diff --git a/client/coral-admin/src/actions/moderation.js b/client/coral-admin/src/actions/moderation.js index 0833c856e..2b8c1e599 100644 --- a/client/coral-admin/src/actions/moderation.js +++ b/client/coral-admin/src/actions/moderation.js @@ -52,6 +52,16 @@ export const toggleSelectCommentInUserDetail = (id, active) => { }; }; -export const toggleStorySearch = (active) => ({type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH}); +export const toggleStorySearch = (active) => ({ + type: active ? actions.SHOW_STORY_SEARCH : actions.HIDE_STORY_SEARCH +}); -export const storySearchChange = (e) => ({type: actions.CHANGE_ASSET_SEARCH_STRING, value: e.target.value}); +export const storySearchChange = (value) => ({ + type: actions.CHANGE_ASSET_SEARCH_STRING, + value +}); + +export const storySearchClear = () => ({ + type: actions.CHANGE_ASSET_SEARCH_STRING, + value: '' +}); diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 3a23a1a86..4d82803a8 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -34,7 +34,9 @@ export default class Moderation extends Component { } closeSearch = () => { - this.props.toggleStorySearch(false); + const {storySearchClear, toggleStorySearch} = this.props; + toggleStorySearch(false); + storySearchClear(); } openSearch = () => { @@ -208,7 +210,10 @@ export default class Moderation extends Component { acceptComment={props.acceptComment} rejectComment={props.rejectComment} /> )} - + ); } diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js index 4da0febbe..b1c44baff 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js @@ -19,7 +19,7 @@ const StorySearch = (props) => { props.router.push(`/admin/moderate/${id}`); props.closeSearch(); }; - + return (
diff --git a/client/coral-admin/src/routes/Moderation/containers/Moderation.js b/client/coral-admin/src/routes/Moderation/containers/Moderation.js index 24a3d748d..eac900d40 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/containers/Moderation.js @@ -25,6 +25,7 @@ import { viewUserDetail, hideUserDetail, setSortOrder, + storySearchClear } from 'actions/moderation'; import {Spinner} from 'coral-ui'; @@ -306,6 +307,7 @@ const mapDispatchToProps = (dispatch) => ({ viewUserDetail, hideUserDetail, setSortOrder, + storySearchClear }, dispatch), }); diff --git a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js index cfe2a5bea..c2c43c6ee 100644 --- a/client/coral-admin/src/routes/Moderation/containers/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/containers/StorySearch.js @@ -8,7 +8,8 @@ import {storySearchChange} from 'coral-admin/src/actions/moderation'; class StorySearchContainer extends React.Component { searchChange = (e) => { - this.props.storySearchChange(e.target.value); + const value = e.target.value; + this.props.storySearchChange(value); this.props.data.refetch(); }