X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/02fe86a56f080ed1d5770ad6c6856a15f50ab508..970a9e9dcd2a444d02181c4df3f205f7e0a8ebeb:/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 e1551c23..b010af14 100644 --- a/src/store/search-bar/search-bar-actions.ts +++ b/src/store/search-bar/search-bar-actions.ts @@ -5,7 +5,7 @@ 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, treePickerActions } from '~/store/tree-picker/tree-picker-actions'; import { ServiceRepository } from '~/services/services'; @@ -14,7 +14,7 @@ import { ResourceKind, RESOURCE_UUID_REGEX, COLLECTION_PDH_REGEX } from '~/model 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 { PropertyValue, SearchBarAdvanceFormData } from '~/models/search-bar'; +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"; @@ -23,6 +23,7 @@ import { searchResultsPanelActions } from "~/store/search-results-panel/search-r 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(), @@ -30,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<{}>(), @@ -41,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; @@ -70,21 +71,22 @@ export const searchData = (searchValue: string) => 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({ @@ -94,17 +96,17 @@ export const setSearchValueFromAdvancedData = (data: SearchBarAdvanceFormData, p dispatch(searchBarActions.SET_SEARCH_VALUE(value)); }; -export const setAdvancedDataFromSearchValue = (search: string) => +export const setAdvancedDataFromSearchValue = (search: string, vocabulary: Vocabulary) => async (dispatch: Dispatch) => { - const data = getAdvancedDataFromQuery(search); - dispatch(initialize(SEARCH_BAR_ADVANCE_FORM_NAME, data)); + 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_ADVANCE_FORM_PICKER_ID, id: data.projectUuid })); + dispatch(treePickerActions.ACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID, id: data.projectUuid })); } }; -const saveQuery = (data: SearchBarAdvanceFormData) => +const saveQuery = (data: SearchBarAdvancedFormData) => (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { const savedQueries = services.searchService.getSavedQueries(); if (data.saveQuery && data.queryName) { @@ -130,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 = () => @@ -155,7 +157,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(treePickerActions.DEACTIVATE_TREE_PICKER_NODE({ pickerId: SEARCH_BAR_ADVANCED_FORM_PICKER_ID })); dispatch(searchBarActions.SET_CURRENT_VIEW(SearchView.BASIC)); }; @@ -197,7 +199,7 @@ export const submitData = (event: React.FormEvent) => dispatch(searchBarActions.SET_SEARCH_VALUE(searchValue)); dispatch(searchBarActions.SET_SEARCH_RESULTS([])); dispatch(searchResultsPanelActions.CLEAR()); - dispatch(navigateToSearchResults); + dispatch(navigateToSearchResults(searchValue)); } }; @@ -210,7 +212,7 @@ const searchGroups = (searchValue: string, limit: number) => 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); + const filters = queryToFilters(searchValue, session.apiRevision); return services.groupsService.contents('', { filters, limit, @@ -223,51 +225,56 @@ const searchGroups = (searchValue: string, limit: number) => } }; -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)) { - const pattern = v === false - ? `${field.replace(':', '\\:\\s*')}\\s*` - : `${field.replace(':', '\\:\\s*')}\\:\\s*"[\\w|\\#|\\-|\\/]*"\\s*`; + 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; - } + // 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, cluster: data.cluster, projectUuid: data.projectUuid, inTrash: data.inTrash, + pastVersions: data.pastVersions, 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; }; @@ -276,27 +283,24 @@ export const getQueryFromAdvancedData = (data: SearchBarAdvanceFormData, prevDat ['cluster', 'cluster'], ['project', 'projectUuid'], [`is:${parser.States.TRASHED}`, 'inTrash'], + [`is:${parser.States.PAST_VERSION}`, 'pastVersions'], ['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)); - 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 getAdvancedDataFromQuery = (query: string): SearchBarAdvanceFormData => { +export const getAdvancedDataFromQuery = (query: string, vocabulary?: Vocabulary): SearchBarAdvancedFormData => { const { tokens, searchString } = parser.parseSearchQuery(query); const getValue = parser.getValue(tokens); return { @@ -305,9 +309,20 @@ export const getAdvancedDataFromQuery = (query: string): SearchBarAdvanceFormDat cluster: getValue(Keywords.CLUSTER), projectUuid: getValue(Keywords.PROJECT), inTrash: parser.isTrashed(tokens), + pastVersions: parser.isPastVersion(tokens), dateFrom: getValue(Keywords.FROM) || '', dateTo: getValue(Keywords.TO) || '', - properties: parser.getProperties(tokens), + 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: '' }; @@ -317,7 +332,7 @@ export const getSearchSessions = (clusterId: string | undefined, sessions: Sessi return sessions.filter(s => s.loggedIn && (!clusterId || s.clusterId === clusterId)); }; -export const queryToFilters = (query: string) => { +export const queryToFilters = (query: string, apiRevision: number) => { const data = getAdvancedDataFromQuery(query); const filter = new FilterBuilder(); const resourceKind = data.type; @@ -327,7 +342,7 @@ export const queryToFilters = (query: string) => { } if (data.projectUuid) { - filter.addEqual('ownerUuid', data.projectUuid); + filter.addEqual('owner_uuid', data.projectUuid); } if (data.dateFrom) { @@ -340,9 +355,17 @@ export const queryToFilters = (query: string) => { data.properties.forEach(p => { if (p.value) { - filter - .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) - .addILike(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION); + if (apiRevision < 20200212) { + filter + .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) + .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION) + .addEqual(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROCESS); + } else { + filter + .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROJECT) + .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.COLLECTION) + .addContains(`properties.${p.key}`, p.value, GroupContentsResourcePrefix.PROCESS); + } } filter.addExists(p.key); }); @@ -360,19 +383,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: PropertyValue[] | 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: PropertyValue) => +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 = () =>