[WIP] remove cycle view -> loader -> functions

Signed-off-by: David Thompson <davthomp@redhat.com>

Author: datho7561

src/serverlessFunction/functionModel.ts

@@ -11,19 +11,15 @@ import { CliChannel } from '../cli';
 import { DeploymentConfig } from '../k8s/deploymentConfig';
 import { Utils } from './commands';
 import { Functions } from './functions';
-import { DeployedFunction, FunctionContent, FunctionObject, FunctionStatus } from './types';
-
-export interface View {
-    refresh(): void;
-}
+import { DeployedFunction, FunctionContent, FunctionObject, FunctionStatus, FunctionView } from './types';
 
 export class ServerlessFunctionModel implements Disposable {
 
     private watchers: fs.FSWatcher[] = [];
     private workspaceWatcher: Disposable;
-    private view: View;
+    private view: FunctionView;
 
-    public constructor(view: View) {
+    public constructor(view: FunctionView) {
         this.view = view;
         this.addWatchers();
         this.workspaceWatcher = workspace.onDidChangeWorkspaceFolders((_e) => {

src/serverlessFunction/functions.ts

@@ -3,17 +3,16 @@
  *  Licensed under the MIT License. See LICENSE file in the project root for license information.
  *-----------------------------------------------------------------------------------------------*/
 
-import { EventEmitter, Terminal, Uri, commands, window } from 'vscode';
-import { ClusterVersion, FunctionContent, FunctionObject, InvokeFunction, RunResponse } from './types';
+import { ChildProcess, SpawnOptions } from 'child_process';
 import validator from 'validator';
-import { ServerlessCommand, Utils } from './commands';
-import { Platform } from '../util/platform';
-import { OdoImpl } from '../odo';
+import { commands, EventEmitter, Terminal, Uri, window } from 'vscode';
 import { CliChannel } from '../cli';
-import { ChildProcess, SpawnOptions } from 'child_process';
-import { ServerlessFunctionView } from './view';
-import { multiStep } from './multiStepInput';
+import { OdoImpl } from '../odo';
+import { Platform } from '../util/platform';
 import { Progress } from '../util/progress';
+import { ServerlessCommand, Utils } from './commands';
+import { multiStep } from './multiStepInput';
+import { ClusterVersion, FunctionContent, FunctionObject, FunctionView, InvokeFunction, RunResponse } from './types';
 
 export class Functions {
 
@@ -51,7 +50,7 @@ export class Functions {
         }
     }
 
-    public async build(context: FunctionObject): Promise<void> {
+    public async build(context: FunctionObject, view: FunctionView): Promise<void> {
         const exisitingTerminal = this.buildTerminalMap.get(`build-${context.folderURI.fsPath}`);
         const outputEmitter = this.buildEmiterMap.get(`build-${context.folderURI.fsPath}`);
         if (exisitingTerminal) {
@@ -81,18 +80,18 @@ export class Functions {
                         });
                         exisitingProcess.on('exit', () => {
                             context.hadBuilt = true;
-                            ServerlessFunctionView.getInstance().refresh(context);
+                            view.refresh(context);
                             outputEmitter.fire('\r\nPress any key to close this terminal\r\n');
                         });
                     });
                 }
             });
         } else {
-            await this.buildProcess(context);
+            await this.buildProcess(context, view);
         }
     }
 
-    private async buildProcess(context: FunctionObject) {
+    private async buildProcess(context: FunctionObject, view: FunctionView) {
         const clusterVersion: ClusterVersion | null = await this.checkOpenShiftCluster();
         const buildImage = await this.getImage(context.folderURI);
         const outputEmitter = new EventEmitter<string>();
@@ -121,7 +120,7 @@ export class Functions {
                         });
                         devProcess.on('exit', () => {
                             context.hadBuilt = true;
-                            ServerlessFunctionView.getInstance().refresh(context);
+                            view.refresh(context);
                             outputEmitter.fire('\r\nPress any key to close this terminal\r\n');
                         });
                     });
@@ -231,7 +230,7 @@ export class Functions {
     }
 
     public async deploy(context: FunctionObject) {
-        const currentNamespace: string = ServerlessFunctionView.getInstance().getCurrentNameSpace();
+        const currentNamespace: string = await OdoImpl.Instance.getActiveProject();
         const yamlContent = await Utils.getFuncYamlContent(context.folderURI.fsPath);
         if (yamlContent) {
             const deployedNamespace = yamlContent.deploy?.namespace || undefined;

src/serverlessFunction/types.ts

@@ -5,6 +5,10 @@
 
 import { Uri } from 'vscode';
 
+export interface FunctionView {
+    refresh(context?: FunctionObject);
+}
+
 export interface FunctionContent {
     name?: string;
     deploy?: {

src/serverlessFunction/view.ts

@@ -218,7 +218,7 @@ export class ServerlessFunctionView implements TreeDataProvider<ExplorerItem>, D
 
     @vsCommand('openshift.Serverless.build')
     static async buildFunction(context: FunctionObject) {
-        await Functions.getInstance().build(context);
+        await Functions.getInstance().build(context, this);
     }
 
     @vsCommand('openshift.Serverless.buildAndRun')