wipp

ukrbublik · Mar 11, 2024 · c286cc7 · c286cc7
1 parent f61017d
commit c286cc7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/core/modules/i18n/index.js b/packages/core/modules/i18n/index.js
@@ -1,4 +1,4 @@
-import i18next from 'i18next';
+import i18next from "i18next";
 import { translations as validationTranslations } from "./validation/translations";
 
 export const NSV = "raqbvalidation";

diff --git a/packages/core/modules/utils/validation.js b/packages/core/modules/utils/validation.js
@@ -10,7 +10,7 @@ import {
 import {defaultValue, getFirstDefined, deepEqual} from "../utils/stuff";
 import {getItemInListValues} from "../utils/listValues";
 import {defaultOperatorOptions} from "../utils/defaultUtils";
-import {fixPathsInTree, getItemByPath} from "../utils/treeUtils";
+import {fixPathsInTree, getItemByPath, getFlatTree} from "../utils/treeUtils";
 import {setFuncDefaultArg} from "../utils/funcUtils";
 import {queryString} from "../export/queryString";
 import * as constants from "../i18n/validation/constains";
@@ -68,7 +68,7 @@ export const validateAndFixTree = (newTree, _oldTree, newConfig, oldConfig, remo
     newTree, _oldTree, newConfig, oldConfig, removeEmptyGroups, removeIncompleteRules, forceFix
   );
   if (isSanitized && allErrros.length) {
-    console.warn("Tree validation errors: ", allErrros)
+    console.warn("Tree validation errors: ", allErrros);
   }
   fixedTree = fixPathsInTree(fixedTree);
   return fixedTree;
@@ -85,10 +85,12 @@ export const _validateTree = (
     errors: {},
   };
   const fixedTree = validateItem(tree, [], null, meta, c);
+  const flatItems = getFlatTree(fixedTree).items;
   const isSanitized = meta.sanitized;
   const errorsArr = [];
   for (const id in meta.errors) {
     let {path, errors} = meta.errors[id];
+    const flatItem = flatItems[id];
     if (translateErrors) {
       errors = errors.map(e => {
         return {
@@ -99,10 +101,14 @@ export const _validateTree = (
     }
     let errorItem = { path, errors };
     if (stringifyRules) {
-      const item = getItemByPath(tree, path);
+      const item = getItemByPath(fixedTree, path);
       const itemStr = queryString(item, config, false, true);
       errorItem.itemStr = itemStr;
     }
+    // todo
+    // if (1) {
+    //   errorItem.itemMeta = flatItem?.nums;
+    // }
     errorsArr.push(errorItem);
   }
   return [fixedTree, errorsArr, isSanitized];