diff --git a/src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.tsx b/src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.tsx index 72bca38b7..c1b1f0e8f 100644 --- a/src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.tsx +++ b/src/main/frontend/pipeline-console-view/pipeline-console/main/ConsoleLogCard.tsx @@ -84,15 +84,10 @@ export default function ConsoleLogCard(props: ConsoleLogCardProps) { status={props.step.state} percentage={props.step.completePercent} /> - {props.step.name} - - {props.step.title} - + + {props.step.title !== "" && {props.step.title}} + + {props.step.name !== "" && {props.step.name}} parseSteps(List stepNodes, String st displayName = cleanTextContent(displayName); logger.debug("DisplayName After: '" + displayName + "'."); + // Ignore certain titles + if (!displayName.isBlank()) { + if (title.equals("Shell Script") || title.equals("Print Message")) { + title = ""; + } + } + return new PipelineStep( flowNodeWrapper.getId(), displayName, PipelineState.of(flowNodeWrapper.getStatus()), flowNodeWrapper.getType().name(), - title, // TODO blue ocean uses timing information: "Passed in - // 0s" + title, stageId, flowNodeWrapper.getTiming()); }) diff --git a/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiLegacyTest.java b/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiLegacyTest.java index 636a954f7..fc47d8e7a 100644 --- a/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiLegacyTest.java +++ b/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiLegacyTest.java @@ -32,16 +32,16 @@ void unstableSmokes(JenkinsRule j) throws Exception { List steps = api.getLegacySteps(unstableOneId).getSteps(); assertThat(steps, hasSize(3)); assertThat(steps.get(0).getName(), is("foo")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("oops-one")); assertThat(steps.get(1).getTitle(), is("Set stage result to unstable")); assertThat(steps.get(2).getName(), is("bar")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); steps = api.getSteps(successId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("baz")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(unstableTwoId).getSteps(); assertThat(steps, hasSize(2)); @@ -87,7 +87,7 @@ void complexParallelBranchesHaveCorrectSteps(JenkinsRule j) throws Exception { List steps = api.getLegacySteps(nonParallelId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("This stage will be executed first.")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("Print Message")); assertThat(steps.get(1).getTitle(), is("")); @@ -95,17 +95,17 @@ void complexParallelBranchesHaveCorrectSteps(JenkinsRule j) throws Exception { steps = api.getSteps(branchAId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("On Branch A - 1")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("On Branch A - 2")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Branch B' steps = api.getSteps(branchBId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("On Branch B - 1")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("On Branch B - 2")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Branch C' steps = api.getSteps(branchCId).getSteps(); @@ -115,17 +115,17 @@ void complexParallelBranchesHaveCorrectSteps(JenkinsRule j) throws Exception { steps = api.getSteps(branchNested1Id).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("In stage Nested 1 - 1 within Branch C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In stage Nested 1 - 2 within Branch C")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Nested 2' steps = api.getSteps(branchNested2Id).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("In stage Nested 2 - 1 within Branch C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In stage Nested 2 - 2 within Branch C")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); } @Test @@ -152,7 +152,7 @@ void nestedStagesHaveCorrectSteps(JenkinsRule j) throws Exception { List steps = api.getSteps(childAId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In child A")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); // Check 'Child A' steps = api.getSteps(childBId).getSteps(); @@ -162,7 +162,7 @@ void nestedStagesHaveCorrectSteps(JenkinsRule j) throws Exception { steps = api.getSteps(grandchildBId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In grandchild B")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); // Check 'Child C' steps = api.getSteps(childCId).getSteps(); @@ -176,7 +176,7 @@ void nestedStagesHaveCorrectSteps(JenkinsRule j) throws Exception { steps = api.getSteps(greatGrandchildCId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In great-grandchild C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); } @Test @@ -193,26 +193,26 @@ void getAllStepsReturnsStepsForComplexParallelBranches(JenkinsRule j) throws Exc List steps = api.getAllSteps().getSteps(); assertThat(steps, hasSize(11)); assertThat(steps.get(0).getName(), is("This stage will be executed first.")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("Print Message")); assertThat(steps.get(1).getTitle(), is("")); assertThat(steps.get(2).getName(), is("On Branch A - 1")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); assertThat(steps.get(3).getName(), is("On Branch A - 2")); - assertThat(steps.get(3).getTitle(), is("Print Message")); + assertThat(steps.get(3).getTitle(), is("")); assertThat(steps.get(4).getName(), is("On Branch B - 1")); - assertThat(steps.get(4).getTitle(), is("Print Message")); + assertThat(steps.get(4).getTitle(), is("")); assertThat(steps.get(5).getName(), is("On Branch B - 2")); - assertThat(steps.get(5).getTitle(), is("Print Message")); + assertThat(steps.get(5).getTitle(), is("")); assertThat(steps.get(6).getName(), is("In stage Nested 1 - 1 within Branch C")); - assertThat(steps.get(6).getTitle(), is("Print Message")); + assertThat(steps.get(6).getTitle(), is("")); assertThat(steps.get(7).getName(), is("In stage Nested 1 - 2 within Branch C")); - assertThat(steps.get(7).getTitle(), is("Print Message")); + assertThat(steps.get(7).getTitle(), is("")); assertThat(steps.get(8).getName(), is("In stage Nested 2 - 1 within Branch C")); - assertThat(steps.get(8).getTitle(), is("Print Message")); + assertThat(steps.get(8).getTitle(), is("")); assertThat(steps.get(9).getName(), is("In stage Nested 2 - 2 within Branch C")); - assertThat(steps.get(9).getTitle(), is("Print Message")); + assertThat(steps.get(9).getTitle(), is("")); assertThat(steps.get(10).getName(), is("Get contextual object from internal APIs")); assertThat(steps.get(10).getTitle(), is("")); } @@ -229,11 +229,11 @@ void getAllStepsReturnsStepsForNestedStages(JenkinsRule j) throws Exception { List steps = api.getAllSteps().getSteps(); assertThat(steps, hasSize(3)); assertThat(steps.get(0).getName(), is("In child A")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In grandchild B")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); assertThat(steps.get(2).getName(), is("In great-grandchild C")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); } @Issue("GH#92") @@ -271,37 +271,37 @@ void githubIssue92RegressionTest(JenkinsRule j) throws Exception { List steps = api.getLegacySteps(linux8CheckoutId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Checking out linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux8BuildId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Building linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux8ArchiveId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Archiving linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11CheckoutId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Checking out linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11BuildId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Building linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11ArchiveId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Archiving linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(deployStageId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Deploying...")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); } @Issue("GH#213") diff --git a/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java b/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java index d994d88d6..6661c4609 100644 --- a/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java +++ b/src/test/java/io/jenkins/plugins/pipelinegraphview/utils/PipelineStepApiTest.java @@ -72,16 +72,16 @@ void unstableSmokes() throws Exception { List steps = api.getSteps(unstableOneId).getSteps(); assertThat(steps, hasSize(3)); assertThat(steps.get(0).getName(), is("foo")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("oops-one")); assertThat(steps.get(1).getTitle(), is("Set stage result to unstable")); assertThat(steps.get(2).getName(), is("bar")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); steps = api.getSteps(successId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("baz")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(unstableTwoId).getSteps(); assertThat(steps, hasSize(2)); @@ -127,7 +127,7 @@ void complexParallelBranchesHaveCorrectSteps() throws Exception { List steps = api.getSteps(nonParallelId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("This stage will be executed first.")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("Print Message")); assertThat(steps.get(1).getTitle(), is("")); @@ -135,17 +135,17 @@ void complexParallelBranchesHaveCorrectSteps() throws Exception { steps = api.getSteps(branchAId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("On Branch A - 1")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("On Branch A - 2")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Branch B' steps = api.getSteps(branchBId).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("On Branch B - 1")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("On Branch B - 2")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Branch C' steps = api.getSteps(branchCId).getSteps(); @@ -155,17 +155,17 @@ void complexParallelBranchesHaveCorrectSteps() throws Exception { steps = api.getSteps(branchNested1Id).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("In stage Nested 1 - 1 within Branch C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In stage Nested 1 - 2 within Branch C")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); // Check 'Nested 2' steps = api.getSteps(branchNested2Id).getSteps(); assertThat(steps, hasSize(2)); assertThat(steps.get(0).getName(), is("In stage Nested 2 - 1 within Branch C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In stage Nested 2 - 2 within Branch C")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); } @Test @@ -192,7 +192,7 @@ void nestedStagesHaveCorrectSteps() throws Exception { List steps = api.getSteps(childAId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In child A")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); // Check 'Child A' steps = api.getSteps(childBId).getSteps(); @@ -202,7 +202,7 @@ void nestedStagesHaveCorrectSteps() throws Exception { steps = api.getSteps(grandchildBId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In grandchild B")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); // Check 'Child C' steps = api.getSteps(childCId).getSteps(); @@ -216,7 +216,7 @@ void nestedStagesHaveCorrectSteps() throws Exception { steps = api.getSteps(greatGrandchildCId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("In great-grandchild C")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); } @Test @@ -233,26 +233,26 @@ void getAllStepsReturnsStepsForComplexParallelBranches() throws Exception { List steps = api.getAllSteps().getSteps(); assertThat(steps, hasSize(11)); assertThat(steps.get(0).getName(), is("This stage will be executed first.")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("Print Message")); assertThat(steps.get(1).getTitle(), is("")); assertThat(steps.get(2).getName(), is("On Branch A - 1")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); assertThat(steps.get(3).getName(), is("On Branch A - 2")); - assertThat(steps.get(3).getTitle(), is("Print Message")); + assertThat(steps.get(3).getTitle(), is("")); assertThat(steps.get(4).getName(), is("On Branch B - 1")); - assertThat(steps.get(4).getTitle(), is("Print Message")); + assertThat(steps.get(4).getTitle(), is("")); assertThat(steps.get(5).getName(), is("On Branch B - 2")); - assertThat(steps.get(5).getTitle(), is("Print Message")); + assertThat(steps.get(5).getTitle(), is("")); assertThat(steps.get(6).getName(), is("In stage Nested 1 - 1 within Branch C")); - assertThat(steps.get(6).getTitle(), is("Print Message")); + assertThat(steps.get(6).getTitle(), is("")); assertThat(steps.get(7).getName(), is("In stage Nested 1 - 2 within Branch C")); - assertThat(steps.get(7).getTitle(), is("Print Message")); + assertThat(steps.get(7).getTitle(), is("")); assertThat(steps.get(8).getName(), is("In stage Nested 2 - 1 within Branch C")); - assertThat(steps.get(8).getTitle(), is("Print Message")); + assertThat(steps.get(8).getTitle(), is("")); assertThat(steps.get(9).getName(), is("In stage Nested 2 - 2 within Branch C")); - assertThat(steps.get(9).getTitle(), is("Print Message")); + assertThat(steps.get(9).getTitle(), is("")); assertThat(steps.get(10).getName(), is("Get contextual object from internal APIs")); assertThat(steps.get(10).getTitle(), is("")); } @@ -269,11 +269,11 @@ void getAllStepsReturnsStepsForNestedStages() throws Exception { List steps = api.getAllSteps().getSteps(); assertThat(steps, hasSize(3)); assertThat(steps.get(0).getName(), is("In child A")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); assertThat(steps.get(1).getName(), is("In grandchild B")); - assertThat(steps.get(1).getTitle(), is("Print Message")); + assertThat(steps.get(1).getTitle(), is("")); assertThat(steps.get(2).getName(), is("In great-grandchild C")); - assertThat(steps.get(2).getTitle(), is("Print Message")); + assertThat(steps.get(2).getTitle(), is("")); } @Issue("GH#92") @@ -311,37 +311,37 @@ void githubIssue92RegressionTest() throws Exception { List steps = api.getSteps(linux8CheckoutId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Checking out linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux8BuildId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Building linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux8ArchiveId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Archiving linux-8")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11CheckoutId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Checking out linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11BuildId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Building linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(linux11ArchiveId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Archiving linux-11")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); steps = api.getSteps(deployStageId).getSteps(); assertThat(steps, hasSize(1)); assertThat(steps.get(0).getName(), is("Deploying...")); - assertThat(steps.get(0).getTitle(), is("Print Message")); + assertThat(steps.get(0).getTitle(), is("")); } @Issue("GH#213")