From 74b545a8d990a1cc8f110c3a538f044ebb98282b Mon Sep 17 00:00:00 2001
From: Chi Vinh Le <vinh@wikiwi.io>
Date: Tue, 23 Jan 2018 16:58:11 +0100
Subject: [PATCH] Refetch configure and notify on error

---
 .../routes/Configure/containers/Configure.js  | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/client/coral-admin/src/routes/Configure/containers/Configure.js b/client/coral-admin/src/routes/Configure/containers/Configure.js
index 0d9d5faf9..e94c89788 100644
--- a/client/coral-admin/src/routes/Configure/containers/Configure.js
+++ b/client/coral-admin/src/routes/Configure/containers/Configure.js
@@ -4,34 +4,33 @@ import { bindActionCreators } from 'redux';
 import { compose, gql } from 'react-apollo';
 import { withQuery, withMergedSettings } from 'coral-framework/hocs';
 import { Spinner } from 'coral-ui';
-import { notify } from 'coral-framework/actions/notification';
 import PropTypes from 'prop-types';
 import { withUpdateSettings } from 'coral-framework/graphql/mutations';
-import { getErrorMessages, getDefinitionName } from 'coral-framework/utils';
+import { getDefinitionName } from 'coral-framework/utils';
 import StreamSettings from './StreamSettings';
 import TechSettings from './TechSettings';
 import ModerationSettings from './ModerationSettings';
 import { clearPending, setActiveSection } from '../../../actions/configure';
 import Configure from '../components/Configure';
+import { notifyOnMutationError, notifyOnDataError } from 'coral-framework/hocs';
 
 class ConfigureContainer extends Component {
   savePending = async () => {
-    try {
-      await this.props.updateSettings(this.props.pending);
-      this.props.clearPending();
-    } catch (err) {
-      this.props.notify('error', getErrorMessages(err));
-    }
+    await this.props.updateSettings(this.props.pending);
+    this.props.clearPending();
   };
 
   render() {
+    if (this.props.data.error) {
+      return <div>{this.props.data.error.message}</div>;
+    }
+
     if (this.props.data.loading) {
       return <Spinner />;
     }
 
     return (
       <Configure
-        notify={this.props.notify}
         auth={this.props.auth}
         data={this.props.data}
         root={this.props.root}
@@ -67,6 +66,7 @@ const withConfigureQuery = withQuery(
   {
     options: () => ({
       variables: {},
+      fetchPolicy: 'network-only',
     }),
   }
 );
@@ -81,7 +81,6 @@ const mapStateToProps = state => ({
 const mapDispatchToProps = dispatch =>
   bindActionCreators(
     {
-      notify,
       clearPending,
       setActiveSection,
     },
@@ -90,7 +89,9 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   withUpdateSettings,
+  notifyOnMutationError(['updateSettings']),
   withConfigureQuery,
+  notifyOnDataError,
   connect(mapStateToProps, mapDispatchToProps),
   withMergedSettings('root.settings', 'pending', 'mergedSettings')
 )(ConfigureContainer);
@@ -99,7 +100,6 @@ ConfigureContainer.propTypes = {
   updateSettings: PropTypes.func.isRequired,
   clearPending: PropTypes.func.isRequired,
   setActiveSection: PropTypes.func.isRequired,
-  notify: PropTypes.func.isRequired,
   auth: PropTypes.object.isRequired,
   data: PropTypes.object.isRequired,
   root: PropTypes.object.isRequired,