Remove user from list when selected in DM modal (mattermost#5884)

Revanth47 · Mar 29, 2017 · 5113067 · 5113067
1 parent 793c0cc
commit 5113067
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/components/multiselect/multiselect.jsx b/components/multiselect/multiselect.jsx
@@ -111,7 +111,8 @@ export default class MultiSelect extends React.Component {
  }
 
  render() {
- const options = this.props.options;
+ const options = Object.assign([], this.props.options);
+ const values = this.props.values;
 
  let numRemainingText;
  if (this.props.numRemainingText) {
@@ -142,6 +143,17 @@ export default class MultiSelect extends React.Component {
  );
  }
 
+ const valueMap = {};
+ for (let i = 0; i < values.length; i++) {
+ valueMap[values[i].id] = true;
+ }
+
+ for (let i = options.length - 1; i >= 0; i--) {
+ if (valueMap[options[i].id]) {
+ options.splice(i, 1);
+ }
+ }
+
  if (options && options.length > this.props.perPage) {
  const pageStart = this.state.page * this.props.perPage;
  const pageEnd = pageStart + this.props.perPage;

diff --git a/components/sidebar.jsx b/components/sidebar.jsx
@@ -677,7 +677,10 @@ export default class Sidebar extends React.Component {
  <li key='more'>
  <a
  href='#'
- onClick={() => this.showMoreDirectChannelsModal()}
+ onClick={(e) => {
+ e.preventDefault();
+ this.showMoreDirectChannelsModal();
+ }}
  >
  <FormattedMessage
  id='sidebar.moreElips'