final touches

medusajs · Feb 2, 2022 · 4fc9702 · 4fc9702
1 parent 0cf54a8
commit 4fc9702
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 630 deletions.
diff --git a/src/components/templates/order-table/index.tsx b/src/components/templates/order-table/index.tsx
@@ -83,6 +83,9 @@ const OrderTable: React.FC<RouteComponentProps> = () => {
       if (query) {
         setFreeText(query)
         gotoPage(0)
+      } else {
+        // if we delete query string, we reset the table view
+        reset()
       }
     }, 400)
 
@@ -120,6 +123,7 @@ const OrderTable: React.FC<RouteComponentProps> = () => {
 
   const clearFilters = () => {
     reset()
+    setQuery("")
   }
 
   useEffect(() => {

diff --git a/src/components/templates/order-table/use-order-filters.ts b/src/components/templates/order-table/use-order-filters.ts
@@ -80,6 +80,7 @@ const reducer = (
         payment: action.payload.payment,
         status: action.payload.status,
         date: action.payload.date,
+        query: action?.payload?.query,
       }
     }
     case "setQuery": {
@@ -182,6 +183,7 @@ export const useOrderFilters = (
           open: false,
           filter: null,
         },
+        query: null,
       },
     })
   }
@@ -201,7 +203,7 @@ export const useOrderFilters = (
         toQuery["q"] = value
       } else if (key === "offset" || key === "limit") {
         toQuery[key] = value
-      } else if (value.open) {
+      } else if (value?.open) {
         if (key === "date") {
           toQuery[stateFilterMap[key]] = formatDateFilter(
             value.filter as OrderDateFilter
@@ -227,7 +229,7 @@ export const useOrderFilters = (
         toQuery["q"] = value
       } else if (key === "offset" || key === "limit") {
         toQuery[key] = value
-      } else if (value.open) {
+      } else if (value?.open) {
         toQuery[stateFilterMap[key]] = value.filter
       }
     }