Merge pull request #2362 from gradido/2355-Edit-contribution-link-does-not-take-old-values

fix(admin): edit contribution link does not take old values

admin/src/components/ContributionLink/ContributionLink.spec.js

@@ -46,5 +46,10 @@ describe('ContributionLink', () => {
       wrapper.vm.editContributionLinkData()
       expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
     })
+
+    it('emits toggle::collapse close Contribution-Form ', async () => {
+      wrapper.vm.closeContributionForm()
+      expect(wrapper.vm.$root.$emit('bv::toggle::collapse', 'newContribution')).toBeTruthy()
+    })
   })
 })

admin/src/components/ContributionLink/ContributionLink.vue

@@ -8,7 +8,11 @@
       header-class="text-center"
       class="mt-5"
     >
-      <b-button v-b-toggle.newContribution class="my-3 d-flex justify-content-left">
+      <b-button
+        v-if="!editContributionLink"
+        v-b-toggle.newContribution
+        class="my-3 d-flex justify-content-left"
+      >
         {{ $t('math.plus') }} {{ $t('contributionLink.newContributionLink') }}
       </b-button>
 
@@ -19,6 +23,7 @@
             :contributionLinkData="contributionLinkData"
             :editContributionLink="editContributionLink"
             @get-contribution-links="$emit('get-contribution-links')"
+            @closeContributionForm="closeContributionForm"
           />
         </b-card>
       </b-collapse>
@@ -63,8 +68,17 @@ export default {
     }
   },
   methods: {
+    closeContributionForm() {
+      if (this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+        this.editContributionLink = false
+        this.contributionLinkData = {}
+      }
+    },
     editContributionLinkData(data) {
-      if (!this.visible) this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      if (!this.visible) {
+        this.$root.$emit('bv::toggle::collapse', 'newContribution')
+      }
       this.contributionLinkData = data
       this.editContributionLink = true
     },

admin/src/components/ContributionLink/ContributionLinkForm.vue

@@ -6,6 +6,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validFrom')">
             <b-form-datepicker
+              reset-button
               v-model="form.validFrom"
               size="lg"
               :min="min"
@@ -19,6 +20,7 @@
         <b-col>
           <b-form-group :label="$t('contributionLink.validTo')">
             <b-form-datepicker
+              reset-button
               v-model="form.validTo"
               size="lg"
               :min="form.validFrom ? form.validFrom : min"
@@ -110,6 +112,9 @@
         <b-button type="reset" variant="danger" @click.prevent="onReset">
           {{ $t('contributionLink.clear') }}
         </b-button>
+        <b-button @click.prevent="$emit('closeContributionForm')">
+          {{ $t('contributionLink.close') }}
+        </b-button>
       </div>
     </b-form>
   </div>
@@ -203,14 +208,7 @@ export default {
   },
   watch: {
     contributionLinkData() {
-      this.form.name = this.contributionLinkData.name
-      this.form.memo = this.contributionLinkData.memo
-      this.form.amount = this.contributionLinkData.amount
-      this.form.validFrom = this.contributionLinkData.validFrom
-      this.form.validTo = this.contributionLinkData.validTo
-      this.form.cycle = this.contributionLinkData.cycle
-      this.form.maxPerCycle = this.contributionLinkData.maxPerCycle
-      this.form.maxAmountPerMonth = this.contributionLinkData.maxAmountPerMonth
+      this.form = this.contributionLinkData
     },
   },
 }

admin/src/locales/de.json

@@ -5,6 +5,7 @@
     "amount": "Betrag",
     "changeSaved": "Änderungen gespeichert",
     "clear": "Löschen",
+    "close": "Schließen",
     "contributionLinks": "Beitragslinks",
     "create": "Anlegen",
     "cycle": "Zyklus",

admin/src/locales/en.json

@@ -5,6 +5,7 @@
     "amount": "Amount",
     "changeSaved": "Changes saved",
     "clear": "Clear",
+    "close": "Close",
     "contributionLinks": "Contribution Links",
     "create": "Create",
     "cycle": "Cycle",