fix: refactor the browserFunctions to enableDelta

Author: acke

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

@@ -94,13 +94,6 @@ public String getNoDescriptionHtml() {
 		return html;
 	}
 
-	public String replaceCssVariablesAndScript(String html, String ideScript) {
-		html = replaceCssVariables(html);
-		html = html.replace("${ideScript}", ideScript);
-
-		return html;
-	}
-
 	public String replaceCssVariables(String html) {
 		// Build the CSS with the nonce
 		String nonce = getNonce();
@@ -115,8 +108,7 @@ public String replaceCssVariables(String html) {
 				getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_TEXT_COLOR", "#000000"));
 
 		html = html.replace("var(--ide-background-color)",
-				getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_BG_START", "#FFFFFF"));
-
+				getColorAsHex("org.eclipse.ui.workbench.ACTIVE_NOFOCUS_TAB_BG_START", "#FFFFFF"));
 		html = html.replace("var(--background-color)",
 				getColorAsHex("org.eclipse.ui.workbench.ACTIVE_TAB_BG_END", "#FFFFFF"));
 		html = html.replace("var(--code-background-color)",

plugin/src/main/java/io/snyk/eclipse/plugin/html/StaticPageHtmlProvider.java

@@ -1,16 +1,20 @@
 package io.snyk.eclipse.plugin.html;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
+import java.io.InputStreamReader;
 
+import org.eclipse.core.runtime.ILog;
 import org.eclipse.core.runtime.Platform;
 import org.osgi.framework.Bundle;
+import io.snyk.eclipse.plugin.utils.SnykLogger;
 
 import io.snyk.eclipse.plugin.utils.ResourceUtils;
 
 public class StaticPageHtmlProvider extends BaseHtmlProvider {
 	private static StaticPageHtmlProvider instance = new StaticPageHtmlProvider();
+	private static ILog logger;
 
 	public static StaticPageHtmlProvider getInstance() {
 		synchronized (StaticPageHtmlProvider.class) {
@@ -154,39 +158,27 @@ public String getInitHtml() {
 	}
 
 	public String getSummaryInitHtml() {
-		String htmlContent = "";
-		try {
-			InputStream inputStream = getClass().getResourceAsStream("/ui/html/ScanSummaryInit.html");
-			if (inputStream != null) {
-				htmlContent = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-				inputStream.close();
+		if (logger == null) {
+			logger = Platform.getLog(getClass());
+		}
+		StringBuilder content = new StringBuilder();
+
+		try (InputStream inputStream = getClass().getResourceAsStream("/ui/html/ScanSummaryInit.html");
+				BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream))) {
+
+			String line;
+			while ((line = reader.readLine()) != null) {
+				content.append(line).append("\n");
 			}
 		} catch (IOException e) {
-			e.printStackTrace();
+			SnykLogger.logError(e);
 		}
-		return replaceCssVariables(htmlContent);
-	}
 
-	public String ideScript() {
-		return """
-				<script>
-				document.addEventListener('DOMContentLoaded', function() {
-					const totalIssuesRadio = document.getElementById('totalIssues');
-					const newIssuesRadio = document.getElementById('newIssues');
-
-					totalIssuesRadio.addEventListener('change', function() {
-						window.totalIssues();
-					});
-
-					 newIssuesRadio.addEventListener('change', function() {
-							window.newIssues();
-					});
-				});
-				</script>
-				 """;
+		return replaceCssVariables(content.toString());
 	}
 
 	public String getFormattedSummaryHtml(String summary) {
-		return replaceCssVariablesAndScript(summary, ideScript());
+		summary = summary.replace("${ideFunc}", "window.enableDelta(isEnabled);");
+		return replaceCssVariables(summary);
 	}
 }

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

@@ -468,7 +468,6 @@ protected void outputCommandResult(Object result) {
 				SnykExtendedLanguageClient.getInstance().showMessage(messageParams);
 			} else {
 				SnykLogger.logError(new RuntimeException(stdOut));
-
 			}
 		}
 	}

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

@@ -18,25 +18,19 @@ public SummaryBrowserHandler(Browser browser) {
 
 	public void initialize() {
 
-		new BrowserFunction(browser, "totalIssues") {
+		new BrowserFunction(browser, "enableDelta") {
 			@Override
 			public Object function(Object[] arguments) {
-				Preferences.getInstance().store(Preferences.ENABLE_DELTA, Boolean.FALSE.toString());
-				updateConfiguration();
-
-				return null;
-			}
-		};
+				boolean value = false;
+				if (arguments.length > 0 && arguments[0] instanceof Boolean) {
+					value = (Boolean) arguments[0];
+				}
 
-		new BrowserFunction(browser, "newIssues") {
-			@Override
-			public Object function(Object[] arguments) {
-				Preferences.getInstance().store(Preferences.ENABLE_DELTA, Boolean.TRUE.toString());
+				Preferences.getInstance().store(Preferences.ENABLE_DELTA, Boolean.toString(value));
 				updateConfiguration();
 
 				return null;
 			}
-
 		};
 
 		setDefaultBrowserText();

plugin/src/main/java/io/snyk/languageserver/protocolextension/SnykExtendedLanguageClient.java

@@ -381,7 +381,6 @@ public void snykScan(SnykScanParam param) {
 		this.toolView.refreshBrowser(param.getStatus());
 	}
 
-	// TODO what data is returned in the SNYK_SCAN_SUMMARY?
 	@JsonNotification(value = LsConstants.SNYK_SCAN_SUMMARY)
 	public void updateSummaryPanel(SummaryPanelParams summary) {
 		openToolView();