X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/92b95f14a38a534f04d462d74792051ba6952638..dc5cd08bad19c302d34b75b34795d5745da2eae2:/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..eb4239de 100644 --- a/src/store/search-bar/search-bar-actions.ts +++ b/src/store/search-bar/search-bar-actions.ts @@ -5,11 +5,19 @@ 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'; +import { debounce } from 'debounce'; export const searchBarActions = unionize({ SET_CURRENT_VIEW: ofType(), @@ -17,24 +25,23 @@ export const searchBarActions = unionize({ CLOSE_SEARCH_VIEW: ofType<{}>(), SET_SEARCH_RESULTS: ofType(), SET_SEARCH_VALUE: ofType(), - SET_SAVED_QUERIES: ofType() -}); + SET_SAVED_QUERIES: ofType(), + SET_RECENT_QUERIES: ofType(), + UPDATE_SAVED_QUERY: ofType(), + SET_SELECTED_ITEM: ofType(), + MOVE_UP: ofType<{}>(), + MOVE_DOWN: ofType<{}>(), + SELECT_FIRST_ITEM: 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 DEFAULT_SEARCH_DEBOUNCE = 1000; + export const goToView = (currentView: string) => searchBarActions.SET_CURRENT_VIEW(currentView); export const saveRecentQuery = (query: string) => @@ -44,15 +51,46 @@ export const saveRecentQuery = (query: string) => export const loadRecentQueries = () => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { - const recentSearchQueries = services.searchService.getRecentQueries(); - return recentSearchQueries || []; + const recentQueries = services.searchService.getRecentQueries(); + dispatch(searchBarActions.SET_RECENT_QUERIES(recentQueries)); + return recentQueries; + }; + +export const searchData = (searchValue: string) => + async (dispatch: Dispatch, getState: () => RootState) => { + const currentView = getState().searchBar.currentView; + dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); + if (searchValue.length > 0) { + dispatch(searchGroups(searchValue, 5, {})); + if (currentView === SearchView.BASIC) { + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + dispatch(navigateToSearchResults); + } + } + }; + +export const searchAdvanceData = (data: SearchBarAdvanceFormData) => + async (dispatch: Dispatch) => { + dispatch(saveQuery(data)); + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + dispatch(navigateToSearchResults); }; -export const saveQuery = (data: SearchBarAdvanceFormData) => +const saveQuery = (data: SearchBarAdvanceFormData) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const savedQueries = services.searchService.getSavedQueries(); if (data.saveQuery && data.searchQuery) { - services.searchService.saveQuery(data.searchQuery); - dispatch(searchBarActions.SET_SAVED_QUERIES(services.searchService.getSavedQueries())); + const filteredQuery = savedQueries.find(query => query.searchQuery === data.searchQuery); + if (filteredQuery) { + services.searchService.editSavedQueries(data); + dispatch(searchBarActions.UPDATE_SAVED_QUERY(savedQueries)); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been successfully updated', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); + } else { + services.searchService.saveQuery(data); + dispatch(searchBarActions.SET_SAVED_QUERIES(savedQueries)); + dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Query has been successfully saved', hideDuration: 2000, kind: SnackbarKind.SUCCESS })); + } } }; @@ -64,35 +102,137 @@ export const deleteSavedQuery = (id: number) => return savedSearchQueries || []; }; +export const editSavedQuery = (data: SearchBarAdvanceFormData) => + (dispatch: Dispatch) => { + 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()); const savedSearchQueries = services.searchService.getSavedQueries(); dispatch(searchBarActions.SET_SAVED_QUERIES(savedSearchQueries)); + dispatch(loadRecentQueries()); + dispatch(searchBarActions.OPEN_SEARCH_VIEW()); + dispatch(searchBarActions.SELECT_FIRST_ITEM()); }; +export const closeSearchView = () => + (dispatch: Dispatch) => { + dispatch(searchBarActions.SET_SELECTED_ITEM('')); + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + }; -export const searchData = (searchValue: string) => - async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { +export const closeAdvanceView = () => + (dispatch: Dispatch) => { + dispatch(searchBarActions.SET_SEARCH_VALUE('')); + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); + }; + +export const navigateToItem = (uuid: string) => + (dispatch: Dispatch) => { + dispatch(searchBarActions.SET_SELECTED_ITEM('')); + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); + dispatch(navigateTo(uuid)); + }; + +export const changeData = (searchValue: string) => + (dispatch: Dispatch, getState: () => RootState) => { + dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); + const currentView = getState().searchBar.currentView; + const searchValuePresent = searchValue.length > 0; + + if (currentView === SearchView.ADVANCED) { + + } else if (searchValuePresent) { + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.AUTOCOMPLETE)); + dispatch(searchBarActions.SET_SELECTED_ITEM(searchValue)); + debounceStartSearch(dispatch); + } else { + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); + dispatch(searchBarActions.SET_SEARCH_RESULTS([])); + dispatch(searchBarActions.SELECT_FIRST_ITEM()); + } + }; + +export const submitData = (event: React.FormEvent) => + (dispatch: Dispatch, getState: () => RootState) => { + event.preventDefault(); + const searchValue = getState().searchBar.searchValue; + dispatch(saveRecentQuery(searchValue)); + dispatch(loadRecentQueries()); + dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); dispatch(searchBarActions.SET_SEARCH_RESULTS([])); - if (searchValue) { - const filters = getFilters('name', searchValue); + dispatch(navigateToSearchResults); + }; + +const debounceStartSearch = debounce((dispatch: Dispatch) => dispatch(startSearch()), DEFAULT_SEARCH_DEBOUNCE); + +const startSearch = () => + (dispatch: Dispatch, getState: () => RootState) => { + const searchValue = getState().searchBar.searchValue; + dispatch(searchData(searchValue)); + }; + +const searchGroups = (searchValue: string, limit: number, {...props}) => + async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { + const currentView = getState().searchBar.currentView; + + if (searchValue || currentView === SearchView.ADVANCED) { + const filters = getFilters('name', searchValue, props); const { items } = await services.groupsService.contents('', { filters, - limit: 5, + limit, recursive: true }); dispatch(searchBarActions.SET_SEARCH_RESULTS(items)); } }; -const getFilters = (filterName: string, searchValue: string): string => { +export const getFilters = (filterName: string, searchValue: string, props: any): string => { + const { resourceKind, dateTo, dateFrom } = props; 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) + .addLte('modified_at', buildDateFilter(dateTo)) + .addGte('modified_at', buildDateFilter(dateFrom)) .addEqual('groupClass', GroupClass.PROJECT, GroupContentsResourcePrefix.PROJECT) .getFilters(); }; + +const buildUuidFilter = (type?: ResourceKind): ResourceKind[] => { + return type ? [type] : [ResourceKind.PROJECT, ResourceKind.COLLECTION, ResourceKind.PROCESS]; +}; + +const buildDateFilter = (date?: string): string => { + return date ? date : ''; +}; + +export const initAdvanceFormProjectsTree = () => + (dispatch: Dispatch) => { + dispatch(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)); + }; + +export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') => + (dispatch: Dispatch) => { + dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value)); + }; + +export const updateAdvanceFormProperties = (propertyValues: PropertyValues) => + (dispatch: Dispatch) => { + dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues)); + }; + +export const moveUp = () => + (dispatch: Dispatch) => { + dispatch(searchBarActions.MOVE_UP()); + }; + +export const moveDown = () => + (dispatch: Dispatch) => { + dispatch(searchBarActions.MOVE_DOWN()); + };