- const crUuid = state.processPanel.containerRequestUuid;
- if (crUuid !== "") {
- const containerRequest = await this.services.containerRequestService.get(crUuid);
- if (containerRequest.containerUuid) {
- const filters = new FilterBuilder().addEqual('requestingContainerUuid', containerRequest.containerUuid).getFilters();
- const containerRequests = await this.services.containerRequestService.list({ ...getParams(dataExplorer), filters });
- api.dispatch(updateResources(containerRequests.items));
- api.dispatch(setItems(containerRequests));
-
- const containerUuids: string[] = containerRequests.items.reduce((uuids, { containerUuid }) =>
- containerUuid
- ? [...uuids, containerUuid]
- : uuids, []);
-
- if (containerUuids.length > 0) {
- const filters = new FilterBuilder().addIn('uuid', containerUuids).getFilters();
- const containers = await this.services.containerService.list({ filters });
- api.dispatch<any>(updateResources(containers.items));
+ 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 (not filtered based on the data explorer parameters).
+ // This lets us filter based on the combined status of the container request and its container, if it exists.
+ let filters = new FilterBuilder().addEqual('requestingContainerUuid', parentContainerRequest.containerUuid).getFilters();
+ const containerRequests = await this.services.containerRequestService.list({ filters });
+ if (containerRequests.items.length === 0) { return; }
+ console.log(containerRequests);
+
+ const containerUuids: string[] = containerRequests.items.reduce((uuids, { containerUuid }) =>
+ containerUuid
+ ? [...uuids, containerUuid]
+ : uuids, []);
+ filters = new FilterBuilder().addIn('uuid', containerUuids).getFilters();
+ // const containers = await this.services.containerService.list({ filters });
+
+ // Find a container requests corresponding container if it exists and check if it should be displayed
+ const filteredContainerRequestUuids: string[] = [];
+ const filteredContainerUuids: string[] = [];
+ /* containerRequests.items.forEach(
+ (cr: ContainerRequestResource) => {
+ const c = containers.items.find((c: ContainerResource) => cr.containerUuid === c.uuid);
+ const process = c ? { containerRequest: cr, container: c } : { containerRequest: cr };
+
+ if (statusFilters === getProcessStatus(process)) {
+ filteredContainerRequestUuids.push(process.containerRequest.uuid);
+ if (process.container) { filteredContainerUuids.push(process.container.uuid); }