Merge branch 'main' into ids-api/add-rum-secrets

island-is · Jan 9, 2025 · 11cbe72 · 11cbe72
2 parents 70a07cd + a850954
commit 11cbe72
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 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
@@ -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/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/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,
   }
 }