feat: display branch selection in the tree node [IDE-446] #489
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
acke
force-pushed
the
feat/choose_netnet_base_branch
branch
from
2c2bdc7 to
d608822
Compare
acke
changed the title
cat2608
changed the title
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
3 times, most recently
from
8ed8df4 to
fc3a11c
Compare
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
from
fc3a11c to
4307560
Compare
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
from
0d1d525 to
0a7438b
Compare
Comment on lines
64
to
66
| async setBaseBranch(): Promise<void> { | ||
| await this.executeCommand(SNYK_SET_BASE_BRANCH_COMMAND, this.authService.setBaseBranch.bind(this.authService)); | ||
| } |
There was a problem hiding this comment.
this will probably not stay like this, but use a setting
bastiandoetsch
requested changes
Jul 16, 2024
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
2 times, most recently
from
591ecee to
731d15a
Compare
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
from
731d15a to
e82fd27
Compare
cat2608
reviewed
Jul 16, 2024
Comment on lines
+297
to
+300
| if (!nIssues) { | ||
| return '✅ Congrats! No issues found!'; | ||
| } | ||
| return `Snyk found ${nIssues} issue${nIssues === 1 ? '' : 's'}`; |
There was a problem hiding this comment.
Small refactor for consistency. Agreed with Arvid and Neil 🙌
| Before | After |
|---|---|
 |
 |
cat2608
reviewed
Jul 16, 2024
Comment on lines
-313
to
+328
| "when": "view == 'snyk.views.analysis.code.security' || view == 'snyk.views.analysis.code.quality' || view == 'snyk.views.analysis.oss' || view == 'snyk.views.analysis.configuration'", | ||
| "when": "view == 'snyk.views.analysis.code.security' || view == 'snyk.views.analysis.code.security.delta' || view == 'snyk.views.analysis.code.quality' || view == 'snyk.views.analysis.code.quality.delta' || view == 'snyk.views.analysis.oss' || view == 'snyk.views.analysis.configuration'", | ||
| "group": "navigation" | ||
| }, | ||
| { | ||
| "command": "snyk.settings", | ||
| "when": "view == 'snyk.views.analysis.code.security' || view == 'snyk.views.analysis.code.quality' || view == 'snyk.views.analysis.oss' || view == 'snyk.views.welcome' || view == 'snyk.views.analysis.configuration'", | ||
| "when": "view == 'snyk.views.analysis.code.security' || view == 'snyk.views.analysis.code.security.delta' || view == 'snyk.views.analysis.code.quality' || view == 'snyk.views.analysis.code.quality.delta' || view == 'snyk.views.analysis.oss' || view == 'snyk.views.welcome' || view == 'snyk.views.analysis.configuration'", |
There was a problem hiding this comment.
This adds the gear ⚙️ and play
| @@ -42,18 +42,20 @@ export default class CodeSecurityIssueTreeProvider extends IssueTreeProvider { | |||
| protected getIssueFoundText(nIssues: number, ignoredIssueCount: number): string { | |||
| if (nIssues > 0) { | |||
| let text; | |||
|
|
|||
| if (nIssues === 1) { | |||
| text = `${nIssues} vulnerability found by Snyk`; | |||
There was a problem hiding this comment.
Shouldn't this be issues, too?
Suggested change
| text = `${nIssues} vulnerability found by Snyk`; | |
| text = `${nIssues} issue found by Snyk`; |
| @@ -42,18 +42,20 @@ export default class CodeSecurityIssueTreeProvider extends IssueTreeProvider { | |||
| protected getIssueFoundText(nIssues: number, ignoredIssueCount: number): string { | |||
| if (nIssues > 0) { | |||
| let text; | |||
|
|
|||
| if (nIssues === 1) { | |||
| text = `${nIssues} vulnerability found by Snyk`; | |||
| } else { | |||
| text = `✋ ${nIssues} vulnerabilities found by Snyk`; | |||
There was a problem hiding this comment.
Suggested change
| text = `✋ ${nIssues} vulnerabilities found by Snyk`; | |
| text = `✋ ${nIssues} issues found by Snyk`; |
| getBaseBranch(): TreeNode | null { | ||
| const deltaFindingsEnabled = this.configuration.getDeltaFindingsEnabled(); | ||
|
|
||
| //TODO: get the actual base branch from Snyk Language Server |
There was a problem hiding this comment.
This should just ask a config setting, what's the base branch for the folder. LS sends a folderConfig notification for all known workspace folders when they are registered at LS.
bastiandoetsch
approved these changes
Jul 17, 2024
ShawkyZ
approved these changes
Jul 17, 2024
cat2608
force-pushed
the
feat/choose_netnet_base_branch
branch
from
e82fd27 to
ac09779
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
This pr covers the UI parts of selecting a base branch for delta findings. No actually calls to language server for available local branches, or to set the choose branch is a part of this pr.
This PR handles tree view for Security Code and Code Quality depending on the Delta Findings feature flag. When enabled, the title for the tree node shows
Checklist
Screenshots / GIFs
code-and-quality-with-deltas.mp4