Merge pull request #1970 from IFRCGo/fix/old-dref-final-report-export

Fix export for old DREF final report

Author: frozenhelium

app/src/components/domain/DrefExportModal/index.tsx

@@ -43,6 +43,7 @@ interface Props {
     onCancel: () => void;
     applicationType: 'DREF' | 'OPS_UPDATE' | 'FINAL_REPORT';
     drefType?: TypeOfDrefEnum | null;
+    isDrefImminentV2?: boolean;
 }
 
 function DrefExportModal(props: Props) {
@@ -51,6 +52,7 @@ function DrefExportModal(props: Props) {
         onCancel,
         applicationType,
         drefType,
+        isDrefImminentV2,
     } = props;
 
     const strings = useTranslation(i18n);
@@ -65,8 +67,15 @@ function DrefExportModal(props: Props) {
             if (applicationType === 'OPS_UPDATE') {
                 type = 'dref-operational-updates';
             } else if (applicationType === 'FINAL_REPORT') {
-                type = 'dref-final-reports';
+                if (isDrefImminentV2) {
+                    type = 'dref-final-reports';
+                } else {
+                    type = 'old-dref-final-reports';
+                }
+            } else if (applicationType === 'DREF') {
+                type = 'dref-applications';
             } else {
+                applicationType satisfies never;
                 type = 'dref-applications';
             }
 
@@ -82,6 +91,7 @@ function DrefExportModal(props: Props) {
             id,
             includePga,
             applicationType,
+            isDrefImminentV2,
         ],
     );
 

app/src/views/AccountMyFormsDref/DrefTableActions/index.tsx

@@ -356,6 +356,8 @@ function DrefTableActions(props: Props) {
                 publishOpsUpdate(null);
             } else if (applicationType === 'FINAL_REPORT') {
                 publishFinalReport(null);
+            } else {
+                applicationType satisfies never;
             }
         },
         [
@@ -528,6 +530,7 @@ function DrefTableActions(props: Props) {
                     id={id}
                     applicationType={applicationType}
                     drefType={drefType}
+                    isDrefImminentV2={isDrefImminentV2}
                 />
             )}
             {showShareModal && (

app/src/views/DrefFinalReportForm/index.tsx

@@ -626,6 +626,7 @@ export function Component() {
                         onCancel={setShowExportModalFalse}
                         id={Number(finalReportId)}
                         applicationType="FINAL_REPORT"
+                        isDrefImminentV2
                     />
                 )}
             </Page>

app/src/views/OldDrefFinalReportForm/index.tsx

@@ -565,6 +565,7 @@ export function Component() {
                         onCancel={setShowExportModalFalse}
                         id={Number(finalReportId)}
                         applicationType="FINAL_REPORT"
+                        isDrefImminentV2={false}
                     />
                 )}
             </Page>