fix: updated UX to use enabled/disabled icons

acke · acke · commit b82f24cd5e8e · 2024-11-18T10:57:03.000+01:00
diff --git a/plugin/icons/transparent.png b/plugin/icons/transparent.png
diff --git a/plugin/plugin.xml b/plugin/plugin.xml
@@ -249,7 +249,7 @@
             locationURI="menu:io.snyk.eclipse.plugin.views.snyktoolview">
             <menu
                 id="io.snyk.eclipse.plugin.views.snyktoolview.filtersMenu"
-                label="Filter Issues">
+                label="Fixablility">
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykFilterFixableIssues"
                     icon="icons/enabled.png"
@@ -259,89 +259,97 @@
             </menu>
             <menu
                 id="io.snyk.eclipse.plugin.views.snyktoolview.filterSeverityMenu"
-                label="Filter Severity">
+                label="Severity">
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykFilterCritical"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/severity-critical.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Critical Severity">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykFilterHigh"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/severity-high.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="High Severity">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykFilterMedium"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/severity-medium.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Medium Severity">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykFilterLow"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/severity-low.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Low Severity">
                 </command>
+                <separator
+                      name="io.snyk.eclipse.plugin.separator.allSeverities"
+                      visible="true">
+                </separator>
             </menu>
             <menu
                 id="io.snyk.eclipse.plugin.views.snyktoolview.filterProductTypeMenu"
-                label="Filter Product Type">
+                label="Snyk Product">
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.enableOSS"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/oss.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Enable/disable OSS scans">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.enableCodeSecurity"
-                    icon="icons/code.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Enable/disable Code scans">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.enableCodeQuality"
-                    icon="icons/code.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Enable/disable Code scans">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.enableIAC"
-                    icon="platform:/plugin/io.snyk.eclipse.plugin/icons/iac.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Enable/disable IAC scans">
                 </command>
+                <separator
+                      name="io.snyk.eclipse.plugin.separator.allProducts"
+                      visible="true">
+                </separator>
             </menu>
             <menu
                 id="io.snyk.eclipse.plugin.views.snyktoolview.filterIgnoreMenu"
-                label="Filter Ignores">
+                label="Issues Status">
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykHideIgnored"
-                    icon="platform:/plugin/org.eclipse.jdt.ui/icons/full/elcl16/hide_ignored.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Hide Ignored">
                 </command>
                 <command
                     commandId="io.snyk.eclipse.plugin.commands.snykShowIgnored"
-                    icon="platform:/plugin/org.eclipse.jdt.ui/icons/full/obj16/ignore.png"
+                    icon="icons/enabled.png"
                     style="push"
                     tooltip="Show Ignored">
                 </command>
-            </menu>
-            <menu
-                id="io.snyk.eclipse.plugin.views.snyktoolview.filterDeltaMenu"
-                label="Filter Net New Issues">
                 <command
-                    commandId="io.snyk.eclipse.plugin.commands.snykFilterAllIssues"
-                    style="push"
-                    tooltip="Show All Issues">
+                      commandId="io.snyk.eclipse.plugin.commands.snykFilterAllIssues"
+                      style="push"
+                      tooltip="Show All Issues">
                 </command>
                 <command
-                    commandId="io.snyk.eclipse.plugin.commands.snykFilterNetNewIssues"
-                    style="push"
-                    tooltip="Show Only Net New Issues">
+                      commandId="io.snyk.eclipse.plugin.commands.snykFilterNetNewIssues"
+                      icon="icons/enabled.png"
+                      style="push"
+                      tooltip="Show Only Net New Issues">
                 </command>
+                <separator
+                      name="io.snyk.eclipse.plugin.separator.allIssues">
+                </separator>
             </menu>
         </menuContribution>
         <menuContribution
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java b/plugin/src/main/java/io/snyk/eclipse/plugin/utils/SnykIcons.java
@@ -24,6 +24,7 @@ public class SnykIcons {
     public static final ImageDescriptor SEVERITY_LOW = imageProvider.getImageDescriptor("/icons/severity-low.png");
 
     public static final ImageDescriptor ENABLED = imageProvider.getImageDescriptor("/icons/enabled.png");
+    public static final ImageDescriptor DISABLED = imageProvider.getImageDescriptor("/icons/transparent.png");
 
     // You can add a method to set a custom ImageDescriptorProvider if needed
     public static void setImageDescriptorProvider(ImageDescriptorProvider provider) {
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableCodeQualityProductHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableCodeQualityProductHandler.java
@@ -10,8 +10,8 @@ public class EnableCodeQualityProductHandler extends BaseHandler implements IEle
 	public EnableCodeQualityProductHandler() {
 		super();
 
-		iconEnabled = SnykIcons.CODE;
-		iconDisabled = SnykIcons.CODE_DISABLED;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.ACTIVATE_SNYK_CODE_QUALITY;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableCodeSecurityProductHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableCodeSecurityProductHandler.java
@@ -10,8 +10,8 @@ public class EnableCodeSecurityProductHandler extends BaseHandler implements IEl
 	public EnableCodeSecurityProductHandler() {
 		super();
 
-		iconEnabled = SnykIcons.CODE;
-		iconDisabled = SnykIcons.CODE_DISABLED;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.ACTIVATE_SNYK_CODE_SECURITY;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableIacProductHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableIacProductHandler.java
@@ -10,8 +10,8 @@ public class EnableIacProductHandler extends BaseHandler implements IElementUpda
 	public EnableIacProductHandler() {
 		super();
 
-		iconEnabled = SnykIcons.IAC;
-		iconDisabled = SnykIcons.IAC_DISABLED;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.ACTIVATE_SNYK_IAC;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableOssProductHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/EnableOssProductHandler.java
@@ -10,8 +10,8 @@ public class EnableOssProductHandler extends BaseHandler implements IElementUpda
 	public EnableOssProductHandler() {
 		super();
 
-		iconEnabled = SnykIcons.OSS;
-		iconDisabled = SnykIcons.OSS_DISABLED;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.ACTIVATE_SNYK_OPEN_SOURCE;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterCriticalHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterCriticalHandler.java
@@ -10,8 +10,8 @@ public class FilterCriticalHandler extends BaseHandler implements IElementUpdate
 	public FilterCriticalHandler() {
 		super();
 
-		iconEnabled = SnykIcons.SEVERITY_CRITICAL;
-		iconDisabled = SnykIcons.SEVERITY_CRITICAL;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_CRITICAL;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterDeltaAllIssuesHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterDeltaAllIssuesHandler.java
@@ -11,6 +11,7 @@ public FilterDeltaAllIssuesHandler() {
 		super();
 
 		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_DELTA_ALL_ISSUES;
 
 		// TODO remove filter that only show the issues on local branch
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterDeltaNewIssuesHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterDeltaNewIssuesHandler.java
@@ -11,6 +11,7 @@ public FilterDeltaNewIssuesHandler() {
 		super();
 
 		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_DELTA_NEW_ISSUES;
 
 		// TODO filter to only show the issues on local branch
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterHighHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterHighHandler.java
@@ -10,8 +10,8 @@ public class FilterHighHandler extends BaseHandler implements IElementUpdater {
 	public FilterHighHandler() {
 		super();
 
-		iconEnabled = SnykIcons.SEVERITY_HIGH;
-		iconDisabled = SnykIcons.SEVERITY_HIGH;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_HIGH;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresIgnoredIssuesHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresIgnoredIssuesHandler.java
@@ -11,6 +11,7 @@ public FilterIgnoresIgnoredIssuesHandler() {
 		super();
 
 		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_IGNORES_IGNORED_ISSUES;
 	}
 }
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresOpenIssuesHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresOpenIssuesHandler.java
@@ -11,6 +11,7 @@ public FilterIgnoresOpenIssuesHandler() {
 		super();
 
 		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_IGNORES_OPEN_ISSUES;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterLowHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterLowHandler.java
@@ -10,8 +10,8 @@ public class FilterLowHandler extends BaseHandler implements IElementUpdater {
 	public FilterLowHandler() {
 		super();
 
-		iconEnabled = SnykIcons.SEVERITY_LOW;
-		iconDisabled = SnykIcons.SEVERITY_LOW;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_LOW;
 	}
 
diff --git a/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterMediumHandler.java b/plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterMediumHandler.java
@@ -10,8 +10,8 @@ public class FilterMediumHandler extends BaseHandler implements IElementUpdater
 	public FilterMediumHandler() {
 		super();
 
-		iconEnabled = SnykIcons.SEVERITY_MEDIUM;
-		iconDisabled = SnykIcons.SEVERITY_MEDIUM;
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
 		preferenceKey = Preferences.FILTER_MEDIUM;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class EnableCodeQualityProductHandler extends BaseHandler implements IEle`
`10`	`10`	`public EnableCodeQualityProductHandler() {`
`11`	`11`	`super();`
`12`	`12`
`13`		`- iconEnabled = SnykIcons.CODE;`
`14`		`- iconDisabled = SnykIcons.CODE_DISABLED;`
	`13`	`+ iconEnabled = SnykIcons.ENABLED;`
	`14`	`+ iconDisabled = SnykIcons.DISABLED;`
`15`	`15`	`preferenceKey = Preferences.ACTIVATE_SNYK_CODE_QUALITY;`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class EnableIacProductHandler extends BaseHandler implements IElementUpda`
`10`	`10`	`public EnableIacProductHandler() {`
`11`	`11`	`super();`
`12`	`12`
`13`		`- iconEnabled = SnykIcons.IAC;`
`14`		`- iconDisabled = SnykIcons.IAC_DISABLED;`
	`13`	`+ iconEnabled = SnykIcons.ENABLED;`
	`14`	`+ iconDisabled = SnykIcons.DISABLED;`
`15`	`15`	`preferenceKey = Preferences.ACTIVATE_SNYK_IAC;`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class EnableOssProductHandler extends BaseHandler implements IElementUpda`
`10`	`10`	`public EnableOssProductHandler() {`
`11`	`11`	`super();`
`12`	`12`
`13`		`- iconEnabled = SnykIcons.OSS;`
`14`		`- iconDisabled = SnykIcons.OSS_DISABLED;`
	`13`	`+ iconEnabled = SnykIcons.ENABLED;`
	`14`	`+ iconDisabled = SnykIcons.DISABLED;`
`15`	`15`	`preferenceKey = Preferences.ACTIVATE_SNYK_OPEN_SOURCE;`
`16`	`16`	`}`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,8 @@ public class FilterCriticalHandler extends BaseHandler implements IElementUpdate`
`10`	`10`	`public FilterCriticalHandler() {`
`11`	`11`	`super();`
`12`	`12`
`13`		`- iconEnabled = SnykIcons.SEVERITY_CRITICAL;`
`14`		`- iconDisabled = SnykIcons.SEVERITY_CRITICAL;`
	`13`	`+ iconEnabled = SnykIcons.ENABLED;`
	`14`	`+ iconDisabled = SnykIcons.DISABLED;`
`15`	`15`	`preferenceKey = Preferences.FILTER_CRITICAL;`
`16`	`16`	`}`
`17`	`17`