From bef0ed1d0964a3f231af0ac6268f6dfb2312cc59 Mon Sep 17 00:00:00 2001
From: Wouter Admiraal <wouter.admiraal@sonarsource.com>
Date: Thu, 12 Oct 2023 09:31:07 +0200
Subject: [PATCH] SONAR-20738 Remove useless "current issue" counter on issues
 page

---
 .../src/main/js/apps/issues/components/IssuesApp.tsx     | 7 +------
 .../src/main/js/apps/issues/components/IssuesCounter.tsx | 8 +-------
 .../src/main/js/apps/issues/components/PageActions.tsx   | 5 ++---
 .../issues-subnavigation/SubnavigationIssuesList.tsx     | 9 +--------
 .../SubnavigationIssuesListHeader.tsx                    | 7 ++-----
 5 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
index 80a291dc4f4..11766feb3d4 100644
--- a/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesApp.tsx
@@ -1184,11 +1184,9 @@ export class App extends React.PureComponent<Props, State> {
   renderHeader({
     openIssue,
     paging,
-    selectedIndex,
   }: {
     openIssue: Issue | undefined;
     paging: Paging | undefined;
-    selectedIndex: number | undefined;
   }) {
     return openIssue ? (
       <A11ySkipTarget anchor="issues_main" />
@@ -1202,7 +1200,6 @@ export class App extends React.PureComponent<Props, State> {
             canSetHome={!this.props.component}
             effortTotal={this.state.effortTotal}
             paging={this.props.component?.needIssueSync ? undefined : paging}
-            selectedIndex={selectedIndex}
           />
         </div>
       </>
@@ -1221,8 +1218,6 @@ export class App extends React.PureComponent<Props, State> {
       loadingRule,
     } = this.state;
 
-    const selectedIndex = this.getSelectedIndex();
-
     return (
       <ScreenPositionHelper>
         {({ top }) => (
@@ -1233,7 +1228,7 @@ export class App extends React.PureComponent<Props, State> {
             })}
             style={{ height: `calc((100vh - ${top + LAYOUT_FOOTER_HEIGHT}px)` }}
           >
-            {this.renderHeader({ openIssue, paging, selectedIndex })}
+            {this.renderHeader({ openIssue, paging })}
 
             <Spinner loading={loadingRule}>
               {/* eslint-disable-next-line local-rules/no-conditional-rendering-of-deferredspinner */}
diff --git a/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx b/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx
index 1f603d0a7da..09c4f00f5be 100644
--- a/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/components/IssuesCounter.tsx
@@ -22,17 +22,11 @@ import PageCounter from '../../../components/common/PageCounter';
 import { translate } from '../../../helpers/l10n';
 
 interface Props {
-  current: number | undefined;
   total: number;
 }
 
 export default function IssuesCounter(props: Props) {
   return (
-    <PageCounter
-      className="spacer-left"
-      current={props.current}
-      label={translate('issues.issues')}
-      total={props.total}
-    />
+    <PageCounter className="spacer-left" label={translate('issues.issues')} total={props.total} />
   );
 }
diff --git a/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx b/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx
index 6af94914793..ed87e3a39ba 100644
--- a/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/components/PageActions.tsx
@@ -29,18 +29,17 @@ export interface PageActionsProps {
   canSetHome: boolean;
   effortTotal: number | undefined;
   paging?: Paging;
-  selectedIndex?: number;
 }
 
 export default function PageActions(props: PageActionsProps) {
-  const { canSetHome, effortTotal, paging, selectedIndex } = props;
+  const { canSetHome, effortTotal, paging } = props;
 
   return (
     <div className="sw-body-sm sw-flex sw-items-center sw-gap-6 sw-justify-end sw-flex-1">
       <KeyboardHint title={translate('issues.to_select_issues')} command="ArrowUp ArrowDown" />
       <KeyboardHint title={translate('issues.to_navigate')} command="ArrowLeft ArrowRight" />
 
-      {paging != null && <IssuesCounter current={selectedIndex} total={paging.total} />}
+      {paging != null && <IssuesCounter total={paging.total} />}
       {effortTotal !== undefined && <TotalEffort effort={effortTotal} />}
 
       {canSetHome && <HomePageSelect currentPage={{ type: 'ISSUES' }} />}
diff --git a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesList.tsx b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesList.tsx
index 4fcdbf16cac..0b37db4b348 100644
--- a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesList.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesList.tsx
@@ -51,16 +51,9 @@ export default function SubnavigationIssuesList(props: Props) {
     selectedLocationIndex,
   } = props;
 
-  let selectedIndex: number | undefined = issues.findIndex((issue) => issue.key === selected);
-  selectedIndex = selectedIndex === -1 ? undefined : selectedIndex;
-
   return (
     <StyledWrapper>
-      <SubnavigationIssuesListHeader
-        loading={loading}
-        paging={paging}
-        selectedIndex={selectedIndex}
-      />
+      <SubnavigationIssuesListHeader loading={loading} paging={paging} />
       <StyledList>
         {issues.map((issue, index) => {
           const previousIssue = index > 0 ? issues[index - 1] : undefined;
diff --git a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesListHeader.tsx b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesListHeader.tsx
index 17c203ef227..6ea525abe5d 100644
--- a/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesListHeader.tsx
+++ b/server/sonar-web/src/main/js/apps/issues/issues-subnavigation/SubnavigationIssuesListHeader.tsx
@@ -26,17 +26,14 @@ import IssuesCounter from '../components/IssuesCounter';
 interface Props {
   loading: boolean;
   paging: Paging | undefined;
-  selectedIndex: number | undefined;
 }
 
 export default function SubnavigationIssuesListHeader(props: Props) {
-  const { loading, paging, selectedIndex } = props;
+  const { loading, paging } = props;
 
   return (
     <StyledHeader>
-      <Spinner loading={loading}>
-        {paging && <IssuesCounter current={selectedIndex} total={paging.total} />}
-      </Spinner>
+      <Spinner loading={loading}>{paging && <IssuesCounter total={paging.total} />}</Spinner>
     </StyledHeader>
   );
 }
-- 
2.39.5