IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/privacy-rooms-page

Browse Source 
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
This commit is contained in:
Nikita Gopienko 2021-06-30 17:20:54 +03:00
commit c93a4eda8e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/asc-web-common/components/FilterInput/FilterInput.js
View File

@ -99,7 +99,8 @@ class FilterInput extends React.Component {
} = props;
const { sortDirection, sortId, inputValue } = selectedFilterData;
const sortData = getSortData();
const viewSettings = getViewSettingsData();
let viewSettings = null;
viewSettings = getViewSettingsData && getViewSettingsData();
const filterValues = selectedFilterData ? this.getDefaultFilterData() : [];

2
packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
View File

@ -124,7 +124,7 @@ class SortComboBox extends React.Component {
spacing="0px"
/>
</DropDownItem>
{viewSettings.length !== 0 && viewAs && isMobileOnly && (
{viewSettings && viewSettings.length && viewAs && isMobileOnly && (
<>
<DropDownItem isSeparator />
<DropDownItem noHover>

2
products/ASC.Files/Server/DocStore

@ -1 +1 @@
Subproject commit 8177bad15d567d997a79478a65d32662a6f773b1
Subproject commit b1063eae56d183b5c0b6eb887115c378f3941ebe