rewriting error throws to be consistent

ansibleguy76 · Oct 5, 2023 · 2712c01 · 2712c01
1 parent 4a1adfd
commit 2712c01
Show file tree

Hide file tree

Showing 48 changed files with 234 additions and 244 deletions.
diff --git a/client/src/App.vue b/client/src/App.vue
@@ -167,7 +167,7 @@
           })
           .catch(function(err){
             ref.$toast.error("Failed to check AnsibleForms database schema");
-            ref.errorMessage="Failed to check AnsibleForms database schema\n\n" + err
+            ref.errorMessage="Failed to check AnsibleForms database schema\n\n" + err.toString()
             ref.$router.replace({name:"Error"}).catch(err => {});
             ref.isLoaded=true
           });            

diff --git a/client/src/components/BulmaAdvancedSelect.vue b/client/src/components/BulmaAdvancedSelect.vue
@@ -205,7 +205,7 @@ export default {
         try{ 
             if(typeof this.values[0]=="object")
                 valueLength=Object.keys(this.values[0]).length 
-        }catch(e){
+        }catch(err){
             //
         }
         var columnsCount=this.columns?.length || valueLength

diff --git a/client/src/components/BulmaAdvancedSelect2.vue b/client/src/components/BulmaAdvancedSelect2.vue
@@ -161,7 +161,7 @@ export default {
                     if(typeof obj == "object"){
                         defaulttype="object"
                     }
-                }catch(e){
+                }catch(err){
                     obj=undefined
                 }
                 if(typeof this.defaultValue == "object"){

diff --git a/client/src/components/BulmaAdvancedTable.vue b/client/src/components/BulmaAdvancedTable.vue
@@ -337,7 +337,7 @@
               if(typeof obj == "object"){
                 defaulttype="object"
               }
-            }catch(e){
+            }catch(err){
               obj=undefined
             }
             if(typeof this.defaultValue == "object"){
@@ -354,8 +354,8 @@
                     if(this.objectEqual(obj,item)){
                         ref.select(i)
                     }
-                  }catch(e){
-                    console.log("Bad defaultvalue : "  + e)
+                  }catch(err){
+                    console.log("Bad defaultvalue : "  + err.toString())
                   }
                 })
               }

diff --git a/client/src/components/Form.vue b/client/src/components/Form.vue
@@ -808,8 +808,8 @@
             Copy(JSON.stringify(v))
           }
           this.$toast.success("Copied to clipboard")
-        }catch(e){
-          this.$toast.error("Error copying to clipboard : \n" + e)
+        }catch(err){
+          this.$toast.error("Error copying to clipboard : \n" + err.toString())
         }
       },
       // creates a list of fields per group
@@ -983,8 +983,8 @@
             try{
               r=Helpers.evalSandbox(_value)
               return r
-            }catch(e){
-              console.log(`Error evaluating default value : ${e}`)
+            }catch(err){
+              console.log(`Error evaluating default value : ${err.toString()}`)
             }
           }else{
             return _value
@@ -1020,10 +1020,10 @@
           // set default value
           Vue.set(this.form,fieldname,this.defaults[fieldname])
          
-        }catch(e){
+        }catch(err){
           // this error should not hit, unless we have a bug
-          console.log("Error: " + e)
-          throw e
+          console.log("Error: " + err.toString())
+          throw err
         }
       },
       // set dynamic field status, only for expressions,query and table
@@ -1444,7 +1444,7 @@
                           Vue.delete(ref.queryerrors, item.name);
                         }catch(err){
                           // console.log("Local eval failed : " + err)
-                          Vue.set(ref.queryerrors, item.name,err);
+                          Vue.set(ref.queryerrors, item.name,err.toString());
                           try{
                             ref.setFieldToDefault(item.name)
                           }catch(err){
@@ -1781,10 +1781,10 @@
               }
           })
           .catch(function(err){
-            console.log("error getting job " + err)
+            console.log("error getting job " + err.toString())
             ref.$toast.error("Failed to get job");
             if(err.response.status!=401){
-              ref.jobResult.message="Error in axios call to get job\n\n" + err
+              ref.jobResult.message="Error in axios call to get job\n\n" + err.toString()
               ref.jobResult.status="error";
             }
           })
@@ -1945,19 +1945,19 @@
                 }
                 if(result.status=="error"){
                   ref.$toast.error(result.data.error);
-                  throw(new Error(result.data.error))
+                  throw new Error(result.data.error)
                 }
 
               } catch (e) {
                 console.log(e)
-                throw(new Error("Failed uploading files"))
+                throw new Error("Failed uploading files")
               }
             });
 
             await Promise.all(uploadPromises);
             // ref.$toast.info(`All files uploaded`);
-          }catch(e){
-            ref.$toast.error(e.message);
+          }catch(err){
+            ref.$toast.error(err.toString());
             ref.resetResult()
             // stop, don't execute job
             throw new Error("Failed uploading files");
@@ -2047,7 +2047,7 @@
           try{
             var queryObject=JSON.parse(atob(ref.$route.query.base64values))
             // Vue.set(ref,"form",queryObject)
-          }catch(e){
+          }catch(err){
             ref.$toast.error("Couldn't parse your querystring")
           }
           for (const [key, value] of Object.entries(queryObject)) {
@@ -2090,7 +2090,7 @@
             if(item.type=="number"){
               try{
                 queryValue=parseInt(queryValue)
-              }catch(e){
+              }catch(err){
                 queryValue=0
               }
             }
@@ -2192,7 +2192,7 @@
             ref.startDynamicFieldsLoop()
           })
           .catch(function(err){
-            ref.$toast.error("Failed to pull from git " + err)
+            ref.$toast.error("Failed to pull from git " + err.toString())
             ref.pretasksFinished=true
             // start dynamic field loop (= infinite)
             ref.startDynamicFieldsLoop()

diff --git a/client/src/lib/Form.js b/client/src/lib/Form.js
@@ -14,7 +14,7 @@ var Form = {
       })
       .catch(function(err){
         if(err.response && err.response.status!=401){
-          error("Could not get forms.yaml file\n\n" + err)
+          error("Could not get forms.yaml file\n\n" + err.toString())
         }
         if(err.response && err.response.status==401){
           error(err)
@@ -36,7 +36,7 @@ var Form = {
       })
       .catch(function(err){
         if(err.response && err.response.status!=401){
-          error("Could not get backups\n\n" + err)
+          error("Could not get backups\n\n" + err.toString())
         }
         if(err.response && err.response.status==401){
           error(err)
@@ -57,7 +57,7 @@ var Form = {
       })
       .catch(function(err){
         if(err.response && err.response.status!=401){
-          error("Could not restore\n\n" + err)
+          error("Could not restore\n\n" + err.toString())
         }
         if(err.response && err.response.status==401){
           error(err)

diff --git a/client/src/views/Awx.vue b/client/src/views/Awx.vue
@@ -72,8 +72,8 @@
         axios.get('/api/v1/awx/',TokenStorage.getAuthentication())
           .then((result)=>{
             ref.awx=result.data.data.output;
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       },updateAwx(){
         var ref= this;
@@ -86,8 +86,8 @@
                 ref.$toast.success("Awx is updated");
                 ref.loadAwx();
               }
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }else{
           this.$toast.warning("Invalid form data")
@@ -102,8 +102,8 @@
             }else{
               ref.$toast.success(result.data.message);
             }
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       }
     },

diff --git a/client/src/views/AzureAd.vue b/client/src/views/AzureAd.vue
@@ -85,17 +85,17 @@
         axios.get('/api/v1/settings/',TokenStorage.getAuthentication())
           .then((result)=>{
             ref.settings=result.data.data.output;
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };        
       },
       loadAzureAd(){
         var ref= this;
         axios.get('/api/v1/azuread/',TokenStorage.getAuthentication())
           .then((result)=>{
             ref.azuread=result.data.data.output;
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       },updateAzureAd(){
         var ref= this;
@@ -108,8 +108,8 @@
                 ref.$toast.success("AzureAd is updated");
                 ref.loadAzureAd();
               }
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }else{
           this.$toast.warning("Invalid form data")
@@ -124,8 +124,8 @@
             }else{
               ref.$toast.success(result.data.message);
             }
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       }
     },

diff --git a/client/src/views/Credentials.vue b/client/src/views/Credentials.vue
@@ -17,7 +17,7 @@
           <div class="columns">
             <div class="column" v-if="credentialList && credentialList.length>0">
               <BulmaAdminTable
-                :dataList="credentialList.map(x => ({...x,allowtest:(x.is_database && x.db_type!='mongodb')}))"
+                :dataList="credentialList.map(x => ({...x,allowtest:(x.is_database )}))"
                 :labels="['Name','User','Host']"
                 :columns="['name','user','host']"
                 :filters="['name','user','host']"
@@ -107,8 +107,8 @@
         axios.get('/api/v1/credential/',TokenStorage.getAuthentication())
           .then((result)=>{
             ref.credentialList=result.data.data.output;
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       },
       selectItem(value){
@@ -132,8 +132,8 @@
               }else{
                 ref.$toast.error(result.data.message + "\r\n" + result.data.data.error)
               }
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }
       },
@@ -145,8 +145,8 @@
             .then((result)=>{
               console.log("loaded credential item");
               ref.credential=result.data.data.output
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }else{
           console.log("No item selected")
@@ -166,8 +166,8 @@
               ref.credentialItem=undefined;
               ref.loadAll();
             }
-          }),function(error){
-            ref.$toast.error(error.message);
+          }),function(err){
+            ref.$toast.error(err.toString());
           };
       },updateCredential(){
         var ref= this;
@@ -180,8 +180,8 @@
                 ref.$toast.success("Credential is updated");
                 ref.loadAll();
               }
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }else{
           this.$toast.warning("Invalid form data")
@@ -198,8 +198,8 @@
                 ref.$toast.success("Created credential with new id " + result.data.data.output);
                 ref.loadAll();
               }
-            }),function(error){
-              ref.$toast.error(error.message);
+            }),function(err){
+              ref.$toast.error(err.toString());
             };
         }
       },showAlert(type,message){