diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/GitHubBranchSourceRunDetailsItems.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/GitHubBranchSourceRunDetailsItems.java deleted file mode 100644 index 6da01afe..00000000 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/GitHubBranchSourceRunDetailsItems.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.jenkins.plugins.pipelinegraphview.cards.items; - -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem; -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.Ionicon; -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent; -import java.util.List; -import java.util.Optional; -import jenkins.scm.api.SCMRevisionAction; -import jenkins.scm.api.metadata.ObjectMetadataAction; -import org.jenkinsci.plugins.github_branch_source.GitHubLink; -import org.jenkinsci.plugins.github_branch_source.PullRequestSCMHead; -import org.jenkinsci.plugins.github_branch_source.PullRequestSCMRevision; -import org.jenkinsci.plugins.workflow.job.WorkflowRun; - -public class GitHubBranchSourceRunDetailsItems { - - public static String getGitCommit(SCMRevisionAction scmRevisionAction) { - PullRequestSCMRevision revision = (PullRequestSCMRevision) scmRevisionAction.getRevision(); - return revision.getPullHash().substring(0, 7); - } - - public static List getGitInformation(SCMRevisionAction scmRevisionAction) { - PullRequestSCMRevision revision = (PullRequestSCMRevision) scmRevisionAction.getRevision(); - - // TODO see if there's a way to get this for branch builds, may need to make changes to - // github-branch-source-plugin - PullRequestSCMHead head = (PullRequestSCMHead) revision.getHead(); - String sourceOwner = head.getSourceOwner(); - String sourceRepo = head.getSourceRepo(); - String sourceBranch = head.getSourceBranch(); - - RunDetailsItem gitRepositoryItem = new RunDetailsItem.RunDetail( - new Ionicon("logo-github"), ItemContent.of(sourceOwner + "/" + sourceRepo)); - - RunDetailsItem gitBranchItem = - new RunDetailsItem.RunDetail(new Ionicon("git-branch-outline"), ItemContent.of(sourceBranch)); - - return List.of(gitRepositoryItem, gitBranchItem); - } - - public static Optional getGitHubLink(WorkflowRun run) { - GitHubLink gitHubLink = run.getParent().getAction(GitHubLink.class); - if (gitHubLink == null) { - return Optional.empty(); - } - ObjectMetadataAction action = run.getParent().getAction(ObjectMetadataAction.class); - String name = action.getObjectDisplayName(); - if (name == null) { - return Optional.empty(); - } - return Optional.of(new RunDetailsItem.RunDetail( - new Ionicon("git-pull-request-outline"), ItemContent.of(gitHubLink.getUrl(), name))); - } -} diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/SCMRunDetailsItems.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/SCMRunDetailsItems.java deleted file mode 100644 index 9d18d751..00000000 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/cards/items/SCMRunDetailsItems.java +++ /dev/null @@ -1,50 +0,0 @@ -package io.jenkins.plugins.pipelinegraphview.cards.items; - -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem; -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.Icon.Ionicon; -import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem.ItemContent; -import java.util.ArrayList; -import java.util.List; -import jenkins.model.Jenkins; -import jenkins.plugins.git.AbstractGitSCMSource; -import jenkins.scm.api.SCMRevisionAction; -import org.jenkinsci.plugins.workflow.job.WorkflowRun; - -public class SCMRunDetailsItems { - - public static List get(WorkflowRun run) { - SCMRevisionAction scmRevisionAction = run.getAction(SCMRevisionAction.class); - if (scmRevisionAction == null) { - return List.of(); - } - - List runDetailsItems = new ArrayList<>(); - boolean githubBranchSourceInstalled = Jenkins.get().getPlugin("github-branch-source") != null; - String commit = null; - - if (githubBranchSourceInstalled - && scmRevisionAction - .getRevision() - .getClass() - .getName() - .equals("org.jenkinsci.plugins.github_branch_source.PullRequestSCMRevision")) { - - runDetailsItems.addAll(GitHubBranchSourceRunDetailsItems.getGitInformation(scmRevisionAction)); - commit = GitHubBranchSourceRunDetailsItems.getGitCommit(scmRevisionAction); - - } else if (scmRevisionAction.getRevision() instanceof AbstractGitSCMSource.SCMRevisionImpl revision) { - commit = revision.getHash().substring(0, 7); - } - - if (githubBranchSourceInstalled) { - GitHubBranchSourceRunDetailsItems.getGitHubLink(run).ifPresent(runDetailsItems::add); - } - - if (commit != null) { - runDetailsItems.add( - new RunDetailsItem.RunDetail(new Ionicon("git-commit-outline"), ItemContent.of(commit))); - } - - return runDetailsItems; - } -} diff --git a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java index 2c0de9ed..7d5b9bea 100644 --- a/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java +++ b/src/main/java/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction.java @@ -16,7 +16,6 @@ import io.jenkins.plugins.pipelinegraphview.cards.RunDetailsItem; import io.jenkins.plugins.pipelinegraphview.cards.items.ArtifactRunDetailsItem; import io.jenkins.plugins.pipelinegraphview.cards.items.ChangesRunDetailsItem; -import io.jenkins.plugins.pipelinegraphview.cards.items.SCMRunDetailsItems; import io.jenkins.plugins.pipelinegraphview.cards.items.TestResultRunDetailsItem; import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraph; import io.jenkins.plugins.pipelinegraphview.utils.PipelineGraphApi; @@ -315,7 +314,7 @@ private static long parseIntWithDefault(String s, long defaultValue) { @SuppressWarnings("unused") public List getRunDetailsItems() { - List runDetailsItems = new ArrayList<>(SCMRunDetailsItems.get(run)); + List runDetailsItems = new ArrayList<>(); ChangesRunDetailsItem.get(run).ifPresent(runDetailsItems::add); TestResultRunDetailsItem.get(run).ifPresent(runDetailsItems::add); ArtifactRunDetailsItem.get(run).ifPresent(runDetailsItems::add);