re-factor / cleanup

ayanova/src/views/ay-customize.vue

@@ -17,13 +17,13 @@
                 <v-card-text>
                   <v-checkbox
                     v-if="item.hideable"
+                    :ref="item.key"
                     v-model="item.visible"
                     :readonly="formState.readOnly"
                     :label="$ay.t('FormFieldVisible')"
-                    :ref="item.key"
                     :disabled="formState.readOnly"
-                    @change="visibleChanged(item)"
                     :data-cy="item.key + 'Visible'"
+                    @change="visibleChanged(item)"
                   ></v-checkbox>
                   <v-checkbox
                     v-if="!requiredDisabled(item)"
@@ -41,8 +41,8 @@
                     item-text="name"
                     item-value="id"
                     :label="$ay.t('UiFieldDataType')"
-                    @input="dataTypeChanged(item)"
                     :data-cy="item.key + 'SelectType'"
+                    @input="dataTypeChanged(item)"
                   ></v-select>
                   <!-- <v-divider></v-divider>
                   <div>{{ item }}</div> -->
@@ -73,27 +73,6 @@ export default {
       next(false);
     }
   },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
-  async created() {
-    const vm = this;
-    try {
-      await initForm(vm);
-
-      vm.formState.readOnly = !vm.rights.change;
-      window.$gz.eventBus.$on("menu-click", clickHandler);
-      //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
-      generateMenu(vm);
-      //init disable save button so it can be enabled only on edit to show dirty form
-      window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
-    } catch (err) {
-      window.$gz.errorHandler.handleFormError(err, vm);
-    } finally {
-      vm.formState.ready = true;
-      vm.formState.loading = false;
-    }
-  },
   data() {
     return {
       obj: [],
@@ -130,6 +109,27 @@ export default {
       deep: true
     }
   },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
+  async created() {
+    const vm = this;
+    try {
+      await initForm(vm);
+
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      //NOTE: this would normally be in getDataFromAPI but this form doesn't really need that function so doing it here
+      generateMenu(vm);
+      //init disable save button so it can be enabled only on edit to show dirty form
+      window.$gz.eventBus.$emit("menu-disable-item", FORM_KEY + ":save");
+    } catch (err) {
+      window.$gz.errorHandler.handleFormError(err, vm);
+    } finally {
+      vm.formState.ready = true;
+      vm.formState.loading = false;
+    }
+  },
   methods: {
     visibleChanged: function(item) {
       //Note: stock items can't be changed so no need to take that into account
@@ -155,7 +155,7 @@ export default {
       }
       return false;
     },
-    dataTypeChanged: function(item) {
+    dataTypeChanged: function() {
       //nothing to scan here just set form dirty
       this.formState.dirty = true;
     },
@@ -320,7 +320,7 @@ function generateMenu(vm) {
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
   populateSelectionLists(vm);
   await ensureTemplateIsInStore(vm);
   await initDataObject(vm);
@@ -330,7 +330,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   //NOTE: This form expects to arrive here from the form being customized
   //so it does *not* attempt to fetch the translations for the field names of the form in question
   //since they should already be set by that form.