Merge pull request #17 from Corgea/COR-990

COR-990: VS Code Scanning Improvement

Author: Ibrahimrahhal

package.json

@@ -3,7 +3,7 @@
   "displayName": "Corgea",
   "publisher": "Corgea",
   "description": "Corgea helps you automatically fix insecure code.",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "icon": "images/logo.png",
   "license": "UNLICENSED",
   "repository": {

src/services/scanningService.ts

@@ -37,6 +37,7 @@ export interface ScanState {
   scanId?: string;
   output: string[];
   error?: string;
+  lastScanType?: 'full' | 'uncommitted';
 }
 
 export default class scanningService {
@@ -66,7 +67,7 @@ export default class scanningService {
       return;
     }
 
-    await scanningService.scanProject(false);
+    await scanningService.scanProject(false, 'uncommitted');
   }
 
   public static async getUncommittedFiles(includeIgnored: boolean = false): Promise<any[]> {
@@ -95,7 +96,7 @@ export default class scanningService {
   */
   @OnCommand("corgea.scan-full")
   @withErrorHandling()
-  public static async scanProject(isFullScan: boolean = true) {
+  public static async scanProject(isFullScan: boolean = true, scanType: 'full' | 'uncommitted' = 'full') {
     // Check if IDE scanning is enabled
     const isIdeScanningEnabled = await ConfigService.isIdeScanningEnabled();
     if (!isIdeScanningEnabled) {
@@ -121,6 +122,7 @@ export default class scanningService {
         scan: false
       },
       output: [],
+      lastScanType: scanType,
     };
 
     // Notify webview that scan started

src/views/components/ScanningError/ScanningError.tsx

@@ -8,24 +8,24 @@ interface ScanningErrorProps {
 
 const ScanningError: React.FC<ScanningErrorProps> = ({ isCancelled = false }) => {
   const { state, actions } = useVulnerabilities();
-
+  const actionsButtons = (<div className="error-actions">
+    <button className="btn btn-primary mt-3" onClick={actions.retryLastScan}>
+      <i className="fas fa-play"></i>
+      Try Again
+    </button>
+    <button className="btn btn-secondary mt-3 ml-2" onClick={actions.clearScanState}>
+      <i className="fas fa-times"></i>
+      Clear
+    </button>
+  </div>);
   if (isCancelled) {
     return (
       <div className="scanning-error">
         <div className="error-icon">
           <i className="fas fa-times-circle" style={{ color: '#ff9500' }}></i>
         </div>
         <div className="error-message">Scan was cancelled</div>
-        <div className="error-actions">
-          <button className="btn btn-primary mt-3" onClick={actions.scanProject}>
-            <i className="fas fa-play"></i>
-            &nbsp;Start New Scan
-          </button>
-          <button className="btn btn-secondary mt-3 ml-2" onClick={actions.clearScanState}>
-            <i className="fas fa-times"></i>
-            &nbsp;Clear
-          </button>
-        </div>
+        {actionsButtons}
       </div>
     );
   }
@@ -36,10 +36,7 @@ const ScanningError: React.FC<ScanningErrorProps> = ({ isCancelled = false }) =>
         <i className="fas fa-exclamation-triangle"></i>
       </div>
       <div className="error-message">{state.scanState.error}</div>
-      <button className="btn btn-primary mt-3" onClick={actions.scanProject}>
-        <i className="fas fa-redo"></i>
-        &nbsp;Try Again
-      </button>
+      {actionsButtons}
     </div>
   );
 };

src/views/context/VulnerabilitiesContext.tsx

@@ -51,6 +51,7 @@ export interface ScanState {
     upload: boolean;
     scan: boolean;
   };
+  lastScanType?: 'full' | 'uncommitted';
 }
 
 export interface FileGroup {
@@ -218,6 +219,7 @@ const VulnerabilitiesContext = createContext<{
     showUncommittedFilesModal: () => void;
     hideUncommittedFilesModal: () => void;
     clearScanState: () => void;
+    retryLastScan: () => void;
   };
 } | undefined>(undefined);
 
@@ -309,6 +311,14 @@ export function VulnerabilitiesProvider({ children }: { children: ReactNode }) {
     },
     clearScanState: () => {
       vscode.postMessage({ type: 'clearScanState' });
+    },
+    retryLastScan: () => {
+      const lastScanType = state.scanState.lastScanType;
+      if (lastScanType === 'uncommitted') {
+        vscode.postMessage({ type: 'scanUncommittedFiles' });
+      } else {
+        vscode.postMessage({ type: 'scanProject' });
+      }
     }
   };