Fix for incremental validation updates when saving attachment tags (#3827)

* Setting data in FormDataWrite so that waitForValidation() doesn't fail later after incremental validation updates arrive from tags saving

* Moving the code snippet so it always happens

---------

Co-authored-by: Ole Martin Handeland <[email protected]>

Author: olemartinorg

src/features/formData/FormDataWrite.tsx

@@ -1160,6 +1160,8 @@ export const FD = {
    */
   useLastSaveValidationIssues: () => useSelector((s) => s.validationIssues),
 
+  useSetLastValidationIssues: () => useStaticSelector((s) => s.setLastValidationIssues),
+
   useRemoveIndexFromList: () => useStaticSelector((s) => s.removeIndexFromList),
 
   useGetDataTypeForElementId: () => {

src/features/formData/FormDataWriteProxies.tsx

@@ -45,6 +45,7 @@ const { Provider, useCtx } = createContext<FormDataWriteProxies>({
     lock: defaultProxy as Proxy<'lock'>,
     nextLock: defaultProxy as Proxy<'nextLock'>,
     requestManualSave: defaultProxy as Proxy<'requestManualSave'>,
+    setLastValidationIssues: defaultProxy as Proxy<'setLastValidationIssues'>,
   },
 });
 

src/features/formData/FormDataWriteStateMachine.tsx

@@ -208,6 +208,7 @@ export interface FormDataMethods {
   lock: (request: LockRequest) => void;
   nextLock: () => void;
   unlock: (key: string, uuid: string, saveResult?: FDActionResult) => void;
+  setLastValidationIssues: (issues: BackendValidationIssueGroups | undefined) => void;
 }
 
 export type FormDataContext = FormDataState & FormDataMethods;
@@ -605,6 +606,10 @@ function makeActions(
          */
         state.lockedBy = undefined;
       }),
+    setLastValidationIssues: (issues) =>
+      set((state) => {
+        state.validationIssues = issues;
+      }),
   };
 }
 

src/features/validation/backendValidation/BackendValidation.tsx

@@ -18,7 +18,7 @@ export function BackendValidation() {
   const lastSaveValidations = FD.useLastSaveValidationIssues();
   const enabled = useShouldValidateInitial();
   const { data: initialValidations, isFetching: isFetchingInitial } = useBackendValidationQuery({ enabled });
-  const updateIncrementalValidations = useUpdateIncrementalValidations();
+  const updateIncrementalValidations = useUpdateIncrementalValidations(false);
 
   // Initial validation
   useEffect(() => {

src/features/validation/backendValidation/useUpdateIncrementalValidations.ts

@@ -3,6 +3,7 @@ import { useCallback } from 'react';
 import deepEqual from 'fast-deep-equal';
 
 import { DataModels } from 'src/features/datamodel/DataModelsProvider';
+import { FD } from 'src/features/formData/FormDataWrite';
 import { useGetCachedInitialValidations } from 'src/features/validation/backendValidation/backendValidationQuery';
 import {
   mapBackendIssuesToFieldValidations,
@@ -15,10 +16,11 @@ import type { BackendValidationIssueGroups } from 'src/features/validation';
 /**
  * Hook for updating incremental validations from various sources (usually the validations updated from last saved data)
  */
-export function useUpdateIncrementalValidations() {
+export function useUpdateIncrementalValidations(setInFormData = true) {
   const updateBackendValidations = Validation.useUpdateBackendValidations();
   const defaultDataElementId = DataModels.useDefaultDataElementId();
   const getCachedInitialValidations = useGetCachedInitialValidations();
+  const updateInFormData = FD.useSetLastValidationIssues();
 
   return useCallback(
     (lastSaveValidations: BackendValidationIssueGroups) => {
@@ -33,6 +35,10 @@ export function useUpdateIncrementalValidations() {
         newValidatorGroups[group] = mapBackendIssuesToFieldValidations(validationIssues, defaultDataElementId);
       }
 
+      if (setInFormData) {
+        updateInFormData(lastSaveValidations);
+      }
+
       if (deepEqual(initialValidatorGroups, newValidatorGroups)) {
         // Don't update any validations, only set last saved validations
         updateBackendValidations(undefined, { incremental: lastSaveValidations });
@@ -42,6 +48,6 @@ export function useUpdateIncrementalValidations() {
       const backendValidations = mapValidatorGroupsToDataModelValidations(newValidatorGroups);
       updateBackendValidations(backendValidations, { incremental: lastSaveValidations });
     },
-    [defaultDataElementId, getCachedInitialValidations, updateBackendValidations],
+    [defaultDataElementId, getCachedInitialValidations, updateBackendValidations, setInFormData, updateInFormData],
   );
 }

src/test/renderWithProviders.tsx

@@ -197,6 +197,7 @@ export const makeFormDataMethodProxies = (
     lock: makeProxy('lock', ref),
     nextLock: makeProxy('nextLock', ref),
     requestManualSave: makeProxy('requestManualSave', ref),
+    setLastValidationIssues: makeProxy('setLastValidationIssues', ref),
   };
 
   const proxies: FormDataWriteProxies = Object.fromEntries(