From 74068fe33cf48b47e48062fb42f6a2b4ae4bf5b8 Mon Sep 17 00:00:00 2001 From: "Thomas H. Wiberg" Date: Tue, 10 Sep 2024 08:36:51 +0200 Subject: [PATCH] Dev next1 update from master (#6565) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Dev-next1 branch deployment til k9-next.dev.intern.nav.no (#6340) * nais deploy konfigurasjon for dev-next1 oppretta. name, ingress og replicas konfigurasjon for nais dev deploy trekt ut i separate filer. dev.yaml inneheld samme konfigurasjonsverdier som før var hardkoda i dev-fss-k9saksbehandling.yml, for normal utrulling til Q dev-next1.yaml inneheld konfigurasjonsverdier for utrulling til ny dev-next1 instans. * Build and deploy dev-next1 workflow oppretta. Denne vil ved push til dev-next1 branch bygge og rulle ut instans av k9-sak-web til k9.dev-next1.intern.navn.no, slik at meir eksperimentelle ting kan testast der før det går til master. * Fiks ingress url til gyldig verdi. * Bumper ft-pakke (#6346) * Fjerner gammal proxy referanse til diagnosekoder service. (#6351) Ikkje i bruk lenger. * Aktiverer det nye meldingspanelet i testmiljø. (#6336) * Fiks maks lengde på brevtekst. (#6354) Hadde brukt makslengde verdi frå FritekstbrevinnholdDto server har, men maks lengde er faktisk ulik alt etter om malen som er valgt er av type som større fritekst og tittel, eller berre fritekst. Endre til å bruke BestillBrevDto makslengde når mal ikkje støtter tittel,og FritekstbrevinnholdDto sin makslengde når mal støtter tittel. Endre også slik at fritekst prop ikkje blir satt (sendt til server) når det er brev med tittel og tekst, sidan den då vil kunne bli for lang. * Sjekker om exception er definert før bruk (#6355) * Bump @navikt/k9-sak-typescript-client (#6359) Bumps [@navikt/k9-sak-typescript-client](https://github.com/navikt/k9-sak) from 1.0.20240620093339 to 1.0.20240708134619. - [Commits](https://github.com/navikt/k9-sak/commits) --- updated-dependencies: - dependency-name: "@navikt/k9-sak-typescript-client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump the patch group across 1 directory with 6 updates (#6350) Bumps the patch group with 6 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@playwright/test](https://github.com/microsoft/playwright) | `1.45.0` | `1.45.1` | | [postcss](https://github.com/postcss/postcss) | `8.4.38` | `8.4.39` | | [typescript](https://github.com/Microsoft/TypeScript) | `5.5.2` | `5.5.3` | | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.3.2` | `5.3.3` | | [@editorjs/header](https://github.com/editor-js/header) | `2.8.1` | `2.8.5` | | [@editorjs/paragraph](https://github.com/editor-js/paragraph) | `2.11.5` | `2.11.6` | Updates `@playwright/test` from 1.45.0 to 1.45.1 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.45.0...v1.45.1) Updates `postcss` from 8.4.38 to 8.4.39 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.38...8.4.39) Updates `typescript` from 5.5.2 to 5.5.3 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.2...v5.5.3) Updates `vite` from 5.3.2 to 5.3.3 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.3.3/packages/vite) Updates `@editorjs/header` from 2.8.1 to 2.8.5 - [Commits](https://github.com/editor-js/header/commits) Updates `@editorjs/paragraph` from 2.11.5 to 2.11.6 - [Commits](https://github.com/editor-js/paragraph/commits) --- updated-dependencies: - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch - dependency-name: "@editorjs/header" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch - dependency-name: "@editorjs/paragraph" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jostein Stuhaug <135307852+josstn@users.noreply.github.com> * Advarsel om søker ikke er sammen med barnet i sykdomssteget. (#6360) * Setter bakgrunnsfarge for varsel i MedisinskVilkår. * Updated readme (#6367) * Oppdatert README.md Fjerna utdaterte ting, la inn litt ny nyttig info. * Oppdatert README.md Litt forbedring av teksten. * Oppdatert README.md Litt info om bygg og deploy av prosjektet. * Tsff 657 cleaning a bit (#6358) * Rydding i packages/form. Ingen funksjonell endring. - Fjern unødvendig prop-types dependency - Endre gjenverande jsx til tsx * Rydding i packages/prop-types. Ingen funksjonell endring. Fjern ubruk behandlingIListePropType.jsx * Rydding i packages/prop-types. Ingen funksjonell endring. Fjern ubrukt arbeidsforholdPropType.jsx og uttaksresultatPropType.jsx * Rydding i packages/prop-types. Ingen funksjonell endring. Fjern ubrukt beregningresultatMedUttaksplanPropType.jsx og fagsakPropType.jsx * Rydding i packages/prop-types. Ingen funksjonell endring. Fjern ubrukt navAnsattPropType.jsx, personopplysningPropType.jsx og rettighetPropType.jsx * Rydding i packages/prop-types. Ingen funksjonell endring. Fjern ubrukt stonadskontoPropType.jsx. * 10 dager ttl på dev-next1 branch deployment. (#6376) * 10 dager ttl på dev-next1 branch deployment. Sidan dev-next1 branch deployment kanskje ikkje blir brukt heile tida legger eg til "time to live" på ti dager på app spec. Det vil seie at app blir sletta etter 10 dager viss det ikkje har skjedd nokon ny bygg og deploy av dev-next1 branch på den tida. Så slepper vi å bruke ressurser på å ha den køyrande ubrukt. * Info om ttl på dev-next1 lagt til i README.md * bugfix inngang til saker fra salesforce * fikse story * Justert mellomrom i FormkravKlageForm.jsx skjema. (#6386) * Tsff 641/storbritannia skal ikke vises som eos land (#6389) * Storbritannia er ikke et EØS-land. Fikser visning av årsak for Sveits * Storbritannia er ikke et EØS-land. Fikser visning av årsak for Sveits * Lint fiks. * tester for utenlandsopphold-visning * kosovo fix --------- Co-authored-by: Jostein Stuhaug * Fiks v2/backend/README.md (#6391) Slik at den stemmer betre. * Aktiver nytt meldingspanel i prod. (#6396) Og dev. * Github pipeline workflow uten issue for deployment. (#6404) * Github pipeline workflow uten issue for deployment. Erstatter bruken av issue med kommentering for å styre utrulling av endringer med å køyre utrulling til Q direkte i workflow, og bruke environment klausul med godkjenning ved utrulling til prod. Legger og inn tagging av prodsatte commits, samme tag som docker image som blir rulla ut har. Legger og inn ein latest_prod tag som alltid peikar på den commit som sist vart rulla ut til prod. Med dette får vi og printa ut url for å enkelt sjå kva endringer som vil bli rulla ut, eller har blitt rulla ut på ei gitt workflow køyring. * Marker utrulling til dev med environment og. Slik at det kjem fram i deployments oversikt på repoet. * Oppdatering avhengigheter (#6406) * Div test/build dependencies oppdatert. * i18n-iso-countries oppdatert. * Fjerner webpack-merge avhengighet. Kan bruke standard object merge istadenfor. * Oppdatert uuid til versjon 10. * Oppdatert vitest til versjon 2. Einaste breaking change som vart vurdert til å kunne ha konsekvens for oss er https://github.com/vitest-dev/vitest/pull/5749, men fant ingen tilfeller i koden der mock results er sjekka. * Reduser oppdeling av dependabot PRs litt. (#6420) Lar patch og minor oppdateringer gå i samme gruppe. Legger og opp til ei gruppering for storybook major oppdateringer, men at vanlege går i hovedgruppa. * Dep adjust (#6423) * Juster namn på dependabot gruppe etter forrige justering. * Avgrens eslint-plugin-vitest versjoner til 0.4, versjon 0.5 krever oppdatering til eslint 9. * dev-next1 Application ttl må spesifiserast i timar. * Ekskluder eslint-plugin-vitest frå patch-and-minor dependabot grupper. Sidan versjon 0.5 krever eslint 9. * Bump the patch-and-minor group across 1 directory with 28 updates (#6426) Bumps the patch-and-minor group with 28 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@sentry/browser](https://github.com/getsentry/sentry-javascript) | `8.18.0` | `8.19.0` | | [@sentry/react](https://github.com/getsentry/sentry-javascript) | `8.18.0` | `8.19.0` | | [@playwright/test](https://github.com/microsoft/playwright) | `1.45.2` | `1.45.3` | | [@sentry/cli](https://github.com/getsentry/sentry-cli) | `2.32.2` | `2.33.0` | | [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/a11y) | `8.2.4` | `8.2.6` | | [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/actions) | `8.2.4` | `8.2.6` | | [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/docs) | `8.2.4` | `8.2.6` | | [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/essentials) | `8.2.4` | `8.2.6` | | [@storybook/addon-interactions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/interactions) | `8.2.4` | `8.2.6` | | [@storybook/cli](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/cli) | `8.2.4` | `8.2.6` | | [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/code/renderers/react) | `8.2.4` | `8.2.6` | | [@storybook/react-vite](https://github.com/storybookjs/storybook/tree/HEAD/code/frameworks/react-vite) | `8.2.4` | `8.2.6` | | [@storybook/test](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/test) | `8.2.4` | `8.2.6` | | [@storybook/theming](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/theming) | `8.2.4` | `8.2.6` | | [@testing-library/dom](https://github.com/testing-library/dom-testing-library) | `10.3.2` | `10.4.0` | | [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) | `6.4.6` | `6.4.8` | | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/eslint-plugin) | `7.16.1` | `7.17.0` | | [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) | `7.16.1` | `7.17.0` | | [eslint-plugin-react](https://github.com/jsx-eslint/eslint-plugin-react) | `7.34.4` | `7.35.0` | | [husky](https://github.com/typicode/husky) | `9.1.0` | `9.1.1` | | [jsdom](https://github.com/jsdom/jsdom) | `24.1.0` | `24.1.1` | | [msw](https://github.com/mswjs/msw) | `2.3.1` | `2.3.4` | | [storybook](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/cli) | `8.2.4` | `8.2.6` | | [tailwindcss](https://github.com/tailwindlabs/tailwindcss) | `3.4.4` | `3.4.6` | | [typescript](https://github.com/Microsoft/TypeScript) | `5.5.3` | `5.5.4` | | [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `2.0.3` | `2.0.4` | | [dayjs](https://github.com/iamkun/dayjs) | `1.11.11` | `1.11.12` | | [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) | `5.51.8` | `5.51.11` | Updates `@sentry/browser` from 8.18.0 to 8.19.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.18.0...8.19.0) Updates `@sentry/react` from 8.18.0 to 8.19.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.18.0...8.19.0) Updates `@playwright/test` from 1.45.2 to 1.45.3 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.45.2...v1.45.3) Updates `@sentry/cli` from 2.32.2 to 2.33.0 - [Release notes](https://github.com/getsentry/sentry-cli/releases) - [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-cli/compare/2.32.2...2.33.0) Updates `@storybook/addon-a11y` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/addons/a11y) Updates `@storybook/addon-actions` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/addons/actions) Updates `@storybook/addon-docs` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/addons/docs) Updates `@storybook/addon-essentials` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/addons/essentials) Updates `@storybook/addon-interactions` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/addons/interactions) Updates `@storybook/cli` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/lib/cli) Updates `@storybook/react` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/renderers/react) Updates `@storybook/react-vite` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/frameworks/react-vite) Updates `@storybook/test` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/lib/test) Updates `@storybook/theming` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/lib/theming) Updates `@testing-library/dom` from 10.3.2 to 10.4.0 - [Release notes](https://github.com/testing-library/dom-testing-library/releases) - [Changelog](https://github.com/testing-library/dom-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/dom-testing-library/compare/v10.3.2...v10.4.0) Updates `@testing-library/jest-dom` from 6.4.6 to 6.4.8 - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v6.4.6...v6.4.8) Updates `@typescript-eslint/eslint-plugin` from 7.16.1 to 7.17.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/eslint-plugin/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/eslint-plugin) Updates `@typescript-eslint/parser` from 7.16.1 to 7.17.0 - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.17.0/packages/parser) Updates `eslint-plugin-react` from 7.34.4 to 7.35.0 - [Release notes](https://github.com/jsx-eslint/eslint-plugin-react/releases) - [Changelog](https://github.com/jsx-eslint/eslint-plugin-react/blob/master/CHANGELOG.md) - [Commits](https://github.com/jsx-eslint/eslint-plugin-react/compare/v7.34.4...v7.35.0) Updates `husky` from 9.1.0 to 9.1.1 - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.0...v9.1.1) Updates `jsdom` from 24.1.0 to 24.1.1 - [Release notes](https://github.com/jsdom/jsdom/releases) - [Changelog](https://github.com/jsdom/jsdom/blob/main/Changelog.md) - [Commits](https://github.com/jsdom/jsdom/compare/24.1.0...24.1.1) Updates `msw` from 2.3.1 to 2.3.4 - [Release notes](https://github.com/mswjs/msw/releases) - [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md) - [Commits](https://github.com/mswjs/msw/compare/v2.3.1...v2.3.4) Updates `storybook` from 8.2.4 to 8.2.6 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.6/code/lib/cli) Updates `tailwindcss` from 3.4.4 to 3.4.6 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.6/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.4...v3.4.6) Updates `typescript` from 5.5.3 to 5.5.4 - [Release notes](https://github.com/Microsoft/TypeScript/releases) - [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml) - [Commits](https://github.com/Microsoft/TypeScript/compare/v5.5.3...v5.5.4) Updates `vitest` from 2.0.3 to 2.0.4 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.4/packages/vitest) Updates `dayjs` from 1.11.11 to 1.11.12 - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/dev/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.11.11...v1.11.12) Updates `@tanstack/react-query` from 5.51.8 to 5.51.11 - [Release notes](https://github.com/TanStack/query/releases) - [Commits](https://github.com/TanStack/query/commits/v5.51.11/packages/react-query) --- updated-dependencies: - dependency-name: "@sentry/browser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@sentry/react" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@sentry/cli" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@storybook/addon-a11y" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-docs" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-interactions" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/react-vite" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/theming" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@testing-library/dom" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@typescript-eslint/eslint-plugin" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: eslint-plugin-react dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: jsdom dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: msw dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: storybook dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: tailwindcss dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: typescript dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: dayjs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@tanstack/react-query" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump uuid from 9.0.1 to 10.0.0 (#6241) Bumps [uuid](https://github.com/uuidjs/uuid) from 9.0.1 to 10.0.0. - [Changelog](https://github.com/uuidjs/uuid/blob/main/CHANGELOG.md) - [Commits](https://github.com/uuidjs/uuid/compare/v9.0.1...v10.0.0) --- updated-dependencies: - dependency-name: uuid dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jostein Stuhaug <135307852+josstn@users.noreply.github.com> * Unngå CORS feil i utviklingsmiljø. (#6435) Når server som er proxied for frontend returnere redirect i location header inneheld den av og til server adressa til proxied server. Dermed sende frontend forespørsel direkte til denne utan å gå via devserver proxy. Dette førte til CORS feil. Fikser dette ved å i vite dev server omskrive header location returnert frå proxied backend server til å ikkje innehalde server adressa. * Bump the patch-and-minor group across 1 directory with 24 updates (#6443) * Bump the patch-and-minor group across 1 directory with 24 updates Bumps the patch-and-minor group with 24 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@sentry/browser](https://github.com/getsentry/sentry-javascript) | `8.19.0` | `8.22.0` | | [@sentry/react](https://github.com/getsentry/sentry-javascript) | `8.19.0` | `8.22.0` | | [axios](https://github.com/axios/axios) | `1.7.2` | `1.7.3` | | [@sentry/cli](https://github.com/getsentry/sentry-cli) | `2.33.0` | `2.33.1` | | [@storybook/addon-a11y](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/a11y) | `8.2.6` | `8.2.7` | | [@storybook/addon-actions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/actions) | `8.2.6` | `8.2.7` | | [@storybook/addon-docs](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/docs) | `8.2.6` | `8.2.7` | | [@storybook/addon-essentials](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/essentials) | `8.2.6` | `8.2.7` | | [@storybook/addon-interactions](https://github.com/storybookjs/storybook/tree/HEAD/code/addons/interactions) | `8.2.6` | `8.2.7` | | [@storybook/cli](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/cli) | `8.2.6` | `8.2.7` | | [@storybook/react](https://github.com/storybookjs/storybook/tree/HEAD/code/renderers/react) | `8.2.6` | `8.2.7` | | [@storybook/react-vite](https://github.com/storybookjs/storybook/tree/HEAD/code/frameworks/react-vite) | `8.2.6` | `8.2.7` | | [@storybook/test](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/test) | `8.2.6` | `8.2.7` | | [@storybook/theming](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/theming) | `8.2.6` | `8.2.7` | | [husky](https://github.com/typicode/husky) | `9.1.1` | `9.1.4` | | [msw](https://github.com/mswjs/msw) | `2.3.4` | `2.3.5` | | [postcss](https://github.com/postcss/postcss) | `8.4.39` | `8.4.40` | | [storybook](https://github.com/storybookjs/storybook/tree/HEAD/code/lib/cli) | `8.2.6` | `8.2.7` | | [stylelint](https://github.com/stylelint/stylelint) | `16.7.0` | `16.8.1` | | [tailwindcss](https://github.com/tailwindlabs/tailwindcss) | `3.4.6` | `3.4.7` | | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.3.4` | `5.3.5` | | [vitest](https://github.com/vitest-dev/vitest/tree/HEAD/packages/vitest) | `2.0.4` | `2.0.5` | | [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) | `5.51.11` | `5.51.18` | | [@editorjs/list](https://github.com/editor-js/list) | `1.9.0` | `1.10.0` | Updates `@sentry/browser` from 8.19.0 to 8.22.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.19.0...8.22.0) Updates `@sentry/react` from 8.19.0 to 8.22.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.19.0...8.22.0) Updates `axios` from 1.7.2 to 1.7.3 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.2...v1.7.3) Updates `@sentry/cli` from 2.33.0 to 2.33.1 - [Release notes](https://github.com/getsentry/sentry-cli/releases) - [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-cli/compare/2.33.0...2.33.1) Updates `@storybook/addon-a11y` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/addons/a11y) Updates `@storybook/addon-actions` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/addons/actions) Updates `@storybook/addon-docs` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/addons/docs) Updates `@storybook/addon-essentials` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/addons/essentials) Updates `@storybook/addon-interactions` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/addons/interactions) Updates `@storybook/cli` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/lib/cli) Updates `@storybook/react` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/renderers/react) Updates `@storybook/react-vite` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/frameworks/react-vite) Updates `@storybook/test` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/lib/test) Updates `@storybook/theming` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/lib/theming) Updates `husky` from 9.1.1 to 9.1.4 - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.1...v9.1.4) Updates `msw` from 2.3.4 to 2.3.5 - [Release notes](https://github.com/mswjs/msw/releases) - [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md) - [Commits](https://github.com/mswjs/msw/compare/v2.3.4...v2.3.5) Updates `postcss` from 8.4.39 to 8.4.40 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.39...8.4.40) Updates `storybook` from 8.2.6 to 8.2.7 - [Release notes](https://github.com/storybookjs/storybook/releases) - [Changelog](https://github.com/storybookjs/storybook/blob/next/CHANGELOG.md) - [Commits](https://github.com/storybookjs/storybook/commits/v8.2.7/code/lib/cli) Updates `stylelint` from 16.7.0 to 16.8.1 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.7.0...16.8.1) Updates `tailwindcss` from 3.4.6 to 3.4.7 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.7/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.6...v3.4.7) Updates `vite` from 5.3.4 to 5.3.5 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.3.5/packages/vite) Updates `vitest` from 2.0.4 to 2.0.5 - [Release notes](https://github.com/vitest-dev/vitest/releases) - [Commits](https://github.com/vitest-dev/vitest/commits/v2.0.5/packages/vitest) Updates `@tanstack/react-query` from 5.51.11 to 5.51.18 - [Release notes](https://github.com/TanStack/query/releases) - [Commits](https://github.com/TanStack/query/commits/v5.51.18/packages/react-query) Updates `@editorjs/list` from 1.9.0 to 1.10.0 - [Commits](https://github.com/editor-js/list/commits) --- updated-dependencies: - dependency-name: "@sentry/browser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@sentry/react" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@sentry/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-a11y" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-actions" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-docs" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-essentials" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/addon-interactions" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/cli" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/react" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/react-vite" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@storybook/theming" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: msw dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: storybook dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: tailwindcss dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: vitest dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@tanstack/react-query" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@editorjs/list" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor ... Signed-off-by: dependabot[bot] * Nedgraderer @editorjs/list --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hallvard Andreas Stark * Bumper pakker (#6445) * Tillat 12000 tegn i tilbakekrevingsform (#6450) * TSFF-644: Resultat settes for tidlig på behandlingene (#6444) * Bruk getStatusText i gammel visning, slik at "Ikke fastsatt" vises for pågående saker * Fiks test * Oppgraderer til eslint 9 (#6428) * Oppgraderer til eslint 9. Disse pakker/plugins blir fjerna som ein del av dette, fordi dei ikkje er kompatible med versjon 9, eller ikkje ser ut til å ha nytteverdi for oss: @typescript-eslint/eslint-plugin, @typescript-eslint/parser: Erstatta med typescript-eslint plugin. eslint-config-airbnb: Siste oppdatering var tre år sidan, og blir ikkje oppdatert med det første. eslint-plugin-import, eslint-import-resolver-typescript: Støtter ikkje versjon 9, og uvisst kor nyttig denne er for oss. Trur andre delar av build gjere nok sjekk på imports. eslint-plugin-jest-dom: Denne ser ikkje ut til å ha vore aktivert i gammal konfigurasjon. Fekk masse feil når den vart aktivert med recommended innstillinger, og fekk ikkje framprovosert feil i gammal konfigurasjon. eslint-plugin-storybook: Ikkje oppdatert til versjon 9, og ser ikkje ut til å ha vore aktivert i gammal konfigurasjon. Klarte ikkje framprovosere feil der ut frå anbefalt sjekk. Endre også tsconfig.json innstilling til react-jsx. Med dette slepp ein å importere React i alle filer som bruker jsx. Og unngår dermed eslint feil om unused-var frå importen av React. Den nye eslint.config.mjs prøver å forenkle i forhold til gammal konfigurasjon, den aktiverer i utgangspunktet recommended settings frå grunnkonfigurasjon og alle plugins, og så tilpasser den litt der det trengs for å unngå for mykje feil i eksisterande kodebase. Kan så skru denne meir strict etterkvart viss vi ser mulighet for det, feks for filer under packages/v2. * Diverse minimale endringer for kompatibilitet med eslint 9. Kun endringer i kommentarer og typescript/postcss konfigurasjon. Ingen endring i runtime javascript. * yarn.lock oppdatert etter fjerning av dayjs. * Tillat 12000 tegn i revurdering (#6456) * Tillat 12000 tegn i tilbakekrevingsform * Tillat 12000 tegn i flere situasjoner * Venter til etter første render, når behandlingId skal være satt, på å… (#6455) * Venter til etter første render, når behandlingId skal være satt, på å sjekke om den faktisk er satt. Hvis ikke er ingen behandlinger valgt og den evt åpne behandlingen skal vises * Forbedring av logikk * Unngå javascript feil pga undefined templates i MeldingerSakIndex.tsx. (#6459) Bakgrunn: Ved feil i bakenforliggande system kan det skje at kall til formidling server for å hente maler feiler (returnerer 500). Dette førte til javascript feil sidan MeldingIndex forventa at templates verdi alltid skulle vere eit objekt, og ikkje undefined som det vart viss serverkall feila. Løysing: Viser alert med informativ feilmelding istadenfor meldingspanel, viss kall for å hente maler har feila. Svakhet: Viss det finnast tilfeller der det er korrekt at det ikkje blir returnert maler for ei sak, så vil det framleis føre til feil. Antar at dette aldri skal skje. * Reverter til 1500 tegn (#6460) * Revert "Tillat 12000 tegn i revurdering (#6456)" This reverts commit c680b93f96067aa3693fe53e4bdd6683df26ae1d. * Revert "Tillat 12000 tegn i tilbakekrevingsform (#6450)" This reverts commit 5c4699c5ac68a91e536a9e15a1c734bd3b071451. * HistorikkEndretFeltType for opphør av refusjon (#6464) * Skriver fakta-medlemskap om til typescript (#6317) * Skriver medlemskap om til typescript Skriver bort redux-form i medlemskap * Rydder litt * Rydding og mer typing * Legger inn manglende verdier fra formState i OppholdINorge..... Bruker valideringsfunksjoner fra ft-frontend-saksbehandling * Tilpasser tester * Venter med å rendre panel til api-kall er ferdig * Forbedret visning av åpne perioder Fikset funksjonalitet for avbryt-knapp * Setter riktig versjon av pakke * Fjernet utkommentert kode * Fjerner bruk av react-intl, må beholde RawIntlProvider pga felleskomponenter som trenger * Fjerner eslint ignores * Legger på manglende typing * Forbedrer logikk som ikke ga mye mening * Legger til test * TSFF-289: Kunne avslå ekstra omsorgsdager for barn over 18 år (#6463) * Legg til aldersvilkår for kronisk syk * Legg til manglende komma * Bruk const, ikke var * Fiks brevpanel så valgt mottaker viser korrekt etter bytte av mal. (#6467) Før dette kunne tidlegare valgt mottaker vise som valgt etter at ein hadde bytte mal, sjølv om komponent state hadde resatt valgt mottaker til å vere første på valgte mal. * Bump paketer (#6470) * Editorjs fix (#6434) * Fjerner resolution på editorjs, oppgraderer til versjon 2.30.2. Fikser typescript problem med versjone 2.30.2. * Litt forbetring av EditorJSWrapper og FritekstEditor. Laga story som tester FritekstEditor komponent, og generelt forbetra EditorJSWrapper og FritekstEditor litt. * Fikser unødvendig re-initialisering av editorjs. La til useCallback med korrekte deps rundt litt funksjoner i FritekstRedigering.tsx og FritekstBrevPanel.tsx slik at vi unngår at callback funksjoner sendt som props ned til FritekstEditor endrer seg ved kvar re-render og dermed fører til re-initialisering av editorjs. * Fikser looping/feil ved innlasting av editorjs i FritekstEditor.tsx Virka som det var unødvendig å kalle lagre og oppdaterFormFelt etter kvar initialisering av editor. oppdaterFormFelt blir uansett kalla i handleSubmit i ovanliggande komponent, så formik verdi blir oppdatert der. Trur og dette forårsaka ein race condition eller noko anna rart som førte til feilmeldinger frå editorjs (Block has invalid content). Ville tru det gjerne kom i konflikt med at submithandler vart kalla ca samtidig. Med denne endring kan lastEditor køyre på kvar endring av redigerbartInnhold prop, slik at komponenten sin reaktivitet er inntakt. Ein kan dermed bruke den utan å unmounte + remounte som ein måtte gjere før for å få korrekt oppførsel viss redigerbartInnhold prop endra seg utanfrå. * Fiks FritekstEditor.stories.tsx etter forrige endring i FritekstEditor. * Fjerner ts-expect-error som visstnok ikkje var nødvendig likevel. --------- Co-authored-by: Thomas H. Wiberg * Sett ALDERSVILKAR_KRONISK_SYK til true i dev * Legg til ALDERSVILKAR_KRONISK_SYK i featureToggles.json * Viser arbeidsgivernavn i historikk (#6476) * Sjekk om aldersvilkår finnes på behandling før panel legges til (#6478) * Bump the patch-and-minor group across 1 directory with 8 updates (#6484) Bumps the patch-and-minor group with 8 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@sentry/browser](https://github.com/getsentry/sentry-javascript) | `8.25.0` | `8.26.0` | | [@sentry/react](https://github.com/getsentry/sentry-javascript) | `8.25.0` | `8.26.0` | | [axios](https://github.com/axios/axios) | `1.7.3` | `1.7.4` | | [postcss](https://github.com/postcss/postcss) | `8.4.40` | `8.4.41` | | [stylelint](https://github.com/stylelint/stylelint) | `16.8.1` | `16.8.2` | | [tailwindcss](https://github.com/tailwindlabs/tailwindcss) | `3.4.9` | `3.4.10` | | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.4.0` | `5.4.1` | | [@editorjs/editorjs](https://github.com/codex-team/editor.js) | `2.30.2` | `2.30.5` | Updates `@sentry/browser` from 8.25.0 to 8.26.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.25.0...8.26.0) Updates `@sentry/react` from 8.25.0 to 8.26.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.25.0...8.26.0) Updates `axios` from 1.7.3 to 1.7.4 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.3...v1.7.4) Updates `postcss` from 8.4.40 to 8.4.41 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.40...8.4.41) Updates `stylelint` from 16.8.1 to 16.8.2 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.8.1...16.8.2) Updates `tailwindcss` from 3.4.9 to 3.4.10 - [Release notes](https://github.com/tailwindlabs/tailwindcss/releases) - [Changelog](https://github.com/tailwindlabs/tailwindcss/blob/v3.4.10/CHANGELOG.md) - [Commits](https://github.com/tailwindlabs/tailwindcss/compare/v3.4.9...v3.4.10) Updates `vite` from 5.4.0 to 5.4.1 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.1/packages/vite) Updates `@editorjs/editorjs` from 2.30.2 to 2.30.5 - [Release notes](https://github.com/codex-team/editor.js/releases) - [Changelog](https://github.com/codex-team/editor.js/blob/next/docs/CHANGELOG.md) - [Commits](https://github.com/codex-team/editor.js/compare/v2.30.2...v2.30.5) --- updated-dependencies: - dependency-name: "@sentry/browser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@sentry/react" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: tailwindcss dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@editorjs/editorjs" dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Fjern unødvendige devDependencies i behandling-unntak. (#6488) * Juster lint-staged konfigurasjon. (#6483) Slik konfigurasjonen var kunne det ifølge dokumentasjonen (https://www.npmjs.com/package/lint-staged#configuration) oppstå race conditions fordi eslint --fix og prettier --write kunne ende opp med å endre samme fil samtidig. Går derfor over til "array syntax" for å køyre både eslint og prettier uten race condition. Justerer og slik at ein unngår å køyre fiks på genererte *.module.d.css.ts filer, sidan dette førte til feil i typed-css-modules sjekk etterpå (fjerna quotes som den krevde). * Modernisering feilmeldingskode (#6482) * Ny komponent for stor feilmelding på side. Bruker aksel komponenter og dropper intl støtte for å forenkle kodebasen. * Skriver om ForbiddenPage komponent til å bruke ny BigError komponent. Lager også separat, moderne storybook fil for den, og flytter test inn i storybook. * Skriver om NotFoundPage komponent til å bruke ny BigError komponent. Lager også separat, moderne storybook fil for den, og flytter test inn i storybook. * Skriver om UnauthorizedPage komponent til å bruke ny BigError komponent. Lager også separat, moderne storybook fil for den, og flytter test inn i storybook. * Skriver om IngenBehandlingValgtPanel komponent til å ikkje bruke intl lenger Lager også separat, moderne storybook fil for den, og flytter test inn i storybook. * Fjerna ubrukt textCode prop på ErrorBoundary, lagt til storybook test * Endra ErrorPage til å bruke BigError, fjerna ErrorPageWrapper. Lage samtidig story for ErrorPage og flytte test inn der. * Legg til standardfeilmelding og større margin på BigError. * Justert feilmelding som viser når ErrorBoundary blir utløst. Oppfordrer brukeren til å laste sida på nytt for å prøve igjen, og så melde frå viss det ikkje hjalp. * ErrorBoundary viser no referanse til sentry rapport. Slik at saksbehandler kan inkludere denne viss feil blir rapportert inn, og forenkle vår feilsøking. * Flytta sak-infosider til v2/gui/src/sak/feilmeldinger. Sletta gammal sak-infosider pakke. Gjere og nødvendige tilpassinger for at kode skal kompilere under v2/. Bytter og namn på ny v2 sak/infomeldinger til sak/feilmeldinger. Justerer title i tilhøyrande storybook filer for å matche ny filsti. * Fiks så CopyButton på ErrorPage blir inline i feilmelding. * typofix i BigError.tsx * NetworkErrorPage komponent for bruk ved nettverksfeil lagt til. Oppfordrer saksbehandler til å prøve igjen ved nettverksfeil, og inkludere litt feilsøkingsinfo ved innrapportering av feil som ikkje løyser seg ved retry. * Handter nettverksfeil i BehandlingTilbakekrevingIndex. Viser feilmelding istadenfor å prøve å køyre vidare med manglande data viss lasting av data frå server feiler. * Fjern utdatert referanse til sak-infosider, fiks ulovlig import path. * css module typegen * legg til "--allow-empty" på lint-staged hook. Ellers vart commit av generert typescript deklarasjon for css modul blokkert. * Behold quotes i modules.d.css.ts filer prettier fjerner disse, men då feila typed-css-modules sjekken etterpå, så må beholde disse quotes. * Revert "legg til "--allow-empty" på lint-staged hook." This reverts commit b0d6b3041c88747e747efe43ac601affa01f7313. * Bump axios-mock-adapter from 1.22.0 to 2.0.0 (#6449) Bumps [axios-mock-adapter](https://github.com/ctimmerm/axios-mock-adapter) from 1.22.0 to 2.0.0. - [Release notes](https://github.com/ctimmerm/axios-mock-adapter/releases) - [Changelog](https://github.com/ctimmerm/axios-mock-adapter/blob/master/CHANGELOG.md) - [Commits](https://github.com/ctimmerm/axios-mock-adapter/compare/v1.22.0...v2.0.0) --- updated-dependencies: - dependency-name: axios-mock-adapter dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump @navikt/familie-endringslogg from 12.0.2 to 13.1.1 (#6461) Bumps [@navikt/familie-endringslogg](https://github.com/navikt/familie-felles-frontend) from 12.0.2 to 13.1.1. - [Commits](https://github.com/navikt/familie-felles-frontend/compare/@navikt/familie-endringslogg@12.0.2...@navikt/familie-endringslogg@13.1.1) --- updated-dependencies: - dependency-name: "@navikt/familie-endringslogg" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump elliptic from 6.5.5 to 6.5.7 (#6487) Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.5 to 6.5.7. - [Commits](https://github.com/indutny/elliptic/compare/v6.5.5...v6.5.7) --- updated-dependencies: - dependency-name: elliptic dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Refaktor prosess-vilkar overstyring (#6468) * prosess-vilkar overstyring Skriver bort redux-form * Rydding * La til manglende prop * Fiksing av tester * Legger tilbake ugyldige datoer i kalender * Fjerner unødige valideringsfunksjoner * Retter opp etter endring i prop * Bruker felles verdikjedetest workflow (#6495) * TSFF-633 - fikser typing og skriver bort redux-form i prosess-søknadsfrist (#6349) * TSFF-633 - fikser typing og skriver bort redux-form Legger til knapp som muligjør endring av vurdering * Fikser i stories * Gjenoppretter story * La til tester Fikset resetting av form Skrevet bort siste rest av redux-form * Retter tester * Justerer css * Sjekker på om begrunnelse finnes før man kan redigere den * Flytter avbrytknapp til mer logisk sted Liten oppdatering av story * Fjerner bruk av react-intl, må beholde RawIntlProvider pga felleskomponenter som trenger * Fikser paneltittel * Fikser visning av løst aksjonspunkt * prettier av package.json * Revert "TSFF-633 - fikser typing og skriver bort redux-form i prosess-søknadsfrist (#6349)" This reverts commit 23c23c717e561e37b354084bf95387a14dae7616. * Legg til ff og utvid varseltekst (#6514) * Legg til ff og utvid varseltekst * Utvid tekst også i TilbakekrevingVedtakUtdypendeTekstPanel * Mock ff i tester * Konkursvarsel brevsending (#6477) * Fiks brevpanel så valgt mottaker viser korrekt etter bytte av mal. Før dette kunne tidlegare valgt mottaker vise som valgt etter at ein hadde bytte mal, sjølv om komponent state hadde resatt valgt mottaker til å vere første på valgte mal. * Korrigert typing på Template frå formidling. * Brev: Legg til støtte for feilmelding ved valg av utilgjengelig mottaker. Bakgrunn: Ønske om å vise feilmelding og hindre at saksbehandler kan forsøke å sende brev som vi veit i neste omgang vil feile fordi mottaker, feks eit firma er gått konkurs. Løysing: Backend implementerer ny property "utilgjengelig" på mottaker definert på maler returnert, denne blir satt med enum som signalierer årsak til at mottaker er utilgjengelig for brevsending. Viss utilgjengelig ikkje er satt er mottaker normalt tilgjengelig. Backend endrer også til å alltid returnere mottaker på maler, i motsetning til før då mottaker kunne vere undefined når mal berre skulle sendast til brukar saka gjaldt. Ny frontend kode forventer at det alltid er satt minst ein mottaker for at det skal vere mulig å sende brev basert på mal. Dette forenkler valideringskoden i frontend. Frontend vil no vise evt signal om utilgjengelig mottaker i nedtrekksliste for å velge mottaker, og viss saksbehandler likevel prøver å sende til ein utilgjengelig mottaker vil det bli vist valideringsfeil og sending vil bli blokkert. Dette er pr no berre implementert ved valg av mottaker frå nedtrekksliste, ikkje ved sending til tredjepartsmottaker. * Brev: Vis feilmelding ved forsøk på sending av brev til opphørt tredjepartsmottaker. Tilsvarande som ved valg av utilgjengelig mottaker. * yarn.lock fiks etter merge. * yarn install etter merge. * Fiksa suffiks på imports. (ts => js) * Bump the patch-and-minor group across 1 directory with 14 updates (#6524) Bumps the patch-and-minor group with 14 updates in the / directory: | Package | From | To | | --- | --- | --- | | [@sentry/browser](https://github.com/getsentry/sentry-javascript) | `8.26.0` | `8.27.0` | | [@sentry/react](https://github.com/getsentry/sentry-javascript) | `8.26.0` | `8.27.0` | | [axios](https://github.com/axios/axios) | `1.7.4` | `1.7.5` | | [@playwright/test](https://github.com/microsoft/playwright) | `1.46.0` | `1.46.1` | | [@sentry/cli](https://github.com/getsentry/sentry-cli) | `2.33.1` | `2.34.1` | | [@testing-library/jest-dom](https://github.com/testing-library/jest-dom) | `6.4.8` | `6.5.0` | | [@testing-library/react](https://github.com/testing-library/react-testing-library) | `16.0.0` | `16.0.1` | | [eslint](https://github.com/eslint/eslint) | `9.9.0` | `9.9.1` | | [husky](https://github.com/typicode/husky) | `9.1.4` | `9.1.5` | | [msw](https://github.com/mswjs/msw) | `2.3.5` | `2.4.1` | | [stylelint](https://github.com/stylelint/stylelint) | `16.8.2` | `16.9.0` | | [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) | `5.4.1` | `5.4.2` | | [dayjs](https://github.com/iamkun/dayjs) | `1.11.12` | `1.11.13` | | [@tanstack/react-query](https://github.com/TanStack/query/tree/HEAD/packages/react-query) | `5.51.23` | `5.52.3` | Updates `@sentry/browser` from 8.26.0 to 8.27.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.26.0...8.27.0) Updates `@sentry/react` from 8.26.0 to 8.27.0 - [Release notes](https://github.com/getsentry/sentry-javascript/releases) - [Changelog](https://github.com/getsentry/sentry-javascript/blob/develop/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-javascript/compare/8.26.0...8.27.0) Updates `axios` from 1.7.4 to 1.7.5 - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](https://github.com/axios/axios/compare/v1.7.4...v1.7.5) Updates `@playwright/test` from 1.46.0 to 1.46.1 - [Release notes](https://github.com/microsoft/playwright/releases) - [Commits](https://github.com/microsoft/playwright/compare/v1.46.0...v1.46.1) Updates `@sentry/cli` from 2.33.1 to 2.34.1 - [Release notes](https://github.com/getsentry/sentry-cli/releases) - [Changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/getsentry/sentry-cli/compare/2.33.1...2.34.1) Updates `@testing-library/jest-dom` from 6.4.8 to 6.5.0 - [Release notes](https://github.com/testing-library/jest-dom/releases) - [Changelog](https://github.com/testing-library/jest-dom/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/jest-dom/compare/v6.4.8...v6.5.0) Updates `@testing-library/react` from 16.0.0 to 16.0.1 - [Release notes](https://github.com/testing-library/react-testing-library/releases) - [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md) - [Commits](https://github.com/testing-library/react-testing-library/compare/v16.0.0...v16.0.1) Updates `eslint` from 9.9.0 to 9.9.1 - [Release notes](https://github.com/eslint/eslint/releases) - [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md) - [Commits](https://github.com/eslint/eslint/compare/v9.9.0...v9.9.1) Updates `husky` from 9.1.4 to 9.1.5 - [Release notes](https://github.com/typicode/husky/releases) - [Commits](https://github.com/typicode/husky/compare/v9.1.4...v9.1.5) Updates `msw` from 2.3.5 to 2.4.1 - [Release notes](https://github.com/mswjs/msw/releases) - [Changelog](https://github.com/mswjs/msw/blob/main/CHANGELOG.md) - [Commits](https://github.com/mswjs/msw/compare/v2.3.5...v2.4.1) Updates `stylelint` from 16.8.2 to 16.9.0 - [Release notes](https://github.com/stylelint/stylelint/releases) - [Changelog](https://github.com/stylelint/stylelint/blob/main/CHANGELOG.md) - [Commits](https://github.com/stylelint/stylelint/compare/16.8.2...16.9.0) Updates `vite` from 5.4.1 to 5.4.2 - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.4.2/packages/vite) Updates `dayjs` from 1.11.12 to 1.11.13 - [Release notes](https://github.com/iamkun/dayjs/releases) - [Changelog](https://github.com/iamkun/dayjs/blob/v1.11.13/CHANGELOG.md) - [Commits](https://github.com/iamkun/dayjs/compare/v1.11.12...v1.11.13) Updates `@tanstack/react-query` from 5.51.23 to 5.52.3 - [Release notes](https://github.com/TanStack/query/releases) - [Commits](https://github.com/TanStack/query/commits/v5.52.3/packages/react-query) --- updated-dependencies: - dependency-name: "@sentry/browser" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@sentry/react" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: axios dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@playwright/test" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@sentry/cli" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@testing-library/jest-dom" dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: "@testing-library/react" dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: eslint dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: husky dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: msw dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: stylelint dependency-type: direct:development update-type: version-update:semver-minor dependency-group: patch-and-minor - dependency-name: vite dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: dayjs dependency-type: direct:production update-type: version-update:semver-patch dependency-group: patch-and-minor - dependency-name: "@tanstack/react-query" dependency-type: direct:production update-type: version-update:semver-minor dependency-group: patch-and-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Lag lovdata lenker (#6502) * Lag Lovreferanse-komponent, inkludert tester * Ta i bruk Lovreferanse-komponenten ett sted * Bruk Lovreferanse-komponenten overalt vi viser lovreferanser * Åpne lenke i nytt vindu * Slett filer som ikke burde vært med * Fiks noen tester * Gjør koden litt mer herda mtp forskjellige tekster * Rename test * Herd koden enda mer, og legg til nok en test * Legg til støtte for kapittelreferanser * Bump micromatch from 4.0.7 to 4.0.8 (#6523) Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.7 to 4.0.8. - [Release notes](https://github.com/micromatch/micromatch/releases) - [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md) - [Commits](https://github.com/micromatch/micromatch/compare/4.0.7...4.0.8) --- updated-dependencies: - dependency-name: micromatch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Skru på utvidet varseltekst i prod * TSFF-763: Medlemskap bug (#6527) * fakta-medlemskap: rettet bug der opphold i Norge ikke kunne vurderes * Tar bort ubrukte interfaces * V2 readme (#6510) * Legger til v2/README.md Inneheld litt teknisk retning så langt denne er tenkt ut, for kode under v2/ * Meir v2/readme tekst. * TSFF-775: Legg til felt for privatperson som arbeidsgiver i unntaksløype (#6518) * Legg til felt for privatperson som arbeidsgiver i unntaksløype * Fiks test * Fjern ubrukt mapper * Bump @navikt/k9-sak-typescript-client (#6515) Bumps [@navikt/k9-sak-typescript-client](https://github.com/navikt/k9-sak) from 1.0.20240807105932 to 1.0.20240828103101. - [Commits](https://github.com/navikt/k9-sak/commits) --- updated-dependencies: - dependency-name: "@navikt/k9-sak-typescript-client" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jostein Stuhaug <135307852+josstn@users.noreply.github.com> * Bumper ft pakker (#6530) * Bumper ft pakker * Bumper react-hook-form * Bumper ds pakker --------- Co-authored-by: Hallvard Andreas Stark <57254397+hallvardastark@users.noreply.github.com> * TSFF-775: Fiks filter og legg til ff (#6542) * Fiks filter og legg til ff * Bruk personidentifikator, ikke identifikator * Fiks skrivefeil * Kompatibiltetsfiks med ny openapi generator (#6543) * Korriger type på properties som blir merka som nullable i ny openapi spesifikasjon. * Korriger type som kan vere null med ny openapi generator. * Fikser feil i logikk for aksjonspunkt (#6545) * Fikser feil i logikk for aksjonspunkt * sjekke om periode er definert før bruk * Forbedring av knapp for overstyring (#6535) * Fjerner ubrukt panel prosess-vilkar-sokers-opplysningsplikt (#6536) * Lagery story for ap 5020 (#6551) * Legger til link til brreg.no for å søke fram tredjepartsmottaker. (#6554) * Legger til link til brreg.no for å søke fram tredjepartsmottaker. * Vis link til brreg.no berre når sending til tredjepart er aktivert. * Forbetra feilhandtering (#6552) * Legger til Nav-Callid header i alle kall via v2/backend/ k9-sak client Slik at vi får samme sporingsid på serverkall som ved bruk av gammal RestApi kode. * Legger til addon-outline i storybook oppsett. Gjere det enklare å sjå DOM oppbygging i storybook. * Parameterstyrt mulighet for å overstyre gammal default margin i storybook. Gjere det mulig å fjerne margin og bruke layout: fullscreen når ein lage story for toppnivå (side) komponenter. * Korriger type på properties som blir merka som nullable i ny openapi spesifikasjon. * Meir instrumentering og feilhandtering i backend kommunikasjon. K9 sak klient vil no kaste eigen feiltype med info frå server respons inkludert og typa korrekt. Gjere det lettare å sjekke kva feil som oppsto og informere bruker betre kva som bør gjerast. * Legger til visning av uhandterte feil i async kode (promse rejections). UnhandledRejectionCatcher fanger alle ellers uhandterte promise rejections, og viser feilmelding for dei feil den er programmert til å vise feil for. Disse feil blir vist med ny komponent TopplinjeAlerts + ExtendedApiErrorAlert på toppen av sida, under dekoratør og evt gamle feilmeldinger. I første omgang blir det vist feilmelding viss serverkall til k9-sak har feila. Valideringsfeil rapportert frå server blir fanga opp og ikkje rapportert vidare sidan det er å rekne som brukarfeil i utgangspunktet. Andre feil blir rapportert som før. * yarn install etter merge. * Fjern duplikat import etter merge. * Oppdaterer k9-sak-typescript-client til versjon med meir null union typer. Dette er første versjon av k9-sak-typescript-client generert med nullable: true i openapi definisjon for alle properties som ikkje eksplisitt er markert med @NotNull. * Endrer tsconfig.json lib til ES2022 under v2/ Må vel kunne rekne med at saksbehandlere har nettlesar som støtter dette pr no. * Legger til støtte for visning av meir generelle feil som oppstår i async kode. * Rydding og meir info i sentry feilrapporter. Får blant anna med errorId verdi i sentry rapport når feil som er fanga opp har dette satt. Slik at vi kan søke opp viss brukere rapportere inn feil med errorId. * Kommentar om framtidig utvidelse av feilvisning. * Fiks feil importstier. * Bumper pakker (#6557) * Bump postcss in the patch-and-minor group across 1 directory (#6559) Bumps the patch-and-minor group with 1 update in the / directory: [postcss](https://github.com/postcss/postcss). Updates `postcss` from 8.4.41 to 8.4.45 - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.4.41...8.4.45) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development update-type: version-update:semver-patch dependency-group: patch-and-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Update README.md (#6532) La til eit avsnitt med link til v2/readme * TSFF-791: Fiks validering slik at privat og org arbeidsgiver ikke begge er påkrevd (#6550) * Fiks validering slik at privat og org arbeidsgiver ikke begge er påkrevd * Fiks nullsjekk og import * Legg til type i utilfunksjon * Bruk riktig type i util * Fjern ubrukt import * Bruk === heller enn == * Fikser husky script (#6560) * aktiver hjemler for oms_ao (#6563) * Kodeverk: merge from master * Delete SokersOpplysningspliktPanelDef.tsx * Update FritekstInput.tsx * Update PerioderMedMedlemskapFaktaPanel.spec.tsx * Update VilkarresultatMedOverstyringForm.tsx --------- Signed-off-by: dependabot[bot] Co-authored-by: Jostein Stuhaug <135307852+josstn@users.noreply.github.com> Co-authored-by: Hallvard Andreas Stark <57254397+hallvardastark@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ramin Esfandiari Co-authored-by: Ramin Esfandiari Co-authored-by: vebnor Co-authored-by: Jostein Stuhaug Co-authored-by: Hallvard Andreas Stark Co-authored-by: Audun Eltvik Co-authored-by: Espen Velsvik Co-authored-by: Audun Eltvik Co-authored-by: Qadeer Khan Co-authored-by: Kristofer Giltvedt Selbekk --- .storybook/main.ts | 1 + .storybook/preview.tsx | 18 +- README.md | 5 + _mocks/featureToggles.ts | 10 +- deploy/dev-fss-k9saksbehandling.yml | 2 + deploy/prod-fss-k9saksbehandling.yml | 2 + envDir/.env.development | 1 + feature-toggles.json | 4 + package.json | 46 +- packages/behandling-felles/package.json | 2 +- packages/behandling-frisinn/package.json | 4 +- .../behandling-omsorgspenger/package.json | 6 +- .../behandling-opplaeringspenger/package.json | 8 +- .../package.json | 9 +- .../SokersOpplysningspliktPanelDef.tsx | 44 - packages/behandling-pleiepenger/package.json | 9 +- .../SokersOpplysningspliktPanelDef.tsx | 44 - .../behandling-tilbakekreving/package.json | 4 +- packages/fakta-etablert-tilsyn/package.json | 10 +- packages/fakta-inntektsmelding/package.json | 14 +- packages/fakta-institusjon/package.json | 2 +- .../package.json" | 16 +- packages/fakta-medlemskap/package.json | 4 +- .../src/MedlemskapFaktaIndex.stories.tsx | 64 +- .../OppholdINorgeOgAdresserFaktaPanel.tsx | 1 - .../StatusForBorgerFaktaPanel.spec.tsx | 1 - packages/fakta-om-barnet/package.json | 10 +- packages/fakta-omsorgen-for/package.json | 14 +- packages/fakta-opplaering/package.json | 4 +- .../fakta-overstyr-beregning/package.json | 2 +- packages/form/package.json | 4 +- .../mocks/mockdata/utenlandsoppholdMock.js | 16 + packages/prosess-aarskvantum-oms/package.json | 2 +- .../src/components/AvregningPanel.jsx | 7 +- .../nfp/KlageVurderingRadioOptionsNfp.jsx | 1 + packages/prosess-omsorgsdager/package.json | 8 +- .../prosess-tilkjent-ytelse/i18n/nb_NO.json | 1 + .../src/components/TilkjentYteleseUtils.ts | 36 +- .../src/components/TilkjentYtelse.spec.tsx | 1 + .../src/components/TilkjentYtelse.tsx | 8 +- .../TilkjentYtelseTimeLineData.spec.tsx | 6 +- .../components/TilkjentYtelseTimelineData.tsx | 15 +- .../components/manuellePerioder/Andeler.tsx | 17 +- .../components/manuellePerioder/NyAndel.tsx | 76 +- .../components/manuellePerioder/NyPeriode.tsx | 1 + packages/prosess-uttak/package.json | 14 +- ...bakekrevingEditerVedtaksbrevPanel.spec.tsx | 2 +- ...ekrevingVedtakUtdypendeTekstPanel.spec.tsx | 2 +- ...ilbakekrevingVedtakUtdypendeTekstPanel.tsx | 10 +- packages/prosess-vilkar-alder/package.json | 6 +- .../package.json | 2 +- .../prosess-vilkar-overstyring/package.json | 2 +- ...lkarresultatMedOverstyringProsessIndex.tsx | 7 +- ...rresultatMedOverstyringFormPeriodisert.tsx | 6 +- .../VilkarresultatMedOverstyringForm.tsx | 6 +- .../VilkarresultatMedOverstyringHeader.tsx | 31 +- ...ilkarresultatMedOverstyringForm.module.css | 6 - .../i18n/index.js | 9 - .../i18n/nb_NO.json | 64 - .../index.ts | 1 - .../package.json | 24 - ...ysningspliktVilkarProsessIndex.stories.tsx | 152 --- ...kersOpplysningspliktVilkarProsessIndex.tsx | 56 - .../SokersOpplysningspliktForm.spec.tsx | 165 --- .../components/SokersOpplysningspliktForm.tsx | 313 ----- .../prosess-vilkar-soknadsfrist/package.json | 2 +- packages/prosess-vilkar-sykdom/package.json | 2 +- packages/rest-api/package.json | 3 +- .../src/axios/getAxiosHttpClientApi.ts | 6 +- packages/sak-app/package.json | 22 +- packages/sak-app/src/app/components/Home.tsx | 2 + packages/sak-app/src/bootstrap.tsx | 54 +- packages/sak-behandling-velger/package.json | 4 +- .../src/components/BehandlingPicker.tsx | 2 +- packages/sak-dekorator/package.json | 2 +- packages/sak-dokumenter/package.json | 2 +- packages/sak-historikk/package.json | 2 +- .../sak-meny-marker-behandling/package.json | 2 +- packages/sak-meny-sett-pa-vent/package.json | 2 +- packages/sak-meny/package.json | 2 +- packages/sak-notat/package.json | 12 +- packages/sak-totrinnskontroll/package.json | 2 +- packages/sak-visittkort/package.json | 2 +- packages/shared-components/package.json | 10 +- .../src/beregningsresultatUtbetaltTsType.ts | 1 + packages/utils-test/package.json | 2 +- packages/utils/package.json | 2 +- packages/utils/src/validation/validators.ts | 1 + packages/v2/README.md | 79 ++ packages/v2/backend/package.json | 3 +- .../src/k9sak/errorhandling/K9SakApiError.ts | 34 + .../k9sak/errorhandling/K9SakHttpRequest.ts | 20 + .../src/k9sak/errorhandling/errorData.spec.ts | 27 + .../src/k9sak/errorhandling/errorData.ts | 41 + .../requestWithExtendedErrorHandler.ts | 99 ++ .../v2/backend/src/k9sak/generated/index.ts | 1 + .../k9sak/kodeverk/OpptjeningAktivitetType.ts | 2 +- .../k9sak/kodeverk/behandling/FagsakStatus.ts | 2 +- .../instrumentation/ExtendedApiError.ts | 51 + .../src/shared/instrumentation/navCallid.ts | 13 + .../v2/gui/src/app/K9SakClientContext.tsx | 21 +- .../gui/src/app/UnhandledRejectionCatcher.tsx | 45 + .../v2/gui/src/app/alerts/AlertInfo.spec.ts | 8 + packages/v2/gui/src/app/alerts/AlertInfo.ts | 20 + packages/v2/gui/src/app/alerts/ErrorAlert.tsx | 91 ++ .../app/alerts/ErrorIdEncouragementMsg.tsx | 21 + .../gui/src/app/alerts/GeneralAsyncError.ts | 11 + .../app/alerts/NavCallIdEncouragementMsg.tsx | 18 + .../app/alerts/TopplinjeAlerts.stories.tsx | 65 ++ .../v2/gui/src/app/alerts/TopplinjeAlerts.tsx | 41 + .../sak/feilmeldinger/NetworkErrorPage.tsx | 17 +- .../sak/meldinger/FritekstInput.stories.tsx | 23 +- .../sak/meldinger/MeldingerBackendClient.ts | 4 +- .../src/sak/meldinger/Messages.stories.tsx | 28 +- .../v2/gui/src/sak/meldinger/Messages.tsx | 18 +- .../meldinger/TredjepartsmottakerCheckbox.tsx | 24 + .../storybook/mocks/fakeExtendedApiError.ts | 66 ++ packages/v2/tsconfig.json | 2 +- public/mockServiceWorker.js | 2 +- yarn.lock | 1030 ++++++++--------- 120 files changed, 1803 insertions(+), 1703 deletions(-) delete mode 100644 packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx delete mode 100644 packages/behandling-pleiepenger/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/i18n/index.js delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/i18n/nb_NO.json delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/index.ts delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/package.json delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/src/SokersOpplysningspliktVilkarProsessIndex.stories.tsx delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/src/SokersOpplysningspliktVilkarProsessIndex.tsx delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/src/components/SokersOpplysningspliktForm.spec.tsx delete mode 100644 packages/prosess-vilkar-sokers-opplysningsplikt/src/components/SokersOpplysningspliktForm.tsx create mode 100644 packages/v2/README.md create mode 100644 packages/v2/backend/src/k9sak/errorhandling/K9SakApiError.ts create mode 100644 packages/v2/backend/src/k9sak/errorhandling/K9SakHttpRequest.ts create mode 100644 packages/v2/backend/src/k9sak/errorhandling/errorData.spec.ts create mode 100644 packages/v2/backend/src/k9sak/errorhandling/errorData.ts create mode 100644 packages/v2/backend/src/k9sak/errorhandling/requestWithExtendedErrorHandler.ts create mode 100644 packages/v2/backend/src/shared/instrumentation/ExtendedApiError.ts create mode 100644 packages/v2/backend/src/shared/instrumentation/navCallid.ts create mode 100644 packages/v2/gui/src/app/UnhandledRejectionCatcher.tsx create mode 100644 packages/v2/gui/src/app/alerts/AlertInfo.spec.ts create mode 100644 packages/v2/gui/src/app/alerts/AlertInfo.ts create mode 100644 packages/v2/gui/src/app/alerts/ErrorAlert.tsx create mode 100644 packages/v2/gui/src/app/alerts/ErrorIdEncouragementMsg.tsx create mode 100644 packages/v2/gui/src/app/alerts/GeneralAsyncError.ts create mode 100644 packages/v2/gui/src/app/alerts/NavCallIdEncouragementMsg.tsx create mode 100644 packages/v2/gui/src/app/alerts/TopplinjeAlerts.stories.tsx create mode 100644 packages/v2/gui/src/app/alerts/TopplinjeAlerts.tsx create mode 100644 packages/v2/gui/src/sak/meldinger/TredjepartsmottakerCheckbox.tsx create mode 100644 packages/v2/gui/src/storybook/mocks/fakeExtendedApiError.ts diff --git a/.storybook/main.ts b/.storybook/main.ts index 991699cd5c..83a74d4f54 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -3,6 +3,7 @@ import type { StorybookConfig } from '@storybook/react-vite'; const config: StorybookConfig = { stories: ['../packages/**/*.stories.@(j|t)s?(x)'], addons: [ + '@storybook/addon-outline', '@storybook/addon-actions', '@storybook/addon-controls', '@storybook/addon-interactions', diff --git a/.storybook/preview.tsx b/.storybook/preview.tsx index 76b86176db..e24fa709d1 100644 --- a/.storybook/preview.tsx +++ b/.storybook/preview.tsx @@ -8,7 +8,6 @@ import React from 'react'; import { Provider } from 'react-redux'; import { MemoryRouter } from 'react-router-dom'; -// @ts-ignore const { VITE_LOCAL_STORYBOOK } = import.meta.env; initialize({ @@ -21,6 +20,9 @@ initialize({ const queryClient = new QueryClient(); const preview: Preview = { + parameters: { + margin: '40px' + }, decorators: [ Story => { const store = configureStore(); @@ -28,14 +30,22 @@ const preview: Preview = { -
- -
+ ); }, + // Decorator som legger på ekstra margin. Kan overstyrast med parameter på komponentnivå/enkeltstories ved behov. + // Feks viss ein lager stories for komponenter som skal vise på toppnivå på sida kan det vere lurt å sette parameter + // layout: "fullscreen", som også fjerner margin her. + (Story, {parameters}) => { + return parameters.margin !== null && parameters.layout !== 'fullscreen' ? +
+ +
: + + }, ], loaders: [ async context => { diff --git a/README.md b/README.md index 3b551c7f99..0a26c0af1b 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,7 @@ Aktiveres ved å definere en eller flere features i `.env.development`fil i _env ## Pakkeoppdatering ### Avhengigheter som må ha samme versjon + Noen sub-pakker i dette prosjekt har avhengigheter til kode fra [ft-frontend-saksbehandling](https://github.com/navikt/ft-frontend-saksbehandling). Samtidig har disse sub-pakkene felles avhengigheter med koden i [ft-frontend-saksbehandling](https://github.com/navikt/ft-frontend-saksbehandling). @@ -71,7 +72,10 @@ Kode som legges inn her blir kontrollert av en strengere tsconfig.json. Gammel k det motsatte skal ikke skje, kode under _packages/v2_ skal aldri importere kode som ikke ligger under _v2_. På denne måten får vi gjort en gradvis overgang til bedre kontrollert typescript. +Mer info om dette i [v2/README](./packages/v2/README.md) + ## Bygg og utrulling + Ved merge av **PR til master** branch blir koden bygd inn i et Docker image og rulla ut til testmiljø på https://k9.dev.intern.nav.no. Etter godkjenning i pipeline blir samme Docker image rulla ut i produksjon på https://k9.intern.nav.no/. @@ -80,6 +84,7 @@ skjer automatisk ved merge av **PR til dev-next1** branch. Denne utrulling lever hver nye utrulling her stenges servicen ned inntil det skjer en ny utrulling. ### Storybook + Katalog med brukergrensesnitt-komponenter blir publisert i storybook på https://navikt.github.io/k9-sak-web/ ## For NAV-ansatte diff --git a/_mocks/featureToggles.ts b/_mocks/featureToggles.ts index 2209e5d8a2..cb8d1e4c1c 100644 --- a/_mocks/featureToggles.ts +++ b/_mocks/featureToggles.ts @@ -46,8 +46,8 @@ export const featureTogglesFactory = () => [ value: process.env.VITE_AKSJONSPUNKT_9015, }, { - key: "ALDERSVILKAR_KRONISK_SYK", - value: process.env.VITE_ALDERSVILKAR_KRONISK_SYK + key: 'ALDERSVILKAR_KRONISK_SYK', + value: process.env.VITE_ALDERSVILKAR_KRONISK_SYK, }, { key: 'FRITEKST_REDIGERING', @@ -80,5 +80,9 @@ export const featureTogglesFactory = () => [ { key: 'UTVIDET_VARSELFELT', value: process.env.VITE_UTVIDET_VARSELFELT, - } + }, + { + key: 'SKILL_UT_PRIVATPERSON', + value: process.env.VITE_SKILL_UT_PRIVATPERSON, + }, ]; diff --git a/deploy/dev-fss-k9saksbehandling.yml b/deploy/dev-fss-k9saksbehandling.yml index fad9b01ca0..58611014c0 100644 --- a/deploy/dev-fss-k9saksbehandling.yml +++ b/deploy/dev-fss-k9saksbehandling.yml @@ -109,3 +109,5 @@ spec: value: "true" - name: UTVIDET_VARSELFELT value: "true" + - name: SKILL_UT_PRIVATPERSON + value: "true" diff --git a/deploy/prod-fss-k9saksbehandling.yml b/deploy/prod-fss-k9saksbehandling.yml index 1bd4e8da07..c315db1805 100644 --- a/deploy/prod-fss-k9saksbehandling.yml +++ b/deploy/prod-fss-k9saksbehandling.yml @@ -106,3 +106,5 @@ spec: value: "false" - name: UTVIDET_VARSELFELT value: "true" + - name: SKILL_UT_PRIVATPERSON + value: "false" diff --git a/envDir/.env.development b/envDir/.env.development index 71e32718b9..d8b57743ab 100644 --- a/envDir/.env.development +++ b/envDir/.env.development @@ -16,3 +16,4 @@ VITE_FIX_SOKNADSFRIST_KALENDER_OG_READONLY=true VITE_INKLUDER_KALENDER_PILS=true VITE_OVERSTYRING_UTTAK=true VITE_NYE_NOKKELTALL=true +VITE_SKILL_UT_PRIVATPERSON=true diff --git a/feature-toggles.json b/feature-toggles.json index 95521b80d6..87b84bd75c 100644 --- a/feature-toggles.json +++ b/feature-toggles.json @@ -86,5 +86,9 @@ { "key": "UTVIDET_VARSELFELT", "value": "${UTVIDET_VARSELFELT}" + }, + { + "key": "SKILL_UT_PRIVATPERSON", + "value": "${SKILL_UT_PRIVATPERSON}" } ] diff --git a/package.json b/package.json index 638d0aba03..0a82079955 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "storybook": "VITE_LOCAL_STORYBOOK=true storybook dev -p 9001", "build-storybook": "storybook build -o .static_storybook", "build-storybook-test": "VITE_LOCAL_STORYBOOK=true storybook build --test -o .static_storybook", - "prepare": "husky install", + "prepare": "husky", "sentry-release": "(SENTRY_RELEASE=$(git rev-parse --short HEAD); node ./scripts/sentry-release.cjs)" }, "workspaces": [ @@ -43,16 +43,16 @@ ], "dependencies": { "@hookform/error-message": "^2.0.1", - "@navikt/aksel-icons": "6.13.0", - "@navikt/ds-css": "6.13.0", - "@navikt/ds-react": "6.13.0", - "@navikt/ds-tailwind": "^6.13.0", - "@navikt/familie-endringslogg": "13.1.1", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/aksel-icons": "6.16.3", + "@navikt/ds-css": "6.16.3", + "@navikt/ds-react": "6.16.3", + "@navikt/ds-tailwind": "^6.16.3", + "@navikt/familie-endringslogg": "13.1.2", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", - "@sentry/browser": "8.27.0", - "@sentry/react": "^8.27.0", - "axios": "1.7.5", + "@sentry/browser": "8.28.0", + "@sentry/react": "^8.28.0", + "axios": "1.7.7", "date-fns": "3.6.0", "date-fns-tz": "3.1.3", "history": "5.3.0", @@ -61,13 +61,13 @@ "postcss-import": "^16.1.0", "react": "18.3.1", "react-dom": "18.3.1", - "react-router": "6.26.0", - "react-router-dom": "6.26.0", + "react-router": "6.26.1", + "react-router-dom": "6.26.1", "vite-plugin-svgr": "4.2.0" }, "devDependencies": { - "@playwright/test": "^1.46.1", - "@sentry/cli": "2.34.1", + "@playwright/test": "^1.47.0", + "@sentry/cli": "2.35.0", "@storybook/addon-a11y": "^8.2.9", "@storybook/addon-actions": "^8.2.9", "@storybook/addon-docs": "^8.2.9", @@ -85,7 +85,7 @@ "@testing-library/user-event": "14.5.2", "@types/history": "5.0.0", "@types/prop-types": "15.7.12", - "@types/react": "18.3.3", + "@types/react": "18.3.5", "@types/react-collapse": "5.0.4", "@types/react-router-dom": "5.3.3", "@types/redux-form": "8.3.11", @@ -95,16 +95,16 @@ "cross-env": "7.0.3", "eslint": "9.9.1", "eslint-config-prettier": "9.1.0", - "eslint-plugin-jsx-a11y": "6.9.0", - "eslint-plugin-react": "7.35.0", + "eslint-plugin-jsx-a11y": "6.10.0", + "eslint-plugin-react": "7.35.2", "eslint-plugin-vitest": "~0.5.4", "globals": "^15.9.0", "husky": "9.1.5", - "jsdom": "24.1.1", - "lint-staged": "15.2.9", - "msw": "2.4.1", + "jsdom": "24.1.3", + "lint-staged": "15.2.10", + "msw": "2.4.2", "msw-storybook-addon": "^2.0.3", - "postcss": "^8.4.41", + "postcss": "^8.4.45", "prettier": "3.3.3", "react-popper": "2.3.0", "storybook": "^8.2.9", @@ -115,13 +115,13 @@ "typed-css-modules": "^0.9.1", "typescript": "5.5.4", "typescript-eslint": "^7.18.0", - "vite": "^5.4.2", + "vite": "^5.4.3", "vite-plugin-html": "^3.2.2", "vitest": "2.0.5", "vitest-axe": "0.1.0" }, "resolutions": { - "postcss": "8.4.41", + "postcss": "8.4.45", "parse-url": "8.1.0", "@types/react": "17" }, diff --git a/packages/behandling-felles/package.json b/packages/behandling-felles/package.json index 51a27744de..42d5523362 100644 --- a/packages/behandling-felles/package.json +++ b/packages/behandling-felles/package.json @@ -16,7 +16,7 @@ "@k9-sak-web/modal-sett-pa-vent": "1.0.0", "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-plattform-komponenter": "3.0.8", "classnames": "2.5.1", "react": "18.3.1", "react-intl": "6.6.8", diff --git a/packages/behandling-frisinn/package.json b/packages/behandling-frisinn/package.json index eca812fa12..9b6379dd90 100644 --- a/packages/behandling-frisinn/package.json +++ b/packages/behandling-frisinn/package.json @@ -18,8 +18,8 @@ "@k9-sak-web/rest-api": "1.0.0", "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-fakta-beregning-redesign": "1.2.21", - "@navikt/ft-prosess-beregningsgrunnlag": "6.5.26", + "@navikt/ft-fakta-beregning-redesign": "1.2.27", + "@navikt/ft-prosess-beregningsgrunnlag": "6.5.32", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/behandling-omsorgspenger/package.json b/packages/behandling-omsorgspenger/package.json index fc170eb445..a15858bf4a 100644 --- a/packages/behandling-omsorgspenger/package.json +++ b/packages/behandling-omsorgspenger/package.json @@ -31,9 +31,9 @@ "@k9-sak-web/rest-api": "1.0.0", "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-fakta-beregning-redesign": "1.2.21", - "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.22", - "@navikt/ft-prosess-beregningsgrunnlag": "6.5.26", + "@navikt/ft-fakta-beregning-redesign": "1.2.27", + "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.29", + "@navikt/ft-prosess-beregningsgrunnlag": "6.5.32", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/behandling-opplaeringspenger/package.json b/packages/behandling-opplaeringspenger/package.json index 8bd4071d32..043a8b8e5c 100644 --- a/packages/behandling-opplaeringspenger/package.json +++ b/packages/behandling-opplaeringspenger/package.json @@ -35,10 +35,10 @@ "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/sak-app": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-fakta-beregning-redesign": "1.2.21", - "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.22", - "@navikt/ft-prosess-beregningsgrunnlag": "6.5.26", - "axios": "1.7.5", + "@navikt/ft-fakta-beregning-redesign": "1.2.27", + "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.29", + "@navikt/ft-prosess-beregningsgrunnlag": "6.5.32", + "axios": "1.7.7", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/behandling-pleiepenger-sluttfase/package.json b/packages/behandling-pleiepenger-sluttfase/package.json index c2ef7d1848..f3e9a71224 100644 --- a/packages/behandling-pleiepenger-sluttfase/package.json +++ b/packages/behandling-pleiepenger-sluttfase/package.json @@ -16,7 +16,6 @@ "@fpsak-frontend/prosess-varsel-om-revurdering": "1.0.0", "@fpsak-frontend/prosess-vedtak": "1.0.0", "@fpsak-frontend/prosess-vilkar-opptjening-oms": "1.0.0", - "@fpsak-frontend/prosess-vilkar-sokers-opplysningsplikt": "1.0.0", "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "1.0.0", "@k9-sak-web/behandling-felles": "1.0.0", @@ -31,10 +30,10 @@ "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/sak-app": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-fakta-beregning-redesign": "1.2.21", - "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.22", - "@navikt/ft-prosess-beregningsgrunnlag": "6.5.26", - "axios": "1.7.5", + "@navikt/ft-fakta-beregning-redesign": "1.2.27", + "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.29", + "@navikt/ft-prosess-beregningsgrunnlag": "6.5.32", + "axios": "1.7.7", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx deleted file mode 100644 index afef0f901c..0000000000 --- a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; - -import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType'; -import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes'; -import behandlingType from '@fpsak-frontend/kodeverk/src/behandlingType'; -import SokersOpplysningspliktVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-sokers-opplysningsplikt'; -import { ProsessStegPanelDef } from '@k9-sak-web/behandling-felles'; -import { Aksjonspunkt, Behandling } from '@k9-sak-web/types'; - -class SokersOpplysningspliktPanelDef extends ProsessStegPanelDef { - getId = () => 'SOKERS_OPPLYSNINGSPLIKT'; - - getTekstKode = () => 'Inngangsvilkar.Opptjeningsvilkaret'; - - getKomponent = props => ; - - getAksjonspunktKoder = () => [ - aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_OVST, - aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_MANU, - ]; - - getAksjonspunktTekstkoder = () => [ - 'SokersOpplysningspliktForm.UtfyllendeOpplysninger', - 'SokersOpplysningspliktForm.UtfyllendeOpplysninger', - ]; - - getVilkarKoder = () => [vilkarType.SOKERSOPPLYSNINGSPLIKT]; - - getOverstyrVisningAvKomponent = ({ - behandling, - aksjonspunkterForSteg, - }: { - behandling: Behandling; - aksjonspunkterForSteg: Aksjonspunkt[]; - }) => { - const isRevurdering = behandlingType.REVURDERING === behandling.type; - const hasAp = aksjonspunkterForSteg.some(ap => ap.definisjon === aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_MANU); - return !(isRevurdering && !hasAp); - }; - - getData = ({ soknad }) => ({ soknad }); -} - -export default SokersOpplysningspliktPanelDef; diff --git a/packages/behandling-pleiepenger/package.json b/packages/behandling-pleiepenger/package.json index d2d2050a0c..587eb9ad31 100644 --- a/packages/behandling-pleiepenger/package.json +++ b/packages/behandling-pleiepenger/package.json @@ -17,7 +17,6 @@ "@fpsak-frontend/prosess-varsel-om-revurdering": "1.0.0", "@fpsak-frontend/prosess-vedtak": "1.0.0", "@fpsak-frontend/prosess-vilkar-opptjening-oms": "1.0.0", - "@fpsak-frontend/prosess-vilkar-sokers-opplysningsplikt": "1.0.0", "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "1.0.0", "@k9-sak-web/behandling-felles": "1.0.0", @@ -36,10 +35,10 @@ "@k9-sak-web/sak-app": "1.0.0", "@k9-sak-web/types": "1.0.0", "@navikt/diagnosekoder": "^1.2024.0", - "@navikt/ft-fakta-beregning-redesign": "1.2.21", - "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.22", - "@navikt/ft-prosess-beregningsgrunnlag": "6.5.26", - "axios": "1.7.5", + "@navikt/ft-fakta-beregning-redesign": "1.2.27", + "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.5.29", + "@navikt/ft-prosess-beregningsgrunnlag": "6.5.32", + "axios": "1.7.7", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/behandling-pleiepenger/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx b/packages/behandling-pleiepenger/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx deleted file mode 100644 index afef0f901c..0000000000 --- a/packages/behandling-pleiepenger/src/panelDefinisjoner/prosessStegPaneler/inngangsvilkarPaneler/SokersOpplysningspliktPanelDef.tsx +++ /dev/null @@ -1,44 +0,0 @@ -import React from 'react'; - -import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType'; -import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes'; -import behandlingType from '@fpsak-frontend/kodeverk/src/behandlingType'; -import SokersOpplysningspliktVilkarProsessIndex from '@fpsak-frontend/prosess-vilkar-sokers-opplysningsplikt'; -import { ProsessStegPanelDef } from '@k9-sak-web/behandling-felles'; -import { Aksjonspunkt, Behandling } from '@k9-sak-web/types'; - -class SokersOpplysningspliktPanelDef extends ProsessStegPanelDef { - getId = () => 'SOKERS_OPPLYSNINGSPLIKT'; - - getTekstKode = () => 'Inngangsvilkar.Opptjeningsvilkaret'; - - getKomponent = props => ; - - getAksjonspunktKoder = () => [ - aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_OVST, - aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_MANU, - ]; - - getAksjonspunktTekstkoder = () => [ - 'SokersOpplysningspliktForm.UtfyllendeOpplysninger', - 'SokersOpplysningspliktForm.UtfyllendeOpplysninger', - ]; - - getVilkarKoder = () => [vilkarType.SOKERSOPPLYSNINGSPLIKT]; - - getOverstyrVisningAvKomponent = ({ - behandling, - aksjonspunkterForSteg, - }: { - behandling: Behandling; - aksjonspunkterForSteg: Aksjonspunkt[]; - }) => { - const isRevurdering = behandlingType.REVURDERING === behandling.type; - const hasAp = aksjonspunkterForSteg.some(ap => ap.definisjon === aksjonspunktCodes.SOKERS_OPPLYSNINGSPLIKT_MANU); - return !(isRevurdering && !hasAp); - }; - - getData = ({ soknad }) => ({ soknad }); -} - -export default SokersOpplysningspliktPanelDef; diff --git a/packages/behandling-tilbakekreving/package.json b/packages/behandling-tilbakekreving/package.json index b91e2db417..7233a302ff 100644 --- a/packages/behandling-tilbakekreving/package.json +++ b/packages/behandling-tilbakekreving/package.json @@ -16,8 +16,8 @@ "@k9-sak-web/rest-api": "1.0.0", "@k9-sak-web/rest-api-hooks": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-kodeverk": "^2.4.15", - "@navikt/ft-prosess-tilbakekreving-foreldelse": "3.3.21", + "@navikt/ft-kodeverk": "^2.4.17", + "@navikt/ft-prosess-tilbakekreving-foreldelse": "3.3.27", "react": "18.3.1", "react-intl": "6.6.8" } diff --git a/packages/fakta-etablert-tilsyn/package.json b/packages/fakta-etablert-tilsyn/package.json index 22fd040b55..b318c7a95e 100644 --- a/packages/fakta-etablert-tilsyn/package.json +++ b/packages/fakta-etablert-tilsyn/package.json @@ -10,14 +10,14 @@ "dev": "vite serve" }, "devDependencies": { - "vite": "^5.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { - "@navikt/ds-css": "6.13.0", + "@navikt/ds-css": "6.16.3", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "6.13.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", "classnames": "2.5.1", "dayjs": "1.11.13", @@ -25,7 +25,7 @@ "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-popper": "2.3.0" }, "msw": { diff --git a/packages/fakta-inntektsmelding/package.json b/packages/fakta-inntektsmelding/package.json index fddad23a57..9f9989e591 100644 --- a/packages/fakta-inntektsmelding/package.json +++ b/packages/fakta-inntektsmelding/package.json @@ -10,23 +10,23 @@ "author": "NAV IT", "license": "MIT", "devDependencies": { - "msw": "2.4.1", - "vite": "^5.4.2", + "msw": "2.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { - "@navikt/ds-css": "6.13.0", + "@navikt/ds-css": "6.16.3", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "6.13.0", - "@navikt/ft-form-hooks": "5.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-form-hooks": "5.0.5", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", "classnames": "2.5.1", "dayjs": "1.11.13", "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-popper": "2.3.0" }, "msw": { diff --git a/packages/fakta-institusjon/package.json b/packages/fakta-institusjon/package.json index 000fb0ea07..3d3c7714a6 100644 --- a/packages/fakta-institusjon/package.json +++ b/packages/fakta-institusjon/package.json @@ -7,7 +7,7 @@ "dependencies": { "@fpsak-frontend/form": "*", "@k9-sak-web/types": "*", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-plattform-komponenter": "3.0.8", "formik": "2.4.6" } } diff --git "a/packages/fakta-medisinsk-vilk\303\245r/package.json" "b/packages/fakta-medisinsk-vilk\303\245r/package.json" index 2ba9b2ba26..4b011445e2 100644 --- "a/packages/fakta-medisinsk-vilk\303\245r/package.json" +++ "b/packages/fakta-medisinsk-vilk\303\245r/package.json" @@ -11,26 +11,26 @@ }, "devDependencies": { "cors": "^2.8.5", - "msw": "2.4.1", - "vite": "^5.4.2", + "msw": "2.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { "@fpsak-frontend/form": "1.0.0", "@navikt/diagnosekoder": "^1.2024.0", - "@navikt/ds-css": "6.13.0", + "@navikt/ds-css": "6.16.3", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "6.13.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", - "@tanstack/react-query": "^5.52.3", - "axios": "1.7.5", + "@tanstack/react-query": "^5.55.0", + "axios": "1.7.7", "classnames": "2.5.1", "dayjs": "1.11.13", "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-outside-click-handler": "1.3.0", "react-popper": "2.3.0" }, diff --git a/packages/fakta-medlemskap/package.json b/packages/fakta-medlemskap/package.json index 5e3614c01b..71c8c7165d 100644 --- a/packages/fakta-medlemskap/package.json +++ b/packages/fakta-medlemskap/package.json @@ -12,8 +12,8 @@ "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "1.0.0", "@k9-sak-web/fakta-felles": "1.0.0", - "@navikt/ft-form-hooks": "5.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-form-hooks": "5.0.5", + "@navikt/ft-plattform-komponenter": "3.0.8", "i18n-iso-countries": "7.11.3", "moment": "2.30.1", "prop-types": "15.8.1", diff --git a/packages/fakta-medlemskap/src/MedlemskapFaktaIndex.stories.tsx b/packages/fakta-medlemskap/src/MedlemskapFaktaIndex.stories.tsx index 4b02ad973d..e3ed4f1e64 100644 --- a/packages/fakta-medlemskap/src/MedlemskapFaktaIndex.stories.tsx +++ b/packages/fakta-medlemskap/src/MedlemskapFaktaIndex.stories.tsx @@ -151,6 +151,68 @@ const medlemskap = { }, ], }; + +const periodeMed5020 = { + vurderingsdato: '2018-11-07', + personopplysninger: { + fnr: null, + aktoerId: '1615078487209', + diskresjonskode: null, + nummer: null, + navBrukerKjonn: { + kode: 'K', + kodeverk: 'BRUKER_KJOENN', + }, + statsborgerskap: { + kode: 'NOR', + kodeverk: 'LANDKODER', + navn: 'Norge', + }, + avklartPersonstatus: { + orginalPersonstatus: { + kode: 'BOSA', + kodeverk: 'PERSONSTATUS_TYPE', + }, + overstyrtPersonstatus: { + kode: 'BOSA', + kodeverk: 'PERSONSTATUS_TYPE', + }, + }, + personstatus: { + kode: 'BOSA', + kodeverk: 'PERSONSTATUS_TYPE', + }, + sivilstand: { + kode: 'UGIF', + kodeverk: 'SIVILSTAND_TYPE', + }, + navn: 'Mygg Robust', + dodsdato: null, + fodselsdato: '1966-08-02', + adresser: [], + region: { + kode: 'NORDEN', + kodeverk: 'REGION', + }, + annenPart: null, + ektefelle: null, + barn: [], + barnSoktFor: [], + barnFraTpsRelatertTilSoknad: [], + harVerge: false, + }, + aksjonspunkter: ['5020'], + årsaker: ['SKJÆRINGSTIDSPUNKT'], + oppholdsrettVurdering: null, + erEosBorger: null, + lovligOppholdVurdering: null, + bosattVurdering: null, + medlemskapManuellVurderingType: null, + begrunnelse: null, +}; + +const medlemskapAp5020 = { ...medlemskap, perioder: [periodeMed5020] }; + const fagsakPerson = {}; const merknaderFraBeslutter = { @@ -187,7 +249,7 @@ export const VisAksjonspunktForAvklaringOmBrukerErBosatt = args => ( VisAksjonspunktForAvklaringOmBrukerErBosatt.args = { behandling, - medlemskap, + medlemskap: medlemskapAp5020, soknad, arbeidsforhold, fagsakPerson, diff --git a/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/OppholdINorgeOgAdresserFaktaPanel.tsx b/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/OppholdINorgeOgAdresserFaktaPanel.tsx index 45cf75b4c5..bb42dec438 100644 --- a/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/OppholdINorgeOgAdresserFaktaPanel.tsx +++ b/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/OppholdINorgeOgAdresserFaktaPanel.tsx @@ -53,7 +53,6 @@ const lagOppholdIUtland = (utlandsOpphold: Opphold['utlandsopphold']) => interface OppholdINorgeOgAdresserFaktaPanelProps { readOnly: boolean; - // alleKodeverk: { [key: string]: KodeverkMedNavn[] }; alleMerknaderFraBeslutter: MerknaderFraBeslutter; } diff --git a/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/StatusForBorgerFaktaPanel.spec.tsx b/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/StatusForBorgerFaktaPanel.spec.tsx index 6c811b73cb..1132acb6b5 100644 --- a/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/StatusForBorgerFaktaPanel.spec.tsx +++ b/packages/fakta-medlemskap/src/components/oppholdInntektOgPerioder/StatusForBorgerFaktaPanel.spec.tsx @@ -4,7 +4,6 @@ import { Aksjonspunkt } from '@k9-sak-web/types'; import { screen } from '@testing-library/react'; import React from 'react'; import { FormProvider, useForm } from 'react-hook-form'; - import { Periode } from './Periode'; import StatusForBorgerFaktaPanel from './StatusForBorgerFaktaPanel'; diff --git a/packages/fakta-om-barnet/package.json b/packages/fakta-om-barnet/package.json index fdb01efb13..84d81b56f2 100644 --- a/packages/fakta-om-barnet/package.json +++ b/packages/fakta-om-barnet/package.json @@ -10,20 +10,20 @@ "dev": "vite serve" }, "devDependencies": { - "msw": "2.4.1", - "vite": "^5.4.2", + "msw": "2.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { - "@navikt/ds-react": "6.13.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", "classnames": "2.5.1", "dayjs": "1.11.13", "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-popper": "2.3.0", "tailwindcss": "^3.4.10" }, diff --git a/packages/fakta-omsorgen-for/package.json b/packages/fakta-omsorgen-for/package.json index 2bcc90ddb6..a7d8d06f75 100644 --- a/packages/fakta-omsorgen-for/package.json +++ b/packages/fakta-omsorgen-for/package.json @@ -10,16 +10,16 @@ "dev": "vite serve" }, "devDependencies": { - "msw": "2.4.1", - "vite": "^5.4.2", + "msw": "2.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { - "@navikt/ds-css": "6.13.0", + "@navikt/ds-css": "6.16.3", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "6.13.0", - "@navikt/fnrvalidator": "2.1.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/fnrvalidator": "2.1.2", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", "classnames": "2.5.1", "dayjs": "1.11.13", @@ -27,7 +27,7 @@ "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-intl": "6.6.8", "react-popper": "2.3.0" }, diff --git a/packages/fakta-opplaering/package.json b/packages/fakta-opplaering/package.json index 62ff08d54d..990bf7e5a0 100644 --- a/packages/fakta-opplaering/package.json +++ b/packages/fakta-opplaering/package.json @@ -9,8 +9,8 @@ "@fpsak-frontend/utils": "*", "@k9-sak-web/types": "*", "@navikt/ds-icons": "3.4.3", - "@navikt/ds-react": "6.13.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-plattform-komponenter": "3.0.8", "classnames": "2.5.1", "dayjs": "1.11.13", "formik": "2.4.6", diff --git a/packages/fakta-overstyr-beregning/package.json b/packages/fakta-overstyr-beregning/package.json index d22a0d71e0..69e79cf77b 100644 --- a/packages/fakta-overstyr-beregning/package.json +++ b/packages/fakta-overstyr-beregning/package.json @@ -9,7 +9,7 @@ "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "workspace:^", "@k9-sak-web/types": "workspace:^", - "@navikt/ds-react": "6.13.0", + "@navikt/ds-react": "6.16.3", "date-fns": "3.6.0", "formik": "2.4.6", "react": "18.3.1", diff --git a/packages/form/package.json b/packages/form/package.json index ae6ce376b6..f1e5c103ad 100644 --- a/packages/form/package.json +++ b/packages/form/package.json @@ -8,12 +8,12 @@ "dependencies": { "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "1.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-plattform-komponenter": "3.0.8", "classnames": "2.5.1", "formik": "2.4.6", "moment": "2.30.1", "react": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-intl": "6.6.8", "react-redux": "9.1.2", "redux": "5.0.1", diff --git a/packages/mocks/mockdata/utenlandsoppholdMock.js b/packages/mocks/mockdata/utenlandsoppholdMock.js index fb91b7ed16..6f895d4446 100644 --- a/packages/mocks/mockdata/utenlandsoppholdMock.js +++ b/packages/mocks/mockdata/utenlandsoppholdMock.js @@ -78,6 +78,22 @@ const utenlandsopphold = { region: 'EOS', // REGION årsak: 'INGEN', }, + { + periode: `${dayjs().subtract(52, 'day').format('YYYY-MM-DD')}/${dayjs() + .subtract(47, 'day') + .format('YYYY-MM-DD')}`, + landkode: 'XXK', // LANDKODER + region: 'ANNET', // REGION + årsak: 'INGEN', + }, + { + periode: `${dayjs().subtract(59, 'day').format('YYYY-MM-DD')}/${dayjs() + .subtract(55, 'day') + .format('YYYY-MM-DD')}`, + landkode: 'GBR', // LANDKODER + region: 'EOS', // REGION + årsak: 'INGEN', + }, ], }; diff --git a/packages/prosess-aarskvantum-oms/package.json b/packages/prosess-aarskvantum-oms/package.json index 9c6f83349c..d3c90a0393 100644 --- a/packages/prosess-aarskvantum-oms/package.json +++ b/packages/prosess-aarskvantum-oms/package.json @@ -19,7 +19,7 @@ "react-dom": "18.3.1", "react-intl": "6.6.8", "react-redux": "9.1.2", - "react-router-dom": "6.26.0", + "react-router-dom": "6.26.1", "redux-form": "8.3.10" }, "devDependencies": { diff --git a/packages/prosess-avregning/src/components/AvregningPanel.jsx b/packages/prosess-avregning/src/components/AvregningPanel.jsx index 04e6adcd77..ded0eac012 100644 --- a/packages/prosess-avregning/src/components/AvregningPanel.jsx +++ b/packages/prosess-avregning/src/components/AvregningPanel.jsx @@ -201,7 +201,12 @@ export class AvregningPanelImpl extends Component { { case fagsakYtelseType.OMSORGSPENGER: case fagsakYtelseType.OMSORGSPENGER_KRONISK_SYKT_BARN: case fagsakYtelseType.OMSORGSPENGER_MIDLERTIDIG_ALENE: + case fagsakYtelseType.OMSORGSPENGER_ALENE_OM_OMSORGEN: return [ { kode: '9-2', navn: '§ 9-2' }, { kode: '9-3', navn: '§ 9-3' }, diff --git a/packages/prosess-omsorgsdager/package.json b/packages/prosess-omsorgsdager/package.json index 6e1417a377..9a296e3fc5 100644 --- a/packages/prosess-omsorgsdager/package.json +++ b/packages/prosess-omsorgsdager/package.json @@ -10,18 +10,18 @@ "dev": "vite serve" }, "devDependencies": { - "vite": "^5.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0", "vitest-axe": "^0.1.0" }, "dependencies": { - "@navikt/ds-css": "6.13.0", - "@navikt/ds-react": "6.13.0", + "@navikt/ds-css": "6.16.3", + "@navikt/ds-react": "6.16.3", "classnames": "2.5.1", "dayjs": "1.11.13", "lodash": "4.17.21", "react": "18.3.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2" + "react-hook-form": "7.53.0" } } diff --git a/packages/prosess-tilkjent-ytelse/i18n/nb_NO.json b/packages/prosess-tilkjent-ytelse/i18n/nb_NO.json index 0ce535742f..4a279d17e4 100644 --- a/packages/prosess-tilkjent-ytelse/i18n/nb_NO.json +++ b/packages/prosess-tilkjent-ytelse/i18n/nb_NO.json @@ -40,6 +40,7 @@ "TilkjentYtelse.NyPeriode.TilSoker": "Til søker", "TilkjentYtelse.NyPeriode.Refusjon": "Refusjon", "TilkjentYtelse.NyPeriode.Arbeidsgiver": "Arbeidsgiver", + "TilkjentYtelse.NyPeriode.ArbeidsgiverPrivatperson": "Arbeidsgiver (privatperson)", "TilkjentYtelse.NyPeriode.Arbeidsforhold": "Arbeidsforhold", "TilkjentYtelse.NyPeriode.AktivitetsStatus": "Aktivitetsstatus", "TilkjentYtelse.NyPeriode.Inntektskategori": "Inntektskategori", diff --git a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYteleseUtils.ts b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYteleseUtils.ts index ebc8809ec7..7ebb8de934 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYteleseUtils.ts +++ b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYteleseUtils.ts @@ -1,4 +1,5 @@ import { KodeverkType } from '@k9-sak-web/lib/kodeverk/types/KodeverkType.js'; +import { ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types'; export const getAktivitet = (aktivitetStatus, kodeverkNavnFraKode) => // hvis valgtAndel ikke satt ennå return tom string. @@ -10,7 +11,7 @@ export const getInntektskategori = (inntektkategori, kodeverkNavnFraKode) => const getEndCharFromId = id => (id ? `...${id.substring(id.length - 4, id.length)}` : ''); -export const createVisningsnavnForAndel = (andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId) => { +export const createArbeidsgiverVisningsnavnForAndel = (andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId) => { if (!andel) return ''; let identifikator; @@ -18,8 +19,6 @@ export const createVisningsnavnForAndel = (andel, kodeverkNavnFraKode, arbeidsgi identifikator = andel.arbeidsgiverOrgnr; } else if (andel.arbeidsgiver?.arbeidsgiverOrgnr) { identifikator = andel.arbeidsgiver.arbeidsgiverOrgnr; - } else if (andel.arbeidsgiver?.identifikator) { - identifikator = andel.arbeidsgiver.identifikator; } if (!identifikator) { @@ -38,4 +37,33 @@ export const createVisningsnavnForAndel = (andel, kodeverkNavnFraKode, arbeidsgi return `${navn} (${identifikator})${getEndCharFromId(andel.eksternArbeidsforholdId)}`; }; -export default createVisningsnavnForAndel; +export const createPrivatarbeidsgiverVisningsnavnForAndel = ( + andel, + getKodeverknavn, + arbeidsgiverOpplysningerPerId: ArbeidsgiverOpplysningerPerId, +) => { + if (!andel) return ''; + + let identifikator; + if (andel.arbeidsgiverPersonIdent) { + identifikator = andel.arbeidsgiverPersonIdent; + } else if (andel.arbeidsgiver?.arbeidsgiverPersonIdent) { + identifikator = andel.arbeidsgiver.arbeidsgiverPersonIdent; + } + + if (identifikator == null) { + return ''; + } + + const arbeidsgiverOpplysninger = Object.values(arbeidsgiverOpplysningerPerId).find( + v => v?.personIdentifikator === identifikator, + ); + + const navn = arbeidsgiverOpplysninger != null ? arbeidsgiverOpplysninger?.navn : ''; + + if (!navn) { + return `${identifikator}${getEndCharFromId(andel.eksternArbeidsforholdId)}`; + } + + return `${navn} (${identifikator})${getEndCharFromId(andel.eksternArbeidsforholdId)}`; +}; diff --git a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.spec.tsx b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.spec.tsx index fcce10693d..9728a36b2d 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.spec.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.spec.tsx @@ -41,6 +41,7 @@ describe('', () => { arbeidsgiver: '973861778', arbeidsgiverOrgnr: '', aktivitetStatus: '', + arbeidsgiverPersonIdent: '', arbeidsforholdId: '', eksternArbeidsforholdId: '', arbeidsgiverNavn: '', diff --git a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.tsx b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.tsx index 02a4f7afb2..5c461b62db 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelse.tsx @@ -6,7 +6,7 @@ import { KodeverkType } from '@k9-sak-web/lib/kodeverk/types/KodeverkType.js'; import moment from 'moment'; import React, { Component, RefObject } from 'react'; import { WrappedComponentProps, injectIntl } from 'react-intl'; -import { createVisningsnavnForAndel } from './TilkjentYteleseUtils'; +import { createArbeidsgiverVisningsnavnForAndel } from './TilkjentYteleseUtils'; import TilkjentYtelseTimelineData from './TilkjentYtelseTimelineData'; import styles from './tilkjentYtelse.module.css'; @@ -63,7 +63,11 @@ const createTooltipContent = (intl, item, kodeverkNavnFraKode, arbeidsgiverOpply formatMessage( { id: 'Timeline.tooltip.dagsatsPerAndel' }, { - arbeidsgiver: createVisningsnavnForAndel(andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId), + arbeidsgiver: createArbeidsgiverVisningsnavnForAndel( + andel, + kodeverkNavnFraKode, + arbeidsgiverOpplysningerPerId, + ), dagsatsPerAndel: Number(andel.refusjon) + Number(andel.tilSoker), }, ), diff --git a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimeLineData.spec.tsx b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimeLineData.spec.tsx index eaaf319c87..64a27e607e 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimeLineData.spec.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimeLineData.spec.tsx @@ -2,7 +2,7 @@ import { renderWithIntl } from '@fpsak-frontend/utils-test/test-utils'; import { screen } from '@testing-library/react'; import React from 'react'; import messages from '../../i18n/nb_NO.json'; -import createVisningsnavnForAndel from './TilkjentYteleseUtils'; +import { createArbeidsgiverVisningsnavnForAndel } from './TilkjentYteleseUtils'; import { PeriodeMedId } from './TilkjentYtelse'; import TilkjentYtelseTimeLineData from './TilkjentYtelseTimelineData'; @@ -73,6 +73,8 @@ describe('', () => { ); expect(screen.getByText('Aktivitetsstatus:')).toBeInTheDocument(); - expect(createVisningsnavnForAndel(selectedItemDataFL.andeler[0], kodeverkNavnFraKode, {})).toBe('Frilans'); + expect(createArbeidsgiverVisningsnavnForAndel(selectedItemDataFL.andeler[0], kodeverkNavnFraKode, {})).toBe( + 'Frilans', + ); }); }); diff --git a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimelineData.tsx b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimelineData.tsx index b9d73551a0..397754a8b0 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimelineData.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/TilkjentYtelseTimelineData.tsx @@ -7,7 +7,8 @@ import moment from 'moment'; import React, { useEffect } from 'react'; import { FormattedMessage, useIntl } from 'react-intl'; import { useKodeverkContext } from '@k9-sak-web/gui/kodeverk/index.js'; -import { createVisningsnavnForAndel, getAktivitet } from './TilkjentYteleseUtils'; + +import { createArbeidsgiverVisningsnavnForAndel, getAktivitet } from './TilkjentYteleseUtils'; import { PeriodeMedId } from './TilkjentYtelse'; import styles from './tilkjentYtelse.module.css'; import UtbetalingsgradDetaljer from './UtbetalingsgradDetaljer'; @@ -155,7 +156,7 @@ const TilkjentYtelseTimeLineData = ({ id="Timeline.tooltip.dagsatsPerAndel" key={`index${index + 1}`} values={{ - arbeidsgiver: createVisningsnavnForAndel( + arbeidsgiver: createArbeidsgiverVisningsnavnForAndel( andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId, @@ -176,7 +177,7 @@ const TilkjentYtelseTimeLineData = ({ id="Timeline.tooltip.dagsatsPerAndel" key={`index${index + 1}`} values={{ - arbeidsgiver: createVisningsnavnForAndel( + arbeidsgiver: createArbeidsgiverVisningsnavnForAndel( andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId, @@ -196,13 +197,17 @@ const TilkjentYtelseTimeLineData = ({ {andeler.map((andel, index) => { - const label = createVisningsnavnForAndel(andel, kodeverkNavnFraKode, arbeidsgiverOpplysningerPerId); + const label = createArbeidsgiverVisningsnavnForAndel( + andel, + kodeverkNavnFraKode, + arbeidsgiverOpplysningerPerId, + ); return ; })} {andeler.map((andel, index) => (
diff --git a/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/Andeler.tsx b/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/Andeler.tsx index 12ff42e11d..fa2fea18b0 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/Andeler.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/Andeler.tsx @@ -4,7 +4,11 @@ import React from 'react'; import { useKodeverkContext } from '@k9-sak-web/gui/kodeverk/index.js'; import { WrappedComponentProps, useIntl } from 'react-intl'; import { FieldArrayFieldsProps, FieldArrayMetaProps } from 'redux-form'; -import { createVisningsnavnForAndel, getInntektskategori } from '../TilkjentYteleseUtils'; +import { + createArbeidsgiverVisningsnavnForAndel, + createPrivatarbeidsgiverVisningsnavnForAndel, + getInntektskategori, +} from '../TilkjentYteleseUtils'; interface OwnProps { fields: FieldArrayFieldsProps; @@ -25,6 +29,7 @@ interface OwnProps { const headerTextCodes = [ 'TilkjentYtelse.NyPeriode.Inntektskategori', 'TilkjentYtelse.NyPeriode.Arbeidsgiver', + 'TilkjentYtelse.NyPeriode.ArbeidsgiverPrivatperson', 'TilkjentYtelse.NyPeriode.TilSoker', 'TilkjentYtelse.NyPeriode.Refusjon', 'TilkjentYtelse.NyPeriode.Ubetalingsgrad', @@ -61,7 +66,12 @@ const Andeler = ({ fields, meta, arbeidsgivere }: Partial & WrappedCom {fields.map((fieldId: string, index: number, field: FieldArrayFieldsProps) => { const andel = field.get(index); const inntektskategori = getInntektskategori(andel.inntektskategori, kodeverkNavnFraKode); - const arbeidsgiver = createVisningsnavnForAndel(andel, kodeverkNavnFraKode, arbeidsgivere); + const arbeidsgiver = createArbeidsgiverVisningsnavnForAndel(andel, kodeverkNavnFraKode, arbeidsgivere); + const arbeidsgiverPrivatperson = createPrivatarbeidsgiverVisningsnavnForAndel( + andel, + kodeverkNavnFraKode, + arbeidsgivere, + ); return ( @@ -71,6 +81,9 @@ const Andeler = ({ fields, meta, arbeidsgivere }: Partial & WrappedCom {arbeidsgiver} + + {arbeidsgiverPrivatperson} + {andel.tilSoker} diff --git a/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/NyAndel.tsx b/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/NyAndel.tsx index d083617bca..6d88eb76f3 100644 --- a/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/NyAndel.tsx +++ b/packages/prosess-tilkjent-ytelse/src/components/manuellePerioder/NyAndel.tsx @@ -2,7 +2,7 @@ import addCircleIcon from '@fpsak-frontend/assets/images/add-circle.svg'; import { InputField, SelectField } from '@fpsak-frontend/form'; import inntektskategorier from '@fpsak-frontend/kodeverk/src/inntektskategorier'; import kodeverkTyper from '@fpsak-frontend/kodeverk/src/kodeverkTyper'; -import { FlexColumn, FlexRow, Image, PeriodFieldArray } from '@fpsak-frontend/shared-components'; +import { FlexColumn, FlexRow, Image, PeriodFieldArray, useFeatureToggles } from '@fpsak-frontend/shared-components'; import { hasValidDecimal, maxValue, minValue, required } from '@fpsak-frontend/utils'; import { ArbeidsgiverOpplysningerPerId, KodeverkMedNavn } from '@k9-sak-web/types'; import React, { useState } from 'react'; @@ -11,6 +11,7 @@ import { FieldArrayFieldsProps, FieldArrayMetaProps } from 'redux-form'; import NyArbeidsgiverModal from './NyArbeidsgiverModal'; import styles from './periode.module.css'; +import {atLeastOneRequired} from "@fpsak-frontend/utils/src/validation/validators"; const minValue0 = minValue(0); const maxValue100 = maxValue(100); @@ -25,6 +26,28 @@ const mapArbeidsgivere = (arbeidsgivere: ArbeidsgiverOpplysningerPerId) => )) : []; +const mapArbeidsgivereOrg = (arbeidsgivere: ArbeidsgiverOpplysningerPerId) => + arbeidsgivere + ? Object.values(arbeidsgivere) + .filter(arbeidsgiver => arbeidsgiver.personIdentifikator == null) // erPrivatPerson returneres ikke fra backend + .map(({ navn, identifikator }) => ( + + )) + : []; + +const mapArbeidsgiverePrivatperson = (arbeidsgivere: ArbeidsgiverOpplysningerPerId) => + arbeidsgivere + ? Object.values(arbeidsgivere) + .filter(arbeidsgiver => arbeidsgiver.personIdentifikator != null) // erPrivatPerson returneres ikke fra backend + .map(({ navn, personIdentifikator }) => ( + + )) + : []; + const getInntektskategori = alleKodeverk => { const aktivitetsstatuser = alleKodeverk[kodeverkTyper.INNTEKTSKATEGORI]; return aktivitetsstatuser.map(ik => ( @@ -71,6 +94,8 @@ export const NyAndel = ({ behandlingVersjon, }: OwnProps & WrappedComponentProps) => { const [isOpen, setOpen] = useState(false); + const [featureToggles] = useFeatureToggles(); + const skillUtPrivatperson = featureToggles?.SKILL_UT_PRIVATPERSON; const allFields = fields.getAll(); @@ -101,24 +126,37 @@ export const NyAndel = ({ /> {!erSN && !erFL && ( - - -
setOpen(true)} - onKeyDown={() => setOpen(true)} - className={styles.addArbeidsforhold} - role="button" - tabIndex={0} - > - Ny arbeidsgiver -
- + <> + + atLeastOneRequired(value, values.arbeidsgiverPersonIdent)] + : [required]} + selectValues={skillUtPrivatperson ? mapArbeidsgivereOrg(arbeidsgivere) : mapArbeidsgivere(arbeidsgivere)} + /> +
setOpen(true)} + onKeyDown={() => setOpen(true)} + className={styles.addArbeidsforhold} + role="button" + tabIndex={0} + > + Ny arbeidsgiver +
+ + {skillUtPrivatperson && ( + atLeastOneRequired(value, values.arbeidsgiverOrgnr)]} + selectValues={mapArbeidsgiverePrivatperson(arbeidsgivere)} + /> + )} + )} ({ kodeverk: 'INNTEKTSKATEGORI', }, arbeidsgiverOrgnr: andel.arbeidsgiverOrgnr, + arbeidsgiverPersonIdent: andel.arbeidsgiverPersonIdent, tilSoker: andel.tilSoker, refusjon: andel.refusjon || 0, utbetalingsgrad: andel.utbetalingsgrad || 100, diff --git a/packages/prosess-uttak/package.json b/packages/prosess-uttak/package.json index e07daf2448..675c9e1002 100644 --- a/packages/prosess-uttak/package.json +++ b/packages/prosess-uttak/package.json @@ -10,23 +10,23 @@ "author": "NAV IT", "license": "MIT", "devDependencies": { - "vite": "^5.4.2", + "vite": "^5.4.3", "vite-plugin-node-polyfills": "^0.22.0" }, "dependencies": { "@hookform/resolvers": "^3.9.0", - "@navikt/ds-css": "6.13.0", - "@navikt/ds-react": "6.13.0", - "@navikt/ft-form-hooks": "5.0.0", - "@navikt/ft-form-validators": "2.3.18", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ds-css": "6.16.3", + "@navikt/ds-react": "6.16.3", + "@navikt/ft-form-hooks": "5.0.5", + "@navikt/ft-form-validators": "2.3.22", + "@navikt/ft-plattform-komponenter": "3.0.8", "@popperjs/core": "2.11.8", "classnames": "2.5.1", "dayjs": "1.11.13", "react": "18.3.1", "react-collapse": "5.1.1", "react-dom": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-popper": "2.3.0", "yup": "1.4.0" } diff --git a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingEditerVedtaksbrevPanel.spec.tsx b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingEditerVedtaksbrevPanel.spec.tsx index 3182678123..cc23ca67ee 100644 --- a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingEditerVedtaksbrevPanel.spec.tsx +++ b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingEditerVedtaksbrevPanel.spec.tsx @@ -2,7 +2,7 @@ import React from 'react'; import { renderWithIntlAndReduxForm } from '@fpsak-frontend/utils-test/test-utils'; import { screen } from '@testing-library/react'; import TilbakekrevingEditerVedtaksbrevPanel from './TilbakekrevingEditerVedtaksbrevPanel'; -import {K9sakApiKeys, requestApi} from "@k9-sak-web/sak-app/src/data/k9sakApi"; +import { K9sakApiKeys, requestApi } from '@k9-sak-web/sak-app/src/data/k9sakApi'; describe('', () => { const vedtaksbrevAvsnitt = [ diff --git a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.spec.tsx b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.spec.tsx index 9a191aff5f..ae8dd772f0 100644 --- a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.spec.tsx +++ b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.spec.tsx @@ -4,7 +4,7 @@ import React from 'react'; import { intlMock } from '../../../i18n'; import messages from '../../../i18n/nb_NO.json'; import { TilbakekrevingVedtakUtdypendeTekstPanel } from './TilbakekrevingVedtakUtdypendeTekstPanel'; -import {K9sakApiKeys, requestApi} from "@k9-sak-web/sak-app/src/data/k9sakApi"; +import { K9sakApiKeys, requestApi } from '@k9-sak-web/sak-app/src/data/k9sakApi'; describe('', () => { it('skal vise lenke for å skrive inn tekst når felt ikke har verdi og en ikke er i readonly-modus', () => { diff --git a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.tsx b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.tsx index 33338ca162..a7cca6cd52 100644 --- a/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.tsx +++ b/packages/prosess-vedtak-tilbakekreving/src/components/brev/TilbakekrevingVedtakUtdypendeTekstPanel.tsx @@ -1,6 +1,6 @@ import addCircleIcon from '@fpsak-frontend/assets/images/add-circle.svg'; import { behandlingFormValueSelector, TextAreaField } from '@fpsak-frontend/form'; -import {Image, useFeatureToggles, VerticalSpacer} from '@fpsak-frontend/shared-components'; +import { Image, useFeatureToggles, VerticalSpacer } from '@fpsak-frontend/shared-components'; import { hasValidText, maxLength, minLength, required } from '@fpsak-frontend/utils'; import { Detail } from '@navikt/ds-react'; import React, { useState } from 'react'; @@ -32,11 +32,13 @@ export const TilbakekrevingVedtakUtdypendeTekstPanel = ({ fritekstPakrevet, maximumLength, }: OwnProps & WrappedComponentProps) => { - const [featureToggles] = useFeatureToggles() - const utvidetVarseltekst = featureToggles?.UTVIDET_VARSELTEKST + const [featureToggles] = useFeatureToggles(); + const utvidetVarseltekst = featureToggles?.UTVIDET_VARSELTEKST; const [isTextfieldHidden, hideTextField] = useState(isEmpty && !fritekstPakrevet); const valideringsRegler = fritekstPakrevet ? valideringsreglerPakrevet : valideringsregler; - valideringsRegler.push(maximumLength ? maxLength(maximumLength) : (utvidetVarseltekst ? maxLength12000 : maxLength4000)); + valideringsRegler.push( + maximumLength ? maxLength(maximumLength) : utvidetVarseltekst ? maxLength12000 : maxLength4000, + ); return ( <> {isTextfieldHidden && !readOnly && ( diff --git a/packages/prosess-vilkar-alder/package.json b/packages/prosess-vilkar-alder/package.json index e5648bd44c..13ebc7eecf 100644 --- a/packages/prosess-vilkar-alder/package.json +++ b/packages/prosess-vilkar-alder/package.json @@ -9,10 +9,10 @@ "@fpsak-frontend/shared-components": "1.0.0", "@fpsak-frontend/utils": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-form-hooks": "5.0.0", - "@navikt/ft-form-validators": "2.3.18", + "@navikt/ft-form-hooks": "5.0.5", + "@navikt/ft-form-validators": "2.3.22", "react": "18.3.1", - "react-hook-form": "7.52.2", + "react-hook-form": "7.53.0", "react-intl": "6.6.8" } } diff --git a/packages/prosess-vilkar-opptjening-oms/package.json b/packages/prosess-vilkar-opptjening-oms/package.json index 935c0de59f..dfd7ba3fbf 100644 --- a/packages/prosess-vilkar-opptjening-oms/package.json +++ b/packages/prosess-vilkar-opptjening-oms/package.json @@ -11,7 +11,7 @@ "@fpsak-frontend/utils": "1.0.0", "@k9-sak-web/prosess-felles": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-plattform-komponenter": "3.0.8", "classnames": "2.5.1", "dayjs": "1.11.13", "lodash": "4.17.21", diff --git a/packages/prosess-vilkar-overstyring/package.json b/packages/prosess-vilkar-overstyring/package.json index 5c406d86e5..b4056d422d 100644 --- a/packages/prosess-vilkar-overstyring/package.json +++ b/packages/prosess-vilkar-overstyring/package.json @@ -13,7 +13,7 @@ "@k9-sak-web/prosess-felles": "1.0.0", "@k9-sak-web/sak-app": "1.0.0", "@k9-sak-web/types": "1.0.0", - "@navikt/ft-plattform-komponenter": "3.0.4", + "@navikt/ft-plattform-komponenter": "3.0.8", "classnames": "2.5.1", "moment": "2.30.1", "react": "18.3.1", diff --git a/packages/prosess-vilkar-overstyring/src/VilkarresultatMedOverstyringProsessIndex.tsx b/packages/prosess-vilkar-overstyring/src/VilkarresultatMedOverstyringProsessIndex.tsx index d7966b4232..6f31f117e8 100644 --- a/packages/prosess-vilkar-overstyring/src/VilkarresultatMedOverstyringProsessIndex.tsx +++ b/packages/prosess-vilkar-overstyring/src/VilkarresultatMedOverstyringProsessIndex.tsx @@ -1,13 +1,12 @@ -import React, { SetStateAction, useEffect, useState } from 'react'; -import classNames from 'classnames/bind'; -import { RawIntlProvider, createIntl, createIntlCache } from 'react-intl'; - import vilkarUtfallType from '@fpsak-frontend/kodeverk/src/vilkarUtfallType'; import { useFeatureToggles } from '@fpsak-frontend/shared-components'; import { dateFormat } from '@fpsak-frontend/utils'; import hentAktivePerioderFraVilkar from '@fpsak-frontend/utils/src/hentAktivePerioderFraVilkar'; import { Aksjonspunkt, Behandling, SubmitCallback, Vilkar } from '@k9-sak-web/types'; import { SideMenu } from '@navikt/ft-plattform-komponenter'; +import classNames from 'classnames/bind'; +import React, { SetStateAction, useEffect, useState } from 'react'; +import { RawIntlProvider, createIntl, createIntlCache } from 'react-intl'; import VilkarresultatMedOverstyringFormPeriodisert from './components-periodisert/VilkarresultatMedOverstyringFormPeriodisert'; import VilkarresultatMedOverstyringForm from './components/VilkarresultatMedOverstyringForm'; import VilkarresultatMedOverstyringHeader from './components/VilkarresultatMedOverstyringHeader'; diff --git a/packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringFormPeriodisert.tsx b/packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringFormPeriodisert.tsx index db56861f64..bfd168a9ff 100644 --- a/packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringFormPeriodisert.tsx +++ b/packages/prosess-vilkar-overstyring/src/components-periodisert/VilkarresultatMedOverstyringFormPeriodisert.tsx @@ -1,6 +1,3 @@ -import React, { FunctionComponent, SetStateAction, useEffect } from 'react'; -import { FormattedMessage } from 'react-intl'; -import moment from 'moment'; import advarselIkonUrl from '@fpsak-frontend/assets/images/advarsel_ny.svg'; import aksjonspunktStatus from '@fpsak-frontend/kodeverk/src/aksjonspunktStatus'; import BehandlingType from '@fpsak-frontend/kodeverk/src/behandlingType'; @@ -19,7 +16,10 @@ import { Aksjonspunkt, SubmitCallback } from '@k9-sak-web/types'; import Vilkarperiode from '@k9-sak-web/types/src/vilkarperiode'; import { BodyShort, Button, Label } from '@navikt/ds-react'; import { Form } from '@navikt/ft-form-hooks'; +import moment from 'moment'; +import React, { FunctionComponent, SetStateAction, useEffect } from 'react'; import { useForm } from 'react-hook-form'; +import { FormattedMessage } from 'react-intl'; import { VilkarresultatMedOverstyringFormState } from './FormState'; import OverstyrBekreftKnappPanel from './OverstyrBekreftKnappPanel'; import { VilkarresultatMedBegrunnelse } from './VilkarresultatMedBegrunnelse'; diff --git a/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringForm.tsx b/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringForm.tsx index ad8056c7de..ad1e540e5a 100644 --- a/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringForm.tsx +++ b/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringForm.tsx @@ -1,6 +1,3 @@ -import React, { SetStateAction, useEffect } from 'react'; -import { FormattedMessage } from 'react-intl'; -import moment from 'moment'; import advarselIkonUrl from '@fpsak-frontend/assets/images/advarsel_ny.svg'; import aksjonspunktStatus from '@fpsak-frontend/kodeverk/src/aksjonspunktStatus'; import BehandlingType from '@fpsak-frontend/kodeverk/src/behandlingType'; @@ -19,7 +16,10 @@ import { Aksjonspunkt, SubmitCallback } from '@k9-sak-web/types'; import Vilkarperiode from '@k9-sak-web/types/src/vilkarperiode'; import { BodyShort, Button, Label } from '@navikt/ds-react'; import { Form } from '@navikt/ft-form-hooks'; +import moment from 'moment'; +import React, { SetStateAction, useEffect } from 'react'; import { useForm } from 'react-hook-form'; +import { FormattedMessage } from 'react-intl'; import { VilkarresultatMedOverstyringFormState } from './FormState'; import OverstyrBekreftKnappPanel from './OverstyrBekreftKnappPanel'; import VilkarresultatMedBegrunnelse from './VilkarresultatMedBegrunnelse'; diff --git a/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringHeader.tsx b/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringHeader.tsx index ec4b82084f..a7e840e619 100644 --- a/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringHeader.tsx +++ b/packages/prosess-vilkar-overstyring/src/components/VilkarresultatMedOverstyringHeader.tsx @@ -1,13 +1,12 @@ -import React, { SetStateAction } from 'react'; -import { FormattedMessage } from 'react-intl'; -import { Detail, Heading, Label } from '@navikt/ds-react'; import avslattImage from '@fpsak-frontend/assets/images/avslaatt_hover.svg'; import innvilgetImage from '@fpsak-frontend/assets/images/innvilget_hover.svg'; -import keyUtgraetImage from '@fpsak-frontend/assets/images/key-1-rotert-utgraet.svg'; import keyImage from '@fpsak-frontend/assets/images/key-1-rotert.svg'; import vilkarUtfallType from '@fpsak-frontend/kodeverk/src/vilkarUtfallType'; import { FlexColumn, FlexContainer, FlexRow, Image, VerticalSpacer } from '@fpsak-frontend/shared-components'; import { Aksjonspunkt } from '@k9-sak-web/types'; +import { Button, Detail, Heading, Label } from '@navikt/ds-react'; +import React, { SetStateAction } from 'react'; +import { FormattedMessage } from 'react-intl'; import styles from './vilkarresultatMedOverstyringForm.module.css'; import { Lovreferanse } from '@k9-sak-web/gui/shared/lovreferanse/Lovreferanse.js'; @@ -92,20 +91,16 @@ const VilkarresultatMedOverstyringHeader = ({ {erVilkarOk !== undefined && !isHidden(kanOverstyreAccess.isEnabled, aksjonspunktCodes, overstyringApKode) && ( - <> - {!erOverstyrt && !overrideReadOnly && ( - - - - - )} - {(erOverstyrt || overrideReadOnly) && ( - - - - - )} - + + +