Merge pull request #48 from MetabobProject/fix/open-more-details

Fix webview sidebar more details opening

Author: AviGopal

ext-src/commands/DetailDocument.ts

@@ -58,39 +58,37 @@ export function activateDetailSuggestionCommand(context: vscode.ExtensionContext
       endorsed: copiedAnalyzeValue[key].isEndorsed || false,
     };
 
-    setTimeout(() => {
-      getExtensionEventEmitter().fire({
-        type: 'FIX_SUGGESTION',
-        data: {
-          path: args.path,
-          id: args.id,
-          vuln: args.vuln,
-          isFix: false,
-          isReset: false,
-        },
-      });
-
-      getExtensionEventEmitter().fire({
-        type: 'Analysis_Completed',
-        data: {
-          shouldResetRecomendation: false,
-          shouldMoveToAnalyzePage: false,
-          ...copiedAnalyzeValue,
-        },
-      });
-
-      extensionEventEmitter.fire({
-        type: 'CURRENT_FILE',
-        data: { ...documentMetaData.editor.document },
-      });
-
-      getExtensionEventEmitter().fire({
-        type: 'CURRENT_PROJECT',
-        data: {
-          name: currentWorkSpaceFolder,
-        },
-      });
-    }, 500);
+    getExtensionEventEmitter().fire({
+      type: 'FIX_SUGGESTION',
+      data: {
+        path: args.path,
+        id: args.id,
+        vuln: args.vuln,
+        isFix: false,
+        isReset: false,
+      },
+    });
+
+    getExtensionEventEmitter().fire({
+      type: 'Analysis_Completed',
+      data: {
+        shouldResetRecomendation: false,
+        shouldMoveToAnalyzePage: false,
+        ...copiedAnalyzeValue,
+      },
+    });
+
+    extensionEventEmitter.fire({
+      type: 'CURRENT_FILE',
+      data: { ...documentMetaData.editor.document },
+    });
+
+    getExtensionEventEmitter().fire({
+      type: 'CURRENT_PROJECT',
+      data: {
+        name: currentWorkSpaceFolder,
+      },
+    });
 
     await setAnalyzeState.set(copiedAnalyzeValue);
 

ext-src/extension.ts

@@ -462,6 +462,7 @@ export function activate(context: vscode.ExtensionContext): void {
         context,
         extensionEventEmitter,
       ),
+      { webviewOptions: { retainContextWhenHidden: true } },
     ),
   );
 }

ext-src/providers/recommendation.provider.ts

@@ -76,6 +76,14 @@ export class RecommendationWebView implements WebviewViewProvider {
     this.activateWebviewMessageListener();
     this.activateExtensionEventListener();
     this.sendDefaultEvents();
+    this._view.onDidChangeVisibility(() => {
+      if (this._view?.visible === false) {
+        this._view.webview.postMessage({
+          type: 'VISIBILITY_LOST',
+          data: {},
+        })
+      }
+    }, null, this.extensionContext.subscriptions);
   }
 
   sendDefaultEvents() {
@@ -116,42 +124,13 @@ export class RecommendationWebView implements WebviewViewProvider {
     }
   }
 
-  intervalHandler() {
-    if (this?._view === null || this?._view === undefined || !this?._view.webview) {
-      return;
-    }
-
-    if (!this._view.visible) {
-      return;
-    }
-
-    for (let i = 0; i < this.eventEmitterQueue.length; i++) {
-      const event = this.eventEmitterQueue[i];
-      if (event) {
-        this?._view?.webview?.postMessage(event);
-      }
-    }
-
-    clearInterval(this.interval);
-  }
-
   activateExtensionEventListener(): void {
-    const self = this;
     this.extensionEventEmitter.event(event => {
       if (this?._view === null || this?._view === undefined || !this?._view.webview) {
         return;
       }
 
-      if (this._view.visible === false) {
-        this.eventEmitterQueue.push(event);
-        if (this.interval !== undefined) {
-          this.interval = setInterval(this.intervalHandler.bind(self), 300);
-        }
-        return;
-      }
-
-      this.eventEmitterQueue = [];
-      this._view.webview.postMessage(event);
+      this?._view?.webview?.postMessage(event);
     });
   }
 
@@ -420,7 +399,7 @@ export class RecommendationWebView implements WebviewViewProvider {
 
     this._view.webview.postMessage({
       type: 'Analysis_Completed',
-      data: { shouldResetRecomendation: true, shouldMoveToAnalyzePage: true, ...getanalyzeState },
+      data: { shouldResetRecomendation: true, shouldMoveToAnalyzePage: false, ...getanalyzeState },
     });
   }
 

src/context/UserContext.tsx

@@ -108,7 +108,6 @@ const AccountSettingProvider = ({ children }: Props): JSX.Element => {
             currentFile,
           } = payload;
 
-          setApplicationState(ApplicationWebviewState.ANALYZE_MODE);
 
           if (hasOpenTextDocuments) {
             setHasOpenTextDocuments(hasOpenTextDocuments);
@@ -217,6 +216,9 @@ const AccountSettingProvider = ({ children }: Props): JSX.Element => {
           }
           setCurrentEditor(filename);
           break;
+        case EventDataType.VISIBILITY_LOST:
+          setApplicationState(ApplicationWebviewState.ANALYZE_MODE);
+          break;
         default:
           break;
       }

src/types.ts

@@ -24,7 +24,8 @@ export enum EventDataType {
   CURRENT_FILE = 'CURRENT_FILE',
   CURRENT_PROJECT = 'CURRENT_PROJECT',
   INIT_DATA_UPON_NEW_FILE_OPEN = 'INIT_DATA_UPON_NEW_FILE_OPEN',
-  ANALYSIS_COMPLETED_EMPTY_PROBLEMS = 'Analysis_Completed_Empty_Problems'
+  ANALYSIS_COMPLETED_EMPTY_PROBLEMS = 'Analysis_Completed_Empty_Problems',
+  VISIBILITY_LOST = 'VISIBILITY_LOST',
 }
 
 export enum ApplicationWebviewState {