-
+
+
{prod.name}
@@ -130,11 +133,11 @@ export const ProductSwitcher: React.FC = ({
{prod.disabled ? (
In Private Beta
) : (
- {prod.description}
+ {prod.description}
)}
- {isSelected &&
}
+ {isSelected &&
}
);
})}
diff --git a/web/apps/dashboard/lib/collections/deploy/deployment-status.ts b/web/apps/dashboard/lib/collections/deploy/deployment-status.ts
new file mode 100644
index 0000000000..7d874168bf
--- /dev/null
+++ b/web/apps/dashboard/lib/collections/deploy/deployment-status.ts
@@ -0,0 +1,12 @@
+export const DEPLOYMENT_STATUSES = [
+ "pending",
+ "starting",
+ "building",
+ "deploying",
+ "network",
+ "finalizing",
+ "ready",
+ "failed",
+] as const;
+
+export type DeploymentStatus = (typeof DEPLOYMENT_STATUSES)[number];
diff --git a/web/apps/dashboard/lib/collections/deploy/deployments.ts b/web/apps/dashboard/lib/collections/deploy/deployments.ts
index 8386bdec9a..1b27f2b99d 100644
--- a/web/apps/dashboard/lib/collections/deploy/deployments.ts
+++ b/web/apps/dashboard/lib/collections/deploy/deployments.ts
@@ -4,6 +4,7 @@ import { queryCollectionOptions } from "@tanstack/query-db-collection";
import { createCollection } from "@tanstack/react-db";
import { z } from "zod";
import { queryClient, trpcClient } from "../client";
+import { DEPLOYMENT_STATUSES } from "./deployment-status";
import { parseProjectIdFromWhere, validateProjectIdInQuery } from "./utils";
const schema = z.object({
@@ -19,16 +20,7 @@ const schema = z.object({
// OpenAPI
hasOpenApiSpec: z.boolean(),
// Deployment status
- status: z.enum([
- "pending",
- "starting",
- "building",
- "deploying",
- "network",
- "finalizing",
- "ready",
- "failed",
- ]),
+ status: z.enum(DEPLOYMENT_STATUSES),
instances: z.array(
z.object({
id: z.string(),
diff --git a/web/apps/dashboard/lib/collections/index.ts b/web/apps/dashboard/lib/collections/index.ts
index 24578f2364..ab837ba23e 100644
--- a/web/apps/dashboard/lib/collections/index.ts
+++ b/web/apps/dashboard/lib/collections/index.ts
@@ -11,6 +11,8 @@ import { ratelimitOverrides } from "./ratelimit/overrides";
// Export types
export type { CustomDomain } from "./deploy/custom-domains";
+export type { DeploymentStatus } from "./deploy/deployment-status";
+export { DEPLOYMENT_STATUSES } from "./deploy/deployment-status";
export type { Deployment } from "./deploy/deployments";
export type { Domain } from "./deploy/domains";
export type { EnvVar } from "./deploy/env-vars";
diff --git a/web/apps/dashboard/lib/utils/metric-formatters.ts b/web/apps/dashboard/lib/utils/metric-formatters.ts
index 584930c178..daa43adf9b 100644
--- a/web/apps/dashboard/lib/utils/metric-formatters.ts
+++ b/web/apps/dashboard/lib/utils/metric-formatters.ts
@@ -6,6 +6,36 @@
* - 1-24h: shows "2.0h"
* - ≥1d: shows "1.2d"
*/
+/**
+ * Formats a duration in milliseconds as a compound string with up to 2 units.
+ * - <1000ms → "500ms"
+ * - 1s–59s → "45s"
+ * - 1m–59m → "2m 20s" (drops seconds if 0 → "2m")
+ * - 1h+ → "1h 15m" (drops minutes if 0 → "1h")
+ */
+export function formatCompoundDuration(ms: number): string {
+ if (ms < 1000) {
+ return `${Math.round(ms)}ms`;
+ }
+
+ const totalSeconds = Math.floor(ms / 1000);
+
+ if (totalSeconds < 60) {
+ return `${totalSeconds}s`;
+ }
+
+ const totalMinutes = Math.floor(totalSeconds / 60);
+
+ if (totalMinutes < 60) {
+ const remainingSeconds = totalSeconds % 60;
+ return remainingSeconds > 0 ? `${totalMinutes}m ${remainingSeconds}s` : `${totalMinutes}m`;
+ }
+
+ const hours = Math.floor(totalMinutes / 60);
+ const remainingMinutes = totalMinutes % 60;
+ return remainingMinutes > 0 ? `${hours}h ${remainingMinutes}m` : `${hours}h`;
+}
+
export function formatLatency(latency: number): string {
if (latency < 1000) {
return `${latency}ms`;