From 2a39c3fe405e033ea0b262a40d9dc2e7f9a8153a Mon Sep 17 00:00:00 2001 From: kwasi Date: Wed, 12 Feb 2020 13:46:51 -0800 Subject: [PATCH] Fix missing ActionBar breadcrumbs (#42) --- build/lib/mlmd/LineageActionBar.js | 4 +-- build/lib/mlmd/LineageActionBar.js.map | 2 +- build/lib/mlmd/Utils.js | 24 +++++----------- build/lib/mlmd/Utils.js.map | 2 +- src/mlmd/LineageActionBar.tsx | 10 +++---- src/mlmd/Utils.tsx | 39 ++++++++++---------------- 6 files changed, 30 insertions(+), 51 deletions(-) diff --git a/build/lib/mlmd/LineageActionBar.js b/build/lib/mlmd/LineageActionBar.js index 1899c28..40dafcd 100644 --- a/build/lib/mlmd/LineageActionBar.js +++ b/build/lib/mlmd/LineageActionBar.js @@ -129,9 +129,7 @@ var LineageActionBar = /** @class */ (function (_super) { var onBreadcrumbClicked = function () { _this.sliceHistory(index); }; - breadcrumbs.push(React.createElement("button", { key: "breadcrumb-" + index, className: typestyle_1.classes(isActive ? actionBarCss.breadcrumbActive : actionBarCss.breadcrumbInactive), disabled: isActive, onClick: onBreadcrumbClicked }, - // TODO: Resolve how to handle Artifacts logged with no name - Utils_1.getResourceProperty(artifact, Api_1.ArtifactProperties.NAME) || '(unnamed)')); + breadcrumbs.push(React.createElement("button", { key: "breadcrumb-" + index, className: typestyle_1.classes(isActive ? actionBarCss.breadcrumbActive : actionBarCss.breadcrumbInactive), disabled: isActive, onClick: onBreadcrumbClicked }, Utils_1.getArtifactName(artifact))); if (!isActive) { breadcrumbs.push(React.createElement(BreadcrumbSeparator, { key: "separator-" + index })); } diff --git a/build/lib/mlmd/LineageActionBar.js.map b/build/lib/mlmd/LineageActionBar.js.map index f3cd517..05fa65a 100644 --- a/build/lib/mlmd/LineageActionBar.js.map +++ b/build/lib/mlmd/LineageActionBar.js.map @@ -1 +1 @@ -{"version":3,"file":"LineageActionBar.js","sourceRoot":"","sources":["../../../src/mlmd/LineageActionBar.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"LineageActionBar.js","sourceRoot":"","sources":["../../../src/mlmd/LineageActionBar.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/build/lib/mlmd/Utils.js b/build/lib/mlmd/Utils.js index 4447f4d..c39dcb3 100644 --- a/build/lib/mlmd/Utils.js +++ b/build/lib/mlmd/Utils.js @@ -18,6 +18,8 @@ Object.defineProperty(exports, "__esModule", { value: true }); var Api_1 = require("./Api"); var __1 = require(".."); var UNNAMED_RESOURCE_DISPLAY_NAME = '(unnamed)'; +var ARTIFACT_FIELD_REPOS = [Api_1.ArtifactProperties, Api_1.ArtifactCustomProperties]; +var EXECUTION_FIELD_REPOS = [Api_1.ExecutionProperties, Api_1.ExecutionCustomProperties]; function getResourceProperty(resource, propertyName, fromCustomProperties) { if (fromCustomProperties === void 0) { fromCustomProperties = false; } var props = fromCustomProperties @@ -39,14 +41,12 @@ function getResourcePropertyViaFallBack(res, fieldRepos, fields) { } exports.getResourcePropertyViaFallBack = getResourcePropertyViaFallBack; function getArtifactName(artifact) { - var artifactName = getResourceProperty(artifact, Api_1.ArtifactProperties.NAME) || - getResourceProperty(artifact, Api_1.ArtifactCustomProperties.NAME, true); - return artifactName ? artifactName.toString() : UNNAMED_RESOURCE_DISPLAY_NAME; + return getResourcePropertyViaFallBack(artifact, ARTIFACT_FIELD_REPOS, ['NAME']) + || UNNAMED_RESOURCE_DISPLAY_NAME; } +exports.getArtifactName = getArtifactName; function getExecutionName(execution) { - var fields = ['COMPONENT_ID', 'TASK_ID', 'NAME']; - var fieldRepos = [Api_1.ExecutionProperties, Api_1.ExecutionCustomProperties]; - return getResourcePropertyViaFallBack(execution, fieldRepos, fields) || UNNAMED_RESOURCE_DISPLAY_NAME; + return getResourcePropertyViaFallBack(execution, EXECUTION_FIELD_REPOS, ['COMPONENT_ID', 'TASK_ID', 'NAME']) || UNNAMED_RESOURCE_DISPLAY_NAME; } /** * Promisified sleep operation @@ -61,17 +61,7 @@ function getResourceName(resource) { } exports.getResourceName = getResourceName; function getResourceDescription(resource) { - var fields, fieldRepos; - if (resource instanceof __1.Artifact) { - fieldRepos = [Api_1.ArtifactProperties, Api_1.ArtifactCustomProperties]; - fields = ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE']; - } - else { - fieldRepos = [Api_1.ExecutionProperties, Api_1.ExecutionCustomProperties]; - fields = ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE']; - } - var description = getResourcePropertyViaFallBack(resource, fieldRepos, fields); - return description; + return getResourcePropertyViaFallBack(resource, resource instanceof __1.Artifact ? ARTIFACT_FIELD_REPOS : EXECUTION_FIELD_REPOS, ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE']); } exports.getResourceDescription = getResourceDescription; function getTypeName(typeId, artifactTypes) { diff --git a/build/lib/mlmd/Utils.js.map b/build/lib/mlmd/Utils.js.map index 32a58d1..9b1566c 100644 --- a/build/lib/mlmd/Utils.js.map +++ b/build/lib/mlmd/Utils.js.map @@ -1 +1 @@ -{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/mlmd/Utils.tsx"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/mlmd/Utils.tsx"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/mlmd/LineageActionBar.tsx b/src/mlmd/LineageActionBar.tsx index eb24cee..18859b1 100644 --- a/src/mlmd/LineageActionBar.tsx +++ b/src/mlmd/LineageActionBar.tsx @@ -6,7 +6,10 @@ import ReplayIcon from '@material-ui/icons/Replay'; import {classes, stylesheet} from "typestyle"; import {color, commonCss, fonts, padding} from "./Css"; import {CSSProperties} from "typestyle/lib/types"; -import {getResourceProperty, getResourcePropertyViaFallBack} from "./Utils"; +import { + getArtifactName, + getResourcePropertyViaFallBack, +} from './Utils'; import {Artifact} from '..'; import {ArtifactProperties, ArtifactCustomProperties} from "./Api"; @@ -134,10 +137,7 @@ export class LineageActionBar extends React.Component - { - // TODO: Resolve how to handle Artifacts logged with no name - getResourceProperty(artifact, ArtifactProperties.NAME) || '(unnamed)' - } + {getArtifactName(artifact)} ); if (!isActive) { diff --git a/src/mlmd/Utils.tsx b/src/mlmd/Utils.tsx index 6d69c76..fa90c41 100644 --- a/src/mlmd/Utils.tsx +++ b/src/mlmd/Utils.tsx @@ -20,10 +20,13 @@ import { ExecutionCustomProperties, ExecutionProperties, } from './Api'; -import {ArtifactTypeMap} from "./LineageApi"; +import {ArtifactTypeMap} from './LineageApi'; import {Artifact, Execution, Value} from '..'; const UNNAMED_RESOURCE_DISPLAY_NAME = '(unnamed)'; +const ARTIFACT_FIELD_REPOS = [ArtifactProperties, ArtifactCustomProperties]; +const EXECUTION_FIELD_REPOS = [ExecutionProperties, ExecutionCustomProperties]; + type RepoType = typeof ArtifactCustomProperties | typeof ArtifactProperties | typeof ExecutionCustomProperties | typeof ExecutionProperties export function getResourceProperty(resource: Artifact | Execution, @@ -46,23 +49,20 @@ export function getResourcePropertyViaFallBack(res: Artifact | Execution, field in repo && getResourceProperty(res, repo[field], !!isCustomProp) ) as string , '') - , '') || '' + , '') || ''; return prop as string; } -function getArtifactName(artifact: Artifact): string { - const artifactName = getResourceProperty(artifact, ArtifactProperties.NAME) || - getResourceProperty(artifact, ArtifactCustomProperties.NAME, true); - return artifactName ? artifactName.toString() : UNNAMED_RESOURCE_DISPLAY_NAME; +export function getArtifactName(artifact: Artifact): string { + return getResourcePropertyViaFallBack(artifact, ARTIFACT_FIELD_REPOS, ['NAME']) + || UNNAMED_RESOURCE_DISPLAY_NAME; } function getExecutionName(execution: Execution): string { - const fields = ['COMPONENT_ID', 'TASK_ID', 'NAME'] - const fieldRepos = [ExecutionProperties, ExecutionCustomProperties] return getResourcePropertyViaFallBack( execution, - fieldRepos, - fields + EXECUTION_FIELD_REPOS, + ['COMPONENT_ID', 'TASK_ID', 'NAME'] ) || UNNAMED_RESOURCE_DISPLAY_NAME } @@ -70,7 +70,7 @@ function getExecutionName(execution: Execution): string { * Promisified sleep operation * @param t Time to sleep for in ms */ -export const sleep = (t: number): Promise => new Promise(res => setTimeout(res, t)) +export const sleep = (t: number): Promise => new Promise(res => setTimeout(res, t)); export function getResourceName(resource: Artifact | Execution): string { if (resource instanceof Artifact) { @@ -80,20 +80,11 @@ export function getResourceName(resource: Artifact | Execution): string { } export function getResourceDescription(resource: Artifact | Execution): string { - let fields: string[], fieldRepos: RepoType[]; - if (resource instanceof Artifact) { - fieldRepos = [ArtifactProperties, ArtifactCustomProperties] - fields = ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE'] - } else { - fieldRepos = [ExecutionProperties, ExecutionCustomProperties] - fields = ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE'] - } - const description = getResourcePropertyViaFallBack( + return getResourcePropertyViaFallBack( resource, - fieldRepos, - fields, - ) - return description; + resource instanceof Artifact ? ARTIFACT_FIELD_REPOS : EXECUTION_FIELD_REPOS, + ['RUN_ID', 'RUN', 'PIPELINE_NAME', 'WORKSPACE'], + ); } export function getTypeName(typeId: number, artifactTypes: ArtifactTypeMap): string {