Broken deep validations in nested repeating groups (#2867)

Co-authored-by: Ole Martin Handeland <git@olemartin.org>

src/features/validation/ValidationStorePlugin.tsx

@@ -42,7 +42,7 @@ export interface ValidationStorePluginConfig {
     useVisibleValidationsDeep: (
       node: LayoutNode | undefined,
       mask: NodeVisibility,
-      stopAtDepth?: number,
+      includeSelf: boolean,
       restriction?: TraversalRestriction,
       severity?: ValidationSeverity,
     ) => NodeRefValidation[];
@@ -136,12 +136,12 @@ export class ValidationStorePlugin extends NodeDataPlugin<ValidationStorePluginC
           }
           return getValidations({ state, node, mask: showAll ? 'showAll' : 'visible' });
         }),
-      useVisibleValidationsDeep: (node, mask, stopAtDepth, restriction, severity) =>
+      useVisibleValidationsDeep: (node, mask, includeSelf, restriction, severity) =>
         store.useMemoSelector((state) => {
           if (!node) {
             return emptyArray;
           }
-          return getRecursiveValidations({ state, node, mask, severity, stopAtDepth, restriction });
+          return getRecursiveValidations({ state, node, mask, severity, includeSelf, restriction });
         }),
       useValidationsSelector: () =>
         store.useDelayedSelector({
@@ -252,28 +252,34 @@ function getValidations({ state, node, mask, severity, includeHidden = false }:
 }
 
 interface GetDeepValidationsProps extends GetValidationsProps {
-  depth?: number;
-  stopAtDepth?: number;
+  includeSelf: boolean;
   restriction?: TraversalRestriction;
 }
 
 function getRecursiveValidations(props: GetDeepValidationsProps): NodeRefValidation[] {
   const out: NodeRefValidation[] = [];
-  const depth = props.depth ?? 0;
 
-  const nodeValidations = getValidations(props);
-  for (const validation of nodeValidations) {
-    out.push({ ...validation, nodeId: props.node.id });
-  }
-
-  if (props.stopAtDepth !== undefined && depth >= props.stopAtDepth) {
-    return out;
+  if (props.includeSelf) {
+    const nodeValidations = getValidations(props);
+    for (const validation of nodeValidations) {
+      out.push({ ...validation, nodeId: props.node.id });
+    }
   }
 
   const nodes = props.node.page.layoutSet;
   if (nodes) {
-    for (const child of props.node.children(new TraversalTask(props.state, nodes, undefined, props.restriction))) {
-      out.push(...getRecursiveValidations({ ...props, node: child, depth: depth + 1 }));
+    const children = props.node.children(new TraversalTask(props.state, nodes, undefined, props.restriction));
+    for (const child of children) {
+      out.push(
+        ...getRecursiveValidations({
+          ...props,
+          node: child,
+
+          // Restriction and includeSelf should only be applied to the first level (not recursively)
+          restriction: undefined,
+          includeSelf: true,
+        }),
+      );
     }
   }
 

src/features/validation/selectors/deepValidationsForNode.ts

@@ -9,10 +9,10 @@ import type { TraversalRestriction } from 'src/utils/layout/useNodeTraversal';
  */
 export function useDeepValidationsForNode(
   node: LayoutNode | undefined,
-  onlyChildren: boolean = false,
+  includeSelf = true,
   restriction?: TraversalRestriction,
 ): NodeRefValidation[] {
   const showAll = Validation.useShowAllBackendErrors();
   const mask = showAll ? 'showAll' : 'visible';
-  return NodesInternal.useVisibleValidationsDeep(node, mask, onlyChildren ? 1 : undefined, restriction);
+  return NodesInternal.useVisibleValidationsDeep(node, mask, includeSelf, restriction);
 }

src/layout/RepeatingGroup/Table/RepeatingGroupTableRow.tsx

@@ -123,7 +123,7 @@ export const RepeatingGroupTableRow = React.memo(function RepeatingGroupTableRow
   const tableEditingNodeIds = tableNodes
     .filter((n) => shouldEditInTable(editForGroup, n, columnSettings))
     .map((n) => n.id);
-  const rowValidations = useDeepValidationsForNode(node, true, index);
+  const rowValidations = useDeepValidationsForNode(node, false, index);
   const rowHasErrors = rowValidations.some(
     (validation) => validation.severity === 'error' && !tableEditingNodeIds.includes(validation.nodeId),
   );