chore: improve logic

SAP · Jun 14, 2021 · 9278fdc · 9278fdc
1 parent 3fe1b02
commit 9278fdc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/packages/backend/src/panels/AbstractWebviewPanel.ts b/packages/backend/src/panels/AbstractWebviewPanel.ts
@@ -22,10 +22,10 @@ export abstract class AbstractWebviewPanel {
   protected isInBAS: boolean;
   protected rpc: RpcExtension;
 
-  public loadWebviewPanel(uiOptions?: any) {
+  public async loadWebviewPanel(uiOptions?: unknown): Promise<void> {
     this.disposeWebviewPanel();
     const webViewPanel = this.createWebviewPanel();
-    this.setWebviewPanel(webViewPanel, uiOptions);
+    await this.setWebviewPanel(webViewPanel, uiOptions);
   }
 
   protected constructor(context: Partial<vscode.ExtensionContext>) {
@@ -38,9 +38,10 @@ export abstract class AbstractWebviewPanel {
     this.isInBAS = !_.isEmpty(_.get(process, "env.WS_BASE_URL"));
   }
 
-  public setWebviewPanel(webviewPanel: vscode.WebviewPanel, state?: unknown) {
+  public setWebviewPanel(webviewPanel: vscode.WebviewPanel, state?: unknown): Promise<void> {
     this.webViewPanel = webviewPanel;
     this.state = state;
+    return;
   }
 
   public createWebviewPanel(): vscode.WebviewPanel {

diff --git a/packages/backend/src/panels/ExploreGensPanel.ts b/packages/backend/src/panels/ExploreGensPanel.ts
@@ -8,7 +8,7 @@ import _ = require("lodash");
 
 export class ExploreGensPanel extends AbstractWebviewPanel {
   public async setWebviewPanel(webviewPanel: vscode.WebviewPanel, uiOptions?: any) {
-    super.setWebviewPanel(webviewPanel);
+    await super.setWebviewPanel(webviewPanel);
     this.rpc = new RpcExtension(webviewPanel.webview, getWebviewRpcLibraryLogger());
     this.exploreGens.init(this.rpc);
     this.initWebviewPanel();
@@ -29,11 +29,11 @@ export class ExploreGensPanel extends AbstractWebviewPanel {
     this.exploreGens = new ExploreGens(this.logger, this.isInBAS, this.context);
   }
 
-  public loadWebviewPanel(uiOptions?: any) {
+  public async loadWebviewPanel(uiOptions?: any) {
     if (this.webViewPanel && _.isNil(uiOptions)) {
       this.webViewPanel.reveal();
     } else {
-      super.loadWebviewPanel(uiOptions);
+      await super.loadWebviewPanel(uiOptions);
     }
   }
 }
diff --git a/packages/backend/src/panels/YeomanUIPanel.ts b/packages/backend/src/panels/YeomanUIPanel.ts
@@ -64,7 +64,7 @@ export class YeomanUIPanel extends AbstractWebviewPanel {
       }
     }
 
-    super.loadWebviewPanel(uiOptions);
+    await super.loadWebviewPanel(uiOptions);
 
     return this.yoUiCommandPromise;
   }
@@ -87,10 +87,10 @@ export class YeomanUIPanel extends AbstractWebviewPanel {
     }
   }
 
-  public setWebviewPanel(webViewPanel: vscode.WebviewPanel, uiOptions?: unknown) {
+  public async setWebviewPanel(webViewPanel: vscode.WebviewPanel, uiOptions?: unknown): Promise<void> {
     this.setYoUiPromises();
 
-    super.setWebviewPanel(webViewPanel);
+    await super.setWebviewPanel(webViewPanel);
 
     this.messages = _.assign({}, backendMessages, _.get(uiOptions, "messages", {}));
     const filter = GeneratorFilter.create(_.get(uiOptions, "filter"));