X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/dc10e586102b4aad5d3c82d6b6cf799a9277a929..4f26fc6e11a411c11fc481b937c2e073f4858081:/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 6d2dce7c..78ba6c38 100644 --- a/src/store/search-results-panel/search-results-middleware-service.ts +++ b/src/store/search-results-panel/search-results-middleware-service.ts @@ -2,29 +2,29 @@ // // SPDX-License-Identifier: AGPL-3.0 -import { ServiceRepository } from '~/services/services'; +import { ServiceRepository } from 'services/services'; import { MiddlewareAPI, Dispatch } from 'redux'; -import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters } from '~/store/data-explorer/data-explorer-middleware-service'; -import { RootState } from '~/store/store'; -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 { 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 { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service'; +import { RootState } from 'store/store'; +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 { 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 { 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 { Resource } from '~/models/resource'; +} 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 { Resource } from 'models/resource'; export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -54,7 +54,7 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic api.dispatch(setItems(initial)); } - sessions.map(session => { + sessions.forEach(session => { const params = getParams(dataExplorer, searchValue, session.apiRevision); this.services.groupsService.contents('', params, session) .then((response) => { @@ -70,7 +70,7 @@ export class SearchResultsMiddlewareService extends DataExplorerMiddlewareServic const typeFilters = (columns: DataColumns) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE)); -const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({ +export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({ ...dataExplorerToListParams(dataExplorer), filters: joinFilters( queryToFilters(query, apiRevision),