From 4777f05589bc9a22e405deb5bc033a2d67870231 Mon Sep 17 00:00:00 2001 From: unakb Date: Thu, 9 Jan 2025 12:32:05 +0000 Subject: [PATCH 1/5] chore(j-s): Pause delivery of subpoena revocation to police (#17456) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../src/app/modules/case/case.service.ts | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 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 index d266510204bb..c7fd79cf6e56 100644 --- 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) } From a850954741edd3ea16c0f1dcd9b3e11e92e84022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=B3rhildur=20Thorleiksd=C3=B3ttir?= <16031078+thorhildurt@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:19:52 +0000 Subject: [PATCH 2/5] fix(j-s): slow down the execution of js playwright tests (#17438) * fix(j-s): temp * fix(j-s): slow down the execution of js playwright tests to debug flakiness * fix(j-s): clean up debugging * fix(j-s): clean up debugging * fix(j-s): reduce the time between actions --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../routes/Prosecutor/Indictments/Processing/Processing.tsx | 2 ++ apps/system-e2e/src/playwright.config.ts | 6 ++++++ 2 files changed, 8 insertions(+) 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 index 0f97829eff43..caacd6e956df 100644 --- 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/system-e2e/src/playwright.config.ts b/apps/system-e2e/src/playwright.config.ts index d5ed49563ac1..bc6e8583b290 100644 --- 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' }, From 24ad26257ed9eb931cd7e67d0e73f1f5d726de95 Mon Sep 17 00:00:00 2001 From: valurefugl <65780958+valurefugl@users.noreply.github.com> Date: Thu, 9 Jan 2025 13:26:46 +0000 Subject: [PATCH 3/5] chore(ids-api): Add secrets for dd rum applicationid and clienttoken. (#17455) Co-authored-by: Valur Einarsson Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- apps/services/auth/ids-api/infra/identity-server.ts | 2 ++ charts/identity-server/values.dev.yaml | 2 ++ charts/identity-server/values.prod.yaml | 2 ++ charts/identity-server/values.staging.yaml | 2 ++ charts/services/identity-server/values.dev.yaml | 2 ++ charts/services/identity-server/values.prod.yaml | 2 ++ charts/services/identity-server/values.staging.yaml | 2 ++ 7 files changed, 14 insertions(+) diff --git a/apps/services/auth/ids-api/infra/identity-server.ts b/apps/services/auth/ids-api/infra/identity-server.ts index 60fe5358f7b4..e1c05992349a 100644 --- 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/charts/identity-server/values.dev.yaml b/charts/identity-server/values.dev.yaml index 47834b587715..c8b6114073eb 100644 --- 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 index a350ead4e04b..4afdbea21e49 100644 --- 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 index 7f6ac4dcf3fb..8a562b0d31ef 100644 --- 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 index 50d9763ee45a..b456e249c963 100644 --- 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 index 7daf65fea874..1f114ce45932 100644 --- 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 index ebe78fbb22a2..63cfea7f55af 100644 --- 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' From cbe89fc7a40f746d79cfdcf50c00fcd0f2450c72 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Baldur=20=C3=93li?= Date: Thu, 9 Jan 2025 13:55:38 +0000 Subject: [PATCH 4/5] fix(application-system): Adding/removing contentful messages (#17460) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../InformationSection/projectPurchase.ts | 9 ++------ .../InformationSection/workhealth.ts | 4 ++-- .../src/lib/messages/information.ts | 22 ++++++++++++++++++- 3 files changed, 25 insertions(+), 10 deletions(-) diff --git a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/projectPurchase.ts b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/projectPurchase.ts index 40d63a20abce..e0f900579f73 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/projectPurchase.ts +++ b/libs/application/templates/aosh/work-accident-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/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/workhealth.ts b/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/workhealth.ts index 66a4b8014d1c..ce7d328a5391 100644 --- a/libs/application/templates/aosh/work-accident-notification/src/forms/WorkAccidentNotificationForm/InformationSection/workhealth.ts +++ b/libs/application/templates/aosh/work-accident-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 index f8e92b4b6986..4640300722be 100644 --- 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', + }, }, }, } From af80723172224731af83ee5ad1888ccbf2ccc719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BAnar=20Vestmann?= <43557895+RunarVestmann@users.noreply.github.com> Date: Thu, 9 Jan 2025 14:48:42 +0000 Subject: [PATCH 5/5] feat(web): Boost.ai - Set language depending on activeLocale (#17461) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../ChatPanel/BoostChatPanel/BoostChatPanel.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/apps/web/components/ChatPanel/BoostChatPanel/BoostChatPanel.tsx b/apps/web/components/ChatPanel/BoostChatPanel/BoostChatPanel.tsx index bc0d8a2f0d58..8f8ca09140a7 100644 --- 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(GET_NAMESPACE_QUERY, { variables: { @@ -102,7 +105,12 @@ export const BoostChatPanel: React.FC< return ( window.boost.chatPanel.show()} + onClick={() => { + window.boost.chatPanel.setStartLanguage( + activeLocale === 'en' ? 'en-US' : 'is-IS', + ) + window.boost.chatPanel.show() + }} isVisible={showButton} pushUp={pushUp} />