ayanova/src/views/adm-global-select-templates.vue

@@ -284,7 +284,7 @@ export default {
         window.$gz.errorHandler.handleFormError(error, vm);
       }
     },
-    submit() {
+    async submit() {
       let vm = this;
       let url = API_BASE_URL;
       //clear any errors vm might be around from previous submit
@@ -306,64 +306,64 @@ export default {
           });
         }
       }
-      //now set the template as a json string
-      newObj.template = JSON.stringify(temp);
-      window.$gz.api
-        .upsert(url, newObj)
-        .then(res => {
-          vm.formState.loading = false;
+      try {
+        //now set the template as a json string
+        newObj.template = JSON.stringify(temp);
+        let res = await window.$gz.api.upsert(url, newObj);
+
+        vm.formState.loading = false;
+        if (res.error) {
+          vm.formState.serverError = res.error;
+          window.$gz.form.setErrorBoxErrors(vm);
+        } else {
+          //It's a 204 no data response so no error means it's ok
+          //form is now clean
+          window.$gz.form.setFormState({
+            vm: vm,
+            dirty: false
+          });
+        }
+      } catch (error) {
+        vm.formState.loading = false;
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
+    },
+    async remove() {
+      let vm = this;
+      if (
+        (await window.$gz.dialog.confirmGeneric(
+          "ResetToDefault",
+          "warning"
+        )) !== true
+      ) {
+        return;
+      }
+      try {
+        //do the delete
+        vm.formState.loading = true;
+        //No need to delete a new record, just abandon it...
+        if (vm.templateId && vm.templateId != 0) {
+          let url = API_BASE_URL + vm.templateId;
+
+          window.$gz.form.deleteAllErrorBoxErrors(vm);
+          let res = await window.$gz.api.remove(url);
+
           if (res.error) {
             vm.formState.serverError = res.error;
             window.$gz.form.setErrorBoxErrors(vm);
           } else {
-            //It's a 204 no data response so no error means it's ok
-            //form is now clean
-            window.$gz.form.setFormState({
-              vm: vm,
-              dirty: false
-            });
-          }
-        })
-        .catch(function handleSubmitError(error) {
-          vm.formState.loading = false;
-          window.$gz.errorHandler.handleFormError(error, vm);
-        });
-    },
-    remove() {
-      let vm = this;
-      window.$gz.dialog
-        .confirmGeneric("ResetToDefault", "warning")
-        .then(dialogResult => {
-          if (dialogResult == true) {
-            //do the delete
-            vm.formState.loading = true;
-            //No need to delete a new record, just abandon it...
-            if (vm.templateId && vm.templateId != 0) {
-              let url = API_BASE_URL + vm.templateId;
-
-              window.$gz.form.deleteAllErrorBoxErrors(vm);
-              window.$gz.api
-                .remove(url)
-                .then(res => {
-                  if (res.error) {
-                    vm.formState.serverError = res.error;
-                    window.$gz.form.setErrorBoxErrors(vm);
-                  } else {
-                    //trigger reload of form
-                    this.getDataFromApi();
-                  }
-                })
-                .catch(function handleGetDataFromAPIError(error) {
-                  //Update the form status
-                  window.$gz.form.setFormState({
-                    vm: vm,
-                    loading: false
-                  });
-                  window.$gz.errorHandler.handleFormError(error, vm);
-                });
-            }
+            //trigger reload of form
+            this.getDataFromApi();
           }
+        }
+      } catch (error) {
+        //Update the form status
+        window.$gz.form.setFormState({
+          vm: vm,
+          loading: false
         });
+        window.$gz.errorHandler.handleFormError(error, vm);
+      }
     }
   }
 };
@@ -453,24 +453,21 @@ function initForm(vm) {
 //
 // Ensures UI translated text is available
 //
-function fetchTranslatedText(vm) {
-  let tKeysRequired = ["Include", "ResetToDefault"];
-
-  return window.$gz.translation.cacheTranslations(tKeysRequired);
+async function fetchTranslatedText(vm) {
+  await window.$gz.translation.cacheTranslations(["Include", "ResetToDefault"]);
 }
 
 //////////////////////
 //
 //
-function populateSelectionLists(vm) {
-  return window.$gz.api.get(API_BASE_URL + "List").then(res => {
-    if (res.error) {
-      window.$gz.errorHandler.handleFormError(res.error, vm);
-    } else {
-      vm.selectLists.pickListTemplates = res.data;
-      window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates);
-    }
-  });
+async function populateSelectionLists(vm) {
+  let res = await window.$gz.api.get(API_BASE_URL + "List");
+  if (res.error) {
+    window.$gz.errorHandler.handleFormError(res.error, vm);
+  } else {
+    vm.selectLists.pickListTemplates = res.data;
+    window.$gz.form.addNoSelectionItem(vm.selectLists.pickListTemplates);
+  }
 }
 
 ////////////////////