Merge branch 'main' into fix/web-generic-list-page-number-sticks-when…

…-filtering
island-is · Dec 5, 2024 · 5a0a8bb · 5a0a8bb
2 parents 5ed8b42 + 4ff3865
commit 5a0a8bb
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 150 deletions.
diff --git a/apps/application-system/api/infra/application-system-api.ts b/apps/application-system/api/infra/application-system-api.ts
@@ -49,80 +49,83 @@ export const GRAPHQL_API_URL_ENV_VAR_NAME = 'GRAPHQL_API_URL' // This property i
 
 const namespace = 'application-system'
 const serviceAccount = 'application-system-api'
-export const workerSetup =
-  (): ServiceBuilder<'application-system-api-worker'> =>
-    service('application-system-api-worker')
-      .namespace(namespace)
-      .image('application-system-api')
-      .db()
-      .serviceAccount('application-system-api-worker')
-      .redis()
-      .codeOwner(CodeOwners.NordaApplications)
-      .env({
-        IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/application-system',
-        IDENTITY_SERVER_ISSUER_URL: {
-          dev: 'https://identity-server.dev01.devland.is',
-          staging: 'https://identity-server.staging01.devland.is',
-          prod: 'https://innskra.island.is',
-        },
-        XROAD_CHARGE_FJS_V2_PATH: {
-          dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
-          staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
-          prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
-        },
-        APPLICATION_ATTACHMENT_BUCKET: {
-          dev: 'island-is-dev-storage-application-system',
-          staging: 'island-is-staging-storage-application-system',
-          prod: 'island-is-prod-storage-application-system',
-        },
-        FILE_SERVICE_PRESIGN_BUCKET: {
-          dev: 'island-is-dev-fs-presign-bucket',
-          staging: 'island-is-staging-fs-presign-bucket',
-          prod: 'island-is-prod-fs-presign-bucket',
-        },
-        FILE_STORAGE_UPLOAD_BUCKET: {
-          dev: 'island-is-dev-upload-api',
-          staging: 'island-is-staging-upload-api',
-          prod: 'island-is-prod-upload-api',
-        },
-        CLIENT_LOCATION_ORIGIN: {
-          dev: 'https://beta.dev01.devland.is/umsoknir',
-          staging: 'https://beta.staging01.devland.is/umsoknir',
-          prod: 'https://island.is/umsoknir',
-          local: 'http://localhost:4200/umsoknir',
-        },
-      })
-      .xroad(Base, Client, Payment, Inna, EHIC, WorkMachines)
-      .secrets({
-        IDENTITY_SERVER_CLIENT_SECRET:
-          '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET',
-        SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST',
-        SYSLUMENN_USERNAME: '/k8s/application-system/api/SYSLUMENN_USERNAME',
-        SYSLUMENN_PASSWORD: '/k8s/application-system/api/SYSLUMENN_PASSWORD',
-        DRIVING_LICENSE_BOOK_XROAD_PATH:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_XROAD_PATH',
-        DRIVING_LICENSE_BOOK_USERNAME:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_USERNAME',
-        DRIVING_LICENSE_BOOK_PASSWORD:
-          '/k8s/application-system-api/DRIVING_LICENSE_BOOK_PASSWORD',
-        DOKOBIT_ACCESS_TOKEN:
-          '/k8s/application-system/api/DOKOBIT_ACCESS_TOKEN',
-        DOKOBIT_URL: '/k8s/application-system-api/DOKOBIT_URL',
-        ARK_BASE_URL: '/k8s/application-system-api/ARK_BASE_URL',
-        DOMSYSLA_PASSWORD: '/k8s/application-system-api/DOMSYSLA_PASSWORD',
-        DOMSYSLA_USERNAME: '/k8s/application-system-api/DOMSYSLA_USERNAME',
-      })
-      .args('main.js', '--job', 'worker')
-      .command('node')
-      .extraAttributes({
-        dev: { schedule: '*/30 * * * *' },
-        staging: { schedule: '*/30 * * * *' },
-        prod: { schedule: '*/30 * * * *' },
-      })
-      .resources({
-        limits: { cpu: '400m', memory: '768Mi' },
-        requests: { cpu: '150m', memory: '384Mi' },
-      })
+export const workerSetup = (services: {
+  userNotificationService: ServiceBuilder<'services-user-notification'>
+}): ServiceBuilder<'application-system-api-worker'> =>
+  service('application-system-api-worker')
+    .namespace(namespace)
+    .image('application-system-api')
+    .db()
+    .serviceAccount('application-system-api-worker')
+    .redis()
+    .codeOwner(CodeOwners.NordaApplications)
+    .env({
+      IDENTITY_SERVER_CLIENT_ID: '@island.is/clients/application-system',
+      IDENTITY_SERVER_ISSUER_URL: {
+        dev: 'https://identity-server.dev01.devland.is',
+        staging: 'https://identity-server.staging01.devland.is',
+        prod: 'https://innskra.island.is',
+      },
+      XROAD_CHARGE_FJS_V2_PATH: {
+        dev: 'IS-DEV/GOV/10021/FJS-Public/chargeFJS_v2',
+        staging: 'IS-TEST/GOV/10021/FJS-Public/chargeFJS_v2',
+        prod: 'IS/GOV/5402697509/FJS-Public/chargeFJS_v2',
+      },
+      APPLICATION_ATTACHMENT_BUCKET: {
+        dev: 'island-is-dev-storage-application-system',
+        staging: 'island-is-staging-storage-application-system',
+        prod: 'island-is-prod-storage-application-system',
+      },
+      FILE_SERVICE_PRESIGN_BUCKET: {
+        dev: 'island-is-dev-fs-presign-bucket',
+        staging: 'island-is-staging-fs-presign-bucket',
+        prod: 'island-is-prod-fs-presign-bucket',
+      },
+      FILE_STORAGE_UPLOAD_BUCKET: {
+        dev: 'island-is-dev-upload-api',
+        staging: 'island-is-staging-upload-api',
+        prod: 'island-is-prod-upload-api',
+      },
+      CLIENT_LOCATION_ORIGIN: {
+        dev: 'https://beta.dev01.devland.is/umsoknir',
+        staging: 'https://beta.staging01.devland.is/umsoknir',
+        prod: 'https://island.is/umsoknir',
+        local: 'http://localhost:4200/umsoknir',
+      },
+      USER_NOTIFICATION_API_URL: ref(
+        (h) => `http://${h.svc(services.userNotificationService)}`,
+      ),
+    })
+    .xroad(Base, Client, Payment, Inna, EHIC, WorkMachines)
+    .secrets({
+      IDENTITY_SERVER_CLIENT_SECRET:
+        '/k8s/application-system/api/IDENTITY_SERVER_CLIENT_SECRET',
+      SYSLUMENN_HOST: '/k8s/application-system-api/SYSLUMENN_HOST',
+      SYSLUMENN_USERNAME: '/k8s/application-system/api/SYSLUMENN_USERNAME',
+      SYSLUMENN_PASSWORD: '/k8s/application-system/api/SYSLUMENN_PASSWORD',
+      DRIVING_LICENSE_BOOK_XROAD_PATH:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_XROAD_PATH',
+      DRIVING_LICENSE_BOOK_USERNAME:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_USERNAME',
+      DRIVING_LICENSE_BOOK_PASSWORD:
+        '/k8s/application-system-api/DRIVING_LICENSE_BOOK_PASSWORD',
+      DOKOBIT_ACCESS_TOKEN: '/k8s/application-system/api/DOKOBIT_ACCESS_TOKEN',
+      DOKOBIT_URL: '/k8s/application-system-api/DOKOBIT_URL',
+      ARK_BASE_URL: '/k8s/application-system-api/ARK_BASE_URL',
+      DOMSYSLA_PASSWORD: '/k8s/application-system-api/DOMSYSLA_PASSWORD',
+      DOMSYSLA_USERNAME: '/k8s/application-system-api/DOMSYSLA_USERNAME',
+    })
+    .args('main.js', '--job', 'worker')
+    .command('node')
+    .extraAttributes({
+      dev: { schedule: '*/30 * * * *' },
+      staging: { schedule: '*/30 * * * *' },
+      prod: { schedule: '*/30 * * * *' },
+    })
+    .resources({
+      limits: { cpu: '400m', memory: '768Mi' },
+      requests: { cpu: '150m', memory: '384Mi' },
+    })
 
 export const serviceSetup = (services: {
   documentsService: ServiceBuilder<'services-documents'>

diff --git a/apps/web/components/connected/WHODAS/Calculator.css.ts b/apps/web/components/connected/WHODAS/Calculator.css.ts
@@ -2,8 +2,20 @@ import { style } from '@vanilla-extract/css'
 
 import { theme } from '@island.is/island-ui/theme'
 
+const leftWidth = 180
+
 export const breakdownRowContainer = style({
   display: 'grid',
-  gridTemplateColumns: '180px 1fr',
+  gridTemplateColumns: `${leftWidth}px 1fr`,
   gap: theme.spacing[5],
 })
+
+export const totalScoreRowContainer = style({
+  display: 'grid',
+  gridTemplateColumns: `${leftWidth + 24}px 1fr`,
+  gap: theme.spacing[5],
+})
+
+export const stayOnSinglePageWhenPrinting = style({
+  pageBreakInside: 'avoid',
+})
diff --git a/apps/web/components/connected/WHODAS/Calculator.strings.ts b/apps/web/components/connected/WHODAS/Calculator.strings.ts
@@ -62,6 +62,18 @@ export const m = {
         'Takk fyrir að svara spurningalistanum, Mat á færni þinni. Mat þitt á færni er stuðningur við að meta þörf þína fyrir heimaþjónustu. Ef þú hefur ekki svarað öllum spurningum getur það haft áhrif á niðurstöðuna.',
       description: 'Texti fyrir ofan niðurstöðuskjá',
     },
+    totalScore: {
+      id: 'web.whodas.calculator:results.totalScore',
+      defaultMessage: 'Stig samtals',
+      description: 'Stig samtals',
+    },
+    resultDisclaimer: {
+      id: 'web.whodas.calculator:results.resultDisclaimer',
+      defaultMessage:
+        'Gott er að prenta út eða senda sér svarið. Það getur gangast við umsókn um heimaþjónustu.',
+      description:
+        'Gott er að prenta út eða senda sér svarið. Það getur gangast við umsókn um heimaþjónustu.',
+    },
     mainHeading: {
       id: 'web.whodas.calculator:form.mainHeading',
       defaultMessage: 'Niðurstaða mats á færni',
@@ -77,16 +89,6 @@ export const m = {
       defaultMessage: 'Heildarstig',
       description: 'Heildarstig',
     },
-    firstBracketScoreText: {
-      id: 'web.whodas.calculator:form.firstBracketScoreText',
-      defaultMessage: '0 til 16,9 stig',
-      description: 'Lítil skerðing á færni - "Score" texti',
-    },
-    secondBracketScoreText: {
-      id: 'web.whodas.calculator:form.secondBracketScoreText',
-      defaultMessage: '17 til 100 stig',
-      description: 'Talsverð skerðing á færni - "Score" texti',
-    },
     firstBracketInterpretationText: {
       id: 'web.whodas.calculator:form.firstBracketInterpretationText',
       defaultMessage: 'Lítil skerðing á færni',