Reuse create/updated coherence and fixes

opendatateam · Jan 28, 2019 · 4ddda3c · 4ddda3c
1 parent c5b485c
commit 4ddda3c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 39 deletions.
diff --git a/js/components/reuse/form.vue b/js/components/reuse/form.vue
@@ -1,24 +1,25 @@
 <template>
 <div>
-  <vform v-ref:form :fields="fields" :model="reuse"></vform>
+  <vertical-form v-ref:form :fields="fields" :model="reuse"></vertical-form>
 </div>
 </template>
 
 <script>
 import Reuse from 'models/reuse';
 import reuse_types from 'models/reuse_types';
+import VerticalForm from 'components/form/vertical-form.vue';
 
 export default {
+    components: {VerticalForm},
     props: {
         reuse: {
             type: Object,
             default: function() {
                 return new Reuse();
             }
         },
-        hideNotifications: false
     },
-    data: function() {
+    data() {
         return {
             fields: [{
                     id: 'title',
@@ -32,7 +33,7 @@ export default {
                     label: this._('Type'),
                     widget: 'select-input',
                     values: reuse_types,
-                    map: function(item) {
+                    map(item) {
                         return {value: item.id, text: item.label};
                     }
                 }, {
@@ -48,26 +49,14 @@ export default {
                 }]
         };
     },
-    components: {
-        vform: require('components/form/vertical-form.vue')
-    },
     methods: {
-        serialize: function() {
+        serialize() {
             return this.$refs.form.serialize();
         },
-        validate: function() {
-            const isValid = this.$refs.form.validate();
-
-            if (isValid & !this.hideNotifications) {
-                this.$dispatch('notify', {
-                    autoclose: true,
-                    title: this._('Changes saved'),
-                    details: this._('Your reuse has been updated.')
-                });
-            }
-            return isValid;
+        validate() {
+            return this.$refs.form.validate();
         },
-        on_error: function(response) {
+        on_error(response) {
             return this.$refs.form.on_error(response);
         },
     }

diff --git a/js/models/reuse.js b/js/models/reuse.js
@@ -23,17 +23,17 @@ export default class Reuse extends Model {
      */
     save(on_error) {
         if (this.id) {
-            return this.update(this, this.on_fetched, on_error);
+            return this.update(this, on_error);
         }
         this.$api('reuses.create_reuse', {payload: this}, this.on_fetched, on_error);
     }
 
-    update(data, on_success, on_error) {
+    update(data, on_error) {
         this.$api('reuses.update_reuse', {
             reuse: this.id,
             payload: data
-        }, on_success, on_error);
+        }, this.on_fetched, on_error);
     }
-};
+}
 
 Reuse.__badges_type__ = 'reuse';
diff --git a/js/views/reuse-edit.vue b/js/views/reuse-edit.vue
@@ -12,12 +12,12 @@ import Reuse from 'models/reuse';
 import FormLayout from 'components/form-layout.vue';
 
 export default {
-    data: function() {
+    components: {FormLayout, ReuseForm},
+    data() {
         return {
             reuse: new Reuse(),
         };
     },
-    components: {FormLayout, ReuseForm},
     computed: {
         title() {
             if (this.reuse.id) {
@@ -29,23 +29,31 @@ export default {
     },
     methods: {
         save() {
-            let form = this.$refs.form;
+            const form = this.$refs.form;
             if (form.validate()) {
-                this.reuse.update(form.serialize(), (response) => {
-                    this.reuse.on_fetched(response);
-                    this.$go({name: 'reuse', params: {oid: this.reuse.id}});
-                }, form.on_error);
+                this.reuse.update(form.serialize(), form.on_error);
             }
         },
+        on_success() {
+            this.$dispatch('notify', {
+                autoclose: true,
+                title: this._('Changes saved'),
+                details: this._('Your reuse has been updated.')
+            });
+            this.$go({name: 'reuse', params: {oid: this.reuse.id}});
+        },
         cancel() {
             this.$go({name: 'reuse', params: {oid: this.reuse.id}});
         }
     },
     route: {
         data() {
             if (this.$route.params.oid !== this.reuse.id) {
-                this.reuse.fetch(this.$route.params.oid);
                 this.$scrollTo(this.$el);
+                this.reuse.fetch(this.$route.params.oid);
+                this.reuse.$once('updated', () => {
+                    this.reuse.$once('updated', this.on_success);
+                });
             }
         }
     }

diff --git a/js/views/reuse-wizard.vue b/js/views/reuse-wizard.vue
@@ -7,7 +7,7 @@ import Reuse from 'models/reuse';
 import API from 'api';
 
 export default {
-    data: function() {
+    data() {
         return {
             reuse: new Reuse(),
             steps: [{
@@ -24,6 +24,9 @@ export default {
                 label: this._('New reuse'),
                 subtitle: this._('Describe your reuse'),
                 component: require('components/reuse/form.vue'),
+                init: (component) => {
+                    this.reuse.$once('updated', this.$refs.wizard.go_next);
+                },
                 next: (component) => {
                     if (component.validate()) {
                         let data = component.serialize();
@@ -32,22 +35,19 @@ export default {
                         }
                         Object.assign(this.reuse, data);
                         this.reuse.save(component.on_error);
-                        this.reuse.$once('updated', () => {
-                            this.$refs.wizard.go_next();
-                        });
                         return false;
                     }
                 }
             }, {
                 label: this._('Datasets'),
                 subtitle: this._('Add some related datasets'),
                 component: require('components/dataset/cards-form.vue'),
+                init: (component) => {
+                    this.reuse.$once('updated', this.$refs.wizard.go_next);
+                },
                 next: (component) => {
                     this.reuse.datasets = component.datasets;
                     this.reuse.save();
-                    this.reuse.$once('updated', () => {
-                        this.$refs.wizard.go_next();
-                    });
                     return false;
                 }
             }, {