Merge branch 'main' into endringsmelding-flere-arbeidsforhold

navikt · Jan 23, 2025 · 19da253 · 19da253
2 parents 5506265 + d076051
commit 19da253
Show file tree

Hide file tree

Showing 31 changed files with 991 additions and 717 deletions.
diff --git a/apps/dine-pleiepenger/package.json b/apps/dine-pleiepenger/package.json
@@ -35,7 +35,7 @@
         "jsdom": "26.0.0",
         "lodash.sortby": "4.7.0",
         "lodash.uniq": "4.5.0",
-        "next": "15.1.5",
+        "next": "15.1.6",
         "next-logger": "5.0.1",
         "pino": "9.6.0",
         "react": "19.0.0",
@@ -53,14 +53,14 @@
         "@navikt/ds-tailwind": "7.9.2",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/addon-onboarding": "8.5.0",
-        "@storybook/blocks": "8.5.0",
-        "@storybook/nextjs": "8.5.0",
-        "@storybook/react": "8.5.0",
-        "@storybook/test": "8.5.0",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/addon-onboarding": "8.5.1",
+        "@storybook/blocks": "8.5.1",
+        "@storybook/nextjs": "8.5.1",
+        "@storybook/react": "8.5.1",
+        "@storybook/test": "8.5.1",
         "@types/react": "19.0.7",
         "classnames": "2.5.1",
         "dayjs": "1.11.13",
@@ -69,7 +69,7 @@
         "formik": "2.4.6",
         "jest": "29.7.0",
         "jest-environment-jsdom": "29.7.0",
-        "next": "15.1.5",
+        "next": "15.1.6",
         "node-fetch": "3.3.2",
         "playwright-core": "1.49.1",
         "postcss": "8.5.1",
@@ -78,7 +78,7 @@
         "react-day-picker": "8.10.1",
         "react-dom": "19.0.0",
         "react-intl": "7.1.4",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",
         "uuid": "11.0.5",

diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
@@ -69,15 +69,15 @@
         "@babel/preset-react": "7.26.3",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/react-vite": "8.5.0",
+        "@storybook/react-vite": "8.5.1",
         "@testing-library/dom": "10.4.0",
         "@testing-library/react": "16.2.0",
         "@types/object-hash": "3.0.6",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/react-router-dom": "5.3.3",
         "babel-polyfill": "6.26.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "compression": "1.7.5",
         "cross-env": "7.0.3",
         "dotenv": "16.4.7",
@@ -87,7 +87,7 @@
         "mustache-express": "1.3.2",
         "playwright-core": "1.49.1",
         "rimraf": "6.0.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "typescript": "5.7.3",
         "vite": "6.0.11",
         "vite-plugin-checker": "0.8.0",

diff --git a/apps/endringsmelding-pleiepenger/package.json b/apps/endringsmelding-pleiepenger/package.json
@@ -53,12 +53,12 @@
         "@playwright/test": "1.49.1",
         "@sentry/vite-plugin": "3.0.0",
         "@sif/eslint-config": "*",
-        "@storybook/addon-actions": "8.5.0",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/node-logger": "8.5.0",
-        "@storybook/react": "8.5.0",
+        "@storybook/addon-actions": "8.5.1",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/node-logger": "8.5.1",
+        "@storybook/react": "8.5.1",
         "@storybook/testing-library": "0.2.2",
         "@testing-library/dom": "10.4.0",
         "@testing-library/react": "16.2.0",
@@ -85,7 +85,7 @@
         "postcss": "8.5.1",
         "postcss-import": "16.1.0",
         "react-responsive": "10.0.0",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "storybook-addon-mock": "5.0.0",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",

diff --git a/apps/omsorgsdager-aleneomsorg-dialog/package.json b/apps/omsorgsdager-aleneomsorg-dialog/package.json
@@ -69,21 +69,21 @@
         "@chromatic-com/storybook": "3.2.4",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-onboarding": "8.5.0",
-        "@storybook/blocks": "8.5.0",
-        "@storybook/react": "8.5.0",
-        "@storybook/react-vite": "8.5.0",
-        "@storybook/test": "8.5.0",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-onboarding": "8.5.1",
+        "@storybook/blocks": "8.5.1",
+        "@storybook/react": "8.5.1",
+        "@storybook/react-vite": "8.5.1",
+        "@storybook/test": "8.5.1",
         "@testing-library/dom": "10.4.0",
         "@types/object-hash": "3.0.6",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/react-router-dom": "5.3.3",
         "@vitejs/plugin-react": "4.3.4",
         "babel-polyfill": "6.26.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "compression": "1.7.5",
         "cors": "2.8.5",
         "cross-env": "7.0.3",
@@ -94,7 +94,7 @@
         "less": "4.2.2",
         "mustache-express": "1.3.2",
         "playwright-core": "1.49.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "typescript": "5.7.3",
         "vite": "6.0.11",
         "vite-plugin-checker": "0.8.0"

diff --git a/apps/omsorgsdager-kalkulator/package.json b/apps/omsorgsdager-kalkulator/package.json
@@ -28,7 +28,7 @@
         "formik": "2.4.6",
         "html-react-parser": "5.2.2",
         "jsdom": "26.0.0",
-        "next": "15.1.5",
+        "next": "15.1.6",
         "node-fetch": "3.3.2",
         "react": "19.0.0",
         "react-day-picker": "8.10.1",
@@ -39,13 +39,13 @@
     "devDependencies": {
         "@axe-core/playwright": "4.10.1",
         "@playwright/test": "1.49.1",
-        "@types/node": "22.10.7",
+        "@types/node": "22.10.8",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/uuid": "10.0.0",
         "config": "*",
         "eslint": "9.18.0",
-        "eslint-config-next": "15.1.5",
+        "eslint-config-next": "15.1.6",
         "jest": "29.7.0",
         "jest-environment-jsdom": "29.7.0",
         "playwright-core": "1.49.1",

diff --git a/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json b/apps/omsorgspengerutbetaling-arbeidstaker-soknad/package.json
@@ -53,24 +53,24 @@
         "@chromatic-com/storybook": "3.2.4",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-a11y": "8.5.0",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/addon-onboarding": "8.5.0",
-        "@storybook/blocks": "8.5.0",
-        "@storybook/react": "8.5.0",
-        "@storybook/react-vite": "8.5.0",
-        "@storybook/test": "8.5.0",
+        "@storybook/addon-a11y": "8.5.1",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/addon-onboarding": "8.5.1",
+        "@storybook/blocks": "8.5.1",
+        "@storybook/react": "8.5.1",
+        "@storybook/react-vite": "8.5.1",
+        "@storybook/test": "8.5.1",
         "@testing-library/dom": "10.4.0",
-        "@types/node": "22.10.7",
+        "@types/node": "22.10.8",
         "@types/object-hash": "3.0.6",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/react-router-dom": "5.3.3",
         "@vitejs/plugin-react": "4.3.4",
         "babel-polyfill": "6.26.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "compression": "1.7.5",
         "cross-env": "7.0.3",
         "dotenv": "16.4.7",
@@ -83,7 +83,7 @@
         "mustache-express": "1.3.2",
         "postcss": "8.5.1",
         "postcss-nesting": "13.0.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "storybook-addon-mock": "5.0.0",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",

diff --git a/apps/omsorgspengerutbetaling-soknad/package.json b/apps/omsorgspengerutbetaling-soknad/package.json
@@ -49,25 +49,25 @@
         "@babel/preset-typescript": "7.26.0",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/addon-onboarding": "8.5.0",
-        "@storybook/blocks": "8.5.0",
-        "@storybook/react": "8.5.0",
-        "@storybook/react-vite": "8.5.0",
-        "@storybook/test": "8.5.0",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/addon-onboarding": "8.5.1",
+        "@storybook/blocks": "8.5.1",
+        "@storybook/react": "8.5.1",
+        "@storybook/react-vite": "8.5.1",
+        "@storybook/test": "8.5.1",
         "@testing-library/dom": "10.4.0",
         "@testing-library/react": "16.2.0",
-        "@types/node": "22.10.7",
+        "@types/node": "22.10.8",
         "@types/object-hash": "3.0.6",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/react-router-dom": "5.3.3",
         "@vitejs/plugin-react": "4.3.4",
         "babel-polyfill": "6.26.0",
         "busboy": "1.6.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "compression": "1.7.5",
         "cross-env": "7.0.3",
         "dotenv": "16.4.7",
@@ -80,7 +80,7 @@
         "mustache-express": "1.3.2",
         "postcss": "8.5.1",
         "postcss-nesting": "13.0.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",
         "vite": "6.0.11",

diff --git a/apps/omsorgspengesoknad/package.json b/apps/omsorgspengesoknad/package.json
@@ -47,13 +47,13 @@
         "@babel/preset-typescript": "7.26.0",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-a11y": "8.5.0",
-        "@storybook/addon-actions": "8.5.0",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/node-logger": "8.5.0",
-        "@storybook/react": "8.5.0",
+        "@storybook/addon-a11y": "8.5.1",
+        "@storybook/addon-actions": "8.5.1",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/node-logger": "8.5.1",
+        "@storybook/react": "8.5.1",
         "@storybook/testing-library": "0.2.2",
         "@testing-library/dom": "10.4.0",
         "@testing-library/react": "16.2.0",
@@ -65,7 +65,7 @@
         "axe-core": "4.10.2",
         "babel-polyfill": "6.26.0",
         "busboy": "1.6.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "compression": "1.7.5",
         "cors": "2.8.5",
         "cross-env": "7.0.3",
@@ -76,7 +76,7 @@
         "mustache-express": "1.3.2",
         "playwright-core": "1.49.1",
         "postcss": "8.5.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",
         "vite": "6.0.11",

diff --git a/apps/opplaringspenger-soknad/package.json b/apps/opplaringspenger-soknad/package.json
@@ -55,33 +55,33 @@
         "@babel/preset-typescript": "7.26.0",
         "@playwright/test": "1.49.1",
         "@sif/eslint-config": "*",
-        "@storybook/addon-essentials": "8.5.0",
-        "@storybook/addon-interactions": "8.5.0",
-        "@storybook/addon-links": "8.5.0",
-        "@storybook/addon-onboarding": "8.5.0",
-        "@storybook/blocks": "8.5.0",
-        "@storybook/react": "8.5.0",
-        "@storybook/react-vite": "8.5.0",
-        "@storybook/test": "8.5.0",
+        "@storybook/addon-essentials": "8.5.1",
+        "@storybook/addon-interactions": "8.5.1",
+        "@storybook/addon-links": "8.5.1",
+        "@storybook/addon-onboarding": "8.5.1",
+        "@storybook/blocks": "8.5.1",
+        "@storybook/react": "8.5.1",
+        "@storybook/react-vite": "8.5.1",
+        "@storybook/test": "8.5.1",
         "@testing-library/dom": "10.4.0",
         "@testing-library/react": "16.2.0",
-        "@types/node": "22.10.7",
+        "@types/node": "22.10.8",
         "@types/object-hash": "3.0.6",
         "@types/react": "19.0.7",
         "@types/react-dom": "19.0.3",
         "@types/react-router-dom": "5.3.3",
         "@vitejs/plugin-react": "4.3.4",
         "babel-polyfill": "6.26.0",
         "busboy": "1.6.0",
-        "chromatic": "11.25.0",
+        "chromatic": "11.25.1",
         "cross-env": "7.0.3",
         "eslint": "9.18.0",
         "eslint-plugin-storybook": "0.11.2",
         "helmet": "8.0.0",
         "msw": "2.7.0",
         "postcss": "8.5.1",
         "postcss-nesting": "13.0.1",
-        "storybook": "8.5.0",
+        "storybook": "8.5.1",
         "tailwindcss": "3.4.17",
         "typescript": "5.7.3",
         "vite": "6.0.11",

diff --git a/apps/opplaringspenger-soknad/src/app/søknad/steps/kurs/GodkjentHelseinstitusjonInfo.tsx b/apps/opplaringspenger-soknad/src/app/søknad/steps/kurs/GodkjentHelseinstitusjonInfo.tsx
@@ -0,0 +1,27 @@
+import { Heading, ReadMore } from '@navikt/ds-react';
+import { AppText, useAppIntl } from '../../../i18n';
+
+const GodkjentHelseinstitusjonInfo = () => {
+    const { text } = useAppIntl();
+    return (
+        <ReadMore header={text('steg.kurs.godkjentHelseinstitusjon.label')}>
+            <p>
+                <AppText id="steg.kurs.godkjentHelseinstitusjon.text.1" />
+            </p>
+            <p>
+                <AppText id="steg.kurs.godkjentHelseinstitusjon.text.2" />
+            </p>
+            <p>
+                <AppText id="steg.kurs.godkjentHelseinstitusjon.text.3" />
+            </p>
+            <Heading level="3" size="xsmall" as="div">
+                <AppText id="steg.kurs.godkjentHelseinstitusjon.text.4" />
+            </Heading>
+            <p>
+                <AppText id="steg.kurs.godkjentHelseinstitusjon.text.5" />
+            </p>
+        </ReadMore>
+    );
+};
+
+export default GodkjentHelseinstitusjonInfo;