From ad32eb991b3dbe422fe88e85019fe8aa3e5eb4ca Mon Sep 17 00:00:00 2001 From: Hydra Date: Sun, 15 Nov 2026 19:55:54 +0200 Subject: [PATCH 1/4] feat: add avatar and project icon URL settings --- apps/api/test/lib/profile-avatar.test.ts | 55 +++++++ .../modules/projects/project-icon.test.ts | 51 +++++++ .../deployments/components/DeploymentCard.tsx | 19 +-- .../src/app/(dashboard)/deployments/types.ts | 1 + .../src/app/(dashboard)/deployments/utils.ts | 1 + .../[id]/components/AdvancedSettings.tsx | 2 + .../projects/components/ProjectCard.tsx | 19 +-- .../projects/components/ProjectGridCard.tsx | 20 +-- .../components/project-favicon.test.tsx | 9 ++ .../settings/_components/ProfileSetting.tsx | 29 ++++ .../src/app/(dashboard)/settings/page.tsx | 2 + .../src/components/overview/HomeAppsCard.tsx | 4 +- .../project-settings/ProjectIconSetting.tsx | 40 +++++ .../settings/ImageUrlEditor.test.tsx | 102 +++++++++++++ .../components/settings/ImageUrlEditor.tsx | 143 ++++++++++++++++++ .../settings/image-settings.test.tsx | 83 ++++++++++ .../src/components/shared/ProjectIcon.tsx | 47 ++++++ apps/dashboard/src/components/sidebar.tsx | 18 +-- .../src/components/ui/UserAvatar.tsx | 37 +++++ apps/dashboard/src/constants/mock.ts | 1 + .../src/i18n/locales/ar/projectSettings.json | 5 + .../src/i18n/locales/ar/settings.json | 16 ++ .../src/i18n/locales/de/projectSettings.json | 5 + .../src/i18n/locales/de/settings.json | 16 ++ .../src/i18n/locales/en/projectSettings.json | 5 + .../src/i18n/locales/en/settings.json | 16 ++ .../src/i18n/locales/es/projectSettings.json | 5 + .../src/i18n/locales/es/settings.json | 16 ++ .../src/i18n/locales/fr/projectSettings.json | 5 + .../src/i18n/locales/fr/settings.json | 16 ++ .../src/i18n/locales/ja/projectSettings.json | 5 + .../src/i18n/locales/ja/settings.json | 16 ++ .../src/i18n/locales/pt/projectSettings.json | 5 + .../src/i18n/locales/pt/settings.json | 16 ++ .../src/i18n/locales/ru/projectSettings.json | 5 + .../src/i18n/locales/ru/settings.json | 16 ++ .../src/i18n/locales/tr/projectSettings.json | 5 + .../src/i18n/locales/tr/settings.json | 16 ++ .../src/i18n/locales/zh/projectSettings.json | 5 + .../src/i18n/locales/zh/settings.json | 16 ++ docs/dashboard-design.md | 7 + packages/contracts/src/deployments.ts | 1 + packages/contracts/src/project-inputs.ts | 6 +- packages/contracts/src/projects.ts | 2 + packages/core/src/image-url.test.ts | 34 +++++ packages/core/src/image-url.ts | 30 ++++ packages/core/src/index.ts | 1 + packages/db/drizzle/0231_project_icon_url.sql | 1 + packages/db/drizzle/meta/_journal.json | 7 + packages/db/src/repos/deployment.repo.ts | 2 +- packages/db/src/repos/project.repo.ts | 2 +- packages/db/src/schema/project.ts | 2 + packages/platform/src/engine/lib/auth.ts | 9 ++ .../src/engine/lib/favicon-detector.ts | 5 +- .../modules/deployments/deployment.service.ts | 8 +- .../modules/projects/project-crud.service.ts | 8 +- packages/platform/src/projects.ts | 2 + .../platform/test/favicon-overrides.test.ts | 54 +++++++ 58 files changed, 1002 insertions(+), 72 deletions(-) create mode 100644 apps/api/test/lib/profile-avatar.test.ts create mode 100644 apps/api/test/modules/projects/project-icon.test.ts create mode 100644 apps/dashboard/src/app/(dashboard)/settings/_components/ProfileSetting.tsx create mode 100644 apps/dashboard/src/components/project-settings/ProjectIconSetting.tsx create mode 100644 apps/dashboard/src/components/settings/ImageUrlEditor.test.tsx create mode 100644 apps/dashboard/src/components/settings/ImageUrlEditor.tsx create mode 100644 apps/dashboard/src/components/settings/image-settings.test.tsx create mode 100644 apps/dashboard/src/components/shared/ProjectIcon.tsx create mode 100644 apps/dashboard/src/components/ui/UserAvatar.tsx create mode 100644 packages/core/src/image-url.test.ts create mode 100644 packages/core/src/image-url.ts create mode 100644 packages/db/drizzle/0231_project_icon_url.sql create mode 100644 packages/platform/test/favicon-overrides.test.ts diff --git a/apps/api/test/lib/profile-avatar.test.ts b/apps/api/test/lib/profile-avatar.test.ts new file mode 100644 index 000000000..31d4e4604 --- /dev/null +++ b/apps/api/test/lib/profile-avatar.test.ts @@ -0,0 +1,55 @@ +import { expect, it } from "vitest"; +import { auth } from "@repo/platform/engine/lib/auth"; +import { provisionUser } from "@repo/platform/engine/lib/provision-user"; +import { mintSession } from "../../src/lib/cloud-auth-proxy"; +import { db, schema, eq } from "@repo/db"; +import { randomUUID } from "node:crypto"; + +it("updates only the signed-in user's avatar through the existing auth endpoint and rejects unsafe URLs", async () => { + const id = randomUUID(); + await provisionUser({ + id, + email: `${id}@example.test`, + name: "Avatar owner", + emailVerified: true, + }); + const session = await mintSession({ purpose: "local-cookie", userId: id }); + const update = (image: unknown, token: string | null = session.token, extra = {}) => + auth.handler( + new Request("http://localhost:4000/api/auth/update-user", { + method: "POST", + headers: { + "Content-Type": "application/json", + ...(token ? { Authorization: `Bearer ${token}` } : {}), + }, + body: JSON.stringify({ image, ...extra }), + }), + ); + expect((await update("https://cdn.example.test/avatar.png", null)).status).toBe(401); + const result = await update("https://cdn.example.test/avatar.png"); + expect(result.status, await result.clone().text()).toBe(200); + expect(await db.query.user.findFirst({ where: eq(schema.user.id, id) })).toMatchObject({ + image: "https://cdn.example.test/avatar.png", + role: "user", + }); + expect( + await auth.api.getSession({ + headers: new Headers({ Authorization: `Bearer ${session.token}` }), + }), + ).toMatchObject({ user: { image: "https://cdn.example.test/avatar.png" } }); + expect( + (await update("https://cdn.example.test/avatar.png", session.token, { role: "admin" })).status, + ).toBe(400); + for (const image of [ + "javascript:alert(1)", + "data:image/svg+xml,", + "https://user:secret@example.test/a.png", + "/avatar.png", + 123, + ]) + expect((await update(image)).status).toBe(400); + expect((await update(null)).status).toBe(200); + expect(await db.query.user.findFirst({ where: eq(schema.user.id, id) })).toMatchObject({ + image: null, + }); +}); diff --git a/apps/api/test/modules/projects/project-icon.test.ts b/apps/api/test/modules/projects/project-icon.test.ts new file mode 100644 index 000000000..bf97cac0f --- /dev/null +++ b/apps/api/test/modules/projects/project-icon.test.ts @@ -0,0 +1,51 @@ +import "../jobs/_env"; +import { expect, it } from "vitest"; +import { Hono } from "hono"; +import { seedOwner, repos } from "../jobs/_harness"; +import { seedProject, seedDeployment } from "../../helpers/seed"; +import { listDeployments } from "@repo/platform/engine/modules/deployments/deployment.service"; +import { projectRoutes } from "../../../src/modules/projects/project.routes"; +import { handleApiError } from "../../../src/middleware/error-handler"; + +const app = new Hono().onError(handleApiError).route("/api/projects", projectRoutes); + +it("persists an icon override through authenticated settings, protects it against discovery and restores automatic mode", async () => { + const owner = await seedOwner(); + const project = await seedProject(owner.orgId); + const automatic = "https://app.example.test/favicon.ico"; + const custom = "https://cdn.example.test/project.svg"; + await repos.project.updateFaviconCache(project.id, { favicon: automatic }); + const update = (iconUrl: unknown, auth = owner.auth) => + app.request(`/api/projects/${project.id}`, { + method: "PATCH", + headers: { ...auth, "Content-Type": "application/json" }, + body: JSON.stringify({ iconUrl }), + }); + const saved = await update(custom); + expect(saved.status, await saved.clone().text()).toBe(200); + expect(await saved.json()).toMatchObject({ data: { iconUrl: custom, favicon: custom } }); + await seedDeployment(project); + for (const options of [{ projectId: project.id }, {}]) { + const history = await listDeployments(owner.orgId, options); + expect(history.rows[0]).toMatchObject({ favicon: custom, iconUrl: custom }); + } + await repos.project.updateFaviconCache(project.id, { + favicon: "https://app.example.test/new-auto.ico", + }); + expect(await repos.project.findById(project.id)).toMatchObject({ + iconUrl: custom, + favicon: automatic, + }); + const stranger = await seedOwner(); + expect((await update("https://stranger.example.test/icon.png", stranger.auth)).status).toBe(404); + for (const unsafe of [ + "javascript:alert(1)", + "data:image/png;base64,AAA", + "https://user:password@example.test/i.png", + "/relative.png", + ]) + expect((await update(unsafe)).status).toBe(400); + const cleared = await update(null); + expect(cleared.status).toBe(200); + expect(await cleared.json()).toMatchObject({ data: { iconUrl: null, favicon: automatic } }); +}); diff --git a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx index 105bd759e..98dd093ad 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx @@ -8,10 +8,8 @@ import { DeploymentMenu } from "./DeploymentMenu"; import { CommitDetailsModal } from "./CommitDetailsModal"; import type { Deployment } from "../types"; import { formatDistanceToNow, formatBuildTime, getStatusConfig } from "../utils"; -import { ProjectStackIcon } from "@/components/shared/ProjectStackIcon"; -import { AppLogo } from "@/components/AppLogo"; +import { ProjectIcon } from "@/components/shared/ProjectIcon"; import { useI18n, interpolate } from "@/components/i18n-provider"; -import { useImageFallback } from "@/hooks/useImageFallback"; type ServiceStatusLabels = { deployed: string; @@ -122,7 +120,6 @@ export const DeploymentCard: React.FC = ({ const { t } = useI18n(); const [isCommitModalOpen, setIsCommitModalOpen] = useState(false); const [isMenuOpen, setIsMenuOpen] = useState(false); - const favicon = useImageFallback(deployment.favicon); const statusConfig = getStatusConfig(deployment.status); const statusLabelMap: Record = { @@ -153,19 +150,7 @@ export const DeploymentCard: React.FC = ({ /> {/* App logo (catalog apps) → project favicon → framework icon → initials */}
- {appTemplateId ? ( - - ) : favicon.showImage ? ( - - ) : ( - - )} +
{/* Main info */} diff --git a/apps/dashboard/src/app/(dashboard)/deployments/types.ts b/apps/dashboard/src/app/(dashboard)/deployments/types.ts index 213fb5e83..419d63976 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/types.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/types.ts @@ -59,6 +59,7 @@ export interface Deployment { /** Auto-detected favicon of the deployed site, cached on the project. * When present it replaces the framework/Docker glyph as the row logo. */ favicon?: string | null; + iconUrl?: string | null; failureReason?: string; /** Rollback state — populated by the orchestrator-aware listing endpoint. * `artifactRetainedAt` non-null = artifact is archived, rollback-eligible. diff --git a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts index f2bc27c23..7482b1056 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts @@ -42,6 +42,7 @@ export const mapRowToDeployment = (row: any): Deployment => { projectId: row.projectId, projectName: row.projectName, favicon: row.favicon ?? null, + iconUrl: row.iconUrl ?? null, failureReason: row.errorMessage ?? undefined, /* Rollback state — flows from the listing endpoint, which enriches * each row with isActive and surfaces the orchestrator-owned diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx index fa09be27a..96b71d21c 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/AdvancedSettings.tsx @@ -27,6 +27,7 @@ import { isSchemaAppTemplate } from "@/components/app-settings/AppSettingsForm"; import { AppConfiguration } from "./AppConfiguration"; import { BuildSettings } from "./BuildSettings"; import { CloudStaticHosting } from "@/components/project-settings/CloudStaticHosting"; +import { ProjectIconSetting } from "@/components/project-settings/ProjectIconSetting"; interface Props { onDeleteProject: (wipeVolumes?: boolean, recordOnly?: boolean) => void; @@ -357,6 +358,7 @@ export const AdvancedSettings = ({ onDeleteProject }: Props) => { and collided — and since this card has no `overflow-hidden` (the ⋮ menu needs to escape it), the collision spilled into the neighbouring card. */}
+
= ({ project, preferAppLogo, updateAvailable, const [menuOpen, setMenuOpen] = useState(false); const status = getProjectStatus(project); const fw = getFrameworkConfig(project.framework); - const favicon = useImageFallback(project.favicon); const isLocal = !!project.localPath; const hasRepo = !!(project.gitOwner && project.gitRepo); @@ -121,19 +118,7 @@ const ProjectCard: React.FC = ({ project, preferAppLogo, updateAvailable, {/* Icon — on the Apps page show the catalog app's brand logo; otherwise the project favicon, falling back to the framework/service glyph. */}
- {preferAppLogo && project.isApp ? ( - - ) : favicon.showImage ? ( - - ) : ( - - )} +
{/* Name + domain */} diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx index 66f51f1f7..0d1a2bcf8 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx @@ -6,14 +6,12 @@ import Link from "next/link"; import { useRouter } from "next/navigation"; import DropdownMenu from "@/components/ui/DropdownMenu"; import { type Project } from "@/constants/mock"; -import { AppLogo } from "@/components/AppLogo"; -import { ProjectStackIcon } from "@/components/shared/ProjectStackIcon"; +import { ProjectIcon } from "@/components/shared/ProjectIcon"; import { getProjectStatus, projectCardHref, projectDisplayDomain } from "@/utils/project-status"; import { ProjectStatusBadge } from "@/components/shared/ProjectStatusBadge"; import { ServiceStatusIndicator } from "@/components/services/ServiceStatusBadge"; import { useI18n, interpolate } from "@/components/i18n-provider"; import { timeAgo } from "@/lib/time"; -import { useImageFallback } from "@/hooks/useImageFallback"; import { getHostingLabel } from "./ProjectCard"; /** Compact project summary with direct links to its management screens. */ @@ -27,7 +25,6 @@ const ProjectGridCard: React.FC<{ }> = ({ project, preferAppLogo, updateAvailable }) => { const { t } = useI18n(); const router = useRouter(); - const favicon = useImageFallback(project.favicon); const domain = projectDisplayDomain(project); const hosting = getHostingLabel(project.deployTarget, project.serverName, t); @@ -65,20 +62,7 @@ const ProjectGridCard: React.FC<{
- {preferAppLogo && project.isApp ? ( - - ) : favicon.showImage ? ( - // eslint-disable-next-line @next/next/no-img-element - - ) : ( - - )} +
diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx index 2165098d3..7c0906168 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx @@ -43,6 +43,15 @@ for (const [name, Card] of [["list", ProjectCard], ["grid", ProjectGridCard]] as ); describe(`${name} favicon`, () => { + it("uses a custom icon before the catalog logo on the Apps page", async () => { + complete = false; + root = createRoot(container); + await act(async () => root!.render( + , + )); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("https://cdn.example.test/custom.png"); + }); + it("falls back when the image failed before hydration attached its error listener", async () => { const view = render(); container.innerHTML = renderToString(view); diff --git a/apps/dashboard/src/app/(dashboard)/settings/_components/ProfileSetting.tsx b/apps/dashboard/src/app/(dashboard)/settings/_components/ProfileSetting.tsx new file mode 100644 index 000000000..12a7600f9 --- /dev/null +++ b/apps/dashboard/src/app/(dashboard)/settings/_components/ProfileSetting.tsx @@ -0,0 +1,29 @@ +"use client"; + +import { useAuth } from "@/context/AuthContext"; +import { authClient } from "@/lib/auth-client"; +import { useI18n } from "@/components/i18n-provider"; +import { ImageUrlEditor } from "@/components/settings/ImageUrlEditor"; +import { SettingsSection } from "./SettingsSection"; + +export function ProfileSetting() { + const { user } = useAuth(); + const { t } = useI18n(); + const c = t.settings.profile; + if (!user) return null; + return ( + + { + const result = await authClient.updateUser({ image }); + if (result.error) throw new Error(result.error.message || t.settings.imageUrl.failed); + }} + /> + + ); +} diff --git a/apps/dashboard/src/app/(dashboard)/settings/page.tsx b/apps/dashboard/src/app/(dashboard)/settings/page.tsx index 2e4e5cea0..6b63ae685 100644 --- a/apps/dashboard/src/app/(dashboard)/settings/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/settings/page.tsx @@ -32,6 +32,7 @@ import { useI18n } from "@/components/i18n-provider"; import { BuildPreferences } from "./_components/BuildPreferences"; import { AppearanceSetting } from "./_components/AppearanceSetting"; +import { ProfileSetting } from "./_components/ProfileSetting"; import { AppearanceEditor } from "@/components/appearance/AppearanceEditor"; import { RoutePreferences } from "./_components/RoutePreferences"; import { DeployDefaults } from "./_components/DeployDefaults"; @@ -144,6 +145,7 @@ function SettingsPageInner() {
{activeTab === "general" && !customizeAppearance && ( <> + {/* Deploy Defaults + Routing hidden for now — advanced/rarely-needed, reduces general-settings noise. The edge defaults to loopback-port diff --git a/apps/dashboard/src/components/overview/HomeAppsCard.tsx b/apps/dashboard/src/components/overview/HomeAppsCard.tsx index aa0d4fe73..837827a11 100644 --- a/apps/dashboard/src/components/overview/HomeAppsCard.tsx +++ b/apps/dashboard/src/components/overview/HomeAppsCard.tsx @@ -4,7 +4,7 @@ import { useId } from "react"; import Link from "next/link"; import { Icon } from "@repo/ui/icons"; import type { Project } from "@/constants/mock"; -import { AppLogo } from "@/components/AppLogo"; +import { ProjectIcon } from "@/components/shared/ProjectIcon"; import { useI18n } from "@/components/i18n-provider"; import { ProjectStatusBadge } from "@/components/shared/ProjectStatusBadge"; import { Button } from "@/components/ui/button"; @@ -66,7 +66,7 @@ export default function HomeAppsCard({ className="absolute inset-0 rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring" />
- +

+ } + onSave={async (iconUrl) => { + const response = await projectsApi.update(projectData.id, { iconUrl }); + updateProjectData({ iconUrl, favicon: response.data.favicon }); + invalidateProjectCaches(projectData.id); + }} + /> + ); +} diff --git a/apps/dashboard/src/components/settings/ImageUrlEditor.test.tsx b/apps/dashboard/src/components/settings/ImageUrlEditor.test.tsx new file mode 100644 index 000000000..a865f71f8 --- /dev/null +++ b/apps/dashboard/src/components/settings/ImageUrlEditor.test.tsx @@ -0,0 +1,102 @@ +// @vitest-environment happy-dom +import { act, useState } from "react"; +import { createRoot, type Root } from "react-dom/client"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import { I18nProvider } from "@/components/i18n-provider"; +import { ImageUrlEditor } from "./ImageUrlEditor"; + +let host: HTMLDivElement; +let root: Root; +const save = vi.fn(); +beforeEach(() => { + vi.resetAllMocks(); + vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); + vi.spyOn(HTMLImageElement.prototype, "complete", "get").mockReturnValue(false); + host = document.createElement("div"); + document.body.append(host); + root = createRoot(host); +}); +afterEach(async () => { + await act(async () => root.unmount()); + host.remove(); + vi.restoreAllMocks(); + vi.unstubAllGlobals(); +}); + +function Editor({ initial = null }: { initial?: string | null }) { + const [value, setValue] = useState(initial); + return ( + + { + await save(next); + setValue(next); + }} + /> + + ); +} +async function render(initial?: string) { + await act(async () => root.render()); +} +async function edit(value: string) { + await act(async () => { + const input = host.querySelector("input")!; + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")!.set!.call(input, value); + input.dispatchEvent(new Event("input", { bubbles: true })); + }); +} +async function submit() { + await act(async () => + host + .querySelector("form")! + .dispatchEvent(new Event("submit", { bubbles: true, cancelable: true })), + ); +} + +it("previews and saves a trimmed image URL", async () => { + await render(); + await edit(" https://cdn.example.test/avatar.png "); + expect(host.querySelector("img")?.getAttribute("src")).toBe( + "https://cdn.example.test/avatar.png", + ); + expect(host.querySelector("img")?.getAttribute("referrerpolicy")).toBe("no-referrer"); + await submit(); + expect(save).toHaveBeenCalledWith("https://cdn.example.test/avatar.png"); + expect(host.querySelector('[role="status"]')?.textContent).toBe("Saved"); +}); + +it("rejects executable image schemes without loading or saving them", async () => { + await render(); + await edit("javascript:alert(1)"); + expect(host.querySelector("img")).toBeNull(); + await submit(); + expect(save).not.toHaveBeenCalled(); + expect(host.querySelector('[role="alert"]')?.textContent).toContain("HTTP or HTTPS"); +}); + +it("clears the saved override using the shared reset action", async () => { + await render("https://cdn.example.test/avatar.png"); + await act(async () => host.querySelector('button[type="button"]')!.click()); + expect(save).toHaveBeenCalledWith(null); + expect(host.querySelector("input")!.value).toBe(""); + expect(host.querySelector("img")).toBeNull(); +}); + +it("falls back for a broken image, retries a changed URL and preserves the draft on save failure", async () => { + await render("https://cdn.example.test/old.png"); + await act(async () => host.querySelector("img")!.dispatchEvent(new Event("error"))); + expect(host.querySelector("img")).toBeNull(); + await edit("https://cdn.example.test/new.png"); + expect(host.querySelector("img")?.getAttribute("src")).toBe("https://cdn.example.test/new.png"); + save.mockRejectedValueOnce(new Error("Permission denied")); + await submit(); + expect(host.querySelector("input")!.value).toBe("https://cdn.example.test/new.png"); + expect(host.querySelector('[role="alert"]')).not.toBeNull(); + expect(host.querySelector('button[type="submit"]')!.disabled).toBe(false); +}); diff --git a/apps/dashboard/src/components/settings/ImageUrlEditor.tsx b/apps/dashboard/src/components/settings/ImageUrlEditor.tsx new file mode 100644 index 000000000..d2e035f0a --- /dev/null +++ b/apps/dashboard/src/components/settings/ImageUrlEditor.tsx @@ -0,0 +1,143 @@ +"use client"; + +import { useEffect, useId, useState, type ReactNode } from "react"; +import { isImageUrl, MAX_IMAGE_URL_LENGTH } from "@repo/core"; +import { useI18n } from "@/components/i18n-provider"; +import { Input } from "@/components/ui/input"; +import { useImageFallback } from "@/hooks/useImageFallback"; +import { getApiErrorMessage } from "@/lib/api/client"; + +/** Shared URL editor; saving never depends on a remote image probe. */ +export function ImageUrlEditor({ + value, + label, + hint, + resetLabel, + fallback, + onSave, +}: { + value: string | null | undefined; + label: string; + hint: string; + resetLabel: string; + fallback: ReactNode; + onSave: (url: string | null) => Promise; +}) { + const { t } = useI18n(); + const c = t.settings.imageUrl; + const id = useId(); + const [draft, setDraft] = useState(value ?? ""); + const [saving, setSaving] = useState(false); + const [error, setError] = useState(""); + const [saved, setSaved] = useState(false); + useEffect(() => { + setDraft(value ?? ""); + }, [value]); + const trimmed = draft.trim(); + const preview = useImageFallback(isImageUrl(trimmed) ? trimmed : null); + const save = async (next: string | null) => { + if (saving) return; + if (next && !isImageUrl(next)) { + setError(c.invalid); + return; + } + setSaving(true); + setError(""); + setSaved(false); + try { + await onSave(next); + setDraft(next ?? ""); + setSaved(true); + } catch (failure) { + setError(getApiErrorMessage(failure, c.failed)); + } finally { + setSaving(false); + } + }; + return ( +

{ + event.preventDefault(); + void save(trimmed || null); + }} + className="space-y-3" + > +
+
+ {preview.showImage ? ( + + ) : ( + fallback + )} +
+
+ + { + setDraft(event.target.value); + setError(""); + setSaved(false); + }} + /> +
+
+

+ {hint} +

+ {isImageUrl(trimmed) && !preview.showImage && ( +

{c.previewFailed}

+ )} + {error && ( + + )} +
+ + {value && ( + + )} + {saved && ( + + {c.saved} + + )} +
+
+ ); +} diff --git a/apps/dashboard/src/components/settings/image-settings.test.tsx b/apps/dashboard/src/components/settings/image-settings.test.tsx new file mode 100644 index 000000000..a6a171b07 --- /dev/null +++ b/apps/dashboard/src/components/settings/image-settings.test.tsx @@ -0,0 +1,83 @@ +// @vitest-environment happy-dom +import { act } from "react"; +import { createRoot, type Root } from "react-dom/client"; +import { afterEach, beforeEach, expect, it, vi } from "vitest"; +import { I18nProvider } from "@/components/i18n-provider"; +import { ProfileSetting } from "@/app/(dashboard)/settings/_components/ProfileSetting"; +import { ProjectIconSetting } from "@/components/project-settings/ProjectIconSetting"; + +const h = vi.hoisted(() => ({ + profile: vi.fn(), + project: vi.fn(), + update: vi.fn(), + invalidate: vi.fn(), +})); +vi.mock("@/context/AuthContext", () => ({ + useAuth: () => ({ user: { name: "Ada", email: "ada@example.test", image: null } }), +})); +vi.mock("@/lib/auth-client", () => ({ authClient: { updateUser: h.profile } })); +vi.mock("@/context/ProjectSettingsContext", () => ({ + useProjectSettings: () => ({ + projectData: { id: "project-a", iconUrl: "https://cdn.example.test/old.png" }, + updateProjectData: h.update, + }), +})); +vi.mock("@/lib/api", () => ({ projectsApi: { update: h.project } })); +vi.mock("@/hooks/useProjectEndpoints", () => ({ invalidateProjectCaches: h.invalidate })); +let host: HTMLDivElement; +let root: Root; +beforeEach(() => { + vi.clearAllMocks(); + vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); + h.profile.mockResolvedValue({ data: { status: true }, error: null }); + h.project.mockResolvedValue({ data: { favicon: "https://app.example.test/favicon.ico" } }); + host = document.createElement("div"); + document.body.append(host); + root = createRoot(host); +}); +afterEach(async () => { + await act(async () => root.unmount()); + host.remove(); + vi.unstubAllGlobals(); +}); + +it("saves the avatar through the current user's existing auth update", async () => { + await act(async () => + root.render( + + + , + ), + ); + await act(async () => { + const input = host.querySelector("input")!; + Object.getOwnPropertyDescriptor(HTMLInputElement.prototype, "value")!.set!.call( + input, + "https://cdn.example.test/avatar.png", + ); + input.dispatchEvent(new Event("input", { bubbles: true })); + }); + await act(async () => + host + .querySelector("form")! + .dispatchEvent(new Event("submit", { bubbles: true, cancelable: true })), + ); + expect(h.profile).toHaveBeenCalledWith({ image: "https://cdn.example.test/avatar.png" }); +}); + +it("clears the project override through existing settings and immediately restores the discovered icon", async () => { + await act(async () => + root.render( + + + , + ), + ); + await act(async () => host.querySelector('button[type="button"]')!.click()); + expect(h.project).toHaveBeenCalledWith("project-a", { iconUrl: null }); + expect(h.update).toHaveBeenCalledWith({ + iconUrl: null, + favicon: "https://app.example.test/favicon.ico", + }); + expect(h.invalidate).toHaveBeenCalledWith("project-a"); +}); diff --git a/apps/dashboard/src/components/shared/ProjectIcon.tsx b/apps/dashboard/src/components/shared/ProjectIcon.tsx new file mode 100644 index 000000000..7474e0013 --- /dev/null +++ b/apps/dashboard/src/components/shared/ProjectIcon.tsx @@ -0,0 +1,47 @@ +"use client"; + +import { projectIconUrl } from "@repo/core"; +import { AppLogo } from "@/components/AppLogo"; +import { useImageFallback } from "@/hooks/useImageFallback"; +import { ProjectStackIcon } from "./ProjectStackIcon"; + +/** Custom URL, existing catalog/discovery preference, then the stack fallback. */ +export function ProjectIcon({ + project, + appTemplateId, + preferAppLogo = false, + className = "size-6", +}: { + project: { + iconUrl?: string | null; + favicon?: string | null; + framework?: string | null; + serviceDeploymentMode?: "single" | "services"; + }; + appTemplateId?: string | null; + preferAppLogo?: boolean; + className?: string; +}) { + const src = project.iconUrl || (preferAppLogo && appTemplateId ? null : projectIconUrl(project)); + const image = useImageFallback(src); + if (image.showImage) + return ( + + ); + if (preferAppLogo && appTemplateId) + return ; + return ( + + ); +} diff --git a/apps/dashboard/src/components/sidebar.tsx b/apps/dashboard/src/components/sidebar.tsx index b772b2914..009db0fe6 100644 --- a/apps/dashboard/src/components/sidebar.tsx +++ b/apps/dashboard/src/components/sidebar.tsx @@ -1,5 +1,7 @@ "use client"; +import { UserAvatar } from "@/components/ui/UserAvatar"; + import { reportCaughtError as observeCaughtError } from "@repo/core/diagnostics"; import { Icon as UiIcon } from "@repo/ui/icons"; @@ -472,9 +474,11 @@ export function Sidebar({ mobileOpen = false, onCloseMobile }: { mobileOpen?: bo title={collapsed ? activeOrg?.name : undefined} > {/* Org avatar / initial */} -
- {activeOrg?.name?.[0] ?? } -
+ {activeOrg?.id === `org_${user?.id}` ? : ( +
+ {activeOrg?.name?.[0] ?? } +
+ )} {!collapsed && ( <> @@ -563,9 +567,7 @@ export function Sidebar({ mobileOpen = false, onCloseMobile }: { mobileOpen?: bo {/* Footer separator + signed-in-as + sign out */}
-
- {displayInitial} -
+

{displayName} @@ -612,9 +614,7 @@ export function Sidebar({ mobileOpen = false, onCloseMobile }: { mobileOpen?: bo collapsed ? "justify-center" : "gap-3" }`} > -

- {displayInitial} -
+ {!collapsed && ( <> diff --git a/apps/dashboard/src/components/ui/UserAvatar.tsx b/apps/dashboard/src/components/ui/UserAvatar.tsx new file mode 100644 index 000000000..e398f65d7 --- /dev/null +++ b/apps/dashboard/src/components/ui/UserAvatar.tsx @@ -0,0 +1,37 @@ +"use client"; + +import { useImageFallback } from "@/hooks/useImageFallback"; +import { cn } from "@/lib/utils"; + +export function UserAvatar({ + image, + name, + className, +}: { + image?: string | null; + name: string; + className?: string; +}) { + const fallback = useImageFallback(image); + return ( + + {fallback.showImage ? ( + + ) : ( + name[0] || "?" + )} + + ); +} diff --git a/apps/dashboard/src/constants/mock.ts b/apps/dashboard/src/constants/mock.ts index a69bb41eb..5338b6844 100644 --- a/apps/dashboard/src/constants/mock.ts +++ b/apps/dashboard/src/constants/mock.ts @@ -79,6 +79,7 @@ export interface Project { /* ── Hosting info (enriched by API) ─────────────────────── */ favicon?: string | null; + iconUrl?: string | null; deployTarget?: string | null; serverId?: string | null; serverName?: string | null; diff --git a/apps/dashboard/src/i18n/locales/ar/projectSettings.json b/apps/dashboard/src/i18n/locales/ar/projectSettings.json index 21e36d9ea..b09fc3b80 100644 --- a/apps/dashboard/src/i18n/locales/ar/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ar/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "بايت", "emptyBodyHint": "يتطلب رمز الحالة هذا محتوى استجابة فارغًا.", "headersHint": "أضف ترويسات للتخزين المؤقت أو CORS أو غيرها." + }, + "icon": { + "label": "رابط أيقونة المشروع", + "hint": "تتجاوز الأيقونة المخصصة الاكتشاف التلقائي. امسح الرابط للعودة إلى الأيقونة المكتشفة.", + "reset": "استخدام الأيقونة التلقائية" } } diff --git a/apps/dashboard/src/i18n/locales/ar/settings.json b/apps/dashboard/src/i18n/locales/ar/settings.json index 360545e81..7e6d02ff5 100644 --- a/apps/dashboard/src/i18n/locales/ar/settings.json +++ b/apps/dashboard/src/i18n/locales/ar/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "إيقاف الخدمة", "cancel": "إلغاء", "noReverseProxy": "لم يتم اكتشاف وكيل عكسي على هذا الجهاز." + }, + "imageUrl": { + "preview": "معاينة الصورة", + "invalid": "أدخل رابط صورة HTTP أو HTTPS بدون بيانات تسجيل دخول.", + "failed": "تعذّر حفظ رابط الصورة.", + "save": "حفظ", + "saving": "جارٍ الحفظ…", + "saved": "تم الحفظ", + "previewFailed": "المعاينة غير متاحة. تأكد أن الرابط يشير مباشرةً إلى صورة." + }, + "profile": { + "title": "الملف الشخصي", + "description": "صورة حسابك الشخصي.", + "label": "رابط الصورة الشخصية", + "hint": "استخدم رابط صورة مباشرًا. اتركه فارغًا لاستخدام الحرف الأول من اسمك.", + "reset": "استخدام الحرف الأول" } } diff --git a/apps/dashboard/src/i18n/locales/de/projectSettings.json b/apps/dashboard/src/i18n/locales/de/projectSettings.json index b21c553ec..940a50538 100644 --- a/apps/dashboard/src/i18n/locales/de/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/de/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "Bytes", "emptyBodyHint": "Dieser Status erfordert einen leeren Antwortinhalt.", "headersHint": "Cache-, CORS- oder andere Antwortheader hinzufügen." + }, + "icon": { + "label": "URL des Projektsymbols", + "hint": "Ein eigenes Symbol ersetzt die automatische Erkennung. Leere die URL, um das erkannte Symbol zu verwenden.", + "reset": "Automatisches Symbol verwenden" } } diff --git a/apps/dashboard/src/i18n/locales/de/settings.json b/apps/dashboard/src/i18n/locales/de/settings.json index 2a500160e..296a00e59 100644 --- a/apps/dashboard/src/i18n/locales/de/settings.json +++ b/apps/dashboard/src/i18n/locales/de/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "Bereitstellung stoppen", "cancel": "Abbrechen", "noReverseProxy": "Auf dieser Maschine wurde kein Reverse-Proxy erkannt." + }, + "imageUrl": { + "preview": "Bildvorschau", + "invalid": "Gib eine HTTP- oder HTTPS-Bild-URL ohne Zugangsdaten ein.", + "failed": "Die Bild-URL konnte nicht gespeichert werden.", + "save": "Speichern", + "saving": "Wird gespeichert…", + "saved": "Gespeichert", + "previewFailed": "Keine Vorschau verfügbar. Prüfe, ob die URL direkt auf ein Bild verweist." + }, + "profile": { + "title": "Profil", + "description": "Das Bild deines persönlichen Kontos.", + "label": "Avatar-URL", + "hint": "Verwende eine direkte Bild-URL. Leer lassen, um deinen Anfangsbuchstaben anzuzeigen.", + "reset": "Anfangsbuchstaben verwenden" } } diff --git a/apps/dashboard/src/i18n/locales/en/projectSettings.json b/apps/dashboard/src/i18n/locales/en/projectSettings.json index 09e2bf804..4539f5159 100644 --- a/apps/dashboard/src/i18n/locales/en/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/en/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "bytes", "emptyBodyHint": "This status requires an empty response body.", "headersHint": "Add cache, CORS, or other response headers." + }, + "icon": { + "label": "Project icon URL", + "hint": "A custom icon replaces automatic discovery. Clear it to use the discovered icon again.", + "reset": "Use automatic icon" } } diff --git a/apps/dashboard/src/i18n/locales/en/settings.json b/apps/dashboard/src/i18n/locales/en/settings.json index 77286e291..ff151942c 100644 --- a/apps/dashboard/src/i18n/locales/en/settings.json +++ b/apps/dashboard/src/i18n/locales/en/settings.json @@ -1791,5 +1791,21 @@ "title": "Demo mode", "description": "Blur IP addresses, hosts, and environment values during screen-shares and recordings." } + }, + "imageUrl": { + "preview": "Image preview", + "invalid": "Enter an HTTP or HTTPS image URL without embedded credentials.", + "failed": "Could not save the image URL.", + "save": "Save", + "saving": "Saving…", + "saved": "Saved", + "previewFailed": "Preview unavailable. Check that the URL points directly to an image." + }, + "profile": { + "title": "Profile", + "description": "Your personal account image.", + "label": "Avatar URL", + "hint": "Use a direct image URL. Leave empty to use your initial.", + "reset": "Use initial" } } diff --git a/apps/dashboard/src/i18n/locales/es/projectSettings.json b/apps/dashboard/src/i18n/locales/es/projectSettings.json index e7e7bfe01..ff9d8ee29 100644 --- a/apps/dashboard/src/i18n/locales/es/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/es/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "bytes", "emptyBodyHint": "Este estado requiere un cuerpo de respuesta vacío.", "headersHint": "Añade cabeceras de caché, CORS u otras." + }, + "icon": { + "label": "URL del icono del proyecto", + "hint": "El icono personalizado sustituye la detección automática. Borra la URL para volver al icono detectado.", + "reset": "Usar icono automático" } } diff --git a/apps/dashboard/src/i18n/locales/es/settings.json b/apps/dashboard/src/i18n/locales/es/settings.json index 3ab15e30e..0d2c5871c 100644 --- a/apps/dashboard/src/i18n/locales/es/settings.json +++ b/apps/dashboard/src/i18n/locales/es/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "Dejar de servir", "cancel": "Cancelar", "noReverseProxy": "No se detectó ningún proxy inverso en esta máquina." + }, + "imageUrl": { + "preview": "Vista previa de la imagen", + "invalid": "Introduce una URL HTTP o HTTPS sin credenciales.", + "failed": "No se pudo guardar la URL de la imagen.", + "save": "Guardar", + "saving": "Guardando…", + "saved": "Guardado", + "previewFailed": "Vista previa no disponible. Comprueba que la URL enlace directamente a una imagen." + }, + "profile": { + "title": "Perfil", + "description": "La imagen de tu cuenta personal.", + "label": "URL del avatar", + "hint": "Usa una URL directa de imagen. Déjala vacía para mostrar tu inicial.", + "reset": "Usar inicial" } } diff --git a/apps/dashboard/src/i18n/locales/fr/projectSettings.json b/apps/dashboard/src/i18n/locales/fr/projectSettings.json index df9987abb..8f5a87b8d 100644 --- a/apps/dashboard/src/i18n/locales/fr/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/fr/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "octets", "emptyBodyHint": "Ce statut nécessite un corps de réponse vide.", "headersHint": "Ajoutez des en-têtes de cache, CORS ou autres." + }, + "icon": { + "label": "URL de l’icône du projet", + "hint": "Une icône personnalisée remplace la détection automatique. Effacez l’URL pour retrouver l’icône détectée.", + "reset": "Utiliser l’icône automatique" } } diff --git a/apps/dashboard/src/i18n/locales/fr/settings.json b/apps/dashboard/src/i18n/locales/fr/settings.json index 4a43b3d39..5614429ab 100644 --- a/apps/dashboard/src/i18n/locales/fr/settings.json +++ b/apps/dashboard/src/i18n/locales/fr/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "Cesser de servir", "cancel": "Annuler", "noReverseProxy": "Aucun proxy inverse détecté sur cette machine." + }, + "imageUrl": { + "preview": "Aperçu de l’image", + "invalid": "Saisissez une URL HTTP ou HTTPS sans identifiants.", + "failed": "Impossible d’enregistrer l’URL de l’image.", + "save": "Enregistrer", + "saving": "Enregistrement…", + "saved": "Enregistré", + "previewFailed": "Aperçu indisponible. Vérifiez que l’URL pointe directement vers une image." + }, + "profile": { + "title": "Profil", + "description": "L’image de votre compte personnel.", + "label": "URL de l’avatar", + "hint": "Utilisez une URL directe d’image. Laissez vide pour afficher votre initiale.", + "reset": "Utiliser l’initiale" } } diff --git a/apps/dashboard/src/i18n/locales/ja/projectSettings.json b/apps/dashboard/src/i18n/locales/ja/projectSettings.json index 1829beee8..0d0cfd5eb 100644 --- a/apps/dashboard/src/i18n/locales/ja/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ja/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "バイト", "emptyBodyHint": "このステータスではレスポンス本文を空にする必要があります。", "headersHint": "キャッシュ、CORSなどのレスポンスヘッダーを追加します。" + }, + "icon": { + "label": "プロジェクトアイコンの URL", + "hint": "カスタムアイコンは自動検出より優先されます。URL を消すと検出されたアイコンに戻ります。", + "reset": "自動アイコンを使用" } } diff --git a/apps/dashboard/src/i18n/locales/ja/settings.json b/apps/dashboard/src/i18n/locales/ja/settings.json index 9394731c4..db135bb68 100644 --- a/apps/dashboard/src/i18n/locales/ja/settings.json +++ b/apps/dashboard/src/i18n/locales/ja/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "配信を停止", "cancel": "キャンセル", "noReverseProxy": "このマシンでリバースプロキシが検出されませんでした。" + }, + "imageUrl": { + "preview": "画像プレビュー", + "invalid": "認証情報を含まない HTTP または HTTPS の画像 URL を入力してください。", + "failed": "画像 URL を保存できませんでした。", + "save": "保存", + "saving": "保存中…", + "saved": "保存しました", + "previewFailed": "プレビューを表示できません。画像の直接 URL か確認してください。" + }, + "profile": { + "title": "プロフィール", + "description": "個人アカウントの画像。", + "label": "アバター URL", + "hint": "画像の直接 URL を使用します。空欄にすると名前の頭文字を表示します。", + "reset": "頭文字を使用" } } diff --git a/apps/dashboard/src/i18n/locales/pt/projectSettings.json b/apps/dashboard/src/i18n/locales/pt/projectSettings.json index b27f511cf..edb282aa8 100644 --- a/apps/dashboard/src/i18n/locales/pt/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/pt/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "bytes", "emptyBodyHint": "Este estado exige um corpo de resposta vazio.", "headersHint": "Adicione cabeçalhos de cache, CORS ou outros." + }, + "icon": { + "label": "URL do ícone do projeto", + "hint": "Um ícone personalizado substitui a detecção automática. Limpe a URL para usar o ícone detectado.", + "reset": "Usar ícone automático" } } diff --git a/apps/dashboard/src/i18n/locales/pt/settings.json b/apps/dashboard/src/i18n/locales/pt/settings.json index 3fa1a6087..883f9ab06 100644 --- a/apps/dashboard/src/i18n/locales/pt/settings.json +++ b/apps/dashboard/src/i18n/locales/pt/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "Parar de servir", "cancel": "Cancelar", "noReverseProxy": "Nenhum proxy reverso detectado nesta máquina." + }, + "imageUrl": { + "preview": "Prévia da imagem", + "invalid": "Insira uma URL HTTP ou HTTPS sem credenciais.", + "failed": "Não foi possível salvar a URL da imagem.", + "save": "Salvar", + "saving": "Salvando…", + "saved": "Salvo", + "previewFailed": "Prévia indisponível. Verifique se a URL aponta diretamente para uma imagem." + }, + "profile": { + "title": "Perfil", + "description": "A imagem da sua conta pessoal.", + "label": "URL do avatar", + "hint": "Use uma URL direta de imagem. Deixe em branco para usar sua inicial.", + "reset": "Usar inicial" } } diff --git a/apps/dashboard/src/i18n/locales/ru/projectSettings.json b/apps/dashboard/src/i18n/locales/ru/projectSettings.json index 80843ddf0..5ad468511 100644 --- a/apps/dashboard/src/i18n/locales/ru/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ru/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "байт", "emptyBodyHint": "Этот статус требует пустого тела ответа.", "headersHint": "Добавьте заголовки кеширования, CORS или другие." + }, + "icon": { + "label": "URL значка проекта", + "hint": "Свой значок заменяет автоматическое обнаружение. Очистите URL, чтобы вернуть найденный значок.", + "reset": "Автоматический значок" } } diff --git a/apps/dashboard/src/i18n/locales/ru/settings.json b/apps/dashboard/src/i18n/locales/ru/settings.json index 59cb29a08..1ee579392 100644 --- a/apps/dashboard/src/i18n/locales/ru/settings.json +++ b/apps/dashboard/src/i18n/locales/ru/settings.json @@ -1791,5 +1791,21 @@ "title": "Демо-режим", "description": "Размывать IP-адреса, хосты и переменные окружения при показе экрана и записи видео." } + }, + "imageUrl": { + "preview": "Предпросмотр изображения", + "invalid": "Введите HTTP- или HTTPS-адрес изображения без учётных данных.", + "failed": "Не удалось сохранить адрес изображения.", + "save": "Сохранить", + "saving": "Сохранение…", + "saved": "Сохранено", + "previewFailed": "Предпросмотр недоступен. Проверьте, что URL ведёт прямо к изображению." + }, + "profile": { + "title": "Профиль", + "description": "Изображение вашего личного аккаунта.", + "label": "URL аватара", + "hint": "Укажите прямую ссылку на изображение. Оставьте поле пустым, чтобы показать инициал.", + "reset": "Использовать инициал" } } diff --git a/apps/dashboard/src/i18n/locales/tr/projectSettings.json b/apps/dashboard/src/i18n/locales/tr/projectSettings.json index b81cee71b..219dfaa06 100644 --- a/apps/dashboard/src/i18n/locales/tr/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/tr/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "bayt", "emptyBodyHint": "Bu durum kodu boş bir yanıt gövdesi gerektirir.", "headersHint": "Önbellek, CORS veya diğer yanıt başlıklarını ekleyin." + }, + "icon": { + "label": "Proje simgesi URL’si", + "hint": "Özel simge otomatik algılamanın yerini alır. Algılanan simgeye dönmek için URL’yi temizleyin.", + "reset": "Otomatik simgeyi kullan" } } diff --git a/apps/dashboard/src/i18n/locales/tr/settings.json b/apps/dashboard/src/i18n/locales/tr/settings.json index 343010e85..563cf2944 100644 --- a/apps/dashboard/src/i18n/locales/tr/settings.json +++ b/apps/dashboard/src/i18n/locales/tr/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "Sunmayı durdur", "cancel": "İptal", "noReverseProxy": "Bu makinede ters proxy algılanmadı." + }, + "imageUrl": { + "preview": "Resim önizlemesi", + "invalid": "Kimlik bilgisi içermeyen bir HTTP veya HTTPS resim URL’si girin.", + "failed": "Resim URL’si kaydedilemedi.", + "save": "Kaydet", + "saving": "Kaydediliyor…", + "saved": "Kaydedildi", + "previewFailed": "Önizleme kullanılamıyor. URL’nin doğrudan bir resme yöneldiğini kontrol edin." + }, + "profile": { + "title": "Profil", + "description": "Kişisel hesabınızın resmi.", + "label": "Avatar URL’si", + "hint": "Doğrudan bir resim URL’si kullanın. Baş harfiniz için boş bırakın.", + "reset": "Baş harfi kullan" } } diff --git a/apps/dashboard/src/i18n/locales/zh/projectSettings.json b/apps/dashboard/src/i18n/locales/zh/projectSettings.json index 8d912db95..b16d95d0b 100644 --- a/apps/dashboard/src/i18n/locales/zh/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/zh/projectSettings.json @@ -1437,5 +1437,10 @@ "bytes": "字节", "emptyBodyHint": "此状态码要求响应正文为空。", "headersHint": "添加缓存、CORS 或其他响应标头。" + }, + "icon": { + "label": "项目图标 URL", + "hint": "自定义图标优先于自动检测。清空 URL 可恢复检测到的图标。", + "reset": "使用自动图标" } } diff --git a/apps/dashboard/src/i18n/locales/zh/settings.json b/apps/dashboard/src/i18n/locales/zh/settings.json index 753bd8f2a..682c418c8 100644 --- a/apps/dashboard/src/i18n/locales/zh/settings.json +++ b/apps/dashboard/src/i18n/locales/zh/settings.json @@ -1791,5 +1791,21 @@ "confirmCta": "停止服务", "cancel": "取消", "noReverseProxy": "在此机器上未检测到反向代理。" + }, + "imageUrl": { + "preview": "图片预览", + "invalid": "请输入不含凭据的 HTTP 或 HTTPS 图片 URL。", + "failed": "无法保存图片 URL。", + "save": "保存", + "saving": "正在保存…", + "saved": "已保存", + "previewFailed": "无法预览。请检查 URL 是否直接指向图片。" + }, + "profile": { + "title": "个人资料", + "description": "你的个人账户图片。", + "label": "头像 URL", + "hint": "使用图片的直接 URL。留空则显示姓名首字母。", + "reset": "使用首字母" } } diff --git a/docs/dashboard-design.md b/docs/dashboard-design.md index d09a84ef8..58409ea52 100644 --- a/docs/dashboard-design.md +++ b/docs/dashboard-design.md @@ -5,6 +5,13 @@ and a consistent type hierarchy across light, dim, and dark themes. ## Surfaces and controls +Personal avatar URLs live in Settings → General → Profile. Project icon URLs live +in the Project Info card in project Settings. Both use the shared URL editor with +a preview and a reset action. Custom project icons take precedence across project, +app and deployment lists and pause automatic favicon discovery. Clearing an override +restores the cached favicon and its normal discovery flow. Image URLs are displayed +directly by the browser with no referrer; the control plane does not fetch custom URLs. + Assistant settings belong in **Settings → Assistant**; event-driven flows and run history open from **Automations** in the AI Agents right column. Keep the conversation free of view tabs, with an AI Agents return action on the automations page. diff --git a/packages/contracts/src/deployments.ts b/packages/contracts/src/deployments.ts index 05b0d73e4..cfa0b5e2c 100644 --- a/packages/contracts/src/deployments.ts +++ b/packages/contracts/src/deployments.ts @@ -98,6 +98,7 @@ export const DeploymentSchema = Type.Object({ isActive: Type.Optional(Type.Boolean()), projectName: Type.Optional(Type.String()), favicon: Type.Optional(Type.Union([Type.String(), Type.Null()])), + iconUrl: Type.Optional(Type.Union([Type.String(), Type.Null()])), }); export type Deployment = Static; diff --git a/packages/contracts/src/project-inputs.ts b/packages/contracts/src/project-inputs.ts index d75ad8545..bfa89184c 100644 --- a/packages/contracts/src/project-inputs.ts +++ b/packages/contracts/src/project-inputs.ts @@ -8,6 +8,7 @@ import { Type, type Static, type TLiteral } from "@sinclair/typebox"; import { GitHubDeploymentChecksSchema } from "./deployment-checks"; import { STACK_IDS, + MAX_IMAGE_URL_LENGTH, RUNTIME_VERSION_PATTERN, RUNTIME_VERSION_MAX_LENGTH, ALL_PACKAGE_MANAGERS, @@ -559,7 +560,10 @@ export const CreateProjectBody = Type.Object({ // `serverId` is create/ensure-only. Keeping it out of the generic PATCH body is // also what keeps PROJECT_UPDATE_KEYS from becoming a target-retargeting path. -export const UpdateProjectBody = Type.Partial(Type.Omit(CreateProjectBody, ["serverId"])); +export const UpdateProjectBody = Type.Object({ + ...Type.Partial(Type.Omit(CreateProjectBody, ["serverId"])).properties, + iconUrl: Type.Optional(Type.Union([Type.String({ maxLength: MAX_IMAGE_URL_LENGTH }), Type.Null()])), +}); /** * POST /projects/ensure — CreateProjectBody plus an optional `projectId` to diff --git a/packages/contracts/src/projects.ts b/packages/contracts/src/projects.ts index 41eb79398..ccb4277cb 100644 --- a/packages/contracts/src/projects.ts +++ b/packages/contracts/src/projects.ts @@ -14,6 +14,8 @@ export const ProjectSchema = Type.Object({ groupId: Type.String({ minLength: 1 }), name: Type.String(), slug: Type.String(), + iconUrl: Type.Optional(nullableString()), + favicon: Type.Optional(nullableString()), createdAt: Type.String(), updatedAt: Type.String(), environmentName: Type.Optional(Type.String()), diff --git a/packages/core/src/image-url.test.ts b/packages/core/src/image-url.test.ts new file mode 100644 index 000000000..391f1648b --- /dev/null +++ b/packages/core/src/image-url.test.ts @@ -0,0 +1,34 @@ +import { describe, expect, it } from "vitest"; +import { isImageUrl, MAX_IMAGE_URL_LENGTH, projectIconUrl } from "./image-url"; + +describe("display image URLs", () => { + it.each([ + "https://cdn.example.test/avatar.png?v=2", + "http://images.example.test/icon.svg", + "https://example.test/a%20b.png", + ])("accepts %s", (url) => expect(isImageUrl(url)).toBe(true)); + it.each([ + null, + 123, + "", + "/icon.png", + "//example.test/icon", + "javascript:alert(1)", + "data:image/svg+xml,", + "file:///etc/passwd", + "blob:https://example.test/id", + "https://user:password@example.test/a.png", + "https://example.test/\nimage.png", + " https://example.test/image.png", + `https://example.test/${"a".repeat(MAX_IMAGE_URL_LENGTH)}`, + ])("refuses unsafe or malformed input %j", (url) => expect(isImageUrl(url)).toBe(false)); + it("uses an explicit project icon before the discovered cache and restores the cache when cleared", () => { + const project = { + iconUrl: "https://images.example.test/custom.png", + favicon: "https://app.example.test/favicon.ico", + }; + expect(projectIconUrl(project)).toBe(project.iconUrl); + expect(projectIconUrl({ ...project, iconUrl: null })).toBe(project.favicon); + expect(projectIconUrl(null)).toBeNull(); + }); +}); diff --git a/packages/core/src/image-url.ts b/packages/core/src/image-url.ts new file mode 100644 index 000000000..52fcc7575 --- /dev/null +++ b/packages/core/src/image-url.ts @@ -0,0 +1,30 @@ +/** Image URLs are displayed by the browser, never fetched by the control plane. */ +export const MAX_IMAGE_URL_LENGTH = 2048; + +export function isImageUrl(value: unknown): value is string { + if ( + typeof value !== "string" || + !/^https?:\/\//i.test(value) || + value.length > MAX_IMAGE_URL_LENGTH || + /[\u0000-\u0020\u007f]/.test(value) + ) + return false; + try { + const url = new URL(value); + return ( + (url.protocol === "https:" || url.protocol === "http:") && + !!url.hostname && + !url.username && + !url.password + ); + } catch { + return false; + } +} + +/** One precedence rule for every project and deployment presentation. */ +export function projectIconUrl( + project: { iconUrl?: string | null; favicon?: string | null } | null | undefined, +): string | null { + return project?.iconUrl || project?.favicon || null; +} diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts index fa306c0a2..2c33b6c39 100644 --- a/packages/core/src/index.ts +++ b/packages/core/src/index.ts @@ -1,4 +1,5 @@ export * from "./types"; +export * from "./image-url"; export * from "./docker-swarm"; export * from "./actions"; export * from "./action-capabilities"; diff --git a/packages/db/drizzle/0231_project_icon_url.sql b/packages/db/drizzle/0231_project_icon_url.sql new file mode 100644 index 000000000..5ecc9e5f7 --- /dev/null +++ b/packages/db/drizzle/0231_project_icon_url.sql @@ -0,0 +1 @@ +ALTER TABLE "project" ADD COLUMN IF NOT EXISTS "icon_url" text; diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json index d7a930769..9e0661e6c 100644 --- a/packages/db/drizzle/meta/_journal.json +++ b/packages/db/drizzle/meta/_journal.json @@ -1618,6 +1618,13 @@ "when": 1794373201000, "tag": "0230_restore_workspace_security_fields", "breakpoints": true + }, + { + "idx": 231, + "version": "7", + "when": 1794373202000, + "tag": "0231_project_icon_url", + "breakpoints": true } ] } diff --git a/packages/db/src/repos/deployment.repo.ts b/packages/db/src/repos/deployment.repo.ts index add5653d8..66dcc253f 100644 --- a/packages/db/src/repos/deployment.repo.ts +++ b/packages/db/src/repos/deployment.repo.ts @@ -626,7 +626,7 @@ export function createDeploymentRepo(db: Database, encryption: ConfigurationEncr async listHistoryProjects(organizationId: string) { return db.selectDistinct({ id: project.id, name: project.name, - activeDeploymentId: project.activeDeploymentId, favicon: project.favicon, + activeDeploymentId: project.activeDeploymentId, favicon: project.favicon, iconUrl: project.iconUrl, }).from(project).innerJoin(deployment, eq(deployment.projectId, project.id)) .where(and(eq(project.organizationId, organizationId), eq(deployment.organizationId, organizationId))) .orderBy(project.name, project.id); diff --git a/packages/db/src/repos/project.repo.ts b/packages/db/src/repos/project.repo.ts index ffe4aa891..5cb6dc8af 100644 --- a/packages/db/src/repos/project.repo.ts +++ b/packages/db/src/repos/project.repo.ts @@ -677,7 +677,7 @@ export function createProjectRepo(db: Database, encryption: ConfigurationEncrypt if (Object.keys(patch).length === 0) return; - await db.update(project).set(patch).where(eq(project.id, id)); + await db.update(project).set(patch).where(and(eq(project.id, id), isNull(project.iconUrl))); }, /** Soft-delete a project */ diff --git a/packages/db/src/schema/project.ts b/packages/db/src/schema/project.ts index 023ae9fe3..176ddcac2 100644 --- a/packages/db/src/schema/project.ts +++ b/packages/db/src/schema/project.ts @@ -499,6 +499,8 @@ export const project = pgTable( * nobody opted into paying for this, so nobody keeps paying for it silently. */ collectPaths: boolean("collect_paths").notNull().default(false), + /** Optional display override; independent of the discovered favicon cache. */ + iconUrl: text("icon_url"), /** Auto-detected favicon URL from the deployed site */ favicon: text("favicon"), /** Last time favicon detection was attempted for this project */ diff --git a/packages/platform/src/engine/lib/auth.ts b/packages/platform/src/engine/lib/auth.ts index 0528fa7fb..b51d75b0c 100644 --- a/packages/platform/src/engine/lib/auth.ts +++ b/packages/platform/src/engine/lib/auth.ts @@ -1,3 +1,4 @@ +import { isImageUrl } from "@repo/core"; import { diagnostics as errorDiagnostics } from "@repo/core/diagnostics"; import { organizationOptions, isSaasDeployment } from "./organization-lifecycle"; import { betterAuth, type User } from "better-auth"; @@ -278,6 +279,14 @@ export const auth = betterAuth({ /* ---------- Database hooks ---------- */ databaseHooks: { user: { + update: { + before: async (user) => { + if (user.image === undefined) return; + const image = typeof user.image === "string" ? user.image.trim() || null : user.image; + if (image !== null && !isImageUrl(image)) throw new APIError("BAD_REQUEST", { message: "Avatar URL must be an HTTP or HTTPS URL without credentials." }); + return { data: { ...user, image } }; + }, + }, create: { before: async (user, ctx) => { const denyCreation = (message: string): never => { diff --git a/packages/platform/src/engine/lib/favicon-detector.ts b/packages/platform/src/engine/lib/favicon-detector.ts index f0eb03024..8185d9ba3 100644 --- a/packages/platform/src/engine/lib/favicon-detector.ts +++ b/packages/platform/src/engine/lib/favicon-detector.ts @@ -22,6 +22,7 @@ interface FaviconRefreshProject { slug?: string | null; activeDeploymentId?: string | null; favicon?: string | null; + iconUrl?: string | null; faviconCheckedAt?: Date | string | null; } @@ -108,7 +109,7 @@ export function refreshProjectFaviconIfStale( project: FaviconRefreshProject, options?: RefreshOptions, ): void { - if (!project.activeDeploymentId || !isRefreshDue(project)) { + if (project.iconUrl || !project.activeDeploymentId || !isRefreshDue(project)) { return; } @@ -140,6 +141,8 @@ export async function detectAndStoreFavicon(projectId: string, siteUrl: string): const checkedAt = new Date(); try { + const project = await repos.project.findById(projectId); + if (!project || project.iconUrl) return; const faviconUrl = await probeFavicon(siteUrl); if (faviconUrl) { await repos.project.updateFaviconCache(projectId, { diff --git a/packages/platform/src/engine/modules/deployments/deployment.service.ts b/packages/platform/src/engine/modules/deployments/deployment.service.ts index 2efe6c992..f851dd4aa 100644 --- a/packages/platform/src/engine/modules/deployments/deployment.service.ts +++ b/packages/platform/src/engine/modules/deployments/deployment.service.ts @@ -10,7 +10,7 @@ import { findProjectDeployment } from "../../lib/active-deployment"; import { withProjectRuntimeLock } from "../../lib/project-runtime-lock"; import { existsSync, readFileSync } from "node:fs"; import { repos, type Deployment } from "@repo/db"; -import { NotFoundError, ForbiddenError, deploymentBelongsToProject, type DeploymentHistoryQuery } from "@repo/core"; +import { projectIconUrl, NotFoundError, ForbiddenError, deploymentBelongsToProject, type DeploymentHistoryQuery } from "@repo/core"; import type { LogEntry } from "@repo/adapters"; import type { ExecutionContext as RequestContext } from "@repo/platform"; import { @@ -91,7 +91,8 @@ export async function listDeployments( projectName: project.name, // Project favicon → the dashboard uses it as the row's logo instead // of the framework/Docker glyph. - favicon: project.favicon ?? null, + favicon: projectIconUrl(project), + iconUrl: project.iconUrl ?? null, })), }; } @@ -111,7 +112,8 @@ export async function listDeployments( projectName: proj?.name ?? "Unknown", isActive: proj?.activeDeploymentId === d.id, // Project favicon → dashboard row logo (see listByProject above). - favicon: proj?.favicon ?? null, + favicon: projectIconUrl(proj), + iconUrl: proj?.iconUrl ?? null, }; }); diff --git a/packages/platform/src/engine/modules/projects/project-crud.service.ts b/packages/platform/src/engine/modules/projects/project-crud.service.ts index d69a954e3..ebc17449d 100644 --- a/packages/platform/src/engine/modules/projects/project-crud.service.ts +++ b/packages/platform/src/engine/modules/projects/project-crud.service.ts @@ -13,8 +13,7 @@ import { type Project, type Server, } from "@repo/db"; -import { - slugify, +import { isImageUrl, slugify, runtimeProjectUpdate, assertRuntimeVersionTarget, AppError, @@ -1902,6 +1901,11 @@ async function updateProjectUnlocked( if (PROJECT_IDENTITY_KEYS.has(key)) continue; if (raw[key] !== undefined) update[key] = raw[key]; } + if (data.iconUrl !== undefined) { + const iconUrl = typeof data.iconUrl === "string" ? data.iconUrl.trim() || null : data.iconUrl; + if (iconUrl !== null && !isImageUrl(iconUrl)) throw new ValidationError("Icon URL must be an HTTP or HTTPS URL without credentials."); + update.iconUrl = iconUrl; + } Object.assign(update, runtimeProjectUpdate(p, update)); assertRuntimeVersionTarget({ ...p, ...update }); await assertBuildCommandUpdate(p, update); diff --git a/packages/platform/src/projects.ts b/packages/platform/src/projects.ts index 4dede0846..cacd7251c 100644 --- a/packages/platform/src/projects.ts +++ b/packages/platform/src/projects.ts @@ -1,3 +1,4 @@ +import { projectIconUrl } from "@repo/core"; import { AppError, CreateProjectBody, @@ -128,6 +129,7 @@ export interface ProjectDependencies { /** One public presentation for HTTP, native and remote project operations. */ export function presentProject(row: unknown): Project { const data = JSON.parse(JSON.stringify(row)) as Record; + if (data.iconUrl) data.favicon = projectIconUrl(data); delete data.cloneTokenEncrypted; delete data.webhookSecret; delete data.cloudPromotion; diff --git a/packages/platform/test/favicon-overrides.test.ts b/packages/platform/test/favicon-overrides.test.ts new file mode 100644 index 000000000..35aff4317 --- /dev/null +++ b/packages/platform/test/favicon-overrides.test.ts @@ -0,0 +1,54 @@ +import { beforeEach, expect, it, vi } from "vitest"; + +const h = vi.hoisted(() => ({ find: vi.fn(), cache: vi.fn(), fetch: vi.fn() })); +vi.mock("@repo/db", () => ({ + repos: { project: { findById: h.find, updateFaviconCache: h.cache } }, +})); +vi.mock("../src/engine/config/env", () => ({ env: { CLOUD_MODE: true } })); +vi.mock("../src/engine/lib/safe-fetch", () => ({ safeFetch: h.fetch })); +import { + detectAndStoreFavicon, + refreshProjectFaviconIfStale, +} from "../src/engine/lib/favicon-detector"; + +beforeEach(() => { + vi.resetAllMocks(); + h.cache.mockResolvedValue(undefined); + h.fetch.mockResolvedValue({ ok: true, headers: { "content-type": "image/png" } }); +}); + +it("does not schedule read-time discovery when an override exists", () => { + refreshProjectFaviconIfStale({ + id: "p", + activeDeploymentId: "d", + iconUrl: "https://cdn.example.test/custom.png", + }); + expect(h.find).not.toHaveBeenCalled(); + expect(h.fetch).not.toHaveBeenCalled(); +}); + +it("does not fetch either the deployed site or the custom URL after a deployment", async () => { + h.find.mockResolvedValue({ iconUrl: "https://cdn.example.test/custom.png" }); + await detectAndStoreFavicon("p", "https://app.example.test"); + expect(h.fetch).not.toHaveBeenCalled(); + expect(h.cache).not.toHaveBeenCalled(); +}); + +it("uses the existing protected discovery flow again after clearing the override", async () => { + h.find.mockResolvedValue({ iconUrl: null }); + await detectAndStoreFavicon("p", "https://app.example.test"); + expect(h.fetch).toHaveBeenCalledWith( + "https://app.example.test/favicon.ico", + expect.objectContaining({ allowPrivate: false, maxRedirects: 3 }), + ); + expect(h.cache).toHaveBeenCalledWith( + "p", + expect.objectContaining({ favicon: "https://app.example.test/favicon.ico" }), + ); +}); + +it("keeps discovery best-effort when the override lookup fails", async () => { + h.find.mockRejectedValueOnce(new Error("database unavailable")); + await expect(detectAndStoreFavicon("p", "https://app.example.test")).resolves.toBeUndefined(); + expect(h.fetch).not.toHaveBeenCalled(); +}); From 3ccab508741c7a75dde9664e608ac96c921c8fc2 Mon Sep 17 00:00:00 2001 From: Hydra Date: Sun, 15 Nov 2026 20:29:16 +0200 Subject: [PATCH 2/4] test: account for project icon overrides in migration upgrades --- packages/db/src/migrate-chain.test.ts | 31 +++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/packages/db/src/migrate-chain.test.ts b/packages/db/src/migrate-chain.test.ts index 6c50eecbb..d59ceccfe 100644 --- a/packages/db/src/migrate-chain.test.ts +++ b/packages/db/src/migrate-chain.test.ts @@ -268,6 +268,32 @@ describe("migration chain applies to an existing, populated database", () => { expect(await appliedMigrations(client)).toBe(total); }); + test("adds an optional icon override without changing the cached favicon or losing a saved override on retry", async () => { + const cutoff = journal.entries.findIndex((entry) => entry.tag === "0231_project_icon_url"); + expect(journal.entries[cutoff - 1]?.tag).toBe("0230_restore_workspace_security_fields"); + const legacy = migrationsPrefix(cutoff); + const { client, db } = await freshDb(); + try { + await migrate(db, { migrationsFolder: legacy }); + await client.exec("SET session_replication_role = replica;"); + await seedRow(client, "project", SEED_ID); + await client.exec("UPDATE project SET favicon = 'https://app.example.test/favicon.ico', favicon_checked_at = '2026-11-01 12:00:00', active_deployment_id = 'retained-release'"); + const projects = (await client.query>("SELECT * FROM project")).rows; + await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); + expect((await client.query("SELECT * FROM project")).rows).toEqual( + projects.map((project) => ({ ...project, icon_url: null })), + ); + await client.exec("UPDATE project SET icon_url = 'https://cdn.example.test/custom.svg'"); + const customized = (await client.query("SELECT * FROM project")).rows; + await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); + expect((await client.query("SELECT * FROM project")).rows).toEqual(customized); + expect(await appliedMigrations(client)).toBe(total); + } finally { + await client.close(); + rmSync(legacy, { recursive: true, force: true }); + } + }); + test("adds runtime roles after the applied lifecycle migration without changing existing releases", async () => { const cutoff = journal.entries.findIndex((entry) => entry.tag === "0192_runtime_roles"); expect(journal.entries[cutoff - 1]?.tag).toBe("0191_project_lifecycle_operation"); @@ -286,7 +312,7 @@ describe("migration chain applies to an existing, populated database", () => { await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); expect((await client.query("SELECT * FROM project")).rows).toEqual( - projects.map((project) => ({ ...project, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false })), + projects.map((project) => ({ ...project, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: null })), ); expect((await client.query("SELECT * FROM deployment")).rows).toEqual( deployments.map((deployment) => ({ @@ -332,7 +358,7 @@ describe("migration chain applies to an existing, populated database", () => { expect(await db.select().from(schema.instanceController)).toEqual([]); expect(await db.select().from(schema.instanceHandoff)).toEqual([]); expect((await client.query("SELECT * FROM project")).rows).toEqual( - projects.map((project) => ({ ...project, github_checks: null, runtime_version: null, runtime_image: null, lifecycle_operation: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false })), + projects.map((project) => ({ ...project, github_checks: null, runtime_version: null, runtime_image: null, lifecycle_operation: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: null })), ); expect( (await client.query("SELECT * FROM drizzle.__drizzle_migrations ORDER BY id")).rows.slice( @@ -535,6 +561,7 @@ describe("migration chain applies to an existing, populated database", () => { ...previous, runtime_version: null, runtime_image: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, + icon_url: null, cloud_promotion: null, lifecycle_operation: null, cloud_static_hosting: "pages", From a1cb1d8a5a742858915f8e057f1091255cd8d0f8 Mon Sep 17 00:00:00 2001 From: Hydra Date: Sun, 15 Nov 2026 21:19:51 +0200 Subject: [PATCH 3/4] refactor: use one project icon URL across storage and UI --- .../deployments/cancel-is-final.test.ts | 1 - .../deployments/route-issues-warning.test.ts | 3 +- .../modules/projects/project-clone.test.ts | 6 +- .../deployments/build-duration.test.ts | 1 - .../deployments/compose-noop-settle.test.ts | 1 - .../deploy-outcome-vs-logs.test.ts | 1 - .../deployment-meta-redaction.test.ts | 1 - .../reused-artifact-not-reclaimed.test.ts | 3 - .../projects/cloud-promotion-recovery.test.ts | 3 +- .../modules/projects/project-icon.test.ts | 39 +++-- .../projects/project-overview-logs.test.ts | 1 - .../shared-service-connections.test.ts | 3 +- .../app/(dashboard)/DashboardHomeClient.tsx | 2 +- .../src/app/(dashboard)/apps/page.tsx | 2 +- .../deployments/components/DeploymentCard.tsx | 4 +- .../src/app/(dashboard)/deployments/types.ts | 4 +- .../src/app/(dashboard)/deployments/utils.ts | 1 - .../[id]/components/DomainSettings.tsx | 2 +- .../components/UseInProjectModal.test.tsx | 16 ++ .../[id]/components/UseInProjectModal.tsx | 18 +- .../projects/components/ProjectCard.tsx | 9 +- .../projects/components/ProjectGridCard.tsx | 5 +- ...favicon.test.tsx => project-icon.test.tsx} | 32 +++- .../src/app/(dashboard)/projects/page.tsx | 4 +- .../src/components/overview/HomeAppsCard.tsx | 2 +- .../project-settings/ProjectIconSetting.tsx | 4 +- .../settings/image-settings.test.tsx | 5 +- .../src/components/shared/ProjectIcon.tsx | 10 +- .../shared/ProjectStackIcon.test.tsx | 4 +- .../components/shared/ProjectStackIcon.tsx | 2 +- apps/dashboard/src/constants/mock.ts | 1 - .../src/i18n/locales/ar/projectSettings.json | 4 +- .../src/i18n/locales/de/projectSettings.json | 4 +- .../src/i18n/locales/en/projectSettings.json | 4 +- .../src/i18n/locales/es/projectSettings.json | 4 +- .../src/i18n/locales/fr/projectSettings.json | 4 +- .../src/i18n/locales/ja/projectSettings.json | 4 +- .../src/i18n/locales/pt/projectSettings.json | 4 +- .../src/i18n/locales/ru/projectSettings.json | 4 +- .../src/i18n/locales/tr/projectSettings.json | 4 +- .../src/i18n/locales/zh/projectSettings.json | 4 +- apps/dashboard/src/lib/api/connections.ts | 11 +- apps/web/content/docs/dashboard/projects.mdx | 2 +- docs/dashboard-design.md | 8 +- packages/contracts/src/deployments.ts | 1 - .../contracts/src/project-integrations.ts | 21 ++- packages/contracts/src/projects.ts | 1 - packages/core/src/image-url.test.ts | 11 +- packages/core/src/image-url.ts | 7 - .../db/drizzle/0232_project_icon_cleanup.sql | 17 ++ packages/db/drizzle/meta/_journal.json | 7 + packages/db/src/dump-roundtrip.test.ts | 29 ++++ packages/db/src/dump.ts | 10 ++ packages/db/src/migrate-chain.test.ts | 47 +++-- packages/db/src/repos/deployment.repo.ts | 2 +- packages/db/src/repos/project.repo.ts | 19 -- packages/db/src/schema/project.ts | 10 +- .../src/engine/lib/cloud/project-promotion.ts | 2 - .../src/engine/lib/favicon-detector.ts | 162 ------------------ .../src/engine/lib/public-endpoints.ts | 2 +- .../deployments/deployment-lifecycle.ts | 7 - .../modules/deployments/deployment.service.ts | 7 +- .../engine/modules/domains/domain.service.ts | 2 +- .../modules/projects/project-clone.service.ts | 4 - .../projects/project-connection.service.ts | 2 + .../projects/project-home.operations.ts | 5 - .../projects/project-inspection.operations.ts | 6 +- .../modules/projects/project.operations.ts | 3 - packages/platform/src/projects.ts | 2 - .../platform/test/favicon-overrides.test.ts | 54 ------ 70 files changed, 240 insertions(+), 451 deletions(-) rename apps/dashboard/src/app/(dashboard)/projects/components/{project-favicon.test.tsx => project-icon.test.tsx} (73%) create mode 100644 packages/db/drizzle/0232_project_icon_cleanup.sql delete mode 100644 packages/platform/src/engine/lib/favicon-detector.ts delete mode 100644 packages/platform/test/favicon-overrides.test.ts diff --git a/apps/api/src/modules/deployments/cancel-is-final.test.ts b/apps/api/src/modules/deployments/cancel-is-final.test.ts index 841363250..062a62169 100644 --- a/apps/api/src/modules/deployments/cancel-is-final.test.ts +++ b/apps/api/src/modules/deployments/cancel-is-final.test.ts @@ -43,7 +43,6 @@ vi.mock("@repo/platform/engine/modules/projects/cleanup-keep-set", () => ({ // Terminal-event side channels, each of which drags in auth/github/mail wiring. vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: mocks.notify } })); vi.mock("../../lib/audit", () => ({ audit: { recordAsync: vi.fn(), record: vi.fn() } })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn(async () => {}) })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(async () => {}), })); diff --git a/apps/api/src/modules/deployments/route-issues-warning.test.ts b/apps/api/src/modules/deployments/route-issues-warning.test.ts index ef824d981..662d10f40 100644 --- a/apps/api/src/modules/deployments/route-issues-warning.test.ts +++ b/apps/api/src/modules/deployments/route-issues-warning.test.ts @@ -1,12 +1,11 @@ import { describe, expect, it, vi } from "vitest"; // The function under test is pure; everything else this module reaches (DB, SSE, -// notifications, favicon probing) is a side effect the assertion doesn't want. +// notifications) is a side effect the assertion doesn't want. // `@repo/adapters` stays REAL — `isEdgeDownMessage` is the branch being pinned. vi.mock("@repo/db", () => ({ repos: {} })); vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: {} })); vi.mock("../../lib/audit", () => ({ audit: {} })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/deployments/session-manager", () => ({})); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), diff --git a/apps/api/src/modules/projects/project-clone.test.ts b/apps/api/src/modules/projects/project-clone.test.ts index 497aa8279..864a94be8 100644 --- a/apps/api/src/modules/projects/project-clone.test.ts +++ b/apps/api/src/modules/projects/project-clone.test.ts @@ -32,8 +32,7 @@ const h = { deletedAt: null, deletionInProgress: false, lifecycleOperation: { kind: "delete", status: "failed", error: "Previous cleanup failure" }, - favicon: "https://clincai.example/favicon.ico", - faviconCheckedAt: new Date(), + iconUrl: "https://clincai.example/icon.png", compositeRoutes: [{ host: "clincai.example" }], workspaceId: null, gitProvider: "github", @@ -194,6 +193,7 @@ describe("the copy direction is COPY-by-default", () => { await clone(); const p = clonedProject(); expect(p.framework).toBe("nextjs"); + expect(p.iconUrl).toBe("https://clincai.example/icon.png"); expect(p.routeStrategy).toBe("loopback"); expect(p.rollbackWindow).toBe(5); // Same for the service rows: a build command exists in no container. @@ -231,7 +231,7 @@ describe("what it deliberately does NOT copy", () => { const p = clonedProject(); // `id`/`groupId` are the insert's, and name/slug/serverId/workspaceId/activeDeploymentId are set // explicitly above — the rest must simply be absent. - for (const field of ["deletedAt", "deletionInProgress", "lifecycleOperation", "disabledAt", "favicon", "faviconCheckedAt", "compositeRoutes", "cloudPromotion", "id", "groupId", "createdAt", "updatedAt"]) { + for (const field of ["deletedAt", "deletionInProgress", "lifecycleOperation", "disabledAt", "compositeRoutes", "cloudPromotion", "id", "groupId", "createdAt", "updatedAt"]) { expect(p, field).not.toHaveProperty(field); } }); diff --git a/apps/api/test/modules/deployments/build-duration.test.ts b/apps/api/test/modules/deployments/build-duration.test.ts index 026f4db36..8d1e2cecb 100644 --- a/apps/api/test/modules/deployments/build-duration.test.ts +++ b/apps/api/test/modules/deployments/build-duration.test.ts @@ -13,7 +13,6 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("@repo/platform/engine/lib/audit-emitter", () => ({ audit: { recordAsync: vi.fn() } })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), })); diff --git a/apps/api/test/modules/deployments/compose-noop-settle.test.ts b/apps/api/test/modules/deployments/compose-noop-settle.test.ts index 100da4d26..7a522fa77 100644 --- a/apps/api/test/modules/deployments/compose-noop-settle.test.ts +++ b/apps/api/test/modules/deployments/compose-noop-settle.test.ts @@ -94,7 +94,6 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: (_c: unknown, e: { eventType: string }) => h.audits.push(e.eventType) }, })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: async () => {} })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: async () => {}, })); diff --git a/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts b/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts index e847bd792..52ffd3b75 100644 --- a/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts +++ b/apps/api/test/modules/deployments/deploy-outcome-vs-logs.test.ts @@ -113,7 +113,6 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ }, })); vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: () => {} } })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: async () => {} })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: async () => {}, })); diff --git a/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts b/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts index 3fd2f63b7..ee521b560 100644 --- a/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts +++ b/apps/api/test/modules/deployments/deployment-meta-redaction.test.ts @@ -13,7 +13,6 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("@repo/platform/engine/lib/audit-emitter", () => ({ audit: { recordAsync: vi.fn() } })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ detectAndStoreFavicon: vi.fn() })); vi.mock("@repo/platform/engine/modules/mail/webmail/webmail-install.service", () => ({ onWebmailDeployed: vi.fn(), })); diff --git a/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts b/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts index 5ab30154e..5d07a4e0f 100644 --- a/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts +++ b/apps/api/test/modules/deployments/reused-artifact-not-reclaimed.test.ts @@ -32,9 +32,6 @@ vi.mock("@repo/platform/engine/lib/notification-dispatcher", () => ({ notification: { emit: vi.fn() }, })); vi.mock("../../../src/lib/audit", () => ({ audit: { recordAsync: vi.fn(), record: vi.fn() } })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ - detectAndStoreFavicon: vi.fn(async () => {}), -})); vi.mock("@repo/platform/engine/modules/projects/cleanup-keep-set", () => ({ computeCleanupKeepSet: vi.fn(async () => ({ containers: new Set() })), })); diff --git a/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts b/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts index a6858b068..10a53e784 100644 --- a/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts +++ b/apps/api/test/modules/projects/cloud-promotion-recovery.test.ts @@ -465,8 +465,9 @@ describe("project promotion recovery", () => { const dump = await dumpSubgraph({ kind: "project", projectId }); const changed = structuredClone(dump); changed.tables.resource_usage.push({ id: "another-sample", projectId, cpu: 42 }); - changed.tables.project[0].favicon = "new favicon"; expect(projectPromotionDigest(changed)).toBe(projectPromotionDigest(dump)); + changed.tables.project[0].iconUrl = "https://cdn.example.test/new-icon.png"; + expect(projectPromotionDigest(changed)).not.toBe(projectPromotionDigest(dump)); changed.tables.project[0].localPath = "/another-source"; expect(projectPromotionDigest(changed)).not.toBe(projectPromotionDigest(dump)); }); diff --git a/apps/api/test/modules/projects/project-icon.test.ts b/apps/api/test/modules/projects/project-icon.test.ts index bf97cac0f..4cbd56c71 100644 --- a/apps/api/test/modules/projects/project-icon.test.ts +++ b/apps/api/test/modules/projects/project-icon.test.ts @@ -9,33 +9,33 @@ import { handleApiError } from "../../../src/middleware/error-handler"; const app = new Hono().onError(handleApiError).route("/api/projects", projectRoutes); -it("persists an icon override through authenticated settings, protects it against discovery and restores automatic mode", async () => { +it("uses one icon URL across authenticated settings, reads and deployment history", async () => { const owner = await seedOwner(); const project = await seedProject(owner.orgId); - const automatic = "https://app.example.test/favicon.ico"; const custom = "https://cdn.example.test/project.svg"; - await repos.project.updateFaviconCache(project.id, { favicon: automatic }); const update = (iconUrl: unknown, auth = owner.auth) => app.request(`/api/projects/${project.id}`, { method: "PATCH", headers: { ...auth, "Content-Type": "application/json" }, body: JSON.stringify({ iconUrl }), }); - const saved = await update(custom); + const assertIcon = (data: unknown, expected: string | null) => { + expect(data).toMatchObject({ iconUrl: expected }); + expect(data).not.toHaveProperty("favicon"); + expect(data).not.toHaveProperty("faviconCheckedAt"); + }; + const saved = await update(` ${custom} `); expect(saved.status, await saved.clone().text()).toBe(200); - expect(await saved.json()).toMatchObject({ data: { iconUrl: custom, favicon: custom } }); + assertIcon((await saved.json()).data, custom); + assertIcon(await repos.project.findById(project.id), custom); + const read = await app.request(`/api/projects/${project.id}`, { headers: owner.auth }); + expect(read.status, await read.clone().text()).toBe(200); + assertIcon((await read.json()).data, custom); await seedDeployment(project); for (const options of [{ projectId: project.id }, {}]) { const history = await listDeployments(owner.orgId, options); - expect(history.rows[0]).toMatchObject({ favicon: custom, iconUrl: custom }); + assertIcon(history.rows[0], custom); } - await repos.project.updateFaviconCache(project.id, { - favicon: "https://app.example.test/new-auto.ico", - }); - expect(await repos.project.findById(project.id)).toMatchObject({ - iconUrl: custom, - favicon: automatic, - }); const stranger = await seedOwner(); expect((await update("https://stranger.example.test/icon.png", stranger.auth)).status).toBe(404); for (const unsafe of [ @@ -45,7 +45,14 @@ it("persists an icon override through authenticated settings, protects it agains "/relative.png", ]) expect((await update(unsafe)).status).toBe(400); - const cleared = await update(null); - expect(cleared.status).toBe(200); - expect(await cleared.json()).toMatchObject({ data: { iconUrl: null, favicon: automatic } }); + assertIcon(await repos.project.findById(project.id), custom); + for (const reset of [null, ""]) { + expect((await update(custom)).status).toBe(200); + const cleared = await update(reset); + expect(cleared.status).toBe(200); + assertIcon((await cleared.json()).data, null); + assertIcon(await repos.project.findById(project.id), null); + const history = await listDeployments(owner.orgId, { projectId: project.id }); + assertIcon(history.rows[0], null); + } }); diff --git a/apps/api/test/modules/projects/project-overview-logs.test.ts b/apps/api/test/modules/projects/project-overview-logs.test.ts index a716386d1..555e7ddf9 100644 --- a/apps/api/test/modules/projects/project-overview-logs.test.ts +++ b/apps/api/test/modules/projects/project-overview-logs.test.ts @@ -19,7 +19,6 @@ vi.mock("@repo/db", () => ({ repos: { vi.mock("@repo/platform/engine/modules/projects/project.service", () => ({ listProjects: h.list, enrichProjectsBatch: h.enrich, deploymentIsBlocked: () => false })); vi.mock("@repo/platform/engine/lib/authorization", () => ({ authorization: { checkPermissionOnResource: h.canRead, authorize: async (ctx: ExecutionContext) => ctx } })); vi.mock("@repo/platform/engine/lib/cloud/projects", () => ({ fetchOrgCloudProjects: h.cloudProjects })); -vi.mock("@repo/platform/engine/lib/favicon-detector", () => ({ refreshProjectFaviconIfStale: vi.fn() })); vi.mock("@repo/platform/engine/config/index", () => ({ env: h.env })); vi.mock("@repo/platform/engine/lib/oblien-user-client", () => ({ getAdminOblienClient: () => h.env.CLOUD_MODE ? { analytics: { streamToken: h.streamToken, requests: h.requests } } : null })); vi.mock("@repo/platform/engine/lib/cloud/client", () => ({ cloudClient: () => ({ analytics: { streamToken: h.streamToken, requests: h.requests } }) })); diff --git a/apps/api/test/modules/projects/shared-service-connections.test.ts b/apps/api/test/modules/projects/shared-service-connections.test.ts index fc4d00f0b..1df8a5fb8 100644 --- a/apps/api/test/modules/projects/shared-service-connections.test.ts +++ b/apps/api/test/modules/projects/shared-service-connections.test.ts @@ -66,9 +66,10 @@ beforeEach(() => { describe("connections to a service inside a project", () => { it("offers all eligible projects while excluding the current project and read-only access", async () => { - h.candidates = ["source", "read-only", ...Array.from({ length: 120 }, (_, i) => `consumer-${i}`)].map(id => ({ id, name: id, environmentName: "production", appTemplateId: null })); + h.candidates = ["source", "read-only", ...Array.from({ length: 120 }, (_, i) => `consumer-${i}`)].map(id => ({ id, name: id, environmentName: "production", appTemplateId: null, iconUrl: "https://cdn.example.test/icon.svg", framework: "nextjs" })); const choices = await listConnectionCandidates(ctx, "source"); expect(choices).toHaveLength(120); + expect(choices[0]).toMatchObject({ iconUrl: "https://cdn.example.test/icon.svg", framework: "nextjs" }); expect(choices.some(choice => ["source", "read-only"].includes(choice.id))).toBe(false); expect(h.authorize).toHaveBeenCalledWith(ctx, { resourceType: "project", resourceId: "source", action: "write" }); }); diff --git a/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx b/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx index 138d19258..b9513fcc3 100644 --- a/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx +++ b/apps/dashboard/src/app/(dashboard)/DashboardHomeClient.tsx @@ -143,7 +143,7 @@ export default function DashboardHomeClient({ ) : (
{sourceProjects.slice(0, 5).map((p) => ( - removeProject(p.id)} /> + removeProject(p.id)} /> ))}
)} diff --git a/apps/dashboard/src/app/(dashboard)/apps/page.tsx b/apps/dashboard/src/app/(dashboard)/apps/page.tsx index 4ba8cd845..377e5f5f2 100644 --- a/apps/dashboard/src/app/(dashboard)/apps/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/apps/page.tsx @@ -184,7 +184,7 @@ export default function AppsPage() {
{filteredApps.length > 0 ? filteredApps.map(app => ( - removeProject(app.id)} /> + removeProject(app.id)} /> )) : (

{copy.catalogNoResults}

)} diff --git a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx index 98dd093ad..92eaf168a 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/deployments/components/DeploymentCard.tsx @@ -148,9 +148,9 @@ export const DeploymentCard: React.FC = ({ aria-label={deployment.projectName || t.deployments.card.unknownProject} className="absolute inset-0 z-0" /> - {/* App logo (catalog apps) → project favicon → framework icon → initials */} + {/* Project icon → catalog logo → framework or service icon */}
- +
{/* Main info */} diff --git a/apps/dashboard/src/app/(dashboard)/deployments/types.ts b/apps/dashboard/src/app/(dashboard)/deployments/types.ts index 419d63976..a49f53391 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/types.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/types.ts @@ -56,9 +56,7 @@ export interface Deployment { branch?: string; projectId?: string; projectName?: string; - /** Auto-detected favicon of the deployed site, cached on the project. - * When present it replaces the framework/Docker glyph as the row logo. */ - favicon?: string | null; + /** Project icon shared with project lists and settings. */ iconUrl?: string | null; failureReason?: string; /** Rollback state — populated by the orchestrator-aware listing endpoint. diff --git a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts index 7482b1056..711c32894 100644 --- a/apps/dashboard/src/app/(dashboard)/deployments/utils.ts +++ b/apps/dashboard/src/app/(dashboard)/deployments/utils.ts @@ -41,7 +41,6 @@ export const mapRowToDeployment = (row: any): Deployment => { branch: row.branch ?? undefined, projectId: row.projectId, projectName: row.projectName, - favicon: row.favicon ?? null, iconUrl: row.iconUrl ?? null, failureReason: row.errorMessage ?? undefined, /* Rollback state — flows from the listing endpoint, which enriches diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx index 86b8f4391..49a48108e 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/DomainSettings.tsx @@ -1581,7 +1581,7 @@ export const DomainSettings = ({ applicationScope = false, serviceScope, onRoute // Per-service domains have no endpoint order to reorder — primary is the // domain row's isPrimary flag. Flip it via the API, then reflect locally // (exactly one primary per project). getPrimaryByProject picks this up for - // the project's canonical URL / favicon / analytics, and it survives + // the project's canonical URL / analytics, and it survives // redeploys (service route registration preserves an existing isPrimary). const handleSetPrimaryServiceDomain = async (summary: DomainSummaryItem) => { if (!summary.domainId || summary.isPrimary) return; diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx index 598bfb73c..a4c904295 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.test.tsx @@ -89,6 +89,7 @@ beforeEach(() => { afterEach(async () => { await act(async () => root.unmount()); host.remove(); + vi.restoreAllMocks(); vi.unstubAllGlobals(); }); @@ -106,6 +107,21 @@ async function choose(scope: ParentNode, name: string) { await click(option!); } +it("shows the saved project icon in the connection picker", async () => { + vi.spyOn(HTMLImageElement.prototype, "complete", "get").mockReturnValue(false); + h.candidates.mockResolvedValue({ + data: [{ id: "web", name: "Web app", description: "production", appTemplateId: "redis", iconUrl: "https://cdn.example.test/project.svg" }], + }); + await act(async () => root.render( + , + )); + const dialog = document.querySelector("[data-modal-surface]")!; + await click(dialog.querySelector('[aria-haspopup="listbox"]')!); + const image = document.querySelector('[role="option"] img'); + expect(image?.getAttribute("src")).toBe("https://cdn.example.test/project.svg"); + expect(image?.getAttribute("referrerpolicy")).toBe("no-referrer"); +}); + describe("connection form copy", () => { it("names the count and project, and points at the deployment status, after sharing values", async () => { h.candidates.mockResolvedValue({ diff --git a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx index 4975561d6..b0d0c3df0 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/[id]/components/UseInProjectModal.tsx @@ -5,10 +5,11 @@ import { Icon as UiIcon } from "@repo/ui/icons"; import { useEffect, useMemo, useState } from "react"; import { resolveLocalized } from "@repo/core"; +import type { ProjectConnectionCandidate } from "@repo/contracts"; import { Modal } from "@/components/ui/Modal"; import { CustomSelect } from "@/components/ui/CustomSelect"; import { Checkbox } from "@/components/ui/Checkbox"; -import { AppLogo } from "@/components/AppLogo"; +import { ProjectIcon } from "@/components/shared/ProjectIcon"; import { connectionsApi, type ConnectionMode } from "@/lib/api/connections"; import { getApiErrorMessage } from "@/lib/api/client"; import { useToast } from "@/context/ToastContext"; @@ -49,15 +50,6 @@ function InlineHint({ text }: { text: string }) { ); } -interface TargetProject { - id: string; - name: string; - description: string; - appTemplateId?: string; - favicon?: string | null; - clusterId?: string | null; -} - interface ConnectionFormProps { onClose: () => void; hideHeader?: boolean; @@ -104,7 +96,7 @@ export function ProjectConnectionForm({ (!sourceDatabaseId || output.sourceDatabaseId === sourceDatabaseId), ), [suppliedOutputs, view, sourceServiceId, sourceDatabaseId]); - const [targets, setTargets] = useState([]); + const [targets, setTargets] = useState([]); const [loadingProjects, setLoadingProjects] = useState(true); const [targetId, setTargetId] = useState(fixedTargetId ?? ""); const [mode, setMode] = useState(guide?.defaultMode ?? "internal"); @@ -164,7 +156,7 @@ export function ProjectConnectionForm({ setLoadingProjects(true); connectionsApi.candidates(fixedSourceId ?? fixedTargetId ?? "") .then(result => { - if (!cancelled) setTargets(result.data.map(project => ({ ...project, appTemplateId: project.appTemplateId ?? undefined }))); + if (!cancelled) setTargets(result.data); }) .catch(error => { if (!cancelled) setLoadError(getApiErrorMessage(error, c.failed)); }) .finally(() => { if (!cancelled) setLoadingProjects(false); }); @@ -237,7 +229,7 @@ export function ProjectConnectionForm({ label: p.name, description: p.description || undefined, icon: ( - + ), }))} onChange={fixedTargetId ? setSourceProjectId : setTargetId} diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx index 91ceda3bf..85e0967bb 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectCard.tsx @@ -48,9 +48,6 @@ interface Props { * every row by the projects list and `/info`, but isn't declared on `Project` * (constants/mock) yet, so it's spelled out here rather than cast away. */ project: Project & { primaryDomain?: string | null }; - /** On the Apps page: show the catalog app's brand logo instead of the - * framework/service fallback icon. */ - preferAppLogo?: boolean; /** Show an "update available" badge (fed by the update scan). Off by default * so the Projects page is unaffected. */ updateAvailable?: boolean; @@ -59,7 +56,7 @@ interface Props { onChanged?: () => void; } -const ProjectCard: React.FC = ({ project, preferAppLogo, updateAvailable, onChanged }) => { +const ProjectCard: React.FC = ({ project, updateAvailable, onChanged }) => { const { t } = useI18n(); const { showModal, hideModal } = useModal(); const { showToast } = useToast(); @@ -115,10 +112,8 @@ const ProjectCard: React.FC = ({ project, preferAppLogo, updateAvailable,
- {/* Icon — on the Apps page show the catalog app's brand logo; otherwise - the project favicon, falling back to the framework/service glyph. */}
- +
{/* Name + domain */} diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx index 0d1a2bcf8..f1aaa56c9 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/ProjectGridCard.tsx @@ -20,9 +20,8 @@ const ProjectGridCard: React.FC<{ * every row by the projects list and `/info`, but isn't declared on `Project` * (constants/mock) yet, so it's spelled out here rather than cast away. */ project: Project & { primaryDomain?: string | null }; - preferAppLogo?: boolean; updateAvailable?: boolean; -}> = ({ project, preferAppLogo, updateAvailable }) => { +}> = ({ project, updateAvailable }) => { const { t } = useI18n(); const router = useRouter(); @@ -62,7 +61,7 @@ const ProjectGridCard: React.FC<{
- +
diff --git a/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx b/apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx similarity index 73% rename from apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx rename to apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx index 7c0906168..e2482db84 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/components/project-favicon.test.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/components/project-icon.test.tsx @@ -39,19 +39,35 @@ afterEach(async () => { }); for (const [name, Card] of [["list", ProjectCard], ["grid", ProjectGridCard]] as const) { - const render = (favicon = "/favicon-old.ico") => ( - + const render = (iconUrl = "/icon-old.png") => ( + ); - describe(`${name} favicon`, () => { + describe(`${name} iconUrl`, () => { it("uses a custom icon before the catalog logo on the Apps page", async () => { complete = false; root = createRoot(container); await act(async () => root!.render( - , + , )); expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("https://cdn.example.test/custom.png"); }); + it("uses the same catalog fallback when a custom icon fails or is cleared", async () => { + complete = false; + root = createRoot(container); + const custom = "https://cdn.example.test/custom.png"; + const view = (iconUrl: string | null) => ( + + ); + await act(async () => root!.render(view(custom))); + await act(async () => container.querySelector('img[alt=""]')!.dispatchEvent(new Event("error"))); + const fallback = container.querySelector('img[alt=""]')?.getAttribute("src"); + expect(fallback).toBeTruthy(); + expect(fallback).not.toBe(custom); + await act(async () => root!.render(view(null))); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe(fallback); + }); + it("falls back when the image failed before hydration attached its error listener", async () => { const view = render(); container.innerHTML = renderToString(view); @@ -68,16 +84,16 @@ for (const [name, Card] of [["list", ProjectCard], ["grid", ProjectGridCard]] as await act(async () => root!.render(render())); await act(async () => container.querySelector('img[alt=""]')!.dispatchEvent(new Event("error"))); expect(container.querySelector('img[alt=""]')).toBeNull(); - await act(async () => root!.render(render("/favicon-new.ico"))); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/favicon-new.ico"); + await act(async () => root!.render(render("/icon-new.png"))); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/icon-new.png"); }); - it("keeps a successfully cached favicon", async () => { + it("keeps an image that loaded before hydration", async () => { naturalWidth = 32; const view = render(); container.innerHTML = renderToString(view); await act(async () => { root = hydrateRoot(container, view); }); - expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/favicon-old.ico"); + expect(container.querySelector('img[alt=""]')?.getAttribute("src")).toBe("/icon-old.png"); }); }); } diff --git a/apps/dashboard/src/app/(dashboard)/projects/page.tsx b/apps/dashboard/src/app/(dashboard)/projects/page.tsx index c692c689e..46aab35f3 100644 --- a/apps/dashboard/src/app/(dashboard)/projects/page.tsx +++ b/apps/dashboard/src/app/(dashboard)/projects/page.tsx @@ -109,11 +109,11 @@ export default function ProjectsPage() { ) : filtered.length > 0 ? ( view === "grid" ? (
- {filtered.map(project => )} + {filtered.map(project => )}
) : (
- {filtered.map(project => removeProject(project.id)} />)} + {filtered.map(project => removeProject(project.id)} />)}
) ) : ( diff --git a/apps/dashboard/src/components/overview/HomeAppsCard.tsx b/apps/dashboard/src/components/overview/HomeAppsCard.tsx index 837827a11..ac1024970 100644 --- a/apps/dashboard/src/components/overview/HomeAppsCard.tsx +++ b/apps/dashboard/src/components/overview/HomeAppsCard.tsx @@ -66,7 +66,7 @@ export default function HomeAppsCard({ className="absolute inset-0 rounded-xl focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-ring" />
- +

} onSave={async (iconUrl) => { const response = await projectsApi.update(projectData.id, { iconUrl }); - updateProjectData({ iconUrl, favicon: response.data.favicon }); + updateProjectData({ iconUrl: response.data.iconUrl }); invalidateProjectCaches(projectData.id); }} /> diff --git a/apps/dashboard/src/components/settings/image-settings.test.tsx b/apps/dashboard/src/components/settings/image-settings.test.tsx index a6a171b07..3a5dd68c1 100644 --- a/apps/dashboard/src/components/settings/image-settings.test.tsx +++ b/apps/dashboard/src/components/settings/image-settings.test.tsx @@ -30,7 +30,7 @@ beforeEach(() => { vi.clearAllMocks(); vi.stubGlobal("IS_REACT_ACT_ENVIRONMENT", true); h.profile.mockResolvedValue({ data: { status: true }, error: null }); - h.project.mockResolvedValue({ data: { favicon: "https://app.example.test/favicon.ico" } }); + h.project.mockImplementation(async (_id, data) => ({ data })); host = document.createElement("div"); document.body.append(host); root = createRoot(host); @@ -65,7 +65,7 @@ it("saves the avatar through the current user's existing auth update", async () expect(h.profile).toHaveBeenCalledWith({ image: "https://cdn.example.test/avatar.png" }); }); -it("clears the project override through existing settings and immediately restores the discovered icon", async () => { +it("clears the single project icon field through existing settings", async () => { await act(async () => root.render( @@ -77,7 +77,6 @@ it("clears the project override through existing settings and immediately restor expect(h.project).toHaveBeenCalledWith("project-a", { iconUrl: null }); expect(h.update).toHaveBeenCalledWith({ iconUrl: null, - favicon: "https://app.example.test/favicon.ico", }); expect(h.invalidate).toHaveBeenCalledWith("project-a"); }); diff --git a/apps/dashboard/src/components/shared/ProjectIcon.tsx b/apps/dashboard/src/components/shared/ProjectIcon.tsx index 7474e0013..629e03763 100644 --- a/apps/dashboard/src/components/shared/ProjectIcon.tsx +++ b/apps/dashboard/src/components/shared/ProjectIcon.tsx @@ -1,28 +1,24 @@ "use client"; -import { projectIconUrl } from "@repo/core"; import { AppLogo } from "@/components/AppLogo"; import { useImageFallback } from "@/hooks/useImageFallback"; import { ProjectStackIcon } from "./ProjectStackIcon"; -/** Custom URL, existing catalog/discovery preference, then the stack fallback. */ +/** One display order everywhere: project icon, catalog logo, then stack icon. */ export function ProjectIcon({ project, appTemplateId, - preferAppLogo = false, className = "size-6", }: { project: { iconUrl?: string | null; - favicon?: string | null; framework?: string | null; serviceDeploymentMode?: "single" | "services"; }; appTemplateId?: string | null; - preferAppLogo?: boolean; className?: string; }) { - const src = project.iconUrl || (preferAppLogo && appTemplateId ? null : projectIconUrl(project)); + const src = project.iconUrl; const image = useImageFallback(src); if (image.showImage) return ( @@ -35,7 +31,7 @@ export function ProjectIcon({ className={`${className} object-contain`} /> ); - if (preferAppLogo && appTemplateId) + if (appTemplateId) return ; return ( { expect(html).not.toContain("html5"); }); - it("keeps favicons ahead of the service-group fallback", () => { + it("keeps project icons ahead of the service-group fallback", () => { const html = renderToStaticMarkup( - + , ); expect(html).toContain('src="/site.ico"'); diff --git a/apps/dashboard/src/components/shared/ProjectStackIcon.tsx b/apps/dashboard/src/components/shared/ProjectStackIcon.tsx index 40d63c979..00d062b2a 100644 --- a/apps/dashboard/src/components/shared/ProjectStackIcon.tsx +++ b/apps/dashboard/src/components/shared/ProjectStackIcon.tsx @@ -4,7 +4,7 @@ import { isServicesFramework } from "@repo/core"; import { Icon } from "@repo/ui/icons"; import { getFrameworkConfig } from "@/components/import-project/Frameworks"; -/** Fallback identity after a catalog logo or favicon, shared by project rows +/** Fallback identity after a project icon or catalog logo, shared by project rows * and deployment history. A missing framework never implies a static site. */ export function ProjectStackIcon({ framework, diff --git a/apps/dashboard/src/constants/mock.ts b/apps/dashboard/src/constants/mock.ts index 5338b6844..91532d414 100644 --- a/apps/dashboard/src/constants/mock.ts +++ b/apps/dashboard/src/constants/mock.ts @@ -78,7 +78,6 @@ export interface Project { lifecycleOperation?: ProjectLifecycleOperation | null; /* ── Hosting info (enriched by API) ─────────────────────── */ - favicon?: string | null; iconUrl?: string | null; deployTarget?: string | null; serverId?: string | null; diff --git a/apps/dashboard/src/i18n/locales/ar/projectSettings.json b/apps/dashboard/src/i18n/locales/ar/projectSettings.json index b09fc3b80..8ccbdf611 100644 --- a/apps/dashboard/src/i18n/locales/ar/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ar/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "رابط أيقونة المشروع", - "hint": "تتجاوز الأيقونة المخصصة الاكتشاف التلقائي. امسح الرابط للعودة إلى الأيقونة المكتشفة.", - "reset": "استخدام الأيقونة التلقائية" + "hint": "استخدم رابط صورة HTTP أو HTTPS. امسحه لاستخدام الأيقونة الافتراضية.", + "reset": "استخدام الأيقونة الافتراضية" } } diff --git a/apps/dashboard/src/i18n/locales/de/projectSettings.json b/apps/dashboard/src/i18n/locales/de/projectSettings.json index 940a50538..427e82fc1 100644 --- a/apps/dashboard/src/i18n/locales/de/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/de/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "URL des Projektsymbols", - "hint": "Ein eigenes Symbol ersetzt die automatische Erkennung. Leere die URL, um das erkannte Symbol zu verwenden.", - "reset": "Automatisches Symbol verwenden" + "hint": "Verwende eine HTTP- oder HTTPS-Bild-URL. Leere sie, um das Standardsymbol zu verwenden.", + "reset": "Standardsymbol verwenden" } } diff --git a/apps/dashboard/src/i18n/locales/en/projectSettings.json b/apps/dashboard/src/i18n/locales/en/projectSettings.json index 4539f5159..283ddea15 100644 --- a/apps/dashboard/src/i18n/locales/en/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/en/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "Project icon URL", - "hint": "A custom icon replaces automatic discovery. Clear it to use the discovered icon again.", - "reset": "Use automatic icon" + "hint": "Use an HTTP or HTTPS image URL. Clear it to use the default icon.", + "reset": "Use default icon" } } diff --git a/apps/dashboard/src/i18n/locales/es/projectSettings.json b/apps/dashboard/src/i18n/locales/es/projectSettings.json index ff9d8ee29..fd96834e2 100644 --- a/apps/dashboard/src/i18n/locales/es/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/es/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "URL del icono del proyecto", - "hint": "El icono personalizado sustituye la detección automática. Borra la URL para volver al icono detectado.", - "reset": "Usar icono automático" + "hint": "Usa una URL de imagen HTTP o HTTPS. Bórrala para usar el icono predeterminado.", + "reset": "Usar icono predeterminado" } } diff --git a/apps/dashboard/src/i18n/locales/fr/projectSettings.json b/apps/dashboard/src/i18n/locales/fr/projectSettings.json index 8f5a87b8d..af9bb4454 100644 --- a/apps/dashboard/src/i18n/locales/fr/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/fr/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "URL de l’icône du projet", - "hint": "Une icône personnalisée remplace la détection automatique. Effacez l’URL pour retrouver l’icône détectée.", - "reset": "Utiliser l’icône automatique" + "hint": "Utilisez une URL d’image HTTP ou HTTPS. Effacez-la pour utiliser l’icône par défaut.", + "reset": "Utiliser l’icône par défaut" } } diff --git a/apps/dashboard/src/i18n/locales/ja/projectSettings.json b/apps/dashboard/src/i18n/locales/ja/projectSettings.json index 0d0cfd5eb..17f63ef7a 100644 --- a/apps/dashboard/src/i18n/locales/ja/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ja/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "プロジェクトアイコンの URL", - "hint": "カスタムアイコンは自動検出より優先されます。URL を消すと検出されたアイコンに戻ります。", - "reset": "自動アイコンを使用" + "hint": "HTTP または HTTPS の画像 URL を指定してください。空にすると既定のアイコンに戻ります。", + "reset": "既定のアイコンを使用" } } diff --git a/apps/dashboard/src/i18n/locales/pt/projectSettings.json b/apps/dashboard/src/i18n/locales/pt/projectSettings.json index edb282aa8..a3ca74b0a 100644 --- a/apps/dashboard/src/i18n/locales/pt/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/pt/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "URL do ícone do projeto", - "hint": "Um ícone personalizado substitui a detecção automática. Limpe a URL para usar o ícone detectado.", - "reset": "Usar ícone automático" + "hint": "Use uma URL de imagem HTTP ou HTTPS. Limpe-a para usar o ícone padrão.", + "reset": "Usar ícone padrão" } } diff --git a/apps/dashboard/src/i18n/locales/ru/projectSettings.json b/apps/dashboard/src/i18n/locales/ru/projectSettings.json index 5ad468511..444152582 100644 --- a/apps/dashboard/src/i18n/locales/ru/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/ru/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "URL значка проекта", - "hint": "Свой значок заменяет автоматическое обнаружение. Очистите URL, чтобы вернуть найденный значок.", - "reset": "Автоматический значок" + "hint": "Укажите HTTP- или HTTPS-ссылку на изображение. Очистите её, чтобы использовать значок по умолчанию.", + "reset": "Стандартный значок" } } diff --git a/apps/dashboard/src/i18n/locales/tr/projectSettings.json b/apps/dashboard/src/i18n/locales/tr/projectSettings.json index 219dfaa06..9f55585ea 100644 --- a/apps/dashboard/src/i18n/locales/tr/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/tr/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "Proje simgesi URL’si", - "hint": "Özel simge otomatik algılamanın yerini alır. Algılanan simgeye dönmek için URL’yi temizleyin.", - "reset": "Otomatik simgeyi kullan" + "hint": "HTTP veya HTTPS resim URL’si kullanın. Varsayılan simgeyi kullanmak için URL’yi temizleyin.", + "reset": "Varsayılan simgeyi kullan" } } diff --git a/apps/dashboard/src/i18n/locales/zh/projectSettings.json b/apps/dashboard/src/i18n/locales/zh/projectSettings.json index b16d95d0b..ab52939d9 100644 --- a/apps/dashboard/src/i18n/locales/zh/projectSettings.json +++ b/apps/dashboard/src/i18n/locales/zh/projectSettings.json @@ -1440,7 +1440,7 @@ }, "icon": { "label": "项目图标 URL", - "hint": "自定义图标优先于自动检测。清空 URL 可恢复检测到的图标。", - "reset": "使用自动图标" + "hint": "使用 HTTP 或 HTTPS 图片 URL。清空后将使用默认图标。", + "reset": "使用默认图标" } } diff --git a/apps/dashboard/src/lib/api/connections.ts b/apps/dashboard/src/lib/api/connections.ts index 54c2c54a1..58e3e6043 100644 --- a/apps/dashboard/src/lib/api/connections.ts +++ b/apps/dashboard/src/lib/api/connections.ts @@ -1,3 +1,4 @@ +import type { ProjectConnectionCandidate } from "@repo/contracts"; import { api } from "./client"; import { endpoints } from "./endpoints"; @@ -48,15 +49,7 @@ async function notifyConnections(request: Promise): Promise { export const connectionsApi = { candidates: (projectId: string) => - api.get<{ - data: Array<{ - id: string; - name: string; - description: string; - appTemplateId: string | null; - clusterId?: string | null; - }>; - }>(`${endpoints.projects.connections(projectId)}/candidates`), + api.get<{ data: ProjectConnectionCandidate[] }>(`${endpoints.projects.connections(projectId)}/candidates`), /** Connections wired INTO a project (`projectId` = the consumer). */ list: (projectId: string) => api.get<{ data: ProjectConnection[] }>(endpoints.projects.connections(projectId)), diff --git a/apps/web/content/docs/dashboard/projects.mdx b/apps/web/content/docs/dashboard/projects.mdx index c616684dc..cb456e05f 100644 --- a/apps/web/content/docs/dashboard/projects.mdx +++ b/apps/web/content/docs/dashboard/projects.mdx @@ -13,7 +13,7 @@ its management tabs). Open **Projects** from the left nav. This screen is a single scannable list of every project in your workspace — one row per project. -Each row shows, left to right: the app's icon (its favicon, or the framework logo), the **name** +Each row shows, left to right: the project icon (set in **Settings → Project Info**), or its app/framework logo, the **name** and its live version badge, the primary **domain**, the detected **framework**, where it's hosted (**Cloud**, a **Server** by name, or **Local**), its source (a GitHub repo or a local folder), the build shape (**Services**, **Static**, or **Standalone**), how long ago it changed, and a diff --git a/docs/dashboard-design.md b/docs/dashboard-design.md index 58409ea52..0d22c3728 100644 --- a/docs/dashboard-design.md +++ b/docs/dashboard-design.md @@ -7,10 +7,10 @@ and a consistent type hierarchy across light, dim, and dark themes. Personal avatar URLs live in Settings → General → Profile. Project icon URLs live in the Project Info card in project Settings. Both use the shared URL editor with -a preview and a reset action. Custom project icons take precedence across project, -app and deployment lists and pause automatic favicon discovery. Clearing an override -restores the cached favicon and its normal discovery flow. Image URLs are displayed -directly by the browser with no referrer; the control plane does not fetch custom URLs. +a preview and a reset action. Each project has one `iconUrl`; project, app, connection +and deployment lists use the same renderer. Clearing the URL restores the catalog +logo or framework/service icon. Image URLs are displayed directly by the browser +with no referrer; the control plane does not fetch them or discover favicons. Assistant settings belong in **Settings → Assistant**; event-driven flows and run history open from **Automations** in the AI Agents right column. diff --git a/packages/contracts/src/deployments.ts b/packages/contracts/src/deployments.ts index cfa0b5e2c..254f540ca 100644 --- a/packages/contracts/src/deployments.ts +++ b/packages/contracts/src/deployments.ts @@ -97,7 +97,6 @@ export const DeploymentSchema = Type.Object({ updatedAt: Type.String(), isActive: Type.Optional(Type.Boolean()), projectName: Type.Optional(Type.String()), - favicon: Type.Optional(Type.Union([Type.String(), Type.Null()])), iconUrl: Type.Optional(Type.Union([Type.String(), Type.Null()])), }); diff --git a/packages/contracts/src/project-integrations.ts b/packages/contracts/src/project-integrations.ts index 5b8f4797e..93a8c3551 100644 --- a/packages/contracts/src/project-integrations.ts +++ b/packages/contracts/src/project-integrations.ts @@ -55,18 +55,21 @@ export const ProjectEdgeConfigSchema = Type.Object({ })), }); +export const ProjectConnectionCandidateSchema = Type.Object({ + id: Type.String(), + name: Type.String(), + description: Type.String(), + appTemplateId: nullableString, + iconUrl: Type.Optional(nullableString), + framework: Type.Optional(nullableString), + clusterId: Type.Optional(nullableString), +}); +export type ProjectConnectionCandidate = Static; + export const ProjectIntegrationSchemas = { listConnectionCandidates: { action: "write", - output: Type.Array( - Type.Object({ - id: Type.String(), - name: Type.String(), - description: Type.String(), - appTemplateId: nullableString, - clusterId: Type.Optional(nullableString), - }), - ), + output: Type.Array(ProjectConnectionCandidateSchema), }, listConnections: { action: "read", output: Type.Array(ProjectConnectionSchema) }, listConnectionConsumers: { action: "read", output: Type.Array(ProjectConnectionConsumerSchema) }, diff --git a/packages/contracts/src/projects.ts b/packages/contracts/src/projects.ts index ccb4277cb..6204f1de6 100644 --- a/packages/contracts/src/projects.ts +++ b/packages/contracts/src/projects.ts @@ -15,7 +15,6 @@ export const ProjectSchema = Type.Object({ name: Type.String(), slug: Type.String(), iconUrl: Type.Optional(nullableString()), - favicon: Type.Optional(nullableString()), createdAt: Type.String(), updatedAt: Type.String(), environmentName: Type.Optional(Type.String()), diff --git a/packages/core/src/image-url.test.ts b/packages/core/src/image-url.test.ts index 391f1648b..79a613338 100644 --- a/packages/core/src/image-url.test.ts +++ b/packages/core/src/image-url.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it } from "vitest"; -import { isImageUrl, MAX_IMAGE_URL_LENGTH, projectIconUrl } from "./image-url"; +import { isImageUrl, MAX_IMAGE_URL_LENGTH } from "./image-url"; describe("display image URLs", () => { it.each([ @@ -22,13 +22,4 @@ describe("display image URLs", () => { " https://example.test/image.png", `https://example.test/${"a".repeat(MAX_IMAGE_URL_LENGTH)}`, ])("refuses unsafe or malformed input %j", (url) => expect(isImageUrl(url)).toBe(false)); - it("uses an explicit project icon before the discovered cache and restores the cache when cleared", () => { - const project = { - iconUrl: "https://images.example.test/custom.png", - favicon: "https://app.example.test/favicon.ico", - }; - expect(projectIconUrl(project)).toBe(project.iconUrl); - expect(projectIconUrl({ ...project, iconUrl: null })).toBe(project.favicon); - expect(projectIconUrl(null)).toBeNull(); - }); }); diff --git a/packages/core/src/image-url.ts b/packages/core/src/image-url.ts index 52fcc7575..137c1d4a6 100644 --- a/packages/core/src/image-url.ts +++ b/packages/core/src/image-url.ts @@ -21,10 +21,3 @@ export function isImageUrl(value: unknown): value is string { return false; } } - -/** One precedence rule for every project and deployment presentation. */ -export function projectIconUrl( - project: { iconUrl?: string | null; favicon?: string | null } | null | undefined, -): string | null { - return project?.iconUrl || project?.favicon || null; -} diff --git a/packages/db/drizzle/0232_project_icon_cleanup.sql b/packages/db/drizzle/0232_project_icon_cleanup.sql new file mode 100644 index 000000000..9ba00e56a --- /dev/null +++ b/packages/db/drizzle/0232_project_icon_cleanup.sql @@ -0,0 +1,17 @@ +-- Preserve saved images before retiring automatic favicon discovery. +-- An explicit icon always wins; projects without one retain their existing image. +UPDATE "project" +SET "icon_url" = COALESCE( + "icon_url", + "favicon", + (SELECT "favicon" FROM "project_app" WHERE "id" = "project"."app_id") +) +WHERE "icon_url" IS NULL; +--> statement-breakpoint +ALTER TABLE "project" DROP COLUMN IF EXISTS "favicon"; +--> statement-breakpoint +ALTER TABLE "project" DROP COLUMN IF EXISTS "favicon_checked_at"; +--> statement-breakpoint +ALTER TABLE "project_app" DROP COLUMN IF EXISTS "favicon"; +--> statement-breakpoint +ALTER TABLE "project_app" DROP COLUMN IF EXISTS "favicon_checked_at"; diff --git a/packages/db/drizzle/meta/_journal.json b/packages/db/drizzle/meta/_journal.json index 9e0661e6c..71b3a5a43 100644 --- a/packages/db/drizzle/meta/_journal.json +++ b/packages/db/drizzle/meta/_journal.json @@ -1625,6 +1625,13 @@ "when": 1794373202000, "tag": "0231_project_icon_url", "breakpoints": true + }, + { + "idx": 232, + "version": "7", + "when": 1794373203000, + "tag": "0232_project_icon_cleanup", + "breakpoints": true } ] } diff --git a/packages/db/src/dump-roundtrip.test.ts b/packages/db/src/dump-roundtrip.test.ts index de514bf69..a2637d446 100644 --- a/packages/db/src/dump-roundtrip.test.ts +++ b/packages/db/src/dump-roundtrip.test.ts @@ -274,6 +274,35 @@ describe("whole-instance dump → restore round trip", () => { }, ); + it.each(["legacy", "group", "custom", "cleared"] as const)( + "restores %s project images into the single iconUrl field", + async (mode) => { + const original = await dumpSubgraph({ kind: "instance" }); + const archive = JSON.parse(JSON.stringify(original)) as typeof original; + const project = archive.tables.project![0]!; + project.favicon = "https://old.example.test/favicon.ico"; + project.faviconCheckedAt = "2026-11-01T12:00:00Z"; + const group = archive.tables.project_app!.find((row) => row.id === project.groupId)!; + group.favicon = "https://cdn.example.test/group.svg"; + if (mode === "custom") project.iconUrl = "https://cdn.example.test/custom.svg"; + else if (mode === "cleared") project.iconUrl = null; + else delete project.iconUrl; + if (mode === "group") project.favicon = null; + const expected = mode === "custom" ? project.iconUrl : mode === "cleared" ? null : mode === "group" ? group.favicon : project.favicon; + try { + await restoreSubgraph(archive, { mode: "wipe" }); + const restored = await dumpSubgraph({ kind: "instance" }); + expect(restored.tables.project![0]!.iconUrl).toBe(expected); + expect(restored.tables.project![0]).not.toHaveProperty("favicon"); + expect(restored.tables.project![0]).not.toHaveProperty("faviconCheckedAt"); + expect(restored.tables.project_app![0]).not.toHaveProperty("favicon"); + expect(project.faviconCheckedAt).toBe("2026-11-01T12:00:00Z"); + } finally { + await restoreSubgraph(original, { mode: "wipe" }); + } + }, + ); + it("lets callers include follow-up work in the same atomic restore transaction", async () => { const projectSpec = topoOrderedTables().find((s) => s.sqlName === "project")!; const [before] = (await db.select().from(projectSpec.table)) as Array>; diff --git a/packages/db/src/dump.ts b/packages/db/src/dump.ts index cd320b1c9..731d8d9ba 100644 --- a/packages/db/src/dump.ts +++ b/packages/db/src/dump.ts @@ -1773,6 +1773,11 @@ export async function restoreSubgraphInTransaction( } } + // Resolve legacy image inheritance once for large instance archives. + const legacyGroupIcons = new Map( + (dump.tables.project_app ?? []).map((group) => [group.id, group.favicon]), + ); + // Pre-compute the encrypted-column specs keyed by table so the insert // loop below can redact those fields without re-scanning ENCRYPTED_COLUMNS // per row. Redaction on restore is REQUIRED (not optional like the @@ -1835,6 +1840,11 @@ export async function restoreSubgraphInTransaction( const prepared = rows.map((r) => { const { row: next, dropped } = filterRowToKnownColumns(r, knownCols); for (const d of dropped) droppedCols.add(d); + // Archives from before iconUrl used a discovered favicon. Honor an explicit + // iconUrl (including a cleared null) when the archive already has the field. + if (spec.sqlName === "project" && !Object.hasOwn(r, "iconUrl")) { + next.iconUrl = r.favicon ?? legacyGroupIcons.get(r.groupId) ?? null; + } // Older instance dumps predate per-factor confirmation. Preserve active // authenticators while keeping unfinished enrollments unconfirmed. if (spec.sqlName === "two_factor" && !Object.hasOwn(r, "verified")) { diff --git a/packages/db/src/migrate-chain.test.ts b/packages/db/src/migrate-chain.test.ts index d59ceccfe..187932de5 100644 --- a/packages/db/src/migrate-chain.test.ts +++ b/packages/db/src/migrate-chain.test.ts @@ -268,25 +268,40 @@ describe("migration chain applies to an existing, populated database", () => { expect(await appliedMigrations(client)).toBe(total); }); - test("adds an optional icon override without changing the cached favicon or losing a saved override on retry", async () => { - const cutoff = journal.entries.findIndex((entry) => entry.tag === "0231_project_icon_url"); - expect(journal.entries[cutoff - 1]?.tag).toBe("0230_restore_workspace_security_fields"); + test("consolidates saved images into icon_url and preserves explicit icons and resets on retry", async () => { + const cutoff = journal.entries.findIndex((entry) => entry.tag === "0232_project_icon_cleanup"); + expect(journal.entries[cutoff - 1]?.tag).toBe("0231_project_icon_url"); const legacy = migrationsPrefix(cutoff); const { client, db } = await freshDb(); try { await migrate(db, { migrationsFolder: legacy }); - await client.exec("SET session_replication_role = replica;"); - await seedRow(client, "project", SEED_ID); - await client.exec("UPDATE project SET favicon = 'https://app.example.test/favicon.ico', favicon_checked_at = '2026-11-01 12:00:00', active_deployment_id = 'retained-release'"); - const projects = (await client.query>("SELECT * FROM project")).rows; + await client.exec(` + INSERT INTO organization (id, name) VALUES ('org', 'Existing organization'); + INSERT INTO project_app (id, organization_id, name, slug, favicon) VALUES + ('group', 'org', 'Apps', 'apps', NULL), + ('group-icon', 'org', 'Group image', 'group-image', 'https://cdn.example.test/group.svg'); + INSERT INTO project (id, organization_id, app_id, environment_slug, name, slug, favicon, icon_url) VALUES + ('legacy', 'org', 'group', 'legacy', 'Legacy', 'legacy', 'https://app.example.test/favicon.ico', NULL), + ('custom', 'org', 'group', 'custom', 'Custom', 'custom', 'https://old.example.test/favicon.ico', 'https://cdn.example.test/custom.svg'), + ('empty', 'org', 'group', 'empty', 'Empty', 'empty', NULL, NULL), + ('inherited', 'org', 'group-icon', 'inherited', 'Inherited', 'inherited', NULL, NULL); + `); + const projects = (await client.query>("SELECT * FROM project ORDER BY id")).rows; + const groups = (await client.query("SELECT * FROM project_app ORDER BY id")).rows; await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); - expect((await client.query("SELECT * FROM project")).rows).toEqual( - projects.map((project) => ({ ...project, icon_url: null })), + expect((await client.query("SELECT * FROM project ORDER BY id")).rows).toEqual( + projects.map(({ favicon, favicon_checked_at: _, ...project }) => ({ + ...project, + icon_url: project.icon_url ?? favicon ?? (project.app_id === "group-icon" ? "https://cdn.example.test/group.svg" : null), + })), ); - await client.exec("UPDATE project SET icon_url = 'https://cdn.example.test/custom.svg'"); - const customized = (await client.query("SELECT * FROM project")).rows; + expect((await client.query("SELECT * FROM project_app ORDER BY id")).rows).toEqual( + groups.map(({ favicon: _, favicon_checked_at: _checked, ...group }) => group), + ); + await client.exec("UPDATE project SET icon_url = NULL WHERE id = 'legacy'"); + const customized = (await client.query("SELECT * FROM project ORDER BY id")).rows; await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); - expect((await client.query("SELECT * FROM project")).rows).toEqual(customized); + expect((await client.query("SELECT * FROM project ORDER BY id")).rows).toEqual(customized); expect(await appliedMigrations(client)).toBe(total); } finally { await client.close(); @@ -312,7 +327,7 @@ describe("migration chain applies to an existing, populated database", () => { await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); expect((await client.query("SELECT * FROM project")).rows).toEqual( - projects.map((project) => ({ ...project, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: null })), + projects.map(({ favicon, favicon_checked_at: _, ...project }) => ({ ...project, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: favicon })), ); expect((await client.query("SELECT * FROM deployment")).rows).toEqual( deployments.map((deployment) => ({ @@ -358,7 +373,7 @@ describe("migration chain applies to an existing, populated database", () => { expect(await db.select().from(schema.instanceController)).toEqual([]); expect(await db.select().from(schema.instanceHandoff)).toEqual([]); expect((await client.query("SELECT * FROM project")).rows).toEqual( - projects.map((project) => ({ ...project, github_checks: null, runtime_version: null, runtime_image: null, lifecycle_operation: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: null })), + projects.map(({ favicon, favicon_checked_at: _, ...project }) => ({ ...project, github_checks: null, runtime_version: null, runtime_image: null, lifecycle_operation: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, icon_url: favicon })), ); expect( (await client.query("SELECT * FROM drizzle.__drizzle_migrations ORDER BY id")).rows.slice( @@ -556,12 +571,12 @@ describe("migration chain applies to an existing, populated database", () => { expect(managed).toHaveLength(2); for (const row of (await selectProjects()).rows) { const old = original.find((project) => project.id === row.id)!; - const { cloud_workspace_id: _native, cloud_archive_strategy: _archive, ...previous } = old as typeof old & Record; + const { cloud_workspace_id: _native, cloud_archive_strategy: _archive, favicon, favicon_checked_at: _checked, ...previous } = old as typeof old & Record; expect(row).toEqual({ ...previous, runtime_version: null, runtime_image: null, roles: null, preview_settings: null, preview_scanned_at: null, build_cache_receipts: null, auto_deploy_cancel_builds: false, - icon_url: null, + icon_url: favicon, cloud_promotion: null, lifecycle_operation: null, cloud_static_hosting: "pages", diff --git a/packages/db/src/repos/deployment.repo.ts b/packages/db/src/repos/deployment.repo.ts index 66dcc253f..9defd12db 100644 --- a/packages/db/src/repos/deployment.repo.ts +++ b/packages/db/src/repos/deployment.repo.ts @@ -626,7 +626,7 @@ export function createDeploymentRepo(db: Database, encryption: ConfigurationEncr async listHistoryProjects(organizationId: string) { return db.selectDistinct({ id: project.id, name: project.name, - activeDeploymentId: project.activeDeploymentId, favicon: project.favicon, iconUrl: project.iconUrl, + activeDeploymentId: project.activeDeploymentId, iconUrl: project.iconUrl, }).from(project).innerJoin(deployment, eq(deployment.projectId, project.id)) .where(and(eq(project.organizationId, organizationId), eq(deployment.organizationId, organizationId))) .orderBy(project.name, project.id); diff --git a/packages/db/src/repos/project.repo.ts b/packages/db/src/repos/project.repo.ts index 5cb6dc8af..4488d9649 100644 --- a/packages/db/src/repos/project.repo.ts +++ b/packages/db/src/repos/project.repo.ts @@ -661,25 +661,6 @@ export function createProjectRepo(db: Database, encryption: ConfigurationEncrypt }).where(eq(project.id, id)); }, - /** Update favicon cache metadata without touching the user-visible updatedAt field. */ - async updateFaviconCache( - id: string, - data: { favicon?: string | null; faviconCheckedAt?: Date | null }, - ) { - const patch: Partial = {}; - - if (Object.prototype.hasOwnProperty.call(data, "favicon")) { - patch.favicon = data.favicon ?? null; - } - if (Object.prototype.hasOwnProperty.call(data, "faviconCheckedAt")) { - patch.faviconCheckedAt = data.faviconCheckedAt ?? null; - } - - if (Object.keys(patch).length === 0) return; - - await db.update(project).set(patch).where(and(eq(project.id, id), isNull(project.iconUrl))); - }, - /** Soft-delete a project */ async softDelete(id: string) { await withProjectConfigurationWrite(db, eq(project.id, id), async (tx) => tx diff --git a/packages/db/src/schema/project.ts b/packages/db/src/schema/project.ts index 176ddcac2..098ae3a3d 100644 --- a/packages/db/src/schema/project.ts +++ b/packages/db/src/schema/project.ts @@ -69,10 +69,6 @@ export const projectGroup = pgTable("project_app", { gitUrl: text("git_url"), installationId: integer("installation_id"), - /** Shared favicon cache */ - favicon: text("favicon"), - faviconCheckedAt: timestamp("favicon_checked_at"), - deletedAt: timestamp("deleted_at"), createdAt: timestamp("created_at").notNull().defaultNow(), updatedAt: timestamp("updated_at").notNull().defaultNow(), @@ -499,12 +495,8 @@ export const project = pgTable( * nobody opted into paying for this, so nobody keeps paying for it silently. */ collectPaths: boolean("collect_paths").notNull().default(false), - /** Optional display override; independent of the discovered favicon cache. */ + /** Project display image, managed in project settings. */ iconUrl: text("icon_url"), - /** Auto-detected favicon URL from the deployed site */ - favicon: text("favicon"), - /** Last time favicon detection was attempted for this project */ - faviconCheckedAt: timestamp("favicon_checked_at"), /** Soft delete */ deletedAt: timestamp("deleted_at"), /** diff --git a/packages/platform/src/engine/lib/cloud/project-promotion.ts b/packages/platform/src/engine/lib/cloud/project-promotion.ts index 62284ce18..20a1679e6 100644 --- a/packages/platform/src/engine/lib/cloud/project-promotion.ts +++ b/packages/platform/src/engine/lib/cloud/project-promotion.ts @@ -45,8 +45,6 @@ export function projectPromotionDigest(dump: DatabaseDump): string { delete row.deletionInProgress; delete row.lifecycleOperation; delete row.updatedAt; - delete row.favicon; - delete row.faviconCheckedAt; } for (const [name, rows] of Object.entries(tables)) { tables[name] = rows diff --git a/packages/platform/src/engine/lib/favicon-detector.ts b/packages/platform/src/engine/lib/favicon-detector.ts deleted file mode 100644 index 8185d9ba3..000000000 --- a/packages/platform/src/engine/lib/favicon-detector.ts +++ /dev/null @@ -1,162 +0,0 @@ -/** - * Favicon detection - check if a deployed site has a favicon. - * - * Called asynchronously on project reads when the favicon cache is stale. - * Simply checks /favicon.ico - the universal standard. - * - * Returns an absolute URL string or null. - */ - -import { reportCaughtError as observeCaughtError } from "@repo/core/diagnostics"; -import { repos } from "@repo/db"; -import { env } from "../config/env"; -import { safeFetch } from "./safe-fetch"; -import { trackBackgroundWork } from "./background-work"; - -const FETCH_TIMEOUT = 8_000; -const FAVICON_REFRESH_TTL_MS = 24 * 60 * 60 * 1000; -const inFlightRefreshes = new Set(); - -interface FaviconRefreshProject { - id: string; - slug?: string | null; - activeDeploymentId?: string | null; - favicon?: string | null; - iconUrl?: string | null; - faviconCheckedAt?: Date | string | null; -} - -interface RefreshOptions { - hostname?: string | null; -} - -function normalizeSiteUrl(siteUrlOrHostname: string): string { - const trimmed = siteUrlOrHostname.trim().replace(/\/$/, ""); - if (!trimmed) return ""; - if (/^https?:\/\//i.test(trimmed)) return trimmed; - return `https://${trimmed}`; -} - -function isRefreshDue(project: FaviconRefreshProject): boolean { - if (!project.faviconCheckedAt) return true; - - const checkedAt = new Date(project.faviconCheckedAt); - if (Number.isNaN(checkedAt.getTime())) return true; - - return Date.now() - checkedAt.getTime() >= FAVICON_REFRESH_TTL_MS; -} - -async function resolvePreferredSiteUrl( - project: FaviconRefreshProject, - options?: RefreshOptions, -): Promise { - if (options?.hostname?.trim()) { - return normalizeSiteUrl(options.hostname); - } - - const primaryDomain = await repos.domain.getPrimaryByProject(project.id); - if (primaryDomain?.verified && primaryDomain.hostname?.trim()) { - return normalizeSiteUrl(primaryDomain.hostname); - } - - return null; -} - -async function probeFavicon(siteUrl: string): Promise { - const base = normalizeSiteUrl(siteUrl); - if (!base) return null; - - const faviconUrl = `${base}/favicon.ico`; - - const tryProbe = async (method: "HEAD" | "GET") => { - // SSRF-safe: `base` is a project's (attacker-controllable-DNS) domain. Pin the - // resolved IP; reject internal targets on the multi-tenant SaaS, allow the - // operator's own LAN on self-hosted. - const res = await safeFetch(faviconUrl, { - method, - timeoutMs: FETCH_TIMEOUT, - allowHttp: true, - allowPrivate: !env.CLOUD_MODE, - maxRedirects: 3, - }); - - if (!res.ok) { - return null; - } - - const ct = res.headers["content-type"] ?? ""; - if (ct.startsWith("image/") || ct === "application/octet-stream") { - return faviconUrl; - } - - return null; - }; - - const headResult = await tryProbe("HEAD"); - if (headResult) { - return headResult; - } - - const getResult = await tryProbe("GET"); - if (getResult) { - return getResult; - } - - return null; -} - -export function refreshProjectFaviconIfStale( - project: FaviconRefreshProject, - options?: RefreshOptions, -): void { - if (project.iconUrl || !project.activeDeploymentId || !isRefreshDue(project)) { - return; - } - - if (inFlightRefreshes.has(project.id)) { - return; - } - - inFlightRefreshes.add(project.id); - void trackBackgroundWork((async () => { - const siteUrl = await resolvePreferredSiteUrl(project, options); - if (!siteUrl) { - return; - } - - await detectAndStoreFavicon(project.id, siteUrl); - })() - .catch((diagnosticFailure) => { observeCaughtError(diagnosticFailure, "platform/engine/lib/favicon-detector"); return undefined; }) - .finally(() => { - inFlightRefreshes.delete(project.id); - })); -} - -/** - * Detect and store the favicon for a deployed project. - * Best-effort: update the cache timestamp on every attempt, but only replace - * the stored favicon URL when the fetch succeeds. - */ -export async function detectAndStoreFavicon(projectId: string, siteUrl: string): Promise { - const checkedAt = new Date(); - - try { - const project = await repos.project.findById(projectId); - if (!project || project.iconUrl) return; - const faviconUrl = await probeFavicon(siteUrl); - if (faviconUrl) { - await repos.project.updateFaviconCache(projectId, { - favicon: faviconUrl, - faviconCheckedAt: checkedAt, - }); - return; - } - } catch (diagnosticFailure) { - observeCaughtError(diagnosticFailure, "platform/engine/lib/favicon-detector"); - // Best-effort - don't break anything if this fails - } - - await repos.project.updateFaviconCache(projectId, { - faviconCheckedAt: checkedAt, - }).catch((diagnosticFailure) => { observeCaughtError(diagnosticFailure, "platform/engine/lib/favicon-detector"); return undefined; }); -} diff --git a/packages/platform/src/engine/lib/public-endpoints.ts b/packages/platform/src/engine/lib/public-endpoints.ts index 91b900d5d..01f05dd69 100644 --- a/packages/platform/src/engine/lib/public-endpoints.ts +++ b/packages/platform/src/engine/lib/public-endpoints.ts @@ -982,7 +982,7 @@ export interface ProjectAccess { /** The project's ONE canonical public domain row, chosen over ALL rows * (project-level AND service-scoped): a verified primary, else the first * verified row, else none. The single primary-selection rule the detail Access - * URL, the list card's primaryDomain, and the favicon refresh all share, so + * URL and the list card's primaryDomain share, so * those surfaces can never disagree on which domain is "the" one. */ export function pickCanonicalDomainRow & { hostname?: string }>( rows: T[] | null | undefined, diff --git a/packages/platform/src/engine/modules/deployments/deployment-lifecycle.ts b/packages/platform/src/engine/modules/deployments/deployment-lifecycle.ts index 061720d5a..f276201b8 100644 --- a/packages/platform/src/engine/modules/deployments/deployment-lifecycle.ts +++ b/packages/platform/src/engine/modules/deployments/deployment-lifecycle.ts @@ -38,8 +38,6 @@ import { sanitizeStorableStrings, sliceWithoutSplittingPair, } from "./build-log-sanitize"; -import { detectAndStoreFavicon } from "../../lib/favicon-detector"; -import { trackBackgroundWork } from "../../lib/background-work"; import { onWebmailDeployed } from "../mail/webmail/webmail-install.service"; import { computeCleanupKeepSet } from "../projects/cleanup-keep-set"; import { deploymentResourceFailure, type DeploymentFailureMeta } from "./resource-failure"; @@ -1065,11 +1063,6 @@ export async function onSuccess( }, ); - // Async favicon detection - don't block the deploy response - if (result.url) { - void trackBackgroundWork(detectAndStoreFavicon(project.id, result.url)); - } - // Webmail on Openship Cloud, routed on the mail server's own `mail.`: // the mail VPS proxies that hostname to the cloud URL, which can only be // registered once the URL exists. Await it so the deployment execution lease diff --git a/packages/platform/src/engine/modules/deployments/deployment.service.ts b/packages/platform/src/engine/modules/deployments/deployment.service.ts index f851dd4aa..4b5cbb34b 100644 --- a/packages/platform/src/engine/modules/deployments/deployment.service.ts +++ b/packages/platform/src/engine/modules/deployments/deployment.service.ts @@ -10,7 +10,7 @@ import { findProjectDeployment } from "../../lib/active-deployment"; import { withProjectRuntimeLock } from "../../lib/project-runtime-lock"; import { existsSync, readFileSync } from "node:fs"; import { repos, type Deployment } from "@repo/db"; -import { projectIconUrl, NotFoundError, ForbiddenError, deploymentBelongsToProject, type DeploymentHistoryQuery } from "@repo/core"; +import { NotFoundError, ForbiddenError, deploymentBelongsToProject, type DeploymentHistoryQuery } from "@repo/core"; import type { LogEntry } from "@repo/adapters"; import type { ExecutionContext as RequestContext } from "@repo/platform"; import { @@ -89,9 +89,6 @@ export async function listDeployments( ...d, isActive: d.id === activeId, projectName: project.name, - // Project favicon → the dashboard uses it as the row's logo instead - // of the framework/Docker glyph. - favicon: projectIconUrl(project), iconUrl: project.iconUrl ?? null, })), }; @@ -111,8 +108,6 @@ export async function listDeployments( ...d, projectName: proj?.name ?? "Unknown", isActive: proj?.activeDeploymentId === d.id, - // Project favicon → dashboard row logo (see listByProject above). - favicon: projectIconUrl(proj), iconUrl: proj?.iconUrl ?? null, }; }); diff --git a/packages/platform/src/engine/modules/domains/domain.service.ts b/packages/platform/src/engine/modules/domains/domain.service.ts index 4e3904afe..91af17542 100644 --- a/packages/platform/src/engine/modules/domains/domain.service.ts +++ b/packages/platform/src/engine/modules/domains/domain.service.ts @@ -108,7 +108,7 @@ export async function getDomain(ctx: RequestContext, domainId: string) { /** * Make a domain the project's primary. Primary is the project's canonical - * hostname — what favicon detection, analytics, and the dashboard's project + * hostname — what analytics and the dashboard's project * link resolve to (getPrimaryByProject). setPrimary unsets any prior primary * for the project and marks this one, so exactly one row stays primary. * Survives redeploys: per-service route registration preserves an existing diff --git a/packages/platform/src/engine/modules/projects/project-clone.service.ts b/packages/platform/src/engine/modules/projects/project-clone.service.ts index 6abf0122d..227c2d705 100644 --- a/packages/platform/src/engine/modules/projects/project-clone.service.ts +++ b/packages/platform/src/engine/modules/projects/project-clone.service.ts @@ -68,10 +68,6 @@ const PROJECT_FIELDS_NOT_CLONED = [ "deletionInProgress", "lifecycleOperation", "disabledAt", - // Detected from the live site; the copy has no site yet, so copying these would show the - // original's icon next to a project that has never served a request. - "favicon", - "faviconCheckedAt", // Routing that names specific hostnames. The copy starts with no domains (the confirm dialog // promises exactly this) — the originals stay with the project still serving them. "compositeRoutes", diff --git a/packages/platform/src/engine/modules/projects/project-connection.service.ts b/packages/platform/src/engine/modules/projects/project-connection.service.ts index 2678838fb..70a45f7cb 100644 --- a/packages/platform/src/engine/modules/projects/project-connection.service.ts +++ b/packages/platform/src/engine/modules/projects/project-connection.service.ts @@ -87,6 +87,8 @@ export async function listConnectionCandidates(ctx: RequestContext, projectId: s name: project.name, description: project.environmentName, appTemplateId: project.appTemplateId, + iconUrl: project.iconUrl, + framework: project.framework, clusterId: project.clusterId, }); } diff --git a/packages/platform/src/engine/modules/projects/project-home.operations.ts b/packages/platform/src/engine/modules/projects/project-home.operations.ts index a2b516850..671ff94d0 100644 --- a/packages/platform/src/engine/modules/projects/project-home.operations.ts +++ b/packages/platform/src/engine/modules/projects/project-home.operations.ts @@ -5,7 +5,6 @@ import { OperationError } from "@repo/contracts"; import type { ExecutionContext } from "../../../context"; import { presentProject } from "../../../projects"; import { authorization } from "../../lib/authorization"; -import { refreshProjectFaviconIfStale } from "../../lib/favicon-detector"; import { fetchOrgCloudProjects } from "../../lib/cloud/projects"; import { canProxyCloudResources } from "../../lib/cloud/scope"; import * as projectService from "./project.service"; @@ -86,10 +85,6 @@ export async function getProjectHome(ctx: ExecutionContext) { const primary = primariesByProject.get(original.id); const services = servicesByProject.get(original.id) ?? []; - refreshProjectFaviconIfStale(original, { - hostname: primary?.verified ? primary.hostname : null, - }); - return { ...presentProject(enriched), latestDeploymentId: latest?.id ?? null, diff --git a/packages/platform/src/engine/modules/projects/project-inspection.operations.ts b/packages/platform/src/engine/modules/projects/project-inspection.operations.ts index e04eefa03..bcabfcc9e 100644 --- a/packages/platform/src/engine/modules/projects/project-inspection.operations.ts +++ b/packages/platform/src/engine/modules/projects/project-inspection.operations.ts @@ -12,8 +12,7 @@ import { deploymentWorkload } from "../deployments/deployment-class"; import { serviceKind } from "../../lib/deployable-service"; import { maskDeploymentEnv } from "../../lib/secret-env"; import { listProjectRouteRows, resolveProjectRouteState } from "../domains/project-route.service"; -import { refreshProjectFaviconIfStale } from "../../lib/favicon-detector"; -import { pickCanonicalDomainRow, resolveProjectAccess } from "../../lib/public-endpoints"; +import { resolveProjectAccess } from "../../lib/public-endpoints"; import { readProjectRoutingClaims } from "../../lib/domain-claims"; import { serviceCustomHostnames } from "../../lib/routing-domains"; import { withDomainDiagnostics } from "../domains/domain-diagnostics"; @@ -107,9 +106,6 @@ export function createProjectInspectionOperations( domain: d.hostname, primary: d.isPrimary, })); - refreshProjectFaviconIfStale(project, { - hostname: pickCanonicalDomainRow(rawDomains)?.hostname ?? null, - }); // One server-computed access URL for every client surface. Derived from ALL // domain rows (service-scoped included, which the project-level publicEndpoints // resolver drops) + the effective deploy target, so a multi-service project diff --git a/packages/platform/src/engine/modules/projects/project.operations.ts b/packages/platform/src/engine/modules/projects/project.operations.ts index 5ed4def9a..b37b91194 100644 --- a/packages/platform/src/engine/modules/projects/project.operations.ts +++ b/packages/platform/src/engine/modules/projects/project.operations.ts @@ -10,7 +10,6 @@ import type { ExecutionContext } from "../../../context"; import { authorization } from "../../lib/authorization"; import { audit } from "../../lib/audit-emitter"; import { assertNativeSourcePath } from "../../native/source-policy"; -import { refreshProjectFaviconIfStale } from "../../lib/favicon-detector"; import { createProjectControls } from "./project-controls.operations"; import { clusterDatabaseEvents } from "./cluster-database.operations"; import { clusterVolumeEvents } from "./cluster-volume.operations"; @@ -88,7 +87,6 @@ export const projectDependencies: ProjectDependencies = { async get(ctx, id) { const service = await import("./project.service"); const project = await service.getProject(id, ctx.organizationId); - refreshProjectFaviconIfStale(project); return project; }, async update(ctx, id, input) { @@ -113,7 +111,6 @@ export const projectDependencies: ProjectDependencies = { }), }), }); - result.rows.forEach((row) => refreshProjectFaviconIfStale(row)); return { ...result, rows: result.rows.map((p) => ({ ...p, source: "local" })) }; }, recordAudit, diff --git a/packages/platform/src/projects.ts b/packages/platform/src/projects.ts index cacd7251c..4dede0846 100644 --- a/packages/platform/src/projects.ts +++ b/packages/platform/src/projects.ts @@ -1,4 +1,3 @@ -import { projectIconUrl } from "@repo/core"; import { AppError, CreateProjectBody, @@ -129,7 +128,6 @@ export interface ProjectDependencies { /** One public presentation for HTTP, native and remote project operations. */ export function presentProject(row: unknown): Project { const data = JSON.parse(JSON.stringify(row)) as Record; - if (data.iconUrl) data.favicon = projectIconUrl(data); delete data.cloneTokenEncrypted; delete data.webhookSecret; delete data.cloudPromotion; diff --git a/packages/platform/test/favicon-overrides.test.ts b/packages/platform/test/favicon-overrides.test.ts deleted file mode 100644 index 35aff4317..000000000 --- a/packages/platform/test/favicon-overrides.test.ts +++ /dev/null @@ -1,54 +0,0 @@ -import { beforeEach, expect, it, vi } from "vitest"; - -const h = vi.hoisted(() => ({ find: vi.fn(), cache: vi.fn(), fetch: vi.fn() })); -vi.mock("@repo/db", () => ({ - repos: { project: { findById: h.find, updateFaviconCache: h.cache } }, -})); -vi.mock("../src/engine/config/env", () => ({ env: { CLOUD_MODE: true } })); -vi.mock("../src/engine/lib/safe-fetch", () => ({ safeFetch: h.fetch })); -import { - detectAndStoreFavicon, - refreshProjectFaviconIfStale, -} from "../src/engine/lib/favicon-detector"; - -beforeEach(() => { - vi.resetAllMocks(); - h.cache.mockResolvedValue(undefined); - h.fetch.mockResolvedValue({ ok: true, headers: { "content-type": "image/png" } }); -}); - -it("does not schedule read-time discovery when an override exists", () => { - refreshProjectFaviconIfStale({ - id: "p", - activeDeploymentId: "d", - iconUrl: "https://cdn.example.test/custom.png", - }); - expect(h.find).not.toHaveBeenCalled(); - expect(h.fetch).not.toHaveBeenCalled(); -}); - -it("does not fetch either the deployed site or the custom URL after a deployment", async () => { - h.find.mockResolvedValue({ iconUrl: "https://cdn.example.test/custom.png" }); - await detectAndStoreFavicon("p", "https://app.example.test"); - expect(h.fetch).not.toHaveBeenCalled(); - expect(h.cache).not.toHaveBeenCalled(); -}); - -it("uses the existing protected discovery flow again after clearing the override", async () => { - h.find.mockResolvedValue({ iconUrl: null }); - await detectAndStoreFavicon("p", "https://app.example.test"); - expect(h.fetch).toHaveBeenCalledWith( - "https://app.example.test/favicon.ico", - expect.objectContaining({ allowPrivate: false, maxRedirects: 3 }), - ); - expect(h.cache).toHaveBeenCalledWith( - "p", - expect.objectContaining({ favicon: "https://app.example.test/favicon.ico" }), - ); -}); - -it("keeps discovery best-effort when the override lookup fails", async () => { - h.find.mockRejectedValueOnce(new Error("database unavailable")); - await expect(detectAndStoreFavicon("p", "https://app.example.test")).resolves.toBeUndefined(); - expect(h.fetch).not.toHaveBeenCalled(); -}); From 52b240422aa50efd5f55d29363f962c6604c2d96 Mon Sep 17 00:00:00 2001 From: Hydra Date: Sun, 15 Nov 2026 21:23:51 +0200 Subject: [PATCH 4/4] test: type legacy project group migration rows --- packages/db/src/migrate-chain.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/db/src/migrate-chain.test.ts b/packages/db/src/migrate-chain.test.ts index 187932de5..de5aaf92b 100644 --- a/packages/db/src/migrate-chain.test.ts +++ b/packages/db/src/migrate-chain.test.ts @@ -287,7 +287,7 @@ describe("migration chain applies to an existing, populated database", () => { ('inherited', 'org', 'group-icon', 'inherited', 'Inherited', 'inherited', NULL, NULL); `); const projects = (await client.query>("SELECT * FROM project ORDER BY id")).rows; - const groups = (await client.query("SELECT * FROM project_app ORDER BY id")).rows; + const groups = (await client.query>("SELECT * FROM project_app ORDER BY id")).rows; await migrate(db, { migrationsFolder: MIGRATIONS_DIR }); expect((await client.query("SELECT * FROM project ORDER BY id")).rows).toEqual( projects.map(({ favicon, favicon_checked_at: _, ...project }) => ({