fix(service-portal): listid unsign (#16172)

* fix(service-portal): listid unsign * chore: nx format:write update dirty files * minor tweaks --------- Co-authored-by: andes-it <[email protected]>
island-is · Oct 2, 2024 · e77610a · e77610a
1 parent c70b7d6
commit e77610a
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 44 deletions.
diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -195,17 +195,17 @@ export const m = defineMessages({
   /* Hætta við söfnun modal */
   cancelCollectionButton: {
     id: 'dmin-portal.signature-collection:cancelCollectionButton',
-    defaultMessage: 'Hætta við söfnun meðmæla',
+    defaultMessage: 'Eyða lista',
     description: '',
   },
   cancelCollectionModalMessage: {
     id: 'dmin-portal.signature-collection:cancelCollectionModalMessage',
-    defaultMessage: 'Þú ert að fara að hætta við söfnun meðmæla. Ertu viss?',
+    defaultMessage: 'Þú ert að fara að eyða þessum lista. Ertu viss?',
     description: '',
   },
   cancelCollectionModalConfirmButton: {
     id: 'dmin-portal.signature-collection:modalConfirmButton',
-    defaultMessage: 'Já, hætta við',
+    defaultMessage: 'Já, eyða lista',
     description: '',
   },
   cancelCollectionModalCancelButton: {
@@ -215,12 +215,12 @@ export const m = defineMessages({
   },
   cancelCollectionModalToastError: {
     id: 'dmin-portal.signature-collection:modalToastError',
-    defaultMessage: 'Ekki tókst að hætta við söfnun meðmæla',
+    defaultMessage: 'Ekki tókst að eyða lista',
     description: '',
   },
   cancelCollectionModalToastSuccess: {
     id: 'dmin-portal.signature-collection:cancelCollectionModalToastSuccess',
-    defaultMessage: 'Tókst að hætta við söfnun meðmæla',
+    defaultMessage: 'Tókst að eyða lista',
     description: '',
   },
 
@@ -460,6 +460,11 @@ export const m = defineMessages({
     defaultMessage: 'Samtals fjöldi',
     description: '',
   },
+  totalListsPerConstituency: {
+    id: 'admin-portal.signature-collection:totalListsPerConstituency',
+    defaultMessage: 'Fjöldi lista: ',
+    description: '',
+  },
   nationalIdsSuccess: {
     id: 'admin-portal.signature-collection:nationalIdsSuccess',
     defaultMessage: 'Kennitölur sem tókst að hlaða upp',

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/index.tsx
@@ -23,7 +23,7 @@ const ParliamentaryRoot = () => {
   const { formatMessage } = useLocale()
 
   const navigate = useNavigate()
-  const { collection } = useLoaderData() as ListsLoaderReturn
+  const { collection, allLists } = useLoaderData() as ListsLoaderReturn
 
   return (
     <GridContainer>
@@ -82,7 +82,10 @@ const ParliamentaryRoot = () => {
             {collection?.areas.map((area) => (
               <ActionCard
                 key={area.id}
-                eyebrow={'Fjöldi lista: XXX'}
+                eyebrow={
+                  formatMessage(m.totalListsPerConstituency) +
+                  allLists.filter((l) => l.area.name === area.name).length
+                }
                 heading={area.name}
                 cta={{
                   label: formatMessage(m.viewConstituency),

diff --git a/libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx b/libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx
@@ -21,6 +21,9 @@ const SignedList = ({
   useNamespaces('sp.signatureCollection')
   const { formatMessage } = useLocale()
   const [modalIsOpen, setModalIsOpen] = useState(false)
+  const [listIdToUnsign, setListIdToUnsign] = useState<string | undefined>(
+    undefined,
+  )
 
   // SignedList is typically singular, although it may consist of multiple entries, which in that case will all be invalid
   const { signedLists, loadingSignedLists, refetchSignedLists } =
@@ -29,10 +32,7 @@ const SignedList = ({
   const [unSign, { loading }] = useMutation(unSignList, {
     variables: {
       input: {
-        listId:
-          signedLists && signedLists?.length === 1
-            ? signedLists[0].id
-            : undefined,
+        listId: listIdToUnsign,
       },
     },
   })
@@ -85,7 +85,10 @@ const SignedList = ({
                             variant: 'text',
                             colorScheme: 'destructive',
                           },
-                          onClick: () => setModalIsOpen(true),
+                          onClick: () => {
+                            setListIdToUnsign(list.id)
+                            setModalIsOpen(true)
+                          },
                           icon: undefined,
                         }
                       : undefined
@@ -120,41 +123,44 @@ const SignedList = ({
                       : undefined
                   }
                 />
-                <Modal
-                  id="unSignList"
-                  isVisible={modalIsOpen}
-                  toggleClose={false}
-                  initialVisibility={false}
-                  onCloseModal={() => setModalIsOpen(false)}
-                >
-                  <Box display="block" width="full">
-                    <Text variant="h2" marginTop={[5, 0]}>
-                      {formatMessage(m.unSignList)}
-                    </Text>
-                    <Text variant="default" marginTop={2}>
-                      {formatMessage(m.unSignModalMessage)}
-                    </Text>
-                    <Box
-                      marginTop={[7, 10]}
-                      marginBottom={5}
-                      display="flex"
-                      justifyContent="center"
-                    >
-                      <Button
-                        loading={loading}
-                        colorScheme="destructive"
-                        onClick={() => {
-                          onUnSignList()
-                        }}
-                      >
-                        {formatMessage(m.unSignModalConfirmButton)}
-                      </Button>
-                    </Box>
-                  </Box>
-                </Modal>
               </Box>
             )
           })}
+          <Modal
+            id="unSignList"
+            isVisible={modalIsOpen}
+            toggleClose={false}
+            initialVisibility={false}
+            onCloseModal={() => {
+              setListIdToUnsign(undefined)
+              setModalIsOpen(false)
+            }}
+          >
+            <Box display="block" width="full">
+              <Text variant="h2" marginTop={[5, 0]}>
+                {formatMessage(m.unSignList)}
+              </Text>
+              <Text variant="default" marginTop={2}>
+                {formatMessage(m.unSignModalMessage)}
+              </Text>
+              <Box
+                marginTop={[7, 10]}
+                marginBottom={5}
+                display="flex"
+                justifyContent="center"
+              >
+                <Button
+                  loading={loading}
+                  colorScheme="destructive"
+                  onClick={() => {
+                    onUnSignList()
+                  }}
+                >
+                  {formatMessage(m.unSignModalConfirmButton)}
+                </Button>
+              </Box>
+            </Box>
+          </Modal>
         </Box>
       )}
     </Box>