Skip to content

Commit e95fd35

Browse files
ackeacke
authored
Merge pull request #267 from snyk/fix/IDE-897_new_severity_icons
fix: new severity icons [IDE-897]
2 parents 5745769 + 18f68ef commit e95fd35

File tree

9 files changed

+48
-44
lines changed

9 files changed

+48
-44
lines changed

‎CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- add option for using a folder as reference instead of a branch in net-new scanning
66
- add scan summary to custom UI, updating scan statuses live
77
- added support for DeepCode AI Fixes
8+
- new severity icons
89

910
### Fixes
1011
- fixes open & ignored issue filtering toggles

‎plugin/icons/severity_critical.png

-468 Bytes
Loading

‎plugin/icons/severity_high.png

352 Bytes
Loading

‎plugin/icons/severity_low.png

295 Bytes
Loading

‎plugin/icons/severity_medium.png

323 Bytes
Loading

‎plugin/src/main/java/io/snyk/eclipse/plugin/domain/ProductConstants.java

+42-42
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,46 @@
44

55
public final class ProductConstants {
66

7-
public static final String SCAN_STATE_IN_PROGRESS = "inProgress";
8-
public static final String SCAN_STATE_SUCCESS = "success";
9-
public static final String SCAN_STATE_ERROR = "error";
10-
11-
public static final String SCAN_PARAMS_OSS = "oss";
12-
public static final String SCAN_PARAMS_CODE = "code";
13-
public static final String SCAN_PARAMS_IAC = "iac";
14-
15-
public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source";
16-
public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code";
17-
public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC";
18-
19-
public static final String DISPLAYED_OSS = "Snyk Open Source";
20-
public static final String DISPLAYED_CODE_SECURITY = "Code Security";
21-
public static final String DISPLAYED_CODE_QUALITY = "Code Quality";
22-
public static final String DISPLAYED_IAC = "Configuration";
23-
24-
public static final String SEVERITY_CRITICAL = "critical";
25-
public static final String SEVERITY_HIGH = "high";
26-
public static final String SEVERITY_MEDIUM = "medium";
27-
public static final String SEVERITY_LOW = "low";
28-
29-
public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source";
30-
public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security";
31-
public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality";
32-
public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code";
33-
34-
public static final Map<String, String> FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(
35-
FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY,
36-
FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY,
37-
FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC,
38-
FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS);
39-
40-
public static final Map<String, String> LSP_SOURCE_TO_SCAN_PARAMS = Map.of(
41-
DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE,
42-
DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC,
43-
DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS);
44-
45-
// code cannot be mapped easily
46-
public static final Map<String, String> SCAN_PARAMS_TO_DISPLAYED = Map.of(
47-
SCAN_PARAMS_OSS, DISPLAYED_OSS,
48-
SCAN_PARAMS_IAC, DISPLAYED_IAC);
7+
public static final String SCAN_STATE_IN_PROGRESS = "inProgress";
8+
public static final String SCAN_STATE_SUCCESS = "success";
9+
public static final String SCAN_STATE_ERROR = "error";
10+
11+
public static final String SCAN_PARAMS_OSS = "oss";
12+
public static final String SCAN_PARAMS_CODE = "code";
13+
public static final String SCAN_PARAMS_IAC = "iac";
14+
15+
public static final String DIAGNOSTIC_SOURCE_SNYK_OSS = "Snyk Open Source";
16+
public static final String DIAGNOSTIC_SOURCE_SNYK_CODE = "Snyk Code";
17+
public static final String DIAGNOSTIC_SOURCE_SNYK_IAC = "Snyk IaC";
18+
19+
public static final String DISPLAYED_OSS = "Snyk Open Source";
20+
public static final String DISPLAYED_CODE_SECURITY = "Code Security";
21+
public static final String DISPLAYED_CODE_QUALITY = "Code Quality";
22+
public static final String DISPLAYED_IAC = "Configuration";
23+
24+
public static final String SEVERITY_CRITICAL = "critical";
25+
public static final String SEVERITY_HIGH = "high";
26+
public static final String SEVERITY_MEDIUM = "medium";
27+
public static final String SEVERITY_LOW = "low";
28+
29+
public static final String FILTERABLE_ISSUE_OPEN_SOURCE = "Open Source";
30+
public static final String FILTERABLE_ISSUE_CODE_SECURITY = "Code Security";
31+
public static final String FILTERABLE_ISSUE_CODE_QUALITY = "Code Quality";
32+
public static final String FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE = "Infrastructure As Code";
33+
34+
public static final Map<String, String> FILTERABLE_ISSUE_TYPE_TO_DISPLAY = Map.of(
35+
FILTERABLE_ISSUE_CODE_QUALITY, DISPLAYED_CODE_QUALITY,
36+
FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY,
37+
FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC,
38+
FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS);
39+
40+
public static final Map<String, String> LSP_SOURCE_TO_SCAN_PARAMS = Map.of(
41+
DIAGNOSTIC_SOURCE_SNYK_CODE, SCAN_PARAMS_CODE,
42+
DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC,
43+
DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS);
44+
45+
// code cannot be mapped easily
46+
public static final Map<String, String> SCAN_PARAMS_TO_DISPLAYED = Map.of(
47+
SCAN_PARAMS_OSS, DISPLAYED_OSS,
48+
SCAN_PARAMS_IAC, DISPLAYED_IAC);
4949
}

‎plugin/src/main/java/io/snyk/eclipse/plugin/html/BaseHtmlProvider.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,9 @@ public String replaceCssVariables(String html) {
107107

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

112114
htmlStyled = htmlStyled.replace("var(--ide-background-color)",
113115
getColorAsHex("org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START", "#FFFFFF"));

‎plugin/src/main/java/io/snyk/eclipse/plugin/html/CodeHtmlProvider.java

+2
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ public String replaceCssVariables(String html) {
7272
htmlStyled = htmlStyled.replace("var(--disabled-background-color)",
7373
super.getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_OUTER_KEYLINE_COLOR", "#CCCCCC"));
7474
htmlStyled = htmlStyled.replace("var(--vscode-input-border)", super.getColorAsHex("BUTTON_COLOR", "#375578"));
75+
htmlStyled = htmlStyled.replace("var(--warning-text)", super.getColorAsHex("WARNING_TEXT_COLOR", "#000000"));
76+
htmlStyled = htmlStyled.replace("var(--warning-background)", super.getColorAsHex("WARNING_BACKGROUND_COLOR", "#c8a000"));
7577

7678
String htmlWithScripts = replaceAIFixScripts(htmlStyled);
7779

‎plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/SnykToolView.java

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
import org.eclipse.ui.menus.CommandContributionItemParameter;
4444
import org.eclipse.ui.part.ViewPart;
4545

46-
import io.snyk.eclipse.plugin.domain.ProductConstants;
4746
import io.snyk.eclipse.plugin.preferences.Preferences;
4847
import io.snyk.eclipse.plugin.properties.FolderConfigs;
4948
import io.snyk.eclipse.plugin.utils.ResourceUtils;

0 commit comments

Comments
 (0)