From 80338f194b5ad5270c874899520acd01eb2d257e Mon Sep 17 00:00:00 2001
From: Piotr Pekala <piotrpawelpekala@gmail.com>
Date: Thu, 30 May 2019 06:21:36 -0700
Subject: [PATCH 1/3] Display progress when server is starting

---
 src/app/components/servers/servers.component.html | 7 +++++--
 src/app/components/servers/servers.component.ts   | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
index 124e91f1..b1ac30f1 100644
--- a/src/app/components/servers/servers.component.html
+++ b/src/app/components/servers/servers.component.html
@@ -13,8 +13,9 @@
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
           <mat-cell *matCellDef="let row">
-            <a [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a></mat-cell
-          >
+            <a *ngIf="getServerStatus(row) === 'running'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
+            <span *ngIf="getServerStatus(row) != 'running'">{{ row.name }}</span>
+          </mat-cell>
         </ng-container>
 
         <ng-container matColumnDef="location">
@@ -42,6 +43,8 @@
             <button mat-icon-button (click)="stopServer(row)" *ngIf="row.location === 'local' && getServerStatus(row) === 'running'">
               <mat-icon aria-label="Stop server">stop</mat-icon>
             </button>
+
+            <mat-spinner [diameter]="24" *ngIf="row.location === 'local' && getServerStatus(row) === 'starting'"></mat-spinner>
             
             <button mat-icon-button (click)="deleteServer(row)">
               <mat-icon aria-label="Remove server">delete</mat-icon>
diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts
index d487e2d4..2e8e35ec 100644
--- a/src/app/components/servers/servers.component.ts
+++ b/src/app/components/servers/servers.component.ts
@@ -98,10 +98,12 @@ export class ServersComponent implements OnInit, OnDestroy {
   }
 
   async startServer(server: Server) {
+    server.status = "starting";
     await this.serverManagement.start(server);
   }
 
   async stopServer(server: Server) {
+    server.status = "stopped";
     await this.serverManagement.stop(server);
   }
 }

From 3f823fac4c587229a5bc86e1b968964f7b50a6f1 Mon Sep 17 00:00:00 2001
From: Piotr Pekala <piotrpawelpekala@gmail.com>
Date: Tue, 4 Jun 2019 05:56:25 -0700
Subject: [PATCH 2/3] Fixes after review

---
 src/app/components/servers/servers.component.html | 4 ++--
 src/app/components/servers/servers.component.ts   | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/app/components/servers/servers.component.html b/src/app/components/servers/servers.component.html
index b1ac30f1..af9774d7 100644
--- a/src/app/components/servers/servers.component.html
+++ b/src/app/components/servers/servers.component.html
@@ -13,8 +13,8 @@
         <ng-container matColumnDef="name">
           <mat-header-cell *matHeaderCellDef> Name </mat-header-cell>
           <mat-cell *matCellDef="let row">
-            <a *ngIf="getServerStatus(row) === 'running'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
-            <span *ngIf="getServerStatus(row) != 'running'">{{ row.name }}</span>
+            <a *ngIf="getServerStatus(row) === 'running' || row.location === 'remote'" [routerLink]="['/server', row.id, 'projects']" class="table-link">{{ row.name }}</a>
+            <span *ngIf="getServerStatus(row) != 'running' && row.location !== 'remote'">{{ row.name }}</span>
           </mat-cell>
         </ng-container>
 
diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts
index 2e8e35ec..e0f6d402 100644
--- a/src/app/components/servers/servers.component.ts
+++ b/src/app/components/servers/servers.component.ts
@@ -103,7 +103,6 @@ export class ServersComponent implements OnInit, OnDestroy {
   }
 
   async stopServer(server: Server) {
-    server.status = "stopped";
     await this.serverManagement.stop(server);
   }
 }

From 7a166cc69df5b02eac639111e303700c0101f11c Mon Sep 17 00:00:00 2001
From: Piotr Pekala <piotrpawelpekala@gmail.com>
Date: Wed, 12 Jun 2019 03:01:40 -0700
Subject: [PATCH 3/3] Fixes after review

---
 src/app/components/servers/servers.component.ts | 4 +++-
 src/app/services/server-management.service.ts   | 8 +++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/app/components/servers/servers.component.ts b/src/app/components/servers/servers.component.ts
index e0f6d402..a6e241f2 100644
--- a/src/app/components/servers/servers.component.ts
+++ b/src/app/components/servers/servers.component.ts
@@ -49,6 +49,9 @@ export class ServersComponent implements OnInit, OnDestroy {
       if(!server) {
         return;
       }
+      if(serverStatus.status === 'starting') {
+        server.status = 'starting';
+      }
       if(serverStatus.status === 'stopped') {
         server.status = 'stopped';
       }
@@ -98,7 +101,6 @@ export class ServersComponent implements OnInit, OnDestroy {
   }
 
   async startServer(server: Server) {
-    server.status = "starting";
     await this.serverManagement.start(server);
   }
 
diff --git a/src/app/services/server-management.service.ts b/src/app/services/server-management.service.ts
index 5dbecd87..45778732 100644
--- a/src/app/services/server-management.service.ts
+++ b/src/app/services/server-management.service.ts
@@ -5,7 +5,7 @@ import { Subject } from 'rxjs';
 
 export interface ServerStateEvent {
   serverName: string;
-  status: "started" | "errored" | "stopped" | "stderr";
+  status: "starting" | "started" | "errored" | "stopped" | "stderr";
   message: string;
 }
 
@@ -29,6 +29,12 @@ export class ServerManagementService implements OnDestroy {
   }
 
   async start(server: Server) {
+    var startingEvent : ServerStateEvent = {
+      serverName: server.name,
+      status: "starting",
+      message: ''
+    };
+    this.serverStatusChanged.next(startingEvent);
     return await this.electronService.remote.require('./local-server.js').startLocalServer(server);
   }