-
+
+
+
+
+
-
-
-
-
-
-
diff --git a/admin/src/components/Tables/SelectedUsersTable.vue b/admin/src/components/Tables/SelectedUsersTable.vue
deleted file mode 100644
index 810f8dac8..000000000
--- a/admin/src/components/Tables/SelectedUsersTable.vue
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
- {{ $t('e_mail') }}{{ $t('math.exclaim') }}
-
-
-
-
-
-
-
-
-
-
diff --git a/admin/src/graphql/listAllContributions.js b/admin/src/graphql/listAllContributions.js
new file mode 100644
index 000000000..655ab679c
--- /dev/null
+++ b/admin/src/graphql/listAllContributions.js
@@ -0,0 +1,34 @@
+import gql from 'graphql-tag'
+
+export const listAllContributions = gql`
+ query (
+ $currentPage: Int = 1
+ $pageSize: Int = 25
+ $order: Order = DESC
+ $statusFilter: [ContributionStatus!]
+ ) {
+ listAllContributions(
+ currentPage: $currentPage
+ pageSize: $pageSize
+ order: $order
+ statusFilter: $statusFilter
+ ) {
+ contributionCount
+ contributionList {
+ id
+ firstName
+ lastName
+ amount
+ memo
+ createdAt
+ contributionDate
+ confirmedAt
+ confirmedBy
+ state
+ messagesCount
+ deniedAt
+ deniedBy
+ }
+ }
+ }
+`
diff --git a/admin/src/graphql/listUnconfirmedContributions.js b/admin/src/graphql/listUnconfirmedContributions.js
deleted file mode 100644
index 1d7f9e21c..000000000
--- a/admin/src/graphql/listUnconfirmedContributions.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import gql from 'graphql-tag'
-
-export const listUnconfirmedContributions = gql`
- query {
- listUnconfirmedContributions {
- id
- firstName
- lastName
- userId
- email
- amount
- memo
- date
- moderator
- creation
- state
- messageCount
- }
- }
-`
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index 9612e3247..00eef1812 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -1,6 +1,7 @@
{
"all_emails": "Alle Nutzer",
"back": "zurück",
+ "chat": "Chat",
"contributionLink": {
"amount": "Betrag",
"changeSaved": "Änderungen gespeichert",
@@ -29,10 +30,18 @@
"validFrom": "Startdatum",
"validTo": "Enddatum"
},
+ "contributions": {
+ "all": "Alle",
+ "confirms": "Bestätigt",
+ "deleted": "Gelöscht",
+ "denied": "Abgelehnt",
+ "open": "Offen"
+ },
+ "created": "Geschöpft",
+ "createdAt": "Angelegt",
"creation": "Schöpfung",
"creationList": "Schöpfungsliste",
"creation_form": {
- "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
"creation_for": "Aktives Grundeinkommen für",
"enter_text": "Text eintragen",
"form": "Schöpfungsformular",
@@ -49,7 +58,6 @@
"update_creation": "Schöpfung aktualisieren"
},
"creation_for_month": "Schöpfung für Monat",
- "date": "Datum",
"delete": "Löschen",
"deleted": "gelöscht",
"deleted_user": "Alle gelöschten Nutzer",
@@ -87,23 +95,19 @@
"lastname": "Nachname",
"math": {
"equals": "=",
- "exclaim": "!",
"pipe": "|",
"plus": "+"
},
"message": {
"request": "Die Anfrage wurde gesendet."
},
+ "mod": "Mod",
"moderator": "Moderator",
- "multiple_creation_text": "Bitte wähle ein oder mehrere Mitglieder aus für die du Schöpfen möchtest.",
"name": "Name",
"navbar": {
"automaticContributions": "Automatische Beiträge",
"logout": "Abmelden",
- "multi_creation": "Mehrfachschöpfung",
"my-account": "Mein Konto",
- "open_creation": "Offene Schöpfungen",
- "overview": "Übersicht",
"statistic": "Statistik",
"user_search": "Nutzersuche"
},
@@ -132,9 +136,7 @@
}
},
"redeemed": "eingelöst",
- "remove": "Entfernen",
"removeNotSelf": "Als Admin/Moderator kannst du dich nicht selber löschen.",
- "remove_all": "alle Nutzer entfernen",
"save": "Speichern",
"statistic": {
"activeUsers": "Aktive Mitglieder",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index f9598d006..e318376b4 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -1,6 +1,7 @@
{
"all_emails": "All users",
"back": "back",
+ "chat": "Chat",
"contributionLink": {
"amount": "Amount",
"changeSaved": "Changes saved",
@@ -29,10 +30,18 @@
"validFrom": "Start-date",
"validTo": "End-Date"
},
+ "contributions": {
+ "all": "All",
+ "confirms": "Confirmed",
+ "deleted": "Deleted",
+ "denied": "Denied",
+ "open": "Open"
+ },
+ "created": "Confirmed",
+ "createdAt": "Created",
"creation": "Creation",
"creationList": "Creation list",
"creation_form": {
- "creation_failed": "Could not create pending creation for {email}",
"creation_for": "Active Basic Income for",
"enter_text": "Enter text",
"form": "Creation form",
@@ -49,7 +58,6 @@
"update_creation": "Creation update"
},
"creation_for_month": "Creation for month",
- "date": "Date",
"delete": "Delete",
"deleted": "deleted",
"deleted_user": "All deleted user",
@@ -87,23 +95,19 @@
"lastname": "Lastname",
"math": {
"equals": "=",
- "exclaim": "!",
"pipe": "|",
"plus": "+"
},
"message": {
"request": "Request has been sent."
},
+ "mod": "Mod",
"moderator": "Moderator",
- "multiple_creation_text": "Please select one or more members for which you would like to perform creations.",
"name": "Name",
"navbar": {
"automaticContributions": "Automatic Contributions",
"logout": "Logout",
- "multi_creation": "Multiple creation",
"my-account": "My Account",
- "open_creation": "Open creations",
- "overview": "Overview",
"statistic": "Statistic",
"user_search": "User search"
},
@@ -132,9 +136,7 @@
}
},
"redeemed": "redeemed",
- "remove": "Remove",
"removeNotSelf": "As an admin/moderator, you cannot delete yourself.",
- "remove_all": "Remove all users",
"save": "Speichern",
"statistic": {
"activeUsers": "Active members",
diff --git a/admin/src/locales/index.test.js b/admin/src/locales/index.test.js
new file mode 100644
index 000000000..1abcadbec
--- /dev/null
+++ b/admin/src/locales/index.test.js
@@ -0,0 +1,18 @@
+import locales from './index.js'
+
+describe('locales', () => {
+ it('should contain 2 locales', () => {
+ expect(locales).toHaveLength(2)
+ })
+
+ it('should contain a German locale', () => {
+ expect(locales).toContainEqual(
+ expect.objectContaining({
+ name: 'Deutsch',
+ code: 'de',
+ iso: 'de-DE',
+ enabled: true,
+ }),
+ )
+ })
+})
diff --git a/admin/src/pages/ContributionLinks.spec.js b/admin/src/pages/ContributionLinks.spec.js
index fb60a99cf..0b79d8671 100644
--- a/admin/src/pages/ContributionLinks.spec.js
+++ b/admin/src/pages/ContributionLinks.spec.js
@@ -1,10 +1,11 @@
import { mount } from '@vue/test-utils'
import ContributionLinks from './ContributionLinks.vue'
import { listContributionLinks } from '@/graphql/listContributionLinks.js'
+import { toastErrorSpy } from '../../test/testSetup'
const localVue = global.localVue
-const apolloQueryMock = jest.fn().mockResolvedValueOnce({
+const apolloQueryMock = jest.fn().mockResolvedValue({
data: {
listContributionLinks: {
links: [
@@ -47,12 +48,31 @@ describe('ContributionLinks', () => {
wrapper = Wrapper()
})
- it('calls listContributionLinks', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- query: listContributionLinks,
- }),
- )
+ describe('apollo returns', () => {
+ it('calls listContributionLinks', () => {
+ expect(apolloQueryMock).toBeCalledWith(
+ expect.objectContaining({
+ query: listContributionLinks,
+ }),
+ )
+ })
+ })
+
+ describe('query transaction with error', () => {
+ beforeEach(() => {
+ apolloQueryMock.mockRejectedValue({ message: 'OUCH!' })
+ wrapper = Wrapper()
+ })
+
+ it('calls the API', () => {
+ expect(apolloQueryMock).toBeCalled()
+ })
+
+ it('toast error', () => {
+ expect(toastErrorSpy).toBeCalledWith(
+ 'listContributionLinks has no result, use default data',
+ )
+ })
})
})
})
diff --git a/admin/src/pages/Creation.spec.js b/admin/src/pages/Creation.spec.js
deleted file mode 100644
index 9524fc5d6..000000000
--- a/admin/src/pages/Creation.spec.js
+++ /dev/null
@@ -1,337 +0,0 @@
-import { mount } from '@vue/test-utils'
-import Creation from './Creation.vue'
-import { toastErrorSpy } from '../../test/testSetup'
-
-const localVue = global.localVue
-
-const apolloQueryMock = jest.fn().mockResolvedValue({
- data: {
- searchUsers: {
- userCount: 2,
- userList: [
- {
- userId: 1,
- firstName: 'Bibi',
- lastName: 'Bloxberg',
- email: 'bibi@bloxberg.de',
- creation: [200, 400, 600],
- emailChecked: true,
- },
- {
- userId: 2,
- firstName: 'Benjamin',
- lastName: 'Blümchen',
- email: 'benjamin@bluemchen.de',
- creation: [800, 600, 400],
- emailChecked: true,
- },
- ],
- },
- },
-})
-
-const storeCommitMock = jest.fn()
-
-const mocks = {
- $t: jest.fn((t, options) => (options ? [t, options] : t)),
- $d: jest.fn((d) => d),
- $apollo: {
- query: apolloQueryMock,
- },
- $store: {
- commit: storeCommitMock,
- state: {
- userSelectedInMassCreation: [],
- },
- },
-}
-
-describe('Creation', () => {
- let wrapper
-
- const Wrapper = () => {
- return mount(Creation, { localVue, mocks })
- }
-
- describe('mount', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- wrapper = Wrapper()
- })
-
- it('has a DIV element with the class.creation', () => {
- expect(wrapper.find('div.creation').exists()).toBeTruthy()
- })
-
- describe('apollo returns user array', () => {
- it('calls the searchUser query', () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- searchText: '',
- currentPage: 1,
- pageSize: 25,
- filters: {
- byActivated: true,
- byDeleted: false,
- },
- },
- }),
- )
- })
-
- it('has two rows in the left table', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr')).toHaveLength(2)
- })
-
- it('has nwo rows in the right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr')).toHaveLength(0)
- })
-
- it('has correct data in first row ', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain('Bibi')
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- 'Bloxberg',
- )
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- '200 | 400 | 600',
- )
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- 'bibi@bloxberg.de',
- )
- })
-
- it('has correct data in second row ', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(1).text()).toContain(
- 'Benjamin',
- )
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(1).text()).toContain(
- 'Blümchen',
- )
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(1).text()).toContain(
- '800 | 600 | 400',
- )
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(1).text()).toContain(
- 'benjamin@bluemchen.de',
- )
- })
- })
-
- describe('push item', () => {
- beforeEach(() => {
- wrapper.findAll('table').at(0).findAll('tbody > tr').at(1).find('button').trigger('click')
- })
-
- it('has one item in left table', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr')).toHaveLength(1)
- })
-
- it('has one item in right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr')).toHaveLength(1)
- })
-
- it('has the correct user in left table', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- 'bibi@bloxberg.de',
- )
- })
-
- it('has the correct user in right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr').at(0).text()).toContain(
- 'benjamin@bluemchen.de',
- )
- })
-
- it('updates userSelectedInMassCreation in store', () => {
- expect(storeCommitMock).toBeCalledWith('setUserSelectedInMassCreation', [
- {
- userId: 2,
- firstName: 'Benjamin',
- lastName: 'Blümchen',
- email: 'benjamin@bluemchen.de',
- creation: [800, 600, 400],
- showDetails: false,
- emailChecked: true,
- },
- ])
- })
-
- describe('remove item', () => {
- beforeEach(async () => {
- await wrapper
- .findAll('table')
- .at(1)
- .findAll('tbody > tr')
- .at(0)
- .find('button')
- .trigger('click')
- })
-
- it('has two items in left table', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr')).toHaveLength(2)
- })
-
- it('has the removed user in first row', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr').at(0).text()).toContain(
- 'benjamin@bluemchen.de',
- )
- })
-
- it('has no items in right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr')).toHaveLength(0)
- })
-
- it('commits empty array as userSelectedInMassCreation', () => {
- expect(storeCommitMock).toBeCalledWith('setUserSelectedInMassCreation', [])
- })
- })
-
- describe('remove all bookmarks', () => {
- beforeEach(async () => {
- jest.clearAllMocks()
- await wrapper.find('button.btn-light').trigger('click')
- })
-
- it('has no items in right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr')).toHaveLength(0)
- })
-
- it('commits empty array to userSelectedInMassCreation', () => {
- expect(storeCommitMock).toBeCalledWith('setUserSelectedInMassCreation', [])
- })
-
- it('calls searchUsers', () => {
- expect(apolloQueryMock).toBeCalled()
- })
- })
- })
-
- describe('store has items in userSelectedInMassCreation', () => {
- beforeEach(() => {
- mocks.$store.state.userSelectedInMassCreation = [
- {
- userId: 2,
- firstName: 'Benjamin',
- lastName: 'Blümchen',
- email: 'benjamin@bluemchen.de',
- creation: [800, 600, 400],
- showDetails: false,
- emailChecked: true,
- },
- ]
- wrapper = Wrapper()
- })
-
- it('has one item in left table', () => {
- expect(wrapper.findAll('table').at(0).findAll('tbody > tr')).toHaveLength(1)
- })
-
- it('has one item in right table', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr')).toHaveLength(1)
- })
-
- it('has the stored user in second row', () => {
- expect(wrapper.findAll('table').at(1).findAll('tbody > tr').at(0).text()).toContain(
- 'benjamin@bluemchen.de',
- )
- })
- })
-
- describe('failed creations', () => {
- beforeEach(async () => {
- await wrapper
- .findComponent({ name: 'CreationFormular' })
- .vm.$emit('toast-failed-creations', ['bibi@bloxberg.de', 'benjamin@bluemchen.de'])
- })
-
- it('toasts two error messages', () => {
- expect(toastErrorSpy).toBeCalledWith([
- 'creation_form.creation_failed',
- { email: 'bibi@bloxberg.de' },
- ])
- expect(toastErrorSpy).toBeCalledWith([
- 'creation_form.creation_failed',
- { email: 'benjamin@bluemchen.de' },
- ])
- })
- })
-
- describe('watchers', () => {
- beforeEach(() => {
- jest.clearAllMocks()
- })
-
- describe('search criteria', () => {
- beforeEach(async () => {
- await wrapper.setData({ criteria: 'XX' })
- })
-
- it('calls API when criteria changes', async () => {
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- searchText: 'XX',
- currentPage: 1,
- pageSize: 25,
- filters: {
- byActivated: true,
- byDeleted: false,
- },
- },
- }),
- )
- })
-
- describe('reset search criteria', () => {
- it('calls the API', async () => {
- jest.clearAllMocks()
- await wrapper.find('.test-click-clear-criteria').trigger('click')
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- searchText: '',
- currentPage: 1,
- pageSize: 25,
- filters: {
- byActivated: true,
- byDeleted: false,
- },
- },
- }),
- )
- })
- })
- })
-
- it('calls API when currentPage changes', async () => {
- await wrapper.setData({ currentPage: 2 })
- expect(apolloQueryMock).toBeCalledWith(
- expect.objectContaining({
- variables: {
- searchText: '',
- currentPage: 2,
- pageSize: 25,
- filters: {
- byActivated: true,
- byDeleted: false,
- },
- },
- }),
- )
- })
- })
-
- describe('apollo returns error', () => {
- beforeEach(() => {
- apolloQueryMock.mockRejectedValue({
- message: 'Ouch',
- })
- wrapper = Wrapper()
- })
-
- it('toasts an error message', () => {
- expect(toastErrorSpy).toBeCalledWith('Ouch')
- })
- })
- })
-})
diff --git a/admin/src/pages/Creation.vue b/admin/src/pages/Creation.vue
deleted file mode 100644
index 26d44fd3e..000000000
--- a/admin/src/pages/Creation.vue
+++ /dev/null
@@ -1,200 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/admin/src/pages/CreationConfirm.spec.js b/admin/src/pages/CreationConfirm.spec.js
index d47233ded..e2d52ccf7 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.vue'
import { adminDeleteContribution } from '../graphql/adminDeleteContribution'
import { denyContribution } from '../graphql/denyContribution'
-import { listUnconfirmedContributions } from '../graphql/listUnconfirmedContributions'
+import { listAllContributions } from '../graphql/listAllContributions'
import { confirmContribution } from '../graphql/confirmContribution'
import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
import VueApollo from 'vue-apollo'
@@ -38,50 +38,68 @@ const mocks = {
const defaultData = () => {
return {
- listUnconfirmedContributions: [
- {
- id: 1,
- firstName: 'Bibi',
- lastName: 'Bloxberg',
- userId: 99,
- email: 'bibi@bloxberg.de',
- amount: 500,
- memo: 'Danke für alles',
- date: new Date(),
- moderator: 1,
- state: 'PENDING',
- creation: [500, 500, 500],
- messageCount: 0,
- },
- {
- id: 2,
- firstName: 'Räuber',
- lastName: 'Hotzenplotz',
- userId: 100,
- email: 'raeuber@hotzenplotz.de',
- amount: 1000000,
- memo: 'Gut Ergattert',
- date: new Date(),
- moderator: 1,
- state: 'PENDING',
- creation: [500, 500, 500],
- messageCount: 0,
- },
- ],
+ listAllContributions: {
+ contributionCount: 2,
+ contributionList: [
+ {
+ id: 1,
+ firstName: 'Bibi',
+ lastName: 'Bloxberg',
+ userId: 99,
+ email: 'bibi@bloxberg.de',
+ amount: 500,
+ memo: 'Danke für alles',
+ date: new Date(),
+ moderator: 1,
+ state: 'PENDING',
+ creation: [500, 500, 500],
+ messagesCount: 0,
+ deniedBy: null,
+ deniedAt: null,
+ confirmedBy: null,
+ confirmedAt: null,
+ contributionDate: new Date(),
+ deletedBy: null,
+ deletedAt: null,
+ createdAt: new Date(),
+ },
+ {
+ id: 2,
+ firstName: 'Räuber',
+ lastName: 'Hotzenplotz',
+ userId: 100,
+ email: 'raeuber@hotzenplotz.de',
+ amount: 1000000,
+ memo: 'Gut Ergattert',
+ date: new Date(),
+ moderator: 1,
+ state: 'PENDING',
+ creation: [500, 500, 500],
+ messagesCount: 0,
+ deniedBy: null,
+ deniedAt: null,
+ confirmedBy: null,
+ confirmedAt: null,
+ contributionDate: new Date(),
+ deletedBy: null,
+ deletedAt: null,
+ createdAt: new Date(),
+ },
+ ],
+ },
}
}
describe('CreationConfirm', () => {
let wrapper
-
- const listUnconfirmedContributionsMock = jest.fn()
const adminDeleteContributionMock = jest.fn()
const adminDenyContributionMock = jest.fn()
const confirmContributionMock = jest.fn()
mockClient.setRequestHandler(
- listUnconfirmedContributions,
- listUnconfirmedContributionsMock
+ listAllContributions,
+ jest
+ .fn()
.mockRejectedValueOnce({ message: 'Ouch!' })
.mockResolvedValue({ data: defaultData() }),
)
@@ -117,6 +135,10 @@ describe('CreationConfirm', () => {
it('toast an error message', () => {
expect(toastErrorSpy).toBeCalledWith('Ouch!')
})
+
+ it('has statusFilter ["IN_PROGRESS", "PENDING"]', () => {
+ expect(wrapper.vm.statusFilter).toEqual(['IN_PROGRESS', 'PENDING'])
+ })
})
describe('server response is succes', () => {
@@ -125,17 +147,7 @@ describe('CreationConfirm', () => {
})
it('has two pending creations', () => {
- expect(wrapper.vm.pendingCreations).toHaveLength(2)
- })
- })
-
- describe('store', () => {
- it('commits resetOpenCreations to store', () => {
- expect(storeCommitMock).toBeCalledWith('resetOpenCreations')
- })
-
- it('commits setOpenCreations to store', () => {
- expect(storeCommitMock).toBeCalledWith('setOpenCreations', 2)
+ expect(wrapper.find('tbody').findAll('tr')).toHaveLength(2)
})
})
@@ -259,7 +271,7 @@ describe('CreationConfirm', () => {
describe('deny creation', () => {
beforeEach(async () => {
- await wrapper.findAll('tr').at(1).findAll('button').at(2).trigger('click')
+ await wrapper.findAll('tr').at(1).findAll('button').at(1).trigger('click')
})
it('opens the overlay', () => {
@@ -316,5 +328,94 @@ describe('CreationConfirm', () => {
})
})
})
+
+ describe('filter tabs', () => {
+ describe('click tab "confirmed"', () => {
+ let refetchSpy
+
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
+ await wrapper.find('a[data-test="confirmed"]').trigger('click')
+ })
+
+ it('has statusFilter set to ["CONFIRMED"]', () => {
+ expect(
+ wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
+ ).toMatchObject({ statusFilter: ['CONFIRMED'] })
+ })
+
+ it('refetches contributions', () => {
+ expect(refetchSpy).toBeCalled()
+ })
+
+ describe('click tab "open"', () => {
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
+ await wrapper.find('a[data-test="open"]').trigger('click')
+ })
+
+ it('has statusFilter set to ["IN_PROGRESS", "PENDING"]', () => {
+ expect(
+ wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
+ ).toMatchObject({ statusFilter: ['IN_PROGRESS', 'PENDING'] })
+ })
+
+ it('refetches contributions', () => {
+ expect(refetchSpy).toBeCalled()
+ })
+ })
+
+ describe('click tab "denied"', () => {
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
+ await wrapper.find('a[data-test="denied"]').trigger('click')
+ })
+
+ it('has statusFilter set to ["DENIED"]', () => {
+ expect(
+ wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
+ ).toMatchObject({ statusFilter: ['DENIED'] })
+ })
+
+ it('refetches contributions', () => {
+ expect(refetchSpy).toBeCalled()
+ })
+ })
+
+ describe('click tab "all"', () => {
+ beforeEach(async () => {
+ jest.clearAllMocks()
+ refetchSpy = jest.spyOn(wrapper.vm.$apollo.queries.ListAllContributions, 'refetch')
+ await wrapper.find('a[data-test="all"]').trigger('click')
+ })
+
+ it('has statusFilter set to ["IN_PROGRESS", "PENDING", "CONFIRMED", "DENIED", "DELETED"]', () => {
+ expect(
+ wrapper.vm.$apollo.queries.ListAllContributions.observer.options.variables,
+ ).toMatchObject({
+ statusFilter: ['IN_PROGRESS', 'PENDING', 'CONFIRMED', 'DENIED', 'DELETED'],
+ })
+ })
+
+ it('refetches contributions', () => {
+ expect(refetchSpy).toBeCalled()
+ })
+ })
+ })
+ })
+
+ describe('update status', () => {
+ beforeEach(async () => {
+ await wrapper.findComponent({ name: 'OpenCreationsTable' }).vm.$emit('update-state', 2)
+ })
+
+ it.skip('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')
+ })
+ })
})
})
diff --git a/admin/src/pages/CreationConfirm.vue b/admin/src/pages/CreationConfirm.vue
index e87dfc247..251971d05 100644
--- a/admin/src/pages/CreationConfirm.vue
+++ b/admin/src/pages/CreationConfirm.vue
@@ -1,6 +1,50 @@
-
-
-
-
-
-
- {{ $t('multiple_creation_text') }}
-
-
+
@@ -24,24 +68,24 @@
-
diff --git a/admin/src/router/router.test.js b/admin/src/router/router.test.js
index fdc4b0b83..ad1ad1245 100644
--- a/admin/src/router/router.test.js
+++ b/admin/src/router/router.test.js
@@ -45,7 +45,7 @@ describe('router', () => {
describe('routes', () => {
it('has nine routes defined', () => {
- expect(routes).toHaveLength(9)
+ expect(routes).toHaveLength(8)
})
it('has "/overview" as default', async () => {
@@ -67,13 +67,6 @@ describe('router', () => {
})
})
- describe('creation', () => {
- it('loads the "Creation" component', async () => {
- const component = await routes.find((r) => r.path === '/creation').component()
- expect(component.default.name).toBe('Creation')
- })
- })
-
describe('creation-confirm', () => {
it('loads the "CreationConfirm" component', async () => {
const component = await routes.find((r) => r.path === '/creation-confirm').component()
diff --git a/admin/src/router/routes.js b/admin/src/router/routes.js
index e365a6e40..b01466cfc 100644
--- a/admin/src/router/routes.js
+++ b/admin/src/router/routes.js
@@ -19,10 +19,6 @@ const routes = [
path: '/user',
component: () => import('@/pages/UserSearch.vue'),
},
- {
- path: '/creation',
- component: () => import('@/pages/Creation.vue'),
- },
{
path: '/creation-confirm',
component: () => import('@/pages/CreationConfirm.vue'),
diff --git a/backend/.env.dist b/backend/.env.dist
index ba5b89fa9..b6216f8e9 100644
--- a/backend/.env.dist
+++ b/backend/.env.dist
@@ -1,5 +1,3 @@
-CONFIG_VERSION=v14.2022-12-22
-
# Server
PORT=4000
JWT_SECRET=secret123
@@ -55,16 +53,9 @@ EMAIL_CODE_REQUEST_TIME=10
# Webhook
WEBHOOK_ELOPAGE_SECRET=secret
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=false
-
# SET LOG LEVEL AS NEEDED IN YOUR .ENV
# POSSIBLE VALUES: all | trace | debug | info | warn | error | fatal
# LOG_LEVEL=info
# Federation
-# if you set the value of FEDERATION_DHT_TOPIC, the DHT hyperswarm will start to announce and listen
-# on an hash created from this topic
-# FEDERATION_DHT_TOPIC=GRADIDO_HUB
-# FEDERATION_DHT_SEED=64ebcb0e3ad547848fef4197c6e2332f
-# FEDERATION_COMMUNITY_URL=http://localhost:4000/api
+FEDERATION_VALIDATE_COMMUNITY_TIMER=60000
\ No newline at end of file
diff --git a/backend/.env.template b/backend/.env.template
index f73b87353..6c32b728d 100644
--- a/backend/.env.template
+++ b/backend/.env.template
@@ -54,10 +54,5 @@ EMAIL_CODE_REQUEST_TIME=$EMAIL_CODE_REQUEST_TIME
# Webhook
WEBHOOK_ELOPAGE_SECRET=$WEBHOOK_ELOPAGE_SECRET
-# EventProtocol
-EVENT_PROTOCOL_DISABLED=$EVENT_PROTOCOL_DISABLED
-
# Federation
-FEDERATION_DHT_TOPIC=$FEDERATION_DHT_TOPIC
-FEDERATION_DHT_SEED=$FEDERATION_DHT_SEED
-FEDERATION_COMMUNITY_URL=$FEDERATION_COMMUNITY_URL
+FEDERATION_VALIDATE_COMMUNITY_TIMER=$FEDERATION_VALIDATE_COMMUNITY_TIMER
diff --git a/backend/.env.test_e2e b/backend/.env.test_e2e
new file mode 100644
index 000000000..a5cdc4bfd
--- /dev/null
+++ b/backend/.env.test_e2e
@@ -0,0 +1,9 @@
+# Server
+JWT_EXPIRES_IN=1m
+
+# Email
+EMAIL=true
+EMAIL_TEST_MODUS=false
+EMAIL_TLS=false
+# for testing password reset
+EMAIL_CODE_REQUEST_TIME=1
diff --git a/backend/package.json b/backend/package.json
index bfcd61d5b..ec9e63a7a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
{
"name": "gradido-backend",
- "version": "1.17.1",
+ "version": "1.18.2",
"description": "Gradido unified backend providing an API-Service for Gradido Transactions",
"main": "src/index.ts",
"repository": "https://github.com/gradido/gradido/backend",
@@ -15,10 +15,10 @@
"lint": "eslint --max-warnings=0 --ext .js,.ts .",
"test": "cross-env TZ=UTC NODE_ENV=development jest --runInBand --coverage --forceExit --detectOpenHandles",
"seed": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/seeds/index.ts",
- "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts"
+ "klicktipp": "cross-env TZ=UTC NODE_ENV=development ts-node -r tsconfig-paths/register src/util/klicktipp.ts",
+ "locales": "scripts/sort.sh"
},
"dependencies": {
- "@hyperswarm/dht": "^6.2.0",
"apollo-server-express": "^2.25.2",
"await-semaphore": "^0.1.3",
"axios": "^0.21.1",
@@ -30,6 +30,7 @@
"email-templates": "^10.0.1",
"express": "^4.17.1",
"graphql": "^15.5.1",
+ "graphql-request": "5.0.0",
"i18n": "^0.15.1",
"jsonwebtoken": "^8.5.1",
"lodash.clonedeep": "^4.5.0",
@@ -72,5 +73,10 @@
"ts-node": "^10.0.0",
"tsconfig-paths": "^3.14.0",
"typescript": "^4.3.4"
+ },
+ "nodemonConfig": {
+ "ignore": [
+ "**/*.test.ts"
+ ]
}
}
diff --git a/backend/scripts/sort.sh b/backend/scripts/sort.sh
new file mode 100755
index 000000000..e5c5c41c6
--- /dev/null
+++ b/backend/scripts/sort.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+ROOT_DIR=$(dirname "$0")/..
+
+tmp=$(mktemp)
+exit_code=0
+
+for locale_file in $ROOT_DIR/src/locales/*.json
+do
+ jq -f $(dirname "$0")/sort_filter.jq $locale_file > "$tmp"
+ if [ "$*" == "--fix" ]
+ then
+ mv "$tmp" $locale_file
+ else
+ if diff -q "$tmp" $locale_file > /dev/null ;
+ then
+ : # all good
+ else
+ exit_code=$?
+ echo "$(basename -- $locale_file) is not sorted by keys"
+ fi
+ fi
+done
+
+exit $exit_code
diff --git a/backend/scripts/sort_filter.jq b/backend/scripts/sort_filter.jq
new file mode 100644
index 000000000..9d108f8f0
--- /dev/null
+++ b/backend/scripts/sort_filter.jq
@@ -0,0 +1,13 @@
+def walk(f):
+ . as $in
+ | if type == "object" then
+ reduce keys_unsorted[] as $key
+ ( {}; . + { ($key): ($in[$key] | walk(f)) } ) | f
+ elif type == "array" then map( walk(f) ) | f
+ else f
+ end;
+
+def keys_sort_by(f):
+ to_entries | sort_by(.key|f ) | from_entries;
+
+walk(if type == "object" then keys_sort_by(ascii_upcase) else . end)
\ No newline at end of file
diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts
index 3b8d0d1d6..27b51b47d 100644
--- a/backend/src/config/index.ts
+++ b/backend/src/config/index.ts
@@ -17,7 +17,7 @@ const constants = {
LOG_LEVEL: process.env.LOG_LEVEL || 'info',
CONFIG_VERSION: {
DEFAULT: 'DEFAULT',
- EXPECTED: 'v14.2022-12-22',
+ EXPECTED: 'v15.2023-02-07',
CURRENT: '',
},
}
@@ -99,11 +99,6 @@ const webhook = {
WEBHOOK_ELOPAGE_SECRET: process.env.WEBHOOK_ELOPAGE_SECRET || 'secret',
}
-const eventProtocol = {
- // global switch to enable writing of EventProtocol-Entries
- EVENT_PROTOCOL_DISABLED: process.env.EVENT_PROTOCOL_DISABLED === 'true' || false,
-}
-
// This is needed by graphql-directive-auth
process.env.APP_SECRET = server.JWT_SECRET
@@ -120,14 +115,8 @@ if (
}
const federation = {
- FEDERATION_DHT_TOPIC: process.env.FEDERATION_DHT_TOPIC || null,
- FEDERATION_DHT_SEED: process.env.FEDERATION_DHT_SEED || null,
- FEDERATION_COMMUNITY_URL:
- process.env.FEDERATION_COMMUNITY_URL === undefined
- ? null
- : process.env.FEDERATION_COMMUNITY_URL.endsWith('/')
- ? process.env.FEDERATION_COMMUNITY_URL
- : process.env.FEDERATION_COMMUNITY_URL + '/',
+ FEDERATION_VALIDATE_COMMUNITY_TIMER:
+ Number(process.env.FEDERATION_VALIDATE_COMMUNITY_TIMER) || 60000,
}
const CONFIG = {
@@ -139,7 +128,6 @@ const CONFIG = {
...email,
...loginServer,
...webhook,
- ...eventProtocol,
...federation,
}
diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts
index ddbc387a1..7e499feb9 100644
--- a/backend/src/emails/sendEmailVariants.test.ts
+++ b/backend/src/emails/sendEmailVariants.test.ts
@@ -10,6 +10,7 @@ import {
sendAccountMultiRegistrationEmail,
sendContributionConfirmedEmail,
sendContributionDeniedEmail,
+ sendContributionDeletedEmail,
sendResetPasswordEmail,
sendTransactionLinkRedeemedEmail,
sendTransactionReceivedEmail,
@@ -438,6 +439,84 @@ describe('sendEmailVariants', () => {
})
})
+ describe('sendContributionDeletedEmail', () => {
+ beforeAll(async () => {
+ result = await sendContributionDeletedEmail({
+ firstName: 'Peter',
+ lastName: 'Lustig',
+ email: 'peter@lustig.de',
+ language: 'en',
+ senderFirstName: 'Bibi',
+ senderLastName: 'Bloxberg',
+ contributionMemo: 'My contribution.',
+ })
+ })
+
+ describe('calls "sendEmailTranslated"', () => {
+ it('with expected parameters', () => {
+ expect(sendEmailTranslated).toBeCalledWith({
+ receiver: {
+ to: 'Peter Lustig
+
+
+
+ {{ $t('contributions.open') }}
+
+ {{ $store.state.openCreations }}
+
+
+
+
+
+ your Gradido team') + expect(result.originalMessage.html).toContain('—————') + expect(result.originalMessage.html).toContain( + '
Gradido-Akademie
Institut für Wirtschaftsbionik
Pfarrweg 2
74653 Künzelsau
Deutschland
support@supportmail.com
http://localhost/', + ) + }) + }) + }) + describe('sendResetPasswordEmail', () => { beforeAll(async () => { result = await sendResetPasswordEmail({ diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index 681ee56af..4e3881829 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -103,6 +103,32 @@ export const sendContributionConfirmedEmail = (data: { }) } +export const sendContributionDeletedEmail = (data: { + firstName: string + lastName: string + email: string + language: string + senderFirstName: string + senderLastName: string + contributionMemo: string +}): Promise
+
{{ noOpenCreation }}
@@ -118,8 +115,8 @@ export default {
}
},
methods: {
- updateAmount(amount) {
- this.form.amount = (amount * 20).toFixed(2).toString()
+ updateAmount(hours) {
+ this.form.amount = (hours * 20).toFixed(2).toString()
},
submit() {
this.$emit(this.form.id ? 'update-contribution' : 'set-contribution', { ...this.form })
@@ -135,6 +132,15 @@ export default {
},
},
computed: {
+ showMessage() {
+ if (this.maxGddThisMonth <= 0 && this.maxGddLastMonth <= 0) return true
+ if (this.form.date)
+ return (
+ (this.isThisMonth && this.maxGddThisMonth <= 0) ||
+ (!this.isThisMonth && this.maxGddLastMonth <= 0)
+ )
+ return false
+ },
disabled() {
return (
this.form.date === '' ||
diff --git a/frontend/src/components/Contributions/ContributionList.spec.js b/frontend/src/components/Contributions/ContributionList.spec.js
index a1dfc934d..de875cf74 100644
--- a/frontend/src/components/Contributions/ContributionList.spec.js
+++ b/frontend/src/components/Contributions/ContributionList.spec.js
@@ -116,5 +116,15 @@ describe('ContributionList', () => {
expect(wrapper.emitted('delete-contribution')).toEqual([[{ id: 2 }]])
})
})
+
+ describe('update status', () => {
+ beforeEach(() => {
+ wrapper.findComponent({ name: 'ContributionListItem' }).vm.$emit('update-state', { id: 2 })
+ })
+
+ it('emits update status', () => {
+ expect(wrapper.emitted('update-state')).toEqual([[{ id: 2 }]])
+ })
+ })
})
})
diff --git a/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue b/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue
index c0f34e24d..037b4f376 100644
--- a/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue
+++ b/frontend/src/components/DecayInformations/DecayInformation-BeforeStartblock.vue
@@ -1,5 +1,9 @@