From 3af471aebbab0138e629878de13d8780d742071a Mon Sep 17 00:00:00 2001 From: elweyn Date: Mon, 26 Jun 2023 20:00:24 +0200 Subject: [PATCH 1/4] Change btn-warning color and background color to #e1a908 --- admin/src/components/Tables/OpenCreationsTable.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue index 9d93eba60..51f00a7d4 100644 --- a/admin/src/components/Tables/OpenCreationsTable.vue +++ b/admin/src/components/Tables/OpenCreationsTable.vue @@ -166,3 +166,9 @@ export default { }, } + From 48498ee729191822c2ce651ec87d87b8e8e2da77 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 27 Jun 2023 10:04:21 +0200 Subject: [PATCH 2/4] Refactor state to status for contribution. --- backend/src/graphql/model/Contribution.ts | 4 +- backend/src/graphql/model/GdtEntryList.ts | 4 +- .../graphql/model/UnconfirmedContribution.ts | 4 +- .../resolver/ContributionResolver.test.ts | 164 +++++++++--------- backend/src/seeds/graphql/queries.ts | 6 +- 5 files changed, 91 insertions(+), 91 deletions(-) diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index b5db21b16..6f36a9f64 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -15,7 +15,7 @@ export class Contribution { this.confirmedAt = contribution.confirmedAt this.confirmedBy = contribution.confirmedBy this.contributionDate = contribution.contributionDate - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messagesCount = contribution.messages ? contribution.messages.length : 0 this.deniedAt = contribution.deniedAt this.deniedBy = contribution.deniedBy @@ -68,7 +68,7 @@ export class Contribution { messagesCount: number @Field(() => String) - state: string + status: string @Field(() => Int, { nullable: true }) moderatorId: number | null diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts index 06f77f532..7c08520c8 100644 --- a/backend/src/graphql/model/GdtEntryList.ts +++ b/backend/src/graphql/model/GdtEntryList.ts @@ -10,7 +10,7 @@ import { GdtEntry } from './GdtEntry' @ObjectType() export class GdtEntryList { constructor(json: any) { - this.state = json.state + this.status = json.state this.count = json.count this.gdtEntries = json.gdtEntries ? json.gdtEntries.map((json: any) => new GdtEntry(json)) : [] this.gdtSum = json.gdtSum @@ -18,7 +18,7 @@ export class GdtEntryList { } @Field(() => String) - state: string + status: string @Field(() => Int) count: number diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index dece05781..5e38db6a0 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -16,7 +16,7 @@ export class UnconfirmedContribution { this.email = user ? user.emailContact.email : '' this.moderator = contribution.moderatorId this.creation = creations - this.state = contribution.contributionStatus + this.status = contribution.contributionStatus this.messageCount = contribution.messages ? contribution.messages.length : 0 } @@ -51,7 +51,7 @@ export class UnconfirmedContribution { creation: Decimal[] @Field(() => String) - state: string + status: string @Field(() => Int) messageCount: number diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index d4c84b4f3..f3646de54 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -1092,29 +1092,29 @@ describe('ContributionResolver', () => { contributionCount: 4, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: contributionToDelete.data.createContribution.id, - state: 'DELETED', + status: 'DELETED', memo: 'Test contribution to delete', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1223,47 +1223,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1288,47 +1288,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1353,47 +1353,47 @@ describe('ContributionResolver', () => { contributionCount: 7, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), @@ -1419,33 +1419,33 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -1468,20 +1468,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), @@ -1506,20 +1506,20 @@ describe('ContributionResolver', () => { contributionCount: 1, contributionList: expect.arrayContaining([ expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ id: inProgressContribution.data.createContribution.id, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', memo: 'Test IN_PROGRESS contribution', amount: '100', }), @@ -1545,27 +1545,27 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ id: contributionToDeny.data.createContribution.id, - state: 'DENIED', + status: 'DENIED', memo: 'Test contribution to deny', amount: '100', }), expect.objectContaining({ id: expect.any(Number), - state: 'DENIED', + status: 'DENIED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.not.objectContaining({ - state: 'PENDING', + status: 'PENDING', }), ]), }) @@ -1608,36 +1608,36 @@ describe('ContributionResolver', () => { contributionList: expect.arrayContaining([ expect.objectContaining({ amount: '100', - state: 'CONFIRMED', + status: 'CONFIRMED', id: contributionToConfirm.data.createContribution.id, memo: 'Test contribution to confirm', }), expect.objectContaining({ id: pendingContribution.data.createContribution.id, - state: 'PENDING', + status: 'PENDING', memo: 'Test PENDING contribution update', amount: '10', }), expect.objectContaining({ id: bibiCreatedContribution.id, - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Herzlich Willkommen bei Gradido!', amount: '1000', }), expect.objectContaining({ id: expect.any(Number), - state: 'CONFIRMED', + status: 'CONFIRMED', memo: 'Whatever contribution', amount: '166', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) @@ -2691,7 +2691,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(50), @@ -2700,7 +2700,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(450), @@ -2709,7 +2709,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido liebe Bibi!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(400), @@ -2718,7 +2718,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2727,7 +2727,7 @@ describe('ContributionResolver', () => { lastName: 'der Baumeister', memo: 'Confirmed Contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2736,7 +2736,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2745,7 +2745,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Aktives Grundeinkommen', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(200), @@ -2754,7 +2754,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Das war leider zu Viel!', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2763,7 +2763,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2772,7 +2772,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(166), @@ -2781,7 +2781,7 @@ describe('ContributionResolver', () => { lastName: 'Hotzenplotz', memo: 'Whatever contribution', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2790,7 +2790,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to delete', messagesCount: 0, - state: 'DELETED', + status: 'DELETED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2799,7 +2799,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to deny', messagesCount: 0, - state: 'DENIED', + status: 'DENIED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2808,7 +2808,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test contribution to confirm', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.objectContaining({ amount: expect.decimalEqual(100), @@ -2817,7 +2817,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test IN_PROGRESS contribution', messagesCount: 1, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), expect.objectContaining({ amount: expect.decimalEqual(10), @@ -2826,7 +2826,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Test PENDING contribution update', messagesCount: 1, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: expect.decimalEqual(1000), @@ -2835,7 +2835,7 @@ describe('ContributionResolver', () => { lastName: 'Bloxberg', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'CONFIRMED', + status: 'CONFIRMED', }), ]), }) @@ -2864,7 +2864,7 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Herzlich Willkommen bei Gradido!', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.objectContaining({ amount: '100', @@ -2873,19 +2873,19 @@ describe('ContributionResolver', () => { lastName: 'Lustig', memo: 'Test env contribution', messagesCount: 0, - state: 'PENDING', + status: 'PENDING', }), expect.not.objectContaining({ - state: 'DENIED', + status: 'DENIED', }), expect.not.objectContaining({ - state: 'DELETED', + status: 'DELETED', }), expect.not.objectContaining({ - state: 'CONFIRMED', + status: 'CONFIRMED', }), expect.not.objectContaining({ - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }), ]), }) diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts index a964cdb3a..f376a5ff6 100644 --- a/backend/src/seeds/graphql/queries.ts +++ b/backend/src/seeds/graphql/queries.ts @@ -195,7 +195,7 @@ export const listContributions = gql` confirmedAt confirmedBy deletedAt - state + status messagesCount deniedAt deniedBy @@ -218,7 +218,7 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF confirmedAt confirmedBy contributionDate - state + status messagesCount deniedAt deniedBy @@ -254,7 +254,7 @@ export const adminListContributions = gql` confirmedAt confirmedBy contributionDate - state + status messagesCount deniedAt deniedBy From af60cc26386a669e2aa68d268726a2d01b571493 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 27 Jun 2023 10:04:40 +0200 Subject: [PATCH 3/4] Refactor state to status for contribution in frontend. --- .../ContributionMessagesFormular.spec.js | 4 +-- .../ContributionMessagesFormular.vue | 2 +- .../ContributionMessagesList.spec.js | 8 +++--- .../ContributionMessagesList.vue | 10 +++---- .../ContributionMessagesListItem.spec.js | 2 +- .../Contributions/ContributionList.spec.js | 4 +-- .../Contributions/ContributionList.vue | 12 ++++---- .../ContributionListItem.spec.js | 14 +++++----- .../Contributions/ContributionListItem.vue | 28 +++++++++---------- frontend/src/graphql/queries.js | 4 +-- frontend/src/pages/Community.spec.js | 12 ++++---- frontend/src/pages/Community.vue | 8 +++--- 12 files changed, 54 insertions(+), 54 deletions(-) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js index ad17152c0..17fd44fe2 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js @@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => { ) }) - it('emitted "update-state" with data', async () => { - expect(wrapper.emitted('update-state')).toEqual( + it('emitted "update-status" with data', async () => { + expect(wrapper.emitted('update-status')).toEqual( expect.arrayContaining([expect.arrayContaining([42])]), ) }) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue index b11be3b14..e84f9273b 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -55,7 +55,7 @@ export default { }) .then((result) => { this.$emit('get-list-contribution-messages', false) - this.$emit('update-state', this.contributionId) + this.$emit('update-status', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.reply')) this.isSubmitting = false diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js index 47a8f9dfe..2caef666f 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -8,7 +8,7 @@ describe('ContributionMessagesList', () => { const propsData = { contributionId: 42, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', messages: [], } @@ -40,13 +40,13 @@ describe('ContributionMessagesList', () => { expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true) }) - describe('update State', () => { + describe('update Status', () => { beforeEach(() => { - wrapper.vm.updateState() + wrapper.vm.updateStatus() }) it('emits getListContributionMessages', async () => { - expect(wrapper.vm.$emit('update-state')).toBeTruthy() + expect(wrapper.vm.$emit('update-status')).toBeTruthy() }) }) }) diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue index c93d424b6..28e37dbb7 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue @@ -7,10 +7,10 @@
@@ -37,7 +37,7 @@ export default { type: Number, required: true, }, - state: { + status: { type: String, required: true, }, @@ -47,8 +47,8 @@ export default { }, }, methods: { - updateState(id) { - this.$emit('update-state', id) + updateStatus(id) { + this.$emit('update-status', id) }, }, } diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js index b00fdd7cf..d93683de9 100644 --- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js +++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js @@ -21,7 +21,7 @@ const mocks = { describe('ContributionMessagesList', () => { const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', messages: [ { id: 111, diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js index ebff93886..4137f7957 100644 --- a/frontend/src/components/Contributions/ContributionList.spec.js +++ b/frontend/src/components/Contributions/ContributionList.spec.js @@ -119,11 +119,11 @@ describe('ContributionList', () => { describe('update status', () => { beforeEach(() => { - wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 }) + wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-status', { id: 2 }) }) it('emits update status', () => { - expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]]) + expect(wrapper.emitted('update-status')).toEqual([[{ id: 2 }]]) }) }) }) diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue index 3e32cb90f..9f62354a3 100644 --- a/frontend/src/components/Contributions/ContributionList.vue +++ b/frontend/src/components/Contributions/ContributionList.vue @@ -2,26 +2,26 @@
{ const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', messagesCount: 2, id: 1, createdAt: '26/07/2022', @@ -72,8 +72,8 @@ describe('ContributionListItem', () => { expect(wrapper.vm.variant).toBe('success') }) - it('is warning at when state is IN_PROGRESS', async () => { - await wrapper.setProps({ state: 'IN_PROGRESS' }) + it('is warning at when status is IN_PROGRESS', async () => { + await wrapper.setProps({ status: 'IN_PROGRESS' }) expect(wrapper.vm.variant).toBe('205') }) }) @@ -134,13 +134,13 @@ describe('ContributionListItem', () => { }) }) - describe('updateState', () => { + describe('updateStatus', () => { beforeEach(async () => { - await wrapper.vm.updateState() + await wrapper.vm.updateStatus() }) - it('emit update-state', () => { - expect(wrapper.vm.$emit('update-state')).toBeTruthy() + it('emit update-status', () => { + expect(wrapper.vm.$emit('update-status')).toBeTruthy() }) }) }) diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue index 27e8459bd..0197a9593 100644 --- a/frontend/src/components/Contributions/ContributionListItem.vue +++ b/frontend/src/components/Contributions/ContributionListItem.vue @@ -2,7 +2,7 @@
@@ -26,7 +26,7 @@
{{ $t('contributionText') }}
{{ memo }}
@@ -37,11 +37,11 @@
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
-
+
{{ $t('contribution.alert.denied') }}
-
+
{{ $t('contribution.deleted') }}
{{ amount | GDD }}
@@ -53,12 +53,12 @@
@@ -69,7 +69,7 @@
@@ -161,7 +161,7 @@ export default { type: String, required: false, }, - state: { + status: { type: String, required: false, default: '', @@ -197,14 +197,14 @@ export default { if (this.deletedAt) return 'trash' if (this.deniedAt) return 'x-circle' if (this.confirmedAt) return 'check' - if (this.state === 'IN_PROGRESS') return 'question' + if (this.status === 'IN_PROGRESS') return 'question' return 'bell-fill' }, variant() { if (this.deletedAt) return 'danger' if (this.deniedAt) return 'warning' if (this.confirmedAt) return 'success' - if (this.state === 'IN_PROGRESS') return '205' + if (this.status === 'IN_PROGRESS') return '205' return 'primary' }, date() { @@ -245,8 +245,8 @@ export default { this.toastError(error.message) }) }, - updateState(id) { - this.$emit('update-state', id) + updateStatus(id) { + this.$emit('update-status', id) }, }, watch: { diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js index f254b93cc..49975b0a2 100644 --- a/frontend/src/graphql/queries.js +++ b/frontend/src/graphql/queries.js @@ -190,7 +190,7 @@ export const listContributions = gql` confirmedAt confirmedBy deletedAt - state + status messagesCount deniedAt deniedBy @@ -214,7 +214,7 @@ export const listAllContributions = gql` contributionDate confirmedAt confirmedBy - state + status messagesCount deniedAt deniedBy diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js index ab1572d37..0867b0732 100644 --- a/frontend/src/pages/Community.spec.js +++ b/frontend/src/pages/Community.spec.js @@ -68,7 +68,7 @@ describe('Community', () => { firstName: 'Bibi', contributionDate: '2022-07-15T08:47:06.000Z', lastName: 'Bloxberg', - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', messagesCount: 0, deniedAt: null, deniedBy: null, @@ -85,7 +85,7 @@ describe('Community', () => { firstName: 'Bibi', contributionDate: '2022-06-15T08:47:06.000Z', lastName: 'Bloxberg', - state: 'CONFIRMED', + status: 'CONFIRMED', messagesCount: 0, deniedAt: null, deniedBy: null, @@ -121,7 +121,7 @@ describe('Community', () => { deniedAt: null, deniedBy: null, messagesCount: 0, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }, { id: 1550, @@ -137,7 +137,7 @@ describe('Community', () => { deniedAt: null, deniedBy: null, messagesCount: 0, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }, { id: 1556, @@ -153,7 +153,7 @@ describe('Community', () => { deniedAt: null, deniedBy: null, messagesCount: 0, - state: 'IN_PROGRESS', + status: 'IN_PROGRESS', }, ], contributionCount: 3, @@ -263,7 +263,7 @@ describe('Community', () => { expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3) }) - it('check for correct tabIndex if state is "IN_PROGRESS" or not', () => { + it('check for correct tabIndex if status is "IN_PROGRESS" or not', () => { expect(routerPushMock).toBeCalledWith({ params: { tab: 'contributions' } }) }) diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue index 4388d6f4a..c4df3a47e 100644 --- a/frontend/src/pages/Community.vue +++ b/frontend/src/pages/Community.vue @@ -30,7 +30,7 @@ @update-list-contributions="updateListContributions" @update-contribution-form="updateContributionForm" @delete-contribution="deleteContribution" - @update-state="updateState" + @update-status="updateStatus" :contributionCount="contributionCount" :showPagination="true" :pageSize="pageSize" @@ -148,7 +148,7 @@ export default { update({ listContributions }) { this.contributionCount = listContributions.contributionCount this.items = listContributions.contributionList - if (this.items.find((item) => item.state === 'IN_PROGRESS')) { + if (this.items.find((item) => item.status === 'IN_PROGRESS')) { this.tabIndex = 1 if (this.$route.params.tab !== 'contributions') this.$router.push({ params: { tab: 'contributions' } }) @@ -290,8 +290,8 @@ export default { updateTransactions(pagination) { this.$emit('update-transactions', pagination) }, - updateState(id) { - this.items.find((item) => item.id === id).state = 'PENDING' + updateStatus(id) { + this.items.find((item) => item.id === id).status = 'PENDING' }, }, } From 45b3dc82952d9c3f0fca970052460ac45e40e976 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 27 Jun 2023 10:04:54 +0200 Subject: [PATCH 4/4] Refactor state to status for contribution in admin. --- .../ContributionMessagesFormular.spec.js | 4 +-- .../ContributionMessagesFormular.vue | 2 +- .../ContributionMessagesList.spec.js | 2 +- .../ContributionMessagesList.vue | 10 +++---- .../ContributionMessagesListItem.spec.js | 4 +-- .../CreationTransactionList.spec.js | 4 +-- .../components/CreationTransactionList.vue | 8 +++--- .../Tables/OpenCreationsTable.spec.js | 8 +++--- .../components/Tables/OpenCreationsTable.vue | 26 +++++++++---------- admin/src/graphql/adminListContributions.js | 2 +- admin/src/locales/de.json | 4 +-- admin/src/locales/en.json | 4 +-- admin/src/pages/CreationConfirm.spec.js | 8 +++--- admin/src/pages/CreationConfirm.vue | 6 ++--- admin/src/pages/Overview.spec.js | 4 +-- 15 files changed, 48 insertions(+), 48 deletions(-) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js index a81009c09..ef96e3652 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js @@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => { ) }) - it('emitted "update-state" with data', async () => { - expect(wrapper.emitted('update-state')).toEqual( + it('emitted "update-status" with data', async () => { + expect(wrapper.emitted('update-status')).toEqual( expect.arrayContaining([expect.arrayContaining([42])]), ) }) diff --git a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue index 3a5d6e0b8..56761df12 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesFormular.vue @@ -54,7 +54,7 @@ export default { }) .then((result) => { this.$emit('get-list-contribution-messages', this.contributionId) - this.$emit('update-state', this.contributionId) + this.$emit('update-status', this.contributionId) this.form.text = '' this.toastSuccess(this.$t('message.request')) this.loading = false diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js index f0b6ea821..c0d9ed9ae 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.spec.js @@ -10,7 +10,7 @@ describe('ContributionMessagesList', () => { const propsData = { contributionId: 42, - contributionState: 'PENDING', + contributionStatus: 'PENDING', } const mocks = { diff --git a/admin/src/components/ContributionMessages/ContributionMessagesList.vue b/admin/src/components/ContributionMessages/ContributionMessagesList.vue index fab6b5e4a..173061012 100644 --- a/admin/src/components/ContributionMessages/ContributionMessagesList.vue +++ b/admin/src/components/ContributionMessages/ContributionMessagesList.vue @@ -6,11 +6,11 @@
-
+
@@ -31,7 +31,7 @@ export default { type: Number, required: true, }, - contributionState: { + contributionStatus: { type: String, required: true, }, @@ -58,8 +58,8 @@ export default { this.toastError(error.message) }) }, - updateState(id) { - this.$emit('update-state', id) + updateStatus(id) { + this.$emit('update-status', id) }, }, created() { diff --git a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js index d02b5053a..93e2cdcd8 100644 --- a/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js +++ b/admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js @@ -18,7 +18,7 @@ describe('ContributionMessagesListItem', () => { describe('if message author has moderator role', () => { const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', message: { id: 111, message: 'Lorem ipsum?', @@ -79,7 +79,7 @@ describe('ContributionMessagesListItem', () => { describe('if message author does not have moderator role', () => { const propsData = { contributionId: 42, - state: 'PENDING', + status: 'PENDING', message: { id: 113, message: 'Asda sdad ad asdasd, das Ass das Das. ', diff --git a/admin/src/components/CreationTransactionList.spec.js b/admin/src/components/CreationTransactionList.spec.js index e88d7cc22..bff1bb32c 100644 --- a/admin/src/components/CreationTransactionList.spec.js +++ b/admin/src/components/CreationTransactionList.spec.js @@ -28,7 +28,7 @@ const defaultData = () => { memo: 'Danke für alles', date: new Date(), moderator: 1, - state: 'PENDING', + status: 'PENDING', creation: [500, 500, 500], messagesCount: 0, deniedBy: null, @@ -50,7 +50,7 @@ const defaultData = () => { memo: 'Gut Ergattert', date: new Date(), moderator: 1, - state: 'PENDING', + status: 'PENDING', creation: [500, 500, 500], messagesCount: 0, deniedBy: null, diff --git a/admin/src/components/CreationTransactionList.vue b/admin/src/components/CreationTransactionList.vue index a4849c87e..5ce3f0644 100644 --- a/admin/src/components/CreationTransactionList.vue +++ b/admin/src/components/CreationTransactionList.vue @@ -34,8 +34,8 @@ {{ $t('help.transactionlist.confirmed') }}
- {{ $t('transactionlist.state') }} {{ $t('math.equals') }} - {{ $t('help.transactionlist.state') }} + {{ $t('transactionlist.status') }} {{ $t('math.equals') }} + {{ $t('help.transactionlist.status') }}
@@ -78,8 +78,8 @@ export default { }, }, { - key: 'state', - label: this.$t('transactionlist.state'), + key: 'status', + label: this.$t('transactionlist.status'), }, { key: 'amount', diff --git a/admin/src/components/Tables/OpenCreationsTable.spec.js b/admin/src/components/Tables/OpenCreationsTable.spec.js index 8f91aca03..11c5fd240 100644 --- a/admin/src/components/Tables/OpenCreationsTable.spec.js +++ b/admin/src/components/Tables/OpenCreationsTable.spec.js @@ -131,13 +131,13 @@ describe('OpenCreationsTable', () => { }) }) - describe('call updateState', () => { + describe('call updateStatus', () => { beforeEach(() => { - wrapper.vm.updateState(4) + wrapper.vm.updateStatus(4) }) - it('emits update-state', () => { - expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy() + it('emits update-status', () => { + expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy() }) }) }) diff --git a/admin/src/components/Tables/OpenCreationsTable.vue b/admin/src/components/Tables/OpenCreationsTable.vue index 9d93eba60..8e1a08785 100644 --- a/admin/src/components/Tables/OpenCreationsTable.vue +++ b/admin/src/components/Tables/OpenCreationsTable.vue @@ -9,8 +9,8 @@ stacked="md" :tbody-tr-class="rowClass" > -