Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Add version tile in control panel (#2355)
Luke Vellaf91e99b38160
diff --git a/apps/web/public/locales/en/app.json b/apps/web/public/locales/en/app.jsonindex 58bfbd693..c1d73da61 100644--- a/apps/web/public/locales/en/app.json+++ b/apps/web/public/locales/en/app.json@@ -627,5 +627,6 @@"customBrandingPromptDescription": "Get professional scheduling polls with your own logo and colors.","customBrandingPromptCta": "Set Up Now","dismiss": "Dismiss",- "new": "New"+ "new": "New",+ "updateAvailable": "Update available"}diff --git a/apps/web/src/app/[locale]/control-panel/page.tsx b/apps/web/src/app/[locale]/control-panel/page.tsxindex b22f42c4b..ef1676847 100644--- a/apps/web/src/app/[locale]/control-panel/page.tsx+++ b/apps/web/src/app/[locale]/control-panel/page.tsx@@ -21,6 +21,7 @@ import { DEFAULT_SEAT_LIMIT } from "@/features/licensing/constants";import { loadInstanceLicense } from "@/features/licensing/data";import { getUserCount } from "@/features/user/queries";import { Trans } from "@/i18n/client";+import { VersionTile } from "./version-tile";async function loadData() {const [userCount, license] = await Promise.all([@@ -135,6 +136,8 @@ export default async function AdminPage() {</TileTitle></Link></Tile>+ {/* VERSION */}+ <VersionTile /></TileGrid></div></SettingsPageContent>diff --git a/apps/web/src/app/[locale]/control-panel/version-tile.tsx b/apps/web/src/app/[locale]/control-panel/version-tile.tsxnew file mode 100644index 000000000..3daf3a6bb--- /dev/null+++ b/apps/web/src/app/[locale]/control-panel/version-tile.tsx@@ -0,0 +1,42 @@+"use client";++import { Tile, TileDescription, TileTitle } from "@rallly/ui/tile";+import { DownloadIcon } from "lucide-react";+import { PageIcon } from "@/app/components/page-icons";+import { Spinner } from "@/components/spinner";+import { Trans } from "@/i18n/client";+import { trpc } from "@/trpc/client";+import { appVersion } from "@/utils/constants";++const RELEASES_URL = "https://github.com/lukevella/rallly/releases";++export function VersionTile() {+ const { data, isFetching } = trpc.system.getUpdateStatus.useQuery(undefined, {+ staleTime: 60 * 60 * 1000,+ refetchOnWindowFocus: false,+ });++ return (+ <Tile asChild>+ <a+ href={data?.url ?? RELEASES_URL}+ target="_blank"+ rel="noreferrer noopener"+ >+ <PageIcon>+ <DownloadIcon />+ </PageIcon>+ <TileTitle>{`v${appVersion ?? "unknown"}`}</TileTitle>+ <TileDescription>+ {isFetching ? (+ <Spinner />+ ) : data ? (+ <span className="text-primary text-sm">+ <Trans i18nKey="updateAvailable" defaults="Update available" />+ </span>+ ) : null}+ </TileDescription>+ </a>+ </Tile>+ );+}diff --git a/apps/web/src/trpc/routers/index.ts b/apps/web/src/trpc/routers/index.tsindex 0e8c85aa6..a150b69ca 100644--- a/apps/web/src/trpc/routers/index.ts+++ b/apps/web/src/trpc/routers/index.ts@@ -9,6 +9,7 @@ import { dashboard } from "./dashboard";import { events } from "./events";import { polls } from "./polls";import { spaces } from "./spaces";+import { system } from "./system";import { user } from "./user";export const appRouter = mergeRouters(@@ -20,6 +21,7 @@ export const appRouter = mergeRouters(events,polls,spaces,+ system,user,calendars,}),diff --git a/apps/web/src/trpc/routers/system.ts b/apps/web/src/trpc/routers/system.tsnew file mode 100644index 000000000..392928b5e--- /dev/null+++ b/apps/web/src/trpc/routers/system.ts@@ -0,0 +1,80 @@+import { prisma } from "@rallly/database";+import * as z from "zod";+import { env } from "@/env";+import { createCache } from "@/lib/cache";+import { appVersion } from "@/utils/constants";+import { adminProcedure, router } from "../trpc";++const upstreamSchema = z.object({+ latest: z.string(),+ url: z.string(),+ publishedAt: z.string(),+});++type UpstreamPayload = z.infer<typeof upstreamSchema>;++const updatesCache = createCache<UpstreamPayload>({+ namespace: "system:updates",+ ttl: "1 h",+});++function normalizeVersion(version: string) {+ return version.replace(/^v/, "").split(/[-+]/)[0];+}++function isOutdated(current: string, latest: string) {+ const a = normalizeVersion(current)+ .split(".")+ .map((n) => Number(n) || 0);+ const b = normalizeVersion(latest)+ .split(".")+ .map((n) => Number(n) || 0);+ const len = Math.max(a.length, b.length);+ for (let i = 0; i < len; i++) {+ const ai = a[i] ?? 0;+ const bi = b[i] ?? 0;+ if (ai !== bi) return ai < bi;+ }+ return false;+}++async function fetchLatestRelease(+ instanceId: string,+): Promise<UpstreamPayload | null> {+ const cached = await updatesCache.get("latest");+ if (cached) return cached;++ if (!appVersion || !env.API_BASE_URL) return null;++ const url = new URL("/api/updates", env.API_BASE_URL);+ url.searchParams.set("version", appVersion);+ url.searchParams.set("instanceId", instanceId);++ try {+ const res = await fetch(url, { signal: AbortSignal.timeout(5000) });+ if (!res.ok) return null;+ const parsed = upstreamSchema.safeParse(await res.json());+ if (!parsed.success) return null;+ await updatesCache.set("latest", parsed.data);+ return parsed.data;+ } catch {+ return null;+ }+}++export const system = router({+ getUpdateStatus: adminProcedure.query(async () => {+ if (!appVersion || !env.API_BASE_URL) return null;++ const settings = await prisma.instanceSettings.findUnique({+ where: { id: 1 },+ select: { instanceId: true },+ });+ if (!settings) return null;++ const upstream = await fetchLatestRelease(settings.instanceId);+ if (!upstream) return null;+ if (!isOutdated(appVersion, upstream.latest)) return null;+ return upstream;+ }),+});