feat(income-plan): Update updateValueObj in incomeType (#15999)

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
island-is · Sep 13, 2024 · f257ea7 · f257ea7
1 parent 8b22584
commit f257ea7
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 7 deletions.
diff --git a/...ication/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts b/...ication/templates/social-insurance-administration/income-plan/src/forms/IncomePlanForm.ts
@@ -113,7 +113,18 @@ export const IncomePlanForm: Form = buildForm({
                   width: 'half',
                   isSearchable: true,
                   updateValueObj: {
-                    valueModifier: (_) => '',
+                    valueModifier: (application, activeField) => {
+                      const options = getTypesOptions(
+                        application.externalData,
+                        activeField?.incomeCategory,
+                      )
+
+                      return (
+                        options.find(
+                          (option) => option.value === activeField?.incomeType,
+                        )?.value ?? ''
+                      )
+                    },
                     watchValues: 'incomeCategory',
                   },
                   options: (application, activeField) => {
@@ -129,7 +140,7 @@ export const IncomePlanForm: Form = buildForm({
                   placeholder: incomePlanFormMessage.incomePlan.selectCurrency,
                   isSearchable: true,
                   updateValueObj: {
-                    valueModifier: (activeField) => {
+                    valueModifier: (_, activeField) => {
                       const defaultCurrency =
                         activeField?.incomeType === FOREIGN_BASIC_PENSION ||
                         activeField?.incomeType === FOREIGN_PENSION ||
@@ -186,7 +197,7 @@ export const IncomePlanForm: Form = buildForm({
                   displayInTable: false,
                   currency: true,
                   updateValueObj: {
-                    valueModifier: (activeField) => {
+                    valueModifier: (_, activeField) => {
                       const unevenAndEmploymentIncome =
                         activeField?.unevenIncomePerYear?.[0] !== YES ||
                         (activeField?.incomeCategory !== INCOME &&
@@ -227,7 +238,7 @@ export const IncomePlanForm: Form = buildForm({
                   displayInTable: false,
                   currency: true,
                   updateValueObj: {
-                    valueModifier: (activeField) => {
+                    valueModifier: (_, activeField) => {
                       const unevenAndEmploymentIncome =
                         activeField?.unevenIncomePerYear?.[0] !== YES ||
                         (activeField?.incomeCategory !== INCOME &&
@@ -270,7 +281,7 @@ export const IncomePlanForm: Form = buildForm({
                     return activeField?.income === RatioType.MONTHLY
                   },
                   updateValueObj: {
-                    valueModifier: (activeField) => {
+                    valueModifier: (_, activeField) => {
                       if (
                         activeField?.income === RatioType.MONTHLY &&
                         activeField?.incomeCategory === INCOME &&

diff --git a/libs/application/types/src/lib/Fields.ts b/libs/application/types/src/lib/Fields.ts
@@ -101,7 +101,10 @@ export type TableRepeaterItem = {
         activeField?: Record<string, string>,
       ) => boolean)
   updateValueObj?: {
-    valueModifier: (activeField?: Record<string, string>) => unknown
+    valueModifier: (
+      application: Application,
+      activeField?: Record<string, string>,
+    ) => unknown
     watchValues:
       | string
       | string[]

diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx
@@ -99,7 +99,10 @@ export const Item = ({
           ? !watchedValues.every((value) => value === undefined)
           : true)
       ) {
-        const finalValue = updateValueObj.valueModifier(activeValues)
+        const finalValue = updateValueObj.valueModifier(
+          application,
+          activeValues,
+        )
         setValue(id, finalValue)
       }
     }