@fctc/widget-logic 2.5.0 → 2.5.2

package/dist/index.mjs

@@ -4610,9 +4610,6 @@ var useViewV2 = ({
 }) => {
   const { useGetView: useGetView2 } = (0, provider_exports.useService)();
   const viewParams = useMemo3(() => {
-    if (!action) {
-      return void 0;
-    }
     return {
       model,
       views,
@@ -5572,27 +5569,69 @@ var many2oneButtonController = (props) => {
 };
 
 // src/widget/basic/many2many-field/controller.ts
-import { useEffect as useEffect11, useState as useState8 } from "react";
-import { evalJSONContext as evalJSONContext4, evalJSONDomain as evalJSONDomain4 } from "@fctc/interface-logic/utils";
+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";
 var many2manyFieldController = (props) => {
-  const { relation, domain, context, options, tab, setSelectedRowKeys: setSelectedRowKeys2 } = props;
+  const {
+    relation,
+    domain,
+    context,
+    options,
+    tab,
+    setSelectedRowKeys: setSelectedRowKeys2,
+    groupByDomain,
+    enabled: enabledCallAPI,
+    actionData
+  } = props;
   const { env } = (0, provider_exports.useEnv)();
-  const { useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
+  const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
+  const [order, setOrder] = useState8();
   const [page, setPage] = useState8(0);
   const [domainMany2Many, setDomainMany2Many] = useState8(null);
-  const { action } = useAppProvider();
+  const [debouncedPage] = useDebounce(page, 500);
   const contextObject = {
     ...env.context,
     ...context || {}
   };
-  const { data: viewResponse } = useViewV2({
-    model: String(relation),
+  const viewParams = {
+    model: 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 {
@@ -5603,17 +5642,32 @@ 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,
-    isLoading
-  } = useListData({
-    action,
-    context,
-    model: String(relation),
-    viewData: viewResponse
-  });
+    isPlaceholderData
+  } = useGetListData2(data, queryKey, enabled);
   useEffect11(() => {
     if (viewResponse) {
       fetchData();
@@ -5644,31 +5698,7 @@ 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,
@@ -5691,7 +5721,7 @@ var many2manyFieldController = (props) => {
 };
 
 // src/widget/basic/many2many-tags-field/controller.ts
-import { useMemo as useMemo9 } from "react";
+import { useMemo as useMemo10 } 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) => {
@@ -5709,7 +5739,7 @@ var many2manyTagsController = (props) => {
   const { env } = (0, provider_exports.useEnv)();
   const { useGetSelection: useGetSelection3 } = (0, provider_exports.useService)();
   const addtionalFields = optionsFields ? evalJSONContext5(optionsFields) : null;
-  const domainObject = useMemo9(
+  const domainObject = useMemo10(
     () => evalJSONDomain5(domain, JSON.parse(JSON.stringify(formValues || {}))),
     [domain, formValues]
   );
@@ -6941,7 +6971,7 @@ var binaryFieldController = (props) => {
 };
 
 // src/widget/advance/table/table-head/controller.ts
-import { useMemo as useMemo10, useRef as useRef5 } from "react";
+import { useMemo as useMemo11, useRef as useRef5 } from "react";
 var tableHeadController = (props) => {
   const {
     typeTable,
@@ -6954,19 +6984,19 @@ var tableHeadController = (props) => {
   const { rowIds: recordIds } = useGetRowIds(tableRef);
   const selectedRowKeysRef = useRef5(recordIds);
   const isGroupTable = typeTable === "group";
-  const recordsCheckedGroup = useMemo10(() => {
+  const recordsCheckedGroup = useMemo11(() => {
     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 = useMemo10(() => {
+  const isAllGroupChecked = useMemo11(() => {
     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 = useMemo10(() => {
+  const isAllNormalChecked = useMemo11(() => {
     if (isGroupTable || !selectedRowKeys?.length || !rows?.length) return false;
     return selectedRowKeys.length === rows.length && selectedRowKeys.every(
       (id) => rows.some((record) => record.id === id)
@@ -7096,7 +7126,7 @@ var tableController = ({ data }) => {
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo11, useState as useState14 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo12, useState as useState14 } from "react";
 import {
   useAppSelector as useAppSelector2,
   selectList
@@ -7124,7 +7154,7 @@ var tableGroupController = (props) => {
     fromEnd: 1
   });
   const domain = row?.__domain;
-  const processedData = useMemo11(() => {
+  const processedData = useMemo12(() => {
     const calculateColSpanEmpty = () => {
       const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
@@ -7139,7 +7169,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo11(() => {
+  const shouldFetchData = useMemo12(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;
@@ -7341,7 +7371,7 @@ var searchController = ({
   const formatDomain = () => {
     if (domainAction) {
       const domain2 = [];
-      if (domainAction?.length > 0) {
+      if (Array.isArray(domainAction) && domainAction.length > 0) {
         if (Object.keys(searchMap).some((key) => !key.includes(SearchType.GROUP))) {
           domain2.push("&");
         }

package/dist/widget.d.mts

@@ -1,10 +1,8 @@
 import * as react from 'react';
 import { ChangeEvent } from 'react';
 import { IInputFieldProps } from './types.mjs';
-import { V as ViewResponse } from './use-view-v2-BWHqxo3S.mjs';
 import moment from 'moment';
 import '@fctc/interface-logic/types';
-import '@tanstack/query-core';
 
 type TStatus = 'normal' | 'done' | 'blocked';
 interface TStatusDropdownFieldProps extends IInputFieldProps {
@@ -85,7 +83,7 @@ declare const many2manyFieldController: (props: IMany2ManyControllerProps) => {
     isPlaceholderData: boolean;
     setPage: react.Dispatch<react.SetStateAction<number>>;
     page: number;
-    viewData: ViewResponse | undefined;
+    viewData: any;
     domain: any;
     setDomain: react.Dispatch<any>;
     searchController: {

package/dist/widget.d.ts

@@ -1,10 +1,8 @@
 import * as react from 'react';
 import { ChangeEvent } from 'react';
 import { IInputFieldProps } from './types.js';
-import { V as ViewResponse } from './use-view-v2-BWHqxo3S.js';
 import moment from 'moment';
 import '@fctc/interface-logic/types';
-import '@tanstack/query-core';
 
 type TStatus = 'normal' | 'done' | 'blocked';
 interface TStatusDropdownFieldProps extends IInputFieldProps {
@@ -85,7 +83,7 @@ declare const many2manyFieldController: (props: IMany2ManyControllerProps) => {
     isPlaceholderData: boolean;
     setPage: react.Dispatch<react.SetStateAction<number>>;
     page: number;
-    viewData: ViewResponse | undefined;
+    viewData: any;
     domain: any;
     setDomain: react.Dispatch<any>;
     searchController: {

package/dist/widget.js

@@ -4320,34 +4320,6 @@ __reExport(utils_exports, require("@fctc/interface-logic/utils"));
 
 // src/hooks/core/use-view-v2.ts
 var import_react7 = require("react");
-var useViewV2 = ({
-  action,
-  context,
-  aid,
-  views,
-  model
-}) => {
-  const { useGetView: useGetView2 } = (0, provider_exports.useService)();
-  const viewParams = (0, import_react7.useMemo)(() => {
-    if (!action) {
-      return void 0;
-    }
-    return {
-      model,
-      views,
-      context,
-      id: isNaN(Number(aid)) ? action?.id : aid
-    };
-  }, [action, context, aid]);
-  const view = useGetView2(
-    viewParams || {},
-    !!viewParams
-  );
-  return {
-    ...view,
-    context
-  };
-};
 
 // src/hooks/core/use-company.ts
 var import_react_query3 = require("@tanstack/react-query");
@@ -4363,47 +4335,12 @@ var AppProviderInitialValue = {
   view: {}
 };
 var ReactContext = (0, import_react9.createContext)(AppProviderInitialValue);
-var useAppProvider = () => {
-  const context = (0, import_react9.useContext)(ReactContext);
-  if (!context) {
-    return AppProviderInitialValue;
-  }
-  return context;
-};
 
 // src/hooks/core/use-config.ts
 var import_react10 = require("react");
 
 // src/hooks/core/use-get-specification.ts
 var import_react11 = require("react");
-var useGetSpecification = ({
-  model,
-  viewData,
-  fields
-}) => {
-  const baseModel = (0, import_react11.useMemo)(
-    () => ({
-      name: String(model),
-      view: viewData || {},
-      fields
-    }),
-    [model, viewData]
-  );
-  const initModel = (0, import_hooks3.useModel)();
-  const modelInstance = (0, import_react11.useMemo)(() => {
-    if (viewData) {
-      return initModel.initModel(baseModel);
-    }
-    return null;
-  }, [baseModel, viewData]);
-  const specification = (0, import_react11.useMemo)(() => {
-    if (modelInstance) {
-      return modelInstance.getSpecification();
-    }
-    return null;
-  }, [modelInstance]);
-  return { specification };
-};
 
 // src/hooks/core/use-list-data.ts
 var import_react15 = require("react");
@@ -4493,95 +4430,6 @@ var useGetRowIds = (tableRef) => {
   return { rowIds, refresh: updateVisibleRowIds };
 };
 
-// src/hooks/core/use-list-data.ts
-var useListData = ({
-  action,
-  context,
-  viewData,
-  model
-}) => {
-  const { useGetListData: useGetListData2 } = (0, provider_exports.useService)();
-  const [page, setPage] = (0, import_react15.useState)(0);
-  const [pageLimit, setPageLimit] = (0, import_react15.useState)(10);
-  const [groupByList, setGroupByList] = (0, import_react15.useState)(null);
-  const [domain, setDomain] = (0, import_react15.useState)(null);
-  const [order, setOrder] = (0, import_react15.useState)("");
-  const [mode, setMode] = (0, import_react15.useState)("month");
-  const [type, setType] = (0, import_react15.useState)("list");
-  const [currentDate, setCurrentDate] = (0, import_react15.useState)(/* @__PURE__ */ new Date());
-  const [selectedRowKeys, setSelectedRowKeys2] = (0, import_react15.useState)([]);
-  const [debouncedPage] = useDebounce(page, 500);
-  const [debouncedDomain] = useDebounce(domain, 500);
-  const { specification } = useGetSpecification({
-    model,
-    viewData,
-    fields: viewData?.views?.list?.fields
-  });
-  const listDataProps = (0, import_react15.useMemo)(() => {
-    if (!viewData || !action || !context) {
-      return null;
-    }
-    const domainParse = type === "calendar" ? getDateRange(currentDate, mode) : action?.domain ? Array.isArray(action?.domain) ? [...action?.domain] : (0, import_utils4.evalJSONDomain)(action?.domain, context) : [];
-    const limit = type === "calendar" ? 2500 : pageLimit;
-    const offset = debouncedPage * pageLimit;
-    const fields = type === "calendar" ? convertFieldsToArray(viewData?.views?.calendar?.fields) || [] : typeof groupByList === "object" ? groupByList?.fields : void 0;
-    const groupby = typeof groupByList === "object" ? [groupByList?.contexts?.[0]?.group_by] : [];
-    const sort = order ? order : viewData?.views?.list?.default_order ? (0, import_utils4.formatSortingString)(viewData?.views?.list?.default_order) : "";
-    return {
-      model: action.res_model,
-      specification,
-      domain: domainParse,
-      limit,
-      offset,
-      fields,
-      groupby,
-      context,
-      sort,
-      type
-    };
-  }, [
-    action,
-    context,
-    currentDate,
-    groupByList,
-    mode,
-    order,
-    debouncedPage,
-    pageLimit,
-    type,
-    debouncedDomain
-  ]);
-  const list = useGetListData2(
-    listDataProps,
-    [listDataProps],
-    !!listDataProps && !!specification && !(0, import_utils4.isObjectEmpty)(specification)
-  );
-  return {
-    ...list,
-    state: {
-      specification,
-      type,
-      page,
-      mode,
-      order,
-      domain: listDataProps?.domain,
-      pageLimit,
-      groupByList,
-      currentDate,
-      selectedRowKeys,
-      setType,
-      setMode,
-      setPage,
-      setOrder,
-      setDomain,
-      setPageLimit,
-      setGroupByList,
-      setCurrentDate,
-      setSelectedRowKeys: setSelectedRowKeys2
-    }
-  };
-};
-
 // src/store.ts
 var store_exports = {};
 __reExport(store_exports, require("@fctc/interface-logic/store"));
@@ -4797,24 +4645,62 @@ 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 } = props;
+  const {
+    relation,
+    domain,
+    context,
+    options,
+    tab,
+    setSelectedRowKeys: setSelectedRowKeys2,
+    groupByDomain,
+    enabled: enabledCallAPI,
+    actionData
+  } = props;
   const { env } = (0, provider_exports.useEnv)();
-  const { useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
+  const { useGetView: useGetView2, useGetListData: useGetListData2, useGetFormView: useGetFormView2 } = (0, provider_exports.useService)();
+  const [order, setOrder] = (0, import_react17.useState)();
   const [page, setPage] = (0, import_react17.useState)(0);
   const [domainMany2Many, setDomainMany2Many] = (0, import_react17.useState)(null);
-  const { action } = useAppProvider();
+  const [debouncedPage] = useDebounce(page, 500);
   const contextObject = {
     ...env.context,
     ...context || {}
   };
-  const { data: viewResponse } = useViewV2({
-    model: String(relation),
+  const viewParams = {
+    model: 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_hooks3.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 {
@@ -4825,17 +4711,32 @@ 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,
-    isLoading
-  } = useListData({
-    action,
-    context,
-    model: String(relation),
-    viewData: viewResponse
-  });
+    isPlaceholderData
+  } = useGetListData2(data, queryKey, enabled);
   (0, import_react17.useEffect)(() => {
     if (viewResponse) {
       fetchData();
@@ -4866,31 +4767,7 @@ 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,
@@ -6555,7 +6432,7 @@ var searchController = ({
   const formatDomain = () => {
     if (domainAction) {
       const domain2 = [];
-      if (domainAction?.length > 0) {
+      if (Array.isArray(domainAction) && domainAction.length > 0) {
         if (Object.keys(searchMap).some((key) => !key.includes(import_constants3.SearchType.GROUP))) {
           domain2.push("&");
         }