diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index ccf130cd0..03d8a0fe6 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -103,7 +103,7 @@ "has-account": "Du hast ein Gradido Konto", "header": "Gradidos versenden per Link", "link-copied": "Link wurde in die Zwischenablage kopiert", - "link-deleted": "Der Link wurde am {date} von {user} gelöscht.", + "link-deleted": "Der Link wurde am {date} gelöscht.", "link-expired": "Der Link ist nicht mehr gültig. Die Gültigkeit ist am {date} abgelaufen.", "link-overview": "Linkübersicht", "links_count": "Aktive Links", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 83ae65c65..26c8db9a2 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -103,7 +103,7 @@ "has-account": "You have a Gradido account", "header": "Send Gradidos via link", "link-copied": "Link copied to clipboard", - "link-deleted": "The link has been deleted.", + "link-deleted": "The link was deleted on {date}.", "link-expired": "The link is no longer valid. The validity expired on {date}.", "link-overview": "Link overview", "links_count": "Active links", diff --git a/frontend/src/pages/ShowTransactionLinkInformations.spec.js b/frontend/src/pages/TransactionLink.spec.js similarity index 88% rename from frontend/src/pages/ShowTransactionLinkInformations.spec.js rename to frontend/src/pages/TransactionLink.spec.js index e5b112f2a..f31812a10 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.spec.js +++ b/frontend/src/pages/TransactionLink.spec.js @@ -1,5 +1,5 @@ import { mount } from '@vue/test-utils' -import ShowTransactionLinkInformations from './ShowTransactionLinkInformations' +import TransactionLink from './TransactionLink' import { queryTransactionLink } from '@/graphql/queries' const localVue = global.localVue @@ -21,7 +21,6 @@ apolloQueryMock.mockResolvedValue({ redeemedAt: '2022-03-18T10:08:43.000Z', deletedAt: null, user: { firstName: 'Bibi', publisherId: 0, email: 'bibi@bloxberg.de', __typename: 'User' }, - __typename: 'TransactionLink', }, ], }, @@ -52,11 +51,11 @@ const createMockObject = (code) => { } } -describe('ShowTransactionLinkInformations', () => { +describe('TransactionLink', () => { let wrapper const Wrapper = (functionN) => { - return mount(ShowTransactionLinkInformations, functionN) + return mount(TransactionLink, functionN) } describe('mount', () => { diff --git a/frontend/src/pages/ShowTransactionLinkInformations.vue b/frontend/src/pages/TransactionLink.vue similarity index 98% rename from frontend/src/pages/ShowTransactionLinkInformations.vue rename to frontend/src/pages/TransactionLink.vue index 9551af052..bd88f051b 100644 --- a/frontend/src/pages/ShowTransactionLinkInformations.vue +++ b/frontend/src/pages/TransactionLink.vue @@ -32,7 +32,7 @@ import { queryTransactionLink } from '@/graphql/queries' import { redeemTransactionLink } from '@/graphql/mutations' export default { - name: 'ShowTransactionLinkInformations', + name: 'TransactionLink', components: { TransactionLinkInformationItem, RedeemLoggedOut, @@ -103,7 +103,6 @@ export default { // eslint-disable-next-line vue/no-side-effects-in-computed-properties this.redeemedBoxText = this.$t('gdd_per_link.link-deleted', { date: this.linkData.deletedAt, - user: this.linkData.user.firstName, }) return `X4` } else { diff --git a/frontend/src/routes/router.test.js b/frontend/src/routes/router.test.js index 1a966fdc6..24916bb05 100644 --- a/frontend/src/routes/router.test.js +++ b/frontend/src/routes/router.test.js @@ -183,9 +183,9 @@ describe('router', () => { }) describe('redeem', () => { - it('loads the "ShowTransactionLinkInformations" page', async () => { + it('loads the "TransactionLink" page', async () => { const component = await routes.find((r) => r.path === '/redeem/:code').component() - expect(component.default.name).toBe('ShowTransactionLinkInformations') + expect(component.default.name).toBe('TransactionLink') }) }) diff --git a/frontend/src/routes/routes.js b/frontend/src/routes/routes.js index 982091b4d..5e0b09c5e 100755 --- a/frontend/src/routes/routes.js +++ b/frontend/src/routes/routes.js @@ -84,7 +84,7 @@ const routes = [ }, { path: '/redeem/:code', - component: () => import('@/pages/ShowTransactionLinkInformations.vue'), + component: () => import('@/pages/TransactionLink.vue'), }, { path: '*', component: NotFound }, ]