X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/a9ba50241080a83734e8aea0f230cc3fc3f3b7ca..25216cc7acedc987c26a159f0b640210c0ef101e:/src/store/workflow-panel/workflow-middleware-service.ts diff --git a/src/store/workflow-panel/workflow-middleware-service.ts b/src/store/workflow-panel/workflow-middleware-service.ts index 49d17f4a..d3a1d055 100644 --- a/src/store/workflow-panel/workflow-middleware-service.ts +++ b/src/store/workflow-panel/workflow-middleware-service.ts @@ -2,20 +2,21 @@ // // 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 } 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 { FilterBuilder } from '~/services/api/filter-builder'; -import { SortDirection } from '~/components/data-table/data-column'; -import { WorkflowPanelColumnNames } from '~/views/workflow-panel/workflow-panel-view'; -import { OrderDirection, OrderBuilder } from '~/services/api/order-builder'; -import { WorkflowResource } from '~/models/workflow'; -import { ListResults } from '~/services/common-service/common-resource-service'; -import { workflowPanelActions } from './workflow-panel-actions'; +import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } 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 { FilterBuilder } from 'services/api/filter-builder'; +import { SortDirection } from 'components/data-table/data-column'; +import { WorkflowPanelColumnNames } from 'views/workflow-panel/workflow-panel-view'; +import { OrderDirection, OrderBuilder } from 'services/api/order-builder'; +import { WorkflowResource } from 'models/workflow'; +import { ListResults } from 'services/common-service/common-service'; +import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions'; +import { getSortColumn } from "store/data-explorer/data-explorer-reducer"; export class WorkflowMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -38,10 +39,18 @@ export class WorkflowMiddlewareService extends DataExplorerMiddlewareService { export const getParams = (dataExplorer: DataExplorer) => ({ ...dataExplorerToListParams(dataExplorer), order: getOrder(dataExplorer), + filters: getFilters(dataExplorer) }); +export const getFilters = (dataExplorer: DataExplorer) => { + const filters = new FilterBuilder() + .addILike("name", dataExplorer.searchValue) + .getFilters(); + return filters; +}; + export const getOrder = (dataExplorer: DataExplorer) => { - const sortColumn = dataExplorer.columns.find(c => c.sortDirection !== SortDirection.NONE); + const sortColumn = getSortColumn(dataExplorer); const order = new OrderBuilder(); if (sortColumn) { const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC