From 1ced8272b02bef9340f98d87def5c8d2fd12ca34 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 15 Feb 2024 17:12:24 +0100 Subject: [PATCH] Fikset en del feil etter merge-conflict og en del oppdateringer for rammeverk #deploy-test-frontend --- .../src/main/js/package-lock.json | 546 ++++-------------- apps/dolly-frontend/src/main/js/package.json | 1 + .../detaljer/BestillingDetaljer.tsx | 2 +- .../kriterier/BestillingKriterieMapper.tsx | 2 +- .../sammendrag/miljoeStatus/MiljoeStatus.tsx | 31 +- .../bestillingsveileder/VisAttributt.tsx | 2 +- .../options/malOptions.tsx | 4 +- .../EksisterendeIdent/EksisterendeIdent.tsx | 2 +- .../startModal/NyIdent/NyIdent.tsx | 2 +- .../stegVelger/steg/steg1/paneler/Pensjon.tsx | 44 +- .../steg/steg1/paneler/Personinformasjon.tsx | 2 +- .../components/bestillingsveileder/utils.tsx | 2 +- .../aareg/form/partials/ameldingForm.tsx | 2 +- .../form/partials/arbeidsforholdForm.tsx | 2 +- .../fagsystem/aareg/form/validation.tsx | 2 +- .../fagsystem/aareg/visning/Visning.tsx | 2 +- .../aareg/visning/partials/Arbeidsavtaler.tsx | 2 +- .../components/fagsystem/arena/form/Form.tsx | 2 +- .../arena/form/partials/MedServicebehov.tsx | 2 +- .../fagsystem/arena/form/validation.tsx | 2 +- .../bankkonto/form/UtenlandskBankkonto.tsx | 2 +- .../fagsystem/bankkonto/form/validation.tsx | 2 +- .../form/partials/EgneOrganisasjoner.tsx | 2 +- .../fagsystem/dokarkiv/form/DokarkivForm.tsx | 2 +- .../fagsystem/histark/form/HistarkForm.tsx | 2 +- .../fagsystem/inntektsmelding/form/Form.tsx | 2 +- .../inntektsmelding/visning/Visning.tsx | 4 +- .../visning/partials/refusjonVisning.tsx | 2 +- .../visning/partials/sykepengerVisning.tsx | 2 +- .../inntektstub/form/partials/versjon.tsx | 2 +- .../components/fagsystem/inst/form/utils.tsx | 2 +- .../fagsystem/krrstub/form/KrrForm.tsx | 2 +- .../fagsystem/medl/visning/Visning.tsx | 2 +- .../organisasjoner/form/partials/Detaljer.tsx | 2 +- .../pdl/visning/partials/PdlPersonInfo.tsx | 2 +- .../partials/relasjoner/PdlForeldreansvar.tsx | 2 +- .../adressebeskyttelse/Adressebeskyttelse.tsx | 2 +- .../MatrikkeladresseTilfeldig.tsx | 2 +- .../bostedsadresse/Bostedsadresse.tsx | 2 +- .../kontaktadresse/Kontaktadresse.tsx | 2 +- .../oppholdsadresse/Oppholdsadresse.tsx | 2 +- .../pdlf/form/partials/alder/Alder.tsx | 2 +- .../forelderBarnRelasjon/DeltBosted.tsx | 2 +- .../ForelderBarnRelasjon.tsx | 2 +- .../foreldreansvar/Foreldreansvar.tsx | 2 +- .../falskIdentitet/FalskIdentitet.tsx | 5 +- .../kontaktinformasjonForDoedsbo/Kontakt.tsx | 2 +- .../pdlf/form/partials/navn/Navn.tsx | 3 +- .../sikkerhetstiltak/Sikkerhetstiltak.tsx | 2 +- .../partials/telefonnummer/Telefonnummer.tsx | 2 +- .../fagsystem/pdlf/form/partials/utils.tsx | 2 +- .../validation/partials/familierelasjoner.tsx | 2 +- .../form/validation/partials/innvandring.tsx | 2 +- .../partials/kontaktinformasjonForDoedsbo.tsx | 2 +- .../validation/partials/sikkerhetstiltak.tsx | 2 +- .../validation/partials/telefonnummer.tsx | 2 +- .../visning/partials/Adressebeskyttelse.tsx | 4 +- .../pdlf/visning/partials/Boadresse.tsx | 2 +- .../pdlf/visning/partials/DeltBosted.tsx | 4 +- .../pdlf/visning/partials/DoedfoedtBarn.tsx | 2 +- .../pdlf/visning/partials/Doedsfall.tsx | 2 +- .../pdlf/visning/partials/Foedsel.tsx | 2 +- .../visning/partials/ForelderBarnRelasjon.tsx | 10 +- .../pdlf/visning/partials/Foreldreansvar.tsx | 10 +- .../pdlf/visning/partials/Fullmakt.tsx | 6 +- .../pdlf/visning/partials/Innvandring.tsx | 4 +- .../pdlf/visning/partials/Kontaktadresse.tsx | 4 +- .../partials/KontaktinformasjonForDoedsbo.tsx | 8 +- .../pdlf/visning/partials/Oppholdsadresse.tsx | 4 +- .../pdlf/visning/partials/Persondetaljer.tsx | 4 +- .../pdlf/visning/partials/Sivilstand.tsx | 10 +- .../pdlf/visning/partials/Statsborgerskap.tsx | 4 +- .../pdlf/visning/partials/Telefonnummer.tsx | 2 +- .../pdlf/visning/partials/UtenlandsId.tsx | 2 +- .../pdlf/visning/partials/Utvandring.tsx | 4 +- .../pdlf/visning/partials/Vergemaal.tsx | 4 +- .../visningRedigerbar/VisningRedigerbar.tsx | 2 +- .../VisningRedigerbarPersondetaljer.tsx | 2 +- .../VisningRedigerbarSamlet.tsx | 2 +- .../fagsystem/pensjon/form/Form.tsx | 2 +- .../fagsystem/pensjon/form/validation.tsx | 2 +- .../form/PensjonsgivendeInntektForm.tsx | 2 +- .../fagsystem/sykdom/visning/Visning.tsx | 2 +- .../fagsystem/tpsf/visning/Visning.tsx | 2 +- .../tpsf/visning/partials/Adressevalg.tsx | 2 +- .../visning/partials/MidlertidigAdresse.tsx | 2 +- .../tpsf/visning/partials/Personinfo.tsx | 2 +- .../tpsf/visning/partials/Postadresse.tsx | 2 +- .../fagsystem/udistub/form/validation.tsx | 2 +- .../fagsystem/udistub/visning/UdiVisning.tsx | 2 +- .../visning/partials/Oppholdsstatus.tsx | 6 +- .../js/src/components/fagsystem/utils.tsx | 2 +- .../src/components/infostripe/InfoStripe.tsx | 2 +- .../inntektStub/validerInntekt/Inntekt.tsx | 2 +- .../inntektStub/validerInntekt/index.tsx | 2 +- .../components/miljoVelger/MiljoVelger.tsx | 68 +-- .../src/components/miljoVelger/MiljoeInfo.tsx | 2 +- .../components/ui/background/Background.tsx | 2 +- .../RelatertPersonImportButton.tsx | 2 +- .../components/ui/dollyTable/table/Table.tsx | 2 +- .../js/src/components/ui/form/formUtils.tsx | 2 +- .../components/ui/form/inputs/label/Label.tsx | 2 +- .../ui/form/inputs/select/Select.tsx | 2 +- .../form/inputs/textInput/FormFieldInput.tsx | 2 +- .../ui/form/inputs/textInput/TextInput.tsx | 2 +- .../ui/form/inputs/yearpicker/Yearpicker.tsx | 2 +- .../src/components/ui/historikk/Historikk.tsx | 2 +- .../components/ui/titleValue/TitleValue.tsx | 2 +- .../main/js/src/ducks/bestilling/index.tsx | 2 +- .../js/src/ducks/bestillingStatus/index.tsx | 2 +- .../src/main/js/src/ducks/errors/index.tsx | 2 +- .../src/main/js/src/ducks/fagsystem/index.tsx | 2 +- .../main/js/src/pages/dollySoek/SoekForm.tsx | 2 +- .../BestillingListe/BestillingListe.tsx | 2 +- .../pages/gruppe/PersonListe/PersonListe.tsx | 4 +- .../organisasjoner/OrganisasjonBestilling.tsx | 2 +- .../organisasjoner/OrganisasjonListe.tsx | 2 +- .../js/src/service/SelectOptionsFormat.tsx | 2 +- .../js/src/service/services/dolly/Utils.tsx | 2 +- .../src/main/js/src/styles/main.less | 4 - .../src/main/js/src/utils/DataFormatter.tsx | 2 +- .../src/utils/FileUploader/FileUploader.tsx | 2 +- .../src/utils/GenererGyldigNorskBankkonto.tsx | 2 +- .../src/main/js/src/utils/Merge.tsx | 2 +- .../src/main/js/src/utils/YupValidations.tsx | 2 +- .../main/js/src/utils/hooks/useKodeverk.tsx | 3 +- 126 files changed, 317 insertions(+), 684 deletions(-) diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json index b80e3fdb6ef..e1302589e6f 100644 --- a/apps/dolly-frontend/src/main/js/package-lock.json +++ b/apps/dolly-frontend/src/main/js/package-lock.json @@ -16,6 +16,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", @@ -1306,21 +1307,21 @@ "dev": true }, "node_modules/@grafana/faro-core": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-1.3.7.tgz", - "integrity": "sha512-QSQBTa32zCAGAQ/fsooNYspvINrCXWoS3NRg7r7/C6ToFOGgcZNIdRoPqCr/sZK9NcICSIoNV6ulGph8gjogYA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@grafana/faro-core/-/faro-core-1.3.8.tgz", + "integrity": "sha512-1bbuR906//gEyaAIUkBOee1bBMR8ZnxAfGttuNznItPKSV6R7aO4U6YhPurVXXPO7QflcZco60Ej6Ov6h8vXhw==", "dependencies": { "@opentelemetry/api": "^1.7.0", - "@opentelemetry/otlp-transformer": "^0.45.1" + "@opentelemetry/otlp-transformer": "^0.48.0" } }, "node_modules/@grafana/faro-react": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@grafana/faro-react/-/faro-react-1.3.7.tgz", - "integrity": "sha512-QuRhKXB2JvVg4oodA1i1qJ2heiVstTfBBwqg7ZPN0puip1XVbfc8h40noyn30NJGMeFahAsHcpUwJ7lOfxG04g==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@grafana/faro-react/-/faro-react-1.3.8.tgz", + "integrity": "sha512-CgwmmZvZTqdGnJ4lT8Be6lcK1i4pNPu6sA9V+5ecQdAFsh/ImmpNihW/sF2ONJTzF/p/yM+gcO/KCFVG5rr6Cw==", "dependencies": { - "@grafana/faro-web-sdk": "^1.3.7", - "@grafana/faro-web-tracing": "^1.3.7", + "@grafana/faro-web-sdk": "^1.3.8", + "@grafana/faro-web-tracing": "^1.3.8", "hoist-non-react-statics": "^3.3.2" }, "peerDependencies": { @@ -1330,30 +1331,30 @@ } }, "node_modules/@grafana/faro-web-sdk": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@grafana/faro-web-sdk/-/faro-web-sdk-1.3.7.tgz", - "integrity": "sha512-D85pCkgPqfKY/Mz1hZnQGT1Yb63lJUlnxdnMGuto2xxb4UzQSyoKY1vnPhBvJvdYQMMvaiEC/DcvsLILzPvaSA==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@grafana/faro-web-sdk/-/faro-web-sdk-1.3.8.tgz", + "integrity": "sha512-XFMBMr8Y+GdwHfOt+I5SlAr7VPulFBmpgPlHtmJ9YitMPWKyQxGOp5HRvmptwIsGMjFXgDdMbO5H2879dpkEjw==", "dependencies": { - "@grafana/faro-core": "^1.3.7", + "@grafana/faro-core": "^1.3.8", "ua-parser-js": "^1.0.32", "web-vitals": "^3.1.1" } }, "node_modules/@grafana/faro-web-tracing": { - "version": "1.3.7", - "resolved": "https://registry.npmjs.org/@grafana/faro-web-tracing/-/faro-web-tracing-1.3.7.tgz", - "integrity": "sha512-pjtEz2EoSzXk2vlcri7BJ0dgTsAfu+fL4KJQZI411bV/jQVHSRt/p+eafCJNztMX9VVwPeIKoDLn11vP5zuuLQ==", + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/@grafana/faro-web-tracing/-/faro-web-tracing-1.3.8.tgz", + "integrity": "sha512-lSBg0OTXU8c86Gywv7V8dMkzH/SXkE0Px95JXiOhpWMB189f3zkbcC6UO+U+ZhGHLPGln+J1sKgW7QVbvzYvLQ==", "dependencies": { - "@grafana/faro-web-sdk": "^1.3.7", + "@grafana/faro-web-sdk": "^1.3.8", "@opentelemetry/api": "^1.7.0", "@opentelemetry/context-zone": "^1.18.1", "@opentelemetry/core": "^1.18.1", - "@opentelemetry/exporter-trace-otlp-http": "^0.45.1", - "@opentelemetry/instrumentation": "^0.45.1", + "@opentelemetry/exporter-trace-otlp-http": "^0.48.0", + "@opentelemetry/instrumentation": "^0.48.0", "@opentelemetry/instrumentation-document-load": "^0.35.0", - "@opentelemetry/instrumentation-fetch": "^0.45.1", - "@opentelemetry/instrumentation-xml-http-request": "^0.45.1", - "@opentelemetry/otlp-transformer": "^0.45.1", + "@opentelemetry/instrumentation-fetch": "^0.48.0", + "@opentelemetry/instrumentation-xml-http-request": "^0.48.0", + "@opentelemetry/otlp-transformer": "^0.48.0", "@opentelemetry/resources": "^1.18.1", "@opentelemetry/sdk-trace-web": "^1.18.1", "@opentelemetry/semantic-conventions": "^1.18.1" @@ -1860,9 +1861,9 @@ } }, "node_modules/@opentelemetry/api-logs": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.45.1.tgz", - "integrity": "sha512-zVGq/k70l+kB/Wuv3O/zhptP2hvDhEbhDu9EtHde1iWZJf3FedeYS/nWVcMBkkyPAjS/JKNk86WN4CBQLGUuOw==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api-logs/-/api-logs-0.48.0.tgz", + "integrity": "sha512-1/aMiU4Eqo3Zzpfwu51uXssp5pzvHFObk8S9pKAiXb1ne8pvg1qxBQitYL1XUiAMEXFzgjaidYG2V6624DRhhw==", "dependencies": { "@opentelemetry/api": "^1.0.0" }, @@ -1909,15 +1910,15 @@ } }, "node_modules/@opentelemetry/exporter-trace-otlp-http": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.45.1.tgz", - "integrity": "sha512-a6CGqSG66n5R1mghzLMzyzn3iGap1b0v+0PjKFjfYuwLtpHQBxh2PHxItu+m2mXSwnM4R0GJlk9oUW5sQkCE0w==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/exporter-trace-otlp-http/-/exporter-trace-otlp-http-0.48.0.tgz", + "integrity": "sha512-QEZKbfWqXrbKVpr2PHd4KyKI0XVOhUYC+p2RPV8s+2K5QzZBE3+F9WlxxrXDfkrvGmpQAZytBoHQQYA3AGOtpw==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/otlp-exporter-base": "0.45.1", - "@opentelemetry/otlp-transformer": "0.45.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/otlp-exporter-base": "0.48.0", + "@opentelemetry/otlp-transformer": "0.48.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "engines": { "node": ">=14" @@ -1926,50 +1927,13 @@ "@opentelemetry/api": "^1.0.0" } }, - "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/resources": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz", - "integrity": "sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/exporter-trace-otlp-http/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/instrumentation": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.45.1.tgz", - "integrity": "sha512-V1Cr0g8hSg35lpW3G/GYVZurrhHrQZJdmP68WyJ83f1FDn3iru+/Vnlto9kiOSm7PHhW+pZGdb9Fbv+mkQ31CA==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.48.0.tgz", + "integrity": "sha512-sjtZQB5PStIdCw5ovVTDGwnmQC+GGYArJNgIcydrDSqUTdYBnMrN9P4pwQZgS3vTGIp+TU1L8vMXGe51NVmIKQ==", "dependencies": { "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.4.2", + "import-in-the-middle": "1.7.1", "require-in-the-middle": "^7.1.1", "semver": "^7.5.2", "shimmer": "^1.2.1" @@ -1999,74 +1963,15 @@ "@opentelemetry/api": "^1.3.0" } }, - "node_modules/@opentelemetry/instrumentation-document-load/node_modules/@opentelemetry/instrumentation": { - "version": "0.48.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation/-/instrumentation-0.48.0.tgz", - "integrity": "sha512-sjtZQB5PStIdCw5ovVTDGwnmQC+GGYArJNgIcydrDSqUTdYBnMrN9P4pwQZgS3vTGIp+TU1L8vMXGe51NVmIKQ==", - "dependencies": { - "@types/shimmer": "^1.0.2", - "import-in-the-middle": "1.7.1", - "require-in-the-middle": "^7.1.1", - "semver": "^7.5.2", - "shimmer": "^1.2.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": "^1.3.0" - } - }, - "node_modules/@opentelemetry/instrumentation-document-load/node_modules/import-in-the-middle": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", - "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", - "dependencies": { - "acorn": "^8.8.2", - "acorn-import-assertions": "^1.9.0", - "cjs-module-lexer": "^1.2.2", - "module-details-from-path": "^1.0.3" - } - }, - "node_modules/@opentelemetry/instrumentation-document-load/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@opentelemetry/instrumentation-document-load/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@opentelemetry/instrumentation-document-load/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, "node_modules/@opentelemetry/instrumentation-fetch": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.45.1.tgz", - "integrity": "sha512-BcLXMlZmGN5islwT+B1hHmgrizZbA7MgTUHhlvwLkZpAmlDeCBUdr779q2iOpxixD2AcpUTQ1RY54JArCZIB7w==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-fetch/-/instrumentation-fetch-0.48.0.tgz", + "integrity": "sha512-y4Zw9VeUUMaowg3aXYZXcaUJQ7IKfpR6sjClrAQOJwWG8LYFpM6NIRSoAeJv/ShfxWWCPWC0P4zgXcKRqpURFQ==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "engines": { "node": ">=14" @@ -2075,53 +1980,15 @@ "@opentelemetry/api": "^1.0.0" } }, - "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/sdk-trace-web": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.18.1.tgz", - "integrity": "sha512-WN30vxy4NY8TqFWuICXaPXjBdy6A5kDhxOqp4NfhqXfpcWWT0GqSgv05Q42quWYOFgaulnmPRRJwxzAdhBliLQ==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/instrumentation-fetch/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/instrumentation-xml-http-request": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.45.1.tgz", - "integrity": "sha512-gwX55apcB4d+2OpZsOEtct+eUAvtZ9wT8IyZVbzZyN471vSePacKNrGbQr8uFlyioPj+IAS/izv+LJyqw6PNxA==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/instrumentation-xml-http-request/-/instrumentation-xml-http-request-0.48.0.tgz", + "integrity": "sha512-YJ9d1sR28hcEVtP4/tHtPX5Hhu0w2LsAMp3M+75YGTHkkunsN8PwcY/1FcSHUP9xwy7Z2myQvT7fTpL3g4tn4A==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/instrumentation": "0.45.1", - "@opentelemetry/sdk-trace-web": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/instrumentation": "0.48.0", + "@opentelemetry/sdk-trace-web": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "engines": { "node": ">=14" @@ -2130,44 +1997,6 @@ "@opentelemetry/api": "^1.0.0" } }, - "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/sdk-trace-web": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.18.1.tgz", - "integrity": "sha512-WN30vxy4NY8TqFWuICXaPXjBdy6A5kDhxOqp4NfhqXfpcWWT0GqSgv05Q42quWYOFgaulnmPRRJwxzAdhBliLQ==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/instrumentation-xml-http-request/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/instrumentation/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -2199,11 +2028,11 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" }, "node_modules/@opentelemetry/otlp-exporter-base": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.45.1.tgz", - "integrity": "sha512-Jvd6x8EwWGKEPWF4tkP4LpTPXiIkkafMNMvMJUfJd5DyNAftL1vAz+48jmi3URL2LMPkGryrvWPz8Tdu917gQw==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-exporter-base/-/otlp-exporter-base-0.48.0.tgz", + "integrity": "sha512-T4LJND+Ugl87GUONoyoQzuV9qCn4BFIPOnCH1biYqdGhc2JahjuLqVD9aefwLzGBW638iLAo88Lh68h2F1FLiA==", "dependencies": { - "@opentelemetry/core": "1.18.1" + "@opentelemetry/core": "1.21.0" }, "engines": { "node": ">=14" @@ -2212,39 +2041,17 @@ "@opentelemetry/api": "^1.0.0" } }, - "node_modules/@opentelemetry/otlp-exporter-base/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/otlp-exporter-base/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/otlp-transformer": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.45.1.tgz", - "integrity": "sha512-FhIHgfC0b0XtoBrS5ISfva939yWffNl47ypXR8I7Ru+dunlySpmf2TLocKHYLHGcWiuoeSNO5O4dZCmSKOtpXw==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/otlp-transformer/-/otlp-transformer-0.48.0.tgz", + "integrity": "sha512-yuoS4cUumaTK/hhxW3JUy3wl2U4keMo01cFDrUOmjloAdSSXvv1zyQ920IIH4lymp5Xd21Dj2/jq2LOro56TJg==", "dependencies": { - "@opentelemetry/api-logs": "0.45.1", - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/sdk-logs": "0.45.1", - "@opentelemetry/sdk-metrics": "1.18.1", - "@opentelemetry/sdk-trace-base": "1.18.1" + "@opentelemetry/api-logs": "0.48.0", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/sdk-logs": "0.48.0", + "@opentelemetry/sdk-metrics": "1.21.0", + "@opentelemetry/sdk-trace-base": "1.21.0" }, "engines": { "node": ">=14" @@ -2253,43 +2060,6 @@ "@opentelemetry/api": ">=1.3.0 <1.8.0" } }, - "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/resources": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz", - "integrity": "sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/otlp-transformer/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/resources": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.21.0.tgz", @@ -2306,12 +2076,12 @@ } }, "node_modules/@opentelemetry/sdk-logs": { - "version": "0.45.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.45.1.tgz", - "integrity": "sha512-z0RRgW4LeKEKnhXS4F/HnqB6+7gsy63YK47F4XAJYHs4s1KKg8XnQ2RkbuL31i/a9nXkylttYtvsT50CGr487g==", + "version": "0.48.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-logs/-/sdk-logs-0.48.0.tgz", + "integrity": "sha512-lRcA5/qkSJuSh4ItWCddhdn/nNbVvnzM+cm9Fg1xpZUeTeozjJDBcHnmeKoOaWRnrGYBdz6UTY6bynZR9aBeAA==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0" }, "engines": { "node": ">=14" @@ -2321,50 +2091,13 @@ "@opentelemetry/api-logs": ">=0.39.1" } }, - "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/resources": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz", - "integrity": "sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-logs/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/sdk-metrics": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.18.1.tgz", - "integrity": "sha512-TEFgeNFhdULBYiCoHbz31Y4PDsfjjxRp8Wmdp6ybLQZPqMNEb+dRq+XN8Xw3ivIgTaf9gYsomgV5ensX99RuEQ==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-metrics/-/sdk-metrics-1.21.0.tgz", + "integrity": "sha512-on1jTzIHc5DyWhRP+xpf+zrgrREXcHBH4EDAfaB5mIG7TWpKxNXooQ1JCylaPsswZUv4wGnVTinr4HrBdGARAQ==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", "lodash.merge": "^4.6.2" }, "engines": { @@ -2374,80 +2107,14 @@ "@opentelemetry/api": ">=1.3.0 <1.8.0" } }, - "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/resources": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz", - "integrity": "sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-metrics/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.18.1.tgz", - "integrity": "sha512-tRHfDxN5dO+nop78EWJpzZwHsN1ewrZRVVwo03VJa3JQZxToRDH29/+MB24+yoa+IArerdr7INFJiX/iN4gjqg==", - "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/resources": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/core": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/core/-/core-1.18.1.tgz", - "integrity": "sha512-kvnUqezHMhsQvdsnhnqTNfAJs3ox/isB0SVrM1dhVFw7SsB7TstuVa6fgWnN2GdPyilIFLUvvbTZoVRmx6eiRg==", - "dependencies": { - "@opentelemetry/semantic-conventions": "1.18.1" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, - "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/resources": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.18.1.tgz", - "integrity": "sha512-JjbcQLYMttXcIabflLRuaw5oof5gToYV9fuXbcsoOeQ0BlbwUn6DAZi++PNsSz2jjPeASfDls10iaO/8BRIPRA==", + "version": "1.21.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.21.0.tgz", + "integrity": "sha512-yrElGX5Fv0umzp8Nxpta/XqU71+jCAyaLk34GmBzNcrW43nqbrqvdPs4gj4MVy/HcTjr6hifCDCYA3rMkajxxA==", "dependencies": { - "@opentelemetry/core": "1.18.1", - "@opentelemetry/semantic-conventions": "1.18.1" + "@opentelemetry/core": "1.21.0", + "@opentelemetry/resources": "1.21.0", + "@opentelemetry/semantic-conventions": "1.21.0" }, "engines": { "node": ">=14" @@ -2456,14 +2123,6 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" } }, - "node_modules/@opentelemetry/sdk-trace-base/node_modules/@opentelemetry/semantic-conventions": { - "version": "1.18.1", - "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.18.1.tgz", - "integrity": "sha512-+NLGHr6VZwcgE/2lw8zDIufOCGnzsA5CbQIMleXZTrgkBd0TanCX+MiDYJ1TOS4KL/Tqk0nFRxawnaYr6pkZkA==", - "engines": { - "node": ">=14" - } - }, "node_modules/@opentelemetry/sdk-trace-web": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-web/-/sdk-trace-web-1.21.0.tgz", @@ -2480,22 +2139,6 @@ "@opentelemetry/api": ">=1.0.0 <1.8.0" } }, - "node_modules/@opentelemetry/sdk-trace-web/node_modules/@opentelemetry/sdk-trace-base": { - "version": "1.21.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.21.0.tgz", - "integrity": "sha512-yrElGX5Fv0umzp8Nxpta/XqU71+jCAyaLk34GmBzNcrW43nqbrqvdPs4gj4MVy/HcTjr6hifCDCYA3rMkajxxA==", - "dependencies": { - "@opentelemetry/core": "1.21.0", - "@opentelemetry/resources": "1.21.0", - "@opentelemetry/semantic-conventions": "1.21.0" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "@opentelemetry/api": ">=1.0.0 <1.8.0" - } - }, "node_modules/@opentelemetry/semantic-conventions": { "version": "1.21.0", "resolved": "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.21.0.tgz", @@ -2526,6 +2169,15 @@ "url": "https://opencollective.com/unts" } }, + "node_modules/@popperjs/core": { + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/popperjs" + } + }, "node_modules/@radix-ui/primitive": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.0.0.tgz", @@ -3213,9 +2865,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.11.17", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz", - "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==", + "version": "20.11.18", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.18.tgz", + "integrity": "sha512-ABT5VWnnYneSBcNWYSCuR05M826RoMyMSGiFivXGx6ZUIsXb9vn4643IEwkg2zbEOSgAiSogtapN2fgc4mAPlw==", "dev": true, "dependencies": { "undici-types": "~5.26.4" @@ -7261,9 +6913,9 @@ } }, "node_modules/import-in-the-middle": { - "version": "1.4.2", - "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.4.2.tgz", - "integrity": "sha512-9WOz1Yh/cvO/p69sxRmhyQwrIGGSp7EIdcb+fFNVi7CzQGQB8U1/1XrKVSbEd/GNOAeM0peJtmi7+qphe7NvAw==", + "version": "1.7.1", + "resolved": "https://registry.npmjs.org/import-in-the-middle/-/import-in-the-middle-1.7.1.tgz", + "integrity": "sha512-1LrZPDtW+atAxH42S6288qyDFNQ2YCty+2mxEPRtfazH6Z5QwkaBSTS2ods7hnVJioF6rkRfNoA6A/MstpFXLg==", "dependencies": { "acorn": "^8.8.2", "acorn-import-assertions": "^1.9.0", @@ -11440,9 +11092,9 @@ "optional": true }, "node_modules/terser": { - "version": "5.27.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.0.tgz", - "integrity": "sha512-bi1HRwVRskAjheeYl291n3JC4GgO/Ty4z1nVs5AAsmonJulGxpSektecnNedrwK9C7vpvVtcX3cw00VSLt7U2A==", + "version": "5.27.1", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.27.1.tgz", + "integrity": "sha512-29wAr6UU/oQpnTw5HoadwjUZnFQXGdOfj0LjZ4sVxzqwHh/QVkvr7m8y9WoR4iN3FRitVduTc6KdjcW38Npsug==", "dev": true, "dependencies": { "@jridgewell/source-map": "^0.3.3", diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json index 3df424d3031..d2075b9b75f 100644 --- a/apps/dolly-frontend/src/main/js/package.json +++ b/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", diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx index a6d00ae7027..d9e1b06ba86 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/detaljer/BestillingDetaljer.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx index 0c14416c022..c46a5edfa00 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/kriterier/BestillingKriterieMapper.tsx +++ b/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, diff --git a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx b/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx index eaddc53a8f3..cac1394f56e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestilling/sammendrag/miljoeStatus/MiljoeStatus.tsx +++ b/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}`, + })), ) } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx index 2e4f41734c0..7ba1786b1f4 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/VisAttributt.tsx +++ b/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 }) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx index d2c46e15e66..16e978bc026 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/options/malOptions.tsx +++ b/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 } diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx index d1d7bd512d2..3be05754e3a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/EksisterendeIdent/EksisterendeIdent.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx index 2924e4bdec1..a9499a765b2 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/startModal/NyIdent/NyIdent.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx index a8da2073c12..0f2a326d61b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Pensjon.tsx +++ b/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 = () => { diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx index 490a1328e85..4aec3d54c6b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/stegVelger/steg/steg1/paneler/Personinformasjon.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx index ab3ba84af25..04ef15a8cc0 100644 --- a/apps/dolly-frontend/src/main/js/src/components/bestillingsveileder/utils.tsx +++ b/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', diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/ameldingForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/ameldingForm.tsx index 4619db93f41..68ed558debf 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/ameldingForm.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx index ac0a83218c0..9fab4caf16d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/partials/arbeidsforholdForm.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx index fb360aaa080..c9c657e01a7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/form/validation.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx index 0c38784ec31..1ad05e8c95f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/Visning.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx index 11856c8303d..1a6c56075be 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/aareg/visning/partials/Arbeidsavtaler.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx index 5768be5b101..188c7c45793 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/Form.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx index b391556d905..ab05c6232e7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/partials/MedServicebehov.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx index 8ffc7868d9b..0357ec35917 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/arena/form/validation.tsx +++ b/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'] diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx index f11b251bf95..9b2404f17c5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/UtenlandskBankkonto.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx index eadc21ce754..c768b08bac0 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/bankkonto/form/validation.tsx +++ b/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) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/EgneOrganisasjoner.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/EgneOrganisasjoner.tsx index b7fe9fc949a..7d7c46ee8fa 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/brregstub/form/partials/EgneOrganisasjoner.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx index 51d7b827d5f..ec4482ed74a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/form/DokarkivForm.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx index 2d7424f3089..25bd7ed7bbc 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/histark/form/HistarkForm.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx index 40a4ed52330..ed00c896bc7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/form/Form.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx index 3007117ee1a..2db03364728 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/Visning.tsx +++ b/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, } diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx index b0cd13f0a02..18f104b6f9d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/refusjonVisning.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx index 9b8e820d3f0..0c8cf4c49ef 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektsmelding/visning/partials/sykepengerVisning.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx index e5bd072c33e..7c856ddd1b6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inntektstub/form/partials/versjon.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx index 796149d61a9..8b5de769da8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/inst/form/utils.tsx +++ b/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) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrForm.tsx index 3de9f621c66..3be0a8fd956 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/krrstub/form/KrrForm.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx index 26ed2aedfcd..69fff695f7b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/medl/visning/Visning.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx index ddbd9b6b3b3..93afbb810fc 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/organisasjoner/form/partials/Detaljer.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/PdlPersonInfo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/PdlPersonInfo.tsx index 8a23bd73c12..2c6ec237425 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/PdlPersonInfo.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx index f94932da159..7132640215d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdl/visning/partials/relasjoner/PdlForeldreansvar.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx index 7e641947a46..b4d892f5a8d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressebeskyttelse/Adressebeskyttelse.tsx +++ b/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 { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx index 3f516560e8a..228b4652fd7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/adressetyper/MatrikkeladresseTilfeldig.tsx +++ b/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' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx index c8e3f4952cb..9d57ba54638 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/bostedsadresse/Bostedsadresse.tsx @@ -12,7 +12,7 @@ import { import { FormikDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker' -import * as _ from 'lodash' +import _ from 'lodash' import { MatrikkeladresseVelger, UkjentBosted, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx index 4be1aef150c..c00f9c53c19 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/kontaktadresse/Kontaktadresse.tsx @@ -1,5 +1,5 @@ import React, { useContext, useEffect } from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialKontaktadresse, initialPostboksadresse, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx index 5d69674aa78..3ff9e2a9ebf 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/adresser/oppholdsadresse/Oppholdsadresse.tsx @@ -1,5 +1,5 @@ import React, { useContext, useEffect } from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialOppholdsadresse, initialMatrikkeladresse, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx index 084a16879cc..8566c77da34 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/alder/Alder.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput' import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker' import React, { useContext } from 'react' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx index 08b7d5a991d..f151a95e1a5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/DeltBosted.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import { FormikSelect } from '@/components/ui/form/inputs/select/Select' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx index 48614d718f4..fe1669f25cc 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/forelderBarnRelasjon/ForelderBarnRelasjon.tsx @@ -8,7 +8,7 @@ import { initialPdlBiPerson, initialPdlPerson, } from '@/components/fagsystem/pdlf/form/initialValues' -import * as _ from 'lodash' +import _ from 'lodash' import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert/AvansertForm' import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import { FormikSelect } from '@/components/ui/form/inputs/select/Select' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx index 5f755cec43e..dd6c0f49588 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/familierelasjoner/foreldreansvar/Foreldreansvar.tsx @@ -10,7 +10,7 @@ import { FormikDollyFieldArray } from '@/components/ui/form/fieldArray/DollyFiel import { FormikSelect } from '@/components/ui/form/inputs/select/Select' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker' -import * as _ from 'lodash' +import _ from 'lodash' import { ForeldreBarnRelasjon, TypeAnsvarlig } from '@/components/fagsystem/pdlf/PdlTypes' import { PdlEksisterendePerson } from '@/components/fagsystem/pdlf/form/partials/pdlPerson/PdlEksisterendePerson' import { PdlNyPerson } from '@/components/fagsystem/pdlf/form/partials/pdlPerson/PdlNyPerson' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx index 6d4a1134a12..aedc3205dab 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/identifikasjon/falskIdentitet/FalskIdentitet.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { AdresseKodeverk } from '@/config/kodeverk' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { DollySelect, FormikSelect } from '@/components/ui/form/inputs/select/Select' @@ -106,8 +106,7 @@ export const FalskIdentitet = ({ formMethods }) => { formMethods.setValue, ) } - value={_.get( - formMethods.getValues(), + value={formMethods.watch( `${path}.rettIdentitetVedOpplysninger.personnavn.fornavn`, )} /> diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx index 95a62ad5061..74dd849b78b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/kontaktinformasjonForDoedsbo/Kontakt.tsx @@ -3,7 +3,7 @@ import { Kategori } from '@/components/ui/form/kategori/Kategori' import { DollySelect, FormikSelect } from '@/components/ui/form/inputs/select/Select' import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker' import { getPlaceholder, setNavn } from '../utils' -import * as _ from 'lodash' +import _ from 'lodash' import { initialNyPerson, initialOrganisasjon, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx index e1a1139b5f8..8a0f5bb68ab 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/navn/Navn.tsx @@ -4,8 +4,7 @@ import { AvansertForm } from '@/components/fagsystem/pdlf/form/partials/avansert import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import { Option } from '@/service/SelectOptionsOppslag' import { FormikSelect } from '@/components/ui/form/inputs/select/Select' -import * as _ from 'lodash' -import { isEmpty } from 'lodash' +import _, { isEmpty } from 'lodash' import { useContext, useEffect, useState } from 'react' import { ArrowCirclepathIcon } from '@navikt/aksel-icons' import { Button } from '@navikt/ds-react' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx index 103afbbb05c..d714c7d40ba 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/sikkerhetstiltak/Sikkerhetstiltak.tsx @@ -4,7 +4,7 @@ import { Vis } from '@/components/bestillingsveileder/VisAttributt' import { DollySelect, FormikSelect } from '@/components/ui/form/inputs/select/Select' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { FormikDatepicker } from '@/components/ui/form/inputs/datepicker/Datepicker' -import * as _ from 'lodash' +import _ from 'lodash' import { genererTilfeldigeNavPersonidenter } from '@/utils/GenererTilfeldigeNavPersonidenter' import { Option } from '@/service/SelectOptionsOppslag' import { isToday } from 'date-fns' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/telefonnummer/Telefonnummer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/telefonnummer/Telefonnummer.tsx index 612b571db32..3e94875aeee 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/telefonnummer/Telefonnummer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/telefonnummer/Telefonnummer.tsx @@ -76,7 +76,7 @@ export const TelefonnummerFormRedigering = ({ path }: TelefonnummerProps) => { export const TelefonnummerForm = ({ path, formMethods, idx }: TelefonnummerProps) => { const { kodeverk: landkoder, loading } = useKodeverk(AdresseKodeverk.ArbeidOgInntektLand) - const [land, setLand] = useState(_.get(formikBag.values, `${path}.land`) || 'NO') + const [land, setLand] = useState(formMethods.watch(`${path}.land`) || 'NO') const tlfListe = formMethods.watch(path || 'pdldata.person.telefonnummer') const mergedeLandkoder = landkoder?.map((landkode: Option) => { const lookupLand = lookup.countries({ alpha2: landkode.value })?.[0] diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx index 562cd1a33cf..3909c010c36 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/partials/utils.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' export const getPlaceholder = (values, selectedValuePath) => { const fornavn = _.get(values, `${selectedValuePath}.fornavn`) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx index 2f8fb1af6c3..51d2ac32735 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/familierelasjoner.tsx @@ -2,7 +2,7 @@ import * as Yup from 'yup' import { ifPresent, requiredDate, requiredString } from '@/utils/YupValidations' import { matrikkeladresse, vegadresse } from '@/components/fagsystem/pdlf/form/validation/partials' import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils' -import * as _ from 'lodash' +import _ from 'lodash' const testForeldreansvar = (val: Yup.StringSchema) => { return val.test('er-gyldig-foreldreansvar', (selected, testContext) => { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx index 8298bcb5493..43fdefd9921 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/innvandring.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import * as Yup from 'yup' import { requiredDate, requiredString } from '@/utils/YupValidations' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx index 988ee0d8744..1a7dedc523f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/kontaktinformasjonForDoedsbo.tsx @@ -1,7 +1,7 @@ import * as Yup from 'yup' import { requiredDate, requiredString } from '@/utils/YupValidations' import { nyPerson } from '@/components/fagsystem/pdlf/form/validation/partials' -import * as _ from 'lodash' +import _ from 'lodash' export const kontaktDoedsbo = Yup.object().shape({ skifteform: requiredString, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx index 54a382eb08a..abe9fff54b4 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/sikkerhetstiltak.tsx @@ -1,7 +1,7 @@ import * as Yup from 'yup' import { requiredDate, requiredString } from '@/utils/YupValidations' import { differenceInWeeks, isAfter } from 'date-fns' -import * as _ from 'lodash' +import _ from 'lodash' export const sikkerhetstiltak = Yup.array().of( Yup.object({ diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx index 207eb3a8be4..f59cd245692 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/form/validation/partials/telefonnummer.tsx @@ -1,6 +1,6 @@ import * as Yup from 'yup' import { requiredString } from '@/utils/YupValidations' -import * as _ from 'lodash' +import _ from 'lodash' const testTelefonnummer = () => Yup.string() diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx index 1a343f09941..b37a381458d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Adressebeskyttelse.tsx @@ -1,5 +1,5 @@ import React from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' @@ -81,7 +81,7 @@ const AdressebeskyttelseVisning = ({ _.cloneDeep(getInitialAdressebeskyttelse()), redigertAdressebeskyttelsePdlf, ), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx index db84a2c72b9..440d9bbcd11 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Boadresse.tsx @@ -1,5 +1,5 @@ import React from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx index 30ccf847801..68c51dea480 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DeltBosted.tsx @@ -6,7 +6,7 @@ import { Matrikkeladresse } from '@/components/fagsystem/pdlf/visning/partials/M import { UkjentBosted } from '@/components/fagsystem/pdlf/visning/partials/UkjentBosted' import { DeltBostedValues, PersonData } from '@/components/fagsystem/pdlf/PdlTypes' import { initialDeltBosted } from '@/components/fagsystem/pdlf/form/initialValues' -import * as _ from 'lodash' +import _ from 'lodash' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet' @@ -64,7 +64,7 @@ export const DeltBostedVisning = ({ let redigertBostedValues = redigertBostedPdlf ? { deltBosted: Object.assign(_.cloneDeep(initialDeltBosted), redigertBostedPdlf), - } + } : null if (redigertBostedValues) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx index 8603efa5561..407a76dcac4 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/DoedfoedtBarn.tsx @@ -4,7 +4,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { formatDate } from '@/utils/DataFormatter' import { DoedfoedtBarnData, PersonData } from '@/components/fagsystem/pdlf/PdlTypes' -import * as _ from 'lodash' +import _ from 'lodash' import { initialDoedfoedtBarn } from '@/components/fagsystem/pdlf/form/initialValues' import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx index e36a0726dba..f7eb6548e4d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Doedsfall.tsx @@ -4,7 +4,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import { formatDate } from '@/utils/DataFormatter' -import * as _ from 'lodash' +import _ from 'lodash' import { DoedsfallData, Person } from '@/components/fagsystem/pdlf/PdlTypes' import { getInitialFoedsel, initialDoedsfall } from '@/components/fagsystem/pdlf/form/initialValues' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx index cfbae309dbe..cc691c1b387 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foedsel.tsx @@ -5,7 +5,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import { formatDate } from '@/utils/DataFormatter' import KodeverkConnector from '@/components/kodeverk/KodeverkConnector' -import * as _ from 'lodash' +import _ from 'lodash' import { Kodeverk, KodeverkValues, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx index 124f88691f1..171d5dc0f33 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/ForelderBarnRelasjon.tsx @@ -6,7 +6,7 @@ import { showLabel } from '@/utils/DataFormatter' import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson' import { ForeldreBarnRelasjon, Relasjon } from '@/components/fagsystem/pdlf/PdlTypes' import { RelatertPersonUtenId } from '@/components/fagsystem/pdlf/visning/partials/RelatertPersonUtenId' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialBarn, getInitialForelder, @@ -121,18 +121,18 @@ export const ForelderBarnRelasjonVisning = ({ ), redigertForelderBarnPdlf, ), - } + } : null const eksisterendeNyPerson = redigertRelatertePersoner ? getEksisterendeNyPerson(redigertRelatertePersoner, forelderBarnValues?.relatertPerson, [ 'FAMILIERELASJON_BARN', 'FAMILIERELASJON_FORELDER', - ]) + ]) : getEksisterendeNyPerson(relasjoner, forelderBarnValues?.relatertPerson, [ 'FAMILIERELASJON_BARN', 'FAMILIERELASJON_FORELDER', - ]) + ]) if (eksisterendeNyPerson && initialValues?.forelderBarnRelasjon?.nyRelatertPerson) { initialValues.forelderBarnRelasjon.nyRelatertPerson = initialPdlPerson @@ -169,7 +169,7 @@ export const ForelderBarnRelasjonVisning = ({ const relatertPersonInfo = erIGruppe ? { ident: initialValues?.forelderBarnRelasjon?.relatertPerson, - } + } : null return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx index f7ff7f9ec66..0816aca81d9 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Foreldreansvar.tsx @@ -3,7 +3,7 @@ import { initialForeldreansvar } from '@/components/fagsystem/pdlf/form/initialV import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import * as React from 'react' import { TitleValue } from '@/components/ui/titleValue/TitleValue' -import * as _ from 'lodash' +import _ from 'lodash' import { formatDate } from '@/utils/DataFormatter' import { AdresseKodeverk } from '@/config/kodeverk' import { getEksisterendeNyPerson } from '@/components/fagsystem/utils' @@ -134,16 +134,16 @@ export const ForeldreansvarEnkeltvisning = ({ _.cloneDeep(initialForeldreansvar), redigertForeldreansvarPdlf, ), - } + } : null const eksisterendeNyPerson = redigertRelatertePersoner ? getEksisterendeNyPerson(redigertRelatertePersoner, foreldreansvarValues?.ansvarlig, [ 'FORELDREANSVAR_FORELDER', - ]) + ]) : getEksisterendeNyPerson(relasjoner, foreldreansvarValues?.ansvarlig, [ 'FORELDREANSVAR_FORELDER', - ]) + ]) let personValuesMedRedigert = _.cloneDeep(personValues) if (redigertForelderBarnRelasjonPdlf && personValuesMedRedigert) { @@ -156,7 +156,7 @@ export const ForeldreansvarEnkeltvisning = ({ const relatertPersonInfo = erIGruppe ? { ident: initialValues?.foreldreansvar?.ansvarlig, - } + } : null return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx index 3b7d1447d81..eef27a286e7 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Fullmakt.tsx @@ -8,7 +8,7 @@ import styled from 'styled-components' import { FullmaktData, Relasjon } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson' import { FullmaktValues, PersonData } from '@/components/fagsystem/pdlf/PdlTypes' -import * as _ from 'lodash' +import _ from 'lodash' import { initialFullmakt, initialPdlPerson } from '@/components/fagsystem/pdlf/form/initialValues' import { getEksisterendeNyPerson } from '@/components/fagsystem/utils' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -108,13 +108,13 @@ export const FullmaktVisning = ({ let redigertFullmaktValues = redigertFullmaktPdlf ? { fullmakt: Object.assign(_.cloneDeep(initialFullmakt), redigertFullmaktPdlf), - } + } : null const eksisterendeNyPerson = redigertRelatertePersoner ? getEksisterendeNyPerson(redigertRelatertePersoner, fullmaktValues?.motpartsPersonident, [ 'FULLMEKTIG', - ]) + ]) : getEksisterendeNyPerson(relasjoner, fullmaktValues?.motpartsPersonident, ['FULLMEKTIG']) if (eksisterendeNyPerson && initialValues?.fullmakt?.nyFullmektig) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx index df3198ee0e8..7c90165aff1 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Innvandring.tsx @@ -9,7 +9,7 @@ import { UtvandringValues, } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' import { initialInnvandring } from '@/components/fagsystem/pdlf/form/initialValues' -import * as _ from 'lodash' +import _ from 'lodash' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' import { PersonData } from '@/components/fagsystem/pdlf/PdlTypes' import { getSisteDato } from '@/components/bestillingsveileder/utils' @@ -102,7 +102,7 @@ const InnvandringVisning = ({ const redigertInnvandringValues = redigertInnvandringPdlf ? { innflytting: Object.assign(_.cloneDeep(initialInnvandring), redigertInnvandringPdlf), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx index 4bc116b8f24..95e33ae68b0 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Kontaktadresse.tsx @@ -11,7 +11,7 @@ import { KodeverkValues, KontaktadresseData, } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' -import * as _ from 'lodash' +import _ from 'lodash' import { AdresseKodeverk } from '@/config/kodeverk' import { getInitialKontaktadresse } from '@/components/fagsystem/pdlf/form/initialValues' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -197,7 +197,7 @@ const KontaktadresseVisning = ({ _.cloneDeep(getInitialKontaktadresse()), redigertKontaktadressePdlf, ), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx index 3030be4c4f5..0caa210884f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/KontaktinformasjonForDoedsbo.tsx @@ -5,7 +5,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { Personnavn } from '@/components/fagsystem/pdlf/visning/partials/Personnavn' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson' -import * as _ from 'lodash' +import _ from 'lodash' import { initialKontaktinfoForDoedebo } from '@/components/fagsystem/pdlf/form/initialValues' import { getEksisterendeNyPerson } from '@/components/fagsystem/utils' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -146,7 +146,7 @@ export const KontaktinformasjonForDoedsboVisning = ({ _.cloneDeep(initialKontaktinfoForDoedebo), redigertKontaktinfoPdlf, ), - } + } : null const eksisterendeNyPerson = redigertRelatertePersoner @@ -154,12 +154,12 @@ export const KontaktinformasjonForDoedsboVisning = ({ redigertRelatertePersoner, kontaktinfoValues?.personSomKontakt?.identifikasjonsnummer, ['KONTAKT_FOR_DOEDSBO'], - ) + ) : getEksisterendeNyPerson( relasjoner, kontaktinfoValues?.personSomKontakt?.identifikasjonsnummer, ['KONTAKT_FOR_DOEDSBO'], - ) + ) if (eksisterendeNyPerson && initialValues?.kontaktinformasjonForDoedsbo?.personSomKontakt) { const filteredPerson = Object.fromEntries( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx index 8965fc31b3b..e97e9a25503 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Oppholdsadresse.tsx @@ -7,7 +7,7 @@ import { Matrikkeladresse } from '@/components/fagsystem/pdlf/visning/partials/M import { UtenlandskAdresse } from '@/components/fagsystem/pdlf/visning/partials/UtenlandskAdresse' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { showLabel } from '@/utils/DataFormatter' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialOppholdsadresse } from '@/components/fagsystem/pdlf/form/initialValues' import { OppholdsadresseData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -93,7 +93,7 @@ const OppholdsadresseVisning = ({ _.cloneDeep(getInitialOppholdsadresse()), redigertOppholdsadressePdlf, ), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx index 78ffa3e5565..67d4f2c4dd8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Persondetaljer.tsx @@ -3,7 +3,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { formatDate, showLabel } from '@/utils/DataFormatter' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialKjoenn, getInitialNavn, @@ -138,7 +138,7 @@ export const Persondetaljer = ({ ? redigertPersonPdlf?.folkeregisterPersonstatus?.[0] : initialPersonstatus, ], - } + } : null const redigertPersonValues = { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx index f78cd357ac2..d4f1cd7ac84 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Sivilstand.tsx @@ -10,7 +10,7 @@ import { getInitialSivilstand, initialPdlPerson, } from '@/components/fagsystem/pdlf/form/initialValues' -import * as _ from 'lodash' +import _ from 'lodash' import React from 'react' import { getEksisterendeNyPerson } from '@/components/fagsystem/utils' import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet' @@ -114,7 +114,7 @@ const SivilstandVisning = ({ let redigertSivilstandValues = redigertSivilstandPdlf ? { sivilstand: Object.assign(_.cloneDeep(getInitialSivilstand()), redigertSivilstandPdlf), - } + } : null if (redigertSivilstandValues) { redigertSivilstandValues.sivilstand.nyRelatertPerson = initialPdlPerson @@ -123,10 +123,10 @@ const SivilstandVisning = ({ const eksisterendeNyPerson = redigertRelatertePersoner ? getEksisterendeNyPerson(redigertRelatertePersoner, sivilstandValues?.relatertVedSivilstand, [ 'EKTEFELLE_PARTNER', - ]) + ]) : getEksisterendeNyPerson(relasjoner, sivilstandValues?.relatertVedSivilstand, [ 'EKTEFELLE_PARTNER', - ]) + ]) const erIGruppe = gruppeIdenter?.some( (person) => person.ident === initialValues?.sivilstand?.relatertVedSivilstand, @@ -134,7 +134,7 @@ const SivilstandVisning = ({ const relatertPersonInfo = erIGruppe ? { ident: initialValues?.sivilstand?.relatertVedSivilstand, - } + } : null return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx index 64772219bbe..e6ff562e78b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Statsborgerskap.tsx @@ -1,7 +1,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import React from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import { getInitialStatsborgerskap } from '@/components/fagsystem/pdlf/form/initialValues' import { PersonData, StatsborgerskapData } from '@/components/fagsystem/pdlf/PdlTypes' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -87,7 +87,7 @@ const StatsborgerskapVisning = ({ _.cloneDeep(getInitialStatsborgerskap()), redigertStatsborgerskapPdlf, ), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx index b12f40830c5..8e2421d2e4a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Telefonnummer.tsx @@ -3,7 +3,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyFieldArray } from '@/components/ui/form/fieldArray/DollyFieldArray' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { TelefonData } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' -import * as _ from 'lodash' +import _ from 'lodash' import VisningRedigerbarSamletConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamletConnector' type DataListe = { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx index af1c7007ff7..67691f1cbc4 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/UtenlandsId.tsx @@ -6,7 +6,7 @@ import { oversettBoolean } from '@/utils/DataFormatter' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import React from 'react' import { getInitialUtenlandskIdentifikasjonsnummer } from '@/components/fagsystem/pdlf/form/initialValues' -import * as _ from 'lodash' +import _ from 'lodash' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' import { OpplysningSlettet } from '@/components/fagsystem/pdlf/visning/visningRedigerbar/OpplysningSlettet' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx index 1e3ac6c32a0..b6c4710e456 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Utvandring.tsx @@ -8,7 +8,7 @@ import { InnvandringValues, UtvandringValues, } from '@/pages/gruppe/PersonVisning/PersonMiljoeinfo/PdlDataTyper' -import * as _ from 'lodash' +import _ from 'lodash' import { PersonData } from '@/components/fagsystem/pdlf/PdlTypes' import { initialUtvandring } from '@/components/fagsystem/pdlf/form/initialValues' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' @@ -80,7 +80,7 @@ const UtvandringVisning = ({ const redigertUtvandringValues = redigertUtvandringPdlf ? { utflytting: Object.assign(_.cloneDeep(initialUtvandring), redigertUtvandringPdlf), - } + } : null return erPdlVisning ? ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx index f40ffb437f4..1ad1c8ded16 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/partials/Vergemaal.tsx @@ -6,7 +6,7 @@ import { formatDate } from '@/utils/DataFormatter' import { RelatertPerson } from '@/components/fagsystem/pdlf/visning/partials/RelatertPerson' import { PersonData, Relasjon, VergemaalValues } from '@/components/fagsystem/pdlf/PdlTypes' import { VergemaalKodeverk } from '@/config/kodeverk' -import * as _ from 'lodash' +import _ from 'lodash' import { initialPdlPerson, initialVergemaal } from '@/components/fagsystem/pdlf/form/initialValues' import VisningRedigerbarConnector from '@/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarConnector' import { getEksisterendeNyPerson } from '@/components/fagsystem/utils' @@ -139,7 +139,7 @@ const VergemaalVisning = ({ let redigertVergemaalValues = redigertVergemaalPdlf ? { vergemaal: Object.assign(_.cloneDeep(initialVergemaal), redigertVergemaalPdlf), - } + } : null if (redigertVergemaalValues) { redigertVergemaalValues.vergemaal.nyVergeIdent = initialPdlPerson diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx index 34e6b7e1b4b..d4f583a5d96 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbar.tsx @@ -3,7 +3,7 @@ import { FoedselForm } from '@/components/fagsystem/pdlf/form/partials/foedsel/F import NavButton from '@/components/ui/button/NavButton/NavButton' import styled from 'styled-components' import Button from '@/components/ui/button/Button' -import * as _ from 'lodash' +import _ from 'lodash' import { DollyApi, PdlforvalterApi } from '@/service/Api' import Icon from '@/components/ui/icon/Icon' import DollyModal from '@/components/ui/modal/DollyModal' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx index e987eac5c0e..02a63a42a64 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarPersondetaljer.tsx @@ -3,7 +3,7 @@ import * as Yup from 'yup' import NavButton from '@/components/ui/button/NavButton/NavButton' import styled from 'styled-components' import Button from '@/components/ui/button/Button' -import * as _ from 'lodash' +import _ from 'lodash' import { DollyApi, PdlforvalterApi, SkjermingApi, TpsMessagingApi } from '@/service/Api' import Icon from '@/components/ui/icon/Icon' import DollyModal from '@/components/ui/modal/DollyModal' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx index 47841cd8c63..f96cf616a7d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pdlf/visning/visningRedigerbar/VisningRedigerbarSamlet.tsx @@ -4,7 +4,7 @@ import Loading from '@/components/ui/loading/Loading' import NavButton from '@/components/ui/button/NavButton/NavButton' import styled from 'styled-components' import Button from '@/components/ui/button/Button' -import * as _ from 'lodash' +import _ from 'lodash' import { DollyApi, PdlforvalterApi } from '@/service/Api' import Icon from '@/components/ui/icon/Icon' import DollyModal from '@/components/ui/modal/DollyModal' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx index d424b264196..dcedaf9a79d 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/Form.tsx @@ -9,7 +9,7 @@ import { FormikTextInput } from '@/components/ui/form/inputs/textInput/TextInput import { FormikCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import React, { useContext } from 'react' import StyledAlert from '@/components/ui/alert/StyledAlert' -import * as _ from 'lodash' +import _ from 'lodash' import { BestillingsveilederContext } from '@/components/bestillingsveileder/BestillingsveilederContext' import { useFormContext } from 'react-hook-form' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx index 1fbe93e9d16..5400dcaf8f5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/pensjon/form/validation.tsx @@ -1,5 +1,5 @@ import * as Yup from 'yup' -import * as _ from 'lodash' +import _ from 'lodash' import { ifPresent, requiredNumber } from '@/utils/YupValidations' import { TjenestepensjonForm } from '@/components/fagsystem/tjenestepensjon/form/Form' import { AlderspensjonForm } from '@/components/fagsystem/alderspensjon/form/Form' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx index 2fa0426643d..7ab3f7c6bf6 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sigrunstubPensjonsgivende/form/PensjonsgivendeInntektForm.tsx @@ -8,7 +8,7 @@ import { getInitialInntekt, kodeverkKeyToLabel, } from '@/components/fagsystem/sigrunstubPensjonsgivende/utils' -import * as _ from 'lodash' +import _ from 'lodash' const getSkatteordningOptions = (skatteordning) => { return skatteordning?.map((item) => ({ value: item, label: _.capitalize(item) })) diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx index 6fd79a3fade..438bdfcac9e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/sykdom/visning/Visning.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { SyntSykemelding } from './partials/SyntSykemelding' import { DetaljertSykemelding } from './partials/DetaljertSykemelding' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx index 5c4f45abd8f..15eddae04a8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/Visning.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { Fullmakt, MidlertidigAdresse, diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx index d9e77d14ce9..a3144fe72f5 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Adressevalg.tsx @@ -1,7 +1,7 @@ import { Historikk } from '@/components/ui/historikk/Historikk' import { Adressevisning } from '@/components/fagsystem/tpsf/visning/partials/Boadresse' import { PostadresseVisning } from '@/components/fagsystem/tpsf/visning/partials/Postadresse' -import * as _ from 'lodash' +import _ from 'lodash' export const Adressevalg = ({ data }: any) => { return ( diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx index e995b1c2a0a..243863772a1 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/MidlertidigAdresse.tsx @@ -4,7 +4,7 @@ import { TitleValue } from '@/components/ui/titleValue/TitleValue' import KodeverkConnector from '@/components/kodeverk/KodeverkConnector' import { Historikk } from '@/components/ui/historikk/Historikk' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' -import * as _ from 'lodash' +import _ from 'lodash' type AlleMidlertidigeAdresser = { midlertidigAdresse: Array diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx index af6ea31fd27..8e1c0cfa49b 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Personinfo.tsx @@ -3,7 +3,7 @@ import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { formatAlder, formatDate, formatKjonn, gtTypeLabel } from '@/utils/DataFormatter' import { GtKodeverk, PersoninformasjonKodeverk } from '@/config/kodeverk' -import * as _ from 'lodash' +import _ from 'lodash' function hentSkjermingData(skjermingPath) { if (!skjermingPath) { diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx index 276ef9b2a41..c70283141ef 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/tpsf/visning/partials/Postadresse.tsx @@ -2,7 +2,7 @@ import { AdresseKodeverk } from '@/config/kodeverk' import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { Historikk } from '@/components/ui/historikk/Historikk' -import * as _ from 'lodash' +import _ from 'lodash' export const PostadresseVisning = ({ postadresse }) => { const { postLinje1, postLinje2, postLinje3, postLand } = postadresse diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx index bf4b83371ab..9c868f32eba 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/form/validation.tsx @@ -1,5 +1,5 @@ import * as Yup from 'yup' -import * as _ from 'lodash' +import _ from 'lodash' import { ifPresent, requiredBoolean, requiredString } from '@/utils/YupValidations' import { testDatoFom, testDatoTom } from '@/components/fagsystem/utils' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx index 2fde64c7ae4..efc127244fa 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/UdiVisning.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import SubOverskrift from '@/components/ui/subOverskrift/SubOverskrift' import Loading from '@/components/ui/loading/Loading' import { Oppholdsstatus } from './partials/Oppholdsstatus' diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx index eb7a43c9efb..bcd4afe21f8 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/udistub/visning/partials/Oppholdsstatus.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { TitleValue } from '@/components/ui/titleValue/TitleValue' import { formatStringDates, showLabel } from '@/utils/DataFormatter' import { AvslagEllerBortfall, AvslagEllerBortfallVisning } from './AvslagEllerBortfallVisning' @@ -52,8 +52,8 @@ export const Oppholdsstatus = ({ oppholdsstatus, oppholdstillatelse }: Opphold) oppholdsrett ? 'EØS- eller EFTA-opphold' : tredjelandsborger - ? 'Tredjelandsborger' - : null + ? 'Tredjelandsborger' + : null } /> 0) { formMethods.setValue('environments', []) } + const isChecked = (id) => values.includes(id) + + const onClick = (e) => { + const { id } = e.target + if (!alleredeValgtMiljoe?.includes(id)) { + isChecked(id) ? fieldMethods.remove(values.indexOf(id)) : fieldMethods.append(id) + } + } return (
@@ -102,45 +109,26 @@ export const MiljoVelger = ({ )} - - {order.map((type) => { - const category = filteredEnvironments[type] - if (!category) { - return null - } - - const isChecked = (id) => values.includes(id) - - const onClick = (e) => { - const { id } = e.target - if (!alleredeValgtMiljoe?.includes(id)) { - isChecked(id) ? fieldMethods.remove(values.indexOf(id)) : fieldMethods.append(id) - } - } - - return ( -
- {type}-miljøer -
- {category.map((env) => ( - miljoe === env.id) - } - label={env?.id?.toUpperCase()} - checked={values.includes(env.id)} - onClick={onClick} - size={'small'} - /> - ))} -
-
- ) - })} +
+ Miljøer +
+ {filteredEnvironments.map((env) => ( + miljoe === env.id) + } + label={env?.id?.toUpperCase()} + checked={values.includes(env.id)} + onClick={onClick} + size={'small'} + /> + ))} +
+
) diff --git a/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoeInfo.tsx b/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoeInfo.tsx index 8a66c426f40..2ec8ae93331 100644 --- a/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoeInfo.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/miljoVelger/MiljoeInfo.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { Alert } from '@navikt/ds-react' import { useArenaEnvironments, diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx index df5485e385e..66365607f41 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/background/Background.tsx @@ -21,7 +21,7 @@ import '@/snow.scss' import '@/rain.scss' import '@/flowers.scss' import { NEDBOER_TYPE, useWeatherFyrstikkAlleen } from '@/utils/hooks/useWeather' -import * as _ from 'lodash' +import _ from 'lodash' const month = new Date().getMonth() const day = new Date().getDate() diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx index 97f7e040b67..1d3148c1146 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/button/RelatertPersonImportButton/RelatertPersonImportButton.tsx @@ -9,7 +9,7 @@ import { DollyApi } from '@/service/Api' import './RelatertPersonImportButton.less' import { DollyCheckbox } from '@/components/ui/form/inputs/checbox/Checkbox' import { allCapsToCapitalized } from '@/utils/DataFormatter' -import * as _ from 'lodash' +import _ from 'lodash' import { REGEX_BACKEND_GRUPPER, useMatchMutate } from '@/utils/hooks/useMutate' import { FormProvider, useFieldArray, useForm } from 'react-hook-form' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx index 7af24e2dc6e..fa497764f29 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/dollyTable/table/Table.tsx @@ -1,7 +1,7 @@ import cn from 'classnames' import Row from './TableRow' import Column from './TableColumn' -import * as _ from 'lodash' +import _ from 'lodash' import { LaastGruppeIconItem } from '@/components/ui/icon/IconItem' import './Table.less' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx index de7993ccaaf..52e28837d38 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/formUtils.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { runningCypressE2E } from '@/service/services/Request' import { isDate } from 'date-fns' import { useFormContext } from 'react-hook-form' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx index 9d56027fa13..eb8becfc15f 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/label/Label.tsx @@ -1,5 +1,5 @@ import cn from 'classnames' -import * as _ from 'lodash' +import _ from 'lodash' import styled from 'styled-components' import './Label.less' import { Hjelpetekst } from '@/components/hjelpetekst/Hjelpetekst' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx index 24dc1cf568c..53d0ebfb39a 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/select/Select.tsx @@ -7,7 +7,7 @@ import { SyntEvent } from '@/components/ui/form/formUtils' import './Select.less' import MenuList from '@/components/ui/form/inputs/select/MenuList' import Option from '@/components/ui/form/inputs/select/Option' -import * as _ from 'lodash' +import _ from 'lodash' import { useKodeverk } from '@/utils/hooks/useKodeverk' import { useController, useFormContext } from 'react-hook-form' import { useContext } from 'react' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/FormFieldInput.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/FormFieldInput.tsx index 5c2c22fb9ee..e5ff84f41b3 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/FormFieldInput.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/FormFieldInput.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { DollyTextInput } from '@/components/ui/form/inputs/textInput/TextInput' import { useFormContext } from 'react-hook-form' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx index b0a6687cca8..7fcc7499e30 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/textInput/TextInput.tsx @@ -10,7 +10,7 @@ import { ShowErrorContext, ShowErrorContextType, } from '@/components/bestillingsveileder/ShowErrorContext' -import * as _ from 'lodash' +import _ from 'lodash' import FormFieldInput from '@/components/ui/form/inputs/textInput/FormFieldInput' const StyledIcon = styled(Icon)` diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/yearpicker/Yearpicker.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/yearpicker/Yearpicker.tsx index 2ed121af7ee..f51e722a0e1 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/yearpicker/Yearpicker.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/form/inputs/yearpicker/Yearpicker.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { InputWrapper } from '@/components/ui/form/inputWrapper/InputWrapper' import { Label } from '@/components/ui/form/inputs/label/Label' import ReactDatepicker from 'react-datepicker' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx index 99663a266a2..20ef1f64f6e 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/historikk/Historikk.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import './historikk.less' diff --git a/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx b/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx index 37562e6c5b0..e05c737d675 100644 --- a/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/ui/titleValue/TitleValue.tsx @@ -1,5 +1,5 @@ import cn from 'classnames' -import * as _ from 'lodash' +import _ from 'lodash' import KodeverkConnector from '@/components/kodeverk/KodeverkConnector' import Loading from '@/components/ui/loading/Loading' diff --git a/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx index 2467b118c55..1c12d2937c0 100644 --- a/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx +++ b/apps/dolly-frontend/src/main/js/src/ducks/bestilling/index.tsx @@ -1,6 +1,6 @@ import { createActions } from 'redux-actions' import { DollyApi } from '@/service/Api' -import * as _ from 'lodash' +import _ from 'lodash' import _set from 'lodash/fp/set' import { handleActions } from '@/ducks/utils/immerHandleActions' import { getLeggTilIdent, rootPaths } from '@/components/bestillingsveileder/utils' diff --git a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx index ed08cb4de31..c639daa2546 100644 --- a/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx +++ b/apps/dolly-frontend/src/main/js/src/ducks/bestillingStatus/index.tsx @@ -1,5 +1,5 @@ import { createActions } from 'redux-actions' -import * as _ from 'lodash' +import _ from 'lodash' import { DollyApi } from '@/service/Api' export const { diff --git a/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx index eda2e0bc38c..7709b9750f2 100644 --- a/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx +++ b/apps/dolly-frontend/src/main/js/src/ducks/errors/index.tsx @@ -1,6 +1,6 @@ import { createAction } from 'redux-actions' import { createSelector } from 'reselect' -import * as _ from 'lodash' +import _ from 'lodash' export const clearAllErrors = createAction('ERRORS/CLEAR_ALL_ERRORS') export const addGlobalError = createAction('ERRORS/ADD_GLOBAL_ERROR') diff --git a/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx b/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx index e9a53d7d251..4727ee328aa 100644 --- a/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx +++ b/apps/dolly-frontend/src/main/js/src/ducks/fagsystem/index.tsx @@ -14,7 +14,7 @@ import { onSuccess } from '@/ducks/utils/requestActions' import { successMiljoSelector } from '@/ducks/bestillingStatus' import { handleActions } from '@/ducks/utils/immerHandleActions' import { formatAlder, formatKjonn } from '@/utils/DataFormatter' -import * as _ from 'lodash' +import _ from 'lodash' export const actions = createActions( { diff --git a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx index 5c5bf5d5200..27b0ea32301 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/dollySoek/SoekForm.tsx @@ -8,7 +8,7 @@ import { Accordion, Button } from '@navikt/ds-react' import { AdresseKodeverk, GtKodeverk } from '@/config/kodeverk' import { useSoekIdenter } from '@/utils/hooks/usePersonSoek' import { ResultatVisning } from '@/pages/dollySoek/ResultatVisning' -import * as _ from 'lodash' +import _ from 'lodash' import { CypressSelector } from '../../../cypress/mocks/Selectors' import { Form, FormProvider, useForm } from 'react-hook-form' diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx index eefaa6034a4..3b7e98cff0b 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/BestillingListe/BestillingListe.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { DollyTable } from '@/components/ui/dollyTable/DollyTable' import ContentContainer from '@/components/ui/contentContainer/ContentContainer' import BestillingDetaljer from '@/components/bestilling/detaljer/BestillingDetaljer' diff --git a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx index 75a166df02f..232e9399017 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/gruppe/PersonListe/PersonListe.tsx @@ -9,7 +9,7 @@ import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import useBoolean from '@/utils/hooks/useBoolean' import { KommentarModal } from '@/pages/gruppe/PersonListe/modal/KommentarModal' import { selectPersonListe, sokSelector } from '@/ducks/fagsystem' -import * as _ from 'lodash' +import _ from 'lodash' import DollyTooltip from '@/components/ui/button/DollyTooltip' import { setSorting } from '@/ducks/finnPerson' import { useDispatch } from 'react-redux' @@ -224,7 +224,7 @@ export default function PersonListe({ brukertype === 'BANKID' ? 'Trykk på "Importer personer"-knappen for å kunne søke opp og importere identer til gruppen.' : 'Trykk på "Opprett personer"-knappen for å starte en bestilling eller "Importer personer"-knappen å kunne ' + - 'søke opp og importere identer til gruppen.' + 'søke opp og importere identer til gruppen.' return {infoTekst} } diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx index 0da8f9d9ae0..aee01185eef 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonBestilling.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import { DollyTable } from '@/components/ui/dollyTable/DollyTable' import { OrganisasjonItem } from '@/components/ui/icon/IconItem' diff --git a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx index 000d2951673..427ccf8a8dc 100644 --- a/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/pages/organisasjoner/OrganisasjonListe.tsx @@ -1,5 +1,5 @@ import React, { useEffect, useState } from 'react' -import * as _ from 'lodash' +import _ from 'lodash' import { ErrorBoundary } from '@/components/ui/appError/ErrorBoundary' import 'rc-tooltip/assets/bootstrap.css' import { OrganisasjonItem } from '@/components/ui/icon/IconItem' diff --git a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx index 536121ed0db..09b19b5e5e5 100644 --- a/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/SelectOptionsFormat.tsx @@ -1,5 +1,5 @@ import { Option } from '@/service/SelectOptionsOppslag' -import * as _ from 'lodash' +import _ from 'lodash' import { toTitleCase } from '@/utils/DataFormatter' type Data = { diff --git a/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx b/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx index 0f234175a55..b3be3ceebe8 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/dolly/Utils.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' // Specialbehov for modifisering og sortering av kodeverk export const SortKodeverkArray = (data) => { diff --git a/apps/dolly-frontend/src/main/js/src/styles/main.less b/apps/dolly-frontend/src/main/js/src/styles/main.less index 4c919b5904b..2048f7d9ff1 100644 --- a/apps/dolly-frontend/src/main/js/src/styles/main.less +++ b/apps/dolly-frontend/src/main/js/src/styles/main.less @@ -80,10 +80,6 @@ a { z-index: unset; } -.navds-checkbox--small .navds-checkbox__input:checked + .navds-checkbox__label > .navds-checkbox__icon { - transform: translate(0.22rem, 1%) -} - .miljo-velger { .navds-body-short { font-size: var(--navds-font-size-small) diff --git a/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx b/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx index 28d93673ba1..0116b0f5b33 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/DataFormatter.tsx @@ -1,5 +1,5 @@ import { format, isDate } from 'date-fns' -import * as _ from 'lodash' +import _ from 'lodash' import { SelectOptionsManager as Options } from '@/service/SelectOptions' import { useKodeverk } from '@/utils/hooks/useKodeverk' diff --git a/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx b/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx index 6b7c6a563df..877f9e4cd4e 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/FileUploader/FileUploader.tsx @@ -1,7 +1,7 @@ import React from 'react' import { useDropzone } from 'react-dropzone' import styled from 'styled-components' -import * as _ from 'lodash' +import _ from 'lodash' const getColor = (props: any) => { if (props.isDragAccept) { diff --git a/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx b/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx index f4a61742b49..76bbef67d88 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/GenererGyldigNorskBankkonto.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' const CHECK_DIGIT_1 = [3, 7, 6, 1, 8, 9, 4, 5, 2] const CHECK_DIGIT_2 = [5, 4, 3, 2, 7, 6, 5, 4, 3, 2] diff --git a/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx b/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx index eebf61bddae..43012ca91c5 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/Merge.tsx @@ -1,4 +1,4 @@ -import * as _ from 'lodash' +import _ from 'lodash' function _mergeKeepShapeArray(dest, source) { if (source.length != dest.length) { diff --git a/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx b/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx index 626d94dae4d..e4e6c9ebcca 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/YupValidations.tsx @@ -1,5 +1,5 @@ import * as Yup from 'yup' -import * as _ from 'lodash' +import _ from 'lodash' import { parseDate } from '@/utils/DataFormatter' import { isDate } from 'date-fns' diff --git a/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx b/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx index 03e403aa774..69124d85f73 100644 --- a/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx +++ b/apps/dolly-frontend/src/main/js/src/utils/hooks/useKodeverk.tsx @@ -1,7 +1,6 @@ import useSWR from 'swr' import { fetcher } from '@/api' -import * as _ from 'lodash' -import { toLower } from 'lodash' +import _, { toLower } from 'lodash' import { SelectOptionsFormat } from '@/service/SelectOptionsFormat' import { SortKodeverkArray } from '@/service/services/dolly/Utils'