From 1e91cb06250f47d1c572c4421d3970e3028ba23d Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 22 Oct 2024 18:52:06 +0200 Subject: [PATCH 1/6] legg til grufagyrke --- mulighetsrommet-api/src/main/resources/application-prod.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/mulighetsrommet-api/src/main/resources/application-prod.yaml b/mulighetsrommet-api/src/main/resources/application-prod.yaml index bd5b697b50..6314ff95d9 100644 --- a/mulighetsrommet-api/src/main/resources/application-prod.yaml +++ b/mulighetsrommet-api/src/main/resources/application-prod.yaml @@ -15,6 +15,7 @@ app: - AVKLARING - DIGITALT_OPPFOLGINGSTILTAK - GRUPPE_ARBEIDSMARKEDSOPPLAERING + - GRUPPE_FAG_OG_YRKESOPPLAERING - JOBBKLUBB - OPPFOLGING - VARIG_TILRETTELAGT_ARBEID_SKJERMET From 5201034da58a8f3d99e0c9601d10b24b4a17881f Mon Sep 17 00:00:00 2001 From: Sondre Lefsaker Date: Tue, 22 Oct 2024 18:54:20 +0200 Subject: [PATCH 2/6] ikke Repair hver gang --- mulighetsrommet-api/src/main/resources/application-dev.yaml | 2 +- mulighetsrommet-api/src/main/resources/application-prod.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mulighetsrommet-api/src/main/resources/application-dev.yaml b/mulighetsrommet-api/src/main/resources/application-dev.yaml index 9c43a87432..6bcefa756a 100644 --- a/mulighetsrommet-api/src/main/resources/application-dev.yaml +++ b/mulighetsrommet-api/src/main/resources/application-dev.yaml @@ -7,7 +7,7 @@ app: jdbcUrl: ${DB_JDBC_URL} maximumPoolSize: 10 flyway: - strategy: RepairAndMigrate + strategy: Migrate migrerteTiltak: - AVKLARING diff --git a/mulighetsrommet-api/src/main/resources/application-prod.yaml b/mulighetsrommet-api/src/main/resources/application-prod.yaml index 6314ff95d9..a3a33bd4c1 100644 --- a/mulighetsrommet-api/src/main/resources/application-prod.yaml +++ b/mulighetsrommet-api/src/main/resources/application-prod.yaml @@ -7,7 +7,7 @@ app: jdbcUrl: ${DB_JDBC_URL} maximumPoolSize: 10 flyway: - strategy: RepairAndMigrate + strategy: Migrate migrerteTiltak: - ARBEIDSFORBEREDENDE_TRENING From dd7c2e82b5ab40cdf0d1c1aa16805e380e60f111 Mon Sep 17 00:00:00 2001 From: Sindre Moldeklev Date: Wed, 23 Oct 2024 12:19:24 +0200 Subject: [PATCH 3/6] =?UTF-8?q?Legger=20til=20ingress=20for=20digitalt=20o?= =?UTF-8?q?ppf=C3=B8lgingstiltak?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/R__deltakerregistrering-innhold.sql | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mulighetsrommet-api/src/main/resources/db/migration/R__deltakerregistrering-innhold.sql b/mulighetsrommet-api/src/main/resources/db/migration/R__deltakerregistrering-innhold.sql index 738eb756f3..93828d267c 100644 --- a/mulighetsrommet-api/src/main/resources/db/migration/R__deltakerregistrering-innhold.sql +++ b/mulighetsrommet-api/src/main/resources/db/migration/R__deltakerregistrering-innhold.sql @@ -1,7 +1,7 @@ /** * Script for å populere tabeller med strukturert * informasjon om hvilke type innhold en gitt tiltakstype kan forvente å innhold. - * Bruker blant annet av Komet sin påmeldingsløsning + * Brukes blant annet av Komet sin påmeldingsløsning */ update tiltakstype @@ -24,6 +24,10 @@ update tiltakstype set deltaker_registrering_ledetekst = 'Varig tilrettelagt arbeid er et tilbud for deg som får uføretrygd. Du jobber i en skjermet bedrift med arbeidsoppgaver som er tilpasset deg.' where tiltakskode = 'VARIG_TILRETTELAGT_ARBEID_SKJERMET'; +update tiltakstype +set deltaker_registrering_ledetekst = 'Du får oppfølging og støtte til jobbsøkingen. På kurset får du karriereveiledning, hjelp til å orientere deg på arbeidsmarkedet, skrive CV og jobbsøknad og trene på jobbintervju.' +where tiltakskode = 'DIGITALT_OPPFOLGINGSTILTAK'; + insert into deltaker_registrering_innholdselement(innholdskode, tekst) values ('jobbsoking', 'Støtte til å søke jobber'), ('arbeidspraksis', 'Arbeidspraksis'), From caeb27a29a715a9fe4943033550b52710be4dddb Mon Sep 17 00:00:00 2001 From: Sindre Moldeklev Date: Wed, 23 Oct 2024 12:33:55 +0200 Subject: [PATCH 4/6] =?UTF-8?q?Rediger=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/mr-admin-flate/src/pages/avtaler/AvtaleKnapperad.tsx | 2 +- .../tiltaksgjennomforinger/TiltaksgjennomforingKnapperad.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/mr-admin-flate/src/pages/avtaler/AvtaleKnapperad.tsx b/frontend/mr-admin-flate/src/pages/avtaler/AvtaleKnapperad.tsx index 86fca89a49..ce907af994 100644 --- a/frontend/mr-admin-flate/src/pages/avtaler/AvtaleKnapperad.tsx +++ b/frontend/mr-admin-flate/src/pages/avtaler/AvtaleKnapperad.tsx @@ -51,7 +51,7 @@ export function AvtaleKnapperad({ bruker, avtale }: Props) { } }} > - Rediger + Rediger avtale {kanRegistrereOpsjon(avtale) && ( - Rediger + Rediger tiltaksgjennomføring {enableOpprettTilsagn && gjennomforingIsAktiv(tiltaksgjennomforing.status.status) ? ( Date: Wed, 23 Oct 2024 13:19:29 +0200 Subject: [PATCH 5/6] =?UTF-8?q?Bump=20deps=20for=20admin-flate=20for=20?= =?UTF-8?q?=C3=A5=20fikse=20select-bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/mr-admin-flate/package.json | 16 +- pnpm-lock.yaml | 539 +++++++++++++++++++++++++-- 2 files changed, 512 insertions(+), 43 deletions(-) diff --git a/frontend/mr-admin-flate/package.json b/frontend/mr-admin-flate/package.json index 7fac4c7f02..b6f96727d3 100644 --- a/frontend/mr-admin-flate/package.json +++ b/frontend/mr-admin-flate/package.json @@ -20,15 +20,15 @@ "playwright:codegen": "playwright codegen playwright.dev" }, "dependencies": { - "@amplitude/analytics-browser": "2.11.7", + "@amplitude/analytics-browser": "2.11.8", "@eik/rollup-plugin": "4.0.64", "@grafana/faro-web-sdk": "1.11.0", "@hookform/resolvers": "3.9.0", "@mr/api-client": "workspace:*", "@mr/frontend-common": "workspace:*", - "@navikt/aksel-icons": "7.3.0", - "@navikt/ds-css": "7.3.0", - "@navikt/ds-react": "7.3.0", + "@navikt/aksel-icons": "7.3.1", + "@navikt/ds-css": "7.3.1", + "@navikt/ds-react": "7.3.1", "@portabletext/react": "3.1.0", "@portabletext/types": "2.0.13", "@tanstack/react-query": "5.59.15", @@ -60,18 +60,18 @@ "@playwright/test": "1.48.1", "@rollup/plugin-terser": "0.4.4", "@types/is-hotkey": "0.1.10", - "@types/react": "18.3.11", + "@types/react": "18.3.12", "@types/react-dom": "18.3.1", "@types/uuid": "10.0.0", "@vitejs/plugin-react": "4.3.3", "axe-core": "4.10.1", "cross-env": "7.0.3", - "msw": "2.4.11", + "msw": "2.5.0", "playwright": "1.48.1", "sass-embedded": "1.80.3", "typescript": "5.6.3", - "typescript-eslint": "8.10.0", - "vite": "5.4.6", + "typescript-eslint": "8.11.0", + "vite": "5.4.10", "vite-tsconfig-paths": "5.0.1", "vitest": "2.1.3" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fb92740981..766b021012 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -348,8 +348,8 @@ importers: frontend/mr-admin-flate: dependencies: '@amplitude/analytics-browser': - specifier: 2.11.7 - version: 2.11.7 + specifier: 2.11.8 + version: 2.11.8 '@eik/rollup-plugin': specifier: 4.0.64 version: 4.0.64 @@ -366,14 +366,14 @@ importers: specifier: workspace:* version: link:../frontend-common '@navikt/aksel-icons': - specifier: 7.3.0 - version: 7.3.0 + specifier: 7.3.1 + version: 7.3.1 '@navikt/ds-css': - specifier: 7.3.0 - version: 7.3.0 + specifier: 7.3.1 + version: 7.3.1 '@navikt/ds-react': - specifier: 7.3.0 - version: 7.3.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + specifier: 7.3.1 + version: 7.3.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@portabletext/react': specifier: 3.1.0 version: 3.1.0(react@18.3.1) @@ -406,7 +406,7 @@ importers: version: 1.2.4 jotai: specifier: 2.10.1 - version: 2.10.1(@types/react@18.3.11)(react@18.3.1) + version: 2.10.1(@types/react@18.3.12)(react@18.3.1) react: specifier: 18.3.1 version: 18.3.1 @@ -427,7 +427,7 @@ importers: version: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) react-select: specifier: 5.8.1 - version: 5.8.1(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + version: 5.8.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) slate: specifier: 0.110.2 version: 0.110.2 @@ -463,8 +463,8 @@ importers: specifier: 0.1.10 version: 0.1.10 '@types/react': - specifier: 18.3.11 - version: 18.3.11 + specifier: 18.3.12 + version: 18.3.12 '@types/react-dom': specifier: 18.3.1 version: 18.3.1 @@ -473,7 +473,7 @@ importers: version: 10.0.0 '@vitejs/plugin-react': specifier: 4.3.3 - version: 4.3.3(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) + version: 4.3.3(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) axe-core: specifier: 4.10.1 version: 4.10.1 @@ -481,8 +481,8 @@ importers: specifier: 7.0.3 version: 7.0.3 msw: - specifier: 2.4.11 - version: 2.4.11(typescript@5.6.3) + specifier: 2.5.0 + version: 2.5.0(typescript@5.6.3) playwright: specifier: 1.48.1 version: 1.48.1 @@ -493,17 +493,17 @@ importers: specifier: 5.6.3 version: 5.6.3 typescript-eslint: - specifier: 8.10.0 - version: 8.10.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + specifier: 8.11.0 + version: 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) vite: - specifier: 5.4.6 - version: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + specifier: 5.4.10 + version: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) vite-tsconfig-paths: specifier: 5.0.1 - version: 5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) + version: 5.0.1(typescript@5.6.3)(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) vitest: specifier: 2.1.3 - version: 2.1.3(@types/node@22.7.7)(jsdom@25.0.1)(msw@2.4.11(typescript@5.6.3))(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + version: 2.1.3(@types/node@22.7.7)(jsdom@25.0.1)(msw@2.5.0(typescript@5.6.3))(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) frontend/mulighetsrommet-cms: dependencies: @@ -696,27 +696,42 @@ packages: '@amplitude/analytics-browser@2.11.7': resolution: {integrity: sha512-tbBeMA2n1JQJlHGEa1LQ7XrSGPM4YKrNdFKV+gDCzqOixx4wBwwYCxN33lVwCpJvCPAjtYonkAO2dq9d78U7Pw==} + '@amplitude/analytics-browser@2.11.8': + resolution: {integrity: sha512-lFv8deROLwBfSlg92+r1NitWJ6BN45IKwpPLoixA0fZytScXEJqc0Gl5O+BY4qScbFECYt9PFKblhB+jC+IvPg==} + '@amplitude/analytics-client-common@2.3.3': resolution: {integrity: sha512-HOvD2A8DH0y2LATrQ0AhFSOCk6yZayebu4+UsEBT76Q7EEYtnc59WMCRRIi5Zv6OqHpOvABumF7g3HmL6ehTYA==} + '@amplitude/analytics-client-common@2.3.4': + resolution: {integrity: sha512-3oqdvca5W4BPblTaxf60YRtlh2uC+N3rA99wowDAhTBJoMJJaauOBoXu5BbiQO1u8Zw/c8ymyr8E20+glyptUg==} + '@amplitude/analytics-connector@1.5.0': resolution: {integrity: sha512-T8mOYzB9RRxckzhL0NTHwdge9xuFxXEOplC8B1Y3UX3NHa3BLh7DlBUZlCOwQgMc2nxDfnSweDL5S3bhC+W90g==} '@amplitude/analytics-core@2.5.2': resolution: {integrity: sha512-4ojYUL7LA+qrlaz1n1nxpsbpgS1k6DOrQ3fBiQOuDJE8Av0aZfylDksFPnZvD1+MMdIm/ONkVAYfEaW3x/uH3Q==} + '@amplitude/analytics-core@2.5.3': + resolution: {integrity: sha512-dvx3PS0adnHRS22VbuP9YtWg//bQGF2c61Pj5IYXVsemtRRHqiS7XJ860brk3WeQgOkqf3Gyc023DoYcsWGoNQ==} + '@amplitude/analytics-remote-config@0.4.1': resolution: {integrity: sha512-BYl6kQ9qjztrCACsugpxO+foLaQIC0aSEzoXEAb/gwOzInmqkyyI+Ub+aWTBih4xgB/lhWlOcidWHAmNiTJTNw==} '@amplitude/analytics-types@2.8.2': resolution: {integrity: sha512-SWFXIMxhFm1/k3PUvxvYLY1iwzS28yd9A6pa5pEnrbaAZwM+E/24ucxs59VGp1N5qlIsvF0aVGSoKzN4ydh4eA==} + '@amplitude/analytics-types@2.8.3': + resolution: {integrity: sha512-HNmKVd0ACoi3xTi86xi+is7WgqKT78JA4fYLcM25/ckFkZ1zVCqD1AubaADEh26m34nJ3qDLK5Pob4QptQNPAg==} + '@amplitude/plugin-autocapture-browser@1.0.3': resolution: {integrity: sha512-XUQWUAw9VqtJPlmOyWjnhsEspyVakd9LuSjVNtLjhwlWv+f/yZM1AAQVUdq/Os1+b5OptSgJQ2pPfRJJHZDXTw==} '@amplitude/plugin-page-view-tracking-browser@2.3.3': resolution: {integrity: sha512-tGDt7aU/okGHH38sxZvBckRXBw2btkw+wJz/PmIFIQdD7/7EMVnTtXgZJTokE+fqfxCx79F2ojEHp37xgVSxpg==} + '@amplitude/plugin-page-view-tracking-browser@2.3.4': + resolution: {integrity: sha512-l7RS5gssG0BPYlgirV0NQ94EPzTOdDkp0z2jqU45D3DQAJXkoloUyw5lw/cbUXYwNulHZTG/BExcERfdvVWkLA==} + '@ampproject/remapping@2.3.0': resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==} engines: {node: '>=6.0.0'} @@ -2424,6 +2439,10 @@ packages: resolution: {integrity: sha512-oOIwPs0Dvq5220Z8lGL/6LHRTEr9TgLHmiI99Rj1PJ1p1czTys+olrgBqZk4E2qC0YTzeHprxSQmoHioVdJ7Lw==} engines: {node: '>=18'} + '@inquirer/confirm@4.0.1': + resolution: {integrity: sha512-46yL28o2NJ9doViqOy0VDcoTzng7rAb6yPQKU7VDLqkmbCaH4JqK4yk4XqlzNWy9PVC5pG1ZUXPBQv+VqnYs2w==} + engines: {node: '>=18'} + '@inquirer/core@9.2.1': resolution: {integrity: sha512-F2VBt7W/mwqEU4bL0RnHNZmC/OxzNx9cOYxHqnXX3MP6ruYvZUZAW9imgN9+h/uBT/oP8Gh888J2OZSbjSeWcg==} engines: {node: '>=18'} @@ -2497,9 +2516,16 @@ packages: resolution: {integrity: sha512-SSnyl/4ni/2ViHKkiZb8eajA/eN1DNFaHjhGiLUdZvDz6PKF4COSf/17xqSz64nOo2Ia29SA6B2KNCsyCbVmaQ==} engines: {node: '>=18'} + '@mswjs/interceptors@0.36.5': + resolution: {integrity: sha512-aQ8WF5zQwOdcxLsxSEk9Jd01GgGb80xxqCaiDDlewhtwqpSm8MOvUHslwPydVirasdW09++NxDNNftm1vLY8yA==} + engines: {node: '>=18'} + '@navikt/aksel-icons@7.3.0': resolution: {integrity: sha512-wQWdKZwY13hAVvurdwheFMOAc0Evl/RJde0KdIM49ZrKA3mpdKh2EQC4MbxkxIZPz071KC8fFdAuDKmKQ+hxvw==, tarball: https://npm.pkg.github.com/download/@navikt/aksel-icons/7.3.0/50af8f46f221d92be1475249e8930c00b5417a72} + '@navikt/aksel-icons@7.3.1': + resolution: {integrity: sha512-FqARFTIvjOVyyYQ2BFS8ba3GEu/M53d7MUle5/NP838ZG4CY3O+Ea453dxPGuGCu2EIG8CX8sQ3VFmVqCYu9mQ==, tarball: https://npm.pkg.github.com/download/@navikt/aksel-icons/7.3.1/579d009ffc9063af4afd5000a9e73dfba39a1f1c} + '@navikt/bedriftsmeny@6.13.1': resolution: {integrity: sha512-wlsOt0iuI1QFnnbcrIQ3ZqRXMvrZQVcBNQf6hF+SU4t6SRWcXAdBMndFrS3+khihKM6sS3+JdpUPOPUYL6kS/Q==, tarball: https://npm.pkg.github.com/download/@navikt/bedriftsmeny/6.13.1/2cb1022f298e6de66ddb4be2670741d251869e4d} peerDependencies: @@ -2511,21 +2537,39 @@ packages: react: 17 || 18 react-dom: 17 || 18 react-router-dom: '6' + peerDependenciesMeta: + react-router-dom: + optional: true '@navikt/ds-css@7.3.0': resolution: {integrity: sha512-kLuq7lJFYuvmQzd9IjkthUFTzQN7hYwSX+oXuQjN4KoBJNqMTwJVnwJUdVY+2xwUirmwXrt2ZRAe0dp7e8+NrQ==, tarball: https://npm.pkg.github.com/download/@navikt/ds-css/7.3.0/149d6e5c64ae6a19a56e070d63bc97522fe54f3a} + '@navikt/ds-css@7.3.1': + resolution: {integrity: sha512-Q/vzLpPvtzUEmrK2s6dH/gtPTcj11AlEBFxG6tMzLUcynB7R0olXgYBfdD7kTPy3F2Y6PWr5ihQvV4tXPIgpww==, tarball: https://npm.pkg.github.com/download/@navikt/ds-css/7.3.1/ed21257bbfa4a5615ce55bfe7f5175b20bf42d8f} + '@navikt/ds-icons@3.4.3': resolution: {integrity: sha512-Ys25tnDUzS+AtagMMW4/154OCZy+pTxCv9uiV4YcZUeXMfjnMiRWx1dueyCODb7FF7Jd6TwELd3G6ieQt/rf+w==, tarball: https://npm.pkg.github.com/download/@navikt/ds-icons/3.4.3/eaa8fc38f6d184806d3405a5efbc9d137c2b8d27} peerDependencies: '@types/react': ^17.0.30 || ^18.0.0 react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true '@navikt/ds-react@7.3.0': resolution: {integrity: sha512-3jZPqOopOCTxl07IRGsnbOae2GZvUsUPYXg0X1A0RGRATZDEPseUd76miI06H2HLH8iqKGr8/I1lACJP70yY6A==, tarball: https://npm.pkg.github.com/download/@navikt/ds-react/7.3.0/f78f7e92e1a244843746d6f746ddc970b5c47106} peerDependencies: '@types/react': ^17.0.30 || ^18.0.0 react: ^17.0.0 || ^18.0.0 + peerDependenciesMeta: + '@types/react': + optional: true + + '@navikt/ds-react@7.3.1': + resolution: {integrity: sha512-5HetHrvZHwjTr/CfOy9fES018vYgU5Jgb+VE+P+U0SuLU2k+86+mJ5fhsXQn6ipSqBDPGOB0IMw0LY8n/eVkFw==, tarball: https://npm.pkg.github.com/download/@navikt/ds-react/7.3.1/0aa76367ae5294f4ed2f598218240efa7a51e136} + peerDependencies: + '@types/react': ^17.0.30 || ^18.0.0 + react: ^17.0.0 || ^18.0.0 '@navikt/ds-tailwind@7.3.0': resolution: {integrity: sha512-+0jk0nCHjfpkJZ/mY/P95JE6vDZVmPcZO6uTIN61g9Gi+zOFTFP2QZhC75NvTJC2HIYmI7eVg8eWmrzAKBYQog==, tarball: https://npm.pkg.github.com/download/@navikt/ds-tailwind/7.3.0/45e61ea01acf63e56a8d75f166b3d69dfaea9463} @@ -2533,6 +2577,9 @@ packages: '@navikt/ds-tokens@7.3.0': resolution: {integrity: sha512-2VeG4C6D6yF4BGKlL9RuSi2scbFVZjXnEOjUYiFeePywS4c56xVvoFTFSWDxn5bHSg59QAuHdnxp7MUwsucYJQ==, tarball: https://npm.pkg.github.com/download/@navikt/ds-tokens/7.3.0/7b08f7cb6ecc23773ded1d655d8e75af80316c3a} + '@navikt/ds-tokens@7.3.1': + resolution: {integrity: sha512-zYoEz4YMfKiyi2CwYFWRjPTkzmeNZqE5XRb8CL0xkZMj3ESkn0M7XSEk2AKfe7BIN7q3kItD4bMsmCruTmr1pQ==, tarball: https://npm.pkg.github.com/download/@navikt/ds-tokens/7.3.1/806b85e70ee44c469422bf5b415a4e9c026d981d} + '@navikt/nav-dekoratoren-moduler@3.1.1': resolution: {integrity: sha512-t64ByXXWVWEs1NGggClq6CVRUD648s0XWkA8imyUva9Mo48BNly4eHz6QbYewuuqvTjPn3k0gYIiF+DE+vYbYQ==, tarball: https://npm.pkg.github.com/download/@navikt/nav-dekoratoren-moduler/3.1.1/b630f2cd32677c2fb0ab67655ee559951bd3d3d4} engines: {node: '>=18'} @@ -2541,6 +2588,9 @@ packages: html-react-parser: '>=5.x' jsdom: '>=16.x' react: '>=17.x' + peerDependenciesMeta: + react: + optional: true '@navikt/oasis@3.4.0': resolution: {integrity: sha512-le+J+gE/OeLfqyZFQWDqp/pY6f7lzMpP1ynXnDOWBalmkav9tmWor4g/pqb+Xorm6C6bNCdScmCKDHvNVf+CoQ==, tarball: https://npm.pkg.github.com/download/@navikt/oasis/3.4.0/7a21e6e8c8e6eca00d7e6a5c06f7e8315c0cc71a} @@ -3305,6 +3355,9 @@ packages: '@types/react@18.3.11': resolution: {integrity: sha512-r6QZ069rFTjrEYgFdOck1gK7FLVsgJE7tTz0pQBczlBNUhBNk0MQH4UbnFSwjpQLMkLzgqvBBa+qGpLje16eTQ==} + '@types/react@18.3.12': + resolution: {integrity: sha512-D2wOSq/d6Agt28q7rSI3jhU7G6aiuzljDGZ2hTZHIkrTLUI+AF3WMeKkEZ9nN2fkBAlcktT6vcZjDFiIhMYEQw==} + '@types/send@0.17.4': resolution: {integrity: sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==} @@ -3358,6 +3411,17 @@ packages: typescript: optional: true + '@typescript-eslint/eslint-plugin@8.11.0': + resolution: {integrity: sha512-KhGn2LjW1PJT2A/GfDpiyOfS4a8xHQv2myUagTM5+zsormOmBlYsnQ6pobJ8XxJmh6hnHwa2Mbe3fPrDJoDhbA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 + eslint: ^8.57.0 || ^9.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/parser@8.10.0': resolution: {integrity: sha512-E24l90SxuJhytWJ0pTQydFT46Nk0Z+bsLKo/L8rtQSL93rQ6byd1V/QbDpHUTdLPOMsBCcYXZweADNCfOCmOAg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3368,10 +3432,24 @@ packages: typescript: optional: true + '@typescript-eslint/parser@8.11.0': + resolution: {integrity: sha512-lmt73NeHdy1Q/2ul295Qy3uninSqi6wQI18XwSpm8w0ZbQXUpjCAWP1Vlv/obudoBiIjJVjlztjQ+d/Md98Yxg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/scope-manager@8.10.0': resolution: {integrity: sha512-AgCaEjhfql9MDKjMUxWvH7HjLeBqMCBfIaBbzzIcBbQPZE7CPh1m6FF+L75NUMJFMLYhCywJXIDEMa3//1A0dw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.11.0': + resolution: {integrity: sha512-Uholz7tWhXmA4r6epo+vaeV7yjdKy5QFCERMjs1kMVsLRKIrSdM6o21W2He9ftp5PP6aWOVpD5zvrvuHZC0bMQ==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/scope-manager@8.8.1': resolution: {integrity: sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3385,10 +3463,23 @@ packages: typescript: optional: true + '@typescript-eslint/type-utils@8.11.0': + resolution: {integrity: sha512-ItiMfJS6pQU0NIKAaybBKkuVzo6IdnAhPFZA/2Mba/uBjuPQPet/8+zh5GtLHwmuFRShZx+8lhIs7/QeDHflOg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/types@8.10.0': resolution: {integrity: sha512-k/E48uzsfJCRRbGLapdZgrX52csmWJ2rcowwPvOZ8lwPUv3xW6CcFeJAXgx4uJm+Ge4+a4tFOkdYvSpxhRhg1w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.11.0': + resolution: {integrity: sha512-tn6sNMHf6EBAYMvmPUaKaVeYvhUsrE6x+bXQTxjQRp360h1giATU0WvgeEys1spbvb5R+VpNOZ+XJmjD8wOUHw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/types@8.8.1': resolution: {integrity: sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3402,6 +3493,15 @@ packages: typescript: optional: true + '@typescript-eslint/typescript-estree@8.11.0': + resolution: {integrity: sha512-yHC3s1z1RCHoCz5t06gf7jH24rr3vns08XXhfEqzYpd6Hll3z/3g23JRi0jM8A47UFKNc3u/y5KIMx8Ynbjohg==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + '@typescript-eslint/typescript-estree@8.8.1': resolution: {integrity: sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3417,6 +3517,12 @@ packages: peerDependencies: eslint: ^8.57.0 || ^9.0.0 + '@typescript-eslint/utils@8.11.0': + resolution: {integrity: sha512-CYiX6WZcbXNJV7UNB4PLDIBtSdRmRI/nb0FMyqHPTQD1rMjA0foPLaPUV39C/MxkTd/QKSeX+Gb34PPsDVC35g==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + eslint: ^8.57.0 || ^9.0.0 + '@typescript-eslint/utils@8.8.1': resolution: {integrity: sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -3427,6 +3533,10 @@ packages: resolution: {integrity: sha512-k8nekgqwr7FadWk548Lfph6V3r9OVqjzAIVskE7orMZR23cGJjAOVazsZSJW+ElyjfTM4wx/1g88Mi70DDtG9A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.11.0': + resolution: {integrity: sha512-EaewX6lxSjRJnc+99+dqzTeoDZUfyrA52d2/HRrkI830kgovWsmIiTfmr0NZorzqic7ga+1bS60lRBUgR3n/Bw==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@typescript-eslint/visitor-keys@8.8.1': resolution: {integrity: sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} @@ -6205,6 +6315,16 @@ packages: typescript: optional: true + msw@2.5.0: + resolution: {integrity: sha512-DwIGQV/XFzkseQD7Ux3rPWMRa7DpozicRQ87QLX9Gzik2xyqcXvtvlBEUs57RziTBZPe/QzaKSl92fJVdxxt2g==} + engines: {node: '>=18'} + hasBin: true + peerDependencies: + typescript: '>= 4.8.x' + peerDependenciesMeta: + typescript: + optional: true + mute-stream@1.0.0: resolution: {integrity: sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA==} engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0} @@ -8010,6 +8130,15 @@ packages: typescript: optional: true + typescript-eslint@8.11.0: + resolution: {integrity: sha512-cBRGnW3FSlxaYwU8KfAewxFK5uzeOAp0l2KebIlPDOT5olVi65KDG/yjBooPBG0kGW/HLkoz1c/iuBFehcS3IA==} + engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + peerDependencies: + typescript: '*' + peerDependenciesMeta: + typescript: + optional: true + typescript@5.6.3: resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} engines: {node: '>=14.17'} @@ -8348,6 +8477,37 @@ packages: terser: optional: true + vite@5.4.10: + resolution: {integrity: sha512-1hvaPshuPUtxeQ0hsVH3Mud0ZanOLwVTneA1EgbAM5LhaZEqyPWGRQ7BtaMvUrTDeEaC8pxtj6a6jku3x4z6SQ==} + engines: {node: ^18.0.0 || >=20.0.0} + hasBin: true + peerDependencies: + '@types/node': ^18.0.0 || >=20.0.0 + less: '*' + lightningcss: ^1.21.0 + sass: '*' + sass-embedded: '*' + stylus: '*' + sugarss: '*' + terser: ^5.4.0 + peerDependenciesMeta: + '@types/node': + optional: true + less: + optional: true + lightningcss: + optional: true + sass: + optional: true + sass-embedded: + optional: true + stylus: + optional: true + sugarss: + optional: true + terser: + optional: true + vite@5.4.6: resolution: {integrity: sha512-IeL5f8OO5nylsgzd9tq4qD2QqI0k2CQLGrWD0rCN0EQJZpBK5vJAx0I+GDkMOXxQX/OfFHMuLIx6ddAxGX/k+Q==} engines: {node: ^18.0.0 || >=20.0.0} @@ -8620,6 +8780,16 @@ snapshots: '@amplitude/plugin-page-view-tracking-browser': 2.3.3 tslib: 2.7.0 + '@amplitude/analytics-browser@2.11.8': + dependencies: + '@amplitude/analytics-client-common': 2.3.4 + '@amplitude/analytics-core': 2.5.3 + '@amplitude/analytics-remote-config': 0.4.1 + '@amplitude/analytics-types': 2.8.3 + '@amplitude/plugin-autocapture-browser': 1.0.3 + '@amplitude/plugin-page-view-tracking-browser': 2.3.4 + tslib: 2.7.0 + '@amplitude/analytics-client-common@2.3.3': dependencies: '@amplitude/analytics-connector': 1.5.0 @@ -8627,6 +8797,13 @@ snapshots: '@amplitude/analytics-types': 2.8.2 tslib: 2.7.0 + '@amplitude/analytics-client-common@2.3.4': + dependencies: + '@amplitude/analytics-connector': 1.5.0 + '@amplitude/analytics-core': 2.5.3 + '@amplitude/analytics-types': 2.8.3 + tslib: 2.7.0 + '@amplitude/analytics-connector@1.5.0': {} '@amplitude/analytics-core@2.5.2': @@ -8634,6 +8811,11 @@ snapshots: '@amplitude/analytics-types': 2.8.2 tslib: 2.7.0 + '@amplitude/analytics-core@2.5.3': + dependencies: + '@amplitude/analytics-types': 2.8.3 + tslib: 2.7.0 + '@amplitude/analytics-remote-config@0.4.1': dependencies: '@amplitude/analytics-client-common': 2.3.3 @@ -8643,6 +8825,8 @@ snapshots: '@amplitude/analytics-types@2.8.2': {} + '@amplitude/analytics-types@2.8.3': {} + '@amplitude/plugin-autocapture-browser@1.0.3': dependencies: '@amplitude/analytics-client-common': 2.3.3 @@ -8656,6 +8840,12 @@ snapshots: '@amplitude/analytics-types': 2.8.2 tslib: 2.7.0 + '@amplitude/plugin-page-view-tracking-browser@2.3.4': + dependencies: + '@amplitude/analytics-client-common': 2.3.4 + '@amplitude/analytics-types': 2.8.3 + tslib: 2.7.0 + '@ampproject/remapping@2.3.0': dependencies: '@jridgewell/gen-mapping': 0.3.5 @@ -10022,6 +10212,22 @@ snapshots: transitivePeerDependencies: - supports-color + '@emotion/react@11.13.3(@types/react@18.3.12)(react@18.3.1)': + dependencies: + '@babel/runtime': 7.25.7 + '@emotion/babel-plugin': 11.12.0 + '@emotion/cache': 11.13.1 + '@emotion/serialize': 1.3.2 + '@emotion/use-insertion-effect-with-fallbacks': 1.1.0(react@18.3.1) + '@emotion/utils': 1.4.1 + '@emotion/weak-memoize': 0.4.0 + hoist-non-react-statics: 3.3.2 + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.12 + transitivePeerDependencies: + - supports-color + '@emotion/serialize@1.3.1': dependencies: '@emotion/hash': 0.9.2 @@ -10469,6 +10675,11 @@ snapshots: '@inquirer/core': 9.2.1 '@inquirer/type': 1.5.5 + '@inquirer/confirm@4.0.1': + dependencies: + '@inquirer/core': 9.2.1 + '@inquirer/type': 2.0.0 + '@inquirer/core@9.2.1': dependencies: '@inquirer/figures': 1.0.6 @@ -10582,8 +10793,19 @@ snapshots: outvariant: 1.4.3 strict-event-emitter: 0.5.1 + '@mswjs/interceptors@0.36.5': + dependencies: + '@open-draft/deferred-promise': 2.2.0 + '@open-draft/logger': 0.3.0 + '@open-draft/until': 2.1.0 + is-node-process: 1.2.0 + outvariant: 1.4.3 + strict-event-emitter: 0.5.1 + '@navikt/aksel-icons@7.3.0': {} + '@navikt/aksel-icons@7.3.1': {} + '@navikt/bedriftsmeny@6.13.1(@navikt/ds-css@7.3.0)(@navikt/ds-icons@3.4.3(@types/react@18.3.11)(react@18.3.1))(@navikt/ds-react@7.3.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react-dom@18.3.1)(@types/react@18.3.11)(prop-types@15.8.1)(react-dom@18.3.1(react@18.3.1))(react-router-dom@6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(react@18.3.1)': dependencies: '@navikt/ds-css': 7.3.0 @@ -10596,16 +10818,20 @@ snapshots: history: 4.10.1 react: 18.3.1 react-dom: 18.3.1(react@18.3.1) + optionalDependencies: react-router-dom: 6.27.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1) transitivePeerDependencies: - prop-types '@navikt/ds-css@7.3.0': {} + '@navikt/ds-css@7.3.1': {} + '@navikt/ds-icons@3.4.3(@types/react@18.3.11)(react@18.3.1)': dependencies: - '@types/react': 18.3.11 react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.11 '@navikt/ds-react@7.3.0(@types/react@18.3.11)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: @@ -10613,7 +10839,22 @@ snapshots: '@floating-ui/react-dom': 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@navikt/aksel-icons': 7.3.0 '@navikt/ds-tokens': 7.3.0 + clsx: 2.1.1 + date-fns: 3.6.0 + react: 18.3.1 + react-day-picker: 8.10.0(date-fns@3.6.0)(react@18.3.1) + optionalDependencies: '@types/react': 18.3.11 + transitivePeerDependencies: + - react-dom + + '@navikt/ds-react@7.3.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@floating-ui/react': 0.25.4(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@floating-ui/react-dom': 2.1.2(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@navikt/aksel-icons': 7.3.1 + '@navikt/ds-tokens': 7.3.1 + '@types/react': 18.3.12 clsx: 2.1.1 date-fns: 3.6.0 react: 18.3.1 @@ -10625,11 +10866,14 @@ snapshots: '@navikt/ds-tokens@7.3.0': {} + '@navikt/ds-tokens@7.3.1': {} + '@navikt/nav-dekoratoren-moduler@3.1.1(csp-header@5.2.1)(html-react-parser@5.1.18(@types/react@18.3.11)(react@18.3.1))(jsdom@25.0.1)(react@18.3.1)': dependencies: csp-header: 5.2.1 html-react-parser: 5.1.18(@types/react@18.3.11)(react@18.3.1) jsdom: 25.0.1 + optionalDependencies: react: 18.3.1 '@navikt/oasis@3.4.0': @@ -11102,7 +11346,7 @@ snapshots: '@sanity/block-tools@3.61.0(debug@4.3.7)': dependencies: '@sanity/types': 3.61.0(debug@4.3.7) - '@types/react': 18.3.11 + '@types/react': 18.3.12 get-random-values-esm: 1.0.2 lodash: 4.17.21 transitivePeerDependencies: @@ -11338,14 +11582,14 @@ snapshots: '@sanity/types@3.37.2(debug@4.3.7)': dependencies: '@sanity/client': 6.22.2(debug@4.3.7) - '@types/react': 18.3.11 + '@types/react': 18.3.12 transitivePeerDependencies: - debug '@sanity/types@3.61.0(debug@4.3.7)': dependencies: '@sanity/client': 6.22.2(debug@4.3.7) - '@types/react': 18.3.11 + '@types/react': 18.3.12 transitivePeerDependencies: - debug @@ -11684,7 +11928,7 @@ snapshots: '@types/react-copy-to-clipboard@5.0.7': dependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-dom@18.3.1': dependencies: @@ -11692,17 +11936,22 @@ snapshots: '@types/react-is@18.3.0': dependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react-transition-group@4.4.11': dependencies: - '@types/react': 18.3.11 + '@types/react': 18.3.12 '@types/react@18.3.11': dependencies: '@types/prop-types': 15.7.13 csstype: 3.1.3 + '@types/react@18.3.12': + dependencies: + '@types/prop-types': 15.7.13 + csstype: 3.1.3 + '@types/send@0.17.4': dependencies: '@types/mime': 1.3.5 @@ -11758,6 +12007,24 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/eslint-plugin@8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': + dependencies: + '@eslint-community/regexpp': 4.11.0 + '@typescript-eslint/parser': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/scope-manager': 8.11.0 + '@typescript-eslint/type-utils': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/utils': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.11.0 + eslint: 9.13.0(jiti@1.21.6) + graphemer: 1.4.0 + ignore: 5.3.2 + natural-compare: 1.4.0 + ts-api-utils: 1.3.0(typescript@5.6.3) + optionalDependencies: + typescript: 5.6.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/parser@8.10.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 8.10.0 @@ -11771,11 +12038,29 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/parser@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': + dependencies: + '@typescript-eslint/scope-manager': 8.11.0 + '@typescript-eslint/types': 8.11.0 + '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) + '@typescript-eslint/visitor-keys': 8.11.0 + debug: 4.3.7 + eslint: 9.13.0(jiti@1.21.6) + optionalDependencies: + typescript: 5.6.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/scope-manager@8.10.0': dependencies: '@typescript-eslint/types': 8.10.0 '@typescript-eslint/visitor-keys': 8.10.0 + '@typescript-eslint/scope-manager@8.11.0': + dependencies: + '@typescript-eslint/types': 8.11.0 + '@typescript-eslint/visitor-keys': 8.11.0 + '@typescript-eslint/scope-manager@8.8.1': dependencies: '@typescript-eslint/types': 8.8.1 @@ -11793,8 +12078,22 @@ snapshots: - eslint - supports-color + '@typescript-eslint/type-utils@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': + dependencies: + '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) + '@typescript-eslint/utils': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + debug: 4.3.7 + ts-api-utils: 1.3.0(typescript@5.6.3) + optionalDependencies: + typescript: 5.6.3 + transitivePeerDependencies: + - eslint + - supports-color + '@typescript-eslint/types@8.10.0': {} + '@typescript-eslint/types@8.11.0': {} + '@typescript-eslint/types@8.8.1': {} '@typescript-eslint/typescript-estree@8.10.0(typescript@5.6.3)': @@ -11812,6 +12111,21 @@ snapshots: transitivePeerDependencies: - supports-color + '@typescript-eslint/typescript-estree@8.11.0(typescript@5.6.3)': + dependencies: + '@typescript-eslint/types': 8.11.0 + '@typescript-eslint/visitor-keys': 8.11.0 + debug: 4.3.7 + fast-glob: 3.3.2 + is-glob: 4.0.3 + minimatch: 9.0.5 + semver: 7.6.3 + ts-api-utils: 1.3.0(typescript@5.6.3) + optionalDependencies: + typescript: 5.6.3 + transitivePeerDependencies: + - supports-color + '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 8.8.1 @@ -11838,6 +12152,17 @@ snapshots: - supports-color - typescript + '@typescript-eslint/utils@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': + dependencies: + '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@1.21.6)) + '@typescript-eslint/scope-manager': 8.11.0 + '@typescript-eslint/types': 8.11.0 + '@typescript-eslint/typescript-estree': 8.11.0(typescript@5.6.3) + eslint: 9.13.0(jiti@1.21.6) + transitivePeerDependencies: + - supports-color + - typescript + '@typescript-eslint/utils@8.8.1(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.13.0(jiti@1.21.6)) @@ -11854,6 +12179,11 @@ snapshots: '@typescript-eslint/types': 8.10.0 eslint-visitor-keys: 3.4.3 + '@typescript-eslint/visitor-keys@8.11.0': + dependencies: + '@typescript-eslint/types': 8.11.0 + eslint-visitor-keys: 3.4.3 + '@typescript-eslint/visitor-keys@8.8.1': dependencies: '@typescript-eslint/types': 8.8.1 @@ -11924,7 +12254,7 @@ snapshots: lodash: 4.17.21 mlly: 1.7.1 outdent: 0.8.0 - vite: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) vite-node: 1.6.0(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) transitivePeerDependencies: - '@types/node' @@ -11951,6 +12281,17 @@ snapshots: transitivePeerDependencies: - supports-color + '@vitejs/plugin-react@4.3.3(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6))': + dependencies: + '@babel/core': 7.25.7 + '@babel/plugin-transform-react-jsx-self': 7.25.7(@babel/core@7.25.7) + '@babel/plugin-transform-react-jsx-source': 7.25.7(@babel/core@7.25.7) + '@types/babel__core': 7.20.5 + react-refresh: 0.14.2 + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + transitivePeerDependencies: + - supports-color + '@vitejs/plugin-react@4.3.3(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6))': dependencies: '@babel/core': 7.25.7 @@ -11969,14 +12310,23 @@ snapshots: chai: 5.1.1 tinyrainbow: 1.2.0 - '@vitest/mocker@2.1.3(@vitest/spy@2.1.3)(msw@2.4.11(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6))': + '@vitest/mocker@2.1.3(@vitest/spy@2.1.3)(msw@2.4.11(typescript@5.6.3))(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6))': dependencies: '@vitest/spy': 2.1.3 estree-walker: 3.0.3 magic-string: 0.30.11 optionalDependencies: msw: 2.4.11(typescript@5.6.3) - vite: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + + '@vitest/mocker@2.1.3(@vitest/spy@2.1.3)(msw@2.5.0(typescript@5.6.3))(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6))': + dependencies: + '@vitest/spy': 2.1.3 + estree-walker: 3.0.3 + magic-string: 0.30.11 + optionalDependencies: + msw: 2.5.0(typescript@5.6.3) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) '@vitest/pretty-format@2.1.3': dependencies: @@ -14340,6 +14690,11 @@ snapshots: '@types/react': 18.3.11 react: 18.3.1 + jotai@2.10.1(@types/react@18.3.12)(react@18.3.1): + optionalDependencies: + '@types/react': 18.3.12 + react: 18.3.1 + js-tokens@4.0.0: {} js-yaml@4.1.0: @@ -15316,6 +15671,28 @@ snapshots: optionalDependencies: typescript: 5.6.3 + msw@2.5.0(typescript@5.6.3): + dependencies: + '@bundled-es-modules/cookie': 2.0.0 + '@bundled-es-modules/statuses': 1.0.1 + '@bundled-es-modules/tough-cookie': 0.1.6 + '@inquirer/confirm': 4.0.1 + '@mswjs/interceptors': 0.36.5 + '@open-draft/until': 2.1.0 + '@types/cookie': 0.6.0 + '@types/statuses': 2.0.5 + chalk: 4.1.2 + graphql: 16.9.0 + headers-polyfill: 4.0.3 + is-node-process: 1.2.0 + outvariant: 1.4.3 + path-to-regexp: 6.3.0 + strict-event-emitter: 0.5.1 + type-fest: 4.26.1 + yargs: 17.7.2 + optionalDependencies: + typescript: 5.6.3 + mute-stream@1.0.0: {} mz@2.7.0: @@ -16138,6 +16515,23 @@ snapshots: - '@types/react' - supports-color + react-select@5.8.1(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1): + dependencies: + '@babel/runtime': 7.25.6 + '@emotion/cache': 11.13.1 + '@emotion/react': 11.13.3(@types/react@18.3.12)(react@18.3.1) + '@floating-ui/dom': 1.6.10 + '@types/react-transition-group': 4.4.11 + memoize-one: 6.0.0 + prop-types: 15.8.1 + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + react-transition-group: 4.4.5(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + use-isomorphic-layout-effect: 1.1.2(@types/react@18.3.12)(react@18.3.1) + transitivePeerDependencies: + - '@types/react' + - supports-color + react-style-proptype@3.2.2: dependencies: prop-types: 15.8.1 @@ -17385,6 +17779,17 @@ snapshots: - eslint - supports-color + typescript-eslint@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3): + dependencies: + '@typescript-eslint/eslint-plugin': 8.11.0(@typescript-eslint/parser@8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3))(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/parser': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + '@typescript-eslint/utils': 8.11.0(eslint@9.13.0(jiti@1.21.6))(typescript@5.6.3) + optionalDependencies: + typescript: 5.6.3 + transitivePeerDependencies: + - eslint + - supports-color + typescript@5.6.3: {} ua-parser-js@1.0.39: {} @@ -17585,6 +17990,12 @@ snapshots: optionalDependencies: '@types/react': 18.3.11 + use-isomorphic-layout-effect@1.1.2(@types/react@18.3.12)(react@18.3.1): + dependencies: + react: 18.3.1 + optionalDependencies: + '@types/react': 18.3.12 + use-resize-observer@9.1.0(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: '@juggle/resize-observer': 3.4.0 @@ -17692,7 +18103,7 @@ snapshots: debug: 4.3.7 pathe: 1.1.2 picocolors: 1.1.0 - vite: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) transitivePeerDependencies: - '@types/node' - less @@ -17709,7 +18120,7 @@ snapshots: cac: 6.7.14 debug: 4.3.7 pathe: 1.1.2 - vite: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) transitivePeerDependencies: - '@types/node' - less @@ -17723,6 +18134,17 @@ snapshots: vite-plugin-shadow-style@1.1.1: {} + vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)): + dependencies: + debug: 4.3.7 + globrex: 0.1.2 + tsconfck: 3.1.3(typescript@5.6.3) + optionalDependencies: + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + transitivePeerDependencies: + - supports-color + - typescript + vite-tsconfig-paths@5.0.1(typescript@5.6.3)(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)): dependencies: debug: 4.3.7 @@ -17745,6 +18167,18 @@ snapshots: sass: 1.79.3 terser: 5.31.6 + vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6): + dependencies: + esbuild: 0.21.5 + postcss: 8.4.47 + rollup: 4.24.0 + optionalDependencies: + '@types/node': 22.7.7 + fsevents: 2.3.3 + sass: 1.79.3 + sass-embedded: 1.80.3 + terser: 5.31.6 + vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6): dependencies: esbuild: 0.21.5 @@ -17760,7 +18194,7 @@ snapshots: vitest@2.1.3(@types/node@22.7.7)(jsdom@25.0.1)(msw@2.4.11(typescript@5.6.3))(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6): dependencies: '@vitest/expect': 2.1.3 - '@vitest/mocker': 2.1.3(@vitest/spy@2.1.3)(msw@2.4.11(typescript@5.6.3))(vite@5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) + '@vitest/mocker': 2.1.3(@vitest/spy@2.1.3)(msw@2.4.11(typescript@5.6.3))(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) '@vitest/pretty-format': 2.1.3 '@vitest/runner': 2.1.3 '@vitest/snapshot': 2.1.3 @@ -17775,7 +18209,42 @@ snapshots: tinyexec: 0.3.0 tinypool: 1.0.1 tinyrainbow: 1.2.0 - vite: 5.4.6(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + vite-node: 2.1.3(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) + why-is-node-running: 2.3.0 + optionalDependencies: + '@types/node': 22.7.7 + jsdom: 25.0.1 + transitivePeerDependencies: + - less + - lightningcss + - msw + - sass + - sass-embedded + - stylus + - sugarss + - supports-color + - terser + + vitest@2.1.3(@types/node@22.7.7)(jsdom@25.0.1)(msw@2.5.0(typescript@5.6.3))(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6): + dependencies: + '@vitest/expect': 2.1.3 + '@vitest/mocker': 2.1.3(@vitest/spy@2.1.3)(msw@2.5.0(typescript@5.6.3))(vite@5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6)) + '@vitest/pretty-format': 2.1.3 + '@vitest/runner': 2.1.3 + '@vitest/snapshot': 2.1.3 + '@vitest/spy': 2.1.3 + '@vitest/utils': 2.1.3 + chai: 5.1.1 + debug: 4.3.7 + magic-string: 0.30.11 + pathe: 1.1.2 + std-env: 3.7.0 + tinybench: 2.9.0 + tinyexec: 0.3.0 + tinypool: 1.0.1 + tinyrainbow: 1.2.0 + vite: 5.4.10(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) vite-node: 2.1.3(@types/node@22.7.7)(sass-embedded@1.80.3)(sass@1.79.3)(terser@5.31.6) why-is-node-running: 2.3.0 optionalDependencies: From 2cd85b2eb881c70ebfdc5c08d5559ca1aade3993 Mon Sep 17 00:00:00 2001 From: Sindre Moldeklev Date: Wed, 23 Oct 2024 14:11:56 +0200 Subject: [PATCH 6/6] Cast til korrekt type... --- .../src/components/avtaler/AvtaleSkjemaDetaljer.tsx | 6 ++++-- .../TiltaksgjennomforingKnapperad.tsx | 2 +- .../TiltaksgjennomforingSkjemaPage.tsx | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/frontend/mr-admin-flate/src/components/avtaler/AvtaleSkjemaDetaljer.tsx b/frontend/mr-admin-flate/src/components/avtaler/AvtaleSkjemaDetaljer.tsx index 434df233bb..1d132d033d 100644 --- a/frontend/mr-admin-flate/src/components/avtaler/AvtaleSkjemaDetaljer.tsx +++ b/frontend/mr-admin-flate/src/components/avtaler/AvtaleSkjemaDetaljer.tsx @@ -152,8 +152,10 @@ export function AvtaleSkjemaDetaljer({ tiltakstyper, ansatt, enheter, avtale }: {...register("tiltakstype")} onChange={(event) => { setValue("amoKategorisering", null); - const options = event.target.value?.tiltakskode - ? avtaletypeOptions(event.target.value.tiltakskode) + const options = (event.target.value as { tiltakskode: string })?.tiltakskode + ? avtaletypeOptions( + (event.target.value as { tiltakskode: Tiltakskode }).tiltakskode, + ) : []; const avtaletype = options[0]?.value; if (options.length === 1) { diff --git a/frontend/mr-admin-flate/src/pages/tiltaksgjennomforinger/TiltaksgjennomforingKnapperad.tsx b/frontend/mr-admin-flate/src/pages/tiltaksgjennomforinger/TiltaksgjennomforingKnapperad.tsx index 4f5d8de082..38b4bc8af6 100644 --- a/frontend/mr-admin-flate/src/pages/tiltaksgjennomforinger/TiltaksgjennomforingKnapperad.tsx +++ b/frontend/mr-admin-flate/src/pages/tiltaksgjennomforinger/TiltaksgjennomforingKnapperad.tsx @@ -74,7 +74,7 @@ export function TiltaksgjennomforingKnapperad({ bruker, tiltaksgjennomforing }: } }} > - Rediger tiltaksgjennomføring + Rediger gjennomføring {enableOpprettTilsagn && gjennomforingIsAktiv(tiltaksgjennomforing.status.status) ? ( - {redigeringsModus ? "Rediger tiltaksgjennomføring" : "Opprett ny tiltaksgjennomføring"} + {redigeringsModus ? "Rediger gjennomføring" : "Opprett ny tiltaksgjennomføring"} {tiltaksgjennomforing ? (