From ef25c07ddc570b599e0f24bc72eb546018b6fb5d Mon Sep 17 00:00:00 2001
From: Artem Tarasov <artem.tarasov@onlyoffice.com>
Date: Wed, 30 Jun 2021 17:05:11 +0300
Subject: [PATCH] Web: Common: FilterInput: fixed transfer viewSettings

---
 packages/asc-web-common/components/FilterInput/FilterInput.js  | 3 ++-
 .../components/FilterInput/sub-components/SortComboBox.js      | 2 +-
 products/ASC.Files/Server/DocStore                             | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/asc-web-common/components/FilterInput/FilterInput.js b/packages/asc-web-common/components/FilterInput/FilterInput.js
index eba2075da2..b6ac75babb 100644
--- a/packages/asc-web-common/components/FilterInput/FilterInput.js
+++ b/packages/asc-web-common/components/FilterInput/FilterInput.js
@@ -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() : [];
 
diff --git a/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js b/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
index 787962530a..e3939e30ba 100644
--- a/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
+++ b/packages/asc-web-common/components/FilterInput/sub-components/SortComboBox.js
@@ -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>
diff --git a/products/ASC.Files/Server/DocStore b/products/ASC.Files/Server/DocStore
index 8177bad15d..b1063eae56 160000
--- a/products/ASC.Files/Server/DocStore
+++ b/products/ASC.Files/Server/DocStore
@@ -1 +1 @@
-Subproject commit 8177bad15d567d997a79478a65d32662a6f773b1
+Subproject commit b1063eae56d183b5c0b6eb887115c378f3941ebe