review comments

Author: AlexTugarev

components/dashboard/src/components/PrebuildLogs.tsx

@@ -108,7 +108,6 @@ export default function PrebuildLogs(props: { workspaceId?: string }) {
   }, [ workspaceInstance?.status.phase ]);
 
   return <>
-    {/* <div className="capitalize">{workspaceInstance?.status.phase}</div> */}
     <Suspense fallback={<div />}>
       <WorkspaceLogs classes="h-64 w-full" logsEmitter={logsEmitter} errorMessage={error?.message} />
     </Suspense>

components/dashboard/src/projects/Prebuild.tsx

@@ -47,7 +47,7 @@ export default function () {
         return (<h1 className="tracking-tight">{prebuild.branch} <span className="text-gray-200">#{prebuild.branchPrebuildNumber}</span></h1>);
     };
 
-    const renderSubbitle = () => {
+    const renderSubtitle = () => {
         if (!prebuild) {
             return "";
         }
@@ -71,7 +71,7 @@ export default function () {
     };
 
     return <>
-        <Header title={renderTitle()} subtitle={renderSubbitle()} />
+        <Header title={renderTitle()} subtitle={renderSubtitle()} />
         <div className="w-full"><PrebuildLogs workspaceId={prebuild?.buildWorkspaceId}/></div>
     </>
 

components/dashboard/src/projects/Project.tsx

@@ -117,7 +117,7 @@ export default function () {
     }
 
     const onNewWorkspace = (branch: Project.BranchDetails) => {
-        window.location.href = gitpodHostUrl.withContext(`${branch.branchUrl}`).toString();
+        window.location.href = gitpodHostUrl.withContext(`${branch.url}`).toString();
     }
 
     const triggerPrebuild = (branch: Project.BranchDetails) => {
@@ -191,7 +191,9 @@ export default function () {
                                 {prebuild ? (<><div className="inline-block align-text-bottom mr-2 w-4 h-4">{statusIcon}</div>{status}</>) : (<span>–</span>)}
                             </div>
                             <span className="flex-grow" />
-                            <button className={`primary mr-2 py-2 ${branch.isDefault ? "" : "opacity-0"} group-hover:opacity-100`} onClick={() => onNewWorkspace(branch)}>New Workspace</button>
+                            <a href={gitpodHostUrl.withContext(`${branch.url}`).toString()}>
+                                <button className={`primary mr-2 py-2 ${branch.isDefault ? "" : "opacity-0"} group-hover:opacity-100`}>New Workspace</button>
+                            </a>
                             <ItemFieldContextMenu className="py-0.5" menuEntries={branchContextMenu(branch)} />
                         </ItemField>
                     </Item>

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

@@ -86,7 +86,7 @@ const gitpodServiceMock = createServiceMock({
         return {
             branches: [{
                 name: "main",
-                branchUrl: "branchUrl",
+                url: "branchUrl",
                 changeDate: t1,
                 changeAuthor: u1.fullName!,
                 changeAuthorAvatar: u1.avatarUrl,

components/dashboard/src/workspaces/workspace-model.ts

@@ -136,7 +136,7 @@ export class WorkspaceModel implements Disposable, Partial<GitpodClient> {
         return (
             info.workspace.pinned ||
             (!!info.latestInstance && info.latestInstance.status?.phase !== 'stopped')
-        );
+        ) && !info.workspace.softDeleted;
     }
 
     public getAllFetchedWorkspaces(): Map<string, WorkspaceInfo> {

components/gitpod-db/src/project-db.ts

@@ -11,11 +11,10 @@ export interface ProjectDB {
     findProjectById(projectId: string): Promise<Project | undefined>;
     findProjectByCloneUrl(cloneUrl: string): Promise<Project | undefined>;
     findProjectsByCloneUrl(cloneUrls: string[]): Promise<Project[]>;
-    findProjectById(projectId: string): Promise<Project | undefined>;
-    findProject(teamId: string, projectName: string): Promise<Project | undefined>;
+    findProjectByTeamAndName(teamId: string, projectName: string): Promise<Project | undefined>;
     findProjectByInstallationId(installationId: string): Promise<Project | undefined>;
     findProjectsByTeam(teamId: string): Promise<Project[]>;
     storeProject(project: Project): Promise<Project>;
     setProjectConfiguration(projectId: string, config: ProjectConfig): Promise<void>;
     markDeleted(projectId: string): Promise<void>;
-}
+}

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

@@ -45,7 +45,7 @@ export class ProjectDBImpl implements ProjectDB {
         return result;
     }
 
-    public async findProject(teamId: string, projectName: string): Promise<Project | undefined> {
+    public async findProjectByTeamAndName(teamId: string, projectName: string): Promise<Project | undefined> {
         const projects = await this.findProjectsByTeam(teamId);
         return projects.find(p => p.name === projectName);
     }

components/gitpod-protocol/src/gitpod-service.ts

@@ -307,8 +307,6 @@ export namespace GitpodServer {
     }
     export interface CreateWorkspaceOptions {
         contextUrl: string;
-        branch?: string;
-        projectId?: string;
         mode?: CreateWorkspaceMode;
         forceDefaultConfig?: boolean;
     }

components/gitpod-protocol/src/teams-projects-protocol.ts

@@ -39,7 +39,7 @@ export namespace Project {
 
     export interface BranchDetails {
         name: string;
-        branchUrl: string;
+        url: string;
         isDefault: boolean;
 
         // Latest commit

components/server/src/auth/resource-access.ts

@@ -4,7 +4,7 @@
  * See License-AGPL.txt in the project root for license information.
  */
 
-import { ContextURL, GitpodToken, Project, Snapshot, Team, TeamMemberInfo, Token, User, UserEnvVar, Workspace, WorkspaceInstance } from "@gitpod/gitpod-protocol";
+import { ContextURL, GitpodToken, Snapshot, Team, TeamMemberInfo, Token, User, UserEnvVar, Workspace, WorkspaceInstance } from "@gitpod/gitpod-protocol";
 import { HostContextProvider } from "./host-context-provider";
 
 declare var resourceInstance: GuardedResource;
@@ -21,7 +21,6 @@ export type GuardedResource =
     GuardedContentBlob |
     GuardEnvVar |
     GuardedTeam |
-    // GuardedProject |
     GuardedWorkspaceLog
     ;
 
@@ -89,11 +88,6 @@ export interface GuardedTeam {
     members: TeamMemberInfo[];
 }
 
-export interface GuardedProject {
-    kind: "project";
-    subject: Project;
-}
-
 export interface GuardedGitpodToken {
     kind: "gitpodToken";
     subject: GitpodToken;

components/server/src/projects/projects-service.ts

@@ -28,7 +28,7 @@ export class ProjectsService {
     }
 
     async getProjectOverview(user: User, teamId: string, projectName: string): Promise<Project.Overview | undefined> {
-        const project = await this.projectDB.findProject(teamId, projectName);
+        const project = await this.projectDB.findProjectByTeamAndName(teamId, projectName);
         if (!project) {
             return undefined;
         }
@@ -60,7 +60,7 @@ export class ProjectsService {
             const { name, commit } = branch;
             result.push({
                 name,
-                branchUrl: `${repository.webUrl}/tree/${branch.name}`, // todo: compute in repositoryProvider
+                url: `${repository.webUrl}/tree/${branch.name}`, // todo: compute in repositoryProvider
                 changeAuthor: commit.author,
                 changeDate: commit.authorDate,
                 changeHash: commit.sha,
@@ -93,7 +93,7 @@ export class ProjectsService {
 
     async findPrebuilds(user: User, params: FindPrebuildsParams): Promise<PrebuildInfo[]> {
         const { teamId, projectName, prebuildId } = params;
-        const project = await this.projectDB.findProject(teamId, projectName);
+        const project = await this.projectDB.findProjectByTeamAndName(teamId, projectName);
         if (!project) {
             return [];
         }