fix(handler): remove section and end date when application is not acc…

…epted (#3232)
City-of-Helsinki · Sep 4, 2024 · 38c2b66 · 38c2b66
1 parent cc7ff47
commit 38c2b66
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/frontend/benefit/handler/src/components/applicationReview/handlingView/HandlingStep1.tsx b/frontend/benefit/handler/src/components/applicationReview/handlingView/HandlingStep1.tsx
@@ -203,7 +203,10 @@ const HandlingStep1: React.FC<HandlingStepProps> = ({
           HANDLED_STATUSES.includes(application.status) && (
             <HandledView data={application} />
           )}
-        {application.archived && <ArchivedView data={application} />}
+        {application.archived &&
+          application.status === APPLICATION_STATUSES.ACCEPTED && (
+            <ArchivedView data={application} />
+          )}
       </Container>
     </ReviewStateContext.Provider>
   );

diff --git a/frontend/benefit/handler/src/components/applicationsArchive/useApplicationsArchive.ts b/frontend/benefit/handler/src/components/applicationsArchive/useApplicationsArchive.ts
@@ -1,5 +1,6 @@
 import useSearchApplicationQuery from 'benefit/handler/hooks/useSearchApplicationQuery';
 import { SearchResponse } from 'benefit/handler/types/search';
+import { APPLICATION_STATUSES } from 'benefit-shared/constants';
 import {
   ApplicationData,
   ApplicationListItemData,
@@ -64,8 +65,12 @@ export const prepareSearchData = (
             handledAt: convertToUIDateFormat(handled_at) || '-',
             applicationNum,
             alterations,
-            calculationEndDate:
-              convertToUIDateFormat(calculation?.end_date) || '-',
+            calculationEndDate: [
+              APPLICATION_STATUSES.ACCEPTED,
+              APPLICATION_STATUSES.ARCHIVAL,
+            ].includes(status)
+              ? convertToUIDateFormat(calculation?.end_date) || '-'
+              : '-',
           };
         })
     : [];