Give server rowIndex for validateRow trigger (#682)

* Give server rowIndex for validateRow trigger * Always update group validations * send all rowIndices * use splitDashedKey instead
Altinn · Nov 23, 2022 · b12cbe6 · b12cbe6
1 parent 4d73928
commit b12cbe6
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/src/altinn-app-frontend/src/features/form/layout/update/updateFormLayoutSagas.ts b/src/altinn-app-frontend/src/features/form/layout/update/updateFormLayoutSagas.ts
@@ -510,21 +510,27 @@ export function* updateRepeatingGroupEditIndexSaga({
   payload: { group, index, validate },
 }: PayloadAction<IUpdateRepeatingGroupsEditIndex>): SagaIterator {
   try {
-    if (validate) {
-      const state: IRuntimeState = yield select();
+    const state: IRuntimeState = yield select();
+    const rowIndex = state.formLayout.uiConfig.repeatingGroups?.[group].editIndex;
+
+    if (validate && typeof rowIndex === 'number' && rowIndex > -1) {
       const validations: IValidations = state.formValidations.validations;
       const currentView = state.formLayout.uiConfig.currentView;
-      const rowIndex = state.formLayout.uiConfig.repeatingGroups?.[group].editIndex;
 
       const frontendValidations: IValidations = validateGroup(
         group,
         state,
         validate === Triggers.ValidateRow ? rowIndex : undefined,
       );
 
+      // Get group's rowIndices to send to server for validations
+      const { depth: rowIndices } = splitDashedKey(group);
+      rowIndices.push(rowIndex);
+
       const options: AxiosRequestConfig = {
         headers: {
           ComponentId: group,
+          RowIndex: rowIndices.join(','),
         },
       };
 
@@ -562,25 +568,26 @@ export function* updateRepeatingGroupEditIndexSaga({
         state.formLayout.layouts,
         state.textResources.resources,
       );
-      const finalServerValidations: IValidations = filterValidationsByRow(
-        mappedServerValidations,
-        state.formLayout.layouts[currentView],
-        state.formLayout.uiConfig.repeatingGroups,
-        group,
-        validate === Triggers.ValidateRow ? rowIndex : undefined,
-      );
 
-      const combinedValidations = mergeValidationObjects(frontendValidations, finalServerValidations);
+      const combinedValidations = mergeValidationObjects(frontendValidations, mappedServerValidations);
+
+      // only overwrite validtions specific to the group - leave all other untouched
+      const newValidations = {
+        ...validations,
+        [currentView]: {
+          ...validations[currentView],
+          ...combinedValidations[currentView],
+        },
+      };
+      yield put(ValidationActions.updateValidations({ validations: newValidations }));
 
       const rowValidations = filterValidationsByRow(
         combinedValidations,
         state.formLayout.layouts[currentView],
         state.formLayout.uiConfig.repeatingGroups,
         group,
-        // Only compute if not already filtered
-        validate === Triggers.Validation ? rowIndex : undefined,
+        rowIndex,
       );
-
       if (canFormBeSaved({ validations: rowValidations, invalidDataTypes: false }, 'Complete')) {
         yield put(
           FormLayoutActions.updateRepeatingGroupsEditIndexFulfilled({
@@ -595,17 +602,6 @@ export function* updateRepeatingGroupEditIndexSaga({
           }),
         );
       }
-      if (!canFormBeSaved({ validations: combinedValidations, invalidDataTypes: false }, 'Complete')) {
-        // only overwrite validtions specific to the group - leave all other untouched
-        const newValidations = {
-          ...validations,
-          [currentView]: {
-            ...validations[currentView],
-            ...combinedValidations[currentView],
-          },
-        };
-        yield put(ValidationActions.updateValidations({ validations: newValidations }));
-      }
     } else {
       yield put(
         FormLayoutActions.updateRepeatingGroupsEditIndexFulfilled({