Merge branch 'master' of git.curoverse.com:arvados-workbench2 into 13862-collection...

[arvados.git] / src / store / search-bar / search-bar-actions.ts

diff --git a/src/store/search-bar/search-bar-actions.ts b/src/store/search-bar/search-bar-actions.ts
index 55acff82ebb089fe1c12afdab23c5e0ff3b775ef..59770cc60844d2aa0d52a3339c6b706f0a148a3f 100644 (file)
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -16,42 +16,62 @@ export const searchBarActions = unionize({
     OPEN_SEARCH_VIEW: ofType<{}>(),
     CLOSE_SEARCH_VIEW: ofType<{}>(),
     SET_SEARCH_RESULTS: ofType<GroupContentsResource[]>(),
-    SET_SEARCH_VALUE: ofType<string>()
+    SET_SEARCH_VALUE: ofType<string>(),
+    SET_SAVED_QUERIES: ofType<string[]>()
 });
 
 export type SearchBarActions = UnionOf<typeof searchBarActions>;
 
+export interface SearchBarAdvanceFormData {
+    type?: GroupContentsResource;
+    cluster?: string;
+    project?: string;
+    inTrash: boolean;
+    dataFrom: string;
+    dataTo: string;
+    saveQuery: boolean;
+    searchQuery: string;
+}
+
+export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName';
+
 export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView);
 
 export const saveRecentQuery = (query: string) =>
-    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        services.searchQueriesService.saveRecentQuery(query);
-    };
+    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) =>
+        services.searchService.saveRecentQuery(query);
+
 
 export const loadRecentQueries = () =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        const recentSearchQueries = services.searchQueriesService.getRecentQueries();
+        const recentSearchQueries = services.searchService.getRecentQueries();
         return recentSearchQueries || [];
     };
 
-export const saveQuery = (query: string) =>
+export const saveQuery = (data: SearchBarAdvanceFormData) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        services.searchQueriesService.saveQuery(query);
+        if (data.saveQuery && data.searchQuery) {
+            services.searchService.saveQuery(data.searchQuery);
+            dispatch(searchBarActions.SET_SAVED_QUERIES(services.searchService.getSavedQueries()));
+        }
     };
 
-export const loadSavedQueries = () =>
+export const deleteSavedQuery = (id: number) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        const savedSearchQueries = services.searchQueriesService.getSavedQueries();
+        services.searchService.deleteSavedQuery(id);
+        const savedSearchQueries = services.searchService.getSavedQueries();
+        dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries));
         return savedSearchQueries || [];
     };
 
-export const deleteSavedQuery = (id: number) =>
+export const openSearchView = () =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
-        services.searchQueriesService.deleteSavedQuery(id);
-        const savedSearchQueries = services.searchQueriesService.getSavedQueries();
-        return savedSearchQueries || [];
+        dispatch(searchBarActions.OPEN_SEARCH_VIEW());
+        const savedSearchQueries = services.searchService.getSavedQueries();
+        dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries));
     };
 
+
 export const searchData = (searchValue: string) =>
     async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));