respect maxNesting in rule-group during d-n-d

ukrbublik · Nov 13, 2024 · e7e5877 · e7e5877
1 parent 4684bb7
commit e7e5877
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 6 deletions.
diff --git a/packages/core/modules/index.d.ts b/packages/core/modules/index.d.ts
@@ -595,7 +595,7 @@ interface TreeUtils {
   expandTreeSubpath(path: ImmutablePath, ...suffix: string[]): ImmutablePath;
   fixEmptyGroupsInTree(tree: ImmutableTree): ImmutableTree;
   fixPathsInTree(tree: ImmutableTree): ImmutableTree;
-  getFlatTree(tree: ImmutableTree): FlatTree;
+  getFlatTree(tree: ImmutableTree, config?: Config): FlatTree;
   getTotalReordableNodesCountInTree(tree: ImmutableTree): number;
   getTotalRulesCountInTree(tree: ImmutableTree): number;
   isEmptyTree(tree: ImmutableTree): boolean;

diff --git a/packages/core/modules/utils/treeUtils.js b/packages/core/modules/utils/treeUtils.js
@@ -1,5 +1,6 @@
 import Immutable  from "immutable";
 import {toImmutableList, isImmutable, applyToJS as immutableToJs} from "./stuff";
+import {getFieldConfig} from "./configUtils";
 import {jsToImmutable} from "../import/tree";
 import uuid from "./uuid";
 
@@ -199,7 +200,7 @@ export const fixEmptyGroupsInTree = (tree) => {
  * @param {Immutable.Map} tree
  * @return {Object} {flat, items}
  */
-export const getFlatTree = (tree) => {
+export const getFlatTree = (tree, config) => {
   let flat = [];
   let items = {};
   let cases = [];
@@ -230,6 +231,11 @@ export const getFlatTree = (tree) => {
     const hasChildren = childrenIds?.length > 0;
     const parentId = path.length ? path[path.length-1] : null;
     const closestRuleGroupId = [...path].reverse().find(id => items[id].type == "rule_group");
+    const field = item.getIn(["properties", "field"]);
+    const fieldConfig = field && config && getFieldConfig(config, field);
+    const maxNesting = fieldConfig?.maxNesting;
+    const closestRuleGroupMaxNesting = items?.[closestRuleGroupId]?.maxNesting;
+    const closestRuleGroupLev = items?.[closestRuleGroupId]?.lev;
     const currentCaseId = isCaseGroup ? id : caseId;
 
     // Calculations before
@@ -271,6 +277,9 @@ export const getFlatTree = (tree) => {
       caseId: currentCaseId,
       caseNo,
       closestRuleGroupId,
+      closestRuleGroupLev,
+      closestRuleGroupMaxNesting,
+      maxNesting,
       path: path.concat(id),
       lev: lev, // depth level (0 for root node)
       atomicLev, // same as lev, but rules inside rule_group retains same number

diff --git a/packages/core/modules/utils/validation.js b/packages/core/modules/utils/validation.js
@@ -247,7 +247,7 @@ export const _validateTree = (
   const allErrors = [];
   let flatItems, oldFlatItems;
   if (includeItemsPositions) {
-    flatItems = getFlatTree(fixedTree).items;
+    flatItems = getFlatTree(fixedTree, config).items;
   }
   for (const id in meta.errors) {
     let { path, errors } = meta.errors[id];
@@ -276,7 +276,7 @@ export const _validateTree = (
       if (isDeleted) {
         // get positions from old tree
         if (!oldFlatItems) {
-          oldFlatItems = getFlatTree(tree).items;
+          oldFlatItems = getFlatTree(tree, config).items;
         }
         flatItem = oldFlatItems[id];
       }

diff --git a/packages/ui/modules/components/containers/SortableContainer.jsx b/packages/ui/modules/components/containers/SortableContainer.jsx
@@ -29,7 +29,7 @@ const createSortableContainer = (Builder, CanMoveFn = null) =>
     }
 
     onPropsChanged(nextProps) {
-      this.tree = getFlatTree(nextProps.tree);
+      this.tree = getFlatTree(nextProps.tree, nextProps.config);
     }
 
     shouldComponentUpdate(nextProps, nextState) {
@@ -578,6 +578,11 @@ const createSortableContainer = (Builder, CanMoveFn = null) =>
       // can't restruct `rule_group`
       const isRuleGroupAffected = (fromII.type == "rule_group" || !!fromII.closestRuleGroupId || toII.type == "rule_group" || !!toII.closestRuleGroupId);
       const targetRuleGroupId = isPend && toII.type == "rule_group" ? toII.id : toII.closestRuleGroupId;
+      const targetRuleGroupMaxNesting = isPend && toII.type == "rule_group" ? toII.maxNesting : toII.closestRuleGroupMaxNesting;
+      const closestRuleGroupLev = isPend && toII.type == "rule_group" ? toII.lev : toII.closestRuleGroupLev;
+      const newDepthLevInRuleGroup = (toParentII ? toParentII.lev + 1 : toII.lev)
+        + (fromII.depth || (fromII.type == "group" ? 1 : 0))
+        - (closestRuleGroupLev || 0);
       const isForbiddenRuleGroupChange = isRuleGroupAffected && fromII.closestRuleGroupId != targetRuleGroupId;
       const isForbiddenCaseChange = 
         // can't move `case_group` anywhere but before/after anoter `case_group`
@@ -590,8 +595,13 @@ const createSortableContainer = (Builder, CanMoveFn = null) =>
       const isForbiddenStructChange = isForbiddenCaseChange || isForbiddenRuleGroupChange;
       const isLockedChange = toII.isLocked || fromII.isLocked || toParentII && toParentII.isLocked;
 
-      if (maxNesting && newDepthLev > maxNesting)
+      if (maxNesting && newDepthLev > maxNesting) {
         return false;
+      }
+
+      if (targetRuleGroupMaxNesting && newDepthLevInRuleGroup > targetRuleGroupMaxNesting) {
+        return false;
+      }
 
       if (isStructChange && (!canRegroup || isForbiddenStructChange || isLockedChange))
         return false;