resolved cyclic dependency

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

Author: msivasubramaniaan

src/serverlessFunction/functions.ts

@@ -9,15 +9,13 @@ import { CliChannel } from '../cli';
 import { Oc } from '../oc/ocWrapper';
 import { Odo } from '../odo/odoWrapper';
 import { isTektonAware } from '../tekton/tekton';
-import { Platform } from '../util/platform';
 import { Progress } from '../util/progress';
 import { OpenShiftTerminalApi, OpenShiftTerminalManager } from '../webview/openshift-terminal/openShiftTerminal';
 import { ServerlessCommand, Utils } from './commands';
 import { GitModel, getGitBranchInteractively, getGitRepoInteractively, getGitStateByPath } from './git/git';
 import { isKnativeServingAware } from './knative';
 import { multiStep } from './multiStepInput';
-import { FunctionContent, FunctionObject, FunctionSession, InvokeFunction } from './types';
-import { ServerlessFunctionView } from './view';
+import { FunctionContent, FunctionObject, FunctionSession } from './types';
 
 export class Functions {
 
@@ -129,7 +127,7 @@ export class Functions {
             teminal: terminal
         };
         this.addSession(context, session);
-        ServerlessFunctionView.getInstance().refresh(context);
+        void commands.executeCommand('openshift.Serverless.refresh', context);
     }
 
     private addSession(context: FunctionObject, session: FunctionSession) {
@@ -192,7 +190,7 @@ export class Functions {
             teminal: terminal
         }
         this.addSession(context, session);
-        ServerlessFunctionView.getInstance().refresh(context);
+        void commands.executeCommand('openshift.Serverless.refresh', context);
         this.buildTerminalMap.set(terminalKey, terminal);
     }
 
@@ -218,7 +216,7 @@ export class Functions {
             teminal: terminal
         }
         this.addSession(context, session);
-        ServerlessFunctionView.getInstance().refresh(context);
+        void commands.executeCommand('openshift.Serverless.refresh', context);
         this.runTerminalMap.set(`run-${context.folderURI.fsPath}`, terminal);
     }
 
@@ -240,14 +238,6 @@ export class Functions {
         });
     }
 
-    public async getTemplates(): Promise<any[]> {
-        const result = await Odo.Instance.execute(ServerlessCommand.getTemplates(), undefined, false);
-        if (result.error) {
-            void window.showErrorMessage(result.error.message);
-        }
-        return JSON.parse(result.stdout) as any[];
-    }
-
     public async deploy(context: FunctionObject) {
         const currentNamespace: string = await Oc.Instance.getActiveProject();
         const yamlContent = await Utils.getFuncYamlContent(context.folderURI.fsPath);
@@ -309,17 +299,7 @@ export class Functions {
             teminal: terminal
         };
         this.addSession(context, session);
-        ServerlessFunctionView.getInstance().refresh(context);
-    }
-
-    public async invoke(functionName: string, invokeFunData: InvokeFunction): Promise<void> {
-       await OpenShiftTerminalManager.getInstance().createTerminal(
-            ServerlessCommand.invokeFunction(invokeFunData),
-            `Invoke: ${functionName}`,
-            undefined, undefined, {
-                onExit: undefined
-            }, true
-        );
+        void commands.executeCommand('openshift.Serverless.refresh', context);
     }
 
     public async config(title: string, context: FunctionObject, mode: string, isAdd = true) {
@@ -377,16 +357,6 @@ export class Functions {
         });
     }
 
-    public getDefaultImages(name: string): string[] {
-        const imageList: string[] = [];
-        const defaultUsername = Platform.getEnv();
-        const defaultQuayImage = `quay.io/${Platform.getOS() === 'win32' ? defaultUsername.USERNAME : defaultUsername.USER}/${name}:latest`;
-        const defaultDockerImage = `docker.io/${Platform.getOS() === 'win32' ? defaultUsername.USERNAME : defaultUsername.USER}/${name}:latest`;
-        imageList.push(defaultQuayImage);
-        imageList.push(defaultDockerImage);
-        return imageList;
-    }
-
     public async getImage(folderURI: Uri): Promise<string> {
         const yamlContent = await Utils.getFuncYamlContent(folderURI.fsPath);
         if (yamlContent?.image && Functions.imageRegex.test(yamlContent.image)) {

src/webview/serverless-function/serverlessFunctionLoader.ts

@@ -10,20 +10,50 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { Odo } from '../../odo/odoWrapper';
 import { ServerlessCommand, Utils } from '../../serverlessFunction/commands';
-import { Functions } from '../../serverlessFunction/functions';
+
 import { InvokeFunction } from '../../serverlessFunction/types';
 import { CliExitData } from '../../util/childProcessUtil';
 import { ExtensionID } from '../../util/constants';
 import { Progress } from '../../util/progress';
 import { selectWorkspaceFolder, selectWorkspaceFolders } from '../../util/workspace';
 import { VsCommandError } from '../../vscommand';
 import { loadWebviewHtml, validateName } from '../common-ext/utils';
+import { Platform } from '../../util/platform';
+import { OpenShiftTerminalManager } from '../openshift-terminal/openShiftTerminal';
 
 export interface ServiceBindingFormResponse {
     selectedService: string;
     bindingName: string;
 }
 
+function getDefaultImages(name: string): string[] {
+    const imageList: string[] = [];
+    const defaultUsername = Platform.getEnv();
+    const defaultQuayImage = `quay.io/${Platform.getOS() === 'win32' ? defaultUsername.USERNAME : defaultUsername.USER}/${name}:latest`;
+    const defaultDockerImage = `docker.io/${Platform.getOS() === 'win32' ? defaultUsername.USERNAME : defaultUsername.USER}/${name}:latest`;
+    imageList.push(defaultQuayImage);
+    imageList.push(defaultDockerImage);
+    return imageList;
+}
+
+async function getTemplates(): Promise<any[]> {
+    const result = await Odo.Instance.execute(ServerlessCommand.getTemplates(), undefined, false);
+    if (result.error) {
+        void vscode.window.showErrorMessage(result.error.message);
+    }
+    return JSON.parse(result.stdout) as any[];
+}
+
+async function invoke(functionName: string, invokeFunData: InvokeFunction): Promise<void> {
+    await OpenShiftTerminalManager.getInstance().createTerminal(
+         ServerlessCommand.invokeFunction(invokeFunData),
+         `Invoke: ${functionName}`,
+         undefined, undefined, {
+             onExit: undefined
+         }, true
+     );
+ }
+
 async function messageListener(panel: vscode.WebviewPanel, event: any): Promise<any> {
     let response: CliExitData;
     const eventName = event.action;
@@ -33,7 +63,7 @@ async function messageListener(panel: vscode.WebviewPanel, event: any): Promise<
         case 'validateName': {
             const flag = validateName(functionName);
             const defaultImages = !flag
-                ? Functions.getInstance().getDefaultImages(functionName)
+                ? getDefaultImages(functionName)
                 : [];
             void panel?.webview.postMessage({
                 action: eventName,
@@ -117,7 +147,7 @@ async function messageListener(panel: vscode.WebviewPanel, event: any): Promise<
                 enableURL: event.enableURL,
                 invokeURL: event.invokeURL,
             };
-            await Functions.getInstance().invoke(functionName, invokeFunData);
+            await invoke(functionName, invokeFunData);
             panel.dispose();
             break;
         }
@@ -155,7 +185,7 @@ export default class ServerlessFunctionViewLoader {
             panel.reveal(vscode.ViewColumn.One);
             return null;
         }
-        const templates = await Functions.getInstance().getTemplates();
+        const templates = await getTemplates();
         if (invoke) {
             const panel = await this.createView(title);
             const getEnvFuncId = crypto.randomUUID();