From ddb222fd86038c93fe4d8627f8c3a58ef8f4de39 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Fri, 27 Dec 2019 11:43:55 +0300 Subject: [PATCH 01/14] ASC.People: GroupAction: search block is hidden because it requires clarification of its work on large lists --- .../src/components/pages/GroupAction/Section/Body/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js b/products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js index a6a83cc1fb..768323152d 100644 --- a/products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js +++ b/products/ASC.People/Client/src/components/pages/GroupAction/Section/Body/index.js @@ -51,15 +51,15 @@ const MainContainer = styled.div` .search_container { margin-top: 32px; + display: none; } .selected-members_container { - margin-top: 16px; + margin-top: 32px; display: grid; grid-template-columns: repeat(3, 1fr); grid-row-gap: 8px; grid-column-gap: 16px; - margin-top: 16px; } .buttons_container { From e1a2d295d16dfa7a233bc3a96cf7f0556ef5fd78 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 11:46:50 +0300 Subject: [PATCH 02/14] Web: Common: Layout: Added backdrop for ProfileActions on touch devices --- .../src/components/Layout/sub-components/profile-actions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js b/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js index 6d96b732a9..28366fc5bf 100644 --- a/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js +++ b/web/ASC.Web.Common/src/components/Layout/sub-components/profile-actions.js @@ -87,6 +87,7 @@ class ProfileActions extends React.PureComponent { withArrow directionX="right" open={this.state.opened} + clickOutsideAction={this.onAvatarClick} > Date: Fri, 27 Dec 2019 11:47:51 +0300 Subject: [PATCH 03/14] Web: Components: ContextMenuButton: Added backdrop for DropDown on touch devices --- .../src/components/context-menu-button/index.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/context-menu-button/index.js b/web/ASC.Web.Components/src/components/context-menu-button/index.js index 3ed60822e0..ce4e5185b2 100644 --- a/web/ASC.Web.Components/src/components/context-menu-button/index.js +++ b/web/ASC.Web.Components/src/components/context-menu-button/index.js @@ -116,7 +116,11 @@ class ContextMenuButton extends React.Component { onMouseOver={onMouseOver} onMouseOut={onMouseOut} /> - + { this.state.data.map((item, index) => (item && (item.label || item.icon || item.key)) && Date: Fri, 27 Dec 2019 11:48:50 +0300 Subject: [PATCH 04/14] Web: Components: DropDownItem: Fixed separator margins --- web/ASC.Web.Components/src/components/drop-down-item/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/drop-down-item/index.js b/web/ASC.Web.Components/src/components/drop-down-item/index.js index d1f575bd8b..c7a81c7a51 100644 --- a/web/ASC.Web.Components/src/components/drop-down-item/index.js +++ b/web/ASC.Web.Components/src/components/drop-down-item/index.js @@ -69,7 +69,7 @@ const StyledDropdownItem = styled.div` padding: 0px 16px; border: 0.5px solid #ECEEF1; cursor: default; - margin: 6px 16px 4px; + margin: 6px 16px 6px; line-height: 1px; height: 1px; width: calc(100% - 32px); From e85b0370b6401094d19b807b2200d1219cf05bee Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 11:49:31 +0300 Subject: [PATCH 05/14] Web: Components: DropDown: Fixed usage withBackdrop property --- web/ASC.Web.Components/src/components/drop-down/README.md | 2 +- web/ASC.Web.Components/src/components/drop-down/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Components/src/components/drop-down/README.md b/web/ASC.Web.Components/src/components/drop-down/README.md index 18bdcd0e59..f6e408d638 100644 --- a/web/ASC.Web.Components/src/components/drop-down/README.md +++ b/web/ASC.Web.Components/src/components/drop-down/README.md @@ -34,4 +34,4 @@ When using component, it should be noted that parent must have CSS property _pos | `open` | `bool` | - | - | `false` | Tells when the dropdown should be opened | | `style` | `obj`, `array` | - | - | - | Accepts css style | | `withArrow` | `bool` | - | - | `false` | It is used if it is necessary to display blue protruding angle as when viewing profile | -| `withBackdrop` | `bool` | - | - | `false` | Used to display backdrop | +| `withBackdrop` | `bool` | - | - | `true` | Used to display backdrop | diff --git a/web/ASC.Web.Components/src/components/drop-down/index.js b/web/ASC.Web.Components/src/components/drop-down/index.js index 522b47d088..7b20725bcb 100644 --- a/web/ASC.Web.Components/src/components/drop-down/index.js +++ b/web/ASC.Web.Components/src/components/drop-down/index.js @@ -170,7 +170,7 @@ DropDown.defaultProps = { directionX: 'left', directionY: 'bottom', withArrow: false, - withBackdrop: false + withBackdrop: true }; export default DropDown \ No newline at end of file From 526949cebd0e4d0d509fbf928b38d505a2b1744a Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 11:49:58 +0300 Subject: [PATCH 06/14] Web: Components: FilterInput: Added backdrop for DropDown on touch devices --- .../src/components/filter-input/hide-filter.js | 1 + 1 file changed, 1 insertion(+) diff --git a/web/ASC.Web.Components/src/components/filter-input/hide-filter.js b/web/ASC.Web.Components/src/components/filter-input/hide-filter.js index cee0b5276f..e704ff5f43 100644 --- a/web/ASC.Web.Components/src/components/filter-input/hide-filter.js +++ b/web/ASC.Web.Components/src/components/filter-input/hide-filter.js @@ -111,6 +111,7 @@ class HideFilter extends React.Component { className="drop-down" manualY="8px" open={this.state.popoverOpen} + clickOutsideAction={this.handleClick} > {this.props.children} From b3f7ed34e1ed7e77678c75bb1040624a2184f508 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 11:50:08 +0300 Subject: [PATCH 07/14] 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 62a5a13fe5..257d8fca67 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.29", + "version": "1.0.30", "description": "Ascensio System SIA common components and solutions library", "license": "AGPL-3.0", "files": [ From c503b9bc232668ee612db9514bfd4e2b3562f7ba Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 11:50:17 +0300 Subject: [PATCH 08/14] 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 b7ebabeb2a..f8228ff318 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.279", + "version": "1.0.280", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From c37e6cc60ce9e0428c944aae0737685d01d53a42 Mon Sep 17 00:00:00 2001 From: NikolayRechkin Date: Fri, 27 Dec 2019 12:38:52 +0300 Subject: [PATCH 09/14] web: components: fix FilterInput style --- .../components/filter-input/close-button.js | 4 +- .../components/filter-input/filter-block.js | 77 +++++++++++++------ 2 files changed, 55 insertions(+), 26 deletions(-) diff --git a/web/ASC.Web.Components/src/components/filter-input/close-button.js b/web/ASC.Web.Components/src/components/filter-input/close-button.js index 209ad6671d..ec472231a5 100644 --- a/web/ASC.Web.Components/src/components/filter-input/close-button.js +++ b/web/ASC.Web.Components/src/components/filter-input/close-button.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; const StyledCloseButton = styled.div` margin-left: 7px; - margin-top: -2px; + margin-top: -1px; `; const CloseButton = props => { //console.log("CloseButton render"); @@ -13,7 +13,7 @@ const CloseButton = props => { props.block ? '8px' : '0'}; position: relative; height: 100%; - padding: 4px 22px 2px 7px; margin-right: 2px; border: 1px solid #ECEEF1; border-radius: 3px; background-color: #F8F9F9; - + padding-right: 22px; + font-weight: 600; font-size: 13px; line-height: 15px; @@ -32,6 +32,20 @@ const StyledFilterItem = styled.div` margin-bottom: 0; } `; + +const StyledFilterItemContent = styled.div` + display: flex; + padding: 5px 0 2px 7px; + + ${props => + !props.isDisabled && + css` + &:active{ + background: #ECEEF1; + } + `} +`; + const StyledCloseButtonBlock = styled.div` display: flex; cursor: ${props => @@ -42,7 +56,18 @@ const StyledCloseButtonBlock = styled.div` width: 25px; border-left: 1px solid #ECEEF1; right: 0; - top: 1px; + top: 0; + background-color: #F8F9F9; + ${props => + !props.isDisabled && + css` + &:active{ + background: #ECEEF1; + svg path:first-child { + fill: #333; + } + } + `} `; const StyledComboBox = styled(ComboBox)` display: inline-block; @@ -50,6 +75,7 @@ const StyledComboBox = styled(ComboBox)` max-width: 185px; cursor: pointer; vertical-align: middle; + margin-top: -1px; > div:first-child{ width: auto; padding-left: 4px; @@ -83,27 +109,30 @@ class FilterItem extends React.Component { render() { return ( - - {this.props.groupLabel}: - {this.props.groupItems.length > 1 ? - - : {this.props.label} - } + + + {this.props.groupLabel}: + {this.props.groupItems.length > 1 ? + + : {this.props.label} + } + + - + Date: Fri, 27 Dec 2019 12:41:01 +0300 Subject: [PATCH 10/14] 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 f8228ff318..29268f6c0e 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.280", + "version": "1.0.281", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js", From 48e56d462a43674412fa0e331c7bfc257a710c20 Mon Sep 17 00:00:00 2001 From: Andrey Savihin Date: Fri, 27 Dec 2019 13:19:35 +0300 Subject: [PATCH 11/14] Api: people. Fixed "Sequence contains no elements" error while saving empty contacts list --- products/ASC.People/Server/Controllers/PeopleController.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/products/ASC.People/Server/Controllers/PeopleController.cs b/products/ASC.People/Server/Controllers/PeopleController.cs index 53cb3ce6be..860156e8bb 100644 --- a/products/ASC.People/Server/Controllers/PeopleController.cs +++ b/products/ASC.People/Server/Controllers/PeopleController.cs @@ -1384,7 +1384,8 @@ namespace ASC.Employee.Core.Controllers PermissionContext.DemandPermissions(new UserSecurityProvider(user.ID), Constants.Action_EditUser); if (contacts == null) return; - user.Contacts = contacts.Select(r => $"{r.Type}|{r.Value}").Aggregate((a, b) => $"{a}|{b}"); + var values = contacts.Where(r => !string.IsNullOrEmpty(r.Value)).Select(r => $"{r.Type}|{r.Value}"); + user.Contacts = string.Join('|', values); } private void DeleteContacts(IEnumerable contacts, UserInfo user) From 5a79a73ba7e62d956de12fa988d19babb03b0897 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 13:24:14 +0300 Subject: [PATCH 12/14] Web: Components: ComboBox: Added state callback on toggleAction --- web/ASC.Web.Components/src/components/combobox/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/ASC.Web.Components/src/components/combobox/index.js b/web/ASC.Web.Components/src/components/combobox/index.js index 4db281134e..4717addd94 100644 --- a/web/ASC.Web.Components/src/components/combobox/index.js +++ b/web/ASC.Web.Components/src/components/combobox/index.js @@ -49,7 +49,7 @@ class ComboBox extends React.Component { comboBoxClick = (e) => { if (this.props.isDisabled || e && e.target.closest('.optionalBlock')) return; this.toggle(!this.state.isOpen); - this.props.toggleAction && this.props.toggleAction(e); + this.props.toggleAction && this.props.toggleAction(e, this.state.isOpen); }; optionClick = (option) => { From 0e9488ba178dd792e856bd63cdd4132c43684e1a Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 13:26:11 +0300 Subject: [PATCH 13/14] Web: Components: ComboBox: Fixed disabled property for ComboButton and change margins on noBorder property --- .../src/components/combobox/sub-components/combo-button.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/web/ASC.Web.Components/src/components/combobox/sub-components/combo-button.js b/web/ASC.Web.Components/src/components/combobox/sub-components/combo-button.js index b0a5c2f07d..ba8b2a521b 100644 --- a/web/ASC.Web.Components/src/components/combobox/sub-components/combo-button.js +++ b/web/ASC.Web.Components/src/components/combobox/sub-components/combo-button.js @@ -58,7 +58,8 @@ const StyledComboButton = styled.div` `} } .combo-button-label{ - margin-right: 8px; + margin-right: ${props => props.noBorder ? `4px` : `8px`}; + color: ${props => props.isDisabled ? '#D0D5DA' : '#333333'}; max-width: 175px; ${props => props.noBorder && ` line-height: 15px; @@ -66,7 +67,7 @@ const StyledComboButton = styled.div` `} } .combo-button-label:hover{ - ${props => props.noBorder && ` + ${props => props.noBorder && !props.isDisabled && ` border-bottom: 1px dashed; `} } @@ -149,6 +150,7 @@ class ComboButton extends React.Component { truncate={true} fontWeight={600} className="combo-button-label" + color={boxIconColor + ' !important'} > {selectedOption.label} From 6b52e1b80833f2b7e899253d5f09fec0ef386a7f Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 27 Dec 2019 13:26:42 +0300 Subject: [PATCH 14/14] 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 29268f6c0e..47cb6c0ba9 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.281", + "version": "1.0.282", "description": "Ascensio System SIA component library", "license": "AGPL-3.0", "main": "dist/asc-web-components.js",