Refactor ChatInviteDialog to be UserPickerDialog #1300
Conversation
Now it's just a means of choosing users and all the actual inviting functionality is moved out to Invite.js. This will allow us to reuse it for inviting to groups. Adds the ability to restrict what types of addresses may be chosen, although this isn;t used yet, it will be necessary for groups because groups don't support 3pid invites.
The other changes I forgot to add
src/Invite.js
Outdated
| import MatrixClientPeg from './MatrixClientPeg'; | ||
| import MultiInviter from './utils/MultiInviter'; | ||
| import Modal from "./Modal"; |
There was a problem hiding this comment.
nit: consistent quotes pls
src/Invite.js
Outdated
| import MatrixClientPeg from './MatrixClientPeg'; | ||
| import MultiInviter from './utils/MultiInviter'; | ||
| import Modal from "./Modal"; | ||
| import createRoom from './createRoom'; | ||
| import sdk from "./"; |
| React.PropTypes.element, | ||
| React.PropTypes.string, | ||
| title: PropTypes.string.isRequired, | ||
| description: PropTypes.oneOfType([ |
There was a problem hiding this comment.
could use PropTypes.node I think
| }; | ||
| }, | ||
|
|
||
| getInitialState: function() { | ||
| return { | ||
| error: false, | ||
|
|
||
| // List of AddressTile.InviteAddressType objects representing | ||
| // List of InviteAddressType objects representing |
There was a problem hiding this comment.
It's a bit odd having the word invite in variables, comments now that this component doesn't know about inviting
There was a problem hiding this comment.
have made it UserAddressType throughout
| @@ -311,7 +268,7 @@ module.exports = React.createClass({ | |||
| // This is important, otherwise there's no way to invite | |||
| // a perfectly valid address if there are close matches. | |||
| const addrType = getAddressType(query); | |||
| if (addrType !== null) { | |||
| if (this.props.validAddressTypes.indexOf(addrType) !== -1) { | |||
There was a problem hiding this comment.
I've been sticking to indexOf, but probably for no reason really, so I don't care, done
| @@ -90,50 +89,7 @@ module.exports = React.createClass({ | |||
| inviteList = this._addInputToList(); | |||
There was a problem hiding this comment.
There are still things called invite and comments mentioning invites in this file
src/Invite.js
Outdated
| // could be a third party identifier or a matrix ID) | ||
| // along with some additional information about the | ||
| // address / target. | ||
| export const UserAddressType = PropTypes.shape({ |
There was a problem hiding this comment.
This feels like a strange place for a general "user address" type that might no have anything to do with inviting. Putting it in AddressTile seems fine?
There was a problem hiding this comment.
Moved to UserAddress as otherwise we'd end up importing view code from utility code which is definitely a pattern I'd like to avoid.
I managed to lose this when refactoring ChatInviteDialog in #1300 Fixes element-hq/element-web#5119
Now it's just a means of choosing users and all the actual inviting
functionality is moved out to Invite.js. This will allow us to
reuse it for inviting to groups.
Adds the ability to restrict what types of addresses may be chosen,
although this isn't used yet, it will be necessary for groups
because groups don't support 3pid invites.