From 2bbfc3fdfa59d668c291b7f4f3ad76979f30231e Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Fri, 27 Oct 2023 17:03:51 -0400 Subject: [PATCH] 21158: Displays executions from the current workflow Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- src/store/store.ts | 4 +++ src/store/workbench/workbench-actions.ts | 4 +++ .../workflow-middleware-service.ts | 28 +++++++++++++++++++ .../workflow-panel/workflow-panel-actions.ts | 3 ++ .../registered-workflow-panel.tsx | 5 ++++ 5 files changed, 44 insertions(+) diff --git a/src/store/store.ts b/src/store/store.ts index daa9812e72..ee861f18be 100644 --- a/src/store/store.ts +++ b/src/store/store.ts @@ -20,9 +20,11 @@ import { collectionPanelFilesReducer } from "./collection-panel/collection-panel import { dataExplorerMiddleware } from "./data-explorer/data-explorer-middleware"; import { FAVORITE_PANEL_ID } from "./favorite-panel/favorite-panel-action"; import { PROJECT_PANEL_ID } from "./project-panel/project-panel-action"; +import { WORKFLOW_PROCESSES_PANEL_ID } from "./workflow-panel/workflow-panel-actions"; import { ProjectPanelMiddlewareService } from "./project-panel/project-panel-middleware-service"; import { FavoritePanelMiddlewareService } from "./favorite-panel/favorite-panel-middleware-service"; import { AllProcessesPanelMiddlewareService } from "./all-processes-panel/all-processes-panel-middleware-service"; +import { WorkflowProcessesMiddlewareService } from "./workflow-panel/workflow-middleware-service"; import { collectionPanelReducer } from "./collection-panel/collection-panel-reducer"; import { dialogReducer } from "./dialog/dialog-reducer"; import { ServiceRepository } from "services/services"; @@ -96,6 +98,7 @@ export function configureStore(history: History, services: ServiceRepository, co const projectPanelMiddleware = dataExplorerMiddleware(new ProjectPanelMiddlewareService(services, PROJECT_PANEL_ID)); const favoritePanelMiddleware = dataExplorerMiddleware(new FavoritePanelMiddlewareService(services, FAVORITE_PANEL_ID)); const allProcessessPanelMiddleware = dataExplorerMiddleware(new AllProcessesPanelMiddlewareService(services, ALL_PROCESSES_PANEL_ID)); + const workflowProcessessPanelMiddleware = dataExplorerMiddleware(new WorkflowProcessesMiddlewareService(services, WORKFLOW_PROCESSES_PANEL_ID)); const trashPanelMiddleware = dataExplorerMiddleware(new TrashPanelMiddlewareService(services, TRASH_PANEL_ID)); const searchResultsPanelMiddleware = dataExplorerMiddleware(new SearchResultsMiddlewareService(services, SEARCH_RESULTS_PANEL_ID)); const sharedWithMePanelMiddleware = dataExplorerMiddleware(new SharedWithMeMiddlewareService(services, SHARED_WITH_ME_PANEL_ID)); @@ -152,6 +155,7 @@ export function configureStore(history: History, services: ServiceRepository, co collectionsContentAddress, subprocessMiddleware, treePickerSearchMiddleware, + workflowProcessessPanelMiddleware ]; const reduceMiddlewaresFn: (a: Middleware[], b: MiddlewareListReducer) => Middleware[] = (a, b) => b(a, services); diff --git a/src/store/workbench/workbench-actions.ts b/src/store/workbench/workbench-actions.ts index b03400d5ae..b4c5df887e 100644 --- a/src/store/workbench/workbench-actions.ts +++ b/src/store/workbench/workbench-actions.ts @@ -98,6 +98,8 @@ import { AdminMenuIcon } from "components/icon/icon"; import { userProfileGroupsColumns } from "views/user-profile-panel/user-profile-panel-root"; import { selectedToArray, selectedToKindSet } from "components/multiselect-toolbar/MultiselectToolbar"; import { multiselectActions } from "store/multiselect/multiselect-actions"; +import { workflowProcessesPanelColumns } from "views/workflow-panel/workflow-processes-panel-root"; +import { workflowProcessesPanelActions } from "store/workflow-panel/workflow-panel-actions"; export const WORKBENCH_LOADING_SCREEN = "workbenchLoadingScreen"; @@ -179,6 +181,7 @@ export const loadWorkbench = () => async (dispatch: Dispatch, getState: () => Ro }) ); dispatch(subprocessPanelActions.SET_COLUMNS({ columns: subprocessPanelColumns })); + dispatch(workflowProcessesPanelActions.SET_COLUMNS({ columns: workflowProcessesPanelColumns })); if (services.linkAccountService.getAccountToLink()) { dispatch(linkAccountPanelActions.HAS_SESSION_DATA()); @@ -579,6 +582,7 @@ export const loadRegisteredWorkflow = (uuid: string) => await dispatch(finishLoadingProject(workflow.ownerUuid)); await dispatch(activateSidePanelTreeItem(workflow.ownerUuid)); dispatch(breadcrumbfunc(workflow.ownerUuid)); + dispatch(workflowProcessesPanelActions.REQUEST_ITEMS()); } } }); diff --git a/src/store/workflow-panel/workflow-middleware-service.ts b/src/store/workflow-panel/workflow-middleware-service.ts index 587f02246c..aa34218942 100644 --- a/src/store/workflow-panel/workflow-middleware-service.ts +++ b/src/store/workflow-panel/workflow-middleware-service.ts @@ -13,6 +13,10 @@ import { FilterBuilder } from 'services/api/filter-builder'; import { WorkflowResource } from 'models/workflow'; import { ListResults } from 'services/common-service/common-service'; import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions'; +import { matchRegisteredWorkflowRoute } from 'routes/routes'; +import { ProcessesMiddlewareService } from "store/processes/processes-middleware-service"; +import { workflowProcessesPanelActions } from "./workflow-panel-actions"; +import { joinFilters } from "services/api/filter-builder"; export class WorkflowMiddlewareService extends DataExplorerMiddlewareService { constructor(private services: ServiceRepository, id: string) { @@ -56,3 +60,27 @@ const couldNotFetchWorkflows = () => message: 'Could not fetch workflows.', kind: SnackbarKind.ERROR }); + + +export class WorkflowProcessesMiddlewareService extends ProcessesMiddlewareService { + constructor(services: ServiceRepository, id: string) { + super(services, workflowProcessesPanelActions, id); + } + + getFilters(api: MiddlewareAPI, dataExplorer: DataExplorer): string | null { + const state = api.getState(); + + if (!state.router.location) { return null; } + + const registeredWorkflowMatch = matchRegisteredWorkflowRoute(state.router.location.pathname); + if (!registeredWorkflowMatch) { return null; } + + const workflow_uuid = registeredWorkflowMatch.params.id; + + const requesting_container = new FilterBuilder().addEqual('properties.template_uuid', workflow_uuid).getFilters(); + const sup = super.getFilters(api, dataExplorer); + if (sup === null) { return null; } + + return joinFilters(sup, requesting_container); + } +} diff --git a/src/store/workflow-panel/workflow-panel-actions.ts b/src/store/workflow-panel/workflow-panel-actions.ts index d8c3b65141..b4c1d3fb7f 100644 --- a/src/store/workflow-panel/workflow-panel-actions.ts +++ b/src/store/workflow-panel/workflow-panel-actions.ts @@ -30,6 +30,9 @@ const UUID_PREFIX_PROPERTY_NAME = 'uuidPrefix'; const WORKFLOW_PANEL_DETAILS_UUID = 'workflowPanelDetailsUuid'; export const workflowPanelActions = bindDataExplorerActions(WORKFLOW_PANEL_ID); +export const WORKFLOW_PROCESSES_PANEL_ID = "workflowProcessesPanel"; +export const workflowProcessesPanelActions = bindDataExplorerActions(WORKFLOW_PROCESSES_PANEL_ID); + export const loadWorkflowPanel = () => async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => { dispatch(workflowPanelActions.REQUEST_ITEMS()); diff --git a/src/views/workflow-panel/registered-workflow-panel.tsx b/src/views/workflow-panel/registered-workflow-panel.tsx index 5973efedc8..98fcabded4 100644 --- a/src/views/workflow-panel/registered-workflow-panel.tsx +++ b/src/views/workflow-panel/registered-workflow-panel.tsx @@ -26,6 +26,7 @@ import { getResource } from 'store/resources/resources'; import { openContextMenu, resourceUuidToContextMenuKind } from 'store/context-menu/context-menu-actions'; import { MPVContainer, MPVPanelContent, MPVPanelState } from 'components/multi-panel-view/multi-panel-view'; import { ProcessIOCard, ProcessIOCardType } from 'views/process-panel/process-io-card'; +import { WorkflowProcessesPanel } from './workflow-processes-panel'; type CssRules = 'root' | 'button' @@ -137,6 +138,7 @@ export const RegisteredWorkflowPanel = withStyles(styles)(connect( { name: "Inputs" }, { name: "Outputs" }, { name: "Files" }, + { name: "Executions" }, ]; return item ? @@ -199,6 +201,9 @@ export const RegisteredWorkflowPanel = withStyles(styles)(connect( + + + : null; } -- 2.30.2