Implement

Author: mustard-mh

components/dashboard/src/service/json-rpc-workspace-client.ts

@@ -200,8 +200,11 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
         if (!request.workspaceId) {
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "workspaceId is required");
         }
+
+        // check if user can access workspace first
+        await this.getWorkspace({ workspaceId: request.workspaceId });
+
         const server = getGitpodService().server;
-        // tasks to wait for promise all with type defined
         const tasks: Array<Promise<any>> = [];
 
         if (request.name) {
@@ -218,7 +221,6 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
             tasks.push(server.updateWorkspaceUserPin(request.workspaceId, request.pinned ? "pin" : "unpin"));
         }
         if (Number(request.timeout?.seconds ?? 0) > 0) {
-            // convert request.timeout into format like 3h or 3d
             const timeout = converter.toDurationString(request.timeout!);
             tasks.push(server.setWorkspaceTimeout(request.workspaceId, timeout));
         }
@@ -249,7 +251,10 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
         request: PartialMessage<ListWorkspaceClassesRequest>,
         _options?: CallOptions | undefined,
     ): Promise<ListWorkspaceClassesResponse> {
-        // const list = await getGitpodService().server.getSupportedWorkspaceClasses();
-        throw new ApplicationError(ErrorCodes.UNIMPLEMENTED, "not implemented");
+        const list = await getGitpodService().server.getSupportedWorkspaceClasses();
+        const response = new ListWorkspaceClassesResponse();
+        response.pagination = new PaginationResponse();
+        response.workspaceClasses = list.map((i) => converter.toWorkspaceClass(i));
+        return response;
     }
 }

components/gitpod-protocol/src/public-api-converter.spec.ts

@@ -64,6 +64,7 @@ import {
     TooManyRunningWorkspacesError,
 } from "@gitpod/public-api/lib/gitpod/v1/error_pb";
 import { SSHPublicKey } from "@gitpod/public-api/lib/gitpod/v1/ssh_pb";
+import { SupportedWorkspaceClass } from "./workspace-class";
 
 describe("PublicAPIConverter", () => {
     const converter = new PublicAPIConverter();
@@ -1432,4 +1433,22 @@ describe("PublicAPIConverter", () => {
             );
         });
     });
+
+    describe("toWorkspaceClass", () => {
+        it("should convert a SupportedWorkspaceClass to WorkspaceClass", () => {
+            const cls: SupportedWorkspaceClass = {
+                id: "g1-standard",
+                category: "GENERAL PURPOSE",
+                displayName: "Standard",
+                description: "Up to 4 cores, 8GB RAM, 30GB storage",
+                powerups: 1,
+                isDefault: true,
+            };
+            const converted = converter.toWorkspaceClass(cls);
+            expect(converted.id).to.equal(cls.id);
+            expect(converted.displayName).to.equal(cls.displayName);
+            expect(converted.description).to.equal(cls.description);
+            expect(converted.isDefault).to.equal(cls.isDefault);
+        });
+    });
 });

components/gitpod-protocol/src/public-api-converter.ts

@@ -41,6 +41,7 @@ import {
     AdmissionLevel,
     EditorReference,
     Workspace,
+    WorkspaceClass,
     WorkspaceConditions,
     WorkspaceEnvironmentVariable,
     WorkspaceGitStatus,
@@ -109,6 +110,7 @@ import {
 } from "./workspace-instance";
 import { Author, Commit } from "@gitpod/public-api/lib/gitpod/v1/scm_pb";
 import type { DeepPartial } from "./util/deep-partial";
+import { SupportedWorkspaceClass } from "./workspace-class";
 
 export type PartialConfiguration = DeepPartial<Configuration> & Pick<Configuration, "id">;
 
@@ -961,4 +963,13 @@ export class PublicAPIConverter {
             nanos: (totalSeconds - Math.floor(totalSeconds)) * 1e9,
         });
     }
+
+    toWorkspaceClass(cls: SupportedWorkspaceClass): WorkspaceClass {
+        return new WorkspaceClass({
+            id: cls.id,
+            displayName: cls.displayName,
+            description: cls.description,
+            isDefault: cls.isDefault,
+        });
+    }
 }

components/public-api/gitpod/v1/workspace.proto

@@ -211,10 +211,14 @@ message UpdateWorkspaceRequest {
   optional WorkspaceGitStatus git_status = 6;
 }
 
-message ListWorkspaceClassesRequest {}
+message ListWorkspaceClassesRequest {
+  PaginationRequest pagination = 1;
+}
 
 message ListWorkspaceClassesResponse {
-  repeated WorkspaceClass result = 1;
+  PaginationResponse pagination = 1;
+
+  repeated WorkspaceClass workspace_classes = 2;
 }
 
 message UpdateWorkspaceResponse {