ayanova/devdocs/todo.txt

@@ -5,8 +5,6 @@ PRIORITY - ALWAYS Lowest level stuff first, i.e. TODO at server, api route chang
 WIFI change 5g channel to 52,56,60 and 2g channel to 8 
 	recheck before doing as it seems to vary, maybe someone else's is auto switching
 
-todo: remove all use of .then() as it's being used incorrectly	
-	replace with await and async methods
 
 
 

ayanova/src/views/ops-metrics.vue

@@ -104,18 +104,17 @@ const CHART_PALETTE = {
 };
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        generateMenu(vm);
-        vm.getDataFromApi();
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      generateMenu(vm);
+      vm.getDataFromApi();
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
@@ -192,7 +191,7 @@ export default {
       }
     },
 
-    getDataFromApi(breakPoint) {
+    async getDataFromApi(breakPoint) {
       let vm = this;
       if (vm.formState.loading) {
         return;
@@ -245,41 +244,37 @@ export default {
         filterDates.before;
 
       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 {
-            vm[tabIndexToRoute(vm.tab)] = res.data;
-            vm.lastFetchBreakPoint = breakPoint;
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
-            });
+      try {
+        let res = await window.$gz.api.get(url);
 
-            vm.formState.ready = true;
+        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 {
+          vm[tabIndexToRoute(vm.tab)] = res.data;
+          vm.lastFetchBreakPoint = breakPoint;
           window.$gz.form.setFormState({
             vm: vm,
+            dirty: false,
+            valid: true,
             loading: false
           });
-          window.$gz.errorHandler.handleFormError(error, vm);
+
+          vm.formState.ready = true;
+        }
+      } catch (error) {
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   },
   computed: {

ayanova/src/views/ops-profile.vue

@@ -28,19 +28,18 @@
 const FORM_KEY = "ops-profile";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        generateMenu(vm);
-        // vm.getDataFromApi();
-        this.formState.ready = true;
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      generateMenu(vm);
+      // vm.getDataFromApi();
+      this.formState.ready = true;
+    } catch (err) {
+      vm.formState.ready = true;
+      window.$gz.errorHandler.handleFormError(err, vm);
+    }
   },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);

ayanova/src/views/ops-server-state.vue

@@ -49,33 +49,20 @@ const API_BASE_URL = "server-state/";
 const FORM_CUSTOM_TEMPLATE_KEY = "ops-server-state";
 
 export default {
-  created() {
+  async created() {
     let vm = this;
-    initForm(vm)
-      .then(() => {
-        vm.rights = window.$gz.role.getRights(window.$gz.type.ServerState);
-        vm.formState.readOnly = !vm.rights.change;
-        window.$gz.eventBus.$on("menu-click", clickHandler);
-        vm.getDataFromApi();
-      })
-      .catch(err => {
-        vm.formState.ready = true;
-        window.$gz.errorHandler.handleFormError(err, vm);
-      });
+    try {
+      await initForm(vm);
+
+      vm.rights = window.$gz.role.getRights(window.$gz.type.ServerState);
+      vm.formState.readOnly = !vm.rights.change;
+      window.$gz.eventBus.$on("menu-click", clickHandler);
+      vm.getDataFromApi();
+    } 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) {
-  //         next();
-  //       } else {
-  //         next(false);
-  //       }
-  //     });
-  //   } else {
-  //     next();
-  //   }
-  // },
   beforeDestroy() {
     window.$gz.eventBus.$off("menu-click", clickHandler);
   },
@@ -134,42 +121,41 @@ export default {
         window.$gz.form.fieldValueChanged(this, ref);
       }
     },
-    getDataFromApi() {
+    async getDataFromApi() {
       let vm = this;
       vm.formState.loading = true;
       let url = API_BASE_URL;
       window.$gz.form.deleteAllErrorBoxErrors(vm);
-      window.$gz.api
-        .get(url)
-        .then(res => {
-          vm.formState.ready = true;
-          if (res.error) {
-            vm.formState.serverError = res.error;
-            window.$gz.form.setErrorBoxErrors(vm);
-          } else {
-            vm.obj = res.data;
+      try {
+        let res = await window.$gz.api.get(url);
+
+        vm.formState.ready = true;
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          vm.obj = res.data;
 
-            //Update the form status
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false,
-              valid: true,
-              loading: false
-            });
-            //modify the menu as necessary
-            generateMenu(vm);
-          }
-        })
-        .catch(function handleGetDataFromAPIError(error) {
           //Update the form status
           window.$gz.form.setFormState({
             vm: vm,
+            dirty: false,
+            valid: true,
             loading: false
           });
-          window.$gz.errorHandler.handleFormError(error, vm);
+          //modify the menu as necessary
+          generateMenu(vm);
+        }
+      } 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;
@@ -177,49 +163,48 @@ 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 => {
-            vm.formState.loading = false;
-            if (res.error) {
-              vm.formState.serverError = res.error;
-              window.$gz.form.setErrorBoxErrors(vm);
-            } else {
-              //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
+        try {
+          let res = await window.$gz.api.upsert(url, vm.obj);
 
-              //Handle "put" of an existing record (UPDATE)
-              vm.obj.concurrency = res.data.concurrency;
-              window.$gz.form.setFormState({
-                vm: vm,
-                dirty: false
-              });
+          vm.formState.loading = false;
+          if (res.error) {
+            vm.formState.serverError = res.error;
+            window.$gz.form.setErrorBoxErrors(vm);
+          } else {
+            //UserOptions is never a POST as it always exists and can't be deleted so always a PUT
 
-              //Set values in store so they are updated immediately for user
-              let l = vm.$store.state.locale;
+            //Handle "put" of an existing record (UPDATE)
+            vm.obj.concurrency = res.data.concurrency;
+            window.$gz.form.setFormState({
+              vm: vm,
+              dirty: false
+            });
 
-              if (vm.obj.languageOverride) {
-                l.languageOverride = vm.obj.languageOverride;
-              }
+            //Set values in store so they are updated immediately for user
+            let l = vm.$store.state.locale;
 
-              if (vm.obj.timeZoneOverride) {
-                l.timeZoneOverride = vm.obj.timeZoneOverride;
-              }
-
-              if (vm.obj.currencyName) {
-                l.currencyName = vm.obj.currencyName;
-              }
-
-              if (vm.obj.hour12) {
-                l.hour12 = vm.obj.hour12;
-              }
-
-              window.$gz.store.commit("setLocale", l);
+            if (vm.obj.languageOverride) {
+              l.languageOverride = vm.obj.languageOverride;
             }
-          })
-          .catch(function handleSubmitError(error) {
-            vm.formState.loading = false;
-            window.$gz.errorHandler.handleFormError(error, vm);
-          });
+
+            if (vm.obj.timeZoneOverride) {
+              l.timeZoneOverride = vm.obj.timeZoneOverride;
+            }
+
+            if (vm.obj.currencyName) {
+              l.currencyName = vm.obj.currencyName;
+            }
+
+            if (vm.obj.hour12) {
+              l.hour12 = vm.obj.hour12;
+            }
+
+            window.$gz.store.commit("setLocale", l);
+          }
+        } catch (error) {
+          vm.formState.loading = false;
+          window.$gz.errorHandler.handleFormError(error, vm);
+        }
       }
     }
   }

ayanova/tests/e2e/specs/jwt-example.js

@@ -7,7 +7,7 @@
 //     password: Cypress.env("adminpassword")
 //   })
 //     .its("body")
-//     .then(res => {
+//     .thsden(res => {
 //       user = res;
 //     });
 // });

ayanova/tests/e2e/specs/search-form.js

@@ -36,7 +36,7 @@ describe("SEARCH", () => {
     let sub = null;
     //funcs are async so need to get result via then
 
-    // cy.url().then(url => {
+    // cy.url().thsen(url => {
     //     startUrl = url;
     //   });