{_t("This room is private, and can only be joined by invitation.")}
);
+ }
+
+ const title = this.state.isPublic ? _t('Create a public room') : _t('Create a private room');
return (
diff --git a/src/components/views/elements/Field.js b/src/components/views/elements/Field.js
index 08a578b963..0a737d963a 100644
--- a/src/components/views/elements/Field.js
+++ b/src/components/views/elements/Field.js
@@ -41,6 +41,8 @@ export default class Field extends React.PureComponent {
value: PropTypes.string.isRequired,
// Optional component to include inside the field before the input.
prefix: PropTypes.node,
+ // Optional component to include inside the field after the input.
+ postfix: PropTypes.node,
// The callback called whenever the contents of the field
// changes. Returns an object with `valid` boolean field
// and a `feedback` react component field to provide feedback
@@ -54,6 +56,8 @@ export default class Field extends React.PureComponent {
// If specified alongside tooltipContent, the class name to apply to the
// tooltip itself.
tooltipClassName: PropTypes.string,
+ // If specified, an additional class name to apply to the field container
+ className: PropTypes.string,
// All other props pass through to the .
};
@@ -143,8 +147,8 @@ export default class Field extends React.PureComponent {
render() {
const {
- element, prefix, onValidate, children, tooltipContent, flagInvalid,
- tooltipClassName, ...inputProps} = this.props;
+ element, prefix, postfix, className, onValidate, children,
+ tooltipContent, flagInvalid, tooltipClassName, ...inputProps} = this.props;
const inputElement = element || "input";
@@ -163,9 +167,13 @@ export default class Field extends React.PureComponent {
if (prefix) {
prefixContainer = {prefix};
}
+ let postfixContainer = null;
+ if (postfix) {
+ postfixContainer = {postfix};
+ }
const hasValidationFlag = flagInvalid !== null && flagInvalid !== undefined;
- const fieldClasses = classNames("mx_Field", `mx_Field_${inputElement}`, {
+ const fieldClasses = classNames("mx_Field", `mx_Field_${inputElement}`, className, {
// If we have a prefix element, leave the label always at the top left and
// don't animate it, as it looks a bit clunky and would add complexity to do
// properly.
@@ -192,6 +200,7 @@ export default class Field extends React.PureComponent {
{prefixContainer}
{fieldInput}
+ {postfixContainer}
{fieldTooltip}
;
}
diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
new file mode 100644
index 0000000000..03f4000e59
--- /dev/null
+++ b/src/components/views/elements/RoomAliasField.js
@@ -0,0 +1,125 @@
+/*
+Copyright 2019 New Vector 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 { _t } from '../../../languageHandler';
+import React from 'react';
+import PropTypes from 'prop-types';
+import sdk from '../../../index';
+import withValidation from './Validation';
+import MatrixClientPeg from '../../../MatrixClientPeg';
+
+export default class RoomAliasField extends React.PureComponent {
+ static propTypes = {
+ id: PropTypes.string.isRequired,
+ domain: PropTypes.string.isRequired,
+ onChange: PropTypes.func,
+ };
+
+ constructor(props) {
+ super(props);
+ this.state = {isValid: true};
+ }
+
+ _asFullAlias(localpart) {
+ return `#${localpart}:${this.props.domain}`;
+ }
+
+ render() {
+ const Field = sdk.getComponent('views.elements.Field');
+ const poundSign = (#);
+ const aliasPostfix = ":" + this.props.domain;
+ const domain = ({aliasPostfix});
+ const maxlength = 255 - this.props.domain.length - 2; // 2 for # and :
+ return (
+ this._fieldRef = ref}
+ onValidate={this._onValidate}
+ placeholder={_t("e.g. my-room")}
+ onChange={this._onChange}
+ maxLength={maxlength} />
+ );
+ }
+
+ _onChange = (ev) => {
+ if (this.props.onChange) {
+ this.props.onChange(this._asFullAlias(ev.target.value));
+ }
+ }
+
+ _onValidate = async (fieldState) => {
+ const result = await this._validationRules(fieldState);
+ this.setState({isValid: result.valid});
+ return result;
+ };
+
+ _validationRules = withValidation({
+ rules: [
+ {
+ key: "safeLocalpart",
+ test: async ({ value }) => {
+ if (!value) {
+ return true;
+ }
+ const fullAlias = this._asFullAlias(value);
+ // XXX: FIXME https://github.com/matrix-org/matrix-doc/issues/668
+ return !value.includes("#") && !value.includes(":") && !value.includes(",") &&
+ encodeURI(fullAlias) === fullAlias;
+ },
+ invalid: () => _t("Some characters not allowed"),
+ }, {
+ key: "required",
+ test: async ({ value, allowEmpty }) => allowEmpty || !!value,
+ invalid: () => _t("Please provide a room alias"),
+ }, {
+ key: "taken",
+ test: async ({value}) => {
+ if (!value) {
+ return true;
+ }
+ const client = MatrixClientPeg.get();
+ try {
+ await client.getRoomIdForAlias(this._asFullAlias(value));
+ // we got a room id, so the alias is taken
+ return false;
+ } catch (err) {
+ // any server error code will do,
+ // either it M_NOT_FOUND or the alias is invalid somehow,
+ // in which case we don't want to show the invalid message
+ return !!err.errcode;
+ }
+ },
+ valid: () => _t("This alias is available to use"),
+ invalid: () => _t("This alias is already in use"),
+ },
+ ],
+ });
+
+ get isValid() {
+ return this.state.isValid;
+ }
+
+ validate(options) {
+ return this._fieldRef.validate(options);
+ }
+
+ focus() {
+ this._fieldRef.focus();
+ }
+}
diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json
index 7ca31a0f94..49302fece1 100644
--- a/src/i18n/strings/en_EN.json
+++ b/src/i18n/strings/en_EN.json
@@ -1189,6 +1189,12 @@
"Custom level": "Custom level",
"Unable to load event that was replied to, it either does not exist or you do not have permission to view it.": "Unable to load event that was replied to, it either does not exist or you do not have permission to view it.",
"In reply to": "In reply to",
+ "Room alias": "Room alias",
+ "e.g. my-room": "e.g. my-room",
+ "Some characters not allowed": "Some characters not allowed",
+ "Please provide a room alias": "Please provide a room alias",
+ "This alias is available to use": "This alias is available to use",
+ "This alias is already in use": "This alias is already in use",
"Room directory": "Room directory",
"And %(count)s more...|other": "And %(count)s more...",
"ex. @bob:example.com": "ex. @bob:example.com",
@@ -1235,11 +1241,18 @@
"Community ID": "Community ID",
"example": "example",
"Create": "Create",
+ "Please enter a name for the room": "Please enter a name for the room",
+ "Set a room alias to easily share your room with other people.": "Set a room alias to easily share your room with other people.",
+ "This room is private, and can only be joined by invitation.": "This room is private, and can only be joined by invitation.",
+ "Create a public room": "Create a public room",
+ "Create a private room": "Create a private room",
+ "Name": "Name",
+ "Topic (optional)": "Topic (optional)",
+ "Make this room public": "Make this room public",
+ "Hide advanced": "Hide advanced",
+ "Show advanced": "Show advanced",
+ "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)": "Block users on other matrix homeservers from joining this room (This setting cannot be changed later!)",
"Create Room": "Create Room",
- "Room name (optional)": "Room name (optional)",
- "Advanced options": "Advanced options",
- "Block users on other matrix homeservers from joining this room": "Block users on other matrix homeservers from joining this room",
- "This setting cannot be changed later!": "This setting cannot be changed later!",
"Sign out": "Sign out",
"To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of Riot to do this",
"You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ": "You've previously used a newer version of Riot on %(host)s. To use this version again with end to end encryption, you will need to sign out and back in again. ",
@@ -1496,7 +1509,6 @@
"Doesn't look like a valid phone number": "Doesn't look like a valid phone number",
"Use lowercase letters, numbers, dashes and underscores only": "Use lowercase letters, numbers, dashes and underscores only",
"Enter username": "Enter username",
- "Some characters not allowed": "Some characters not allowed",
"Email (optional)": "Email (optional)",
"Confirm": "Confirm",
"Phone (optional)": "Phone (optional)",
@@ -1722,7 +1734,6 @@
"NOT verified": "NOT verified",
"Blacklisted": "Blacklisted",
"verified": "verified",
- "Name": "Name",
"Verification": "Verification",
"Ed25519 fingerprint": "Ed25519 fingerprint",
"User ID": "User ID",