fix(application-plc): Various fixes 16.10

libs/application/template-api-modules/src/lib/modules/templates/signature-collection/parliamentary-list-creation/parliamentary-list-creation.service.ts

@@ -7,7 +7,6 @@ import {
   Collection,
   CreateParliamentaryCandidacyInput,
   MandateType,
-  ReasonKey,
   SignatureCollectionClientService,
 } from '@island.is/clients/signature-collection'
 import { errorMessages } from '@island.is/application/templates/signature-collection/parliamentary-list-creation'
@@ -53,13 +52,11 @@ export class ParliamentaryListCreationService extends BaseTemplateApiService {
         405,
       )
     }
-    const contactNationalId = isCompany(auth.nationalId)
-      ? auth.actor?.nationalId ?? auth.nationalId
-      : auth.nationalId
+    // Candidates are stored on user national id never the actors so should be able to check just the auth national id
 
     if (
       currentCollection.candidates.some(
-        (c) => c.nationalId.replace('-', '') === contactNationalId,
+        (c) => c.nationalId.replace('-', '') === auth.nationalId,
       )
     ) {
       throw new TemplateApiError(errorMessages.alreadyCandidate, 412)

libs/application/templates/signature-collection/parliamentary-list-creation/src/dataProviders/index.ts

@@ -2,12 +2,15 @@ import { defineTemplateApi } from '@island.is/application/types'
 
 export const CandidateApi = defineTemplateApi({
   action: 'candidate',
+  order: 0,
 })
 
 export const ParliamentaryCollectionApi = defineTemplateApi({
   action: 'parliamentaryCollection',
+  order: 1,
 })
 
 export const ParliamentaryIdentityApi = defineTemplateApi({
   action: 'parliamentaryIdentity',
+  order: 2,
 })

libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Draft.ts

@@ -278,17 +278,17 @@ export const Draft: Form = buildForm({
               doesNotRequireAnswer: true,
               title: '',
               items: ({ answers }) => {
-                return (answers.constituency as string[]).map((c: string) => ({
-                  heading:
-                    getValueViaPath(answers, 'list.name') +
-                    ' - ' +
-                    c.split('|')[1],
-                  progressMeter: {
-                    currentProgress: 0,
-                    maxProgress: 350,
-                    withLabel: true,
-                  },
-                }))
+                return (answers.constituency as string[]).map(
+                  (constituency: string) => ({
+                    heading: constituency.split('|')[1],
+                    eyebrow: getValueViaPath(answers, 'list.name'),
+                    progressMeter: {
+                      currentProgress: 0,
+                      maxProgress: 350,
+                      withLabel: true,
+                    },
+                  }),
+                )
               },
             }),
             buildSubmitField({

libs/application/templates/signature-collection/parliamentary-list-creation/src/forms/Prerequisites.ts

@@ -11,7 +11,6 @@ import {
   DefaultEvents,
   Form,
   FormModes,
-  NationalRegistryUserApi,
   UserProfileApi,
 } from '@island.is/application/types'
 
@@ -105,11 +104,6 @@ export const Prerequisites: Form = buildForm({
       title: m.constituency,
       children: [],
     }),
-    buildSection({
-      id: 'screen5',
-      title: m.managersAndSupervisors,
-      children: [],
-    }),
     buildSection({
       id: 'screen6',
       title: m.overview,

libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/errors.ts

@@ -34,7 +34,8 @@ export const errorMessages = {
     },
     summary: {
       id: 'plc.application:error.alreadyCandidate.summary',
-      defaultMessage: 'Þú ert nú þegar með framboð',
+      defaultMessage:
+        'Þú ert nú þegar með framboð. Þú getur nálgast nánari upplýsingar um þína meðmælasöfnun á Mínum Síðum.',
       description: '',
     },
   }),

libs/application/templates/signature-collection/parliamentary-list-creation/src/lib/messages.ts

@@ -169,52 +169,6 @@ export const m = defineMessages({
     description: '',
   },
 
-  /* Ábyrgðaraðilar */
-  managersAndSupervisors: {
-    id: 'plc.application:managersAndSupervisors',
-    defaultMessage: 'Ábyrgðar-/umsjónaraðilar',
-    description: '',
-  },
-  managersAndSupervisorsTitle: {
-    id: 'plc.application:managersAndSupervisorsTitle',
-    defaultMessage: 'Veljið ábyrgðar- og umsjónaraðila',
-    description: '',
-  },
-  managers: {
-    id: 'plc.application:managers',
-    defaultMessage: 'Ábyrgðaraðilar',
-    description: '',
-  },
-  managersDescription: {
-    id: 'plc.application:managersDescription',
-    defaultMessage:
-      'Ábyrgðaraðili hefur aðgang að söfnunum í öllum kjördæmum og getur bætt við og eytt umsjónaraðilum. Ábyrgðaraðili getur slegið inn kennitölur meðmælenda af blaði í viðeigandi kjördæmum.',
-    description: '',
-  },
-  addManager: {
-    id: 'plc.application:addManager',
-    defaultMessage: 'Bæta við ábyrgðaraðila',
-    description: '',
-  },
-
-  /* Umsjónaraðilar */
-  supervisors: {
-    id: 'plc.application:supervisors',
-    defaultMessage: 'Umsjónaraðilar',
-    description: '',
-  },
-  supervisorsDescription: {
-    id: 'plc.application:supervisorsDescription',
-    defaultMessage:
-      'Umsjónaraðili sér aðeins þau kjördæmi sem honum hefur verið úthlutað og getur slegið inn kennitölur meðmælenda af blaði í þeim kjördæmum.',
-    description: '',
-  },
-  addSupervisor: {
-    id: 'plc.application:addSupervisor',
-    defaultMessage: 'Bæta við umsjónaraðila',
-    description: '',
-  },
-
   /* Yfirlit */
   overview: {
     id: 'plc.application:overview',
@@ -238,7 +192,7 @@ export const m = defineMessages({
     description: '',
   },
   listsOverviewHeader: {
-    id: 'plc.application:listOverviewHeader',
+    id: 'plc.application:listsOverviewHeader',
     defaultMessage: 'Upplýsingar um meðmælalista',
     description: '',
   },
@@ -305,7 +259,7 @@ export const m = defineMessages({
 
   /* Action Card logs */
   logListCreated: {
-    id: 'plc.application:listCreated',
+    id: 'plc.application:logListCreated',
     defaultMessage: 'Meðmælalisti stofnaður',
     description: '',
   },

libs/application/templates/signature-collection/parliamentary-list-signing/src/lib/errors.ts

@@ -3,121 +3,121 @@ import { defineMessages } from 'react-intl'
 export const errorMessages = {
   age: defineMessages({
     title: {
-      id: 'sls.application:error.age.title',
+      id: 'pls.application:error.age.title',
       defaultMessage: 'Aldur uppfyllir ekki skilyrði',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.age.summary',
+      id: 'pls.application:error.age.summary',
       defaultMessage: '18 ára aldursmark er ekki náð',
       description: '',
     },
   }),
   citizenship: defineMessages({
     title: {
-      id: 'sls.application:error.citizenship.title',
+      id: 'pls.application:error.citizenship.title',
       defaultMessage: 'Ekki með íslenskt ríkisfang',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.citizenship.summary',
+      id: 'pls.application:error.citizenship.summary',
       defaultMessage: 'Þú þarft að vera með íslenskt ríkisfang',
       description: '',
     },
   }),
   areaId: defineMessages({
     title: {
-      id: 'sls.application:error.areaId.title',
+      id: 'pls.application:error.areaId.title',
       defaultMessage: 'Ekki með kjördæmi skráð',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.areaId.summary',
+      id: 'pls.application:error.areaId.summary',
       defaultMessage:
         'Hægt er að hafa samband við Þjóðskrá fyrir nánari upplýsingar.',
       description: '',
     },
   }),
   residency: defineMessages({
     title: {
-      id: 'sls.application:error.residency.title',
+      id: 'pls.application:error.residency.title',
       defaultMessage: 'Ekki með búsetu á Íslandi',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.residency.summary',
+      id: 'pls.application:error.residency.summary',
       defaultMessage: 'Skilyrði um búsetu á Íslandi eru ekki uppfyllt',
       description: '',
     },
   }),
   active: defineMessages({
     title: {
-      id: 'sls.application:error.active.title',
+      id: 'pls.application:error.active.title',
       defaultMessage: 'Ekki er hægt að mæla með framboði.',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.active.summary',
+      id: 'pls.application:error.active.summary',
       defaultMessage: 'Framboð er ekki með virka meðmælasöfnun í þínu kjördæmi',
       description: '',
     },
   }),
   invalidSignature: defineMessages({
     title: {
-      id: 'sls.application:error.invalidSignature.title',
+      id: 'pls.application:error.invalidSignature.title',
       defaultMessage: 'Undirskrift til staðar í kerfi',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.acinvalidSignatureive.summary',
+      id: 'pls.application:error.invalidSignatureive.summary',
       defaultMessage: 'Nánari upplýsingar á mínum síðum.',
       description: '',
     },
   }),
   signer: defineMessages({
     title: {
-      id: 'sls.application:error.signer.title',
+      id: 'pls.application:error.signer.title',
       defaultMessage: 'Þú hefur nú þegar skrifað undir lista í þessari söfnun',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.signer.summary#markdown',
+      id: 'pls.application:error.signer.summary#markdown',
       defaultMessage: 'Hægt er að draga meðmæli tilbaka inni á Mínum Síðum.',
       description: '',
     },
   }),
   deniedByService: defineMessages({
     title: {
-      id: 'sls.application:error.deniedByService.title',
+      id: 'pls.application:error.deniedByService.title',
       defaultMessage: 'Eitthvað fór úrskeiðis',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.deniedByService.summary',
+      id: 'pls.application:error.deniedByService.summary',
       defaultMessage: 'Ekki er hægt að mæla með framboði.',
       description: '',
     },
   }),
   maxReached: defineMessages({
     title: {
-      id: 'sls.application:error.maxReached.title',
+      id: 'pls.application:error.maxReached.title',
       defaultMessage: 'Framboð hefur náð hámarksfjölda meðmæla.',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.maxReached.summary',
+      id: 'pls.application:error.maxReached.summary',
       defaultMessage: 'Ekki er lengur hægt að mæla með þessu framboði.',
       description: '',
     },
   }),
   submitFailure: defineMessages({
     title: {
-      id: 'sls.application:error.submitFailure.title',
+      id: 'pls.application:error.submitFailure.title',
       defaultMessage: 'Eitthvað fór úrskeiðis',
       description: '',
     },
     summary: {
-      id: 'sls.application:error.submitFailure.summary',
+      id: 'pls.application:error.submitFailure.summary',
       defaultMessage: 'Tókst ekki að skrá meðmæli.',
       description: '',
     },

libs/application/types/src/lib/Fields.ts

@@ -563,6 +563,7 @@ export type ActionCardListField = BaseField & {
 export type ApplicationActionCardProps = Modify<
   ActionCardProps,
   {
+    eyebrow?: string
     heading?: FormText
     text?: FormText
     tag?: Modify<ActionCardProps['tag'], { label: FormText }>

libs/clients/signature-collection/src/lib/signature-collection.service.ts

@@ -360,9 +360,21 @@ export class SignatureCollectionClientService {
         }),
       ),
     )
+    // If no lists remain remove Candidate so that they can start a new collection through applications again
+    await this.checkIfRemoveCandidate(candidate.id, auth)
+
     return { success: true }
   }
 
+  private async checkIfRemoveCandidate(id: string, auth: User) {
+    const { ownedLists, candidate } = await this.getSignee(auth)
+    if ((!ownedLists || ownedLists.length === 0) && candidate?.id) {
+      await this.getApiWithAuth(this.candidateApi, auth).frambodIDDelete({
+        iD: parseInt(id),
+      })
+    }
+  }
+
   async getSignedList(auth: User): Promise<SignedList[] | null> {
     const { signatures } = await this.getSignee(auth)
     const { endTime, isPresidential } = await this.currentCollection()
@@ -404,7 +416,7 @@ export class SignatureCollectionClientService {
   }: CanSignInput): Promise<Success> {
     // User is not allowed to have more than one signature
     // They are marked as invalid but count as participation
-    const noInvalidSignature = !signatures?.find((s) => !s.valid) ?? true
+    const noInvalidSignature = !signatures?.find((s) => !s.valid)
 
     const reasons = mapReasons({
       ...canSignInfo,

libs/service-portal/signature-collection/src/screens/Parliamentary/OwnerView/index.tsx

@@ -30,6 +30,7 @@ import { useMutation } from '@apollo/client'
 import { cancelCollectionMutation } from '../../../hooks/graphql/mutations'
 import copyToClipboard from 'copy-to-clipboard'
 import { formatNationalId } from '@island.is/portals/core'
+import SignedList from '../../shared/SignedList'
 
 const OwnerView = ({
   currentCollection,
@@ -74,6 +75,9 @@ const OwnerView = ({
   return (
     <Stack space={8}>
       <Box marginTop={5}>
+        <Box marginBottom={8}>
+          <SignedList currentCollection={currentCollection} />
+        </Box>
         <Box display="flex" justifyContent="spaceBetween" alignItems="baseline">
           <Text variant="h4">
             {formatMessage(m.myListsDescription) + ' '}

libs/service-portal/signature-collection/src/screens/shared/SignedList/index.tsx

@@ -12,6 +12,7 @@ import {
   SignatureCollectionSignedList,
   SignatureCollectionSuccess,
 } from '@island.is/api/schema'
+import { SingleListSkeleton } from '../../../skeletons'
 
 const SignedList = ({
   currentCollection,
@@ -61,6 +62,11 @@ const SignedList = ({
 
   return (
     <Box>
+      {loadingSignedLists && (
+        <Box marginTop={10}>
+          <SingleListSkeleton />
+        </Box>
+      )}
       {!loadingSignedLists && !!signedLists?.length && (
         <Box marginTop={[5, 7]}>
           <Text marginBottom={2} variant="h4">
@@ -110,6 +116,7 @@ const SignedList = ({
                       ? {
                           label:
                             formatMessage(m.digitalSignature) +
+                            ' ' +
                             format(new Date(list.signedDate), 'dd.MM.yyyy'),
                           variant: 'blueberry',
                           outlined: true,