re-factor / cleanup

ayanova/src/views/ay-evaluate.vue

@@ -11,17 +11,18 @@
               {{ $ay.t("ErrorSecurityAdministratorOnlyMessage") }}
             </div>
             <v-select
+              ref="seedLevel"
               v-model="obj.seedLevel"
               :items="selectLists.seedLevels"
               :rules="[form().required(this, 'seedLevel')]"
-              @input="fieldValueChanged('seedLevel')"
-              ref="seedLevel"
               item-text="name"
               item-value="id"
               :readonly="formState.readOnly"
               :label="$ay.t('SeedLevel')"
+              @input="fieldValueChanged('seedLevel')"
             ></v-select>
             <v-text-field
+              ref="timeZoneOffset"
               v-model="obj.timeZoneOffset"
               :readonly="formState.readOnly"
               :rules="[
@@ -30,7 +31,6 @@
               ]"
               :label="$ay.t('UserTimeZoneOffset')"
               type="number"
-              ref="timeZoneOffset"
               @input="fieldValueChanged('timeZoneOffset')"
             ></v-text-field>
           </v-card-text>
@@ -47,8 +47,8 @@
               :loading="seedingJobActive"
               color="blue darken-1"
               text
-              @click="generate()"
               data-cy="btnStart"
+              @click="generate()"
               >{{ $ay.t("StartJob") }}</v-btn
             >
           </v-card-actions>
@@ -74,8 +74,8 @@
                   large
                   color="primary"
                   text
-                  @click="helpEvaluate()"
                   class="my-8 mr-16"
+                  @click="helpEvaluate()"
                   >{{ $ay.t("EvaluationGuide") }}</v-btn
                 >
                 <v-btn
@@ -91,9 +91,9 @@
                   large
                   color="primary"
                   text
-                  @click="seedDialog = !seedDialog"
                   class="my-8 mr-12"
                   data-cy="btnSeed"
+                  @click="seedDialog = !seedDialog"
                   >{{ $ay.t("GenerateSampleData") }}</v-btn
                 >
               </v-col>
@@ -107,26 +107,6 @@
 <script>
 const FORM_KEY = "ay-evaluate";
 export default {
-  async created() {
-    const vm = this;
-    try {
-      await initForm(vm);
-      vm.obj.timeZoneOffset =
-        Math.floor(new Date().getTimezoneOffset() / 60) * -1;
-      vm.rights = window.$gz.role.getRights(window.$gz.type.TrialSeeder);
-      vm.formState.readOnly = !vm.rights.change;
-      generateMenu(vm);
-      vm.formState.ready = true;
-      vm.formState.loading = false;
-      window.$gz.eventBus.$on("menu-click", clickHandler);
-    } catch (err) {
-      vm.formState.ready = true;
-      window.$gz.errorHandler.handleFormError(err, vm);
-    }
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
   components: {},
   data() {
     return {
@@ -153,6 +133,26 @@ export default {
       rights: window.$gz.role.fullRightsObject()
     };
   },
+  async created() {
+    const vm = this;
+    try {
+      await initForm(vm);
+      vm.obj.timeZoneOffset =
+        Math.floor(new Date().getTimezoneOffset() / 60) * -1;
+      vm.rights = window.$gz.role.getRights(window.$gz.type.TrialSeeder);
+      vm.formState.readOnly = !vm.rights.change;
+      generateMenu(vm);
+      vm.formState.ready = true;
+      vm.formState.loading = false;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
   methods: {
     form() {
       return window.$gz.form;
@@ -257,7 +257,7 @@ function clickHandler(menuItem) {
 //////////////////////
 //
 //
-function generateMenu(vm) {
+function generateMenu() {
   const menuOptions = {
     isMain: true,
     icon: "$ayiRocket",
@@ -273,7 +273,7 @@ function generateMenu(vm) {
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
   populateSelectionLists(vm);
 }
 
@@ -281,7 +281,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "Welcome",
     "GenerateSampleData",