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.

Sign up for GitHub

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

fix: update root node branch name on changing base branch [IDE-841] #641

Merged
merged 2 commits into from
Dec 19, 2024
Merged

fix: update root node branch name on changing base branch [IDE-841] #641

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c37616
fix: update root node branch name on changing base branch
DariusZdroba Dec 17, 2024
8903790
chore: update changelog
DariusZdroba Dec 18, 2024
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
13 changes: 13 additions & 0 deletions src/main/kotlin/io/snyk/plugin/ui/toolwindow/SnykToolWindowPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -552,8 +552,21 @@ class SnykToolWindowPanel(

val newContainerTreeNodeText = getNewContainerTreeNodeText(settings, containerResultsCount, addHMLPostfix)
newContainerTreeNodeText?.let { rootContainerIssuesTreeNode.userObject = it }

val newRootTreeNodeText = getNewRootTreeNodeText()
newRootTreeNodeText.let { rootTreeNode.info = it }
DariusZdroba marked this conversation as resolved.
Show resolved Hide resolved
}

private fun getNewRootTreeNodeText() : String {
val folderConfig = service<FolderConfigSettings>().getFolderConfig(project.basePath.toString())
bastiandoetsch marked this conversation as resolved.
Show resolved Hide resolved
if (folderConfig?.let {
getRootNodeText(
it.folderPath,
it.baseBranch
)
} != null) return folderConfig.let { getRootNodeText(it.folderPath, it.baseBranch) }
return "Choose branch on ${project.basePath}"
}
private fun getNewContainerTreeNodeText(
settings: SnykApplicationSettingsStateService,
containerResultsCount: Int?,
Expand Down
Loading