Ensure workspace class is selected if no user choice has been made

Author: Furisto

components/dashboard/src/service/service-mock.ts

@@ -5,6 +5,7 @@
  */
 
 import { createServiceMock, Event, Project, Team, User } from "@gitpod/gitpod-protocol";
+import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
 
 const u1: User = {
     id: "1234",
@@ -218,15 +219,15 @@ const gitpodServiceMock = createServiceMock({
                 displayName: "Standard",
                 description: "Up to 4 vCPU, 8GB memory, 30GB disk",
                 powerups: 1,
-                isDefault: true,
+                isSelected: true,
             },
             {
                 id: "g1-large",
                 category: "GENERAL PURPOSE",
                 displayName: "Large",
                 description: "Up to 8 vCPU, 16GB memory, 50GB disk",
                 powerups: 2,
-                isDefault: false,
+                isSelected: false,
             },
         ];
     },
@@ -265,6 +266,9 @@ const gitpodServiceMock = createServiceMock({
             },
         };
     },
+    getBillingModeForUser: async () => {
+        return BillingMode.NONE;
+    },
 });
 
 export { gitpodServiceMock };

components/dashboard/src/settings/selectClass.tsx

@@ -45,7 +45,7 @@ export default function SelectWorkspaceClass(props: SelectWorkspaceClassProps) {
             setSupportedClasses(classes);
 
             if (!workspaceClass) {
-                setWorkspaceClass(supportedClasses.find((c) => c.isDefault)?.id || "");
+                setWorkspaceClass(classes.find((c) => c.isSelected)?.id || "");
             }
         };
 

components/gitpod-protocol/src/workspace-class.ts

@@ -10,5 +10,5 @@ export interface SupportedWorkspaceClass {
     displayName: string;
     description: string;
     powerups: number;
-    isDefault: boolean;
+    isSelected: boolean;
 }

components/server/src/workspace/gitpod-server-impl.ts

@@ -176,6 +176,8 @@ import { getExperimentsClientForBackend } from "@gitpod/gitpod-protocol/lib/expe
 import { BillableSession, BillableSessionRequest } from "@gitpod/gitpod-protocol/lib/usage";
 import { WorkspaceClusterImagebuilderClientProvider } from "./workspace-cluster-imagebuilder-client-provider";
 import { BillingMode } from "@gitpod/gitpod-protocol/lib/billing-mode";
+import { EntitlementService } from "../billing/entitlement-service";
+import { WorkspaceClasses } from "./workspace-classes";
 
 // shortcut
 export const traceWI = (ctx: TraceContext, wi: Omit<LogContext, "userId">) => TraceContext.setOWI(ctx, wi); // userId is already taken care of in WebsocketConnectionManager
@@ -244,6 +246,8 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     @inject(IDEConfigService) protected readonly ideConfigService: IDEConfigService;
 
+    @inject(EntitlementService) protected readonly entitlementService: EntitlementService;
+
     /** Id the uniquely identifies this server instance */
     public readonly uuid: string = uuidv4();
     public readonly clientMetadata: ClientMetadata;
@@ -3030,6 +3034,13 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
     }
 
     async getSupportedWorkspaceClasses(ctx: TraceContext): Promise<SupportedWorkspaceClass[]> {
+        let user = this.checkAndBlockUser("getSupportedWorkspaceClasses");
+        let selectedClass = await WorkspaceClasses.getConfiguredOrUpgradeFromLegacy(
+            user,
+            this.config.workspaceClasses,
+            this.entitlementService,
+        );
+
         let classes = this.config.workspaceClasses
             .filter((c) => !c.deprecated)
             .map((c) => ({
@@ -3038,7 +3049,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
                 displayName: c.displayName,
                 description: c.description,
                 powerups: c.powerups,
-                isDefault: c.isDefault,
+                isSelected: selectedClass === c.id,
             }));
 
         return classes;