@fctc/widget-logic 2.4.10 → 2.5.0

package/dist/index.js

@@ -5296,7 +5296,9 @@ var many2oneFieldController = (props) => {
     name,
     context: fieldContext,
     options: fieldOptions,
-    showDetail
+    showDetail,
+    service,
+    xNode
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const [options, setOptions] = (0, import_react16.useState)([]);
@@ -5327,6 +5329,7 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
+  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -5334,7 +5337,9 @@ var many2oneFieldController = (props) => {
   } = useGetSelection3({
     data,
     queryKey,
-    enabled: false
+    enabled: false,
+    service,
+    xNode
   });
   const selectOptions = (0, import_react16.useMemo)(() => {
     return dataOfSelection?.records?.map((val) => ({
@@ -5461,7 +5466,7 @@ var import_environment2 = require("@fctc/interface-logic/environment");
 var import_hooks6 = require("@fctc/interface-logic/hooks");
 var import_utils7 = require("@fctc/interface-logic/utils");
 var many2oneButtonController = (props) => {
-  const { domain, methods, relation } = props;
+  const { domain, methods, relation, service, xNode } = props;
   const actionDataString = sessionStorage.getItem("actionData");
   const env = (0, import_environment2.getEnv)();
   const domainObject = (0, import_utils7.evalJSONDomain)(domain, methods?.getValues() || {});
@@ -5472,7 +5477,9 @@ var many2oneButtonController = (props) => {
       domain: domainObject,
       context: { ...env.context, ...(0, import_utils7.evalJSONContext)(actionData?.context) }
     },
-    queryKey: [`data_${relation}`, domainObject]
+    queryKey: [`data_${relation}`, domainObject],
+    service,
+    xNode
   });
   const options = dataOfSelection?.records?.map((val) => ({
     value: val.id,
@@ -5487,62 +5494,24 @@ var many2oneButtonController = (props) => {
 var import_react17 = require("react");
 var import_utils8 = require("@fctc/interface-logic/utils");
 var many2manyFieldController = (props) => {
-  const {
-    relation,
-    domain,
-    context,
-    options,
-    tab,
-    setSelectedRowKeys: setSelectedRowKeys2,
-    groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
-  } = props;
+  const { relation, domain, context, options, tab, setSelectedRowKeys: setSelectedRowKeys2 } = props;
   const { env } = (0, provider_exports.useEnv)();
-  const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
-  const [order, setOrder] = (0, import_react17.useState)();
+  const { useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
   const [page, setPage] = (0, import_react17.useState)(0);
   const [domainMany2Many, setDomainMany2Many] = (0, import_react17.useState)(null);
-  const [debouncedPage] = useDebounce(page, 500);
+  const { action } = useAppProvider();
   const contextObject = {
     ...env.context,
     ...context || {}
   };
-  const viewParams = {
-    model: relation,
+  const { data: viewResponse } = useViewV2({
+    model: String(relation),
     views: [
       [false, "list"],
       [false, "search"]
     ],
     context: contextObject
-  };
-  const { data: viewResponse } = useGetView2(viewParams, enabledCallAPI);
-  const baseModel = (0, import_react17.useMemo)(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = (0, import_hooks2.useModel)();
-  const modelInstance = (0, import_react17.useMemo)(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = (0, import_react17.useMemo)(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
-  const default_order = viewResponse && viewResponse?.views?.list?.default_order;
+  });
   const optionsObject = tab?.options ? (0, import_utils8.evalJSONContext)(tab?.options) : (options ? (0, import_utils8.evalJSONContext)(options) : {}) || {};
   const fetchData = async () => {
     try {
@@ -5553,32 +5522,17 @@ var many2manyFieldController = (props) => {
       console.log(err);
     }
   };
-  const queryKey = [
-    `view-${relation}`,
-    specification,
-    domainMany2Many,
-    debouncedPage,
-    groupByDomain,
-    order
-  ];
-  const data = {
-    model: relation,
-    specification,
-    domain: domainMany2Many,
-    offset: debouncedPage * 10,
-    limit: 10,
-    context: contextObject,
-    fields: groupByDomain?.fields,
-    groupby: [groupByDomain?.contexts[0]?.group_by],
-    sort: order ? order : default_order ? (0, import_utils8.formatSortingString)(default_order) : ""
-  };
-  const enabled = enabledCallAPI && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
   const {
     data: dataResponse,
-    isLoading,
     isFetched,
-    isPlaceholderData
-  } = useGetListData2(data, queryKey, enabled);
+    isPlaceholderData,
+    isLoading
+  } = useListData({
+    action,
+    context,
+    model: String(relation),
+    viewData: viewResponse
+  });
   (0, import_react17.useEffect)(() => {
     if (viewResponse) {
       fetchData();
@@ -5609,7 +5563,31 @@ var many2manyFieldController = (props) => {
       )?.map((col) => ({ ...col.field })) ?? []
     ]
   });
+  const {
+    refetch,
+    data: dataFormViewResponse,
+    isSuccess
+  } = useGetFormView2({
+    data: {
+      id: null,
+      model: relation ?? "",
+      context: contextObject
+    },
+    queryKey: [`form-view-action-${relation}`],
+    enabled: false
+  });
+  (0, import_react17.useEffect)(() => {
+    if (isSuccess && dataFormViewResponse) {
+      sessionStorage.setItem("actionData", JSON.stringify(dataFormViewResponse));
+      window.location.href = `/form/menu?model=${relation}`;
+    }
+  }, [isSuccess]);
   const handleCreateNewOnPage = async () => {
+    try {
+      refetch();
+    } catch (error) {
+      console.log(error);
+    }
   };
   return {
     handleCreateNewOnPage,
@@ -5642,7 +5620,9 @@ var many2manyTagsController = (props) => {
     options: optionsFields,
     widget,
     formValues,
-    placeholderNoOption
+    placeholderNoOption,
+    service,
+    xNode
   } = props;
   const isUser = relation === "res.users" || relation === "res.partner";
   const { env } = (0, provider_exports.useEnv)();
@@ -5665,9 +5645,12 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
+  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
-    queryKey: [`data_${relation}`, domainObject]
+    queryKey: [`data_${relation}`, domainObject],
+    service,
+    xNode
   });
   const customNoOptionsMessage = () => placeholderNoOption;
   const tranfer = (data2) => {

package/dist/index.mjs

@@ -5377,7 +5377,9 @@ var many2oneFieldController = (props) => {
     name,
     context: fieldContext,
     options: fieldOptions,
-    showDetail
+    showDetail,
+    service,
+    xNode
   } = props;
   const { env } = (0, provider_exports.useEnv)();
   const [options, setOptions] = useState7([]);
@@ -5408,6 +5410,7 @@ var many2oneFieldController = (props) => {
     }
   };
   const queryKey = [`data_${relation}`, domainObject];
+  console.log("data", data);
   const {
     data: dataOfSelection,
     refetch,
@@ -5415,7 +5418,9 @@ var many2oneFieldController = (props) => {
   } = useGetSelection3({
     data,
     queryKey,
-    enabled: false
+    enabled: false,
+    service,
+    xNode
   });
   const selectOptions = useMemo8(() => {
     return dataOfSelection?.records?.map((val) => ({
@@ -5542,7 +5547,7 @@ import { getEnv as getEnv2 } from "@fctc/interface-logic/environment";
 import { useGetSelection as useGetSelection2 } from "@fctc/interface-logic/hooks";
 import { evalJSONDomain as evalJSONDomain3, evalJSONContext as evalJSONContext3 } from "@fctc/interface-logic/utils";
 var many2oneButtonController = (props) => {
-  const { domain, methods, relation } = props;
+  const { domain, methods, relation, service, xNode } = props;
   const actionDataString = sessionStorage.getItem("actionData");
   const env = getEnv2();
   const domainObject = evalJSONDomain3(domain, methods?.getValues() || {});
@@ -5553,7 +5558,9 @@ var many2oneButtonController = (props) => {
       domain: domainObject,
       context: { ...env.context, ...evalJSONContext3(actionData?.context) }
     },
-    queryKey: [`data_${relation}`, domainObject]
+    queryKey: [`data_${relation}`, domainObject],
+    service,
+    xNode
   });
   const options = dataOfSelection?.records?.map((val) => ({
     value: val.id,
@@ -5565,69 +5572,27 @@ var many2oneButtonController = (props) => {
 };
 
 // src/widget/basic/many2many-field/controller.ts
-import { useEffect as useEffect11, useMemo as useMemo9, useState as useState8 } from "react";
-import {
-  evalJSONContext as evalJSONContext4,
-  evalJSONDomain as evalJSONDomain4,
-  formatSortingString as formatSortingString2
-} from "@fctc/interface-logic/utils";
+import { useEffect as useEffect11, useState as useState8 } from "react";
+import { evalJSONContext as evalJSONContext4, evalJSONDomain as evalJSONDomain4 } from "@fctc/interface-logic/utils";
 var many2manyFieldController = (props) => {
-  const {
-    relation,
-    domain,
-    context,
-    options,
-    tab,
-    setSelectedRowKeys: setSelectedRowKeys2,
-    groupByDomain,
-    enabled: enabledCallAPI,
-    actionData
-  } = props;
+  const { relation, domain, context, options, tab, setSelectedRowKeys: setSelectedRowKeys2 } = props;
   const { env } = (0, provider_exports.useEnv)();
-  const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
-  const [order, setOrder] = useState8();
+  const { useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
   const [page, setPage] = useState8(0);
   const [domainMany2Many, setDomainMany2Many] = useState8(null);
-  const [debouncedPage] = useDebounce(page, 500);
+  const { action } = useAppProvider();
   const contextObject = {
     ...env.context,
     ...context || {}
   };
-  const viewParams = {
-    model: relation,
+  const { data: viewResponse } = useViewV2({
+    model: String(relation),
     views: [
       [false, "list"],
       [false, "search"]
     ],
     context: contextObject
-  };
-  const { data: viewResponse } = useGetView2(viewParams, enabledCallAPI);
-  const baseModel = useMemo9(
-    () => ({
-      name: String(relation),
-      view: viewResponse || {},
-      actContext: contextObject,
-      fields: [
-        ...Object.values(viewResponse?.views?.list?.fields ?? {}),
-        ...tab?.fields ? tab.fields : []
-      ]
-    }),
-    [relation, viewResponse]
-  );
-  const initModel = useModel();
-  const modelInstance = useMemo9(() => {
-    if (viewResponse) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewResponse]);
-  const specification = useMemo9(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
-  const default_order = viewResponse && viewResponse?.views?.list?.default_order;
+  });
   const optionsObject = tab?.options ? evalJSONContext4(tab?.options) : (options ? evalJSONContext4(options) : {}) || {};
   const fetchData = async () => {
     try {
@@ -5638,32 +5603,17 @@ var many2manyFieldController = (props) => {
       console.log(err);
     }
   };
-  const queryKey = [
-    `view-${relation}`,
-    specification,
-    domainMany2Many,
-    debouncedPage,
-    groupByDomain,
-    order
-  ];
-  const data = {
-    model: relation,
-    specification,
-    domain: domainMany2Many,
-    offset: debouncedPage * 10,
-    limit: 10,
-    context: contextObject,
-    fields: groupByDomain?.fields,
-    groupby: [groupByDomain?.contexts[0]?.group_by],
-    sort: order ? order : default_order ? formatSortingString2(default_order) : ""
-  };
-  const enabled = enabledCallAPI && !!specification && !!relation && !!domainMany2Many && !!viewResponse;
   const {
     data: dataResponse,
-    isLoading,
     isFetched,
-    isPlaceholderData
-  } = useGetListData2(data, queryKey, enabled);
+    isPlaceholderData,
+    isLoading
+  } = useListData({
+    action,
+    context,
+    model: String(relation),
+    viewData: viewResponse
+  });
   useEffect11(() => {
     if (viewResponse) {
       fetchData();
@@ -5694,7 +5644,31 @@ var many2manyFieldController = (props) => {
       )?.map((col) => ({ ...col.field })) ?? []
     ]
   });
+  const {
+    refetch,
+    data: dataFormViewResponse,
+    isSuccess
+  } = useGetFormView2({
+    data: {
+      id: null,
+      model: relation ?? "",
+      context: contextObject
+    },
+    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]);
   const handleCreateNewOnPage = async () => {
+    try {
+      refetch();
+    } catch (error) {
+      console.log(error);
+    }
   };
   return {
     handleCreateNewOnPage,
@@ -5717,7 +5691,7 @@ var many2manyFieldController = (props) => {
 };
 
 // src/widget/basic/many2many-tags-field/controller.ts
-import { useMemo as useMemo10 } from "react";
+import { useMemo as useMemo9 } from "react";
 import { WIDGETAVATAR, WIDGETCOLOR } from "@fctc/interface-logic/constants";
 import { evalJSONContext as evalJSONContext5, evalJSONDomain as evalJSONDomain5 } from "@fctc/interface-logic/utils";
 var many2manyTagsController = (props) => {
@@ -5727,13 +5701,15 @@ var many2manyTagsController = (props) => {
     options: optionsFields,
     widget,
     formValues,
-    placeholderNoOption
+    placeholderNoOption,
+    service,
+    xNode
   } = props;
   const isUser = relation === "res.users" || relation === "res.partner";
   const { env } = (0, provider_exports.useEnv)();
   const { useGetSelection: useGetSelection3 } = (0, provider_exports.useService)();
   const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
-  const domainObject = useMemo10(
+  const domainObject = useMemo9(
     () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
@@ -5750,9 +5726,12 @@ var many2manyTagsController = (props) => {
     enabled: true,
     context: env.context
   };
+  console.log("data", data);
   const { data: dataOfSelection } = useGetSelection3({
     data,
-    queryKey: [`data_${relation}`, domainObject]
+    queryKey: [`data_${relation}`, domainObject],
+    service,
+    xNode
   });
   const customNoOptionsMessage = () => placeholderNoOption;
   const tranfer = (data2) => {
@@ -6962,7 +6941,7 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-head/controller.ts
-import { useMemo as useMemo11, useRef as useRef5 } from "react";
+import { useMemo as useMemo10, useRef as useRef5 } from "react";
 var tableHeadController = (props) => {
   const {
     typeTable,
@@ -6975,19 +6954,19 @@ var tableHeadController = (props) => {
   const { rowIds: recordIds } = useGetRowIds(tableRef);
   const selectedRowKeysRef = useRef5(recordIds);
   const isGroupTable = typeTable === "group";
-  const recordsCheckedGroup = useMemo11(() => {
+  const recordsCheckedGroup = useMemo10(() => {
     if (!rows || !groupByList) return 0;
     const groupBy = typeof groupByList === "object" ? groupByList?.contexts?.[0]?.group_by : void 0;
     return countSum(rows, groupBy);
   }, [rows, groupByList]);
-  const isAllGroupChecked = useMemo11(() => {
+  const isAllGroupChecked = useMemo10(() => {
     if (!isGroupTable || !selectedRowKeys?.length) return false;
     const selectedLength = selectedRowKeys.filter((id) => id !== -1).length;
     const allRecordsSelected = recordIds.length === selectedRowKeys.length ? recordIds.length === selectedLength : false;
     const allGroupsSelected = recordsCheckedGroup === selectedRowKeys.length;
     return allGroupsSelected || allRecordsSelected;
   }, [isGroupTable, selectedRowKeys, recordIds, recordsCheckedGroup]);
-  const isAllNormalChecked = useMemo11(() => {
+  const isAllNormalChecked = useMemo10(() => {
     if (isGroupTable || !selectedRowKeys?.length || !rows?.length) return false;
     return selectedRowKeys.length === rows.length && selectedRowKeys.every(
       (id) => rows.some((record) => record.id === id)
@@ -7117,7 +7096,7 @@ var tableController = ({ data }) => {
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo12, useState as useState14 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo11, useState as useState14 } from "react";
 import {
   useAppSelector as useAppSelector2,
   selectList
@@ -7145,7 +7124,7 @@ var tableGroupController = (props) => {
     fromEnd: 1
   });
   const domain = row?.__domain;
-  const processedData = useMemo12(() => {
+  const processedData = useMemo11(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
@@ -7160,7 +7139,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo12(() => {
+  const shouldFetchData = useMemo11(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;