Merge branch 'main' into feat/move-and-improve-e2e-tests-web

.github/workflows/pullrequest.yml

@@ -178,7 +178,7 @@ jobs:
     runs-on: ec2-runners
     container:
       image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
-    timeout-minutes: 35
+    timeout-minutes: 45
     env:
       AFFECTED_PROJECTS: ${{ matrix.projects }}
       MAX_JOBS: 1
@@ -220,7 +220,7 @@ jobs:
     runs-on: ec2-runners
     container:
       image: public.ecr.aws/m3u4c4h9/island-is/actions-runner-public:latest
-    timeout-minutes: 35
+    timeout-minutes: 45
     env:
       AFFECTED_PROJECT: ${{ matrix.projects }}
       CYPRESS_PROJECT_ID: 4q7jz8

apps/judicial-system/backend/src/app/modules/notification/baseNotification.service.ts

@@ -89,7 +89,7 @@ export abstract class BaseNotificationService {
       // We use the first one as the main recipient and the rest as CC
       let recipients = recipientEmail ? recipientEmail.split(',') : undefined
 
-      if (!this.config.production && recipients) {
+      if (this.config.shouldUseWhitelist && recipients) {
         recipients = await this.handleWhitelist(recipients)
       }
 

apps/judicial-system/backend/src/app/modules/notification/notification.config.ts

@@ -5,6 +5,8 @@ export const notificationModuleConfig = defineConfig({
   load: (env) => ({
     production: env.optional('NODE_ENV') === 'production',
     courtOfAppealsId: '4676f08b-aab4-4b4f-a366-697540788088',
+    shouldUseWhitelist:
+      env.required('CONTENTFUL_ENVIRONMENT', 'test') !== 'master',
     email: {
       fromEmail: env.required('EMAIL_FROM', '[email protected]'),
       fromName: env.required('EMAIL_FROM_NAME', 'Réttarvörslugátt'),

apps/services/auth/admin-api/project.json

@@ -42,6 +42,12 @@
       },
       "outputs": ["{workspaceRoot}/coverage/apps/services/auth/admin-api"]
     },
+    "dev": {
+      "executor": "nx:run-commands",
+      "options": {
+        "command": "yarn start --project services-auth-admin-api"
+      }
+    },
     "codegen/backend-schema": {
       "executor": "nx:run-commands",
       "options": {

apps/services/bff/src/app/app.module.ts

@@ -1,5 +1,6 @@
 import { ConfigModule } from '@island.is/nest/config'
 import { Module } from '@nestjs/common'
+import { ProblemModule } from '@island.is/nest/problem'
 import { BffConfig } from './bff.config'
 import { AuthModule as AppAuthModule } from './modules/auth/auth.module'
 import { CacheModule } from './modules/cache/cache.module'
@@ -18,6 +19,7 @@ import { EnhancedFetchModule } from './modules/enhancedFetch/enhanced-fetch.modu
     AppAuthModule,
     ProxyModule,
     EnhancedFetchModule,
+    ProblemModule,
   ],
 })
 export class AppModule {}

apps/services/bff/src/app/modules/auth/auth.controller.spec.ts

@@ -456,8 +456,8 @@ describe('AuthController', () => {
       expect(res.status).toEqual(HttpStatus.BAD_REQUEST)
       // Expect error to be
       expect(res.body).toMatchObject({
-        statusCode: 400,
-        message: 'No param "logout_token" provided!',
+        status: 400,
+        detail: 'No param "logout_token" provided!',
       })
     })
 

apps/services/bff/src/main.ts

@@ -9,4 +9,5 @@ bootstrap({
   port: environment.port,
   globalPrefix: `${environment.keyPath}/bff`,
   healthCheck: true,
+  jsonBodyLimit: '350kb',
 })

apps/web/components/Organization/MarkdownText/MarkdownText.css.ts

@@ -1,7 +1,18 @@
 import { globalStyle, style } from '@vanilla-extract/css'
 
+import { theme } from '@island.is/island-ui/theme'
+
 export const markdownText = style({})
 
 globalStyle(`${markdownText} ul`, {
   paddingTop: 16,
 })
+
+globalStyle(`${markdownText} a`, {
+  color: theme.color.blue400,
+  textDecoration: 'underline',
+})
+
+globalStyle(`${markdownText} a:hover`, {
+  color: theme.color.blueberry400,
+})

apps/web/components/connected/WHODAS/Calculator.css.ts

@@ -0,0 +1,9 @@
+import { style } from '@vanilla-extract/css'
+
+import { theme } from '@island.is/island-ui/theme'
+
+export const breakdownRowContainer = style({
+  display: 'grid',
+  gridTemplateColumns: '180px 1fr',
+  gap: theme.spacing[5],
+})

apps/web/components/connected/WHODAS/Calculator.strings.ts

@@ -0,0 +1,115 @@
+import { defineMessages } from 'react-intl'
+
+export const m = {
+  form: defineMessages({
+    previousStep: {
+      id: 'web.whodas.calculator:form.previousStep',
+      defaultMessage: 'Fyrra skref',
+      description: 'Fyrra skref',
+    },
+    nextStep: {
+      id: 'web.whodas.calculator:form.nextStep',
+      defaultMessage: 'Næsta skref',
+      description: 'Næsta skref',
+    },
+    seeResults: {
+      id: 'web.whodas.calculator:form.seeResults',
+      defaultMessage: 'Senda inn svör',
+      description: 'Senda inn svör',
+    },
+    progress: {
+      id: 'web.whodas.calculator:form.progress',
+      defaultMessage: 'Skref {stepIndex} af {stepCount}',
+      description: 'Skref {stepIndex} af {stepCount}',
+    },
+  }),
+  answerLabel: defineMessages({
+    '0': {
+      id: 'web.whodas.calculator:form.answerLabel0',
+      defaultMessage: 'Ekkert erfitt',
+      description: 'Ekkert erfitt',
+    },
+    '1': {
+      id: 'web.whodas.calculator:form.answerLabel1',
+      defaultMessage: 'Svolítið erfitt',
+      description: 'Svolítið erfitt',
+    },
+    '2': {
+      id: 'web.whodas.calculator:form.answerLabel2',
+      defaultMessage: 'Nokkuð erfitt',
+      description: 'Nokkuð erfitt',
+    },
+    '3': {
+      id: 'web.whodas.calculator:form.answerLabel3',
+      defaultMessage: 'Talsvert erfitt',
+      description: 'Talsvert erfitt',
+    },
+    '4': {
+      id: 'web.whodas.calculator:form.answerLabel4',
+      defaultMessage: 'Mjög erfitt eða gekk ekki',
+      description: 'Mjög erfitt eða gekk ekki',
+    },
+  }),
+  results: defineMessages({
+    mainHeading: {
+      id: 'web.whodas.calculator:form.mainHeading',
+      defaultMessage: 'Niðurstaða mats á færni',
+      description: 'Niðurstaða mats á færni',
+    },
+    print: {
+      id: 'web.whodas.calculator:form.print',
+      defaultMessage: 'Prenta',
+      description: 'Prenta',
+    },
+    scoreHeading: {
+      id: 'web.whodas.calculator:form.scoreHeading',
+      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',
+      description: 'Lítil skerðing á færni - Túlkun',
+    },
+    secondBracketInterpretationText: {
+      id: 'web.whodas.calculator:form.secondBracketInterpretationText',
+      defaultMessage: 'Talsverð færniskerðing',
+      description: 'Talsverð færniskerðing - Túlkun',
+    },
+    firstBracketAdviceText: {
+      id: 'web.whodas.calculator:form.firstBracketAdviceText#markdown',
+      defaultMessage: 'Mælum með að skoða hvað er í boði í þínu nærsamfélagi.',
+      description: 'Lítil skerðing á færni - Ráð',
+    },
+    secondBracketAdviceText: {
+      id: 'web.whodas.calculator:form.secondBracketAdviceText#markdown',
+      defaultMessage: 'Vert er að sækja um heimaþjónustu í þínu sveitarfélagi.',
+      description: 'Talsverð færniskerðing - Ráð',
+    },
+    interpretationHeading: {
+      id: 'web.whodas.calculator:form.interpretationHeading',
+      defaultMessage: 'Túlkun',
+      description: 'Túlkun',
+    },
+    adviceHeading: {
+      id: 'web.whodas.calculator:form.adviceHeading',
+      defaultMessage: 'Ráðleggingar',
+      description: 'Ráðleggingar',
+    },
+    breakdownHeading: {
+      id: 'web.whodas.calculator:form.breakdownHeading',
+      defaultMessage: 'Sundurliðun á niðurstöðum',
+      description: 'Sundurliðun á niðurstöðum',
+    },
+  }),
+}