From e200960a0f86467630ffdfacf67bc6e86c198f00 Mon Sep 17 00:00:00 2001 From: kulsveen Date: Thu, 7 May 2020 12:05:22 +0200 Subject: [PATCH] =?UTF-8?q?Legger=20inn=20URL=20for=20ny=20dekorat=C3=B8r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- decorator.js | 11 ++----- nais-dev.yaml | 4 +-- nais-prod.yaml | 4 +-- package-lock.json | 81 +++++++++++++---------------------------------- package.json | 4 +-- 6 files changed, 32 insertions(+), 74 deletions(-) diff --git a/.env b/.env index 3536eee..487ab37 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -APPRES_CMS_URL=https://appres.nav.no +DECORATOR_URL=https://nav.no/dekoratoren PORT=8080 REACT_APP_CONTEXT_ROOT=/sykepengesoknad REACT_APP_SYKEFRAVAER_CONTEXT_ROOT=/sykefravaer diff --git a/decorator.js b/decorator.js index 6edf55e..20dd7e9 100644 --- a/decorator.js +++ b/decorator.js @@ -5,12 +5,7 @@ const request = require('request'); const { JSDOM } = jsdom; const requestDecorator = (callback) => - request( - `${ - process.env.APPRES_CMS_URL - }/common-html/v4/navno?header-withmenu=true&styles=true&scripts=true&footer=true`, - callback - ); + request(`${process.env.DECORATOR_URL}/?simple=true`, callback); const getDecorator = () => new Promise((resolve, reject) => { @@ -27,8 +22,8 @@ const getDecorator = () => NAV_SCRIPTS: document.getElementById('scripts')[prop], NAV_STYLES: document.getElementById('styles')[prop], NAV_HEADING: document.getElementById('header-withmenu')[prop], - NAV_FOOTER: document.getElementById('footer')[prop], - NAV_MEGAMENU_RESOURCES: document.getElementById('megamenu-resources')[prop] + NAV_FOOTER: document.getElementById('footer-withmenu')[prop], + NAV_MEGAMENU_RESOURCES: document.getElementById('megamenu-resources')[prop], }; resolve(data); } else { diff --git a/nais-dev.yaml b/nais-dev.yaml index 5e0d061..2198e06 100644 --- a/nais-dev.yaml +++ b/nais-dev.yaml @@ -31,8 +31,8 @@ spec: enabled: true path: /actuator/metrics env: - - name: APPRES_CMS_URL - value: "https://appres-q1.nav.no" + - name: DECORATOR_URL + value: "https://www-q1.nav.no/dekoratoren" - name: LOGINSERVICE_URL value: "https://loginservice-q.nav.no/login" - name: SYFOAPI_SYFOTEKSTERAPI_URL diff --git a/nais-prod.yaml b/nais-prod.yaml index c3e6272..3b99017 100644 --- a/nais-prod.yaml +++ b/nais-prod.yaml @@ -31,8 +31,8 @@ spec: enabled: true path: /actuator/metrics env: - - name: APPRES_CMS_URL - value: "https://appres.nav.no" + - name: DECORATOR_URL + value: "https://nav.no/dekoratoren" - name: LOGINSERVICE_URL value: "https://loginservice.nav.no/login" - name: SYFOAPI_SYFOTEKSTERAPI_URL diff --git a/package-lock.json b/package-lock.json index c8a5b6e..8ed1dd4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -594,8 +594,7 @@ "abab": { "version": "1.0.4", "resolved": "https://repo.adeo.no/repository/npm-public/abab/-/abab-1.0.4.tgz", - "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=", - "dev": true + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" }, "accepts": { "version": "1.3.7", @@ -609,14 +608,12 @@ "acorn": { "version": "5.7.3", "resolved": "https://repo.adeo.no/repository/npm-public/acorn/-/acorn-5.7.3.tgz", - "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==", - "dev": true + "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw==" }, "acorn-globals": { "version": "4.3.4", "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", - "dev": true, "requires": { "acorn": "^6.0.1", "acorn-walk": "^6.0.1" @@ -625,8 +622,7 @@ "acorn": { "version": "6.4.0", "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.4.0.tgz", - "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==", - "dev": true + "integrity": "sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==" } } }, @@ -650,8 +646,7 @@ "acorn-walk": { "version": "6.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", - "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", - "dev": true + "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==" }, "airbnb-prop-types": { "version": "2.15.0", @@ -848,8 +843,7 @@ "array-equal": { "version": "1.0.0", "resolved": "https://repo.adeo.no/repository/npm-public/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", - "dev": true + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" }, "array-flatten": { "version": "1.1.1", @@ -5699,8 +5693,7 @@ "content-type-parser": { "version": "1.0.2", "resolved": "https://repo.adeo.no/repository/npm-public/content-type-parser/-/content-type-parser-1.0.2.tgz", - "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==", - "dev": true + "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==" }, "convert-source-map": { "version": "1.7.0", @@ -5991,14 +5984,12 @@ "cssom": { "version": "0.3.8", "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", - "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==", - "dev": true + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" }, "cssstyle": { "version": "0.2.37", "resolved": "https://repo.adeo.no/repository/npm-public/cssstyle/-/cssstyle-0.2.37.tgz", "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", - "dev": true, "requires": { "cssom": "0.3.x" } @@ -6078,8 +6069,7 @@ "deep-is": { "version": "0.1.3", "resolved": "https://repo.adeo.no/repository/npm-public/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "default-gateway": { "version": "2.7.2", @@ -6320,7 +6310,6 @@ "version": "1.0.1", "resolved": "https://repo.adeo.no/repository/npm-public/domexception/-/domexception-1.0.1.tgz", "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", - "dev": true, "requires": { "webidl-conversions": "^4.0.2" } @@ -6699,7 +6688,6 @@ "version": "1.13.0", "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.13.0.tgz", "integrity": "sha512-eYk2dCkxR07DsHA/X2hRBj0CFAZeri/LyDMc0C8JT1Hqi6JnVpMhJ7XFITbb0+yZS3lVkaPL2oCkZ3AVmeVbMw==", - "dev": true, "requires": { "esprima": "^4.0.1", "estraverse": "^4.2.0", @@ -6712,7 +6700,6 @@ "version": "0.6.1", "resolved": "https://repo.adeo.no/repository/npm-public/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true, "optional": true } } @@ -7056,8 +7043,7 @@ "esprima": { "version": "4.0.1", "resolved": "https://repo.adeo.no/repository/npm-public/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "dev": true + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, "esquery": { "version": "1.0.1", @@ -7080,14 +7066,12 @@ "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", - "dev": true + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", - "dev": true + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" }, "etag": { "version": "1.8.1", @@ -7371,8 +7355,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://repo.adeo.no/repository/npm-public/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "fastparse": { "version": "1.1.2", @@ -8719,7 +8702,6 @@ "version": "1.0.2", "resolved": "https://repo.adeo.no/repository/npm-public/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", - "dev": true, "requires": { "whatwg-encoding": "^1.0.1" } @@ -9410,7 +9392,6 @@ "version": "11.3.0", "resolved": "https://repo.adeo.no/repository/npm-public/jsdom/-/jsdom-11.3.0.tgz", "integrity": "sha512-aPZTDl4MplzQhx5bLztk6nzjbEslmO3Q3+z0WpCMutL1XJDhZIRzir6R1Y8S84LgeT/7jhQvgtUMkY6oPwvlUw==", - "dev": true, "requires": { "abab": "^1.0.3", "acorn": "^5.1.2", @@ -9623,7 +9604,6 @@ "version": "0.3.0", "resolved": "https://repo.adeo.no/repository/npm-public/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" @@ -9720,8 +9700,7 @@ "lodash.sortby": { "version": "4.7.0", "resolved": "https://repo.adeo.no/repository/npm-public/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", - "dev": true + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" }, "lodash.throttle": { "version": "4.1.1", @@ -10614,8 +10593,7 @@ "nwmatcher": { "version": "1.4.4", "resolved": "https://repo.adeo.no/repository/npm-public/nwmatcher/-/nwmatcher-1.4.4.tgz", - "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==", - "dev": true + "integrity": "sha512-3iuY4N5dhgMpCUrOVnuAdGrgxVqV2cJpM+XNccjR2DKOB1RUP0aA+wGXEiNziG/UKboFyGBIoKOaNlJxx8bciQ==" }, "oauth-sign": { "version": "0.9.0", @@ -10784,7 +10762,6 @@ "version": "0.8.3", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", - "dev": true, "requires": { "deep-is": "~0.1.3", "fast-levenshtein": "~2.0.6", @@ -11171,8 +11148,7 @@ "pn": { "version": "1.1.0", "resolved": "https://repo.adeo.no/repository/npm-public/pn/-/pn-1.1.0.tgz", - "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", - "dev": true + "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==" }, "portfinder": { "version": "1.0.25", @@ -11334,8 +11310,7 @@ "prelude-ls": { "version": "1.1.2", "resolved": "https://repo.adeo.no/repository/npm-public/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "private": { "version": "0.1.8", @@ -12143,7 +12118,6 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.3.tgz", "integrity": "sha512-QIs2+ArIGQVp5ZYbWD5ZLCY29D5CfWizP8eWnm8FoGD1TX61veauETVQbrV60662V0oFBkrDOuaBI8XgtuyYAQ==", - "dev": true, "requires": { "lodash": "^4.17.15" } @@ -12152,7 +12126,6 @@ "version": "1.0.8", "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.8.tgz", "integrity": "sha512-dapwLGqkHtwL5AEbfenuzjTYg35Jd6KPytsC2/TLkVMz8rm+tNt72MGUWT1RP/aYawMpN6HqbNGBQaRcBtjQMQ==", - "dev": true, "requires": { "request-promise-core": "1.1.3", "stealthy-require": "^1.1.1", @@ -12370,8 +12343,7 @@ "sax": { "version": "1.2.4", "resolved": "https://repo.adeo.no/repository/npm-public/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "scheduler": { "version": "0.18.0", @@ -12990,8 +12962,7 @@ "stealthy-require": { "version": "1.1.1", "resolved": "https://repo.adeo.no/repository/npm-public/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" }, "stream-browserify": { "version": "2.0.2", @@ -13275,8 +13246,7 @@ "symbol-tree": { "version": "3.2.4", "resolved": "https://repo.adeo.no/repository/npm-public/symbol-tree/-/symbol-tree-3.2.4.tgz", - "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", - "dev": true + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, "table": { "version": "4.0.3", @@ -13615,7 +13585,6 @@ "version": "1.0.1", "resolved": "https://repo.adeo.no/repository/npm-public/tr46/-/tr46-1.0.1.tgz", "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", - "dev": true, "requires": { "punycode": "^2.1.0" } @@ -13655,7 +13624,6 @@ "version": "0.3.2", "resolved": "https://repo.adeo.no/repository/npm-public/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "~1.1.2" } @@ -13987,8 +13955,7 @@ "webidl-conversions": { "version": "4.0.2", "resolved": "https://repo.adeo.no/repository/npm-public/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", - "dev": true + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" }, "webpack": { "version": "4.41.6", @@ -14388,7 +14355,6 @@ "version": "1.0.5", "resolved": "https://repo.adeo.no/repository/npm-public/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", - "dev": true, "requires": { "iconv-lite": "0.4.24" } @@ -14402,7 +14368,6 @@ "version": "6.5.0", "resolved": "https://repo.adeo.no/repository/npm-public/whatwg-url/-/whatwg-url-6.5.0.tgz", "integrity": "sha512-rhRZRqx/TLJQWUpQ6bmrt2UV4f0HCQ463yQuONJqC6fO2VoEb1pTYddbe59SkYq87aoM5A3bdhMZiUiVws+fzQ==", - "dev": true, "requires": { "lodash.sortby": "^4.7.0", "tr46": "^1.0.1", @@ -14427,8 +14392,7 @@ "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" }, "worker-farm": { "version": "1.7.0", @@ -14488,8 +14452,7 @@ "xml-name-validator": { "version": "2.0.1", "resolved": "https://repo.adeo.no/repository/npm-public/xml-name-validator/-/xml-name-validator-2.0.1.tgz", - "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=", - "dev": true + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" }, "xregexp": { "version": "4.0.0", diff --git a/package.json b/package.json index 53b233f..0a57b19 100644 --- a/package.json +++ b/package.json @@ -89,7 +89,8 @@ "scroll-behavior": "0.3.2", "simple-ajax": "2.6.0", "source-map-explorer": "1.6.0", - "whatwg-fetch": "0.11.0" + "whatwg-fetch": "0.11.0", + "jsdom": "11.3.0" }, "devDependencies": { "@babel/cli": "^7.0.0", @@ -118,7 +119,6 @@ "has-ansi": "2.0.0", "http-proxy-middleware": "^0.20.0", "ignore-styles": "5.0.1", - "jsdom": "11.3.0", "less": "3.8.1", "less-loader": "4.1.0", "less-plugin-autoprefix": "2.0.0",