From 8173624fcadc0c692ffefd61e5737da7f4a7bbae Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Mon, 13 Jul 2020 11:21:52 +0200 Subject: [PATCH] Fix order note when no user was given --- src/components/Timeline/TimelineNote.tsx | 16 +- src/orders/fixtures.ts | 24 + .../__snapshots__/Stories.test.ts.snap | 980 ++++++++++++++++++ 3 files changed, 1013 insertions(+), 7 deletions(-) diff --git a/src/components/Timeline/TimelineNote.tsx b/src/components/Timeline/TimelineNote.tsx index bdeb5cdef..28203686a 100644 --- a/src/components/Timeline/TimelineNote.tsx +++ b/src/components/Timeline/TimelineNote.tsx @@ -79,14 +79,16 @@ export const TimelineNote: React.FC = props => { return (
- - - + {user && ( + + + + )}
- {user.email} + {user?.email} diff --git a/src/orders/fixtures.ts b/src/orders/fixtures.ts index 41279fd34..fe69a4a58 100644 --- a/src/orders/fixtures.ts +++ b/src/orders/fixtures.ts @@ -825,6 +825,30 @@ export const order = (placeholder: string): OrderDetails_order => ({ email: "admin@example.com", id: "QWRkcmVzczoxNQ==" } + }, + { + __typename: "OrderEvent", + amount: null, + date: "2019-09-17T13:22:24.376193+00:00", + email: null, + emailType: null, + id: "T3JkZXJFdmVudDo0", + message: "This is note", + quantity: null, + type: OrderEventsEnum.NOTE_ADDED, + user: null + }, + { + __typename: "OrderEvent", + amount: null, + date: "2019-09-17T13:22:24.376193+00:00", + email: null, + emailType: null, + id: "T3JkZXJFdmVudDo1", + message: "This is note", + quantity: null, + type: OrderEventsEnum.NOTE_ADDED, + user: null } ], fulfillments: [ diff --git a/src/storybook/__snapshots__/Stories.test.ts.snap b/src/storybook/__snapshots__/Stories.test.ts.snap index 22bf55029..b2c87ea14 100644 --- a/src/storybook/__snapshots__/Stories.test.ts.snap +++ b/src/storybook/__snapshots__/Stories.test.ts.snap @@ -9159,6 +9159,76 @@ exports[`Storyshots Orders / OrderHistory default 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -66733,6 +66803,76 @@ exports[`Storyshots Views / Orders / Order details cancelled 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -67729,6 +67869,76 @@ exports[`Storyshots Views / Orders / Order details default 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -68755,6 +68965,76 @@ exports[`Storyshots Views / Orders / Order details fulfilled 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -70351,6 +70631,76 @@ exports[`Storyshots Views / Orders / Order details no customer note 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -71377,6 +71727,76 @@ exports[`Storyshots Views / Orders / Order details no payment 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -72403,6 +72823,76 @@ exports[`Storyshots Views / Orders / Order details no shipping address 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -73429,6 +73919,76 @@ exports[`Storyshots Views / Orders / Order details partially fulfilled 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -74455,6 +75015,76 @@ exports[`Storyshots Views / Orders / Order details payment confirmed 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -75481,6 +76111,76 @@ exports[`Storyshots Views / Orders / Order details payment error 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -76507,6 +77207,76 @@ exports[`Storyshots Views / Orders / Order details pending payment 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -77533,6 +78303,76 @@ exports[`Storyshots Views / Orders / Order details refunded payment 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -78559,6 +79399,76 @@ exports[`Storyshots Views / Orders / Order details rejected payment 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
@@ -79585,6 +80495,76 @@ exports[`Storyshots Views / Orders / Order details unfulfilled 1`] = `
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ This is note +
+
+
+