Merge branch 'main' of github.com:island-is/island.is into j-s/sort-b…

…y-state
island-is · Feb 5, 2025 · 423b27b · 423b27b
2 parents 3f4b3b5 + 5188d0e
commit 423b27b
Show file tree

Hide file tree

Showing 21 changed files with 369 additions and 113 deletions.
diff --git a/charts/islandis-services/api/values.dev.yaml b/charts/islandis-services/api/values.dev.yaml
@@ -120,7 +120,7 @@ env:
   XROAD_INNA_PATH: 'IS-DEV/GOV/10066/MMS-Protected/inna-v1'
   XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS-DEV/GOV/10030/WebAPI-Public/HUG-webAPI'
   XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS-DEV/GOV/10014/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-  XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_MMS_GRADE_SERVICE_ID: 'IS-DEV/GOV/10066/MMS-Protected/grade-api-v1'
   XROAD_MMS_LICENSE_SERVICE_ID: 'IS-DEV/GOV/10066/MMS-Protected/license-api-v1'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'

diff --git a/charts/islandis-services/api/values.prod.yaml b/charts/islandis-services/api/values.prod.yaml
@@ -120,7 +120,7 @@ env:
   XROAD_INNA_PATH: 'IS/GOV/6601241280/MMS-Protected/inna-v1'
   XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS/GOV/6501912189/WebAPI-Public/HUG-webAPI'
   XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS/GOV/5804170510/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-  XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_MMS_GRADE_SERVICE_ID: 'IS/GOV/6601241280/MMS-Protected/grade-api-v1'
   XROAD_MMS_LICENSE_SERVICE_ID: 'IS/GOV/6601241280/MMS-Protected/license-api-v1'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'

diff --git a/charts/islandis-services/api/values.staging.yaml b/charts/islandis-services/api/values.staging.yaml
@@ -120,7 +120,7 @@ env:
   XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
   XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS-TEST/GOV/6501912189/WebAPI-Public/HUG-webAPI'
   XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS-TEST/GOV/10014/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-  XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_MMS_GRADE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/grade-api-v1'
   XROAD_MMS_LICENSE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/license-api-v1'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'

diff --git a/charts/islandis-services/application-system-api/values.dev.yaml b/charts/islandis-services/application-system-api/values.dev.yaml
@@ -103,7 +103,7 @@ env:
   XROAD_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1'
   XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1'
   XROAD_INNA_PATH: 'IS-DEV/GOV/10066/MMS-Protected/inna-v1'
-  XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
   XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1'
   XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/charts/islandis-services/application-system-api/values.prod.yaml b/charts/islandis-services/application-system-api/values.prod.yaml
@@ -103,7 +103,7 @@ env:
   XROAD_HOLAR_UNIVERSITY_PATH: 'IS/EDU/5001694359/Holar-Protected/brautskraning-v1'
   XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS/EDU/4210984099/LHI-Protected/brautskraning-v1'
   XROAD_INNA_PATH: 'IS/GOV/6601241280/MMS-Protected/inna-v1'
-  XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
   XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
   XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/charts/islandis-services/application-system-api/values.staging.yaml b/charts/islandis-services/application-system-api/values.staging.yaml
@@ -103,7 +103,7 @@ env:
   XROAD_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1'
   XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1'
   XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
-  XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-service'
+  XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-api'
   XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
   XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
   XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/charts/islandis/values.dev.yaml b/charts/islandis/values.dev.yaml
@@ -371,7 +371,7 @@ api:
     XROAD_INNA_PATH: 'IS-DEV/GOV/10066/MMS-Protected/inna-v1'
     XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS-DEV/GOV/10030/WebAPI-Public/HUG-webAPI'
     XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS-DEV/GOV/10014/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_MMS_GRADE_SERVICE_ID: 'IS-DEV/GOV/10066/MMS-Protected/grade-api-v1'
     XROAD_MMS_LICENSE_SERVICE_ID: 'IS-DEV/GOV/10066/MMS-Protected/license-api-v1'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
@@ -663,7 +663,7 @@ application-system-api:
     XROAD_HOLAR_UNIVERSITY_PATH: 'IS-DEV/EDU/10055/Holar-Protected/brautskraning-v1'
     XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-DEV/EDU/10049/LHI-Protected/brautskraning-v1'
     XROAD_INNA_PATH: 'IS-DEV/GOV/10066/MMS-Protected/inna-v1'
-    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.5fzau3.euw1.cache.amazonaws.com:6379"]'
     XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-DEV/GOV/10001/SKRA-Protected/Einstaklingar-v1'
     XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-DEV/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/charts/islandis/values.prod.yaml b/charts/islandis/values.prod.yaml
@@ -359,7 +359,7 @@ api:
     XROAD_INNA_PATH: 'IS/GOV/6601241280/MMS-Protected/inna-v1'
     XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS/GOV/6501912189/WebAPI-Public/HUG-webAPI'
     XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS/GOV/5804170510/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-    XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_MMS_GRADE_SERVICE_ID: 'IS/GOV/6601241280/MMS-Protected/grade-api-v1'
     XROAD_MMS_LICENSE_SERVICE_ID: 'IS/GOV/6601241280/MMS-Protected/license-api-v1'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
@@ -651,7 +651,7 @@ application-system-api:
     XROAD_HOLAR_UNIVERSITY_PATH: 'IS/EDU/5001694359/Holar-Protected/brautskraning-v1'
     XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS/EDU/4210984099/LHI-Protected/brautskraning-v1'
     XROAD_INNA_PATH: 'IS/GOV/6601241280/MMS-Protected/inna-v1'
-    XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.whakos.euw1.cache.amazonaws.com:6379"]'
     XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
     XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/charts/islandis/values.staging.yaml b/charts/islandis/values.staging.yaml
@@ -371,7 +371,7 @@ api:
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
     XROAD_INTELLECTUAL_PROPERTIES_PATH: 'IS-TEST/GOV/6501912189/WebAPI-Public/HUG-webAPI'
     XROAD_JUDICIAL_SYSTEM_SP_PATH: 'IS-TEST/GOV/10014/Rettarvorslugatt-Private/judicial-system-mailbox-api'
-    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_MMS_GRADE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/grade-api-v1'
     XROAD_MMS_LICENSE_SERVICE_ID: 'IS-TEST/GOV/6601241280/MMS-Protected/license-api-v1'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
@@ -660,7 +660,7 @@ application-system-api:
     XROAD_HOLAR_UNIVERSITY_PATH: 'IS-TEST/EDU/10055/Holar-Protected/brautskraning-v1'
     XROAD_ICELAND_UNIVERSITY_OF_THE_ARTS_PATH: 'IS-TEST/EDU/10049/LHI-Protected/brautskraning-v1'
     XROAD_INNA_PATH: 'IS-TEST/GOV/6601241280/MMS-Protected/inna-v1'
-    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-service'
+    XROAD_MMS_FRIGG_PATH: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-api'
     XROAD_NATIONAL_REGISTRY_REDIS_NODES: '["clustercfg.general-redis-cluster-group.ab9ckb.euw1.cache.amazonaws.com:6379"]'
     XROAD_NATIONAL_REGISTRY_SERVICE_PATH: 'IS-TEST/GOV/6503760649/SKRA-Protected/Einstaklingar-v1'
     XROAD_OFFICIAL_JOURNAL_APPLICATION_PATH: 'IS-TEST/GOV/10014/DMR-Protected/official-journal-application'

diff --git a/infra/src/dsl/xroad.ts b/infra/src/dsl/xroad.ts
@@ -906,9 +906,9 @@ export const OfficialJournalOfIcelandApplication = new XroadConf({
 export const Frigg = new XroadConf({
   env: {
     XROAD_MMS_FRIGG_PATH: {
-      dev: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-service',
-      staging: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-service',
-      prod: 'IS/GOV/10066/MMS-Protected/frigg-form-service',
+      dev: 'IS-DEV/GOV/10066/MMS-Protected/frigg-form-api',
+      staging: 'IS-TEST/GOV/10066/MMS-Protected/frigg-form-api',
+      prod: 'IS/GOV/10066/MMS-Protected/frigg-form-api',
     },
   },
 })

diff --git a/libs/application/templates/new-primary-school/src/fields/ContactsTableRepeater/index.tsx b/libs/application/templates/new-primary-school/src/fields/ContactsTableRepeater/index.tsx
@@ -52,7 +52,7 @@ const ContactsTableRepeater: FC<React.PropsWithChildren<FieldBaseProps>> = ({
             label: newPrimarySchoolMessages.shared.fullName,
             width: 'half',
             type: 'text',
-            dataTestId: 'relative-full-name',
+            dataTestId: 'contact-full-name',
           },
           phoneNumber: {
             component: 'input',
@@ -61,7 +61,7 @@ const ContactsTableRepeater: FC<React.PropsWithChildren<FieldBaseProps>> = ({
             type: 'tel',
             format: '###-####',
             placeholder: '000-0000',
-            dataTestId: 'relative-phone-number',
+            dataTestId: 'contact-phone-number',
           },
           nationalId: {
             component: 'input',
@@ -70,15 +70,15 @@ const ContactsTableRepeater: FC<React.PropsWithChildren<FieldBaseProps>> = ({
             type: 'text',
             format: '######-####',
             placeholder: '000000-0000',
-            dataTestId: 'relative-national-id',
+            dataTestId: 'contact-national-id',
           },
           relation: {
             component: 'select',
             label: newPrimarySchoolMessages.shared.relation,
             width: 'half',
             placeholder: newPrimarySchoolMessages.shared.relationPlaceholder,
             options: relationFriggOptions,
-            dataTestId: 'relative-relation',
+            dataTestId: 'contact-relation',
           },
         },
         table: {

diff --git a/...templates/new-primary-school/src/fields/Review/review-groups/AllergiesAndIntolerances.tsx b/...templates/new-primary-school/src/fields/Review/review-groups/AllergiesAndIntolerances.tsx
@@ -41,13 +41,13 @@ export const AllergiesAndIntolerances = ({
     options: foodAllergiesOrIntolerancesOptions,
     loading: foodAllergiesOrIntolerancesLoading,
     error: foodAllergiesOrIntolerancesError,
-  } = useFriggOptions(OptionsType.INTOLERANCE) // TODO: Update when Júní has updated key-options
+  } = useFriggOptions(OptionsType.FOOD_ALLERGY_AND_INTOLERANCE)
 
   const {
     options: otherAllergiesOptions,
     loading: otherAllergiesLoading,
     error: otherAllergiesError,
-  } = useFriggOptions(OptionsType.ALLERGY) // TODO: Update when Júní has updated key-options
+  } = useFriggOptions(OptionsType.ALLERGY)
 
   return (
     <ReviewGroup

diff --git a/...plication/templates/new-primary-school/src/fields/Review/review-groups/FreeSchoolMeal.tsx b/...plication/templates/new-primary-school/src/fields/Review/review-groups/FreeSchoolMeal.tsx
@@ -34,7 +34,7 @@ export const FreeSchoolMeal = ({
     options: specialNeedsTypeOptions,
     loading,
     error,
-  } = useFriggOptions(OptionsType.ALLERGY) // TODO: Update when Júní has updated key-options
+  } = useFriggOptions(OptionsType.SCHOOL_MEAL)
 
   return (
     <ReviewGroup

diff --git a/...rc/forms/NewPrimarySchoolForm/differentNeedsSection/allergiesAndIntolerancesSubSection.ts b/...rc/forms/NewPrimarySchoolForm/differentNeedsSection/allergiesAndIntolerancesSubSection.ts
@@ -59,7 +59,7 @@ export const allergiesAndIntolerancesSubSection = buildSubSection({
             },
           },
           {
-            optionsType: OptionsType.INTOLERANCE, // TODO: Update when Júní has updated key-options
+            optionsType: OptionsType.FOOD_ALLERGY_AND_INTOLERANCE,
             placeholder:
               newPrimarySchoolMessages.differentNeeds
                 .typeOfFoodAllergiesOrIntolerancesPlaceholder,
@@ -88,7 +88,7 @@ export const allergiesAndIntolerancesSubSection = buildSubSection({
             },
           },
           {
-            optionsType: OptionsType.ALLERGY, // TODO: Update when Júní has updated key-options
+            optionsType: OptionsType.ALLERGY,
             placeholder:
               newPrimarySchoolMessages.differentNeeds
                 .typeOfOtherAllergiesPlaceholder,

diff --git a/...y-school/src/forms/NewPrimarySchoolForm/differentNeedsSection/freeSchoolMealSubSection.ts b/...y-school/src/forms/NewPrimarySchoolForm/differentNeedsSection/freeSchoolMealSubSection.ts
@@ -72,7 +72,7 @@ export const freeSchoolMealSubSection = buildSubSection({
             },
           },
           {
-            optionsType: OptionsType.ALLERGY, // TODO: Update when Júní has updated key-options
+            optionsType: OptionsType.SCHOOL_MEAL,
             placeholder:
               newPrimarySchoolMessages.differentNeeds
                 .specialNeedsTypePlaceholder,

diff --git a/libs/application/templates/new-primary-school/src/lib/constants.ts b/libs/application/templates/new-primary-school/src/lib/constants.ts
@@ -27,15 +27,18 @@ export enum Roles {
 
 export enum ReasonForApplicationOptions {
   MOVING_MUNICIPALITY = 'movingMuniciplaity',
-  SIBLINGS_IN_SAME_SCHOOL = 'SiblingsInSameSchool',
+  SIBLINGS_IN_SAME_SCHOOL = 'siblingsInSameSchool',
 }
 
 export enum OptionsType {
   PRONOUN = 'pronoun',
   GENDER = 'gender',
-  INTOLERANCE = 'intolerence',
+  FOOD_ALLERGY_AND_INTOLERANCE = 'foodAllergyAndIntolerance',
   REASON = 'registrationReason',
+  REASON_INTERNATIONAL_SCHOOL = 'registrationReasonInternationalSchool',
+  REASON_PRIVATE_SCHOOL = 'registrationReasonPrivateSchool',
   RELATION = 'relation',
+  SCHOOL_MEAL = 'schoolMeal',
   ALLERGY = 'allergy',
 }