diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabStateUtil.ts b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabStateUtil.ts index 56729da59..d693a5ef3 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabStateUtil.ts +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabStateUtil.ts @@ -15,6 +15,7 @@ export enum SubComponentName { MainTabDivider = "MainTabDivider", ColumnsSelection = "ColumnsSelection", ColumnSort = "ColumnSort", + CurrentFilter = "CurrentFilter", } export type ColumnSizesMap = { [columnId: string]: WidthDefinition }; diff --git a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx index efb3eac02..b896a8a4c 100644 --- a/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx +++ b/src/Explorer/Tabs/DocumentsTabV2/DocumentsTabV2.tsx @@ -35,6 +35,7 @@ import { FilterHistory, SubComponentName, TabDivider, + deleteDocumentsTabSubComponentState, readDocumentsTabSubComponentState, saveDocumentsTabSubComponentState, } from "Explorer/Tabs/DocumentsTabV2/DocumentsTabStateUtil"; @@ -585,7 +586,10 @@ export const DocumentsTabComponent: React.FunctionComponent { - const [filterContent, setFilterContent] = useState(""); + const [filterContent, setFilterContent] = useState(() => + readDocumentsTabSubComponentState(SubComponentName.CurrentFilter, _collection, ""), + ); + const [documentIds, setDocumentIds] = useState([]); const [isExecuting, setIsExecuting] = useState(false); const styles = useDocumentsTabStyles(); @@ -818,7 +822,7 @@ export const DocumentsTabComponent: React.FunctionComponent { setKeyboardActions({ [KeyboardAction.CLEAR_SEARCH]: () => { - setFilterContent(""); + updateFilterContent(""); refreshDocumentsGrid(true); return true; }, @@ -2073,6 +2077,15 @@ export const DocumentsTabComponent: React.FunctionComponent { + if (filter === "" || filter === undefined) { + deleteDocumentsTabSubComponentState(SubComponentName.CurrentFilter, _collection); + } else { + saveDocumentsTabSubComponentState(SubComponentName.CurrentFilter, _collection, filter, true); + } + setFilterContent(filter); + }; + return (
@@ -2087,7 +2100,7 @@ export const DocumentsTabComponent: React.FunctionComponent setFilterContent(value)} + onChange={updateFilterContent} onKeyDown={onFilterKeyDown} bottomLink={{ text: "Learn more", url: DATA_EXPLORER_DOC_URL }} />