Skip to content

AST-7507 - Eclipse - Listen to project branch - Get branch from project #14

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
cx-hugo-machado merged 1 commit into from
Dec 20, 2021
Merged

AST-7507 - Eclipse - Listen to project branch - Get branch from project #14

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
40 changes: 29 additions & 11 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 @@ -243,6 +243,12 @@ private void createToolbar() {
toolBarManager.add(new Separator("\t"));
}
}

if(currentScanId.isEmpty()) {
toolBarActions.getAbortResultsAction().setEnabled(false);
toolBarActions.getScanResultsAction().setEnabled(true);
toolBarActions.getClearAndRefreshAction().setEnabled(true);
}
}

@Override
Expand Down Expand Up @@ -387,6 +393,7 @@ private void createProjectListComboBox(Composite parent) {
String currentProjectName = getProjectFromId(projectList, currentProjectId);

projectComboViewer = new ComboViewer(parent, SWT.DROP_DOWN);
PluginUtils.enableComboViewer(projectComboViewer, false);
projectComboViewer.setContentProvider(ArrayContentProvider.getInstance());
projectComboViewer.setInput(projectList);

Expand Down Expand Up @@ -471,6 +478,9 @@ private void onProjectChangePluginLoading(String projectId) {
PluginUtils.showMessage(rootModel, viewer, PluginConstants.EMPTY_STRING);
PluginUtils.setTextForComboViewer(scanIdComboViewer, PluginConstants.COMBOBOX_SCAND_ID_PLACEHOLDER);
toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(false));
// Hide center and right panels
resultInfoCompositePanel.setVisible(false);
attackVectorCompositePanel.setVisible(false);
}

/**
Expand All @@ -493,6 +503,7 @@ private String getProjectFromId(List<Project> projects, String projectId) {
private void createBranchComboBox(Composite parent) {
currentBranch = globalSettings.getBranch();
branchComboViewer = new ComboViewer(parent, SWT.DROP_DOWN);
PluginUtils.enableComboViewer(branchComboViewer, false);
branchComboViewer.setContentProvider(ArrayContentProvider.getInstance());

branchComboViewer.setLabelProvider(new LabelProvider() {
Expand Down Expand Up @@ -544,7 +555,6 @@ public void run() {
}

PluginUtils.setTextForComboViewer(branchComboViewer, currentProjectId.isEmpty() || currentBranch.isEmpty() ? BRANCH_COMBO_VIEWER_TEXT : currentBranch);
PluginUtils.enableComboViewer(branchComboViewer, !currentProjectId.isEmpty());

GridData gridData = new GridData();
gridData.widthHint = 150;
Expand Down Expand Up @@ -577,6 +587,7 @@ private void onBranchChangePluginLoading(String branch) {
private void createScanIdComboBox(Composite parent){
currentScanId = globalSettings.getScanId();
scanIdComboViewer = new ComboViewer(parent, SWT.DROP_DOWN | SWT.SIMPLE);
PluginUtils.enableComboViewer(scanIdComboViewer, false);
scanIdComboViewer.setContentProvider(ArrayContentProvider.getInstance());

scanIdComboViewer.setLabelProvider(new LabelProvider() {
Expand Down Expand Up @@ -636,7 +647,15 @@ public void run() {
updateResultsTree(DataProvider.getInstance().getResultsForScanId(currentScanId));
}
});
}else {
PluginUtils.enableComboViewer(projectComboViewer, true);
PluginUtils.enableComboViewer(branchComboViewer, !currentProjectId.isEmpty());
PluginUtils.enableComboViewer(scanIdComboViewer, true);
}
} else {
PluginUtils.enableComboViewer(projectComboViewer, true);
PluginUtils.enableComboViewer(branchComboViewer, !currentProjectId.isEmpty());
PluginUtils.enableComboViewer(scanIdComboViewer, true);
}

GridData gridData = new GridData();
Expand Down Expand Up @@ -667,8 +686,7 @@ private void onScanChangePluginLoading(String scan) {
PluginUtils.showMessage(rootModel, viewer, String.format(PluginConstants.RETRIEVING_RESULTS_FOR_SCAN, scan));
PluginUtils.enableComboViewer(projectComboViewer, false);
PluginUtils.enableComboViewer(branchComboViewer, false);
toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(false));
toolBarActions.getAbortResultsAction().setEnabled(true);
toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(action.getId().equals(ActionName.ABORT_RESULTS.name())));
}

/**
Expand Down Expand Up @@ -728,11 +746,13 @@ private void setSelectionForProjectComboViewer() {
return;
}

toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(false));
toolBarActions.getAbortResultsAction().setEnabled(true);
// Disable all tool bar actions except the clear and refresh action
toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(action.getId().equals(ActionName.ABORT_RESULTS.name())));
PluginUtils.showMessage(rootModel, viewer, String.format(PluginConstants.RETRIEVING_RESULTS_FOR_SCAN, scanId));
loadingProjects();
loadingBranches();
resultInfoCompositePanel.setVisible(false);
attackVectorCompositePanel.setVisible(false);

Display.getDefault().asyncExec(new Runnable() {
public void run() {
Expand All @@ -752,8 +772,6 @@ public void run() {
projectComboViewer.setInput(projectList);

String projectName = getProjectFromId(projectList, projectId);

PluginUtils.enableComboViewer(projectComboViewer, true);
PluginUtils.setTextForComboViewer(projectComboViewer, projectName);

currentProjectId = projectId;
Expand All @@ -765,11 +783,8 @@ public void run() {

setSelectionForBranchComboViewer(scan.getBranch(), projectId);
setSelectionForScanIdComboViewer(scan.getID(), scan.getBranch());
PluginUtils.enableComboViewer(branchComboViewer, true);
PluginUtils.enableComboViewer(scanIdComboViewer, true);
}
});

}

/**
Expand Down Expand Up @@ -1073,7 +1088,8 @@ private void updateResultsTree(List<DisplayModel> results) {
toolBarActions.getAbortResultsAction().setEnabled(false);
toolBarActions.getClearAndRefreshAction().setEnabled(true);
PluginUtils.enableComboViewer(projectComboViewer, true);
PluginUtils.enableComboViewer(branchComboViewer, true);
PluginUtils.enableComboViewer(branchComboViewer, !currentProjectId.isEmpty());
PluginUtils.enableComboViewer(scanIdComboViewer, true);
alreadyRunning = false;

if(results.isEmpty()) {
Expand Down Expand Up @@ -1222,6 +1238,8 @@ public void run() {
loadingScans();
toolBarActions.getToolBarActions().forEach(action -> action.setEnabled(false));
PluginUtils.showMessage(rootModel, viewer, PluginConstants.EMPTY_STRING);
resultInfoCompositePanel.setVisible(false);
attackVectorCompositePanel.setVisible(false);
}
});
}
Expand Down
2 changes: 1 addition & 1 deletion ...rx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionAbortScanResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public void run() {
abortScanResultsAction.setId(ActionName.ABORT_RESULTS.name());
abortScanResultsAction.setToolTipText(ACTION_ABORT_SCAN_RESULTS_TOOLTIP);
abortScanResultsAction.setImageDescriptor(Activator.getImageDescriptor(ACTION_ABORT_SCAN_RESULTS_ICON_PATH));
abortScanResultsAction.setEnabled(false);
abortScanResultsAction.setEnabled(true);

return abortScanResultsAction;
}
Expand Down
1 change: 1 addition & 0 deletions ...marx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionClearSelection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ public void run() {
clearSelectionAction.setId(ActionName.CLEAN_AND_REFRESH.name());
clearSelectionAction.setToolTipText(ACTION_CLEAR_SELECTION_TOOLTIP);
clearSelectionAction.setImageDescriptor(Activator.getImageDescriptor(ACTION_CLEAR_SELECTION_ICON_PATH));
clearSelectionAction.setEnabled(false);

return clearSelectionAction;
}
Expand Down
1 change: 1 addition & 0 deletions ...marx-ast-eclipse-plugin/src/com/checkmarx/eclipse/views/actions/ActionGetScanResults.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public void run(){
getScanResultsAction.setId(ActionName.GET_RESULTS.name());
getScanResultsAction.setToolTipText(ACTION_SCAN_RESULTS_TOOLTIP);
getScanResultsAction.setImageDescriptor(Activator.getImageDescriptor(ACTION_SCAN_RESULTS_ICON_PATH));
getScanResultsAction.setEnabled(false);

return getScanResultsAction;
}
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.