Validering i livets sluttfase

Author: frodehansen2

apps/pleiepenger-i-livets-sluttfase-soknad/src/app/søknad/steps/legeerklæring/LegeerklæringForm.tsx

@@ -1,6 +1,6 @@
 import { VStack } from '@navikt/ds-react';
 import React from 'react';
-import { FormikAttachmentForm, useAttachmentsHelper } from '@navikt/sif-common-core-ds';
+import { FormikAttachmentForm, getAttachmentsValidator, useAttachmentsHelper } from '@navikt/sif-common-core-ds';
 import SifGuidePanel from '@navikt/sif-common-core-ds/src/components/sif-guide-panel/SifGuidePanel';
 import { Attachment } from '@navikt/sif-common-core-ds/src/types/Attachment';
 import { getTypedFormComponents } from '@navikt/sif-common-formik-ds';
@@ -33,13 +33,13 @@ const LegeerklæringForm: React.FunctionComponent<Props> = ({
     isSubmitting,
 }) => {
     const { text, intl } = useAppIntl();
-    const { hasPendingUploads, maxTotalSizeExceeded } = useAttachmentsHelper(legeerklæringer, andreVedlegg);
+    const { hasPendingUploads } = useAttachmentsHelper(legeerklæringer, andreVedlegg);
     return (
         <Form
             formErrorHandler={getIntlFormErrorHandler(intl, 'validation')}
             includeValidationSummary={true}
             submitPending={isSubmitting}
-            submitDisabled={hasPendingUploads || maxTotalSizeExceeded}
+            submitDisabled={hasPendingUploads}
             runDelayedFormValidation={true}
             onBack={goBack}>
             <VStack gap="6">
@@ -54,6 +54,12 @@ const LegeerklæringForm: React.FunctionComponent<Props> = ({
                     otherAttachments={andreVedlegg}
                     uploadLaterURL={getLenker(intl.locale).ettersend}
                     onUnauthorizedOrForbiddenUpload={relocateToLoginPage}
+                    validate={getAttachmentsValidator(
+                        {
+                            useDefaultMessages: true,
+                        },
+                        andreVedlegg,
+                    )}
                     labels={{
                         addLabel: text('step.legeerklæring.vedlegg.knappLabel'),
                         noAttachmentsText: text('vedleggsliste.ingenLegeerklæringLastetOpp'),

apps/pleiepenger-i-livets-sluttfase-soknad/src/app/søknad/steps/opplysninger-om-pleietrengende/OpplysningerOmPleietrengendeForm.tsx

@@ -66,7 +66,7 @@ const OpplysningerOmPleietrengendeForm = ({ andreVedlegg, søker, isSubmitting,
 
     const { setFieldValue, values } = useFormikContext<OpplysningerOmPleietrengendeFormValues>();
 
-    const { hasPendingUploads, maxTotalSizeExceeded } = useAttachmentsHelper(
+    const { hasPendingUploads } = useAttachmentsHelper(
         values[OpplysningerOmPleietrengendeFormFields.pleietrengendeId],
         andreVedlegg,
     );
@@ -77,7 +77,7 @@ const OpplysningerOmPleietrengendeForm = ({ andreVedlegg, søker, isSubmitting,
             formErrorHandler={getIntlFormErrorHandler(intl, 'validation')}
             includeValidationSummary={true}
             submitPending={isSubmitting}
-            submitDisabled={hasPendingUploads || isSubmitting || maxTotalSizeExceeded}
+            submitDisabled={hasPendingUploads || isSubmitting}
             onBack={goBack}
             runDelayedFormValidation={true}>
             <SifGuidePanel>

apps/pleiepenger-i-livets-sluttfase-soknad/src/app/søknad/steps/opplysninger-om-pleietrengende/form-parts/IdPart.tsx

@@ -1,4 +1,4 @@
-import { FormikAttachmentForm } from '@navikt/sif-common-core-ds/src';
+import { FormikAttachmentForm, getAttachmentsValidator } from '@navikt/sif-common-core-ds/src';
 import { Attachment } from '@navikt/sif-common-core-ds/src/types';
 import { useAppIntl } from '../../../../i18n';
 import getLenker from '../../../../lenker';
@@ -19,6 +19,12 @@ const IdPart = ({ andreVedlegg = [], pleietrengendeId = [] }: Props) => {
             otherAttachments={andreVedlegg}
             uploadLaterURL={getLenker(intl.locale).ettersend}
             onUnauthorizedOrForbiddenUpload={relocateToLoginPage}
+            validate={getAttachmentsValidator(
+                {
+                    useDefaultMessages: true,
+                },
+                andreVedlegg,
+            )}
             labels={{
                 addLabel: text('step.opplysningerOmPleietrengende.id.uploadButtonLabel'),
                 noAttachmentsText: text('vedleggsliste.ingenDokumenter'),