Merge pull request #2087 from gradido/add-confirm-dialog-on-delete-contribution

fix: Add Confirm Dialog on Delete Contribution

admin/src/locales/de.json

@@ -35,6 +35,7 @@
   "creation_form": {
     "creation_failed": "Ausstehende Schöpfung für {email} konnte nicht erzeugt werden.",
     "creation_for": "Aktives Grundeinkommen für",
+    "deleteNow": "Möchtest du diesen Beitrag zur Gemeinschaft wirklich löschen?",
     "enter_text": "Text eintragen",
     "form": "Schöpfungsformular",
     "min_characters": "Mindestens 10 Zeichen eingeben",

admin/src/locales/en.json

@@ -35,6 +35,7 @@
   "creation_form": {
     "creation_failed": "Could not create pending creation for {email}",
     "creation_for": "Active Basic Income for",
+    "deleteNow": "Do you really want to delete this contribution to the community?",
     "enter_text": "Enter text",
     "form": "Creation form",
     "min_characters": "Enter at least 10 characters",

admin/src/pages/CreationConfirm.spec.js

@@ -80,10 +80,19 @@ describe('CreationConfirm', () => {
     })
 
     describe('remove creation with success', () => {
+      let spy
+
+      describe('admin confirms deletion', () => {
         beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve('some value'))
           await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
         })
 
+        it('opens a modal', () => {
+          expect(spy).toBeCalled()
+        })
+
         it('calls the adminDeleteContribution mutation', () => {
           expect(apolloMutateMock).toBeCalledWith({
             mutation: adminDeleteContribution,
@@ -100,8 +109,25 @@ describe('CreationConfirm', () => {
         })
       })
 
-    describe('remove creation with error', () => {
+      describe('admin cancels deletion', () => {
         beforeEach(async () => {
+          spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+          spy.mockImplementation(() => Promise.resolve(false))
+          await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
+        })
+
+        it('does not call the adminDeleteContribution mutation', () => {
+          expect(apolloMutateMock).not.toBeCalled()
+        })
+      })
+    })
+
+    describe('remove creation with error', () => {
+      let spy
+
+      beforeEach(async () => {
+        spy = jest.spyOn(wrapper.vm.$bvModal, 'msgBoxConfirm')
+        spy.mockImplementation(() => Promise.resolve('some value'))
         apolloMutateMock.mockRejectedValue({ message: 'Ouchhh!' })
         await wrapper.findAll('tr').at(1).findAll('button').at(0).trigger('click')
       })

admin/src/pages/CreationConfirm.vue

@@ -34,7 +34,9 @@ export default {
   },
   methods: {
     removeCreation(item) {
-      this.$apollo
+      this.$bvModal.msgBoxConfirm(this.$t('creation_form.deleteNow')).then(async (value) => {
+        if (value)
+          await this.$apollo
             .mutate({
               mutation: adminDeleteContribution,
               variables: {
@@ -48,6 +50,7 @@ export default {
             .catch((error) => {
               this.toastError(error.message)
             })
+      })
     },
     confirmCreation() {
       this.$apollo