From 2dc185763a714a57b4fcce30fc55c9071847fdbf Mon Sep 17 00:00:00 2001 From: "Thomas H. Wiberg" Date: Tue, 3 Sep 2024 13:41:38 +0200 Subject: [PATCH] Dev next1 kodeverk historikkinnslagsmaler (#6534) 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 * Kodeverk: Update utenladsoppholdMock * Kodeverk: ts-check * Kodeverk: fikse tester * Kodeverk: Oppdater historikkinnslagmaler --------- 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 --- .../components/maler/HistorikkMalType7.tsx | 146 ++++++++++------- .../components/maler/HistorikkMalType8.tsx | 133 ++++++++------- .../maler/HistorikkmalFelles7og8.tsx | 114 +++++++------ .../components/maler/historikkMalType1.tsx | 2 +- .../components/maler/historikkMalType4.tsx | 47 +++--- .../components/maler/historikkMalType5.tsx | 153 ++++++++++-------- 6 files changed, 344 insertions(+), 251 deletions(-) diff --git a/packages/sak-historikk/src/components/maler/HistorikkMalType7.tsx b/packages/sak-historikk/src/components/maler/HistorikkMalType7.tsx index 0aac69d71b..d42810ac31 100644 --- a/packages/sak-historikk/src/components/maler/HistorikkMalType7.tsx +++ b/packages/sak-historikk/src/components/maler/HistorikkMalType7.tsx @@ -55,72 +55,94 @@ const HistorikkMalType7 = ({ return ( <> - {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => ( -
- {historikkinnslagDel.skjermlenke && ( - - )} + {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => { + const { + skjermlenke, + hendelse, + resultat, + endredeFelter, + opplysninger, + tema, + aarsak, + aarsakKodeverkType, + begrunnelse, + begrunnelseFritekst, + begrunnelseKodeverkType, + } = historikkinnslagDel; - {historikkinnslagDel.hendelse && ( - - )} + const begrunnelseTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[begrunnelseKodeverkType] || KodeverkType.HISTORIKK_BEGRUNNELSE_TYPE, + ) + : null; - {historikkinnslagDel.resultat && ( - - )} + const aarsakTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[aarsakKodeverkType] || KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE, + ) + : null; - {historikkinnslagDel.endredeFelter && - historikkinnslagDel.endredeFelter.map((endretFelt, i) => ( -
{formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)}
- ))} - - {historikkinnslagDel.opplysninger && - historikkinnslagDel.opplysninger.map(opplysning => ( - {chunks}, - }} - /> - ))} - {!!historikkinnslagDel.tema && historikkinnslagDel.tema.navnVerdi !== undefined && ( - ({historikkinnslagDel.tema.navnVerdi}) - )} - {historikkinnslagDel.aarsak && ( - - {kodeverkNavnFraKodeFn(historikkinnslagDel.aarsak, KodeverkType.VENT_AARSAK)} - - )} - {historikkinnslagDel.begrunnelse && ( - - )} - {historikkinnslagDel.begrunnelseFritekst && } - {dokumentLinks && - dokumentLinks.map(dokumentLenke => ( - + {skjermlenke && ( + - ))} -
- ))} + )} + + {hendelse && ( + + )} + + {resultat && ( + + )} + + {endredeFelter && + endredeFelter.map((endretFelt, i) => ( +
{formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)}
+ ))} + + {opplysninger && + opplysninger.map(opplysning => ( + {chunks}, + }} + /> + ))} + {!!tema && tema.navnVerdi !== undefined && ( + ({historikkinnslagDel.tema.navnVerdi}) + )} + {aarsak && {aarsakTekst}} + {begrunnelse && } + {begrunnelseFritekst && } + {dokumentLinks && + dokumentLinks.map(dokumentLenke => ( + + ))} + + ); + })} ); }; diff --git a/packages/sak-historikk/src/components/maler/HistorikkMalType8.tsx b/packages/sak-historikk/src/components/maler/HistorikkMalType8.tsx index f684bcea13..622ae5b752 100644 --- a/packages/sak-historikk/src/components/maler/HistorikkMalType8.tsx +++ b/packages/sak-historikk/src/components/maler/HistorikkMalType8.tsx @@ -62,67 +62,88 @@ const HistorikkMalType8 = ({ return ( <> - {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => ( -
- {historikkinnslagDel.skjermlenke && ( - - )} + {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => { + const { + skjermlenke, + hendelse, + resultat, + endredeFelter, + opplysninger, + aarsak, + aarsakKodeverkType, + begrunnelse, + begrunnelseKodeverkType, + begrunnelseFritekst, + } = historikkinnslagDel; - {historikkinnslagDel.hendelse && ( - - )} + const begrunnelseTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[begrunnelseKodeverkType] || KodeverkType.HISTORIKK_BEGRUNNELSE_TYPE, + ) + : null; - {historikkinnslagDel.resultat && ( - - )} + const aarsakTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[aarsakKodeverkType] || KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE, + ) + : null; - {historikkinnslagDel.endredeFelter && - historikkinnslagDel.endredeFelter.map((endretFelt, i) => ( -
{formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)}
- ))} - - {historikkinnslagDel.opplysninger && - historikkinnslagDel.opplysninger.map(opplysning => ( - {chunks} }} + return ( +
+ {skjermlenke && ( + - ))} + )} - {historikkinnslagDel.aarsak && ( - - {kodeverkNavnFraKodeFn(historikkinnslagDel.aarsak, KodeverkType.VENT_AARSAK)} - - )} - {historikkinnslagDel.begrunnelse && ( - - )} - {historikkinnslagDel.begrunnelseFritekst && } - {dokumentLinks && - dokumentLinks.map(dokumentLenke => ( - - ))} -
- ))} + {hendelse && ( + + )} + + {resultat && ( + + )} + + {endredeFelter && + endredeFelter.map((endretFelt, i) => ( +
{formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)}
+ ))} + + {opplysninger && + opplysninger.map(opplysning => ( + {chunks} }} + /> + ))} + + {aarsak && {aarsakTekst}} + {begrunnelse && } + {begrunnelseFritekst && } + {dokumentLinks && + dokumentLinks.map(dokumentLenke => ( + + ))} +
+ ); + })} ); }; diff --git a/packages/sak-historikk/src/components/maler/HistorikkmalFelles7og8.tsx b/packages/sak-historikk/src/components/maler/HistorikkmalFelles7og8.tsx index 5823e298f0..8f5028c1dd 100644 --- a/packages/sak-historikk/src/components/maler/HistorikkmalFelles7og8.tsx +++ b/packages/sak-historikk/src/components/maler/HistorikkmalFelles7og8.tsx @@ -18,63 +18,83 @@ const HistorikkMalFelles7og8 = ({ saksnummer, }: HistorikkMal & WrappedComponentProps) => { const { historikkinnslagDeler, dokumentLinks } = historikkinnslag; + return ( <> - {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => ( -
- + {historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => { + const { + hendelse, + resultat, + endredeFelter, + opplysninger, + aarsak, + begrunnelse, + begrunnelseFritekst, + aarsakKodeverkType, + } = historikkinnslagDel; + + const aarsakTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[aarsakKodeverkType] || KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE, + ) + : null; - {historikkinnslagDel.hendelse && ( - - )} + return ( +
+ - {historikkinnslagDel.resultat && ( - - )} + {hendelse && ( + + )} - {historikkinnslagDel.endredeFelter && - historikkinnslagDel.endredeFelter.map((endretFelt, i) => ( -
{/* formatChangedField(endretFelt) */}
- ))} + {resultat && ( + + )} - {historikkinnslagDel.opplysninger && - historikkinnslagDel.opplysninger.map(opplysning => ( - - ))} + {endredeFelter && + endredeFelter.map((endretFelt, i) => ( +
{/* formatChangedField(endretFelt) */}
+ ))} - {historikkinnslagDel.aarsak && ( - - {kodeverkNavnFraKodeFn(historikkinnslagDel.aarsak, KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE)} - - )} - {historikkinnslagDel.begrunnelse && } - {historikkinnslagDel.begrunnelseFritekst && } -
- {dokumentLinks && - dokumentLinks.map(dokumentLenke => ( - ( + ))} + + {aarsak && {aarsakTekst}} + {begrunnelse && } + {begrunnelseFritekst && } +
+ {dokumentLinks && + dokumentLinks.map(dokumentLenke => ( + + ))} +
-
- ))} + ); + })} ); }; diff --git a/packages/sak-historikk/src/components/maler/historikkMalType1.tsx b/packages/sak-historikk/src/components/maler/historikkMalType1.tsx index 430d3c86e9..760efcc9a8 100644 --- a/packages/sak-historikk/src/components/maler/historikkMalType1.tsx +++ b/packages/sak-historikk/src/components/maler/historikkMalType1.tsx @@ -28,7 +28,7 @@ const HistorikkMalType1 = ({ historikkinnslag, kodeverkNavnFraKodeFn, saksnummer {findHendelseText(hendelse, kodeverkNavnFraKodeFn)} )} - {begrunnelseTekst && } + {begrunnelse && } {begrunnelseFritekst && } {dokumentLinks && dokumentLinks.map(dokumentLenke => ( diff --git a/packages/sak-historikk/src/components/maler/historikkMalType4.tsx b/packages/sak-historikk/src/components/maler/historikkMalType4.tsx index 73148cf56c..e9ef476a35 100644 --- a/packages/sak-historikk/src/components/maler/historikkMalType4.tsx +++ b/packages/sak-historikk/src/components/maler/historikkMalType4.tsx @@ -9,24 +9,35 @@ import { findHendelseText } from './felles/historikkUtils'; const HistorikkMalType4 = ({ historikkinnslag, kodeverkNavnFraKodeFn }: HistorikkMal & WrappedComponentProps) => ( <> - {historikkinnslag.historikkinnslagDeler.map((del, delIndex) => ( -
- - {del.aarsak && ( - {kodeverkNavnFraKodeFn(del.aarsak, KodeverkType.VENT_AARSAK)} - )} - {del.begrunnelse && ( - - )} - {del.begrunnelseFritekst && } -
- ))} + {historikkinnslag.historikkinnslagDeler.map((del, delIndex) => { + const { aarsak, begrunnelse, begrunnelseFritekst, aarsakKodeverkType, begrunnelseKodeverkType } = del; + + const aarsakTekst = begrunnelse + ? kodeverkNavnFraKodeFn(begrunnelse, KodeverkType[aarsakKodeverkType] || KodeverkType.VENT_AARSAK) + : null; + + const begrunnelseTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[begrunnelseKodeverkType] || KodeverkType.HISTORIKK_BEGRUNNELSE_TYPE, + ) + : null; + + return ( +
+ + {aarsak && {aarsakTekst}} + {begrunnelse && } + {begrunnelseFritekst && } +
+ ); + })} ); diff --git a/packages/sak-historikk/src/components/maler/historikkMalType5.tsx b/packages/sak-historikk/src/components/maler/historikkMalType5.tsx index f2f626ea5c..74487fb3a7 100644 --- a/packages/sak-historikk/src/components/maler/historikkMalType5.tsx +++ b/packages/sak-historikk/src/components/maler/historikkMalType5.tsx @@ -157,78 +157,97 @@ const HistorikkMalType5 = ({ saksnummer, }: HistorikkMal & WrappedComponentProps) => ( <> - {historikkinnslag.historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => ( -
- {historikkinnslagDel.skjermlenke && ( - - )} - - {lageElementInnhold(historikkinnslagDel, intl, kodeverkNavnFraKodeFn).map(tekst => ( -
- -
- ))} - - {lagGjeldendeFraInnslag(historikkinnslagDel)} + {historikkinnslag.historikkinnslagDeler.map((historikkinnslagDel, historikkinnslagDelIndex) => { + const { + skjermlenke, + soeknadsperiode, + endredeFelter, + opplysninger, + aarsakKodeverkType, + begrunnelse, + begrunnelseKodeverkType, + begrunnelseFritekst, + aarsak, + } = historikkinnslagDel; + + const begrunnelseTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[begrunnelseKodeverkType] || KodeverkType.HISTORIKK_BEGRUNNELSE_TYPE, + ) + : null; + + const aarsakTekst = begrunnelse + ? kodeverkNavnFraKodeFn( + begrunnelse, + KodeverkType[aarsakKodeverkType] || KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE, + ) + : null; - {historikkinnslagDel.soeknadsperiode && - lagSoeknadsperiode(historikkinnslagDel.soeknadsperiode, kodeverkNavnFraKodeFn)} - - {lagTemaHeadingId(historikkinnslagDel)} - - {historikkinnslagDel.endredeFelter && - historikkinnslagDel.endredeFelter.map((endretFelt, i) => ( - - {formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)} - + return ( +
+ {skjermlenke && ( + + )} + + {lageElementInnhold(historikkinnslagDel, intl, kodeverkNavnFraKodeFn).map(tekst => ( +
+ +
))} - {historikkinnslagDel.opplysninger && - historikkinnslagDel.opplysninger.map(opplysning => ( - - {chunks}, br:
}} - key={`${kodeverkNavnFraKodeFn(opplysning.opplysningType, KodeverkType.HISTORIKK_OPPLYSNING_TYPE)}@${opplysning.tilVerdi}`} + {lagGjeldendeFraInnslag(historikkinnslagDel)} + + {soeknadsperiode && lagSoeknadsperiode(soeknadsperiode, kodeverkNavnFraKodeFn)} + + {lagTemaHeadingId(historikkinnslagDel)} + + {endredeFelter && + endredeFelter.map((endretFelt, i) => ( + + {formatChangedField(endretFelt, intl, kodeverkNavnFraKodeFn)} + + ))} + + {opplysninger && + opplysninger.map(opplysning => ( + + {chunks}, br:
}} + key={`${kodeverkNavnFraKodeFn(opplysning.opplysningType, KodeverkType.HISTORIKK_OPPLYSNING_TYPE)}@${opplysning.tilVerdi}`} + /> +
+ ))} + + {aarsak && {aarsakTekst}} + {begrunnelse && } + {begrunnelseFritekst && } + {historikkinnslag.dokumentLinks && + historikkinnslag.dokumentLinks.map(dokumentLenke => ( + -
- ))} - - {historikkinnslagDel.aarsak && ( - - {kodeverkNavnFraKodeFn(historikkinnslagDel.aarsak, KodeverkType.HISTORIKK_AVKLART_SOEKNADSPERIODE_TYPE)} - - )} - {historikkinnslagDel.begrunnelse && ( - - )} - {historikkinnslagDel.begrunnelseFritekst && } - {historikkinnslag.dokumentLinks && - historikkinnslag.dokumentLinks.map(dokumentLenke => ( - - ))} + ))} - {historikkinnslagDelIndex < historikkinnslag.historikkinnslagDeler.length - 1 && } -
- ))} + {historikkinnslagDelIndex < historikkinnslag.historikkinnslagDeler.length - 1 && } +
+ ); + })} );