Skip to content

Commit c6186cd

Browse files
authored
chore: update org settings text [IDE-1503] (#743)
1 parent fe146c5 commit c6186cd

3 files changed

Lines changed: 22 additions & 5 deletions

File tree

src/main/kotlin/io/snyk/plugin/ui/SnykSettingsDialog.kt

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -464,11 +464,24 @@ class SnykSettingsDialog(
464464
issueViewPanel.border = IdeBorderFactory.createTitledBorder("Issue View Options")
465465

466466
val issueViewLabel = JLabel("Show the following issues:")
467-
issueViewLabel.toolTipText = "Code Consistent Ignores is a feature" +
468-
" which provides consistent handling of \"ignore\" rules" +
469-
" for code security findings across all surfaces - such as the CLI, IDE, and Snyk UI"
467+
468+
val issueViewContextHelpLabel =
469+
ContextHelpLabel.createWithLink(
470+
null,
471+
SnykBundle.message("snyk.settings.issueViewOptions.tooltip.description"),
472+
SnykBundle.message("snyk.settings.issueViewOptions.tooltip.linkText"),
473+
) {
474+
BrowserUtil.browse(SnykBundle.message("snyk.settings.issueViewOptions.tooltip.link"))
475+
}
476+
477+
val issueViewLabelPanel = JPanel(GridBagLayout()).apply {
478+
val gb = GridBag().setDefaultWeightX(0.0).setDefaultFill(GridBagConstraints.NONE).setDefaultInsets(JBUI.emptyInsets())
479+
add(issueViewLabel, gb.nextLine().next())
480+
add(issueViewContextHelpLabel, gb.next().insets(JBUI.insetsLeft(2)))
481+
}
482+
470483
issueViewPanel.add(
471-
issueViewLabel,
484+
issueViewLabelPanel,
472485
baseGridConstraintsAnchorWest(
473486
row = 0,
474487
indent = 0,

src/main/kotlin/snyk/common/ProductType.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ enum class ProductType(
2424
CODE_SECURITY(
2525
productSelectionName = "Snyk Code Security",
2626
treeName = "Code Security",
27-
description = "Find and fix vulnerabilities in your application code in real time"
27+
description = "Find and fix vulnerabilities in your application code in real time. For these scans to run, Snyk Code must be enabled for your organization in Snyk settings."
2828
) {
2929
override fun getCountText(count: Int, isUniqueCount: Boolean): String =
3030
getVulnerabilitiesCountText(count, isUniqueCount)

src/main/resources/SnykBundle.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ snyk.settings.preferredOrg.tooltip.description=<p>[Experimental] Specify the org
1212
snyk.settings.preferredOrg.tooltip.linkText=Web Account Settings
1313
snyk.settings.preferredOrg.tooltip.link=https://app.snyk.io/account
1414
15+
snyk.settings.issueViewOptions.tooltip.description=<p>Code Consistent Ignores helps your teams focus on important tasks by filtering out distractions. It ensures that once an ignore is created, it is consistently respected regardless of how and where the test is run and what branch is being tested.</p><p>Note: These filters will have no effect if Code Consistent Ignores is disabled for the organization.</p>
16+
snyk.settings.issueViewOptions.tooltip.linkText=Learn more
17+
snyk.settings.issueViewOptions.tooltip.link=https://docs.snyk.io/manage-risk/prioritize-issues-for-fixing/ignore-issues/consistent-ignores-for-snyk-code
18+
1519
snyk.trust.dialog.warning.button.distrust=Don't scan
1620
snyk.trust.dialog.warning.button.trust=Trust project and continue
1721
snyk.trust.dialog.warning.text=When scanning project files for vulnerabilities, Snyk may automatically execute code such as invoking the package manager to get dependency information.<br><br>You should only scan projects you trust.<br><br><a href="https://docs.snyk.io/ide-tools/jetbrains-plugins/folder-trust">More info</a>

0 commit comments

Comments
 (0)