Filter by organizationId in ListWorkspaces

Author: filiptronicek

components/gitpod-protocol/go/gitpod-service.go

@@ -1490,9 +1490,11 @@ type UserInfo struct {
 
 // GetWorkspacesOptions is the GetWorkspacesOptions message type
 type GetWorkspacesOptions struct {
-	Limit        float64 `json:"limit,omitempty"`
-	PinnedOnly   bool    `json:"pinnedOnly,omitempty"`
-	SearchString string  `json:"searchString,omitempty"`
+	Limit                 float64 `json:"limit,omitempty"`
+	SearchString          string  `json:"searchString,omitempty"`
+	PinnedOnly            bool    `json:"pinnedOnly,omitempty"`
+	IncludeWithoutProject bool    `json:"includeWithoutProject,omitempty"`
+	OrganizationId        string  `json:"organizationId,omitempty"`
 }
 
 // StartWorkspaceResult is the StartWorkspaceResult message type

components/public-api-server/pkg/apiv1/workspace.go

@@ -140,7 +140,8 @@ func (s *WorkspaceService) ListWorkspaces(ctx context.Context, req *connect.Requ
 		return nil, err
 	}
 	serverResp, err := conn.GetWorkspaces(ctx, &protocol.GetWorkspacesOptions{
-		Limit: float64(limit),
+		Limit:          float64(limit),
+		OrganizationId: req.Msg.GetOrganizationId(),
 	})
 	if err != nil {
 		return nil, proxy.ConvertError(err)

components/public-api/gitpod/experimental/v1/workspaces.proto

@@ -45,6 +45,7 @@ service WorkspacesService {
 message ListWorkspacesRequest {
     Pagination pagination = 1;
     google.protobuf.FieldMask field_mask = 2;
+    string organization_id = 3;
 }
 message ListWorkspacesResponse {
     string next_page_token = 1;