[dashboard] fix deletion of workspaces

Author: svenefftinge

components/dashboard/src/workspaces/WorkspaceEntry.tsx

@@ -53,11 +53,14 @@ export function WorkspaceEntry({ desc, model }: { desc: WorkspaceInfo, model: Wo
         {
             title: 'Open',
             href: startUrl.toString()
-        },
-        {
+        }];
+    if (state === 'running') {
+        menuEntries.push({
             title: 'Stop',
             onClick: () => getGitpodService().server.stopWorkspace(ws.id)
-        },
+        });
+    }
+    menuEntries.push(
         {
             title: 'Download',
             href: downloadURL
@@ -84,7 +87,7 @@ export function WorkspaceEntry({ desc, model }: { desc: WorkspaceInfo, model: Wo
                 setModalVisible(true);
             }
         }
-    ];
+    );
     const project = getProject(ws);
     const showChanges = (event: MouseEvent) => {
         event.preventDefault();
@@ -139,7 +142,7 @@ export function WorkspaceEntry({ desc, model }: { desc: WorkspaceInfo, model: Wo
                 <div className="flex">
                     <div className="flex-1"></div>
                     <button className="cursor-pointer px-3 py-2 text-white text-sm rounded-md border-2 border-red-800 bg-red-600 hover:bg-red-800"
-                        onClick={() => getGitpodService().server.deleteWorkspace(ws.id)}>
+                        onClick={() => model.deleteWorkspace(ws.id)}>
                         Delete
                     </button>
                 </div>

components/dashboard/src/workspaces/workspace-model.ts

@@ -2,7 +2,7 @@ import { Disposable, DisposableCollection, GitpodClient, WorkspaceInfo, Workspac
 import { getGitpodService } from "../service/service";
 
 export class WorkspaceModel implements Disposable, Partial<GitpodClient> {
-
+    
     protected workspaces = new Map<string,WorkspaceInfo>();
     protected currentlyFetching = new Set<string>();
     protected disposables = new DisposableCollection();
@@ -15,7 +15,7 @@ export class WorkspaceModel implements Disposable, Partial<GitpodClient> {
     constructor(protected setWorkspaces: (ws: WorkspaceInfo[]) => void) {
         this.internalRefetch();
     }
-
+    
     protected internalRefetch() {
         this.disposables.dispose();
         this.disposables = new DisposableCollection();
@@ -27,17 +27,17 @@ export class WorkspaceModel implements Disposable, Partial<GitpodClient> {
         });
         this.disposables.push(getGitpodService().registerClient(this));
     }
-
+    
     protected updateMap(workspaces: WorkspaceInfo[]) {
         for (const ws of workspaces) {
             this.workspaces.set(ws.workspace.id, ws);
         }
     }
-
+    
     dispose(): void {
         this.disposables.dispose();
     }
-
+    
     async onInstanceUpdate(instance: WorkspaceInstance) {
         if (this.workspaces) {
             if (this.workspaces.has(instance.workspaceId)) {
@@ -58,7 +58,13 @@ export class WorkspaceModel implements Disposable, Partial<GitpodClient> {
             }
         }
     }
-
+    
+    async deleteWorkspace(id: string): Promise<void> {
+        await getGitpodService().server.deleteWorkspace(id);
+        this.workspaces.delete(id);
+        this.notifyWorkpaces();
+    }
+    
     protected internalActive = true;
     get active() {
         return this.internalActive;