Merge branch 'master' into vitest

navikt · Nov 14, 2023 · 59e06fc · 59e06fc
2 parents 755489f + dc769b3
commit 59e06fc
Show file tree

Hide file tree

Showing 229 changed files with 6,272 additions and 4,639 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 => (
     <div style={{ margin: '40px' }}>

diff --git 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
@@ -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
@@ -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
@@ -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}"
   }
 ]