Fikset en del feil etter merge-conflict og en del oppdateringer for r…

…ammeverk

#deploy-test-frontend

apps/dolly-frontend/src/main/js/package.json

@@ -24,6 +24,7 @@
     "@navikt/ds-css-internal": "^3.4.3",
     "@navikt/ds-react-internal": "^3.4.3",
     "@navikt/fnrvalidator": "^1.3.0",
+    "@popperjs/core": "^2.11.8",
     "axios": "^1.1.3",
     "classnames": "^2.3.1",
     "country-data-list": "^1.3.0",

apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx

@@ -5,7 +5,7 @@ import GjenopprettConnector from '@/components/bestilling/gjenopprett/Gjenoppret
 
 import './BestillingDetaljer.less'
 import { MalModal } from '@/pages/minSide/maler/MalModal'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { SlettButton } from '@/components/ui/button/SlettButton/SlettButton'
 import React from 'react'
 import { DollyApi } from '@/service/Api'

apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 import {
 	allCapsToCapitalized,
 	arrayToString,

apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx

@@ -2,7 +2,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import FagsystemStatus from './fagsystemStatus/FagsystemStatus'
 import ApiFeilmelding from '@/components/ui/apiFeilmelding/ApiFeilmelding'
 import antallIdenterOpprettet from '@/components/bestilling/utils/antallIdenterOpprettet'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import React from 'react'
 
 export type Miljostatus = {
@@ -99,21 +99,20 @@ const mergeIdentiskeStatusmeldinger = (statuser: Status[]) => {
 			(value, index, self) => index === self?.findIndex((status) => _.isEqual(status, value)),
 		)
 
-	return [...unikeStatusMeldingerPerSystem]?.map(
-		(statusMelding) =>
-			statuser
-				?.filter((status) => {
-					const identerErIdentiske = _.isEqual(status.identer, statusMelding.identer)
-					return (
-						status.melding === statusMelding.melding &&
-						status.navn === statusMelding.navn &&
-						identerErIdentiske
-					)
-				})
-				?.reduce((previousValue, currentValue) => ({
-					...previousValue,
-					miljo: `${previousValue.miljo}, ${currentValue.miljo}`,
-				})),
+	return [...unikeStatusMeldingerPerSystem]?.map((statusMelding) =>
+		statuser
+			?.filter((status) => {
+				const identerErIdentiske = _.isEqual(status.identer, statusMelding.identer)
+				return (
+					status.melding === statusMelding.melding &&
+					status.navn === statusMelding.navn &&
+					identerErIdentiske
+				)
+			})
+			?.reduce((previousValue, currentValue) => ({
+				...previousValue,
+				miljo: `${previousValue.miljo}, ${currentValue.miljo}`,
+			})),
 	)
 }
 

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { useFormContext } from 'react-hook-form'
 
 export const Vis = ({ attributt, children }) => {

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx

@@ -1,5 +1,5 @@
 import { initialValues } from './utils'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { filterMiljoe } from '@/components/miljoVelger/MiljoeInfo'
 import {
 	BostedData,
@@ -85,7 +85,7 @@ export const initialValuesBasedOnMal = (mal: any) => {
 		delete initialValuesMal.tpsMessaging.utenlandskBankkonto
 	}
 
-	initialValuesMal.environments = filterMiljoe(dollyEnvironments, mal.bestilling.environments)
+	initialValuesMal.environments = filterMiljoe(dollyEnvironments, mal.bestilling?.environments)
 	return initialValuesMal
 }
 

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx

@@ -1,6 +1,6 @@
 import React, { BaseSyntheticEvent, useState } from 'react'
 import { useAsyncFn } from 'react-use'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import NavButton from '@/components/ui/button/NavButton/NavButton'
 import { PdlforvalterApi } from '@/service/Api'
 import Loading from '@/components/ui/loading/Loading'

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx

@@ -11,7 +11,7 @@ import { Alert } from '@navikt/ds-react'
 import ModalActionKnapper from '@/components/ui/modal/ModalActionKnapper'
 
 import styled from 'styled-components'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { tpsfAttributter } from '@/components/bestillingsveileder/utils'
 import { Mal, useDollyMaler } from '@/utils/hooks/useMaler'
 import { CypressSelector } from '../../../../../cypress/mocks/Selectors'

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx

@@ -1,14 +1,18 @@
-import React, {useContext} from 'react'
+import React, { useContext } from 'react'
 import Panel from '@/components/ui/panel/Panel'
-import {Attributt, AttributtKategori} from '../Attributt'
-import {fetchTpOrdninger, initialOrdning, tpPath,} from '@/components/fagsystem/tjenestepensjon/form/Form'
-import {harValgtAttributt} from '@/components/ui/form/formUtils'
-import {pensjonPath} from '@/components/fagsystem/pensjon/form/Form'
-import {genInitialAlderspensjonVedtak} from '@/components/fagsystem/alderspensjon/form/initialValues'
-import {BestillingsveilederContext} from '@/components/bestillingsveileder/BestillingsveilederContext'
-import {initialUforetrygd} from '@/components/fagsystem/uforetrygd/initialValues'
-import {runningCypressE2E} from '@/service/services/Request'
-import * as _ from 'lodash'
+import { Attributt, AttributtKategori } from '../Attributt'
+import {
+	fetchTpOrdninger,
+	initialOrdning,
+	tpPath,
+} from '@/components/fagsystem/tjenestepensjon/form/Form'
+import { harValgtAttributt } from '@/components/ui/form/formUtils'
+import { pensjonPath } from '@/components/fagsystem/pensjon/form/Form'
+import { genInitialAlderspensjonVedtak } from '@/components/fagsystem/alderspensjon/form/initialValues'
+import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
+import { initialUforetrygd } from '@/components/fagsystem/uforetrygd/initialValues'
+import { runningCypressE2E } from '@/service/services/Request'
+import _ from 'lodash'
 
 export const PensjonPanel = ({ stateModifier, formValues }: any) => {
 	const sm = stateModifier(PensjonPanel.initialValues)
@@ -17,20 +21,16 @@ export const PensjonPanel = ({ stateModifier, formValues }: any) => {
 	const harValgtAp = _.has(formValues, 'pensjonforvalter.alderspensjon')
 	const harValgtUforetrygd = _.has(formValues, 'pensjonforvalter.uforetrygd')
 
-	const harGyldigApBestilling = opts?.tidligereBestillinger?.some(
-		(bestilling) =>
-			bestilling.status?.some(
-				(status) =>
-					status.id === 'PEN_AP' && status.statuser?.some((item) => item?.melding === 'OK'),
-			),
+	const harGyldigApBestilling = opts?.tidligereBestillinger?.some((bestilling) =>
+		bestilling.status?.some(
+			(status) => status.id === 'PEN_AP' && status.statuser?.some((item) => item?.melding === 'OK'),
+		),
 	)
 
-	const harGyldigUforetrygdBestilling = opts?.tidligereBestillinger?.some(
-		(bestilling) =>
-			bestilling.status?.some(
-				(status) =>
-					status.id === 'PEN_UT' && status.statuser?.some((item) => item.melding === 'OK'),
-			),
+	const harGyldigUforetrygdBestilling = opts?.tidligereBestillinger?.some((bestilling) =>
+		bestilling.status?.some(
+			(status) => status.id === 'PEN_UT' && status.statuser?.some((item) => item.melding === 'OK'),
+		),
 	)
 
 	const getTitleAlderspensjon = () => {

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import Panel from '@/components/ui/panel/Panel'
 import { Attributt, AttributtKategori } from '../Attributt'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'

apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 
 export const tpsfAttributter = [
 	'harMellomnavn',

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/ameldingForm.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react'
 import styled from 'styled-components'
 import useBoolean from '@/utils/hooks/useBoolean'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { add, eachMonthOfInterval, format, isAfter, isDate } from 'date-fns'
 import { DollySelect } from '@/components/ui/form/inputs/select/Select'
 import { ArbeidKodeverk } from '@/config/kodeverk'

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx

@@ -22,7 +22,7 @@ import { ArbeidsgiverIdent } from '@/components/fagsystem/aareg/form/partials/ar
 import { isDate } from 'date-fns'
 import { EgneOrganisasjoner } from '@/components/fagsystem/brregstub/form/partials/EgneOrganisasjoner'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { Monthpicker } from '@/components/ui/form/inputs/monthpicker/Monthpicker'
 import { fixTimezone } from '@/components/ui/form/formUtils'
 import { useFormContext } from 'react-hook-form'

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx

@@ -1,5 +1,5 @@
 import * as Yup from 'yup'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { getMonth, getYear, isWithinInterval } from 'date-fns'
 import { ifPresent, messages, requiredDate, requiredString } from '@/utils/YupValidations'
 import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils'

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx

@@ -13,7 +13,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { MiljoTabs } from '@/components/ui/miljoTabs/MiljoTabs'
 import { useBestilteMiljoer } from '@/utils/hooks/useBestilling'
 import { arrayToString, formatDate } from '@/utils/DataFormatter'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import React from 'react'
 import StyledAlert from '@/components/ui/alert/StyledAlert'
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx

@@ -2,7 +2,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatStringDates } from '@/utils/DataFormatter'
 import { ArbeidKodeverk } from '@/config/kodeverk'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import React from 'react'
 import { Fartoy } from '@/components/fagsystem/aareg/visning/partials/Fartoy'
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx

@@ -1,5 +1,5 @@
 import React, { useContext } from 'react'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { ifPresent } from '@/utils/YupValidations'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import Panel from '@/components/ui/panel/Panel'

apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx

@@ -3,7 +3,7 @@ import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { FormikSelect } from '@/components/ui/form/inputs/select/Select'
 import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { Alert } from '@navikt/ds-react'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx

@@ -1,7 +1,7 @@
 import * as Yup from 'yup'
 import { messages, requiredString } from '@/utils/YupValidations'
 import { isAfter, isBefore, isEqual } from 'date-fns'
-import * as _ from 'lodash'
+import _ from 'lodash'
 
 const ikkeOverlappendeVedtak = ['aap', 'dagpenger']
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx

@@ -4,7 +4,7 @@ import { FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput
 import { ArbeidKodeverk, GtKodeverk } from '@/config/kodeverk'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { landkodeIsoMapping } from '@/service/services/kontoregister/landkoder'
 
 const path = 'bankkonto.utenlandskBankkonto'

apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx

@@ -1,6 +1,6 @@
 import * as Yup from 'yup'
 import { ifPresent, messages, requiredString } from '@/utils/YupValidations'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { landkodeIsoMapping, landkoder } from '@/service/services/kontoregister/landkoder'
 
 const validInputOrCheckboxTest = (val, checkboxPath, feilmelding, inputValidation) => {

apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/EgneOrganisasjoner.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { Adresse, Organisasjon } from '@/service/services/organisasjonforvalter/types'
 import { Alert } from '@navikt/ds-react'
 import { useCurrentBruker } from '@/utils/hooks/useBruker'

apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx

@@ -7,7 +7,7 @@ import { FormikSelect } from '@/components/ui/form/inputs/select/Select'
 import { DollyTextInput, FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
 import Panel from '@/components/ui/panel/Panel'
 import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { UseFormReturn } from 'react-hook-form/dist/types'

apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx

@@ -10,7 +10,7 @@ import { Vedlegg } from '@/components/fagsystem/dokarkiv/form/DokarkivForm'
 import { FormikDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { initialHistark } from '@/components/fagsystem/arbeidsplassen/form/initialValues'
 import { useNavEnheter } from '@/utils/hooks/useNorg2'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { Option } from '@/service/SelectOptionsOppslag'
 import { FormikDateTimepicker } from '@/components/ui/form/inputs/timepicker/Timepicker'
 import { FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput'

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx

@@ -1,6 +1,6 @@
 import React, { useContext, useState } from 'react'
 import * as Yup from 'yup'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import Panel from '@/components/ui/panel/Panel'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { erForsteEllerTest, panelError } from '@/components/ui/form/formUtils'

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import {
 	Bestilling,
@@ -71,7 +71,7 @@ export const InntektsmeldingVisning = ({
 									(bestilling) => bestilling?.data.inntektsmelding.inntekter,
 								),
 								miljoe: miljo.miljo,
-						  },
+							},
 				},
 				miljo: miljo.miljo,
 			}

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { formatDate } from '@/utils/DataFormatter'

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { codeToNorskLabel, formatDate } from '@/utils/DataFormatter'

apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 // @ts-ignore
 import { Inntektsinformasjon } from './inntektinformasjonTypes'
 import { UseFormReturn } from 'react-hook-form/dist/types'

apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx

@@ -1,4 +1,4 @@
-import * as _ from 'lodash'
+import _ from 'lodash'
 
 const getAllDatesBetween = (startdato, sluttdato) => {
 	const startDate = new Date(startdato)

apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrForm.tsx

@@ -1,6 +1,6 @@
 import * as Yup from 'yup'
 import { ifPresent, requiredBoolean, requiredString } from '@/utils/YupValidations'
-import * as _ from 'lodash-es'
+import _ from 'lodash'
 import { Vis } from '@/components/bestillingsveileder/VisAttributt'
 import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker'
 import { DollySelect, FormikSelect } from '@/components/ui/form/inputs/select/Select'

apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx

@@ -1,7 +1,7 @@
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
 import MedlVisning from './MedlVisning'
 import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { Medlemskapsperiode } from '@/components/fagsystem/medl/MedlTypes'
 import styled from 'styled-components'
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { organisasjonPaths } from '../paths'
 import { Kategori } from '@/components/ui/form/kategori/Kategori'
 import { FormikSelect } from '@/components/ui/form/inputs/select/Select'

apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/PdlPersonInfo.tsx

@@ -3,7 +3,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary'
 import { formatDate, showLabel } from '@/utils/DataFormatter'
 import { TpsMPersonInfo } from '@/components/fagsystem/pdl/visning/partials/tpsMessaging/TpsMPersonInfo'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import React from 'react'
 import { ArrayHistorikk } from '@/components/ui/historikk/ArrayHistorikk'
 

apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx

@@ -1,6 +1,6 @@
 import { TitleValue } from '@/components/ui/titleValue/TitleValue'
 import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { formatDate } from '@/utils/DataFormatter'
 import { AdresseKodeverk } from '@/config/kodeverk'
 import { Foreldreansvar } from '@/components/fagsystem/pdlf/PdlTypes'

apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx

@@ -6,7 +6,7 @@ import { FormikSelect } from '@/components/ui/form/inputs/select/Select'
 import { SelectOptionsManager as Options } from '@/service/SelectOptions'
 import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert/AvansertForm'
 import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import { UseFormReturn } from 'react-hook-form/dist/types'
 
 interface AdressebeskyttelseValues {

apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx

@@ -1,6 +1,6 @@
 import { MatrikkelAdresseVelger } from '@/components/adresseVelger'
 import { DollyTextInput } from '@/components/ui/form/inputs/textInput/TextInput'
-import * as _ from 'lodash'
+import _ from 'lodash'
 import styled from 'styled-components'
 import { MatrikkelAdresse } from '@/components/adresseVelger/MatrikkelAdresseVelger'
 import { UseFormReturn } from 'react-hook-form/dist/types'