X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/32dcbe112366f6ce4037e87527aac5ea7865bee0..02109725d788c1092c0b4023cee41ea901ed1a58:/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 59770cc6..2541e7a3 100644 --- a/src/store/search-bar/search-bar-actions.ts +++ b/src/store/search-bar/search-bar-actions.ts @@ -5,11 +5,18 @@ import { unionize, ofType, UnionOf } from "~/common/unionize"; import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; import { Dispatch } from 'redux'; +import { change, arrayPush } from 'redux-form'; import { RootState } from '~/store/store'; +import { initUserProject } from '~/store/tree-picker/tree-picker-actions'; import { ServiceRepository } from '~/services/services'; import { FilterBuilder } from "~/services/api/filter-builder"; import { ResourceKind } from '~/models/resource'; import { GroupClass } from '~/models/group'; +import { SearchView } from '~/store/search-bar/search-bar-reducer'; +import { navigateToSearchResults, navigateTo } from '~/store/navigation/navigation-action'; +import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; +import { initialize } from 'redux-form'; +import { SearchBarAdvanceFormData, PropertyValues } from '~/models/search-bar'; export const searchBarActions = unionize({ SET_CURRENT_VIEW: ofType(), @@ -17,24 +24,16 @@ export const searchBarActions = unionize({ CLOSE_SEARCH_VIEW: ofType<{}>(), SET_SEARCH_RESULTS: ofType(), SET_SEARCH_VALUE: ofType(), - SET_SAVED_QUERIES: ofType() + SET_SAVED_QUERIES: ofType(), + UPDATE_SAVED_QUERY: ofType() }); export type SearchBarActions = UnionOf; -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 SEARCH_BAR_ADVANCE_FORM_PICKER_ID = 'searchBarAdvanceFormPickerId'; + export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView); export const saveRecentQuery = (query: string) => @@ -48,12 +47,24 @@ export const loadRecentQueries = () => return recentSearchQueries || []; }; +// Todo: create ids for particular searchQuery export const saveQuery = (data: SearchBarAdvanceFormData) => (dispatch: Dispatch, 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.searchQuery); - dispatch(searchBarActions.SET_SAVED_QUERIES(services.searchService.getSavedQueries())); + 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 })); + } } + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); }; export const deleteSavedQuery = (id: number) => @@ -64,6 +75,13 @@ export const deleteSavedQuery = (id: number) => return savedSearchQueries || []; }; +export const editSavedQuery = (data: SearchBarAdvanceFormData) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED)); + dispatch(searchBarActions.SET_SEARCH_VALUE(data.searchQuery)); + dispatch(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data)); + }; + export const openSearchView = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(searchBarActions.OPEN_SEARCH_VIEW()); @@ -71,9 +89,27 @@ export const openSearchView = () => dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries)); }; +export const closeSearchView = () => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const isOpen = getState().searchBar.open; + if (isOpen) { + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); + } + }; + +export const navigateToItem = (uuid: string) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + dispatch(navigateTo(uuid)); + }; export const searchData = (searchValue: string) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const currentView = getState().searchBar.currentView; + if (currentView !== SearchView.AUTOCOMPLETE) { + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + } dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); dispatch(searchBarActions.SET_SEARCH_RESULTS([])); if (searchValue) { @@ -85,9 +121,30 @@ export const searchData = (searchValue: string) => }); dispatch(searchBarActions.SET_SEARCH_RESULTS(items)); } + if (currentView !== SearchView.AUTOCOMPLETE) { + dispatch(navigateToSearchResults); + } + }; -const getFilters = (filterName: string, searchValue: string): string => { +export const searchDataOnEnter = (searchValue: string) => + async (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); + const { items } = await services.groupsService.contents('', { + filters, + limit: 5, + recursive: true + }); + dispatch(searchBarActions.SET_SEARCH_RESULTS(items)); + } + dispatch(navigateToSearchResults); + }; + +export const getFilters = (filterName: string, searchValue: string): string => { return new FilterBuilder() .addIsA("uuid", [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS]) .addILike(filterName, searchValue, GroupContentsResourcePrefix.COLLECTION) @@ -96,3 +153,18 @@ const getFilters = (filterName: string, searchValue: string): string => { .addEqual('groupClass', GroupClass.PROJECT, GroupContentsResourcePrefix.PROJECT) .getFilters(); }; + +export const initAdvanceFormProjectsTree = () => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)); + }; + +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) => + (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues)); + }; \ No newline at end of file