@fctc/widget-logic 1.9.3 → 1.9.5

package/dist/widget.mjs

@@ -4978,6 +4978,7 @@ var many2oneFieldController = (props) => {
     options: fieldOptions,
     showDetail
   } = props;
+  const { env } = (0, provider_exports.useEnv)();
   const [options, setOptions] = useState7([]);
   const [inputValue, setInputValue] = useState7("");
   const [debouncedInputValue] = useDebounce(inputValue, 1e3);
@@ -4987,13 +4988,12 @@ var many2oneFieldController = (props) => {
   const [domainObject, setDomainObject] = useState7(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: useGetSelection3 } = (0, provider_exports.useService)();
   const data = {
@@ -5165,15 +5165,9 @@ var many2oneButtonController = (props) => {
 
 // src/widget/basic/many2many-field/controller.ts
 import { useEffect as useEffect11, useMemo as useMemo10, useState as useState8 } from "react";
-import {
-  useAppDispatch as useAppDispatch5,
-  setFirstDomain,
-  setViewDataStore,
-  setPage,
-  setGroupByDomain
-} from "@fctc/interface-logic/store";
 import {
   evalJSONContext as evalJSONContext4,
+  evalJSONDomain as evalJSONDomain4,
   formatSortingString as formatSortingString2
 } from "@fctc/interface-logic/utils";
 var many2manyFieldController = (props) => {
@@ -5181,45 +5175,43 @@ var many2manyFieldController = (props) => {
     relation,
     domain,
     context,
+    options,
     tab,
-    model,
-    aid,
     setSelectedRowKeys: setSelectedRowKeys4,
-    fields,
-    setFields,
     groupByDomain,
-    page,
-    options,
-    sessionStorageUtils
+    enabled: enabledCallAPI
   } = props;
-  const appDispatch = useAppDispatch5();
-  const actionData = sessionStorageUtils.getActionData();
-  const [debouncedPage] = useDebounce(page, 500);
-  const [order, setOrder] = useState8();
-  const [isLoadedData, setIsLoadedData] = useState8(false);
-  const [domainMany2Many, setDomainMany2Many] = useState8(domain);
   const { env } = (0, provider_exports.useEnv)();
   const { useGetView: useGetView2, useGetListData: useGetListData3, useGetFormView } = (0, provider_exports.useService)();
+  const [order, setOrder] = useState8();
+  const [isLoadedData, setIsLoadedData] = useState8(false);
+  const [page, setPage] = useState8(0);
+  const [domainMany2Many, setDomainMany2Many] = useState8(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 = useMemo10(
     () => ({
       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 = useMemo10(() => {
@@ -5238,26 +5230,15 @@ var many2manyFieldController = (props) => {
   const optionsObject = tab?.options ? evalJSONContext4(tab?.options) : (options ? evalJSONContext4(options) : {}) || {};
   const fetchData = async () => {
     try {
-      setDomainMany2Many(domain);
-      appDispatch(setFirstDomain(domain));
-      appDispatch(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(setPage(0));
+      const domainParse = typeof domain === "string" ? evalJSONDomain4(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,
@@ -5270,16 +5251,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 ? formatSortingString2(default_order) : ""
   };
-  const enabled = isLoadedData && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
+  const enabled = enabledCallAPI && isLoadedData && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
   const {
     data: dataResponse,
-    isLoading: isDataLoading,
-    isFetched: isDataResponseFetched,
+    isLoading,
+    isFetched,
     isPlaceholderData
   } = useGetListData3(data, queryKey, enabled);
   useEffect11(() => {
@@ -5287,12 +5268,7 @@ var many2manyFieldController = (props) => {
       fetchData();
     }
     return () => {
-      appDispatch(setGroupByDomain(null));
-      setFields((prevFields) => ({
-        ...prevFields,
-        [`${aid}_${relation}_popupmany2many`]: null
-      }));
-      appDispatch(setPage(0));
+      setPage(0);
       setSelectedRowKeys4([]);
       setDomainMany2Many(null);
       setIsLoadedData(false);
@@ -5300,44 +5276,19 @@ var many2manyFieldController = (props) => {
   }, [viewResponse]);
   const { rows, columns, typeTable } = 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
-  });
-  useEffect11(() => {
-    if (isSuccess && dataFormViewResponse) {
-      sessionStorage.setItem("actionData", JSON.stringify(dataFormViewResponse));
-      window.location.href = `/form/menu?model=${relation}`;
-    }
-  }, [isSuccess]);
   useEffect11(() => {
     if (domainMany2Many && !isLoadedData) {
       setIsLoadedData(true);
     }
   }, [domainMany2Many]);
   const handleCreateNewOnPage = async () => {
-    try {
-      refetch();
-    } catch (error) {
-      console.log(error);
-    }
   };
   return {
     handleCreateNewOnPage,
@@ -5345,9 +5296,13 @@ var many2manyFieldController = (props) => {
     rows,
     columns,
     typeTable,
-    isDataLoading,
-    isDataResponseFetched,
-    isPlaceholderData
+    isLoading,
+    isFetched,
+    isPlaceholderData,
+    setPage,
+    page,
+    domain: domainMany2Many,
+    setDomain: setDomainMany2Many
   };
 };
 
@@ -5356,7 +5311,7 @@ import { useMemo as useMemo11 } from "react";
 import { WIDGETAVATAR, WIDGETCOLOR } from "@fctc/interface-logic/constants";
 import { getEnv as getEnv7 } from "@fctc/interface-logic/environment";
 import { useGetSelection as useGetSelection2 } from "@fctc/interface-logic/hooks";
-import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain4 } from "@fctc/interface-logic/utils";
+import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
 var many2manyTagsController = (props) => {
   const {
     relation,
@@ -5370,7 +5325,7 @@ var many2manyTagsController = (props) => {
   const env = getEnv7();
   const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
   const domainObject = useMemo11(
-    () => evalJSONDomain4(domain, JSON.parse(JSON.stringify(formValues || {}))),
+    () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
   const data = {
@@ -5413,7 +5368,7 @@ var many2manyTagsController = (props) => {
 
 // src/widget/basic/status-bar-field/controller.ts
 import { useState as useState9 } from "react";
-import { evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
+import { evalJSONDomain as evalJSONDomain6 } from "@fctc/interface-logic/utils";
 var durationController = (props) => {
   const { relation, domain, formValues, name, id, model, onRefetch } = props;
   const specification = {
@@ -5429,7 +5384,7 @@ var durationController = (props) => {
   const listDataProps = {
     model: relation,
     specification,
-    domain: evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues))),
+    domain: evalJSONDomain6(domain, JSON.parse(JSON.stringify(formValues))),
     limit: 10,
     offset: 0,
     fields: "",
@@ -6615,7 +6570,7 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-body/controller.ts
-import { useAppDispatch as useAppDispatch6, setSelectedRowKeys } from "@fctc/interface-logic/store";
+import { useAppDispatch as useAppDispatch5, setSelectedRowKeys } from "@fctc/interface-logic/store";
 import { useEffect as useEffect13, useMemo as useMemo12 } from "react";
 var tableBodyController = (props) => {
   const {
@@ -6628,7 +6583,7 @@ var tableBodyController = (props) => {
     selectedRowKeysRef,
     onClickRow
   } = props;
-  const appDispatch = useAppDispatch6();
+  const appDispatch = useAppDispatch5();
   const checked = useMemo12(() => {
     if (!row?.id) return false;
     if (selectedRowKeys?.includes(row.id)) {
@@ -6683,14 +6638,14 @@ var tableBodyController = (props) => {
 
 // src/widget/advance/table/table-head/controller.ts
 import {
-  useAppDispatch as useAppDispatch7,
+  useAppDispatch as useAppDispatch6,
   useAppSelector as useAppSelector4,
   selectSearch as selectSearch3,
   setSelectedRowKeys as setSelectedRowKeys2
 } from "@fctc/interface-logic/store";
 var tableHeadController = (props) => {
   const { typeTable, rows, selectedRowKeysRef } = props;
-  const appDispatch = useAppDispatch7();
+  const appDispatch = useAppDispatch6();
   const { groupByDomain } = useAppSelector4(selectSearch3);
   const handleCheckBoxAll = (event) => {
     if (event?.target?.checked && typeTable === "list") {
@@ -6816,7 +6771,7 @@ import {
   useAppSelector as useAppSelector6,
   selectSearch as selectSearch5,
   selectList as selectList4,
-  useAppDispatch as useAppDispatch8,
+  useAppDispatch as useAppDispatch7,
   setSelectedRowKeys as setSelectedRowKeys3
 } from "@fctc/interface-logic/store";
 
@@ -6849,7 +6804,7 @@ var tableGroupController = (props) => {
   const [pageGroup, setPageGroup] = useState14(0);
   const { groupByDomain, selectedTags } = useAppSelector6(selectSearch5);
   const { selectedRowKeys } = useAppSelector6(selectList4);
-  const appDispatch = useAppDispatch8();
+  const appDispatch = useAppDispatch7();
   const { toDataJS } = useOdooDataTransform();
   const initVal = toDataJS(row, viewData, model);
   const [isShowGroup, setIsShowGroup] = useState14(false);
@@ -6990,7 +6945,7 @@ var import_moment2 = __toESM(require_moment());
 import { SearchType } from "@fctc/interface-logic/constants";
 import {
   domainHelper as domainHelper2,
-  evalJSONDomain as evalJSONDomain6,
+  evalJSONDomain as evalJSONDomain7,
   validateAndParseDate
 } from "@fctc/interface-logic/utils";
 import { useCallback as useCallback3, useEffect as useEffect16, useState as useState15 } from "react";
@@ -7007,7 +6962,7 @@ var searchController = ({
   const [groupBy, setGroupBy] = useState15(null);
   const [selectedTags, setSelectedTags] = useState15(null);
   const [searchString, setSearchString] = useState15("");
-  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : evalJSONDomain6(actionData?.domain, contextSearch) : [];
+  const domainAction = actionData?.domain ? Array.isArray(actionData?.domain) ? [...actionData?.domain] : evalJSONDomain7(actionData?.domain, contextSearch) : [];
   const aid = actionData?.id;
   const model = actionData?.res_model;
   const clearSearch = () => {

package/package.json

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