feat: disable CSV download on invalid alteration calculation (#3406)

City-of-Helsinki · Oct 8, 2024 · 26453a8 · 26453a8
1 parent 012302c
commit 26453a8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/frontend/benefit/handler/src/components/alterationHandling/AlterationCsvButton.tsx b/frontend/benefit/handler/src/components/alterationHandling/AlterationCsvButton.tsx
@@ -13,6 +13,7 @@ const AlterationCsvButton: React.FC<AlterationCsvProps> = ({
   alteration,
   values,
   onSubmit,
+  isAlterationValid = true,
 }) => {
   const { t } = useTranslation();
   const updateMutation = updateApplicationAlterationWithCsvQuery();
@@ -50,7 +51,7 @@ const AlterationCsvButton: React.FC<AlterationCsvProps> = ({
       variant={secondary ? 'secondary' : 'primary'}
       iconLeft={<IconDownload />}
       onClick={handleDownloadCsv}
-      disabled={updateMutation.isLoading}
+      disabled={!isAlterationValid || updateMutation.isLoading}
     >
       {updateMutation.isLoading
         ? t('common:utility.downloading')

diff --git a/frontend/benefit/handler/src/components/alterationHandling/AlterationHandlingForm.tsx b/frontend/benefit/handler/src/components/alterationHandling/AlterationHandlingForm.tsx
@@ -238,10 +238,14 @@ const AlterationHandlingForm = ({
                 <$TalpaGuideText>
                   {t(`${translationBase}.talpaCsv.guideText`)}
                 </$TalpaGuideText>
-                <AlterationCsvButton 
+                <AlterationCsvButton
+                  theme="coat"
+                  secondary
+                  isAlterationValid={formik.isValid && !!formik.touched}
                   alteration={alteration}
                   values={formik.values}
-                  onSubmit={handleAlterationCsvDownload} />
+                  onSubmit={handleAlterationCsvDownload}
+                />
               </$GridCell>
             </$Grid>
           </AlterationHandlingSection>
@@ -283,10 +287,7 @@ const AlterationHandlingForm = ({
               onClick={openConfirmationModal}
               theme="coat"
               iconLeft={<IconCheck />}
-              disabled={
-                isSubmitting ||
-                (isSubmitted && (!formik.isValid || isCalculationOutOfDate))
-              }
+              disabled={isSubmitting || (isSubmitted && hasErrors)}
               isLoading={isSubmitting}
               loadingText={t('common:utility.submitting')}
             >

diff --git a/frontend/benefit/handler/src/types/application.d.ts b/frontend/benefit/handler/src/types/application.d.ts
@@ -239,10 +239,10 @@ export type ApplicationAlterationHandlingForm =
   };
 
 export type AlterationCsvProps = {
-    alteration: ApplicationAlteration;
-    values?: ApplicationAlterationHandlingForm;
-    theme?: ButtonTheme;
-    secondary?: boolean;
-    onSubmit?: () => void;
-  };
-  
+  alteration: ApplicationAlteration;
+  values?: ApplicationAlterationHandlingForm;
+  theme?: ButtonTheme;
+  secondary?: boolean;
+  onSubmit?: () => void;
+  isAlterationValid?: boolean;
+};