fix json rpc watch

gitpod-io · Nov 8, 2023 · ed01347 · ed01347
1 parent 8a448fb
commit ed01347
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/components/dashboard/src/service/json-rpc-workspace-client.ts b/components/dashboard/src/service/json-rpc-workspace-client.ts
@@ -37,6 +37,14 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
         if (!options?.signal) {
             throw new ConnectError("signal is required", Code.InvalidArgument);
         }
+        if (request.workspaceId) {
+            const resp = await this.getWorkspace({ id: request.workspaceId });
+            if (resp.item?.status) {
+                const response = new WatchWorkspaceStatusResponse();
+                response.status = resp.item.status;
+                yield response;
+            }
+        }
         const it = generateAsyncGenerator<WorkspaceInstance>(
             (queue) => {
                 try {
@@ -54,14 +62,6 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
             },
             { signal: options.signal },
         );
-        if (request.workspaceId) {
-            const resp = await this.getWorkspace({ id: request.workspaceId });
-            if (resp.item?.status) {
-                const response = new WatchWorkspaceStatusResponse();
-                response.status = resp.item.status;
-                yield response;
-            }
-        }
         for await (const item of it) {
             if (!item) {
                 continue;