re-factor / cleanup

ayanova/src/views/home-notifications.vue

@@ -4,15 +4,15 @@
       <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
       <v-col rows="12">
         <div
-          class="text-center text-h4"
           v-if="obj.length == 0"
+          class="text-center text-h4"
           data-cy="notifications"
         >
           <span>{{ $ay.t("NoData") }}</span>
         </div>
         <v-timeline
-          :dense="$vuetify.breakpoint.smAndDown"
           v-if="obj.length > 0"
+          :dense="$vuetify.breakpoint.smAndDown"
           data-cy="notifications"
         >
           <v-timeline-item
@@ -40,7 +40,7 @@
                     >{{ i.uiayatype }}</v-btn
                   >
                 </template>
-                <div class="mt-4" v-if="i.message">
+                <div v-if="i.message" class="mt-4">
                   <pre>{{ i.message }}</pre>
                 </div>
               </v-card-text>
@@ -48,9 +48,9 @@
               <v-card-actions>
                 <v-btn text @click="deleteItem(i)">{{ $ay.t("Delete") }}</v-btn>
                 <v-btn
+                  v-if="i.eventType != 27"
                   text
                   @click="openSubscription(i)"
-                  v-if="i.eventType != 27"
                   >{{ $ay.t("Open") }}</v-btn
                 >
               </v-card-actions>
@@ -65,23 +65,6 @@
 <script>
 const FORM_KEY = "notifications";
 export default {
-  async created() {
-    const vm = this;
-    try {
-      await initForm(vm);
-
-      window.$gz.eventBus.$on("menu-click", clickHandler);
-      generateMenu(vm, false);
-      await vm.getDataFromApi();
-    } catch (err) {
-      window.$gz.errorHandler.handleFormError(err, vm);
-    } finally {
-      vm.formState.ready = true;
-    }
-  },
-  beforeDestroy() {
-    window.$gz.eventBus.$off("menu-click", clickHandler);
-  },
   data() {
     return {
       selectLists: {
@@ -102,6 +85,23 @@ export default {
       rights: window.$gz.role.defaultRightsObject()
     };
   },
+  async created() {
+    const vm = this;
+    try {
+      await initForm(vm);
+
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      generateMenu(vm, false);
+      await vm.getDataFromApi();
+    } catch (err) {
+      window.$gz.errorHandler.handleFormError(err, vm);
+    } finally {
+      vm.formState.ready = true;
+    }
+  },
+  beforeDestroy() {
+    window.$gz.eventBus.$off("menu-click", clickHandler);
+  },
   methods: {
     openItem(item) {
       window.$gz.eventBus.$emit("openobject", {
@@ -286,7 +286,7 @@ function generateMenu(vm) {
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
   await populateSelectionLists(vm);
 }
 
@@ -294,7 +294,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "NotifySubscription",
     "Server",