Skip to content

TagSpaces is an offline, open source, document manager with tagging support

Create new search query dialog not cleared on second reopening (#2288)

Stanimirf43ad69cd6da
diff --git a/src/renderer/components/SearchPopover.tsx b/src/renderer/components/SearchPopover.tsx
index cfa2fe0ff..03d49cbd7 100644
--- a/src/renderer/components/SearchPopover.tsx
+++ b/src/renderer/components/SearchPopover.tsx
@@ -188,7 +188,7 @@ function SearchPopover(props: Props) {
<TsIconButton
tooltip={t('createNewSavedSearchTitle')}
data-tid="addSearchBtnTID"
- onClick={() => openSaveSearchDialog()}
+ onClick={() => openSaveSearchDialog('new_from_search')}
>
<CreateFileIcon />
</TsIconButton>
diff --git a/src/renderer/components/dialogs/SaveSearchDialog.tsx b/src/renderer/components/dialogs/SaveSearchDialog.tsx
index c35c26439..cb75c941b 100644
--- a/src/renderer/components/dialogs/SaveSearchDialog.tsx
+++ b/src/renderer/components/dialogs/SaveSearchDialog.tsx
@@ -37,6 +37,10 @@ import { useEffect, useReducer, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useSearchQueryContext } from '-/hooks/useSearchQueryContext';
import EditSearchQuery from '-/components/EditSearchQuery';
+import { usePanelsContext } from '-/hooks/usePanelsContext';
+import { AppDispatch } from '-/reducers/app';
+import { useDispatch } from 'react-redux';
+import { actions as SettingsActions } from '-/reducers/settings';
interface Props {
open: boolean;
@@ -47,6 +51,7 @@ function SaveSearchDialog(props: Props) {
const { open, onClose } = props;
const { searches, addSearch, editSearch, removeSearch } =
useSavedSearchesContext();
+ const { showPanel } = usePanelsContext();
const { tempSearchQuery, setTempSearchQuery } = useSearchQueryContext();
const theme = useTheme();
const smallScreen = useMediaQuery(theme.breakpoints.down('md'));
@@ -54,6 +59,7 @@ function SaveSearchDialog(props: Props) {
const inputError = useRef<string>(undefined);
const title = useRef<string>(getTitle());
const titleChanged = useRef<boolean>(false);
+ const dispatch: AppDispatch = useDispatch();
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
useEffect(() => {
@@ -97,6 +103,9 @@ function SaveSearchDialog(props: Props) {
addSearch(searchQuery);
onClose();
}
+
+ showPanel('searchPanel');
+ dispatch(SettingsActions.setStoredSearchesVisible(true));
}
}
diff --git a/src/renderer/hooks/PanelsContextProvider.tsx b/src/renderer/hooks/PanelsContextProvider.tsx
index f0c2d0dd1..15d85d200 100644
--- a/src/renderer/hooks/PanelsContextProvider.tsx
+++ b/src/renderer/hooks/PanelsContextProvider.tsx
@@ -65,8 +65,10 @@ export const PanelsContextProvider = ({
}, []);
function showPanel(panel: PanelType) {
- currentOpenedPanel.current = panel;
- forceUpdate();
+ if (currentOpenedPanel.current !== panel) {
+ currentOpenedPanel.current = panel;
+ forceUpdate();
+ }
}
const context = useMemo(() => {
diff --git a/src/renderer/hooks/SearchQueryContextProvider.tsx b/src/renderer/hooks/SearchQueryContextProvider.tsx
index 582b7c597..28bd117fb 100644
--- a/src/renderer/hooks/SearchQueryContextProvider.tsx
+++ b/src/renderer/hooks/SearchQueryContextProvider.tsx
@@ -72,11 +72,11 @@ export const SearchQueryContextProvider = ({
const [ignored, forceUpdate] = useReducer((x) => x + 1, 0, undefined);
useEffect(() => {
- if (searchQuery) {
+ if (searchQuery && Object.keys(searchQuery).length > 0) {
tempSearchQuery.current = { ...searchQuery };
- } else {
+ } /* else {
tempSearchQuery.current = {};
- }
+ }*/
forceUpdate();
}, [searchQuery]);
@@ -98,7 +98,7 @@ export const SearchQueryContextProvider = ({
function clearSearch() {
openCurrentDirectory().then(() => {
- tempSearchQuery.current = {}; //...searchQuery };
+ //tempSearchQuery.current = {}; //...searchQuery };
setSearchQuery({});
exitSearchMode();
});
@@ -150,9 +150,13 @@ export const SearchQueryContextProvider = ({
);
if (savedSearch) {
setTempSearchQuery({ ...savedSearch }, true);
+ } else {
+ setTempSearchQuery({ uuid: undefined });
+ exitSearchMode();
}
} else {
- setTempSearchQuery({ uuid: undefined });
+ setTempSearchQuery({ uuid: undefined }, true);
+ exitSearchMode();
}
setSaveSearchDialogOpened(true);
}
@@ -178,6 +182,7 @@ export const SearchQueryContextProvider = ({
<SaveSearchDialog
open={saveSearchDialogOpened}
onClose={() => {
+ tempSearchQuery.current = {};
setSaveSearchDialogOpened(false);
}}
/>
diff --git a/tests/e2e/search.helpers.js b/tests/e2e/search.helpers.js
index 971d621b0..2e554fa9f 100644
--- a/tests/e2e/search.helpers.js
+++ b/tests/e2e/search.helpers.js
@@ -102,8 +102,7 @@ export async function createSavedSearch(searchQuery) {
await expectElementExist('#searchTerm');
await global.client.dblclick('#searchTerm');
await typeInputValue('#searchTerm', searchQuery.textQuery, 0);
- //await typeInputValue('#textQuery', searchQuery.textQuery, 10);
- //await clickOn('#searchButton');
+
await clickOn('#searchButtonAdvTID');
await clickOn('[data-tid=advancedSearch]');
await clickOn('[data-tid=addSearchBtnTID]');
@@ -111,7 +110,7 @@ export async function createSavedSearch(searchQuery) {
await global.client.dblclick('[data-tid=savedSearchTID]');
await typeInputValue('[data-tid=savedSearchTID] input', searchQuery.title, 0);
await clickOn('[data-tid=confirmSavedSearchTID]');
- await clickOn('[data-tid=closeSearchTID]');
+ //await clickOn('[data-tid=closeSearchTID]');
}
export async function addRemoveTagsInSearchResults(