From 00a6d15b5127c2093aa363cae26cb6c8c629bbdf Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 27 Apr 2023 10:06:54 +0200 Subject: [PATCH 1/5] error message for incorrect redemption link --- .../LinkInformations/RedeemInformation.vue | 5 +++-- .../components/LinkInformations/RedeemValid.vue | 8 +++++++- frontend/src/locales/de.json | 1 + frontend/src/locales/en.json | 1 + frontend/src/pages/TransactionLink.vue | 14 +++++++++----- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/LinkInformations/RedeemInformation.vue b/frontend/src/components/LinkInformations/RedeemInformation.vue index d287605a4..7a55c5c01 100644 --- a/frontend/src/components/LinkInformations/RedeemInformation.vue +++ b/frontend/src/components/LinkInformations/RedeemInformation.vue @@ -1,11 +1,12 @@ @@ -47,12 +48,13 @@ export default { return { linkData: { __typename: 'TransactionLink', - amount: '123.45', - memo: 'memo', + amount: '', + memo: '', user: { - firstName: 'Bibi', + firstName: '', }, deletedAt: null, + validLink: false, }, } }, @@ -67,13 +69,15 @@ export default { }, }) .then((result) => { + this.validLink = true this.linkData = result.data.queryTransactionLink if (this.linkData.__typename === 'ContributionLink' && this.$store.state.token) { this.mutationLink(this.linkData.amount) } }) - .catch((err) => { - this.toastError(err.message) + .catch(() => { + this.toastError(this.$t('gdd_per_link.redeemlink-error')) + // this.$router.push('/overview') }) }, mutationLink(amount) { From c6a4e1a9df0a197cd2c43c8db9511d77c4353955 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 27 Apr 2023 10:07:32 +0200 Subject: [PATCH 2/5] yarn lint --- frontend/src/locales/de.json | 2 +- frontend/src/locales/en.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 18024d2fd..c1bbea760 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -204,7 +204,7 @@ "redeemed": "Erfolgreich eingelöst! Deinem Konto wurden {n} GDD gutgeschrieben.", "redeemed-at": "Der Link wurde bereits am {date} eingelöst.", "redeemed-title": "eingelöst", - "redeemlink-error":"Dieser Einlöse-Link ist nicht vollständig.", + "redeemlink-error": "Dieser Einlöse-Link ist nicht vollständig.", "to-login": "Log dich ein", "to-register": "Registriere ein neues Konto.", "validUntil": "Gültig bis", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 260d09343..7d0c28429 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -204,7 +204,7 @@ "redeemed": "Successfully redeemed! Your account has been credited with {n} GDD.", "redeemed-at": "The link was already redeemed on {date}.", "redeemed-title": "redeemed", - "redeemlink-error":"This redemption link is not complete.", + "redeemlink-error": "This redemption link is not complete.", "to-login": "Log in", "to-register": "Register a new account.", "validUntil": "Valid until", From ae4b88055e704a50839aee1d064649f08cd1483c Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 27 Apr 2023 10:21:12 +0200 Subject: [PATCH 3/5] fix test --- frontend/src/pages/TransactionLink.spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/TransactionLink.spec.js b/frontend/src/pages/TransactionLink.spec.js index adbb25226..349c6c36d 100644 --- a/frontend/src/pages/TransactionLink.spec.js +++ b/frontend/src/pages/TransactionLink.spec.js @@ -374,12 +374,12 @@ describe('TransactionLink', () => { describe('error on transaction link query', () => { beforeEach(() => { - apolloQueryMock.mockRejectedValue({ message: 'Ouchh!' }) + apolloQueryMock.mockRejectedValue({ message: 'gdd_per_link.redeemlink-error' }) wrapper = Wrapper() }) it('toasts an error message', () => { - expect(toastErrorSpy).toBeCalledWith('Ouchh!') + expect(toastErrorSpy).toBeCalledWith('gdd_per_link.redeemlink-error') }) }) }) From 3a6b73842744568864b976ae857f013e153817d1 Mon Sep 17 00:00:00 2001 From: mahula Date: Tue, 2 May 2023 09:24:57 +0200 Subject: [PATCH 4/5] update jest-canvas-mock version to resolve window mock problem in tests --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 8515ca209..f07284da6 100755 --- a/frontend/package.json +++ b/frontend/package.json @@ -44,7 +44,7 @@ "graphql": "^15.5.1", "identity-obj-proxy": "^3.0.0", "jest": "^26.6.3", - "jest-canvas-mock": "^2.3.1", + "jest-canvas-mock": "^2.5.0", "jwt-decode": "^3.1.2", "portal-vue": "^2.1.7", "prettier": "^2.2.1", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 9e8fdd81d..7cc8e5fe5 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -8657,10 +8657,10 @@ javascript-stringify@^1.6.0: resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3" integrity sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM= -jest-canvas-mock@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.3.1.tgz#9535d14bc18ccf1493be36ac37dd349928387826" - integrity sha512-5FnSZPrX3Q2ZfsbYNE3wqKR3+XorN8qFzDzB5o0golWgt6EOX1+emBnpOc9IAQ+NXFj8Nzm3h7ZdE/9H0ylBcg== +jest-canvas-mock@^2.5.0: + version "2.5.0" + resolved "https://registry.yarnpkg.com/jest-canvas-mock/-/jest-canvas-mock-2.5.0.tgz#3e60f87f77ddfa273cf8e7e4ea5f86fa827c7117" + integrity sha512-s2bmY2f22WPMzhB2YA93kiyf7CAfWAnV/sFfY9s48IVOrGmwui1eSFluDPesq1M+7tSC1hJAit6mzO0ZNXvVBA== dependencies: cssfontparser "^1.2.1" moo-color "^1.0.2" From 12265a79da6e155a2a880f03545b3b82ebb5b0c7 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 31 May 2023 11:35:51 +0200 Subject: [PATCH 5/5] changes reviews --- frontend/src/pages/TransactionLink.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/pages/TransactionLink.vue b/frontend/src/pages/TransactionLink.vue index 21bc833c6..9444d7d18 100644 --- a/frontend/src/pages/TransactionLink.vue +++ b/frontend/src/pages/TransactionLink.vue @@ -77,7 +77,6 @@ export default { }) .catch(() => { this.toastError(this.$t('gdd_per_link.redeemlink-error')) - // this.$router.push('/overview') }) }, mutationLink(amount) {