@fctc/widget-logic 2.0.8 → 2.0.9

package/dist/index.js

@@ -5246,6 +5246,7 @@ var many2oneFieldController = (props) => {
     options: fieldOptions,
     showDetail
   } = props;
+  const { env } = (0, provider_exports.useEnv)();
   const [options, setOptions] = (0, import_react14.useState)([]);
   const [inputValue, setInputValue] = (0, import_react14.useState)("");
   const [debouncedInputValue] = useDebounce(inputValue, 1e3);
@@ -5255,15 +5256,14 @@ var many2oneFieldController = (props) => {
   const [domainObject, setDomainObject] = (0, import_react14.useState)(null);
   const actionData = sessionStorageUtils.getActionData();
   const { menuList } = (0, store_exports.useAppSelector)(store_exports.selectNavbar);
-  const { context } = (0, store_exports.useAppSelector)(store_exports.selectEnv);
   const initValue = methods?.getValues(name);
   const optionsObject = (0, utils_exports.evalJSONContext)(fieldOptions) || {};
   const contextObject = {
     ...(0, utils_exports.evalJSONContext)(actionData?.context) || {},
     ...fieldContext,
-    ...context
+    ...env?.context
   };
-  const { useGetSelection: useGetSelection2 } = (0, provider_exports.useService)();
+  const { useGetSelection: useGetSelection3 } = (0, provider_exports.useService)();
   const data = {
     model: relation,
     domain: domainObject,
@@ -5279,7 +5279,7 @@ var many2oneFieldController = (props) => {
     data: dataOfSelection,
     refetch,
     isFetching
-  } = useGetSelection2({
+  } = useGetSelection3({
     data,
     queryKey,
     enabled: false
@@ -5433,52 +5433,49 @@ var many2oneButtonController = (props) => {
 
 // src/widget/basic/many2many-field/controller.ts
 var import_react15 = require("react");
-var import_store8 = require("@fctc/interface-logic/store");
 var import_utils6 = require("@fctc/interface-logic/utils");
 var many2manyFieldController = (props) => {
   const {
     relation,
     domain,
     context,
+    options,
     tab,
-    model,
-    aid,
     setSelectedRowKeys: setSelectedRowKeys4,
-    fields,
-    setFields,
     groupByDomain,
-    page,
-    options,
-    sessionStorageUtils
+    enabled: enabledCallAPI,
+    actionData
   } = props;
-  const appDispatch = (0, import_store8.useAppDispatch)();
-  const actionData = sessionStorageUtils.getActionData();
-  const [debouncedPage] = useDebounce(page, 500);
-  const [order, setOrder] = (0, import_react15.useState)();
-  const [isLoadedData, setIsLoadedData] = (0, import_react15.useState)(false);
-  const [domainMany2Many, setDomainMany2Many] = (0, import_react15.useState)(domain);
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData3, useGetFormView } = (0, provider_exports.useService)();
+  const [order, setOrder] = (0, import_react15.useState)();
+  const [page, setPage] = (0, import_react15.useState)(0);
+  const [domainMany2Many, setDomainMany2Many] = (0, import_react15.useState)(null);
+  const [debouncedPage] = useDebounce(page, 500);
+  const contextObject = {
+    ...env.context,
+    ...context || {}
+  };
   const viewParams = {
     model: relation,
     views: [
       [false, "list"],
       [false, "search"]
     ],
-    context
+    context: contextObject
   };
-  const { data: viewResponse } = useGetView2(viewParams, actionData);
+  const { data: viewResponse } = useGetView2(viewParams, enabledCallAPI);
   const baseModel = (0, import_react15.useMemo)(
     () => ({
       name: String(relation),
       view: viewResponse || {},
-      actContext: context,
+      actContext: contextObject,
       fields: [
         ...Object.values(viewResponse?.views?.list?.fields ?? {}),
         ...tab?.fields ? tab.fields : []
       ]
     }),
-    [model, viewResponse]
+    [relation, viewResponse]
   );
   const initModel = (0, hooks_exports.useModel)();
   const modelInstance = (0, import_react15.useMemo)(() => {
@@ -5497,26 +5494,15 @@ var many2manyFieldController = (props) => {
   const optionsObject = tab?.options ? (0, import_utils6.evalJSONContext)(tab?.options) : (options ? (0, import_utils6.evalJSONContext)(options) : {}) || {};
   const fetchData = async () => {
     try {
-      setDomainMany2Many(domain);
-      appDispatch((0, import_store8.setFirstDomain)(domain));
-      appDispatch((0, import_store8.setViewDataStore)(viewResponse));
-      const modalData = viewResponse?.views?.list?.fields.map((field) => ({
-        ...viewResponse?.models?.[String(model)]?.[field?.name],
-        ...field
-      }));
-      if (!fields?.[`${aid}_${relation}_popupmany2many`] && modalData) {
-        setFields({
-          ...fields,
-          [`${aid}_${relation}_popupmany2many`]: modalData
-        });
-      }
-      appDispatch((0, import_store8.setPage)(0));
+      const domainParse = typeof domain === "string" ? (0, import_utils6.evalJSONDomain)(domain, contextObject) : Array.isArray(domain) ? domain : [];
+      setDomainMany2Many(domainParse);
+      setPage(0);
     } catch (err) {
       console.log(err);
     }
   };
   const queryKey = [
-    `view-${relation}-${aid}`,
+    `view-${relation}`,
     specification,
     domainMany2Many,
     debouncedPage,
@@ -5529,16 +5515,16 @@ var many2manyFieldController = (props) => {
     domain: domainMany2Many,
     offset: debouncedPage * 10,
     limit: 10,
-    context,
+    context: contextObject,
     fields: groupByDomain?.fields,
     groupby: [groupByDomain?.contexts[0]?.group_by],
     sort: order ? order : default_order ? (0, import_utils6.formatSortingString)(default_order) : ""
   };
-  const enabled = isLoadedData && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
+  const enabled = enabledCallAPI && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
   const {
     data: dataResponse,
-    isLoading: isDataLoading,
-    isFetched: isDataResponseFetched,
+    isLoading,
+    isFetched,
     isPlaceholderData
   } = useGetListData3(data, queryKey, enabled);
   (0, import_react15.useEffect)(() => {
@@ -5546,73 +5532,58 @@ var many2manyFieldController = (props) => {
       fetchData();
     }
     return () => {
-      appDispatch((0, import_store8.setGroupByDomain)(null));
-      setFields((prevFields) => ({
-        ...prevFields,
-        [`${aid}_${relation}_popupmany2many`]: null
-      }));
-      appDispatch((0, import_store8.setPage)(0));
+      setPage(0);
       setSelectedRowKeys4([]);
       setDomainMany2Many(null);
-      setIsLoadedData(false);
     };
   }, [viewResponse]);
-  const { rows, columns, typeTable } = tableController({
+  const { rows, columns, typeTable, onToggleColumnOptional } = tableController({
     data: {
-      fields: fields?.[`${aid}_${relation}_popupmany2many`] || viewResponse?.views?.list?.fields,
+      fields: viewResponse?.views?.list?.fields,
       records: dataResponse?.records ?? dataResponse?.groups,
       dataModel: viewResponse?.models?.[String(relation)],
-      context: { ...env.context, ...context },
+      context: contextObject,
       typeTable: dataResponse?.groups ? "group" : "list"
     }
   });
-  const dataFormView = {
-    id: null,
-    model: relation,
-    context
-  };
-  const {
-    refetch,
-    data: dataFormViewResponse,
-    isSuccess
-  } = useGetFormView({
-    data: dataFormView,
-    queryKey: [`form-view-action-${relation}`],
-    enabled: false
+  const searchControllers = searchController({
+    viewData: viewResponse,
+    model: relation ?? "",
+    context: contextObject,
+    domain,
+    fieldsList: [
+      ...columns?.filter(
+        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
+      )?.map((col) => ({ ...col.field })) ?? []
+    ]
   });
-  (0, import_react15.useEffect)(() => {
-    if (isSuccess && dataFormViewResponse) {
-      sessionStorage.setItem("actionData", JSON.stringify(dataFormViewResponse));
-      window.location.href = `/form/menu?model=${relation}`;
-    }
-  }, [isSuccess]);
-  (0, import_react15.useEffect)(() => {
-    if (domainMany2Many && !isLoadedData) {
-      setIsLoadedData(true);
-    }
-  }, [domainMany2Many]);
   const handleCreateNewOnPage = async () => {
-    try {
-      refetch();
-    } catch (error) {
-      console.log(error);
-    }
   };
   return {
     handleCreateNewOnPage,
     optionsObject,
+    totalRows: dataResponse?.length ?? 0,
     rows,
     columns,
+    onToggleColumnOptional,
     typeTable,
-    isDataLoading,
-    isDataResponseFetched,
-    isPlaceholderData
+    isLoading,
+    isFetched,
+    isPlaceholderData,
+    setPage,
+    page,
+    viewData: viewResponse,
+    domain: domainMany2Many,
+    setDomain: setDomainMany2Many,
+    searchController: searchControllers
   };
 };
 
 // src/widget/basic/many2many-tags-field/controller.ts
 var import_react16 = require("react");
 var import_constants4 = require("@fctc/interface-logic/constants");
+var import_environment7 = require("@fctc/interface-logic/environment");
+var import_hooks14 = require("@fctc/interface-logic/hooks");
 var import_utils7 = require("@fctc/interface-logic/utils");
 var many2manyTagsController = (props) => {
   const {
@@ -5624,8 +5595,7 @@ var many2manyTagsController = (props) => {
     placeholderNoOption
   } = props;
   const isUser = relation === "res.users" || relation === "res.partner";
-  const { env } = (0, provider_exports.useEnv)();
-  const { useGetSelection: useGetSelection2 } = (0, provider_exports.useService)();
+  const env = (0, import_environment7.getEnv)();
   const addtionalFields = optionsFields ? (0, import_utils7.evalJSONContext)(optionsFields) : null;
   const domainObject = (0, import_react16.useMemo)(
     () => (0, import_utils7.evalJSONDomain)(domain, JSON.parse(JSON.stringify(formValues || {}))),
@@ -5644,7 +5614,7 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
-  const { data: dataOfSelection } = useGetSelection2({
+  const { data: dataOfSelection } = (0, import_hooks14.useGetSelection)({
     data,
     queryKey: [`data_${relation}`, domainObject]
   });
@@ -5664,6 +5634,7 @@ var many2manyTagsController = (props) => {
     options,
     customNoOptionsMessage,
     tranfer,
+    dataOfSelection,
     isUser
   };
 };
@@ -5672,7 +5643,7 @@ var many2manyTagsController = (props) => {
 var import_react17 = require("react");
 var import_utils8 = require("@fctc/interface-logic/utils");
 var durationController = (props) => {
-  const { relation, domain, formValues, name, id, model, onRefetch, enabled } = props;
+  const { relation, domain, formValues, name, id, model, onRefetch } = props;
   const specification = {
     id: 0,
     name: "",
@@ -5696,11 +5667,7 @@ var durationController = (props) => {
     },
     sort: ""
   };
-  const { data: dataResponse } = useGetListData3(
-    listDataProps,
-    queryKey,
-    enabled
-  );
+  const { data: dataResponse } = useGetListData3(listDataProps, queryKey);
   const { mutate: fetchChangeStatus } = useChangeStatus();
   const handleClick = async (stage_id) => {
     setDisabled(true);
@@ -5736,18 +5703,32 @@ var durationController = (props) => {
 };
 
 // src/widget/basic/priority-field/controller.ts
+var import_hooks15 = require("@fctc/interface-logic/hooks");
 var import_utils9 = require("@fctc/interface-logic/utils");
 var priorityFieldController = (props) => {
-  const { name, model, id, actionData, context, onChange } = props;
+  const {
+    value,
+    isForm,
+    name,
+    methods,
+    onChange,
+    model,
+    selection,
+    id,
+    actionData,
+    viewData,
+    context
+  } = props;
   const _context = { ...(0, import_utils9.evalJSONContext)(actionData?.context) };
   const contextObject = { ...context, ..._context };
-  const { useSave: useSave2 } = (0, provider_exports.useService)();
-  const { mutateAsync: fetchSave } = useSave2();
+  const defaultPriority = parseInt(value) + 1;
+  const label = viewData?.models?.[model]?.[name ?? ""]?.string ?? name;
+  const { mutateAsync: fetchSave } = (0, import_hooks15.useSave)();
   const savePriorities = async ({
-    value,
+    value: value2,
     resetPriority
   }) => {
-    const priorityValue = value <= 0 ? 0 : value - 1;
+    const priorityValue = value2 <= 0 ? 0 : value2 - 1;
     try {
       fetchSave({
         ids: id ? [id] : [],
@@ -5765,7 +5746,14 @@ var priorityFieldController = (props) => {
     }
   };
   return {
-    savePriorities
+    selection,
+    isForm,
+    methods,
+    defaultPriority,
+    savePriorities,
+    label,
+    id,
+    onChange
   };
 };
 
@@ -6728,11 +6716,11 @@ var import_utils11 = require("@fctc/interface-logic/utils");
 var colorFieldController = (props) => {
   const { value, isForm, name, formValues, idForm, model, actionData } = props;
   const { env } = (0, provider_exports.useEnv)();
-  const { useSave: useSave2 } = (0, provider_exports.useService)();
+  const { useSave: useSave3 } = (0, provider_exports.useService)();
   const _context = { ...(0, import_utils11.evalJSONContext)(actionData?.context) || {} };
   const contextObject = { ...env.context, ..._context };
   const idDefault = isForm ? idForm : formValues?.id;
-  const { mutate: onSave } = useSave2();
+  const { mutate: onSave } = useSave3();
   const savePickColor = async (colorObject) => {
     const { id } = colorObject;
     if (value === id) return;
@@ -6855,20 +6843,20 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-body/controller.ts
-var import_store9 = require("@fctc/interface-logic/store");
+var import_store8 = require("@fctc/interface-logic/store");
 var import_react21 = require("react");
 var tableBodyController = (props) => {
   const {
     checkedAll,
     checkboxRef,
     setIsAutoSelect,
+    selectedRowKeys,
     row,
     isAutoSelect,
     selectedRowKeysRef,
     onClickRow
   } = props;
-  const appDispatch = (0, import_store9.useAppDispatch)();
-  const { selectedRowKeys } = (0, import_store9.useAppSelector)(import_store9.selectList);
+  const appDispatch = (0, import_store8.useAppDispatch)();
   const checked = (0, import_react21.useMemo)(() => {
     if (!row?.id) return false;
     if (selectedRowKeys?.includes(row.id)) {
@@ -6884,7 +6872,8 @@ var tableBodyController = (props) => {
       return;
     }
     const newSelectedRowKeys = selectedRowKeys?.includes(row.id) ? selectedRowKeys?.filter((key) => key !== row.id) : [...selectedRowKeys, row.id];
-    appDispatch((0, import_store9.setSelectedRowKeys)(newSelectedRowKeys));
+    console.log("newSelectedRowKeys", newSelectedRowKeys);
+    appDispatch((0, import_store8.setSelectedRowKeys)(newSelectedRowKeys));
   };
   const handleClickRow = (col, row2) => {
     onClickRow(col, row2);
@@ -6897,13 +6886,13 @@ var tableBodyController = (props) => {
           (id) => id !== row.id
         );
         selectedRowKeysRef.current = filtered;
-        appDispatch((0, import_store9.setSelectedRowKeys)(filtered));
+        appDispatch((0, import_store8.setSelectedRowKeys)(filtered));
       } else {
         const unique = Array.from(
           /* @__PURE__ */ new Set([...selectedRowKeysRef?.current, row?.id])
         );
         selectedRowKeysRef.current = unique;
-        appDispatch((0, import_store9.setSelectedRowKeys)(unique));
+        appDispatch((0, import_store8.setSelectedRowKeys)(unique));
       }
     }
   }, [isAutoSelect]);
@@ -6921,35 +6910,35 @@ var tableBodyController = (props) => {
 };
 
 // src/widget/advance/table/table-head/controller.ts
-var import_store10 = require("@fctc/interface-logic/store");
+var import_store9 = require("@fctc/interface-logic/store");
 var tableHeadController = (props) => {
   const { typeTable, rows, selectedRowKeysRef } = props;
-  const appDispatch = (0, import_store10.useAppDispatch)();
-  const { groupByDomain } = (0, import_store10.useAppSelector)(import_store10.selectSearch);
+  const appDispatch = (0, import_store9.useAppDispatch)();
+  const { groupByDomain } = (0, import_store9.useAppSelector)(import_store9.selectSearch);
   const handleCheckBoxAll = (event) => {
     if (event?.target?.checked && typeTable === "list") {
       const allRowKeys = Array.isArray(rows) ? rows.map((record) => record?.id) : [];
-      appDispatch((0, import_store10.setSelectedRowKeys)(allRowKeys));
+      appDispatch((0, import_store9.setSelectedRowKeys)(allRowKeys));
     } else if (event?.target?.checked && typeTable === "group") {
       const rowsIDs = document.querySelectorAll("tr[data-row-id]");
       const ids = Array.from(rowsIDs)?.map(
         (row) => Number(row?.getAttribute("data-row-id"))
       );
       if (ids?.length > 0) {
-        appDispatch((0, import_store10.setSelectedRowKeys)(ids));
+        appDispatch((0, import_store9.setSelectedRowKeys)(ids));
       } else {
         const sum = countSum(
           rows,
           typeof groupByDomain === "object" ? groupByDomain?.contexts?.[0]?.group_by : void 0
         );
         const keys = Array.from({ length: sum }, (_) => void 0);
-        appDispatch((0, import_store10.setSelectedRowKeys)(keys));
+        appDispatch((0, import_store9.setSelectedRowKeys)(keys));
       }
       if (selectedRowKeysRef) {
         selectedRowKeysRef.current = [];
       }
     } else {
-      appDispatch((0, import_store10.setSelectedRowKeys)([]));
+      appDispatch((0, import_store9.setSelectedRowKeys)([]));
     }
   };
   return {
@@ -6959,7 +6948,7 @@ var tableHeadController = (props) => {
 
 // src/widget/advance/table/table-view/controller.ts
 var import_react22 = require("react");
-var import_store11 = require("@fctc/interface-logic/store");
+var import_store10 = require("@fctc/interface-logic/store");
 var import_utils13 = require("@fctc/interface-logic/utils");
 var tableController = ({ data }) => {
   const [rows, setRows] = (0, import_react22.useState)(data.records || []);
@@ -7038,8 +7027,8 @@ var tableController = ({ data }) => {
 
 // src/widget/advance/table/table-group/controller.ts
 var import_react23 = require("react");
-var import_hooks14 = require("@fctc/interface-logic/hooks");
-var import_store12 = require("@fctc/interface-logic/store");
+var import_hooks16 = require("@fctc/interface-logic/hooks");
+var import_store11 = require("@fctc/interface-logic/store");
 
 // src/environment.ts
 var environment_exports = {};
@@ -7067,10 +7056,10 @@ var tableGroupController = (props) => {
     selectedRowKeysRef
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react23.useState)(0);
-  const { groupByDomain, selectedTags } = (0, import_store12.useAppSelector)(import_store12.selectSearch);
-  const { selectedRowKeys } = (0, import_store12.useAppSelector)(import_store12.selectList);
-  const appDispatch = (0, import_store12.useAppDispatch)();
-  const { toDataJS } = (0, import_hooks14.useOdooDataTransform)();
+  const { groupByDomain, selectedTags } = (0, import_store11.useAppSelector)(import_store11.selectSearch);
+  const { selectedRowKeys } = (0, import_store11.useAppSelector)(import_store11.selectList);
+  const appDispatch = (0, import_store11.useAppDispatch)();
+  const { toDataJS } = (0, import_hooks16.useOdooDataTransform)();
   const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = (0, import_react23.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react23.useState)({
@@ -7117,7 +7106,7 @@ var tableGroupController = (props) => {
     isPlaceholderData,
     isLoading,
     isFetching
-  } = (0, import_hooks14.useGetListData)(listDataProps, queryKey, enabled);
+  } = (0, import_hooks16.useGetListData)(listDataProps, queryKey, enabled);
   const {
     columns: columnsGroup,
     rows: rowsGroup,
@@ -7155,14 +7144,14 @@ var tableGroupController = (props) => {
       const filteredIds = selectedRowKeys.filter(
         (id) => !ids.includes(id)
       );
-      appDispatch((0, import_store12.setSelectedRowKeys)(filteredIds));
+      appDispatch((0, import_store11.setSelectedRowKeys)(filteredIds));
     } else if (!isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && checkedAll && !allIdsNull && isQueryFetched) {
       const clonedKeys = [...selectedRowKeys];
-      appDispatch((0, import_store12.setSelectedRowKeys)([...clonedKeys, -1]));
-      setTimeout(() => appDispatch((0, import_store12.setSelectedRowKeys)(clonedKeys)), 500);
+      appDispatch((0, import_store11.setSelectedRowKeys)([...clonedKeys, -1]));
+      setTimeout(() => appDispatch((0, import_store11.setSelectedRowKeys)(clonedKeys)), 500);
     } else if (isShowGroup && selectedRowKeys?.length > 0 && typeTableGroup === "list" && !checkedAll && !allIdsNull) {
       const filteredKeys = selectedRowKeys.filter((id) => id > -1);
-      appDispatch((0, import_store12.setSelectedRowKeys)(filteredKeys));
+      appDispatch((0, import_store11.setSelectedRowKeys)(filteredKeys));
     }
     toggleShowGroup();
   };
@@ -7171,8 +7160,8 @@ var tableGroupController = (props) => {
       return;
     }
     const clonedKeys = [...selectedRowKeys];
-    (0, import_store12.setSelectedRowKeys)([...clonedKeys, -1]);
-    setTimeout(() => (0, import_store12.setSelectedRowKeys)(clonedKeys), 500);
+    (0, import_store11.setSelectedRowKeys)([...clonedKeys, -1]);
+    setTimeout(() => (0, import_store11.setSelectedRowKeys)(clonedKeys), 500);
   }, [isQueryFetched]);
   return {
     handleExpandChildGroup,
@@ -7212,20 +7201,21 @@ var import_moment2 = __toESM(require_moment());
 var import_react24 = require("react");
 var searchController = ({
   viewData,
-  actionData,
-  fieldsList,
-  contextSearch,
-  setSearchMap,
-  searchMap
+  model,
+  domain,
+  context,
+  fieldsList
 }) => {
+  const { env } = (0, provider_exports.useEnv)();
   const [filterBy, setFilterBy] = (0, import_react24.useState)(null);
   const [searchBy, setSearchBy] = (0, import_react24.useState)(null);
   const [groupBy, setGroupBy] = (0, import_react24.useState)(null);
   const [selectedTags, setSelectedTags] = (0, import_react24.useState)(null);
   const [searchString, setSearchString] = (0, import_react24.useState)("");
-  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 [searchMap, setSearchMap] = (0, import_react24.useState)({});
+  const actionContext = typeof context === "string" ? (0, import_utils14.evalJSONContext)(context) : context;
+  const contextSearch = { ...env.context, ...actionContext };
+  const domainAction = domain ? Array.isArray(domain) ? [...domain] : (0, import_utils14.evalJSONDomain)(domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -7270,9 +7260,8 @@ var searchController = ({
     }
   };
   (0, import_react24.useEffect)(() => {
-    clearSearch();
     fetchData();
-  }, [aid, model, viewData]);
+  }, [model, viewData]);
   const onChangeSearchInput = (search_string) => {
     setSearchString(search_string);
   };
@@ -7309,27 +7298,27 @@ var searchController = ({
   };
   const formatDomain = () => {
     if (domainAction) {
-      const domain = [];
+      const domain2 = [];
       if (domainAction?.length > 0) {
-        if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
+        if (Object.keys(searchMap).some((key) => !key.includes(import_constants5.SearchType.GROUP))) {
+          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;
@@ -7345,11 +7334,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)(
@@ -7380,16 +7369,16 @@ var searchController = ({
             const contexts = [];
             let groupValues = [];
             objValues?.forEach((objValue) => {
-              const { context, value, active, groupIndex: groupIndex2, isDefault } = objValue;
+              const { context: context2, value, active, groupIndex: groupIndex2, isDefault } = objValue;
               const indexAppend = groupIndex2 != null ? groupIndex2 : viewData?.views?.search?.filters_by?.length ?? 0;
               contexts.push(
-                ...Array.isArray(context?.group_by) ? context.group_by.map((item) => ({ group_by: item })) : [context]
+                ...Array.isArray(context2?.group_by) ? context2.group_by.map((item) => ({ group_by: item })) : [context2]
               );
               groupValues[indexAppend] = {
                 contexts: [
-                  ...Array.isArray(context?.group_by) ? context.group_by.map((item) => ({
+                  ...Array.isArray(context2?.group_by) ? context2.group_by.map((item) => ({
                     group_by: item
-                  })) : [context]
+                  })) : [context2]
                 ],
                 strings: isDefault ? [value] : [...groupValues[indexAppend]?.strings ?? [], value]
               };
@@ -7416,39 +7405,38 @@ var searchController = ({
     [searchMap]
   );
   (0, import_react24.useEffect)(() => {
-    setSelectedTags(null);
     setTagSearch(searchMap);
   }, [searchMap]);
   const handleAddTagSearch = (tag) => {
     const {
-      domain,
+      domain: domain2,
       groupIndex,
       value,
       type,
       title,
-      context,
+      context: context2,
       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(context) : 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({
-          ...context,
+        domain: domain2 ? domainFormat.toList({
+          ...context2,
           self: value
         }) : null
       });
     } else if (type === import_constants5.SearchType.GROUP) {
       addSearchItems(`${import_constants5.SearchType.GROUP}`, {
         ...tag,
-        domain: domain ? domainFormat.toList({
-          context,
+        domain: domain2 ? domainFormat.toList({
+          context: context2,
           self: value
         }) : null
       });
@@ -7468,7 +7456,8 @@ var searchController = ({
     removeSearchItems,
     onSearchString: onChangeSearchInput,
     handleAddTagSearch,
-    domain: formatDomain()
+    domain: formatDomain(),
+    context: contextSearch
   };
 };