Merge branch 'master' of https://github.com/abouolia/Bigcapital

client/src/components/ErrorBoundary/index.js

@@ -0,0 +1,34 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+
+function ErrorBoundary({
+  error,
+  errorInfo,
+  children
+}) {
+
+  if (errorInfo) {
+    return (
+      <div>
+        <h2>Something went wrong.</h2>
+
+        <details style={{ whiteSpace: 'pre-wrap' }}>
+          {error && error.toString()}
+          <br />
+          {errorInfo.componentStack}
+        </details>
+      </div>
+    );
+  }
+  return children;
+}
+
+ErrorBoundary.defaultProps = {
+  children: null,
+};
+
+ErrorBoundary.propTypes = {
+  children: PropTypes.node,
+};
+
+export default ErrorBoundary;

client/src/store/customViews/customViews.actions.js

@@ -27,7 +27,7 @@ export const fetchView = ({ id }) => {
 
 export const fetchResourceViews = ({ resourceSlug }) => {
   return (dispatch) => new Promise((resolve, reject) => {
-    ApiService.get('views', { params: { resource_name: resourceSlug } })
+    ApiService.get(`views/resource/${resourceSlug}`)
       .then((response) => {
         dispatch({
           type: t.RESOURCE_VIEWS_SET,