diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d029c0c6f1..843a1155e2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -9,13 +9,22 @@ updates:
directory: "/"
schedule:
interval: daily
- open-pull-requests-limit: 20
- ignore:
- - dependency-name: "*"
- update-types: ["version-update:semver-patch"]
+ open-pull-requests-limit: 30
registries:
- npm-github
groups:
+ patch:
+ patterns:
+ - "*"
+ update-types:
+ - "patch"
+ exclude-patterns:
+ - "@storybook/*"
+ - "@typescript-eslint*"
+ - "@babel*"
+ - "react*"
+ - "@types/react"
+ - "@navikt*"
react:
patterns:
- "react"
@@ -34,7 +43,12 @@ updates:
- "@storybook/storybook-deployer"
- "@storybook/testing-react"
- "@storybook/testing-library"
+
- package-ecosystem: github-actions
directory: "/"
schedule:
interval: daily
+ groups:
+ github:
+ patterns:
+ - "*"
diff --git a/.github/workflows/deploy-docker-image.yml b/.github/workflows/deploy-docker-image.yml
index 2069f23f64..57666dbe55 100644
--- a/.github/workflows/deploy-docker-image.yml
+++ b/.github/workflows/deploy-docker-image.yml
@@ -33,7 +33,7 @@ jobs:
image: ${{ steps.docker-push.outputs.image }}
steps:
- name: Hente kode
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup .yarnrc.yml
run: |
@@ -44,7 +44,7 @@ jobs:
NPM_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
- name: Sette opp Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'yarn'
@@ -66,7 +66,7 @@ jobs:
- name: Sette TAG variable for docker image & deploy issue-info
run: echo "TAG=$TIMESTAMP-$(echo $GITHUB_SHA | cut -c1-7)" >> $GITHUB_ENV
- - uses: docker/login-action@v2
+ - uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
diff --git a/.github/workflows/lint-tscheck-build.yml b/.github/workflows/lint-tscheck-build.yml
index 05b30a282a..4bf56f5796 100644
--- a/.github/workflows/lint-tscheck-build.yml
+++ b/.github/workflows/lint-tscheck-build.yml
@@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Hente kode
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup .yarnrc.yml
run: |
@@ -25,7 +25,7 @@ jobs:
NPM_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
- name: Sette opp Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'yarn'
@@ -36,9 +36,13 @@ jobs:
- name: Typescript-sjekk
run: yarn ts-check
- - name: Linting
+ - name: Eslint
+ run: yarn lint
+
+ - name: CSS-lint
run: yarn css:lint
- name: Sjekker at koden bygger
if: ${{inputs.run-build}}
run: yarn build-ci
+ timeout-minutes: 30
diff --git a/.github/workflows/promote-command.yml b/.github/workflows/promote-command.yml
index 62ecea88d3..672a835591 100644
--- a/.github/workflows/promote-command.yml
+++ b/.github/workflows/promote-command.yml
@@ -38,7 +38,7 @@ jobs:
echo "CLUSTER=$CLUSTER_INPUT" >> $GITHUB_ENV
- name: Sjekk ut kode
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
ref: ${{ env.SHA }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4d7c1534bc..d84af3636c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Hente kode
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Setup .yarnrc.yml
run: |
@@ -20,7 +20,7 @@ jobs:
NPM_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
- name: Sette opp Node
- uses: actions/setup-node@v3
+ uses: actions/setup-node@v4
with:
node-version: '18'
cache: 'yarn'
diff --git a/.storybook/main.js b/.storybook/main.js
index 314821a26c..9995ece860 100644
--- a/.storybook/main.js
+++ b/.storybook/main.js
@@ -21,6 +21,7 @@ module.exports = {
// ref: https://medium.com/storybookjs/storybook-6-migration-guide-200346241bb5
// '@storybook/addon-essentials',
],
+ staticDirs: ['../public'],
// reactOptions: {
// fastRefresh: true,
@@ -75,6 +76,11 @@ module.exports = {
include: [PACKAGES_DIR],
exclude: [CSS_DIR],
},
+ {
+ test: /\.css$/,
+ use: ['postcss-loader'],
+ include: [CSS_DIR],
+ },
{
test: /\.less$/,
use: [
@@ -100,7 +106,7 @@ module.exports = {
},
},
],
- include: [CSS_DIR, NODE_MODULES],
+ include: [NODE_MODULES],
},
{
test: /\.(jp|pn|sv)g$/,
diff --git a/.storybook/preview.js b/.storybook/preview.js
index c41421b045..1c2006ddcb 100644
--- a/.storybook/preview.js
+++ b/.storybook/preview.js
@@ -1,12 +1,16 @@
-import React from 'react';
import '@formatjs/intl-datetimeformat/polyfill-force';
-import '@formatjs/intl-datetimeformat/locale-data/nb';
import '@formatjs/intl-numberformat/polyfill-force';
+import '@formatjs/intl-datetimeformat/locale-data/nb';
import '@formatjs/intl-numberformat/locale-data/nb';
+import { initialize, mswLoader } from 'msw-storybook-addon';
+import React from 'react';
+import '@navikt/ds-css';
import '@fpsak-frontend/assets/styles/global.css';
import '@navikt/ft-plattform-komponenter/dist/style.css';
-import '@navikt/ds-css';
+initialize({ onUnhandledRequest: 'bypass' });
+
+export const loaders = [mswLoader];
export const decorators = [
Story => (
diff --git a/@types/externals.d.ts b/@types/externals.d.ts
index ffa280d8ea..196a0b97ff 100644
--- a/@types/externals.d.ts
+++ b/@types/externals.d.ts
@@ -6,4 +6,5 @@ declare module '*.svg' {
export default src;
}
declare module '*.less';
+declare module '*.css';
declare module '*.module.css';
diff --git a/deploy/dev-fss-k9saksbehandling.yml b/deploy/dev-fss-k9saksbehandling.yml
index eb03d4e588..c833627b71 100644
--- a/deploy/dev-fss-k9saksbehandling.yml
+++ b/deploy/dev-fss-k9saksbehandling.yml
@@ -87,8 +87,6 @@ spec:
value: "true"
- name: TILBAKE
value: "true"
- - name: UTENLANDSOPPHOLD
- value: "true"
- name: SOKNADPERIODESTRIPE
value: "false"
- name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV
@@ -113,3 +111,7 @@ spec:
value: "true"
- name: OVERSTYR_BEREGNING
value: "true"
+ - name: FAKTA_BEREGNING_REDESIGN
+ value: "true"
+ - name: NOTAT_I_SAK
+ value: "true"
diff --git a/deploy/prod-fss-k9saksbehandling.yml b/deploy/prod-fss-k9saksbehandling.yml
index 354a65da5d..d38d830328 100644
--- a/deploy/prod-fss-k9saksbehandling.yml
+++ b/deploy/prod-fss-k9saksbehandling.yml
@@ -87,8 +87,6 @@ spec:
value: "true"
- name: TILBAKE
value: "true"
- - name: UTENLANDSOPPHOLD
- value: "true"
- name: SOKNADPERIODESTRIPE
value: "false"
- name: TYPE_MEDISINSKE_OPPLYSNINGER_BREV
@@ -113,3 +111,7 @@ spec:
value: "true"
- name: OVERSTYR_BEREGNING
value: "false"
+ - name: FAKTA_BEREGNING_REDESIGN
+ value: "false"
+ - name: NOTAT_I_SAK
+ value: "false"
diff --git a/feature-toggles.json b/feature-toggles.json
index 6c124c8467..f5c878f9a7 100644
--- a/feature-toggles.json
+++ b/feature-toggles.json
@@ -15,10 +15,6 @@
"key": "UNNTAKSBEHANDLING",
"value": "${UNNTAKSBEHANDLING}"
},
- {
- "key": "UTENLANDSOPPHOLD",
- "value": "${UTENLANDSOPPHOLD}"
- },
{
"key": "SOKNADPERIODESTRIPE",
"value": "${SOKNADPERIODESTRIPE}"
@@ -70,5 +66,13 @@
{
"key": "OVERSTYR_BEREGNING",
"value": "${OVERSTYR_BEREGNING}"
+ },
+ {
+ "key": "FAKTA_BEREGNING_REDESIGN",
+ "value": "${FAKTA_BEREGNING_REDESIGN}"
+ },
+ {
+ "key": "NOTAT_I_SAK",
+ "value": "${NOTAT_I_SAK}"
}
]
diff --git a/package.json b/package.json
index 3ea0274971..bbde825225 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,7 @@
"lint:fix": "eslint --fix --cache packages --ext .ts,.tsx,.js,.jsx",
"css:lint": "stylelint \"packages/**/*.css\"",
"dev": "yarn dev-env-variables cross-env NODE_ENV=development APP_URL_K9FORMIDLING=http://localhost:8060/rest/dummy webpack serve --config webpack/webpack.dev.ts",
- "dev-env-variables": "cross-env KLAGE_KABAL=true VARSELTEKST=true DOKUMENTDATA=true UNNTAKSBEHANDLING=true UTENLANDSOPPHOLD=true SOKNADPERIODESTRIPE=false TYPE_MEDISINSKE_OPPLYSNINGER_BREV=true LOS_MARKER_BEHANDLING=true LOS_MARKER_BEHANDLING_SUBMIT=true AKSJONSPUNKT_9014=true AKSJONSPUNKT_9015=true FRITEKST_REDIGERING=true FIX_SOKNADSFRIST_KALENDER_OG_READONLY=true INKLUDER_KALENDER_PILS=true",
+ "dev-env-variables": "cross-env KLAGE_KABAL=true VARSELTEKST=true DOKUMENTDATA=true UNNTAKSBEHANDLING=true UTENLANDSOPPHOLD=true SOKNADPERIODESTRIPE=false TYPE_MEDISINSKE_OPPLYSNINGER_BREV=true LOS_MARKER_BEHANDLING=true LOS_MARKER_BEHANDLING_SUBMIT=true AKSJONSPUNKT_9014=true AKSJONSPUNKT_9015=true FRITEKST_REDIGERING=true FIX_SOKNADSFRIST_KALENDER_OG_READONLY=true INKLUDER_KALENDER_PILS=true FAKTA_BEREGNING_REDESIGN=true NOTAT_I_SAK=true",
"dev-lokal": "cross-env NODE_ENV=development APP_URL_SAK=http://k9-sak:8080 APP_URL_K9OPPDRAG=http://k9-oppdrag:8070 APP_URL_K9FORMIDLING_DD=http://k9-formidling-dokumentdata:8294 APP_URL_K9FORMIDLING=http://k9-formidling:8290 SPLITTET_SAMMENLINGNING_BEREGNING=true webpack serve --config webpack/webpack.dev.ts",
"dev-med-formidling": "cross-env NODE_ENV=development webpack serve --config webpack/webpack.dev.ts",
"build": "cross-env NODE_ENV=production SENTRY_RELEASE=$(git rev-parse --short HEAD) webpack --config webpack/webpack.prod.ts",
@@ -40,20 +40,20 @@
"packages/*"
],
"dependencies": {
- "@babel/runtime": "7.23.1",
- "@formatjs/intl-datetimeformat": "6.10.3",
- "@formatjs/intl-numberformat": "8.7.2",
- "@navikt/aksel-icons": "5.5.0",
- "@navikt/ds-css": "5.5.0",
- "@navikt/ds-react": "5.5.0",
- "@navikt/ds-tailwind": "^5.5.0",
- "@navikt/familie-endringslogg": "9.0.3",
- "@navikt/ft-plattform-komponenter": "2.3.2",
+ "@babel/runtime": "7.23.2",
+ "@formatjs/intl-datetimeformat": "6.11.1",
+ "@formatjs/intl-numberformat": "8.8.0",
+ "@navikt/aksel-icons": "5.10.0",
+ "@navikt/ds-css": "5.10.0",
+ "@navikt/ds-react": "5.10.0",
+ "@navikt/ds-tailwind": "^5.10.0",
+ "@navikt/familie-endringslogg": "10.0.0",
+ "@navikt/ft-plattform-komponenter": "2.3.9",
"@popperjs/core": "2.11.8",
- "@sentry/browser": "7.70.0",
+ "@sentry/browser": "7.80.0",
"@storybook/testing-react": "2.0.1",
- "axios": "0.27.2",
- "core-js": "3.32.2",
+ "axios": "1.6.1",
+ "core-js": "3.33.2",
"date-fns": "2.30.0",
"date-fns-tz": "2.0.0",
"dotenv": "16.3.1",
@@ -64,51 +64,51 @@
"postcss-import": "^15.1.0",
"postcss-less": "6.0.0",
"postcss-loader": "^7.3.3",
- "react": "17.0.2",
- "react-dom": "17.0.2",
+ "react": "18.2.0",
+ "react-dom": "18.2.0",
"react-modal": "3.16.1",
- "react-router": "6.16.0",
- "react-router-dom": "6.16.0"
+ "react-router": "6.18.0",
+ "react-router-dom": "6.18.0"
},
"devDependencies": {
- "@babel/core": "7.23.0",
- "@babel/eslint-parser": "7.22.15",
+ "@babel/core": "7.23.3",
+ "@babel/eslint-parser": "7.23.3",
"@babel/helper-regex": "7.10.5",
- "@babel/preset-env": "7.22.20",
- "@babel/preset-react": "7.22.15",
- "@babel/preset-typescript": "7.23.0",
+ "@babel/preset-env": "7.23.3",
+ "@babel/preset-react": "7.23.3",
+ "@babel/preset-typescript": "7.23.3",
"@babel/register": "7.22.15",
+ "@cfaester/enzyme-adapter-react-18": "^0.7.1",
"@commercetools/enzyme-extensions": "5.0.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.11",
- "@sentry/cli": "2.21.1",
- "@storybook/addon-actions": "7.4.5",
- "@storybook/addon-docs": "7.4.5",
- "@storybook/addon-essentials": "7.4.5",
+ "@sentry/cli": "2.21.2",
+ "@storybook/addon-actions": "7.5.3",
+ "@storybook/addon-docs": "7.5.3",
+ "@storybook/addon-essentials": "7.5.3",
"@storybook/addon-knobs": "7.0.2",
- "@storybook/addons": "7.4.5",
- "@storybook/cli": "7.4.5",
- "@storybook/react": "7.4.5",
- "@storybook/react-webpack5": "7.4.5",
+ "@storybook/addons": "7.5.3",
+ "@storybook/cli": "7.5.3",
+ "@storybook/react": "7.5.3",
+ "@storybook/react-webpack5": "7.5.3",
"@storybook/storybook-deployer": "2.8.16",
- "@storybook/theming": "7.4.5",
- "@svgr/webpack": "7.0.0",
+ "@storybook/theming": "7.5.3",
+ "@svgr/webpack": "8.1.0",
"@testing-library/dom": "8.20.1",
"@testing-library/jest-dom": "^6.1.3",
"@testing-library/react": "12.1.5",
"@testing-library/user-event": "13.5.0",
- "@types/chai": "4.3.6",
- "@types/enzyme": "3.10.14",
+ "@types/chai": "4.3.9",
+ "@types/enzyme": "3.10.15",
"@types/history": "5.0.0",
- "@types/jest": "29.5.5",
- "@types/prop-types": "15.7.7",
- "@types/react": "17.0.65",
- "@types/react-collapse": "5.0.1",
+ "@types/jest": "29.5.7",
+ "@types/prop-types": "15.7.9",
+ "@types/react": "18.2.35",
+ "@types/react-collapse": "5.0.3",
"@types/react-router-dom": "5.3.3",
- "@types/redux-form": "8.3.5",
- "@types/sinon": "10.0.16",
- "@types/styled-components": "5.1.27",
- "@typescript-eslint/eslint-plugin": "6.7.2",
- "@typescript-eslint/parser": "6.7.2",
+ "@types/redux-form": "8.3.8",
+ "@types/sinon": "10.0.20",
+ "@typescript-eslint/eslint-plugin": "6.11.0",
+ "@typescript-eslint/parser": "6.11.0",
"@vitejs/plugin-react": "^4.0.4",
"@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
"autoprefixer": "^10.4.16",
@@ -117,25 +117,25 @@
"babel-loader": "9.1.3",
"body-parser": "1.20.2",
"cache-loader": "4.1.0",
- "chai": "4.3.8",
+ "chai": "4.3.10",
"circular-dependency-plugin": "5.2.2",
"copy-webpack-plugin": "11.0.0",
"cross-env": "7.0.3",
"css-loader": "6.8.1",
"css-minimizer-webpack-plugin": "5.0.1",
"enzyme": "3.11.0",
- "eslint": "8.50.0",
+ "eslint": "8.53.0",
"eslint-config-airbnb": "19.0.4",
- "eslint-config-prettier": "8.10.0",
+ "eslint-config-prettier": "9.0.0",
"eslint-import-resolver-lerna": "2.0.0",
- "eslint-import-resolver-webpack": "0.13.7",
+ "eslint-import-resolver-webpack": "0.13.8",
"eslint-loader": "4.0.2",
- "eslint-plugin-import": "2.28.1",
- "eslint-plugin-jest": "27.4.0",
+ "eslint-plugin-import": "2.29.0",
+ "eslint-plugin-jest": "27.6.0",
"eslint-plugin-jest-dom": "4.0.3",
"eslint-plugin-jsx-a11y": "6.7.1",
"eslint-plugin-react": "7.33.2",
- "eslint-plugin-storybook": "0.6.14",
+ "eslint-plugin-storybook": "0.6.15",
"external-remotes-plugin": "1.0.0",
"file-loader": "6.2.0",
"happy-dom": "^11.0.2",
@@ -148,43 +148,41 @@
"jest-runner-eslint": "2.1.2",
"jest-transform-stub": "2.0.0",
"jsdom": "22.1.0",
- "lerna": "7.3.0",
+ "lerna": "7.4.2",
"less": "4.2.0",
"less-loader": "11.1.3",
- "lint-staged": "13.3.0",
+ "lint-staged": "15.1.0",
"mini-css-extract-plugin": "2.7.6",
- "msw": "1.3.1",
- "postcss": "^8.4.30",
- "prettier": "3.0.3",
+ "msw": "1.3.2",
+ "msw-storybook-addon": "^1.10.0",
+ "postcss": "^8.4.31",
+ "prettier": "3.1.0",
"raf": "3.4.1",
"react-popper": "2.3.0",
"react-test-renderer": "18.2.0",
"redux-mock-store": "1.5.4",
"sinon": "15.2.0",
"source-map-loader": "4.0.1",
- "storybook": "7.4.5",
+ "storybook": "7.5.2",
"storybook-react-router": "1.0.8",
- "stylelint": "15.10.3",
+ "stylelint": "15.11.0",
"stylelint-order": "6.0.3",
- "tailwindcss": "^3.3.3",
+ "tailwindcss": "^3.3.5",
"terser-webpack-plugin": "5.3.9",
"thread-loader": "4.0.2",
- "type-fest": "3.13.1",
"typescript": "5.2.2",
"vite": "^4.4.9",
"vite-plugin-svgr": "^3.2.0",
"vitest": "^0.34.3",
- "webpack": "5.88.2",
+ "webpack": "5.89.0",
"webpack-cli": "5.1.4",
"webpack-dev-server": "4.15.1",
- "webpack-merge": "5.9.0"
+ "webpack-merge": "5.10.0"
},
"resolutions": {
- "react": "17.0.2",
- "react-dom": "17.0.2",
+ "postcss": "8.4.31",
"react-test-renderer": "18.2.0",
"parse-url": "8.1.0",
- "@types/react": "17",
"@editorjs/editorjs": "2.27.2"
},
"msw": {
diff --git a/packages/assets/styles/global.css b/packages/assets/styles/global.css
index f767a9f9d0..25d3ba9259 100644
--- a/packages/assets/styles/global.css
+++ b/packages/assets/styles/global.css
@@ -565,11 +565,11 @@ div[class^='SjekkFodselDokForm'] [class^='periodFieldArray_buttonRemove'] {
}
.snakkeboble.snakkeboble__bruker .panel {
- background: var(--a-white) 2;
+ background: #fff2e0;
}
.snakkeboble.snakkeboble__bruker .snakkeboble__snakkebole-pil {
- background: var(--a-white) 2;
+ background: #fff2e0;
}
.snakkeboble.snakkeboble__ekstern .panel {
diff --git a/packages/behandling-anke/package.json b/packages/behandling-anke/package.json
index 155e91b918..d56548003a 100644
--- a/packages/behandling-anke/package.json
+++ b/packages/behandling-anke/package.json
@@ -25,9 +25,9 @@
"nav-frontend-modal-style": "2.0.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/behandling-felles/package.json b/packages/behandling-felles/package.json
index 7c0ca3cbf9..e2d3b16866 100644
--- a/packages/behandling-felles/package.json
+++ b/packages/behandling-felles/package.json
@@ -15,11 +15,11 @@
"@k9-sak-web/modal-sett-pa-vent": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-plattform-komponenter": "2.3.2",
+ "@navikt/ft-plattform-komponenter": "2.3.9",
"@navikt/k9-fe-array-utils": "1.0.4",
"@navikt/k9-fe-bem-utils": "1.0.2",
- "@navikt/k9-fe-date-utils": "1.0.5",
- "@navikt/k9-fe-period-utils": "1.0.8",
+ "@navikt/k9-fe-date-utils": "1.0.6",
+ "@navikt/k9-fe-period-utils": "1.0.9",
"classnames": "2.3.2",
"nav-frontend-core": "6.0.1",
"nav-frontend-grid": "2.0.2",
@@ -34,9 +34,9 @@
"nav-frontend-tabs": "2.0.3",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux-form": "8.3.10",
"reselect": "4.1.8"
},
diff --git a/packages/behandling-felles/src/util/fakta/FaktaPanelDef.tsx b/packages/behandling-felles/src/util/fakta/FaktaPanelDef.tsx
index 349d959491..076badb45b 100644
--- a/packages/behandling-felles/src/util/fakta/FaktaPanelDef.tsx
+++ b/packages/behandling-felles/src/util/fakta/FaktaPanelDef.tsx
@@ -31,6 +31,13 @@ abstract class FaktaPanelDef {
// eslint-disable-next-line @typescript-eslint/no-unused-vars
public getEndepunkter = (featureToggles?: any): string[] => [];
+ /**
+ * Data som komponent er avhengig av må defineres her slik at det kan hentes fra server.
+ * Forskjell fra getEndepunkter er at disse endepunktene alltid kalles på nytt ved åpning av panelet
+ */
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ public getEndepunkterUtenCaching = (featureToggles?: any): string[] => [];
+
/**
* For å avgjøre om komponent skal vises brukes denne i @see skalVisePanel
*/
diff --git a/packages/behandling-frisinn/package.json b/packages/behandling-frisinn/package.json
index a5ce550f38..570c0d3d15 100644
--- a/packages/behandling-frisinn/package.json
+++ b/packages/behandling-frisinn/package.json
@@ -23,11 +23,12 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "4.3.3",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.3.6",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "@navikt/ft-fakta-beregning": "5.0.11",
+ "@navikt/ft-fakta-beregning-redesign": "1.0.12",
+ "@navikt/ft-prosess-beregningsgrunnlag": "6.3.15",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/behandling-frisinn/src/components/FrisinnFakta.spec.tsx b/packages/behandling-frisinn/src/components/FrisinnFakta.spec.tsx
index a6454a6c55..3c1db124ef 100644
--- a/packages/behandling-frisinn/src/components/FrisinnFakta.spec.tsx
+++ b/packages/behandling-frisinn/src/components/FrisinnFakta.spec.tsx
@@ -146,6 +146,7 @@ describe('
', () => {
setApentFaktaPanel={sinon.spy()}
setBehandling={sinon.spy()}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
+ featureToggles={{ FAKTA_BEREGNING_REDESIGN: true }}
/>,
);
@@ -187,6 +188,7 @@ describe('', () => {
setApentFaktaPanel={sinon.spy()}
setBehandling={sinon.spy()}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
+ featureToggles={{ FAKTA_BEREGNING_REDESIGN: true }}
/>,
);
diff --git a/packages/behandling-frisinn/src/components/FrisinnFakta.tsx b/packages/behandling-frisinn/src/components/FrisinnFakta.tsx
index 268f8bbad2..10cc5d7dcf 100644
--- a/packages/behandling-frisinn/src/components/FrisinnFakta.tsx
+++ b/packages/behandling-frisinn/src/components/FrisinnFakta.tsx
@@ -1,7 +1,14 @@
import React, { useEffect, useState } from 'react';
import { Rettigheter, SideMenuWrapper, faktaHooks, useSetBehandlingVedEndring } from '@k9-sak-web/behandling-felles';
-import { KodeverkMedNavn, Behandling, Fagsak, FagsakPerson, ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types';
+import {
+ KodeverkMedNavn,
+ Behandling,
+ Fagsak,
+ FagsakPerson,
+ ArbeidsgiverOpplysningerPerId,
+ FeatureToggles,
+} from '@k9-sak-web/types';
import { RestApiState, useRestApiErrorDispatcher } from '@k9-sak-web/rest-api-hooks';
import ErrorBoundary from '@k9-sak-web/sak-app/src/app/ErrorBoundary';
import ac from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
@@ -27,6 +34,7 @@ interface OwnProps {
setApentFaktaPanel: (faktaPanelInfo: { urlCode: string; textCode: string }) => void;
setBehandling: (behandling: Behandling) => void;
arbeidsgiverOpplysningerPerId: ArbeidsgiverOpplysningerPerId;
+ featureToggles: FeatureToggles;
}
const FrisinnFakta = ({
@@ -43,6 +51,7 @@ const FrisinnFakta = ({
setApentFaktaPanel,
setBehandling,
arbeidsgiverOpplysningerPerId,
+ featureToggles,
}: OwnProps) => {
const { aksjonspunkter, ...rest } = data;
const { addErrorMessage } = useRestApiErrorDispatcher();
@@ -72,6 +81,7 @@ const FrisinnFakta = ({
rettigheter,
aksjonspunkter,
valgtFaktaSteg,
+ featureToggles,
);
faktaHooks.useFaktaAksjonspunktNotifikator(faktaPaneler, setApentFaktaPanel, behandling.versjon);
@@ -93,6 +103,12 @@ const FrisinnFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
// TODO FetchedData er feil type
const { data: faktaData, state } = restApiFrisinnHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
@@ -100,6 +116,12 @@ const FrisinnFakta = ({
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiFrisinnHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
const [formData, setFormData] = useState({});
useEffect(() => {
if (formData) {
@@ -108,7 +130,11 @@ const FrisinnFakta = ({
}, [behandling.versjon]);
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -116,6 +142,7 @@ const FrisinnFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
formData,
diff --git a/packages/behandling-frisinn/src/components/FrisinnPaneler.tsx b/packages/behandling-frisinn/src/components/FrisinnPaneler.tsx
index 763691a016..7619e1f2dd 100644
--- a/packages/behandling-frisinn/src/components/FrisinnPaneler.tsx
+++ b/packages/behandling-frisinn/src/components/FrisinnPaneler.tsx
@@ -98,6 +98,7 @@ const FrisinnPaneler = ({
setApentFaktaPanel={setApentFaktaPanel}
setBehandling={setBehandling}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
+ featureToggles={featureToggles}
/>
>
);
diff --git a/packages/behandling-frisinn/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx b/packages/behandling-frisinn/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
index 3633f1aebe..067765890f 100644
--- a/packages/behandling-frisinn/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
+++ b/packages/behandling-frisinn/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
@@ -6,10 +6,14 @@ import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { konverterKodeverkTilKode, mapVilkar, transformBeregningValues } from '@fpsak-frontend/utils';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { BeregningFaktaIndex } from '@navikt/ft-fakta-beregning';
+import { BeregningFaktaIndex as BeregningFaktaIndexRedesign } from '@navikt/ft-fakta-beregning-redesign';
+import { FrisinnBehandlingApiKeys } from '../../data/frisinnBehandlingApi';
class BeregningFaktaPanelDef extends FaktaPanelDef {
getUrlKode = () => faktaPanelCodes.BEREGNING;
+ getEndepunkterUtenCaching = () => [FrisinnBehandlingApiKeys.BEREGNINGSGRUNNLAG];
+
getTekstKode = () => 'BeregningInfoPanel.Title';
getAksjonspunktKoder = () => [aksjonspunktCodes.VURDER_FAKTA_FOR_ATFL_SN];
@@ -18,6 +22,23 @@ class BeregningFaktaPanelDef extends FaktaPanelDef {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps);
const bgVilkaret = deepCopyProps.vilkar.find(v => v.vilkarType === vilkarType.BEREGNINGSGRUNNLAGVILKARET);
+ if (props.featureToggles?.FAKTA_BEREGNING_REDESIGN) {
+ return (
+ props.submitCallback(transformBeregningValues(aksjonspunktData))}
+ formData={props.formData}
+ setFormData={props.setFormData}
+ vilkar={mapVilkar(bgVilkaret, props.beregningreferanserTilVurdering)}
+ kodeverkSamling={deepCopyProps.alleKodeverk}
+ erOverstyrer={false}
+ submittable={deepCopyProps.submittable}
+ readOnly={deepCopyProps.isReadOnly}
+ skalKunneOverstyreAktiviteter={false}
+ skalKunneAvbryteOverstyring
+ />
+ );
+ }
return (
{
if (data?.behandlingPerioderårsakMedVilkår?.perioderMedÅrsak?.perioderTilVurdering) {
- return data.behandlingPerioderårsakMedVilkår.perioderMedÅrsak.perioderTilVurdering.filter(periode =>
- isBefore(parse(periode.tom, 'yyyy-MM-dd', new Date()), parse('2023-01-01', 'yyyy-MM-dd', new Date())),
- ).length > 0;
+ return (
+ data.behandlingPerioderårsakMedVilkår.perioderMedÅrsak.perioderTilVurdering.filter(periode =>
+ isBefore(parse(periode.tom, 'yyyy-MM-dd', new Date()), parse('2023-01-01', 'yyyy-MM-dd', new Date())),
+ ).length > 0
+ );
}
return false;
};
@@ -98,6 +100,7 @@ const OmsorgspengerFakta = ({
rettigheter,
aksjonspunkter,
valgtFaktaSteg,
+ featureToggles,
);
faktaHooks.useFaktaAksjonspunktNotifikator(faktaPaneler, setApentFaktaPanel, behandling.versjon);
@@ -119,12 +122,24 @@ const OmsorgspengerFakta = ({
.getEndepunkter(featureToggles)
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
const { data: faktaData, state } = restApiOmsorgHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
suspendRequest: !valgtPanel,
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiOmsorgHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
const [formData, setFormData] = useState({});
useEffect(() => {
if (formData) {
@@ -133,7 +148,11 @@ const OmsorgspengerFakta = ({
}, [behandling.versjon]);
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -141,6 +160,7 @@ const OmsorgspengerFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
fagsak,
behandling,
alleKodeverk,
diff --git a/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx b/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
index af7079c352..6be11260b3 100644
--- a/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
+++ b/packages/behandling-omsorgspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
@@ -6,10 +6,14 @@ import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { konverterKodeverkTilKode, mapVilkar, transformBeregningValues } from '@fpsak-frontend/utils';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { BeregningFaktaIndex } from '@navikt/ft-fakta-beregning';
+import { BeregningFaktaIndex as BeregningFaktaIndexRedesign } from '@navikt/ft-fakta-beregning-redesign';
+import { OmsorgspengerBehandlingApiKeys } from '../../data/omsorgspengerBehandlingApi';
class BeregningFaktaPanelDef extends FaktaPanelDef {
getUrlKode = () => faktaPanelCodes.BEREGNING;
+ getEndepunkterUtenCaching = () => [OmsorgspengerBehandlingApiKeys.BEREGNINGSGRUNNLAG];
+
getTekstKode = () => 'BeregningInfoPanel.Title';
getAksjonspunktKoder = () => [
@@ -23,6 +27,22 @@ class BeregningFaktaPanelDef extends FaktaPanelDef {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps);
const bgVilkaret = deepCopyProps.vilkar.find(v => v.vilkarType === vilkarType.BEREGNINGSGRUNNLAGVILKARET);
+ if (props.featureToggles?.FAKTA_BEREGNING_REDESIGN) {
+ return (
+ props.submitCallback(transformBeregningValues(aksjonspunktData))}
+ formData={props.formData}
+ setFormData={props.setFormData}
+ vilkar={mapVilkar(bgVilkaret, props.beregningreferanserTilVurdering)}
+ skalKunneOverstyreAktiviteter={false}
+ skalKunneAvbryteOverstyring
+ />
+ );
+ }
return (
', () => {
setBehandling={sinon.spy()}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
dokumenter={[]}
- featureToggles={{ UTENLANDSOPPHOLD: true }}
+ featureToggles={{}}
/>,
);
@@ -216,11 +216,6 @@ describe('', () => {
harAksjonspunkt: false,
tekstKode: 'InntektOgYtelser.Title',
},
- {
- erAktiv: false,
- harAksjonspunkt: false,
- tekstKode: 'UtenlandsoppholdInfoPanel.Title',
- },
{ erAktiv: false, harAksjonspunkt: false, tekstKode: 'SoknadsperioderPanel.Soknadsperioder' },
]);
});
diff --git a/packages/behandling-opplaeringspenger/src/components/OpplaeringspengerFakta.tsx b/packages/behandling-opplaeringspenger/src/components/OpplaeringspengerFakta.tsx
index 6f87fa8246..bb9b5a4b65 100644
--- a/packages/behandling-opplaeringspenger/src/components/OpplaeringspengerFakta.tsx
+++ b/packages/behandling-opplaeringspenger/src/components/OpplaeringspengerFakta.tsx
@@ -112,6 +112,12 @@ const OpplaeringspengerFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
// TODO FetchedData er feil type her
const { data: faktaData, state } = restApiOpplaeringspengerHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
@@ -119,6 +125,12 @@ const OpplaeringspengerFakta = ({
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiOpplaeringspengerHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
const [formData, setFormData] = useState({});
useEffect(() => {
if (formData) {
@@ -127,7 +139,11 @@ const OpplaeringspengerFakta = ({
}, [behandling.versjon]);
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -135,6 +151,7 @@ const OpplaeringspengerFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
featureToggles,
diff --git a/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.spec.tsx b/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.spec.tsx
deleted file mode 100644
index a8df0865dd..0000000000
--- a/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.spec.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/* eslint-disable jest/expect-expect */
-import React from 'react';
-import { screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-
-import { renderWithIntl } from '@fpsak-frontend/utils-test/src/test-utils';
-// eslint-disable-next-line import/no-relative-packages
-import utenlandsoppholdMock, { utenlandsoppholdÅrsakMock } from '../../../mocks/mockdata/utenlandsoppholdMock';
-
-import Utenlandsopphold from './Utenlandsopphold';
-
-describe('Utenlandsopphold', () => {
- test('har utenlandsopphold som tittel', () => {
- renderWithIntl();
- screen.getByText('Utenlandsopphold');
- });
-
- test('kan kan toggle på hjelpetekst', () => {
- renderWithIntl();
- const infoboksTekst =
- 'Opphold innenfor EØS likestilles med opphold i Norge, og det er ingen tidsbegrensning på hvor lenge søker kan motta opplaeringspenger.';
- expect(screen.queryByText(infoboksTekst)).toBeFalsy();
- userEvent.click(screen.getByRole('button'));
- expect(screen.getByText(infoboksTekst)).toBeVisible();
- });
-
- test('viser land, tilhørighet til EØS og årsak for utenlandsopphold', () => {
- renderWithIntl(
- ,
- );
-
- expect(screen.getByText('Land')).toBeVisible();
- expect(screen.getByText('Luxemburg')).toBeVisible();
- expect(screen.getByText('EØS')).toBeVisible();
- expect(screen.getByText('Ja')).toBeVisible();
- expect(screen.getByText('Merknad til utenlandsopphold')).toBeVisible();
- expect(screen.getByText('Periode telles ikke.')).toBeVisible();
- });
-});
diff --git a/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.tsx b/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.tsx
deleted file mode 100644
index 93dc5ea57e..0000000000
--- a/packages/behandling-opplaeringspenger/src/components/Utenlandsopphold.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-/* eslint-disable react/jsx-curly-brace-presence */
-import React from 'react';
-
-import { Alert, Heading } from '@navikt/ds-react';
-import Ekspanderbartpanel from 'nav-frontend-ekspanderbartpanel';
-
-import { VerticalSpacer } from '@fpsak-frontend/shared-components';
-import { KodeverkMedNavn, UtenlandsoppholdPerioder, UtenlandsoppholdType } from '@k9-sak-web/types';
-import { PeriodList } from '@navikt/ft-plattform-komponenter';
-
-import countries from 'i18n-iso-countries';
-import norwegianLocale from 'i18n-iso-countries/langs/no.json';
-import styles from './utenlandsopphold.module.css';
-
-countries.registerLocale(norwegianLocale);
-
-const Utenlandsopphold = ({
- utenlandsopphold,
- kodeverk,
-}: {
- utenlandsopphold: UtenlandsoppholdPerioder;
- kodeverk: { UtenlandsoppholdÅrsak: KodeverkMedNavn[] };
-}) => {
- const finnÅrsaker = (periode, erEØS) => {
- if (erEØS) {
- return 'Periode telles ikke.';
- }
-
- return kodeverk?.UtenlandsoppholdÅrsak?.find(v => v.kode === periode?.årsak)?.navn || 'Ukjent årsak';
- };
-
- const vurderesMotEØSRegelverk = (landkode: string) => {
- const land = ['CHE'];
- if (land.includes(landkode)) {
- return '*';
- }
- return '';
- };
-
- const mapItems = (periode: UtenlandsoppholdType) => {
- const erEØS = periode.region.kode === 'NORDEN' || periode.region.kode === 'EOS';
-
- const land = { label: 'Land', value: countries.getName(periode.landkode.kode, 'no') };
- const eos = { label: 'EØS', value: erEØS ? 'Ja' : `Nei${vurderesMotEØSRegelverk(periode.landkode.kode)}` };
- const årsak = { label: 'Merknad til utenlandsopphold', value: finnÅrsaker(periode, erEØS) };
-
- return [land, eos, årsak];
- };
-
- const perioder = utenlandsopphold?.perioder;
-
- const harUtenlandsopphold = perioder?.length;
-
- const perioderMedItems = perioder?.map(periode => {
- const [fom, tom] = periode.periode.split('/');
- return { fom, tom, items: mapItems(periode) };
- });
-
- return (
-
-
- Utenlandsopphold
-
-
-
-
-
-
-
- {harUtenlandsopphold ? (
- <>
-
- {perioder.some(periode => vurderesMotEØSRegelverk(periode.landkode.kode)) && (
-
{`*) Ikke en del av EØS, men vurderes mot EØS-regelverk`}
- )}
- >
- ) : (
- <>Søker har ingen utenlandsopphold å vise.>
- )}
-
- );
-};
-
-export default Utenlandsopphold;
diff --git a/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaOpplaeringspengerPanelDefinisjoner.tsx b/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaOpplaeringspengerPanelDefinisjoner.tsx
index 35e682a950..3eb9e4c85d 100644
--- a/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaOpplaeringspengerPanelDefinisjoner.tsx
+++ b/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaOpplaeringspengerPanelDefinisjoner.tsx
@@ -11,7 +11,6 @@ import OmBarnetFaktaPanelDef from './faktaPaneler/OmBarnetFaktaPanelDef';
import InntektOgYtelserFaktaPanelDef from './faktaPaneler/InntektOgYtelserFaktaPanelDef';
import OverstyrBeregningFaktaPanelDef from './faktaPaneler/OverstyrBeregningFaktaPanelDef';
import DirekteOvergangFaktaPanelDef from './faktaPaneler/DirekteOvergangFaktaPanelDef';
-import UtenlandsoppholdFaktaPanelDef from './faktaPaneler/UtenlandsoppholdFaktaPanelDef';
import SoknadsperioderFaktaPanelDef from './faktaPaneler/SoknadsperioderFaktaPanelDef';
import InstitusjonFaktaPanelDef from './faktaPaneler/InstitusjonFaktaPanelDef';
import OpplaeringFaktaPanelDef from './faktaPaneler/OpplaeringFaktaPanelDef';
@@ -32,7 +31,6 @@ const faktaPanelDefinisjoner = [
new BeregningFaktaPanelDef(),
new FordelBeregningPanelDef(),
new InntektOgYtelserFaktaPanelDef(),
- new UtenlandsoppholdFaktaPanelDef(),
new SoknadsperioderFaktaPanelDef(),
];
diff --git a/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx b/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
index c51fcdf5bc..f46319ca43 100644
--- a/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
+++ b/packages/behandling-opplaeringspenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
@@ -6,11 +6,15 @@ import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { konverterKodeverkTilKode, mapVilkar, transformBeregningValues } from '@fpsak-frontend/utils';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { BeregningFaktaIndex } from '@navikt/ft-fakta-beregning';
+import { BeregningFaktaIndex as BeregningFaktaIndexRedesign } from '@navikt/ft-fakta-beregning-redesign';
+import { OpplaeringspengerBehandlingApiKeys } from '../../data/opplaeringspengerBehandlingApi';
class BeregningFaktaPanelDef extends FaktaPanelDef {
// eslint-disable-next-line class-methods-use-this
getUrlKode = () => faktaPanelCodes.BEREGNING;
+ getEndepunkterUtenCaching = () => [OpplaeringspengerBehandlingApiKeys.BEREGNINGSGRUNNLAG];
+
// eslint-disable-next-line class-methods-use-this
getTekstKode = () => 'BeregningInfoPanel.Title';
@@ -27,6 +31,22 @@ class BeregningFaktaPanelDef extends FaktaPanelDef {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps);
const bgVilkaret = deepCopyProps.vilkar.find(v => v.vilkarType === vilkarType.BEREGNINGSGRUNNLAGVILKARET);
+ if (props.featureToggles?.FAKTA_BEREGNING_REDESIGN) {
+ return (
+ props.submitCallback(transformBeregningValues(aksjonspunktData))}
+ formData={props.formData}
+ setFormData={props.setFormData}
+ vilkar={mapVilkar(bgVilkaret, props.beregningreferanserTilVurdering)}
+ skalKunneOverstyreAktiviteter={false}
+ skalKunneAvbryteOverstyring
+ />
+ );
+ }
return (
faktaPanelCodes.UTENLANDSOPPHOLD;
-
- getTekstKode = () => 'UtenlandsoppholdInfoPanel.Title';
-
- getEndepunkter = () => [OpplaeringspengerBehandlingApiKeys.UTENLANDSOPPHOLD];
-
- getKomponent = props => ;
-
- skalVisePanel = (apCodes, data, featureToggles) => featureToggles?.UTENLANDSOPPHOLD;
-}
-
-export default UtenlandsoppholdFaktaPanelDef;
diff --git a/packages/behandling-pleiepenger-sluttfase/i18n/nb_NO.json b/packages/behandling-pleiepenger-sluttfase/i18n/nb_NO.json
index e56f1549ce..308849f9d7 100644
--- a/packages/behandling-pleiepenger-sluttfase/i18n/nb_NO.json
+++ b/packages/behandling-pleiepenger-sluttfase/i18n/nb_NO.json
@@ -5,6 +5,7 @@
"BeregningInfoPanel.Title": "Beregning",
"LivetsSluttfasePanel.LivetsSluttfase": "Livets sluttfase",
"InntektOgYtelser.Title": "Inntekt og ytelser",
+ "UtenlandsoppholdInfoPanel.Title": "Utenlandsopphold",
"MainSideMenu.Heading": "Saksopplysninger",
"OpptjeningInfoPanel.KontrollerFaktaForOpptjening": "Opptjening",
"InntektsmeldingInfoPanel.Title": "Inntektsmelding",
diff --git a/packages/behandling-pleiepenger-sluttfase/package.json b/packages/behandling-pleiepenger-sluttfase/package.json
index 2c656cfbe4..bd42027486 100644
--- a/packages/behandling-pleiepenger-sluttfase/package.json
+++ b/packages/behandling-pleiepenger-sluttfase/package.json
@@ -24,6 +24,7 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
+ "@k9-sak-web/fakta-utenlandsopphold": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-vilkar-soknadsfrist": "1.0.0",
"@k9-sak-web/prosess-vilkar-sykdom": "1.0.0",
@@ -31,14 +32,15 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "4.3.3",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.6",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.3.6",
- "axios": "0.27.2",
+ "@navikt/ft-fakta-beregning": "5.0.11",
+ "@navikt/ft-fakta-beregning-redesign": "1.0.12",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.13",
+ "@navikt/ft-prosess-beregningsgrunnlag": "6.3.15",
+ "axios": "1.6.1",
"nav-frontend-alertstriper": "4.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"redux-saga": "1.2.3",
diff --git a/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.spec.tsx b/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.spec.tsx
index 26cbf31a16..fa5f66bc7a 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.spec.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.spec.tsx
@@ -193,6 +193,11 @@ describe('', () => {
harAksjonspunkt: false,
tekstKode: 'InntektOgYtelser.Title',
},
+ {
+ erAktiv: false,
+ harAksjonspunkt: false,
+ tekstKode: 'UtenlandsoppholdInfoPanel.Title',
+ },
{
erAktiv: false,
harAksjonspunkt: false,
diff --git a/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.tsx b/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.tsx
index 506540a325..47858cba3a 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/components/PleiepengerSluttfaseFakta.tsx
@@ -92,6 +92,7 @@ const PleiepengerSluttfaseFakta = ({
rettigheter,
aksjonspunkter,
valgtFaktaSteg,
+ featureToggles,
);
faktaHooks.useFaktaAksjonspunktNotifikator(faktaPaneler, setApentFaktaPanel, behandling.versjon);
@@ -113,6 +114,12 @@ const PleiepengerSluttfaseFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
// TODO FetchedData er feil type her
const { data: faktaData, state } = restApiPleiepengerSluttfaseHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
@@ -120,6 +127,12 @@ const PleiepengerSluttfaseFakta = ({
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiPleiepengerSluttfaseHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
const [formData, setFormData] = useState({});
useEffect(() => {
if (formData) {
@@ -128,7 +141,11 @@ const PleiepengerSluttfaseFakta = ({
}, [behandling.versjon]);
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -136,6 +153,7 @@ const PleiepengerSluttfaseFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
featureToggles,
diff --git a/packages/behandling-pleiepenger-sluttfase/src/components/Uttak.tsx b/packages/behandling-pleiepenger-sluttfase/src/components/Uttak.tsx
index 2f270d770b..a8b1174a10 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/components/Uttak.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/components/Uttak.tsx
@@ -1,7 +1,7 @@
import aksjonspunktCodes from '@fpsak-frontend/kodeverk/src/aksjonspunktCodes';
import aksjonspunktStatus from '@fpsak-frontend/kodeverk/src/aksjonspunktStatus';
import { MicroFrontend } from '@fpsak-frontend/utils';
-import { Aksjonspunkt, ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types';
+import { Aksjonspunkt, AlleKodeverk, ArbeidsgiverOpplysningerPerId } from '@k9-sak-web/types';
import React from 'react';
const initializeUttak = (
@@ -12,6 +12,7 @@ const initializeUttak = (
arbeidsforhold: ArbeidsgiverOpplysningerPerId,
aksjonspunktkoder: string[],
erFagytelsetypeLivetsSluttfase: boolean,
+ kodeverkUtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak: ({
begrunnelse,
virkningsdato,
@@ -29,6 +30,7 @@ const initializeUttak = (
arbeidsforhold,
aksjonspunktkoder,
erFagytelsetypeLivetsSluttfase,
+ kodeverkUtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak,
virkningsdatoUttakNyeRegler,
aksjonspunkter,
@@ -41,6 +43,7 @@ interface UttakProps {
utsattePerioder: string[];
arbeidsgiverOpplysningerPerId: ArbeidsgiverOpplysningerPerId;
aksjonspunkter: Aksjonspunkt[];
+ alleKodeverk: AlleKodeverk;
erFagytelsetypeLivetsSluttfase: boolean;
submitCallback: (data: { kode: string; begrunnelse: string; virkningsdato: string }[]) => void;
virkningsdatoUttakNyeRegler?: string;
@@ -53,6 +56,7 @@ export default ({
utsattePerioder,
arbeidsgiverOpplysningerPerId,
aksjonspunkter,
+ alleKodeverk,
erFagytelsetypeLivetsSluttfase,
submitCallback,
virkningsdatoUttakNyeRegler,
@@ -83,6 +87,7 @@ export default ({
arbeidsgiverOpplysningerPerId,
funnedeRelevanteAksjonspunktkoder,
erFagytelsetypeLivetsSluttfase,
+ alleKodeverk?.UtenlandsoppholdÅrsak,
løsAksjonspunktVurderDatoNyRegelUttak,
virkningsdatoUttakNyeRegler,
funnedeRelevanteAksjonspunkter,
diff --git a/packages/behandling-pleiepenger-sluttfase/src/data/pleiepengerSluttfaseBehandlingApi.ts b/packages/behandling-pleiepenger-sluttfase/src/data/pleiepengerSluttfaseBehandlingApi.ts
index db3025ca72..507f52aa22 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/data/pleiepengerSluttfaseBehandlingApi.ts
+++ b/packages/behandling-pleiepenger-sluttfase/src/data/pleiepengerSluttfaseBehandlingApi.ts
@@ -54,6 +54,7 @@ export enum PleiepengerSluttfaseBehandlingApiKeys {
OM_PLEIETRENGENDE = 'OM_PLEIETRENGENDE',
BEHANDLING_PERIODER_ÅRSAK_MED_VILKÅR = 'BEHANDLING_PERIODER_ÅRSAK_MED_VILKÅR',
BEREGNINGREFERANSER_TIL_VURDERING = 'BEREGNINGREFERANSER_TIL_VURDERING',
+ UTENLANDSOPPHOLD = 'UTENLANDSOPPHOLD',
}
const endpoints = new RestApiConfigBuilder()
@@ -95,6 +96,8 @@ const endpoints = new RestApiConfigBuilder()
.withRel('overlappende-ytelser', PleiepengerSluttfaseBehandlingApiKeys.OVERLAPPENDE_YTELSER)
.withRel('saksbehandler-info', PleiepengerSluttfaseBehandlingApiKeys.HENT_SAKSBEHANDLERE)
.withRel('om-pleietrengende', PleiepengerSluttfaseBehandlingApiKeys.OM_PLEIETRENGENDE)
+ .withRel('utenlandsopphold', PleiepengerSluttfaseBehandlingApiKeys.UTENLANDSOPPHOLD)
+
.withRel(
'behandling-perioder-årsak-med-vilkår',
PleiepengerSluttfaseBehandlingApiKeys.BEHANDLING_PERIODER_ÅRSAK_MED_VILKÅR,
diff --git a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
index a7c36bb028..71d4343609 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
@@ -6,10 +6,14 @@ import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { konverterKodeverkTilKode, mapVilkar, transformBeregningValues } from '@fpsak-frontend/utils';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { BeregningFaktaIndex } from '@navikt/ft-fakta-beregning';
+import { BeregningFaktaIndex as BeregningFaktaIndexRedesign } from '@navikt/ft-fakta-beregning-redesign';
+import { PleiepengerSluttfaseBehandlingApiKeys } from '../../data/pleiepengerSluttfaseBehandlingApi';
class BeregningFaktaPanelDef extends FaktaPanelDef {
getUrlKode = () => faktaPanelCodes.BEREGNING;
+ getEndepunkterUtenCaching = () => [PleiepengerSluttfaseBehandlingApiKeys.BEREGNINGSGRUNNLAG];
+
getTekstKode = () => 'BeregningInfoPanel.Title';
getAksjonspunktKoder = () => [
@@ -23,6 +27,22 @@ class BeregningFaktaPanelDef extends FaktaPanelDef {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps);
const bgVilkaret = deepCopyProps.vilkar.find(v => v.vilkarType === vilkarType.BEREGNINGSGRUNNLAGVILKARET);
+ if (props.featureToggles?.FAKTA_BEREGNING_REDESIGN) {
+ return (
+ props.submitCallback(transformBeregningValues(aksjonspunktData))}
+ formData={props.formData}
+ setFormData={props.setFormData}
+ vilkar={mapVilkar(bgVilkaret, props.beregningreferanserTilVurdering)}
+ skalKunneOverstyreAktiviteter={false}
+ skalKunneAvbryteOverstyring
+ />
+ );
+ }
return (
faktaPanelCodes.UTENLANDSOPPHOLD;
+
+ getTekstKode = () => 'UtenlandsoppholdInfoPanel.Title';
+
+ getEndepunkter = () => [PleiepengerSluttfaseBehandlingApiKeys.UTENLANDSOPPHOLD];
+
+ getKomponent = props => (
+
+ );
+
+ skalVisePanel = () => true;
+}
+
+export default UtenlandsoppholdFaktaPanelDef;
diff --git a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPleiepengerSluttfasePanelDefinisjoner.tsx b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPleiepengerSluttfasePanelDefinisjoner.tsx
index b9b979e867..63e159cdf0 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPleiepengerSluttfasePanelDefinisjoner.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/faktaPleiepengerSluttfasePanelDefinisjoner.tsx
@@ -9,6 +9,7 @@ import InntektOgYtelserFaktaPanelDef from './faktaPaneler/InntektOgYtelserFaktaP
import OverstyrBeregningFaktaPanelDef from './faktaPaneler/OverstyrBeregningFaktaPanelDef';
import OmPleietrengendeFaktaPanelDef from './faktaPaneler/OmPleietrengendeFaktaPanelDef';
import SoknadsperioderFaktaPanelDef from './faktaPaneler/SoknadsperioderFaktaPanelDef';
+import UtenlandsoppholdFaktaPanelDef from './faktaPaneler/UtenlandsoppholdFaktaPanelDef';
const faktaPanelDefinisjoner = [
new OmPleietrengendeFaktaPanelDef(),
@@ -21,6 +22,7 @@ const faktaPanelDefinisjoner = [
new BeregningFaktaPanelDef(),
new FordelBeregningPanelDef(),
new InntektOgYtelserFaktaPanelDef(),
+ new UtenlandsoppholdFaktaPanelDef(),
new SoknadsperioderFaktaPanelDef(),
];
diff --git a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/UttakProsessStegPanelDef.tsx b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/UttakProsessStegPanelDef.tsx
index c9946ae436..a2d3a90c4f 100644
--- a/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/UttakProsessStegPanelDef.tsx
+++ b/packages/behandling-pleiepenger-sluttfase/src/panelDefinisjoner/prosessStegPaneler/UttakProsessStegPanelDef.tsx
@@ -16,6 +16,7 @@ class PanelDef extends ProsessStegPanelDef {
kvoteInfo,
arbeidsgiverOpplysningerPerId,
aksjonspunkter,
+ alleKodeverk,
erFagytelsetypeLivetsSluttfase,
submitCallback,
virkningsdatoUttakNyeRegler,
@@ -26,6 +27,7 @@ class PanelDef extends ProsessStegPanelDef {
uuid={behandling.uuid}
uttaksperioder={uttaksperioder}
utsattePerioder={utsattePerioder}
+ alleKodeverk={alleKodeverk}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
aksjonspunkter={aksjonspunkter}
erFagytelsetypeLivetsSluttfase={erFagytelsetypeLivetsSluttfase}
@@ -60,13 +62,14 @@ class PanelDef extends ProsessStegPanelDef {
getEndepunkter = () => [PleiepengerSluttfaseBehandlingApiKeys.ARBEIDSFORHOLD];
- getData = ({ uttak, arbeidsgiverOpplysningerPerId, fagsak }) => ({
+ getData = ({ uttak, arbeidsgiverOpplysningerPerId, fagsak, alleKodeverk }) => ({
uttaksperioder: uttak?.uttaksplan?.perioder,
utsattePerioder: uttak?.utsattePerioder,
kvoteInfo: uttak?.uttaksplan?.kvoteInfo,
virkningsdatoUttakNyeRegler: uttak?.virkningsdatoUttakNyeRegler,
arbeidsgiverOpplysningerPerId,
erFagytelsetypeLivetsSluttfase: fagsak.sakstype.kode === fagsakYtelseType.PLEIEPENGER_SLUTTFASE,
+ alleKodeverk,
});
}
diff --git a/packages/behandling-pleiepenger/package.json b/packages/behandling-pleiepenger/package.json
index d42962c48e..cc66401b41 100644
--- a/packages/behandling-pleiepenger/package.json
+++ b/packages/behandling-pleiepenger/package.json
@@ -25,6 +25,7 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/behandling-felles": "1.0.0",
+ "@k9-sak-web/fakta-utenlandsopphold": "1.0.0",
"@k9-sak-web/konstanter": "1.0.0",
"@k9-sak-web/prosess-vilkar-soknadsfrist": "1.0.0",
"@k9-sak-web/prosess-vilkar-sykdom": "1.0.0",
@@ -32,14 +33,15 @@
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/sak-app": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-fakta-beregning": "4.3.3",
- "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.6",
- "@navikt/ft-prosess-beregningsgrunnlag": "6.3.6",
- "axios": "0.27.2",
+ "@navikt/ft-fakta-beregning": "5.0.11",
+ "@navikt/ft-fakta-beregning-redesign": "1.0.12",
+ "@navikt/ft-fakta-fordel-beregningsgrunnlag": "7.3.13",
+ "@navikt/ft-prosess-beregningsgrunnlag": "6.3.15",
+ "axios": "1.6.1",
"nav-frontend-alertstriper": "4.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/behandling-pleiepenger/src/components/PleiepengerFakta.spec.tsx b/packages/behandling-pleiepenger/src/components/PleiepengerFakta.spec.tsx
index 4412dd63b6..aef5fd2d88 100644
--- a/packages/behandling-pleiepenger/src/components/PleiepengerFakta.spec.tsx
+++ b/packages/behandling-pleiepenger/src/components/PleiepengerFakta.spec.tsx
@@ -159,7 +159,7 @@ describe('', () => {
setBehandling={sinon.spy()}
arbeidsgiverOpplysningerPerId={arbeidsgiverOpplysningerPerId}
dokumenter={[]}
- featureToggles={{ UTENLANDSOPPHOLD: true }}
+ featureToggles={{}}
/>,
);
diff --git a/packages/behandling-pleiepenger/src/components/PleiepengerFakta.tsx b/packages/behandling-pleiepenger/src/components/PleiepengerFakta.tsx
index 04a8a682be..d50f56533f 100644
--- a/packages/behandling-pleiepenger/src/components/PleiepengerFakta.tsx
+++ b/packages/behandling-pleiepenger/src/components/PleiepengerFakta.tsx
@@ -107,6 +107,12 @@ const PleiepengerFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
// TODO FetchedData er feil type her
const { data: faktaData, state } = restApiPleiepengerHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
@@ -114,6 +120,12 @@ const PleiepengerFakta = ({
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiPleiepengerHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
const [formData, setFormData] = useState({});
useEffect(() => {
if (formData) {
@@ -122,7 +134,11 @@ const PleiepengerFakta = ({
}, [behandling.versjon]);
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -130,6 +146,7 @@ const PleiepengerFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
featureToggles,
diff --git a/packages/behandling-pleiepenger/src/components/utenlandsopphold.module.css b/packages/behandling-pleiepenger/src/components/utenlandsopphold.module.css
deleted file mode 100644
index 801e327794..0000000000
--- a/packages/behandling-pleiepenger/src/components/utenlandsopphold.module.css
+++ /dev/null
@@ -1,34 +0,0 @@
-.utenlandsopphold {
- max-width: 900px;
-}
-
-.utenlandsopphold__info {
- background: inherit !important;
- border: none !important;
-}
-
-.utenlandsopphold__info :global .ekspanderbartPanel__tittel {
- font-size: 16px;
-}
-
-.utenlandsopphold__info :global .ekspanderbartPanel__hode {
- padding: 0.25rem;
-}
-
-.utenlandsopphold__info :global .ekspanderbartPanel__flex-wrapper {
- gap: 10px;
- justify-content: normal;
-}
-
-.utenlandsopphold__info:hover {
- border: none !important;
- box-shadow: none !important;
-}
-
-.alertstripe .alertstripe__tekst {
- max-width: 100%;
-}
-
-.alertstripe :global .navds-alert__wrapper {
- max-width: 100%;
-}
diff --git a/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx b/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
index c611686f34..bb11d49cf9 100644
--- a/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
+++ b/packages/behandling-pleiepenger/src/panelDefinisjoner/faktaPaneler/BeregningFaktaPanelDef.tsx
@@ -6,11 +6,15 @@ import { FaktaPanelDef } from '@k9-sak-web/behandling-felles';
import { konverterKodeverkTilKode, mapVilkar, transformBeregningValues } from '@fpsak-frontend/utils';
import vilkarType from '@fpsak-frontend/kodeverk/src/vilkarType';
import { BeregningFaktaIndex } from '@navikt/ft-fakta-beregning';
+import { BeregningFaktaIndex as BeregningFaktaIndexRedesign } from '@navikt/ft-fakta-beregning-redesign';
+import { PleiepengerBehandlingApiKeys } from '../../data/pleiepengerBehandlingApi';
class BeregningFaktaPanelDef extends FaktaPanelDef {
// eslint-disable-next-line class-methods-use-this
getUrlKode = () => faktaPanelCodes.BEREGNING;
+ getEndepunkterUtenCaching = () => [PleiepengerBehandlingApiKeys.BEREGNINGSGRUNNLAG];
+
// eslint-disable-next-line class-methods-use-this
getTekstKode = () => 'BeregningInfoPanel.Title';
@@ -27,6 +31,22 @@ class BeregningFaktaPanelDef extends FaktaPanelDef {
const deepCopyProps = JSON.parse(JSON.stringify(props));
konverterKodeverkTilKode(deepCopyProps);
const bgVilkaret = deepCopyProps.vilkar.find(v => v.vilkarType === vilkarType.BEREGNINGSGRUNNLAGVILKARET);
+ if (props.featureToggles?.FAKTA_BEREGNING_REDESIGN) {
+ return (
+ props.submitCallback(transformBeregningValues(aksjonspunktData))}
+ formData={props.formData}
+ setFormData={props.setFormData}
+ vilkar={mapVilkar(bgVilkaret, props.beregningreferanserTilVurdering)}
+ skalKunneOverstyreAktiviteter={props.featureToggles && props.featureToggles.OVERSTYR_BEREGNING}
+ skalKunneAvbryteOverstyring
+ />
+ );
+ }
return (
[PleiepengerBehandlingApiKeys.UTENLANDSOPPHOLD];
getKomponent = props => (
-
+
);
- skalVisePanel = (apCodes, data, featureToggles) => featureToggles?.UTENLANDSOPPHOLD;
+ skalVisePanel = () => true;
}
export default UtenlandsoppholdFaktaPanelDef;
diff --git a/packages/behandling-tilbakekreving/package.json b/packages/behandling-tilbakekreving/package.json
index 7e0e870c52..28d6ccdb11 100644
--- a/packages/behandling-tilbakekreving/package.json
+++ b/packages/behandling-tilbakekreving/package.json
@@ -21,13 +21,13 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "@navikt/ft-kodeverk": "^2.2.2",
- "@navikt/ft-prosess-tilbakekreving-foreldelse": "^3.1.6",
+ "@navikt/ft-kodeverk": "^2.2.6",
+ "@navikt/ft-prosess-tilbakekreving-foreldelse": "^3.1.13",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/behandling-tilbakekreving/src/components/TilbakekrevingFakta.tsx b/packages/behandling-tilbakekreving/src/components/TilbakekrevingFakta.tsx
index e6c1a1a5b9..1855819b72 100644
--- a/packages/behandling-tilbakekreving/src/components/TilbakekrevingFakta.tsx
+++ b/packages/behandling-tilbakekreving/src/components/TilbakekrevingFakta.tsx
@@ -77,14 +77,30 @@ const TilbakekrevingFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
const { data: faktaData, state } = restApiTilbakekrevingHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
suspendRequest: !valgtPanel,
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiTilbakekrevingHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -92,6 +108,7 @@ const TilbakekrevingFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
fpsakKodeverk,
diff --git a/packages/behandling-unntak/package.json b/packages/behandling-unntak/package.json
index 511b018643..8ec877b2fa 100644
--- a/packages/behandling-unntak/package.json
+++ b/packages/behandling-unntak/package.json
@@ -37,9 +37,9 @@
"nav-frontend-modal-style": "2.0.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/behandling-unntak/src/components/UnntakFakta.tsx b/packages/behandling-unntak/src/components/UnntakFakta.tsx
index c85678a6c6..99adf6c8c5 100644
--- a/packages/behandling-unntak/src/components/UnntakFakta.tsx
+++ b/packages/behandling-unntak/src/components/UnntakFakta.tsx
@@ -93,6 +93,12 @@ const UnntakFakta = ({
.getEndepunkter()
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
// TODO type FetchedData er feil her
const { data: faktaData, state } = restApiUnntakHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
@@ -100,8 +106,18 @@ const UnntakFakta = ({
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiUnntakHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -109,6 +125,7 @@ const UnntakFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
submitCallback: bekreftAksjonspunktCallback,
diff --git a/packages/behandling-utvidet-rett/package.json b/packages/behandling-utvidet-rett/package.json
index 5c4d56a9ed..e479a24ac6 100644
--- a/packages/behandling-utvidet-rett/package.json
+++ b/packages/behandling-utvidet-rett/package.json
@@ -18,9 +18,9 @@
"@k9-sak-web/rest-api": "1.0.0",
"@k9-sak-web/rest-api-hooks": "1.0.0",
"@k9-sak-web/types": "1.0.0",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"react-uuid": "2.0.0",
"redux": "4.2.1",
"redux-form": "8.3.10",
diff --git a/packages/behandling-utvidet-rett/src/components/UtvidetRettFakta.tsx b/packages/behandling-utvidet-rett/src/components/UtvidetRettFakta.tsx
index 52305e9419..82ef1a0d36 100644
--- a/packages/behandling-utvidet-rett/src/components/UtvidetRettFakta.tsx
+++ b/packages/behandling-utvidet-rett/src/components/UtvidetRettFakta.tsx
@@ -68,14 +68,30 @@ const UtvidetRettFakta = ({
.getEndepunkter(featureToggles)
.map(e => ({ key: e }))
: [];
+ const endepunkterUtenCaching = valgtPanel
+ ? valgtPanel
+ .getPanelDef()
+ .getEndepunkterUtenCaching()
+ .map(e => ({ key: e }))
+ : [];
const { data: faktaData, state } = restApiUtvidetRettHooks.useMultipleRestApi(endepunkter, {
updateTriggers: [behandling.versjon, valgtPanel],
suspendRequest: !valgtPanel,
isCachingOn: true,
});
+ const { data: faktaDataUtenCaching, state: stateForEndepunkterUtenCaching } =
+ restApiUtvidetRettHooks.useMultipleRestApi(endepunkterUtenCaching, {
+ updateTriggers: [behandling.versjon, valgtPanel],
+ suspendRequest: !valgtPanel,
+ });
+
if (sidemenyPaneler.length > 0) {
- const isLoading = state === RestApiState.NOT_STARTED || state === RestApiState.LOADING;
+ const isLoading =
+ state === RestApiState.NOT_STARTED ||
+ state === RestApiState.LOADING ||
+ stateForEndepunkterUtenCaching === RestApiState.NOT_STARTED ||
+ stateForEndepunkterUtenCaching === RestApiState.LOADING;
return (
{valgtPanel && isLoading && }
@@ -83,6 +99,7 @@ const UtvidetRettFakta = ({
{valgtPanel.getPanelDef().getKomponent({
...faktaData,
+ ...faktaDataUtenCaching,
behandling,
alleKodeverk,
submitCallback: bekreftAksjonspunktCallback,
diff --git a/packages/fakta-arbeidsforhold/package.json b/packages/fakta-arbeidsforhold/package.json
index e49700cb71..155c04fb4d 100644
--- a/packages/fakta-arbeidsforhold/package.json
+++ b/packages/fakta-arbeidsforhold/package.json
@@ -20,9 +20,9 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
diff --git a/packages/fakta-barn-og-overfoeringsdager/package.json b/packages/fakta-barn-og-overfoeringsdager/package.json
index 49da0d8c1f..c0d3a7e5ff 100644
--- a/packages/fakta-barn-og-overfoeringsdager/package.json
+++ b/packages/fakta-barn-og-overfoeringsdager/package.json
@@ -28,11 +28,10 @@
"nav-frontend-popover-style": "2.0.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux-form": "8.3.10",
- "styled-components": "5.3.11",
"uuid": "9.0.1"
},
"devDependencies": {
diff --git a/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.spec.tsx b/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.spec.tsx
index 46ba76dad0..e28550ad52 100644
--- a/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.spec.tsx
+++ b/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.spec.tsx
@@ -1,8 +1,8 @@
-import { shallow } from 'enzyme';
import React from 'react';
-import FastBreddeAligner, { Kolonne } from './FastBreddeAligner';
+import { render, screen } from '@testing-library/react';
+import FastBreddeAligner from './FastBreddeAligner';
-it('rendrer alle kolonner med gitt content', () => {
+it('renders all columns with given content', () => {
const content1 = 'kolonne_1';
const content2 = 'kolonne_2';
const kolonner = [
@@ -18,10 +18,11 @@ it('rendrer alle kolonner med gitt content', () => {
},
];
- const wrapper = shallow();
- const renderedKolonner = wrapper.find(Kolonne);
+ render();
- expect(renderedKolonner).toHaveLength(2);
- expect(renderedKolonner.filterWhere(kol => kol.text() === content1)).toHaveLength(1);
- expect(renderedKolonner.filterWhere(kol => kol.text() === content2)).toHaveLength(1);
+ const renderedContent1 = screen.getByText(content1);
+ const renderedContent2 = screen.getByText(content2);
+
+ expect(renderedContent1).toBeInTheDocument();
+ expect(renderedContent2).toBeInTheDocument();
});
diff --git a/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.tsx b/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.tsx
index 58febd300e..ba27ca4359 100644
--- a/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.tsx
+++ b/packages/fakta-barn-og-overfoeringsdager/src/components/FastBreddeAligner.tsx
@@ -1,18 +1,4 @@
-import React, { ReactNode } from 'react';
-import styled from 'styled-components';
-
-const Rad = styled.div<{ padding?: string; margin?: string }>`
- display: flex;
- justify-content: flex-start;
- align-items: flex-start;
- padding: ${({ padding }) => padding};
- margin: ${({ margin }) => margin};
-`;
-
-export const Kolonne = styled.span<{ width: string; padding?: string }>`
- width: ${({ width }) => width};
- padding: ${({ padding }) => padding};
-`;
+import React, { ReactNode, CSSProperties } from 'react';
interface FastBreddeAlignerProps {
kolonner: {
@@ -27,14 +13,31 @@ interface FastBreddeAlignerProps {
};
}
-const FastBreddeAligner = ({ kolonner, rad }: FastBreddeAlignerProps) => (
-
- {kolonner.map(({ width, id, content, padding }) => (
-
- {content}
-
- ))}
-
-);
+const FastBreddeAligner = ({ kolonner, rad }: FastBreddeAlignerProps) => {
+ const radStyle: CSSProperties = {
+ display: 'flex',
+ justifyContent: 'flex-start',
+ alignItems: 'flex-start',
+ padding: rad?.padding,
+ margin: rad?.margin,
+ };
+
+ return (
+
+ {kolonner.map(({ width, id, content, padding }) => {
+ const kolonneStyle: CSSProperties = {
+ width,
+ padding,
+ };
+
+ return (
+
+ {content}
+
+ );
+ })}
+
+ );
+};
export default FastBreddeAligner;
diff --git a/packages/fakta-barn-oms/package.json b/packages/fakta-barn-oms/package.json
index 3bee287317..59066f6803 100644
--- a/packages/fakta-barn-oms/package.json
+++ b/packages/fakta-barn-oms/package.json
@@ -21,9 +21,8 @@
"nav-frontend-paneler": "3.0.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "styled-components": "5.3.11",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
"uuid": "9.0.1"
},
"devDependencies": {
diff --git a/packages/fakta-barn-oms/src/components/BarnSeksjon.tsx b/packages/fakta-barn-oms/src/components/BarnSeksjon.tsx
index aee66b7c3a..68b44f9dfa 100644
--- a/packages/fakta-barn-oms/src/components/BarnSeksjon.tsx
+++ b/packages/fakta-barn-oms/src/components/BarnSeksjon.tsx
@@ -1,7 +1,6 @@
import { FormattedMessage } from 'react-intl';
import { Element } from 'nav-frontend-typografi';
import React from 'react';
-import styled from 'styled-components';
import { v4 as uuidv4 } from 'uuid';
import BarnVisning from './BarnVisning';
import KombinertBarnOgRammevedtak from '../dto/KombinertBarnOgRammevedtak';
@@ -12,24 +11,20 @@ interface BarnSeksjonProps {
tekstId: string;
}
-const AvstandTopp = styled.div`
- margin-top: 1.5rem;
-`;
-
const BarnSeksjon = ({ barn, startIndex, tekstId }: BarnSeksjonProps) => {
if (barn.length === 0) {
return null;
}
return (
-
+
{barn.map((barnet, index) => (
))}
-
+
);
};
diff --git a/packages/fakta-bosted-soker/package.json b/packages/fakta-bosted-soker/package.json
index d7572eeb56..2e7a0440a2 100644
--- a/packages/fakta-bosted-soker/package.json
+++ b/packages/fakta-bosted-soker/package.json
@@ -17,12 +17,12 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
- "react": "17.0.2",
- "react-intl": "6.4.7"
+ "react": "18.2.0",
+ "react-intl": "6.5.2"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
- "chai": "4.3.8",
+ "chai": "4.3.10",
"enzyme": "3.11.0"
}
}
diff --git a/packages/fakta-direkte-overgang/package.json b/packages/fakta-direkte-overgang/package.json
index 3aa975b9ac..9f9f4df6af 100644
--- a/packages/fakta-direkte-overgang/package.json
+++ b/packages/fakta-direkte-overgang/package.json
@@ -20,8 +20,8 @@
"nav-frontend-skjema": "4.0.6",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
"yup": "0.32.11"
},
"devDependencies": {
diff --git a/packages/fakta-feilutbetaling/package.json b/packages/fakta-feilutbetaling/package.json
index ee2f548dc7..b8dfbf1158 100644
--- a/packages/fakta-feilutbetaling/package.json
+++ b/packages/fakta-feilutbetaling/package.json
@@ -21,16 +21,16 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
- "chai": "4.3.8",
+ "chai": "4.3.10",
"enzyme": "3.11.0",
"sinon": "15.2.0"
}
diff --git a/packages/fakta-felles/package.json b/packages/fakta-felles/package.json
index 50223d9ba2..6038bd28bc 100644
--- a/packages/fakta-felles/package.json
+++ b/packages/fakta-felles/package.json
@@ -18,9 +18,9 @@
"nav-frontend-knapper-style": "2.1.2",
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10"
},
diff --git a/packages/fakta-inntekt-og-ytelser/package.json b/packages/fakta-inntekt-og-ytelser/package.json
index 9209505ed4..28bf267761 100644
--- a/packages/fakta-inntekt-og-ytelser/package.json
+++ b/packages/fakta-inntekt-og-ytelser/package.json
@@ -14,12 +14,12 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
- "react": "17.0.2",
- "react-intl": "6.4.7"
+ "react": "18.2.0",
+ "react-intl": "6.5.2"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
- "chai": "4.3.8",
+ "chai": "4.3.10",
"enzyme": "3.11.0",
"sinon": "15.2.0"
}
diff --git a/packages/fakta-institusjon/package.json b/packages/fakta-institusjon/package.json
index 80465dbe79..9f1695d483 100644
--- a/packages/fakta-institusjon/package.json
+++ b/packages/fakta-institusjon/package.json
@@ -7,9 +7,9 @@
"dependencies": {
"@fpsak-frontend/form": "*",
"@k9-sak-web/types": "*",
- "@navikt/ft-plattform-komponenter": "2.3.2",
- "@navikt/k9-fe-form-utils": "1.0.9",
- "@navikt/k9-fe-period-utils": "1.0.8",
+ "@navikt/ft-plattform-komponenter": "2.3.9",
+ "@navikt/k9-fe-form-utils": "1.0.10",
+ "@navikt/k9-fe-period-utils": "1.0.9",
"formik": "2.4.5",
"yup": "0.32.11"
}
diff --git a/packages/fakta-medlemskap/package.json b/packages/fakta-medlemskap/package.json
index 59b6b199c1..33926a36eb 100644
--- a/packages/fakta-medlemskap/package.json
+++ b/packages/fakta-medlemskap/package.json
@@ -12,7 +12,7 @@
"@fpsak-frontend/shared-components": "1.0.0",
"@fpsak-frontend/utils": "1.0.0",
"@k9-sak-web/fakta-felles": "1.0.0",
- "@navikt/ft-plattform-komponenter": "2.3.2",
+ "@navikt/ft-plattform-komponenter": "2.3.9",
"i18n-iso-countries": "7.7.0",
"moment": "2.29.4",
"nav-frontend-core": "6.0.1",
@@ -25,16 +25,16 @@
"nav-frontend-typografi": "4.0.2",
"nav-frontend-typografi-style": "2.0.2",
"prop-types": "15.8.1",
- "react": "17.0.2",
- "react-intl": "6.4.7",
- "react-redux": "8.1.2",
+ "react": "18.2.0",
+ "react-intl": "6.5.2",
+ "react-redux": "8.1.3",
"redux": "4.2.1",
"redux-form": "8.3.10",
"reselect": "4.1.8"
},
"devDependencies": {
"@fpsak-frontend/utils-test": "1.0.0",
- "chai": "4.3.8",
+ "chai": "4.3.10",
"enzyme": "3.11.0",
"sinon": "15.2.0"
}
diff --git a/packages/fakta-opplaering/package.json b/packages/fakta-opplaering/package.json
index 57fbadf6a6..a3bc28875a 100644
--- a/packages/fakta-opplaering/package.json
+++ b/packages/fakta-opplaering/package.json
@@ -9,15 +9,15 @@
"@fpsak-frontend/utils": "*",
"@k9-sak-web/types": "*",
"@navikt/ds-icons": "3.4.3",
- "@navikt/ds-react": "5.5.0",
- "@navikt/ft-plattform-komponenter": "2.3.2",
- "@navikt/k9-fe-form-utils": "1.0.9",
- "@navikt/k9-fe-period-utils": "1.0.8",
+ "@navikt/ds-react": "5.10.0",
+ "@navikt/ft-plattform-komponenter": "2.3.9",
+ "@navikt/k9-fe-form-utils": "1.0.10",
+ "@navikt/k9-fe-period-utils": "1.0.9",
"classnames": "2.3.2",
"dayjs": "1.11.10",
"formik": "2.4.5",
"nav-frontend-tabs": "2.0.3",
- "react-intl": "6.4.7",
+ "react-intl": "6.5.2",
"react-outside-click-handler": "1.3.0",
"uuid": "9.0.1",
"yup": "0.32.11"
diff --git a/packages/fakta-opplaering/src/gjennomgaaOpplaering/GjennomgaaOpplaeringForm.tsx b/packages/fakta-opplaering/src/gjennomgaaOpplaering/GjennomgaaOpplaeringForm.tsx
index 0290ea72f8..8465e7d5bb 100644
--- a/packages/fakta-opplaering/src/gjennomgaaOpplaering/GjennomgaaOpplaeringForm.tsx
+++ b/packages/fakta-opplaering/src/gjennomgaaOpplaering/GjennomgaaOpplaeringForm.tsx
@@ -229,6 +229,7 @@ const GjennomgaaOpplaeringForm = ({ vurdering, avbrytRedigering, erRedigering }:
),
});
}}
+ mode="range"
/>
{array.length > 1 && arrayHelpers.remove(index)} />}
diff --git a/packages/fakta-opplaering/src/reisetid/ReisetidForm.tsx b/packages/fakta-opplaering/src/reisetid/ReisetidForm.tsx
index 2a29813e13..867faf8454 100644
--- a/packages/fakta-opplaering/src/reisetid/ReisetidForm.tsx
+++ b/packages/fakta-opplaering/src/reisetid/ReisetidForm.tsx
@@ -146,6 +146,7 @@ const ReisetidForm = ({ vurdering, avbrytRedigering, erRedigering }: OwnProps):
false,
);
}}
+ mode="range"
/>