@licklist/design 0.50.0-dev.2 → 0.50.0

package/src/table/TableHelperComponent.tsx

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/ban-types */
-import React, { SetStateAction, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { Col, Row, Table } from "react-bootstrap";
 import { useLocation } from "react-router-dom";
 import { isEqual } from "lodash";
@@ -30,7 +30,6 @@ export interface TableHelperComponentProps {
   displayShowingSection?: boolean;
   externalFilters?: { [key: string]: any };
   initialOptions?: Partial<ITableProps>;
-  filteredOrdersOptions?: (value: SetStateAction<ITableProps>) => void;
 }
 
 // @TODO Refactor? component to get less complexity
@@ -63,7 +62,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
     displayShowingSection = true,
     externalFilters = {},
     initialOptions = {},
-    filteredOrdersOptions,
   } = props;
 
   const query = useQuery();
@@ -99,9 +97,8 @@ function TableHelperComponent(props: TableHelperComponentProps) {
   useEffect(
     () => {
       if (
-        (isEqual(optionsCache, options) &&
-          isEqual(cachedExtFilters, externalFilters)) ||
-        !!filteredOrdersOptions
+        isEqual(optionsCache, options) &&
+        isEqual(cachedExtFilters, externalFilters)
       )
         return;
 
@@ -127,12 +124,12 @@ function TableHelperComponent(props: TableHelperComponentProps) {
       );
     },
     // eslint-disable-next-line react-hooks/exhaustive-deps
-    [pathname, options, onRefreshFn, filteredOrdersOptions, externalFilters]
+    [pathname, options, onRefreshFn, externalFilters]
   );
 
   // Refresh table's content on manual trigger
   useEffect(() => {
-    if (refreshedAt === refreshAt || !!filteredOrdersOptions) {
+    if (refreshedAt === refreshAt) {
       return;
     }
 
@@ -141,44 +138,24 @@ function TableHelperComponent(props: TableHelperComponentProps) {
     if (onRefreshFn) {
       onRefreshFn(options);
     }
-  }, [onRefreshFn, options, refreshAt, filteredOrdersOptions, refreshedAt]);
+  }, [onRefreshFn, options, refreshAt, refreshedAt]);
 
   const onSort = (key: string) => {
     let nextDirection = TableService.DEFAULT_SORT_DIRECTION;
-    if (sortKey === key) {
-      if (filteredOrdersOptions) {
-        filteredOrdersOptions((prevOptions) => {
-          nextDirection = TableService.getSortDirection(
-            prevOptions.sortDirection,
-            nextDirection
-          );
 
-          return {
-            ...prevOptions,
-            sortKey: key,
-            sortDirection: nextDirection,
-          };
-        });
-      } else {
-        setOptions((prevOptions) => {
-          nextDirection = TableService.getSortDirection(
-            prevOptions.sortDirection,
-            nextDirection
-          );
+    if (sortKey === key) {
+      setOptions((prevOptions) => {
+        nextDirection = TableService.getSortDirection(
+          prevOptions.sortDirection,
+          nextDirection
+        );
 
-          return {
-            ...prevOptions,
-            sortKey: key,
-            sortDirection: nextDirection,
-          };
-        });
-      }
-    } else if (filteredOrdersOptions) {
-      filteredOrdersOptions((prevOptions) => ({
-        ...prevOptions,
-        sortKey: key,
-        sortDirection: nextDirection,
-      }));
+        return {
+          ...prevOptions,
+          sortKey: key,
+          sortDirection: nextDirection,
+        };
+      });
     } else {
       setOptions((prevOptions) => ({
         ...prevOptions,
@@ -189,13 +166,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
   };
 
   const onPerPageChange = (nextPerPage: number) => {
-    if (filteredOrdersOptions) {
-      filteredOrdersOptions((prevOptions) => ({
-        ...prevOptions,
-        page: nextPerPage,
-      }));
-      return;
-    }
     setOptions((prevOptions) => ({
       ...prevOptions,
       perPage: nextPerPage,
@@ -203,13 +173,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
   };
 
   const onPageChange = (nextPage: number) => {
-    if (filteredOrdersOptions) {
-      filteredOrdersOptions((prevOptions) => ({
-        ...prevOptions,
-        page: nextPage,
-      }));
-      return;
-    }
     setOptions((prevOptions) => ({
       ...prevOptions,
       page: nextPage,
@@ -217,24 +180,6 @@ function TableHelperComponent(props: TableHelperComponentProps) {
   };
 
   const onFilterChange = (nextFilter: string) => {
-    if (filteredOrdersOptions) {
-      filteredOrdersOptions(({ page: prevPage, ...prevOptions }) => {
-        let nextPage = prevPage;
-
-        if (
-          (!nextFilter && prevOptions.filter) ||
-          (nextFilter && !prevOptions.filter)
-        ) {
-          nextPage = 1;
-        }
-
-        return {
-          ...prevOptions,
-          page: nextPage,
-          filter: nextFilter,
-        };
-      });
-    }
     setOptions(({ page: prevPage, ...prevOptions }) => {
       let nextPage = prevPage;