From 456aa5414940c484ffc1e43dfea60313dfd81c86 Mon Sep 17 00:00:00 2001
From: Wroud <wroud@yandex.ru>
Date: Wed, 2 Mar 2022 15:24:45 +0300
Subject: [PATCH] fix(core-app): CB-1735 elements tree save filter

---
 .../NavigationTreeSettings/createElementsTreeSettings.ts     | 2 ++
 .../src/NavigationTree/ElementsTree/useElementsTree.ts       | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts b/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
index a546c053f9..0ec92dddf4 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree/ElementsTreeTools/NavigationTreeSettings/createElementsTreeSettings.ts
@@ -12,6 +12,7 @@ export function createElementsTreeSettings(defaults?: Partial<IElementsTreeSetti
   return {
     filter: false,
     filterAll: false,
+    saveFilter: true,
     saveExpanded: true,
     foldersTree: false,
     showFolderExplorerPath: true,
@@ -25,6 +26,7 @@ export function validateElementsTreeSettings(data: any): boolean {
     typeof data === 'object'
     && typeof data.filterAll === 'boolean'
     && typeof data.filter === 'boolean'
+    && typeof data.saveFilter === 'boolean'
     && typeof data.saveExpanded === 'boolean'
     && typeof data.foldersTree === 'boolean'
     && typeof data.showFolderExplorerPath === 'boolean'
diff --git a/webapp/packages/core-app/src/NavigationTree/ElementsTree/useElementsTree.ts b/webapp/packages/core-app/src/NavigationTree/ElementsTree/useElementsTree.ts
index 61f79fbe8a..faf609ad15 100644
--- a/webapp/packages/core-app/src/NavigationTree/ElementsTree/useElementsTree.ts
+++ b/webapp/packages/core-app/src/NavigationTree/ElementsTree/useElementsTree.ts
@@ -46,6 +46,7 @@ export interface IElementsTreeSettings {
   filterAll: boolean;
   saveExpanded: boolean;
   foldersTree: boolean;
+  saveFilter: boolean;
   showFolderExplorerPath: boolean;
   configurable: boolean;
 }
@@ -115,6 +116,10 @@ export function useElementsTree(options: IOptions): IElementsTree {
       filter: '',
     }),
     async data => {
+      if (!options.settings?.saveFilter) {
+        data.filter = '';
+      }
+
       if (options.settings?.saveExpanded) {
         state.sync(data.nodeState);