Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
MM-14783: Fix button in progress text in add users to channel/team. (#…
Browse files Browse the repository at this point in the history
…2579)

* MM-14783: Fix button in progress text in add users to channel/team.

* Fix snapshot tests.
  • Loading branch information
grundleborg committed Apr 1, 2019
1 parent 7f8151c commit d4e422d
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ exports[`components/AddUsersToTeam should match snapshot 1`] = `
componentClass="div"
>
<MultiSelect
buttonSubmitLoadingText="Adding..."
buttonSubmitText="Add"
handleAdd={[Function]}
handleDelete={[Function]}
Expand Down
2 changes: 2 additions & 0 deletions components/add_users_to_team/add_users_to_team.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ export default class AddUsersToTeam extends React.Component {
);

const buttonSubmitText = localizeMessage('multiselect.add', 'Add');
const buttonSubmitLoadingText = localizeMessage('multiselect.adding', 'Adding...');

let users = [];
if (this.props.users) {
Expand Down Expand Up @@ -269,6 +270,7 @@ export default class AddUsersToTeam extends React.Component {
maxValues={MAX_SELECTABLE_VALUES}
numRemainingText={numRemainingText}
buttonSubmitText={buttonSubmitText}
buttonSubmitLoadingText={buttonSubmitLoadingText}
saving={this.state.saving}
loading={this.state.loadingUsers}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ exports[`components/channel_invite_modal should match snapshot for channel_invit
componentClass="div"
>
<MultiSelect
buttonSubmitLoadingText="Adding..."
buttonSubmitText="Add"
handleAdd={[Function]}
handleDelete={[Function]}
Expand Down
2 changes: 2 additions & 0 deletions components/channel_invite_modal/channel_invite_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ export default class ChannelInviteModal extends React.Component {
);

const buttonSubmitText = localizeMessage('multiselect.add', 'Add');
const buttonSubmitLoadingText = localizeMessage('multiselect.adding', 'Adding...');

let users = filterProfilesMatchingTerm(this.props.profilesNotInCurrentChannel, this.state.term);
users = users.filter((user) => user.delete_at === 0);
Expand All @@ -222,6 +223,7 @@ export default class ChannelInviteModal extends React.Component {
maxValues={MAX_SELECTABLE_VALUES}
numRemainingText={numRemainingText}
buttonSubmitText={buttonSubmitText}
buttonSubmitLoadingText={buttonSubmitLoadingText}
saving={this.state.saving}
loading={this.state.loadingUsers}
/>
Expand Down
3 changes: 2 additions & 1 deletion i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2463,6 +2463,7 @@
"msg_typing.areTyping": "{users} and {last} are typing...",
"msg_typing.isTyping": "{user} is typing...",
"multiselect.add": "Add",
"multiselect.adding": "Adding...",
"multiselect.go": "Go",
"multiselect.list.notFound": "No items found",
"multiselect.loading": "Loading...",
Expand Down Expand Up @@ -3258,4 +3259,4 @@
"web.root.signup_info": "All team communication in one place, searchable and accessible anywhere",
"yourcomputer": "Your computer",
"youtube_video.notFound": "Video not found"
}
}

0 comments on commit d4e422d

Please sign in to comment.