Skip to content

Removed the status from scan label since all scans are filtered with status=Completed. #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Dec 15, 2021
Merged

Removed the status from scan label since all scans are filtered with status=Completed. #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/CheckmarxView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public class CheckmarxView extends ViewPart {
private static final String NO_PROJECTS_AVAILABLE = "No projects available.";
private static final String NO_SCANS_AVAILABLE = "No scans available.";
private static final String VERTICAL_SEPERATOR = "|";
private static final String FORMATTED_SCAN_LABEL = "%s (%s, %s)";
private static final String FORMATTED_SCAN_LABEL = "%s (%s)";

/**
* The ID of the view as specified by the extension.
Expand Down Expand Up @@ -596,7 +596,7 @@ private String getScanNameFromId(List<Scan> scans, String scanId) {
private static String formatScanLabel(Scan scan) {
String updatedAtDate = PluginUtils.convertStringTimeStamp(scan.getUpdatedAt());

return String.format(FORMATTED_SCAN_LABEL, scan.getID(), scan.getStatus(), updatedAtDate);
return String.format(FORMATTED_SCAN_LABEL, scan.getID(), updatedAtDate);
}

/**
Expand Down
12 changes: 6 additions & 6 deletions checkmarx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/DataProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ private List<DisplayModel> processResults(Results scanResults, String scanId) {
List<DisplayModel> allResultsTransformed = resultsList.stream().map(resultItem -> transform(resultItem)).collect(Collectors.toList());

// Divide all the results by scanner type
Map<String, List<DisplayModel>> filteredResultsByScannerType = filterResultsByScannerTypeV2(allResultsTransformed);
Map<String, List<DisplayModel>> filteredResultsByScannerType = filterResultsByScannerType(allResultsTransformed);

// build results based on selected filters
return buildResults(scanId, filteredResultsByScannerType);
Expand All @@ -281,7 +281,7 @@ private List<DisplayModel> buildResults(String scanId, Map<String, List<DisplayM

if (filteredResultsByScannerType.containsKey(PluginConstants.SAST)) {
List<DisplayModel> sastList = filteredResultsByScannerType.get(PluginConstants.SAST);
sastResultsMap = filterResultsBySeverityV2(sastList);
sastResultsMap = filterResultsBySeverity(sastList);

if(FilterState.groupByQueryName && !sastResultsMap.isEmpty()) {
filterResultsByQueryName(sastResultsMap);
Expand All @@ -290,7 +290,7 @@ private List<DisplayModel> buildResults(String scanId, Map<String, List<DisplayM

if (filteredResultsByScannerType.containsKey(PluginConstants.SCA_DEPENDENCY)) {
List<DisplayModel> scaList = filteredResultsByScannerType.get(PluginConstants.SCA_DEPENDENCY);
scaResultsMap = filterResultsBySeverityV2(scaList);
scaResultsMap = filterResultsBySeverity(scaList);

if(FilterState.groupByQueryName && !scaResultsMap.isEmpty()) {
filterResultsByQueryName(scaResultsMap);
Expand All @@ -299,7 +299,7 @@ private List<DisplayModel> buildResults(String scanId, Map<String, List<DisplayM

if (filteredResultsByScannerType.containsKey(PluginConstants.KICS_INFRASTRUCTURE)) {
List<DisplayModel> kicsList = filteredResultsByScannerType.get(PluginConstants.KICS_INFRASTRUCTURE);
kicsResultsMap = filterResultsBySeverityV2(kicsList);
kicsResultsMap = filterResultsBySeverity(kicsList);

if(FilterState.groupByQueryName && !kicsResultsMap.isEmpty()) {
filterResultsByQueryName(kicsResultsMap);
Expand Down Expand Up @@ -402,7 +402,7 @@ private DisplayModel transform(Result resultItem) {
* @param allResultsTransformed
* @return
*/
private Map<String, List<DisplayModel>> filterResultsByScannerTypeV2(List<DisplayModel> allResultsTransformed) {
private Map<String, List<DisplayModel>> filterResultsByScannerType(List<DisplayModel> allResultsTransformed) {
Map<String, List<DisplayModel>> filteredMap = new HashMap<>();

for (DisplayModel transformedResult : allResultsTransformed) {
Expand All @@ -428,7 +428,7 @@ private Map<String, List<DisplayModel>> filterResultsByScannerTypeV2(List<Displa
* @param resultList
* @return
*/
private Map<String, List<DisplayModel>> filterResultsBySeverityV2(List<DisplayModel> resultList) {
private Map<String, List<DisplayModel>> filterResultsBySeverity(List<DisplayModel> resultList) {
Map<String, List<DisplayModel>> filteredMapBySeverity = new HashMap<>();

for (DisplayModel result : resultList) {
Expand Down