X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/72b6c853b95b1ef3da2a0beca3a31e4838a17896..519cf0aa43e6ac3085974506ff4eb1f0a70156c4:/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 1746c953..54678b50 100644 --- a/src/store/search-bar/search-bar-actions.ts +++ b/src/store/search-bar/search-bar-actions.ts @@ -5,20 +5,25 @@ import { ofType, unionize, UnionOf } from "~/common/unionize"; import { GroupContentsResource, GroupContentsResourcePrefix } from '~/services/groups-service/groups-service'; import { Dispatch } from 'redux'; -import { arrayPush, change, initialize } from 'redux-form'; +import { change, initialize, untouch } 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 { getResourceKind, 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 { navigateTo, navigateToSearchResults } from '~/store/navigation/navigation-action'; import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions'; -import { ClusterObjectType, getClusterObjectType, PropertyValues, SearchBarAdvanceFormData } from '~/models/search-bar'; -import { debounce } from 'debounce'; +import { PropertyValue, SearchBarAdvancedFormData } 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'; +import { Vocabulary, getTagKeyLabel, getTagValueLabel } from "~/models/vocabulary"; export const searchBarActions = unionize({ SET_CURRENT_VIEW: ofType(), @@ -26,9 +31,9 @@ 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(), + UPDATE_SAVED_QUERY: ofType(), SET_SELECTED_ITEM: ofType(), MOVE_UP: ofType<{}>(), MOVE_DOWN: ofType<{}>(), @@ -37,9 +42,9 @@ export const searchBarActions = unionize({ export type SearchBarActions = UnionOf; -export const SEARCH_BAR_ADVANCE_FORM_NAME = 'searchBarAdvanceFormName'; +export const SEARCH_BAR_ADVANCED_FORM_NAME = 'searchBarAdvancedFormName'; -export const SEARCH_BAR_ADVANCE_FORM_PICKER_ID = 'searchBarAdvanceFormPickerId'; +export const SEARCH_BAR_ADVANCED_FORM_PICKER_ID = 'searchBarAdvancedFormPickerId'; export const DEFAULT_SEARCH_DEBOUNCE = 1000; @@ -60,34 +65,48 @@ 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)); if (currentView === SearchView.BASIC) { dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); - dispatch(navigateToSearchResults); + dispatch(navigateToSearchResults(searchValue)); } } }; -export const searchAdvanceData = (data: SearchBarAdvanceFormData) => - async (dispatch: Dispatch) => { +export const searchAdvancedData = (data: SearchBarAdvancedFormData) => + async (dispatch: Dispatch, getState: () => RootState) => { dispatch(saveQuery(data)); + const searchValue = getState().searchBar.searchValue; + dispatch(searchResultsPanelActions.CLEAR()); dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); dispatch(searchBarActions.CLOSE_SEARCH_VIEW()); - dispatch(navigateToSearchResults); + dispatch(navigateToSearchResults(searchValue)); }; -export const setSearchValueFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) => +export const setSearchValueFromAdvancedData = (data: SearchBarAdvancedFormData, prevData?: SearchBarAdvancedFormData) => (dispatch: Dispatch, getState: () => RootState) => { + const searchValue = getState().searchBar.searchValue; const value = getQueryFromAdvancedData({ - searchValue: getState().searchBar.searchValue, - ...data + ...data, + searchValue }, prevData); dispatch(searchBarActions.SET_SEARCH_VALUE(value)); }; -const saveQuery = (data: SearchBarAdvanceFormData) => +export const setAdvancedDataFromSearchValue = (search: string, vocabulary: Vocabulary) => + async (dispatch: Dispatch) => { + const data = getAdvancedDataFromQuery(search, vocabulary); + dispatch(initialize(SEARCH_BAR_ADVANCED_FORM_NAME, data)); + if (data.projectUuid) { + await dispatch(activateSearchBarProject(data.projectUuid)); + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID, id: data.projectUuid })); + } + }; + +const saveQuery = (data: SearchBarAdvancedFormData) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const savedQueries = services.searchService.getSavedQueries(); if (data.saveQuery && data.queryName) { @@ -113,11 +132,11 @@ export const deleteSavedQuery = (id: number) => return savedSearchQueries || []; }; -export const editSavedQuery = (data: SearchBarAdvanceFormData) => +export const editSavedQuery = (data: SearchBarAdvancedFormData) => (dispatch: Dispatch) => { dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.ADVANCED)); dispatch(searchBarActions.SET_SEARCH_VALUE(getQueryFromAdvancedData(data))); - dispatch(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data)); + dispatch(initialize(SEARCH_BAR_ADVANCED_FORM_NAME, data)); }; export const openSearchView = () => @@ -138,6 +157,7 @@ export const closeSearchView = () => export const closeAdvanceView = () => (dispatch: Dispatch) => { dispatch(searchBarActions.SET_SEARCH_VALUE('')); + dispatch(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID })); dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); }; @@ -155,11 +175,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([])); @@ -174,66 +193,75 @@ 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(searchValue)); + } }; -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) => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const currentView = getState().searchBar.currentView; if (searchValue || currentView === SearchView.ADVANCED) { - const filters = getFilters('name', searchValue); - 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, session.apiRevision); + 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)); } }; -const buildQueryFromKeyMap = (data: any, keyMap: string[][], mode: 'rebuild' | 'reuse') => { +const buildQueryFromKeyMap = (data: any, keyMap: string[][]) => { let value = data.searchValue; const addRem = (field: string, key: string) => { const v = data[key]; + // Remove previous search expression. + if (data.hasOwnProperty(key)) { + let pattern: string; + if (v === false) { + pattern = `${field.replace(':', '\\:\\s*')}\\s*`; + } else if (key.startsWith('prop-')) { + // On properties, only remove key:value duplicates, allowing + // multiple properties with the same key. + const oldValue = key.slice(5).split(':')[1]; + pattern = `${field.replace(':', '\\:\\s*')}\\:\\s*${oldValue}\\s*`; + } else { + pattern = `${field.replace(':', '\\:\\s*')}\\:\\s*[\\w|\\#|\\-|\\/]*\\s*`; + } + value = value.replace(new RegExp(pattern), ''); + } + // Re-add it with the current search value. if (v) { const nv = v === true ? `${field}` : `${field}:${v}`; - - if (mode === 'rebuild') { - value = value + ' ' + nv; - } else { - value = nv + ' ' + value; - } - } else if (data.hasOwnProperty(key) && (v === undefined || v === false)) { - const pattern = v === false - ? `${field.replace(':', '\\:\\s*')}\\s*` - : `${field.replace(':', '\\:\\s*')}\\:\\s*[\\w|\\#|\\-|\\/]*`; - value = value.replace(new RegExp(pattern), ''); + // Always append to the end to keep user-entered text at the start. + value = value + ' ' + nv; } }; - keyMap.forEach(km => addRem(km[0], km[1])); - return value; }; -export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevData?: SearchBarAdvanceFormData) => { +export const getQueryFromAdvancedData = (data: SearchBarAdvancedFormData, prevData?: SearchBarAdvancedFormData) => { let value = ''; - const flatData = (data: SearchBarAdvanceFormData) => { + const flatData = (data: SearchBarAdvancedFormData) => { const fo = { searchValue: data.searchValue, type: data.type, @@ -243,7 +271,9 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevDat dateFrom: data.dateFrom, dateTo: data.dateTo, }; - (data.properties || []).forEach(p => fo[`prop-${p.key}`] = p.value); + (data.properties || []).forEach(p => + fo[`prop-"${p.keyID || p.key}":"${p.valueID || p.value}"`] = `"${p.valueID || p.value}"` + ); return fo; }; @@ -251,180 +281,92 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevDat ['type', 'type'], ['cluster', 'cluster'], ['project', 'projectUuid'], - ['is:trashed', 'inTrash'], + [`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}`])); + .forEach(p => keyMap.push( + [`has:"${p.keyID || p.key}"`, `prop-"${p.keyID || p.key}":"${p.valueID || p.value}"`] + )); - if (prevData) { - const obj = getModifiedKeysValues(flatData(data), flatData(prevData)); - console.log(obj); - value = buildQueryFromKeyMap({ - searchValue: data.searchValue, - ...obj - } as SearchBarAdvanceFormData, keyMap, "reuse"); - } else { - value = buildQueryFromKeyMap(flatData(data), keyMap, "rebuild"); - } + const modified = getModifiedKeysValues(flatData(data), prevData ? flatData(prevData):{}); + value = buildQueryFromKeyMap( + {searchValue: data.searchValue, ...modified} as SearchBarAdvancedFormData, keyMap); value = value.trim(); return value; }; -export const parseQuery: (query: string) => { hasKeywords: boolean; values: string[]; properties: any } = (searchValue: string) => { - const keywords = [ - 'type:', - 'cluster:', - 'project:', - 'is:', - 'from:', - 'to:', - 'has:' - ]; - - const hasKeywords = (search: string) => keywords.reduce((acc, keyword) => acc + search.indexOf(keyword) >= 0 ? 1 : 0, 0); - let keywordsCnt = 0; - - const properties = {}; - - keywords.forEach(k => { - let p = searchValue.indexOf(k); - const key = k.substr(0, k.length - 1); - - while (p >= 0) { - const l = searchValue.length; - keywordsCnt += 1; - - let v = ''; - let i = p + k.length; - while (i < l && searchValue[i] === ' ') { - ++i; - } - const vp = i; - while (i < l && searchValue[i] !== ' ') { - v += searchValue[i]; - ++i; - } - - if (hasKeywords(v)) { - searchValue = searchValue.substr(0, p) + searchValue.substr(vp); - } else { - if (v !== '') { - if (!properties[key]) { - properties[key] = []; - } - properties[key].push(v); - } - searchValue = searchValue.substr(0, p) + searchValue.substr(i); - } - p = searchValue.indexOf(k); - } - }); - - const values = _.uniq(searchValue.split(' ').filter(v => v.length > 0)); - - return { hasKeywords: keywordsCnt > 0, values, properties }; -}; - -export const getAdvancedDataFromQuery = (query: string): SearchBarAdvanceFormData => { - const r = parseQuery(query); - - const getFirstProp = (name: string) => r.properties[name] && r.properties[name][0]; - const getPropValue = (name: string, value: string) => r.properties[name] && r.properties[name].find((v: string) => v === value); - const getProperties = () => { - if (r.properties['has']) { - return r.properties['has'].map((value: string) => { - const v = value.split(':'); - return { - key: v[0], - value: v[1] - } - }) - } - return []; - }; - +export const getAdvancedDataFromQuery = (query: string, vocabulary?: Vocabulary): SearchBarAdvancedFormData => { + const { tokens, searchString } = parser.parseSearchQuery(query); + const getValue = parser.getValue(tokens); return { - searchValue: r.values.join(' '), - type: getResourceKind(getFirstProp('type')), - cluster: getClusterObjectType(getFirstProp('cluster')), - projectUuid: getFirstProp('project'), - inTrash: getPropValue('is', 'trashed') !== undefined, - dateFrom: getFirstProp('from'), - dateTo: getFirstProp('to'), - properties: getProperties(), + 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: vocabulary + ? parser.getProperties(tokens).map( + p => { + return { + keyID: p.key, + key: getTagKeyLabel(p.key, vocabulary), + valueID: p.value, + value: getTagValueLabel(p.key, p.value, vocabulary), + }; + }) + : parser.getProperties(tokens), saveQuery: false, - queryName: '', - } + queryName: '' + }; }; -export const getFilters = (filterName: string, searchValue: string): string => { +export const getSearchSessions = (clusterId: string | undefined, sessions: Session[]): Session[] => { + return sessions.filter(s => s.loggedIn && (!clusterId || s.clusterId === clusterId)); +}; + +export const queryToFilters = (query: string, apiRevision: number) => { + const data = getAdvancedDataFromQuery(query); const filter = new FilterBuilder(); + const resourceKind = data.type; - const pq = parseQuery(searchValue); - - if (!pq.hasKeywords) { - filter - .addILike(filterName, searchValue, GroupContentsResourcePrefix.COLLECTION) - .addILike(filterName, searchValue, GroupContentsResourcePrefix.PROCESS) - .addILike(filterName, searchValue, GroupContentsResourcePrefix.PROJECT); - } else { - - if (pq.properties.type) { - pq.values.forEach(v => { - let prefix = ''; - switch (ResourceKind[pq.properties.type]) { - case ResourceKind.PROJECT: - prefix = GroupContentsResourcePrefix.PROJECT; - break; - case ResourceKind.COLLECTION: - prefix = GroupContentsResourcePrefix.COLLECTION; - break; - case ResourceKind.PROCESS: - prefix = GroupContentsResourcePrefix.PROCESS; - break; - } - if (prefix !== '') { - filter.addILike(filterName, v, prefix); - } - }); - } else { - pq.values.forEach(v => { - filter - .addILike(filterName, v, GroupContentsResourcePrefix.COLLECTION) - .addILike(filterName, v, GroupContentsResourcePrefix.PROCESS) - .addILike(filterName, v, GroupContentsResourcePrefix.PROJECT); - }); - } + if (data.searchValue) { + filter.addFullTextSearch(data.searchValue); + } - if (pq.properties.is && pq.properties.is === 'trashed') { - } + if (data.projectUuid) { + filter.addEqual('owner_uuid', data.projectUuid); + } - if (pq.properties.project) { - filter.addEqual('owner_uuid', pq.properties.project, GroupContentsResourcePrefix.PROJECT); - } + if (data.dateFrom) { + filter.addGte('modified_at', buildDateFilter(data.dateFrom)); + } - if (pq.properties.from) { - filter.addGte('modified_at', buildDateFilter(pq.properties.from)); - } + if (data.dateTo) { + filter.addLte('modified_at', buildDateFilter(data.dateTo)); + } - if (pq.properties.to) { - filter.addLte('modified_at', buildDateFilter(pq.properties.to)); + data.properties.forEach(p => { + if (p.value) { + if (apiRevision < 20200212) { + filter + .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) + .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION); + } else { + filter + .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) + .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION); + } } - // 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) - } + filter.addExists(p.key); + }); return filter - .addEqual('groupClass', GroupClass.PROJECT, GroupContentsResourcePrefix.PROJECT) + .addIsA("uuid", buildUuidFilter(resourceKind)) .getFilters(); }; @@ -436,19 +378,20 @@ const buildDateFilter = (date?: string): string => { return date ? date : ''; }; -export const initAdvanceFormProjectsTree = () => +export const initAdvancedFormProjectsTree = () => (dispatch: Dispatch) => { - dispatch(initUserProject(SEARCH_BAR_ADVANCE_FORM_PICKER_ID)); + dispatch(initUserProject(SEARCH_BAR_ADVANCED_FORM_PICKER_ID)); }; -export const changeAdvanceFormProperty = (property: string, value: PropertyValues[] | string = '') => +export const changeAdvancedFormProperty = (propertyField: string, value: PropertyValue[] | string = '') => (dispatch: Dispatch) => { - dispatch(change(SEARCH_BAR_ADVANCE_FORM_NAME, property, value)); + dispatch(change(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField, value)); }; -export const updateAdvanceFormProperties = (propertyValues: PropertyValues) => +export const resetAdvancedFormProperty = (propertyField: string) => (dispatch: Dispatch) => { - dispatch(arrayPush(SEARCH_BAR_ADVANCE_FORM_NAME, 'properties', propertyValues)); + dispatch(change(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField, null)); + dispatch(untouch(SEARCH_BAR_ADVANCED_FORM_NAME, propertyField)); }; export const moveUp = () =>