fix(signature-collection): Get candidate collectors

libs/api/domains/signature-collection/src/lib/signatureCollection.resolver.ts

@@ -34,6 +34,8 @@ import { SignatureCollectionCanSignFromPaperInput } from './dto/canSignFromPaper
 import { SignatureCollectionAddListsInput } from './dto/addLists.input'
 import { SignatureCollectionListBulkUploadInput } from './dto/bulkUpload.input'
 import { SignatureCollectionUploadPaperSignatureInput } from './dto/uploadPaperSignature.input'
+import { SignatureCollectionCollector } from './models/collector.model'
+import { SignatureCollectionCandidateIdInput } from './dto/candidateId.input'
 @UseGuards(IdsUserGuard, ScopesGuard, UserAccessGuard)
 @Resolver()
 @Audit({ namespace: '@island.is/api/signature-collection' })
@@ -186,4 +188,18 @@ export class SignatureCollectionResolver {
       user,
     )
   }
+
+  @Scopes(ApiScope.signatureCollection)
+  @AccessRequirement(OwnerAccess.AllowActor)
+  @Query(() => [SignatureCollectionCollector])
+  @Audit()
+  async signatureCollectionCollectors(
+    @CurrentUser() user: User,
+    @CurrentSignee() signee: SignatureCollectionSignee,
+  ): Promise<SignatureCollectionCollector[]> {
+    return this.signatureCollectionService.collectors(
+      user,
+      signee.candidate?.id,
+    )
+  }
 }

libs/api/domains/signature-collection/src/lib/signatureCollection.service.ts

@@ -19,6 +19,8 @@ import { SignatureCollectionOwnerInput } from './dto/owner.input'
 import { SignatureCollectionListBulkUploadInput } from './dto/bulkUpload.input'
 import { SignatureCollectionUploadPaperSignatureInput } from './dto/uploadPaperSignature.input'
 import { SignatureCollectionCanSignFromPaperInput } from './dto/canSignFromPaper.input'
+import { SignatureCollectionCandidateIdInput } from './dto/candidateId.input'
+import { SignatureCollectionCollector } from './models/collector.model'
 
 @Injectable()
 export class SignatureCollectionService {
@@ -161,4 +163,17 @@ export class SignatureCollectionService {
 
     return canSign && list.area.id === signee.area?.id
   }
+
+  async collectors(
+    user: User,
+    candidateId: string | undefined,
+  ): Promise<SignatureCollectionCollector[]> {
+    if (!candidateId) {
+      return []
+    }
+    return await this.signatureCollectionClientService.getCollectors(
+      user,
+      candidateId,
+    )
+  }
 }

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

@@ -524,4 +524,23 @@ export class SignatureCollectionClientService {
     }
     return { success: true }
   }
+
+  async getCollectors(
+    auth: User,
+    candidateId: string,
+  ): Promise<{ name: string; nationalId: string }[]> {
+    const candidate = await this.getApiWithAuth(
+      this.candidateApi,
+      auth,
+    ).frambodIDGet({
+      iD: parseInt(candidateId),
+    })
+
+    return (
+      candidate.umbodList?.map((u) => ({
+        name: u.nafn ?? '',
+        nationalId: u.kennitala ?? '',
+      })) ?? []
+    )
+  }
 }

libs/service-portal/signature-collection/src/hooks/graphql/queries.ts

@@ -163,3 +163,12 @@ export const GetCanSign = gql`
     signatureCollectionCanSignFromPaper(input: $input)
   }
 `
+
+export const GetCollectors = gql`
+  query SignatureCollectionCollectors {
+    signatureCollectionCollectors {
+      nationalId
+      name
+    }
+  }
+`

libs/service-portal/signature-collection/src/hooks/index.ts

@@ -8,6 +8,7 @@ import {
   GetListsForOwner,
   GetCurrentCollection,
   GetCanSign,
+  GetCollectors,
 } from './graphql/queries'
 import {
   SignatureCollectionListBase,
@@ -16,6 +17,7 @@ import {
   SignatureCollectionSuccess,
   SignatureCollection,
   SignatureCollectionSignedList,
+  SignatureCollectionCollector,
 } from '@island.is/api/schema'
 
 export const useGetSignatureList = (listId: string) => {
@@ -169,3 +171,12 @@ export const useGetCanSign = (
   const canSign = getCanSignData?.signatureCollectionCanSignFromPaper ?? false
   return { canSign, loadingCanSign }
 }
+
+export const useGetCollectors = () => {
+  const { data: getCollectorsData, loading: loadingCollectors } =
+    useQuery(GetCollectors)
+  const collectors =
+    (getCollectorsData?.signatureCollectionCollectors as SignatureCollectionCollector[]) ??
+    []
+  return { collectors, loadingCollectors }
+}

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

@@ -20,8 +20,11 @@ import {
   SignatureCollectionList,
   SignatureCollectionSuccess,
 } from '@island.is/api/schema'
-import { OwnerParliamentarySkeleton } from '../../../skeletons'
-import { useGetListsForOwner } from '../../../hooks'
+import {
+  CollectorSkeleton,
+  OwnerParliamentarySkeleton,
+} from '../../../skeletons'
+import { useGetCollectors, useGetListsForOwner } from '../../../hooks'
 import { SignatureCollection } from '@island.is/api/schema'
 import { useMutation } from '@apollo/client'
 import { cancelCollectionMutation } from '../../../hooks/graphql/mutations'
@@ -36,6 +39,7 @@ const OwnerView = ({
   const { formatMessage } = useLocale()
   const { listsForOwner, loadingOwnerLists, refetchListsForOwner } =
     useGetListsForOwner(currentCollection?.id || '')
+  const { collectors, loadingCollectors } = useGetCollectors()
 
   const [cancelCollection] = useMutation<SignatureCollectionSuccess>(
     cancelCollectionMutation,
@@ -179,10 +183,20 @@ const OwnerView = ({
             </T.Row>
           </T.Head>
           <T.Body>
-            <T.Row>
-              <T.Data width={'40%'}>{'Nafni Nafnason'}</T.Data>
-              <T.Data>{'010130-3019'}</T.Data>
-            </T.Row>
+            {loadingCollectors ? (
+              <T.Row>
+                <T.Data colSpan={2}>
+                  <CollectorSkeleton></CollectorSkeleton>
+                </T.Data>
+              </T.Row>
+            ) : (
+              collectors.map((collector) => (
+                <T.Row key={collector.nationalId}>
+                  <T.Data width={'40%'}>{collector.name}</T.Data>
+                  <T.Data>{collector.nationalId}</T.Data>
+                </T.Row>
+              ))
+            )}
           </T.Body>
         </T.Table>
       </Box>

libs/service-portal/signature-collection/src/skeletons.tsx

@@ -21,3 +21,9 @@ export const SkeletonTable = () => {
     </Box>
   )
 }
+
+export const CollectorSkeleton = () => {
+  return (
+    <SkeletonLoader height={50} borderRadius="large" repeat={2} space={1} />
+  )
+}