From f452e6537f4421785fc999114413b88793086457 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 15:03:58 +0100 Subject: [PATCH 01/10] Change delete method from Query to Mutation. --- backend/src/graphql/resolver/AdminResolver.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 51b018897..aaa60a50d 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -78,7 +78,7 @@ export class AdminResolver { return pendingCreationsPromise } - @Query(() => Boolean) + @Mutation(() => Boolean) async deletePendingCreation(@Arg('id') id: number): Promise { const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const entity = await pendingCreationRepository.findOne(id) From 997230b334b4fde176cb80f5985702bcc0fc3dce Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:26:00 +0100 Subject: [PATCH 02/10] text name changed from note to memo --- admin/src/graphql/getPendingCreations.js | 2 +- admin/src/pages/CreationConfirm.spec.js | 4 ++-- admin/src/pages/CreationConfirm.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index f359c79db..a94172d43 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -7,7 +7,7 @@ export const getPendingCreations = gql` lastName email amount - note + memo date moderator creation diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index 365ccd809..6598738f1 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -13,7 +13,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Bloxberg', email: 'bibi@bloxberg.de', amount: 500, - note: 'Danke für alles', + memo: 'Danke für alles', date: new Date(), moderator: 0, }, @@ -22,7 +22,7 @@ const apolloQueryMock = jest.fn().mockResolvedValue({ lastName: 'Hotzenplotz', email: 'raeuber@hotzenplotz.de', amount: 1000000, - note: 'Gut Ergatert', + memo: 'Gut Ergatert', date: new Date(), moderator: 0, }, diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 660436d6c..368734b23 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -37,7 +37,7 @@ export default { return value + ' GDD' }, }, - { key: 'note', label: 'Text' }, + { key: 'memo', label: 'Text' }, { key: 'date', label: 'Datum', From 56fcd7d445490b934e5934bf1d3ed2ca69433178 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:51:06 +0100 Subject: [PATCH 03/10] change Overview.vue methods getPendingCreations and store set open pending creations --- admin/src/pages/CreationConfirm.vue | 3 ++- admin/src/pages/Overview.vue | 11 ++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 368734b23..6b9166666 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -74,7 +74,9 @@ export default { query: getPendingCreations, }) .then((result) => { + this.$store.commit('resetOpenCreations') this.confirmResult = result.data.getPendingCreations + this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch((error) => { this.$toasted.error(error.message) @@ -83,7 +85,6 @@ export default { }, async created() { await this.getPendingCreations() - this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index d63c46199..6690678e3 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -76,24 +76,25 @@ From 297c892e5759d0a2efdd16e63e193489898e5540 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:52:36 +0100 Subject: [PATCH 04/10] remove console logs --- admin/src/pages/Overview.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue index 6690678e3..1c58751bc 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -87,7 +87,6 @@ export default { query: getPendingCreations, }) .then((result) => { - console.log(result.data) this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch() From ab86e95d179f975fc191150f69f87d01d92cfbb6 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 12:11:45 +0100 Subject: [PATCH 05/10] result array reverse, remove async from created und methods getPendingCreations --- admin/src/pages/CreationConfirm.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 6b9166666..7e3ca329f 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -68,14 +68,14 @@ export default { this.$store.commit('openCreationsMinus', 1) } }, - async getPendingCreations() { + getPendingCreations() { this.$apollo .query({ query: getPendingCreations, }) .then((result) => { this.$store.commit('resetOpenCreations') - this.confirmResult = result.data.getPendingCreations + this.confirmResult = result.data.getPendingCreations.reverse() this.$store.commit('setOpenCreations', result.data.getPendingCreations.length) }) .catch((error) => { @@ -83,8 +83,9 @@ export default { }) }, }, - async created() { - await this.getPendingCreations() + created() { + alert('neu laden') + this.getPendingCreations() }, } From 3c5778a81bca8ebb860c8ff6b845b55add6dc558 Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 12:14:06 +0100 Subject: [PATCH 06/10] remove alerts, remove test info text --- admin/src/pages/CreationConfirm.vue | 5 ----- 1 file changed, 5 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 7e3ca329f..654f1a74a 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,9 +1,5 @@