🐛 Fix issue causing all non-required assessments to show as archived (#…

…1580) - Missed this in the first pass. Need to filter the archived questionnaires passed when rendering the archived table. https://issues.redhat.com/browse/MTA-1722 Signed-off-by: ibolton336 <[email protected]>
konveyor · Dec 4, 2023 · 17369d3 · 17369d3
1 parent 86c4640
commit 17369d3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/...pp/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx b/...pp/pages/assessment/components/assessment-actions/components/assessment-actions-table.tsx
@@ -40,6 +40,12 @@ const AssessmentActionsTable: React.FC<AssessmentActionsTableProps> = ({
       nonRequiredQuestionnaireIds.includes(assessment.questionnaire.id) &&
       relevantAssessmentIds.includes(assessment.id)
   );
+  const filteredArchivedQuestionnaires = archivedQuestionnaires.filter(
+    (questionnaire) =>
+      filteredArchivedAssessments.some(
+        (assessment) => assessment.questionnaire.id === questionnaire.id
+      )
+  );
 
   return (
     <>
@@ -56,7 +62,7 @@ const AssessmentActionsTable: React.FC<AssessmentActionsTableProps> = ({
           application={application}
           archetype={archetype}
           isReadonly
-          questionnaires={archivedQuestionnaires}
+          questionnaires={filteredArchivedQuestionnaires}
           assessments={filteredArchivedAssessments}
           isFetching={isFetchingQuestionnaires || isFetchingAssessmentsById}
           tableName="Archived questionnaires"