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

Fix links in giftcard events created by apps (#1998)

Browse source 
* Fix links in giftcard events created by apps

* Trigger deployment
This commit is contained in:
Michał Droń 2022-04-27 14:12:01 +02:00 committed by GitHub
parent 5c6c0b43f1
commit fbf57bbbb1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/giftCards/GiftCardUpdate/GiftCardHistory/GiftCardTimelineEvent.tsx
View file

@ -28,24 +28,31 @@ const getUserOrApp = (event: GiftCardEventFragment): string | null => {
return null; return null;
}; };
const getUserOrAppUrl = (event: GiftCardEventFragment): string => {
if (event.user) {
return staffMemberDetailsUrl(event.user.id);
}
if (event.app) {
return appPath(event.app.id);
}
return null;
};
const getEventMessage = (event: GiftCardEventFragment, intl: IntlShape) => { const getEventMessage = (event: GiftCardEventFragment, intl: IntlShape) => {
const user = getUserOrApp(event); const user = getUserOrApp(event);
const userUrl = getUserOrAppUrl(event);
switch (event.type) { switch (event.type) {
case GiftCardEventsEnum.ACTIVATED: case GiftCardEventsEnum.ACTIVATED:
return user return user
? intl.formatMessage(timelineMessages.activated, { ? intl.formatMessage(timelineMessages.activated, {
activatedBy: ( activatedBy: <Link href={userUrl}>{user}</Link>
<Link href={staffMemberDetailsUrl(event.user.id)}>{user}</Link>
)
}) })
: intl.formatMessage(timelineMessages.activatedAnonymous); : intl.formatMessage(timelineMessages.activatedAnonymous);
case GiftCardEventsEnum.BALANCE_RESET: case GiftCardEventsEnum.BALANCE_RESET:
return user return user
? intl.formatMessage(timelineMessages.balanceReset, { ? intl.formatMessage(timelineMessages.balanceReset, {
resetBy: ( resetBy: <Link href={userUrl}>{user}</Link>
<Link href={staffMemberDetailsUrl(event.user.id)}>{user}</Link>
)
}) })
: intl.formatMessage(timelineMessages.balanceResetAnonymous); : intl.formatMessage(timelineMessages.balanceResetAnonymous);
case GiftCardEventsEnum.BOUGHT: case GiftCardEventsEnum.BOUGHT:
@ -57,25 +64,19 @@ const getEventMessage = (event: GiftCardEventFragment, intl: IntlShape) => {
case GiftCardEventsEnum.DEACTIVATED: case GiftCardEventsEnum.DEACTIVATED:
return user return user
? intl.formatMessage(timelineMessages.deactivated, { ? intl.formatMessage(timelineMessages.deactivated, {
deactivatedBy: ( deactivatedBy: <Link href={userUrl}>{user}</Link>
<Link href={staffMemberDetailsUrl(event.user.id)}>{user}</Link>
)
}) })
: intl.formatMessage(timelineMessages.deactivatedAnonymous); : intl.formatMessage(timelineMessages.deactivatedAnonymous);
case GiftCardEventsEnum.EXPIRY_DATE_UPDATED: case GiftCardEventsEnum.EXPIRY_DATE_UPDATED:
return user return user
? intl.formatMessage(timelineMessages.expiryDateUpdate, { ? intl.formatMessage(timelineMessages.expiryDateUpdate, {
expiryUpdatedBy: ( expiryUpdatedBy: <Link href={userUrl}>{user}</Link>
<Link href={staffMemberDetailsUrl(event.user.id)}>{user}</Link>
)
}) })
: intl.formatMessage(timelineMessages.expiryDateUpdateAnonymous); : intl.formatMessage(timelineMessages.expiryDateUpdateAnonymous);
case GiftCardEventsEnum.ISSUED: case GiftCardEventsEnum.ISSUED:
return user return user
? intl.formatMessage(timelineMessages.issued, { ? intl.formatMessage(timelineMessages.issued, {
issuedBy: ( issuedBy: <Link href={userUrl}>{user}</Link>
<Link href={staffMemberDetailsUrl(event.user.id)}>{user}</Link>
)
}) })
: intl.formatMessage(timelineMessages.issuedAnonymous); : intl.formatMessage(timelineMessages.issuedAnonymous);
case GiftCardEventsEnum.RESENT: case GiftCardEventsEnum.RESENT: