Remove legacy maybe usages

saleor · Sep 7, 2020 · 3d86ca2 · 3d86ca2
1 parent 0ad7c51
commit 3d86ca2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/src/views/Category/View.tsx b/src/views/Category/View.tsx
@@ -13,7 +13,6 @@ import {
   convertSortByFromString,
   convertToAttributeScalar,
   getGraphqlIdFromDBId,
-  maybe,
 } from "../../core/utils";
 import Page from "./Page";
 import {
@@ -155,12 +154,9 @@ export const View: React.FC<ViewProps> = ({ match }) => {
               return <OfflinePlaceholder />;
             }
 
-            const canDisplayFilters = maybe(
-              () =>
-                !!categoryData.data.attributes.edges &&
-                !!categoryData.data.category.name,
-              false
-            );
+            const canDisplayFilters =
+              !!categoryData.data?.attributes?.edges &&
+              !!categoryData.data?.category?.name;
 
             return (
               <TypedCategoryProductsQuery variables={variables}>

diff --git a/src/views/Collection/View.tsx b/src/views/Collection/View.tsx
@@ -158,12 +158,9 @@ export const View: React.FC<ViewProps> = ({ match }) => {
               return <OfflinePlaceholder />;
             }
 
-            const canDisplayFilters = maybe(
-              () =>
-                !!collectionData.data.attributes.edges &&
-                !!collectionData.data.collection.name,
-              false
-            );
+            const canDisplayFilters =
+              !!collectionData.data?.attributes?.edges &&
+              !!collectionData.data?.collection?.name;
 
             return (
               <TypedCollectionProductsQuery variables={variables}>

diff --git a/src/views/Search/View.tsx b/src/views/Search/View.tsx
@@ -141,10 +141,8 @@ export const View: React.FC<ViewProps> = ({ match }) => {
           loaderFull
         >
           {({ loading, data, loadMore }) => {
-            const canDisplayFilters = maybe(
-              () => !!data.attributes.edges && !!data.products.edges,
-              false
-            );
+            const canDisplayFilters =
+              !!data?.attributes?.edges && !!data?.products?.edges;
 
             if (canDisplayFilters) {
               const handleLoadMore = () =>