Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions apps/web/src/components/projects/project-apps.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ describe("launchableApps", () => {
analytics: false,
cdn: false,
experiments: false,
releases: false,
};
expect(
launchableApps(
Expand Down
11 changes: 10 additions & 1 deletion apps/web/src/components/projects/project-apps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

import { Link } from "@tanstack/react-router";
import {
ClockRewind,
BarChartSquare02,
BezierCurve02,
FileSearch02,
Expand Down Expand Up @@ -79,6 +80,13 @@ const APPS: Record<
to: PROJECT_ROUTE.assets,
tone: "bg-chart-2/15 text-chart-2",
},
releases: {
labelKey: "projects.apps.releases",
captionKey: "projects.apps.releasesCaption",
Icon: ClockRewind,
to: PROJECT_ROUTE.releases,
tone: "bg-chart-3/15 text-chart-3",
},
hosting: {
labelKey: "projects.apps.hosting",
captionKey: "projects.apps.hostingCaption",
Expand Down Expand Up @@ -256,7 +264,8 @@ function ProjectAppTilesBody({
const apps = launchableApps(project, native ?? undefined).filter(
(id) =>
/* Both need a repo, as in the sidebar's presence rules. */
((id !== "site-editor" && id !== "experiments") || hasSource) &&
((id !== "site-editor" && id !== "experiments" && id !== "releases") ||
hasSource) &&
/* Every project has these two, so across an org they bury the apps
someone actually chose. They stay on each project's own screen. */
!(showProject && ORG_HIDDEN_APPS.has(id)),
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/components/sidebar/project-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import type { ReactNode } from "react";
import {
ClockRewind,
BarChartSquare02,
Beaker02,
CheckDone01,
Expand Down Expand Up @@ -115,6 +116,10 @@ export function ProjectNav({ onNavigate }: { onNavigate?: () => void }) {
label: t("common.mainPanelTabs.assets"),
icon: <Image01 size={16} />,
},
releases: {
label: t("common.mainPanelTabs.releases"),
icon: <ClockRewind size={16} />,
},
hosting: {
label: t("common.mainPanelTabs.hosting"),
icon: <Server01 size={16} />,
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/hooks/use-destination-route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export const PROJECT_ROUTE = {
connectSources: "/$org/projects/$agentId/connect-sources",
settings: "/$org/projects/$agentId/settings",
assets: "/$org/projects/$agentId/assets",
releases: "/$org/projects/$agentId/releases",
hosting: "/$org/projects/$agentId/hosting",
e2e: "/$org/projects/$agentId/e2e",
analytics: "/$org/projects/$agentId/analytics",
Expand Down
1 change: 1 addition & 0 deletions apps/web/src/i18n/en/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,7 @@ export const common = {
"common.mainPanelTabs.code": "Code",
"common.mainPanelTabs.content": "Content",
"common.mainPanelTabs.assets": "Assets",
"common.mainPanelTabs.releases": "Releases",
"common.mainPanelTabs.hosting": "Hosting",
"common.mainPanelTabs.e2e": "E2E",
"common.mainPanelTabs.analytics": "Deco Analytics",
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/en/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { discover } from "./discover.ts";
import { commandPalette } from "./command-palette.ts";
import { connections } from "./connections.ts";
import { experiments } from "./experiments.ts";
import { releases } from "./releases.ts";
import { common } from "./common.ts";
import { reportsOnboarding } from "./reports-onboarding.ts";
import { collections } from "./collections.ts";
Expand Down Expand Up @@ -65,6 +66,7 @@ export const en = {
...monitoring,
...mainPanelTabs,
...experiments,
...releases,
...markdownEditor,
...library,
...layouts,
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/en/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ export const projects = {
"projects.apps.siteEditorCaption": "Pages, sections and content",
"projects.apps.assets": "Assets",
"projects.apps.assetsCaption": "Images and files the site uses",
"projects.apps.releases": "Releases",
"projects.apps.releasesCaption": "What the site serves, and rollbacks",
"projects.apps.hosting": "Hosting",
"projects.apps.hostingCaption": "Deploys, domains and environments",
"projects.apps.e2e": "End-to-end tests",
Expand Down
21 changes: 21 additions & 0 deletions apps/web/src/i18n/en/releases.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
export const releases = {
"releases.title": "Releases",
"releases.subtitle":
"Every change merged to main, newest first. A Publish also creates a release on the CDN; Make current switches the CDN to any release.",
"releases.loadFailed": "Couldn't load releases",
"releases.currentOnCdn": "Current on the CDN:",
"releases.madeCurrentAgo": "made current {when}",
"releases.nothingOnCdn": "Nothing on the CDN yet",
"releases.current": "Current",
"releases.actions": "Release actions",
"releases.makeCurrent": "Make current",
"releases.makeCurrentFailed": "Making it current failed. Try again.",
"releases.makeCurrentTitle": "Make {sha} current?",
"releases.makeCurrentBody":
"The CDN serves this release from now on. Git doesn't change, and the next Publish makes its own release current.",
"releases.schemaMismatchBody":
"This release was made with a different schema than main's. Sites built from main keep their current content until the schemas match again.",
"releases.madeCurrent": "{sha} is now current",
"releases.loadMore": "Load more",
"releases.cancel": "Cancel",
};
1 change: 1 addition & 0 deletions apps/web/src/i18n/pt-br/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -280,6 +280,7 @@ export const common = {
"common.mainPanelTabs.code": "Código",
"common.mainPanelTabs.content": "Conteúdo",
"common.mainPanelTabs.assets": "Assets",
"common.mainPanelTabs.releases": "Versões",
"common.mainPanelTabs.hosting": "Hospedagem",
"common.mainPanelTabs.e2e": "E2E",
"common.mainPanelTabs.analytics": "Deco Analytics",
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/pt-br/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { discover } from "./discover.ts";
import { commandPalette } from "./command-palette.ts";
import { connections } from "./connections.ts";
import { experiments } from "./experiments.ts";
import { releases } from "./releases.ts";
import { common } from "./common.ts";
import { reportsOnboarding } from "./reports-onboarding.ts";
import { collections } from "./collections.ts";
Expand Down Expand Up @@ -63,6 +64,7 @@ export const ptBR = {
...monitoring,
...mainPanelTabs,
...experiments,
...releases,
...markdownEditor,
...library,
...layouts,
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/i18n/pt-br/projects.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ export const projects = {
"projects.apps.siteEditorCaption": "Páginas, seções e conteúdo",
"projects.apps.assets": "Assets",
"projects.apps.assetsCaption": "Imagens e arquivos que o site usa",
"projects.apps.releases": "Versões",
"projects.apps.releasesCaption": "O que o site serve, e reversões",
"projects.apps.hosting": "Hosting",
"projects.apps.hostingCaption": "Deploys, domínios e ambientes",
"projects.apps.e2e": "Testes ponta a ponta",
Expand Down
24 changes: 24 additions & 0 deletions apps/web/src/i18n/pt-br/releases.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import type { releases as enReleases } from "../en/releases.ts";

export const releases = {
"releases.title": "Versões",
"releases.subtitle":
"Todas as alterações mescladas na main, da mais recente para a mais antiga. Publicar também cria uma versão na CDN; Tornar atual faz a CDN servir qualquer versão.",
"releases.loadFailed": "Não foi possível carregar as versões",
"releases.currentOnCdn": "Atual na CDN:",
"releases.madeCurrentAgo": "tornada atual {when}",
"releases.nothingOnCdn": "Nada na CDN ainda",
"releases.current": "Atual",
"releases.actions": "Ações da versão",
"releases.makeCurrent": "Tornar atual",
"releases.makeCurrentFailed":
"Não foi possível torná-la atual. Tente de novo.",
"releases.makeCurrentTitle": "Tornar {sha} a versão atual?",
"releases.makeCurrentBody":
"A CDN passa a servir esta versão. O git não muda, e a próxima publicação torna a sua própria versão atual.",
"releases.schemaMismatchBody":
"Esta versão foi criada com um schema diferente do da main. Sites gerados a partir da main mantêm o conteúdo atual até os schemas voltarem a coincidir.",
"releases.madeCurrent": "{sha} agora é a versão atual",
"releases.loadMore": "Carregar mais",
"releases.cancel": "Cancelar",
} satisfies Record<keyof typeof enReleases, string>;
10 changes: 10 additions & 0 deletions apps/web/src/layouts/legacy-main-redirect.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,16 @@ export function LegacyCanonicalNavigate({
replace
/>
);
case PROJECT_ROUTE.releases:
return (
<Navigate
to={PROJECT_ROUTE.releases}
params={route.params}
search={search}
hash={true}
replace
/>
);
case PROJECT_ROUTE.hosting:
return (
<Navigate
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const nativePresence = (
present: Array<keyof ProjectNativeViewPresence>,
): ProjectNativeViewPresence => ({
assets: present.includes("assets"),
releases: present.includes("releases"),
hosting: present.includes("hosting"),
e2e: present.includes("e2e"),
analytics: present.includes("analytics"),
Expand Down Expand Up @@ -271,31 +272,35 @@ describe("project sidebar views", () => {
projectSidebarViewUnavailable("assets", none, {
assets: true,
siteAccess: false,
releases: false,
}),
).toBe(false);
expect(
projectSidebarViewUnavailable("hosting", none, {
assets: false,
siteAccess: true,
releases: false,
}),
).toBe(false);
expect(
projectSidebarViewUnavailable("assets", none, {
assets: false,
siteAccess: false,
releases: false,
}),
).toBe(true);
expect(
projectSidebarViewUnavailable("git", none, {
assets: false,
siteAccess: false,
releases: false,
}),
).toBe(false);
});

test("rejects source-backed views immediately when source is absent", () => {
const none = projectSidebarViewPresence(false, nativePresence([]));
const pending = { assets: true, siteAccess: true };
const pending = { assets: true, siteAccess: true, releases: false };

for (const viewId of ["overview", "reports", "board", "site-editor"]) {
expect(projectSidebarViewUnavailable(viewId, none, pending)).toBe(true);
Expand All @@ -308,7 +313,7 @@ describe("project sidebar views", () => {
test("rejects unavailable Site Editor and retired surface defaults", () => {
const absent = projectSidebarViewPresence(false, nativePresence([]));
const present = projectSidebarViewPresence(true, nativePresence([]));
const settled = { assets: false, siteAccess: false };
const settled = { assets: false, siteAccess: false, releases: false };

expect(
projectDefaultViewUnavailable("preview", absent, settled, [], true),
Expand Down
15 changes: 12 additions & 3 deletions apps/web/src/layouts/main-panel-tabs/project-sidebar-views.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const PROJECT_SIDEBAR_VIEW_IDS = [
"board",
"site-editor",
"assets",
"releases",
"hosting",
"e2e",
"analytics",
Expand All @@ -33,6 +34,7 @@ export type ProjectSidebarViewId = (typeof PROJECT_SIDEBAR_VIEW_IDS)[number];
/** Native panels whose availability is discovered from project resources. */
export const PROJECT_NATIVE_VIEW_IDS = [
"assets",
"releases",
"hosting",
"e2e",
"analytics",
Expand All @@ -48,6 +50,7 @@ export type ProjectSidebarViewPresence = Record<ProjectSidebarViewId, boolean>;
export interface ProjectNativeViewPending {
assets: boolean;
siteAccess: boolean;
releases: boolean;
}

export interface ProjectSidebarViewsMetadata {
Expand Down Expand Up @@ -132,8 +135,8 @@ export function isProjectNativeViewId(
return PROJECT_NATIVE_VIEW_IDS.some((viewId) => viewId === value);
}

/** Combine permanent project capabilities with the five resource-backed
* native panels. */
/** Combine permanent project capabilities with the resource-backed native
* panels. */
export function projectSidebarViewPresence(
hasClonableSource: boolean,
native: ProjectNativeViewPresence,
Expand All @@ -144,6 +147,8 @@ export function projectSidebarViewPresence(
board: hasClonableSource,
"site-editor": hasClonableSource,
assets: native.assets,
// Hosted Deco CMS releases: a v8 site's repo history.
releases: hasClonableSource && native.releases,
hosting: native.hosting,
e2e: native.e2e,
analytics: native.analytics,
Expand Down Expand Up @@ -212,7 +217,11 @@ export function projectSidebarViewUnavailable(
): boolean {
if (!isProjectSidebarViewId(viewId) || presence[viewId]) return false;
if (!isProjectNativeViewId(viewId)) return true;
return !(viewId === "assets" ? pending.assets : pending.siteAccess);
return !(viewId === "assets"
? pending.assets
: viewId === "releases"
? pending.releases
: pending.siteAccess);
}

/** Validate a persisted built-in landing view, including retired Preview and
Expand Down
Loading
Loading