From 7286389b87d2345fb7739f0905c5bfe3ec2366cd Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Oct 2022 20:03:00 +0200 Subject: [PATCH 1/5] filter contribution link list by valid to --- backend/src/graphql/resolver/AdminResolver.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3435edb94..4f7aedd9d 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -675,6 +675,7 @@ export class AdminResolver { { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, ): Promise { const [links, count] = await DbContributionLink.findAndCount({ + where: [{ validTo: MoreThan(new Date()) }, { validTo: IsNull() }], order: { createdAt: order }, skip: (currentPage - 1) * pageSize, take: pageSize, From 505463a3f8a03b47998939ed625649d5721667e4 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Oct 2022 20:03:52 +0200 Subject: [PATCH 2/5] show default text when no contribution links are present --- frontend/src/locales/de.json | 3 ++- frontend/src/locales/en.json | 3 ++- frontend/src/pages/InfoStatistic.vue | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 1ed8af19f..5a71faef0 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -24,7 +24,8 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge zum Gemeinwohl", - "openContributionLinks": "öffentliche Beitrags-Linkliste", + "noOpenContributionLinkText": "Zur Zeit gibt es keine automatische Schöpfungen.", + "openContributionLinks": "Öffentliche Beitrags-Linkliste", "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", "other-communities": "Weitere Gemeinschaften", "submitContribution": "Beitrag einreichen", diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 113fa1cb9..d9f69581d 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -24,7 +24,8 @@ "moderator": "Moderator", "moderators": "Moderators", "myContributions": "My contributions to the common good", - "openContributionLinks": "open Contribution links list", + "noOpenContributionLinkText": "Currently there are no automatic creations.", + "openContributionLinks": "Open contribution-link list", "openContributionLinkText": "The following {count} automatic creations are currently provided by the \"{name}\" community.", "other-communities": "Other communities", "submitContribution": "Submit contribution", diff --git a/frontend/src/pages/InfoStatistic.vue b/frontend/src/pages/InfoStatistic.vue index 1e09f83ed..de4b9e224 100644 --- a/frontend/src/pages/InfoStatistic.vue +++ b/frontend/src/pages/InfoStatistic.vue @@ -14,7 +14,7 @@
{{ $t('community.openContributionLinks') }}
- + {{ $t('community.openContributionLinkText', { name: CONFIG.COMMUNITY_NAME, @@ -22,6 +22,9 @@ }) }} + + {{ $t('community.noOpenContributionLinkText') }} +
  • {{ item.name }}
    From 4e13678367162a3e00d33dffce95f8b2f25f4a07 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Tue, 11 Oct 2022 20:56:02 +0200 Subject: [PATCH 3/5] fix test. Add dynamic valid to date for contribution link --- backend/src/graphql/resolver/AdminResolver.test.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/src/graphql/resolver/AdminResolver.test.ts b/backend/src/graphql/resolver/AdminResolver.test.ts index b1b4e469e..4170e3324 100644 --- a/backend/src/graphql/resolver/AdminResolver.test.ts +++ b/backend/src/graphql/resolver/AdminResolver.test.ts @@ -1792,13 +1792,14 @@ describe('AdminResolver', () => { }) describe('Contribution Links', () => { + const now = new Date() const variables = { amount: new Decimal(200), name: 'Dokumenta 2022', memo: 'Danke für deine Teilnahme an der Dokumenta 2022', cycle: 'once', validFrom: new Date(2022, 5, 18).toISOString(), - validTo: new Date(2022, 7, 14).toISOString(), + validTo: new Date(now.getFullYear() + 1, 7, 14).toISOString(), maxAmountPerMonth: new Decimal(200), maxPerCycle: 1, } @@ -1980,7 +1981,7 @@ describe('AdminResolver', () => { name: 'Dokumenta 2022', memo: 'Danke für deine Teilnahme an der Dokumenta 2022', validFrom: new Date('2022-06-18T00:00:00.000Z'), - validTo: new Date('2022-08-14T00:00:00.000Z'), + validTo: expect.any(Date), cycle: 'once', maxPerCycle: 1, totalMaxCountOfContribution: null, From d4353f34fa6d33714de1db5f0dee4f34312f30c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= Date: Thu, 13 Oct 2022 13:33:24 +0200 Subject: [PATCH 4/5] =?UTF-8?q?Fix=20reminder=20in=20test=20`TransactionLi?= =?UTF-8?q?nkResolver.test.ts`=20of=20merging=20master=20=E2=80=93=20login?= =?UTF-8?q?=20is=20now=20a=20mutation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/graphql/resolver/UserResolver.test.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index 299725b2b..cf4ad8d4b 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -360,7 +360,7 @@ describe('UserResolver', () => { beforeAll(async () => { await userFactory(testEnv, peterLustig) await userFactory(testEnv, bobBaumeister) - await query({ query: login, variables: bobData }) + await mutate({ mutation: login, variables: bobData }) // create contribution as user bob contribution = await mutate({ @@ -369,7 +369,7 @@ describe('UserResolver', () => { }) // login as admin - await query({ query: login, variables: peterData }) + await mutate({ mutation: login, variables: peterData }) // confirm the contribution contribution = await mutate({ @@ -378,7 +378,7 @@ describe('UserResolver', () => { }) // login as user bob - bob = await query({ query: login, variables: bobData }) + bob = await mutate({ mutation: login, variables: bobData }) // create transaction link await transactionLinkFactory(testEnv, { From 025a10f3bae64ca60a35c3a7c255d92eaec3bb18 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Thu, 13 Oct 2022 15:53:54 +0200 Subject: [PATCH 5/5] Update frontend/src/locales/de.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Wolfgang Huß --- frontend/src/locales/de.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 5a71faef0..a9ad47911 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -24,7 +24,7 @@ "moderator": "Moderator", "moderators": "Moderatoren", "myContributions": "Meine Beiträge zum Gemeinwohl", - "noOpenContributionLinkText": "Zur Zeit gibt es keine automatische Schöpfungen.", + "noOpenContributionLinkText": "Zur Zeit gibt es keine automatischen Schöpfungen.", "openContributionLinks": "Öffentliche Beitrags-Linkliste", "openContributionLinkText": "Folgende {count} automatische Schöpfungen werden zur Zeit durch die Gemeinschaft „{name}“ bereitgestellt.", "other-communities": "Weitere Gemeinschaften",