From 3d393b654b2d9d87839225d2fe2590eeb78df686 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 4 Feb 2019 18:27:22 +0000 Subject: [PATCH 01/14] clear min-height on ScrollPanel::componentDidUpdate to catch all cases --- src/components/structures/MessagePanel.js | 9 ++++----- src/components/structures/ScrollPanel.js | 4 ++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/components/structures/MessagePanel.js b/src/components/structures/MessagePanel.js index fc3b421e89..dd3d92913c 100644 --- a/src/components/structures/MessagePanel.js +++ b/src/components/structures/MessagePanel.js @@ -642,14 +642,13 @@ module.exports = React.createClass({ updateTimelineMinHeight: function() { const scrollPanel = this.refs.scrollPanel; - const whoIsTyping = this.refs.whoIsTyping; - const isTypingVisible = whoIsTyping && whoIsTyping.isVisible(); if (scrollPanel) { - if (isTypingVisible) { + const isAtBottom = scrollPanel.isAtBottom(); + const whoIsTyping = this.refs.whoIsTyping; + const isTypingVisible = whoIsTyping && whoIsTyping.isVisible(); + if (isAtBottom && isTypingVisible) { scrollPanel.blockShrinking(); - } else { - scrollPanel.clearBlockShrinking(); } } }, diff --git a/src/components/structures/ScrollPanel.js b/src/components/structures/ScrollPanel.js index be5f23c420..1df5e876e8 100644 --- a/src/components/structures/ScrollPanel.js +++ b/src/components/structures/ScrollPanel.js @@ -169,6 +169,10 @@ module.exports = React.createClass({ // // This will also re-check the fill state, in case the paginate was inadequate this.checkScroll(); + + if (!this.isAtBottom()) { + this.clearBlockShrinking(); + } }, componentWillUnmount: function() { From bdc3e1173d0b5cad2b5b686f4e9face00b410b48 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 4 Feb 2019 18:51:41 +0000 Subject: [PATCH 02/14] preserve SearchBox searchTerm state when collapsing --- src/components/structures/LeftPanel.js | 7 ++++--- src/components/structures/SearchBox.js | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/components/structures/LeftPanel.js b/src/components/structures/LeftPanel.js index 489e9bd243..cb374a02a3 100644 --- a/src/components/structures/LeftPanel.js +++ b/src/components/structures/LeftPanel.js @@ -199,9 +199,10 @@ const LeftPanel = React.createClass({ }, ); - const searchBox = !this.props.collapsed ? - : - undefined; + const searchBox = (); return (
diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index ea1fa312c1..db982b0d59 100644 --- a/src/components/structures/SearchBox.js +++ b/src/components/structures/SearchBox.js @@ -97,6 +97,13 @@ module.exports = React.createClass({ render: function() { const TintableSvg = sdk.getComponent('elements.TintableSvg'); + // check for collapsed here and + // not at parent so we keep + // searchTerm in our state + // when collapsing and expanding + if (this.props.collapsed) { + return null; + } const clearButton = this.state.searchTerm.length > 0 ? ( Date: Mon, 4 Feb 2019 18:52:10 +0000 Subject: [PATCH 03/14] remove unused variable --- src/components/structures/SearchBox.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index db982b0d59..5792b2904c 100644 --- a/src/components/structures/SearchBox.js +++ b/src/components/structures/SearchBox.js @@ -95,8 +95,6 @@ module.exports = React.createClass({ }, render: function() { - const TintableSvg = sdk.getComponent('elements.TintableSvg'); - // check for collapsed here and // not at parent so we keep // searchTerm in our state From 5432b0947853caef98520da59be668be5ef0f230 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 05:25:13 +0000 Subject: [PATCH 04/14] Default to registration phase when custom URLs disabled --- src/components/structures/auth/Login.js | 1 - src/components/structures/auth/Registration.js | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index a98e77c12b..17da4a855f 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -560,7 +560,6 @@ module.exports = React.createClass({ const ModularServerConfig = sdk.getComponent("auth.ModularServerConfig"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); - // TODO: May need to adjust the behavior of this config option if (SdkConfig.get()['disable_custom_urls']) { return null; } diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index c0b393febf..55cb4b7499 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -69,6 +69,8 @@ module.exports = React.createClass({ }, getInitialState: function() { + const customURLsAllowed = !SdkConfig.get()['disable_custom_urls']; + return { busy: false, errorText: null, @@ -90,6 +92,8 @@ module.exports = React.createClass({ serverType: null, hsUrl: this.props.customHsUrl, isUrl: this.props.customIsUrl, + // Phase of the overall registration dialog. + phase: customURLsAllowed ? PHASE_SERVER_DETAILS : PHASE_REGISTRATION, flows: null, }; }, @@ -367,7 +371,6 @@ module.exports = React.createClass({ const ModularServerConfig = sdk.getComponent("auth.ModularServerConfig"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); - // TODO: May need to adjust the behavior of this config option if (SdkConfig.get()['disable_custom_urls']) { return null; } From a73e3dcd4ceaa58c4c1608b7a936c51254407e5a Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 07:11:29 +0000 Subject: [PATCH 05/14] Remove unused props from registration --- src/components/structures/MatrixChat.js | 4 ---- src/components/structures/auth/Registration.js | 6 ------ 2 files changed, 10 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 613d310da9..77800109e4 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1891,7 +1891,6 @@ export default React.createClass({ sessionId={this.state.register_session_id} idSid={this.state.register_id_sid} email={this.props.startingFragmentQueryParams.email} - referrer={this.props.startingFragmentQueryParams.referrer} defaultServerDiscoveryError={this.state.defaultServerDiscoveryError} defaultHsUrl={this.getDefaultHsUrl()} defaultIsUrl={this.getDefaultIsUrl()} @@ -1899,11 +1898,8 @@ export default React.createClass({ customHsUrl={this.getCurrentHsUrl()} customIsUrl={this.getCurrentIsUrl()} makeRegistrationUrl={this._makeRegistrationUrl} - defaultDeviceDisplayName={this.props.defaultDeviceDisplayName} onLoggedIn={this.onRegistered} onLoginClick={this.onLoginClick} - onRegisterClick={this.onRegisterClick} - onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null} onServerConfigChange={this.onServerConfigChange} /> ); diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index 55cb4b7499..69abd8b88b 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -54,17 +54,11 @@ module.exports = React.createClass({ defaultIsUrl: PropTypes.string, brand: PropTypes.string, email: PropTypes.string, - referrer: PropTypes.string, - // An error passed along from higher up explaining that something // went wrong when finding the defaultHsUrl. defaultServerDiscoveryError: PropTypes.string, - - defaultDeviceDisplayName: PropTypes.string, - // registration shouldn't know or care how login is done. onLoginClick: PropTypes.func.isRequired, - onCancelClick: PropTypes.func, onServerConfigChange: PropTypes.func.isRequired, }, From 71d1a24fcb79a81c66f74d9e51f78a920fed4570 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 09:26:45 +0000 Subject: [PATCH 06/14] Add some basic registration tests --- .../structures/auth/Registration-test.js | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) create mode 100644 test/components/structures/auth/Registration-test.js diff --git a/test/components/structures/auth/Registration-test.js b/test/components/structures/auth/Registration-test.js new file mode 100644 index 0000000000..a10201d465 --- /dev/null +++ b/test/components/structures/auth/Registration-test.js @@ -0,0 +1,83 @@ +/* +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 expect from 'expect'; +import sinon from 'sinon'; +import React from 'react'; +import ReactDOM from 'react-dom'; +import ReactTestUtils from 'react-dom/test-utils'; +import sdk from 'matrix-react-sdk'; +import SdkConfig from '../../../../src/SdkConfig'; +import * as TestUtils from '../../../test-utils'; + +const Registration = sdk.getComponent( + 'structures.auth.Registration', +); + +describe('Registration', function() { + let parentDiv; + + beforeEach(function() { + TestUtils.beforeEach(this); + parentDiv = document.createElement('div'); + document.body.appendChild(parentDiv); + }); + + afterEach(function() { + sinon.restore(); + ReactDOM.unmountComponentAtNode(parentDiv); + parentDiv.remove(); + }); + + function render() { + return ReactDOM.render( {}} + onLoggedIn={() => {}} + onLoginClick={() => {}} + onServerConfigChange={() => {}} + />, parentDiv); + } + + it('should show server type selector', function() { + const root = render(); + const selector = ReactTestUtils.findRenderedComponentWithType( + root, + sdk.getComponent('auth.ServerTypeSelector'), + ); + expect(selector).toBeTruthy(); + }); + + it('should show form when custom URLs disabled', function() { + sinon.stub(SdkConfig, "get").returns({ + disable_custom_urls: true, + }); + + const root = render(); + + // Set non-empty flows to get past the loading spinner + root.setState({ + flows: [], + }); + + const form = ReactTestUtils.findRenderedComponentWithType( + root, + sdk.getComponent('auth.RegistrationForm'), + ); + expect(form).toBeTruthy(); + }); +}); From 32dbbbe7b1d9de5f3b7d66dca91a59e76e151310 Mon Sep 17 00:00:00 2001 From: David Baker Date: Tue, 5 Feb 2019 13:13:20 +0000 Subject: [PATCH 07/14] Remove the arrow-paren lint rule It's now in the base lint rules file: https://github.com/matrix-org/matrix-js-sdk/pull/834 --- .eslintrc.js | 1 - 1 file changed, 1 deletion(-) diff --git a/.eslintrc.js b/.eslintrc.js index ec48f6b2ff..fae41ec159 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -97,7 +97,6 @@ module.exports = { "new-cap": ["warn"], "key-spacing": ["warn"], "prefer-const": ["warn"], - "arrow-parens": "off", // crashes currently: https://github.com/eslint/eslint/issues/6274 "generator-star-spacing": "off", From 4e152f82e747b39eb9227277af4a26f20a0c527f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 14:30:45 +0000 Subject: [PATCH 08/14] Remove server types from login --- src/components/structures/auth/Login.js | 109 +++--------------------- 1 file changed, 14 insertions(+), 95 deletions(-) diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index 17da4a855f..f9964a9ed3 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -26,7 +26,6 @@ import Login from '../../../Login'; import SdkConfig from '../../../SdkConfig'; import { messageForResourceLimitError } from '../../../utils/ErrorUtils'; import { AutoDiscovery } from "matrix-js-sdk"; -import * as ServerType from '../../views/auth/ServerTypeSelector'; // For validating phone numbers without country codes const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/; @@ -87,7 +86,6 @@ module.exports = React.createClass({ errorText: null, loginIncorrect: false, - serverType: null, enteredHsUrl: this.props.customHsUrl || this.props.defaultHsUrl, enteredIsUrl: this.props.customIsUrl || this.props.defaultIsUrl, @@ -263,11 +261,6 @@ module.exports = React.createClass({ username: username, discoveryError: null, }); - // If the free server type is selected, we don't show server details at all, - // so it doesn't make sense to try .well-known discovery. - if (this.state.serverType === ServerType.FREE) { - return; - } if (username[0] === "@") { const serverName = username.split(':').slice(1).join(':'); try { @@ -323,39 +316,6 @@ module.exports = React.createClass({ }); }, - onServerTypeChange(type) { - this.setState({ - serverType: type, - }); - - // When changing server types, set the HS / IS URLs to reasonable defaults for the - // the new type. - switch (type) { - case ServerType.FREE: { - const { hsUrl, isUrl } = ServerType.TYPES.FREE; - this.onServerConfigChange({ - hsUrl, - isUrl, - }); - // Move directly to the login phase since the server details are fixed. - this.setState({ - phase: PHASE_LOGIN, - }); - break; - } - case ServerType.PREMIUM: - case ServerType.ADVANCED: - this.onServerConfigChange({ - hsUrl: this.props.defaultHsUrl, - isUrl: this.props.defaultIsUrl, - }); - this.setState({ - phase: PHASE_SERVER_DETAILS, - }); - break; - } - }, - onRegisterClick: function(ev) { ev.preventDefault(); ev.stopPropagation(); @@ -391,14 +351,6 @@ module.exports = React.createClass({ try { const discovery = await AutoDiscovery.findClientConfig(serverName); - // The server type may have changed while discovery began in the background. - // If it has become the free server type which doesn't show server details, - // ignore discovery results. - if (this.state.serverType === ServerType.FREE) { - this.setState({findingHomeserver: false}); - return; - } - const state = discovery["m.homeserver"].state; if (state !== AutoDiscovery.SUCCESS && state !== AutoDiscovery.PROMPT) { this.setState({ @@ -554,51 +506,27 @@ module.exports = React.createClass({ return errorText; }, - renderServerComponentForStep() { - const ServerTypeSelector = sdk.getComponent("auth.ServerTypeSelector"); + renderServerComponent() { const ServerConfig = sdk.getComponent("auth.ServerConfig"); - const ModularServerConfig = sdk.getComponent("auth.ModularServerConfig"); const AccessibleButton = sdk.getComponent("elements.AccessibleButton"); if (SdkConfig.get()['disable_custom_urls']) { return null; } - // If we're on a different phase, we only show the server type selector, - // which is always shown if we allow custom URLs at all. if (PHASES_ENABLED && this.state.phase !== PHASE_SERVER_DETAILS) { - return
- -
; + // TODO: ... + return null; } - let serverDetails = null; - switch (this.state.serverType) { - case ServerType.FREE: - break; - case ServerType.PREMIUM: - serverDetails = ; - break; - case ServerType.ADVANCED: - serverDetails = ; - break; - } + const serverDetails = ; let nextButton = null; if (PHASES_ENABLED) { @@ -610,10 +538,6 @@ module.exports = React.createClass({ } return
- {serverDetails} {nextButton}
; @@ -642,13 +566,8 @@ module.exports = React.createClass({ _renderPasswordStep: function() { const PasswordLogin = sdk.getComponent('auth.PasswordLogin'); let onEditServerDetailsClick = null; - // If custom URLs are allowed and we haven't selected the Free server type, wire - // up the server details edit link. - if ( - PHASES_ENABLED && - !SdkConfig.get()['disable_custom_urls'] && - this.state.serverType !== ServerType.FREE - ) { + // If custom URLs are allowed, wire up the server details edit link. + if (PHASES_ENABLED && !SdkConfig.get()['disable_custom_urls']) { onEditServerDetailsClick = this.onEditServerDetailsClick; } return ( @@ -721,7 +640,7 @@ module.exports = React.createClass({ {loader} { errorTextSection } - { this.renderServerComponentForStep() } + { this.renderServerComponent() } { this.renderLoginComponentForStep() } { _t('Create account') } From dbe14c5527c62d5dcd7bfacdb965e5d5e03d362d Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 14:43:25 +0000 Subject: [PATCH 09/14] Enable phases for login, but start on the login phase by default --- src/components/structures/auth/Login.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index f9964a9ed3..d645ade967 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -31,13 +31,13 @@ import { AutoDiscovery } from "matrix-js-sdk"; const PHONE_NUMBER_REGEX = /^[0-9()\-\s]*$/; // Phases -// Show controls to configure server details -const PHASE_SERVER_DETAILS = 0; // Show the appropriate login flow(s) for the server -const PHASE_LOGIN = 1; +const PHASE_LOGIN = 0; +// Show controls to configure server details +const PHASE_SERVER_DETAILS = 1; -// Disable phases for now, pending UX discussion on WK discovery -const PHASES_ENABLED = false; +// Enable phases for login +const PHASES_ENABLED = true; // These are used in several places, and come from the js-sdk's autodiscovery // stuff. We define them here so that they'll be picked up by i18n. @@ -95,7 +95,7 @@ module.exports = React.createClass({ phoneNumber: "", // Phase of the overall login dialog. - phase: PHASE_SERVER_DETAILS, + phase: PHASE_LOGIN, // The current login flow, such as password, SSO, etc. currentFlow: "m.login.password", From 02a20fa6684ec9c9d0f93f79692052a17ceab412 Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 15:36:00 +0000 Subject: [PATCH 10/14] Tweak login wording to match design --- src/components/structures/auth/Login.js | 2 +- src/components/views/auth/PasswordLogin.js | 8 ++++---- src/i18n/strings/en_EN.json | 10 ++++------ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index d645ade967..c6de095461 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -636,7 +636,7 @@ module.exports = React.createClass({

- {_t('Sign in to your account')} + {_t('Sign in')} {loader}

{ errorTextSection } diff --git a/src/components/views/auth/PasswordLogin.js b/src/components/views/auth/PasswordLogin.js index 5bc6d6e05b..8db30c6d43 100644 --- a/src/components/views/auth/PasswordLogin.js +++ b/src/components/views/auth/PasswordLogin.js @@ -249,10 +249,10 @@ class PasswordLogin extends React.Component { ; } - let yourMatrixAccountText = _t('Your account'); + let signInToText = _t('Sign in'); try { const parsedHsUrl = new URL(this.props.hsUrl); - yourMatrixAccountText = _t('Your %(serverName)s account', { + signInToText = _t('Sign in to %(serverName)s', { serverName: parsedHsUrl.hostname, }); } catch (e) { @@ -264,7 +264,7 @@ class PasswordLogin extends React.Component { editLink = - {_t('Edit')} + {_t('Change')} ; } @@ -297,7 +297,7 @@ class PasswordLogin extends React.Component { return (

- {yourMatrixAccountText} + {signInToText} {editLink}

diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 623dd92613..9e5b32f24c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -870,12 +870,12 @@ "Delete widget": "Delete widget", "Failed to remove widget": "Failed to remove widget", "An error ocurred whilst trying to remove the widget from the room": "An error ocurred whilst trying to remove the widget from the room", - "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", + "Revoke widget access": "Revoke widget access", "Create new room": "Create new room", "Unblacklist": "Unblacklist", "Blacklist": "Blacklist", @@ -1064,7 +1064,6 @@ "To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.": "To help avoid duplicate issues, please view existing issues first (and add a +1) or create a new issue if you can't find it.", "Report bugs & give feedback": "Report bugs & give feedback", "Go back": "Go back", - "Visit old settings": "Visit old settings", "Room Settings": "Room Settings", "Failed to upgrade room": "Failed to upgrade room", "The room upgrade could not be completed": "The room upgrade could not be completed", @@ -1196,10 +1195,10 @@ "Username": "Username", "Mobile phone number": "Mobile phone number", "Not sure of your password? Set a new one": "Not sure of your password? Set a new one", - "Your account": "Your account", - "Your %(serverName)s account": "Your %(serverName)s account", - "Sign in with": "Sign in with", "Sign in": "Sign in", + "Sign in to %(serverName)s": "Sign in to %(serverName)s", + "Change": "Change", + "Sign in with": "Sign in with", "If you don't specify an email address, you won't be able to reset your password. Are you sure?": "If you don't specify an email address, you won't be able to reset your password. Are you sure?", "Create your account": "Create your account", "Create your %(serverName)s account": "Create your %(serverName)s account", @@ -1403,7 +1402,6 @@ "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.": "Can't connect to homeserver - please check your connectivity, ensure your homeserver's SSL certificate is trusted, and that a browser extension is not blocking requests.", "Sign in with single sign-on": "Sign in with single sign-on", "Try the app first": "Try the app first", - "Sign in to your account": "Sign in to your account", "Create account": "Create account", "Failed to fetch avatar URL": "Failed to fetch avatar URL", "Set a display name:": "Set a display name:", From 36bf06d87a467122b0da3e4a735cdf1b050af9ea Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 15:50:56 +0000 Subject: [PATCH 11/14] Tweak field padding to avoid overlapping with selected text --- res/css/views/elements/_Field.scss | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/res/css/views/elements/_Field.scss b/res/css/views/elements/_Field.scss index 06002939f5..6f215412db 100644 --- a/res/css/views/elements/_Field.scss +++ b/res/css/views/elements/_Field.scss @@ -100,7 +100,8 @@ limitations under the License. top 0.25s ease-out 0s, background-color 0.25s ease-out 0s; font-size: 10px; - top: -14px; + top: -13px; + padding: 0 2px; background-color: $field-focused-label-bg-color; } From 6549ae1ce54b766ab2a657c4b3f8ad2559a8e80b Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 16:11:32 +0000 Subject: [PATCH 12/14] Remove unused props from login --- src/components/structures/MatrixChat.js | 6 ------ src/components/structures/auth/Login.js | 1 - 2 files changed, 7 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 77800109e4..24db0dc995 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1676,11 +1676,6 @@ export default React.createClass({ this.showScreen("forgot_password"); }, - onReturnToAppClick: function() { - // treat it the same as if the user had completed the login - this._onLoggedIn(); - }, - // returns a promise which resolves to the new MatrixClient onRegistered: function(credentials) { // XXX: This should be in state or ideally store(s) because we risk not @@ -1936,7 +1931,6 @@ export default React.createClass({ defaultDeviceDisplayName={this.props.defaultDeviceDisplayName} onForgotPasswordClick={this.onForgotPasswordClick} enableGuest={this.props.enableGuest} - onCancelClick={MatrixClientPeg.get() ? this.onReturnToAppClick : null} onServerConfigChange={this.onServerConfigChange} /> ); diff --git a/src/components/structures/auth/Login.js b/src/components/structures/auth/Login.js index c6de095461..8524447ed4 100644 --- a/src/components/structures/auth/Login.js +++ b/src/components/structures/auth/Login.js @@ -76,7 +76,6 @@ module.exports = React.createClass({ // login shouldn't care how password recovery is done. onForgotPasswordClick: PropTypes.func, - onCancelClick: PropTypes.func, onServerConfigChange: PropTypes.func.isRequired, }, From 71c30b564181d71083d5202043067cc9a536ca3f Mon Sep 17 00:00:00 2001 From: "J. Ryan Stinnett" Date: Tue, 5 Feb 2019 16:33:12 +0000 Subject: [PATCH 13/14] Add some basic login tests --- test/components/structures/auth/Login-test.js | 90 +++++++++++++++++++ 1 file changed, 90 insertions(+) create mode 100644 test/components/structures/auth/Login-test.js diff --git a/test/components/structures/auth/Login-test.js b/test/components/structures/auth/Login-test.js new file mode 100644 index 0000000000..ec95243a56 --- /dev/null +++ b/test/components/structures/auth/Login-test.js @@ -0,0 +1,90 @@ +/* +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 expect from 'expect'; +import sinon from 'sinon'; +import React from 'react'; +import ReactDOM from 'react-dom'; +import ReactTestUtils from 'react-dom/test-utils'; +import sdk from 'matrix-react-sdk'; +import SdkConfig from '../../../../src/SdkConfig'; +import * as TestUtils from '../../../test-utils'; + +const Login = sdk.getComponent( + 'structures.auth.Login', +); + +describe('Login', function() { + let parentDiv; + + beforeEach(function() { + TestUtils.beforeEach(this); + parentDiv = document.createElement('div'); + document.body.appendChild(parentDiv); + }); + + afterEach(function() { + sinon.restore(); + ReactDOM.unmountComponentAtNode(parentDiv); + parentDiv.remove(); + }); + + function render() { + return ReactDOM.render( {}} + onRegisterClick={() => {}} + onServerConfigChange={() => {}} + />, parentDiv); + } + + it('should show form with change server link', function() { + const root = render(); + + const form = ReactTestUtils.findRenderedComponentWithType( + root, + sdk.getComponent('auth.PasswordLogin'), + ); + expect(form).toBeTruthy(); + + const changeServerLink = ReactTestUtils.findRenderedDOMComponentWithClass( + root, + 'mx_AuthBody_editServerDetails', + ); + expect(changeServerLink).toBeTruthy(); + }); + + it('should show form without change server link when custom URLs disabled', function() { + sinon.stub(SdkConfig, "get").returns({ + disable_custom_urls: true, + }); + + const root = render(); + + const form = ReactTestUtils.findRenderedComponentWithType( + root, + sdk.getComponent('auth.PasswordLogin'), + ); + expect(form).toBeTruthy(); + + const changeServerLinks = ReactTestUtils.scryRenderedDOMComponentsWithClass( + root, + 'mx_AuthBody_editServerDetails', + ); + expect(changeServerLinks).toHaveLength(0); + }); +}); From d501ce0553a7a4082d6aba3196e2bea15457c0aa Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Wed, 6 Feb 2019 17:25:56 +0000 Subject: [PATCH 14/14] increase debouncing of filtering because its quite laggy atm --- src/components/structures/SearchBox.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index 5792b2904c..fbcd9a7279 100644 --- a/src/components/structures/SearchBox.js +++ b/src/components/structures/SearchBox.js @@ -71,7 +71,7 @@ module.exports = React.createClass({ function() { this.props.onSearch(this.refs.search.value); }, - 100, + 500, ), _onKeyDown: function(ev) {