relax · s-coimbra21 · Aug 16, 2016 · Sep 5, 2016
diff --git a/.babelrc b/.babelrc
diff --git a/.coveralls.yml b/.coveralls.yml
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitignore b/.gitignore
diff --git a/.npmignore b/.npmignore
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/docs/.gitignore b/docs/.gitignore
diff --git a/docs/_config.yml b/docs/_config.yml
diff --git a/docs/package.json b/docs/package.json
diff --git a/docs/scaffolds/draft.md b/docs/scaffolds/draft.md
diff --git a/docs/scaffolds/page.md b/docs/scaffolds/page.md
diff --git a/docs/scaffolds/post.md b/docs/scaffolds/post.md
diff --git a/docs/source/_data/nav.yml b/docs/source/_data/nav.yml
diff --git a/docs/source/data-connect.md b/docs/source/data-connect.md
diff --git a/docs/source/fragments.md b/docs/source/fragments.md
diff --git a/docs/source/how-it-works.md b/docs/source/how-it-works.md
diff --git a/docs/source/images/logo.png b/docs/source/images/logo.png
diff --git a/docs/source/images/logo_image.png b/docs/source/images/logo_image.png
diff --git a/docs/source/images/relate_scheme.png b/docs/source/images/relate_scheme.png
diff --git a/docs/source/index.md b/docs/source/index.md
diff --git a/docs/source/installation.md b/docs/source/installation.md
diff --git a/docs/source/intersect.md b/docs/source/intersect.md
diff --git a/docs/source/mutations.md b/docs/source/mutations.md
diff --git a/docs/source/reducer.md b/docs/source/reducer.md
diff --git a/docs/source/root-data-connect.md b/docs/source/root-data-connect.md
diff --git a/docs/source/server-side.md b/docs/source/server-side.md
diff --git a/docs/source/settings.md b/docs/source/settings.md
diff --git a/docs/themes/relate/_config.yml b/docs/themes/relate/_config.yml
diff --git a/docs/themes/relate/layout/default.swig b/docs/themes/relate/layout/default.swig
diff --git a/docs/themes/relate/source/css/_code.scss b/docs/themes/relate/source/css/_code.scss
diff --git a/docs/themes/relate/source/css/_content.scss b/docs/themes/relate/source/css/_content.scss
diff --git a/docs/themes/relate/source/css/_menu.scss b/docs/themes/relate/source/css/_menu.scss
diff --git a/docs/themes/relate/source/css/_typography.scss b/docs/themes/relate/source/css/_typography.scss
diff --git a/docs/themes/relate/source/css/bootstrap.min.css b/docs/themes/relate/source/css/bootstrap.min.css
diff --git a/docs/themes/relate/source/css/docs.scss b/docs/themes/relate/source/css/docs.scss
diff --git a/docs/themes/relate/source/css/font-awesome.min.css b/docs/themes/relate/source/css/font-awesome.min.css
diff --git a/docs/themes/relate/source/fonts/FontAwesome.otf b/docs/themes/relate/source/fonts/FontAwesome.otf
diff --git a/docs/themes/relate/source/fonts/fontawesome-webfont.eot b/docs/themes/relate/source/fonts/fontawesome-webfont.eot
diff --git a/docs/themes/relate/source/fonts/fontawesome-webfont.svg b/docs/themes/relate/source/fonts/fontawesome-webfont.svg
diff --git a/docs/themes/relate/source/fonts/fontawesome-webfont.ttf b/docs/themes/relate/source/fonts/fontawesome-webfont.ttf
diff --git a/docs/themes/relate/source/fonts/fontawesome-webfont.woff b/docs/themes/relate/source/fonts/fontawesome-webfont.woff
diff --git a/docs/themes/relate/source/fonts/fontawesome-webfont.woff2 b/docs/themes/relate/source/fonts/fontawesome-webfont.woff2
diff --git a/lib/actions/mutation.js b/lib/actions/mutation.js
@@ -38,10 +38,12 @@ export default function (options, callback = false) {
       mutates: options.mutates,
       headers: options.headers || headers,
       body: options.body || body,
-      endpoint: options.endpoint || endpoint
+      endpoint: options.endpoint || endpoint,
+      logging: options.logging
     }).then((result) => {
       if (callback !== false) {
-        callback(result, dispatch);
+        // result = { data: {...}, errors: {...} }
+        callback({...result, dispatch});
       }
     });
   };

diff --git a/lib/actions/query.js b/lib/actions/query.js
@@ -48,7 +48,8 @@ export default function graphql (
         fragments,
         headers: config && config.headers || headers,
         body: config && config.body || body,
-        endpoint: config && config.endpoint || endpoint
+        endpoint: config && config.endpoint || endpoint,
+        logging: config && config.logging
       });
     }
 

diff --git a/lib/actions/remove-connector.js b/lib/actions/remove-connector.js
diff --git a/lib/actions/settings.js b/lib/actions/settings.js
diff --git a/lib/actions/types.js b/lib/actions/types.js
@@ -6,5 +6,6 @@ export default {
   removeHeader: 'RELATE_REMOVE_HEADER',
   setEndpoint: 'RELATE_SET_ENDPOINT',
   setBody: 'RELATE_SET_BODY',
-  removeBody: 'RELATE_REMOVE_BODY'
+  removeBody: 'RELATE_REMOVE_BODY',
+  setLoggingFn: 'RELATE_SET_LOGGING_FUNCTION'
 };
diff --git a/lib/decorators/data-connect.js b/lib/decorators/data-connect.js
diff --git a/lib/decorators/root-data-connect.js b/lib/decorators/root-data-connect.js
@@ -130,7 +130,7 @@ export default function rootDataConnect (config) {
               config,
               relate_ssr
             )
-          ).then((data) => {
+          ).then(({data}) => {
             this.deferred.resolve(data);
           }).catch((err) => {
             warning(false, err);

diff --git a/lib/helpers/connectors-ids.js b/lib/helpers/connectors-ids.js
diff --git a/lib/helpers/errorParser.js b/lib/helpers/errorParser.js
@@ -0,0 +1,8 @@
+export default function errorParser (error) {
+  if (error && error.status === 400) {
+    return (error.response && error.response.body && error.response.body.errors)
+      || error.message
+      || [{message: 'Unknown error'}];
+  }
+  return error && [error] || [{message: 'Unknown error'}];
+}
diff --git a/lib/helpers/get-variables.js b/lib/helpers/get-variables.js
diff --git a/lib/helpers/iterate-field.js b/lib/helpers/iterate-field.js
diff --git a/lib/helpers/iterate-node.js b/lib/helpers/iterate-node.js
diff --git a/lib/helpers/request.js b/lib/helpers/request.js
@@ -1,7 +1,20 @@
 import request from 'superagent';
+import errorParser from '../helpers/errorParser';
 import Q from 'q';
 
-export default function doRequest ({dispatch, query, variables, type, endpoint, headers, body, ...params}) {
+export default function doRequest (
+  {
+    dispatch,
+    query,
+    variables,
+    type,
+    endpoint,
+    headers,
+    body,
+    logging,
+    ...params
+  }
+) {
   return new Q()
     .then(() => {
       const deferred = Q.defer();
@@ -20,6 +33,7 @@ export default function doRequest ({dispatch, query, variables, type, endpoint,
       req
         .end((error, res) => {
           if (error) {
+            logging && logging({errors: errorParser(error)}, dispatch);
             deferred.reject(error);
           } else {
             deferred.resolve(res.body);
@@ -28,8 +42,9 @@ export default function doRequest ({dispatch, query, variables, type, endpoint,
 
       if (dispatch) {
         promise = promise.then(({data, errors}) => {
+          logging && logging({data, errors}, dispatch);
           dispatch({type, data, errors, ...params});
-          return data;
+          return {data, errors};
         });
       }
 

diff --git a/lib/index.js b/lib/index.js
diff --git a/lib/reducer/reducer.js b/lib/reducer/reducer.js
@@ -127,6 +127,12 @@ export function relateReducer (_state = defaultState, action = {}) {
     });
   }
 
+  if (action.type === actionTypes.setLoggingFn) {
+    return Object.assign({}, state, {
+      logging: action.logging
+    });
+  }
+
   return state;
 }
 

diff --git a/lib/server/get-data-dependencies.js b/lib/server/get-data-dependencies.js
diff --git a/lib/store/connectors.js b/lib/store/connectors.js
diff --git a/lib/store/db.js b/lib/store/db.js
diff --git a/lib/store/index.js b/lib/store/index.js
diff --git a/lib/store/normalize.js b/lib/store/normalize.js
diff --git a/package.json b/package.json
diff --git a/test/.eslintrc b/test/.eslintrc
diff --git a/test/decorators/root-data-connect.js b/test/decorators/root-data-connect.js
diff --git a/test/helpers/get-variables.js b/test/helpers/get-variables.js
diff --git a/test/index.js b/test/index.js
diff --git a/test/reducer/reducer.js b/test/reducer/reducer.js
@@ -2,6 +2,7 @@ import expect from 'expect';
 
 import {relateReducer, relateReducerInit, actionTypes} from '../../lib';
 
+
 describe('Reducer', () => {
   it('Does not alter state if not a Relate action', () => {
     const state = {something: 1};

diff --git a/test/reducer/settings.js b/test/reducer/settings.js
diff --git a/test/store/connectors.js b/test/store/connectors.js
diff --git a/test/store/db.js b/test/store/db.js
diff --git a/test/store/normalize.js b/test/store/normalize.js
diff --git a/webpack.config.js b/webpack.config.js