fix edit contribution formular, remove unused methods

admin/src/components/EditCreationFormular.spec.js

@@ -1,19 +1,18 @@
 import { mount } from '@vue/test-utils'
 import EditCreationFormular from './EditCreationFormular'
 import { toastErrorSpy, toastSuccessSpy } from '../../test/testSetup'
+import VueApollo from 'vue-apollo'
+import { createMockClient } from 'mock-apollo-client'
+import { adminOpenCreations } from '../graphql/adminOpenCreations'
+import { adminUpdateContribution } from '../graphql/adminUpdateContribution'
+
+const mockClient = createMockClient()
+const apolloProvider = new VueApollo({
+  defaultClient: mockClient,
+})
 
 const localVue = global.localVue
-
+localVue.use(VueApollo)
-const apolloMutateMock = jest.fn().mockResolvedValue({
-  data: {
-    adminUpdateContribution: {
-      creation: [0, 0, 0],
-      amount: 500,
-      date: new Date(),
-      memo: 'Test Schöpfung 2',
-    },
-  },
-})
 
 const stateCommitMock = jest.fn()
 
@@ -23,22 +22,18 @@ const mocks = {
     const date = new Date(d)
     return date.toISOString().split('T')[0]
   }),
-  $apollo: {
-    mutate: apolloMutateMock,
-  },
   $store: {
     commit: stateCommitMock,
   },
 }
 
-const now = new Date(Date.now())
+const now = new Date()
 const getCreationDate = (sub) => {
   const date = sub === 0 ? now : new Date(now.getFullYear(), now.getMonth() - sub, 1, 0)
   return date.toISOString().split('T')[0]
 }
 
 const propsData = {
-  creation: [200, 400, 600],
   creationUserData: {
     memo: 'Test schöpfung 1',
     amount: 100,
@@ -46,20 +41,65 @@ const propsData = {
   },
   item: {
     id: 0,
-    email: 'bob@baumeister.de',
+    amount: '300',
+    contributionDate: `${now.getFullYear()}-${now.getMonth() + 1}-${now.getDate()}`,
   },
 }
 
+const data = () => {
+  return { creation: ['1000', '1000', '400'] }
+}
+
 describe('EditCreationFormular', () => {
   let wrapper
 
+  const adminUpdateContributionMock = jest.fn()
+  const adminOpenCreationsMock = jest.fn()
+  mockClient.setRequestHandler(
+    adminOpenCreations,
+    adminOpenCreationsMock.mockResolvedValue({
+      data: {
+        adminOpenCreations: [
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 2).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 2).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: new Date(now.getFullYear(), now.getMonth() - 1).getMonth(),
+            year: new Date(now.getFullYear(), now.getMonth() - 1).getFullYear(),
+            amount: '1000',
+          },
+          {
+            month: now.getMonth(),
+            year: now.getFullYear(),
+            amount: '400',
+          },
+        ],
+      },
+    }),
+  )
+  mockClient.setRequestHandler(
+    adminUpdateContribution,
+    adminUpdateContributionMock.mockResolvedValue({
+      data: {
+        adminUpdateContribution: {
+          amount: '600',
+          date: new Date(),
+          memo: 'This is my memo',
+        },
+      },
+    }),
+  )
+
   const Wrapper = () => {
-    return mount(EditCreationFormular, { localVue, mocks, propsData })
+    return mount(EditCreationFormular, { localVue, mocks, propsData, data, apolloProvider })
   }
 
   describe('mount', () => {
-    beforeEach(() => {
+    beforeEach(async () => {
       wrapper = Wrapper()
+      await wrapper.vm.$nextTick()
     })
 
     it('has a DIV element with the class.component-edit-creation-formular', () => {
@@ -89,42 +129,16 @@ describe('EditCreationFormular', () => {
         })
 
         it('calls the API', () => {
-          expect(apolloMutateMock).toBeCalledWith(
+          expect(adminUpdateContributionMock).toBeCalledWith({
-            expect.objectContaining({
-              variables: {
             id: 0,
-                email: 'bob@baumeister.de',
             creationDate: getCreationDate(0),
             amount: 500,
             memo: 'Test Schöpfung 2',
-              },
-            }),
-          )
           })
-
-        it('emits update-user-data', () => {
-          expect(wrapper.emitted('update-user-data')).toEqual([
-            [
-              {
-                id: 0,
-                email: 'bob@baumeister.de',
-              },
-              [0, 0, 0],
-            ],
-          ])
         })
 
         it('emits update-creation-data', () => {
-          expect(wrapper.emitted('update-creation-data')).toEqual([
+          expect(wrapper.emitted('update-creation-data')).toBeTruthy()
-            [
-              {
-                amount: 500,
-                date: expect.any(Date),
-                memo: 'Test Schöpfung 2',
-                row: expect.any(Object),
-              },
-            ],
-          ])
         })
 
         it('toasts a success message', () => {
@@ -134,7 +148,7 @@ describe('EditCreationFormular', () => {
 
       describe('change and save memo and value with error', () => {
         beforeEach(async () => {
-          apolloMutateMock.mockRejectedValue({ message: 'Oh no!' })
+          adminUpdateContributionMock.mockRejectedValue({ message: 'Oh no!' })
           await wrapper.find('input[type="number"]').setValue(500)
           await wrapper.find('textarea').setValue('Test Schöpfung 2')
           await wrapper.find('.test-submit').trigger('click')

admin/src/components/EditCreationFormular.vue

@@ -108,6 +108,7 @@ export default {
   },
   methods: {
     submitCreation() {
+      // console.log('submitCreation', this.selected)
       this.$apollo
         .mutate({
           mutation: adminUpdateContribution,
@@ -119,12 +120,7 @@ export default {
           },
         })
         .then((result) => {
-          this.$emit('update-creation-data', {
+          this.$emit('update-creation-data')
-            amount: Number(result.data.adminUpdateContribution.amount),
-            date: result.data.adminUpdateContribution.date,
-            memo: result.data.adminUpdateContribution.memo,
-            row: this.row,
-          })
           this.toastSuccess(
             this.$t('creation_form.toasted_update', {
               value: this.value,
@@ -151,7 +147,9 @@ export default {
   computed: {
     creationIndex() {
       const month = this.$d(new Date(this.item.contributionDate), 'month')
-      return this.radioOptions.findIndex((obj) => obj.item.short === month)
+      return this.radioOptions.findIndex((obj) => {
+        return obj.item.short === month
+      })
     },
     selectedComputed() {
       return this.radioOptions[this.creationIndex].item

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

@@ -17,7 +17,7 @@ const propsData = {
       amount: 300,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [700, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -29,7 +29,7 @@ const propsData = {
       amount: 210,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: null,
+      moderatorId: null,
       creation: [790, 1000, 1000],
       __typename: 'PendingCreation',
     },
@@ -41,7 +41,7 @@ const propsData = {
       amount: 330,
       memo: 'Aktives Grundeinkommen für Januar 2022',
       date: '2022-01-01T00:00:00.000Z',
-      moderator: 1,
+      moderatorId: 1,
       creation: [670, 1000, 1000],
       __typename: 'PendingCreation',
     },

admin/src/components/Tables/OpenCreationsTable.vue

@@ -96,7 +96,7 @@
                 :item="row.item"
                 :row="row"
                 :creationUserData="creationUserData"
-                @update-creation-data="updateCreationData"
+                @update-creation-data="$emit('update-contributions')"
               />
             </div>
             <div v-else>
@@ -145,16 +145,6 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      creationUserData: {
-        amount: null,
-        date: null,
-        memo: null,
-        moderator: null,
-      },
-    }
-  },
   methods: {
     myself(item) {
       return (
@@ -173,16 +163,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)
     },

admin/src/graphql/adminUpdateContribution.js

@@ -6,7 +6,6 @@ export const adminUpdateContribution = gql`
       amount
       date
       memo
-      creation
     }
   }
 `