Validering i psb

Author: frodehansen2

apps/pleiepenger-sykt-barn/src/app/søknad/legeerklæring-step/LegeerklæringStep.tsx

@@ -1,6 +1,6 @@
 import { useAppIntl } from '@i18n/index';
 import { useAmplitudeInstance } from '@navikt/sif-common-amplitude';
-import { FormikAttachmentForm, useAttachmentsHelper } from '@navikt/sif-common-core-ds';
+import { FormikAttachmentForm, getAttachmentsValidator, useAttachmentsHelper } from '@navikt/sif-common-core-ds';
 import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block';
 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';
@@ -28,11 +28,7 @@ const LegeerklæringStep = ({ onValidSubmit }: StepCommonProps) => {
         persist({ formValues: valuesToPersist, lastStepID: StepID.LEGEERKLÆRING });
     };
 
-    const { hasPendingUploads, maxTotalSizeExceeded } = useAttachmentsHelper(
-        attachments,
-        andreVedlegg,
-        onAttachmentsChange,
-    );
+    const { hasPendingUploads } = useAttachmentsHelper(attachments, andreVedlegg, onAttachmentsChange);
 
     usePersistOnChange(attachments, true, StepID.LEGEERKLÆRING);
 
@@ -51,7 +47,7 @@ const LegeerklæringStep = ({ onValidSubmit }: StepCommonProps) => {
             }}
             useValidationErrorSummary={false}
             skipValidation={true}
-            buttonDisabled={hasPendingUploads || maxTotalSizeExceeded}>
+            buttonDisabled={hasPendingUploads}>
             <Block padBottom="xl">
                 <SifGuidePanel compact={true}>
                     <p>
@@ -69,6 +65,7 @@ const LegeerklæringStep = ({ onValidSubmit }: StepCommonProps) => {
                     addLabel: text('steg.lege.vedlegg'),
                     noAttachmentsText: text('vedleggsliste.ingenLegeerklæringLastetOpp'),
                 }}
+                validate={getAttachmentsValidator({ useDefaultMessages: true }, andreVedlegg)}
                 uploadLaterURL={getLenker(intl.locale).ettersend}
                 onUnauthorizedOrForbiddenUpload={userNotLoggedIn}
                 otherAttachments={andreVedlegg}

apps/pleiepenger-sykt-barn/src/app/søknad/opplysninger-om-barnet-step/FødselsattestPart.tsx

@@ -2,7 +2,7 @@ import { Heading } from '@navikt/ds-react';
 import React from 'react';
 import { useAppIntl } from '@i18n/index';
 import { useAmplitudeInstance } from '@navikt/sif-common-amplitude';
-import { useAttachmentsHelper } from '@navikt/sif-common-core-ds';
+import { getAttachmentsValidator, useAttachmentsHelper } from '@navikt/sif-common-core-ds';
 import { FormikAttachmentForm } from '@navikt/sif-common-core-ds/src';
 import Block from '@navikt/sif-common-core-ds/src/atoms/block/Block';
 import { Attachment } from '@navikt/sif-common-core-ds/src/types/Attachment';
@@ -53,6 +53,7 @@ const FødselsattestPart: React.FC<Props> = ({ fødselsattester }) => {
                     addLabel: text('steg.omBarnet.fødselsattest.vedlegg'),
                     noAttachmentsText: text('step.oppsummering.omBarn.ingenFødselsattest'),
                 }}
+                validate={getAttachmentsValidator({ useDefaultMessages: true }, andreVedlegg)}
                 uploadLaterURL={getLenker(intl.locale).ettersend}
                 onUnauthorizedOrForbiddenUpload={userNotLoggedIn}
                 otherAttachments={andreVedlegg}

apps/pleiepenger-sykt-barn/src/app/søknad/opplysninger-om-barnet-step/OpplysningerOmBarnetStep.tsx

@@ -1,9 +1,5 @@
 import React from 'react';
 import { Attachment } from '@navikt/sif-common-core-ds/src/types/Attachment';
-import {
-    getTotalSizeOfAttachments,
-    MAX_TOTAL_ATTACHMENT_SIZE_BYTES,
-} from '@navikt/sif-common-core-ds/src/utils/attachmentUtils';
 import { useFormikContext } from 'formik';
 import { SøkerdataContext } from '../../context/SøkerdataContext';
 import { StepCommonProps } from '../../types/StepCommonProps';
@@ -28,14 +24,12 @@ const OpplysningerOmBarnetStep = ({ onValidSubmit }: StepCommonProps) => {
         return values && values.fødselsattest ? values[SøknadFormField.fødselsattest] : [];
     }, [values]);
     const hasPendingUploads: boolean = attachments.find((a) => a.pending === true) !== undefined;
-    const totalSize = getTotalSizeOfAttachments([...attachments, ...values.legeerklæring]);
-    const attachmentsSizeOver24Mb = totalSize > MAX_TOTAL_ATTACHMENT_SIZE_BYTES;
 
     return (
         <SøknadFormStep
             stepId={StepID.OPPLYSNINGER_OM_BARNET}
             onValidFormSubmit={onValidSubmit}
-            buttonDisabled={hasPendingUploads || attachmentsSizeOver24Mb}>
+            buttonDisabled={hasPendingUploads}>
             {søkerdata && (
                 <div data-testid="opplysninger-om-barnet">
                     {harRegistrerteBarn(søkerdata) && <RegistrertBarnPart søkersBarn={søkerdata.barn} />}