From 1763359523bdd52c31627b2f72015f6985502511 Mon Sep 17 00:00:00 2001 From: NikolayRechkin Date: Thu, 19 Dec 2019 12:04:37 +0300 Subject: [PATCH 1/9] web: components: small property fix --- .../src/components/filter-input/filter-block.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/filter-input/filter-block.js b/web/ASC.Web.Components/src/components/filter-input/filter-block.js index a921db6735..f8e3cb24d4 100644 --- a/web/ASC.Web.Components/src/components/filter-input/filter-block.js +++ b/web/ASC.Web.Components/src/components/filter-input/filter-block.js @@ -100,7 +100,7 @@ class FilterItem extends React.Component { scaled={false} noBorder={true} opened={this.props.opened} - directionX='right' + directionX='left' > : {this.props.label} } From 3461dc115235f56b83119de74248227026da575b Mon Sep 17 00:00:00 2001 From: NikolayRechkin Date: Thu, 19 Dec 2019 12:05:29 +0300 Subject: [PATCH 2/9] web: components: bump version --- web/ASC.Web.Components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json index 6acb0e86f3..7cead65165 100644 --- a/web/ASC.Web.Components/package.json +++ b/web/ASC.Web.Components/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-components", - "version": "1.0.249", + "version": "1.0.250", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From 3b091a0ef79243e8a175d79aa3a64614ad028604 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 19 Dec 2019 12:26:58 +0300 Subject: [PATCH 3/9] Web: Components: increased help-button click size --- .../src/components/field-container/index.js | 5 ++--- .../src/components/help-button/index.js | 12 +++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/web/ASC.Web.Components/src/components/field-container/index.js b/web/ASC.Web.Components/src/components/field-container/index.js index 43f90cee04..92428a3a53 100644 --- a/web/ASC.Web.Components/src/components/field-container/index.js +++ b/web/ASC.Web.Components/src/components/field-container/index.js @@ -28,8 +28,7 @@ function getHorizontalCss(labelWidth) { } .icon-button { position: relative; - line-height: 24px; - margin: 2px 0 0 4px; + margin-top: 1px; } `; } @@ -56,7 +55,7 @@ function getVerticalCss() { .icon-button { position: relative; line-height: unset; - margin: -4px 0 0 4px; + margin-top: -12px; } `; } diff --git a/web/ASC.Web.Components/src/components/help-button/index.js b/web/ASC.Web.Components/src/components/help-button/index.js index 8fbf94ded1..aec1277740 100644 --- a/web/ASC.Web.Components/src/components/help-button/index.js +++ b/web/ASC.Web.Components/src/components/help-button/index.js @@ -11,6 +11,12 @@ import Heading from "../heading"; import throttle from "lodash/throttle"; import styled from "styled-components"; +const HelpContainer = styled.div` + .help-icon { + padding: 8px; + } +`; + const Content = styled.div` position: relative; width: 100%; @@ -136,10 +142,10 @@ class HelpButton extends React.Component { } = this.props; return ( -
+ )} -
+ ); } } From ead63330819d2e2e0a025be154451ed14bb35454 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 19 Dec 2019 12:27:45 +0300 Subject: [PATCH 4/9] Web: People: fixed help-button position --- .../pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js index 2e78c7ab85..65a69ba3f4 100644 --- a/products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js +++ b/products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js @@ -47,11 +47,13 @@ const InfoItemValue = styled.div` padding-left: 0px; } } + .help-icon { + margin-top: -2px; + } `; -const TooltipIcon = styled.span` +const TooltipIcon = styled.div` display: inline-flex; - padding-top: 6px; `; const IconButtonWrapper = styled.div` @@ -353,6 +355,7 @@ class ProfileInfo extends React.PureComponent { offsetRight={0} tooltipContent={tooltipLanguage} helpButtonHeaderContent={t('Language')} + className="help-icon" /> From d0f471d058e823b26d73450b19f686e1596aae73 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 19 Dec 2019 12:30:58 +0300 Subject: [PATCH 5/9] web: components: bump version --- web/ASC.Web.Components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json index 7cead65165..cfc93c8e65 100644 --- a/web/ASC.Web.Components/package.json +++ b/web/ASC.Web.Components/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-components", - "version": "1.0.250", + "version": "1.0.251", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From 6d6203f9d5e08acfdfbad0720924d5e28935fb99 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 19 Dec 2019 15:42:42 +0300 Subject: [PATCH 6/9] Web: Components: fixed icon-button touch selection --- web/ASC.Web.Components/src/components/icon-button/index.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/icon-button/index.js b/web/ASC.Web.Components/src/components/icon-button/index.js index 191873e64e..a823fff680 100644 --- a/web/ASC.Web.Components/src/components/icon-button/index.js +++ b/web/ASC.Web.Components/src/components/icon-button/index.js @@ -9,7 +9,8 @@ const StyledOuter = styled.div` props.size ? Math.abs(parseInt(props.size)) + "px" : "20px"}; cursor: ${props => props.isDisabled || !props.isClickable ? "default" : "pointer"}; - line-height: 0; + line-height: 0; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); `; class IconButton extends React.PureComponent { constructor(props) { From 7fd9e3be6d419dfcf43912fe22d3cf445c5ec85b Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Thu, 19 Dec 2019 15:42:47 +0300 Subject: [PATCH 7/9] web: components: bump version --- web/ASC.Web.Components/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/package.json b/web/ASC.Web.Components/package.json index cfc93c8e65..9b7ca5c291 100644 --- a/web/ASC.Web.Components/package.json +++ b/web/ASC.Web.Components/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-components", - "version": "1.0.251", + "version": "1.0.252", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From 0347e2df546e498643d3324b4b822ab8045b149c Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Thu, 19 Dec 2019 17:31:40 +0300 Subject: [PATCH 8/9] web: Common: Fixed login/logout setups (translation, layout) --- .../src/components/login/index.js | 42 +++++++++++-------- web/ASC.Web.Common/src/store/auth/actions.js | 8 +++- 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/web/ASC.Web.Common/src/components/login/index.js b/web/ASC.Web.Common/src/components/login/index.js index 1552372aaa..63101f3440 100644 --- a/web/ASC.Web.Common/src/components/login/index.js +++ b/web/ASC.Web.Common/src/components/login/index.js @@ -14,7 +14,7 @@ import { } from "asc-web-components"; import { connect } from "react-redux"; import styled from "styled-components"; -import { withTranslation, I18nextProvider } from "react-i18next"; +import { withTranslation } from "react-i18next"; import i18n from "./i18n"; import SubModalDialog from "./sub-components/modal-dialog"; import { login, setIsLoaded } from "../../store/auth/actions"; @@ -25,6 +25,7 @@ const FormContainer = styled.form` max-width: 432px; .login-header { + min-height: 79px; margin-bottom: 24px; .login-logo { @@ -181,9 +182,12 @@ class Form extends Component { }; componentDidMount() { - const { language, match } = this.props; + const { language, match, i18n } = this.props; const { error, confirmedEmail } = match.params; - i18n.changeLanguage(language); + + if(i18n.lng != language) + i18n.changeLanguage(language); + error && this.setState({ errorText: error }); confirmedEmail && this.setState({ identifier: confirmedEmail }); window.addEventListener("keyup", this.onKeyPress); @@ -323,19 +327,6 @@ class Form extends Component { } } -const FormWrapper = withTranslation()(Form); - -const LoginForm = props => { - const { language } = props; - i18n.changeLanguage(language); - - return ( - - } /> - - ); -}; - Form.propTypes = { login: PropTypes.func.isRequired, match: PropTypes.object.isRequired, @@ -343,6 +334,7 @@ Form.propTypes = { setIsLoaded: PropTypes.func.isRequired, greetingTitle: PropTypes.string.isRequired, t: PropTypes.func.isRequired, + i18n: PropTypes.object.isRequired, language: PropTypes.string.isRequired }; @@ -352,12 +344,28 @@ Form.defaultProps = { email: "" }; +const FormWrapper = withTranslation()(Form); + +const LoginForm = props => { + const { language, isLoaded } = props; + + i18n.changeLanguage(language); + + return ( + <> + {isLoaded && } />} + + ); +}; + LoginForm.propTypes = { - language: PropTypes.string.isRequired + language: PropTypes.string.isRequired, + isLoaded: PropTypes.bool }; function mapStateToProps(state) { return { + isLoaded: state.auth.isLoaded, language: state.auth.user.cultureName || state.auth.settings.culture, greetingTitle: state.auth.settings.greetingSettings }; diff --git a/web/ASC.Web.Common/src/store/auth/actions.js b/web/ASC.Web.Common/src/store/auth/actions.js index 48c1a2068e..594035a370 100644 --- a/web/ASC.Web.Common/src/store/auth/actions.js +++ b/web/ASC.Web.Common/src/store/auth/actions.js @@ -132,13 +132,17 @@ export function getUserInfo(dispatch) { export function login(user, pass) { return dispatch => { - return api.user.login(user, pass).then(() => getUserInfo(dispatch)); + return api.user.login(user, pass) + .then(() => dispatch(setIsLoaded(false))) + .then(() => getUserInfo(dispatch)); }; } export function logout() { return dispatch => { - return api.user.logout().then(() => dispatch(setLogout())); + return api.user.logout() + .then(() => dispatch(setLogout())) + .then(() => dispatch(setIsLoaded(true))); }; } From d8f6d616d89be31e203f012f8af5c6016541a1fd Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 20 Dec 2019 09:26:32 +0300 Subject: [PATCH 9/9] web: common: bump version --- web/ASC.Web.Common/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Common/package.json b/web/ASC.Web.Common/package.json index 7a55fea289..dcd496f37a 100644 --- a/web/ASC.Web.Common/package.json +++ b/web/ASC.Web.Common/package.json @@ -1,6 +1,6 @@ { "name": "asc-web-common", - "version": "1.0.17", + "version": "1.0.18", "description": "Ascensio System SIA common components and solutions library", "license": "AGPL-3.0", "files": [