Moving console initialization in subclass

Author: exc3eed

client/src/app/site/console/bash/bash.component.ts

@@ -21,6 +21,15 @@ export class BashComponent  extends AbstractConsoleComponent {
       this.consoleType = ConsoleTypes.BASH;
     }
 
+  protected initializeConsole() {
+    this.siteSubscription = this.consoleService.getSite().subscribe(site => {
+      this.site = site;
+    });
+    this.publishingCredSubscription = this.consoleService.getPublishingCredentials().subscribe(publishingCredentials => {
+      this.publishingCredentials = publishingCredentials;
+    });
+  }
+
   /**
    * Get the tab-key command for bash console
    */

client/src/app/site/console/shared/components/abstract.console.component.ts

@@ -1,4 +1,4 @@
-import { OnInit, OnDestroy, ComponentFactoryResolver, ComponentFactory, ComponentRef, ViewChild, ViewContainerRef, ElementRef, Input, EventEmitter } from '@angular/core';
+import { OnInit, OnDestroy, ComponentFactoryResolver, ComponentFactory, ComponentRef, ViewChild, ViewContainerRef, ElementRef, Input} from '@angular/core';
 import { ArmObj } from '../../../../shared/models/arm/arm-obj';
 import { Site } from '../../../../shared/models/arm/site';
 import { PublishingCredentials } from '../../../../shared/models/publishing-credentials';
@@ -19,9 +19,7 @@ export abstract class AbstractConsoleComponent implements OnInit, OnDestroy {
     public initialized = false;
     protected enterPressed = false;
     protected site: ArmObj<Site>;
-    protected siteInitialized = new EventEmitter();
     protected publishingCredentials: ArmObj<PublishingCredentials>;
-    protected publishingCredentialsInitialized = new EventEmitter();
 
     /*** Variables for Tab-key ***/
     protected listOfDir: string[] = [];
@@ -39,8 +37,8 @@ export abstract class AbstractConsoleComponent implements OnInit, OnDestroy {
     private _msgComponents: ComponentRef<any>[] = [];
     private _currentPrompt: ComponentRef<any> = null;
     private _resourceIdSubscription: Subscription;
-    private _siteSubscription: Subscription;
-    private _publishingCredSubscription: Subscription;
+    protected siteSubscription: Subscription;
+    protected publishingCredSubscription: Subscription;
 
     @Input()
     public appName: string;
@@ -60,27 +58,25 @@ export abstract class AbstractConsoleComponent implements OnInit, OnDestroy {
     ngOnInit() {
         this._resourceIdSubscription = this._consoleService.getResourceId().subscribe(resourceId => {
             this.resourceId = resourceId; });
-        this._siteSubscription = this._consoleService.getSite().subscribe(site => {
-            this.site = site;
-            this.siteInitialized.emit(null);
-        });
-        this._publishingCredSubscription = this._consoleService.getPublishingCredentials().subscribe(publishingCredentials => {
-            this.publishingCredentials = publishingCredentials;
-            this.publishingCredentialsInitialized.emit(null);
-        });
+        this.initializeConsole();
         this.initialized = true;
         this.focusConsole();
     }
 
     ngOnDestroy() {
         this._resourceIdSubscription.unsubscribe();
-        this._siteSubscription.unsubscribe();
-        this._publishingCredSubscription.unsubscribe();
+        this.siteSubscription.unsubscribe();
+        this.publishingCredSubscription.unsubscribe();
         if (this.lastAPICall && !this.lastAPICall.closed) {
             this.lastAPICall.unsubscribe();
         }
     }
 
+    /**
+     * 
+     */
+    protected abstract initializeConsole();
+
     /**
      * Mouse Press outside the console,
      * i.e. the console no longer in focus

client/src/app/site/console/shared/components/abstract.windows.component.ts

@@ -2,7 +2,6 @@ import { AbstractConsoleComponent } from './abstract.console.component';
 import { ComponentFactoryResolver } from '@angular/core';
 import { ConsoleService } from '../services/console.service';
 import { Regex, ConsoleConstants, HttpMethods } from '../../../../shared/models/constants';
-import { Observable } from 'rxjs/Observable';
 
 export abstract class AbstractWindowsComponent extends AbstractConsoleComponent {
     private _defaultDirectory = 'D:\\home\\site\\wwwroot';
@@ -14,28 +13,34 @@ export abstract class AbstractWindowsComponent extends AbstractConsoleComponent
         ) {
           super(componentFactoryResolver, consoleService);
           this.dir = this._defaultDirectory;
-          Observable.zip(this.siteInitialized, this.publishingCredentialsInitialized)
-          .subscribe(r => {
-              this.updateDefaultDirectory();
-          });
         }
 
+    protected initializeConsole() {
+        this.siteSubscription = this.consoleService.getSite().subscribe(site => {
+            this.site = site;
+            this.updateDefaultDirectory();
+        });
+        this.publishingCredSubscription = this.consoleService.getPublishingCredentials().subscribe(publishingCredentials => {
+            this.publishingCredentials = publishingCredentials;
+            this.updateDefaultDirectory();
+        });
+    }
+
     protected updateDefaultDirectory() {
-        if (!this.site || !this.publishingCredentials) {
-            return;
+        if (this.site && this.publishingCredentials) {
+            const uri = this.getKuduUri();
+            const header = this.getHeader();
+            const body = {
+                'command': 'cd',
+                'dir': 'site\\wwwroot'
+            };
+            const res = this.consoleService.send(HttpMethods.POST, uri, JSON.stringify(body), header);
+            res.subscribe(data => {
+                const output = data.json();
+                this._defaultDirectory = output.Output.trim();
+                this.dir = this._defaultDirectory;
+            });
         }
-        const uri = this.getKuduUri();
-        const header = this.getHeader();
-        const body = {
-            'command': 'cd',
-            'dir': 'site\\wwwroot'
-        };
-        const res = this.consoleService.send(HttpMethods.POST, uri, JSON.stringify(body), header);
-        res.subscribe(data => {
-            const output = data.json();
-            this._defaultDirectory = output.Output.trim();
-            this.dir = this._defaultDirectory;
-        });
     }
 
     /**