X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/c8f9ad8b41c678eef32c6df467f259d141fa9376..ecfd85a34f5852c160a25ab61bc5c38059927c56:/src/store/subprocess-panel/subprocess-panel-middleware-service.ts

diff --git a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
index 13402225..6fdb8de2 100644
--- a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
+++ b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
@@ -17,9 +17,13 @@ import { ListResults } from '~/services/common-service/common-service';
 import { getSortColumn } from "~/store/data-explorer/data-explorer-reducer";
 import { ProcessResource } from '~/models/process';
 import { SubprocessPanelColumnNames } from '~/views/subprocess-panel/subprocess-panel-root';
-import { FilterBuilder } from '~/services/api/filter-builder';
+import { FilterBuilder, joinFilters } from '~/services/api/filter-builder';
 import { subprocessPanelActions } from './subprocess-panel-actions';
 import { DataColumns } from '~/components/data-table/data-table';
+import { ProcessStatusFilter, buildProcessStatusFilters } from '../resource-type-filters/resource-type-filters';
+import { ContainerRequestResource } from '~/models/container-request';
+import { progressIndicatorActions } from '../progress-indicator/progress-indicator-actions';
+import { loadMissingProcessesInformation } from '../project-panel/project-panel-middleware-service';
 
 export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
     constructor(private services: ServiceRepository, id: string) {
@@ -29,51 +33,33 @@ export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
     async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
         const state = api.getState();
         const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
-        const columns = dataExplorer.columns as DataColumns<string>;
-        const statusFilters = getDataExplorerColumnFilters(columns, 'Status');
-        const activeStatusFilter = Object.keys(statusFilters).find(
-            filterName => statusFilters[filterName].selected
-        );
 
         try {
+            api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
             const parentContainerRequestUuid = state.processPanel.containerRequestUuid;
-            if (parentContainerRequestUuid === "") { return; }
-
             const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
-
-            if (!parentContainerRequest.containerUuid) { return; }
-
-            // Get all the subprocess' container requests and containers.
-            const fb = new FilterBuilder().addEqual('requesting_container_uuid', parentContainerRequest.containerUuid);
-            if (activeStatusFilter !== undefined && activeStatusFilter !== 'All') {
-                fb.addEqual('container.state', activeStatusFilter);
-            }
             const containerRequests = await this.services.containerRequestService.list(
-                { ...getParams(dataExplorer), filters: fb.getFilters() });
-            if (containerRequests.items.length === 0) { return; }
-            const containerUuids: string[] = containerRequests.items.reduce(
-                (uuids, { containerUuid }) =>
-                    containerUuid
-                        ? [...uuids, containerUuid]
-                        : uuids, []);
-            const containers = await this.services.containerService.list({
-                filters: new FilterBuilder().addIn('uuid', containerUuids).getFilters()
-            });
+                { ...getParams(dataExplorer, parentContainerRequest) });
 
-            // Populate the actual user view
+            api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
             api.dispatch(updateResources(containerRequests.items));
-            api.dispatch(updateResources(containers.items));
+            await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
+            // Populate the actual user view
             api.dispatch(setItems(containerRequests));
         } catch {
+            api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
             api.dispatch(couldNotFetchSubprocesses());
         }
     }
 }
 
-export const getParams = (dataExplorer: DataExplorer) => ({
-    ...dataExplorerToListParams(dataExplorer),
-    order: getOrder(dataExplorer)
-});
+export const getParams = (
+    dataExplorer: DataExplorer,
+    parentContainerRequest: ContainerRequestResource) => ({
+        ...dataExplorerToListParams(dataExplorer),
+        order: getOrder(dataExplorer),
+        filters: getFilters(dataExplorer, parentContainerRequest)
+    });
 
 const getOrder = (dataExplorer: DataExplorer) => {
     const sortColumn = getSortColumn(dataExplorer);
@@ -92,6 +78,31 @@ const getOrder = (dataExplorer: DataExplorer) => {
     }
 };
 
+export const getFilters = (
+    dataExplorer: DataExplorer,
+    parentContainerRequest: ContainerRequestResource) => {
+        const columns = dataExplorer.columns as DataColumns<string>;
+        const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
+        const activeStatusFilter = Object.keys(statusColumnFilters).find(
+            filterName => statusColumnFilters[filterName].selected
+        ) || ProcessStatusFilter.ALL;
+
+        // Get all the subprocess' container requests and containers.
+        const fb = new FilterBuilder().addEqual('requesting_container_uuid', parentContainerRequest.containerUuid);
+        const statusFilters = buildProcessStatusFilters(fb, activeStatusFilter).getFilters();
+
+        const nameFilters = dataExplorer.searchValue
+            ? new FilterBuilder()
+                .addILike("name", dataExplorer.searchValue)
+                .getFilters()
+            : '';
+
+        return joinFilters(
+            nameFilters,
+            statusFilters
+        );
+    };
+
 export const setItems = (listResults: ListResults<ProcessResource>) =>
     subprocessPanelActions.SET_ITEMS({
         ...listResultsToDataExplorerItemsMeta(listResults),