fix: move filtering ignored issues to the LS [IDE-899] (#278)

Including updating the wording for issues found summaries since we now won't always know the count of open & ignored issues.

Author: rrama

plugin/src/main/java/io/snyk/eclipse/plugin/properties/IssueViewOptions.java

@@ -0,0 +1,3 @@
+package io.snyk.eclipse.plugin.properties;
+
+public record IssueViewOptions(boolean openIssues, boolean ignoredIssues) {}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/ISnykToolView.java

@@ -11,49 +11,53 @@
  */
 public interface ISnykToolView {
 	String CONGRATS_NO_ISSUES_FOUND = "✅ Congrats! No issues found!";
+	String CONGRATS_NO_OPEN_ISSUES_FOUND = "✅ Congrats! No open issues found!";
+	String OPEN_ISSUES_ARE_DISABLED = "Open issues are disabled!";
+	String NO_IGNORED_ISSUES = "✋ No ignored issues, open issues are disabled";
+	String OPEN_AND_IGNORED_ISSUES_ARE_DISABLED = "Open and Ignored issues are disabled!";
 	String NO_FIXABLE_ISSUES = "There are no issues automatically fixable.";
-	String IGNORED_ISSUES_FILTERED_BUT_AVAILABLE = "Adjust your Issue View Options to see ignored issues.";
-	String OPEN_ISSUES_FILTERED_BUT_AVAILABLE = "Adjust your Issue View Options to see open issues.";
+	String IGNORED_ISSUES_FILTERED_BUT_AVAILABLE = "Adjust your settings to view Ignored issues.";
+	String OPEN_ISSUES_FILTERED_BUT_AVAILABLE = "Adjust your settings to view Open issues.";
+	String ALL_ISSUES_FILTERED_BUT_AVAILABLE = "Adjust your settings to view Open or Ignored issues.";
 
 	String NODE_TEXT_SCANNING = "Scanning...";
-	String NODE_TEXT_NO_ISSUES_FOUND = "No issues found";
 	String NODE_TEXT_ERROR = "An error occurred";
 
 	/**
 	 * Updates the text of the given node
-	 * 
+	 *
 	 * @param node
 	 * @param text
 	 */
 	abstract void setNodeText(BaseTreeNode node, String text);
 
 	/**
 	 * Adds an issue node to the parent (usually a file node)
-	 * 
+	 *
 	 * @param parent
 	 * @param toBeAdded
 	 */
 	abstract void addIssueNode(FileTreeNode parent, IssueTreeNode toBeAdded);
 
 	/**
 	 * Adds a file node (usually below the product node)
-	 * 
+	 *
 	 * @param parent
 	 * @param toBeAdded
 	 */
 	abstract void addFileNode(ProductTreeNode parent, FileTreeNode toBeAdded);
 
 	/**
 	 * Adds an info node (usually below the product node)
-	 * 
+	 *
 	 * @param parent
 	 * @param toBeAdded
 	 */
 	abstract void addInfoNode(ProductTreeNode parent, InfoTreeNode toBeAdded);
 
 	/**
 	 * Returns the product node
-	 * 
+	 *
 	 * @param product    the product. ProductConstants#DISPLAY_
 	 * @param folderPath TODO*
 	 * @return
@@ -67,7 +71,7 @@ public interface ISnykToolView {
 
 	/**
 	 * Remove all info nodes from the product tree node
-	 * 
+	 *
 	 * @param node
 	 */
 	abstract void removeInfoNodes(ProductTreeNode node);
@@ -94,41 +98,37 @@ public interface ISnykToolView {
 
 	/**
 	 * Returns the tree root
-	 * 
+	 *
 	 * @return
 	 */
 	abstract BaseTreeNode getRoot();
 
 	/**
 	 * Clears all nodes in the tree
-	 * 
+	 *
 	 * @return
 	 */
 	abstract void clearTree();
 
-	static String getPlural(long count) {
-		return count > 1 ? "s" : "";
-	}
-
 	abstract TreeViewer getTreeViewer();
 
 	/**
 	 * Hides or shows the Ignore buttons.
-	 * 
+	 *
 	 * @return
 	 */
 	abstract void toggleIgnoresButtons();
 
 	/**
 	 * Enables the net new issues scans.
-	 * 
+	 *
 	 * @return
 	 */
 	abstract void enableDelta();
 
 	/**
 	 * Disable the net new issues scans.
-	 * 
+	 *
 	 * @return
 	 */
 	abstract void disableDelta();

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/TreeFilterManager.java

@@ -15,8 +15,6 @@
 
 import io.snyk.eclipse.plugin.SnykStartup;
 import io.snyk.eclipse.plugin.views.snyktoolview.filters.FixableFilter;
-import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresIgnoredIssuesFilter;
-import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresOpenIssuesFilter;
 import io.snyk.eclipse.plugin.views.snyktoolview.filters.ProductFilter;
 import io.snyk.eclipse.plugin.views.snyktoolview.filters.SeverityFilter;
 import io.snyk.languageserver.protocolextension.messageObjects.scanResults.Issue;
@@ -49,10 +47,6 @@ private void setupFilters(TreeFilterManager tfm) {
 		new ProductFilter(tfm, ACTIVATE_SNYK_CODE_SECURITY).applyFilter();
 		new ProductFilter(tfm, ACTIVATE_SNYK_CODE_QUALITY).applyFilter();
 
-		// Ignores filters
-		new IgnoresIgnoredIssuesFilter(tfm).applyFilter();
-		new IgnoresOpenIssuesFilter(tfm).applyFilter();
-
 		// Fix
 		new FixableFilter(tfm).applyFilter();
 	}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/IgnoresIgnoredIssuesFilter.java

@@ -5,8 +5,7 @@
 import org.eclipse.ui.commands.IElementUpdater;
 
 import io.snyk.eclipse.plugin.preferences.Preferences;
-import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager;
-import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresIgnoredIssuesFilter;
+import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
 public class FilterIgnoresIgnoredIssuesHandler extends BaseHandler implements IElementUpdater {
 
@@ -19,7 +18,7 @@ public FilterIgnoresIgnoredIssuesHandler() {
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		super.execute(event);
 
-		new IgnoresIgnoredIssuesFilter(TreeFilterManager.getInstance()).applyFilter();
+		SnykExtendedLanguageClient.getInstance().updateConfiguration();
 
 		return null;
 	}

plugin/src/main/java/io/snyk/eclipse/plugin/views/snyktoolview/filters/IgnoresOpenIssuesFilter.java

@@ -5,8 +5,7 @@
 import org.eclipse.ui.commands.IElementUpdater;
 
 import io.snyk.eclipse.plugin.preferences.Preferences;
-import io.snyk.eclipse.plugin.views.snyktoolview.TreeFilterManager;
-import io.snyk.eclipse.plugin.views.snyktoolview.filters.IgnoresOpenIssuesFilter;
+import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 
 public class FilterIgnoresOpenIssuesHandler extends BaseHandler implements IElementUpdater {
 
@@ -19,7 +18,7 @@ public FilterIgnoresOpenIssuesHandler() {
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		super.execute(event);
 
-		new IgnoresOpenIssuesFilter(TreeFilterManager.getInstance()).applyFilter();
+		SnykExtendedLanguageClient.getInstance().updateConfiguration();
 
 		return null;
 	}

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

@@ -11,6 +11,7 @@
 import io.snyk.eclipse.plugin.Activator;
 import io.snyk.eclipse.plugin.preferences.Preferences;
 import io.snyk.eclipse.plugin.properties.FolderConfigs;
+import io.snyk.eclipse.plugin.properties.IssueViewOptions;
 import io.snyk.languageserver.download.LsBinaries;
 import io.snyk.languageserver.protocolextension.SnykExtendedLanguageClient;
 import io.snyk.languageserver.protocolextension.messageObjects.FolderConfig;
@@ -42,6 +43,10 @@ Settings getCurrentSettings() {
 		String additionalParams = preferences.getPref(Preferences.ADDITIONAL_PARAMETERS, "");
 		String additionalEnv = preferences.getPref(Preferences.ADDITIONAL_ENVIRONMENT, "");
 		String path = preferences.getPref(Preferences.PATH_KEY, "");
+		IssueViewOptions issueViewOptions = new IssueViewOptions(
+				preferences.getBooleanPref(Preferences.FILTER_IGNORES_SHOW_OPEN_ISSUES, true),
+				preferences.getBooleanPref(Preferences.FILTER_IGNORES_SHOW_IGNORED_ISSUES, false)
+				);
 		String sendErrorReports = preferences.getPref(Preferences.SEND_ERROR_REPORTS, "");
 		String enableTelemetry = preferences.getPref(Preferences.ENABLE_TELEMETRY, Boolean.FALSE.toString());
 		String organization = preferences.getPref(Preferences.ORGANIZATION_KEY, "");
@@ -73,7 +78,7 @@ Settings getCurrentSettings() {
 		}
 
 		return new Settings(activateSnykOpenSource, activateSnykCodeSecurity, activateSnykCodeQuality, activateSnykIac,
-				insecure, endpoint, additionalParams, additionalEnv, path, sendErrorReports, enableTelemetry,
+				insecure, endpoint, additionalParams, additionalEnv, path, issueViewOptions, sendErrorReports, enableTelemetry,
 				organization, manageBinariesAutomatically, cliPath, token, integrationName, integrationVersion,
 				automaticAuthentication, trustedFolders, enableTrustedFolderFeature, scanningMode, enableDeltaFindings,
 				authMethod, folderConfigs);
@@ -90,6 +95,7 @@ static class Settings {
 		private final String additionalParams;
 		private final String additionalEnv;
 		private final String path;
+		private final IssueViewOptions issueViewOptions;
 		private final String sendErrorReports;
 		private final String enableTelemetry;
 		private final String organization;
@@ -113,7 +119,7 @@ static class Settings {
 
 		public Settings(String activateSnykOpenSource, String activateSnykCodeSecurity, String activateSnykCodeQuality,
 				String activateSnykIac, String insecure, String endpoint, String additionalParams, String additionalEnv,
-				String path, String sendErrorReports, String enableTelemetry, String organization,
+				String path, IssueViewOptions issueViewOptions, String sendErrorReports, String enableTelemetry, String organization,
 				String manageBinariesAutomatically, String cliPath, String token, String integrationName,
 				String integrationVersion, String automaticAuthentication, String[] trustedFolders,
 				String enableTrustedFoldersFeature, String scanningMode, String enableDeltaFindings, String authMethod,List<FolderConfig>folderConfigs) {
@@ -126,6 +132,7 @@ public Settings(String activateSnykOpenSource, String activateSnykCodeSecurity,
 			this.additionalParams = additionalParams;
 			this.additionalEnv = additionalEnv;
 			this.path = path;
+			this.issueViewOptions = issueViewOptions;
 			this.sendErrorReports = sendErrorReports;
 			this.enableTelemetry = enableTelemetry;
 			this.organization = organization;
@@ -179,6 +186,10 @@ public String getAdditionalEnv() {
 			return additionalEnv;
 		}
 
+		public IssueViewOptions getIssueViewOptions() {
+			return this.issueViewOptions;
+		}
+
 		public String getSendErrorReports() {
 			return this.sendErrorReports;
 		}