Merge branch 'main' into j-s/withdraw-case

island-is · Oct 23, 2024 · 8735126 · 8735126
2 parents fdda7fb + a84ba44
commit 8735126
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 26 deletions.
diff --git a/libs/api/domains/documents/src/lib/documentV2.service.ts b/libs/api/domains/documents/src/lib/documentV2.service.ts
@@ -128,6 +128,12 @@ export class DocumentServiceV2 {
     const actions = document.actions?.filter(
       (action) => action.type !== 'alert' && action.type !== 'confirmation',
     )
+    if (document.urgent)
+      this.logger.info('Urgent document fetched', {
+        documentId: documentId,
+        includeDocument,
+      })
+
     return {
       ...document,
       publicationDate: document.date,
@@ -484,7 +490,7 @@ export class DocumentServiceV2 {
 
     // we return the document even if the actions are faulty, logged for tracability
     if (hasEmpty) {
-      this.logger.warn('No title or data in actions array', {
+      this.logger.info('No title or data in actions array, return undefined', {
         category: LOG_CATEGORY,
         id,
       })
@@ -511,6 +517,8 @@ export class DocumentServiceV2 {
       }
     })
 
+    // Log the actions to ensure that they are mapped correctly
+    this.logger.info('Actions mapped successfully', { actions: mapped })
     return mapped
   }
 }
diff --git a/libs/api/domains/law-and-order/src/lib/law-and-order.resolver.ts b/libs/api/domains/law-and-order/src/lib/law-and-order.resolver.ts
@@ -95,7 +95,12 @@ export class LawAndOrderResolver {
     @Args('locale', { type: () => String, nullable: true })
     locale: Locale = 'is',
   ) {
-    return this.lawAndOrderService.getLawyers(user, locale)
+    return this.auditAndHandle(
+      'getLawyers',
+      'lawyers',
+      this.lawAndOrderService.getLawyers(user, locale),
+      user,
+    )
   }
 
   @Mutation(() => DefenseChoice, {

diff --git a/libs/portals/admin/ids-admin/src/screens/Permission/components/PermissionAccessControl.tsx b/libs/portals/admin/ids-admin/src/screens/Permission/components/PermissionAccessControl.tsx
@@ -9,6 +9,7 @@ import { m } from '../../../lib/messages'
 import { PermissionFormTypes } from '../EditPermission.schema'
 import { useEnvironmentState } from '../../../hooks/useEnvironmentState'
 import { checkEnvironmentsSync } from '../../../utils/checkEnvironmentsSync'
+import { useSuperAdmin } from '../../../hooks/useSuperAdmin'
 
 const commonProps: Pick<CheckboxProps, 'backgroundColor' | 'large' | 'value'> =
   {
@@ -20,6 +21,7 @@ const commonProps: Pick<CheckboxProps, 'backgroundColor' | 'large' | 'value'> =
 export const PermissionAccessControl = () => {
   const { formatMessage } = useLocale()
   const { selectedPermission, permission } = usePermission()
+  const { isSuperAdmin } = useSuperAdmin()
   const { isAccessControlled, grantToAuthenticatedUser } = selectedPermission
 
   const [inputValues, setInputValues] = useEnvironmentState<{
@@ -40,19 +42,21 @@ export const PermissionAccessControl = () => {
       ])}
     >
       <Stack space={3}>
-        <Checkbox
-          label={formatMessage(m.isAccessControlled)}
-          subLabel={formatMessage(m.isAccessControlledDescription)}
-          name="isAccessControlled"
-          checked={inputValues.isAccessControlled}
-          onChange={(e) => {
-            setInputValues({
-              ...inputValues,
-              isAccessControlled: e.target.checked,
-            })
-          }}
-          {...commonProps}
-        />
+        {isSuperAdmin && (
+          <Checkbox
+            label={formatMessage(m.isAccessControlled)}
+            subLabel={formatMessage(m.isAccessControlledDescription)}
+            name="isAccessControlled"
+            checked={inputValues.isAccessControlled}
+            onChange={(e) => {
+              setInputValues({
+                ...inputValues,
+                isAccessControlled: e.target.checked,
+              })
+            }}
+            {...commonProps}
+          />
+        )}
         <Checkbox
           label={formatMessage(m.grantToAuthenticatedUser)}
           subLabel={formatMessage(m.grantToAuthenticatedUserDescription)}

diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -501,6 +501,11 @@ export const m = defineMessages({
     defaultMessage: 'Úrvinnslu lokið',
     description: '',
   },
+  toggleReviewSuccessToggleBack: {
+    id: 'admin-portal.signature-collection:toggleReviewSuccessToggleBack',
+    defaultMessage: 'Tókst að opna fyrir úrvinnslu',
+    description: '',
+  },
   lockList: {
     id: 'admin-portal.signature-collection:lockList',
     defaultMessage: 'Læsa söfnun',
@@ -754,6 +759,11 @@ export const m = defineMessages({
     defaultMessage: 'Ekki tókst að skrá meðmæli',
     description: '',
   },
+  paperSigneeErrorAlreadySigned: {
+    id: 'admin-portal.signature-collection:paperSigneeErrorAlreadySigned',
+    defaultMessage: 'Kennitala er þegar á lista',
+    description: '',
+  },
 })
 
 export const createCollectionErrorMessages = defineMessages({

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -131,13 +131,10 @@ export const Constituency = ({
                     ': ' +
                     constituencyLists.length}
                 </Text>
-                {allowedToProcess &&
-                  collectionStatus === CollectionStatus.InInitialReview && (
-                    <CreateCollection
-                      collectionId={collection?.id}
-                      areaId={areaId}
-                    />
-                  )}
+                <CreateCollection
+                  collectionId={collection?.id}
+                  areaId={areaId}
+                />
               </Box>
               <Stack space={3}>
                 {constituencyLists.map((list) => (

diff --git a/.../portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx b/.../portals/admin/signature-collection/src/screens-parliamentary/List/paperSignees/index.tsx
@@ -75,7 +75,13 @@ export const PaperSignees = ({ listId }: { listId: string }) => {
         if (res.signatureCollectionAdminUploadPaperSignature?.success) {
           toast.success(formatMessage(m.paperSigneeSuccess))
         } else {
-          toast.error(formatMessage(m.paperSigneeError))
+          if (
+            res.signatureCollectionAdminUploadPaperSignature?.reasons?.includes(
+              'alreadySigned',
+            )
+          ) {
+            toast.error(formatMessage(m.paperSigneeErrorAlreadySigned))
+          }
         }
         reset()
         revalidate()

diff --git a/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx b/libs/portals/admin/signature-collection/src/shared-components/completeReview/index.tsx
@@ -35,7 +35,11 @@ const ActionReviewComplete = ({
     onCompleted: () => {
       setModalSubmitReviewIsOpen(false)
       revalidate()
-      toast.success(formatMessage(m.toggleReviewSuccess))
+      toast.success(
+        listReviewed
+          ? formatMessage(m.toggleReviewSuccessToggleBack)
+          : formatMessage(m.toggleReviewSuccess),
+      )
     },
     onError: () => {
       toast.error(formatMessage(m.toggleReviewError))

diff --git a/libs/service-portal/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx b/libs/service-portal/law-and-order/src/components/DefenderChoices/DefenderChoices.tsx
@@ -186,7 +186,7 @@ const DefenderChoices: FC<React.PropsWithChildren<Props>> = ({
                     </>
                   ))}
 
-                  {!popUp && (
+                  {!popUp && !error && (
                     <Button
                       type="submit"
                       size="small"
@@ -201,7 +201,7 @@ const DefenderChoices: FC<React.PropsWithChildren<Props>> = ({
                       )}
                     </Button>
                   )}
-                  {popUp && (
+                  {popUp && !error && (
                     <Box
                       display="flex"
                       flexDirection="row"