Merge branch 'main' into j-s/use-confirmed-indictment-date

island-is · Jan 9, 2025 · fe13df0 · fe13df0
2 parents 5afbc5d + af80723
commit fe13df0
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 26 deletions.
diff --git a/apps/judicial-system/backend/src/app/modules/case/case.service.ts b/apps/judicial-system/backend/src/app/modules/case/case.service.ts
@@ -1095,20 +1095,21 @@ export class CaseService {
       })
     }
 
-    const subpoenasToRevoke = await this.subpoenaService.findByCaseId(
-      theCase.id,
-    )
-
-    if (subpoenasToRevoke?.length > 0) {
-      messages.push(
-        ...subpoenasToRevoke.map((subpoena) => ({
-          type: MessageType.DELIVERY_TO_POLICE_SUBPOENA_REVOCATION,
-          user,
-          caseId: theCase.id,
-          elementId: [subpoena.defendantId, subpoena.id],
-        })),
-      )
-    }
+    // Commented out temporarily because police endpoint is not ready to receive revocation
+    // const subpoenasToRevoke = await this.subpoenaService.findByCaseId(
+    //   theCase.id,
+    // )
+
+    // if (subpoenasToRevoke?.length > 0) {
+    //   messages.push(
+    //     ...subpoenasToRevoke.map((subpoena) => ({
+    //       type: MessageType.DELIVERY_TO_POLICE_SUBPOENA_REVOCATION,
+    //       user,
+    //       caseId: theCase.id,
+    //       elementId: [subpoena.defendantId, subpoena.id],
+    //     })),
+    //   )
+    // }
 
     return this.messageService.sendMessagesToQueue(messages)
   }

diff --git a/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx b/apps/judicial-system/web/src/routes/Prosecutor/Indictments/Processing/Processing.tsx
@@ -76,6 +76,8 @@ const Processing: FC = () => {
     deleteCivilClaimant,
   } = useCivilClaimants()
   const router = useRouter()
+
+  // TODO: currently for e2e tests, this is failing locally due to this feature flag
   const isTrafficViolationCaseCheck =
     features.includes(Feature.MULTIPLE_INDICTMENT_SUBTYPES) ||
     isTrafficViolationCase(workingCase)

diff --git a/apps/services/auth/ids-api/infra/identity-server.ts b/apps/services/auth/ids-api/infra/identity-server.ts
@@ -108,6 +108,8 @@ export const serviceSetup = (services: {
         '/k8s/identity-server/redaction/USER_IDENTIFIERS_KEY_ID',
       Redaction__UserIdentifiers__Key:
         '/k8s/identity-server/redaction/USER_IDENTIFIERS_KEY',
+      Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID',
+      Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN',
     })
     .ingress({
       primary: {

diff --git a/apps/system-e2e/src/playwright.config.ts b/apps/system-e2e/src/playwright.config.ts
@@ -70,6 +70,12 @@ const config: PlaywrightTestConfig = {
     {
       name: 'judicial-system',
       testMatch: 'tests/judicial-system/**/*.spec.[tj]s',
+      use: {
+        /* Slows down execution in ms */
+        launchOptions: {
+          slowMo: 200,
+        },
+      },
     },
     { name: 'islandis', testMatch: 'tests/islandis/**/*.spec.[tj]s' },
     { name: 'everything', testMatch: 'tests/*/**/*.spec.[tj]s' },

diff --git a/apps/web/components/ChatPanel/BoostChatPanel/BoostChatPanel.tsx b/apps/web/components/ChatPanel/BoostChatPanel/BoostChatPanel.tsx
@@ -73,6 +73,9 @@ export const BoostChatPanel: React.FC<
           'wa_lid',
         )
         if (queryParam && ['t10', 't11'].includes(queryParam)) {
+          window.boost.chatPanel.setStartLanguage(
+            activeLocale === 'en' ? 'en-US' : 'is-IS',
+          )
           window.boost.chatPanel.show()
         }
       })
@@ -81,7 +84,7 @@ export const BoostChatPanel: React.FC<
       el.id = 'boost-script'
       document.body.appendChild(el)
     }
-  }, [endpoint])
+  }, [activeLocale, endpoint])
 
   const { data } = useQuery<Query, QueryGetNamespaceArgs>(GET_NAMESPACE_QUERY, {
     variables: {
@@ -102,7 +105,12 @@ export const BoostChatPanel: React.FC<
   return (
     <ChatBubble
       text={n('chatBubbleText', 'Hæ, get ég aðstoðað?')}
-      onClick={() => window.boost.chatPanel.show()}
+      onClick={() => {
+        window.boost.chatPanel.setStartLanguage(
+          activeLocale === 'en' ? 'en-US' : 'is-IS',
+        )
+        window.boost.chatPanel.show()
+      }}
       isVisible={showButton}
       pushUp={pushUp}
     />

diff --git a/charts/identity-server/values.dev.yaml b/charts/identity-server/values.dev.yaml
@@ -191,6 +191,8 @@ identity-server:
     AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+    Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+    Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
     FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
     IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/charts/identity-server/values.prod.yaml b/charts/identity-server/values.prod.yaml
@@ -188,6 +188,8 @@ identity-server:
     AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+    Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+    Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
     FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
     IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/charts/identity-server/values.staging.yaml b/charts/identity-server/values.staging.yaml
@@ -191,6 +191,8 @@ identity-server:
     AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
     CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+    Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+    Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
     FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
     IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
     IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/charts/services/identity-server/values.dev.yaml b/charts/services/identity-server/values.dev.yaml
@@ -121,6 +121,8 @@ secrets:
   AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+  Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+  Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
   FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
   IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/charts/services/identity-server/values.prod.yaml b/charts/services/identity-server/values.prod.yaml
@@ -120,6 +120,8 @@ secrets:
   AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+  Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+  Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
   FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
   IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/charts/services/identity-server/values.staging.yaml b/charts/services/identity-server/values.staging.yaml
@@ -121,6 +121,8 @@ secrets:
   AudkenniSettings__ClientSecret: '/k8s/identity-server/AudkenniClientSecret'
   CONFIGCAT_SDK_KEY: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   ContentfulSettings__AccessToken: '/k8s/identity-server/CONTENTFUL_ACCESS_TOKEN'
+  Datadog__RUM__ApplicationId: '/k8s/ids/DD_RUM_APPLICATION_ID'
+  Datadog__RUM__ClientToken: '/k8s/ids/DD_RUM_CLIENT_TOKEN'
   FeatureFlags__ConfigCatSdkKey: '/k8s/configcat/CONFIGCAT_SDK_KEY'
   IdentityServer__FakePersons: '/k8s/identity-server/FakePersons'
   IdentityServer__LicenseKey: '/k8s/identity-server/LicenseKey'

diff --git a/...notification/src/forms/WorkAccidentNotificationForm/InformationSection/projectPurchase.ts b/...notification/src/forms/WorkAccidentNotificationForm/InformationSection/projectPurchase.ts
@@ -16,14 +16,9 @@ export const projectPurchaseSection = buildSubSection({
   children: [
     buildMultiField({
       id: 'projectPurchase',
-      title: information.general.pageTitle,
-      description: information.general.description,
+      title: information.labels.projectPurchase.pageTitle,
+      description: information.labels.projectPurchase.pageDescription,
       children: [
-        buildDescriptionField({
-          id: 'projectPurchase.description',
-          title: information.labels.projectPurchase.descriptionField,
-          titleVariant: 'h5',
-        }),
         buildAlertMessageField({
           id: 'projectPurchase.alertMessage',
           title: '',

diff --git a/...dent-notification/src/forms/WorkAccidentNotificationForm/InformationSection/workhealth.ts b/...dent-notification/src/forms/WorkAccidentNotificationForm/InformationSection/workhealth.ts
@@ -13,8 +13,8 @@ export const workhealthSection = buildSubSection({
   children: [
     buildMultiField({
       id: 'workhealth',
-      title: information.general.pageTitle,
-      description: information.general.description,
+      title: information.labels.workhealth.pageTitle,
+      description: information.labels.workhealth.pageDescription,
       children: [
         buildDescriptionField({
           id: 'companyInformation.description',

diff --git a/libs/application/templates/aosh/work-accident-notification/src/lib/messages/information.ts b/libs/application/templates/aosh/work-accident-notification/src/lib/messages/information.ts
@@ -137,7 +137,7 @@ export const information = {
       },
       descriptionField: {
         id: 'aosh.wan.application:information.workhealth.descriptionField',
-        defaultMessage: 'Vinnuverndarstarf',
+        defaultMessage: 'Vinnuverndarstörf',
         description: 'H5 of workhealth information page',
       },
       errorAlert: {
@@ -147,6 +147,16 @@ export const information = {
         description:
           'error alert on workhealth information page when user attempt to navigate forwards without choosing an option',
       },
+      pageTitle: {
+        id: 'aosh.wan.application:information.workhealth.pageTitle',
+        defaultMessage: 'Vinnuvernd',
+        description: 'Title of workhealth information page',
+      },
+      pageDescription: {
+        id: 'aosh.wan.application:information.workhealth.pageDescription',
+        defaultMessage: 'Öryggis- og heilbrigðisstarfsemi fyrirtækisins.',
+        description: 'Description of workhealth information page',
+      },
     },
     projectPurchase: {
       sectionTitle: {
@@ -177,6 +187,16 @@ export const information = {
         defaultMessage: 'Nafn',
         description: 'Name, in project purchase section',
       },
+      pageTitle: {
+        id: 'aosh.wan.application:information.projectPurchase.pageTitle',
+        defaultMessage: 'Verkkaupi',
+        description: 'Title of project purchase information page',
+      },
+      pageDescription: {
+        id: 'aosh.wan.application:information.projectPurchase.pageDescription',
+        defaultMessage: 'Verkkaupi',
+        description: 'Description of project purchase information page',
+      },
     },
   },
 }