Merge pull request #1427 from navikt/feat/forms-api-forms

Feat/forms api forms

Author: magnurh-cx

.github/workflows/cypress-tests.yaml

@@ -18,6 +18,10 @@ jobs:
           node-version: '20.9.0'
           registry-url: https://npm.pkg.github.com/
           scope: '@navikt'
+      - name: set timezone
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: 'Europe/Oslo'
       - name: 'Install dependencies'
         run: yarn --frozen-lockfile
       - name: 'Build application'
@@ -56,6 +60,10 @@ jobs:
           node-version: '20.9.0'
           registry-url: https://npm.pkg.github.com/
           scope: '@navikt'
+      - name: set timezone
+        uses: szenius/[email protected]
+        with:
+          timezoneLinux: 'Europe/Oslo'
       - name: 'Install dependencies'
         run: yarn --frozen-lockfile
       - name: 'Build application'
@@ -70,3 +78,9 @@ jobs:
           command: yarn cypress:bygger
           config: video=false
           config-file: cypress.config.ts
+      - name: Upload screenshots
+        uses: actions/upload-artifact@v4
+        if: failure()
+        with:
+          name: cypress-bygger-screenshots
+          path:  ${{ github.workspace }}/packages/bygger/cypress/screenshots/*

.nais/bygger/preprod-alt.yaml

@@ -35,6 +35,8 @@ environmentVars:
     value: http://formio-enterprise-server
   - name: FORMIO_PROJECT_NAME_PROD
     value: jvcemxwcpghcqjn
+  - name: FORMS_API_URL_PROD
+    value: https://forms-api.nav.no
 azure:
   ad_groups:
     - id: b7012a89-90b9-4215-b7dc-988b929216e9

.nais/bygger/preprod.yaml

@@ -38,6 +38,8 @@ environmentVars:
     value: http://formio-enterprise-server
   - name: FORMIO_PROJECT_NAME_PROD
     value: jvcemxwcpghcqjn
+  - name: FORMS_API_URL_PROD
+    value: https://forms-api.nav.no
 azure:
   ad_groups:
     - id: b7012a89-90b9-4215-b7dc-988b929216e9

.nais/fyllut/dev-delingslenke.yaml

@@ -14,7 +14,7 @@ forms-api-url: https://forms-api.nav.no
 kodeverk:
   url: https://kodeverk-api.nav.no
   scope: dev-gcp.team-rocket.kodeverk-api
-forms-source: "formioapi"
+forms-source: "formsapi-staging"
 pdl-token-scope-cluster: "dev-fss"
 azure:
   application:

.nais/fyllut/preprod-alt.yaml

@@ -14,7 +14,7 @@ send-inn-host: http://innsending-api.team-soknad
 kodeverk:
   url: https://kodeverk-api.nav.no
   scope: dev-gcp.team-rocket.kodeverk-api
-forms-source: "formioapi"
+forms-source: "formsapi-staging"
 environmentVars:
   - name: FORMIO_API_SERVICE
     value: http://formio-api

.nais/fyllut/preprod.yaml

@@ -14,7 +14,7 @@ send-inn-host: http://innsending-api.team-soknad
 kodeverk:
   url: https://kodeverk-api.nav.no
   scope: dev-gcp.team-rocket.kodeverk-api
-forms-source: "formioapi"
+forms-source: "formsapi-staging"
 environmentVars:
   - name: FORMIO_API_SERVICE
     value: http://formio-api

README.md

@@ -216,9 +216,7 @@ Docker-image bygges og startes lokalt på følgende måte:
     # image: fyllut-base
     docker build --tag fyllut-base -f ./docker/Dockerfile.fyllut-base --build-arg git_sha=local ./packages
     docker run \
-       -e FORMS_SOURCE=formioapi \
-       -e FORMIO_API_SERVICE=https://formio-api.intern.dev.nav.no \
-       -e FORMIO_PROJECT_NAME=jvcemxwcpghcqjn \
+       -e FORMS_SOURCE=formsapi-staging \
        -e FORMS_API_URL=https://forms-api.intern.dev.nav.no \
        -e NAIS_CLUSTER_NAME=dev-gcp \
        -p 8080:8080 fyllut-base

mocks/mocks/collections.json

@@ -13,8 +13,6 @@
       "get-active-tasks:success",
       "put-soknad:success",
       "get-soknad:success-1",
-      "get-soknad:success-mellomlagring-nested-norwegian-business",
-      "get-soknad:success-mellomlagring-nested-foreign-business",
       "delete-soknad:success",
       "put-utfylt-soknad:success",
       "send-inn-frontend:available",

mocks/mocks/data/formio-api/attachments.json

@@ -27,12 +27,10 @@
             "required": true
           },
           "attachmentValues": {
-            "leggerVedNaa": {
+            "nei": {
               "enabled": true,
               "additionalDocumentation": {
-                "enabled": true,
-                "label": "Ledetekst tilleggsinformasjon",
-                "description": "Beskrivelse av krav til tilleggsinformasjon"
+                "enabled": false
               }
             },
             "ettersender": {
@@ -42,10 +40,12 @@
                 "enabled": false
               }
             },
-            "nei": {
+            "leggerVedNaa": {
               "enabled": true,
               "additionalDocumentation": {
-                "enabled": false
+                "enabled": true,
+                "label": "Ledetekst tilleggsinformasjon",
+                "description": "Beskrivelse av krav til tilleggsinformasjon"
               }
             }
           },

packages/bygger-backend/package.json

@@ -49,6 +49,7 @@
     "@types/uuid": "^10.0.0",
     "memorystream": "^0.3.1",
     "nock": "^13.5.6",
-    "vite-plugin-node": "^4.0.0"
+    "vite-plugin-node": "^4.0.0",
+    "vitest-mock-extended": "^2.0.2"
   }
 }

packages/bygger-backend/src/GitHubRepo.js

@@ -50,8 +50,8 @@ export class GitHubRepo {
       log: {
         debug: () => {},
         info: () => {},
-        warn: logger.warn,
-        error: logger.error,
+        warn: logger.warn.bind(logger),
+        error: logger.error.bind(logger),
       },
     });
   }

packages/bygger-backend/src/config/development.ts

@@ -47,6 +47,10 @@ export const devFormsApi: FormsApiConfig = {
   },
 };
 
+export const prodFormsApi: Pick<FormsApiConfig, 'url'> = {
+  url: 'https://forms-api.nav.no',
+};
+
 export const devPusher: Partial<PusherConfig> = {
   cluster: 'eu',
 };

packages/bygger-backend/src/config/index.ts

@@ -11,6 +11,7 @@ import {
   devPusher,
   devSkjemabyggingProxy,
   prodFormio,
+  prodFormsApi,
 } from './development';
 import { ConfigType, NodeEnv } from './types';
 
@@ -99,6 +100,12 @@ const config: ConfigType = {
     },
     devToken: isDevelopment ? optionalEnv('FORMS_API_ACCESS_TOKEN') : undefined,
   },
+  prodFormsApi:
+    naisClusterName !== 'prod-gcp'
+      ? {
+          url: env('FORMS_API_URL_PROD', prodFormsApi.url),
+        }
+      : undefined,
   pusher: {
     cluster: env('PUSHER_CLUSTER', devPusher.cluster),
     key: env('PUSHER_KEY'),

packages/bygger-backend/src/config/types.d.ts

@@ -68,6 +68,7 @@ export type ConfigType = {
   prodFormio?: Pick<FormioConfig, 'apiService' | 'projectName'>;
   fyllut: FyllutConfig;
   formsApi: FormsApiConfig;
+  prodFormsApi?: Pick<FormsApiConfig, 'url'>;
   pusher: PusherConfig;
   githubApp: GithubAppConfig;
   gitSha: string;

packages/bygger-backend/src/fetchUtils.ts

@@ -43,9 +43,18 @@ export async function fetchWithErrorHandling(url: RequestInfo, options: RequestI
       data: null,
     };
   }
+  if (res.headers.get('content-type')?.includes('application/json')) {
+    return {
+      status: 'OK',
+      data: await res.json(),
+    };
+  }
+
+  const logMeta = { status: res.status, method };
+  logger.warn(`Fetch ${method} ${url}: Unexpected content-type "${res.headers.get('content-type')}"`, logMeta);
   return {
     status: 'OK',
-    data: await res.json(),
+    data: null,
   };
 }
 

packages/bygger-backend/src/routers/api/form-publications/form-publications.ts

@@ -0,0 +1,82 @@
+import { formioFormsApiUtils, TranslationLang } from '@navikt/skjemadigitalisering-shared-domain';
+import { RequestHandler } from 'express';
+import { formPublicationsService, formsService } from '../../../services';
+import { mapLanguageCodeToFormioFormat } from './utils';
+
+const getAll: RequestHandler = async (req, res, next) => {
+  try {
+    const allPublishedForms = await formPublicationsService.getAll();
+    res.json(allPublishedForms);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const get: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  try {
+    const form = await formPublicationsService.get(formPath);
+    res.json(form);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const post: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  const { languageCodes, revision } = req.query; // TODO
+  const accessToken = req.headers.AzureAccessToken as string;
+
+  try {
+    const form = await formPublicationsService.post(
+      formPath,
+      languageCodes as TranslationLang[],
+      parseInt(revision as string),
+      accessToken,
+    );
+    const { translations } = await formPublicationsService.getTranslations(
+      formPath,
+      languageCodes as TranslationLang[],
+    );
+    const formioTranslations = Object.fromEntries(
+      Object.entries(translations).map(([key, values]) => [
+        mapLanguageCodeToFormioFormat(key as TranslationLang),
+        values,
+      ]),
+    );
+    const formioForm = formioFormsApiUtils.mapFormToNavForm(form);
+
+    req.body = { form: formioForm, translations: formioTranslations, formsApiForm: form };
+    next();
+  } catch (error) {
+    next(error);
+  }
+};
+
+const unpublish: RequestHandler = async (req, _res, next) => {
+  try {
+    const { formPath } = req.params;
+    const accessToken = req.headers.AzureAccessToken as string;
+    await formPublicationsService.unpublish(formPath, accessToken);
+    const form = await formsService.get(formPath);
+    req.body = { formsApiForm: form };
+    next();
+  } catch (error) {
+    next(error);
+  }
+};
+
+const getTranslations = async (req, res, next) => {
+  const { formPath } = req.params;
+  const { languageCodes } = req.query;
+  try {
+    const translations = await formPublicationsService.getTranslations(formPath, languageCodes);
+    res.json(translations);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const formPublications = { getAll, get, post, delete: unpublish, getTranslations };
+
+export default formPublications;

packages/bygger-backend/src/routers/api/form-publications/index.ts

@@ -0,0 +1,16 @@
+import express from 'express';
+import authHandlers from '../helpers/authHandlers';
+import publishForm from '../publish-form';
+import unpublishForm from '../unpublish-form';
+import formPublications from './form-publications';
+
+const formPublicationsRouter = express.Router();
+const { formsApiAuthHandler } = authHandlers;
+
+formPublicationsRouter.get('/', formPublications.getAll);
+formPublicationsRouter.get('/:formPath', formPublications.get);
+formPublicationsRouter.post('/:formPath', formsApiAuthHandler, formPublications.post, publishForm);
+formPublicationsRouter.delete('/:formPath', formsApiAuthHandler, formPublications.delete, unpublishForm);
+formPublicationsRouter.get('/:formPath/translations', formPublications.getTranslations);
+
+export default formPublicationsRouter;

packages/bygger-backend/src/routers/api/form-publications/utils.ts

@@ -0,0 +1,15 @@
+import { TranslationLang } from '@navikt/skjemadigitalisering-shared-domain';
+
+const mapLanguageCodeToFormioFormat = (languageCode: TranslationLang) => {
+  switch (languageCode) {
+    case 'nn':
+      return 'nn-NO';
+    case 'en':
+      return 'en';
+    case 'nb':
+    default:
+      return 'nb-NO';
+  }
+};
+
+export { mapLanguageCodeToFormioFormat };

packages/bygger-backend/src/routers/api/forms-api-form-translations/form-translations.ts

@@ -0,0 +1,72 @@
+import { FormsApiFormTranslation } from '@navikt/skjemadigitalisering-shared-domain';
+import { RequestHandler } from 'express';
+import { HttpError as OldHttpError } from '../../../fetchUtils';
+import { formTranslationsService } from '../../../services';
+import { HttpError } from '../helpers/errors';
+
+const get: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  try {
+    const translations = await formTranslationsService.get(formPath);
+    res.json(translations);
+  } catch (error) {
+    next(error);
+  }
+};
+
+const post: RequestHandler = async (req, res, next) => {
+  const { formPath } = req.params;
+  const accessToken = req.headers.AzureAccessToken as string;
+  const { key, nb, nn, en, globalTranslationId } = req.body as FormsApiFormTranslation;
+  const body = globalTranslationId ? { key, globalTranslationId } : { key, nb, nn, en };
+  try {
+    const translation = await formTranslationsService.post(formPath, body, accessToken);
+    res.status(201).json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const put: RequestHandler = async (req, res, next) => {
+  const { formPath, id } = req.params;
+  const { revision, nb, nn, en, globalTranslationId } = req.body as FormsApiFormTranslation;
+  const accessToken = req.headers.AzureAccessToken as string;
+  const body = globalTranslationId ? { globalTranslationId } : { nb, nn, en };
+  try {
+    const translation = await formTranslationsService.put(formPath, id, body, revision!, accessToken);
+    res.json(translation);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const deleteTranslation: RequestHandler = async (req, res, next) => {
+  const { formPath, id } = req.params;
+  const accessToken = req.headers.AzureAccessToken as string;
+  try {
+    await formTranslationsService.delete(formPath, parseInt(id), accessToken);
+    res.sendStatus(204);
+  } catch (error) {
+    if (error instanceof OldHttpError) {
+      next(new HttpError(error.message, error.response.status));
+    } else {
+      next(error);
+    }
+  }
+};
+
+const formTranslations = {
+  get,
+  post,
+  put,
+  delete: deleteTranslation,
+};
+export default formTranslations;