trails/apps/journal/app/routes/sync.import.komoot.tsx
Ullrich Schäfer 8eba5b2d9e
fix(journal): centralize session-auth helpers + extract .server.ts siblings
Follow-up to PR #406 — addresses the two items deferred from the audit:

#7 — Centralize auth helpers
- New `requireSessionUser(request)` in lib/auth/session.server.ts that
  returns the user or throws a redirect to /auth/login.
- New `requireSessionUserJson(request)` companion that throws a 401 JSON
  response (for fetcher/JSON endpoints).
- Replace the repeated
    const user = await getSessionUser(request);
    if (!user) return redirect("/auth/login");
  pattern across 18 route loaders/actions. Removes the duplicated guard
  preamble and gives a single chokepoint to evolve later (e.g., for
  terms-version gating).

#8 — Extract heavy loaders into .server.ts siblings
- routes/home.tsx → home.server.ts (DB count query + listActivities +
  listRecentPublicActivities)
- routes/users.$username.tsx → users.$username.server.ts (user lookup +
  follow state + counts + listPublicRoutes/Activities + persona check)
- routes/settings.connections.tsx → settings.connections.server.ts
  (connected_services join + manifest merge)

Each route file shrinks to a thin delegator: `loader` calls
`loadXxx(request)`. The component module no longer transitively pulls
`getDb` and Drizzle schema into its import graph — Vite's tree-shake
already strips server-only code from the client bundle, but the
explicit `.server.ts` suffix makes that contract local and auditable.

Other 17 routes that mix loader/action with components are left as-is
for now: they're each small enough that the split adds churn without
buying much clarity. The pattern is documented by the three examples;
the rest can convert opportunistically when they grow.

Tests:
- lib/auth/session.server.test.ts (4 cases — redirect for missing
  cookie, redirect for ghost userId, success path, JSON 401 variant)

Full repo: pnpm typecheck, pnpm lint, pnpm test all green
(181 passed | 31 integration-gated skipped).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-24 10:44:33 +02:00

206 lines
7.2 KiB
TypeScript

// Komoot import page — shows live progress for background bulk imports
// and lets the user trigger a new import run.
import { useEffect, useRef } from "react";
import { data, redirect, useFetcher, useRevalidator } from "react-router";
import { useTranslation } from "react-i18next";
import type { Route } from "./+types/sync.import.komoot";
import { requireSessionUser } from "~/lib/auth/session.server";
import { getService } from "~/lib/connected-services";
import { getDb } from "~/lib/db";
import { importBatches } from "@trails-cool/db/schema/journal";
import { desc, eq, and } from "drizzle-orm";
export function meta() {
return [{ title: "Import from Komoot — trails.cool" }];
}
export async function loader({ request }: Route.LoaderArgs) {
const user = await requireSessionUser(request);
const service = await getService(user.id, "komoot");
if (!service) return redirect("/settings/connections/komoot");
const db = getDb();
const [batch] = await db
.select()
.from(importBatches)
.where(and(eq(importBatches.userId, user.id), eq(importBatches.connectionId, service.id)))
.orderBy(desc(importBatches.startedAt))
.limit(1);
return data({
batch: batch
? {
id: batch.id,
status: batch.status,
totalFound: batch.totalFound,
importedCount: batch.importedCount,
duplicateCount: batch.duplicateCount,
errorMessage: batch.errorMessage,
startedAt: batch.startedAt.toISOString(),
completedAt: batch.completedAt?.toISOString() ?? null,
}
: null,
});
}
export async function action({ request }: Route.ActionArgs) {
await requireSessionUser(request);
// Delegate to the API route — just redirect so the page reloads with
// the new batch after the POST.
const resp = await fetch(
new URL("/api/sync/komoot/import", new URL(request.url).origin),
{ method: "POST", headers: { cookie: request.headers.get("cookie") ?? "" } },
);
if (!resp.ok) {
const body = (await resp.json()) as { error?: string };
return data({ error: body.error ?? "failed" }, { status: resp.status });
}
return redirect("/sync/import/komoot");
}
function formatDuration(seconds: number): string {
const h = Math.floor(seconds / 3600);
const m = Math.floor((seconds % 3600) / 60);
if (h > 0) return `${h}h ${m}m`;
return `${m}m`;
}
export default function KomootImportPage({ loaderData }: Route.ComponentProps) {
const { batch } = loaderData;
const { t } = useTranslation("journal");
const revalidator = useRevalidator();
const triggerFetcher = useFetcher<{ error?: string }>();
const pollingRef = useRef<ReturnType<typeof setInterval> | null>(null);
const isActive = batch?.status === "pending" || batch?.status === "running";
useEffect(() => {
if (isActive) {
pollingRef.current = setInterval(() => {
revalidator.revalidate();
}, 2000);
}
return () => {
if (pollingRef.current) clearInterval(pollingRef.current);
};
}, [isActive]);
const elapsedSeconds = batch
? Math.floor(
(batch.completedAt
? new Date(batch.completedAt).getTime()
: Date.now()) - new Date(batch.startedAt).getTime(),
) / 1000
: 0;
return (
<div className="mx-auto max-w-2xl px-4 py-8">
<h1 className="text-2xl font-bold text-gray-900">
{t("sync.importFrom", { provider: "Komoot" })}
</h1>
<div className="mt-6 rounded-lg border border-gray-200 p-6">
{!batch && (
<div className="text-center">
<p className="text-gray-600">{t("komoot.import.noImportYet")}</p>
<triggerFetcher.Form method="post" className="mt-4">
<button
type="submit"
disabled={triggerFetcher.state !== "idle"}
className="rounded-md bg-blue-600 px-5 py-2 text-sm font-medium text-white hover:bg-blue-700 disabled:opacity-50"
>
{triggerFetcher.state !== "idle"
? t("komoot.import.starting")
: t("komoot.import.startImport")}
</button>
</triggerFetcher.Form>
</div>
)}
{batch && (
<div className="space-y-4">
<div className="flex items-center justify-between">
<StatusBadge status={batch.status} t={t} />
{(batch.status === "completed" || batch.status === "failed") && (
<triggerFetcher.Form method="post">
<button
type="submit"
disabled={triggerFetcher.state !== "idle"}
className="text-sm text-blue-600 hover:underline disabled:opacity-50"
>
{t("komoot.import.runAgain")}
</button>
</triggerFetcher.Form>
)}
</div>
{isActive && (
<div className="h-2 w-full overflow-hidden rounded-full bg-gray-100">
<div
className="h-2 rounded-full bg-blue-500 transition-all duration-500"
style={{
width: batch.totalFound > 0
? `${Math.round(((batch.importedCount + batch.duplicateCount) / batch.totalFound) * 100)}%`
: "5%",
}}
/>
</div>
)}
<dl className="grid grid-cols-3 gap-4 text-center">
<StatBox label={t("komoot.import.found")} value={batch.totalFound} />
<StatBox label={t("komoot.import.imported")} value={batch.importedCount} />
<StatBox label={t("komoot.import.skipped")} value={batch.duplicateCount} />
</dl>
{batch.status === "completed" && (
<p className="text-sm text-gray-500">
{t("komoot.import.completedIn", { duration: formatDuration(elapsedSeconds) })}
</p>
)}
{batch.status === "failed" && batch.errorMessage && (
<p className="rounded-md border border-red-200 bg-red-50 px-3 py-2 text-sm text-red-700">
{batch.errorMessage}
</p>
)}
</div>
)}
</div>
{batch?.status === "completed" && (
<p className="mt-4 text-center text-sm text-gray-500">
<a href={`/users/me`} className="text-blue-600 hover:underline">
{t("komoot.import.viewActivities")}
</a>
</p>
)}
</div>
);
}
function StatusBadge({ status, t }: { status: string; t: (k: string) => string }) {
const styles: Record<string, string> = {
pending: "bg-gray-100 text-gray-600",
running: "bg-blue-100 text-blue-700",
completed: "bg-green-100 text-green-700",
failed: "bg-red-100 text-red-700",
};
return (
<span className={`rounded-full px-3 py-1 text-sm font-medium ${styles[status] ?? styles.pending}`}>
{t(`komoot.import.status.${status}`)}
</span>
);
}
function StatBox({ label, value }: { label: string; value: number }) {
return (
<div className="rounded-md border border-gray-100 bg-gray-50 py-3">
<p className="text-2xl font-bold text-gray-900 tabular-nums">{value}</p>
<p className="mt-0.5 text-xs text-gray-500">{label}</p>
</div>
);
}