next-helios-fe 1.8.137 → 1.8.139

package/package.json

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

package/src/components/table/index.tsx

@@ -152,14 +152,14 @@ export const Table: TableComponentProps = ({
     setExcludedColumn(tempExcludedColumn.map((item) => item.key));
   }, []);
 
-  useEffect(() => {
-    setFilter(
-      header?.map((item) => {
-        return { key: item.key, value: "", type: item.type };
-      })
-    );
+  useEffect(
+    () => {
+      setFilter(
+        header?.map((item) => {
+          return { key: item.key, value: "", type: item.type };
+        })
+      );
 
-    if (data.length !== 0) {
       const tempCategoryFilter: any = {};
       const tempDateFilter: any = {};
 
@@ -170,32 +170,34 @@ export const Table: TableComponentProps = ({
             tempCategoryFilter[item.key] =
               dynamicTable?.setValue?.categoryFilter[item.key];
           } else {
-            const tempDataByCategory: string[] = [];
+            if (data.length !== 0) {
+              const tempDataByCategory: string[] = [];
 
-            data
-              .map((dataItem) => dataItem[item.key as keyof typeof dataItem])
-              .sort((a, b) =>
-                (a === undefined
-                  ? "undefined"
-                  : a === null
-                  ? "null"
-                  : a.toString()
-                ).localeCompare(
-                  b === undefined
+              data
+                .map((dataItem) => dataItem[item.key as keyof typeof dataItem])
+                .sort((a, b) =>
+                  (a === undefined
                     ? "undefined"
-                    : b === null
+                    : a === null
                     ? "null"
-                    : b.toString()
+                    : a.toString()
+                  ).localeCompare(
+                    b === undefined
+                      ? "undefined"
+                      : b === null
+                      ? "null"
+                      : b.toString()
+                  )
                 )
-              )
-              .filter((value, index, self) => self.indexOf(value) === index)
-              .map((value) => {
-                if (!tempDataByCategory.includes(value)) {
-                  tempDataByCategory.push(value);
-                }
-              });
+                .filter((value, index, self) => self.indexOf(value) === index)
+                .map((value) => {
+                  if (!tempDataByCategory.includes(value)) {
+                    tempDataByCategory.push(value);
+                  }
+                });
 
-            tempCategoryFilter[item.key] = tempDataByCategory;
+              tempCategoryFilter[item.key] = tempDataByCategory;
+            }
           }
         });
 
@@ -213,8 +215,18 @@ export const Table: TableComponentProps = ({
       setCategoryFilter(tempCategoryFilter);
       setDateFilter(tempDateFilter);
       setIsReadyForDynamicValue(true);
-    }
-  }, [data, dynamicTable?.setValue?.categoryFilter]);
+    },
+    dynamicTable?.setValue?.categoryFilter || dynamicTable?.setValue?.dateFilter
+      ? [
+          dynamicTable?.setValue?.categoryFilter,
+          dynamicTable?.setValue?.dateFilter,
+        ]
+      : [
+          data,
+          dynamicTable?.setValue?.categoryFilter,
+          dynamicTable?.setValue?.dateFilter,
+        ]
+  );
 
   useEffect(() => {
     if (page === 1) {