Refactor frontend to prepare for #5955.

ICTU · Dec 7, 2023 · 625aeea · 625aeea
1 parent 1876f27
commit 625aeea
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/components/frontend/src/issue/IssueStatus.js b/components/frontend/src/issue/IssueStatus.js
@@ -157,17 +157,18 @@ issuePopupContent.propTypes = {
     issueStatus: issueStatusPropType
 }
 
-function IssuesWithTracker({ metric, settings }) {
+function IssuesWithTracker({ issueIds, metric, settings }) {
     const issueStatuses = metric.issue_status || [];
     return <>
         {
-            issueStatuses.map((issueStatus) =>
+            issueStatuses.filter((issueStatus) => issueIds.indexOf(issueStatus.issue_id) > -1).map((issueStatus) =>
                 <IssueWithTracker key={issueStatus.issue_id} issueStatus={issueStatus} settings={settings} />
             )
         }
     </>
 }
 IssuesWithTracker.propTypes = {
+    issueIds: stringsPropType,
     metric: metricPropType,
     settings: settingsPropType
 }
@@ -177,7 +178,7 @@ export function IssueStatus({ metric, issueTrackerMissing, settings }) {
     if (issueTrackerMissing && issueIds.length > 0) {
         return <IssuesWithoutTracker issueIds={issueIds} />
     }
-    return <IssuesWithTracker metric={metric} settings={settings} />
+    return <IssuesWithTracker issueIds={issueIds} metric={metric} settings={settings} />
 }
 IssueStatus.propTypes = {
     issueTrackerMissing: PropTypes.bool,