Visning av annen forelders uttaksplan

.deploy/naiserator_rework.yaml

@@ -0,0 +1,47 @@
+apiVersion: 'nais.io/v1alpha1'
+kind: 'Application'
+metadata:
+    name: foreldrepengeoversikt-rework
+    namespace: teamforeldrepenger
+    labels:
+        team: teamforeldrepenger
+spec:
+  accessPolicy:
+    outbound:
+      external:
+        - host: dekoratoren.dev.nav.no
+  image: {{image}}
+  port: 8080
+  replicas:
+      min: 2
+      max: 2
+      disableAutoScaling: true
+  liveness:
+      path: /health/isAlive
+      initialDelay: 60
+  readiness:
+      path: /health/isReady
+      initialDelay: 60
+  prometheus:
+      enabled: false
+      path: /internal/actuator/prometheus
+  ingresses:
+    - "https://foreldrepenger-rework.dev.nav.no"
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 200m
+      memory: 256Mi
+  env:
+    - name: APPRES_CMS_URL
+      value: "https://dekoratoren.dev.nav.no"
+    - name: FORELDREPENGESOKNAD_API_URL
+      value: "https://foreldrepengesoknad-api.dev.nav.no/rest"
+    - name: LOGINSERVICE_URL
+      value: "https://loginservice-testing.dev.nav.no/login"
+    - name: FP_UTTAK_SERVICE_URL
+      value: "https://foreldrepengesoknad-api.dev.nav.no"
+    - name: KLAGE_URL
+      value: "https://klage-dittnav.dev.nav.no"

.env

@@ -1,5 +1,5 @@
 APPRES_CMS_URL=https://www.nav.no/dekoratoren
-FORELDREPENGESOKNAD_API_URL=http://localhost:8888/rest
-LOGINSERVICE_URL=http://localhost:8888/local/cookie
-FP_UTTAK_SERVICE_URL=https://foreldrepengesoknad-api.nav.no
+FORELDREPENGESOKNAD_API_URL=http://localhost:9002/rest
+LOGINSERVICE_URL=http://localhost:8060/rest/loginservice/login
+FP_UTTAK_SERVICE_URL=http://localhost:9002
 KLAGE_URL=https://klage-dittnav.dev.nav.no

.eslintrc.js

@@ -1,17 +1,25 @@
 module.exports = {
     parser: '@typescript-eslint/parser',
-    extends: ['plugin:@typescript-eslint/recommended', 'plugin:prettier/recommended', 'plugin:react/recommended'],
+    extends: [
+        'plugin:@typescript-eslint/recommended',
+        'plugin:prettier/recommended',
+        'plugin:react/recommended',
+        'plugin:react-hooks/recommended',
+        'plugin:jest-dom/recommended',
+        'plugin:testing-library/react',
+    ],
+    plugins: ['jest-dom', 'testing-library', 'typescript-sort-keys'],
     parserOptions: {
         ecmaVersion: 2018,
         sourceType: 'module',
     },
     rules: {
-        '@typescript-eslint/array-type': ['error', { default: 'array' }],
+        '@typescript-eslint/array-type': ['error', { default: 'array-simple' }],
         '@typescript-eslint/no-explicit-any': 'off',
         '@typescript-eslint/no-var-requires': 'off',
+        'typescript-sort-keys/interface': 'error',
         '@typescript-eslint/explicit-module-boundary-types': 'off',
         '@typescript-eslint/no-non-null-assertion': 'off',
-        '@typescript-eslint/no-empty-interface': 'off',
         '@typescript-eslint/no-unused-vars': [
             'error',
             { vars: 'all', args: 'all', ignoreRestSiblings: true, varsIgnorePattern: '^_', argsIgnorePattern: '^_' },

.github/workflows/build-pr.yml

@@ -26,6 +26,6 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - run: npm install
+            - run: npm install --legacy-peer-deps
             - run: npm run jest
             - run: npm run build

.github/workflows/build.yml

@@ -30,7 +30,7 @@ jobs:
                       ${{ runner.os }}-build-
                       ${{ runner.os }}-
 
-            - run: npm install
+            - run: npm install --legacy-peer-deps
             - run: npm run jest
             - run: |
                   npm run build

.github/workflows/rework-build.yaml

@@ -0,0 +1,61 @@
+name: Build, push og deploy til q1 for innsyn-redesign branch
+
+on:
+    push:
+        branches:
+            - innsyn-redesign
+env:
+    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    IMAGE_BASE: ghcr.io/navikt/foreldrepengeoversikt-rework
+    SHOULD_DEPLOY: true
+
+jobs:
+    kompiler:
+        runs-on: ubuntu-latest
+        steps:
+            - name: Sjekk ut kode
+              uses: actions/checkout@v3
+            - run: git fetch --prune --unshallow
+
+            - name: Hent tag
+              run: |
+                  echo 'TAG<<EOF' >> $GITHUB_ENV
+                  git log -1 --pretty=%ad --date=format:%Y%m%d%H%M%S-`echo $GITHUB_SHA | cut -c1-7`  >> $GITHUB_ENV
+                  echo 'EOF' >> $GITHUB_ENV
+
+            - name: Cache node modules
+              uses: actions/cache@v3.0.8
+              with:
+                  path: ~/.npm # npm cache files are stored in `~/.npm` on Linux/macOS
+                  key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
+                  restore-keys: |
+                      ${{ runner.os }}-build-${{ env.cache-name }}-
+                      ${{ runner.os }}-build-
+                      ${{ runner.os }}-
+
+            - run: npm install --legacy-peer-deps
+            - run: npm run jest
+            - run: |
+                  npm run build
+                  echo "IMAGE=$IMAGE_BASE:$TAG" >> $GITHUB_ENV
+
+            - name: Login to GitHub Packages Docker Registry
+              uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 # Use commit-sha1 instead of tag for security concerns
+              with:
+                  registry: ghcr.io
+                  username: ${{ github.actor }}
+                  password: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Bygg, tag og push Docker image
+              run: |
+                  docker build --pull --tag ${IMAGE_BASE}:${TAG} .
+                  docker push ${IMAGE_BASE} --all-tags
+
+            - name: Deploy
+              if: success() && env.SHOULD_DEPLOY == 'true'
+              uses: nais/deploy/actions/deploy@v1
+              env:
+                  PRINT_PAYLOAD: true
+                  APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}
+                  CLUSTER: dev-gcp
+                  RESOURCE: .deploy/naiserator_rework.yaml

jest/jest.config.js

@@ -15,6 +15,7 @@ module.exports = {
         },
     },
     rootDir: '../',
+    roots: ['<rootDir>/src/app/'],
     coverageReporters: ['text-summary'],
     preset: 'ts-jest/presets/js-with-babel',
     testMatch: null,

jest/setup.ts

@@ -1,9 +1,5 @@
-import Enzyme from 'enzyme';
-import Adapter from 'enzyme-adapter-react-16';
 import { JSDOM } from 'jsdom';
 
-Enzyme.configure({ adapter: new Adapter() });
-
 const dom = new JSDOM('<!doctype html><html><body><div id="app"></div></body></html>');
 (global as any).document = dom.window.document;
 (global as any).window = dom.window;

mock-api/mock-api-server.js

@@ -8,7 +8,12 @@ const morgan = require('morgan');
 require('dotenv').config();
 
 const allowCrossDomain = function (req, res, next) {
-    res.setHeader('Access-Control-Allow-Origin', 'http://localhost:8880');
+    const corsWhiteList = ['http://localhost:8080', 'http://localhost:8880']; // 8080 dev server with decorator, 8880 dev server without decorator
+
+    if (corsWhiteList.includes(req.headers.origin)) {
+        res.header('Access-Control-Allow-Origin', req.headers.origin);
+    }
+
     res.setHeader('Access-Control-Allow-Methods', 'GET,PUT,POST,DELETE,OPTIONS');
     res.setHeader('Access-Control-Allow-Headers', 'Content-Type,X-XSRF-TOKEN,Location');
     res.setHeader('Access-Control-Expose-Headers', 'Location');
@@ -30,9 +35,17 @@ router.get(['/rest/sokerinfo'], (req, res) => {
     res.send(MockStorage.getSokerinfo());
 });
 
+router.get(['/rest/dokument/alle'], (req, res) => {
+    res.send(MockStorage.getDokumenter());
+});
+
+router.get(['/rest/innsyn/v2/annenPartVedtak'], (req, res) => {
+    res.send(MockStorage.getAnnenPartsVedtak());
+});
+
 router.post('/rest/engangsstonad', (req, res) => res.sendStatus(200));
 
-router.get('/rest/innsyn/saker', (req, res) => {
+router.get('/rest/innsyn/v2/saker', (req, res) => {
     res.send(MockStorage.getSaker());
 });
 
@@ -60,6 +73,10 @@ router.get('/rest/innsyn/uttaksplan', (req, res) => {
     res.send(MockStorage.getUttaksplan());
 });
 
+router.get('/rest/innsyn/tidslinje', (req, res) => {
+    res.send(MockStorage.getTidslinjeHendelser());
+});
+
 const vedleggUpload = multer({ dest: './dist/vedlegg/' });
 router.post('/rest/storage/vedlegg', vedleggUpload.single('vedlegg'), (req, res) => {
     res.setHeader('Location', `http://localhost:8080/foreldrepengesoknad/dist/vedlegg/${req.body.id}`);