Merge branch 'adminEditPendingCreationQueries' into adminDeletePendingCreationQuery

admin/src/components/CreationFormular.spec.js

@@ -3,6 +3,16 @@ import CreationFormular from './CreationFormular.vue'
 
 const localVue = global.localVue
 
+const apolloMock = jest.fn().mockResolvedValue({
+  data: {
+    verifyLogin: {
+      name: 'success',
+      id: 0,
+    },
+  },
+})
+const stateCommitMock = jest.fn()
+
 const mocks = {
   $moment: jest.fn(() => {
     return {
@@ -14,6 +24,12 @@ const mocks = {
       }),
     }
   }),
+  $apollo: {
+    query: apolloMock,
+  },
+  $store: {
+    commit: stateCommitMock,
+  },
 }
 
 const propsData = {
@@ -39,6 +55,23 @@ describe('CreationFormular', () => {
       expect(wrapper.find('.component-creation-formular').exists()).toBeTruthy()
     })
 
+    describe('server sends back moderator data', () => {
+      it('called store commit with mocked data', () => {
+        expect(stateCommitMock).toBeCalledWith('moderator', { name: 'success', id: 0 })
+      })
+    })
+
+    describe('server throws error for moderator data call', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        apolloMock.mockRejectedValue({ message: 'Ouch!' })
+        wrapper = Wrapper()
+      })
+      it('has called store commit with fake data', () => {
+        expect(stateCommitMock).toBeCalledWith('moderator', { id: 0, name: 'Test Moderator' })
+      })
+    })
+
     describe('radio buttons to selcet month', () => {
       it('has three radio buttons', () => {
         expect(wrapper.findAll('input[type="radio"]').length).toBe(3)

admin/src/components/EditCreationFormular.spec.js

@@ -0,0 +1,143 @@
+import { mount } from '@vue/test-utils'
+import EditCreationFormular from './EditCreationFormular.vue'
+
+const localVue = global.localVue
+
+const apolloMock = jest.fn().mockResolvedValue({
+  data: {
+    verifyLogin: {
+      name: 'success',
+      id: 0,
+    },
+  },
+})
+const apolloMutateMock = jest.fn().mockResolvedValue({
+  data: {
+    updatePendingCreation: {
+      creation: [0, 0, 0],
+      date: new Date(),
+      memo: 'qwertzuiopasdfghjkl',
+      moderator: 0,
+    },
+  },
+})
+const stateCommitMock = jest.fn()
+
+const mocks = {
+  $moment: jest.fn(() => {
+    return {
+      format: jest.fn((m) => m),
+      subtract: jest.fn(() => {
+        return {
+          format: jest.fn((m) => m),
+        }
+      }),
+    }
+  }),
+  $apollo: {
+    query: apolloMock,
+    mutate: apolloMutateMock,
+  },
+  $store: {
+    commit: stateCommitMock,
+  },
+}
+
+const propsData = {
+  type: '',
+  item: {},
+  row: [],
+  creation: [],
+  itemsMassCreation: {},
+}
+
+describe('EditCreationFormular', () => {
+  let wrapper
+
+  const Wrapper = () => {
+    return mount(EditCreationFormular, { localVue, mocks, propsData })
+  }
+
+  describe('mount', () => {
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('has a DIV element with the class.component-edit-creation-formular', () => {
+      expect(wrapper.find('.component-edit-creation-formular').exists()).toBeTruthy()
+    })
+
+    describe('server sends back moderator data', () => {
+      it('called store commit with mocked data', () => {
+        expect(stateCommitMock).toBeCalledWith('moderator', { name: 'success', id: 0 })
+      })
+    })
+
+    describe('server throws error for moderator data call', () => {
+      beforeEach(() => {
+        jest.clearAllMocks()
+        apolloMock.mockRejectedValue({ message: 'Ouch!' })
+        wrapper = Wrapper()
+      })
+      it('has called store commit with fake data', () => {
+        expect(stateCommitMock).toBeCalledWith('moderator', { id: 0, name: 'Test Moderator' })
+      })
+    })
+
+    describe('radio buttons to selcet month', () => {
+      it('has three radio buttons', () => {
+        expect(wrapper.findAll('input[type="radio"]').length).toBe(3)
+      })
+
+      describe('with single creation', () => {
+        beforeEach(async () => {
+          jest.clearAllMocks()
+          await wrapper.setProps({ type: 'singleCreation', creation: [200, 400, 600] })
+          await wrapper.setData({ rangeMin: 180 })
+        })
+
+        describe('first radio button', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('input[type="radio"]').at(0).setChecked()
+          })
+
+          it('sets rangeMin to 0', () => {
+            expect(wrapper.vm.rangeMin).toBe(0)
+          })
+
+          it('sets rangeMax to 200', () => {
+            expect(wrapper.vm.rangeMax).toBe(200)
+          })
+        })
+
+        describe('second radio button', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('input[type="radio"]').at(1).setChecked()
+          })
+
+          it('sets rangeMin to 0', () => {
+            expect(wrapper.vm.rangeMin).toBe(0)
+          })
+
+          it('sets rangeMax to 400', () => {
+            expect(wrapper.vm.rangeMax).toBe(400)
+          })
+        })
+
+        describe('third radio button', () => {
+          beforeEach(async () => {
+            await wrapper.findAll('input[type="radio"]').at(2).setChecked()
+          })
+
+          it('sets rangeMin to 0', () => {
+            expect(wrapper.vm.rangeMin).toBe(0)
+          })
+
+          it('sets rangeMax to 400', () => {
+            expect(wrapper.vm.rangeMax).toBe(600)
+          })
+        })
+      })
+    })
+  })
+})

admin/src/components/EditCreationFormular.vue

@@ -120,8 +120,9 @@
 </template>
 <script>
 import { updatePendingCreation } from '../graphql/updatePendingCreation'
+import { verifyLogin } from '../graphql/verifyLogin'
 export default {
-  name: 'CreationFormular',
+  name: 'EditCreationFormular',
   props: {
     type: {
       type: String,
@@ -166,6 +167,7 @@ export default {
     },
   },
   created() {
+    this.searchModeratorData()
     if (this.pagetype === 'PageCreationConfirm' && this.creationUserData.date) {
       switch (this.$moment(this.creationUserData.date).format('MMMM')) {
         case this.currentMonth.short:
@@ -237,53 +239,59 @@ export default {
       if (this.text.length < 10) {
         return alert('Bitte gib einen Text ein der länger als 10 Zeichen ist!')
       }
-      if (this.type === 'singleCreation') {
+      this.submitObj = {
-        this.submitObj = {
+        id: this.item.id,
-          id: this.item.id,
+        email: this.item.email,
-          email: this.item.email,
+        creationDate: this.radioSelected.long,
-          creationDate: this.radioSelected.long,
+        amount: Number(this.value),
-          amount: Number(this.value),
+        memo: this.text,
-          memo: this.text,
+        moderator: Number(this.$store.state.moderator.id),
-          moderator: Number(this.$store.state.moderator.id),
-        }
-
-        if (this.pagetype === 'PageCreationConfirm') {
-          // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
-          this.$apollo
-            .mutate({
-              mutation: updatePendingCreation,
-              variables: this.submitObj,
-            })
-            .then((result) => {
-              this.$emit('update-user-data', this.item, result.data.updatePendingCreation.creation)
-              this.$emit('update-creation-data', {
-                amount: Number(result.data.updatePendingCreation.amount),
-                date: result.data.updatePendingCreation.date,
-                memo: result.data.updatePendingCreation.memo,
-                moderator: Number(result.data.updatePendingCreation.moderator),
-                row: this.row,
-              })
-              this.$toasted.success(
-                `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde geändert, liegt zur Bestätigung bereit`,
-              )
-              this.submitObj = null
-              this.createdIndex = null
-              // das creation Formular reseten
-              this.$refs.updateCreationForm.reset()
-              // Den geschöpften Wert auf o setzen
-              this.value = 0
-            })
-            .catch((error) => {
-              this.$toasted.error(error.message)
-              this.submitObj = null
-              // das creation Formular reseten
-              this.$refs.updateCreationForm.reset()
-              // Den geschöpften Wert auf o setzen
-              this.value = 0
-            })
-        }
       }
+
+      // hinweis das eine ein einzelne Schöpfung abgesendet wird an (email)
+      this.$apollo
+        .mutate({
+          mutation: updatePendingCreation,
+          variables: this.submitObj,
+        })
+        .then((result) => {
+          this.$emit('update-user-data', this.item, result.data.updatePendingCreation.creation)
+          this.$emit('update-creation-data', {
+            amount: Number(result.data.updatePendingCreation.amount),
+            date: result.data.updatePendingCreation.date,
+            memo: result.data.updatePendingCreation.memo,
+            moderator: Number(result.data.updatePendingCreation.moderator),
+            row: this.row,
+          })
+          this.$toasted.success(
+            `Offene schöpfung (${this.value} GDD) für ${this.item.email} wurde geändert, liegt zur Bestätigung bereit`,
+          )
+          this.submitObj = null
+          this.createdIndex = null
+          // das creation Formular reseten
+          this.$refs.updateCreationForm.reset()
+          // Den geschöpften Wert auf o setzen
+          this.value = 0
+        })
+        .catch((error) => {
+          this.$toasted.error(error.message)
+          this.submitObj = null
+          // das creation Formular reseten
+          this.$refs.updateCreationForm.reset()
+          // Den geschöpften Wert auf o setzen
+          this.value = 0
+        })
     },
   },
+  searchModeratorData() {
+    this.$apollo
+      .query({ query: verifyLogin })
+      .then((result) => {
+        this.$store.commit('moderator', result.data.verifyLogin)
+      })
+      .catch(() => {
+        this.$store.commit('moderator', { id: 0, name: 'Test Moderator' })
+      })
+  },
 }
 </script>

admin/src/pages/CreationConfirm.spec.js

@@ -60,8 +60,11 @@ describe('CreationConfirm', () => {
     })
 
     describe('store', () => {
-      it('commits openCreationsPlus to store', () => {
+      it('commits resetOpenCreations to store', () => {
-        expect(storeCommitMock).toBeCalledWith('openCreationsPlus', 2)
+        expect(storeCommitMock).toBeCalledWith('resetOpenCreations')
+      })
+      it('commits setOpenCreations to store', () => {
+        expect(storeCommitMock).toBeCalledWith('setOpenCreations', 2)
       })
     })
 

admin/src/pages/CreationConfirm.vue

@@ -64,15 +64,15 @@ export default {
         this.$store.commit('openCreationsMinus', 1)
       }
     },
-    async getPendingCreations() {
+    getPendingCreations() {
       this.$apollo
         .query({
           query: getPendingCreations,
         })
         .then((result) => {
-          this.confirmResult = result.data.getPendingCreations
           this.$store.commit('resetOpenCreations')
-          this.$store.commit('openCreationsPlus', result.data.getPendingCreations.length)
+          this.confirmResult = result.data.getPendingCreations.reverse()
+          this.$store.commit('setOpenCreations', result.data.getPendingCreations.length)
         })
         .catch((error) => {
           this.$toasted.error(error.message)

admin/src/pages/Overview.vue

@@ -64,11 +64,7 @@ export default {
           query: getPendingCreations,
         })
         .then((result) => {
-          this.$store.commit('resetOpenCreations')
+          this.$store.commit('setOpenCreations', result.data.getPendingCreations.length)
-          this.$store.commit('openCreationsPlus', result.data.getPendingCreations.length)
-        })
-        .catch((error) => {
-          this.$toasted.error(error.message)
         })
     },
   },

backend/src/webhook/elopage.ts

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
 /*
     Elopage Webhook
 

frontend/src/locales/de.json

@@ -114,6 +114,11 @@
   "message": "hallo gradido !!",
   "overview": "Übersicht",
   "privacy_policy": "Datenschutzerklärung",
+  "publisher": {
+    "infoNoRegister": "Dies ist für die Registrieung nicht nötig!",
+    "infoText": "Trage hier die ID des Herausgebers ein. Wenn du keine ID hast dann bitte leer lassen.",
+    "publisherId": "PublisherID"
+  },
   "send": "Senden",
   "settings": {
     "coinanimation": {

frontend/src/locales/en.json

@@ -114,6 +114,11 @@
   "message": "hello gradido !!",
   "overview": "Overview",
   "privacy_policy": "Privacy policy",
+  "publisher": {
+    "infoNoRegister": "This is not necessary for registration!",
+    "infoText": "Enter the ID of the publisher here. If you do not have an ID, please leave it blank.",
+    "publisherId": "PublisherID"
+  },
   "send": "Send",
   "settings": {
     "coinanimation": {

frontend/src/store/store.test.js

@@ -11,6 +11,7 @@ const {
   coinanimation,
   newsletterState,
   publisherId,
+  isAdmin,
   community,
   hasElopage,
 } = mutations
@@ -104,6 +105,14 @@ describe('Vuex store', () => {
       })
     })
 
+    describe('isAdmin', () => {
+      it('sets the state of isAdmin', () => {
+        const state = { isAdmin: null }
+        isAdmin(state, true)
+        expect(state.isAdmin).toEqual(true)
+      })
+    })
+
     describe('community', () => {
       it('sets the state of community', () => {
         const state = {}

frontend/src/views/Pages/Register.spec.js

@@ -170,6 +170,11 @@ describe('Register', () => {
         expect(wrapper.find('#registerCheckbox').exists()).toBeTruthy()
       })
 
+      it('has PublisherId input fields', () => {
+        wrapper.find('.publisherCollaps').trigger('click')
+        expect(wrapper.find('#publisherid').exists()).toBe(true)
+      })
+
       it('has disabled submit button when not completely filled', () => {
         expect(wrapper.find('button[type="submit"]').attributes('disabled')).toBe('disabled')
       })
@@ -221,6 +226,11 @@ describe('Register', () => {
         wrapper.find('input[name="form.password"]').setValue('Aa123456_')
         wrapper.find('input[name="form.passwordRepeat"]').setValue('Aa123456_')
         wrapper.find('.language-switch-select').findAll('option').at(1).setSelected()
+        wrapper.find('#publisherid').setValue('12345')
+      })
+
+      it('commits publisherId to store', () => {
+        expect(mockStoreCommit).toBeCalledWith('publisherId', 12345)
       })
 
       it('has enabled submit button when completely filled', () => {

frontend/src/views/Pages/Register.vue

@@ -121,8 +121,44 @@
                       {{ messageError }}
                     </span>
                   </b-alert>
+                  <b-row v-b-toggle:my-collapse class="text-muted shadow-sm p-3 publisherCollaps">
+                    <b-col>
+                      {{ $t('publisher.publisherId') }} : {{ $store.state.publisherId }}
+                    </b-col>
+                    <b-col class="text-right">
+                      <b-icon icon="chevron-down" aria-hidden="true"></b-icon>
+                    </b-col>
+                  </b-row>
+                  <b-row>
+                    <b-col>
+                      <b-collapse id="my-collapse" class="">
+                        <b-input-group class="shadow-sm p-2 bg-white rounded">
+                          <b-input-group-prepend is-text>
+                            <b-icon icon="person-fill"></b-icon>
+                          </b-input-group-prepend>
+                          <b-form-input
+                            id="publisherid"
+                            type="text"
+                            placeholder="Publisher ID"
+                            v-model="publisherId"
+                            @input="commitStore(publisherId)"
+                          ></b-form-input>
+                        </b-input-group>
+                        <div
+                          v-b-toggle:my-collapse
+                          class="text-center mt-1 shadow-lg p-3 mb-5 rounded"
+                        >
+                          {{ $t('publisher.infoText') }}
+                          <span class="text-dark">{{ $t('publisher.infoNoRegister') }}</span>
+                          <div class="text-center">
+                            <b-icon icon="chevron-up" aria-hidden="true"></b-icon>
+                          </div>
+                        </div>
+                      </b-collapse>
+                    </b-col>
+                  </b-row>
 
-                  <div class="text-center">
+                  <div class="text-center mt-5">
                     <div class="text-center">
                       <router-link class="test-button-back" to="/login">
                         <b-button variant="outline-secondary" class="mr-4">
@@ -185,6 +221,7 @@ export default {
       showError: false,
       messageError: '',
       register: true,
+      publisherId: this.$store.state.publisherId,
     }
   },
   methods: {
@@ -197,6 +234,9 @@ export default {
     getValidationState({ dirty, validated, valid = null }) {
       return dirty || validated ? valid : null
     },
+    commitStore(val) {
+      this.$store.commit('publisherId', val)
+    },
     async onSubmit() {
       this.$apollo
         .mutate({