From 29a7ef644c2166a1d0bb6b6b59df96a5fba2fba9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Choi=C5=84ski?= <marekchoinski17@gmail.com>
Date: Wed, 9 Dec 2020 11:15:13 +0100
Subject: [PATCH] Fix null voucher name handle (#891)

* Fix null voucher name handle

* Fix behavior for optional name

* Fix voucher list

* Fix loading voucher

* Update storybook
---
 .../components/VoucherList/VoucherList.tsx    | 34 ++++++++++++-------
 .../__snapshots__/Stories.test.ts.snap        | 24 +++----------
 .../views/TranslationsEntities.tsx            |  2 +-
 3 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/discounts/components/VoucherList/VoucherList.tsx b/src/discounts/components/VoucherList/VoucherList.tsx
index bc400e25a..a16532850 100644
--- a/src/discounts/components/VoucherList/VoucherList.tsx
+++ b/src/discounts/components/VoucherList/VoucherList.tsx
@@ -243,8 +243,12 @@ const VoucherList: React.FC<VoucherListProps> = props => {
                   {maybe<React.ReactNode>(() => voucher.code, <Skeleton />)}
                 </TableCell>
                 <TableCell className={classes.colMinSpent}>
-                  {hasChannelsLoaded ? (
-                    <Money money={channel?.minSpent} />
+                  {voucher?.code ? (
+                    hasChannelsLoaded ? (
+                      <Money money={channel?.minSpent} />
+                    ) : (
+                      "-"
+                    )
                   ) : (
                     <Skeleton />
                   )}
@@ -269,19 +273,23 @@ const VoucherList: React.FC<VoucherListProps> = props => {
                   className={classes.colValue}
                   onClick={voucher ? onRowClick(voucher.id) : undefined}
                 >
-                  {hasChannelsLoaded ? (
-                    voucher.discountValueType ===
-                    DiscountValueTypeEnum.FIXED ? (
-                      <Money
-                        money={
-                          channel?.discountValue && {
-                            amount: channel?.discountValue,
-                            currency: channel?.currency
+                  {voucher?.code ? (
+                    hasChannelsLoaded ? (
+                      voucher.discountValueType ===
+                      DiscountValueTypeEnum.FIXED ? (
+                        <Money
+                          money={
+                            channel?.discountValue && {
+                              amount: channel?.discountValue,
+                              currency: channel?.currency
+                            }
                           }
-                        }
-                      />
+                        />
+                      ) : (
+                        <Percent amount={channel?.discountValue} />
+                      )
                     ) : (
-                      <Percent amount={channel?.discountValue} />
+                      "-"
                     )
                   ) : (
                     <Skeleton />
diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap
index 34bc36aca..4fd004819 100644
--- a/src/storybook/__snapshots__/Stories.test.ts.snap
+++ b/src/storybook/__snapshots__/Stories.test.ts.snap
@@ -87873,11 +87873,7 @@ exports[`Storyshots Views / Discounts / Voucher list no channels 1`] = `
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colMinSpent-id"
               >
-                <span
-                  class="Skeleton-skeleton-id"
-                >
-                  ‌
-                </span>
+                -
               </td>
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colStart-id"
@@ -87898,11 +87894,7 @@ exports[`Storyshots Views / Discounts / Voucher list no channels 1`] = `
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colValue-id"
               >
-                <span
-                  class="Skeleton-skeleton-id"
-                >
-                  ‌
-                </span>
+                -
               </td>
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colUses-id"
@@ -87955,11 +87947,7 @@ exports[`Storyshots Views / Discounts / Voucher list no channels 1`] = `
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colMinSpent-id"
               >
-                <span
-                  class="Skeleton-skeleton-id"
-                >
-                  ‌
-                </span>
+                -
               </td>
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colStart-id"
@@ -87980,11 +87968,7 @@ exports[`Storyshots Views / Discounts / Voucher list no channels 1`] = `
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colValue-id"
               >
-                <span
-                  class="Skeleton-skeleton-id"
-                >
-                  ‌
-                </span>
+                -
               </td>
               <td
                 class="MuiTableCell-root-id MuiTableCell-body-id VoucherList-colUses-id"
diff --git a/src/translations/views/TranslationsEntities.tsx b/src/translations/views/TranslationsEntities.tsx
index cf8de1970..4fc268679 100644
--- a/src/translations/views/TranslationsEntities.tsx
+++ b/src/translations/views/TranslationsEntities.tsx
@@ -346,7 +346,7 @@ const TranslationsEntities: React.FC<TranslationsEntitiesProps> = ({
                           max: 1
                         },
                         id: node.voucher?.id,
-                        name: node.voucher?.name
+                        name: node.voucher?.name || "-"
                       }
                   )}
                 onRowClick={id =>