X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/4a72c22ddb45dce37ff0f9f18d4d73c289a08070..970a9e9dcd2a444d02181c4df3f205f7e0a8ebeb:/src/store/search-results-panel/search-results-middleware-service.ts

diff --git a/src/store/search-results-panel/search-results-middleware-service.ts b/src/store/search-results-panel/search-results-middleware-service.ts
index efe62f23..9aa49c28 100644
--- a/src/store/search-results-panel/search-results-middleware-service.ts
+++ b/src/store/search-results-panel/search-results-middleware-service.ts
@@ -10,23 +10,21 @@ import { snackbarActions, SnackbarKind } from '~/store/snackbar/snackbar-actions
 import { DataExplorer, getDataExplorer } from '~/store/data-explorer/data-explorer-reducer';
 import { updateResources } from '~/store/resources/resources-actions';
 import { SortDirection } from '~/components/data-table/data-column';
-import { SearchResultsPanelColumnNames } from '~/views/search-results-panel/search-results-panel-view';
 import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
 import { GroupContentsResource, GroupContentsResourcePrefix } from "~/services/groups-service/groups-service";
 import { ListResults } from '~/services/common-service/common-service';
 import { searchResultsPanelActions } from '~/store/search-results-panel/search-results-panel-actions';
 import {
-    getFilters,
-    getSearchQueryFirstProp,
-    getSearchSessions, ParseSearchQuery,
-    parseSearchQuery
+    getSearchSessions,
+    queryToFilters,
+    getAdvancedDataFromQuery
 } from '~/store/search-bar/search-bar-actions';
 import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
 import { joinFilters } from '~/services/api/filter-builder';
 import { DataColumns } from '~/components/data-table/data-table';
 import { serializeResourceTypeFilters } from '~/store//resource-type-filters/resource-type-filters';
 import { ProjectPanelColumnNames } from '~/views/project-panel/project-panel';
-import * as _ from 'lodash';
+import { Resource } from '~/models/resource';
 
 export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -35,77 +33,55 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic
 
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>, criteriaChanged?: boolean) {
         const state = api.getState();
-        const userUuid = state.auth.user!.uuid;
         const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
         const searchValue = state.searchBar.searchValue;
-        const sq = parseSearchQuery(searchValue);
-        const clusterId = getSearchQueryFirstProp(sq, 'cluster');
+        const { cluster: clusterId } = getAdvancedDataFromQuery(searchValue);
         const sessions = getSearchSessions(clusterId, state.auth.sessions);
 
         if (searchValue.trim() === '') {
             return;
         }
 
-        try {
-            const nameParams = getParams(dataExplorer, searchValue, sq, 'name');
+        const initial = {
+            itemsAvailable: 0,
+            items: [] as GroupContentsResource[],
+            kind: '',
+            offset: 0,
+            limit: 10
+        };
 
-            const nameLists: ListResults<GroupContentsResource>[] = await Promise.all(sessions.map(session =>
-                this.services.groupsService.contents('', nameParams, session)
-            ));
-
-            const nameItems = nameLists
-                .reduce((items, list) => items.concat(list.items), [] as GroupContentsResource[]);
-
-            const nameItemsAvailable = nameLists
-                .reduce((itemsAvailable, list) => itemsAvailable + list.itemsAvailable, 0);
-
-            const descriptionParams = getParams(dataExplorer, searchValue, sq, 'description');
-
-            const descriptionLists: ListResults<GroupContentsResource>[] = await Promise.all(sessions.map(session =>
-                this.services.groupsService.contents('', descriptionParams, session)
-            ));
-
-            const descriptionItems = descriptionLists
-                .reduce((items, list) => items.concat(list.items), [] as GroupContentsResource[]);
-
-            const descriptionItemsAvailable = descriptionLists
-                .reduce((itemsAvailable, list) => itemsAvailable + list.itemsAvailable, 0);
-
-            const items = nameItems.concat(descriptionItems);
-
-            const uniqueItems = _.uniqBy(items, 'uuid');
-
-            const mainList: ListResults<GroupContentsResource> = {
-                ...nameParams,
-                kind: '',
-                items: uniqueItems,
-                itemsAvailable: nameItemsAvailable + descriptionItemsAvailable
-            };
-
-            api.dispatch(updateResources(mainList.items));
-
-            api.dispatch(criteriaChanged
-                ? setItems(mainList)
-                : appendItems(mainList));
-
-        } catch {
-            api.dispatch(couldNotFetchSearchResults());
+        if (criteriaChanged) {
+            api.dispatch(setItems(initial));
         }
+
+        sessions.map(session => {
+            const params = getParams(dataExplorer, searchValue, session.apiRevision);
+            this.services.groupsService.contents('', params, session)
+                .then((response) => {
+                    api.dispatch(updateResources(response.items));
+                    api.dispatch(appendItems(response));
+                }).catch(() => {
+                    api.dispatch(couldNotFetchSearchResults(session.clusterId));
+                });
+            }
+        );
     }
 }
 
 const typeFilters = (columns: DataColumns<string>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
 
-export const getParams = (dataExplorer: DataExplorer, searchValue: string, sq: ParseSearchQuery, filter: string) => ({
+export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({
     ...dataExplorerToListParams(dataExplorer),
     filters: joinFilters(
-        getFilters(filter, searchValue, sq),
-        typeFilters(dataExplorer.columns)),
-    order: getOrder(dataExplorer, filter),
-    includeTrash: true
+        queryToFilters(query, apiRevision),
+        typeFilters(dataExplorer.columns)
+    ),
+    order: getOrder(dataExplorer),
+    includeTrash: getAdvancedDataFromQuery(query).inTrash,
+    includeOldVersions: getAdvancedDataFromQuery(query).pastVersions
 });
 
-const getOrder = (dataExplorer: DataExplorer, orderBy: any) => {
+const getOrder = (dataExplorer: DataExplorer) => {
     const sortColumn = getSortColumn(dataExplorer);
     const order = new OrderBuilder<GroupContentsResource>();
     if (sortColumn) {
@@ -113,11 +89,10 @@ const getOrder = (dataExplorer: DataExplorer, orderBy: any) => {
             ? OrderDirection.ASC
             : OrderDirection.DESC;
 
-        const columnName = sortColumn && sortColumn.name === SearchResultsPanelColumnNames.NAME ? orderBy : "modifiedAt";
         return order
-            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
-            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
-            .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
+            .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.COLLECTION)
+            .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROCESS)
+            .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROJECT)
             .getOrder();
     } else {
         return order.getOrder();
@@ -136,8 +111,8 @@ export const appendItems = (listResults: ListResults<GroupContentsResource>) =>
         items: listResults.items.map(resource => resource.uuid),
     });
 
-const couldNotFetchSearchResults = () =>
+const couldNotFetchSearchResults = (cluster: string) =>
     snackbarActions.OPEN_SNACKBAR({
-        message: `Could not fetch search results for some sessions.`,
+        message: `Could not fetch search results from ${cluster}.`,
         kind: SnackbarKind.ERROR
     });