SONAR-20023 Remove rule deprecated and removed badges from list/details

3 files changed, 4 insertions, 26 deletions

diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/IssueHeader-it.tsx b/server/sonar-web/src/main/js/apps/issues/__tests__/IssueHeader-it.tsx
index 54fdfeb64a4..fce07fd1743 100644
--- a/server/sonar-web/src/main/js/apps/issues/__tests__/IssueHeader-it.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/__tests__/IssueHeader-it.tsx
@@ -22,8 +22,7 @@ import * as React from 'react';
 import { WorkspaceContext } from '../../../components/workspace/context';
 import { mockIssue, mockRuleDetails } from '../../../helpers/testMocks';
 import { renderComponent } from '../../../helpers/testReactTestingUtils';
-import { byLabelText, byRole, byText } from '../../../helpers/testSelector';
-import { RuleStatus } from '../../../types/rules';
+import { byRole, byText } from '../../../helpers/testSelector';
 import { Dict } from '../../../types/types';
 import IssueHeader from '../components/IssueHeader';
 
@@ -38,11 +37,10 @@ it('renders correctly', async () => {
         codeVariants: ['first', 'second'],
         effort: '5min',
         quickFixAvailable: true,
-        ruleStatus: RuleStatus.Deprecated,
         externalRuleEngine: 'eslint',
       },
     },
-    { eslint: 'yes' }
+    { eslint: 'eslint' }
   );
 
   // Title
@@ -88,11 +86,8 @@ it('renders correctly', async () => {
   // SonarLint badge
   expect(byText('issue.quick_fix_available_with_sonarlint_no_link').get()).toBeInTheDocument();
 
-  // Rule status - Deprecated
-  expect(byLabelText(`issue.resolution.badge.${RuleStatus.Deprecated}`).get()).toBeInTheDocument();
-
   // Rule external engine
-  expect(byText(/issue.resolution.badge/).get()).toBeInTheDocument();
+  expect(byText('eslint').get()).toBeInTheDocument();
 });
 
 it('renders correctly when some data is not provided', () => {
@@ -112,13 +107,8 @@ it('renders correctly when some data is not provided', () => {
     byText('issue.quick_fix_available_with_sonarlint_no_link').query()
   ).not.toBeInTheDocument();
 
-  // Rule status deprecated
-  expect(
-    byLabelText(`issue.resolution.badge.${RuleStatus.Deprecated}`).query()
-  ).not.toBeInTheDocument();
-
   // Rule external engine
-  expect(byText(/issue.resolution.badge/).query()).not.toBeInTheDocument();
+  expect(byText('eslint').query()).not.toBeInTheDocument();
 });
 
 function renderIssueHeader(
diff --git a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-it.tsx b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-it.tsx
index 08cd336d489..9ea10f02b66 100644
--- a/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-it.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/__tests__/IssuesApp-it.tsx
@@ -657,12 +657,6 @@ describe('issues item', () => {
     await expect(
       screen.getByText('issue.quick_fix_available_with_sonarlint_no_link')
     ).toHaveATooltipWithContent('issue.quick_fix_available_with_sonarlint');
-
-    expect(
-      screen.getByRole('status', {
-        name: 'issue.resolution.badge.DEPRECATED',
-      })
-    ).toBeInTheDocument();
   });
 });
 
diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssueHeader.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssueHeader.tsx
index 95aeb66c064..a0b4fd5adba 100644
--- a/server/sonar-web/src/main/js/apps/issues/components/IssueHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/components/IssueHeader.tsx
@@ -31,7 +31,6 @@ import * as React from 'react';
 import { setIssueAssignee } from '../../../api/issues';
 import { updateIssue } from '../../../components/issue/actions';
 import IssueActionsBar from '../../../components/issue/components/IssueActionsBar';
-import { RuleBadge } from '../../../components/issue/components/IssueBadges';
 import { CleanCodeAttributePill } from '../../../components/shared/CleanCodeAttributePill';
 import SoftwareImpactPill from '../../../components/shared/SoftwareImpactPill';
 import { WorkspaceContext } from '../../../components/workspace/context';
@@ -43,7 +42,6 @@ import { getKeyboardShortcutEnabled } from '../../../helpers/preferences';
 import { getComponentIssuesUrl, getPathUrlAsString, getRuleUrl } from '../../../helpers/urls';
 import { BranchLike } from '../../../types/branch-like';
 import { IssueActions, IssueType } from '../../../types/issues';
-import { RuleStatus } from '../../../types/rules';
 import { Issue, RuleDetails } from '../../../types/types';
 import IssueHeaderMeta from './IssueHeaderMeta';
 
@@ -148,10 +146,6 @@ export default class IssueHeader extends React.PureComponent<Props, State> {
             return null;
           }}
         </WorkspaceContext.Consumer>
-        {(issue.ruleStatus === RuleStatus.Deprecated ||
-          issue.ruleStatus === RuleStatus.Removed) && (
-          <RuleBadge ruleStatus={issue.ruleStatus} className="sw-ml-1" />
-        )}
       </Note>
     );
   };