Update server and implement scopes

Author: mustard-mh

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

@@ -20,7 +20,7 @@ import { converter } from "./public-api";
 import { getGitpodService } from "./service";
 import { PaginationResponse } from "@gitpod/public-api/lib/gitpod/v1/pagination_pb";
 import { generateAsyncGenerator } from "@gitpod/gitpod-protocol/lib/generate-async-generator";
-import { WorkspaceInstance } from "@gitpod/gitpod-protocol";
+import { GetWorkspacesScope, WorkspaceInstance } from "@gitpod/gitpod-protocol";
 
 export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceService> {
     async getWorkspace(request: PartialMessage<GetWorkspaceRequest>): Promise<GetWorkspaceResponse> {
@@ -90,24 +90,28 @@ export class JsonRpcWorkspaceClient implements PromiseClient<typeof WorkspaceSer
         _options?: CallOptions,
     ): Promise<ListWorkspacesResponse> {
         request.scope = request.scope ?? ListWorkspacesRequest_Scope.MY_WORKSPACES_IN_ORGANIZATION;
-        if (
-            request.scope === ListWorkspacesRequest_Scope.MY_WORKSPACES_IN_ORGANIZATION ||
-            request.scope === ListWorkspacesRequest_Scope.ALL_WORKSPACES_IN_ORGANIZATION
-        ) {
-            throw new ConnectError("organization_id is required", Code.InvalidArgument);
+        let getWorkspacesScope: GetWorkspacesScope = GetWorkspacesScope.MY_WORKSPACES_IN_ORGANIZATION;
+        if (request.scope === ListWorkspacesRequest_Scope.ALL_WORKSPACES_IN_INSTALLATION) {
+            getWorkspacesScope = GetWorkspacesScope.ALL_WORKSPACES_IN_INSTALLATION;
+        } else if (request.scope === ListWorkspacesRequest_Scope.ALL_WORKSPACES_IN_ORGANIZATION) {
+            getWorkspacesScope = GetWorkspacesScope.ALL_WORKSPACES_IN_ORGANIZATION;
+        } else if (request.scope === ListWorkspacesRequest_Scope.MY_WORKSPACES_IN_ORGANIZATION) {
+            getWorkspacesScope = GetWorkspacesScope.MY_WORKSPACES_IN_ORGANIZATION;
         }
         const server = getGitpodService().server;
         const pageSize = request.pagination?.pageSize || 100;
-        const workspaces = await server.getWorkspaces({
+        const results = await server.getWorkspaces({
             organizationId: request.organizationId,
-            pinnedOnly: request.pinned === true ? true : undefined,
+            pinnedOnly: request.pinned,
             limit: pageSize,
             offset: (request.pagination?.page ?? 0) * pageSize,
+            searchString: request.searchTerm,
+            scope: getWorkspacesScope,
         });
         const response = new ListWorkspacesResponse();
-        response.workspaces = workspaces.map((info) => converter.toWorkspace(info));
+        response.workspaces = results.rows.map((info) => converter.toWorkspace(info));
         response.pagination = new PaginationResponse();
-        response.pagination.total = workspaces.length;
+        response.pagination.total = results.total;
         return response;
     }
 }

components/gitpod-db/package.json

@@ -12,7 +12,7 @@
     "test": "yarn db-test",
     "watch": "leeway exec --package .:lib --transitive-dependencies --filter-type yarn --components --parallel -- tsc -w --preserveWatchOutput",
     "db-test": "r(){ . $(leeway run components/gitpod-db:db-test-env); yarn db-test-run; };r",
-    "db-test-run": "mocha '**/*.spec.db.ts' --exclude './node_modules/**' --exit",
+    "db-test-run": "mocha '**/workspace-db.spec.db.ts' --exclude './node_modules/**' --exit",
     "wait-for-db": "node ./lib/wait-for-db.js",
     "typeorm": "typeorm -f lib/typeorm/ormconfig",
     "migrate-migrations": "node ./lib/migrate-migrations.js",

components/gitpod-db/src/typeorm/workspace-db-impl.ts

@@ -210,13 +210,16 @@ export class TypeORMWorkspaceDBImpl extends TransactionalDBImpl<WorkspaceDB> imp
                 "wsiRunning",
                 "ws.id = wsiRunning.workspaceId",
             )
-            .where("ws.ownerId = :userId", { userId: options.userId })
-            .andWhere("ws.softDeletedTime = ''") // enables usage of: ind_softDeletion
+            .where("ws.softDeletedTime = ''") // enables usage of: ind_softDeletion
             .andWhere("ws.softDeleted IS NULL")
             .andWhere("ws.deleted != TRUE")
             .orderBy("wsiRunning.workspaceId", "DESC")
             .addOrderBy("GREATEST(ws.creationTime, wsi.creationTime, wsi.startedTime, wsi.stoppedTime)", "DESC")
+            .offset(options.offset || 0)
             .limit(options.limit || 10);
+        if (options.userId) {
+            qb.andWhere("ws.ownerId = :userId", { userId: options.userId });
+        }
         if (options.searchString) {
             qb.andWhere("ws.description LIKE :searchString", { searchString: `%${options.searchString}%` });
         }