Add cancel button to restore previously saved rule

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue
index 18db4eef696f25d3c1900280aca0a50acf6efebb..5bfbe48138d19d34b0cd45a6d115e30642dcbfc6 100644 (file)
--- a/apps/workflowengine/src/components/Rule.vue
+++ b/apps/workflowengine/src/components/Rule.vue
@@ -36,10 +36,10 @@
                                        @click="saveRule">
                                        {{ ruleStatus.title }}
                                </button>
-                               <button v-if="rule.id < -1" @click="cancelRule">
+                               <button v-if="rule.id < -1 || dirty" @click="cancelRule">
                                        {{ t('workflowengine', 'Cancel') }}
                                </button>
-                               <button v-else @click="deleteRule">
+                               <button v-else-if="!dirty" @click="deleteRule">
                                        {{ t('workflowengine', 'Delete') }}
                                </button>
                        </div>
@@ -75,7 +75,8 @@ export default {
                        checks: [],
                        error: null,
                        dirty: this.rule.id < 0,
-                       checking: false
+                       checking: false,
+                       originalRule: null
                }
        },
        computed: {
@@ -101,6 +102,9 @@ export default {
                        return typeof lastCheck === 'undefined' || lastCheck.class !== null
                }
        },
+       mounted() {
+               this.originalRule = JSON.parse(JSON.stringify(this.rule))
+       },
        methods: {
                async updateOperation(operation) {
                        this.$set(this.rule, 'operation', operation)
@@ -128,6 +132,7 @@ export default {
                                await this.$store.dispatch('pushUpdateRule', this.rule)
                                this.dirty = false
                                this.error = null
+                               this.originalRule = JSON.parse(JSON.stringify(this.rule))
                        } catch (e) {
                                console.error('Failed to save operation')
                                this.error = e.response.data.ocs.meta.message
@@ -142,7 +147,13 @@ export default {
                        }
                },
                cancelRule() {
-                       this.$store.dispatch('removeRule', this.rule)
+                       if (this.rule.id < 0) {
+                               this.$store.dispatch('removeRule', this.rule)
+                       } else {
+                               this.$store.dispatch('updateRule', this.originalRule)
+                               this.originalRule = JSON.parse(JSON.stringify(this.rule))
+                               this.dirty = false
+                       }
                },
                async removeCheck(check) {
                        const index = this.rule.checks.findIndex(item => item === check)