npm - @fctc/widget-logic - Versions diffs - 6.1.2 → 6.1.4 - Mend

@fctc/widget-logic 6.1.2 → 6.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

package/dist/hooks.d.mts CHANGED Viewed

@@ -796,14 +796,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -840,14 +838,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -884,14 +880,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -928,14 +922,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -972,14 +964,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -1016,14 +1006,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;

package/dist/hooks.d.ts CHANGED Viewed

@@ -796,14 +796,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -840,14 +838,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -884,14 +880,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -928,14 +922,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -972,14 +964,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;
@@ -1016,14 +1006,12 @@ declare const useListData: ({ action, context, viewData, model, service, xNode,
         specification: Record<string, any> | null;
         page: number;
         order: any;
-        orderGroupBy: any;
         domain: any;
         pageLimit: number;
         groupByList: any;
         selectedRowKeys: number[];
         setPage: react.Dispatch<react.SetStateAction<number>>;
         setOrder: react.Dispatch<any>;
-        setOrderGroupBy: react.Dispatch<any>;
         setDomain: react.Dispatch<any>;
         setPageLimit: react.Dispatch<react.SetStateAction<number>>;
         setGroupByList: react.Dispatch<any>;

package/dist/hooks.js CHANGED Viewed

@@ -559,11 +559,20 @@ var useCompany = ({ service }) => {
       service
     });
   };
+  const fetchWesapCompany = async () => {
+    return await getCurrentCompany.mutateAsync({
+      service: "wesap"
+    });
+  };
   const currentCompany = (0, import_react_query3.useQuery)({
     queryKey: ["currentCompany"],
     queryFn: fetchCurrentCompany,
     enabled: !!env?.defaultCompany
   });
+  const wesapCompany = (0, import_react_query3.useQuery)({
+    queryKey: ["wesapCompany"],
+    queryFn: fetchWesapCompany
+  });
   const current_company_id = (0, import_react7.useMemo)(() => {
     return currentCompany.data?.current_company_id;
   }, [currentCompany.data]);
@@ -573,6 +582,14 @@ var useCompany = ({ service }) => {
       setCompanies(companyIDs);
     }
   }, [current_company_id]);
+  (0, import_react7.useEffect)(() => {
+    if (wesapCompany.data) {
+      const allowedCompanies = currentCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
+      if (allowedCompanies.length) {
+        setAllowCompanies(allowedCompanies);
+      }
+    }
+  }, [wesapCompany.data]);
   const getCompanyInfo = useGetCompanyInfo2();
   const companyInfo = (0, import_react_query3.useQuery)({
     queryKey: ["companyInfoQuery", current_company_id],
@@ -902,7 +919,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
   const [domain, setDomain] = (0, import_react14.useState)(null);
   const [order, setOrder] = (0, import_react14.useState)("");
-  const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
   const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -923,7 +939,6 @@ var useListData = ({
     const sort = order ?? (0, import_utils5.formatSortingString)(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -934,8 +949,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -945,8 +959,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -958,8 +971,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
     service,
@@ -971,14 +983,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,

package/dist/hooks.mjs CHANGED Viewed

@@ -540,11 +540,20 @@ var useCompany = ({ service }) => {
       service
     });
   };
+  const fetchWesapCompany = async () => {
+    return await getCurrentCompany.mutateAsync({
+      service: "wesap"
+    });
+  };
   const currentCompany = useQuery3({
     queryKey: ["currentCompany"],
     queryFn: fetchCurrentCompany,
     enabled: !!env?.defaultCompany
   });
+  const wesapCompany = useQuery3({
+    queryKey: ["wesapCompany"],
+    queryFn: fetchWesapCompany
+  });
   const current_company_id = useMemo3(() => {
     return currentCompany.data?.current_company_id;
   }, [currentCompany.data]);
@@ -554,6 +563,14 @@ var useCompany = ({ service }) => {
       setCompanies(companyIDs);
     }
   }, [current_company_id]);
+  useEffect4(() => {
+    if (wesapCompany.data) {
+      const allowedCompanies = currentCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
+      if (allowedCompanies.length) {
+        setAllowCompanies(allowedCompanies);
+      }
+    }
+  }, [wesapCompany.data]);
   const getCompanyInfo = useGetCompanyInfo2();
   const companyInfo = useQuery3({
     queryKey: ["companyInfoQuery", current_company_id],
@@ -887,7 +904,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = useState5(null);
   const [domain, setDomain] = useState5(null);
   const [order, setOrder] = useState5("");
-  const [orderGroupBy, setOrderGroupBy] = useState5("");
   const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -908,7 +924,6 @@ var useListData = ({
     const sort = order ?? formatSortingString(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -919,8 +934,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -930,8 +944,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -943,8 +956,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
     service,
@@ -956,14 +968,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,

package/dist/index.js CHANGED Viewed

@@ -4633,11 +4633,20 @@ var useCompany = ({ service }) => {
       service
     });
   };
+  const fetchWesapCompany = async () => {
+    return await getCurrentCompany.mutateAsync({
+      service: "wesap"
+    });
+  };
   const currentCompany = (0, import_react_query3.useQuery)({
     queryKey: ["currentCompany"],
     queryFn: fetchCurrentCompany,
     enabled: !!env?.defaultCompany
   });
+  const wesapCompany = (0, import_react_query3.useQuery)({
+    queryKey: ["wesapCompany"],
+    queryFn: fetchWesapCompany
+  });
   const current_company_id = (0, import_react7.useMemo)(() => {
     return currentCompany.data?.current_company_id;
   }, [currentCompany.data]);
@@ -4647,6 +4656,14 @@ var useCompany = ({ service }) => {
       setCompanies(companyIDs);
     }
   }, [current_company_id]);
+  (0, import_react7.useEffect)(() => {
+    if (wesapCompany.data) {
+      const allowedCompanies = currentCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
+      if (allowedCompanies.length) {
+        setAllowCompanies(allowedCompanies);
+      }
+    }
+  }, [wesapCompany.data]);
   const getCompanyInfo = useGetCompanyInfo2();
   const companyInfo = (0, import_react_query3.useQuery)({
     queryKey: ["companyInfoQuery", current_company_id],
@@ -4976,7 +4993,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = (0, import_react14.useState)(null);
   const [domain, setDomain] = (0, import_react14.useState)(null);
   const [order, setOrder] = (0, import_react14.useState)("");
-  const [orderGroupBy, setOrderGroupBy] = (0, import_react14.useState)("");
   const [selectedRowKeys, setSelectedRowKeys] = (0, import_react14.useState)([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -4997,7 +5013,6 @@ var useListData = ({
     const sort = order ?? (0, import_utils5.formatSortingString)(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -5008,8 +5023,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -5019,8 +5033,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -5032,8 +5045,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
     service,
@@ -5045,14 +5057,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,
@@ -6595,11 +6605,9 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys,
-    limit = 10
+    setSelectedRowKeys
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
-  const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
   const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
   const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -6609,20 +6617,16 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = (0, import_react26.useMemo)(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findIndex(
+      const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findLastIndex(
+      const endIndex = columns.findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -6638,14 +6642,13 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: pageLimitGroup
+    limit: 10
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup,
-    pageLimitGroup
+    pageGroup
   ];
   const {
     data: dataGroup,
@@ -6719,9 +6722,7 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup,
-    pageLimitGroup,
-    setPageLimitGroup
+    typeTableGroup
   };
 };

package/dist/index.mjs CHANGED Viewed

@@ -4723,11 +4723,20 @@ var useCompany = ({ service }) => {
       service
     });
   };
+  const fetchWesapCompany = async () => {
+    return await getCurrentCompany.mutateAsync({
+      service: "wesap"
+    });
+  };
   const currentCompany = useQuery3({
     queryKey: ["currentCompany"],
     queryFn: fetchCurrentCompany,
     enabled: !!env?.defaultCompany
   });
+  const wesapCompany = useQuery3({
+    queryKey: ["wesapCompany"],
+    queryFn: fetchWesapCompany
+  });
   const current_company_id = useMemo3(() => {
     return currentCompany.data?.current_company_id;
   }, [currentCompany.data]);
@@ -4737,6 +4746,14 @@ var useCompany = ({ service }) => {
       setCompanies(companyIDs);
     }
   }, [current_company_id]);
+  useEffect4(() => {
+    if (wesapCompany.data) {
+      const allowedCompanies = currentCompany.data?.allowed_companies?.map((c) => c[0]) ?? [];
+      if (allowedCompanies.length) {
+        setAllowCompanies(allowedCompanies);
+      }
+    }
+  }, [wesapCompany.data]);
   const getCompanyInfo = useGetCompanyInfo2();
   const companyInfo = useQuery3({
     queryKey: ["companyInfoQuery", current_company_id],
@@ -5070,7 +5087,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = useState5(null);
   const [domain, setDomain] = useState5(null);
   const [order, setOrder] = useState5("");
-  const [orderGroupBy, setOrderGroupBy] = useState5("");
   const [selectedRowKeys, setSelectedRowKeys] = useState5([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -5091,7 +5107,6 @@ var useListData = ({
     const sort = order ?? formatSortingString(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -5102,8 +5117,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -5113,8 +5127,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -5126,8 +5139,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
     service,
@@ -5139,14 +5151,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,
@@ -6690,11 +6700,9 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys,
-    limit = 10
+    setSelectedRowKeys
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
-  const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
   const { selectedRowKeys } = useAppSelector(selectList);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -6704,20 +6712,16 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = useMemo12(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findIndex(
+      const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findLastIndex(
+      const endIndex = columns.findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -6733,14 +6737,13 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: pageLimitGroup
+    limit: 10
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup,
-    pageLimitGroup
+    pageGroup
   ];
   const {
     data: dataGroup,
@@ -6814,9 +6817,7 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup,
-    pageLimitGroup,
-    setPageLimitGroup
+    typeTableGroup
   };
 };

package/dist/widget.d.mts CHANGED Viewed

@@ -315,8 +315,6 @@ declare const tableGroupController: (props: any) => {
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
     typeTableGroup: "list" | "group" | "calendar" | undefined;
-    pageLimitGroup: number;
-    setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
 };
 declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {

package/dist/widget.d.ts CHANGED Viewed

@@ -315,8 +315,6 @@ declare const tableGroupController: (props: any) => {
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;
     typeTableGroup: "list" | "group" | "calendar" | undefined;
-    pageLimitGroup: number;
-    setPageLimitGroup: react.Dispatch<react.SetStateAction<number>>;
 };
 declare const searchController: ({ viewData, model, domain, context, fieldsList, }: {

package/dist/widget.js CHANGED Viewed

@@ -4506,7 +4506,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = (0, import_react15.useState)(null);
   const [domain, setDomain] = (0, import_react15.useState)(null);
   const [order, setOrder] = (0, import_react15.useState)("");
-  const [orderGroupBy, setOrderGroupBy] = (0, import_react15.useState)("");
   const [selectedRowKeys, setSelectedRowKeys] = (0, import_react15.useState)([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -4527,7 +4526,6 @@ var useListData = ({
     const sort = order ?? (0, import_utils5.formatSortingString)(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? (0, import_utils5.formatSortingString)(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -4538,8 +4536,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -4549,8 +4546,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -4562,8 +4558,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !(0, import_utils5.isObjectEmpty)(specification) && !!domain,
     service,
@@ -4575,14 +4570,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,
@@ -5833,11 +5826,9 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys,
-    limit = 10
+    setSelectedRowKeys
   } = props;
   const [pageGroup, setPageGroup] = (0, import_react26.useState)(0);
-  const [pageLimitGroup, setPageLimitGroup] = (0, import_react26.useState)(limit);
   const { selectedRowKeys } = (0, import_store.useAppSelector)(import_store.selectList);
   const [isShowGroup, setIsShowGroup] = (0, import_react26.useState)(false);
   const [colEmptyGroup, setColEmptyGroup] = (0, import_react26.useState)({
@@ -5847,20 +5838,16 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = (0, import_react26.useMemo)(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findIndex(
+      const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findLastIndex(
+      const endIndex = columns.findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -5876,14 +5863,13 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: pageLimitGroup
+    limit: 10
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup,
-    pageLimitGroup
+    pageGroup
   ];
   const {
     data: dataGroup,
@@ -5957,9 +5943,7 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup,
-    pageLimitGroup,
-    setPageLimitGroup
+    typeTableGroup
   };
 };

package/dist/widget.mjs CHANGED Viewed

@@ -4577,7 +4577,6 @@ var useListData = ({
   const [groupByList, setGroupByList] = useState6(null);
   const [domain, setDomain] = useState6(null);
   const [order, setOrder] = useState6("");
-  const [orderGroupBy, setOrderGroupBy] = useState6("");
   const [selectedRowKeys, setSelectedRowKeys] = useState6([]);
   const [debouncedPage] = useDebounce(page, 500);
   const [debouncedDomain] = useDebounce(domain, 500);
@@ -4598,7 +4597,6 @@ var useListData = ({
     const sort = order ?? formatSortingString(
       (mode === "kanban" ? viewData?.views?.kanban : viewData?.views?.list)?.default_order
     ) ?? "";
-    const orderGroupBy2 = groupByList && typeof groupByList === "object" ? formatSortingString(groupByList?.contexts?.[0]?.order_by) : null;
     return {
       model: action?.res_model,
       specification,
@@ -4609,8 +4607,7 @@ var useListData = ({
       groupby,
       context,
       sort,
-      mode,
-      orderGroupBy: orderGroupBy2
+      mode
     };
   }, [
     action,
@@ -4620,8 +4617,7 @@ var useListData = ({
     pageLimit,
     debouncedDomain,
     context,
-    model,
-    orderGroupBy
+    model
   ]);
   const list = useGetListData2(
     { ...listDataProps },
@@ -4633,8 +4629,7 @@ var useListData = ({
       listDataProps?.sort,
       listDataProps?.context,
       listDataProps?.specification,
-      listDataProps?.mode,
-      listDataProps?.orderGroupBy
+      listDataProps?.mode
     ],
     !!listDataProps && !!specification && !isObjectEmpty4(specification) && !!domain,
     service,
@@ -4646,14 +4641,12 @@ var useListData = ({
       specification,
       page,
       order,
-      orderGroupBy,
       domain: listDataProps?.domain,
       pageLimit,
       groupByList,
       selectedRowKeys,
       setPage,
       setOrder,
-      setOrderGroupBy,
       setDomain,
       setPageLimit,
       setGroupByList,
@@ -5904,11 +5897,9 @@ var tableGroupController = (props) => {
     context,
     checkedAll,
     groupByList,
-    setSelectedRowKeys,
-    limit = 10
+    setSelectedRowKeys
   } = props;
   const [pageGroup, setPageGroup] = useState15(0);
-  const [pageLimitGroup, setPageLimitGroup] = useState15(limit);
   const { selectedRowKeys } = useAppSelector(selectList);
   const [isShowGroup, setIsShowGroup] = useState15(false);
   const [colEmptyGroup, setColEmptyGroup] = useState15({
@@ -5918,20 +5909,16 @@ var tableGroupController = (props) => {
   const domain = row?.__domain;
   const processedData = useMemo12(() => {
     const calculateColSpanEmpty = () => {
-      const startIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findIndex(
+      const startIndex = columns.findIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator === "sum"
       );
-      const endIndex = columns?.filter(
-        (col) => col?.field?.type_co === "field" && col?.optional !== "hide"
-      ).findLastIndex(
+      const endIndex = columns.findLastIndex(
         (col) => col.field.type === "monetary" && typeof row[col.key] === "number" || col.field.aggregator !== "sum"
       );
       const fromStart = startIndex === -1 ? columns.length : startIndex;
       const fromEnd = endIndex === -1 ? columns.length : columns.length - 1 - endIndex;
-      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 10 });
-      return { fromStart: fromStart + 1, fromEnd: fromEnd + 10 };
+      setColEmptyGroup({ fromStart: fromStart + 1, fromEnd: fromEnd + 1 });
+      return { fromStart: fromStart + 1, fromEnd: fromEnd + 1 };
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
@@ -5947,14 +5934,13 @@ var tableGroupController = (props) => {
     offset: pageGroup * 10,
     fields: groupByList?.fields,
     groupby: [groupByList?.contexts[level]?.group_by],
-    limit: pageLimitGroup
+    limit: 10
   };
   const queryKey = [
     `data-${model}-level_${level}-row-${row?.id}`,
     specification,
     domain,
-    pageGroup,
-    pageLimitGroup
+    pageGroup
   ];
   const {
     data: dataGroup,
@@ -6028,9 +6014,7 @@ var tableGroupController = (props) => {
     dataGroup,
     pageGroup,
     setPageGroup,
-    typeTableGroup,
-    pageLimitGroup,
-    setPageLimitGroup
+    typeTableGroup
   };
 };

package/package.json CHANGED Viewed

@@ -1,92 +1,92 @@
-{
-  "name": "@fctc/widget-logic",
-  "version": "6.1.2",
-  "types": "dist/index.d.ts",
-  "main": "dist/index.cjs",
-  "module": "dist/index.mjs",
-  "exports": {
-    ".": {
-      "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.cjs"
-    },
-    "./hooks": {
-      "types": "./dist/hooks.d.ts",
-      "import": "./dist/hooks.mjs",
-      "require": "./dist/hooks.cjs"
-    },
-    "./widget": {
-      "types": "./dist/widget.d.ts",
-      "import": "./dist/widget.mjs",
-      "require": "./dist/widget.cjs"
-    },
-    "./icons": {
-      "types": "./dist/icons.d.ts",
-      "import": "./dist/icons.mjs",
-      "require": "./dist/icons.cjs"
-    },
-    "./utils": {
-      "types": "./dist/utils.d.ts",
-      "import": "./dist/utils.mjs",
-      "require": "./dist/utils.cjs"
-    },
-    "./store": {
-      "types": "./dist/store.d.ts",
-      "import": "./dist/store.mjs",
-      "require": "./dist/store.cjs"
-    },
-    "./config": {
-      "types": "./dist/config.d.ts",
-      "import": "./dist/config.mjs",
-      "require": "./dist/config.cjs"
-    },
-    "./constants": {
-      "types": "./dist/constants.d.ts",
-      "import": "./dist/constants.mjs",
-      "require": "./dist/constants.cjs"
-    },
-    "./environment": {
-      "types": "./dist/environment.d.ts",
-      "import": "./dist/environment.mjs",
-      "require": "./dist/environment.cjs"
-    },
-    "./provider": {
-      "types": "./dist/provider.d.ts",
-      "import": "./dist/provider.mjs",
-      "require": "./dist/provider.cjs"
-    },
-    "./services": {
-      "types": "./dist/services.d.ts",
-      "import": "./dist/services.mjs",
-      "require": "./dist/services.cjs"
-    },
-    "./types": {
-      "types": "./dist/types.d.ts",
-      "import": "./dist/types.mjs",
-      "require": "./dist/types.cjs"
-    }
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "test": "jest"
-  },
-  "dependencies": {
-    "@fctc/interface-logic": "^5.5.1",
-    "@tanstack/react-query": "^5.84.0",
-    "i18next": "^25.3.2",
-    "i18next-browser-languagedetector": "^8.2.0",
-    "react-i18next": "^15.6.1"
-  },
-  "devDependencies": {
-    "@types/react": "^18.3.1",
-    "jest": "^29.7.0",
-    "react": "18.0.0",
-    "tsup": "^8.0.0",
-    "typescript": "^5.8.2"
-  },
-  "packageManager": "yarn@1.22.0",
-  "peerDependencies": {}
-}
+{
+  "name": "@fctc/widget-logic",
+  "version": "6.1.4",
+  "types": "dist/index.d.ts",
+  "main": "dist/index.cjs",
+  "module": "dist/index.mjs",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.cjs"
+    },
+    "./hooks": {
+      "types": "./dist/hooks.d.ts",
+      "import": "./dist/hooks.mjs",
+      "require": "./dist/hooks.cjs"
+    },
+    "./widget": {
+      "types": "./dist/widget.d.ts",
+      "import": "./dist/widget.mjs",
+      "require": "./dist/widget.cjs"
+    },
+    "./icons": {
+      "types": "./dist/icons.d.ts",
+      "import": "./dist/icons.mjs",
+      "require": "./dist/icons.cjs"
+    },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.mjs",
+      "require": "./dist/utils.cjs"
+    },
+    "./store": {
+      "types": "./dist/store.d.ts",
+      "import": "./dist/store.mjs",
+      "require": "./dist/store.cjs"
+    },
+    "./config": {
+      "types": "./dist/config.d.ts",
+      "import": "./dist/config.mjs",
+      "require": "./dist/config.cjs"
+    },
+    "./constants": {
+      "types": "./dist/constants.d.ts",
+      "import": "./dist/constants.mjs",
+      "require": "./dist/constants.cjs"
+    },
+    "./environment": {
+      "types": "./dist/environment.d.ts",
+      "import": "./dist/environment.mjs",
+      "require": "./dist/environment.cjs"
+    },
+    "./provider": {
+      "types": "./dist/provider.d.ts",
+      "import": "./dist/provider.mjs",
+      "require": "./dist/provider.cjs"
+    },
+    "./services": {
+      "types": "./dist/services.d.ts",
+      "import": "./dist/services.mjs",
+      "require": "./dist/services.cjs"
+    },
+    "./types": {
+      "types": "./dist/types.d.ts",
+      "import": "./dist/types.mjs",
+      "require": "./dist/types.cjs"
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "test": "jest"
+  },
+  "dependencies": {
+    "@fctc/interface-logic": "^5.4.9",
+    "@tanstack/react-query": "^5.84.0",
+    "i18next": "^25.3.2",
+    "i18next-browser-languagedetector": "^8.2.0",
+    "react-i18next": "^15.6.1"
+  },
+  "devDependencies": {
+    "@types/react": "^18.3.1",
+    "jest": "^29.7.0",
+    "react": "18.0.0",
+    "tsup": "^8.0.0",
+    "typescript": "^5.8.2"
+  },
+  "packageManager": "yarn@1.22.0",
+  "peerDependencies": {}
+}