fix: workspace issues

src/app/workspace/workspace-template/workspace-template-list/workspace-template-list.component.html

@@ -44,7 +44,8 @@
                     (deleteWorkspaceTemplateClicked)="deleteWorkspaceTemplate($event)"
                     class="mr-3 pointer-hover"
                     [ngClass]="{selected: selectedTemplate?.name === template.name}"
-                    [template]="template">
+                    [template]="template"
+                    [deleting]="deletingTemplates.has(template.uid)">
             </app-workspace-template-summary-view>
         </div>
     </div>

src/app/workspace/workspace-template/workspace-template-list/workspace-template-list.component.ts

@@ -66,6 +66,12 @@ export class WorkspaceTemplateListComponent implements OnInit, CanComponentDeact
 
   state: WorkspaceTemplateState = 'create';
 
+  /**
+   * terminatingTemplates keeps track of all of the workspace templates that are currently being
+   * deleted.
+   */
+  deletingTemplates = new Map<string, WorkspaceTemplate>();
+
   constructor(
       private appRouter: AppRouter,
       private workspaceTemplateService: WorkspaceTemplateServiceService,
@@ -251,16 +257,21 @@ export class WorkspaceTemplateListComponent implements OnInit, CanComponentDeact
         return;
       }
 
+      this.deletingTemplates.set(template.uid, template);
+
       this.workspaceTemplateService.archiveWorkspaceTemplate(this.namespace, template.uid)
           .subscribe(res => {
+            this.deletingTemplates.delete(template.uid);
             const templateIndex = this.workspaceTemplates.indexOf(template);
             if(templateIndex > -1) {
               this.workspaceTemplates.splice(templateIndex, 1);
             }
 
             this.getWorkspaceTemplates();
             this.selectedTemplate = null;
+            this.state = 'create';
           }, (err: HttpErrorResponse) => {
+            this.deletingTemplates.delete(template.uid);
             if(err.status === 400 && err.error.code  === 9) {
               this.alertService.storeAlert(new Alert({
                 message: 'Error deleting template ' + template.uid + ', it has running workspaces',
@@ -273,7 +284,6 @@ export class WorkspaceTemplateListComponent implements OnInit, CanComponentDeact
               message: 'Error deleting template ' + template.uid,
               type: 'danger',
             }));
-
           })
     });
   }

src/app/workspace/workspace-template/workspace-template-summary-view/workspace-template-summary-view.component.html

@@ -1,7 +1,13 @@
 <div class="workspace-template-summary-view op-border op-rounded-regular d-inline-flex flex-column align-items-center">
-    <button [class.hidden]="!showMenu" mat-icon-button [matMenuTriggerFor]="appMenu" style="align-self: flex-end">
-        <mat-icon>more_vert</mat-icon>
-    </button>
+    <div class="d-inline-flex justify-content-between w-100 align-items-center">
+        <div class="ml-3 font-roboto" [class.visible]="deleting" [class.hidden]="!deleting">
+            <img class="terminating-icon" src="/assets/images/status-icons/failed.svg"/>
+            <span class="ml-2">Deleting</span>
+        </div>
+        <button [class.hidden]="!showMenu" mat-icon-button [matMenuTriggerFor]="appMenu">
+            <mat-icon>more_vert</mat-icon>
+        </button>
+    </div>
     <div class="content text-center">
         <i [class]="iconClass"></i>
         <div class="title font-proxima-bold font-size-regular mt-3">{{template.name}}</div>

src/app/workspace/workspace-template/workspace-template-summary-view/workspace-template-summary-view.component.scss

@@ -16,6 +16,11 @@
   .title {
     font-weight: 900;
   }
+
+  .terminating-icon {
+    position: relative;
+    top: 2px;
+  }
 }
 
 .workspace-template-menu-icon {

src/app/workspace/workspace-template/workspace-template-summary-view/workspace-template-summary-view.component.ts

@@ -10,6 +10,7 @@ export class WorkspaceTemplateSummaryViewComponent implements OnInit {
   @Input() iconClass = 'fas fa-desktop';
   @Input() template: WorkspaceTemplate;
   @Input() showMenu = true;
+  @Input() deleting = false;
 
   @Output() createWorkspaceClicked = new EventEmitter<WorkspaceTemplate>();
   @Output() cloneWorkspaceTemplateClicked = new EventEmitter<WorkspaceTemplate>();

src/app/workspace/workspace-view/workspace-view.component.ts

@@ -1,5 +1,5 @@
-import { Component, ElementRef, OnDestroy, OnInit, ViewChild } from '@angular/core';
-import { ActivatedRoute, Router } from "@angular/router";
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { ActivatedRoute } from "@angular/router";
 import { Parameter, UpdateWorkspaceBody, Workspace, WorkspaceServiceService } from "../../../api";
 import { DomSanitizer, SafeResourceUrl } from "@angular/platform-browser";
 import { MatDialog } from "@angular/material/dialog";
@@ -8,7 +8,6 @@ import {
   ConfirmationDialogData
 } from "../../confirmation-dialog/confirmation-dialog.component";
 import { AppRouter } from "../../router/app-router.service";
-import { WorkflowExecuteDialogComponent } from "../../workflow/workflow-execute-dialog/workflow-execute-dialog.component";
 
 export type WorkspaceState = 'Launching' | 'Updating' | 'Pausing' | 'Paused' | 'Resuming' | 'Running' | 'Deleting';
 
@@ -76,7 +75,7 @@ export class WorkspaceViewComponent implements OnInit, OnDestroy {
   getWorkspace() {
     this.workspaceService.getWorkspace(this.namespace, this.workspaceUid).subscribe(res => {
       this.workspace = res;
-      // t query parameter is so we avoid caching the response.
+      // We add a 't' query parameter is so we avoid caching the response.
       this.workspaceUrl = this.domSanitizer.bypassSecurityTrustResourceUrl(res.url + "?t=" + Date.now());
 
       this.parameters = res.parameters;