+
@@ -104,7 +104,6 @@
:contributionId="row.item.id"
:contributionState="row.item.state"
@update-state="updateState"
- @update-user-data="updateUserData"
/>
@@ -146,22 +145,9 @@ export default {
required: true,
},
},
- data() {
- return {
- creationUserData: {
- amount: null,
- date: null,
- memo: null,
- moderator: null,
- },
- }
- },
methods: {
myself(item) {
- return (
- `${item.firstName} ${item.lastName}` ===
- `${this.$store.state.moderator.firstName} ${this.$store.state.moderator.lastName}`
- )
+ return item.userId === this.$store.state.moderator.id
},
getStatusIcon(status) {
return iconMap[status] ? iconMap[status] : 'default-icon'
@@ -174,16 +160,6 @@ export default {
if (item.state === 'IN_PROGRESS') return 'table-primary'
if (item.state === 'PENDING') return 'table-primary'
},
- updateCreationData(data) {
- const row = data.row
- this.$emit('update-contributions', data)
- delete data.row
- this.creationUserData = { ...this.creationUserData, ...data }
- row.toggleDetails()
- },
- updateUserData(rowItem, newCreation) {
- rowItem.creation = newCreation
- },
updateState(id) {
this.$emit('update-state', id)
},
diff --git a/admin/src/graphql/adminListAllContributions.js b/admin/src/graphql/adminListContributions.js
similarity index 80%
rename from admin/src/graphql/adminListAllContributions.js
rename to admin/src/graphql/adminListContributions.js
index cd47cd1d4..97a11c61a 100644
--- a/admin/src/graphql/adminListAllContributions.js
+++ b/admin/src/graphql/adminListContributions.js
@@ -1,17 +1,19 @@
import gql from 'graphql-tag'
-export const adminListAllContributions = gql`
+export const adminListContributions = gql`
query (
$currentPage: Int = 1
$pageSize: Int = 25
$order: Order = DESC
$statusFilter: [ContributionStatus!]
+ $userId: Int
) {
- adminListAllContributions(
+ adminListContributions(
currentPage: $currentPage
pageSize: $pageSize
order: $order
statusFilter: $statusFilter
+ userId: $userId
) {
contributionCount
contributionList {
@@ -30,6 +32,8 @@ export const adminListAllContributions = gql`
deniedBy
deletedAt
deletedBy
+ moderatorId
+ userId
}
}
}
diff --git a/admin/src/graphql/adminOpenCreations.js b/admin/src/graphql/adminOpenCreations.js
new file mode 100644
index 000000000..0e766c0f7
--- /dev/null
+++ b/admin/src/graphql/adminOpenCreations.js
@@ -0,0 +1,11 @@
+import gql from 'graphql-tag'
+
+export const adminOpenCreations = gql`
+ query ($userId: Int!) {
+ adminOpenCreations(userId: $userId) {
+ year
+ month
+ amount
+ }
+ }
+`
diff --git a/admin/src/graphql/adminUpdateContribution.js b/admin/src/graphql/adminUpdateContribution.js
index b7c834109..c52a0cbc4 100644
--- a/admin/src/graphql/adminUpdateContribution.js
+++ b/admin/src/graphql/adminUpdateContribution.js
@@ -1,18 +1,11 @@
import gql from 'graphql-tag'
export const adminUpdateContribution = gql`
- mutation ($id: Int!, $email: String!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
- adminUpdateContribution(
- id: $id
- email: $email
- amount: $amount
- memo: $memo
- creationDate: $creationDate
- ) {
+ mutation ($id: Int!, $amount: Decimal!, $memo: String!, $creationDate: String!) {
+ adminUpdateContribution(id: $id, amount: $amount, memo: $memo, creationDate: $creationDate) {
amount
date
memo
- creation
}
}
`
diff --git a/admin/src/graphql/creationTransactionList.js b/admin/src/graphql/creationTransactionList.js
deleted file mode 100644
index fc3a80b18..000000000
--- a/admin/src/graphql/creationTransactionList.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import gql from 'graphql-tag'
-
-export const creationTransactionList = gql`
- query ($currentPage: Int = 1, $pageSize: Int = 25, $order: Order = DESC, $userId: Int!) {
- creationTransactionList(
- currentPage: $currentPage
- pageSize: $pageSize
- order: $order
- userId: $userId
- ) {
- contributionCount
- contributionList {
- id
- amount
- createdAt
- confirmedAt
- contributionDate
- memo
- state
- }
- }
- }
-`
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 0d05eaa88..f98dc90f3 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,6 +1,7 @@
{
"all_emails": "Alle Nutzer",
"back": "zurück",
+ "change_user_role": "Nutzerrolle ändern",
"chat": "Chat",
"contributionLink": {
"amount": "Betrag",
@@ -114,6 +115,11 @@
"open_creations": "Offene Schöpfungen",
"overlay": {
"cancel": "Abbrechen",
+ "changeUserRole": {
+ "question": "Willst du die Rolle von {username} wirklich zu {newRole} ändern?",
+ "title": "Nutzerrolle ändern",
+ "yes": "Ja, Nutzerrolle ändern"
+ },
"confirm": {
"question": "Willst du diesen Gemeinwohl-Beitrag wirklich bestätigen und gutschreiben?",
"text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar. Bitte überprüfe genau, dass alles stimmt.",
@@ -126,11 +132,21 @@
"title": "Gemeinwohl-Beitrag löschen!",
"yes": "Ja, Beitrag löschen!"
},
+ "deleteUser": {
+ "question": "Willst du {username} wirklich löschen?",
+ "title": "Nutzer löschen",
+ "yes": "Ja, Nutzer löschen"
+ },
"deny": {
"question": "Willst du diesen Gemeinwohl-Beitrag wirklich ablehnen?",
"text": "Nach dem Speichern ist der Datensatz nicht mehr änderbar und kann auch nicht mehr gelöscht werden. Bitte überprüfe genau, dass alles stimmt.",
"title": "Gemeinwohl-Beitrag ablehnen!",
"yes": "Ja, Beitrag ablehnen und speichern!"
+ },
+ "undeleteUser": {
+ "question": "Willst du wirklich {username} wiederherstellen?",
+ "title": "Nutzer wiederherstellen",
+ "yes": "Ja, Nutzer wiederherstellen"
}
},
"redeemed": "eingelöst",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index de7d3b871..358c62a15 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,6 +1,7 @@
{
"all_emails": "All users",
"back": "back",
+ "change_user_role": "Change user role",
"chat": "Chat",
"contributionLink": {
"amount": "Amount",
@@ -39,7 +40,7 @@
},
"created": "Created for",
"createdAt": "Created at",
- "creation": "Amount",
+ "creation": "Creation",
"creationList": "Creation list",
"creation_form": {
"creation_for": "Active Basic Income for",
@@ -114,6 +115,11 @@
"open_creations": "Open creations",
"overlay": {
"cancel": "Cancel",
+ "changeUserRole": {
+ "question": "Do you really want to change {username}'s role to {newRole}?",
+ "title": "Change user role",
+ "yes": "Yes, change user role"
+ },
"confirm": {
"question": "Do you really want to carry out and finally save this pre-stored creation?",
"text": "After saving, the record can no longer be changed. Please check carefully that everything is correct.",
@@ -126,11 +132,21 @@
"title": "Delete creation!",
"yes": "Yes, delete and save creation!"
},
+ "deleteUser": {
+ "question": "Do you really want to delete {username}?",
+ "title": "Delete user",
+ "yes": "Yes, delete user"
+ },
"deny": {
"question": "Do you really want to carry out and finally save this pre-stored creation?",
"text": "After saving, the record can no longer be changed or deleted. Please check carefully that everything is correct.",
"title": "Reject creation!",
"yes": "Yes, reject and save creation!"
+ },
+ "undeleteUser": {
+ "question": "Do you really want to undelete {username}",
+ "title": "Undelete user",
+ "yes": "Yes,undelete user"
}
},
"redeemed": "redeemed",
diff --git a/admin/src/mixins/creationMonths.js b/admin/src/mixins/creationMonths.js
index c26dc5b02..57e0ab17e 100644
--- a/admin/src/mixins/creationMonths.js
+++ b/admin/src/mixins/creationMonths.js
@@ -1,9 +1,11 @@
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+
export const creationMonths = {
- props: {
- creation: {
- type: Array,
- default: () => [1000, 1000, 1000],
- },
+ data() {
+ return {
+ creation: [1000, 1000, 1000],
+ userId: 0,
+ }
},
computed: {
creationDates() {
@@ -38,4 +40,23 @@ export const creationMonths = {
return this.creationDates.map((date) => this.$d(date, 'monthShort')).join(' | ')
},
},
+ apollo: {
+ OpenCreations: {
+ query() {
+ return adminOpenCreations
+ },
+ variables() {
+ return {
+ userId: this.userId,
+ }
+ },
+ fetchPolicy: 'no-cache',
+ update({ adminOpenCreations }) {
+ this.creation = adminOpenCreations.map((obj) => obj.amount)
+ },
+ error({ message }) {
+ this.toastError(message)
+ },
+ },
+ },
}
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index 87f94e91f..c9d9661c2 100644
--- a/admin/src/pages/CreationConfirm.spec.js
+++ b/admin/src/pages/CreationConfirm.spec.js
@@ -2,7 +2,7 @@ import { mount } from '@vue/test-utils'
import CreationConfirm from './CreationConfirm'
import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
import { denyContribution } from '../graphql/denyContribution'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
import { confirmContribution } from '../graphql/confirmContribution'
import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
import VueApollo from 'vue-apollo'
@@ -38,7 +38,7 @@ const mocks = {
const defaultData = () => {
return {
- adminListAllContributions: {
+ adminListContributions: {
contributionCount: 2,
contributionList: [
{
@@ -92,14 +92,14 @@ const defaultData = () => {
describe('CreationConfirm', () => {
let wrapper
- const adminListAllContributionsMock = jest.fn()
+ const adminListContributionsMock = jest.fn()
const adminDeleteContributionMock = jest.fn()
const adminDenyContributionMock = jest.fn()
const confirmContributionMock = jest.fn()
mockClient.setRequestHandler(
- adminListAllContributions,
- adminListAllContributionsMock
+ adminListContributions,
+ adminListContributionsMock
.mockRejectedValueOnce({ message: 'Ouch!' })
.mockResolvedValue({ data: defaultData() }),
)
@@ -337,7 +337,7 @@ describe('CreationConfirm', () => {
})
it('refetches contributions with proper filter', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
@@ -352,7 +352,7 @@ describe('CreationConfirm', () => {
})
it('refetches contributions with proper filter', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
@@ -368,7 +368,7 @@ describe('CreationConfirm', () => {
})
it('refetches contributions with proper filter', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
@@ -384,7 +384,7 @@ describe('CreationConfirm', () => {
})
it('refetches contributions with proper filter', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
@@ -400,7 +400,7 @@ describe('CreationConfirm', () => {
})
it('refetches contributions with proper filter', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index 55caf8677..3c1a1e67e 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -44,7 +44,7 @@
:fields="fields"
@show-overlay="showOverlay"
@update-state="updateStatus"
- @update-contributions="$apollo.queries.AllContributions.refetch()"
+ @update-contributions="$apollo.queries.ListAllContributions.refetch()"
/>
import Overlay from '../components/Overlay'
import OpenCreationsTable from '../components/Tables/OpenCreationsTable'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
import { confirmContribution } from '../graphql/confirmContribution'
import { denyContribution } from '../graphql/denyContribution'
@@ -212,7 +212,7 @@ export default {
return this.formatDateOrDash(value)
},
},
- { key: 'moderator', label: this.$t('moderator') },
+ { key: 'moderatorId', label: this.$t('moderator') },
{ key: 'editCreation', label: this.$t('chat') },
{ key: 'confirm', label: this.$t('save') },
],
@@ -397,7 +397,7 @@ export default {
apollo: {
ListAllContributions: {
query() {
- return adminListAllContributions
+ return adminListContributions
},
variables() {
return {
@@ -407,11 +407,11 @@ export default {
}
},
fetchPolicy: 'no-cache',
- update({ adminListAllContributions }) {
- this.rows = adminListAllContributions.contributionCount
- this.items = adminListAllContributions.contributionList
+ update({ adminListContributions }) {
+ this.rows = adminListContributions.contributionCount
+ this.items = adminListContributions.contributionList
if (this.statusFilter === FILTER_TAB_MAP[0]) {
- this.$store.commit('setOpenCreations', adminListAllContributions.contributionCount)
+ this.$store.commit('setOpenCreations', adminListContributions.contributionCount)
}
},
error({ message }) {
diff --git a/admin/src/pages/Overview.spec.js b/admin/src/pages/Overview.spec.js
index beb5bc2dd..53378d010 100644
--- a/admin/src/pages/Overview.spec.js
+++ b/admin/src/pages/Overview.spec.js
@@ -1,6 +1,6 @@
import { mount } from '@vue/test-utils'
import Overview from './Overview'
-import { adminListAllContributions } from '../graphql/adminListAllContributions'
+import { adminListContributions } from '../graphql/adminListContributions'
import VueApollo from 'vue-apollo'
import { createMockClient } from 'mock-apollo-client'
import { toastErrorSpy } from '../../test/testSetup'
@@ -30,7 +30,7 @@ const mocks = {
const defaultData = () => {
return {
- adminListAllContributions: {
+ adminListContributions: {
contributionCount: 2,
contributionList: [
{
@@ -42,7 +42,7 @@ const defaultData = () => {
amount: 500,
memo: 'Danke für alles',
date: new Date(),
- moderator: 1,
+ moderatorId: 1,
state: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
@@ -64,7 +64,7 @@ const defaultData = () => {
amount: 1000000,
memo: 'Gut Ergattert',
date: new Date(),
- moderator: 1,
+ moderatorId: 1,
state: 'PENDING',
creation: [500, 500, 500],
messagesCount: 0,
@@ -84,11 +84,11 @@ const defaultData = () => {
describe('Overview', () => {
let wrapper
- const adminListAllContributionsMock = jest.fn()
+ const adminListContributionsMock = jest.fn()
mockClient.setRequestHandler(
- adminListAllContributions,
- adminListAllContributionsMock
+ adminListContributions,
+ adminListContributionsMock
.mockRejectedValueOnce({ message: 'Ouch!' })
.mockResolvedValue({ data: defaultData() }),
)
@@ -109,8 +109,8 @@ describe('Overview', () => {
})
})
- it('calls the adminListAllContributions query', () => {
- expect(adminListAllContributionsMock).toBeCalledWith({
+ it('calls the adminListContributions query', () => {
+ expect(adminListContributionsMock).toBeCalledWith({
currentPage: 1,
order: 'DESC',
pageSize: 25,
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index c5316a35b..90924c9a9 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -31,7 +31,7 @@