From a2d6db813ac9fab8d5090b836f4b37a5d4e020c2 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 11:24:26 +0000 Subject: [PATCH 1/3] feat(web): Add custom top login button item to VMST "My Pages" page (#17453) Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../screens/Organization/DirectorateOfLabour/MyPages.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx index 997f62bffed9..16ca9a41f236 100644 --- a/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx +++ b/apps/web/screens/Organization/DirectorateOfLabour/MyPages.tsx @@ -26,6 +26,7 @@ import { useNamespace } from '@island.is/web/hooks' import { useI18n } from '@island.is/web/i18n' import { withMainLayout } from '@island.is/web/layouts/main' import { CustomNextError } from '@island.is/web/units/errors' +import { extractNamespaceFromOrganization } from '@island.is/web/utils/extractNamespaceFromOrganization' import { getOrganizationSidebarNavigationItems } from '@island.is/web/utils/organization' import { webRichText } from '@island.is/web/utils/richText' @@ -159,9 +160,14 @@ MyPages.getProps = async ({ apolloClient, locale }) => { throw new CustomNextError(404, 'Organization page not found') } + const organizationNamespace = extractNamespaceFromOrganization( + getOrganizationPage.organization, + ) + return { organizationPage: getOrganizationPage, namespace, + customTopLoginButtonItem: organizationNamespace?.customTopLoginButtonItem, } } From 4777f05589bc9a22e405deb5bc033a2d67870231 Mon Sep 17 00:00:00 2001 From: unakb Date: Thu, 9 Jan 2025 12:32:05 +0000 Subject: [PATCH 2/3] 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 3/3] 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' },