fix(driving-license): adding back JurisdictionApi check

island-is · Sep 10, 2024 · 83d28e9 · 83d28e9
1 parent c280c15
commit 83d28e9
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 0 deletions.
diff --git a/libs/application/templates/driving-license/src/dataProviders/index.ts b/libs/application/templates/driving-license/src/dataProviders/index.ts
@@ -9,6 +9,7 @@ export {
   UserProfileApi,
   CurrentLicenseApi,
   DrivingAssessmentApi,
+  JurisdictionApi,
   QualityPhotoApi,
   ExistingApplicationApi,
 } from '@island.is/application/types'

diff --git a/libs/application/templates/driving-license/src/forms/draft/draft.ts b/libs/application/templates/driving-license/src/forms/draft/draft.ts
@@ -6,6 +6,7 @@ import { subSectionTempInfo } from './subSectionTempInfo'
 import { subSectionOtherCountry } from './subSectionOtherCountry'
 import { subSectionOtherCountryDirections } from './subSectionOtherCountryDirections'
 import { subSectionQualityPhoto } from './subSectionQualityPhoto'
+import { subSectionDelivery } from './subSectionDelivery'
 import { subSectionHealthDeclaration } from './subSectionHealthDeclaration'
 import { subSectionSummary } from './subSectionSummary'
 import { subSectionPhone } from './subSectionPhone'
@@ -32,6 +33,7 @@ export const draft: Form = buildForm({
         subSectionOtherCountry,
         subSectionOtherCountryDirections,
         subSectionQualityPhoto,
+        subSectionDelivery,
         subSectionHealthDeclaration,
         subSectionSummary,
       ],

diff --git a/libs/application/templates/driving-license/src/forms/draft/subSectionDelivery.ts b/libs/application/templates/driving-license/src/forms/draft/subSectionDelivery.ts
@@ -0,0 +1,51 @@
+import {
+  buildDescriptionField,
+  buildMultiField,
+  buildSelectField,
+  buildSubSection,
+} from '@island.is/application/core'
+import { m } from '../../lib/messages'
+import {
+  chooseDistrictCommissionerDescription,
+  hasNoDrivingLicenseInOtherCountry,
+} from '../../lib/utils'
+
+import { Jurisdiction } from '@island.is/clients/driving-license'
+
+export const subSectionDelivery = buildSubSection({
+  id: 'user',
+  title: m.informationSectionTitle,
+  condition: hasNoDrivingLicenseInOtherCountry,
+  children: [
+    buildMultiField({
+      id: 'info',
+      title: m.pickupLocationTitle,
+      space: 1,
+      children: [
+        buildDescriptionField({
+          id: 'afhending',
+          title: m.districtCommisionerTitle,
+          titleVariant: 'h4',
+          description: chooseDistrictCommissionerDescription,
+        }),
+        buildSelectField({
+          id: 'jurisdiction',
+          title: m.districtCommisionerPickup,
+          disabled: false,
+          required: true,
+          options: ({
+            externalData: {
+              jurisdictions: { data },
+            },
+          }) => {
+            return (data as Jurisdiction[]).map(({ id, name, zip }) => ({
+              value: `${id}`,
+              label: name,
+              tooltip: `Póstnúmer ${zip}`,
+            }))
+          },
+        }),
+      ],
+    }),
+  ],
+})
diff --git a/libs/application/templates/driving-license/src/forms/prerequisites/sectionExternalData.ts b/libs/application/templates/driving-license/src/forms/prerequisites/sectionExternalData.ts
@@ -10,6 +10,7 @@ import {
   UserProfileApi,
   CurrentLicenseApi,
   DrivingAssessmentApi,
+  JurisdictionApi,
   QualityPhotoApi,
   ExistingApplicationApi,
 } from '@island.is/application/types'
@@ -56,6 +57,10 @@ export const sectionExternalData = buildSubSection({
           provider: DrivingAssessmentApi,
           title: '',
         }),
+        buildDataProviderItem({
+          provider: JurisdictionApi,
+          title: '',
+        }),
         buildDataProviderItem({
           provider: SyslumadurPaymentCatalogApi,
           title: '',

diff --git a/libs/application/templates/driving-license/src/lib/drivingLicenseTemplate.ts b/libs/application/templates/driving-license/src/lib/drivingLicenseTemplate.ts
@@ -11,6 +11,7 @@ import {
   ApplicationStateSchema,
   DefaultEvents,
   defineTemplateApi,
+  JurisdictionApi,
   CurrentLicenseApi,
   DrivingAssessmentApi,
   NationalRegistryUserApi,
@@ -128,6 +129,7 @@ const template: ApplicationTemplate<
                 UserProfileApi,
                 SyslumadurPaymentCatalogApi,
                 GlassesCheckApi,
+                JurisdictionApi,
                 CurrentLicenseApi.configure({
                   params: {
                     useLegacyVersion: true,

diff --git a/libs/application/templates/driving-license/src/lib/messages.ts b/libs/application/templates/driving-license/src/lib/messages.ts
@@ -105,6 +105,11 @@ export const m = defineMessages({
     defaultMessage: 'Sýslumannsembætti',
     description: 'Information',
   },
+  pickupLocationTitle: {
+    id: 'dl.application:pickuplocation',
+    defaultMessage: 'Afhendingarstaður',
+    description: 'location for pickup',
+  },
   informationApplicant: {
     id: 'dl.application:information.applicant',
     defaultMessage: 'Umsækjandi',
@@ -599,6 +604,11 @@ export const m = defineMessages({
     defaultMessage: 'Sýslumannsembætti',
     description: 'Title for district commissioner',
   },
+  districtCommisionerPickup: {
+    id: 'dl.application:districtCommisionerPickup',
+    defaultMessage: 'Afhending',
+    description: 'Pickup for district commissioner',
+  },
   chooseDistrictCommisionerForFullLicense: {
     id: 'dl.application:chooseDistrictCommisionerForFullLicense',
     defaultMessage: