From bc474e79ff5754ede0ea0c6e2b10d741049555e8 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 16 Sep 2022 12:03:11 +0200
Subject: [PATCH] delete contribution link and update contribution list

---
 admin/src/components/ContributionLink.vue     |  9 +++-
 admin/src/components/ContributionLinkForm.vue |  3 +-
 admin/src/components/ContributionLinkList.vue | 46 ++++++++++---------
 admin/src/locales/de.json                     |  2 +-
 admin/src/locales/en.json                     |  2 +-
 admin/src/pages/Overview.vue                  |  6 ++-
 6 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/admin/src/components/ContributionLink.vue b/admin/src/components/ContributionLink.vue
index 893e202f4..91c8ce95b 100644
--- a/admin/src/components/ContributionLink.vue
+++ b/admin/src/components/ContributionLink.vue
@@ -15,7 +15,10 @@
       <b-collapse v-model="visible" id="newContribution" class="mt-2">
         <b-card>
           <p class="h2 ml-5">{{ $t('contributionLink.contributionLinks') }}</p>
-          <contribution-link-form :contributionLinkData="contributionLinkData" />
+          <contribution-link-form
+            :contributionLinkData="contributionLinkData"
+            @get-contribution-links="getContributionLinks"
+          />
         </b-card>
       </b-collapse>
 
@@ -24,6 +27,7 @@
           v-if="count > 0"
           :items="items"
           @editContributionLinkData="editContributionLinkData"
+          @get-contribution-links="getContributionLinks"
         />
         <div v-else>{{ $t('contributionLink.noContributionLinks') }}</div>
       </b-card-text>
@@ -61,6 +65,9 @@ export default {
       if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
       this.contributionLinkData = data
     },
+    getContributionLinks() {
+      this.$emit('get-contribution-links')
+    },
   },
 }
 </script>
diff --git a/admin/src/components/ContributionLinkForm.vue b/admin/src/components/ContributionLinkForm.vue
index a159d33d3..6daf1e299 100644
--- a/admin/src/components/ContributionLinkForm.vue
+++ b/admin/src/components/ContributionLinkForm.vue
@@ -163,7 +163,6 @@ export default {
       if (this.form.validFrom === null)
         return this.toastError(this.$t('contributionLink.noStartDate'))
       if (this.form.validTo === null) return this.toastError(this.$t('contributionLink.noEndDate'))
-      // alert(JSON.stringify(this.form))
       this.$apollo
         .mutate({
           mutation: createContributionLink,
@@ -182,6 +181,8 @@ export default {
           this.link = result.data.createContributionLink.link
           this.toastSuccess(this.link)
           this.onReset()
+          this.$root.$emit('bv::toggle::collapse', 'newContribution')
+          this.$emit('get-contribution-links')
         })
         .catch((error) => {
           this.toastError(error.message)
diff --git a/admin/src/components/ContributionLinkList.vue b/admin/src/components/ContributionLinkList.vue
index 518d7d57e..18c136199 100644
--- a/admin/src/components/ContributionLinkList.vue
+++ b/admin/src/components/ContributionLinkList.vue
@@ -1,12 +1,12 @@
 <template>
   <div class="contribution-link-list">
     <b-table striped hover :items="items" :fields="fields">
-      <template #cell(delete)>
+      <template #cell(delete)="data">
         <b-button
           variant="danger"
           size="md"
           class="mr-2 test-delete-link"
-          @click="deleteContributionLink"
+          @click="deleteContributionLink(data.item.id, data.item.name)"
         >
           <b-icon icon="trash" variant="light"></b-icon>
         </b-button>
@@ -34,7 +34,7 @@
           <h6 class="mb-0">{{ modalData ? modalData.name : '' }}</h6>
         </template>
         <b-card-text>
-          {{ modalData }}
+          {{ modalData.memo ? modalData.memo : '' }}
           <figure-qr-code :link="modalData ? modalData.link : ''" />
         </b-card-text>
         <template #footer>
@@ -70,28 +70,30 @@ export default {
         'edit',
         'show',
       ],
-      modalData: null,
-      modalDataLink: null,
+      modalData: {},
     }
   },
   methods: {
-    deleteContributionLink() {
-      this.$bvModal.msgBoxConfirm(this.$t('contributionLink.deleteNow')).then(async (value) => {
-        if (value)
-          await this.$apollo
-            .mutate({
-              mutation: deleteContributionLink,
-              variables: {
-                id: this.id,
-              },
-            })
-            .then(() => {
-              this.toastSuccess('TODO: request message deleted ')
-            })
-            .catch((err) => {
-              this.toastError(err.message)
-            })
-      })
+    deleteContributionLink(id, name) {
+      this.$bvModal
+        .msgBoxConfirm(this.$t('contributionLink.deleteNow', { name: name }))
+        .then(async (value) => {
+          if (value)
+            await this.$apollo
+              .mutate({
+                mutation: deleteContributionLink,
+                variables: {
+                  id: id,
+                },
+              })
+              .then(() => {
+                this.toastSuccess('TODO: request message deleted ')
+                this.$emit('get-contribution-links')
+              })
+              .catch((err) => {
+                this.toastError(err.message)
+              })
+        })
     },
     editContributionLink(row) {
       this.$emit('editContributionLinkData', row)
diff --git a/admin/src/locales/de.json b/admin/src/locales/de.json
index c977a613e..6b50d328d 100644
--- a/admin/src/locales/de.json
+++ b/admin/src/locales/de.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",
-    "deleteNow": "Automatische Creations wirklich löschen?",
+    "deleteNow": "Automatische Creations '{name}' wirklich löschen?",
     "maximumAmount": "maximaler Betrag",
     "maxPerCycle": "Wiederholungen",
     "memo": "Nachricht",
diff --git a/admin/src/locales/en.json b/admin/src/locales/en.json
index e99305e08..2474b6cd2 100644
--- a/admin/src/locales/en.json
+++ b/admin/src/locales/en.json
@@ -7,7 +7,7 @@
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",
-    "deleteNow": "Do you really delete automatic creations?",
+    "deleteNow": "Do you really delete automatic creations '{name}'?",
     "maximumAmount": "Maximum amount",
     "maxPerCycle": "Repetition",
     "memo": "Memo",
diff --git a/admin/src/pages/Overview.vue b/admin/src/pages/Overview.vue
index 4c4ba47fa..cfa247b8e 100644
--- a/admin/src/pages/Overview.vue
+++ b/admin/src/pages/Overview.vue
@@ -28,7 +28,11 @@
         </b-link>
       </b-card-text>
     </b-card>
-    <contribution-link :items="items" :count="count" />
+    <contribution-link
+      :items="items"
+      :count="count"
+      @get-contribution-links="getContributionLinks"
+    />
     <community-statistic class="mt-5" v-model="statistics" />
   </div>
 </template>