fixed the issue of second time opening the webview

msivasubramaniaan · datho7561 · commit 2a4f594e6c68 · 2023-11-24T08:55:57.000-05:00
Signed-off-by: msivasubramaniaan &lt;msivasub@redhat.com&gt;
diff --git a/src/webview/helm-chart/app/index.html b/src/webview/helm-chart/app/index.html
@@ -47,6 +47,5 @@
     <body>
         <div class="box" id="root"></div>
         <script src="%SCRIPT%" ></script>
-        <link rel="stylesheet" href="%STYLE%"></link>
     </body>
 </html>
diff --git a/src/webview/helm-chart/helmChartLoader.ts b/src/webview/helm-chart/helmChartLoader.ts
@@ -134,13 +134,12 @@ function helmChartMessageListener(event: any): void {
 }
 
 export default class HelmChartLoader {
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
+
     static get extensionPath() {
         return vscode.extensions.getExtension(ExtensionID).extensionPath
     }
 
-    // eslint-disable-next-line @typescript-eslint/require-await
-    static async loadView(title: string, url?: string): Promise<vscode.WebviewPanel> {
+    static async loadView(title: string): Promise<vscode.WebviewPanel> {
         const localResourceRoot = vscode.Uri.file(path.join(HelmChartLoader.extensionPath, 'out', 'helmChartViewer'));
         if (panel) {
             // If we already have a panel, show it in the target column
@@ -154,10 +153,11 @@ export default class HelmChartLoader {
             });
             panel.iconPath = vscode.Uri.file(path.join(HelmChartLoader.extensionPath, 'images/helm/helm.svg'));
             panel.webview.html = await loadWebviewHtml('helmChartViewer', panel);
+            const messageDisposable = panel.webview.onDidReceiveMessage(helmChartMessageListener);
             panel.onDidDispose(() => {
+                messageDisposable.dispose();
                 panel = undefined;
             });
-            panel.webview.onDidReceiveMessage(helmChartMessageListener);
         }
         await getHelmCharts();
         return panel;
@@ -170,25 +170,24 @@ export default class HelmChartLoader {
 }
 
 async function getHelmCharts(): Promise<void> {
-    if (helmCharts.length === 0) {
-        const cliData = await Helm.getHelmRepos();
-        if (!cliData.error && !cliData.stderr) {
-            const helmRepos = JSON.parse(cliData.stdout) as HelmRepo[];
-            void panel?.webview.postMessage(
-                {
-                    action: 'getHelmRepos',
-                    data: {
-                        helmRepos
-                    }
+    helmCharts.length = 0;
+    const cliData = await Helm.getHelmRepos();
+    if (!cliData.error && !cliData.stderr) {
+        const helmRepos = JSON.parse(cliData.stdout) as HelmRepo[];
+        void panel?.webview.postMessage(
+            {
+                action: 'getHelmRepos',
+                data: {
+                    helmRepos
                 }
-            );
-            helmRepos.forEach((helmRepo: HelmRepo) => {
-                let url = helmRepo.url;
-                url = url.endsWith('/') ? url : url.concat('/');
-                url = url.concat('index.yaml');
-                void fetchURL(helmRepo, url);
-            });
-        }
+            }
+        );
+        helmRepos.forEach((helmRepo: HelmRepo) => {
+            let url = helmRepo.url;
+            url = url.endsWith('/') ? url : url.concat('/');
+            url = url.concat('index.yaml');
+            void fetchURL(helmRepo, url);
+        });
     }
 }
 
