Skip to content

fix: new severity icons [IDE-897] #267

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

Merged
merged 6 commits into from
Mar 11, 2025
Merged

fix: new severity icons [IDE-897] #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c8701a0
fix: new severity icons [IDE-897]
acke Mar 10, 2025
98d6f95
fix: fix unable to lookup product
acke Mar 10, 2025
17dfdc7
fix: added new colors for details view
acke Mar 10, 2025
5d947a6
fix: rename icons and handle case with not matching product identifier
acke Mar 11, 2025
ce8ae1d
fix: reverting unneed changes
acke Mar 11, 2025
18f68ef
Merge branch 'main' into fix/IDE-897_new_severity_icons
acke Mar 11, 2025
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
- add option for using a folder as reference instead of a branch in net-new scanning
- add scan summary to custom UI, updating scan statuses live
- added support for DeepCode AI Fixes
- new severity icons

### Fixes
- fixes open & ignored issue filtering toggles
Expand Down
Binary file modified plugin/icons/severity_critical.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugin/icons/severity_high.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugin/icons/severity_low.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified plugin/icons/severity_medium.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 42 additions & 42 deletions plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,46 @@

public final class ProductConstants {

public static final String SCAN_STATE_IN_PROGRESS = "inProgress";
public static final String SCAN_STATE_SUCCESS = "success";
public static final String SCAN_STATE_ERROR = "error";

public static final String SCAN_PARAMS_OSS = "oss";
public static final String SCAN_PARAMS_CODE = "code";
public static final String SCAN_PARAMS_IAC = "iac";

public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source";
public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code";
public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC";

public static final String DISPLAYED_OSS = "Snyk Open Source";
public static final String DISPLAYED_CODE_SECURITY = "Code Security";
public static final String DISPLAYED_CODE_QUALITY = "Code Quality";
public static final String DISPLAYED_IAC = "Configuration";

public static final String SEVERITY_CRITICAL = "critical";
public static final String SEVERITY_HIGH = "high";
public static final String SEVERITY_MEDIUM = "medium";
public static final String SEVERITY_LOW = "low";

public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source";
public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security";
public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality";
public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code";

public static final Map<String, String> FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(
FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY,
FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY,
FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC,
FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS);

public static final Map<String, String> LSP_SOURCE_TO_SCAN_PARAMS = Map.of(
DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE,
DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC,
DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS);

// code cannot be mapped easily
public static final Map<String, String> SCAN_PARAMS_TO_DISPLAYED = Map.of(
SCAN_PARAMS_OSS, DISPLAYED_OSS,
SCAN_PARAMS_IAC, DISPLAYED_IAC);
public static final String SCAN_STATE_IN_PROGRESS = "inProgress";
public static final String SCAN_STATE_SUCCESS = "success";
public static final String SCAN_STATE_ERROR = "error";

public static final String SCAN_PARAMS_OSS = "oss";
public static final String SCAN_PARAMS_CODE = "code";
public static final String SCAN_PARAMS_IAC = "iac";

public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source";
public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code";
public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC";

public static final String DISPLAYED_OSS = "Snyk Open Source";
public static final String DISPLAYED_CODE_SECURITY = "Code Security";
public static final String DISPLAYED_CODE_QUALITY = "Code Quality";
public static final String DISPLAYED_IAC = "Configuration";

public static final String SEVERITY_CRITICAL = "critical";
public static final String SEVERITY_HIGH = "high";
public static final String SEVERITY_MEDIUM = "medium";
public static final String SEVERITY_LOW = "low";

public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source";
public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security";
public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality";
public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code";

public static final Map<String, String> FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(
FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY,
FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY,
FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC,
FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS);

public static final Map<String, String> LSP_SOURCE_TO_SCAN_PARAMS = Map.of(
DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE,
DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC,
DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS);

// code cannot be mapped easily
public static final Map<String, String> SCAN_PARAMS_TO_DISPLAYED = Map.of(
SCAN_PARAMS_OSS, DISPLAYED_OSS,
SCAN_PARAMS_IAC, DISPLAYED_IAC);
}
4 changes: 3 additions & 1 deletion plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ public String replaceCssVariables(String html) {

// Replace CSS variables with actual color values
htmlStyled = htmlStyled.replace("var(--text-color)",
getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR", "#000000"));
getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_SELECTED_TEXT_COLOR", "#000000"));
htmlStyled = htmlStyled.replace("var(--dimmed-text-color)",
getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR", "#4F5456"));

htmlStyled = htmlStyled.replace("var(--ide-background-color)",
getColorAsHex("org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START", "#FFFFFF"));
Expand Down
2 changes: 2 additions & 0 deletions plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ public String replaceCssVariables(String html) {
htmlStyled = htmlStyled.replace("var(--disabled-background-color)",
super.getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_OUTER_KEYLINE_COLOR", "#CCCCCC"));
htmlStyled = htmlStyled.replace("var(--vscode-input-border)", super.getColorAsHex("BUTTON_COLOR", "#375578"));
htmlStyled = htmlStyled.replace("var(--warning-text)", super.getColorAsHex("WARNING_TEXT_COLOR", "#000000"));
htmlStyled = htmlStyled.replace("var(--warning-background)", super.getColorAsHex("WARNING_BACKGROUND_COLOR", "#c8a000"));

String htmlWithScripts = replaceAIFixScripts(htmlStyled);

Expand Down
1 change: 0 additions & 1 deletion plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@
import org.eclipse.ui.menus.CommandContributionItemParameter;
import org.eclipse.ui.part.ViewPart;

import io.snyk.eclipse.plugin.domain.ProductConstants;
import io.snyk.eclipse.plugin.preferences.Preferences;
import io.snyk.eclipse.plugin.properties.FolderConfigs;
import io.snyk.eclipse.plugin.utils.ResourceUtils;
Expand Down