moved registryview loader dependency from component view

Signed-off-by: msivasubramaniaan <msivasub@redhat.com>

Author: msivasubramaniaan

src/extension.ts

@@ -31,7 +31,6 @@ import { WelcomePage } from './welcomePage';
 import { ComponentsTreeDataProvider } from './componentsView';
 
 import fsx = require('fs-extra');
-import { getAllComponents } from './webview/devfile-registry/registryViewLoader';
 
 
 // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -145,12 +144,6 @@ export async function activate(extensionContext: ExtensionContext): Promise<any>
 
     void ComponentTypesView.instance.getAllComponents();
 
-    ComponentTypesView.instance.subject.subscribe((value: string) => {
-        if (value === 'refresh') {
-            getAllComponents('getAllComponents');
-        }
-    });
-
     OdoImpl.Instance.loadWorkspaceComponents(null);
 
     startTelemetry(extensionContext);

src/registriesView.ts

@@ -23,7 +23,6 @@ import {
 import { StarterProject } from './odo/componentTypeDescription';
 import { vsCommand, VsCommandError } from './vscommand';
 import validator from 'validator';
-import RegistryViewLoader from './webview/devfile-registry/registryViewLoader';
 import { Command } from './odo/command';
 import { CliExitData } from './cli';
 import { Subject } from 'rxjs';
@@ -135,13 +134,8 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
                 }).catch(() => {
                     isError = true;
                 }).finally(() => {
-                    if (isError) {
-                        if (this.subject.closed) {
-                            this.subject = new Subject<string>();
-                            this.getAllComponents();
-                        } else {
-                            this.subject.next('refresh');
-                        }
+                    if (isError && !this.subject.closed) {
+                        this.subject.next('refresh');
                     }
                 });
             });
@@ -300,7 +294,6 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
         ComponentTypesView.instance.addRegistry(newRegistry);
 
         ComponentTypesView.instance.getAllComponents();
-        RegistryViewLoader.refresh()
     }
 
     @vsCommand('openshift.componentTypesView.registry.remove')
@@ -315,7 +308,6 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
             ComponentTypesView.instance.removeRegistry(registry);
             if (!isEdit) {
                 ComponentTypesView.instance.getAllComponents();
-                RegistryViewLoader.refresh();
             }
         }
     }
@@ -329,9 +321,4 @@ export class ComponentTypesView implements TreeDataProvider<ComponentType> {
     public static async openRegistryWebSite(registry: Registry): Promise<void> {
         await commands.executeCommand('vscode.open', Uri.parse(registry.URL));
     }
-
-    @vsCommand('openshift.componentTypesView.registry.openInView')
-    public static async openRegistryInWebview(): Promise<void> {
-        await RegistryViewLoader.loadView('Devfile Registry');
-    }
 }

src/webview/devfile-registry/registryViewLoader.ts

@@ -105,6 +105,11 @@ export default class RegistryViewLoader {
             .replace('<!-- meta http-equiv="Content-Security-Policy" -->', meta);
     }
 
+    @vsCommand('openshift.componentTypesView.registry.openInView')
+    public static async openRegistryInWebview(): Promise<void> {
+        await RegistryViewLoader.loadView('Devfile Registry');
+    }
+
     @vsCommand('openshift.componentTypesView.registry.closeView')
     static async closeRegistryInWebview(): Promise<void> {
         panel?.dispose();
@@ -117,14 +122,21 @@ export default class RegistryViewLoader {
     }
 }
 
-export function getAllComponents(eventActionName: string) {
+function getAllComponents(eventActionName: string) {
     const registries = ComponentTypesView.instance.getListOfRegistries();
     const componentDescriptions = ComponentTypesView.instance.getCompDescriptions();
-    panel.webview.postMessage(
+    panel?.webview.postMessage(
         {
             action: eventActionName,
             compDescriptions: Array.from(componentDescriptions),
             registries: registries
         }
     );
 }
+
+ComponentTypesView.instance.subject.subscribe((value: string) => {
+    if (value === 'refresh') {
+        RegistryViewLoader.refresh();
+        getAllComponents('getAllComponents');
+    }
+});