From ce57482b94f028c1659f7f855374509543e7b2b7 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 14:40:02 +0000
Subject: [PATCH 1/4] =?UTF-8?q?fix(admin):=20sc=20-=20lista=20l=C3=A6st=20?=
 =?UTF-8?q?tag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../signature-collection/src/lib/messages.ts  |   5 +
 .../Constituency/index.tsx                    | 143 +++++++++---------
 2 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/lib/messages.ts b/libs/portals/admin/signature-collection/src/lib/messages.ts
index f5ba0db59386..a90cbdaccbb1 100644
--- a/libs/portals/admin/signature-collection/src/lib/messages.ts
+++ b/libs/portals/admin/signature-collection/src/lib/messages.ts
@@ -485,6 +485,11 @@ export const m = defineMessages({
     defaultMessage: 'Læsa söfnun',
     description: '',
   },
+  listLocked: {
+    id: 'admin-portal.signature-collection:listLocked',
+    defaultMessage: 'Lista læst',
+    description: '',
+  },
   lockListDescription: {
     id: 'admin-portal.signature-collection:lockListDescription',
     defaultMessage:
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
index cc7ae4cd8152..56f84382f550 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/Constituency/index.tsx
@@ -153,86 +153,91 @@ export const Constituency = ({
                       },
                     }}
                     tag={
-                      !list.reviewed
-                        ? allowedToProcess
-                          ? {
-                              label: 'Cancel collection',
-                              renderTag: () => (
-                                <DialogPrompt
-                                  baseId="cancel_collection_dialog"
-                                  title={
-                                    formatMessage(m.cancelCollectionButton) +
-                                    ' - ' +
-                                    list.area?.name
-                                  }
-                                  description={
+                      allowedToProcess && list.active
+                        ? {
+                            label: 'Cancel collection',
+                            renderTag: () => (
+                              <DialogPrompt
+                                baseId="cancel_collection_dialog"
+                                title={
+                                  formatMessage(m.cancelCollectionButton) +
+                                  ' - ' +
+                                  list.area?.name
+                                }
+                                description={
+                                  candidatesListCount[list.candidate.id] === 1
+                                    ? formatMessage(
+                                        m.cancelCollectionModalMessageLastList,
+                                      )
+                                    : formatMessage(
+                                        m.cancelCollectionModalMessage,
+                                      )
+                                }
+                                ariaLabel="delete"
+                                disclosureElement={
+                                  <Tag outlined variant="red">
+                                    <Box display="flex" alignItems="center">
+                                      <Icon
+                                        icon="trash"
+                                        size="small"
+                                        type="outline"
+                                      />
+                                    </Box>
+                                  </Tag>
+                                }
+                                onConfirm={() => {
+                                  removeList({
+                                    variables: {
+                                      input: {
+                                        listId: list.id,
+                                      },
+                                    },
+                                  })
+
+                                  if (
                                     candidatesListCount[list.candidate.id] === 1
-                                      ? formatMessage(
-                                          m.cancelCollectionModalMessageLastList,
-                                        )
-                                      : formatMessage(
-                                          m.cancelCollectionModalMessage,
-                                        )
-                                  }
-                                  ariaLabel="delete"
-                                  disclosureElement={
-                                    <Tag outlined variant="red">
-                                      <Box display="flex" alignItems="center">
-                                        <Icon
-                                          icon="trash"
-                                          size="small"
-                                          type="outline"
-                                        />
-                                      </Box>
-                                    </Tag>
-                                  }
-                                  onConfirm={() => {
-                                    removeList({
+                                  ) {
+                                    removeCandidate({
                                       variables: {
                                         input: {
-                                          listId: list.id,
+                                          candidateId: list.candidate.id,
                                         },
                                       },
                                     })
-
-                                    if (
-                                      candidatesListCount[list.candidate.id] ===
-                                      1
-                                    ) {
-                                      removeCandidate({
-                                        variables: {
-                                          input: {
-                                            candidateId: list.candidate.id,
-                                          },
-                                        },
-                                      })
-                                    }
-                                  }}
-                                  buttonTextConfirm={
-                                    candidatesListCount[list.candidate.id] === 1
-                                      ? formatMessage(
-                                          m.cancelCollectionAndCandidateModalConfirmButton,
-                                        )
-                                      : formatMessage(
-                                          m.cancelCollectionModalConfirmButton,
-                                        )
                                   }
-                                  buttonPropsConfirm={{
-                                    variant: 'primary',
-                                    colorScheme: 'destructive',
-                                  }}
-                                  buttonTextCancel={formatMessage(
-                                    m.cancelCollectionModalCancelButton,
-                                  )}
-                                />
-                              ),
-                            }
-                          : undefined
-                        : {
+                                }}
+                                buttonTextConfirm={
+                                  candidatesListCount[list.candidate.id] === 1
+                                    ? formatMessage(
+                                        m.cancelCollectionAndCandidateModalConfirmButton,
+                                      )
+                                    : formatMessage(
+                                        m.cancelCollectionModalConfirmButton,
+                                      )
+                                }
+                                buttonPropsConfirm={{
+                                  variant: 'primary',
+                                  colorScheme: 'destructive',
+                                }}
+                                buttonTextCancel={formatMessage(
+                                  m.cancelCollectionModalCancelButton,
+                                )}
+                              />
+                            ),
+                          }
+                        : !list.active && !list.reviewed
+                        ? {
+                            label: formatMessage(m.listLocked),
+                            variant: 'blueberry',
+                            outlined: false,
+                          }
+                        : !list.active && list.reviewed
+                        ? {
                             label: formatMessage(m.confirmListReviewed),
                             variant: 'mint',
                             outlined: false,
                           }
+                        : undefined
                     }
                   />
                 ))}

From 2bc81b83d21bce60c52a6c8d4172551b7826b144 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 15:05:02 +0000
Subject: [PATCH 2/4] extend deadline

---
 .../src/screens-parliamentary/List/index.tsx           | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 48c8d6d1969e..0e684c0947d0 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -92,14 +92,12 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
           <ActionExtendDeadline
             listId={list.id}
             endTime={list.endTime}
-            allowedToProcess={
-              allowedToProcess && listStatus === ListStatus.Extendable
-            }
+            allowedToProcess={allowedToProcess}
           />
-          {(allowedToProcess && !list.active) ||
-            (!allowedToProcess && (
+          {(allowedToProcess && !list.active ||
+            !allowedToProcess) && (
               <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
-            ))}
+            )}
           {allowedToProcess && (
             <Box>
               {!list.active && <PaperSignees listId={list.id} />}

From a69224079c101905a1d169f357dc098bb9042799 Mon Sep 17 00:00:00 2001
From: andes-it <builders@andes.is>
Date: Mon, 21 Oct 2024 15:09:35 +0000
Subject: [PATCH 3/4] chore: nx format:write update dirty files

---
 .../src/screens-parliamentary/List/index.tsx               | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 0e684c0947d0..696fa64fa75d 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -94,10 +94,9 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
             endTime={list.endTime}
             allowedToProcess={allowedToProcess}
           />
-          {(allowedToProcess && !list.active ||
-            !allowedToProcess) && (
-              <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
-            )}
+          {((allowedToProcess && !list.active) || !allowedToProcess) && (
+            <Signees numberOfSignatures={list.numberOfSignatures ?? 0} />
+          )}
           {allowedToProcess && (
             <Box>
               {!list.active && <PaperSignees listId={list.id} />}

From 2aa38eac8aaf4b4d7d9a2da7810926ea579cf617 Mon Sep 17 00:00:00 2001
From: albina <albina@kosmosogkaos.is>
Date: Mon, 21 Oct 2024 15:38:15 +0000
Subject: [PATCH 4/4] back

---
 .../src/screens-parliamentary/List/index.tsx                  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
index 0e684c0947d0..1d83a08a2c39 100644
--- a/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
+++ b/libs/portals/admin/signature-collection/src/screens-parliamentary/List/index.tsx
@@ -92,7 +92,9 @@ const List = ({ allowedToProcess }: { allowedToProcess: boolean }) => {
           <ActionExtendDeadline
             listId={list.id}
             endTime={list.endTime}
-            allowedToProcess={allowedToProcess}
+            allowedToProcess={
+              allowedToProcess && listStatus === ListStatus.Extendable
+            }
           />
           {(allowedToProcess && !list.active ||
             !allowedToProcess) && (