Skip to content

Reset the loaded project list after showing empty result #223

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-aniket-shinde merged 3 commits into from
Aug 29, 2025
Merged

Reset the loaded project list after showing empty result #223

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a659ea8
Reset the loaded project list after showing empty result
mraniket Aug 25, 2025
c258cff
Reset the project list after project selection
mraniket Aug 26, 2025
b7e26ef
removed unused imports
mraniket Aug 29, 2025
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
60 changes: 51 additions & 9 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 @@ -48,6 +48,7 @@
import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.FontData;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.FillLayout;
import org.eclipse.swt.layout.GridData;
Expand All @@ -74,7 +75,6 @@
import org.eclipse.ui.ide.IDE;
import org.eclipse.ui.part.ViewPart;
import org.osgi.service.event.EventHandler;

import com.checkmarx.ast.codebashing.CodeBashing;
import com.checkmarx.ast.learnMore.LearnMore;
import com.checkmarx.ast.learnMore.Sample;
Expand Down Expand Up @@ -115,6 +115,8 @@ public class CheckmarxView extends ViewPart implements EventHandler {
private static final String NO_PROJECTS_AVAILABLE = "No projects available.";
private static final String FORMATTED_SCAN_LABEL = "%s %s";
private static final String FORMATTED_SCAN_LABEL_LATEST = "%s %s (%s)";
private boolean isUpdatingCombo = false;
private boolean resetStoredProjects = false;

private Timer debounceTimer = new Timer("ProjectSearchDebounce", true);
private TimerTask pendingSearchTask;
Expand Down Expand Up @@ -194,6 +196,7 @@ public class CheckmarxView extends ViewPart implements EventHandler {
private static String currentScanIdFormmated = PluginConstants.EMPTY_STRING;
private List<String> currentBranches = new ArrayList<>();
private List<Project> currentProjects = new ArrayList<>();
private List<Project> storeCurrentProjects = new ArrayList<>();


private boolean scansCleanedByProject = false;
Expand Down Expand Up @@ -389,6 +392,7 @@ private void loadComboboxes() {
@Override
protected IStatus run(IProgressMonitor arg0) {
currentProjects = getProjects();
storeCurrentProjects = currentProjects;
sync.asyncExec(() -> {
projectComboViewer.setInput(currentProjects);
if (currentProjectId.isEmpty() || currentProjects.isEmpty()) {
Expand Down Expand Up @@ -775,7 +779,8 @@ public String getText(Object element) {
return super.getText(element);
}
});



projectComboViewer.addSelectionChangedListener(new ISelectionChangedListener() {
@Override
public void selectionChanged(SelectionChangedEvent event) {
Expand All @@ -794,6 +799,8 @@ public void selectionChanged(SelectionChangedEvent event) {
// Avoid non-sense trigger changed when opening the combo
if (selectedProject.getId().equals(currentProjectId)) {
CxLogger.info(PluginConstants.INFO_CHANGE_PROJECT_EVENT_NOT_TRIGGERED);
preservCaretposition(storeCurrentProjects, selectedProject.getName());
currentProjects = storeCurrentProjects;
return;
}

Expand All @@ -806,7 +813,6 @@ protected IStatus run(IProgressMonitor arg0) {
sync.asyncExec(() -> {
branchComboViewer.setInput(currentBranches);
PluginUtils.setTextForComboViewer(branchComboViewer, currentBranches.isEmpty() ? NO_BRANCHES_AVAILABLE : BRANCH_COMBO_VIEWER_TEXT);

PluginUtils.enableComboViewer(branchComboViewer, true);
PluginUtils.enableComboViewer(scanIdComboViewer, true);
PluginUtils.updateFiltersEnabledAndCheckedState(toolBarActions.getFilterActions());
Expand All @@ -818,25 +824,39 @@ protected IStatus run(IProgressMonitor arg0) {
}
};
job.schedule();
//After project selected and branches loaded reset the project list
if(resetStoredProjects) {
storeCurrentProjects.add(selectedProject);
preservCaretposition(storeCurrentProjects, selectedProject.getName());
currentProjects = storeCurrentProjects;
resetStoredProjects=false;
}
}
}
});

// Add ModifyListener to handle manual text input for projects
projectComboViewer.getCombo().addModifyListener(e -> {
if (isUpdatingCombo) return;
String enteredProject = projectComboViewer.getCombo().getText().trim();

// Skip search if the text is the default instruction
if (enteredProject.equals(PROJECT_COMBO_VIEWER_TEXT)) {
if (enteredProject.equals(PROJECT_COMBO_VIEWER_TEXT) || enteredProject.equals(LOADING_PROJECTS)) {
updateStartScanButton(false); // Disable scan button
return;
}
// If user starts typing again and list is empty, restore currentProjects
if (projectComboViewer.getCombo().getItemCount() == 0 && !currentProjects.isEmpty() && enteredProject.length()>0) {
isUpdatingCombo = true;
preservCaretposition(currentProjects,enteredProject);
isUpdatingCombo = false;
}

latestProjectSearchTerm = enteredProject; // Track the latest term
List<String> matchedProjects;
matchedProjects = currentProjects.stream().map(Project::getName)
.filter(name -> name != null && name.toLowerCase().contains(enteredProject.toLowerCase())).limit(100)
.collect(Collectors.toList());

if (matchedProjects.isEmpty()) {
CxLogger.info("Entered project is not exist in current projects list");
// Cancel any pending search
Expand All @@ -857,13 +877,19 @@ protected IStatus run(IProgressMonitor monitor) {
searchedProjects = DataProvider.getInstance().getProjects(searchTerm);
Display.getDefault().asyncExec(() -> {
if (searchTerm.equals(latestProjectSearchTerm)) {
isUpdatingCombo = true;
// Update UI in UI thread
if (searchedProjects != null && !searchedProjects.isEmpty()) {
projectComboViewer.setInput(searchedProjects);
preservCaretposition(searchedProjects,searchTerm);
currentProjects = searchedProjects;
resetStoredProjects=true;
} else {
preservCaretposition(Collections.emptyList(),searchTerm);
updateStartScanButton(false); // Disable scan button
isUpdatingCombo = false;
return;
}
isUpdatingCombo = false;
}
});
} catch (Exception ex) {
Expand All @@ -876,8 +902,10 @@ protected IStatus run(IProgressMonitor monitor) {
}
};
debounceTimer.schedule(pendingSearchTask, DEBOUNCE_DELAY_MS);

}
});
});

}
/**
* Update state variables and make plugin fields loading when project changes
Expand Down Expand Up @@ -2570,9 +2598,10 @@ private void clearAndRefreshPlugin() {

@Override
protected IStatus run(IProgressMonitor arg0) {
List<Project> projectList = getProjects();
currentProjects = getProjects();
storeCurrentProjects = currentProjects;
sync.asyncExec(() -> {
projectComboViewer.setInput(projectList);
projectComboViewer.setInput(currentProjects);
projectComboViewer.refresh();
PluginUtils.setTextForComboViewer(projectComboViewer, PROJECT_COMBO_VIEWER_TEXT);
PluginUtils.enableComboViewer(projectComboViewer, true);
Expand Down Expand Up @@ -2763,4 +2792,17 @@ private void updateStartScanButton(boolean enabled) {
toolBarActions.getStartScanAction().setEnabled(false);
}
}

/**
* Store the user entered value and the caret position
*
* @param projectList
* @param searchText
*/
private void preservCaretposition( List<Project> projectList, String searchText) {
int caretPos = projectComboViewer.getCombo().getCaretPosition();
projectComboViewer.setInput(projectList);
PluginUtils.setTextForComboViewer(projectComboViewer, searchText);
projectComboViewer.getCombo().setSelection(new Point(caretPos, caretPos));
}
}