Merge branch 'master' into unit-tests-community-page

.github/workflows/test.yml

@@ -478,7 +478,7 @@ jobs:
           report_name: Coverage Admin Interface
           type: lcov
           result_path: ./coverage/lcov.info
-          min_coverage: 95
+          min_coverage: 96
           token: ${{ github.token }}
 
   ##############################################################################

admin/src/components/Tables/OpenCreationsTable.spec.js

@@ -5,6 +5,7 @@ const localVue = global.localVue
 
 const apolloMutateMock = jest.fn().mockResolvedValue({})
 const apolloQueryMock = jest.fn().mockResolvedValue({})
+const toggleDetailsMock = jest.fn()
 
 const propsData = {
   items: [
@@ -138,5 +139,50 @@ describe('OpenCreationsTable', () => {
         expect(wrapper.vm.items[0].creation).toEqual([444, 555, 666])
       })
     })
+
+    describe('call updateState', () => {
+      beforeEach(() => {
+        wrapper.vm.updateState(4)
+      })
+
+      it('emits update-state', () => {
+        expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
+      })
+    })
+
+    describe('call updateCreationData', () => {
+      const date = new Date()
+      beforeEach(() => {
+        wrapper.vm.updateCreationData({
+          amount: Number(80.0),
+          date: date,
+          memo: 'Test memo',
+          row: {
+            item: {},
+            detailsShowing: false,
+            toggleDetails: toggleDetailsMock,
+          },
+        })
+      })
+
+      it('emits update-state', () => {
+        expect(
+          wrapper.vm.$emit('update-contributions', {
+            amount: Number(80.0),
+            date: date,
+            memo: 'Test memo',
+            row: {
+              item: {},
+              detailsShowing: false,
+              toggleDetails: toggleDetailsMock,
+            },
+          }),
+        ).toBeTruthy()
+      })
+
+      it('calls toggleDetails', () => {
+        expect(toggleDetailsMock).toBeCalled()
+      })
+    })
   })
 })

admin/src/components/Tables/OpenCreationsTable.vue

@@ -8,7 +8,7 @@
           @click="$emit('remove-creation', row.item)"
           class="mr-2"
         >
-          <b-icon icon="x" variant="light"></b-icon>
+          <b-icon icon="trash" variant="light"></b-icon>
         </b-button>
       </template>
       <template #cell(editCreation)="row">
@@ -49,6 +49,18 @@
           </b-button>
         </div>
       </template>
+      <template #cell(deny)="row">
+        <div v-if="$store.state.moderator.id !== row.item.userId">
+          <b-button
+            variant="danger"
+            size="md"
+            @click="$emit('deny-creation', row.item)"
+            class="mr-2"
+          >
+            <b-icon icon="x" variant="light"></b-icon>
+          </b-button>
+        </div>
+      </template>
       <template #row-details="row">
         <row-details
           :row="row"

admin/src/graphql/denyContribution.js

@@ -0,0 +1,7 @@
+import gql from 'graphql-tag'
+
+export const denyContribution = gql`
+  mutation ($id: Int!) {
+    denyContribution(id: $id)
+  }
+`

admin/src/locales/de.json

@@ -35,6 +35,7 @@
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
     "deleteNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich löschen?",
+    "denyNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich ablehnen?",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",
@@ -45,6 +46,7 @@
     "toasted": "Offene Schöpfung ({value} GDD) für {email} wurde gespeichert und liegt zur Bestätigung bereit",
     "toasted_created": "Schöpfung wurde erfolgreich gespeichert",
     "toasted_delete": "Offene Schöpfung wurde gelöscht",
+    "toasted_denied": "Offene Schöpfung wurde abgelehnt",
     "toasted_update": "`Offene Schöpfung {value} GDD) für {email} wurde geändert und liegt zur Bestätigung bereit",
     "update_creation": "Schöpfung aktualisieren"
   },
@@ -54,6 +56,7 @@
   "deleted": "gelöscht",
   "deleted_user": "Alle gelöschten Nutzer",
   "delete_user": "Nutzer löschen",
+  "deny": "Ablehnen",
   "edit": "Bearbeiten",
   "enabled": "aktiviert",
   "error": "Fehler",

admin/src/locales/en.json

@@ -35,6 +35,7 @@
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
     "deleteNow": "Do you really want to delete this contribution to the community?",
+    "denyNow": "Do you really want to reject this contribution to the community?",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",
@@ -45,6 +46,7 @@
     "toasted": "Open creation ({value} GDD) for {email} has been saved and is ready for confirmation.",
     "toasted_created": "Creation has been successfully saved",
     "toasted_delete": "Open creation has been deleted",
+    "toasted_denied": "Open creation has been denied",
     "toasted_update": "Open creation {value} GDD) for {email} has been changed and is ready for confirmation.",
     "update_creation": "Creation update"
   },
@@ -54,6 +56,7 @@
   "deleted": "deleted",
   "deleted_user": "All deleted user",
   "delete_user": "Delete user",
+  "deny": "Reject",
   "edit": "Edit",
   "enabled": "enabled",
   "error": "Error",

admin/src/pages/CreationConfirm.spec.js

@@ -1,6 +1,7 @@
 import { mount } from '@vue/test-utils'
 import CreationConfirm from './CreationConfirm.vue'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
+import { denyContribution } from '../graphql/denyContribution'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { confirmContribution } from '../graphql/confirmContribution'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
@@ -75,6 +76,7 @@ describe('CreationConfirm', () => {
 
   const listUnconfirmedContributionsMock = jest.fn()
   const adminDeleteContributionMock = jest.fn()
+  const adminDenyContributionMock = jest.fn()
   const confirmContributionMock = jest.fn()
 
   mockClient.setRequestHandler(
@@ -89,6 +91,13 @@ describe('CreationConfirm', () => {
     adminDeleteContributionMock.mockResolvedValue({ data: { adminDeleteContribution: true } }),
   )
 
+  mockClient.setRequestHandler(
+    denyContribution,
+    adminDenyContributionMock
+      .mockRejectedValueOnce({ message: 'Ouch!' })
+      .mockResolvedValue({ data: { denyContribution: true } }),
+  )
+
   mockClient.setRequestHandler(
     confirmContribution,
     confirmContributionMock.mockResolvedValue({ data: { confirmContribution: true } }),
@@ -243,5 +252,59 @@ describe('CreationConfirm', () => {
         })
       })
     })
+
+    describe('deny creation with error', () => {
+      let spy
+
+      beforeEach(async () => {
+        spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+        spy.mockImplementation(() => Promise.resolve('some value'))
+        await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
+      })
+
+      it('toasts an error message', () => {
+        expect(toastErrorSpy).toBeCalledWith('Ouchhh!')
+      })
+    })
+
+    describe('deny creation with success', () => {
+      let spy
+
+      describe('admin confirms deny', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
+          await wrapper.findAll('tr').at(1).findAll('button').at(3).trigger('click')
+        })
+
+        it('opens a modal', () => {
+          expect(spy).toBeCalled()
+        })
+
+        it('calls the adminDeleteContribution mutation', () => {
+          expect(adminDenyContributionMock).toBeCalledWith({ id: 1 })
+        })
+
+        it('commits openCreationsMinus to store', () => {
+          expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
+        })
+
+        it('toasts a success message', () => {
+          expect(toastSuccessSpy).toBeCalledWith('creation_form.toasted_denied')
+        })
+      })
+
+      describe('admin cancels deny', () => {
+        beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(false))
+          await wrapper.findAll('tr').at(1).findAll('button').at(3).trigger('click')
+        })
+
+        it('does not call the adminDeleteContribution mutation', () => {
+          expect(adminDenyContributionMock).not.toBeCalled()
+        })
+      })
+    })
   })
 })

admin/src/pages/CreationConfirm.vue

@@ -7,6 +7,7 @@
       class="mt-4"
       :items="pendingCreations"
       :fields="fields"
+      @deny-creation="denyCreation"
       @remove-creation="removeCreation"
       @show-overlay="showOverlay"
       @update-state="updateState"
@@ -20,6 +21,7 @@ import OpenCreationsTable from '../components/Tables/OpenCreationsTable.vue'
 import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
 import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
 import { confirmContribution } from '../graphql/confirmContribution'
+import { denyContribution } from '../graphql/denyContribution'
 
 export default {
   name: 'CreationConfirm',
@@ -35,6 +37,26 @@ export default {
     }
   },
   methods: {
+    denyCreation(item) {
+      this.$bvModal.msgBoxConfirm(this.$t('creation_form.denyNow')).then(async (value) => {
+        if (value) {
+          await this.$apollo
+            .mutate({
+              mutation: denyContribution,
+              variables: {
+                id: item.id,
+              },
+            })
+            .then((result) => {
+              this.updatePendingCreations(item.id)
+              this.toastSuccess(this.$t('creation_form.toasted_denied'))
+            })
+            .catch((error) => {
+              this.toastError(error.message)
+            })
+        }
+      })
+    },
     removeCreation(item) {
       this.$bvModal.msgBoxConfirm(this.$t('creation_form.deleteNow')).then(async (value) => {
         if (value)
@@ -110,6 +132,7 @@ export default {
         { key: 'moderator', label: this.$t('moderator') },
         { key: 'editCreation', label: this.$t('edit') },
         { key: 'confirm', label: this.$t('save') },
+        { key: 'deny', label: this.$t('deny') },
       ]
     },
   },

backend/src/auth/RIGHTS.ts

@@ -54,4 +54,5 @@ export enum RIGHTS {
   DELETE_CONTRIBUTION_LINK = 'DELETE_CONTRIBUTION_LINK',
   UPDATE_CONTRIBUTION_LINK = 'UPDATE_CONTRIBUTION_LINK',
   ADMIN_CREATE_CONTRIBUTION_MESSAGE = 'ADMIN_CREATE_CONTRIBUTION_MESSAGE',
+  DENY_CONTRIBUTION = 'DENY_CONTRIBUTION',
 }

backend/src/emails/sendEmailVariants.test.ts

@@ -9,7 +9,7 @@ import {
   sendAccountActivationEmail,
   sendAccountMultiRegistrationEmail,
   sendContributionConfirmedEmail,
-  sendContributionRejectedEmail,
+  sendContributionDeniedEmail,
   sendResetPasswordEmail,
   sendTransactionLinkRedeemedEmail,
   sendTransactionReceivedEmail,
@@ -360,9 +360,9 @@ describe('sendEmailVariants', () => {
     })
   })
 
-  describe('sendContributionRejectedEmail', () => {
+  describe('sendContributionDeniedEmail', () => {
     beforeAll(async () => {
-      result = await sendContributionRejectedEmail({
+      result = await sendContributionDeniedEmail({
         firstName: 'Peter',
         lastName: 'Lustig',
         email: 'peter@lustig.de',
@@ -379,7 +379,7 @@ describe('sendEmailVariants', () => {
           receiver: {
             to: 'Peter Lustig <peter@lustig.de>',
           },
-          template: 'contributionRejected',
+          template: 'contributionDenied',
           locals: {
             firstName: 'Peter',
             lastName: 'Lustig',

backend/src/emails/sendEmailVariants.ts

@@ -103,7 +103,7 @@ export const sendContributionConfirmedEmail = (data: {
   })
 }
 
-export const sendContributionRejectedEmail = (data: {
+export const sendContributionDeniedEmail = (data: {
   firstName: string
   lastName: string
   email: string
@@ -114,7 +114,7 @@ export const sendContributionRejectedEmail = (data: {
 }): Promise<Record<string, unknown> | null> => {
   return sendEmailTranslated({
     receiver: { to: `${data.firstName} ${data.lastName} <${data.email}>` },
-    template: 'contributionRejected',
+    template: 'contributionDenied',
     locals: {
       firstName: data.firstName,
       lastName: data.lastName,

backend/src/emails/templates/contributionDenied/html.pug

@@ -0,0 +1,16 @@
+doctype html
+html(lang=locale)
+  head
+    title= t('emails.contributionDenied.subject')
+  body
+    h1(style='margin-bottom: 24px;')= t('emails.contributionDenied.subject')
+    #container.col
+      include ../hello.pug
+      p= t('emails.contributionDenied.commonGoodContributionDenied', { senderFirstName, senderLastName, contributionMemo })
+      p= t('emails.contributionDenied.toSeeContributionsAndMessages')
+      p
+        = t('emails.general.linkToYourAccount')
+        = " "
+        a(href=overviewURL) #{overviewURL}
+      p= t('emails.general.pleaseDoNotReply')
+      include ../greatingFormularImprint.pug

backend/src/emails/templates/contributionDenied/subject.pug

@@ -0,0 +1 @@
+= t('emails.contributionDenied.subject')

backend/src/emails/templates/contributionRejected/html.pug

@@ -1,16 +0,0 @@
-doctype html
-html(lang=locale)
-  head
-    title= t('emails.contributionRejected.subject')
-  body
-    h1(style='margin-bottom: 24px;')= t('emails.contributionRejected.subject')
-    #container.col
-      include ../hello.pug
-      p= t('emails.contributionRejected.commonGoodContributionRejected', { senderFirstName, senderLastName, contributionMemo })
-      p= t('emails.contributionRejected.toSeeContributionsAndMessages')
-      p
-        = t('emails.general.linkToYourAccount')
-        = " "
-        a(href=overviewURL) #{overviewURL}
-      p= t('emails.general.pleaseDoNotReply')
-      include ../greatingFormularImprint.pug

backend/src/emails/templates/contributionRejected/subject.pug

@@ -1 +0,0 @@
-= t('emails.contributionRejected.subject')

backend/src/graphql/model/Contribution.ts

@@ -18,6 +18,8 @@ export class Contribution {
     this.contributionDate = contribution.contributionDate
     this.state = contribution.contributionStatus
     this.messagesCount = contribution.messages ? contribution.messages.length : 0
+    this.deniedAt = contribution.deniedAt
+    this.deniedBy = contribution.deniedBy
   }
 
   @Field(() => Number)
@@ -47,6 +49,12 @@ export class Contribution {
   @Field(() => Number, { nullable: true })
   confirmedBy: number | null
 
+  @Field(() => Date, { nullable: true })
+  deniedAt: Date | null
+
+  @Field(() => Number, { nullable: true })
+  deniedBy: number | null
+
   @Field(() => Date)
   contributionDate: Date
 

backend/src/graphql/resolver/ContributionResolver.ts

@@ -50,7 +50,7 @@ import { eventProtocol } from '@/event/EventProtocolEmitter'
 import { calculateDecay } from '@/util/decay'
 import {
   sendContributionConfirmedEmail,
-  sendContributionRejectedEmail,
+  sendContributionDeniedEmail,
 } from '@/emails/sendEmailVariants'
 import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK'
 
@@ -217,7 +217,7 @@ export class ContributionResolver {
     const user = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
-      where: { id: contributionId, confirmedAt: IsNull() },
+      where: { id: contributionId, confirmedAt: IsNull(), deniedAt: IsNull() },
     })
     if (!contributionToUpdate) {
       logger.error('No contribution found to given id')
@@ -409,7 +409,7 @@ export class ContributionResolver {
     const moderator = getUser(context)
 
     const contributionToUpdate = await DbContribution.findOne({
-      where: { id, confirmedAt: IsNull() },
+      where: { id, confirmedAt: IsNull(), deniedAt: IsNull() },
     })
     if (!contributionToUpdate) {
       logger.error('No contribution found to given id.')
@@ -475,6 +475,7 @@ export class ContributionResolver {
       .from(DbContribution, 'c')
       .leftJoinAndSelect('c.messages', 'm')
       .where({ confirmedAt: IsNull() })
+      .andWhere({ deniedAt: IsNull() })
       .getMany()
 
     if (contributions.length === 0) {
@@ -540,7 +541,7 @@ export class ContributionResolver {
     await eventProtocol.writeEvent(
       event.setEventAdminContributionDelete(eventAdminContributionDelete),
     )
-    sendContributionRejectedEmail({
+    sendContributionDeniedEmail({
       firstName: user.firstName,
       lastName: user.lastName,
       email: user.emailContact.email,
@@ -572,6 +573,10 @@ export class ContributionResolver {
         logger.error(`Contribution already confirmd: ${id}`)
         throw new Error('Contribution already confirmd.')
       }
+      if (contribution.contributionStatus === 'DENIED') {
+        logger.error(`Contribution already denied: ${id}`)
+        throw new Error('Contribution already denied.')
+      }
       const moderatorUser = getUser(context)
       if (moderatorUser.id === contribution.userId) {
         logger.error('Moderator can not confirm own contribution')
@@ -684,6 +689,7 @@ export class ContributionResolver {
       .from(DbContribution, 'c')
       .leftJoinAndSelect('c.user', 'u')
       .where(`user_id = ${userId}`)
+      .withDeleted()
       .limit(pageSize)
       .offset(offset)
       .orderBy('c.created_at', order)
@@ -714,4 +720,58 @@ export class ContributionResolver {
       }
     })
   }
+
+  @Authorized([RIGHTS.DENY_CONTRIBUTION])
+  @Mutation(() => Boolean)
+  async denyContribution(
+    @Arg('id', () => Int) id: number,
+    @Ctx() context: Context,
+  ): Promise<boolean> {
+    const contributionToUpdate = await DbContribution.findOne({
+      id,
+      confirmedAt: IsNull(),
+      deniedBy: IsNull(),
+    })
+    if (!contributionToUpdate) {
+      logger.error(`Contribution not found for given id: ${id}`)
+      throw new Error(`Contribution not found for given id.`)
+    }
+    if (
+      contributionToUpdate.contributionStatus !== ContributionStatus.IN_PROGRESS &&
+      contributionToUpdate.contributionStatus !== ContributionStatus.PENDING
+    ) {
+      logger.error(
+        `Contribution state (${contributionToUpdate.contributionStatus}) is not allowed.`,
+      )
+      throw new Error(`State of the contribution is not allowed.`)
+    }
+    const moderator = getUser(context)
+    const user = await DbUser.findOne(
+      { id: contributionToUpdate.userId },
+      { relations: ['emailContact'] },
+    )
+    if (!user) {
+      logger.error(
+        `Could not find User for the Contribution (userId: ${contributionToUpdate.userId}).`,
+      )
+      throw new Error('Could not find User for the Contribution.')
+    }
+
+    contributionToUpdate.contributionStatus = ContributionStatus.DENIED
+    contributionToUpdate.deniedBy = moderator.id
+    contributionToUpdate.deniedAt = new Date()
+    const res = await contributionToUpdate.save()
+
+    sendContributionDeniedEmail({
+      firstName: user.firstName,
+      lastName: user.lastName,
+      email: user.emailContact.email,
+      language: user.language,
+      senderFirstName: moderator.firstName,
+      senderLastName: moderator.lastName,
+      contributionMemo: contributionToUpdate.memo,
+    })
+
+    return !!res
+  }
 }

backend/src/locales/en.json

@@ -23,8 +23,8 @@
       "commonGoodContributionConfirmed": "Your public good contribution “{contributionMemo}” has just been confirmed by {senderFirstName} {senderLastName} and credited to your Gradido account.",
       "subject": "Gradido: Your contribution to the common good was confirmed"
     },
-    "contributionRejected": {
-      "commonGoodContributionRejected": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
+    "contributionDenied": {
+      "commonGoodContributionDenied": "Your public good contribution “{contributionMemo}” was rejected by {senderFirstName} {senderLastName}.",
       "subject": "Gradido: Your common good contribution was rejected",
       "toSeeContributionsAndMessages": "To see your common good contributions and related messages, go to the “Community” menu in your Gradido account and click on the “My contributions to the common good” tab!"
     },

frontend/src/components/Contributions/ContributionListItem.vue

@@ -33,6 +33,10 @@
           <div class="small">
             {{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
           </div>
+          <div v-if="state === 'DENIED' && allContribution" class="font-weight-bold">
+            <b-icon icon="x-circle" variant="danger"></b-icon>
+            {{ $t('contribution.alert.denied') }}
+          </div>
           <div v-if="state === 'DELETED'" class="small">
             {{ $t('contribution.deleted') }}
           </div>
@@ -146,6 +150,14 @@ export default {
       type: String,
       required: false,
     },
+    deniedBy: {
+      type: Number,
+      required: false,
+    },
+    deniedAt: {
+      type: String,
+      required: false,
+    },
     state: {
       type: String,
       required: false,
@@ -175,12 +187,14 @@ export default {
   computed: {
     icon() {
       if (this.deletedAt) return 'trash'
+      if (this.deniedAt) return 'x-circle'
       if (this.confirmedAt) return 'check'
       if (this.state === 'IN_PROGRESS') return 'question-circle'
       return 'bell-fill'
     },
     variant() {
       if (this.deletedAt) return 'danger'
+      if (this.deniedAt) return 'warning'
       if (this.confirmedAt) return 'success'
       if (this.state === 'IN_PROGRESS') return 'f5'
       return 'primary'

frontend/src/components/Template/RightSide/ContributionInfo.spec.js

@@ -55,7 +55,7 @@ describe('ContributionInfo', () => {
         expect(listItems.at(2).text()).toBe('contribution.alert.confirm')
 
         expect(listItems.at(3).find('svg').attributes('aria-label')).toEqual('x circle')
-        expect(listItems.at(3).text()).toBe('contribution.alert.rejected')
+        expect(listItems.at(3).text()).toBe('contribution.alert.denied')
       })
     })
 
@@ -72,7 +72,7 @@ describe('ContributionInfo', () => {
         expect(wrapper.find('p').text()).toBe('contribution.alert.communityNoteList')
       })
 
-      it('has a legend to explain the icons', () => {
+      it.skip('has a legend to explain the icons', () => {
         const listItems = wrapper.findAll('li')
 
         expect(listItems.at(0).find('svg').attributes('aria-label')).toEqual('bell fill')

frontend/src/components/Template/RightSide/ContributionInfo.vue

@@ -19,8 +19,8 @@
           {{ $t('contribution.alert.confirm') }}
         </li>
         <li>
-          <b-icon icon="x-circle" variant="danger"></b-icon>
-          {{ $t('contribution.alert.rejected') }}
+          <b-icon icon="x-circle" variant="warning"></b-icon>
+          {{ $t('contribution.alert.denied') }}
         </li>
         <li>
           <b-icon icon="trash" variant="danger"></b-icon>
@@ -33,16 +33,6 @@
       <p>
         {{ $t('contribution.alert.communityNoteList') }}
       </p>
-      <ul>
-        <li>
-          <b-icon icon="bell-fill" variant="primary"></b-icon>
-          {{ $t('contribution.alert.pending') }}
-        </li>
-        <li>
-          <b-icon icon="check" variant="success"></b-icon>
-          {{ $t('contribution.alert.confirm') }}
-        </li>
-      </ul>
     </div>
     <div v-if="hash === '#edit'" show fade variant="secondary" class="text-dark">
       <div>

frontend/src/graphql/queries.js

@@ -183,6 +183,8 @@ export const listContributions = gql`
         deletedAt
         state
         messagesCount
+        deniedAt
+        deniedBy
       }
     }
   }
@@ -202,6 +204,10 @@ export const listAllContributions = gql`
         contributionDate
         confirmedAt
         confirmedBy
+        state
+        messagesCount
+        deniedAt
+        deniedBy
       }
     }
   }

frontend/src/locales/de.json

@@ -42,10 +42,10 @@
       "communityNoteList": "Hier findest du alle eingereichten und bestätigten Beiträge von allen Mitgliedern aus dieser Gemeinschaft.",
       "confirm": "bestätigt",
       "deleted": "gelöscht",
+      "denied": "abgelehnt",
       "in_progress": "Es gibt eine Rückfrage der Moderatoren.",
       "myContributionNoteList": "Eingereichte Beiträge, die noch nicht bestätigt wurden, kannst du jederzeit bearbeiten oder löschen.",
-      "pending": "Eingereicht und wartet auf Bestätigung",
-      "rejected": "abgelehnt"
+      "pending": "Eingereicht und wartet auf Bestätigung"
     },
     "delete": "Beitrag löschen! Bist du sicher?",
     "deleted": "Der Beitrag wurde gelöscht! Wird aber sichtbar bleiben.",

frontend/src/locales/en.json

@@ -42,10 +42,10 @@
       "communityNoteList": "Here you will find all submitted and confirmed contributions from all members of this community.",
       "confirm": "confirmed",
       "deleted": "deleted",
+      "denied": "rejected",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "You can edit or delete entries that have not yet been confirmed at any time.",
-      "pending": "Submitted and waiting for confirmation",
-      "rejected": "deleted"
+      "pending": "Submitted and waiting for confirmation"
     },
     "delete": "Delete Contribution! Are you sure?",
     "deleted": "The contribution has been deleted! But it will remain visible.",

frontend/src/locales/es.json

@@ -39,10 +39,10 @@
       "answerQuestion": "Por favor,  contesta las preguntas",
       "communityNoteList": "Aquí encontrarás todas las contribuciones enviadas y confirmadas de todos los miembros de esta comunidad.",
       "confirm": "confirmado",
+      "denied": "rechazado",
       "in_progress": "Hay una pregunta de los moderatores.",
       "myContributionNoteList": "Puedes editar o eliminar las contribuciones enviadas que aún no han sido confirmadas en cualquier momento.",
-      "pending": "Enviado y a la espera de confirmación",
-      "rejected": "rechazado"
+      "pending": "Enviado y a la espera de confirmación"
     },
     "date": "Contribución para:",
     "delete": "Eliminar la contribución. ¿Estás seguro?",

frontend/src/locales/fr.json

@@ -41,10 +41,10 @@
       "communityNoteList": "Vous trouverez ci-contre toutes les contributions versées et certifiées de tous les membres de cette communauté.",
       "confirm": "Approuvé",
       "deleted": "Supprimé",
+      "denied": "supprimé",
       "in_progress": "Il y a une question du modérateur.",
       "myContributionNoteList": "À tout moment vous pouvez éditer ou supprimer les données qui n´ont pas été confirmées.",
-      "pending": "Inscription en attente de validation",
-      "rejected": "supprimé"
+      "pending": "Inscription en attente de validation"
     },
     "date": "Contribution pour:",
     "delete": "Supprimer la contribution! Êtes-vous sûr?",

frontend/src/locales/nl.json

@@ -39,10 +39,10 @@
       "answerQuestion": "Please answer the question",
       "communityNoteList": "Hier vind je alle ingediende en bevestigde bijdragen van alle leden uit deze gemeenschap.",
       "confirm": "bevestigt",
+      "denied": "afgewezen",
       "in_progress": "There is a question from the moderators.",
       "myContributionNoteList": "Ingediende bijdragen, die nog niet bevestigd zijn, kun je op elk moment wijzigen of verwijderen.",
-      "pending": "Ingediend en wacht op bevestiging",
-      "rejected": "afgewezen"
+      "pending": "Ingediend en wacht op bevestiging"
     },
     "date": "Bijdrage voor:",
     "delete": "Bijdrage verwijderen! Weet je het zeker?",

frontend/src/locales/tr.json

@@ -34,10 +34,10 @@
     "alert": {
       "communityNoteList": "Burada, bu topluluğun tüm üyelerinden gönderilen ve onaylanan bütün faydalı hizmetleri bulacaksın.",
       "confirm": "onaylandı",
+      "denied": "reddedildi",
       "myContributionNoteList": "Bildirmiş olduğun henüz onaylanmamış olan  faaliyetleri istediğin zaman düzenleyebilir veya silebilirsin.",
       "myContributionNoteSupport": "Yakın zamanda moderatörlerle aranda bir diyalog olasılığı olacak. Şu anda herhangi bir sorun yaşıyorsan, lütfen destek hattına başvur.",
-      "pending": "Gönderildi ve onay bekleniyor",
-      "rejected": "reddedildi"
+      "pending": "Gönderildi ve onay bekleniyor"
     },
     "date": "Hizmet:",
     "delete": "Hizmeti sil! Emin misin?",