Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Show pipeline details embedded in runs #447

Merged
merged 8 commits into from
Dec 4, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
breadcrumbs fixed, needs testing
  • Loading branch information
Yasser Elsayed committed Nov 30, 2018
commit f228b42288a96529b0dfed6bb8aa61c95c7b5748
45 changes: 36 additions & 9 deletions frontend/src/pages/PipelineDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ import Graph from '../components/Graph';
import InfoIcon from '@material-ui/icons/InfoOutlined';
import MD2Tabs from '../atoms/MD2Tabs';
import Paper from '@material-ui/core/Paper';
import RunUtils from '../lib/RunUtils';
import SidePanel from '../components/SidePanel';
import StaticNodeDetails from '../components/StaticNodeDetails';
import { ApiExperiment } from '../apis/experiment';
import { ApiPipeline, ApiGetTemplateResponse } from '../apis/pipeline';
import { Apis } from '../lib/Apis';
import { Page } from './Page';
Expand All @@ -38,7 +40,6 @@ import { Workflow } from '../../third_party/argo-ui/argo_template';
import { classes, stylesheet } from 'typestyle';
import { color, commonCss, padding, fontsize, fonts } from '../Css';
import { logger, errorToMessage, formatDateString } from '../lib/Utils';
import RunUtils from 'src/lib/RunUtils';

interface PipelineDetailsState {
graph?: dagre.graphlib.Graph;
Expand Down Expand Up @@ -248,12 +249,40 @@ class PipelineDetails extends Page<{}, PipelineDetailsState> {
let pipeline: ApiPipeline | null = null;
let templateYaml = '';
let template: Workflow | undefined;
let breadcrumbs: Array<{ displayName: string, href: string }> = [];
const toolbarActions = [...this.props.toolbarProps.actions];
let pageTitle = '';

// If fromRunId is specified, load the run and get the pipeline template from it
if (fromRunId) {
try {
const run = await Apis.runServiceApi.getRun(fromRunId);
templateYaml = RunUtils.getPipelineSpec(run.run) || '';
const runDetails = await Apis.runServiceApi.getRun(fromRunId);
templateYaml = RunUtils.getPipelineSpec(runDetails.run) || '';

const relatedExperimentId = RunUtils.getFirstExperimentReferenceId(runDetails.run);
let experiment: ApiExperiment | undefined;
if (relatedExperimentId) {
experiment = await Apis.experimentServiceApi.getExperiment(relatedExperimentId);
}

// Build the breadcrumbs, by adding experiment and run names
if (experiment) {
breadcrumbs.push(
{ displayName: 'Experiments', href: RoutePage.EXPERIMENTS },
{
displayName: experiment.name!,
href: RoutePage.EXPERIMENT_DETAILS.replace(':' + RouteParams.experimentId, experiment.id!)
});
} else {
breadcrumbs.push(
{ displayName: 'All runs', href: RoutePage.RUNS }
);
}
breadcrumbs.push({
displayName: runDetails.run!.name!,
href: RoutePage.RUN_DETAILS.replace(':' + RouteParams.runId, fromRunId),
});
pageTitle = 'Pipeline details';
yebrahim marked this conversation as resolved.
Show resolved Hide resolved
} catch (err) {
await this.showPageError('Cannot retrieve run details.', err);
logger.error('Cannot retrieve run details.', err);
Expand All @@ -265,6 +294,7 @@ class PipelineDetails extends Page<{}, PipelineDetailsState> {

try {
pipeline = await Apis.pipelineServiceApi.getPipeline(pipelineId);
pageTitle = pipeline.name!;
} catch (err) {
await this.showPageError('Cannot retrieve pipeline details.', err);
logger.error('Cannot retrieve pipeline details.', err);
Expand All @@ -280,15 +310,12 @@ class PipelineDetails extends Page<{}, PipelineDetailsState> {
return;
}

const breadcrumbs = [{ displayName: 'Pipelines', href: RoutePage.PIPELINES }];
const pageTitle = pipeline.name!;

const toolbarActions = [...this.props.toolbarProps.actions];
breadcrumbs = [{ displayName: 'Pipelines', href: RoutePage.PIPELINES }];
toolbarActions[0].disabled = false;
this.props.updateToolbar({ breadcrumbs, actions: toolbarActions, pageTitle });

}

this.props.updateToolbar({ breadcrumbs, actions: toolbarActions, pageTitle });

let g: dagre.graphlib.Graph | undefined;
try {
template = JsYaml.safeLoad(templateYaml);
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/pages/RunDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,17 @@ import { ApiExperiment } from '../apis/experiment';
import { ApiRun } from '../apis/run';
import { Apis } from '../lib/Apis';
import { NodePhase, statusToIcon } from './Status';
import { OutputArtifactLoader } from '../lib/OutputArtifactLoader';
import { Page } from './Page';
import { RoutePage, RouteParams, QUERY_PARAMS } from '../components/Router';
import { ToolbarProps } from '../components/Toolbar';
import { URLParser } from '../lib/URLParser';
import { ViewerConfig } from '../components/viewers/Viewer';
import { Workflow } from '../../third_party/argo-ui/argo_template';
import { classes } from 'typestyle';
import { commonCss, padding } from '../Css';
import { componentMap } from '../components/viewers/ViewerContainer';
import { formatDateString, getRunTime, logger, errorToMessage } from '../lib/Utils';
import { OutputArtifactLoader } from '../lib/OutputArtifactLoader';
import { classes } from 'typestyle';

enum SidePaneTab {
ARTIFACTS,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/pages/RunList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import { Apis, RunSortKeys, ListRequest } from '../lib/Apis';
import { Link, RouteComponentProps } from 'react-router-dom';
import { NodePhase, statusToIcon } from './Status';
import { RoutePage, RouteParams, QUERY_PARAMS } from '../components/Router';
import { URLParser } from '../lib/URLParser';
import { Workflow } from '../../../frontend/third_party/argo-ui/argo_template';
import { commonCss, color } from '../Css';
import { getRunTime, formatDateString, logger, errorToMessage } from '../lib/Utils';
import { stylesheet } from 'typestyle';
import { URLParser } from 'src/lib/URLParser';

const css = stylesheet({
metricContainer: {
Expand Down