feat(web): Journeyman list - display national id field (#15645)

* Add national id field to journeyman table view * Display publication date * Allow for national id search * Add field to gql model * Change table header display name --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Aug 20, 2024 · 609194d · 609194d
1 parent 927cde3
commit 609194d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/JourneymanList.tsx
@@ -31,7 +31,11 @@ import { GET_JOURNEYMAN_LICENCES_QUERY } from './queries'
 
 const DEFAULT_PAGE_SIZE = 20
 const DEFAULT_TABLE_MIN_HEIGHT = '800px'
-const SEARCH_KEYS: (keyof JourneymanLicence)[] = ['name', 'dateOfPublication']
+const SEARCH_KEYS: (keyof JourneymanLicence)[] = [
+  'name',
+  'dateOfPublication',
+  'nationalId',
+]
 
 interface JourneymanListProps {
   slice: ConnectedComponent
@@ -113,6 +117,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
           n('csvHeaderName', 'Nafn') as string,
           n('csvHeaderProfession', 'Iðngrein') as string,
           n('csvHeaderDateOfPublication', 'Útgáfuár') as string,
+          n('csvHeaderNationalId', 'Kennitala') as string,
         ]
         const dataRows = []
         for (const licence of licences) {
@@ -122,6 +127,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
             licence.dateOfPublication // Útgáfuár
               ? format(new Date(licence.dateOfPublication), 'yyyy')
               : '',
+            licence.nationalId ?? '',
           ])
         }
         return resolve(prepareCsvString(headerRow, dataRows))
@@ -262,8 +268,9 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                 <T.Row>
                   <T.HeadData>{n('name', 'Nafn')}</T.HeadData>
                   <T.HeadData>{n('profession', 'Iðngrein')}</T.HeadData>
+                  <T.HeadData>{n('dateOfPublication', 'Útgáfuár')}</T.HeadData>
                   <T.HeadData align="right">
-                    {n('dateOfPublication', 'Útgáfuár')}
+                    {n('nationalId', 'Kennitala')}
                   </T.HeadData>
                 </T.Row>
               </T.Head>
@@ -287,7 +294,7 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                         <T.Data>
                           {licences.dateOfPublication && (
                             <Box>
-                              <Text textAlign="right" variant="small">
+                              <Text variant="small">
                                 {format(
                                   new Date(licences.dateOfPublication),
                                   'yyyy',
@@ -296,6 +303,13 @@ const JourneymanList = ({ slice }: JourneymanListProps) => {
                             </Box>
                           )}
                         </T.Data>
+                        <T.Data>
+                          <Box>
+                            <Text textAlign="right" variant="small">
+                              {licences.nationalId}
+                            </Text>
+                          </Box>
+                        </T.Data>
                       </T.Row>
                     )
                   })}

diff --git a/apps/web/components/connected/syslumenn/TableLists/JourneymanList/queries.ts b/apps/web/components/connected/syslumenn/TableLists/JourneymanList/queries.ts
@@ -7,6 +7,7 @@ export const GET_JOURNEYMAN_LICENCES_QUERY = gql`
         name
         dateOfPublication
         profession
+        nationalId
       }
     }
   }

diff --git a/libs/api/domains/syslumenn/src/lib/models/journeymanLicence.ts b/libs/api/domains/syslumenn/src/lib/models/journeymanLicence.ts
@@ -11,6 +11,9 @@ class JourneymanLicence {
 
   @Field({ nullable: true })
   profession?: string
+
+  @Field({ nullable: true })
+  nationalId?: string
 }
 
 @ObjectType()

diff --git a/libs/clients/syslumenn/src/clientConfig.json b/libs/clients/syslumenn/src/clientConfig.json
@@ -3210,6 +3210,9 @@
         "nafn": {
           "type": "string"
         },
+        "kennitala": {
+          "type": "string"
+        },
         "idngrein": {
           "type": "string"
         },
@@ -3432,6 +3435,9 @@
         "nafn": {
           "type": "string"
         },
+        "kennitala": {
+          "type": "string"
+        },
         "starfsrettindi": {
           "type": "string"
         }
@@ -4626,6 +4632,10 @@
         },
         "malsvari": {
           "$ref": "#/definitions/Malsvari"
+        },
+        "arfshlutfall": {
+          "type": "number",
+          "format": "decimal"
         }
       }
     },

diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.types.ts b/libs/clients/syslumenn/src/lib/syslumennClient.types.ts
@@ -397,6 +397,7 @@ export interface JourneymanLicence {
   name?: string
   dateOfPublication?: Date
   profession?: string
+  nationalId?: string
 }
 
 export interface ProfessionRight {

diff --git a/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts b/libs/clients/syslumenn/src/lib/syslumennClient.utils.ts
@@ -556,6 +556,7 @@ export const mapJourneymanLicence = (
     name: licence.nafn,
     dateOfPublication: licence.gildirFra,
     profession: licence.idngrein,
+    nationalId: licence.kennitala,
   }
 }