From 98752afd318e2c78fe15466dc55a27d9b0e204ec Mon Sep 17 00:00:00 2001
From: Antoine Nguyen <tonio@ngyn.org>
Date: Mon, 27 Feb 2023 10:25:29 +0100
Subject: [PATCH] Make sure to reset creation forms between 2 uses.

---
 .../components/domains/DomainCreationForm.vue |  6 +++++
 .../src/components/domains/DomainDNSForm.vue  |  3 +++
 .../components/domains/DomainGeneralForm.vue  |  3 +++
 .../domains/DomainLimitationsForm.vue         |  3 +++
 .../components/domains/DomainOptionsForm.vue  |  3 +++
 .../domains/DomainTransportForm.vue           |  3 +++
 .../identities/AccountAliasForm.vue           |  4 ++++
 .../identities/AccountCreationForm.vue        |  6 +++++
 .../identities/AccountGeneralForm.vue         |  3 +++
 .../identities/AccountMailboxForm.vue         |  5 ++++
 .../components/identities/AccountRoleForm.vue |  3 +++
 .../identities/AliasCreationForm.vue          |  6 +++++
 .../identities/AliasGeneralForm.vue           |  3 +++
 .../identities/AliasRecipientForm.vue         |  4 ++++
 .../src/components/tools/CreationForm.vue     | 23 ++++++++++++-------
 15 files changed, 70 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/domains/DomainCreationForm.vue b/frontend/src/components/domains/DomainCreationForm.vue
index 0cc1a7c88..f2b4679f2 100644
--- a/frontend/src/components/domains/DomainCreationForm.vue
+++ b/frontend/src/components/domains/DomainCreationForm.vue
@@ -1,7 +1,9 @@
 <template>
 <creation-form
+  ref="form"
   :title="'New domain'|translate"
   :steps="steps"
+  :form-getter="getForm"
   :form-observer-getter="getObserver"
   :validate-object="validateDomain"
   :summary-sections="summarySections"
@@ -199,8 +201,12 @@ export default {
     },
     close () {
       this.initDomain()
+      this.$refs.form.resetForm()
       this.$emit('close')
     },
+    getForm (step) {
+      return this.$refs[`form_${step}`]
+    },
     getObserver (step) {
       return this.$refs[`form_${step}`].$refs.observer
     },
diff --git a/frontend/src/components/domains/DomainDNSForm.vue b/frontend/src/components/domains/DomainDNSForm.vue
index 03b56a26d..ec08d7596 100644
--- a/frontend/src/components/domains/DomainDNSForm.vue
+++ b/frontend/src/components/domains/DomainDNSForm.vue
@@ -55,6 +55,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     update () {
       this.$emit('input', this.form)
     }
diff --git a/frontend/src/components/domains/DomainGeneralForm.vue b/frontend/src/components/domains/DomainGeneralForm.vue
index 342a4970f..eb84698b0 100644
--- a/frontend/src/components/domains/DomainGeneralForm.vue
+++ b/frontend/src/components/domains/DomainGeneralForm.vue
@@ -59,6 +59,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     update () {
       this.$emit('input', this.form)
     }
diff --git a/frontend/src/components/domains/DomainLimitationsForm.vue b/frontend/src/components/domains/DomainLimitationsForm.vue
index aa7b6764a..ba4b23e16 100644
--- a/frontend/src/components/domains/DomainLimitationsForm.vue
+++ b/frontend/src/components/domains/DomainLimitationsForm.vue
@@ -58,6 +58,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     update () {
       this.$emit('input', this.form)
     }
diff --git a/frontend/src/components/domains/DomainOptionsForm.vue b/frontend/src/components/domains/DomainOptionsForm.vue
index 83b44a09d..4b64899e1 100644
--- a/frontend/src/components/domains/DomainOptionsForm.vue
+++ b/frontend/src/components/domains/DomainOptionsForm.vue
@@ -57,6 +57,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     updatePassword (value) {
       if (value) {
         accounts.getRandomPassword().then(resp => {
diff --git a/frontend/src/components/domains/DomainTransportForm.vue b/frontend/src/components/domains/DomainTransportForm.vue
index c76289cce..89046d62e 100644
--- a/frontend/src/components/domains/DomainTransportForm.vue
+++ b/frontend/src/components/domains/DomainTransportForm.vue
@@ -65,6 +65,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     resetForm (value) {
       this.$set(this.form, 'transport', { service: value.name, settings: {} })
       for (const setting of value.settings) {
diff --git a/frontend/src/components/identities/AccountAliasForm.vue b/frontend/src/components/identities/AccountAliasForm.vue
index 83b758b69..f1e026e3a 100644
--- a/frontend/src/components/identities/AccountAliasForm.vue
+++ b/frontend/src/components/identities/AccountAliasForm.vue
@@ -42,6 +42,10 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.currentAlias = ''
+      this.aliases = []
+    },
     async addAlias () {
       try {
         await accounts.validate({ aliases: [this.currentAlias] })
diff --git a/frontend/src/components/identities/AccountCreationForm.vue b/frontend/src/components/identities/AccountCreationForm.vue
index 0d70729be..a1a2c3cf5 100644
--- a/frontend/src/components/identities/AccountCreationForm.vue
+++ b/frontend/src/components/identities/AccountCreationForm.vue
@@ -1,7 +1,9 @@
 <template>
 <creation-form
+  ref="form"
   :title="'New account'|translate"
   :steps="steps"
+  :form-getter="getForm"
   :form-observer-getter="getObserver"
   :validate-object="validateAccount"
   :summary-sections="summarySections"
@@ -162,6 +164,9 @@ export default {
         random_password: true
       }
     },
+    getForm (step) {
+      return this.$refs[`form_${step}`]
+    },
     getObserver (step) {
       return this.$refs[`form_${step}`].$refs.observer
     },
@@ -170,6 +175,7 @@ export default {
     },
     close () {
       this.account = this.getInitialForm()
+      this.$refs.form.resetForm()
       this.$emit('close')
     },
     submit () {
diff --git a/frontend/src/components/identities/AccountGeneralForm.vue b/frontend/src/components/identities/AccountGeneralForm.vue
index 6bd352dc3..6ef5fb71b 100644
--- a/frontend/src/components/identities/AccountGeneralForm.vue
+++ b/frontend/src/components/identities/AccountGeneralForm.vue
@@ -74,6 +74,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     async validateForm () {
       return await this.$refs.observer.validate() && await this.$refs.passwordForm.validate()
     },
diff --git a/frontend/src/components/identities/AccountMailboxForm.vue b/frontend/src/components/identities/AccountMailboxForm.vue
index 8b6728c12..06fd0a8db 100644
--- a/frontend/src/components/identities/AccountMailboxForm.vue
+++ b/frontend/src/components/identities/AccountMailboxForm.vue
@@ -75,6 +75,11 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {
+        mailbox: {}
+      }
+    },
     update () {
       this.$emit('input', this.form)
     }
diff --git a/frontend/src/components/identities/AccountRoleForm.vue b/frontend/src/components/identities/AccountRoleForm.vue
index e640ff3aa..a56812bf3 100644
--- a/frontend/src/components/identities/AccountRoleForm.vue
+++ b/frontend/src/components/identities/AccountRoleForm.vue
@@ -45,6 +45,9 @@ export default {
       return role !== undefined ? role.help : ''
     }
   },
+  methods: {
+    reset () { }
+  },
   data () {
     return {
       accountRoles: [
diff --git a/frontend/src/components/identities/AliasCreationForm.vue b/frontend/src/components/identities/AliasCreationForm.vue
index 64423f6ea..415186990 100644
--- a/frontend/src/components/identities/AliasCreationForm.vue
+++ b/frontend/src/components/identities/AliasCreationForm.vue
@@ -1,7 +1,9 @@
 <template>
 <creation-form
+  ref="form"
   :title="'New alias'|translate"
   :steps="steps"
+  :form-getter="getForm"
   :form-observer-getter="getObserver"
   :validate-object="validateAlias"
   :summary-sections="summarySections"
@@ -78,6 +80,7 @@ export default {
   methods: {
     close () {
       this.alias = this.getInitialForm()
+      this.$refs.form.resetForm()
       this.$emit('close')
     },
     getInitialForm () {
@@ -87,6 +90,9 @@ export default {
         recipients: []
       }
     },
+    getForm (step) {
+      return this.$refs[`form_${step}`]
+    },
     getObserver (step) {
       return this.$refs[`form_${step}`].$refs.observer
     },
diff --git a/frontend/src/components/identities/AliasGeneralForm.vue b/frontend/src/components/identities/AliasGeneralForm.vue
index 9e7e3da76..2ace60d49 100644
--- a/frontend/src/components/identities/AliasGeneralForm.vue
+++ b/frontend/src/components/identities/AliasGeneralForm.vue
@@ -86,6 +86,9 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.form = {}
+    },
     updateAddress (value) {
       aliases.getRandomAddress().then(resp => {
         this.$set(this.form, 'address', `${resp.data.address}@${value.name}`)
diff --git a/frontend/src/components/identities/AliasRecipientForm.vue b/frontend/src/components/identities/AliasRecipientForm.vue
index 02e736ef3..01e8abfba 100644
--- a/frontend/src/components/identities/AliasRecipientForm.vue
+++ b/frontend/src/components/identities/AliasRecipientForm.vue
@@ -42,6 +42,10 @@ export default {
     }
   },
   methods: {
+    reset () {
+      this.recipient = ''
+      this.recipients = []
+    },
     async addRecipient () {
       this.recipients.push(this.recipient)
       this.$emit('input', this.recipients)
diff --git a/frontend/src/components/tools/CreationForm.vue b/frontend/src/components/tools/CreationForm.vue
index e0a8f6808..b57963216 100644
--- a/frontend/src/components/tools/CreationForm.vue
+++ b/frontend/src/components/tools/CreationForm.vue
@@ -84,6 +84,7 @@ export default {
     steps: Array,
     summarySections: Array,
     formObserverGetter: Function,
+    formGetter: Function,
     validateObject: Function
   },
   data () {
@@ -92,6 +93,19 @@ export default {
     }
   },
   methods: {
+    resetForm () {
+      this.currentStep = 1
+      this.steps.forEach((item, index) => {
+        const observer = this.formObserverGetter(index + 1)
+        if (observer !== undefined) {
+          observer.reset()
+        }
+        const form = this.formGetter(index + 1)
+        if (form !== undefined) {
+          form.reset()
+        }
+      })
+    },
     async close (withConfirm) {
       if (withConfirm) {
         const confirm = await this.$refs.confirm.open(
@@ -107,13 +121,7 @@ export default {
           return
         }
       }
-      this.currentStep = 1
-      this.steps.forEach((item, index) => {
-        const observer = this.formObserverGetter(index + 1)
-        if (observer !== undefined) {
-          observer.reset()
-        }
-      })
+      this.resetForm()
       this.$emit('close')
     },
     async goToNextStep (current, next) {
@@ -132,7 +140,6 @@ export default {
       }
       this.currentStep = next
     }
-
   }
 }
 </script>