ayanova/src/views/ops-log.vue

@@ -37,20 +37,20 @@
 const FORM_KEY = "ops-logs";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        vm.formState.ready = true;
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        generateMenu(vm);
-        vm.getDataFromApi();
-        vm.formState.loading = false;
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+
+      vm.formState.ready = true;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      generateMenu(vm);
+      vm.getDataFromApi();
+      vm.formState.loading = false;
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
   },
   data() {
     return {
@@ -93,7 +93,7 @@ export default {
     logSelected: function() {
       this.getDataFromApi();
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       if (!vm.selectedLog) {
         return;
@@ -101,44 +101,40 @@ export default {
       vm.formState.loading = true;
       let url = "log-file/" + vm.selectedLog;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
-          if (res.error) {
-            if (res.error.code == "2010") {
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
-              window.$gz._.delay(function() {
-                vm.$router.go(-1);
-              }, 2000);
-            }
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          } else {
-            if (res) {
-              vm.log = res;
-            } else {
-              vm.log = vm.$ay.t("NoData");
-            }
+      try {
+        let res = await window.$gz.api.get(url);
 
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
-            });
-            // generateMenu(vm);
+        if (res.error) {
+          if (res.error.code == "2010") {
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
+            window.$gz._.delay(function() {
+              vm.$router.go(-1);
+            }, 2000);
           }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          if (res) {
+            vm.log = res;
+          } else {
+            vm.log = vm.$ay.t("NoData");
+          }
+
           window.$gz.form.setFormState({
             vm: vm,
+            dirty: false,
+            valid: true,
             loading: false
           });
-          window.$gz.errorHandler.handleFormError(error, vm);
+          // generateMenu(vm);
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   }
 };
@@ -220,13 +216,12 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-function populateSelectionLists(vm) {
-  return window.$gz.api.get("log-file").then(res => {
-    if (res.error) {
-      window.$gz.errorHandler.handleFormError(res.error, vm);
-    } else {
-      vm.selectLists.serverLogs = res.data;
-    }
-  });
+async function populateSelectionLists(vm) {
+  let res = await window.$gz.api.get("log-file");
+  if (res.error) {
+    window.$gz.errorHandler.handleFormError(res.error, vm);
+  } else {
+    vm.selectLists.serverLogs = res.data;
+  }
 }
 </script>