Refactor state to status for contribution in admin.

admin/src/components/ContributionMessages/ContributionMessagesFormular.spec.js

@@ -73,8 +73,8 @@ describe('ContributionMessagesFormular', () => {
         )
       })
 
-      it('emitted "update-state" with data', async () => {
-        expect(wrapper.emitted('update-state')).toEqual(
+      it('emitted "update-status" with data', async () => {
+        expect(wrapper.emitted('update-status')).toEqual(
           expect.arrayContaining([expect.arrayContaining([42])]),
         )
       })

admin/src/components/ContributionMessages/ContributionMessagesFormular.vue

@@ -54,7 +54,7 @@ export default {
         })
         .then((result) => {
           this.$emit('get-list-contribution-messages', this.contributionId)
-          this.$emit('update-state', this.contributionId)
+          this.$emit('update-status', this.contributionId)
           this.form.text = ''
           this.toastSuccess(this.$t('message.request'))
           this.loading = false

admin/src/components/ContributionMessages/ContributionMessagesList.spec.js

@@ -10,7 +10,7 @@ describe('ContributionMessagesList', () => {
 
   const propsData = {
     contributionId: 42,
-    contributionState: 'PENDING',
+    contributionStatus: 'PENDING',
   }
 
   const mocks = {

admin/src/components/ContributionMessages/ContributionMessagesList.vue

@@ -6,11 +6,11 @@
       </div>
     </b-container>
 
-    <div v-if="contributionState === 'PENDING' || contributionState === 'IN_PROGRESS'">
+    <div v-if="contributionStatus === 'PENDING' || contributionStatus === 'IN_PROGRESS'">
       <contribution-messages-formular
         :contributionId="contributionId"
         @get-list-contribution-messages="getListContributionMessages"
-        @update-state="updateState"
+        @update-status="updateStatus"
       />
     </div>
   </div>
@@ -31,7 +31,7 @@ export default {
       type: Number,
       required: true,
     },
-    contributionState: {
+    contributionStatus: {
       type: String,
       required: true,
     },
@@ -58,8 +58,8 @@ export default {
           this.toastError(error.message)
         })
     },
-    updateState(id) {
-      this.$emit('update-state', id)
+    updateStatus(id) {
+      this.$emit('update-status', id)
     },
   },
   created() {

admin/src/components/ContributionMessages/slots/ContributionMessagesListItem.spec.js

@@ -18,7 +18,7 @@ describe('ContributionMessagesListItem', () => {
   describe('if message author has moderator role', () => {
     const propsData = {
       contributionId: 42,
-      state: 'PENDING',
+      status: 'PENDING',
       message: {
         id: 111,
         message: 'Lorem ipsum?',
@@ -79,7 +79,7 @@ describe('ContributionMessagesListItem', () => {
   describe('if message author does not have moderator role', () => {
     const propsData = {
       contributionId: 42,
-      state: 'PENDING',
+      status: 'PENDING',
       message: {
         id: 113,
         message: 'Asda sdad ad asdasd, das Ass das Das. ',

admin/src/components/CreationTransactionList.spec.js

@@ -28,7 +28,7 @@ const defaultData = () => {
           memo: 'Danke für alles',
           date: new Date(),
           moderator: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,
@@ -50,7 +50,7 @@ const defaultData = () => {
           memo: 'Gut Ergattert',
           date: new Date(),
           moderator: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,

admin/src/components/CreationTransactionList.vue

@@ -34,8 +34,8 @@
           {{ $t('help.transactionlist.confirmed') }}
         </div>
         <div>
-          {{ $t('transactionlist.state') }} {{ $t('math.equals') }}
-          {{ $t('help.transactionlist.state') }}
+          {{ $t('transactionlist.status') }} {{ $t('math.equals') }}
+          {{ $t('help.transactionlist.status') }}
         </div>
       </b-collapse>
     </div>
@@ -78,8 +78,8 @@ export default {
           },
         },
         {
-          key: 'state',
-          label: this.$t('transactionlist.state'),
+          key: 'status',
+          label: this.$t('transactionlist.status'),
         },
         {
           key: 'amount',

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

@@ -131,13 +131,13 @@ describe('OpenCreationsTable', () => {
       })
     })
 
-    describe('call updateState', () => {
+    describe('call updateStatus', () => {
       beforeEach(() => {
-        wrapper.vm.updateState(4)
+        wrapper.vm.updateStatus(4)
       })
 
-      it('emits update-state', () => {
-        expect(wrapper.vm.$root.$emit('update-state', 4)).toBeTruthy()
+      it('emits update-status', () => {
+        expect(wrapper.vm.$root.$emit('update-status', 4)).toBeTruthy()
       })
     })
   })

admin/src/components/Tables/OpenCreationsTable.vue

@@ -9,8 +9,8 @@
       stacked="md"
       :tbody-tr-class="rowClass"
     >
-      <template #cell(state)="row">
-        <b-icon :icon="getStatusIcon(row.item.state)"></b-icon>
+      <template #cell(status)="row">
+        <b-icon :icon="getStatusIcon(row.item.status)"></b-icon>
       </template>
       <template #cell(bookmark)="row">
         <div v-if="!myself(row.item)">
@@ -39,12 +39,12 @@
           <b-button v-else @click="rowToggleDetails(row, 0)">
             <b-icon icon="chat-dots"></b-icon>
             <b-icon
-              v-if="row.item.state === 'PENDING' && row.item.messagesCount > 0"
+              v-if="row.item.status === 'PENDING' && row.item.messagesCount > 0"
               icon="exclamation-circle-fill"
               variant="warning"
             ></b-icon>
             <b-icon
-              v-if="row.item.state === 'IN_PROGRESS' && row.item.messagesCount > 0"
+              v-if="row.item.status === 'IN_PROGRESS' && row.item.messagesCount > 0"
               icon="question-diamond"
               variant="warning"
               class="pl-1"
@@ -102,8 +102,8 @@
             <div v-else>
               <contribution-messages-list
                 :contributionId="row.item.id"
-                :contributionState="row.item.state"
-                @update-state="updateState"
+                :contributionStatus="row.item.status"
+                @update-status="updateStatus"
               />
             </div>
           </template>
@@ -154,14 +154,14 @@ export default {
     },
     rowClass(item, type) {
       if (!item || type !== 'row') return
-      if (item.state === 'CONFIRMED') return 'table-success'
-      if (item.state === 'DENIED') return 'table-warning'
-      if (item.state === 'DELETED') return 'table-danger'
-      if (item.state === 'IN_PROGRESS') return 'table-primary'
-      if (item.state === 'PENDING') return 'table-primary'
+      if (item.status === 'CONFIRMED') return 'table-success'
+      if (item.status === 'DENIED') return 'table-warning'
+      if (item.status === 'DELETED') return 'table-danger'
+      if (item.status === 'IN_PROGRESS') return 'table-primary'
+      if (item.status === 'PENDING') return 'table-primary'
     },
-    updateState(id) {
-      this.$emit('update-state', id)
+    updateStatus(id) {
+      this.$emit('update-status', id)
     },
   },
 }

admin/src/graphql/adminListContributions.js

@@ -26,7 +26,7 @@ export const adminListContributions = gql`
         contributionDate
         confirmedAt
         confirmedBy
-        state
+        status
         messagesCount
         deniedAt
         deniedBy

admin/src/locales/de.json

@@ -94,7 +94,7 @@
     "transactionlist": {
       "confirmed": "Wann wurde es von einem Moderator / Admin bestätigt.",
       "periods": "Für welchen Zeitraum wurde vom Mitglied eingereicht.",
-      "state": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
+      "status": "[PENDING = eingereicht, DELETED = gelöscht, IN_PROGRESS = im Dialog mit Moderator, DENIED = abgelehnt, CONFIRMED = bestätigt]",
       "submitted": "Wann wurde es vom Mitglied eingereicht"
     }
   },
@@ -184,7 +184,7 @@
     "confirmed": "Bestätigt",
     "memo": "Nachricht",
     "period": "Zeitraum",
-    "state": "Status",
+    "status": "Status",
     "submitted": "Eingereicht",
     "title": "Alle geschöpften Transaktionen für den Nutzer"
   },

admin/src/locales/en.json

@@ -94,7 +94,7 @@
     "transactionlist": {
       "confirmed": "When was it confirmed by a moderator / admin.",
       "periods": "For what period was it submitted by the member.",
-      "state": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
+      "status": "[PENDING = submitted, DELETED = deleted, IN_PROGRESS = in dialogue with moderator, DENIED = rejected, CONFIRMED = confirmed]",
       "submitted": "When was it submitted by the member"
     }
   },
@@ -184,7 +184,7 @@
     "confirmed": "Confirmed",
     "memo": "Message",
     "period": "Period",
-    "state": "State",
+    "status": "State",
     "submitted": "Submitted",
     "title": "All creation-transactions for the user"
   },

admin/src/pages/CreationConfirm.spec.js

@@ -51,7 +51,7 @@ const defaultData = () => {
           memo: 'Danke für alles',
           date: new Date(),
           moderator: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,
@@ -73,7 +73,7 @@ const defaultData = () => {
           memo: 'Gut Ergattert',
           date: new Date(),
           moderator: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,
@@ -451,12 +451,12 @@ describe('CreationConfirm', () => {
 
     describe('update status', () => {
       beforeEach(async () => {
-        await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-state', 2)
+        await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-status', 2)
       })
 
       it('updates the status', () => {
         expect(wrapper.vm.items.find((obj) => obj.id === 2).messagesCount).toBe(1)
-        expect(wrapper.vm.items.find((obj) => obj.id === 2).state).toBe('IN_PROGRESS')
+        expect(wrapper.vm.items.find((obj) => obj.id === 2).status).toBe('IN_PROGRESS')
       })
     })
 

admin/src/pages/CreationConfirm.vue

@@ -43,7 +43,7 @@
       :items="items"
       :fields="fields"
       @show-overlay="showOverlay"
-      @update-state="updateStatus"
+      @update-status="updateStatus"
       @update-contributions="$apollo.queries.ListAllContributions.refetch()"
     />
 
@@ -187,7 +187,7 @@ export default {
     },
     updateStatus(id) {
       this.items.find((obj) => obj.id === id).messagesCount++
-      this.items.find((obj) => obj.id === id).state = 'IN_PROGRESS'
+      this.items.find((obj) => obj.id === id).status = 'IN_PROGRESS'
     },
     formatDateOrDash(value) {
       return value ? this.$d(new Date(value), 'short') : '—'
@@ -331,7 +331,7 @@ export default {
         ],
         [
           // all contributions
-          { key: 'state', label: this.$t('status') },
+          { key: 'status', label: this.$t('status') },
           { key: 'firstName', label: this.$t('firstname') },
           { key: 'lastName', label: this.$t('lastname') },
           {

admin/src/pages/Overview.spec.js

@@ -43,7 +43,7 @@ const defaultData = () => {
           memo: 'Danke für alles',
           date: new Date(),
           moderatorId: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,
@@ -65,7 +65,7 @@ const defaultData = () => {
           memo: 'Gut Ergattert',
           date: new Date(),
           moderatorId: 1,
-          state: 'PENDING',
+          status: 'PENDING',
           creation: [500, 500, 500],
           messagesCount: 0,
           deniedBy: null,