Merge branch 'master' into migration_0006-login_users_collation

admin/src/components/UserTable.vue

@@ -237,7 +237,7 @@ export default {
           },
         })
         .then(() => {
-          this.$emit('remove-confirm-result', item, 'remove')
+          this.$emit('remove-confirm-result', item, 'confirmed')
         })
         .catch((error) => {
           this.$toasted.error(error.message)

admin/src/graphql/createPendingCreation.js

@@ -3,7 +3,7 @@ import gql from 'graphql-tag'
 export const createPendingCreation = gql`
   mutation (
     $email: String!
-    $amount: Int!
+    $amount: Float!
     $memo: String!
     $creationDate: String!
     $moderator: Int!

admin/src/graphql/updatePendingCreation.js

@@ -4,7 +4,7 @@ export const updatePendingCreation = gql`
   mutation (
     $id: Int!
     $email: String!
-    $amount: Int!
+    $amount: Float!
     $memo: String!
     $creationDate: String!
     $moderator: Int!

admin/src/pages/CreationConfirm.spec.js

@@ -81,7 +81,7 @@ describe('CreationConfirm', () => {
       })
     })
 
-    describe('confirm creation delete with success', () => {
+    describe('delete creation delete with success', () => {
       beforeEach(async () => {
         apolloQueryMock.mockResolvedValue({
           data: {
@@ -130,7 +130,7 @@ describe('CreationConfirm', () => {
       })
     })
 
-    describe('confirm creation delete with error', () => {
+    describe('delete creation delete with error', () => {
       beforeEach(async () => {
         apolloMutateMock.mockRejectedValue({ message: 'Ouchhh!' })
         await wrapper
@@ -143,6 +143,67 @@ describe('CreationConfirm', () => {
       })
     })
 
+    describe('confirm creation delete with success', () => {
+      beforeEach(async () => {
+        apolloQueryMock.mockResolvedValue({
+          data: {
+            getPendingCreations: [
+              {
+                id: 1,
+                firstName: 'Bibi',
+                lastName: 'Bloxberg',
+                email: 'bibi@bloxberg.de',
+                amount: 500,
+                memo: 'Danke für alles',
+                date: new Date(),
+                moderator: 0,
+              },
+              {
+                id: 2,
+                firstName: 'Räuber',
+                lastName: 'Hotzenplotz',
+                email: 'raeuber@hotzenplotz.de',
+                amount: 1000000,
+                memo: 'Gut Ergatert',
+                date: new Date(),
+                moderator: 0,
+              },
+            ],
+          },
+        })
+        await wrapper
+          .findComponent({ name: 'UserTable' })
+          .vm.$emit('remove-confirm-result', { id: 1 }, 'confirmed')
+      })
+
+      it('calls the deletePendingCreation mutation', () => {
+        expect(apolloMutateMock).not.toBeCalledWith({
+          mutation: deletePendingCreation,
+          variables: { id: 1 },
+        })
+      })
+
+      it('commits openCreationsMinus to store', () => {
+        expect(storeCommitMock).toBeCalledWith('openCreationsMinus', 1)
+      })
+
+      it('toasts a success message', () => {
+        expect(toastedSuccessMock).toBeCalledWith('Pending Creation has been deleted')
+      })
+    })
+
+    describe('delete creation delete with error', () => {
+      beforeEach(async () => {
+        await wrapper
+          .findComponent({ name: 'UserTable' })
+          .vm.$emit('remove-confirm-result', { id: 1 }, 'confirm')
+      })
+
+      it('toasts an error message', () => {
+        expect(toastedErrorMock).toBeCalledWith('Case confirm is not supported')
+      })
+    })
+
     describe('server response is error', () => {
       beforeEach(() => {
         jest.clearAllMocks()

admin/src/pages/CreationConfirm.vue

@@ -51,9 +51,10 @@ export default {
   },
   methods: {
     removeConfirmResult(e, event) {
-      if (event === 'remove') {
       let index = 0
       const findArr = this.confirmResult.find((arr) => arr.id === e.id)
+      switch (event) {
+        case 'remove':
           this.$apollo
             .mutate({
               mutation: deletePendingCreation,
@@ -70,6 +71,14 @@ export default {
             .catch((error) => {
               this.$toasted.error(error.message)
             })
+          break
+        case 'confirmed':
+          this.confirmResult.splice(index, 1)
+          this.$store.commit('openCreationsMinus', 1)
+          this.$toasted.success('Pending Creation has been deleted')
+          break
+        default:
+          this.$toasted.error('Case ' + event + ' is not supported')
       }
     },
     getPendingCreations() {
@@ -80,7 +89,7 @@ export default {
         })
         .then((result) => {
           this.$store.commit('resetOpenCreations')
-          this.confirmResult = result.data.getPendingCreations.reverse()
+          this.confirmResult = result.data.getPendingCreations
           this.$store.commit('setOpenCreations', result.data.getPendingCreations.length)
         })
         .catch((error) => {

backend/src/graphql/arg/CreatePendingCreationArgs.ts

@@ -1,11 +1,11 @@
-import { ArgsType, Field, Int } from 'type-graphql'
+import { ArgsType, Field, Float, Int } from 'type-graphql'
 
 @ArgsType()
 export default class CreatePendingCreationArgs {
   @Field(() => String)
   email: string
 
-  @Field(() => Int)
+  @Field(() => Float)
   amount: number
 
   @Field(() => String)

backend/src/graphql/arg/UpdatePendingCreationArgs.ts

@@ -1,4 +1,4 @@
-import { ArgsType, Field, Int } from 'type-graphql'
+import { ArgsType, Field, Float, Int } from 'type-graphql'
 
 @ArgsType()
 export default class CreatePendingCreationArgs {
@@ -8,7 +8,7 @@ export default class CreatePendingCreationArgs {
   @Field(() => String)
   email: string
 
-  @Field(() => Int)
+  @Field(() => Float)
   amount: number
 
   @Field(() => String)

backend/src/graphql/resolver/AdminResolver.ts

@@ -133,7 +133,7 @@ export class AdminResolver {
         return newPendingCreation
       }),
     )
-    return pendingCreationsPromise
+    return pendingCreationsPromise.reverse()
   }
 
   @Mutation(() => Boolean)

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

@@ -251,6 +251,44 @@ describe('Login', () => {
           it('toasts an error message', () => {
             expect(toastErrorMock).toBeCalledWith('error.no-account')
           })
+
+          describe('login fails with "User email not validated"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User email not validated',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to /thx/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/thx/login')
+            })
+          })
+
+          describe('login fails with "User has no password set yet"', () => {
+            beforeEach(async () => {
+              apolloQueryMock.mockRejectedValue({
+                message: 'User has no password set yet',
+              })
+              wrapper = Wrapper()
+              jest.clearAllMocks()
+              await wrapper.find('input[placeholder="Email"]').setValue('user@example.org')
+              await wrapper.find('input[placeholder="form.password"]').setValue('1234')
+              await flushPromises()
+              await wrapper.find('form').trigger('submit')
+              await flushPromises()
+            })
+
+            it('redirects to /reset/login', () => {
+              expect(mockRouterPush).toBeCalledWith('/reset/login')
+            })
+          })
         })
       })
     })

frontend/src/views/Pages/Login.vue

@@ -105,10 +105,10 @@ export default {
           loader.hide()
         })
         .catch((error) => {
-          if (error.message.includes('No user with this credentials')) {
           this.$toasted.global.error(this.$t('error.no-account'))
-          } else {
+          if (error.message.includes('User email not validated')) {
-            // : this.$t('error.no-email-verify')
+            this.$router.push('/thx/login')
+          } else if (error.message.includes('User has no password set yet')) {
             this.$router.push('/reset/login')
           }
           loader.hide()