Merge branch 'main' into feat/IDE-715_filter-tree

Author: acke

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterCriticalHandler.java

@@ -29,4 +29,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
 	}
 
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterHighHandler.java

@@ -28,4 +28,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
 	}
 
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresIgnoredIssuesHandler.java

@@ -27,4 +27,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterIgnoresOpenIssuesHandler.java

@@ -29,4 +29,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 
 		return null;
 	}
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterLowHandler.java

@@ -28,4 +28,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
 	}
 
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/FilterMediumHandler.java

@@ -29,4 +29,3 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
 		return null;
 	}
 
-}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/handlers/snykFilterFixableIssuesHandler.java

@@ -0,0 +1,82 @@
+package io.snyk.eclipse.plugin.views.snyktoolview.handlers;
+
+import org.eclipse.core.commands.ExecutionEvent;
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.commands.ICommandService;
+import org.eclipse.ui.commands.IElementUpdater;
+
+import io.snyk.eclipse.plugin.SnykStartup;
+import io.snyk.eclipse.plugin.properties.preferences.Preferences;
+import io.snyk.eclipse.plugin.utils.SnykIcons;
+import io.snyk.eclipse.plugin.views.snyktoolview.TreeViewerFilter;
+
+public class snykFilterFixableIssuesHandler extends BaseHandler implements IElementUpdater {
+
+	public snykFilterFixableIssuesHandler() {
+		super();
+
+		iconEnabled = SnykIcons.ENABLED;
+		iconDisabled = SnykIcons.DISABLED;
+		preferenceKey = Preferences.FILTER_FIXABLE_ISSUES;
+	}
+
+	@Override
+	public Object execute(ExecutionEvent event) throws ExecutionException {
+
+		TreeViewer treeView = SnykStartup.getView().getTreeViewer();
+		TreeViewerFilter filter = new TreeViewerFilter();
+
+		filter.addSearchText("⚡"); // Ai Fix filter flash string
+
+		// TODO remove these search strings and make sure we just filter out items of
+		// the correct node type in our TreeViewerFilter.select() function.
+		filter.addSearchText("Open Source");
+		filter.addSearchText("Code");
+		filter.addSearchText("Configuration");
+
+		// TODO Add the correct filter strings here when we have items in the treeview.
+		// The fixable states open source issues can have are one of: Fixable,
+		// Partially Fixable, No Supported Fix, Any Fixability Level
+		// filter.addSearchText(""); // OSS Upgradable filter string
+
+		filter.setMatchAll(false);
+
+		boolean booleanPref = Preferences.getInstance().getBooleanPref(preferenceKey);
+		if (booleanPref) {
+			applyTreeFilter(treeView, filter);
+		} else {
+			removeTreeFilter(treeView);
+		}
+
+		// Update the application state for the preference.
+		Preferences.getInstance().store(preferenceKey, Boolean.valueOf(!booleanPref).toString());
+
+		// Lastly update the UI.
+		String commandId = event.getCommand().getId();
+		ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class);
+		if (commandService != null) {
+			commandService.refreshElements(commandId, null);
+		}
+
+		return null;
+	}
+
+	private void removeTreeFilter(TreeViewer treeView) {
+		treeView.resetFilters();
+		updateTree(treeView);
+	}
+
+	private void applyTreeFilter(TreeViewer treeView, TreeViewerFilter filter) {
+		treeView.addFilter(filter);
+		updateTree(treeView);
+	}
+
+	private void updateTree(TreeViewer treeView) {
+		treeView.getControl().setRedraw(false);
+		treeView.refresh();
+		treeView.getControl().setRedraw(true);
+	}
+
+}

tests/src/test/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClientTest.java

@@ -202,6 +202,11 @@ void testPublishDiagnosticsShouldChangeCache() {
 			future.get(10, TimeUnit.SECONDS);
 		} catch (Exception ex) {
 
+		Collection<Issue> actualIssueList = null;
+		if (issue.additionalData().isSecurityType()) {
+			actualIssueList = issueCache.getCodeSecurityIssuesForPath(filePath);
+		} else {
+			actualIssueList = issueCache.getCodeQualityIssuesForPath(filePath);
 		}
 
 		Collection<Issue> actualIssueList = null;