@@ -39,12 +39,12 @@
+
diff --git a/admin/src/graphql/adminListContributions.js b/admin/src/graphql/adminListContributions.js
index 97a11c61a..3c1dcd69c 100644
--- a/admin/src/graphql/adminListContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -26,7 +26,7 @@ export const adminListContributions = gql`
contributionDate
confirmedAt
confirmedBy
- state
+ status
messagesCount
deniedAt
deniedBy
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index a15fc139e..18412c969 100644
--- a/admin/src/locales/de.json
+++ b/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"
}
},
@@ -189,7 +189,7 @@
"confirmed": "Bestätigt",
"memo": "Nachricht",
"period": "Zeitraum",
- "state": "Status",
+ "status": "Status",
"submitted": "Eingereicht",
"title": "Alle geschöpften Transaktionen für den Nutzer"
},
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index b173b38f3..095b53970 100644
--- a/admin/src/locales/en.json
+++ b/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"
}
},
@@ -189,7 +189,7 @@
"confirmed": "Confirmed",
"memo": "Message",
"period": "Period",
- "state": "State",
+ "status": "State",
"submitted": "Submitted",
"title": "All creation-transactions for the user"
},
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 091d7a011..c8f01d40d 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/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')
})
})
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 415f2edf7..c8e756223 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/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') },
{
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index 53378d010..b9ad77cdd 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/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,
diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts
index b5db21b16..6f36a9f64 100644
--- a/backend/src/graphql/model/Contribution.ts
+++ b/backend/src/graphql/model/Contribution.ts
@@ -15,7 +15,7 @@ export class Contribution {
this.confirmedAt = contribution.confirmedAt
this.confirmedBy = contribution.confirmedBy
this.contributionDate = contribution.contributionDate
- this.state = contribution.contributionStatus
+ this.status = contribution.contributionStatus
this.messagesCount = contribution.messages ? contribution.messages.length : 0
this.deniedAt = contribution.deniedAt
this.deniedBy = contribution.deniedBy
@@ -68,7 +68,7 @@ export class Contribution {
messagesCount: number
@Field(() => String)
- state: string
+ status: string
@Field(() => Int, { nullable: true })
moderatorId: number | null
diff --git a/backend/src/graphql/model/GdtEntryList.ts b/backend/src/graphql/model/GdtEntryList.ts
index 06f77f532..7c08520c8 100644
--- a/backend/src/graphql/model/GdtEntryList.ts
+++ b/backend/src/graphql/model/GdtEntryList.ts
@@ -10,7 +10,7 @@ import { GdtEntry } from './GdtEntry'
@ObjectType()
export class GdtEntryList {
constructor(json: any) {
- this.state = json.state
+ this.status = json.state
this.count = json.count
this.gdtEntries = json.gdtEntries ? json.gdtEntries.map((json: any) => new GdtEntry(json)) : []
this.gdtSum = json.gdtSum
@@ -18,7 +18,7 @@ export class GdtEntryList {
}
@Field(() => String)
- state: string
+ status: string
@Field(() => Int)
count: number
diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts
index dece05781..5e38db6a0 100644
--- a/backend/src/graphql/model/UnconfirmedContribution.ts
+++ b/backend/src/graphql/model/UnconfirmedContribution.ts
@@ -16,7 +16,7 @@ export class UnconfirmedContribution {
this.email = user ? user.emailContact.email : ''
this.moderator = contribution.moderatorId
this.creation = creations
- this.state = contribution.contributionStatus
+ this.status = contribution.contributionStatus
this.messageCount = contribution.messages ? contribution.messages.length : 0
}
@@ -51,7 +51,7 @@ export class UnconfirmedContribution {
creation: Decimal[]
@Field(() => String)
- state: string
+ status: string
@Field(() => Int)
messageCount: number
diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts
index d4c84b4f3..f3646de54 100644
--- a/backend/src/graphql/resolver/ContributionResolver.test.ts
+++ b/backend/src/graphql/resolver/ContributionResolver.test.ts
@@ -1092,29 +1092,29 @@ describe('ContributionResolver', () => {
contributionCount: 4,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
expect.objectContaining({
id: contributionToDeny.data.createContribution.id,
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Test contribution to deny',
amount: '100',
}),
expect.objectContaining({
id: contributionToDelete.data.createContribution.id,
- state: 'DELETED',
+ status: 'DELETED',
memo: 'Test contribution to delete',
amount: '100',
}),
expect.objectContaining({
id: inProgressContribution.data.createContribution.id,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
memo: 'Test IN_PROGRESS contribution',
amount: '100',
}),
@@ -1223,47 +1223,47 @@ describe('ContributionResolver', () => {
contributionCount: 7,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: '100',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
id: contributionToConfirm.data.createContribution.id,
memo: 'Test contribution to confirm',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
expect.objectContaining({
id: contributionToDeny.data.createContribution.id,
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Test contribution to deny',
amount: '100',
}),
expect.objectContaining({
id: inProgressContribution.data.createContribution.id,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
memo: 'Test IN_PROGRESS contribution',
amount: '100',
}),
expect.objectContaining({
id: bibiCreatedContribution.id,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Herzlich Willkommen bei Gradido!',
amount: '1000',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Whatever contribution',
amount: '166',
}),
@@ -1288,47 +1288,47 @@ describe('ContributionResolver', () => {
contributionCount: 7,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: '100',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
id: contributionToConfirm.data.createContribution.id,
memo: 'Test contribution to confirm',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
expect.objectContaining({
id: contributionToDeny.data.createContribution.id,
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Test contribution to deny',
amount: '100',
}),
expect.objectContaining({
id: inProgressContribution.data.createContribution.id,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
memo: 'Test IN_PROGRESS contribution',
amount: '100',
}),
expect.objectContaining({
id: bibiCreatedContribution.id,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Herzlich Willkommen bei Gradido!',
amount: '1000',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Whatever contribution',
amount: '166',
}),
@@ -1353,47 +1353,47 @@ describe('ContributionResolver', () => {
contributionCount: 7,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: '100',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
id: contributionToConfirm.data.createContribution.id,
memo: 'Test contribution to confirm',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
expect.objectContaining({
id: contributionToDeny.data.createContribution.id,
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Test contribution to deny',
amount: '100',
}),
expect.objectContaining({
id: inProgressContribution.data.createContribution.id,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
memo: 'Test IN_PROGRESS contribution',
amount: '100',
}),
expect.objectContaining({
id: bibiCreatedContribution.id,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Herzlich Willkommen bei Gradido!',
amount: '1000',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Whatever contribution',
amount: '166',
}),
@@ -1419,33 +1419,33 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: '100',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
id: contributionToConfirm.data.createContribution.id,
memo: 'Test contribution to confirm',
}),
expect.objectContaining({
id: bibiCreatedContribution.id,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Herzlich Willkommen bei Gradido!',
amount: '1000',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.not.objectContaining({
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.not.objectContaining({
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.not.objectContaining({
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
]),
})
@@ -1468,20 +1468,20 @@ describe('ContributionResolver', () => {
contributionCount: 1,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.not.objectContaining({
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.not.objectContaining({
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
@@ -1506,20 +1506,20 @@ describe('ContributionResolver', () => {
contributionCount: 1,
contributionList: expect.arrayContaining([
expect.not.objectContaining({
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.not.objectContaining({
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.not.objectContaining({
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
id: inProgressContribution.data.createContribution.id,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
memo: 'Test IN_PROGRESS contribution',
amount: '100',
}),
@@ -1545,27 +1545,27 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
id: contributionToDeny.data.createContribution.id,
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Test contribution to deny',
amount: '100',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'DENIED',
+ status: 'DENIED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.not.objectContaining({
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.not.objectContaining({
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
expect.not.objectContaining({
- state: 'PENDING',
+ status: 'PENDING',
}),
]),
})
@@ -1608,36 +1608,36 @@ describe('ContributionResolver', () => {
contributionList: expect.arrayContaining([
expect.objectContaining({
amount: '100',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
id: contributionToConfirm.data.createContribution.id,
memo: 'Test contribution to confirm',
}),
expect.objectContaining({
id: pendingContribution.data.createContribution.id,
- state: 'PENDING',
+ status: 'PENDING',
memo: 'Test PENDING contribution update',
amount: '10',
}),
expect.objectContaining({
id: bibiCreatedContribution.id,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Herzlich Willkommen bei Gradido!',
amount: '1000',
}),
expect.objectContaining({
id: expect.any(Number),
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
memo: 'Whatever contribution',
amount: '166',
}),
expect.not.objectContaining({
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.not.objectContaining({
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
]),
})
@@ -2691,7 +2691,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(50),
@@ -2700,7 +2700,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(450),
@@ -2709,7 +2709,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido liebe Bibi!',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(400),
@@ -2718,7 +2718,7 @@ describe('ContributionResolver', () => {
lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2727,7 +2727,7 @@ describe('ContributionResolver', () => {
lastName: 'der Baumeister',
memo: 'Confirmed Contribution',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2736,7 +2736,7 @@ describe('ContributionResolver', () => {
lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
@@ -2745,7 +2745,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Aktives Grundeinkommen',
messagesCount: 0,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.objectContaining({
amount: expect.decimalEqual(200),
@@ -2754,7 +2754,7 @@ describe('ContributionResolver', () => {
lastName: 'Lustig',
memo: 'Das war leider zu Viel!',
messagesCount: 0,
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
@@ -2763,7 +2763,7 @@ describe('ContributionResolver', () => {
lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
@@ -2772,7 +2772,7 @@ describe('ContributionResolver', () => {
lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: expect.decimalEqual(166),
@@ -2781,7 +2781,7 @@ describe('ContributionResolver', () => {
lastName: 'Hotzenplotz',
memo: 'Whatever contribution',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2790,7 +2790,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Test contribution to delete',
messagesCount: 0,
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2799,7 +2799,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Test contribution to deny',
messagesCount: 0,
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2808,7 +2808,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Test contribution to confirm',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.objectContaining({
amount: expect.decimalEqual(100),
@@ -2817,7 +2817,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Test IN_PROGRESS contribution',
messagesCount: 1,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
expect.objectContaining({
amount: expect.decimalEqual(10),
@@ -2826,7 +2826,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Test PENDING contribution update',
messagesCount: 1,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.objectContaining({
amount: expect.decimalEqual(1000),
@@ -2835,7 +2835,7 @@ describe('ContributionResolver', () => {
lastName: 'Bloxberg',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
]),
})
@@ -2864,7 +2864,7 @@ describe('ContributionResolver', () => {
lastName: 'Lustig',
memo: 'Herzlich Willkommen bei Gradido!',
messagesCount: 0,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.objectContaining({
amount: '100',
@@ -2873,19 +2873,19 @@ describe('ContributionResolver', () => {
lastName: 'Lustig',
memo: 'Test env contribution',
messagesCount: 0,
- state: 'PENDING',
+ status: 'PENDING',
}),
expect.not.objectContaining({
- state: 'DENIED',
+ status: 'DENIED',
}),
expect.not.objectContaining({
- state: 'DELETED',
+ status: 'DELETED',
}),
expect.not.objectContaining({
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
}),
expect.not.objectContaining({
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
}),
]),
})
diff --git a/backend/src/seeds/graphql/queries.ts b/backend/src/seeds/graphql/queries.ts
index f82882f97..061898ae1 100644
--- a/backend/src/seeds/graphql/queries.ts
+++ b/backend/src/seeds/graphql/queries.ts
@@ -195,7 +195,7 @@ export const listContributions = gql`
confirmedAt
confirmedBy
deletedAt
- state
+ status
messagesCount
deniedAt
deniedBy
@@ -218,7 +218,7 @@ query ($currentPage: Int = 1, $pageSize: Int = 5, $order: Order = DESC, $statusF
confirmedAt
confirmedBy
contributionDate
- state
+ status
messagesCount
deniedAt
deniedBy
@@ -254,7 +254,7 @@ export const adminListContributions = gql`
confirmedAt
confirmedBy
contributionDate
- state
+ status
messagesCount
deniedAt
deniedBy
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
index ad17152c0..17fd44fe2 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.spec.js
+++ b/frontend/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])]),
)
})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
index b11be3b14..e84f9273b 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesFormular.vue
@@ -55,7 +55,7 @@ export default {
})
.then((result) => {
this.$emit('get-list-contribution-messages', false)
- this.$emit('update-state', this.contributionId)
+ this.$emit('update-status', this.contributionId)
this.form.text = ''
this.toastSuccess(this.$t('message.reply'))
this.isSubmitting = false
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
index 47a8f9dfe..2caef666f 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.spec.js
@@ -8,7 +8,7 @@ describe('ContributionMessagesList', () => {
const propsData = {
contributionId: 42,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
messages: [],
}
@@ -40,13 +40,13 @@ describe('ContributionMessagesList', () => {
expect(wrapper.findComponent({ name: 'ContributionMessagesFormular' }).exists()).toBe(true)
})
- describe('update State', () => {
+ describe('update Status', () => {
beforeEach(() => {
- wrapper.vm.updateState()
+ wrapper.vm.updateStatus()
})
it('emits getListContributionMessages', async () => {
- expect(wrapper.vm.$emit('update-state')).toBeTruthy()
+ expect(wrapper.vm.$emit('update-status')).toBeTruthy()
})
})
})
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
index c93d424b6..28e37dbb7 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesList.vue
@@ -7,10 +7,10 @@
@@ -37,7 +37,7 @@ export default {
type: Number,
required: true,
},
- state: {
+ status: {
type: String,
required: true,
},
@@ -47,8 +47,8 @@ export default {
},
},
methods: {
- updateState(id) {
- this.$emit('update-state', id)
+ updateStatus(id) {
+ this.$emit('update-status', id)
},
},
}
diff --git a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
index b00fdd7cf..d93683de9 100644
--- a/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
+++ b/frontend/src/components/ContributionMessages/ContributionMessagesListItem.spec.js
@@ -21,7 +21,7 @@ const mocks = {
describe('ContributionMessagesList', () => {
const propsData = {
contributionId: 42,
- state: 'PENDING',
+ status: 'PENDING',
messages: [
{
id: 111,
diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index ebff93886..4137f7957 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -119,11 +119,11 @@ describe('ContributionList', () => {
describe('update status', () => {
beforeEach(() => {
- wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
+ wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-status', { id: 2 })
})
it('emits update status', () => {
- expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
+ expect(wrapper.emitted('update-status')).toEqual([[{ id: 2 }]])
})
})
})
diff --git a/frontend/src/components/Contributions/ContributionList.vue b/frontend/src/components/Contributions/ContributionList.vue
index 3e32cb90f..9f62354a3 100644
--- a/frontend/src/components/Contributions/ContributionList.vue
+++ b/frontend/src/components/Contributions/ContributionList.vue
@@ -2,26 +2,26 @@
{
const propsData = {
contributionId: 42,
- state: 'PENDING',
+ status: 'PENDING',
messagesCount: 2,
id: 1,
createdAt: '26/07/2022',
@@ -72,8 +72,8 @@ describe('ContributionListItem', () => {
expect(wrapper.vm.variant).toBe('success')
})
- it('is warning at when state is IN_PROGRESS', async () => {
- await wrapper.setProps({ state: 'IN_PROGRESS' })
+ it('is warning at when status is IN_PROGRESS', async () => {
+ await wrapper.setProps({ status: 'IN_PROGRESS' })
expect(wrapper.vm.variant).toBe('205')
})
})
@@ -134,13 +134,13 @@ describe('ContributionListItem', () => {
})
})
- describe('updateState', () => {
+ describe('updateStatus', () => {
beforeEach(async () => {
- await wrapper.vm.updateState()
+ await wrapper.vm.updateStatus()
})
- it('emit update-state', () => {
- expect(wrapper.vm.$emit('update-state')).toBeTruthy()
+ it('emit update-status', () => {
+ expect(wrapper.vm.$emit('update-status')).toBeTruthy()
})
})
})
diff --git a/frontend/src/components/Contributions/ContributionListItem.vue b/frontend/src/components/Contributions/ContributionListItem.vue
index 27e8459bd..0197a9593 100644
--- a/frontend/src/components/Contributions/ContributionListItem.vue
+++ b/frontend/src/components/Contributions/ContributionListItem.vue
@@ -2,7 +2,7 @@
@@ -26,7 +26,7 @@
{{ $t('contributionText') }}
{{ memo }}
@@ -37,11 +37,11 @@
{{ $t('creation') }} {{ $t('(') }}{{ amount / 20 }} {{ $t('h') }}{{ $t(')') }}
-
+
{{ $t('contribution.alert.denied') }}
-
+
{{ $t('contribution.deleted') }}
{{ amount | GDD }}
@@ -53,12 +53,12 @@
@@ -69,7 +69,7 @@
@@ -161,7 +161,7 @@ export default {
type: String,
required: false,
},
- state: {
+ status: {
type: String,
required: false,
default: '',
@@ -197,14 +197,14 @@ export default {
if (this.deletedAt) return 'trash'
if (this.deniedAt) return 'x-circle'
if (this.confirmedAt) return 'check'
- if (this.state === 'IN_PROGRESS') return 'question'
+ if (this.status === 'IN_PROGRESS') return 'question'
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 '205'
+ if (this.status === 'IN_PROGRESS') return '205'
return 'primary'
},
date() {
@@ -245,8 +245,8 @@ export default {
this.toastError(error.message)
})
},
- updateState(id) {
- this.$emit('update-state', id)
+ updateStatus(id) {
+ this.$emit('update-status', id)
},
},
watch: {
diff --git a/frontend/src/graphql/queries.js b/frontend/src/graphql/queries.js
index f254b93cc..49975b0a2 100644
--- a/frontend/src/graphql/queries.js
+++ b/frontend/src/graphql/queries.js
@@ -190,7 +190,7 @@ export const listContributions = gql`
confirmedAt
confirmedBy
deletedAt
- state
+ status
messagesCount
deniedAt
deniedBy
@@ -214,7 +214,7 @@ export const listAllContributions = gql`
contributionDate
confirmedAt
confirmedBy
- state
+ status
messagesCount
deniedAt
deniedBy
diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index ab1572d37..0867b0732 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -68,7 +68,7 @@ describe('Community', () => {
firstName: 'Bibi',
contributionDate: '2022-07-15T08:47:06.000Z',
lastName: 'Bloxberg',
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
messagesCount: 0,
deniedAt: null,
deniedBy: null,
@@ -85,7 +85,7 @@ describe('Community', () => {
firstName: 'Bibi',
contributionDate: '2022-06-15T08:47:06.000Z',
lastName: 'Bloxberg',
- state: 'CONFIRMED',
+ status: 'CONFIRMED',
messagesCount: 0,
deniedAt: null,
deniedBy: null,
@@ -121,7 +121,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
},
{
id: 1550,
@@ -137,7 +137,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
},
{
id: 1556,
@@ -153,7 +153,7 @@ describe('Community', () => {
deniedAt: null,
deniedBy: null,
messagesCount: 0,
- state: 'IN_PROGRESS',
+ status: 'IN_PROGRESS',
},
],
contributionCount: 3,
@@ -263,7 +263,7 @@ describe('Community', () => {
expect(wrapper.findAll('div[role="tabpanel"]')).toHaveLength(3)
})
- it('check for correct tabIndex if state is "IN_PROGRESS" or not', () => {
+ it('check for correct tabIndex if status is "IN_PROGRESS" or not', () => {
expect(routerPushMock).toBeCalledWith({ params: { tab: 'contributions' } })
})
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 4388d6f4a..c4df3a47e 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -30,7 +30,7 @@
@update-list-contributions="updateListContributions"
@update-contribution-form="updateContributionForm"
@delete-contribution="deleteContribution"
- @update-state="updateState"
+ @update-status="updateStatus"
:contributionCount="contributionCount"
:showPagination="true"
:pageSize="pageSize"
@@ -148,7 +148,7 @@ export default {
update({ listContributions }) {
this.contributionCount = listContributions.contributionCount
this.items = listContributions.contributionList
- if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
+ if (this.items.find((item) => item.status === 'IN_PROGRESS')) {
this.tabIndex = 1
if (this.$route.params.tab !== 'contributions')
this.$router.push({ params: { tab: 'contributions' } })
@@ -290,8 +290,8 @@ export default {
updateTransactions(pagination) {
this.$emit('update-transactions', pagination)
},
- updateState(id) {
- this.items.find((item) => item.id === id).state = 'PENDING'
+ updateStatus(id) {
+ this.items.find((item) => item.id === id).status = 'PENDING'
},
},
}