Skip to content

Commit 98d6f95

Browse files
committed
fix: fix unable to lookup product
1 parent c8701a0 commit 98d6f95

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

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

Lines changed: 41 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,46 +4,45 @@
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(FILTERABLE_ISSUE_CODE_QUALITY,
35+
DISPLAYED_CODE_QUALITY, FILTERABLE_ISSUE_CODE_SECURITY, DISPLAYED_CODE_SECURITY,
36+
FILTERABLE_ISSUE_INFRASTRUCTURE_AS_CODE, DISPLAYED_IAC, FILTERABLE_ISSUE_OPEN_SOURCE, DISPLAYED_OSS);
37+
38+
public static final Map<String, String> LSP_SOURCE_TO_SCAN_PARAMS = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE,
39+
SCAN_PARAMS_CODE, DIAGNOSTIC_SOURCE_SNYK_IAC, SCAN_PARAMS_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS, SCAN_PARAMS_OSS);
40+
41+
public static final Map<String, String> LSP_SOURCE_TO_DISPLAYED = Map.of(DIAGNOSTIC_SOURCE_SNYK_CODE,
42+
DISPLAYED_CODE_SECURITY, DIAGNOSTIC_SOURCE_SNYK_IAC, DISPLAYED_IAC, DIAGNOSTIC_SOURCE_SNYK_OSS,
43+
DISPLAYED_OSS);
44+
45+
// code cannot be mapped easily
46+
public static final Map<String, String> SCAN_PARAMS_TO_DISPLAYED = Map.of(SCAN_PARAMS_OSS, DISPLAYED_OSS,
47+
SCAN_PARAMS_IAC, DISPLAYED_IAC);
4948
}

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

Lines changed: 0 additions & 1 deletion
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;

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import io.snyk.eclipse.plugin.analytics.AbstractTask;
7070
import io.snyk.eclipse.plugin.analytics.AnalyticsEventTask;
7171
import io.snyk.eclipse.plugin.analytics.TaskProcessor;
72+
import io.snyk.eclipse.plugin.domain.ProductConstants;
7273
import io.snyk.eclipse.plugin.preferences.Preferences;
7374
import io.snyk.eclipse.plugin.properties.FolderConfigs;
7475
import io.snyk.eclipse.plugin.utils.ResourceUtils;
@@ -473,7 +474,8 @@ public CompletableFuture<ShowDocumentResult> showDocument(
473474

474475
return CompletableFuture.supplyAsync(() -> {
475476
openToolView();
476-
this.toolView.selectTreeNode(issue, uriDetails.product());
477+
String display_product = ProductConstants.LSP_SOURCE_TO_DISPLAYED.get(uriDetails.product());
478+
this.toolView.selectTreeNode(issue, display_product);
477479
return new ShowDocumentResult(true);
478480
});
479481
}

0 commit comments

Comments
 (0)