Bugs fixed: - FIT parser returns timestamps as Date objects, not strings — convert to ISO 8601 before passing to generateGpx (caused str.replace crash) - FIT parser already converts semicircles to degrees — remove redundant conversion that produced near-zero coordinates - Wahoo CDN URLs are pre-signed S3 URLs — remove Bearer auth header from download requests (caused 400 "Unsupported Authorization Type") - Filter out third-party workouts (fitness_app_id >= 1000) since Wahoo does not share their data via the API UX improvements: - Individual imports use fetcher (no page refresh), button shows "Importing..." inline - "Import all" button imports all unimported workouts on the page sequentially with progress indicator - Add @vitejs/plugin-basic-ssl for local HTTPS dev (opt-in via HTTPS=1) Also adds unit test for FIT-to-GPX conversion with real fixture file, and updates wahoo-import spec to reflect all behaviors. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
278 lines
9.7 KiB
TypeScript
278 lines
9.7 KiB
TypeScript
import { useCallback, useEffect, useRef, useState } from "react";
|
|
import { data, redirect, useFetcher } from "react-router";
|
|
import { useTranslation } from "react-i18next";
|
|
import type { Route } from "./+types/sync.import.$provider";
|
|
import { getSessionUser } from "~/lib/auth.server";
|
|
import { getProvider } from "~/lib/sync/registry";
|
|
import { getConnection, updateTokens } from "~/lib/sync/connections.server";
|
|
import { getImportedIds, recordImport } from "~/lib/sync/imports.server";
|
|
import { createActivity } from "~/lib/activities.server";
|
|
import { ClientDate } from "~/components/ClientDate";
|
|
|
|
export async function loader({ params, request }: Route.LoaderArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
|
|
const provider = getProvider(params.provider);
|
|
if (!provider) throw data({ error: "Unknown provider" }, { status: 404 });
|
|
|
|
const connection = await getConnection(user.id, provider.id);
|
|
if (!connection) return redirect("/settings");
|
|
|
|
const url = new URL(request.url);
|
|
const page = parseInt(url.searchParams.get("page") ?? "1");
|
|
|
|
// Refresh token if needed
|
|
let tokens = {
|
|
accessToken: connection.accessToken,
|
|
refreshToken: connection.refreshToken,
|
|
expiresAt: connection.expiresAt,
|
|
};
|
|
if (new Date() >= tokens.expiresAt) {
|
|
tokens = await provider.refreshToken(tokens.refreshToken);
|
|
await updateTokens(connection.id, tokens);
|
|
}
|
|
|
|
const workoutList = await provider.listWorkouts(tokens, page);
|
|
const importedIds = await getImportedIds(
|
|
user.id,
|
|
provider.id,
|
|
workoutList.workouts.map((w) => w.id),
|
|
);
|
|
|
|
return data({
|
|
provider: { id: provider.id, name: provider.name },
|
|
workouts: workoutList.workouts.map((w) => ({
|
|
...w,
|
|
imported: importedIds.has(w.id),
|
|
})),
|
|
page: workoutList.page,
|
|
totalPages: Math.ceil(workoutList.total / workoutList.perPage),
|
|
});
|
|
}
|
|
|
|
export async function action({ params, request }: Route.ActionArgs) {
|
|
const user = await getSessionUser(request);
|
|
if (!user) return redirect("/auth/login");
|
|
|
|
const provider = getProvider(params.provider);
|
|
if (!provider) throw data({ error: "Unknown provider" }, { status: 404 });
|
|
|
|
const connection = await getConnection(user.id, provider.id);
|
|
if (!connection) return redirect("/settings");
|
|
|
|
const formData = await request.formData();
|
|
const workoutId = formData.get("workoutId") as string;
|
|
const workoutName = formData.get("workoutName") as string;
|
|
const fileUrl = formData.get("fileUrl") as string;
|
|
|
|
// Refresh token if needed
|
|
let tokens = {
|
|
accessToken: connection.accessToken,
|
|
refreshToken: connection.refreshToken,
|
|
expiresAt: connection.expiresAt,
|
|
};
|
|
if (new Date() >= tokens.expiresAt) {
|
|
tokens = await provider.refreshToken(tokens.refreshToken);
|
|
await updateTokens(connection.id, tokens);
|
|
}
|
|
|
|
const workout = {
|
|
id: workoutId,
|
|
name: workoutName,
|
|
type: "",
|
|
startedAt: "",
|
|
duration: null,
|
|
distance: null,
|
|
fileUrl: fileUrl || undefined,
|
|
};
|
|
|
|
let gpx: string | null = null;
|
|
if (workout.fileUrl) {
|
|
const fileBuffer = await provider.downloadFile(tokens, workout);
|
|
gpx = await provider.convertToGpx(fileBuffer);
|
|
}
|
|
|
|
const activityId = await createActivity(user.id, {
|
|
name: workoutName || `${provider.name} workout`,
|
|
gpx: gpx ?? undefined,
|
|
});
|
|
|
|
await recordImport(user.id, provider.id, workoutId, activityId);
|
|
|
|
return data({ imported: workoutId });
|
|
}
|
|
|
|
export function meta({ data: loaderData }: Route.MetaArgs) {
|
|
const name = (loaderData as { provider: { name: string } })?.provider?.name ?? "Import";
|
|
return [{ title: `Import from ${name} — trails.cool` }];
|
|
}
|
|
|
|
function WorkoutRow({
|
|
workout,
|
|
provider,
|
|
alreadyImported,
|
|
}: {
|
|
workout: { id: string; name: string; fileUrl?: string; startedAt: string; distance: number | null; duration: number | null };
|
|
provider: { id: string; name: string };
|
|
alreadyImported: boolean;
|
|
}) {
|
|
const { t } = useTranslation("journal");
|
|
const fetcher = useFetcher<{ imported?: string }>();
|
|
const isImporting = fetcher.state !== "idle";
|
|
const isImported = alreadyImported || fetcher.data?.imported === workout.id;
|
|
|
|
return (
|
|
<li className="flex items-center justify-between rounded-lg border border-gray-200 p-4">
|
|
<div>
|
|
<div className="flex items-center gap-2">
|
|
<p className="font-medium text-gray-900">{workout.name}</p>
|
|
{!workout.fileUrl && (
|
|
<span
|
|
className="inline-flex items-center rounded-full bg-amber-50 px-2 py-0.5 text-xs font-medium text-amber-700"
|
|
title={t("sync.noGpsTooltip", { provider: provider.name })}
|
|
>
|
|
{t("sync.noGps")}
|
|
</span>
|
|
)}
|
|
</div>
|
|
<div className="mt-1 flex gap-3 text-sm text-gray-500">
|
|
{workout.startedAt && <ClientDate iso={workout.startedAt} />}
|
|
{workout.distance != null && <span>{(workout.distance / 1000).toFixed(1)} km</span>}
|
|
{workout.duration != null && <span>{Math.round(workout.duration / 60)} min</span>}
|
|
</div>
|
|
</div>
|
|
{isImported ? (
|
|
<span className="text-sm text-green-600">{t("sync.imported")}</span>
|
|
) : isImporting ? (
|
|
<span className="text-sm text-gray-400">{t("sync.importing")}</span>
|
|
) : (
|
|
<fetcher.Form method="post">
|
|
<input type="hidden" name="workoutId" value={workout.id} />
|
|
<input type="hidden" name="workoutName" value={workout.name} />
|
|
<input type="hidden" name="fileUrl" value={workout.fileUrl ?? ""} />
|
|
<button
|
|
type="submit"
|
|
className="rounded-md bg-blue-600 px-3 py-1.5 text-sm text-white hover:bg-blue-700"
|
|
>
|
|
{t("sync.import")}
|
|
</button>
|
|
</fetcher.Form>
|
|
)}
|
|
</li>
|
|
);
|
|
}
|
|
|
|
export default function SyncImportPage({ loaderData }: Route.ComponentProps) {
|
|
const { provider, workouts, page, totalPages } = loaderData;
|
|
const { t } = useTranslation("journal");
|
|
|
|
const importableWorkouts = workouts.filter((w) => !w.imported);
|
|
const [importAllActive, setImportAllActive] = useState(false);
|
|
const [importAllIndex, setImportAllIndex] = useState(0);
|
|
const importAllFetcher = useFetcher<{ imported?: string }>();
|
|
const importAllRef = useRef({ index: 0, workouts: importableWorkouts });
|
|
|
|
useEffect(() => {
|
|
importAllRef.current.workouts = importableWorkouts;
|
|
}, [importableWorkouts]);
|
|
|
|
useEffect(() => {
|
|
if (!importAllActive) return;
|
|
if (importAllFetcher.state !== "idle") return;
|
|
|
|
// Previous import finished — advance to next
|
|
const nextIndex = importAllFetcher.data ? importAllRef.current.index + 1 : importAllRef.current.index;
|
|
importAllRef.current.index = nextIndex;
|
|
setImportAllIndex(nextIndex);
|
|
|
|
if (nextIndex >= importAllRef.current.workouts.length) {
|
|
setImportAllActive(false);
|
|
return;
|
|
}
|
|
|
|
const w = importAllRef.current.workouts[nextIndex]!;
|
|
const formData = new FormData();
|
|
formData.set("workoutId", w.id);
|
|
formData.set("workoutName", w.name);
|
|
formData.set("fileUrl", w.fileUrl ?? "");
|
|
importAllFetcher.submit(formData, { method: "post" });
|
|
}, [importAllActive, importAllFetcher.state, importAllFetcher.data]);
|
|
|
|
const startImportAll = useCallback(() => {
|
|
if (importableWorkouts.length === 0) return;
|
|
importAllRef.current = { index: 0, workouts: importableWorkouts };
|
|
setImportAllIndex(0);
|
|
setImportAllActive(true);
|
|
|
|
const w = importableWorkouts[0]!;
|
|
const formData = new FormData();
|
|
formData.set("workoutId", w.id);
|
|
formData.set("workoutName", w.name);
|
|
formData.set("fileUrl", w.fileUrl ?? "");
|
|
importAllFetcher.submit(formData, { method: "post" });
|
|
}, [importableWorkouts, importAllFetcher]);
|
|
|
|
return (
|
|
<div className="mx-auto max-w-4xl px-4 py-8">
|
|
<div className="flex items-center justify-between">
|
|
<h1 className="text-2xl font-bold text-gray-900">
|
|
{t("sync.importFrom", { provider: provider.name })}
|
|
</h1>
|
|
{importableWorkouts.length > 0 && (
|
|
importAllActive ? (
|
|
<span className="text-sm text-gray-500">
|
|
{t("sync.importingProgress", { current: importAllIndex + 1, total: importAllRef.current.workouts.length })}
|
|
</span>
|
|
) : (
|
|
<button
|
|
onClick={startImportAll}
|
|
className="rounded-md border border-gray-300 px-3 py-1.5 text-sm text-gray-700 hover:bg-gray-50"
|
|
>
|
|
{t("sync.importAll", { count: importableWorkouts.length })}
|
|
</button>
|
|
)
|
|
)}
|
|
</div>
|
|
|
|
{workouts.length === 0 ? (
|
|
<p className="mt-8 text-center text-gray-500">{t("sync.noWorkouts")}</p>
|
|
) : (
|
|
<ul className="mt-6 space-y-3">
|
|
{workouts.map((w) => (
|
|
<WorkoutRow
|
|
key={w.id}
|
|
workout={w}
|
|
provider={provider}
|
|
alreadyImported={w.imported || importAllFetcher.data?.imported === w.id}
|
|
/>
|
|
))}
|
|
</ul>
|
|
)}
|
|
|
|
{totalPages > 1 && (
|
|
<div className="mt-6 flex justify-center gap-2">
|
|
{page > 1 && (
|
|
<a
|
|
href={`/sync/import/${provider.id}?page=${page - 1}`}
|
|
className="rounded border border-gray-300 px-3 py-1 text-sm hover:bg-gray-50"
|
|
>
|
|
{t("sync.previous")}
|
|
</a>
|
|
)}
|
|
<span className="px-3 py-1 text-sm text-gray-500">
|
|
{page} / {totalPages}
|
|
</span>
|
|
{page < totalPages && (
|
|
<a
|
|
href={`/sync/import/${provider.id}?page=${page + 1}`}
|
|
className="rounded border border-gray-300 px-3 py-1 text-sm hover:bg-gray-50"
|
|
>
|
|
{t("sync.next")}
|
|
</a>
|
|
)}
|
|
</div>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|