ayanova/devdocs/todo.txt

@@ -49,8 +49,7 @@ CURRENT TODOs
 
 @@@@@@@@@@@ ROADMAP STAGE 2:
 
-todo: what is vm.loading used for?
+todo: search form docs, jesus
-	- generally preventing a loading a second time, but it's not checked for at the start in all cases so need to pick through and ensure that
 
 todo: RECORD HISTORY
 	- implement in stubbed out separate page

ayanova/src/api/gzform.js

@@ -65,15 +65,7 @@ function getControl(vm, ref) {
 //
 function getControlValue(ctrl) {
   let value = ctrl.value;
-  // if(value==undefined){
-  //   debugger;
-  //   if(ctrl._props){
-  //     let subvalue=ctrl._props;
-
-  //   }
-  // }
   return value;
-  //vm.$refs["customFields"]._computedWatchers.c2.value
 }
 
 ////////////////////////////////////

ayanova/src/api/translation.js

@@ -2,7 +2,6 @@
 //AyaNova Translation related utilities
 export default {
   get(key) {
-    // debugger;
     if (!window.$gz._.has(window.$gz.store.state.translationText, key)) {
       return "??" + key;
     }

ayanova/src/components/custom-fields-control.vue

@@ -474,7 +474,6 @@ export default {
   },
   created() {
     if (this.$ay.dev) {
-      //debugger;
       if (!this.formKey) {
         throw "custom-fields-control: formKey property is required and missing";
       }

ayanova/src/components/gz-data-table.vue

@@ -533,7 +533,7 @@ export default {
               vm.headers = buildHeaders(res.columns);
               //Post process data here and then set vm.records
               vm.records = buildRecords(res.data, res.columns);
-              vm.loading = false;
+
               vm.totalRecords = res.totalRecordCount;
               //Put back selected items
               vm.selected = [...preSelected];
@@ -545,8 +545,11 @@ export default {
           }
         })
         .catch(err => {
-          vm.formState.ready = true;
           window.$gz.errorHandler.handleFormError(err, vm);
+        })
+        .finally(function() {
+          vm.loading = false;
+          vm.formState.ready = true;
         });
     }
   },
@@ -565,7 +568,6 @@ export default {
 
 //Called by getDataFromApi on retrieval of list with columnData
 function buildHeaders(columnData) {
-  //debugger;
   //iterate columns, build headers and return
   if (!columnData) {
     return [];

ayanova/src/components/report-selector-control.vue

@@ -71,7 +71,6 @@ export default {
   },
   methods: {
     open() {
-      //debugger;
       //get report list from server
       //for now we'll fake it
       let fakeReportList = [];

ayanova/src/views/ay-data-list-view.vue

@@ -745,7 +745,6 @@ export default {
               window.$gz.form.setFormSettings(vm.formKey, formSettings);
 
               //Logic for detecting if a post or put: if id then it was a post, if no id then it was a put
-              // debugger;
               if (res.data.id) {
                 //Handle "post" of new record (CREATE)
 
@@ -843,7 +842,6 @@ export default {
         window.$gz.api
           .duplicate(url)
           .then(res => {
-            // debugger;
             vm.formState.loading = false;
             if (res.error) {
               vm.formState.serverError = res.error;
@@ -1322,7 +1320,6 @@ function initDataObject(vm) {
   }
 
   //Pass 2, remaining fields not already dealt with
-  //debugger;
   for (let i = 0; i < vm.fieldDefinitions.length; i++) {
     let fld = vm.fieldDefinitions[i];
 
@@ -1457,7 +1454,6 @@ function getDisplayForFilter(
       valueDisplay = window.$gz.locale.decimalLocalized(filterValue);
       break;
     case 6: //BOOL translate
-      //debugger;
       let tKey = filterValue ? "True" : "False";
       valueDisplay = vm.$ay.t(tKey);
       break;
@@ -1503,7 +1499,6 @@ function generateListViewFromEdited(vm) {
       o.sort = ev.sort;
     }
     if (ev.filter && ev.filter.items && ev.filter.items.length > 0) {
-      // debugger;
       let f = {
         items: []
       };

ayanova/src/views/home-password.vue

@@ -204,7 +204,6 @@ export default {
         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);
@@ -217,8 +216,10 @@ export default {
             }
           })
           .catch(function handleSubmitError(error) {
-            vm.formState.loading = false;
             window.$gz.errorHandler.handleFormError(error, vm);
+          })
+          .finally(function() {
+            vm.loading = false;
           });
       }
     }

ayanova/src/views/login.vue

@@ -317,40 +317,4 @@ export default {
     });
   }
 };
-
-// created() {
-//   console.log("CREATED");
-//   // window.$gz.api
-//   //   .get("license/trial")
-//   //   .then(res => {
-//   //     debugger;
-//   //     vm.formState.ready = true;
-//   //     if (res.error) {
-//   //       vm.formState.serverError = res.error;
-//   //       window.$gz.form.setErrorBoxErrors(vm);
-//   //     } else {
-//   //       vm.trialMode = res.data;
-//   //       // vm.obj = res.data;
-
-//   //       // //Update the form status
-//   //       // window.$gz.form.setFormState({
-//   //       //   vm: vm,
-//   //       //   dirty: false,
-//   //       //   valid: true,
-//   //       //   loading: false,
-//   //       //   readOnly: res.readOnly ? true : false
-//   //       // });
-//   //       // //modify the menu as necessary
-//   //       // generateMenu(vm);
-//   //     }
-//   //   })
-//   //   .catch(function handleGetDataFromAPIError(error) {
-//   //     //Update the form status
-//   //     window.$gz.form.setFormState({
-//   //       vm: vm,
-//   //       loading: false
-//   //     });
-//   //     window.$gz.errorHandler.handleFormError(error, vm);
-//   //   });
-// },
 </script>

ayanova/src/views/notfound.vue

@@ -21,9 +21,8 @@ export default {
     };
   },
   created() {
-    // debugger;
     let badPath = this.$router.history.current.path;
-    //If this happens too early then it might not have all the setup stuf available which would trigger an infinite loop
+    //If this happens too early then it might not have all the setup stuff available which would trigger an infinite loop
     if (
       !window ||
       !window.$gz ||

ayanova/src/views/widget.vue

@@ -463,7 +463,6 @@ export default {
             }
           })
           .catch(function handleSubmitError(error) {
-            debugger;
             vm.formState.loading = false;
             window.$gz.errorHandler.handleFormError(error, vm);
           });
@@ -523,7 +522,6 @@ export default {
         window.$gz.api
           .duplicate(url)
           .then(res => {
-            // debugger;
             vm.formState.loading = false;
             if (res.error) {
               vm.formState.serverError = res.error;