Matrix/element-web-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2024-11-17 22:14:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Group create dialog: only enter localpart

Browse Source 
Since we currently can only create groups on the local server anyway,
there's no point making the user jump through the hoop of forming the
whole group ID and telling them off if they got the server name wrong.
This commit is contained in:
David Baker 2017-10-19 16:47:43 +01:00
parent 0f4ca1992d
commit b9574ff382
2 changed files with 8 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/components/views/dialogs/CreateGroupDialog.js
View File

@ -58,26 +58,9 @@ export default React.createClass({
},
_checkGroupId: function(e) {
const parsedGroupId = this._parseGroupId(this.state.groupId);
let error = null;
if (parsedGroupId === null) {
error = _t(
"Community IDs must be of the form +localpart:%(domain)s",
{domain: MatrixClientPeg.get().getDomain()},
);
} else {
const groupId = parsedGroupId[0];
const domain = parsedGroupId[1];
if (!/^[a-zA-Z0-9]*$/.test(groupId)) {
error = _t("Community IDs may only contain alphanumeric characters");
} else if (domain !== MatrixClientPeg.get().getDomain()) {
error = _t(
"It is currently only possible to create communities on your own home server: "+
"use a community ID ending with %(domain)s",
{domain: MatrixClientPeg.get().getDomain()},
);
}
if (!/^[a-zA-Z0-9]*$/.test(this.state.groupId)) {
error = _t("Community IDs may only contain alphanumeric characters");
}
this.setState({
groupIdError: error,
@ -90,14 +73,13 @@ export default React.createClass({
if (this._checkGroupId()) return;
const parsedGroupId = this._parseGroupId(this.state.groupId);
const profile = {};
if (this.state.groupName !== '') {
profile.name = this.state.groupName;
}
this.setState({creating: true});
MatrixClientPeg.get().createGroup({
localpart: parsedGroupId[0],
localpart: this.state.groupId,
profile: profile,
}).then((result) => {
dis.dispatch({
@ -116,22 +98,6 @@ export default React.createClass({
this.props.onFinished(false);
},
/**
* Parse a string that may be a group ID
* If the string is a valid group ID, return a list of [localpart, domain],
* otherwise return null.
*
* @param {string} groupId The ID of the group
* @return {string[]} array of localpart, domain
*/
_parseGroupId: function(groupId) {
const matches = GROUP_REGEX.exec(this.state.groupId);
if (!matches || matches.length < 3) {
return null;
}
return [matches[1], matches[2]];
},
render: function() {
const BaseDialog = sdk.getComponent('views.dialogs.BaseDialog');
const Spinner = sdk.getComponent('elements.Spinner');
@ -176,13 +142,15 @@ export default React.createClass({
<label htmlFor="groupid">{ _t('Community ID') }</label>
</div>
<div>
<span>+</span>
<input id="groupid" className="mx_CreateGroupDialog_input"
size="64"
placeholder={_t('+example:%(domain)s', {domain: MatrixClientPeg.get().getDomain()})}
size="32"
placeholder={_t('example')}
onChange={this._onGroupIdChange}
onBlur={this._onGroupIdBlur}
value={this.state.groupId}
/>
<span>:{MatrixClientPeg.get().getDomain()}</span>
</div>
</div>
<div className="error">

2
src/i18n/strings/en_EN.json
View File

@ -590,7 +590,7 @@
"Community Name": "Community Name",
"Example": "Example",
"Community ID": "Community ID",
"+example:%(domain)s": "+example:%(domain)s",
"example": "example",
"Create": "Create",
"Create Room": "Create Room",
"Room name (optional)": "Room name (optional)",