@fctc/widget-logic 1.8.4 → 1.8.5

package/dist/index.mjs

@@ -6583,43 +6583,24 @@ var tableGroupController = (props) => {
 };
 
 // src/widget/advance/search/controller.ts
-var import_moment = __toESM(require_moment());
 import { SearchType } from "@fctc/interface-logic/constants";
-import {
-  domainHelper as domainHelper2,
-  evalJSONContext as evalJSONContext4,
-  evalJSONDomain as evalJSONDomain4,
-  validateAndParseDate
-} from "@fctc/interface-logic/utils";
+import { domainHelper as domainHelper2 } from "@fctc/interface-logic/utils";
 import { useCallback as useCallback3, useEffect as useEffect14, useState as useState10 } from "react";
-
-// src/provider.ts
-var provider_exports = {};
-__reExport(provider_exports, provider_star);
-import * as provider_star from "@fctc/interface-logic/provider";
-
-// src/widget/advance/search/controller.ts
 var searchController = ({
   viewData,
   actionData,
   fieldsList,
-  setDomain
+  contextSearch,
+  setSearchMap,
+  searchMap
 }) => {
-  const { env } = (0, provider_exports.useEnv)();
-  const { context } = actionData || {};
-  const actionContext = typeof context === "string" ? evalJSONContext4(context) : context;
-  const contextSearch = { ...env.context, ...actionContext };
   const [filterBy, setFilterBy] = useState10(null);
   const [searchBy, setSearchBy] = useState10(null);
   const [groupBy, setGroupBy] = useState10(null);
   const [selectedTags, setSelectedTags] = useState10(null);
   const [searchString, setSearchString] = useState10("");
-  const [searchMap, setSearchMap] = useState10({});
-  const [isReadyFormatDomain, setIsReadyFormatDomain] = useState10(false);
-  const [didInit, setDidInit] = useState10(false);
   const aid = actionData?.id;
   const model = actionData?.res_model;
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : evalJSONDomain4(actionData?.domain, contextSearch) : [];
   const clearSearch = () => {
     setFilterBy([]);
     setGroupBy([]);
@@ -6729,16 +6710,16 @@ var searchController = ({
             const contexts = [];
             let groupValues = [];
             objValues?.forEach((objValue) => {
-              const { context: context2, value, active, groupIndex: groupIndex2, isDefault } = objValue;
+              const { context, value, active, groupIndex: groupIndex2, isDefault } = objValue;
               const indexAppend = groupIndex2 != null ? groupIndex2 : viewData?.views?.search?.filters_by?.length ?? 0;
               contexts.push(
-                ...Array.isArray(context2?.group_by) ? context2.group_by.map((item) => ({ group_by: item })) : [context2]
+                ...Array.isArray(context?.group_by) ? context.group_by.map((item) => ({ group_by: item })) : [context]
               );
               groupValues[indexAppend] = {
                 contexts: [
-                  ...Array.isArray(context2?.group_by) ? context2.group_by.map((item) => ({
+                  ...Array.isArray(context?.group_by) ? context.group_by.map((item) => ({
                     group_by: item
-                  })) : [context2]
+                  })) : [context]
                 ],
                 strings: isDefault ? [value] : [...groupValues[indexAppend]?.strings ?? [], value]
               };
@@ -6768,51 +6749,6 @@ var searchController = ({
     setSelectedTags(null);
     setTagSearch(searchMap);
   }, [searchMap]);
-  const formatDomain = () => {
-    if (domainAction) {
-      const domain = [];
-      if (domainAction?.length > 0) {
-        if (Object.keys(searchMap).length > 0) {
-          domain.push("&");
-        }
-        domainAction.forEach((domainItem) => {
-          domain.push(domainItem);
-        });
-      }
-      Object.keys(searchMap).forEach((key, keyIndex, keys) => {
-        if (!key?.includes(SearchType.GROUP)) {
-          if (keys.length > 1 && keyIndex < keys.length - 1) {
-            domain.push("&");
-          }
-          const valuesOfKey = searchMap[key];
-          valuesOfKey.forEach((value, index) => {
-            if (index < valuesOfKey.length - 1) {
-              domain.push("|");
-            }
-            if (value.domain) {
-              domain.push(...value.domain);
-              return;
-            }
-            let valueDomainItem = value?.value;
-            if (value?.modelType === "date") {
-              valueDomainItem = validateAndParseDate(value?.value);
-            } else if (value?.modelType === "datetime") {
-              if (value?.operator === "<=" || value?.operator === "<") {
-                const parsedDate = validateAndParseDate(value?.value, true);
-                const hasTime = (0, import_moment.default)(value?.value).format("HH:mm:ss") !== "00:00:00";
-                valueDomainItem = hasTime ? (0, import_moment.default)(parsedDate).format("YYYY-MM-DD HH:mm:ss") : (0, import_moment.default)(parsedDate).add(1, "day").subtract(1, "second").format("YYYY-MM-DD HH:mm:ss");
-              } else {
-                valueDomainItem = validateAndParseDate(value?.value, true);
-              }
-            }
-            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]);
-          });
-        }
-      });
-      return [...domain];
-    }
-  };
   const handleAddTagSearch = (tag) => {
     const {
       domain,
@@ -6820,7 +6756,7 @@ var searchController = ({
       value,
       type,
       title,
-      context: context2,
+      context,
       active,
       dataIndex
     } = tag;
@@ -6828,13 +6764,13 @@ var searchController = ({
     if (type === SearchType.FILTER) {
       addSearchItems(`${SearchType.FILTER}_${groupIndex}`, {
         ...tag,
-        domain: domain ? domainFormat.toList(context2) : null
+        domain: domain ? domainFormat.toList(context) : null
       });
     } else if (type === SearchType.SEARCH) {
       addSearchItems(`${SearchType.SEARCH}_${String(dataIndex)}`, {
         ...tag,
         domain: domain ? domainFormat.toList({
-          ...context2,
+          ...context,
           self: value
         }) : null
       });
@@ -6842,73 +6778,12 @@ var searchController = ({
       addSearchItems(`${SearchType.GROUP}`, {
         ...tag,
         domain: domain ? domainFormat.toList({
-          context: context2,
+          context,
           self: value
         }) : null
       });
     }
   };
-  useEffect14(() => {
-    if (isReadyFormatDomain) {
-      (0, store_exports.setPage)(0);
-      (0, store_exports.setSelectedRowKeys)([]);
-      const containSearchFilter = selectedTags?.length > 0 && selectedTags?.find(
-        (item) => item?.type === SearchType.FILTER || item?.type === SearchType.SEARCH || item?.type === SearchType.GROUP
-      );
-      if (containSearchFilter || Array.isArray(selectedTags) && selectedTags?.length === 0) {
-        setDomain(formatDomain());
-      }
-    }
-    return () => {
-      setDidInit(false);
-      setIsReadyFormatDomain(false);
-    };
-  }, [selectedTags, isReadyFormatDomain]);
-  useEffect14(() => {
-    if (didInit || selectedTags?.length > 0 || !fieldsList || fieldsList?.length === 0)
-      return;
-    const searchDefaults = Object.entries(actionContext || {}).filter(
-      ([key]) => key.startsWith("search_default_")
-    );
-    const hasGroupBy = viewData?.views?.search?.filters_by?.length > 0;
-    if (searchDefaults.length === 0 && !hasGroupBy) {
-      setIsReadyFormatDomain(true);
-      setDidInit(true);
-      return;
-    }
-    const updatedFilter = filterBy?.map((item) => {
-      const matched = searchDefaults.find(
-        ([key]) => key.split("search_default_")[1] === item.name
-      );
-      if (matched && !item.active) {
-        handleAddTagSearch?.({
-          name: item?.name,
-          value: item?.string ?? item?.help,
-          domain: item?.domain,
-          groupIndex: item?.group_index,
-          type: SearchType.FILTER
-        });
-        return { ...item, active: true };
-      }
-      return item;
-    });
-    if (updatedFilter) setFilterBy(updatedFilter);
-    if (hasGroupBy) {
-      viewData?.views?.search?.filters_by?.forEach((item, idx) => {
-        const groupCtx = evalJSONContext4(item?.context);
-        handleAddTagSearch?.({
-          name: item?.name,
-          value: item?.display_name,
-          type: SearchType.GROUP,
-          context: groupCtx,
-          groupIndex: idx,
-          isDefault: true
-        });
-      });
-      setDidInit(true);
-    }
-    setIsReadyFormatDomain(true);
-  }, [aid, fieldsList]);
   return {
     groupBy,
     searchBy,
@@ -6934,11 +6809,11 @@ import {
   selectSearch as selectSearch6,
   setFirstDomain,
   setViewDataStore,
-  setPage as setPage2,
+  setPage,
   setGroupByDomain
 } from "@fctc/interface-logic/store";
 import {
-  evalJSONContext as evalJSONContext5,
+  evalJSONContext as evalJSONContext4,
   formatSortingString as formatSortingString2
 } from "@fctc/interface-logic/utils";
 var many2manyFieldController = (props) => {
@@ -6949,7 +6824,7 @@ var many2manyFieldController = (props) => {
     tab,
     model,
     aid,
-    setSelectedRowKeys: setSelectedRowKeys5,
+    setSelectedRowKeys: setSelectedRowKeys4,
     fields,
     setFields,
     groupByDomain,
@@ -7003,7 +6878,7 @@ var many2manyFieldController = (props) => {
     return null;
   }, [modelInstance]);
   const default_order = viewResponse && viewResponse?.views?.list?.default_order;
-  const optionsObject = tab?.options ? evalJSONContext5(tab?.options) : (options ? evalJSONContext5(options) : {}) || {};
+  const optionsObject = tab?.options ? evalJSONContext4(tab?.options) : (options ? evalJSONContext4(options) : {}) || {};
   const fetchData = async () => {
     try {
       setDomainMany2Many(domain);
@@ -7019,7 +6894,7 @@ var many2manyFieldController = (props) => {
           [`${aid}_${relation}_popupmany2many`]: modalData
         });
       }
-      appDispatch(setPage2(0));
+      appDispatch(setPage(0));
     } catch (err) {
       console.log(err);
     }
@@ -7060,8 +6935,8 @@ var many2manyFieldController = (props) => {
         ...prevFields,
         [`${aid}_${relation}_popupmany2many`]: null
       }));
-      appDispatch(setPage2(0));
-      setSelectedRowKeys5([]);
+      appDispatch(setPage(0));
+      setSelectedRowKeys4([]);
       setDomainMany2Many(null);
       setIsLoadedData(false);
     };
@@ -7115,7 +6990,7 @@ import { useMemo as useMemo14 } from "react";
 import { WIDGETAVATAR, WIDGETCOLOR } from "@fctc/interface-logic/constants";
 import { getEnv as getEnv9 } from "@fctc/interface-logic/environment";
 import { useGetSelection as useGetSelection3 } from "@fctc/interface-logic/hooks";
-import { evalJSONContext as evalJSONContext6, evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
+import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain4 } from "@fctc/interface-logic/utils";
 var many2manyTagsController = (props) => {
   const {
     relation,
@@ -7127,9 +7002,9 @@ var many2manyTagsController = (props) => {
   } = props;
   const isUser = relation === "res.users" || relation === "res.partner";
   const env = getEnv9();
-  const addtionalFields = optionsFields ? evalJSONContext6(optionsFields) : null;
+  const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
   const domainObject = useMemo14(
-    () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
+    () => evalJSONDomain4(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
   const data = {
@@ -7174,7 +7049,7 @@ var many2manyTagsController = (props) => {
 import { useState as useState12 } from "react";
 import { useGetListData as useGetListData4, useChangeStatus } from "@fctc/interface-logic/hooks";
 import { useAppSelector as useAppSelector8, selectEnv as selectEnv2 } from "@fctc/interface-logic/store";
-import { evalJSONDomain as evalJSONDomain6 } from "@fctc/interface-logic/utils";
+import { evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
 var durationController = (props) => {
   const {
     relation,
@@ -7198,7 +7073,7 @@ var durationController = (props) => {
   const listDataProps = {
     model: relation,
     specification,
-    domain: evalJSONDomain6(domain, JSON.parse(JSON.stringify(formValues))),
+    domain: evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues))),
     limit: 10,
     offset: 0,
     fields: "",
@@ -7246,7 +7121,7 @@ var durationController = (props) => {
 
 // src/widget/basic/priority-field/controller.ts
 import { useSave as useSave2 } from "@fctc/interface-logic/hooks";
-import { evalJSONContext as evalJSONContext7 } from "@fctc/interface-logic/utils";
+import { evalJSONContext as evalJSONContext6 } from "@fctc/interface-logic/utils";
 var priorityFieldController = (props) => {
   const {
     value,
@@ -7261,7 +7136,7 @@ var priorityFieldController = (props) => {
     viewData,
     context
   } = props;
-  const _context = { ...evalJSONContext7(actionData?.context) };
+  const _context = { ...evalJSONContext6(actionData?.context) };
   const contextObject = { ...context, ..._context };
   const defaultPriority = parseInt(value) + 1;
   const label = viewData?.models?.[model]?.[name ?? ""]?.string ?? name;
@@ -7567,7 +7442,7 @@ var downLoadBinaryController = (props) => {
 };
 
 // src/widget/basic/date-field/controller.ts
-var import_moment2 = __toESM(require_moment());
+var import_moment = __toESM(require_moment());
 var DURATIONS = {
   PAST: "past",
   NOW: "now",
@@ -7594,8 +7469,8 @@ var dateFieldController = (props) => {
   const formatDate = showTime ? "DD/MM/YYYY HH:mm:ss" : "DD/MM/YYYY";
   const formatDateParse = showTime ? "YYYY-MM-DD HH:mm:ss" : "YYYY-MM-DD";
   const fieldForCustom = widget === "datetime_custom" || widget === "date_custom";
-  const minNowValue = fieldForCustom && (min === DURATIONS.NOW ? true : typeof min === "string" && Object.keys(formValues)?.includes(min) && formValues?.[min] ? (0, import_moment2.default)(formValues?.[min], formatDateParse).add(7, "hours") : null);
-  const maxNowValue = fieldForCustom && (max === DURATIONS.NOW ? true : typeof max === "string" && Object.keys(formValues)?.includes(max) && formValues?.[max] ? (0, import_moment2.default)(formValues?.[max], formatDateParse).add(7, "hours") : null);
+  const minNowValue = fieldForCustom && (min === DURATIONS.NOW ? true : typeof min === "string" && Object.keys(formValues)?.includes(min) && formValues?.[min] ? (0, import_moment.default)(formValues?.[min], formatDateParse).add(7, "hours") : null);
+  const maxNowValue = fieldForCustom && (max === DURATIONS.NOW ? true : typeof max === "string" && Object.keys(formValues)?.includes(max) && formValues?.[max] ? (0, import_moment.default)(formValues?.[max], formatDateParse).add(7, "hours") : null);
   const years = range(
     minNowValue ? (/* @__PURE__ */ new Date()).getFullYear() : 1990,
     (/* @__PURE__ */ new Date()).getFullYear() + 4,
@@ -7630,8 +7505,8 @@ var dateFieldController = (props) => {
     "December"
   ];
   const customValidateMinMax = (date) => {
-    const selected = (0, import_moment2.default)(date, formatDateParse);
-    const now = (0, import_moment2.default)();
+    const selected = (0, import_moment.default)(date, formatDateParse);
+    const now = (0, import_moment.default)();
     const compareSelected = showTime ? selected : selected.clone().startOf("day");
     const compareNow = showTime ? now : now.clone().startOf("day");
     if (minNowValue) {
@@ -7639,7 +7514,7 @@ var dateFieldController = (props) => {
         return `${i18n_default.t("please_enter")} ${string} ${i18n_default.t(
           "greater_or_equal_now"
         )}`;
-      } else if (import_moment2.default.isMoment(minNowValue)) {
+      } else if (import_moment.default.isMoment(minNowValue)) {
         const compareMin = showTime ? minNowValue : minNowValue.clone().startOf("day");
         if (compareSelected.isBefore(compareMin)) {
           const fieldRelationDate = viewData?.models?.[model]?.[min ?? ""];
@@ -7653,7 +7528,7 @@ var dateFieldController = (props) => {
         return `${i18n_default.t("please_enter")} ${string} ${i18n_default.t(
           "less_or_equal_now"
         )}`;
-      } else if (import_moment2.default.isMoment(maxNowValue)) {
+      } else if (import_moment.default.isMoment(maxNowValue)) {
         const compareMax = showTime ? maxNowValue : maxNowValue.clone().startOf("day");
         if (compareSelected.isAfter(compareMax)) {
           const fieldRelationDate = viewData?.models?.[model]?.[max ?? ""];
@@ -7700,11 +7575,11 @@ var copyLinkButtonController = (props) => {
 // src/widget/basic/color-field/color-controller.ts
 import { getEnv as getEnv10 } from "@fctc/interface-logic/environment";
 import { useSave as useSave3 } from "@fctc/interface-logic/hooks";
-import { evalJSONContext as evalJSONContext8 } from "@fctc/interface-logic/utils";
+import { evalJSONContext as evalJSONContext7 } from "@fctc/interface-logic/utils";
 var colorFieldController = (props) => {
   const { value, isForm, name, formValues, idForm, model, actionData } = props;
   const env = getEnv10();
-  const _context = { ...evalJSONContext8(actionData?.context) || {} };
+  const _context = { ...evalJSONContext7(actionData?.context) || {} };
   const contextObject = { ...env.context, ..._context };
   const idDefault = isForm ? idForm : formValues?.id;
   const { mutate: onSave } = useSave3();
@@ -7861,6 +7736,13 @@ import * as constants_star from "@fctc/interface-logic/constants";
 // src/index.ts
 __reExport(index_exports, constants_exports);
 __reExport(index_exports, environment_exports);
+
+// src/provider.ts
+var provider_exports = {};
+__reExport(provider_exports, provider_star);
+import * as provider_star from "@fctc/interface-logic/provider";
+
+// src/index.ts
 __reExport(index_exports, provider_exports);
 
 // src/services.ts

package/dist/widget.d.mts

@@ -298,7 +298,7 @@ declare const tableGroupController: (props: any) => {
     setPageGroup: react.Dispatch<any>;
 };
 
-declare const searchController: ({ viewData, actionData, fieldsList, setDomain, }: any) => {
+declare const searchController: ({ viewData, actionData, fieldsList, contextSearch, setSearchMap, searchMap, }: any) => {
     groupBy: any;
     searchBy: any;
     filterBy: any;

package/dist/widget.d.ts

@@ -298,7 +298,7 @@ declare const tableGroupController: (props: any) => {
     setPageGroup: react.Dispatch<any>;
 };
 
-declare const searchController: ({ viewData, actionData, fieldsList, setDomain, }: any) => {
+declare const searchController: ({ viewData, actionData, fieldsList, contextSearch, setSearchMap, searchMap, }: any) => {
     groupBy: any;
     searchBy: any;
     filterBy: any;