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", 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; } 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/MatrixChat.js b/src/components/structures/MatrixChat.js index 5682f96634..bb90b2aeb5 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1647,11 +1647,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 @@ -1862,7 +1857,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()} @@ -1870,11 +1864,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} /> ); @@ -1911,7 +1902,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/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() { diff --git a/src/components/structures/SearchBox.js b/src/components/structures/SearchBox.js index ea1fa312c1..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) { @@ -95,8 +95,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 ? ( - -
; + // 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) { @@ -611,10 +537,6 @@ module.exports = React.createClass({ } return
- {serverDetails} {nextButton}
; @@ -643,13 +565,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 ( @@ -718,11 +635,11 @@ module.exports = React.createClass({

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

{ errorTextSection } - { this.renderServerComponentForStep() } + { this.renderServerComponent() } { this.renderLoginComponentForStep() } { _t('Create account') } diff --git a/src/components/structures/auth/Registration.js b/src/components/structures/auth/Registration.js index c0b393febf..69abd8b88b 100644 --- a/src/components/structures/auth/Registration.js +++ b/src/components/structures/auth/Registration.js @@ -54,21 +54,17 @@ 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, }, getInitialState: function() { + const customURLsAllowed = !SdkConfig.get()['disable_custom_urls']; + return { busy: false, errorText: null, @@ -90,6 +86,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 +365,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/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 70156b470d..66ba312025 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -1182,6 +1182,9 @@ "Sign in with": "Sign in with", "Phone": "Phone", "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", @@ -1362,7 +1365,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:", 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); + }); +}); 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(); + }); +});