From ef808262d7fe05cb1d7abdd465e8f91948e024fd Mon Sep 17 00:00:00 2001 From: Martin Kraft Date: Tue, 9 Oct 2018 13:01:32 -0400 Subject: [PATCH] MM-12552: Adds parameter to include archived channel search results. --- app/screens/search/index.js | 1 + app/screens/search/search.js | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/app/screens/search/index.js b/app/screens/search/index.js index 672ad129c..aed820a51 100644 --- a/app/screens/search/index.js +++ b/app/screens/search/index.js @@ -66,6 +66,7 @@ function makeMapStateToProps() { theme: getTheme(state), enableDateSuggestion, timezoneOffsetInSeconds, + viewArchivedChannels, }; }; } diff --git a/app/screens/search/search.js b/app/screens/search/search.js index 9ae01e48c..f57fafeb4 100644 --- a/app/screens/search/search.js +++ b/app/screens/search/search.js @@ -73,6 +73,7 @@ export default class Search extends PureComponent { theme: PropTypes.object.isRequired, enableDateSuggestion: PropTypes.bool, timezoneOffsetInSeconds: PropTypes.number.isRequired, + viewArchivedChannels: PropTypes.bool, }; static defaultProps = { @@ -537,7 +538,7 @@ export default class Search extends PureComponent { }; search = (terms, isOrSearch) => { - const {actions, currentTeamId} = this.props; + const {actions, currentTeamId, viewArchivedChannels} = this.props; this.handleTextChanged(`${terms.trim()} `); @@ -551,7 +552,15 @@ export default class Search extends PureComponent { }); // timezone offset in seconds - actions.searchPostsWithParams(currentTeamId, {terms: terms.trim(), is_or_search: isOrSearch, time_zone_offset: this.props.timezoneOffsetInSeconds, page: 0, per_page: 20}, true); + const params = { + terms: terms.trim(), + is_or_search: isOrSearch, + time_zone_offset: this.props.timezoneOffsetInSeconds, + page: 0, + per_page: 20, + include_deleted_channels: viewArchivedChannels, + }; + actions.searchPostsWithParams(currentTeamId, params, true); }; setModifierValue = preventDoubleTap((modifier) => {