use response message for JS generated errors to differentiate from aj…

…ax error/statusText
damianham · May 17, 2019 · a4e5fcd · a4e5fcd
1 parent f5d33fd
commit a4e5fcd
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/scaffold/view/src/modules/{{name}}/js/{{name}}.js.lqd b/scaffold/view/src/modules/{{name}}/js/{{name}}.js.lqd
@@ -33,7 +33,7 @@ export class {{class_name}} extends Resource {
       return new Promise(function (resolve, reject) {
         // eslint-disable-next-line prefer-promise-reject-errors
         reject({
-          statusText: 'Could not save {{name}}',
+          message: 'Could not save {{name}}',
           responseJSON: {
             error: 'Validation failed. [' + errors.map((err) => {
               return `Amber::Validators::Error(@param="${err.field}", @value="${err.value}", @message="Field ${err.field} ${err.message}" )`

diff --git a/scaffold/view/src/modules/{{name}}/js/{{name}}_edit.js.lqd b/scaffold/view/src/modules/{{name}}/js/{{name}}_edit.js.lqd
@@ -35,7 +35,7 @@ class {{class_name}}EditComponent extends React.Component {
     store.update('{{name}}', this.state.id, this.state)
       .then(this.onBack.bind(this))
       .catch((response, statusText, error) => {
-        store.handleErrors('Update', '{{name}}', error, response.responseJSON)
+        store.handleErrors('Update', '{{name}}', error || response.message, response.responseJSON)
       })
   }
 

diff --git a/scaffold/view/src/modules/{{name}}/js/{{name}}_new.js.lqd b/scaffold/view/src/modules/{{name}}/js/{{name}}_new.js.lqd
@@ -45,7 +45,7 @@ class {{class_name}}NewComponent extends React.Component {
     let {{name}} = new {{class_name}}(this.state)
     {{name}}.save().then(this.onBack.bind(this))
     .catch((response, statusText, error) => {
-      store.handleErrors('Add', '{{name}}', error, response.responseJSON)
+      store.handleErrors('Add', '{{name}}', error || response.message, response.responseJSON)
     });
   }
 

diff --git a/scaffold/view/src/modules/{{name}}/js/{{name}}_view.js.lqd b/scaffold/view/src/modules/{{name}}/js/{{name}}_view.js.lqd
@@ -61,7 +61,7 @@ class {{class_name}}ViewComponent extends React.Component {
 
       if (typeof related.catch === 'function') {
         related.catch((response, statusText, error) => {
-          store.handleErrors('Show', 'related', error, response.responseJSON)
+          store.handleErrors('Show', 'related', error || response.message, response.responseJSON)
         })
       } else {
         // we got an array of records with matching {{name}}_id
@@ -82,7 +82,7 @@ class {{class_name}}ViewComponent extends React.Component {
         }
       }).catch((response, statusText, error) => {
         console.log('store load resources failed with', error)
-        store.handleErrors('Query', 'comment', error, response.responseJSON)
+        store.handleErrors('Query', 'comment', error || response.message, response.responseJSON)
       })
     */
   }

diff --git a/shard.yml b/shard.yml
@@ -1,5 +1,5 @@
 name: amber_material_kit
-version: 1.0.5
+version: 1.0.6
 
 authors:
    - Damian Hamill <damianham@gmail.com>