X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/e7af5ee5ca402f7c637586831d611e5648cbc5b9..239ccc433d865ca165aac949cb66d7a03f86c721:/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 165392c6..e1551c23 100644 --- a/src/store/search-bar/search-bar-actions.ts +++ b/src/store/search-bar/search-bar-actions.ts @@ -2,22 +2,27 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { unionize, ofType, UnionOf } from "~/common/unionize"; +import { ofType, unionize, UnionOf } from "~/common/unionize"; import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; import { Dispatch } from 'redux'; -import { change, arrayPush } from 'redux-form'; +import { arrayPush, change, initialize } from 'redux-form'; import { RootState } from '~/store/store'; -import { initUserProject } from '~/store/tree-picker/tree-picker-actions'; +import { initUserProject, treePickerActions } 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 { ResourceKind, RESOURCE_UUID_REGEX, COLLECTION_PDH_REGEX } from '~/models/resource'; import { SearchView } from '~/store/search-bar/search-bar-reducer'; -import { navigateToSearchResults, navigateTo } from '~/store/navigation/navigation-action'; +import { navigateTo, navigateToSearchResults } 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'; +import { PropertyValue, SearchBarAdvanceFormData } from '~/models/search-bar'; +import * as _ from "lodash"; +import { getModifiedKeysValues } from "~/common/objects"; +import { activateSearchBarProject } from "~/store/search-bar/search-bar-tree-actions"; +import { Session } from "~/models/session"; +import { searchResultsPanelActions } from "~/store/search-results-panel/search-results-panel-actions"; +import { ListResults } from "~/services/common-service/common-service"; +import * as parser from './search-query/arv-parser'; +import { Keywords } from './search-query/arv-parser'; export const searchBarActions = unionize({ SET_CURRENT_VIEW: ofType(), @@ -59,9 +64,10 @@ export const loadRecentQueries = () => export const searchData = (searchValue: string) => async (dispatch: Dispatch, getState: () => RootState) => { const currentView = getState().searchBar.currentView; + dispatch(searchResultsPanelActions.CLEAR()); dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); if (searchValue.length > 0) { - dispatch(searchGroups(searchValue, 5, {})); + dispatch(searchGroups(searchValue, 5)); if (currentView === SearchView.BASIC) { dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); dispatch(navigateToSearchResults); @@ -72,16 +78,38 @@ export const searchData = (searchValue: string) => export const searchAdvanceData = (data: SearchBarAdvanceFormData) => async (dispatch: Dispatch) => { dispatch(saveQuery(data)); + dispatch(searchResultsPanelActions.CLEAR()); dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); dispatch(navigateToSearchResults); }; +export const setSearchValueFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) => + (dispatch: Dispatch, getState: () => RootState) => { + const searchValue = getState().searchBar.searchValue; + const value = getQueryFromAdvancedData({ + ...data, + searchValue + }, prevData); + dispatch(searchBarActions.SET_SEARCH_VALUE(value)); + }; + +export const setAdvancedDataFromSearchValue = (search: string) => + async (dispatch: Dispatch) => { + const data = getAdvancedDataFromQuery(search); + dispatch(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data)); + if (data.projectUuid) { + await dispatch(activateSearchBarProject(data.projectUuid)); + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID, id: data.projectUuid })); + } + }; + const saveQuery = (data: SearchBarAdvanceFormData) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const savedQueries = services.searchService.getSavedQueries(); - if (data.saveQuery && data.searchQuery) { - const filteredQuery = savedQueries.find(query => query.searchQuery === data.searchQuery); + if (data.saveQuery && data.queryName) { + const filteredQuery = savedQueries.find(query => query.queryName === data.queryName); + data.searchValue = getState().searchBar.searchValue; if (filteredQuery) { services.searchService.editSavedQueries(data); dispatch(searchBarActions.UPDATE_SAVED_QUERY(savedQueries)); @@ -105,7 +133,7 @@ export const deleteSavedQuery = (id: number) => export const editSavedQuery = (data: SearchBarAdvanceFormData) => (dispatch: Dispatch) => { dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED)); - dispatch(searchBarActions.SET_SEARCH_VALUE(data.searchQuery)); + dispatch(searchBarActions.SET_SEARCH_VALUE(getQueryFromAdvancedData(data))); dispatch(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data)); }; @@ -127,6 +155,7 @@ export const closeSearchView = () => export const closeAdvanceView = () => (dispatch: Dispatch) => { dispatch(searchBarActions.SET_SEARCH_VALUE('')); + dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCE_FORM_PICKER_ID })); dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); }; @@ -144,11 +173,10 @@ export const changeData = (searchValue: string) => const searchValuePresent = searchValue.length > 0; if (currentView === SearchView.ADVANCED) { - + dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.AUTOCOMPLETE)); } 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([])); @@ -163,44 +191,164 @@ export const submitData = (event: React.FormEvent) => dispatch(saveRecentQuery(searchValue)); dispatch(loadRecentQueries()); dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); - dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); - dispatch(searchBarActions.SET_SEARCH_RESULTS([])); - dispatch(navigateToSearchResults); + if (RESOURCE_UUID_REGEX.exec(searchValue) || COLLECTION_PDH_REGEX.exec(searchValue)) { + dispatch(navigateTo(searchValue)); + } else { + dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); + dispatch(searchBarActions.SET_SEARCH_RESULTS([])); + dispatch(searchResultsPanelActions.CLEAR()); + 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}) => +const searchGroups = (searchValue: string, limit: number) => 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, - recursive: true - }); + const { cluster: clusterId } = getAdvancedDataFromQuery(searchValue); + const sessions = getSearchSessions(clusterId, getState().auth.sessions); + const lists: ListResults[] = await Promise.all(sessions.map(session => { + const filters = queryToFilters(searchValue); + return services.groupsService.contents('', { + filters, + limit, + recursive: true + }, session); + })); + + const items = lists.reduce((items, list) => items.concat(list.items), [] as GroupContentsResource[]); dispatch(searchBarActions.SET_SEARCH_RESULTS(items)); } }; -export const getFilters = (filterName: string, searchValue: string, props: any): string => { - const { resourceKind, dateTo, dateFrom } = props; - return new FilterBuilder() +const buildQueryFromKeyMap = (data: any, keyMap: string[][], mode: 'rebuild' | 'reuse') => { + let value = data.searchValue; + + const addRem = (field: string, key: string) => { + const v = data[key]; + + if (data.hasOwnProperty(key)) { + const pattern = v === false + ? `${field.replace(':', '\\:\\s*')}\\s*` + : `${field.replace(':', '\\:\\s*')}\\:\\s*"[\\w|\\#|\\-|\\/]*"\\s*`; + value = value.replace(new RegExp(pattern), ''); + } + + if (v) { + const nv = v === true + ? `${field}` + : `${field}:${v}`; + + if (mode === 'rebuild') { + value = value + ' ' + nv; + } else { + value = nv + ' ' + value; + } + } + }; + + keyMap.forEach(km => addRem(km[0], km[1])); + + return value; +}; + +export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) => { + let value = ''; + + const flatData = (data: SearchBarAdvanceFormData) => { + const fo = { + searchValue: data.searchValue, + type: data.type, + cluster: data.cluster, + projectUuid: data.projectUuid, + inTrash: data.inTrash, + dateFrom: data.dateFrom, + dateTo: data.dateTo, + }; + (data.properties || []).forEach(p => fo[`prop-"${p.key}"`] = `"${p.value}"`); + return fo; + }; + + const keyMap = [ + ['type', 'type'], + ['cluster', 'cluster'], + ['project', 'projectUuid'], + [`is:${parser.States.TRASHED}`, 'inTrash'], + ['from', 'dateFrom'], + ['to', 'dateTo'] + ]; + _.union(data.properties, prevData ? prevData.properties : []) + .forEach(p => keyMap.push([`has:"${p.key}"`, `prop-"${p.key}"`])); + + if (prevData) { + const obj = getModifiedKeysValues(flatData(data), flatData(prevData)); + value = buildQueryFromKeyMap({ + searchValue: data.searchValue, + ...obj + } as SearchBarAdvanceFormData, keyMap, "reuse"); + } else { + value = buildQueryFromKeyMap(flatData(data), keyMap, "rebuild"); + } + + value = value.trim(); + return value; +}; + +export const getAdvancedDataFromQuery = (query: string): SearchBarAdvanceFormData => { + const { tokens, searchString } = parser.parseSearchQuery(query); + const getValue = parser.getValue(tokens); + return { + searchValue: searchString, + type: getValue(Keywords.TYPE) as ResourceKind, + cluster: getValue(Keywords.CLUSTER), + projectUuid: getValue(Keywords.PROJECT), + inTrash: parser.isTrashed(tokens), + dateFrom: getValue(Keywords.FROM) || '', + dateTo: getValue(Keywords.TO) || '', + properties: parser.getProperties(tokens), + saveQuery: false, + queryName: '' + }; +}; + +export const getSearchSessions = (clusterId: string | undefined, sessions: Session[]): Session[] => { + return sessions.filter(s => s.loggedIn && (!clusterId || s.clusterId === clusterId)); +}; + +export const queryToFilters = (query: string) => { + const data = getAdvancedDataFromQuery(query); + const filter = new FilterBuilder(); + const resourceKind = data.type; + + if (data.searchValue) { + filter.addFullTextSearch(data.searchValue); + } + + if (data.projectUuid) { + filter.addEqual('ownerUuid', data.projectUuid); + } + + if (data.dateFrom) { + filter.addGte('modified_at', buildDateFilter(data.dateFrom)); + } + + if (data.dateTo) { + filter.addLte('modified_at', buildDateFilter(data.dateTo)); + } + + data.properties.forEach(p => { + if (p.value) { + filter + .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) + .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION); + } + filter.addExists(p.key); + }); + + return filter .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(); }; @@ -217,12 +365,12 @@ export const initAdvanceFormProjectsTree = () => dispatch(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)); }; -export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') => +export const changeAdvanceFormProperty = (property: string, value: PropertyValue[] | string = '') => (dispatch: Dispatch) => { dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value)); }; -export const updateAdvanceFormProperties = (propertyValues: PropertyValues) => +export const updateAdvanceFormProperties = (propertyValues: PropertyValue) => (dispatch: Dispatch) => { dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues)); };