X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/13c4b3ea9297faf1ed25a3e8ff326bf6b0f15ee1..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 cf003472..6fdb8de2 100644
--- a/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
+++ b/src/store/subprocess-panel/subprocess-panel-middleware-service.ts
@@ -20,8 +20,10 @@ import { SubprocessPanelColumnNames } from '~/views/subprocess-panel/subprocess-
 import { FilterBuilder, joinFilters } from '~/services/api/filter-builder';
 import { subprocessPanelActions } from './subprocess-panel-actions';
 import { DataColumns } from '~/components/data-table/data-table';
-import { ProcessStatusFilter } from '../resource-type-filters/resource-type-filters';
+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) {
@@ -33,36 +35,19 @@ export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
         const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
 
         try {
+            api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
             const parentContainerRequestUuid = state.processPanel.containerRequestUuid;
-            if (parentContainerRequestUuid === "") {
-                api.dispatch(subprocessPanelActions.CLEAR());
-                return;
-            }
             const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
-            if (!parentContainerRequest.containerUuid) {
-                api.dispatch(subprocessPanelActions.CLEAR());
-                return;
-            }
             const containerRequests = await this.services.containerRequestService.list(
                 { ...getParams(dataExplorer, parentContainerRequest) });
-            if (containerRequests.items.length === 0) {
-                api.dispatch(subprocessPanelActions.CLEAR());
-                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()
-            });
 
-            // 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());
         }
     }
@@ -100,31 +85,11 @@ export const getFilters = (
         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);
-        switch (activeStatusFilter) {
-            case ProcessStatusFilter.COMPLETED: {
-                fb.addEqual('container.state', 'Complete');
-                fb.addEqual('container.exit_code', '0');
-                break;
-            }
-            case ProcessStatusFilter.FAILED: {
-                fb.addEqual('container.state', 'Complete');
-                fb.addDistinct('container.exit_code', '0');
-                break;
-            }
-            case ProcessStatusFilter.CANCELLED:
-            case ProcessStatusFilter.FAILED:
-            case ProcessStatusFilter.LOCKED:
-            case ProcessStatusFilter.QUEUED:
-            case ProcessStatusFilter.RUNNING: {
-                fb.addEqual('container.state', activeStatusFilter);
-                break;
-            }
-        }
-        const statusFilters = fb.getFilters();
+        const statusFilters = buildProcessStatusFilters(fb, activeStatusFilter).getFilters();
 
         const nameFilters = dataExplorer.searchValue
             ? new FilterBuilder()