diff --git a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/LeggTilPeriodeModal.tsx b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/LeggTilPeriodeModal.tsx index 0f76b5a7ec..ccab64d061 100644 --- a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/LeggTilPeriodeModal.tsx +++ b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/LeggTilPeriodeModal.tsx @@ -8,8 +8,8 @@ import { Forelder, StønadskontoType } from '@navikt/fp-constants'; import { Planperiode } from '../../types/Planperiode'; import styles from './leggTilPeriodeModal.module.css'; import { EndreTidsperiodeModalStep } from './steps/EndreTidsperiodeModalStep'; -import { OppsummeringModalStep } from './steps/OppsummeringModalStep'; -import { ValgModalStep } from './steps/ValgModalStep'; +// import { OppsummeringModalStep } from './steps/OppsummeringModalStep'; +// import { ValgModalStep } from './steps/ValgModalStep'; import { VelgKontotypeModalStep } from './steps/VelgKontotypeModalStep'; interface Props { @@ -52,15 +52,15 @@ export const LeggTilPeriodeModal = forwardRef( const renderContent = () => { switch (currentStep) { + // case 'step1': + // return ( + // + // ); case 'step1': - return ( - - ); - case 'step2': return ( ( familiehendelsedato={familiehendelsedato} /> ); - case 'step3': + case 'step2': return ( - ); - case 'step4': - return ( - ); + // case 'step3': + // return ( + // + // ); default: return null; } diff --git a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/EndreTidsperiodeModalStep.tsx b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/EndreTidsperiodeModalStep.tsx index 6701697c0b..631d61c2a9 100644 --- a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/EndreTidsperiodeModalStep.tsx +++ b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/EndreTidsperiodeModalStep.tsx @@ -5,7 +5,7 @@ import { useIntl } from 'react-intl'; import { Button, Heading } from '@navikt/ds-react'; import { RhfDatepicker, RhfForm } from '@navikt/fp-form-hooks'; -import { isBeforeOrSame, isRequired, isValidDate } from '@navikt/fp-validation'; +import { isBeforeOrSame, isEmpty, isRequired, isValidDate } from '@navikt/fp-validation'; import { ModalData } from '../LeggTilPeriodeModal'; @@ -36,7 +36,7 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal, ...modalData, fom: values.fom, tom: values.tom, - currentStep: 'step3', + currentStep: 'step2', }); }; @@ -65,6 +65,7 @@ export const EndreTidsperiodeModalStep = ({ modalData, setModalData, closeModal, disableWeekends={true} label="Fra og med dato" name="fom" + defaultMonth={isEmpty(fomValue) ? familiehendelsedato : fomValue} />
- + */}
diff --git a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/VelgKontotypeModalStep.tsx b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/VelgKontotypeModalStep.tsx index 63de7426b4..240cfd83cc 100644 --- a/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/VelgKontotypeModalStep.tsx +++ b/packages/ny-uttaksplan/src/components/legg-til-periode-modal/steps/VelgKontotypeModalStep.tsx @@ -7,12 +7,14 @@ import { Forelder, StønadskontoType } from '@navikt/fp-constants'; import { RhfForm, RhfRadioGroup } from '@navikt/fp-form-hooks'; import { isRequired } from '@navikt/fp-validation'; +import { Planperiode } from '../../../types/Planperiode'; import { ModalData } from '../LeggTilPeriodeModal'; interface Props { modalData: ModalData; closeModal: () => void; setModalData: (data: ModalData) => void; + handleAddPeriode: (oppdatertPeriode: Planperiode) => void; } interface FormValues { @@ -20,9 +22,9 @@ interface FormValues { forelder: Forelder; } -export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }: Props) => { +export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData, handleAddPeriode }: Props) => { const intl = useIntl(); - const { kontoType, forelder } = modalData; + const { fom, tom, forelder, kontoType } = modalData; const formMethods = useForm({ defaultValues: { @@ -31,6 +33,9 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }: }, }); + const kontoTypeValue = formMethods.watch('kontoType'); + const forelderValue = formMethods.watch('forelder'); + const getForelderFromKontoType = ( kontoTypeValue: StønadskontoType, forelderValue: Forelder | undefined, @@ -49,13 +54,20 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }: setModalData({ ...modalData, kontoType: values.kontoType, - currentStep: 'step4', + currentStep: 'step3', forelder: getForelderFromKontoType(values.kontoType, values.forelder), }); + handleAddPeriode({ + fom: fom!, + tom: tom!, + id: `${fom} - ${tom} - ${'kontoType'}`, + readOnly: false, + kontoType: kontoTypeValue, + forelder: forelderValue, + }); + closeModal(); }; - const kontoTypeValue = formMethods.watch('kontoType'); - return ( <> @@ -99,12 +111,12 @@ export const VelgKontotypeModalStep = ({ modalData, closeModal, setModalData }: type="button" variant="secondary" onClick={() => { - setModalData({ ...modalData, currentStep: 'step2' }); + setModalData({ ...modalData, currentStep: 'step1' }); }} > Gå tilbake - + diff --git a/packages/validation/index.ts b/packages/validation/index.ts index 9c8f2ab6c3..99cc2d7342 100644 --- a/packages/validation/index.ts +++ b/packages/validation/index.ts @@ -8,6 +8,7 @@ export { hasMinLength, hasMaxLength, hasLegalChars, + isEmpty, } from './src/form/generalFormValidation'; export { isValidNumberForm,