re-factor / cleanup

ayanova/src/views/ay-about.vue

@@ -1,5 +1,5 @@
 <template>
-  <v-row v-if="this.formState.ready">
+  <v-row v-if="formState.ready">
     <gz-error :error-box-message="formState.errorBoxMessage"></gz-error>
     <v-col>
       <v-card id="ayaNovaVersioncard" data-cy="versionCard">
@@ -10,7 +10,7 @@
         </div>
         <div>
           <span class="ml-6 text-body-1">{{ $ay.t("User") }}: </span>
-          <span class="text-body-2">{{ this.$store.state.userName }}</span>
+          <span class="text-body-2">{{ $store.state.userName }}</span>
         </div>
 
         <div>
@@ -48,7 +48,7 @@
         <v-subheader>{{ $ay.t("Server") }}</v-subheader>
         <div>
           <span class="ml-6 text-body-1">{{ $ay.t("ServerAddress") }}: </span>
-          <span class="text-body-2">{{ this.$store.state.apiUrl }}</span>
+          <span class="text-body-2">{{ $store.state.apiUrl }}</span>
         </div>
         <div>
           <span class="ml-6 text-body-1">{{ $ay.t("Version") }}: </span>
@@ -130,6 +130,20 @@
 <script>
 import ayaNovaVersion from "../api/ayanova-version";
 export default {
+  data() {
+    return {
+      serverInfo: { license: { license: {} } },
+      clientInfo: {},
+      browser: {},
+      formState: {
+        ready: false,
+        loading: true,
+        errorBoxMessage: null,
+        appError: null,
+        serverError: {}
+      }
+    };
+  },
   async created() {
     const vm = this;
     try {
@@ -150,20 +164,6 @@ export default {
     this.clientInfo = {};
     this.clientInfo = ayaNovaVersion;
   },
-  data() {
-    return {
-      serverInfo: { license: { license: {} } },
-      clientInfo: {},
-      browser: {},
-      formState: {
-        ready: false,
-        loading: true,
-        errorBoxMessage: null,
-        appError: null,
-        serverError: {}
-      }
-    };
-  },
   methods: {
     translation() {
       return window.$gz.translation;
@@ -231,13 +231,15 @@ function clickHandler(menuItem) {
         break;
       case "copysupportinfo":
         //put the support info on the clipboard:
-        const element = document.getElementById("ayaNovaVersioncard");
-        const text = element.innerText || element.textContent;
-        let logText = "";
-        m.vm.$store.state.logArray.forEach(function appendLogItem(value) {
-          logText += value + "\n";
-        });
-        window.$gz.util.copyToClipboard(text + "\nCLIENT LOG\n" + logText);
+        {
+          const element = document.getElementById("ayaNovaVersioncard");
+          const text = element.innerText || element.textContent;
+          let logText = "";
+          m.vm.$store.state.logArray.forEach(function appendLogItem(value) {
+            logText += value + "\n";
+          });
+          window.$gz.util.copyToClipboard(text + "\nCLIENT LOG\n" + logText);
+        }
         break;
       default:
         window.$gz.eventBus.$emit(
@@ -252,7 +254,7 @@ function clickHandler(menuItem) {
 //
 //
 async function initForm(vm) {
-  await fetchTranslatedText(vm);
+  await fetchTranslatedText();
   await getServerInfo(vm);
   getBrowserInfo(vm);
 }
@@ -261,7 +263,7 @@ async function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-async function fetchTranslatedText(vm) {
+async function fetchTranslatedText() {
   await window.$gz.translation.cacheTranslations([
     "HelpAboutAyaNova",
     "HelpTechSupport",
@@ -291,7 +293,7 @@ async function fetchTranslatedText(vm) {
 //
 async function getServerInfo(vm) {
   const res = await window.$gz.api.get("server-info");
-  if (!res.hasOwnProperty("data")) {
+  if (!Object.prototype.hasOwnProperty.call(res, "data")) {
     return Promise.reject(res);
   } else {
     vm.serverInfo = res.data;