X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/853d8c61628e6c948406aa7ad4b9c4a6e11ef25a..6c40105be37e95350ad0537c38401d58e6f84e2c:/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts diff --git a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts index ad9bbd93..c139b429 100644 --- a/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts +++ b/src/store/shared-with-me-panel/shared-with-me-middleware-service.ts @@ -9,7 +9,7 @@ import { RootState } from '~/store/store'; import { getDataExplorer, DataExplorer } from '~/store/data-explorer/data-explorer-reducer'; import { updateFavorites } from '~/store/favorites/favorites-actions'; import { updateResources } from '~/store/resources/resources-actions'; -import { loadMissingProcessesInformation } from '~/store/project-panel/project-panel-middleware-service'; +import { loadMissingProcessesInformation, getFilters } from '~/store/project-panel/project-panel-middleware-service'; import { snackbarActions } from '~/store/snackbar/snackbar-actions'; import { sharedWithMePanelActions } from './shared-with-me-panel-actions'; import { ListResults } from '~/services/common-service/common-resource-service'; @@ -18,7 +18,7 @@ import { SortDirection } from '~/components/data-table/data-column'; import { OrderBuilder, OrderDirection } from '~/services/api/order-builder'; import { ProjectResource } from '~/models/project'; import { ProjectPanelColumnNames } from '~/views/project-panel/project-panel'; -import { FilterBuilder } from '~/services/api/filter-builder'; +import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer"; export class SharedWithMeMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -50,16 +50,8 @@ export const getParams = (dataExplorer: DataExplorer) => ({ filters: getFilters(dataExplorer), }); -export const getFilters = (dataExplorer: DataExplorer) => { - return new FilterBuilder() - .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.COLLECTION) - .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROCESS) - .addILike("name", dataExplorer.searchValue, GroupContentsResourcePrefix.PROJECT) - .getFilters(); -}; - export const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = dataExplorer.columns.find(c => !!c.sortDirection && c.sortDirection !== SortDirection.NONE); + const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn) { const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC