From 9e45a2168773b1ede494ac99ceb6a7a99af72e26 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 10:59:32 +0100 Subject: [PATCH 01/22] Call Apollo query to get the pendingCreations. --- admin/src/graphql/getPendingCreations.js | 7 +++++++ admin/src/pages/CreationConfirm.vue | 11 +++++++++++ 2 files changed, 18 insertions(+) create mode 100644 admin/src/graphql/getPendingCreations.js diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js new file mode 100644 index 000000000..322d46269 --- /dev/null +++ b/admin/src/graphql/getPendingCreations.js @@ -0,0 +1,7 @@ +import gql from 'graphql-tag' + +export const getPendingCreations = gql` + query { + getPendingCreations + } +` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 0d68635e0..d035e1b74 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -15,6 +15,7 @@ diff --git a/admin/src/store/store.js b/admin/src/store/store.js index 140a92391..9559e3d58 100644 --- a/admin/src/store/store.js +++ b/admin/src/store/store.js @@ -18,6 +18,9 @@ export const mutations = { token: (state, token) => { state.token = token }, + setOpenCreations: (state, openCreations) => { + state.openCreations = openCreations + }, } export const actions = { From 99749eebb2a6459a59844dd4d060aa3b6297054b Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 11:28:14 +0100 Subject: [PATCH 03/22] Apollo first steps getPendingCreations. --- admin/src/pages/CreationConfirm.vue | 1 + backend/src/graphql/resolver/AdminResolver.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index d035e1b74..5e5078283 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -153,6 +153,7 @@ export default { }, }, created() { + this.getPendingCreations() this.$store.commit('resetOpenCreations') this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index f08b1a4dc..6b81ce220 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,5 +1,5 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw } from 'typeorm' +import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' @@ -7,6 +7,7 @@ import { TransactionCreationRepository } from '../../typeorm/repository/Transact import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' +import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() @@ -52,6 +53,14 @@ export class AdminResolver { } return await getUserCreations(user.id) } + + @Query(() => String) + async getPendingCreations(): Promise { + const pendingCreationRepository = getCustomRepository(PendingCreationRepository) + const pendingCreations = await pendingCreationRepository.find() + console.log('pendingCreations', pendingCreations) + return pendingCreations.toString() + } } async function getUserCreations(id: number): Promise { From 602dfd64f1edb5ac5ada8ce34c3859ced92c6922 Mon Sep 17 00:00:00 2001 From: Hannes Heine Date: Fri, 26 Nov 2021 12:36:01 +0100 Subject: [PATCH 04/22] Corected return type for getPendingCreations and corected query. --- admin/src/graphql/getPendingCreations.js | 10 +++++- backend/src/graphql/model/PendingCreation.ts | 31 +++++++++++++++++++ backend/src/graphql/resolver/AdminResolver.ts | 25 ++++++++++++--- 3 files changed, 61 insertions(+), 5 deletions(-) create mode 100644 backend/src/graphql/model/PendingCreation.ts diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index 322d46269..c387c368e 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -2,6 +2,14 @@ import gql from 'graphql-tag' export const getPendingCreations = gql` query { - getPendingCreations + getPendingCreations { + firstName + lastName + email + amount + note + date + moderator + } } ` diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts new file mode 100644 index 000000000..56bbe6d27 --- /dev/null +++ b/backend/src/graphql/model/PendingCreation.ts @@ -0,0 +1,31 @@ +import { ObjectType, Field, Int } from 'type-graphql' + +@ObjectType() +export class PendingCreation { + @Field(() => String) + firstName: string + + @Field(() => Int) + id?: number + + @Field(() => String) + lastName: string + + @Field(() => Number) + userId: number + + @Field(() => String) + email: string + + @Field(() => Date) + date: Date + + @Field(() => String) + note: string + + @Field(() => Number) + amount: BigInt + + @Field(() => Number) + moderator: number +} diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 6b81ce220..8dd0293ce 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,6 +1,7 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' import { getCustomRepository, Raw, Any } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' +import { PendingCreation } from '../model/PendingCreation' import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' @@ -54,12 +55,28 @@ export class AdminResolver { return await getUserCreations(user.id) } - @Query(() => String) - async getPendingCreations(): Promise { + @Query(() => [PendingCreation]) + async getPendingCreations(): Promise { const pendingCreationRepository = getCustomRepository(PendingCreationRepository) const pendingCreations = await pendingCreationRepository.find() - console.log('pendingCreations', pendingCreations) - return pendingCreations.toString() + + const pendingCreationsPromise = await Promise.all( + pendingCreations.map(async (pendingCreation) => { + const userRepository = getCustomRepository(UserRepository) + const user = await userRepository.findOneOrFail({ id: pendingCreation.userId }) + + const newPendingCreation = { + ...pendingCreation, + firstName: user.firstName, + lastName: user.lastName, + email: user.email, + } + + return newPendingCreation + }), + ) + console.log('pendingCreations', pendingCreationsPromise) + return pendingCreationsPromise } } From 48c0b687d6be249025dc512c12038b7c5fca33a4 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:05:49 +0100 Subject: [PATCH 05/22] Query changed to Type PendingCreation, changed the login user search to state user search, adding parameters to PendingCreation object, changed frontend to map the query informations. --- admin/src/graphql/getPendingCreations.js | 1 + admin/src/pages/CreationConfirm.vue | 98 +++---------------- backend/src/graphql/model/PendingCreation.ts | 3 + backend/src/graphql/resolver/AdminResolver.ts | 24 ++--- backend/src/typeorm/repository/User.ts | 13 +++ 5 files changed, 43 insertions(+), 96 deletions(-) diff --git a/admin/src/graphql/getPendingCreations.js b/admin/src/graphql/getPendingCreations.js index c387c368e..f359c79db 100644 --- a/admin/src/graphql/getPendingCreations.js +++ b/admin/src/graphql/getPendingCreations.js @@ -10,6 +10,7 @@ export const getPendingCreations = gql` note date moderator + creation } } ` diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue index 5e5078283..660436d6c 100644 --- a/admin/src/pages/CreationConfirm.vue +++ b/admin/src/pages/CreationConfirm.vue @@ -31,98 +31,25 @@ export default { { key: 'firstName', label: 'Vorname' }, { key: 'lastName', label: 'Nachname' }, { - key: 'creation_gdd', + key: 'amount', label: 'Schöpfung', formatter: (value) => { return value + ' GDD' }, }, - { key: 'text', label: 'Text' }, + { key: 'note', label: 'Text' }, { - key: 'creation_date', + key: 'date', label: 'Datum', formatter: (value) => { - return value.long + return this.$moment(value).format('ll') }, }, - { key: 'creation_moderator', label: 'Moderator' }, + { key: 'moderator', label: 'Moderator' }, { key: 'edit_creation', label: 'ändern' }, { key: 'confirm', label: 'speichern' }, ], - confirmResult: [ - { - id: 1, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[450,200,700]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '22/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 2, - email: 'larsen@woob.de', - firstName: 'Larsen', - lastName: 'Shaw', - creation: '[300,200,1000]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam ', - - creation_date: { - short: 'November', - long: '03/11/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 3, - email: 'geneva@tete.de', - firstName: 'Geneva', - lastName: 'Wilson', - creation: '[350,200,900]', - creation_gdd: '1000', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam', - creation_date: { - short: 'September', - long: '27/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - { - id: 4, - email: 'viewrter@asdfvb.com', - firstName: 'Soledare', - lastName: 'Takker', - creation: '[100,400,800]', - creation_gdd: '500', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo ', - creation_date: { - short: 'Oktober', - long: '12/10/2021', - }, - creation_moderator: 'Evelyn Roller', - }, - { - id: 5, - email: 'dickerson@web.de', - firstName: 'Dickerson', - lastName: 'Macdonald', - creation: '[100,400,800]', - creation_gdd: '200', - text: 'Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At', - creation_date: { - short: 'September', - long: '05/09/2021', - }, - creation_moderator: 'Manuela Gast', - }, - ], + confirmResult: [], } }, @@ -141,20 +68,21 @@ export default { this.$store.commit('openCreationsMinus', 1) } }, - getPendingCreations() { + async getPendingCreations() { this.$apollo .query({ query: getPendingCreations, }) .then((result) => { - console.log('getPendingCreations.Result', result) + this.confirmResult = result.data.getPendingCreations + }) + .catch((error) => { + this.$toasted.error(error.message) }) - .catch() }, }, - created() { - this.getPendingCreations() - this.$store.commit('resetOpenCreations') + async created() { + await this.getPendingCreations() this.$store.commit('openCreationsPlus', Object.keys(this.confirmResult).length) }, } diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts index 56bbe6d27..aa12bd94b 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingCreation.ts @@ -28,4 +28,7 @@ export class PendingCreation { @Field(() => Number) moderator: number + + @Field(() => [Number]) + creation: number[] } diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 8dd0293ce..3c960b0fa 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -16,19 +16,19 @@ export class AdminResolver { @Authorized([RIGHTS.SEARCH_USERS]) @Query(() => [UserAdmin]) async searchUsers(@Arg('searchText') searchText: string): Promise { - const loginUserRepository = getCustomRepository(LoginUserRepository) - const loginUsers = await loginUserRepository.findBySearchCriteria(searchText) - const users = await Promise.all( - loginUsers.map(async (loginUser) => { - const user = new UserAdmin() - user.firstName = loginUser.firstName - user.lastName = loginUser.lastName - user.email = loginUser.email - user.creation = await getUserCreations(loginUser.id) - return user + const userRepository = getCustomRepository(UserRepository) + const users = await userRepository.findBySearchCriteria(searchText) + const adminUsers = await Promise.all( + users.map(async (user) => { + const adminUser = new UserAdmin() + adminUser.firstName = user.firstName + adminUser.lastName = user.lastName + adminUser.email = user.email + adminUser.creation = await getUserCreations(user.id) + return adminUser }), ) - return users + return adminUsers } @Query(() => [Number]) @@ -38,6 +38,7 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) + console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -70,6 +71,7 @@ export class AdminResolver { firstName: user.firstName, lastName: user.lastName, email: user.email, + creation: await getUserCreations(user.id), } return newPendingCreation diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index e127c179c..cf67c837b 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -30,4 +30,17 @@ export class UserRepository extends Repository { }) return usersIndiced } + + async findBySearchCriteria(searchCriteria: string): Promise { + return await this.createQueryBuilder('user') + .where( + 'user.firstName like :name or user.lastName like :lastName or user.email like :email', + { + name: `%${searchCriteria}%`, + lastName: `%${searchCriteria}%`, + email: `%${searchCriteria}%`, + }, + ) + .getMany() + } } From 18a530b1b129cb270b85ac651a24bcfdb9b17c32 Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:03 +0100 Subject: [PATCH 06/22] Withdrew console.logs. --- backend/src/graphql/resolver/AdminResolver.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3c960b0fa..ca903f49b 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -38,7 +38,6 @@ export class AdminResolver { const userRepository = getCustomRepository(UserRepository) const user = await userRepository.findByEmail(email) - console.log('User', user) const creations = await getUserCreations(user.id) const creationDateObj = new Date(creationDate) if (isCreationValid(creations, amount, creationDateObj)) { @@ -77,7 +76,6 @@ export class AdminResolver { return newPendingCreation }), ) - console.log('pendingCreations', pendingCreationsPromise) return pendingCreationsPromise } } From e0ad9ab40a609728127c26ca0597a9f196033c8c Mon Sep 17 00:00:00 2001 From: ogerly Date: Fri, 26 Nov 2021 15:11:46 +0100 Subject: [PATCH 07/22] Removed unused imports. --- backend/src/graphql/resolver/AdminResolver.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index ca903f49b..a93696814 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -1,14 +1,12 @@ import { Resolver, Query, Arg, Args, Authorized } from 'type-graphql' -import { getCustomRepository, Raw, Any } from 'typeorm' +import { getCustomRepository, Raw } from 'typeorm' import { UserAdmin } from '../model/UserAdmin' import { PendingCreation } from '../model/PendingCreation' -import { LoginUserRepository } from '../../typeorm/repository/LoginUser' import { RIGHTS } from '../../auth/RIGHTS' import { TransactionCreationRepository } from '../../typeorm/repository/TransactionCreation' import { PendingCreationRepository } from '../../typeorm/repository/PendingCreation' import { UserRepository } from '../../typeorm/repository/User' import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' -import { LoginPendingTasksAdmin } from '@entity/LoginPendingTasksAdmin' import moment from 'moment' @Resolver() From da649868cc7288220e1e6474e0b89bbe1bb95ac1 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:28:59 +0100 Subject: [PATCH 08/22] Removed the remove test that removes all creations, Test that the server sends error. --- admin/src/pages/CreationConfirm.spec.js | 49 +++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js index caf94cd37..365ccd809 100644 --- a/admin/src/pages/CreationConfirm.spec.js +++ b/admin/src/pages/CreationConfirm.spec.js @@ -4,11 +4,42 @@ import CreationConfirm from './CreationConfirm.vue' const localVue = global.localVue const storeCommitMock = jest.fn() +const toastedErrorMock = jest.fn() +const apolloQueryMock = jest.fn().mockResolvedValue({ + data: { + getPendingCreations: [ + { + firstName: 'Bibi', + lastName: 'Bloxberg', + email: 'bibi@bloxberg.de', + amount: 500, + note: 'Danke für alles', + date: new Date(), + moderator: 0, + }, + { + firstName: 'Räuber', + lastName: 'Hotzenplotz', + email: 'raeuber@hotzenplotz.de', + amount: 1000000, + note: 'Gut Ergatert', + date: new Date(), + moderator: 0, + }, + ], + }, +}) const mocks = { $store: { commit: storeCommitMock, }, + $apollo: { + query: apolloQueryMock, + }, + $toasted: { + error: toastedErrorMock, + }, } describe('CreationConfirm', () => { @@ -29,12 +60,22 @@ describe('CreationConfirm', () => { }) describe('store', () => { - it('commits resetOpenCreations to store', () => { - expect(storeCommitMock).toBeCalledWith('resetOpenCreations') + it('commits openCreationsPlus to store', () => { + expect(storeCommitMock).toBeCalledWith('openCreationsPlus', 2) + }) + }) + + describe('server response is error', () => { + beforeEach(() => { + jest.clearAllMocks() + apolloQueryMock.mockRejectedValue({ + message: 'Ouch!', + }) + wrapper = Wrapper() }) - it('commits openCreationsPlus to store', () => { - expect(storeCommitMock).toBeCalledWith('openCreationsPlus', 5) + it('toast an error message', () => { + expect(toastedErrorMock).toBeCalledWith('Ouch!') }) }) From bd5aebbfd539b2f8609a2ff9d13c1a1d185f6038 Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 09:30:37 +0100 Subject: [PATCH 09/22] Coverage upgraded to 53% in admin. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 66fc1c9f5..a28680279 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -441,7 +441,7 @@ jobs: report_name: Coverage Admin Interface type: lcov result_path: ./coverage/lcov.info - min_coverage: 52 + min_coverage: 53 token: ${{ github.token }} ############################################################################## From 3a5999ffe5486f4b89015769785383aca22f55ef Mon Sep 17 00:00:00 2001 From: elweyn Date: Tue, 30 Nov 2021 10:11:28 +0100 Subject: [PATCH 10/22] Change note to memo. --- backend/src/graphql/model/PendingCreation.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/graphql/model/PendingCreation.ts b/backend/src/graphql/model/PendingCreation.ts index aa12bd94b..f1087ea0b 100644 --- a/backend/src/graphql/model/PendingCreation.ts +++ b/backend/src/graphql/model/PendingCreation.ts @@ -21,7 +21,7 @@ export class PendingCreation { date: Date @Field(() => String) - note: string + memo: string @Field(() => Number) amount: BigInt From 997230b334b4fde176cb80f5985702bcc0fc3dce Mon Sep 17 00:00:00 2001 From: ogerly Date: Thu, 2 Dec 2021 11:26:00 +0100 Subject: [PATCH 11/22] 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 12/22] 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 13/22] 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 14/22] 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 15/22] 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 @@