feat(form-system): Application

.eslintrc.json

@@ -42,6 +42,7 @@
                 "onlyDependOnLibsWithTags": [
                   "lib:portals-admin",
                   "lib:application-system",
+                  "lib:form-system",
                   "lib:portals",
                   "lib:react-spa",
                   "lib:react",

apps/api/infra/api.ts

@@ -65,6 +65,7 @@ export const serviceSetup = (services: {
   authAdminApi: ServiceBuilder<'services-auth-admin-api'>
   universityGatewayApi: ServiceBuilder<'services-university-gateway'>
   userNotificationService: ServiceBuilder<'services-user-notification'>
+  formSystemService: ServiceBuilder<'api-domains-form-system'>
 }): ServiceBuilder<'api'> => {
   return service('api')
     .namespace('islandis')
@@ -197,10 +198,13 @@ export const serviceSetup = (services: {
         prod: 'https://api.thinglysing.is/business/tolfraedi',
       },
       FORM_SYSTEM_API_BASE_PATH: {
-        dev: 'https://profun.island.is/umsoknarkerfi',
+        dev: 'http://localhost:3434',
         staging: '',
         prod: '',
       },
+      // FORM_SYSTEM_API_BASE_PATH: ref(
+      //   (h) => `http://${h.svc(services.formSystemService)}`,
+      // ),
       CONSULTATION_PORTAL_CLIENT_BASE_PATH: {
         dev: 'https://samradapi-test.devland.is',
         staging: 'https://samradapi-test.devland.is',

apps/judicial-system/api/src/app/modules/file/file.controller.ts

@@ -31,7 +31,7 @@ export class FileController {
     private readonly fileService: FileService,
     @Inject(LOGGER_PROVIDER)
     private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @Get('request')
   @Header('Content-Type', 'application/pdf')
@@ -191,8 +191,7 @@ export class FileController {
     @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<Response> {
     this.logger.debug(
-      `Getting subpoena ${
-        subpoenaId ?? 'draft'
+      `Getting subpoena ${subpoenaId ?? 'draft'
       } for defendant ${defendantId} of case ${id} as a pdf document`,
     )
 

apps/judicial-system/api/src/app/modules/file/limitedAccessFile.controller.ts

@@ -6,6 +6,7 @@ import {
   Header,
   Inject,
   Param,
+  Query,
   Req,
   Res,
   UseGuards,
@@ -19,7 +20,7 @@ import {
   CurrentHttpUser,
   JwtInjectBearerAuthGuard,
 } from '@island.is/judicial-system/auth'
-import type { User } from '@island.is/judicial-system/types'
+import type { SubpoenaType, User } from '@island.is/judicial-system/types'
 
 import { FileService } from './file.service'
 
@@ -29,7 +30,7 @@ export class LimitedAccessFileController {
   constructor(
     private readonly fileService: FileService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @Get('request')
   @Header('Content-Type', 'application/pdf')

apps/judicial-system/backend/src/app/modules/case/pdf.service.ts

@@ -51,7 +51,7 @@ export class PdfService {
     private readonly subpoenaService: SubpoenaService,
     @InjectModel(Case) private readonly caseModel: typeof Case,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   private formatMessage: FormatMessage = () => {
     throw new InternalServerErrorException('Format message not initialized')
@@ -93,7 +93,7 @@ export class PdfService {
         (caseFile1, caseFile2) =>
           (caseFile1.chapter ?? 0) - (caseFile2.chapter ?? 0) ||
           (caseFile1.orderWithinChapter ?? 0) -
-            (caseFile2.orderWithinChapter ?? 0),
+          (caseFile2.orderWithinChapter ?? 0),
       )
       ?.map((caseFile) => async () => {
         const buffer = await this.awsS3Service

apps/judicial-system/backend/src/app/modules/subpoena/limitedAccessSubpoena.controller.ts

@@ -51,7 +51,7 @@ export class LimitedAccessSubpoenaController {
   constructor(
     private readonly pdfService: PdfService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @UseGuards(SubpoenaExistsGuard)
   @RolesRules(defenderGeneratedPdfRule)

apps/judicial-system/backend/src/app/modules/subpoena/subpoena.controller.ts

@@ -68,7 +68,7 @@ export class SubpoenaController {
     private readonly pdfService: PdfService,
     private readonly subpoenaService: SubpoenaService,
     @Inject(LOGGER_PROVIDER) private readonly logger: Logger,
-  ) {}
+  ) { }
 
   @RolesRules(
     prosecutorRule,
@@ -125,8 +125,7 @@ export class SubpoenaController {
     @Query('subpoenaType') subpoenaType?: SubpoenaType,
   ): Promise<void> {
     this.logger.debug(
-      `Getting subpoena ${
-        subpoenaId ?? 'draft'
+      `Getting subpoena ${subpoenaId ?? 'draft'
       } for defendant ${defendantId} of case ${caseId} as a pdf document`,
     )
 

apps/portals/admin/infra/portals-admin.ts

@@ -23,6 +23,7 @@ export const serviceSetup = (): ServiceBuilder<'portals-admin'> =>
       SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY',
       SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID',
       SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN',
+      FORM_SYSTEM_MIDEIND_KEY: '/k8s/portals-admin/FORM_SYSTEM_MIDEIND_KEY',
     })
     .ingress({
       primary: {

apps/portals/form-system/.babelrc

@@ -0,0 +1,11 @@
+{
+  "presets": [
+    [
+      "@nx/react/babel",
+      {
+        "runtime": "automatic"
+      }
+    ]
+  ],
+  "plugins": []
+}

apps/portals/form-system/.eslintrc.json

@@ -0,0 +1,18 @@
+{
+  "extends": ["plugin:@nx/react", "../../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*"],
+  "overrides": [
+    {
+      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.ts", "*.tsx"],
+      "rules": {}
+    },
+    {
+      "files": ["*.js", "*.jsx"],
+      "rules": {}
+    }
+  ]
+}

apps/portals/form-system/infra/form-system.ts

@@ -0,0 +1,63 @@
+import { ref, service, ServiceBuilder } from '../../../../infra/src/dsl/dsl'
+
+export const serviceSetup = (services: {
+  api: ServiceBuilder<'api'>
+}): ServiceBuilder<'portals-form-system'> =>
+  service('portals-form-system')
+    .namespace('portals-form-system')
+    .liveness('/liveness')
+    .readiness('/readiness')
+    .replicaCount({
+      default: 2,
+      max: 30,
+      min: 2,
+    })
+    .resources({
+      limits: { cpu: '400m', memory: '512Mi' },
+      requests: { cpu: '200m', memory: '256Mi' },
+    })
+    .env({
+      BASEPATH: '/form',
+      SI_PUBLIC_GRAPHQL_PATH: {
+        dev: 'http://localhost:4445',
+        prod: '',
+        staging: '',
+        local: ref((h) => `http://${h.svc(services.api)}`),
+      },
+      SI_PUBLIC_IDENTITY_SERVER_ISSUER_URL: {
+        dev: 'https://identity-server.dev01.devland.is',
+        staging: 'https://identity-server.staging01.devland.is',
+        prod: 'https://innskra.island.is',
+      },
+      SI_PUBLIC_ENVIRONMENT: ref((h) => h.env.type),
+    })
+    .secrets({
+      SI_PUBLIC_CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY',
+      SI_PUBLIC_DD_RUM_APPLICATION_ID: '/k8s/DD_RUM_APPLICATION_ID',
+      SI_PUBLIC_DD_RUM_CLIENT_TOKEN: '/k8s/DD_RUM_CLIENT_TOKEN',
+    })
+    .ingress({
+      primary: {
+        host: {
+          dev: ['beta'],
+          staging: ['beta'],
+          prod: ['', 'www.island.is'],
+        },
+        extraAnnotations: {
+          dev: {
+            'nginx.ingress.kubernetes.io/proxy-buffering': 'on',
+            'nginx.ingress.kubernetes.io/proxy-buffer-size': '8k',
+          },
+          staging: {
+            'nginx.ingress.kubernetes.io/enable-global-auth': 'false',
+            'nginx.ingress.kubernetes.io/proxy-buffering': 'on',
+            'nginx.ingress.kubernetes.io/proxy-buffer-size': '8k',
+          },
+          prod: {
+            'nginx.ingress.kubernetes.io/proxy-buffering': 'on',
+            'nginx.ingress.kubernetes.io/proxy-buffer-size': '8k',
+          },
+        },
+        paths: ['/form'],
+      },
+    })

apps/portals/form-system/jest.config.ts

@@ -0,0 +1,11 @@
+/* eslint-disable */
+export default {
+  displayName: 'portals-form-system',
+  preset: '../../../jest.preset.js',
+  transform: {
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
+  },
+  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
+  coverageDirectory: '../../../coverage/apps/portals/form-system',
+}

apps/portals/form-system/project.json

@@ -0,0 +1,103 @@
+{
+  "name": "portals-form-system",
+  "$schema": "../../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "apps/portals/form-system/src",
+  "projectType": "application",
+  "targets": {
+    "build": {
+      "executor": "@nx/webpack:webpack",
+      "outputs": ["{options.outputPath}"],
+      "defaultConfiguration": "production",
+      "options": {
+        "compiler": "babel",
+        "outputPath": "dist/apps/portals/form-system",
+        "index": "apps/portals/form-system/src/index.html",
+        "baseHref": "/form/",
+        "main": "apps/portals/form-system/src/main.tsx",
+        "polyfills": "apps/portals/form-system/src/polyfills.ts",
+        "tsConfig": "apps/portals/form-system/tsconfig.app.json",
+        "assets": [
+          "apps/portals/form-system/src/favicon.ico",
+          "apps/portals/form-system/src/assets"
+        ],
+        "styles": ["apps/portals/form-system/src/styles.css"],
+        "scripts": [],
+        "webpackConfig": "apps/portals/form-system/webpack.config.js"
+      },
+      "configurations": {
+        "production": {
+          "fileReplacements": [
+            {
+              "replace": "apps/portals/form-system/src/environments/environment.ts",
+              "with": "apps/portals/form-system/src/environments/environment.prod.ts"
+            }
+          ],
+          "optimization": true,
+          "outputHashing": "all",
+          "sourceMap": false,
+          "namedChunks": false,
+          "extractLicenses": true,
+          "vendorChunk": false
+        }
+      },
+      "dependsOn": [
+        {
+          "target": "generateDevIndexHTML"
+        }
+      ]
+    },
+    "generateDevIndexHTML": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          "node scripts/dockerfile-assets/bash/extract-environment.js apps/portals/form-system/src"
+        ]
+      },
+      "outputs": ["{workspaceRoot}/apps/portals/form-system/src/index.html"]
+    },
+    "serve": {
+      "executor": "@nx/webpack:dev-server",
+      "defaultConfiguration": "development",
+      "options": {
+        "buildTarget": "portals-form-system:build",
+        "hmr": true
+      },
+      "configurations": {
+        "development": {
+          "buildTarget": "portals-form-system:build:development"
+        },
+        "production": {
+          "buildTarget": "portals-form-system:build:production",
+          "hmr": false
+        }
+      },
+      "dependsOn": [
+        {
+          "target": "generateDevIndexHTML"
+        }
+      ]
+    },
+    "lint": {
+      "executor": "@nx/linter:eslint",
+      "outputs": ["{options.outputFile}"],
+      "options": {
+        "lintFilePatterns": ["apps/portals/form-system/**/*.{ts,tsx,js,jsx}"]
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
+      "options": {
+        "jestConfig": "apps/portals/form-system/jest.config.ts",
+        "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
+      }
+    }
+  },
+  "tags": []
+}

apps/portals/form-system/src/app/App.tsx

@@ -0,0 +1,20 @@
+import { ApolloProvider } from '@apollo/client'
+import { initializeClient } from '@island.is/form-system/graphql'
+import environment from '../environments/environment'
+import { defaultLanguage } from '@island.is/shared/constants'
+import { LocaleProvider } from '@island.is/localization'
+import { AuthProvider } from '@island.is/auth/react'
+import { BASE_PATH } from '../lib/routes'
+import { Router } from '../components/Router/Router'
+
+export const App = () => (
+  <ApolloProvider client={initializeClient(environment.baseApiUrl)}>
+    <LocaleProvider locale={defaultLanguage} messages={{}}>
+      <AuthProvider basePath={BASE_PATH}>
+        <Router />
+      </AuthProvider>
+    </LocaleProvider>
+  </ApolloProvider>
+)
+
+export default App

apps/portals/form-system/src/auth.ts

@@ -0,0 +1,24 @@
+import { configure, configureMock } from '@island.is/auth/react'
+
+import environment from './environments/environment'
+
+const userMocked = process.env.API_MOCKS === 'true'
+
+if (userMocked) {
+  configureMock({
+    profile: { name: 'Mock', locale: 'is', nationalId: '0000000000' },
+    scopes: [],
+  })
+} else {
+  configure({
+    baseUrl: `${window.location.origin}/form`,
+    redirectPath: '/signin-oidc',
+    redirectPathSilent: '/silent/signin-oidc',
+    switchUserRedirectUrl: '/',
+    authority: environment.identityServer.authority,
+    client_id: '@island.is/web',
+    scope: ['openid', 'profile'],
+    post_logout_redirect_uri: `${window.location.origin}`,
+    userStorePrefix: 'ap.',
+  })
+}