From c04692732b0b1671be24c01cf5eadacc27f3995e Mon Sep 17 00:00:00 2001
From: stanislavh <stanislav.honcharov@sonarsource.com>
Date: Mon, 13 Mar 2023 14:01:57 +0100
Subject: [PATCH] SONAR-18736 Drop and refactor UI BBTs for rules page

---
 .../components/ActivationFormModal.tsx        |  4 ++--
 .../components/RuleDetailsProfiles.tsx        |  2 +-
 .../components/SeveritySelect.tsx             |  1 +
 .../ActivationFormModal-test.tsx.snap         | 20 +++++++++----------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx
index 98031fd3254..4568687ddb6 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/ActivationFormModal.tsx
@@ -181,10 +181,10 @@ export default class ActivationFormModal extends React.PureComponent<Props, Stat
               />
             </div>
             <div className="modal-field">
-              <label id="coding-rules-severity-select">{translate('severity')}</label>
+              <label id="coding-rules-severity-select-label">{translate('severity')}</label>
               <SeveritySelect
                 isDisabled={submitting}
-                ariaLabelledby="coding-rules-severity-select"
+                ariaLabelledby="coding-rules-severity-select-label"
                 onChange={this.handleSeverityChange}
                 severity={severity}
               />
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx
index 4ac0260e43c..5dffc23758c 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/RuleDetailsProfiles.tsx
@@ -200,7 +200,7 @@ export default class RuleDetailsProfiles extends React.PureComponent<Props> {
     const parentActivation = activations.find((x) => x.qProfile === profile.parentKey);
 
     return (
-      <tr data-profile={profile.key} key={profile.key}>
+      <tr key={profile.key}>
         <td className="coding-rules-detail-quality-profile-name">
           <Link to={getQualityProfileUrl(profile.name, profile.language)}>{profile.name}</Link>
           {profile.isBuiltIn && <BuiltInQualityProfileBadge className="spacer-left" />}
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/SeveritySelect.tsx b/server/sonar-web/src/main/js/apps/coding-rules/components/SeveritySelect.tsx
index ff27e2ac8c5..69ce2fb8b60 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/SeveritySelect.tsx
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/SeveritySelect.tsx
@@ -56,6 +56,7 @@ export function SeveritySelect(props: SeveritySelectProps) {
 
   return (
     <Select
+      id="coding-rules-severity-select"
       aria-labelledby={ariaLabelledby}
       isDisabled={isDisabled}
       onChange={props.onChange}
diff --git a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap
index 218e1a3d16e..44237c4942e 100644
--- a/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap
+++ b/server/sonar-web/src/main/js/apps/coding-rules/components/__tests__/__snapshots__/ActivationFormModal-test.tsx.snap
@@ -46,12 +46,12 @@ exports[`should render correctly: custom rule 1`] = `
         className="modal-field"
       >
         <label
-          id="coding-rules-severity-select"
+          id="coding-rules-severity-select-label"
         >
           severity
         </label>
         <SeveritySelect
-          ariaLabelledby="coding-rules-severity-select"
+          ariaLabelledby="coding-rules-severity-select-label"
           isDisabled={false}
           onChange={[Function]}
           severity="MAJOR"
@@ -132,12 +132,12 @@ exports[`should render correctly: default 1`] = `
         className="modal-field"
       >
         <label
-          id="coding-rules-severity-select"
+          id="coding-rules-severity-select-label"
         >
           severity
         </label>
         <SeveritySelect
-          ariaLabelledby="coding-rules-severity-select"
+          ariaLabelledby="coding-rules-severity-select-label"
           isDisabled={false}
           onChange={[Function]}
           severity="MAJOR"
@@ -253,12 +253,12 @@ exports[`should render correctly: submitting 1`] = `
         className="modal-field"
       >
         <label
-          id="coding-rules-severity-select"
+          id="coding-rules-severity-select-label"
         >
           severity
         </label>
         <SeveritySelect
-          ariaLabelledby="coding-rules-severity-select"
+          ariaLabelledby="coding-rules-severity-select-label"
           isDisabled={true}
           onChange={[Function]}
           severity="MAJOR"
@@ -372,12 +372,12 @@ exports[`should render correctly: update mode 1`] = `
         className="modal-field"
       >
         <label
-          id="coding-rules-severity-select"
+          id="coding-rules-severity-select-label"
         >
           severity
         </label>
         <SeveritySelect
-          ariaLabelledby="coding-rules-severity-select"
+          ariaLabelledby="coding-rules-severity-select-label"
           isDisabled={false}
           onChange={[Function]}
           severity="MAJOR"
@@ -527,12 +527,12 @@ exports[`should render correctly: with deep profiles 1`] = `
         className="modal-field"
       >
         <label
-          id="coding-rules-severity-select"
+          id="coding-rules-severity-select-label"
         >
           severity
         </label>
         <SeveritySelect
-          ariaLabelledby="coding-rules-severity-select"
+          ariaLabelledby="coding-rules-severity-select-label"
           isDisabled={false}
           onChange={[Function]}
           severity="MAJOR"
-- 
2.39.5