From a618ac678e3685c26a83c68a31ab710286368bbb Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:35:21 +0100 Subject: [PATCH 01/40] Created delete query. --- admin/src/graphql/getPendingCreations.js | 1 + backend/src/graphql/resolver/AdminResolver.ts | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index f359c79db..add9efc29 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -3,6 +3,7 @@ import gql from 'graphql-tag' export const getPendingCreations = gql` query { getPendingCreations { + id firstName lastName email diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index a93696814..70f6c35ec 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -8,6 +8,7 @@ import { PendingCreationRepository } from '../../typeorm/repository/PendingCreat import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' import moment from 'moment' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' @Resolver() export class AdminResolver { @@ -76,6 +77,15 @@ export class AdminResolver { ) return pendingCreationsPromise } + + @Query(() => Boolean) + async deletePendingCreation(@Arg('id') id: number): Promise { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const entity = await pendingCreationRepository.findOne(id) + if (!entity) throw new Error('Not pending creation with this id.') + const res = await pendingCreationRepository.manager.remove(entity) + return res ? true : false + } } async function getUserCreations(id: number): Promise { From 2f6a1a06300c58bbfa567352bdf632de84a9d367 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 17:43:24 +0100 Subject: [PATCH 02/40] In CreationConfirm.vue number of all open creations and transferred to the store --- admin/src/pages/CreationConfirm.vue | 3 ++- admin/src/pages/Overview.vue | 16 +++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 660436d6c..c44402a1e 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -75,6 +75,8 @@ export default { }) .then((result) => { this.confirmResult = result.data.getPendingCreations + this.$store.commit('resetOpenCreations') + this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).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..329843cad 100644 --- a/admin/src/pages/Overview.vue +++ b/admin/src/pages/Overview.vue @@ -76,21 +76,27 @@ From f2c31b7d6837ef22e9c79a65d1d4f60323c3a724 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 17:49:29 +0100 Subject: [PATCH 04/40] pendingCreationRepository.manager.remove res - fix prettier --- 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 70f6c35ec..5d2ed47a2 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -84,7 +84,7 @@ export class AdminResolver { const entity = await pendingCreationRepository.findOne(id) if (!entity) throw new Error('Not pending creation with this id.') const res = await pendingCreationRepository.manager.remove(entity) - return res ? true : false + return !!res } } From 30ba6e473b176d02614a6360e93cd8cc854b7f7a Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 18:02:18 +0100 Subject: [PATCH 05/40] chnaged simpler counting, number of open creations --- admin/src/pages/CreationConfirm.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index c44402a1e..1b53dc85b 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -76,7 +76,7 @@ export default { .then((result) => { this.confirmResult = result.data.getPendingCreations this.$store.commit('resetOpenCreations') - this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) + this.$store.commit('openCreationsPlus', result.data.getPendingCreations.length) }) .catch((error) => { this.$toasted.error(error.message) From 38da2dcdfd34d7b4331a4593849dffdeee2cbdaa Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 18:09:10 +0100 Subject: [PATCH 06/40] Remove hint text for test creations on CreationConfirm Table. --- admin/src/pages/CreationConfirm.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 1b53dc85b..ec0e6e7af 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -1,9 +1,5 @@