@fctc/widget-logic 1.10.4 → 1.10.6

package/dist/index.js

@@ -5550,7 +5550,9 @@ var many2manyFieldController = (props) => {
   });
   const searchControllers = searchController({
     viewData: viewResponse,
-    actionData,
+    model: relation ?? "",
+    context: contextObject,
+    domain: domainMany2Many,
     fieldsList: [
       ...columns?.filter(
         (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
@@ -7206,7 +7208,9 @@ var import_moment2 = __toESM(require_moment());
 var import_react24 = require("react");
 var searchController = ({
   viewData,
-  actionData,
+  model,
+  domain,
+  context,
   fieldsList
 }) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -7216,12 +7220,9 @@ var searchController = ({
   const [selectedTags, setSelectedTags] = (0, import_react24.useState)(null);
   const [searchString, setSearchString] = (0, import_react24.useState)("");
   const [searchMap, setSearchMap] = (0, import_react24.useState)({});
-  const { context } = actionData || {};
   const actionContext = typeof context === "string" ? (0, import_utils14.evalJSONContext)(context) : context;
   const contextSearch = { ...env.context, ...actionContext };
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : (0, import_utils14.evalJSONDomain)(actionData?.domain, contextSearch) : [];
-  const aid = actionData?.id;
-  const model = actionData?.res_model;
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : (0, import_utils14.evalJSONDomain)(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -7266,9 +7267,8 @@ var searchController = ({
     }
   };
   (0, import_react24.useEffect)(() => {
-    clearSearch();
     fetchData();
-  }, [aid, model, viewData]);
+  }, [model, viewData]);
   const onChangeSearchInput = (search_string) => {
     setSearchString(search_string);
   };
@@ -7305,27 +7305,27 @@ var searchController = ({
   };
   const formatDomain = () => {
     if (domainAction) {
-      const domain = [];
+      const domain2 = [];
       if (domainAction?.length > 0) {
         if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
+          domain2.push("&");
         }
         domainAction.forEach((domainItem) => {
-          domain.push(domainItem);
+          domain2.push(domainItem);
         });
       }
       Object.keys(searchMap).forEach((key, keyIndex, keys) => {
         if (!key?.includes(import_constants5.SearchType.GROUP)) {
           if (keys.length > 1 && keyIndex < keys.length - 1) {
-            domain.push("&");
+            domain2.push("&");
           }
           const valuesOfKey = searchMap[key];
           valuesOfKey.forEach((value, index) => {
             if (index < valuesOfKey.length - 1) {
-              domain.push("|");
+              domain2.push("|");
             }
             if (value.domain) {
-              domain.push(...value.domain);
+              domain2.push(...value.domain);
               return;
             }
             let valueDomainItem = value?.value;
@@ -7341,11 +7341,11 @@ var searchController = ({
               }
             }
             const operator = value?.modelType === "date" || value?.modelType === "datetime" || value?.modelType === "boolean" || value?.modelType === "integer" ? value?.operator ?? "=" : value.operator ?? "ilike";
-            domain.push([value.name, operator, valueDomainItem]);
+            domain2.push([value.name, operator, valueDomainItem]);
           });
         }
       });
-      return [...domain];
+      return [...domain2];
     }
   };
   const setTagSearch = (0, import_react24.useCallback)(
@@ -7417,7 +7417,7 @@ var searchController = ({
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const {
-      domain,
+      domain: domain2,
       groupIndex,
       value,
       type,
@@ -7426,16 +7426,16 @@ var searchController = ({
       active,
       dataIndex
     } = tag;
-    const domainFormat = new import_utils14.domainHelper.Domain(domain);
+    const domainFormat = new import_utils14.domainHelper.Domain(domain2);
     if (type === import_constants5.SearchType.FILTER) {
       addSearchItems(`${import_constants5.SearchType.FILTER}_${groupIndex}`, {
         ...tag,
-        domain: domain ? domainFormat.toList(context2) : null
+        domain: domain2 ? domainFormat.toList(context2) : null
       });
     } else if (type === import_constants5.SearchType.SEARCH) {
       addSearchItems(`${import_constants5.SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           ...context2,
           self: value
         }) : null
@@ -7443,7 +7443,7 @@ var searchController = ({
     } else if (type === import_constants5.SearchType.GROUP) {
       addSearchItems(`${import_constants5.SearchType.GROUP}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           context: context2,
           self: value
         }) : null

package/dist/index.mjs

@@ -5584,7 +5584,9 @@ var many2manyFieldController = (props) => {
   });
   const searchControllers = searchController({
     viewData: viewResponse,
-    actionData,
+    model: relation ?? "",
+    context: contextObject,
+    domain: domainMany2Many,
     fieldsList: [
       ...columns?.filter(
         (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
@@ -7264,7 +7266,9 @@ import {
 import { useCallback as useCallback3, useEffect as useEffect16, useState as useState15 } from "react";
 var searchController = ({
   viewData,
-  actionData,
+  model,
+  domain,
+  context,
   fieldsList
 }) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -7274,12 +7278,9 @@ var searchController = ({
   const [selectedTags, setSelectedTags] = useState15(null);
   const [searchString, setSearchString] = useState15("");
   const [searchMap, setSearchMap] = useState15({});
-  const { context } = actionData || {};
   const actionContext = typeof context === "string" ? evalJSONContext8(context) : context;
   const contextSearch = { ...env.context, ...actionContext };
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : evalJSONDomain7(actionData?.domain, contextSearch) : [];
-  const aid = actionData?.id;
-  const model = actionData?.res_model;
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : evalJSONDomain7(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -7324,9 +7325,8 @@ var searchController = ({
     }
   };
   useEffect16(() => {
-    clearSearch();
     fetchData();
-  }, [aid, model, viewData]);
+  }, [model, viewData]);
   const onChangeSearchInput = (search_string) => {
     setSearchString(search_string);
   };
@@ -7363,27 +7363,27 @@ var searchController = ({
   };
   const formatDomain = () => {
     if (domainAction) {
-      const domain = [];
+      const domain2 = [];
       if (domainAction?.length > 0) {
         if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
+          domain2.push("&");
         }
         domainAction.forEach((domainItem) => {
-          domain.push(domainItem);
+          domain2.push(domainItem);
         });
       }
       Object.keys(searchMap).forEach((key, keyIndex, keys) => {
         if (!key?.includes(SearchType.GROUP)) {
           if (keys.length > 1 && keyIndex < keys.length - 1) {
-            domain.push("&");
+            domain2.push("&");
           }
           const valuesOfKey = searchMap[key];
           valuesOfKey.forEach((value, index) => {
             if (index < valuesOfKey.length - 1) {
-              domain.push("|");
+              domain2.push("|");
             }
             if (value.domain) {
-              domain.push(...value.domain);
+              domain2.push(...value.domain);
               return;
             }
             let valueDomainItem = value?.value;
@@ -7399,11 +7399,11 @@ var searchController = ({
               }
             }
             const operator = value?.modelType === "date" || value?.modelType === "datetime" || value?.modelType === "boolean" || value?.modelType === "integer" ? value?.operator ?? "=" : value.operator ?? "ilike";
-            domain.push([value.name, operator, valueDomainItem]);
+            domain2.push([value.name, operator, valueDomainItem]);
           });
         }
       });
-      return [...domain];
+      return [...domain2];
     }
   };
   const setTagSearch = useCallback3(
@@ -7475,7 +7475,7 @@ var searchController = ({
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const {
-      domain,
+      domain: domain2,
       groupIndex,
       value,
       type,
@@ -7484,16 +7484,16 @@ var searchController = ({
       active,
       dataIndex
     } = tag;
-    const domainFormat = new domainHelper2.Domain(domain);
+    const domainFormat = new domainHelper2.Domain(domain2);
     if (type === SearchType.FILTER) {
       addSearchItems(`${SearchType.FILTER}_${groupIndex}`, {
         ...tag,
-        domain: domain ? domainFormat.toList(context2) : null
+        domain: domain2 ? domainFormat.toList(context2) : null
       });
     } else if (type === SearchType.SEARCH) {
       addSearchItems(`${SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           ...context2,
           self: value
         }) : null
@@ -7501,7 +7501,7 @@ var searchController = ({
     } else if (type === SearchType.GROUP) {
       addSearchItems(`${SearchType.GROUP}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           context: context2,
           self: value
         }) : null

package/dist/widget.d.mts

@@ -297,7 +297,13 @@ declare const tableGroupController: (props: any) => {
     setPageGroup: react.Dispatch<any>;
 };
 
-declare const searchController: ({ viewData, actionData, fieldsList, }: any) => {
+declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {
+    viewData: any;
+    model: string;
+    context: any;
+    domain: any;
+    fieldsList: any[];
+}) => {
     groupBy: any[] | null;
     searchBy: any[] | null;
     filterBy: any[] | null;

package/dist/widget.d.ts

@@ -297,7 +297,13 @@ declare const tableGroupController: (props: any) => {
     setPageGroup: react.Dispatch<any>;
 };
 
-declare const searchController: ({ viewData, actionData, fieldsList, }: any) => {
+declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {
+    viewData: any;
+    model: string;
+    context: any;
+    domain: any;
+    fieldsList: any[];
+}) => {
     groupBy: any[] | null;
     searchBy: any[] | null;
     filterBy: any[] | null;

package/dist/widget.js

@@ -5276,7 +5276,9 @@ var many2manyFieldController = (props) => {
   });
   const searchControllers = searchController({
     viewData: viewResponse,
-    actionData,
+    model: relation ?? "",
+    context: contextObject,
+    domain: domainMany2Many,
     fieldsList: [
       ...columns?.filter(
         (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
@@ -6932,7 +6934,9 @@ var import_moment2 = __toESM(require_moment());
 var import_react24 = require("react");
 var searchController = ({
   viewData,
-  actionData,
+  model,
+  domain,
+  context,
   fieldsList
 }) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -6942,12 +6946,9 @@ var searchController = ({
   const [selectedTags, setSelectedTags] = (0, import_react24.useState)(null);
   const [searchString, setSearchString] = (0, import_react24.useState)("");
   const [searchMap, setSearchMap] = (0, import_react24.useState)({});
-  const { context } = actionData || {};
   const actionContext = typeof context === "string" ? (0, import_utils14.evalJSONContext)(context) : context;
   const contextSearch = { ...env.context, ...actionContext };
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : (0, import_utils14.evalJSONDomain)(actionData?.domain, contextSearch) : [];
-  const aid = actionData?.id;
-  const model = actionData?.res_model;
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : (0, import_utils14.evalJSONDomain)(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -6992,9 +6993,8 @@ var searchController = ({
     }
   };
   (0, import_react24.useEffect)(() => {
-    clearSearch();
     fetchData();
-  }, [aid, model, viewData]);
+  }, [model, viewData]);
   const onChangeSearchInput = (search_string) => {
     setSearchString(search_string);
   };
@@ -7031,27 +7031,27 @@ var searchController = ({
   };
   const formatDomain = () => {
     if (domainAction) {
-      const domain = [];
+      const domain2 = [];
       if (domainAction?.length > 0) {
         if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
+          domain2.push("&");
         }
         domainAction.forEach((domainItem) => {
-          domain.push(domainItem);
+          domain2.push(domainItem);
         });
       }
       Object.keys(searchMap).forEach((key, keyIndex, keys) => {
         if (!key?.includes(import_constants5.SearchType.GROUP)) {
           if (keys.length > 1 && keyIndex < keys.length - 1) {
-            domain.push("&");
+            domain2.push("&");
           }
           const valuesOfKey = searchMap[key];
           valuesOfKey.forEach((value, index) => {
             if (index < valuesOfKey.length - 1) {
-              domain.push("|");
+              domain2.push("|");
             }
             if (value.domain) {
-              domain.push(...value.domain);
+              domain2.push(...value.domain);
               return;
             }
             let valueDomainItem = value?.value;
@@ -7067,11 +7067,11 @@ var searchController = ({
               }
             }
             const operator = value?.modelType === "date" || value?.modelType === "datetime" || value?.modelType === "boolean" || value?.modelType === "integer" ? value?.operator ?? "=" : value.operator ?? "ilike";
-            domain.push([value.name, operator, valueDomainItem]);
+            domain2.push([value.name, operator, valueDomainItem]);
           });
         }
       });
-      return [...domain];
+      return [...domain2];
     }
   };
   const setTagSearch = (0, import_react24.useCallback)(
@@ -7143,7 +7143,7 @@ var searchController = ({
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const {
-      domain,
+      domain: domain2,
       groupIndex,
       value,
       type,
@@ -7152,16 +7152,16 @@ var searchController = ({
       active,
       dataIndex
     } = tag;
-    const domainFormat = new import_utils14.domainHelper.Domain(domain);
+    const domainFormat = new import_utils14.domainHelper.Domain(domain2);
     if (type === import_constants5.SearchType.FILTER) {
       addSearchItems(`${import_constants5.SearchType.FILTER}_${groupIndex}`, {
         ...tag,
-        domain: domain ? domainFormat.toList(context2) : null
+        domain: domain2 ? domainFormat.toList(context2) : null
       });
     } else if (type === import_constants5.SearchType.SEARCH) {
       addSearchItems(`${import_constants5.SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           ...context2,
           self: value
         }) : null
@@ -7169,7 +7169,7 @@ var searchController = ({
     } else if (type === import_constants5.SearchType.GROUP) {
       addSearchItems(`${import_constants5.SearchType.GROUP}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           context: context2,
           self: value
         }) : null

package/dist/widget.mjs

@@ -5286,7 +5286,9 @@ var many2manyFieldController = (props) => {
   });
   const searchControllers = searchController({
     viewData: viewResponse,
-    actionData,
+    model: relation ?? "",
+    context: contextObject,
+    domain: domainMany2Many,
     fieldsList: [
       ...columns?.filter(
         (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
@@ -6966,7 +6968,9 @@ import {
 import { useCallback as useCallback3, useEffect as useEffect16, useState as useState15 } from "react";
 var searchController = ({
   viewData,
-  actionData,
+  model,
+  domain,
+  context,
   fieldsList
 }) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -6976,12 +6980,9 @@ var searchController = ({
   const [selectedTags, setSelectedTags] = useState15(null);
   const [searchString, setSearchString] = useState15("");
   const [searchMap, setSearchMap] = useState15({});
-  const { context } = actionData || {};
   const actionContext = typeof context === "string" ? evalJSONContext8(context) : context;
   const contextSearch = { ...env.context, ...actionContext };
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : evalJSONDomain7(actionData?.domain, contextSearch) : [];
-  const aid = actionData?.id;
-  const model = actionData?.res_model;
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : evalJSONDomain7(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -7026,9 +7027,8 @@ var searchController = ({
     }
   };
   useEffect16(() => {
-    clearSearch();
     fetchData();
-  }, [aid, model, viewData]);
+  }, [model, viewData]);
   const onChangeSearchInput = (search_string) => {
     setSearchString(search_string);
   };
@@ -7065,27 +7065,27 @@ var searchController = ({
   };
   const formatDomain = () => {
     if (domainAction) {
-      const domain = [];
+      const domain2 = [];
       if (domainAction?.length > 0) {
         if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
+          domain2.push("&");
         }
         domainAction.forEach((domainItem) => {
-          domain.push(domainItem);
+          domain2.push(domainItem);
         });
       }
       Object.keys(searchMap).forEach((key, keyIndex, keys) => {
         if (!key?.includes(SearchType.GROUP)) {
           if (keys.length > 1 && keyIndex < keys.length - 1) {
-            domain.push("&");
+            domain2.push("&");
           }
           const valuesOfKey = searchMap[key];
           valuesOfKey.forEach((value, index) => {
             if (index < valuesOfKey.length - 1) {
-              domain.push("|");
+              domain2.push("|");
             }
             if (value.domain) {
-              domain.push(...value.domain);
+              domain2.push(...value.domain);
               return;
             }
             let valueDomainItem = value?.value;
@@ -7101,11 +7101,11 @@ var searchController = ({
               }
             }
             const operator = value?.modelType === "date" || value?.modelType === "datetime" || value?.modelType === "boolean" || value?.modelType === "integer" ? value?.operator ?? "=" : value.operator ?? "ilike";
-            domain.push([value.name, operator, valueDomainItem]);
+            domain2.push([value.name, operator, valueDomainItem]);
           });
         }
       });
-      return [...domain];
+      return [...domain2];
     }
   };
   const setTagSearch = useCallback3(
@@ -7177,7 +7177,7 @@ var searchController = ({
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const {
-      domain,
+      domain: domain2,
       groupIndex,
       value,
       type,
@@ -7186,16 +7186,16 @@ var searchController = ({
       active,
       dataIndex
     } = tag;
-    const domainFormat = new domainHelper2.Domain(domain);
+    const domainFormat = new domainHelper2.Domain(domain2);
     if (type === SearchType.FILTER) {
       addSearchItems(`${SearchType.FILTER}_${groupIndex}`, {
         ...tag,
-        domain: domain ? domainFormat.toList(context2) : null
+        domain: domain2 ? domainFormat.toList(context2) : null
       });
     } else if (type === SearchType.SEARCH) {
       addSearchItems(`${SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           ...context2,
           self: value
         }) : null
@@ -7203,7 +7203,7 @@ var searchController = ({
     } else if (type === SearchType.GROUP) {
       addSearchItems(`${SearchType.GROUP}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
+        domain: domain2 ? domainFormat.toList({
           context: context2,
           self: value
         }) : null

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fctc/widget-logic",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "types": "dist/index.d.ts",
   "main": "dist/index.cjs",
   "module": "dist/index.mjs",