diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 59a5a70e7..a0a5b3705 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -214,7 +214,6 @@ export default class Moderation extends Component { moderation={this.props.moderation} closeSearch={this.closeSearch} storySearchChange={this.props.storySearchChange} - storySearchClear={this.props.storySearchClear} /> ); diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css index 796bc9266..d161b4efd 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css @@ -1,3 +1,14 @@ +.overlay { + position: absolute; + background-color: transparent; + top: 0; + left: 0; + right: 0; + bottom: 0; + width: 100%; + z-index: 99; +} + .container { position: absolute; background-color: white; diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js index 38f8057db..8989f8ed3 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js @@ -2,7 +2,6 @@ import React from 'react'; import PropTypes from 'prop-types'; import styles from './StorySearch.css'; import {Button, Spinner, Icon} from 'coral-ui'; -import {withRouter} from 'react-router'; import Story from './Story'; const StorySearch = (props) => { @@ -18,52 +17,49 @@ const StorySearch = (props) => { return null; } - const goToStory = (id) => { - props.router.push(`/admin/moderate/${id}`); - props.closeSearch(); - }; - return ( -
-
-
- - -
-
-

Moderate comments on All Stories

-
-
- - Most Recent Stories +
+
+
+
+ + +
+
+

Moderate comments on All Stories

+
+
+ + Most Recent Stories +
+ { + loading + ? + : assets.map((story, i) => { + const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date(); + return ; + }) + }
- { - loading - ? - : assets.map((story, i) => { - const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date(); - return ; - }) - }
@@ -72,9 +68,11 @@ const StorySearch = (props) => { }; StorySearch.propTypes = { - handleSearchChange: PropTypes.func.isRequired, search: PropTypes.func.isRequired, - moderation: PropTypes.object.isRequired + goToStory: PropTypes.func.isRequired, + closeSearch: PropTypes.func.isRequired, + moderation: PropTypes.object.isRequired, + handleSearchChange: PropTypes.func.isRequired }; -export default withRouter(StorySearch); +export default StorySearch; diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js index c7c3863db..d2790eccf 100644 --- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js @@ -1,6 +1,7 @@ import React from 'react'; import {compose, gql} from 'react-apollo'; import StorySearch from '../components/StorySearch'; +import {withRouter} from 'react-router'; import withQuery from 'coral-framework/hocs/withQuery'; class StorySearchContainer extends React.Component { @@ -31,12 +32,19 @@ class StorySearchContainer extends React.Component { this.props.storySearchChange(searchValue); } + goToStory = (id) => { + const {router, closeSearch} = this.props; + router.push(`/admin/moderate/${id}`); + closeSearch(); + } + render () { return ( @@ -66,5 +74,6 @@ export const withAssetSearchQuery = withQuery(gql` }); export default compose( - withAssetSearchQuery + withAssetSearchQuery, + withRouter )(StorySearchContainer);