- { projectName &&
+ { projectSlug && ) => void
@@ -24,7 +24,7 @@ function CheckBox(props: {
const checkboxId = `checkbox-${props.title}-${String(Math.random())}`;
- return
{team?.name || userFullName}
@@ -214,21 +218,21 @@ export default function Menu() {
}
]}>
- { projectName && (
+ { projectSlug && (
- { !projectName && {team?.name || userFullName}}
- 
+ { !projectSlug && {team?.name || userFullName}}
+
-
- {projectName}
+
+ {projectSlug}
)}
{ prebuildId && (
- 
+
{prebuildId}
)}
diff --git a/components/dashboard/src/components/CheckBox.tsx b/components/dashboard/src/components/CheckBox.tsx
index ef806d2610ec63..d16f2ea7cab92b 100644
--- a/components/dashboard/src/components/CheckBox.tsx
+++ b/components/dashboard/src/components/CheckBox.tsx
@@ -8,7 +8,7 @@
function CheckBox(props: {
name?: string,
title: string | React.ReactNode,
- desc: string,
+ desc: string | React.ReactNode,
checked: boolean,
disabled?: boolean,
onChange?: (e: React.ChangeEvent
+ return
{
const disposables = new DisposableCollection();
+ setWorkspaceInstance(undefined);
(async () => {
if (!props.workspaceId) {
return;
@@ -120,7 +121,7 @@ export default function PrebuildLogs(props: PrebuildLogsProps) {
if (workspaceInstance?.status.conditions.failed) {
setError(new Error(workspaceInstance.status.conditions.failed));
}
- }, [ workspaceInstance?.status.phase ]);
+ }, [ props.workspaceId, workspaceInstance?.status.phase ]);
return 
;
+ return ;
case "building":
- return 
;
+ return ;
case "aborted":
- return 
;
+ return ;
case "timeout":
- return 
;
+ return ;
case "available":
if (prebuild?.error) {
- return ;
+ return ;
}
- return 
;
+ return ;
}
}
+function formatDuration(milliseconds: number) {
+ const hours = Math.floor(milliseconds / (1000 * 60 * 60));
+ return (hours > 0 ? `${hours}:` : '') + moment(milliseconds).format('mm:ss');
+}
+
export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInstance }) {
let status = <>;
let details = <>;
@@ -267,11 +272,11 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
case 'creating': // Fall through
case 'unknown':
status =
();
+
+ const [ isLoading, setIsLoading ] = useState(true);
+ const [ isIncrementalPrebuildsEnabled, setIsIncrementalPrebuildsEnabled ] = useState(false);
+
+ useEffect(() => {
+ if (!teams || !projectSlug) {
+ return;
+ }
+ (async () => {
+ const projects = (!!team
+ ? await getGitpodService().server.getTeamProjects(team.id)
+ : await getGitpodService().server.getUserProjects());
+
+ // Find project matching with slug, otherwise with name
+ const project = projectSlug && projects.find(p => p.slug ? p.slug === projectSlug : p.name === projectSlug);
+ if (!project) {
+ return;
+ }
+ setProject(project);
+ })();
+ }, [ projectSlug, team, teams ]);
+
+ useEffect(() => {
+ if (!project) {
+ return;
+ }
+ setIsLoading(false);
+ setIsIncrementalPrebuildsEnabled(!!project.settings?.useIncrementalPrebuilds);
+ }, [ project ]);
+
+ const toggleIncrementalPrebuilds = async () => {
+ if (!project) {
+ return;
+ }
+ setIsLoading(true);
+ try {
+ await getGitpodService().server.updateProjectPartial({
+ id: project.id,
+ settings: {
+ useIncrementalPrebuilds: !isIncrementalPrebuildsEnabled,
+ }
+ });
+ setIsIncrementalPrebuildsEnabled(!isIncrementalPrebuildsEnabled);
+ } finally {
+ setIsLoading(false);
+ }
+ }
+
+ return
+ Enable Incremental Prebuilds Beta }
+ desc={When possible, use an earlier successful prebuild as a base to create new prebuilds. This can make your prebuilds significantly faster, especially if they normally take longer than 10 minutes. Learn more}
+ checked={isIncrementalPrebuildsEnabled}
+ disabled={isLoading}
+ onChange={toggleIncrementalPrebuilds} />
+ ;
+}
\ No newline at end of file
diff --git a/components/dashboard/src/teams/TeamSettings.tsx b/components/dashboard/src/teams/TeamSettings.tsx
index 1070a763cde288..8ac24586574c1f 100644
--- a/components/dashboard/src/teams/TeamSettings.tsx
+++ b/components/dashboard/src/teams/TeamSettings.tsx
@@ -4,6 +4,7 @@
* See License-AGPL.txt in the project root for license information.
*/
+import { Team } from "@gitpod/gitpod-protocol";
import { useContext, useEffect, useState } from "react";
import { Redirect, useLocation } from "react-router";
import CodeText from "../components/CodeText";
@@ -13,6 +14,15 @@ import { getGitpodService, gitpodHostUrl } from "../service/service";
import { UserContext } from "../user-context";
import { getCurrentTeam, TeamsContext } from "./teams-context";
+export function getTeamSettingsMenu(team?: Team) {
+ return [
+ {
+ title: 'General',
+ link: [`/t/${team?.slug}/settings`],
+ },
+ ];
+}
+
export default function TeamSettings() {
const [modal, setModal] = useState(false);
const [teamSlug, setTeamSlug] = useState('');
@@ -44,17 +54,10 @@ export default function TeamSettings() {
document.location.href = gitpodHostUrl.asDashboard().toString();
};
- const settingsMenu = [
- {
- title: 'General',
- link: [`/t/${team?.slug}/settings`]
- }
- ]
-
return <>
-
+
diff --git a/components/gitpod-db/src/project-db.ts b/components/gitpod-db/src/project-db.ts
index ab64e65184e4ef..35c7948b23e4f0 100644
--- a/components/gitpod-db/src/project-db.ts
+++ b/components/gitpod-db/src/project-db.ts
@@ -4,7 +4,7 @@
* See License.enterprise.txt in the project root folder.
*/
-import { Project, ProjectConfig } from "@gitpod/gitpod-protocol";
+import { PartialProject, Project } from "@gitpod/gitpod-protocol";
export const ProjectDB = Symbol('ProjectDB');
export interface ProjectDB {
@@ -14,6 +14,6 @@ export interface ProjectDB {
findTeamProjects(teamId: string): Promise;
findUserProjects(userId: string): Promise;
storeProject(project: Project): Promise;
- setProjectConfiguration(projectId: string, config: ProjectConfig): Promise;
+ updateProject(partialProject: PartialProject): Promise;
markDeleted(projectId: string): Promise;
}
diff --git a/components/gitpod-db/src/typeorm/entity/db-project.ts b/components/gitpod-db/src/typeorm/entity/db-project.ts
index 53e41e51ab3ba8..e49be8a93fbad3 100644
--- a/components/gitpod-db/src/typeorm/entity/db-project.ts
+++ b/components/gitpod-db/src/typeorm/entity/db-project.ts
@@ -6,7 +6,7 @@
import { Entity, Column, PrimaryColumn, Index } from "typeorm";
import { TypeORM } from "../typeorm";
-import { ProjectConfig } from "@gitpod/gitpod-protocol";
+import { ProjectConfig, ProjectSettings } from "@gitpod/gitpod-protocol";
import { Transformer } from "../transformer";
@Entity()
@@ -44,6 +44,9 @@ export class DBProject {
@Column("simple-json", { nullable: true })
config?: ProjectConfig;
+ @Column("simple-json", { nullable: true })
+ settings?: ProjectSettings;
+
@Column("varchar")
creationTime: string;
diff --git a/components/gitpod-db/src/typeorm/migration/1638025268018-ProjectSettings.ts b/components/gitpod-db/src/typeorm/migration/1638025268018-ProjectSettings.ts
new file mode 100644
index 00000000000000..4882bfd20c98b8
--- /dev/null
+++ b/components/gitpod-db/src/typeorm/migration/1638025268018-ProjectSettings.ts
@@ -0,0 +1,21 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { MigrationInterface, QueryRunner } from "typeorm";
+import { columnExists } from "./helper/helper";
+
+export class ProjectSettings1638025268018 implements MigrationInterface {
+
+ public async up(queryRunner: QueryRunner): Promise {
+ if (!(await columnExists(queryRunner, "d_b_project", "settings"))) {
+ await queryRunner.query("ALTER TABLE d_b_project ADD COLUMN `settings` text NULL");
+ }
+ }
+
+ public async down(queryRunner: QueryRunner): Promise {
+ }
+
+}
diff --git a/components/gitpod-db/src/typeorm/project-db-impl.ts b/components/gitpod-db/src/typeorm/project-db-impl.ts
index b5c12110158b8e..ea6abab77cf606 100644
--- a/components/gitpod-db/src/typeorm/project-db-impl.ts
+++ b/components/gitpod-db/src/typeorm/project-db-impl.ts
@@ -9,7 +9,7 @@ import { TypeORM } from "./typeorm";
import { Repository } from "typeorm";
import { ProjectDB } from "../project-db";
import { DBProject } from "./entity/db-project";
-import { Project, ProjectConfig } from "@gitpod/gitpod-protocol";
+import { PartialProject, Project } from "@gitpod/gitpod-protocol";
@injectable()
export class ProjectDBImpl implements ProjectDB {
@@ -60,14 +60,13 @@ export class ProjectDBImpl implements ProjectDB {
return repo.save(project);
}
- public async setProjectConfiguration(projectId: string, config: ProjectConfig): Promise {
+ public async updateProject(partialProject: PartialProject): Promise {
const repo = await this.getRepo();
- const project = await repo.findOne({ id: projectId, markedDeleted: false });
- if (!project) {
+ const count = await repo.count({ id: partialProject.id, markedDeleted: false });
+ if (count < 1) {
throw new Error('A project with this ID could not be found');
}
- project.config = config;
- await repo.save(project);
+ await repo.update(partialProject.id, partialProject);
}
public async markDeleted(projectId: string): Promise {
diff --git a/components/gitpod-protocol/src/gitpod-service.ts b/components/gitpod-protocol/src/gitpod-service.ts
index d30dbd75233ae9..a0911270311551 100644
--- a/components/gitpod-protocol/src/gitpod-service.ts
+++ b/components/gitpod-protocol/src/gitpod-service.ts
@@ -13,7 +13,7 @@ import {
} from './protocol';
import {
Team, TeamMemberInfo,
- TeamMembershipInvite, Project, TeamMemberRole, PrebuildWithStatus, StartPrebuildResult
+ TeamMembershipInvite, Project, TeamMemberRole, PrebuildWithStatus, StartPrebuildResult, PartialProject
} from './teams-projects-protocol';
import { JsonRpcProxy, JsonRpcServer } from './messaging/proxy-factory';
import { Disposable, CancellationTokenSource } from 'vscode-jsonrpc';
@@ -136,11 +136,12 @@ export interface GitpodServer extends JsonRpcServer, AdminServer,
findPrebuilds(params: FindPrebuildsParams): Promise;
triggerPrebuild(projectId: string, branchName: string | null): Promise;
cancelPrebuild(projectId: string, prebuildId: string): Promise;
- setProjectConfiguration(projectId: string, configString: string): Promise;
fetchProjectRepositoryConfiguration(projectId: string): Promise;
guessProjectConfiguration(projectId: string): Promise;
fetchRepositoryConfiguration(cloneUrl: string): Promise;
guessRepositoryConfiguration(cloneUrl: string): Promise;
+ setProjectConfiguration(projectId: string, configString: string): Promise;
+ updateProjectPartial(partialProject: PartialProject): Promise;
// content service
getContentBlobUploadUrl(name: string): Promise
diff --git a/components/gitpod-protocol/src/teams-projects-protocol.ts b/components/gitpod-protocol/src/teams-projects-protocol.ts
index ea3ad9a426535d..eae40284c65778 100644
--- a/components/gitpod-protocol/src/teams-projects-protocol.ts
+++ b/components/gitpod-protocol/src/teams-projects-protocol.ts
@@ -6,11 +6,16 @@
import { PrebuiltWorkspaceState } from "./protocol";
import { v4 as uuidv4 } from 'uuid';
+import { DeepPartial } from "./util/deep-partial";
export interface ProjectConfig {
'.gitpod.yml': string;
}
+export interface ProjectSettings {
+ useIncrementalPrebuilds?: boolean;
+}
+
export interface Project {
id: string;
name: string;
@@ -20,6 +25,7 @@ export interface Project {
userId?: string;
appInstallationId: string;
config?: ProjectConfig;
+ settings?: ProjectSettings;
creationTime: string;
/** This is a flag that triggers the HARD DELETION of this entity */
deleted?: boolean;
@@ -55,6 +61,8 @@ export namespace Project {
}
}
+export type PartialProject = DeepPartial & Pick;
+
export interface PrebuildWithStatus {
info: PrebuildInfo;
status: PrebuiltWorkspaceState;
@@ -64,6 +72,7 @@ export interface PrebuildWithStatus {
export interface PrebuildInfo {
id: string;
buildWorkspaceId: string;
+ basedOnPrebuildId?: string;
teamId?: string;
userId?: string;
diff --git a/components/server/ee/src/prebuilds/prebuild-manager.ts b/components/server/ee/src/prebuilds/prebuild-manager.ts
index 99f68b3135474f..c21f87348e4d36 100644
--- a/components/server/ee/src/prebuilds/prebuild-manager.ts
+++ b/components/server/ee/src/prebuilds/prebuild-manager.ts
@@ -106,7 +106,7 @@ export class PrebuildManager {
normalizedContextURL: actual.normalizedContextURL
};
- if (this.shouldPrebuildIncrementally(actual.repository.cloneUrl)) {
+ if (this.shouldPrebuildIncrementally(actual.repository.cloneUrl, project)) {
const maxDepth = this.config.incrementalPrebuilds.commitHistory;
prebuildContext.commitHistory = await contextParser.fetchCommitHistory({ span }, user, contextURL, commit, maxDepth);
}
@@ -184,7 +184,10 @@ export class PrebuildManager {
return true;
}
- protected shouldPrebuildIncrementally(cloneUrl: string): boolean {
+ protected shouldPrebuildIncrementally(cloneUrl: string, project?: Project): boolean {
+ if (project?.settings?.useIncrementalPrebuilds) {
+ return true;
+ }
const trimRepoUrl = (url: string) => url.replace(/\/$/, '').replace(/\.git$/, '');
const repoUrl = trimRepoUrl(cloneUrl);
return this.config.incrementalPrebuilds.repositoryPasslist.some(url => trimRepoUrl(url) === repoUrl);
diff --git a/components/server/ee/src/workspace/workspace-factory.ts b/components/server/ee/src/workspace/workspace-factory.ts
index ab2a7084a24ef6..ad4b0e5fde0404 100644
--- a/components/server/ee/src/workspace/workspace-factory.ts
+++ b/components/server/ee/src/workspace/workspace-factory.ts
@@ -169,6 +169,7 @@ export class WorkspaceFactoryEE extends WorkspaceFactory {
await this.db.trace({span}).storePrebuildInfo({
id: pws.id,
buildWorkspaceId: pws.buildWorkspaceId,
+ basedOnPrebuildId: ws.basedOnPrebuildId,
teamId,
userId,
projectName,
diff --git a/components/server/src/auth/rate-limiter.ts b/components/server/src/auth/rate-limiter.ts
index ff1ffa11130919..f11996f6046837 100644
--- a/components/server/src/auth/rate-limiter.ts
+++ b/components/server/src/auth/rate-limiter.ts
@@ -98,11 +98,12 @@ function getConfig(config: RateLimiterConfig): RateLimiterConfig {
"getProjectOverview": { group: "default", points: 1 },
"triggerPrebuild": { group: "default", points: 1 },
"cancelPrebuild": { group: "default", points: 1 },
- "setProjectConfiguration": { group: "default", points: 1 },
"fetchProjectRepositoryConfiguration": { group: "default", points: 1 },
"guessProjectConfiguration": { group: "default", points: 1 },
"fetchRepositoryConfiguration": { group: "default", points: 1 },
"guessRepositoryConfiguration": { group: "default", points: 1 },
+ "setProjectConfiguration": { group: "default", points: 1 },
+ "updateProjectPartial": { group: "default", points: 1 },
"getContentBlobUploadUrl": { group: "default", points: 1 },
"getContentBlobDownloadUrl": { group: "default", points: 1 },
"getGitpodTokens": { group: "default", points: 1 },
diff --git a/components/server/src/projects/projects-service.ts b/components/server/src/projects/projects-service.ts
index 6688e110a24042..182f6861282578 100644
--- a/components/server/src/projects/projects-service.ts
+++ b/components/server/src/projects/projects-service.ts
@@ -6,13 +6,14 @@
import { inject, injectable } from "inversify";
import { DBWithTracing, ProjectDB, TeamDB, TracedWorkspaceDB, UserDB, WorkspaceDB } from "@gitpod/gitpod-db/lib";
-import { Branch, CommitContext, PrebuildWithStatus, CreateProjectParams, FindPrebuildsParams, Project, ProjectConfig, User, WorkspaceConfig } from "@gitpod/gitpod-protocol";
+import { Branch, CommitContext, PrebuildWithStatus, CreateProjectParams, FindPrebuildsParams, Project, User, WorkspaceConfig } from "@gitpod/gitpod-protocol";
import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
import { HostContextProvider } from "../auth/host-context-provider";
import { FileProvider, RepoURL } from "../repohost";
import { log } from '@gitpod/gitpod-protocol/lib/util/logging';
import { ContextParser } from "../workspace/context-parser-service";
import { ConfigInferrer } from "./config-inferrer";
+import { PartialProject } from "@gitpod/gitpod-protocol/src/teams-projects-protocol";
@injectable()
export class ProjectsService {
@@ -178,10 +179,6 @@ export class ProjectsService {
return result;
}
- async setProjectConfiguration(projectId: string, config: ProjectConfig): Promise {
- return this.projectDB.setProjectConfiguration(projectId, config);
- }
-
protected async getRepositoryFileProviderAndCommitContext(ctx: TraceContext, user: User, cloneUrl: string): Promise<{fileProvider: FileProvider, commitContext: CommitContext}> {
const normalizedContextUrl = this.contextParser.normalizeContextURL(cloneUrl);
const commitContext = (await this.contextParser.handle(ctx, user, normalizedContextUrl)) as CommitContext;
@@ -229,4 +226,8 @@ export class ProjectsService {
return configString;
}
+ async updateProjectPartial(partialProject: PartialProject): Promise {
+ return this.projectDB.updateProject(partialProject);
+ }
+
}
diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
index 1d67c179c199cf..04230fc55ae0e4 100644
--- a/components/server/src/workspace/gitpod-server-impl.ts
+++ b/components/server/src/workspace/gitpod-server-impl.ts
@@ -53,6 +53,7 @@ import { LocalMessageBroker } from "../messaging/local-message-broker";
import { CachingBlobServiceClientProvider } from '@gitpod/content-service/lib/sugar';
import { IDEOptions } from '@gitpod/gitpod-protocol/lib/ide-protocol';
import { IDEConfigService } from '../ide-config';
+import { PartialProject } from '@gitpod/gitpod-protocol/src/teams-projects-protocol';
// shortcut
export const traceWI = (ctx: TraceContext, wi: Omit) => TraceContext.setOWI(ctx, wi); // userId is already taken care of in WebsocketConnectionManager
@@ -1635,18 +1636,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
throw new ResponseError(ErrorCodes.EE_FEATURE, `Cancelling Prebuilds is implemented in Gitpod's Enterprise Edition`);
}
- public async setProjectConfiguration(ctx: TraceContext, projectId: string, configString: string): Promise {
- traceAPIParams(ctx, { projectId }); // filter configString because of size
-
- const user = this.checkAndBlockUser("setProjectConfiguration");
- await this.guardProjectOperation(user, projectId, "update");
- const parseResult = this.gitpodParser.parse(configString);
- if (parseResult.validationErrors) {
- throw new Error(`This configuration could not be parsed: ${parseResult.validationErrors.join(', ')}`);
- }
- await this.projectsService.setProjectConfiguration(projectId, { '.gitpod.yml': configString });
- }
-
public async fetchRepositoryConfiguration(ctx: TraceContext, cloneUrl: string): Promise {
traceAPIParams(ctx, { cloneUrl });
const user = this.checkUser("fetchRepositoryConfiguration");
@@ -1713,6 +1702,44 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
}
}
+ public async setProjectConfiguration(ctx: TraceContext, projectId: string, configString: string): Promise {
+ traceAPIParams(ctx, { projectId }); // filter configString because of size
+
+ const user = this.checkAndBlockUser("setProjectConfiguration");
+ await this.guardProjectOperation(user, projectId, "update");
+
+ const parseResult = this.gitpodParser.parse(configString);
+ if (parseResult.validationErrors) {
+ throw new Error(`This configuration could not be parsed: ${parseResult.validationErrors.join(', ')}`);
+ }
+ await this.projectsService.updateProjectPartial({
+ id: projectId,
+ config: { '.gitpod.yml': configString },
+ });
+ }
+
+ public async updateProjectPartial(ctx: TraceContext, partialProject: PartialProject): Promise {
+ traceAPIParams(ctx, {
+ // censor everything irrelevant
+ partialProject: {
+ id: partialProject.id,
+ settings: partialProject.settings,
+ }
+ });
+
+ const user = this.checkUser("updateProjectPartial");
+ await this.guardProjectOperation(user, partialProject.id, "update");
+
+ const partial: PartialProject = { id: partialProject.id };
+ const allowedFields: (keyof Project)[] = ['settings']; // Don't add 'config' here! Please use `setProjectConfiguration` instead to parse & validate configs
+ for (const f of allowedFields) {
+ if (f in partialProject) {
+ (partial[f] as any) = partialProject[f];
+ }
+ }
+ await this.projectsService.updateProjectPartial(partial);
+ }
+
public async getContentBlobUploadUrl(ctx: TraceContext, name: string): Promise {
traceAPIParams(ctx, { name });
+ return
+
setSelectedEditor('.gitpod.yml')} />
@@ -301,7 +283,7 @@ export default function () {
- ;
+ ;
}
function EditorMessage(props: { heading: string, message: string, type: 'success' | 'warning' }) {
diff --git a/components/dashboard/src/projects/Prebuild.tsx b/components/dashboard/src/projects/Prebuild.tsx
index d957de2ef765f6..d10728d8bee249 100644
--- a/components/dashboard/src/projects/Prebuild.tsx
+++ b/components/dashboard/src/projects/Prebuild.tsx
@@ -41,21 +41,21 @@ export default function () {
? await getGitpodService().server.getTeamProjects(team.id)
: await getGitpodService().server.getUserProjects());
- const project = projectSlug && projects.find(
- p => p.slug ? p.slug === projectSlug :
- p.name === projectSlug);
-
+ const project = projectSlug && projects.find(p => !!p.slug
+ ? p.slug === projectSlug
+ : p.name === projectSlug);
if (!project) {
console.error(new Error(`Project not found! (teamId: ${team?.id}, projectName: ${projectSlug})`));
return;
}
+
const prebuilds = await getGitpodService().server.findPrebuilds({
projectId: project.id,
prebuildId
});
setPrebuild(prebuilds[0]);
})();
- }, [ teams ]);
+ }, [prebuildId, projectSlug, team, teams]);
const renderTitle = () => {
if (!prebuild) {
@@ -77,6 +77,12 @@ export default function () {
+ {!!prebuild.info.basedOnPrebuildId && <>
+
)
};
diff --git a/components/dashboard/src/projects/Prebuilds.tsx b/components/dashboard/src/projects/Prebuilds.tsx
index 2bf8fb228b7899..89cf1bda1e00a7 100644
--- a/components/dashboard/src/projects/Prebuilds.tsx
+++ b/components/dashboard/src/projects/Prebuilds.tsx
@@ -242,21 +242,26 @@ export function prebuildStatusIcon(prebuild?: PrebuildWithStatus) {
switch (prebuild?.status) {
case undefined: // Fall through
case "queued":
- return {shortCommitMessage(prebuild.info.changeTitle)}
ยท
+
+
+ }
Incremental Prebuild (base)
+
-
+
PENDING
;
details =
- 
+
Preparing prebuild ...
;
break;
@@ -280,30 +285,30 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
case 'interrupted': // Fall through
case 'stopping':
status =
-
+
RUNNING
;
details =
-
+
Prebuild in progress ...
;
break;
case 'stopped':
status =
-
+
READY
;
details =
-
+
{!!props.prebuildInstance?.stoppedTime
- ? `${Math.round(((new Date(props.prebuildInstance.stoppedTime).getTime()) - (new Date(props.prebuildInstance.creationTime).getTime())) / 1000)}s`
+ ? formatDuration((new Date(props.prebuildInstance.stoppedTime).getTime()) - (new Date(props.prebuildInstance.creationTime).getTime()))
: '...'}
;
break;
}
if (props.prebuildInstance?.status.conditions.stoppedByRequest) {
status =
-
+
CANCELED
;
details =
@@ -311,12 +316,20 @@ export function PrebuildInstanceStatus(props: { prebuildInstance?: WorkspaceInst
;
} else if (props.prebuildInstance?.status.conditions.failed || props.prebuildInstance?.status.conditions.headlessTaskFailed) {
status =
-
+
FAILED
;
details =
Prebuild failed
;
+ } else if (props.prebuildInstance?.status.conditions.timeout) {
+ status =
+
+ FAILED
+
;
+ details =
+ Prebuild timed out
+
;
}
return {status}
diff --git a/components/dashboard/src/projects/ProjectSettings.tsx b/components/dashboard/src/projects/ProjectSettings.tsx
new file mode 100644
index 00000000000000..a9811ed9b7d8a9
--- /dev/null
+++ b/components/dashboard/src/projects/ProjectSettings.tsx
@@ -0,0 +1,94 @@
+/**
+ * Copyright (c) 2021 Gitpod GmbH. All rights reserved.
+ * Licensed under the GNU Affero General Public License (AGPL).
+ * See License-AGPL.txt in the project root for license information.
+ */
+
+import { useContext, useEffect, useState } from "react";
+import { useLocation, useRouteMatch } from "react-router";
+import { Project, Team } from "@gitpod/gitpod-protocol";
+import CheckBox from "../components/CheckBox";
+import { getGitpodService } from "../service/service";
+import { getCurrentTeam, TeamsContext } from "../teams/teams-context";
+import { PageWithSubMenu } from "../components/PageWithSubMenu";
+import PillLabel from "../components/PillLabel";
+
+export function getProjectSettingsMenu(project?: Project, team?: Team) {
+ const teamOrUserSlug = !!team ? 't/' + team.slug : 'projects';
+ return [
+ {
+ title: 'General',
+ link: [`/${teamOrUserSlug}/${project?.slug || project?.name}/settings`],
+ },
+ {
+ title: 'Configuration',
+ link: [`/${teamOrUserSlug}/${project?.slug || project?.name}/configure`],
+ },
+ ];
+}
+
+export default function () {
+ const location = useLocation();
+ const { teams } = useContext(TeamsContext);
+ const team = getCurrentTeam(location, teams);
+ const match = useRouteMatch<{ team: string, resource: string }>("/(t/)?:team/:resource");
+ const projectSlug = match?.params?.resource;
+ const [ project, setProject ] = useStateIncremental Prebuilds
+Delete Team
-Deleting this team will also remove all associated data with this team, including projects and workspaces. Deleted teams cannot be restored!
+Deleting this team will also remove all associated data with this team, including projects and workspaces. Deleted teams cannot be restored!