@fctc/widget-logic 3.4.1 → 3.4.2

package/dist/hooks.js

@@ -458,7 +458,7 @@ var import_react_i18next = require("react-i18next");
 var useProfile = ({ service }) => {
   const { setUid, setLang, setUserInfo, env } = (0, provider_exports.useEnv)();
   const { useGetProfile: useGetProfile2 } = (0, provider_exports.useService)();
-  const getProfile = useGetProfile2();
+  const getProfile = useGetProfile2("service", service);
   const { i18n } = (0, import_react_i18next.useTranslation)();
   const userInfoQuery = (0, import_react_query2.useQuery)({
     queryKey: ["userInfo"],

package/dist/hooks.mjs

@@ -439,7 +439,7 @@ import { useTranslation } from "react-i18next";
 var useProfile = ({ service }) => {
   const { setUid, setLang, setUserInfo, env } = (0, provider_exports.useEnv)();
   const { useGetProfile: useGetProfile2 } = (0, provider_exports.useService)();
-  const getProfile = useGetProfile2();
+  const getProfile = useGetProfile2("service", service);
   const { i18n } = useTranslation();
   const userInfoQuery = useQuery2({
     queryKey: ["userInfo"],

package/dist/index.js

@@ -4508,7 +4508,7 @@ var import_react_i18next = require("react-i18next");
 var useProfile = ({ service }) => {
   const { setUid, setLang, setUserInfo, env } = (0, provider_exports.useEnv)();
   const { useGetProfile: useGetProfile2 } = (0, provider_exports.useService)();
-  const getProfile = useGetProfile2();
+  const getProfile = useGetProfile2("service", service);
   const { i18n: i18n2 } = (0, import_react_i18next.useTranslation)();
   const userInfoQuery = (0, import_react_query2.useQuery)({
     queryKey: ["userInfo"],
@@ -6953,88 +6953,76 @@ var tableHeadController = (props) => {
 var import_react24 = require("react");
 var import_utils17 = require("@fctc/interface-logic/utils");
 var tableController = ({ data }) => {
-  const [rows, setRows] = (0, import_react24.useState)(null);
-  const [columns, setColumns] = (0, import_react24.useState)(null);
-  const dataModelFields = data?.fields?.map((field) => {
-    return {
+  const [rows, setRows] = (0, import_react24.useState)([]);
+  const [columnVisibility, setColumnVisibility] = (0, import_react24.useState)({});
+  const dataModelFields = (0, import_react24.useMemo)(() => {
+    return data?.fields?.map((field) => ({
       ...data.dataModel?.[field?.name],
       ...field,
       string: field?.string || data.dataModel?.[field?.name]?.string
-    };
-  });
-  const mergeFields = mergeButtons(dataModelFields);
-  const transformData = (dataList) => {
-    if (!dataList) return;
-    return dataList?.map((item) => {
-      const transformedItem = { ...item };
-      Object.keys(item).forEach((field) => {
-        if (field !== "__domain") {
-          if (item[field] && typeof item[field] === "object" && item[field].display_name) {
-            transformedItem[field] = item[field];
-          } else if (Array.isArray(item[field]) && item[field].length > 0) {
-            if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
-              transformedItem["string"] = item[field]?.[1];
+    })) ?? [];
+  }, [data?.fields, data?.dataModel]);
+  const mergeFields = (0, import_react24.useMemo)(
+    () => mergeButtons(dataModelFields),
+    [dataModelFields]
+  );
+  const transformData = (0, import_react24.useCallback)(
+    (dataList) => {
+      if (!dataList) return [];
+      return dataList.map((item) => {
+        const transformedItem = { ...item };
+        Object.keys(item).forEach((field) => {
+          if (field !== "__domain") {
+            if (item[field] && typeof item[field] === "object" && item[field].display_name) {
+              transformedItem[field] = item[field];
+            } else if (Array.isArray(item[field]) && item[field].length > 0) {
+              if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
+                transformedItem["string"] = item[field]?.[1];
+              }
+              transformedItem[field] = item[field];
             }
-            transformedItem[field] = item[field];
           }
-        }
+        });
+        return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
       });
-      return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
-    });
-  };
+    },
+    [data?.typeTable]
+  );
   (0, import_react24.useEffect)(() => {
-    setRows(transformData(data.records));
-  }, [data.records]);
-  const handleGetColumns = () => {
-    let cols = [];
+    setRows(transformData(data?.records));
+  }, [data?.records, transformData]);
+  const columns = (0, import_react24.useMemo)(() => {
     try {
-      cols = mergeFields?.filter((item) => {
-        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.column_invisible) : item?.invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.invisible) : false);
+      return mergeFields?.filter((item) => {
+        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? import_utils17.domainHelper.matchDomains(
+          data.context,
+          item?.column_invisible
+        ) : item?.invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.invisible) : false);
       })?.map((field) => {
+        const overridden = columnVisibility[field?.name];
         return {
           name: field?.name,
-          optional: field?.optional,
+          optional: overridden ?? field?.optional,
           title: field?.type_co === "button" ? "" : field?.string,
           field: { ...field }
         };
-      });
+      }) ?? [];
     } catch (error) {
       console.error("Error in useTable:", error);
+      return [];
     }
-    return cols;
-  };
-  (0, import_react24.useEffect)(() => {
-    if (!columns) {
-      setColumns(handleGetColumns());
-    }
-  }, [data]);
-  const onToggleColumnOptional = (item) => {
-    const tempColumn = [...columns]?.map((val) => {
-      if (item?.name === val?.name) {
-        return {
-          ...val,
-          optional: item?.optional === "show" ? "hide" : "show"
-        };
-      }
-      return val;
-    });
-    setColumns(tempColumn);
-  };
-  (0, import_react24.useEffect)(() => {
-    if (data?.fields != null) {
-      setColumns(null);
-    }
-    return () => {
-      if (data?.fields != null) {
-        setColumns(null);
-      }
-    };
-  }, [data?.fields]);
+  }, [mergeFields, data?.context, columnVisibility]);
+  const onToggleColumnOptional = (0, import_react24.useCallback)((item) => {
+    setColumnVisibility((prev) => ({
+      ...prev,
+      [item?.name]: item?.optional === "show" ? "hide" : "show"
+    }));
+  }, []);
   return {
     rows,
     columns,
     onToggleColumnOptional,
-    typeTable: data.typeTable
+    typeTable: data?.typeTable
   };
 };
 

package/dist/index.mjs

@@ -4583,7 +4583,7 @@ import { useTranslation } from "react-i18next";
 var useProfile = ({ service }) => {
   const { setUid, setLang, setUserInfo, env } = (0, provider_exports.useEnv)();
   const { useGetProfile: useGetProfile2 } = (0, provider_exports.useService)();
-  const getProfile = useGetProfile2();
+  const getProfile = useGetProfile2("service", service);
   const { i18n: i18n2 } = useTranslation();
   const userInfoQuery = useQuery2({
     queryKey: ["userInfo"],
@@ -7031,96 +7031,84 @@ var tableHeadController = (props) => {
 };
 
 // src/widget/advance/table/table-view/controller.ts
-import { useEffect as useEffect13, useState as useState12 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect13, useMemo as useMemo11, useState as useState12 } from "react";
 import { domainHelper } from "@fctc/interface-logic/utils";
 var tableController = ({ data }) => {
-  const [rows, setRows] = useState12(null);
-  const [columns, setColumns] = useState12(null);
-  const dataModelFields = data?.fields?.map((field) => {
-    return {
+  const [rows, setRows] = useState12([]);
+  const [columnVisibility, setColumnVisibility] = useState12({});
+  const dataModelFields = useMemo11(() => {
+    return data?.fields?.map((field) => ({
       ...data.dataModel?.[field?.name],
       ...field,
       string: field?.string || data.dataModel?.[field?.name]?.string
-    };
-  });
-  const mergeFields = mergeButtons(dataModelFields);
-  const transformData = (dataList) => {
-    if (!dataList) return;
-    return dataList?.map((item) => {
-      const transformedItem = { ...item };
-      Object.keys(item).forEach((field) => {
-        if (field !== "__domain") {
-          if (item[field] && typeof item[field] === "object" && item[field].display_name) {
-            transformedItem[field] = item[field];
-          } else if (Array.isArray(item[field]) && item[field].length > 0) {
-            if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
-              transformedItem["string"] = item[field]?.[1];
+    })) ?? [];
+  }, [data?.fields, data?.dataModel]);
+  const mergeFields = useMemo11(
+    () => mergeButtons(dataModelFields),
+    [dataModelFields]
+  );
+  const transformData = useCallback5(
+    (dataList) => {
+      if (!dataList) return [];
+      return dataList.map((item) => {
+        const transformedItem = { ...item };
+        Object.keys(item).forEach((field) => {
+          if (field !== "__domain") {
+            if (item[field] && typeof item[field] === "object" && item[field].display_name) {
+              transformedItem[field] = item[field];
+            } else if (Array.isArray(item[field]) && item[field].length > 0) {
+              if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
+                transformedItem["string"] = item[field]?.[1];
+              }
+              transformedItem[field] = item[field];
             }
-            transformedItem[field] = item[field];
           }
-        }
+        });
+        return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
       });
-      return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
-    });
-  };
+    },
+    [data?.typeTable]
+  );
   useEffect13(() => {
-    setRows(transformData(data.records));
-  }, [data.records]);
-  const handleGetColumns = () => {
-    let cols = [];
+    setRows(transformData(data?.records));
+  }, [data?.records, transformData]);
+  const columns = useMemo11(() => {
     try {
-      cols = mergeFields?.filter((item) => {
-        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? domainHelper.matchDomains(data.context, item?.column_invisible) : item?.invisible ? domainHelper.matchDomains(data.context, item?.invisible) : false);
+      return mergeFields?.filter((item) => {
+        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? domainHelper.matchDomains(
+          data.context,
+          item?.column_invisible
+        ) : item?.invisible ? domainHelper.matchDomains(data.context, item?.invisible) : false);
       })?.map((field) => {
+        const overridden = columnVisibility[field?.name];
         return {
           name: field?.name,
-          optional: field?.optional,
+          optional: overridden ?? field?.optional,
           title: field?.type_co === "button" ? "" : field?.string,
           field: { ...field }
         };
-      });
+      }) ?? [];
     } catch (error) {
       console.error("Error in useTable:", error);
+      return [];
     }
-    return cols;
-  };
-  useEffect13(() => {
-    if (!columns) {
-      setColumns(handleGetColumns());
-    }
-  }, [data]);
-  const onToggleColumnOptional = (item) => {
-    const tempColumn = [...columns]?.map((val) => {
-      if (item?.name === val?.name) {
-        return {
-          ...val,
-          optional: item?.optional === "show" ? "hide" : "show"
-        };
-      }
-      return val;
-    });
-    setColumns(tempColumn);
-  };
-  useEffect13(() => {
-    if (data?.fields != null) {
-      setColumns(null);
-    }
-    return () => {
-      if (data?.fields != null) {
-        setColumns(null);
-      }
-    };
-  }, [data?.fields]);
+  }, [mergeFields, data?.context, columnVisibility]);
+  const onToggleColumnOptional = useCallback5((item) => {
+    setColumnVisibility((prev) => ({
+      ...prev,
+      [item?.name]: item?.optional === "show" ? "hide" : "show"
+    }));
+  }, []);
   return {
     rows,
     columns,
     onToggleColumnOptional,
-    typeTable: data.typeTable
+    typeTable: data?.typeTable
   };
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo11, useState as useState13 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo12, useState as useState13 } from "react";
 import { useAppSelector as useAppSelector2, selectList } from "@fctc/interface-logic/store";
 var tableGroupController = (props) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -7145,7 +7133,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"
@@ -7160,7 +7148,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo11(() => {
+  const shouldFetchData = useMemo12(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;
@@ -7262,7 +7250,7 @@ import {
   evalJSONDomain as evalJSONDomain6,
   validateAndParseDate
 } from "@fctc/interface-logic/utils";
-import { useCallback as useCallback5, useEffect as useEffect15, useState as useState14 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect15, useState as useState14 } from "react";
 var searchController = ({
   viewData,
   model,
@@ -7405,7 +7393,7 @@ var searchController = ({
       return [...domain2];
     }
   };
-  const setTagSearch = useCallback5(
+  const setTagSearch = useCallback6(
     (updatedMap) => {
       if (!updatedMap) return;
       const tagsSearch = Object.entries(updatedMap).map(

package/dist/widget.d.mts

@@ -70,7 +70,7 @@ interface IMany2ManyControllerProps extends IInputFieldProps {
 }
 
 declare const many2manyFieldController: (props: IMany2ManyControllerProps) => {
-    rows: any;
+    rows: any[];
     columns: any;
     optionsObject: any;
     viewData: any;
@@ -245,7 +245,7 @@ interface ISelctionStateProps {
 }
 
 declare const tableController: ({ data }: ITableProps) => {
-    rows: any;
+    rows: any[];
     columns: any;
     onToggleColumnOptional: (item: any) => void;
     typeTable: "list" | "group" | "calendar" | undefined;
@@ -262,7 +262,7 @@ declare const tableGroupController: (props: any) => {
     isDataPlaceHolder: boolean;
     nameGroupWithCount: string;
     columnsGroup: any;
-    rowsGroup: any;
+    rowsGroup: any[];
     dataGroup: any;
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;

package/dist/widget.d.ts

@@ -70,7 +70,7 @@ interface IMany2ManyControllerProps extends IInputFieldProps {
 }
 
 declare const many2manyFieldController: (props: IMany2ManyControllerProps) => {
-    rows: any;
+    rows: any[];
     columns: any;
     optionsObject: any;
     viewData: any;
@@ -245,7 +245,7 @@ interface ISelctionStateProps {
 }
 
 declare const tableController: ({ data }: ITableProps) => {
-    rows: any;
+    rows: any[];
     columns: any;
     onToggleColumnOptional: (item: any) => void;
     typeTable: "list" | "group" | "calendar" | undefined;
@@ -262,7 +262,7 @@ declare const tableGroupController: (props: any) => {
     isDataPlaceHolder: boolean;
     nameGroupWithCount: string;
     columnsGroup: any;
-    rowsGroup: any;
+    rowsGroup: any[];
     dataGroup: any;
     pageGroup: any;
     setPageGroup: react.Dispatch<any>;

package/dist/widget.js

@@ -6196,88 +6196,76 @@ var tableHeadController = (props) => {
 var import_react24 = require("react");
 var import_utils17 = require("@fctc/interface-logic/utils");
 var tableController = ({ data }) => {
-  const [rows, setRows] = (0, import_react24.useState)(null);
-  const [columns, setColumns] = (0, import_react24.useState)(null);
-  const dataModelFields = data?.fields?.map((field) => {
-    return {
+  const [rows, setRows] = (0, import_react24.useState)([]);
+  const [columnVisibility, setColumnVisibility] = (0, import_react24.useState)({});
+  const dataModelFields = (0, import_react24.useMemo)(() => {
+    return data?.fields?.map((field) => ({
       ...data.dataModel?.[field?.name],
       ...field,
       string: field?.string || data.dataModel?.[field?.name]?.string
-    };
-  });
-  const mergeFields = mergeButtons(dataModelFields);
-  const transformData = (dataList) => {
-    if (!dataList) return;
-    return dataList?.map((item) => {
-      const transformedItem = { ...item };
-      Object.keys(item).forEach((field) => {
-        if (field !== "__domain") {
-          if (item[field] && typeof item[field] === "object" && item[field].display_name) {
-            transformedItem[field] = item[field];
-          } else if (Array.isArray(item[field]) && item[field].length > 0) {
-            if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
-              transformedItem["string"] = item[field]?.[1];
+    })) ?? [];
+  }, [data?.fields, data?.dataModel]);
+  const mergeFields = (0, import_react24.useMemo)(
+    () => mergeButtons(dataModelFields),
+    [dataModelFields]
+  );
+  const transformData = (0, import_react24.useCallback)(
+    (dataList) => {
+      if (!dataList) return [];
+      return dataList.map((item) => {
+        const transformedItem = { ...item };
+        Object.keys(item).forEach((field) => {
+          if (field !== "__domain") {
+            if (item[field] && typeof item[field] === "object" && item[field].display_name) {
+              transformedItem[field] = item[field];
+            } else if (Array.isArray(item[field]) && item[field].length > 0) {
+              if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
+                transformedItem["string"] = item[field]?.[1];
+              }
+              transformedItem[field] = item[field];
             }
-            transformedItem[field] = item[field];
           }
-        }
+        });
+        return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
       });
-      return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
-    });
-  };
+    },
+    [data?.typeTable]
+  );
   (0, import_react24.useEffect)(() => {
-    setRows(transformData(data.records));
-  }, [data.records]);
-  const handleGetColumns = () => {
-    let cols = [];
+    setRows(transformData(data?.records));
+  }, [data?.records, transformData]);
+  const columns = (0, import_react24.useMemo)(() => {
     try {
-      cols = mergeFields?.filter((item) => {
-        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.column_invisible) : item?.invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.invisible) : false);
+      return mergeFields?.filter((item) => {
+        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? import_utils17.domainHelper.matchDomains(
+          data.context,
+          item?.column_invisible
+        ) : item?.invisible ? import_utils17.domainHelper.matchDomains(data.context, item?.invisible) : false);
       })?.map((field) => {
+        const overridden = columnVisibility[field?.name];
         return {
           name: field?.name,
-          optional: field?.optional,
+          optional: overridden ?? field?.optional,
           title: field?.type_co === "button" ? "" : field?.string,
           field: { ...field }
         };
-      });
+      }) ?? [];
     } catch (error) {
       console.error("Error in useTable:", error);
+      return [];
     }
-    return cols;
-  };
-  (0, import_react24.useEffect)(() => {
-    if (!columns) {
-      setColumns(handleGetColumns());
-    }
-  }, [data]);
-  const onToggleColumnOptional = (item) => {
-    const tempColumn = [...columns]?.map((val) => {
-      if (item?.name === val?.name) {
-        return {
-          ...val,
-          optional: item?.optional === "show" ? "hide" : "show"
-        };
-      }
-      return val;
-    });
-    setColumns(tempColumn);
-  };
-  (0, import_react24.useEffect)(() => {
-    if (data?.fields != null) {
-      setColumns(null);
-    }
-    return () => {
-      if (data?.fields != null) {
-        setColumns(null);
-      }
-    };
-  }, [data?.fields]);
+  }, [mergeFields, data?.context, columnVisibility]);
+  const onToggleColumnOptional = (0, import_react24.useCallback)((item) => {
+    setColumnVisibility((prev) => ({
+      ...prev,
+      [item?.name]: item?.optional === "show" ? "hide" : "show"
+    }));
+  }, []);
   return {
     rows,
     columns,
     onToggleColumnOptional,
-    typeTable: data.typeTable
+    typeTable: data?.typeTable
   };
 };
 

package/dist/widget.mjs

@@ -6251,96 +6251,84 @@ var tableHeadController = (props) => {
 };
 
 // src/widget/advance/table/table-view/controller.ts
-import { useEffect as useEffect13, useState as useState12 } from "react";
+import { useCallback as useCallback5, useEffect as useEffect13, useMemo as useMemo11, useState as useState12 } from "react";
 import { domainHelper } from "@fctc/interface-logic/utils";
 var tableController = ({ data }) => {
-  const [rows, setRows] = useState12(null);
-  const [columns, setColumns] = useState12(null);
-  const dataModelFields = data?.fields?.map((field) => {
-    return {
+  const [rows, setRows] = useState12([]);
+  const [columnVisibility, setColumnVisibility] = useState12({});
+  const dataModelFields = useMemo11(() => {
+    return data?.fields?.map((field) => ({
       ...data.dataModel?.[field?.name],
       ...field,
       string: field?.string || data.dataModel?.[field?.name]?.string
-    };
-  });
-  const mergeFields = mergeButtons(dataModelFields);
-  const transformData = (dataList) => {
-    if (!dataList) return;
-    return dataList?.map((item) => {
-      const transformedItem = { ...item };
-      Object.keys(item).forEach((field) => {
-        if (field !== "__domain") {
-          if (item[field] && typeof item[field] === "object" && item[field].display_name) {
-            transformedItem[field] = item[field];
-          } else if (Array.isArray(item[field]) && item[field].length > 0) {
-            if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
-              transformedItem["string"] = item[field]?.[1];
+    })) ?? [];
+  }, [data?.fields, data?.dataModel]);
+  const mergeFields = useMemo11(
+    () => mergeButtons(dataModelFields),
+    [dataModelFields]
+  );
+  const transformData = useCallback5(
+    (dataList) => {
+      if (!dataList) return [];
+      return dataList.map((item) => {
+        const transformedItem = { ...item };
+        Object.keys(item).forEach((field) => {
+          if (field !== "__domain") {
+            if (item[field] && typeof item[field] === "object" && item[field].display_name) {
+              transformedItem[field] = item[field];
+            } else if (Array.isArray(item[field]) && item[field].length > 0) {
+              if (data.typeTable === "group" && item[field]?.length === 2 && typeof item[field]?.[1] === "string") {
+                transformedItem["string"] = item[field]?.[1];
+              }
+              transformedItem[field] = item[field];
             }
-            transformedItem[field] = item[field];
           }
-        }
+        });
+        return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
       });
-      return item.display_name ? { ...transformedItem, item: item.display_name } : transformedItem;
-    });
-  };
+    },
+    [data?.typeTable]
+  );
   useEffect13(() => {
-    setRows(transformData(data.records));
-  }, [data.records]);
-  const handleGetColumns = () => {
-    let cols = [];
+    setRows(transformData(data?.records));
+  }, [data?.records, transformData]);
+  const columns = useMemo11(() => {
     try {
-      cols = mergeFields?.filter((item) => {
-        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? domainHelper.matchDomains(data.context, item?.column_invisible) : item?.invisible ? domainHelper.matchDomains(data.context, item?.invisible) : false);
+      return mergeFields?.filter((item) => {
+        return item?.widget !== "details_Receive_money" && !(item?.column_invisible ? domainHelper.matchDomains(
+          data.context,
+          item?.column_invisible
+        ) : item?.invisible ? domainHelper.matchDomains(data.context, item?.invisible) : false);
       })?.map((field) => {
+        const overridden = columnVisibility[field?.name];
         return {
           name: field?.name,
-          optional: field?.optional,
+          optional: overridden ?? field?.optional,
           title: field?.type_co === "button" ? "" : field?.string,
           field: { ...field }
         };
-      });
+      }) ?? [];
     } catch (error) {
       console.error("Error in useTable:", error);
+      return [];
     }
-    return cols;
-  };
-  useEffect13(() => {
-    if (!columns) {
-      setColumns(handleGetColumns());
-    }
-  }, [data]);
-  const onToggleColumnOptional = (item) => {
-    const tempColumn = [...columns]?.map((val) => {
-      if (item?.name === val?.name) {
-        return {
-          ...val,
-          optional: item?.optional === "show" ? "hide" : "show"
-        };
-      }
-      return val;
-    });
-    setColumns(tempColumn);
-  };
-  useEffect13(() => {
-    if (data?.fields != null) {
-      setColumns(null);
-    }
-    return () => {
-      if (data?.fields != null) {
-        setColumns(null);
-      }
-    };
-  }, [data?.fields]);
+  }, [mergeFields, data?.context, columnVisibility]);
+  const onToggleColumnOptional = useCallback5((item) => {
+    setColumnVisibility((prev) => ({
+      ...prev,
+      [item?.name]: item?.optional === "show" ? "hide" : "show"
+    }));
+  }, []);
   return {
     rows,
     columns,
     onToggleColumnOptional,
-    typeTable: data.typeTable
+    typeTable: data?.typeTable
   };
 };
 
 // src/widget/advance/table/table-group/controller.ts
-import { useEffect as useEffect14, useMemo as useMemo11, useState as useState13 } from "react";
+import { useEffect as useEffect14, useMemo as useMemo12, useState as useState13 } from "react";
 import { useAppSelector as useAppSelector2, selectList } from "@fctc/interface-logic/store";
 var tableGroupController = (props) => {
   const { env } = (0, provider_exports.useEnv)();
@@ -6365,7 +6353,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"
@@ -6380,7 +6368,7 @@ var tableGroupController = (props) => {
     };
     return calculateColSpanEmpty();
   }, [columns, row]);
-  const shouldFetchData = useMemo11(() => {
+  const shouldFetchData = useMemo12(() => {
     return !!isShowGroup;
   }, [isShowGroup]);
   const enabled = shouldFetchData && !!processedData;
@@ -6482,7 +6470,7 @@ import {
   evalJSONDomain as evalJSONDomain6,
   validateAndParseDate
 } from "@fctc/interface-logic/utils";
-import { useCallback as useCallback5, useEffect as useEffect15, useState as useState14 } from "react";
+import { useCallback as useCallback6, useEffect as useEffect15, useState as useState14 } from "react";
 var searchController = ({
   viewData,
   model,
@@ -6625,7 +6613,7 @@ var searchController = ({
       return [...domain2];
     }
   };
-  const setTagSearch = useCallback5(
+  const setTagSearch = useCallback6(
     (updatedMap) => {
       if (!updatedMap) return;
       const tagsSearch = Object.entries(updatedMap).map(

package/package.json

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