Merge branch 'main' into feat/update-income-type

island-is · Sep 13, 2024 · 6946dfb · 6946dfb
2 parents dbb11ca + 8b22584
commit 6946dfb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 1 deletion.
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
@@ -277,7 +277,7 @@ export const IncomePlanForm: Form = buildForm({
                   width: 'half',
                   type: 'number',
                   currency: true,
-                  readonly: (_, activeField) => {
+                  disabled: (_, activeField) => {
                     return activeField?.income === RatioType.MONTHLY
                   },
                   updateValueObj: {

diff --git a/...ation/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts b/...ation/templates/social-insurance-administration/income-plan/src/lib/IncomePlanTemplate.ts
@@ -61,6 +61,7 @@ const IncomePlanTemplate: ApplicationTemplate<
   featureFlag: Features.IncomePlanEnabled,
   translationNamespaces: ApplicationConfigurations.IncomePlan.translation,
   dataSchema,
+  allowMultipleApplicationsInDraft: false,
   newApplicationButtonLabel: historyMessages.newIncomePlanButtonLabel,
   applicationText: historyMessages.incomePlanPageTitle,
   stateMachineConfig: {

diff --git a/libs/application/types/src/lib/Fields.ts b/libs/application/types/src/lib/Fields.ts
@@ -94,6 +94,12 @@ export type TableRepeaterItem = {
         application: Application,
         activeField?: Record<string, string>,
       ) => boolean)
+  disabled?:
+    | boolean
+    | ((
+        application: Application,
+        activeField?: Record<string, string>,
+      ) => boolean)
   updateValueObj?: {
     valueModifier: (
       application: Application,

diff --git a/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx b/libs/application/ui-fields/src/lib/TableRepeaterFormField/TableRepeaterItem.tsx
@@ -54,6 +54,7 @@ export const Item = ({
     width = 'full',
     condition,
     readonly = false,
+    disabled = false,
     updateValueObj,
     defaultValue,
     ...props
@@ -151,6 +152,13 @@ export const Item = ({
     Readonly = readonly
   }
 
+  let Disabled: boolean | undefined
+  if (typeof disabled === 'function') {
+    Disabled = disabled(application, activeValues)
+  } else {
+    Disabled = disabled
+  }
+
   let DefaultValue: any
   if (component === 'input') {
     DefaultValue = getDefaultValue(item, application, activeValues)
@@ -197,6 +205,7 @@ export const Item = ({
         error={getFieldError(itemId)}
         control={control}
         readOnly={Readonly}
+        disabled={Disabled}
         backgroundColor={backgroundColor}
         onChange={() => {
           if (error) {