Merge branch 'master' into daily-rule-for-contribution-links-frontend

backend/src/graphql/resolver/AdminResolver.test.ts

@@ -1795,13 +1795,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,
     }
@@ -1983,7 +1984,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,

backend/src/graphql/resolver/AdminResolver.ts

@@ -678,6 +678,7 @@ export class AdminResolver {
     { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated,
   ): Promise<ContributionLinkList> {
     const [links, count] = await DbContributionLink.findAndCount({
+      where: [{ validTo: MoreThan(new Date()) }, { validTo: IsNull() }],
       order: { createdAt: order },
       skip: (currentPage - 1) * pageSize,
       take: pageSize,

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, {

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 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",
     "submitContribution": "Beitrag einreichen",

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",

frontend/src/pages/InfoStatistic.vue

@@ -14,7 +14,7 @@
     <hr />
     <b-container>
       <div class="h3">{{ $t('community.openContributionLinks') }}</div>
-      <small>
+      <small v-if="count > 0">
         {{
           $t('community.openContributionLinkText', {
             name: CONFIG.COMMUNITY_NAME,
@@ -22,6 +22,9 @@
           })
         }}
       </small>
+      <small v-else>
+        {{ $t('community.noOpenContributionLinkText') }}
+      </small>
       <ul>
         <li v-for="item in itemsContributionLinks" v-bind:key="item.id">
           <div>{{ item.name }}</div>