This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Better support for inviting multiple people #403
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import MatrixClientPeg from './MatrixClientPeg'; | ||
|
|
||
| const emailRegex = /^\S+@\S+\.\S+$/; | ||
|
|
||
| export function getAddressType(inputText) { | ||
| const isEmailAddress = /^\S+@\S+\.\S+$/.test(inputText); | ||
| const isMatrixId = inputText[0] === '@' && inputText.indexOf(":") > 0; | ||
|
|
||
| // sanity check the input for user IDs | ||
| if (isEmailAddress) { | ||
| return 'email'; | ||
| } else if (isMatrixId) { | ||
| return 'mx'; | ||
| } else { | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| export function inviteToRoom(roomId, addr) { | ||
| const addrType = getAddressType(addr); | ||
|
|
||
| if (addrType == 'email') { | ||
| return MatrixClientPeg.get().inviteByEmail(roomId, addr); | ||
| } else if (addrType == 'mx') { | ||
| return MatrixClientPeg.get().invite(roomId, addr); | ||
| } else { | ||
| throw new Error('Unsupported address'); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,199 @@ | ||
| /* | ||
| Copyright 2016 OpenMarket Ltd | ||
|
|
||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
|
|
||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
|
|
||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| import React from 'react'; | ||
|
|
||
| import {getAddressType, inviteToRoom} from '../../../Invite'; | ||
| import sdk from '../../../index'; | ||
|
|
||
| export default class MultiInviteDialog extends React.Component { | ||
| constructor(props, context) { | ||
| super(props, context); | ||
|
|
||
| this._onCancel = this._onCancel.bind(this); | ||
| this._startInviting = this._startInviting.bind(this); | ||
|
|
||
| this.state = { | ||
| busy: false, | ||
| completionStates: [], // State of each address (invited or error) | ||
| errorTexts: [], // Textual error per address | ||
| done: false, | ||
| }; | ||
| for (let i = 0; i < this.props.inputs.length; ++i) { | ||
| const input = this.props.inputs[i]; | ||
| if (getAddressType(input) === null) { | ||
| this.state.completionStates[i] = 'error'; | ||
| this.state.errorTexts[i] = 'Unrecognised address'; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| _onCancel() { | ||
| this.props.onFinished(false); | ||
| } | ||
|
|
||
| _startInviting() { | ||
| this.setState({ | ||
| completionStates: [], | ||
|
There was a problem hiding this comment. this will blow away any |
||
| busy: true, | ||
| done: false, | ||
| }); | ||
| this._inviteMore(0); | ||
| } | ||
|
|
||
| _inviteMore(nextIndex) { | ||
| if (nextIndex == this.props.inputs.length) { | ||
| this.setState({ | ||
| busy: false, | ||
| done: true, | ||
| }); | ||
| return; | ||
| } | ||
|
|
||
| const input = this.props.inputs[nextIndex]; | ||
|
|
||
| // don't try to invite it if it's an invalid address | ||
| // (it will already be marked as an error though, | ||
| // so no need top do so again | ||
|
|
||
| if (getAddressType(input) === null) { | ||
| this._inviteMore(nextIndex + 1); | ||
| return; | ||
| } | ||
|
|
||
| // don't re-invite (there's no way in the UI to do this, but | ||
| // for sanity's sake) | ||
| if (this.state.completionStates[nextIndex] == 'invited') { | ||
| this._inviteMore(nextIndex + 1); | ||
| return; | ||
| } | ||
|
|
||
| inviteToRoom(this.props.roomId, input).then(() => { | ||
| this.setState((s) => { | ||
| s.completionStates[nextIndex] = 'invited' | ||
| return s; | ||
| }); | ||
| this._inviteMore(nextIndex + 1); | ||
| }, (err) => { | ||
| let errorText; | ||
| let fatal = false; | ||
| if (err.errcode == 'M_FORBIDDEN') { | ||
| fatal = true; | ||
| errorText = 'You do not have permission to invite people to this room.'; | ||
| } else if (err.errcode == 'M_LIMIT_EXCEEDED') { | ||
| // we're being throttled so wait a bit & try again | ||
| setTimeout(() => { | ||
| this._inviteMore(nextIndex); | ||
| }, 5000); | ||
| return; | ||
| } else { | ||
| errorText = 'Unknown server error'; | ||
| } | ||
| this.setState((s) => { | ||
| s.completionStates[nextIndex] = 'error'; | ||
| s.errorTexts[nextIndex] = errorText; | ||
| s.busy = !fatal; | ||
| s.done = fatal; | ||
| return s; | ||
| }); | ||
| if (!fatal) { | ||
| this._inviteMore(nextIndex + 1); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| _getProgressIndicator() { | ||
| const numErrors = this.state.completionStates.filter((s) => { | ||
| return s == 'error'; | ||
| }).length; | ||
| let errorText; | ||
| if (numErrors > 0) { | ||
| const plural = numErrors > 1 ? 's' : ''; | ||
| errorText = <span className="error">({numErrors} error{plural})</span> | ||
| } | ||
| return <span> | ||
| {this.state.completionStates.length} / {this.props.inputs.length} {errorText} | ||
|
There was a problem hiding this comment. if you have 10 inputs, of which the last is an invalid address, and you haven't started doing any invites yet, |
||
| </span>; | ||
| } | ||
|
|
||
| render() { | ||
| const Spinner = sdk.getComponent("elements.Spinner"); | ||
| const inviteTiles = []; | ||
|
|
||
| for (let i = 0; i < this.props.inputs.length; ++i) { | ||
| const input = this.props.inputs[i]; | ||
| let statusClass = ''; | ||
| let statusElement; | ||
| if (this.state.completionStates[i] == 'error') { | ||
| statusClass = 'error'; | ||
| statusElement = <p className="mx_MultiInviteDialog_statusText">{this.state.errorTexts[i]}</p>; | ||
| } else if (this.state.completionStates[i] == 'invited') { | ||
| statusClass = 'invited'; | ||
| } | ||
| inviteTiles.push( | ||
| <li key={i}> | ||
| <p className={statusClass}>{input}</p> | ||
| {statusElement} | ||
| </li> | ||
| ); | ||
| } | ||
|
|
||
| let controls = []; | ||
| if (this.state.busy) { | ||
| controls.push(<Spinner key="spinner" />); | ||
| controls.push(<span key="progr">{this._getProgressIndicator()}</span>); | ||
| } else if (this.state.done) { | ||
| controls.push( | ||
| <button | ||
| key="cancel" | ||
| className="mx_Dialog_primary" | ||
| onClick={this._onCancel} | ||
| >Done</button> | ||
| ); | ||
| controls.push(<span key="progr">{this._getProgressIndicator()}</span>); | ||
| } else { | ||
| controls.push( | ||
| <button | ||
| key="invite" | ||
| onClick={this._startInviting} | ||
| autoFocus={true} | ||
| className="mx_Dialog_primary" | ||
| > | ||
| Invite | ||
| </button>); | ||
| controls.push(<button key="cancel" onClick={this._onCancel}>Cancel</button>); | ||
| } | ||
|
|
||
| return ( | ||
| <div className="mx_MultiInviteDialog"> | ||
| <div className="mx_Dialog_title"> | ||
| Inviting {this.props.inputs.length} People | ||
| </div> | ||
| <div className="mx_Dialog_content"> | ||
| <ul> | ||
| {inviteTiles} | ||
| </ul> | ||
| </div> | ||
| <div className="mx_Dialog_buttons"> | ||
| {controls} | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| MultiInviteDialog.propTypes = { | ||
|
|
||
| onFinished: React.PropTypes.func.isRequired, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
shouldn't this attempt to cancel the invite process?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Otherwise the invite process could go on for hours in the background? And react will get very sad about the attempts to update the state.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would, although this button isn't visible once you start inviting - it probably should be though.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Isn't the close button visible?
On 10 August 2016 18:38:55 BST, David Baker notifications@github.com wrote: