@grafosoft/excel-validator 1.0.1 → 1.0.3

package/dist/components/ExcelLayout.js

@@ -85,7 +85,7 @@ function ExcelLayout({ initData, jsonValidator, isBalances = false, }) {
     const [currentPage, setCurrentPage] = (0, react_1.useState)(1);
     const [focusTarget, setFocusTarget] = (0, react_1.useState)(null);
     const [fetchCatalogsByUrl, setFetchCatalogsByUrl] = (0, react_1.useState)({});
-    const [stringEmptyResultsByQuery, setStringEmptyResultsByQuery] = (0, react_1.useState)({});
+    const [stringEmptyCatalogsByUrl, setStringEmptyCatalogsByUrl] = (0, react_1.useState)({});
     (0, react_1.useEffect)(() => {
         let isCancelled = false;
         const fetchRules = resolvedJsonValidator.filter((item) => typeof item === "object" &&
@@ -136,13 +136,9 @@ function ExcelLayout({ initData, jsonValidator, isBalances = false, }) {
             .filter((row) => { var _a, _b; return ((_b = (_a = row[0]) === null || _a === void 0 ? void 0 : _a.toString().trim()) !== null && _b !== void 0 ? _b : "") !== ""; });
         const queryUrls = new Set();
         stringEmptyRules.forEach(({ item, index }) => {
-            filteredRows.forEach((row) => {
-                var _a;
-                const cellValue = String((_a = row[index]) !== null && _a !== void 0 ? _a : "").trim();
-                if (cellValue !== "") {
-                    queryUrls.add(`${item.url}&${encodeURIComponent(item.prop)}=${encodeURIComponent(cellValue)}`);
-                }
-            });
+            if (filteredRows.some((row) => { var _a; return String((_a = row[index]) !== null && _a !== void 0 ? _a : "").trim() !== ""; })) {
+                queryUrls.add(item.url);
+            }
         });
         if (queryUrls.size === 0) {
             return;
@@ -165,7 +161,7 @@ function ExcelLayout({ initData, jsonValidator, isBalances = false, }) {
                 }
             }));
             if (!isCancelled) {
-                setStringEmptyResultsByQuery((prev) => (Object.assign(Object.assign({}, prev), Object.fromEntries(entries))));
+                setStringEmptyCatalogsByUrl((prev) => (Object.assign(Object.assign({}, prev), Object.fromEntries(entries))));
             }
         };
         void loadStringEmptyResults();
@@ -394,12 +390,14 @@ function ExcelLayout({ initData, jsonValidator, isBalances = false, }) {
                                 return validationResult;
                             }
                         }
-                        const queryKey = `${rule.url}&${encodeURIComponent(rule.prop)}=${encodeURIComponent(trimmedValue)}`;
-                        const queryResult = stringEmptyResultsByQuery[queryKey];
-                        if (queryResult === undefined) {
+                        const catalog = stringEmptyCatalogsByUrl[rule.url];
+                        if (catalog === undefined) {
                             return { valid: true, message: "" };
                         }
-                        const alreadyExists = queryResult.length > 0;
+                        const alreadyExists = catalog.some((catalogItem) => {
+                            const propValue = catalogItem[rule.prop];
+                            return String(propValue !== null && propValue !== void 0 ? propValue : "").trim() === trimmedValue;
+                        });
                         return {
                             valid: !alreadyExists,
                             message: alreadyExists
@@ -429,7 +427,7 @@ function ExcelLayout({ initData, jsonValidator, isBalances = false, }) {
         matrix,
         resolvedJsonValidator,
         fetchCatalogsByUrl,
-        stringEmptyResultsByQuery,
+        stringEmptyCatalogsByUrl,
     ]);
     const hasBalanceDifference = (0, react_1.useMemo)(() => {
         var _a;

package/dist/components/ExcelValidator.js

@@ -26,7 +26,7 @@ const ExcelValidator = ({ initData, fileContent, matrix, validationErrors, onSel
         const content = lines.join("\n");
         const base64 = btoa(String.fromCharCode(...new TextEncoder().encode(content)));
         try {
-            const response = await fetch(`http://lab.globho.com/api/v1/plains/upload?companyId=&apikey=`, {
+            const response = await fetch(`${initData.environment}api/v1/plains/upload?companyId=${initData.companyId}&apikey=${initData.apikey}`, {
                 method: "POST",
                 headers: {
                     "Content-Type": "application/json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@grafosoft/excel-validator",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "React component to validate Excel files against configurable JSON rules.",
   "license": "MIT",
   "main": "dist/index.js",