Add Abort Scan button

src/main/java/com/jfrog/ide/idea/actions/StartLocalScanAction.java

@@ -32,6 +32,6 @@ public void update(@NotNull AnActionEvent e) {
             return;
         }
         boolean isScanInProgress = ScanManager.getInstance(project).isScanInProgress();
-        e.getPresentation().setEnabled(!isScanInProgress);
+        e.getPresentation().setVisible(!isScanInProgress);
     }
 }

src/main/java/com/jfrog/ide/idea/actions/StopLocalScanAction.java

@@ -0,0 +1,37 @@
+package com.jfrog.ide.idea.actions;
+
+import com.intellij.openapi.actionSystem.ActionUpdateThread;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.project.Project;
+import com.jfrog.ide.idea.scan.ScanManager;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * Created by tala on 10/10/23.
+ */
+public class StopLocalScanAction extends AnAction {
+    @Override
+    public @NotNull ActionUpdateThread getActionUpdateThread() {
+        return ActionUpdateThread.BGT;
+    }
+
+    @Override
+    public void actionPerformed(AnActionEvent e) {
+        Project project = e.getProject();
+        if (project == null) {
+            return;
+        }
+        ScanManager.getInstance(project).stopScan();
+    }
+
+    @Override
+    public void update(@NotNull AnActionEvent e) {
+        Project project = e.getProject();
+        if (project == null) {
+            return;
+        }
+        boolean isScanInProgress = ScanManager.getInstance(project).isScanInProgress();
+        e.getPresentation().setVisible(isScanInProgress);
+    }
+}

src/main/java/com/jfrog/ide/idea/events/ApplicationEvents.java

@@ -10,6 +10,7 @@
 public interface ApplicationEvents {
     // Scan started
     Topic<ApplicationEvents> ON_SCAN_LOCAL_STARTED = Topic.create("Local scan started", ApplicationEvents.class);
+    Topic<ApplicationEvents> ON_SCAN_LOCAL_CANCELED = Topic.create("Local scan canceled", ApplicationEvents.class);
     Topic<ApplicationEvents> ON_SCAN_CI_STARTED = Topic.create("CI scan started", ApplicationEvents.class);
 
     // Configuration changed

src/main/java/com/jfrog/ide/idea/scan/ScanBinaryExecutor.java

@@ -157,6 +157,8 @@ protected List<JFrogSecurityWarning> execute(ScanConfig.Builder inputFileBuilder
             CommandResults commandResults = commandExecutor.exeCommand(binaryTargetPath.toFile().getParentFile(), args,
                     null, new NullLog(), MAX_EXECUTION_MINUTES, TimeUnit.MINUTES);
 
+            checkCanceled.run();
+
             if (commandResults.isOk()) {
                 log.debug(commandResults.getRes());
                 return parseOutputSarif(outputFilePath);

src/main/java/com/jfrog/ide/idea/scan/ScanManager.java

@@ -26,7 +26,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.jfrog.ide.common.log.Utils.logError;
 import static com.jfrog.ide.common.utils.XrayConnectionUtils.createXrayClientBuilder;
@@ -37,6 +36,8 @@ public class ScanManager {
     private final ScannerFactory factory;
     private final SourceCodeScannerManager sourceCodeScannerManager;
     private Map<Integer, ScannerBase> scanners = Maps.newHashMap();
+    private ExecutorService executor;
+
 
     private ScanManager(@NotNull Project project) {
         this.project = project;
@@ -83,9 +84,8 @@ public void startScan() {
         project.getMessageBus().syncPublisher(ApplicationEvents.ON_SCAN_LOCAL_STARTED).update();
         LocalComponentsTree componentsTree = LocalComponentsTree.getInstance(project);
         componentsTree.setScanningEmptyText();
-        AtomicBoolean isScanCompleted = new AtomicBoolean(false);
         Thread currScanThread = new Thread(() -> {
-            ExecutorService executor = Executors.newFixedThreadPool(3);
+            executor = Executors.newFixedThreadPool(3);
             try {
                 // Source code scanners
                 sourceCodeScannerManager.asyncScanAndUpdateResults(executor, Logger.getInstance());
@@ -101,28 +101,34 @@ public void startScan() {
                     logError(Logger.getInstance(), "Scan timeout of " + SCAN_TIMEOUT_MINUTES + " minutes elapsed. The scan is being canceled.", true);
                 }
                 // Cache tree only if no errors occurred during scan.
-                if (scanners.values().stream().anyMatch(ScannerBase::isScanInterrupted)) {
+                if (scanners.values().stream().anyMatch(ScannerBase::isScanErrorOccurred)) {
                     componentsTree.deleteCachedTree();
+                    componentsTree.setScanErrorEmptyText();
+                } else if (scanners.values().stream().anyMatch(ScannerBase::isScanCanceled)) {
+                    project.getMessageBus().syncPublisher(ApplicationEvents.ON_SCAN_LOCAL_CANCELED).update();
                 } else {
-                    isScanCompleted.set(true);
                     componentsTree.cacheTree();
+                    componentsTree.setNoIssuesEmptyText();
                 }
             } catch (JFrogInactiveEnvironmentException e) {
                 handleJfrogInactiveEnvironment(e.getRedirectUrl());
+                componentsTree.setScanErrorEmptyText();
             } catch (IOException | RuntimeException | InterruptedException e) {
                 logError(Logger.getInstance(), ExceptionUtils.getRootCauseMessage(e), e, true);
+                componentsTree.setScanErrorEmptyText();
             } finally {
                 executor.shutdownNow();
-                if (isScanCompleted.get()) {
-                    componentsTree.setNoIssuesEmptyText();
-                } else {
-                    componentsTree.setScanErrorEmptyText();
-                }
             }
         });
         currScanThread.start();
     }
 
+    public void stopScan() {
+        executor.shutdown();
+        scanners.values().forEach(ScannerBase::stopScan);
+        sourceCodeScannerManager.stopScan();
+    }
+
     /**
      * Handle inactive JFrog platform (free-tier) by displaying a clear warning message and a reactivation link.
      *
@@ -141,7 +147,7 @@ public void refreshScanners(ScanLogic scanLogic, @Nullable ExecutorService execu
     }
 
     public boolean isScanInProgress() {
-        return scanners.values().stream().anyMatch(ScannerBase::isScanInProgress);
+        return scanners.values().stream().anyMatch(ScannerBase::isScanInProgress) || sourceCodeScannerManager.isScanInProgress();
     }
 
     /**

src/main/java/com/jfrog/ide/idea/scan/ScannerBase.java

@@ -53,7 +53,6 @@
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static com.jfrog.ide.common.log.Utils.logError;
@@ -70,7 +69,9 @@ public abstract class ScannerBase {
     private final Log log;
     // Lock to prevent multiple simultaneous scans
     private final AtomicBoolean scanInProgress = new AtomicBoolean(false);
-    private final AtomicBoolean scanInterrupted = new AtomicBoolean(false);
+    private final AtomicBoolean scanError = new AtomicBoolean(false);
+    private final AtomicBoolean scanCanceled = new AtomicBoolean(false);
+
     private ScanLogic scanLogic;
     protected Project project;
     protected SourceCodeScannerManager sourceCodeScannerManager;
@@ -124,7 +125,8 @@ void setScanLogic(ScanLogic logic) {
      *
      * @return the Inspection tool corresponding to the scan-manager type.
      */
-    protected @Nullable abstract AbstractInspection getInspectionTool();
+    @Nullable
+    protected abstract AbstractInspection getInspectionTool();
 
     protected void sendUsageReport() {
         ApplicationManager.getApplication().invokeLater(() -> Utils.sendUsageReport(getPackageManagerType().getName() + "-deps"));
@@ -144,11 +146,13 @@ private void scanAndUpdate(ProgressIndicator indicator) {
             // Building dependency tree
             indicator.setText("1/3: Building dependency tree");
             DepTree depTree = buildTree();
+            checkCanceled();
 
             // Sending the dependency tree to Xray for scanning
             indicator.setText("2/3: Xray scanning project dependencies");
             log.debug("Start scan for '" + basePath + "'.");
             Map<String, DependencyNode> results = scanLogic.scanArtifacts(depTree, serverConfig, indicator, prefix, this::checkCanceled);
+            checkCanceled();
 
             indicator.setText("3/3: Finalizing");
             if (results == null || results.isEmpty()) {
@@ -168,9 +172,9 @@ private void scanAndUpdate(ProgressIndicator indicator) {
 
         } catch (ProcessCanceledException e) {
             log.info("Xray scan was canceled");
-            scanInterrupted.set(true);
+            scanCanceled.set(true);
         } catch (Exception e) {
-            scanInterrupted.set(true);
+            scanError.set(true);
             logError(log, "Xray scan failed", e, true);
         }
     }
@@ -310,13 +314,22 @@ public void onFinished() {
             @Override
             public void onThrowable(@NotNull Throwable error) {
                 log.error(ExceptionUtils.getRootCauseMessage(error));
-                scanInterrupted.set(true);
+                scanError.set(true);
             }
 
         };
         executor.submit(createRunnable(scanAndUpdateTask, latch, progressIndicator, log));
     }
 
+    /**
+     * Stop the current scan.
+     */
+    void stopScan() {
+        if (progressIndicator != null) {
+            progressIndicator.cancel();
+        }
+    }
+
     /**
      * Get text to display in the task progress.
      *
@@ -421,8 +434,12 @@ boolean isScanInProgress() {
         return this.scanInProgress.get();
     }
 
-    boolean isScanInterrupted() {
-        return this.scanInterrupted.get();
+    boolean isScanErrorOccurred() {
+        return this.scanError.get();
+    }
+
+    boolean isScanCanceled() {
+        return this.scanCanceled.get();
     }
 
     public String getProjectPath() {

src/main/java/com/jfrog/ide/idea/scan/SourceCodeScannerManager.java

@@ -94,7 +94,9 @@ public List<FileTreeNode> applicabilityScan(ProgressIndicator indicator, Collect
                     scanResults.addAll(applicabilityResults);
                 }
             }
-        } catch (IOException | InterruptedException | NullPointerException e) {
+        } catch (InterruptedException e) {
+            logError(Logger.getInstance(), "Scan canceled due to a user request or timeout.", false);
+        } catch (IOException | NullPointerException e) {
             logError(Logger.getInstance(), "Failed to scan source code", e, true);
         } finally {
             scanInProgress.set(false);
@@ -151,6 +153,12 @@ public void onThrowable(@NotNull Throwable error) {
         executor.submit(createRunnable(sourceCodeScanTask, latch, progressIndicator, log));
     }
 
+    public void stopScan() {
+        if (progressIndicator != null) {
+            progressIndicator.cancel();
+        }
+    }
+
     private void sourceCodeScanAndUpdate(ProgressIndicator indicator, Runnable checkCanceled, Logger log) throws IOException {
         indicator.setText("Running advanced source code scanning");
         JFrogApplicationsConfig projectConfig = parseJFrogApplicationsConfig();
@@ -313,4 +321,8 @@ private Map<SourceCodeScanType, ScanBinaryExecutor> initScannersCollection() {
         scanners.put(SourceCodeScanType.SAST, new SastScannerExecutor(Logger.getInstance(), GlobalSettings.getInstance().getServerConfig()));
         return scanners;
     }
+
+    public boolean isScanInProgress() {
+        return this.scanInProgress.get();
+    }
 }

src/main/java/com/jfrog/ide/idea/ui/JFrogLocalToolWindow.java

@@ -94,6 +94,8 @@ public JPanel createActionToolbar() {
         DefaultActionGroup actionGroup = new DefaultActionGroup(new CollapseAllAction(componentsTree), new ExpandAllAction(componentsTree),
                 new GoToSettingsAction(), new Separator(), new ScanTimeLabelAction());
         actionGroup.addAction(ActionManager.getInstance().getAction("JFrog.StartLocalScan"), Constraints.FIRST);
+        actionGroup.addAction(ActionManager.getInstance().getAction("JFrog.StopLocalScan"), Constraints.FIRST);
+
         return createJFrogToolbar(actionGroup);
     }
 
@@ -124,6 +126,9 @@ public void registerListeners(JComponent browserComponent) {
             setLeftPanelContent(compTreeView);
             ApplicationManager.getApplication().invokeLater(this::resetViews);
         });
+        projectBusConnection.subscribe(ApplicationEvents.ON_SCAN_LOCAL_CANCELED, (ApplicationEvents) () -> {
+            ApplicationManager.getApplication().invokeLater(this::initialView);
+        });
         componentsTree.addRightClickListener();
     }
 
@@ -143,7 +148,7 @@ private void refreshView(boolean reloadCredentials) {
             return;
         }
         if (componentsTree.isCacheEmpty() && !ScanManager.getInstance(project).isScanInProgress()) {
-            setLeftPanelContent(createReadyEnvView());
+            initialView();
             return;
         }
         setLeftPanelContent(compTreeView);
@@ -294,4 +299,8 @@ public void updateUI() {
             refreshView(true);
         }
     }
+
+    public void initialView() {
+        setLeftPanelContent(createReadyEnvView());
+    }
 }

src/main/resources/META-INF/plugin.xml

@@ -90,14 +90,19 @@
             <action id="JFrog.FloatingStartLocalScan"
                     class="com.jfrog.ide.idea.actions.StartLocalScanAction"
                     text="Trigger Scan"
-                    description="Trigger JFrog Scan"
+                    description="Trigger JFrog scan"
                     icon="/icons/jfrog_icon.svg"/>
         </group>
         <action id="JFrog.StartLocalScan"
                 class="com.jfrog.ide.idea.actions.StartLocalScanAction"
                 text="Trigger Scan"
-                description="Trigger JFrog Scan"
+                description="Trigger JFrog scan"
                 icon="AllIcons.Actions.Execute"/>
+        <action id="JFrog.StopLocalScan"
+                class="com.jfrog.ide.idea.actions.StopLocalScanAction"
+                text="Stop Scan"
+                description="Cancel all JFrog scan tasks"
+                icon="AllIcons.Actions.Suspend"/>
         <action id="JFrog.RefreshBuilds"
                 class="com.jfrog.ide.idea.actions.RefreshBuildsAction"
                 text="Refresh Builds"