Remove usages of old flash messages

ui/src/access_control/containers/RolePageContainer.js

@@ -1,7 +1,6 @@
 import React, {PropTypes} from 'react';
 import {withRouter} from 'react-router';
 import RolePage from '../components/RolePage';
-import FlashMessages from 'src/shared/components/FlashMessages';
 import {showDatabases} from 'src/shared/apis/metaQuery';
 import showDatabasesParser from 'shared/parsing/showDatabases';
 import {buildRoles, buildAllPermissions} from 'src/shared/presenters';
@@ -190,4 +189,4 @@ export const RolePageContainer = React.createClass({
   },
 });
 
-export default FlashMessages(withRouter(RolePageContainer));
+export default withRouter(RolePageContainer);

ui/src/access_control/containers/RolesPageContainer.js

@@ -2,7 +2,6 @@ import React, {PropTypes} from 'react';
 import {getRoles, createRole} from 'src/shared/apis';
 import {buildRoles} from 'src/shared/presenters';
 import RolesPage from '../components/RolesPage';
-import FlashMessages from 'src/shared/components/FlashMessages';
 import _ from 'lodash';
 
 export const RolesPageContainer = React.createClass({
@@ -69,4 +68,4 @@ export const RolesPageContainer = React.createClass({
   },
 });
 
-export default FlashMessages(RolesPageContainer);
+export default RolesPageContainer;

ui/src/cluster_accounts/containers/ClusterAccountContainer.js

@@ -1,7 +1,6 @@
 import React, {PropTypes} from 'react';
 import _ from 'lodash';
 import {withRouter} from 'react-router';
-import FlashMessages from 'shared/components/FlashMessages';
 import ClusterAccountEditPage from '../components/ClusterAccountEditPage';
 import {buildClusterAccounts, buildRoles, buildAllPermissions, buildPermission} from 'src/shared/presenters';
 import {showDatabases} from 'src/shared/apis/metaQuery';
@@ -35,7 +34,7 @@ export const ClusterAccountContainer = React.createClass({
     router: shape({
       push: func.isRequired,
     }).isRequired,
-    addFlashMessage: func.isRequired,
+    addFlashMessage: func,
   },
 
   getInitialState() {
@@ -276,4 +275,4 @@ export const ClusterAccountContainer = React.createClass({
   },
 });
 
-export default FlashMessages(withRouter(ClusterAccountContainer));
+export default withRouter(ClusterAccountContainer);

ui/src/cluster_accounts/containers/ClusterAccountsPageContainer.js

@@ -1,5 +1,4 @@
 import React, {PropTypes} from 'react';
-import FlashMessages from 'src/shared/components/FlashMessages';
 import ClusterAccountsPage from '../components/ClusterAccountsPage';
 import DeleteClusterAccountModal from '../components/DeleteClusterAccountModal';
 import {buildClusterAccounts} from 'src/shared/presenters';
@@ -155,4 +154,4 @@ export const ClusterAccountsPageContainer = React.createClass({
   },
 });
 
-export default FlashMessages(ClusterAccountsPageContainer);
+export default ClusterAccountsPageContainer;

ui/src/database_manager/containers/DatabaseManagerApp.js

@@ -2,7 +2,6 @@ import React, {PropTypes} from 'react';
 import {getDatabaseManager, createDatabase} from 'shared/apis/index';
 import DatabaseManager from '../components/DatabaseManager';
 
-
 const {shape, string} = PropTypes;
 
 const DatabaseManagerApp = React.createClass({

ui/src/hosts/containers/HostPage.js

@@ -2,7 +2,6 @@ import React, {PropTypes} from 'react';
 // TODO: move this to a higher level package than chronograf?
 import AutoRefresh from 'shared/components/AutoRefresh';
 import LineGraph from 'shared/components/LineGraph';
-import FlashMessages from 'shared/components/FlashMessages';
 
 const RefreshingLineGraph = AutoRefresh(LineGraph);
 
@@ -86,4 +85,4 @@ export const HostPage = React.createClass({
   },
 });
 
-export default FlashMessages(HostPage);
+export default HostPage;

ui/src/queries/containers/QueriesPage.js

@@ -8,7 +8,6 @@ import {
   killQuery,
 } from 'shared/apis/metaQuery';
 
-import FlashMessages from 'shared/components/FlashMessages';
 import showDatabasesParser from 'shared/parsing/showDatabases';
 import showQueriesParser from 'shared/parsing/showQueries';
 
@@ -185,4 +184,4 @@ export const QueriesPage = React.createClass({
   },
 });
 
-export default FlashMessages(QueriesPage);
+export default QueriesPage;

ui/src/retention_policies/containers/RetentionPoliciesApp.js

@@ -4,7 +4,6 @@ import _ from 'lodash';
 import RetentionPoliciesHeader from '../components/RetentionPoliciesHeader';
 import RetentionPoliciesList from '../components/RetentionPoliciesList';
 import CreateRetentionPolicyModal from '../components/CreateRetentionPolicyModal';
-import FlashMessages from 'shared/components/FlashMessages';
 
 import {
   showDatabases,
@@ -25,7 +24,7 @@ const RetentionPoliciesApp = React.createClass({
     params: PropTypes.shape({
       clusterID: PropTypes.string.isRequired,
     }).isRequired,
-    addFlashMessage: PropTypes.func.isRequired,
+    addFlashMessage: PropTypes.func,
   },
 
   getInitialState() {
@@ -210,4 +209,4 @@ const RetentionPoliciesApp = React.createClass({
   },
 });
 
-export default FlashMessages(RetentionPoliciesApp);
+export default RetentionPoliciesApp;

ui/src/shared/components/FlashMessage.js

@@ -1,45 +0,0 @@
-import React, {PropTypes} from 'react';
-
-const {string, oneOfType, shape, arrayOf} = PropTypes;
-
-const messageClasses = {
-  error: 'danger',
-  success: 'success',
-};
-
-export default React.createClass({
-  propTypes: {
-    message: shape({
-      text: oneOfType([string, arrayOf(string)]),
-      type: string.isRequired,
-    }),
-  },
-
-  getInitialState() {
-    return {show: true};
-  },
-
-  handleClick() {
-    this.setState({show: false});
-  },
-
-  render() {
-    if (!this.state.show) {
-      return null;
-    }
-
-    const {text, type} = this.props.message;
-    return (
-      <div className={`alert alert-${messageClasses[type]}`} role="alert">
-        {Array.isArray(text) ? (
-          <ul>
-            {text.map((msg, i) => <li key={i}>{msg}</li>)}
-          </ul>
-        ) : text}
-        <button className="close" data-dismiss="alert" aria-label="Close" onClick={this.handleClick}>
-          <span className="icon remove"></span>
-        </button>
-      </div>
-    );
-  },
-});

ui/src/shared/components/FlashMessages.js

@@ -1,34 +0,0 @@
-import React from 'react';
-
-import FlashMessage from 'shared/components/FlashMessage';
-
-export default function FlashMessages(ComposedComponent) {
-  return React.createClass({
-    getInitialState() {
-      return {messages: []};
-    },
-
-    render() {
-      const {messages} = this.state;
-      return (
-        <div>
-          <div className="flash-messages">
-            {messages.map((m, i) => {
-              return <FlashMessage key={i} message={m} />;
-            })}
-          </div>
-          <ComposedComponent
-            {...this.props}
-            addFlashMessage={this.handleNewFlashMessage}
-          />
-        </div>
-      );
-    },
-
-    handleNewFlashMessage(message) {
-      this.setState({
-        messages: this.state.messages.concat(message),
-      });
-    },
-  });
-}

ui/src/sources/containers/CreateSource.js

@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
 import {withRouter} from 'react-router';
-import FlashMessages from 'shared/components/FlashMessages';
 import {createSource} from 'shared/apis';
 
 export const CreateSource = React.createClass({
@@ -87,4 +86,4 @@ export const CreateSource = React.createClass({
   },
 });
 
-export default FlashMessages(withRouter(CreateSource));
+export default withRouter(CreateSource);

ui/src/sources/containers/ManageSources.js

@@ -1,6 +1,5 @@
 import React, {PropTypes} from 'react';
 import {withRouter, Link} from 'react-router';
-import FlashMessages from 'shared/components/FlashMessages';
 import {getSources} from 'shared/apis';
 
 export const ManageSources = React.createClass({
@@ -76,4 +75,4 @@ export const ManageSources = React.createClass({
   },
 });
 
-export default FlashMessages(withRouter(ManageSources));
+export default withRouter(ManageSources);