//
// 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 { SortDirection } from '~/components/data-table/data-column';
-import { OrderDirection, OrderBuilder } from '~/services/api/order-builder';
-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 {
+ DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters
+} 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 { SortDirection } from 'components/data-table/data-column';
+import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
+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, 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';
+import { containerRequestFieldsNoMounts } from 'store/all-processes-panel/all-processes-panel-middleware-service';
export class SubprocessMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
const state = api.getState();
+ const parentContainerRequestUuid = state.processPanel.containerRequestUuid;
+ if (parentContainerRequestUuid === "") { return; }
const dataExplorer = getDataExplorer(state.dataExplorer, this.getId());
try {
- 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));
- }
- }
- }
- // TODO: set filters based on process panel state
+ api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+ const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
+ const containerRequests = await this.services.containerRequestService.list(
+ {
+ ...getParams(dataExplorer, parentContainerRequest) ,
+ select: containerRequestFieldsNoMounts
+ });
+ api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
+ api.dispatch(updateResources(containerRequests.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 getFilters = (processPanel: ProcessPanelState, processes: Process[]) => {
- const grouppedProcesses = groupBy(processes, getProcessStatus);
- return Object
- .keys(processPanel.filters)
- .map(filter => ({
- label: filter,
- value: (grouppedProcesses[filter] || []).length,
- checked: processPanel.filters[filter],
- key: filter,
- }));
- };
-*/
-
-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);
}
};
+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),
projects / arvados-workbench2.git / blobdiff