From 933275c36702dd143b24eb7466be0f10d7eeeefc Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:03:05 +0100 Subject: [PATCH 1/3] .global.error to .error as global is not defined so far --- admin/src/components/CreationTransactionListFormular.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/components/CreationTransactionListFormular.vue b/admin/src/components/CreationTransactionListFormular.vue index 09e1fa92a..d3ffc3e29 100644 --- a/admin/src/components/CreationTransactionListFormular.vue +++ b/admin/src/components/CreationTransactionListFormular.vue @@ -33,7 +33,7 @@ export default { this.items = result.data.transactionList.transactions }) .catch((error) => { - this.$toasted.global.error(error.message) + this.$toasted.error(error.message) }) }, }, From 814f9e18ddb3c46d868c6a20018c559f70f3587c Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:25:35 +0100 Subject: [PATCH 2/3] fix update of open creations --- admin/src/pages/UserSearch.vue | 12 +++++------- backend/src/graphql/resolver/AdminResolver.ts | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/admin/src/pages/UserSearch.vue b/admin/src/pages/UserSearch.vue index d811fe2ad..a5d4c05cf 100644 --- a/admin/src/pages/UserSearch.vue +++ b/admin/src/pages/UserSearch.vue @@ -42,15 +42,13 @@ export default { { key: 'lastName', label: this.$t('lastname') }, { key: 'creation', - // label: this.$t('open_creation') + 'Jan | Feb | März', - label: - this.$moment().subtract(2, 'month').format('MMM') + - ' | ' + - this.$moment().subtract(1, 'month').format('MMM') + - ' | ' + + label: [ + this.$moment().subtract(2, 'month').format('MMM'), + this.$moment().subtract(1, 'month').format('MMM'), this.$moment().format('MMM'), + ].join(' | '), formatter: (value, key, item) => { - return String(value[0]) + ` | ` + String(value[1]) + ` | ` + String(value[2]) + return value.join(' | ') }, }, { key: 'show_details', label: this.$t('details') }, diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 0d16769c7..11d8c99cd 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -65,9 +65,9 @@ export class AdminResolver { loginPendingTaskAdmin.memo = memo loginPendingTaskAdmin.moderator = moderator - loginPendingTasksAdminRepository.save(loginPendingTaskAdmin) + await loginPendingTasksAdminRepository.save(loginPendingTaskAdmin) } - return await getUserCreations(user.id) + return getUserCreations(user.id) } @Authorized([RIGHTS.CREATE_PENDING_CREATION]) From 5c3c22780a4a8119e7716c0619c4450b49ab3de1 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 10 Jan 2022 13:45:38 +0100 Subject: [PATCH 3/3] get the tests running --- .../components/CreationTransactionListFormular.spec.js | 4 +--- admin/src/components/UserTable.spec.js | 9 +++++++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/admin/src/components/CreationTransactionListFormular.spec.js b/admin/src/components/CreationTransactionListFormular.spec.js index 9817d6b8f..1c7b81c25 100644 --- a/admin/src/components/CreationTransactionListFormular.spec.js +++ b/admin/src/components/CreationTransactionListFormular.spec.js @@ -58,9 +58,7 @@ const mocks = { query: apolloQueryMock, }, $toasted: { - global: { - error: toastedErrorMock, - }, + error: toastedErrorMock, }, } diff --git a/admin/src/components/UserTable.spec.js b/admin/src/components/UserTable.spec.js index 80bdf6047..e26a548cc 100644 --- a/admin/src/components/UserTable.spec.js +++ b/admin/src/components/UserTable.spec.js @@ -3,6 +3,9 @@ import UserTable from './UserTable.vue' const localVue = global.localVue +const apolloQueryMock = jest.fn() +apolloQueryMock.mockResolvedValue() + describe('UserTable', () => { let wrapper @@ -114,6 +117,12 @@ describe('UserTable', () => { }), } }), + $apollo: { + query: apolloQueryMock, + }, + $store: { + commit: jest.fn(), + }, } const Wrapper = (propsData) => {