From 01d6e7d3ad5a5792895be0d1da970b3a945930cd Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 15 Sep 2020 14:46:53 +0300 Subject: [PATCH 1/2] Web: Commpon: fixed the display of the filter selector element --- web/ASC.Web.Common/src/components/FilterInput/FilterInput.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/ASC.Web.Common/src/components/FilterInput/FilterInput.js b/web/ASC.Web.Common/src/components/FilterInput/FilterInput.js index fe3b2a5ceb..f700457bef 100644 --- a/web/ASC.Web.Common/src/components/FilterInput/FilterInput.js +++ b/web/ASC.Web.Common/src/components/FilterInput/FilterInput.js @@ -91,12 +91,15 @@ class FilterInput extends React.Component { return filterItems; } + let filterValues = props.selectedFilterData ? getDefaultFilterData() : []; + filterValues = [...filterValues, ...this.convertSelectorToInternalData(props.getFilterData(), cloneObjectsArray(props.selectedFilterData.filterValues))]; + this.state = { sortDirection: props.selectedFilterData.sortDirection === "desc" ? true : false, sortId: props.getSortData().findIndex(x => x.key === props.selectedFilterData.sortId) != -1 ? props.selectedFilterData.sortId : props.getSortData().length > 0 ? props.getSortData()[0].key : "", searchText: props.selectedFilterData.inputValue || props.value, - filterValues: props.selectedFilterData ? getDefaultFilterData() : [], + filterValues, openFilterItems: [], hideFilterItems: [] }; From 01a8aa22b4ace1aac64bab343f7c17696fc61c78 Mon Sep 17 00:00:00 2001 From: gopienkonikita Date: Tue, 15 Sep 2020 14:47:53 +0300 Subject: [PATCH 2/2] 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 84bbbf8c1a..6b5e92c6fa 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.223", + "version": "1.0.224", "description": "Ascensio System SIA common components and solutions library", "license": "AGPL-3.0", "files": [