djkato/saleor-dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle situation when email is removed from user (#631)

Browse source
This commit is contained in:
Krzysztof Wolski 2020-08-07 17:15:18 +02:00 committed by GitHub
parent 1eb3ec7b2d
commit fdb8d1e272
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 87 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
locale/defaultMessages.json
View file

@ -2586,6 +2586,9 @@
"src_dot_home_dot_components_dot_HomeActivityCard_dot_draft": {
"string": "Order #{orderId} was placed from draft by {userEmail}"
},
"src_dot_home_dot_components_dot_HomeActivityCard_dot_draft_no_email": {
"string": "Order #{orderId} was placed from draft"
},
"src_dot_home_dot_components_dot_HomeActivityCard_dot_paid": {
"string": "Order #{orderId} was fully paid"
},

18
src/home/components/HomeActivityCard/activityMessages.ts
View file

@ -7,6 +7,9 @@ const messages = defineMessages({
draft: {
defaultMessage: "Order #{orderId} was placed from draft by {userEmail}"
},
draft_no_email: {
defaultMessage: "Order #{orderId} was placed from draft"
},
paid: {
defaultMessage: "Order #{orderId} was fully paid"
},
@ -29,10 +32,17 @@ export const getActivityMessage = (
orderId: activity.orderNumber
});
case OrderEventsEnum.PLACED_FROM_DRAFT:
return intl.formatMessage(messages.draft, {
orderId: activity.orderNumber,
userEmail: activity.user.email
});
if (!!activity.user?.email) {
return intl.formatMessage(messages.draft, {
orderId: activity.orderNumber,
userEmail: activity.user?.email
});
} else {
return intl.formatMessage(messages.draft_no_email, {
orderId: activity.orderNumber
});
}
default:
return activity.message;
}

22
src/home/fixtures.ts
View file

@ -193,6 +193,28 @@ export const shop: (placeholderImage: string) => Home = (
}
}
},
{
__typename: "OrderEventCountableEdge",
node: {
__typename: "OrderEvent",
amount: null,
composedId: null,
date: "2018-10-12T15:51:11.665838+00:00",
email: null,
emailType: null,
id: "T3JkZXJFdmVudDo3Nw==",
message: null,
orderNumber: "15",
oversoldItems: null,
quantity: null,
type: OrderEventsEnum.PLACED_FROM_DRAFT,
user: {
__typename: "User",
email: null,
id: "VXNlcjoyMQ=="
}
}
},
{
__typename: "OrderEventCountableEdge",
node: {

48
src/storybook/__snapshots__/Stories.test.ts.snap
View file

@ -64853,6 +64853,30 @@ exports[`Storyshots Views / HomePage default 1`] = `
</div>
</div>
</li>
<li
class="MuiListItem-root-id MuiListItem-dense-id MuiListItem-gutters-id"
>
<div
class="MuiListItemText-root-id MuiListItemText-dense-id MuiListItemText-multiline-id"
>
<div
class="MuiTypography-root-id MuiTypography-body1-id"
>
Order #15 was placed from draft
</div>
<div
class="MuiTypography-root-id MuiListItemText-secondary-id MuiTypography-body2-id MuiTypography-colorTextSecondary-id"
>
<time
class=""
datetime="1539359471665"
title="Oct 12, 2018 11:51 AM"
>
in 2 months
</time>
</div>
</div>
</li>
<li
class="MuiListItem-root-id MuiListItem-dense-id MuiListItem-gutters-id"
>
@ -66158,6 +66182,30 @@ exports[`Storyshots Views / HomePage order permissions 1`] = `
</div>
</div>
</li>
<li
class="MuiListItem-root-id MuiListItem-dense-id MuiListItem-gutters-id"
>
<div
class="MuiListItemText-root-id MuiListItemText-dense-id MuiListItemText-multiline-id"
>
<div
class="MuiTypography-root-id MuiTypography-body1-id"
>
Order #15 was placed from draft
</div>
<div
class="MuiTypography-root-id MuiListItemText-secondary-id MuiTypography-body2-id MuiTypography-colorTextSecondary-id"
>
<time
class=""
datetime="1539359471665"
title="Oct 12, 2018 11:51 AM"
>
in 2 months
</time>
</div>
</div>
</li>
<li
class="MuiListItem-root-id MuiListItem-dense-id MuiListItem-gutters-id"
>