fixed filters for category

Author: talhainvenxion

src/ui/layouts/common/Table/index.tsx

@@ -162,7 +162,12 @@ export const Table: React.FC<TableProps> = ({
   //   itemsPerPage: itemPerPage,
   //   items: tableRows,
   // });
-  const isValidFilter = filters?.map((f) => f.value).join('');
+
+  const isValidFilterFroValue: any = filters?.map((f) => f.value).join('');
+  const isValidFilterForCategory: any =
+    isValidFilterFroValue && filters?.map((f) => f.type.value).join('');
+  const checkValidFilter = isValidFilterFroValue + isValidFilterForCategory;
+  console.log(checkValidFilter, 'checkValidFilter');
 
   const { dispatchStackData } = callActionForStacksForPagination();
   const {
@@ -192,82 +197,84 @@ export const Table: React.FC<TableProps> = ({
     if (filters) {
       setPageIndex(0);
     }
-    switch (componentName) {
-      case 'stacks':
-        if (CheckIfRun) {
-          dispatchStackRunsData(
-            id,
-            1,
-            itemPerPage,
-            filters as any,
-            activeSorting,
-          );
-          break;
-        } else {
-          dispatchStackData(1, itemPerPage, filters as any, activeSorting);
-          break;
-        }
-      case 'components':
-        if (CheckIfRun) {
-          dispatchStackComponentRunsData(
-            id,
-            1,
-            itemPerPage,
-            filters as any,
-            activeSorting,
-          );
-          break;
-        } else {
-          dispatchStackComponentsData(
-            1,
-            itemPerPage,
-            filters as any,
-            activeSorting,
-          );
-          break;
-        }
-      case 'pipelines':
-        if (CheckIfRun) {
-          dispatchPipelineRunsData(
-            id,
-            1,
-            itemPerPage,
-            filters as any,
-            activeSorting,
-          );
-          break;
-        } else {
-          console.log(itemPerPage, 'itemPerPage');
-          if (!renderAfterRow) break;
-          dispatchPipelineData(1, itemPerPage, filters as any, activeSorting);
-          break;
-        }
+    if (checkValidFilter) {
+      switch (componentName) {
+        case 'stacks':
+          if (CheckIfRun) {
+            dispatchStackRunsData(
+              id,
+              1,
+              itemPerPage,
+              filters as any,
+              activeSorting,
+            );
+            break;
+          } else {
+            dispatchStackData(1, itemPerPage, filters as any, activeSorting);
+            break;
+          }
+        case 'components':
+          if (CheckIfRun) {
+            dispatchStackComponentRunsData(
+              id,
+              1,
+              itemPerPage,
+              filters as any,
+              activeSorting,
+            );
+            break;
+          } else {
+            dispatchStackComponentsData(
+              1,
+              itemPerPage,
+              filters as any,
+              activeSorting,
+            );
+            break;
+          }
+        case 'pipelines':
+          if (CheckIfRun) {
+            dispatchPipelineRunsData(
+              id,
+              1,
+              itemPerPage,
+              filters as any,
+              activeSorting,
+            );
+            break;
+          } else {
+            console.log(itemPerPage, 'itemPerPage');
+            if (!renderAfterRow) break;
+            dispatchPipelineData(1, itemPerPage, filters as any, activeSorting);
+            break;
+          }
 
-      case 'all-runs':
-        dispatchAllrunsData(1, itemPerPage, filters as any, activeSorting);
-        break;
+        case 'all-runs':
+          dispatchAllrunsData(1, itemPerPage, filters as any, activeSorting);
+          break;
 
-      default:
-        break;
-    }
-    if (locationPath.pathname.split('/')[2] === 'organization') {
-      // debugger;
-      setFetchingMembers(true);
-      dispatch(
-        organizationActions.getMembers({
-          page: 1,
-          size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
-          sort_by: activeSorting,
-          onSuccess: () => setFetchingMembers(false),
-          onFailure: () => setFetchingMembers(false),
-        }),
-      );
+        default:
+          break;
+      }
+      if (locationPath.pathname.split('/')[2] === 'organization') {
+        // debugger;
+        setFetchingMembers(true);
+        dispatch(
+          organizationActions.getMembers({
+            page: 1,
+            size: ITEMS_PER_PAGE ? ITEMS_PER_PAGE : DEFAULT_ITEMS_PER_PAGE,
+            sort_by: activeSorting,
+            onSuccess: () => setFetchingMembers(false),
+            onFailure: () => setFetchingMembers(false),
+          }),
+        );
+      }
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [
     checkForLocationPath,
-    isValidFilter,
+    checkValidFilter,
     activeSorting,
     activeSortingDirection,
   ]);