Oppdatert veilederapp - ungdomsytelse

apps/ungdomsytelse-veileder/api-mock/mock-server.cjs

@@ -1,9 +1,6 @@
 /* eslint-disable no-console */
 const express = require('express');
 const helmet = require('helmet');
-const busboyCons = require('busboy');
-const os = require('os');
-const fs = require('fs');
 const cors = require('cors');
 
 const server = express();
@@ -27,81 +24,148 @@ server.use(
 );
 server.options('*', cors());
 
-const readFileSync = (path) => {
-    return fs.readFileSync(path, 'utf8');
+const nyDeltaker = {
+    id: null,
+    deltakerIdent: '56857102105',
+    navn: {
+        fornavn: 'GLORETE',
+        mellomnavn: null,
+        etternavn: 'TØFFEL',
+    },
 };
 
-const existsSync = (path) => fs.existsSync(path);
+const nyDeltakerRegistrert = {
+    ...nyDeltaker,
+    id: 'd-n',
+};
+
+const registrertDeltaker = {
+    id: 'd-r',
+    deltakerIdent: '03867198392',
+    navn: {
+        fornavn: 'PRESENTABEL',
+        mellomnavn: null,
+        etternavn: 'HOFTE',
+    },
+};
 
-const mockPath = `${__dirname}/data`;
-const deltakelser = 'deltaker';
+const deltakelse1 = {
+    id: '3ebb8cb3-a2eb-45a5-aeee-22a2766aaab0',
+    deltakerIdent: '03867198392',
+    deltaker: {
+        id: 'd-r',
+        deltakerIdent: '03867198392',
+    },
+    fraOgMed: '2025-09-01',
+    harSøkt: false,
+};
+const deltakelser = [deltakelse1];
 
-const readMockFile = (file, responseObject) => {
-    const filePath = `${mockPath}/${soker}/${file}`;
-    if (existsSync(filePath)) {
-        const body = readFileSync(filePath);
-        responseObject.send(JSON.parse(body));
-    } else {
-        responseObject.send({});
+const getDeltaker = ({ deltakerIdent, deltakerId }) => {
+    if (deltakerIdent) {
+        console.log('henter deltaker med deltakerIdent', deltakerIdent);
+        switch (deltakerIdent) {
+            case nyDeltaker.deltakerIdent:
+                return nyDeltaker;
+            case registrertDeltaker.deltakerIdent:
+                return registrertDeltaker;
+            default:
+                console.log('fant ikke deltaker med deltakerIdent', deltakerIdent);
+                return null;
+        }
     }
+    if (deltakerId) {
+        console.log('henter deltaker med id', deltakerId);
+        switch (deltakerId) {
+            case registrertDeltaker.id:
+                return registrertDeltaker;
+            case nyDeltakerRegistrert.id:
+                return nyDeltakerRegistrert;
+            default:
+                console.log('fant ikke deltaker med id', deltakerId);
+                return null;
+        }
+    }
+};
+
+const getDeltakelser = (id) => {
+    console.log('getDeltakelser', id);
+    return id === 'd-n' ? [] : deltakelser;
 };
 
 const startExpressServer = () => {
     const port = process.env.PORT || 8099;
 
-    server.post('/veileder/register/hent/alle', (req, res) => {
-        const response = [
-            {
-                id: '3ebb8cb3-a2eb-45a5-aeee-22a2766aaab0',
-                deltakerIdent: '56857102105',
-                fraOgMed: '2025-09-01',
-            },
-        ];
+    server.get('/oppslag/deltaker/:id', (req, res) => {
+        console.log('/oppslag/deltaker', req.params);
+        const response = getDeltaker({ deltakerId: req.params.id });
         setTimeout(() => {
             res.status(200).send(response);
-        }, 50);
+        }, 350);
+    });
+
+    server.post('/oppslag/deltaker', (req, res) => {
+        const response = getDeltaker({ deltakerIdent: req.body.deltakerIdent });
+        setTimeout(() => {
+            res.status(200).send(response);
+        }, 350);
     });
 
-    server.post('/veileder/register/legg-til', (req, res) => {
+    server.post('/oppslag/deltaker-500', (req, res) => {
+        const response = getDeltaker(req.body);
+        setTimeout(() => {
+            res.status(500).send(response);
+        }, 350);
+    });
+
+    server.get('/veileder/register/deltaker/:deltakerId/deltakelser', (req, res) => {
+        const response = getDeltakelser(req.params.deltakerId);
+        console.log(response);
+        setTimeout(() => {
+            res.status(200).send(response);
+        }, 250);
+    });
+
+    server.post('/veileder/register/deltaker/innmelding', (req, res) => {
         const body = req.body;
         console.log('[POST] body', body);
         const response = {
-            ...req.body,
+            id: 'd-n',
+            deltakerIdent: req.body.deltakerIdent,
+            deltaker: {
+                id: 'd-n',
+                deltakerIdent: req.body.deltakerIdent,
+            },
+            harSøkt: false,
+            fraOgMed: req.body.fraOgMed,
         };
         setTimeout(() => {
             res.status(200).send(response);
-        }, 50);
+        }, 1500);
     });
 
-    server.post('/veileder/register/legg-til-error', (req, res) => {
-        const body = req.body;
-        console.log('[POST] body', body);
+    server.put('/veileder/register/deltakelse/:id/avslutt', (req, res) => {
         const response = {
-            ...req.body,
+            ...deltakelse1,
+            tilOgMed: req.body.utmeldingsdato,
         };
         setTimeout(() => {
-            res.status(409).send({
-                type: '/problem-details/deltaker-med-overlappende-periode',
-                title: 'Deltaker er allerede i programmet for oppgitt periode',
-                status: 409,
-                detail: 'Key (deltaker_ident, periode)=(02499435811, [2024-10-08,)) conflicts with existing key (deltaker_ident, periode)=(02499435811, [2024-10-01,)).',
-                instance: 'https://ungdomsytelse-veileder.intern.dev.nav.no/veileder/register/legg-til',
-            });
-        }, 50);
+            res.status(200).send(response);
+        }, 1500);
     });
 
-    server.put('/veileder/register/oppdater/:id', (req, res) => {
+    server.put('/veileder/register/deltakelse/:id/oppdater', (req, res) => {
         const body = req.body;
-        console.log('[put] body', body);
         const response = {
-            ...req.body,
+            ...deltakelse1,
+            ...body,
         };
         setTimeout(() => {
             res.status(200).send(response);
         }, 50);
     });
 
-    server.delete('/veileder/register/fjern/:id', (req, res) => {
+    server.delete('/veileder/register/deltakelse/:id/fjern', (req, res) => {
         res.sendStatus(200);
     });
 

apps/ungdomsytelse-veileder/dev-server.cjs

@@ -1,12 +1,12 @@
 const { createProxyMiddleware, fixRequestBody } = require('http-proxy-middleware');
-const { injectDecoratorServerSide } = require('@navikt/nav-dekoratoren-moduler/ssr/index.js');
 const express = require('express');
 const server = express();
 server.use(express.json());
 const path = require('path');
 const mustacheExpress = require('mustache-express');
 const compression = require('compression');
 const getAppSettings = require('./getAppSettings.cjs');
+const fs = require('fs');
 
 server.disable('x-powered-by');
 
@@ -43,9 +43,9 @@ const startServer = async () => {
 
     const indexHtmlPath = path.resolve(__dirname, 'index.html');
 
-    const htmlWithDecoratorInjected = await injectDecorator(indexHtmlPath);
+    const html = fs.readFileSync(indexHtmlPath, 'utf-8');
 
-    const renderedHtml = htmlWithDecoratorInjected.replaceAll(
+    const renderedHtml = html.replaceAll(
         '{{{APP_SETTINGS}}}',
         JSON.stringify({
             APP_VERSION: `${process.env.APP_VERSION}`,
@@ -66,7 +66,6 @@ const startServer = async () => {
         }),
     );
 
-    const fs = require('fs');
     fs.writeFileSync(path.resolve(__dirname, 'index-decorated.html'), renderedHtml);
 
     const vite = await require('vite').createServer({

apps/ungdomsytelse-veileder/env.schema.ts

@@ -1,6 +1,10 @@
 import { commonEnvSchema, ungDeltakelseOpplyserEnvSchema } from '@navikt/sif-common-env';
 import * as z from 'zod';
 
-export const appEnvSchema = commonEnvSchema.merge(ungDeltakelseOpplyserEnvSchema);
+const localSchema = z.object({
+    isLocal: z.boolean().optional(),
+});
+
+export const appEnvSchema = commonEnvSchema.merge(ungDeltakelseOpplyserEnvSchema).merge(localSchema);
 
 export type AppEnv = z.infer<typeof appEnvSchema>;

apps/ungdomsytelse-veileder/getAppSettings.cjs

@@ -3,15 +3,29 @@ require('dotenv').config();
 const process = require('process');
 
 const getAppSettings = () => ({
+    ENV: `${process.env.ENV}`,
     APP_VERSION: `${process.env.APP_VERSION}`,
     GITHUB_REF_NAME: `${process.env.GITHUB_REF_NAME}`,
     PUBLIC_PATH: `${process.env.PUBLIC_PATH}`,
 
-    K9_BRUKERDIALOG_PROSESSERING_API_URL: `${process.env.K9_BRUKERDIALOG_PROSESSERING_API_URL}`,
+    SIF_PUBLIC_AMPLITUDE_API_KEY: `${process.env.SIF_PUBLIC_AMPLITUDE_API_KEY}`,
+    SIF_PUBLIC_APPSTATUS_DATASET: `${process.env.SIF_PUBLIC_APPSTATUS_DATASET}`,
+    SIF_PUBLIC_APPSTATUS_PROJECT_ID: `${process.env.SIF_PUBLIC_APPSTATUS_PROJECT_ID}`,
+    SIF_PUBLIC_DEKORATOR_URL: `${process.env.SIF_PUBLIC_DEKORATOR_URL}`,
+    SIF_PUBLIC_FEATURE_NYNORSK: `${process.env.SIF_PUBLIC_FEATURE_NYNORSK}`,
+    SIF_PUBLIC_LOGIN_URL: `${process.env.SIF_PUBLIC_LOGIN_URL}`,
+    SIF_PUBLIC_MINSIDE_URL: `${process.env.SIF_PUBLIC_MINSIDE_URL}`,
+    SIF_PUBLIC_USE_AMPLITUDE: `${process.env.SIF_PUBLIC_USE_AMPLITUDE}`,
+    SIF_PUBLIC_AMPLITUDE_API_KEY: `${process.env.SIF_PUBLIC_AMPLITUDE_API_KEY}`,
+    IS_LOCAL: `${process.env.IS_LOCAL}`,
+
     K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH: `${process.env.K9_BRUKERDIALOG_PROSESSERING_FRONTEND_PATH}`,
+    K9_BRUKERDIALOG_PROSESSERING_API_SCOPE: `${process.env.K9_BRUKERDIALOG_PROSESSERING_API_SCOPE}`,
+    K9_BRUKERDIALOG_PROSESSERING_API_URL: `${process.env.K9_BRUKERDIALOG_PROSESSERING_API_URL}`,
 
     UNG_DELTAKELSE_OPPLYSER_API_URL: `${process.env.UNG_DELTAKELSE_OPPLYSER_API_URL}`,
     UNG_DELTAKELSE_OPPLYSER_FRONTEND_PATH: `${process.env.UNG_DELTAKELSE_OPPLYSER_FRONTEND_PATH}`,
+    UNG_DELTAKELSE_OPPLYSER_API_SCOPE: `${process.env.UNG_DELTAKELSE_OPPLYSER_API_SCOPE}`,
 });
 
 module.exports = getAppSettings;

apps/ungdomsytelse-veileder/index.html

@@ -9,13 +9,6 @@
   <script type="text/json" id="nav:appSettings">
     {{{APP_SETTINGS}}}
   </script>
-  <style>
-    #decorator-header,
-    #decorator-footer {
-      display: none;
-    }
-  </style>
-
 </head>
 
 <body>

apps/ungdomsytelse-veileder/nais/dev-gcp.json

@@ -17,10 +17,11 @@
         "NPM_CONFIG_CACHE": "/tmp",
         "PUBLIC_PATH": "/",
 
+        "SKIP_DECORATOR": "true",
+
         "SIF_PUBLIC_AMPLITUDE_API_KEY": "default",
         "SIF_PUBLIC_USE_AMPLITUDE": "false",
         "SIF_PUBLIC_APPSTATUS_DATASET": "staging",
-
         "SIF_PUBLIC_APPSTATUS_PROJECT_ID": "ryujtq87",
         "SIF_PUBLIC_DEKORATOR_URL": "https://dekoratoren.ekstern.dev.nav.no/?simple=true&chatbot=false&urlLookupTable=false",
         "SIF_PUBLIC_FEATURE_NYNORSK": "on",