X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/50af2fa94e9f3e3025723c3d0703cb90771f3fbd..eec72fb6bd94a219b07370120e2c2af67d562a05:/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 9ddfc9c517..653a8f536d 100644
--- a/src/store/search-bar/search-bar-actions.ts
+++ b/src/store/search-bar/search-bar-actions.ts
@@ -17,6 +17,7 @@ import { navigateToSearchResults, navigateTo } from '~/store/navigation/navigati
 import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions';
 import { initialize } from 'redux-form';
 import { SearchBarAdvanceFormData, PropertyValues } from '~/models/search-bar';
+import { debounce } from 'debounce';
 
 export const searchBarActions = unionize({
     SET_CURRENT_VIEW: ofType<string>(),
@@ -24,7 +25,8 @@ export const searchBarActions = unionize({
     CLOSE_SEARCH_VIEW: ofType<{}>(),
     SET_SEARCH_RESULTS: ofType<GroupContentsResource[]>(),
     SET_SEARCH_VALUE: ofType<string>(),
-    SET_SAVED_QUERIES: ofType<SearchBarAdvanceFormData[]>()
+    SET_SAVED_QUERIES: ofType<SearchBarAdvanceFormData[]>(),
+    UPDATE_SAVED_QUERY: ofType<SearchBarAdvanceFormData[]>()
 });
 
 export type SearchBarActions = UnionOf<typeof searchBarActions>;
@@ -33,6 +35,8 @@ export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName';
 
 export const SEARCH_BAR_ADVANCE_FORM_PICKER_ID = 'searchBarAdvanceFormPickerId';
 
+export const DEFAULT_SEARCH_DEBOUNCE = 1000;
+
 export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView);
 
 export const saveRecentQuery = (query: string) =>
@@ -46,12 +50,44 @@ export const loadRecentQueries = () =>
         return recentSearchQueries || [];
     };
 
-export const saveQuery = (data: SearchBarAdvanceFormData) =>
+export const searchData = (searchValue: string) =>
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const currentView = getState().searchBar.currentView;
+        dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
+        dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
+        dispatch<any>(searchGroups(searchValue));
+        if (currentView === SearchView.BASIC) {
+            dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
+            dispatch(navigateToSearchResults);
+        }
+
+    };
+
+export const searchAdvanceData = (data: SearchBarAdvanceFormData) =>
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const searchValue = getState().searchBar.searchValue;
+        dispatch<any>(saveQuery(data));
+        dispatch<any>(searchGroups(searchValue, 100, data.type));
+        dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC));
+        dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
+        dispatch(navigateToSearchResults);
+    };
+
+// Todo: create ids for particular searchQuery
+const saveQuery = (data: SearchBarAdvanceFormData) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+        const savedSearchQueries = services.searchService.getSavedQueries();
+        const filteredQuery = savedSearchQueries.find(query => query.searchQuery === data.searchQuery);
         if (data.saveQuery && data.searchQuery) {
-            services.searchService.saveQuery(data);
-            dispatch(searchBarActions.SET_SAVED_QUERIES(services.searchService.getSavedQueries()));
-            dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been sucessfully saved', kind: SnackbarKind.SUCCESS }));
+            if (filteredQuery) {
+                services.searchService.editSavedQueries(data);
+                dispatch(searchBarActions.UPDATE_SAVED_QUERY(savedSearchQueries));
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been sucessfully updated', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+            } else {
+                services.searchService.saveQuery(data);
+                dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries));
+                dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been sucessfully saved', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+            }
         }
     };
 
@@ -63,9 +99,10 @@ export const deleteSavedQuery = (id: number) =>
         return savedSearchQueries || [];
     };
 
-export const editSavedQuery = (data: SearchBarAdvanceFormData, id: number) =>
+export const editSavedQuery = (data: SearchBarAdvanceFormData) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED));
+        dispatch(searchBarActions.SET_SEARCH_VALUE(data.searchQuery));
         dispatch<any>(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data));
     };
 
@@ -85,35 +122,80 @@ export const closeSearchView = () =>
         }
     };
 
+export const closeAdvanceView = () => 
+    (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
+        dispatch(searchBarActions.SET_SEARCH_VALUE(''));
+        dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC));
+    };
+
 export const navigateToItem = (uuid: string) =>
     (dispatch: Dispatch<any>, getState: () => RootState, services: ServiceRepository) => {
         dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
         dispatch(navigateTo(uuid));
     };
 
-export const searchData = (searchValue: string) =>
-    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+export const changeData = (searchValue: string) => 
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
         const currentView = getState().searchBar.currentView;
-        if (currentView !== SearchView.AUTOCOMPLETE) {
-            dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
+        const searchValuePresent = searchValue.length > 0;
+
+        if (currentView === SearchView.ADVANCED) {
+
+        } else if (searchValuePresent) {
+            dispatch<any>(goToView(SearchView.AUTOCOMPLETE));
+            debounceStartSearch(dispatch);
+        } else {
+            dispatch<any>(goToView(SearchView.BASIC));
+            dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
+            dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
         }
+    };
+
+export const submitData = (event: React.FormEvent<HTMLFormElement>) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        event.preventDefault();
+        const searchValue = getState().searchBar.searchValue;
+        dispatch<any>(saveRecentQuery(searchValue));
+        dispatch<any>(searchDataOnEnter(searchValue));
+        dispatch<any>(loadRecentQueries());
+    };
+
+const searchDataOnEnter = (searchValue: string) =>
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        dispatch(searchBarActions.CLOSE_SEARCH_VIEW());
         dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue));
         dispatch(searchBarActions.SET_SEARCH_RESULTS([]));
-        if (searchValue) {
-            const filters = getFilters('name', searchValue);
+        dispatch<any>(searchGroups(searchValue, 100));
+        dispatch(navigateToSearchResults);
+    };
+
+const debounceStartSearch = debounce((dispatch: Dispatch) => dispatch<any>(startSearch()), DEFAULT_SEARCH_DEBOUNCE);
+
+const startSearch = () => 
+    (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const searchValue = getState().searchBar.searchValue;
+        dispatch<any>(searchData(searchValue));
+    };
+
+const searchGroups = (searchValue: string, limit = 5, resourceKind?: ResourceKind) => 
+    async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+        const currentView = getState().searchBar.currentView;
+        
+        if (searchValue || currentView === SearchView.ADVANCED) {
+            const filters = getFilters('name', searchValue, resourceKind);
             const { items } = await services.groupsService.contents('', {
                 filters,
-                limit: 5,
+                limit,
                 recursive: true
             });
             dispatch(searchBarActions.SET_SEARCH_RESULTS(items));
         }
-        dispatch(navigateToSearchResults);
     };
 
-export const getFilters = (filterName: string, searchValue: string): string => {
+export const getFilters = (filterName: string, searchValue: string, resourceKind?: ResourceKind): string => {
     return new FilterBuilder()
-        .addIsA("uuid", [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS])
+        .addIsA("uuid", buildUuidFilter(resourceKind))
         .addILike(filterName, searchValue, GroupContentsResourcePrefix.COLLECTION)
         .addILike(filterName, searchValue, GroupContentsResourcePrefix.PROCESS)
         .addILike(filterName, searchValue, GroupContentsResourcePrefix.PROJECT)
@@ -121,17 +203,21 @@ export const getFilters = (filterName: string, searchValue: string): string => {
         .getFilters();
 };
 
-export const initAdvanceFormProjectsTree = () => 
+const buildUuidFilter = (type?: ResourceKind): ResourceKind[] => {
+    return type ? [type] : [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS];
+};
+
+export const initAdvanceFormProjectsTree = () =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch<any>(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID));
     };
 
-export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') => 
+export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value));
     };
 
-export const updateAdvanceFormProperties = (propertyValues: PropertyValues) => 
+export const updateAdvanceFormProperties = (propertyValues: PropertyValues) =>
     (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
         dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues));
     };
\ No newline at end of file