Merge branch 'master' into splitt-alternative-audience

Author: bdahle

.env.development

@@ -7,7 +7,7 @@ ADMIN_ORIGIN=http://localhost:8080
 APP_ORIGIN=http://localhost:3000
 DECORATOR_URL=http://localhost:8100/dekoratoren
 FAILOVER_ORIGIN=http://localhost:3003
-INNLOGGINGSSTATUS_URL=http://localhost:8095/nav-dekoratoren-api/auth
+INNLOGGINGSSTATUS_URL=http://localhost:8100/api/auth
 REVALIDATOR_PROXY_ORIGIN=http://localhost:3002
 XP_ORIGIN=http://localhost:8080
 IS_FAILOVER_INSTANCE='false'

.env.prod-local

@@ -7,13 +7,13 @@ ADMIN_ORIGIN=http://localhost:8080
 APP_ORIGIN=http://localhost:3000
 DECORATOR_URL=http://localhost:8100/dekoratoren
 FAILOVER_ORIGIN=http://localhost:3003
-INNLOGGINGSSTATUS_URL=http://localhost:8095/nav-dekoratoren-api/auth
+INNLOGGINGSSTATUS_URL=http://localhost:8100/api/auth
 REVALIDATOR_PROXY_ORIGIN=http://localhost:3002
 XP_ORIGIN=http://localhost:8080
 IS_FAILOVER_INSTANCE='false'
 RELEASE_TAG=prodLocal
 ASSET_PREFIX=http://localhost:3000
 TELEMETRY_URL=http://localhost:12347/collect
 NAVNO_API_URL=https://www.nav.no/person/navno-api
-NAVNO_SEARCH_API_URL=https://navno-search-api.nav.no/content/search-url
+NAVNO_SEARCH_API_URL=https://navno-search-api.ekstern.dev.nav.no/content/search-url
 NEXT_TELEMETRY_DISABLED=1

.eslintrc.json

@@ -1,6 +1,10 @@
 {
     "plugins": ["css-modules", "no-relative-import-paths"],
-    "extends": ["next/core-web-vitals", "plugin:css-modules/recommended"],
+    "extends": [
+        "next/core-web-vitals",
+        "plugin:css-modules/recommended",
+        "plugin:storybook/recommended"
+    ],
     "ignorePatterns": ["next.config.js"],
     "rules": {
         "@next/next/no-img-element": 0,

.github/workflows/deploy.dev2.yml

@@ -24,7 +24,7 @@ jobs:
       ADMIN_ORIGIN: https://portal-admin-q6.oera.no
       APP_ORIGIN: https://www-2.ansatt.dev.nav.no
       REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy-dev2
-      DECORATOR_URL: https://dekoratoren.ekstern.dev.nav.no
+      DECORATOR_URL: https://dekoratoren-beta.intern.dev.nav.no
       XP_ORIGIN: https://www-q6.nav.no
       TELEMETRY_URL: https://telemetry.ekstern.dev.nav.no/collect
       INNLOGGINGSSTATUS_URL: https://www.ekstern.dev.nav.no/person/nav-dekoratoren-api/auth

.github/workflows/deploy.prod.yml

@@ -17,7 +17,7 @@ jobs:
       ADMIN_ORIGIN: https://portal-admin.oera.no
       APP_ORIGIN: https://www.nav.no
       REVALIDATOR_PROXY_ORIGIN: http://nav-enonicxp-frontend-revalidator-proxy
-      DECORATOR_URL: https://www.nav.no/dekoratoren
+      DECORATOR_URL: https://www.nav.no/nav-dekoratoren
       XP_ORIGIN: https://www.nav.no
       TELEMETRY_URL: https://telemetry.nav.no/collect
       INNLOGGINGSSTATUS_URL: https://www.nav.no/person/nav-dekoratoren-api/auth

.gitignore

@@ -8,6 +8,8 @@
 
 # testing
 /coverage
+*storybook.log
+/storybook-static
 
 # next.js
 /.next/

.nais/vars/vars-dev2.yml

@@ -4,6 +4,7 @@ dekoratorenApp: nav-dekoratoren-beta
 externalHosts:
   - www-q6.nav.no
   - www-2-failover.intern.dev.nav.no
+  - dekoratoren-beta.intern.dev.nav.no
 secret: nav-enonicxp-dev2
 ingresses:
   - https://www-2.ansatt.dev.nav.no

.storybook/main.ts

@@ -0,0 +1,49 @@
+import path, { dirname, join } from 'path';
+import type { StorybookConfig } from '@storybook/nextjs';
+
+const config: StorybookConfig = {
+    stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+
+    addons: [
+        getAbsolutePath('@storybook/addon-onboarding'),
+        getAbsolutePath('@storybook/addon-links'),
+        getAbsolutePath('@storybook/addon-essentials'),
+        getAbsolutePath('@chromatic-com/storybook'),
+        getAbsolutePath('@storybook/addon-interactions'),
+        getAbsolutePath('@storybook/addon-mdx-gfm'),
+        getAbsolutePath('@storybook/addon-storysource'),
+    ],
+
+    framework: {
+        name: getAbsolutePath('@storybook/nextjs'),
+        options: {},
+    },
+
+    webpackFinal: async (config) => {
+        const updatedConfig = {
+            ...config,
+            resolve: {
+                ...config.resolve,
+                alias: {
+                    ...config.resolve?.alias,
+                    common: path.resolve(__dirname, '../src/common.scss'),
+                },
+            },
+        };
+
+        return updatedConfig;
+    },
+
+    staticDirs: ['../public'],
+
+    docs: {},
+
+    typescript: {
+        reactDocgen: 'react-docgen-typescript',
+    },
+};
+export default config;
+
+function getAbsolutePath(value: string): any {
+    return dirname(require.resolve(join(value, 'package.json')));
+}

.storybook/preview.tsx

@@ -0,0 +1,11 @@
+import type { Preview } from '@storybook/react';
+import '../src/global.scss';
+
+const preview: Preview = {
+    parameters: {
+        layout: 'centered',
+    },
+    tags: ['autodocs'],
+};
+
+export default preview;

README.md

@@ -25,12 +25,9 @@ Som default kreves en lokal instans av Enonic XP med [nav-enonicxp](https://gith
 
 Kjør `npm run start-clean`
 
-### Docker compose
+### Andre lokale avhengigheter
 
-[Dekoratøren](https://github.com/navikt/nav-dekoratoren), [revalidator-proxy](https://github.com/navikt/nav-enonicxp-frontend-revalidator-proxy) og mocks for innlogging
-kan kjøres lokalt med `docker compose up`. Du må først autentisere til relevante image registries:
-
-#### GAR
+[Dekoratøren](https://github.com/navikt/decorator-next) og [revalidator-proxy](https://github.com/navikt/nav-enonicxp-frontend-revalidator-proxy) kan kjøres lokalt med `docker compose up`. Du må først autentisere til GAR image registry'et:
 
 ```
 gcloud auth login
@@ -39,14 +36,6 @@ gcloud auth configure-docker europe-north1-docker.pkg.dev
 
 Se også https://cloud.google.com/artifact-registry/docs/docker/authentication#gcloud-helper
 
-#### Github packages:
-
-Generer en token på Github med `read:packages` access og SSO auth for navikt. Bruk denne som passord ved login:
-
-```
-docker login ghcr.io
-```
-
 ## Deploy til test-miljø
 
 [Actions](https://github.com/navikt/nav-enonicxp-frontend/actions) -> Velg workflow -> Run workflow -> Velg branch -> Run workflow

docker-compose.yml

@@ -9,61 +9,35 @@ services:
       SERVICE_SECRET: 'dummyToken'
       NO_REDIS: true
 
-  oidc-provider:
-    container_name: oidc-provider-xpfrontend
-    image: 'ghcr.io/navikt/stub-oidc-provider/stub-oidc-provider:latest'
-    ports:
-      - '9000:9000'
-    environment:
-      PORT: '9000'
-      CALLBACK_URL: 'http://localhost:50000/callback'
-      ISSUER: 'https://localhost:9000'
-
-  oidc-provider-gui:
-    container_name: oidc-provider-gui-xpfrontend
-    image: 'ghcr.io/navikt/pb-oidc-provider-gui/pb-oidc-provider-gui:latest'
-    ports:
-      - '50000:50000'
-    environment:
-      REDIRECT_URL: 'http://localhost:3000'
-      AUTO_REDIRECT_TO_FRONTEND: 'true'
-      OIDC_PROVIDER_GUI_URL: 'http://localhost:50000/callback'
-    depends_on:
-      - oidc-provider
-
-  mocks:
-    container_name: mocks-xpfrontend
-    image: 'ghcr.io/navikt/pb-nav-mocked/pb-nav-mocked:latest'
-    ports:
-      - '8095:8080'
-    environment:
-      CORS_ALLOWED_ORIGINS: 'localhost:3000'
-      CORS_ALLOWED_SCHEMES: 'http'
-      OIDC_ISSUER: 'https://localhost:9000'
-      OIDC_ACCEPTED_AUDIENCE: 'stubOidcClient'
-      OIDC_JWKS_URI: 'http://oidc-provider:9000/certs'
-    depends_on:
-      - oidc-provider
-
   dekoratoren:
     container_name: dekoratoren-xpfrontend
-    image: 'ghcr.io/navikt/nav-dekoratoren:latest'
+    image: 'europe-north1-docker.pkg.dev/nais-management-233d/personbruker/decorator-next-prod:latest'
     ports:
-      - '8100:8088'
+      - '8100:8089'
     environment:
-      ENV: 'localhost'
       XP_BASE_URL: 'http://localhost:3000'
-      APP_BASE_URL: 'http://localhost:8100'
-      APP_BASE_PATH: '/dekoratoren'
-      API_XP_SERVICES_URL: 'https://www.nav.no/_/service'
-      API_DEKORATOREN_URL: 'http://localhost:8095/nav-dekoratoren-api'
-      MINSIDE_ARBEIDSGIVER_URL: 'https://arbeidsgiver.nav.no/min-side-arbeidsgiver/'
-      MIN_SIDE_URL: 'https://www.nav.no/minside/'
-      LOGIN_URL: 'http://localhost:50000'
-      LOGOUT_URL: 'http://localhost:50000/?logout'
-      VARSEL_API_URL: 'http://localhost:8095/tms-varsel-api'
-    depends_on:
-      - mocks
+      MIN_SIDE_URL: 'https://www.nav.no/minside'
+      MIN_SIDE_ARBEIDSGIVER_URL: 'https://arbeidsgiver.nav.no/min-side-arbeidsgiver'
+      ENONICXP_SERVICES: 'http://localhost:8080/_/service/'
+      SEARCH_API_URL: 'https://navno-search-api.ekstern.dev.nav.no/content/decorator-search'
+      PORT: '8089'
+      NODE_ENV: 'production'
+      CDN_URL: 'http://localhost:8100/public'
+      APP_URL: 'http://localhost:8100'
+      LOGIN_URL: 'http://localhost:8100/oauth2/login'
+      LOGOUT_URL: 'http://localhost:8100/oauth2/logout'
+      PERSONOPPLYSNINGER_URL: 'https://www.nav.no/person/personopplysninger'
+      VARSEL_API_URL: 'http://localhost:8100/api'
+      LOGIN_SESSION_API_URL: 'http://localhost:8100/api/oauth2/session'
+      DEKORATOREN_API_URL: 'http://localhost:8100/api'
+      UNLEASH_SERVER_API_URL: 'http://localhost:8095/unleash'
+      UNLEASH_SERVER_API_TOKEN: 'dummy_token'
+      BOOST_ENV: 'navtest'
+      PUZZEL_CUSTOMER_ID: 'C1302192-8BEC-4EA2-84AB-F4EDE8AC6230'
+      VERSION_ID: 'asdf'
+      APP_NAME: 'nav-dekoratoren'
+#     Set this to '3' or '4' to mock logged in state
+      MOCK_AUTH_LEVEL:
 
 volumes:
   event-cache-data:

next.config.js

@@ -279,10 +279,6 @@ const config = {
         {
             source: '/:path*',
             headers: [
-                {
-                    key: 'app-name',
-                    value: 'nav-enonicxp-frontend',
-                },
                 {
                     key: 'Content-Security-Policy',
                     value: await csp(),