next-helios-fe 1.8.136 → 1.8.138

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next-helios-fe",
-  "version": "1.8.136",
+  "version": "1.8.138",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/components/table/index.tsx

@@ -159,17 +159,17 @@ export const Table: TableComponentProps = ({
       })
     );
 
-    if (data.length !== 0) {
-      const tempCategoryFilter: any = {};
-      const tempDateFilter: any = {};
+    const tempCategoryFilter: any = {};
+    const tempDateFilter: any = {};
 
-      header
-        ?.filter((item) => item.type === "category")
-        ?.map((item) => {
-          if (dynamicTable?.setValue?.categoryFilter?.[item.key]) {
-            tempCategoryFilter[item.key] =
-              dynamicTable?.setValue?.categoryFilter[item.key];
-          } else {
+    header
+      ?.filter((item) => item.type === "category")
+      ?.map((item) => {
+        if (dynamicTable?.setValue?.categoryFilter?.[item.key]) {
+          tempCategoryFilter[item.key] =
+            dynamicTable?.setValue?.categoryFilter[item.key];
+        } else {
+          if (data.length !== 0) {
             const tempDataByCategory: string[] = [];
 
             data
@@ -197,24 +197,28 @@ export const Table: TableComponentProps = ({
 
             tempCategoryFilter[item.key] = tempDataByCategory;
           }
-        });
+        }
+      });
 
-      header
-        ?.filter((item) => item.type === "date")
-        ?.map((item) => {
-          if (dynamicTable?.setValue?.dateFilter?.[item.key]) {
-            tempDateFilter[item.key] =
-              dynamicTable?.setValue?.dateFilter[item.key];
-          } else {
-            tempDateFilter[item.key] = [];
-          }
-        });
+    header
+      ?.filter((item) => item.type === "date")
+      ?.map((item) => {
+        if (dynamicTable?.setValue?.dateFilter?.[item.key]) {
+          tempDateFilter[item.key] =
+            dynamicTable?.setValue?.dateFilter[item.key];
+        } else {
+          tempDateFilter[item.key] = [];
+        }
+      });
 
-      setCategoryFilter(tempCategoryFilter);
-      setDateFilter(tempDateFilter);
-      setIsReadyForDynamicValue(true);
-    }
-  }, [data, dynamicTable?.setValue?.categoryFilter]);
+    setCategoryFilter(tempCategoryFilter);
+    setDateFilter(tempDateFilter);
+    setIsReadyForDynamicValue(true);
+  }, [
+    dynamicTable?.setValue?.categoryFilter,
+    dynamicTable?.setValue?.dateFilter,
+    ...(!dynamicTable?.setValue?.categoryFilter ? [data] : []),
+  ]);
 
   useEffect(() => {
     if (page === 1) {
@@ -660,7 +664,7 @@ export const Table: TableComponentProps = ({
     });
 
   const dataArr = (
-    options?.toolbar?.pagination?.show !== false
+    options?.toolbar?.pagination?.show !== false && !dynamicTable
       ? filteredData?.slice((page - 1) * maxRow, page * maxRow)
       : filteredData
   )?.map((item, index) => {