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

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

Merged
merged 2 commits into from
Dec 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
### Fixed
- folder-specific configs are availabe on opening projects, not only on restart of the IDE
- display open source issues in Rider. Previously, as the project.assets.json is in a derived folder, it was filtered.
- correctly display and update base branch name for Net New Issues
## [2.10.0]
### Changed
- save git folder config in settings
Expand Down
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