ayanova/src/views/ay-history.vue

@@ -111,21 +111,20 @@ const FORM_KEY = "ay-history";
 const API_BASE_URL = "event-log/";
 const DEFAULT_EVENTS_PAGE_SIZE = 200;
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
+    try {
+      await initForm(vm);
+
       vm.readOnly = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       generateMenu(vm, false);
       vm.getDataFromApi();
-      })
-      .catch(err => {
+    } catch (err) {
       window.$gz.errorHandler.handleFormError(err, vm);
-      })
-      .finally(function() {
+    } finally {
       vm.formState.ready = true;
-      });
+    }
   },
   data() {
     return {
@@ -244,7 +243,7 @@ export default {
           return "primary";
       }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       if (vm.formState.loading) {
         return;
@@ -270,18 +269,14 @@ export default {
       //paging
       url += "&Offset=" + vm.page * DEFAULT_EVENTS_PAGE_SIZE;
       url += "&limit=" + DEFAULT_EVENTS_PAGE_SIZE;
+      try {
+        let res = await window.$gz.api.get(url);
 
-      window.$gz.api
-        .get(url)
-        .then(res => {
         if (res.error) {
           //Not found?
           if (res.error.code == "2010") {
             //notify not found error then navigate backwards
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
             // navigate backwards
             window.$gz._.delay(function() {
               vm.$router.go(-1);
@@ -290,8 +285,7 @@ export default {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-            vm.moreAvailable =
-              res.data.events.length == DEFAULT_EVENTS_PAGE_SIZE;
+          vm.moreAvailable = res.data.events.length == DEFAULT_EVENTS_PAGE_SIZE;
           vm.name = res.data.name;
           let temp = res.data.events;
           let currentEventCount = vm.obj.length;
@@ -299,9 +293,7 @@ export default {
           let languageName = window.$gz.locale.getBrowserLanguages();
           let hour12 = window.$gz.store.state.locale.hour12;
           for (let i = 0; i < temp.length; i++) {
-              temp[
-                i
-              ].date = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
+            temp[i].date = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
               temp[i].date,
               timeZoneName,
               languageName,
@@ -323,15 +315,14 @@ export default {
           //modify the menu as necessary
           //  generateMenu(vm);
         }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+      } catch (error) {
         //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
         });
         window.$gz.errorHandler.handleFormError(error, vm);
-        });
+      }
     }
   }
 };
@@ -388,8 +379,8 @@ function initForm(vm) {
 //////////////////////
 //
 //
-function populateAyaTypeList(vm) {
-  return window.$gz.enums.fetchEnumList("ayatype").then(() => {
+async function populateAyaTypeList(vm) {
+  await window.$gz.enums.fetchEnumList("ayatype");
   let ayt = window.$gz.enums.getSelectionList("ayatype");
   let temp = {};
   for (let i = 0; i < ayt.length; i++) {
@@ -411,7 +402,6 @@ function populateAyaTypeList(vm) {
     };
   }
   vm.ayaTypes = temp;
-  });
 }
 
 /////////////////////////////////

ayanova/src/views/ay-log.vue

@@ -10,7 +10,7 @@
 <script>
 /*  Xeslint-disable */
 export default {
-  created() {
+  async created() {
     let vm = this;
     window.$gz.eventBus.$emit("menu-change", {
       isMain: false,
@@ -28,13 +28,13 @@ export default {
       outText += value + "\n";
     });
     this.logText = outText;
-    window.$gz.translation
-      .fetch(["Log"])
-      .then(() => (vm.formState.ready = true))
-      .catch(err => {
+    try {
+      await window.$gz.translation.fetch(["Log"]);
+      vm.formState.ready = true;
+    } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    }
   },
   data() {
     return {

ayanova/src/views/home-password.vue

@@ -92,10 +92,11 @@ const FORM_KEY = "home-password";
 const API_BASE_URL = "auth/changepassword";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
+    try {
+      await initForm(vm);
+
       vm.rights = window.$gz.role.fullRightsObject();
       generateMenu(vm);
       vm.formState.ready = true;
@@ -121,24 +122,21 @@ export default {
         this.obj.oldPassword = "l3tm3in";
       }
       //------------------
-      })
-      .catch(err => {
+    } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    }
   },
-  beforeRouteLeave(to, from, next) {
-    if (this.formState.dirty) {
-      window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => {
-        if (dialogResult == true) {
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
       next();
     } else {
       next(false);
     }
-      });
-    } else {
-      next();
-    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -203,8 +201,7 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
-
-    submit() {
+    async submit() {
       let vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
@@ -214,9 +211,9 @@ export default {
 
         //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        window.$gz.api
-          .upsert(url, vm.obj)
-          .then(res => {
+        try {
+          let res = await window.$gz.api.upsert(url, vm.obj);
+
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
@@ -227,13 +224,11 @@ export default {
               dirty: false
             });
           }
-          })
-          .catch(function handleSubmitError(error) {
+        } catch (error) {
           window.$gz.errorHandler.handleFormError(error, vm);
-          })
-          .finally(function() {
+        } finally {
           vm.loading = false;
-          });
+        }
       }
     }
   }

ayanova/src/views/home-search.vue

@@ -107,10 +107,11 @@ export default {
 
     next();
   },
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
+    try {
+      await initForm(vm);
+
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       generateMenu(vm);
@@ -135,11 +136,10 @@ export default {
           vm.items = savedSettings.items;
         }
       }
-      })
-      .catch(err => {
+    } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -176,7 +176,7 @@ export default {
         id: item.id
       });
     },
-    getExcerpt(item) {
+    async getExcerpt(item) {
       let vm = this;
       //Search/Info/2/1?phrase=we
       if (item.info || item.id == 0) {
@@ -203,9 +203,8 @@ export default {
         default:
           max = 40;
       }
-
-      window.$gz.api
-        .get(
+      try {
+        let res = await window.$gz.api.get(
           API_BASE_URL +
             "Info/" +
             item.type +
@@ -215,8 +214,8 @@ export default {
             vm.searchPhrase +
             "&max=" +
             max
-        )
-        .then(res => {
+        );
+
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
@@ -235,17 +234,15 @@ export default {
 
           item.info = showInfo;
         }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+      } catch (error) {
         window.$gz.errorHandler.handleFormError(error, vm);
-        });
+      }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       if (!vm.searchPhrase || vm.formState.loading) {
         return;
       }
-
       vm.formState.loading = true;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
       /**
@@ -257,22 +254,18 @@ export default {
 }
  * 
  */
-
-      window.$gz.api
-        .upsert(API_BASE_URL, {
+      try {
+        let res = await window.$gz.api.upsert(API_BASE_URL, {
           phrase: vm.searchPhrase,
           nameOnly: false,
           typeOnly: !!vm.searchObjectType ? vm.searchObjectType : 0,
           maxResults: MAX_RESULTS
-        })
-
-        .then(res => {
+        });
         if (res.error) {
           vm.formState.serverError = res.error;
           window.$gz.form.setErrorBoxErrors(vm);
         } else {
-            vm.maxResultsReturned =
-              res.data.searchResults.length == MAX_RESULTS;
+          vm.maxResultsReturned = res.data.searchResults.length == MAX_RESULTS;
           let newResults = [];
           let nDex = 0;
           let lastType = -1;
@@ -284,34 +277,29 @@ export default {
                 "id",
                 item.type
               ]);
-
               if (tsub != null) {
                 item.subheader = tsub.name;
               } else {
                 item.subheader = "TYPE " + item.type;
               }
-
               item.icon = window.$gz.util.iconForType(item.type);
               lastType = item.type;
             }
             item.info = null;
             item.index = ++nDex;
-
             newResults.push(item);
           }
           vm.items = newResults;
         }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+      } catch (error) {
         window.$gz.errorHandler.handleFormError(error, vm);
-        })
-        .finally(function() {
+      } finally {
         //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
         });
-        });
+      }
     }
   }
 };
@@ -386,14 +374,13 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-function populateSelectionLists(vm) {
-  return window.$gz.api.get("enum-list/list/Core").then(res => {
+async function populateSelectionLists(vm) {
+  let res = await window.$gz.api.get("enum-list/list/Core");
   if (res.error) {
     window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.objectTypes = res.data;
     window.$gz.form.addNoSelectionItem(vm.selectLists.objectTypes);
   }
-  });
 }
 </script>

ayanova/src/views/home-user-settings.vue

@@ -121,10 +121,11 @@ const API_BASE_URL = "user-option/";
 const FORM_CUSTOM_TEMPLATE_KEY = "Useroptions";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
+    try {
+      await initForm(vm);
+
       vm.rights = window.$gz.role.getRights(window.$gz.type.UserOptions);
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
@@ -136,24 +137,21 @@ export default {
       //id 0 means create a new record don't load one but thats not applicable here
 
       vm.getDataFromApi();
-      })
-      .catch(err => {
+    } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    }
   },
-  beforeRouteLeave(to, from, next) {
-    if (this.formState.dirty) {
-      window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => {
-        if (dialogResult == true) {
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
       next();
     } else {
       next(false);
     }
-      });
-    } else {
-      next();
-    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -243,25 +241,20 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       vm.formState.loading = true;
       //always fetch on this form for the current logged in user id
       let url = API_BASE_URL + vm.$store.state.userId;
-
       window.$gz.form.deleteAllErrorBoxErrors(vm);
+      try {
+        let res = await window.$gz.api.get(url);
 
-      window.$gz.api
-        .get(url)
-        .then(res => {
         if (res.error) {
           //Not found?
           if (res.error.code == "2010") {
             //notify not found error then navigate backwards
-              window.$gz.eventBus.$emit(
-                "notify-error",
-                vm.$ay.t("ErrorAPI2010")
-              );
+            window.$gz.eventBus.$emit("notify-error", vm.$ay.t("ErrorAPI2010"));
             // navigate backwards
             window.$gz._.delay(function() {
               vm.$router.go(-1);
@@ -282,17 +275,16 @@ export default {
           //modify the menu as necessary
           generateMenu(vm);
         }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
+      } catch (error) {
         //Update the form status
         window.$gz.form.setFormState({
           vm: vm,
           loading: false
         });
         window.$gz.errorHandler.handleFormError(error, vm);
-        });
+      }
     },
-    submit() {
+    async submit() {
       let vm = this;
       if (vm.canSave) {
         vm.formState.loading = true;
@@ -302,9 +294,9 @@ export default {
 
         //clear any errors vm might be around from previous submit
         window.$gz.form.deleteAllErrorBoxErrors(vm);
-        window.$gz.api
-          .upsert(url, vm.obj)
-          .then(res => {
+        try {
+          let res = await window.$gz.api.upsert(url, vm.obj);
+
           vm.formState.loading = false;
           if (res.error) {
             vm.formState.serverError = res.error;
@@ -340,11 +332,10 @@ export default {
 
             window.$gz.store.commit("setLocale", l);
           }
-          })
-          .catch(function handleSubmitError(error) {
+        } catch (error) {
           vm.formState.loading = false;
           window.$gz.errorHandler.handleFormError(error, vm);
-          });
+        }
       }
     }
   }
@@ -446,15 +437,14 @@ async function fetchTranslatedText(vm) {
 //////////////////////
 //
 //
-function populateSelectionLists(vm) {
+async function populateSelectionLists(vm) {
   //http://localhost:7575/api/v8/translation/list
-  return window.$gz.api.get("translation/list").then(res => {
+  let res = await window.$gz.api.get("translation/list");
   if (res.error) {
     window.$gz.errorHandler.handleFormError(res.error, vm);
   } else {
     vm.selectLists.translations = res.data;
   }
-  });
 }
 </script>
 

ayanova/src/views/ops-backup.vue

@@ -98,34 +98,32 @@
 const FORM_KEY = "ops-backup";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
+    try {
+      await initForm(vm);
+
       vm.rights = window.$gz.role.getRights(window.$gz.type.GlobalOps);
       vm.formState.readOnly = !vm.rights.change;
       vm.formState.ready = true;
       window.$gz.eventBus.$on("menu-click", clickHandler);
       vm.getDataFromApi();
       vm.getBackupStatus();
-      })
-      .catch(err => {
+    } catch (err) {
       vm.formState.ready = true;
       window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    }
   },
-  beforeRouteLeave(to, from, next) {
-    if (this.formState.dirty) {
-      window.$gz.dialog.confirmLeaveUnsaved().then(dialogResult => {
-        if (dialogResult == true) {
+  async beforeRouteLeave(to, from, next) {
+    if (!this.formState.dirty) {
+      next();
+      return;
+    }
+    if ((await window.$gz.dialog.confirmLeaveUnsaved()) === true) {
       next();
     } else {
       next(false);
     }
-      });
-    } else {
-      next();
-    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);