From b731e7cf895a045f2b97ecd38870d9fd4d5f201e Mon Sep 17 00:00:00 2001
From: Magdalena Markusik <magdalena.markusik@mirumee.com>
Date: Wed, 12 May 2021 10:03:11 +0200
Subject: [PATCH] Change more usages to map edges to items

---
 src/collections/views/CollectionDetails.tsx   |  7 ++---
 .../views/SaleDetails/SaleDetails.tsx         | 29 +++++++------------
 .../views/VoucherDetails/VoucherDetails.tsx   | 29 +++++++------------
 3 files changed, 23 insertions(+), 42 deletions(-)

diff --git a/src/collections/views/CollectionDetails.tsx b/src/collections/views/CollectionDetails.tsx
index 152eda1db..b6bf931dc 100644
--- a/src/collections/views/CollectionDetails.tsx
+++ b/src/collections/views/CollectionDetails.tsx
@@ -23,6 +23,7 @@ import { commonMessages } from "@saleor/intl";
 import useProductSearch from "@saleor/searches/useProductSearch";
 import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
 import createMetadataUpdateHandler from "@saleor/utils/handlers/metadataUpdateHandler";
+import { mapEdgesToItems } from "@saleor/utils/maps";
 import {
   useMetadataUpdate,
   usePrivateMetadataUpdate
@@ -361,10 +362,8 @@ export const CollectionDetails: React.FC<CollectionDetailsProps> = ({
                   }
                 })
               }
-              products={maybe(() =>
-                result.data.search.edges
-                  .map(edge => edge.node)
-                  .filter(suggestedProduct => suggestedProduct.id)
+              products={mapEdgesToItems(result?.data?.search).filter(
+                suggestedProduct => suggestedProduct.id
               )}
             />
             <ActionDialog
diff --git a/src/discounts/views/SaleDetails/SaleDetails.tsx b/src/discounts/views/SaleDetails/SaleDetails.tsx
index a8ab497c1..0617b7f73 100644
--- a/src/discounts/views/SaleDetails/SaleDetails.tsx
+++ b/src/discounts/views/SaleDetails/SaleDetails.tsx
@@ -51,6 +51,7 @@ import useCategorySearch from "@saleor/searches/useCategorySearch";
 import useCollectionSearch from "@saleor/searches/useCollectionSearch";
 import useProductSearch from "@saleor/searches/useProductSearch";
 import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
+import { mapEdgesToItems } from "@saleor/utils/maps";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -393,20 +394,14 @@ export const SaleDetails: React.FC<SaleDetailsProps> = ({ id, params }) => {
                                 }
                               })
                             }
-                            products={maybe(() =>
-                              searchProductsOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(suggestedProduct => suggestedProduct.id)
-                            )}
+                            products={mapEdgesToItems(
+                              searchProductsOpts?.data?.search
+                            ).filter(suggestedProduct => suggestedProduct.id)}
                           />
                           <AssignCategoriesDialog
-                            categories={maybe(() =>
-                              searchCategoriesOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(
-                                  suggestedCategory => suggestedCategory.id
-                                )
-                            )}
+                            categories={mapEdgesToItems(
+                              searchCategoriesOpts?.data?.search
+                            ).filter(suggestedCategory => suggestedCategory.id)}
                             confirmButtonState={saleCataloguesAddOpts.status}
                             hasMore={
                               searchCategoriesOpts.data?.search.pageInfo
@@ -430,13 +425,9 @@ export const SaleDetails: React.FC<SaleDetailsProps> = ({ id, params }) => {
                             }
                           />
                           <AssignCollectionDialog
-                            collections={maybe(() =>
-                              searchCollectionsOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(
-                                  suggestedCategory => suggestedCategory.id
-                                )
-                            )}
+                            collections={mapEdgesToItems(
+                              searchCollectionsOpts?.data?.search
+                            ).filter(suggestedCategory => suggestedCategory.id)}
                             confirmButtonState={saleCataloguesAddOpts.status}
                             hasMore={
                               searchCollectionsOpts.data?.search.pageInfo
diff --git a/src/discounts/views/VoucherDetails/VoucherDetails.tsx b/src/discounts/views/VoucherDetails/VoucherDetails.tsx
index 5b5294d4a..82d201c1a 100644
--- a/src/discounts/views/VoucherDetails/VoucherDetails.tsx
+++ b/src/discounts/views/VoucherDetails/VoucherDetails.tsx
@@ -49,6 +49,7 @@ import useCategorySearch from "@saleor/searches/useCategorySearch";
 import useCollectionSearch from "@saleor/searches/useCollectionSearch";
 import useProductSearch from "@saleor/searches/useProductSearch";
 import createDialogActionHandlers from "@saleor/utils/handlers/dialogActionHandlers";
+import { mapEdgesToItems } from "@saleor/utils/maps";
 import React from "react";
 import { FormattedMessage, useIntl } from "react-intl";
 
@@ -426,13 +427,9 @@ export const VoucherDetails: React.FC<VoucherDetailsProps> = ({
                             toggleAll={toggleAll}
                           />
                           <AssignCategoriesDialog
-                            categories={maybe(() =>
-                              searchCategoriesOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(
-                                  suggestedCategory => suggestedCategory.id
-                                )
-                            )}
+                            categories={mapEdgesToItems(
+                              searchCategoriesOpts?.data?.search
+                            ).filter(suggestedCategory => suggestedCategory.id)}
                             confirmButtonState={voucherCataloguesAddOpts.status}
                             hasMore={
                               searchCategoriesOpts.data?.search.pageInfo
@@ -456,13 +453,9 @@ export const VoucherDetails: React.FC<VoucherDetailsProps> = ({
                             }
                           />
                           <AssignCollectionDialog
-                            collections={maybe(() =>
-                              searchCollectionsOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(
-                                  suggestedCategory => suggestedCategory.id
-                                )
-                            )}
+                            collections={mapEdgesToItems(
+                              searchCollectionsOpts?.data?.search
+                            ).filter(suggestedCategory => suggestedCategory.id)}
                             confirmButtonState={voucherCataloguesAddOpts.status}
                             hasMore={
                               searchCollectionsOpts.data?.search.pageInfo
@@ -532,11 +525,9 @@ export const VoucherDetails: React.FC<VoucherDetailsProps> = ({
                                 }
                               })
                             }
-                            products={maybe(() =>
-                              searchProductsOpts.data.search.edges
-                                .map(edge => edge.node)
-                                .filter(suggestedProduct => suggestedProduct.id)
-                            )}
+                            products={mapEdgesToItems(
+                              searchProductsOpts?.data?.search
+                            ).filter(suggestedProduct => suggestedProduct.id)}
                           />
                           <ActionDialog
                             open={