Merge pull request #1074 from navikt/internflate-decorator-v3

Bytte til ny internflatedecorator (V3)

.nais/obo-nais-dev.yaml

@@ -84,8 +84,8 @@ spec:
           "redirects": [
             {
               "fromPath": "/internarbeidsflatedecorator/*",
-              "toUrl": "https://internarbeidsflatedecorator-q1.intern.dev.nav.no",
-              "preserveFromPath": true
+              "toUrl": "https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/dev",
+              "preserveFromPath": false
             },
             {
               "fromPath": "/veilarbpersonflatefs/*",

.nais/obo-nais-prod.yaml

@@ -73,16 +73,16 @@ spec:
           "header": {
             "csp": {
               "connectSrc": ["'self'", "wss:", "*.nav.no", "*.adeo.no"]
-            }
+            },
             "corp": {
               "policy": "cross-origin"
             }
           },
           "redirects": [
             {
               "fromPath": "/internarbeidsflatedecorator/*",
-              "toUrl": "https://internarbeidsflatedecorator.intern.nav.no",
-              "preserveFromPath": true
+              "toUrl": "https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/prod",
+              "preserveFromPath": false
             },
             {
               "fromPath": "/veilarbpersonflatefs/*",

cypress/e2e/mine-filter_spec.js

@@ -17,6 +17,7 @@ before('Start server', () => {
 });
 
 beforeEach('Lag alias for Mine filter: @mineFilter', () => {
+    Cypress.cy.state("jQuery", Cypress.$);
     // Aliaset kan hentast med cy.get('@mineFilter').
     // Cypress dobbeltsjekkar at verdien er oppdatert ved bruk av aliaset.
     cy.getByTestId('mine-filter_rad-wrapper').as('mineFilter');

cypress/e2e/veiledergrupper_spec.js

@@ -19,6 +19,7 @@ before('Start server', () => {
 });
 
 beforeEach('Lag alias for veiledergrupper: @veiledergrupper', () => {
+    Cypress.cy.state("jQuery", Cypress.$);
     // Aliaset kan hentast med cy.get('@veiledergrupper').
     // Cypress dobbeltsjekkar at verdien er oppdatert ved bruk av aliaset.
     cy.getByTestId('veiledergruppe_rad-wrapper').as('veiledergrupper');

package.json

@@ -7,7 +7,7 @@
     "license": "MIT",
     "homepage": "/veilarbportefoljeflatefs",
     "scripts": {
-        "start": "cross-env REACT_APP_MOCK=true react-scripts start",
+        "start": "cross-env REACT_APP_MOCK=true REACT_APP_DECORATOR=https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/dev react-scripts start",
         "start:metrics": "cross-env REACT_APP_MOCK=true REACT_APP_DEPLOYMENT_ENV=local react-scripts start",
         "build": "react-scripts build",
         "eject": "react-scripts eject",
@@ -16,9 +16,9 @@
         "cypress:clear": "cypress cache clear",
         "cypress:open": "cypress open",
         "cy:run": "cypress run",
-        "build:mock": "cross-env PUBLIC_URL=/veilarbportefoljeflatefs REACT_APP_MOCK=true react-scripts build",
-        "build:dev": "cross-env REACT_APP_DEPLOYMENT_ENV=development REACT_APP_MOCK=false PUBLIC_URL=/ react-scripts build",
-        "build:prod": "cross-env REACT_APP_DEPLOYMENT_ENV=production REACT_APP_MOCK=false PUBLIC_URL=/ react-scripts build",
+        "build:mock": "cross-env PUBLIC_URL=/veilarbportefoljeflatefs REACT_APP_MOCK=true REACT_APP_DECORATOR=https://cdn.nav.no/personoversikt/internarbeidsflate-decorator-v3/dev react-scripts build",
+        "build:dev": "cross-env REACT_APP_DEPLOYMENT_ENV=development REACT_APP_MOCK=false PUBLIC_URL=/ REACT_APP_DECORATOR=/internarbeidsflatedecorator react-scripts build",
+        "build:prod": "cross-env REACT_APP_DEPLOYMENT_ENV=production REACT_APP_MOCK=false PUBLIC_URL=/ REACT_APP_DECORATOR=/internarbeidsflatedecorator react-scripts build",
         "prepare": "husky install",
         "pre-commit": "lint-staged --verbose"
     },
@@ -35,7 +35,7 @@
         "@types/react-router": "5.1.20",
         "@types/react-router-dom": "5.3.3",
         "@types/react-transition-group": "4.4.10",
-        "cypress": "13.12.0",
+        "cypress": "13.14.2",
         "husky": "8.0.3",
         "lint-staged": "15.2.7",
         "msw": "2.3.1",

public/index.html

@@ -7,8 +7,8 @@
         <link rel="icon" href="/favicon.ico" sizes="any"> <!-- localhost -->
         <link rel="icon" href="/favicon.svg" type="image/svg+xml"> <!-- AzureAd kommer fra internarbeidsflatedecorator -->
         <link rel="icon" href="/veilarbportefoljeflatefs/favicon.ico" type="image/x-icon" /> <!-- openAm -->
-        <script src="%PUBLIC_URL%/internarbeidsflatedecorator/v2.1/static/js/head.v2.min.js"></script>
-        <link rel="stylesheet" href="%PUBLIC_URL%/internarbeidsflatedecorator/v2.1/static/css/main.css" />
+        <script src="%REACT_APP_DECORATOR%/latest/dist/bundle.js" ></script>
+        <link rel="stylesheet" href="%REACT_APP_DECORATOR%/latest/dist/index.css" />
         <link
                 rel="preload"
                 href="https://cdn.nav.no/aksel/fonts/SourceSans3-normal.woff2"