X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/9ea087b587f8139416cea16fbe4caad0d6df90c4..fe477581df706f4c2c1669f2df584bd94dbb4bea:/src/store/workflow-panel/workflow-middleware-service.ts?ds=inline

diff --git a/src/store/workflow-panel/workflow-middleware-service.ts b/src/store/workflow-panel/workflow-middleware-service.ts
index 7fa2dd4f..6dbcf6ac 100644
--- a/src/store/workflow-panel/workflow-middleware-service.ts
+++ b/src/store/workflow-panel/workflow-middleware-service.ts
@@ -11,11 +11,12 @@ import { DataExplorer, getDataExplorer } from '~/store/data-explorer/data-explor
 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';
+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 { 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) {
@@ -26,7 +27,7 @@ export class WorkflowMiddlewareService extends DataExplorerMiddlewareService {
         const state = api.getState();
         const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
         try {
-            const response = await this.services.workflowService.list({ order: getOrder(dataExplorer) });
+            const response = await this.services.workflowService.list(getParams(dataExplorer));
             api.dispatch(updateResources(response.items));
             api.dispatch(setItems(response));
         } catch {
@@ -38,18 +39,18 @@ export class WorkflowMiddlewareService extends DataExplorerMiddlewareService {
 export const getParams = (dataExplorer: DataExplorer) => ({
     ...dataExplorerToListParams(dataExplorer),
     order: getOrder(dataExplorer),
-    filters: getFilters(dataExplorer),
+    filters: getFilters(dataExplorer)
 });
 
 export const getFilters = (dataExplorer: DataExplorer) => {
     const filters = new FilterBuilder()
         .addILike("name", dataExplorer.searchValue)
         .getFilters();
-    return `[${filters}]`;
+    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<WorkflowResource>();
     if (sortColumn) {
         const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC