From 5d8c4c171241da2fd562f55afdd4462bd3fee6f9 Mon Sep 17 00:00:00 2001 From: Will Piers Date: Thu, 20 Oct 2016 09:50:55 -0700 Subject: [PATCH] Remove usages of old flash messages --- .../containers/RolePageContainer.js | 3 +- .../containers/RolesPageContainer.js | 3 +- .../containers/ClusterAccountContainer.js | 5 +-- .../ClusterAccountsPageContainer.js | 3 +- .../containers/DatabaseManagerApp.js | 1 - ui/src/hosts/containers/HostPage.js | 3 +- ui/src/queries/containers/QueriesPage.js | 3 +- .../containers/RetentionPoliciesApp.js | 5 +-- ui/src/shared/components/FlashMessage.js | 45 ------------------- ui/src/shared/components/FlashMessages.js | 34 -------------- ui/src/sources/containers/CreateSource.js | 3 +- ui/src/sources/containers/ManageSources.js | 3 +- 12 files changed, 11 insertions(+), 100 deletions(-) delete mode 100644 ui/src/shared/components/FlashMessage.js delete mode 100644 ui/src/shared/components/FlashMessages.js diff --git a/ui/src/access_control/containers/RolePageContainer.js b/ui/src/access_control/containers/RolePageContainer.js index d83d3ae0e..18a531345 100644 --- a/ui/src/access_control/containers/RolePageContainer.js +++ b/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); diff --git a/ui/src/access_control/containers/RolesPageContainer.js b/ui/src/access_control/containers/RolesPageContainer.js index efa6e483c..f8494fd1c 100644 --- a/ui/src/access_control/containers/RolesPageContainer.js +++ b/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; diff --git a/ui/src/cluster_accounts/containers/ClusterAccountContainer.js b/ui/src/cluster_accounts/containers/ClusterAccountContainer.js index e0bb9b98b..96fab4dde 100644 --- a/ui/src/cluster_accounts/containers/ClusterAccountContainer.js +++ b/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); diff --git a/ui/src/cluster_accounts/containers/ClusterAccountsPageContainer.js b/ui/src/cluster_accounts/containers/ClusterAccountsPageContainer.js index 91f78e9fe..12cb4fe35 100644 --- a/ui/src/cluster_accounts/containers/ClusterAccountsPageContainer.js +++ b/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; diff --git a/ui/src/database_manager/containers/DatabaseManagerApp.js b/ui/src/database_manager/containers/DatabaseManagerApp.js index 677274416..60cafd2b7 100644 --- a/ui/src/database_manager/containers/DatabaseManagerApp.js +++ b/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({ diff --git a/ui/src/hosts/containers/HostPage.js b/ui/src/hosts/containers/HostPage.js index 12a8eacbe..95e072d95 100644 --- a/ui/src/hosts/containers/HostPage.js +++ b/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; diff --git a/ui/src/queries/containers/QueriesPage.js b/ui/src/queries/containers/QueriesPage.js index ef59df623..533f7b684 100644 --- a/ui/src/queries/containers/QueriesPage.js +++ b/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; diff --git a/ui/src/retention_policies/containers/RetentionPoliciesApp.js b/ui/src/retention_policies/containers/RetentionPoliciesApp.js index 87923ed70..9d798a646 100644 --- a/ui/src/retention_policies/containers/RetentionPoliciesApp.js +++ b/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; diff --git a/ui/src/shared/components/FlashMessage.js b/ui/src/shared/components/FlashMessage.js deleted file mode 100644 index d063561dc..000000000 --- a/ui/src/shared/components/FlashMessage.js +++ /dev/null @@ -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 ( -
- {Array.isArray(text) ? ( - - ) : text} - -
- ); - }, -}); diff --git a/ui/src/shared/components/FlashMessages.js b/ui/src/shared/components/FlashMessages.js deleted file mode 100644 index 1309e94ab..000000000 --- a/ui/src/shared/components/FlashMessages.js +++ /dev/null @@ -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 ( -
-
- {messages.map((m, i) => { - return ; - })} -
- -
- ); - }, - - handleNewFlashMessage(message) { - this.setState({ - messages: this.state.messages.concat(message), - }); - }, - }); -} diff --git a/ui/src/sources/containers/CreateSource.js b/ui/src/sources/containers/CreateSource.js index 7f4e51a35..4fa6aed76 100644 --- a/ui/src/sources/containers/CreateSource.js +++ b/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); diff --git a/ui/src/sources/containers/ManageSources.js b/ui/src/sources/containers/ManageSources.js index e79ceac6b..95b2f53f9 100644 --- a/ui/src/sources/containers/ManageSources.js +++ b/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);