From 8aaab0a3baa7efd812df05a401c1c7138fdd97ff Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Sat, 29 Feb 2020 01:00:57 +0000
Subject: [PATCH] refactor to add Validation::final

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 src/components/views/elements/RoomAliasField.js | 14 +++++---------
 src/components/views/elements/Validation.js     |  6 ++++++
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/views/elements/RoomAliasField.js b/src/components/views/elements/RoomAliasField.js
index 06e608b14c..b38047cd3b 100644
--- a/src/components/views/elements/RoomAliasField.js
+++ b/src/components/views/elements/RoomAliasField.js
@@ -38,13 +38,6 @@ export default class RoomAliasField extends React.PureComponent {
         return `#${localpart}:${this.props.domain}`;
     }
 
-    _isValid(value) {
-        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;
-    }
-
     render() {
         const Field = sdk.getComponent('views.elements.Field');
         const poundSign = (<span>#</span>);
@@ -87,7 +80,10 @@ export default class RoomAliasField extends React.PureComponent {
                     if (!value) {
                         return true;
                     }
-                    return this._isValid(value);
+                    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"),
             }, {
@@ -96,7 +92,7 @@ export default class RoomAliasField extends React.PureComponent {
                 invalid: () => _t("Please provide a room alias"),
             }, {
                 key: "taken",
-                skip: ({value}) => !value || !this._isValid(value),
+                final: true,
                 test: async ({value}) => {
                     if (!value) {
                         return true;
diff --git a/src/components/views/elements/Validation.js b/src/components/views/elements/Validation.js
index 3454ab3aec..2be526a3c3 100644
--- a/src/components/views/elements/Validation.js
+++ b/src/components/views/elements/Validation.js
@@ -28,9 +28,11 @@ import classNames from 'classnames';
  *     An array of rules describing how to check to input value. Each rule in an object
  *     and may have the following properties:
  *     - `key`: A unique ID for the rule. Required.
+ *     - `skip`: A function used to determine whether the rule should even be evaluated.
  *     - `test`: A function used to determine the rule's current validity. Required.
  *     - `valid`: Function returning text to show when the rule is valid. Only shown if set.
  *     - `invalid`: Function returning text to show when the rule is invalid. Only shown if set.
+ *     - `final`: A Boolean if true states that this rule will only be considered if all rules before it returned valid.
  * @returns {Function}
  *     A validation function that takes in the current input value and returns
  *     the overall validity and a feedback UI that can be rendered for more detail.
@@ -52,6 +54,10 @@ export default function withValidation({ description, rules }) {
                     continue;
                 }
 
+                if (!valid && rule.final) {
+                    continue;
+                }
+
                 const data = { value, allowEmpty };
 
                 if (rule.skip && rule.skip.call(this, data)) {