diff --git a/messages/de.json b/messages/de.json index 79ab35aaa..aaaa96955 100644 --- a/messages/de.json +++ b/messages/de.json @@ -1390,6 +1390,14 @@ "saveSuccess": "Quellen-Priorität gespeichert.", "saveError": "Quellen-Priorität konnte nicht gespeichert werden.", "resetSuccess": "Quellen-Priorität zurückgesetzt.", + "perMetricToggle": "Pro Metrik anpassen ({count})", + "perMetricHelp": "Metriken mit individueller Reihenfolge. Über diese Liste lässt sich eine einzelne Metrik mit einem Klick auf den Standard zurücksetzen, ohne die anderen anzufassen.", + "perMetricEmpty": "Keine individuellen Anpassungen — jede Metrik nutzt die globale Reihenfolge oben.", + "resetMetric": "Zurücksetzen", + "deviceTypeToggle": "Geräte-Typ-Reihenfolge ({count})", + "deviceTypeHelp": "Innerhalb einer Quelle entscheidet die Geräte-Typ-Reihenfolge. Wenn Apple Watch und iPhone beide Schritte aufzeichnen, zählt der höher gereihte Geräte-Typ.", + "deviceTypeDefault": "Standard-Geräte-Typ-Reihenfolge", + "resetDeviceTypes": "Geräte-Typen zurücksetzen", "metrics": { "steps": "Schritte", "activeEnergy": "Aktive Energie", @@ -1411,6 +1419,15 @@ "APPLE_HEALTH": "Apple Health", "MANUAL": "Manuelle Eingabe", "IMPORT": "Import" + }, + "deviceLabels": { + "watch": "Uhr", + "band": "Fitnessband", + "ring": "Ring", + "phone": "Smartphone", + "scale": "Waage", + "other": "Sonstige", + "unknown": "Unbekannt" } }, "ai": { @@ -2712,6 +2729,13 @@ "timeShort": "{hours}:{minutes}", "dateTime": "{day}.{month}.{year}, {hours}:{minutes}" }, + "i18n": { + "maintainershipBanner": { + "notice": "Diese Übersetzung wird per KI gepflegt und kann ungenau sein.", + "cta": "Hilf mit auf GitHub", + "dismiss": "Schließen" + } + }, "classifications": { "bmi": { "Underweight": "Untergewicht", diff --git a/messages/en.json b/messages/en.json index e59a588d1..cf7e0260b 100644 --- a/messages/en.json +++ b/messages/en.json @@ -1390,6 +1390,14 @@ "saveSuccess": "Source priority saved.", "saveError": "Saving the source priority failed.", "resetSuccess": "Source priority reset to defaults.", + "perMetricToggle": "Per-metric overrides ({count})", + "perMetricHelp": "Metrics you have customised away from the default ladder. Use this list to roll any single metric back to its constant default without touching the rest.", + "perMetricEmpty": "No per-metric overrides set — every metric uses the global ladder above.", + "resetMetric": "Reset", + "deviceTypeToggle": "Device-type priority ({count})", + "deviceTypeHelp": "Within a source, which device wins. When an Apple Watch and an iPhone both record steps, the higher-ranked device-type counts as the canonical reading.", + "deviceTypeDefault": "Default device-type ladder", + "resetDeviceTypes": "Reset device-types", "metrics": { "steps": "Steps", "activeEnergy": "Active energy", @@ -1411,6 +1419,15 @@ "APPLE_HEALTH": "Apple Health", "MANUAL": "Manual entry", "IMPORT": "Import" + }, + "deviceLabels": { + "watch": "Watch", + "band": "Band", + "ring": "Ring", + "phone": "Phone", + "scale": "Scale", + "other": "Other", + "unknown": "Unknown" } }, "ai": { @@ -2712,6 +2729,13 @@ "timeShort": "{hours}:{minutes}", "dateTime": "{month}/{day}/{year}, {hours}:{minutes}" }, + "i18n": { + "maintainershipBanner": { + "notice": "This translation is AI-maintained and may contain inaccuracies.", + "cta": "Help out on GitHub", + "dismiss": "Dismiss" + } + }, "classifications": { "bmi": { "Underweight": "Underweight", diff --git a/src/components/settings/sources-section.tsx b/src/components/settings/sources-section.tsx index 8a000232d..9e643f980 100644 --- a/src/components/settings/sources-section.tsx +++ b/src/components/settings/sources-section.tsx @@ -15,24 +15,52 @@ * same daily total. The UI lands now so v1.5's Apple Health passthrough * drops onto a known foundation — every user's preferences carry * straight into iOS-era analytics without an extra migration step. + * + * v1.4.25 W8c — two-axis extension. The same screen now hosts three + * vertically-stacked sections (Marc no-split directive): + * 1. Global default ladder per metric class (existing). + * 2. Per-metric override expander — collapsed by default; an + * explicit knob for power users (the global ladder already lives + * above and most users never open this). + * 3. Device-type override expander — collapsed by default; one + * global ladder ("watch beats phone beats scale") with optional + * per-metric overrides. */ import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query"; -import { useState } from "react"; +import { useMemo, useState } from "react"; import { toast } from "sonner"; -import { ArrowDown, ArrowUp, Layers, Loader2, RotateCcw } from "lucide-react"; +import { + ArrowDown, + ArrowUp, + ChevronDown, + Layers, + Loader2, + RotateCcw, +} from "lucide-react"; import { Button } from "@/components/ui/button"; import { useTranslations } from "@/lib/i18n/context"; import { queryKeys } from "@/lib/query-keys"; import { + DEFAULT_DEVICE_TYPE_PRIORITY, DEFAULT_SOURCE_PRIORITY, + type DeviceType, + type DeviceTypePriority, + type MetricPriority, SOURCE_PRIORITY_METRIC_KEYS, - type SourcePriority, type SourcePriorityMetricKey, } from "@/lib/validations/source-priority"; -type ResolvedPriority = Required; +/** + * Resolved shape returned by `GET /api/auth/me/source-priority`. Mirrors + * `parseSourcePriority()`'s return: every metric ladder is defaulted, + * the two-axis containers are present (possibly empty). + */ +interface ResolvedPriority extends Required { + metricPriority: Required; + deviceTypePriority: DeviceTypePriority; +} const METRIC_LABEL_KEYS: Record = { steps: "settings.sections.sources.metrics.steps", @@ -59,6 +87,16 @@ const SOURCE_LABEL_KEYS: Record = { IMPORT: "settings.sections.sources.sourceLabels.IMPORT", }; +const DEVICE_TYPE_LABEL_KEYS: Record = { + watch: "settings.sections.sources.deviceLabels.watch", + band: "settings.sections.sources.deviceLabels.band", + ring: "settings.sections.sources.deviceLabels.ring", + phone: "settings.sections.sources.deviceLabels.phone", + scale: "settings.sections.sources.deviceLabels.scale", + other: "settings.sections.sources.deviceLabels.other", + unknown: "settings.sections.sources.deviceLabels.unknown", +}; + export function SourcesSection() { const { t } = useTranslations(); const queryClient = useQueryClient(); @@ -79,21 +117,32 @@ export function SourcesSection() { const [draft, setDraft] = useState(null); const priority = draft ?? remote ?? null; + const [showPerMetric, setShowPerMetric] = useState(false); + const [showDeviceType, setShowDeviceType] = useState(false); + const saveMutation = useMutation({ mutationFn: async (next: ResolvedPriority) => { + // PUT the W8c-canonical shape: nested `metricPriority` + + // `deviceTypePriority` together. The server's + // `parseSourcePriority` echoes the resolved shape back so the + // optimistic update is just a `setQueryData`. + const body = { + metricPriority: next.metricPriority, + deviceTypePriority: next.deviceTypePriority, + }; const res = await fetch("/api/auth/me/source-priority", { method: "PUT", headers: { "Content-Type": "application/json" }, - body: JSON.stringify(next), + body: JSON.stringify(body), }); if (!res.ok) throw new Error("save failed"); return (await res.json()).data as ResolvedPriority; }, onSuccess: (saved) => { queryClient.setQueryData(queryKeys.sourcePriority(), saved); - // The analytics aggregator folds source priority into the - // SLEEP_DURATION daily total — flush its cache so the chart - // re-paints with the new picker on the next mount. + // The analytics aggregator folds source priority into per-day + // canonical-row picks — flush its cache so the charts re-paint + // with the new picker on the next mount. queryClient.invalidateQueries({ queryKey: queryKeys.analytics() }); setDraft(null); toast.success(t("settings.sections.sources.saveSuccess")); @@ -103,13 +152,13 @@ export function SourcesSection() { const resetMutation = useMutation({ mutationFn: async () => { - // The PUT validator accepts an empty partial object too, but - // sending the full default keeps the round-trip body - // representative of "this is what should be active". + // Sending the empty W8c shape clears every per-user override; the + // server's `parseSourcePriority` then returns the constant + // defaults verbatim. Keeps the wire payload tiny. const res = await fetch("/api/auth/me/source-priority", { method: "PUT", headers: { "Content-Type": "application/json" }, - body: JSON.stringify(DEFAULT_SOURCE_PRIORITY), + body: JSON.stringify({}), }); if (!res.ok) throw new Error("reset failed"); return (await res.json()).data as ResolvedPriority; @@ -128,15 +177,87 @@ export function SourcesSection() { delta: -1 | 1, ) { if (!priority) return; - const list = [...(priority[metric] ?? DEFAULT_SOURCE_PRIORITY[metric])]; + const list = [ + ...(priority.metricPriority[metric] ?? DEFAULT_SOURCE_PRIORITY[metric]), + ]; const targetIdx = index + delta; if (targetIdx < 0 || targetIdx >= list.length) return; [list[index], list[targetIdx]] = [list[targetIdx], list[index]]; - setDraft({ ...priority, [metric]: list }); + const nextMetric = { ...priority.metricPriority, [metric]: list }; + setDraft({ + ...priority, + ...nextMetric, + metricPriority: nextMetric, + }); + } + + function moveDeviceType( + /** `__default__` for the global ladder, MeasurementType-enum string otherwise. */ + bucket: string, + index: number, + delta: -1 | 1, + ) { + if (!priority) return; + const current = bucket === "__default__" + ? priority.deviceTypePriority.default ?? [...DEFAULT_DEVICE_TYPE_PRIORITY] + : priority.deviceTypePriority[bucket] ?? [...DEFAULT_DEVICE_TYPE_PRIORITY]; + const list = [...current]; + const targetIdx = index + delta; + if (targetIdx < 0 || targetIdx >= list.length) return; + [list[index], list[targetIdx]] = [list[targetIdx], list[index]]; + + const nextDevicePriority: DeviceTypePriority = { ...priority.deviceTypePriority }; + if (bucket === "__default__") { + nextDevicePriority.default = list; + } else { + nextDevicePriority[bucket] = list; + } + setDraft({ ...priority, deviceTypePriority: nextDevicePriority }); + } + + function resetMetricToDefault(metric: SourcePriorityMetricKey) { + if (!priority) return; + const nextMetric: Required = { + ...priority.metricPriority, + [metric]: [...DEFAULT_SOURCE_PRIORITY[metric]], + }; + setDraft({ + ...priority, + ...nextMetric, + metricPriority: nextMetric, + }); + } + + function resetDeviceTypeAxis() { + if (!priority) return; + setDraft({ ...priority, deviceTypePriority: {} }); } const dirty = draft !== null && priority !== null; + // The per-metric expander shows every metric whose ladder has been + // overridden, plus a hint when none has. Counter lives next to the + // expander label so the section "asks" for attention proportional + // to its setting. + const overriddenMetrics = useMemo(() => { + if (!priority) return [] as SourcePriorityMetricKey[]; + return SOURCE_PRIORITY_METRIC_KEYS.filter((metric) => { + const list = priority.metricPriority[metric]; + const defaultList = DEFAULT_SOURCE_PRIORITY[metric]; + if (!list || list.length !== defaultList.length) return true; + return list.some((s, i) => s !== defaultList[i]); + }); + }, [priority]); + + // Count distinct overrides the user has set on the device-type axis. + // `default` counts as one if present; every per-metric override + // (`WEIGHT`, `ACTIVITY_STEPS`, …) counts as one more. The number drives + // the expander label so the section is self-explanatory at a glance. + const deviceTypeOverrideCount = useMemo(() => { + if (!priority) return 0; + return Object.keys(priority.deviceTypePriority).length; + }, [priority]); + return (
{SOURCE_PRIORITY_METRIC_KEYS.map((metric) => { - const list = priority[metric] ?? DEFAULT_SOURCE_PRIORITY[metric]; + const list = + priority.metricPriority[metric] ?? + DEFAULT_SOURCE_PRIORITY[metric]; return (
)} + {/* ── v1.4.25 W8c — per-metric override expander ── + Collapsed by default. The global ladder above already + covers every metric; this section lets a power user reset + a single metric back to the constant default in one click. */} + {priority && ( +
+ + {showPerMetric && ( +
+

+ {t("settings.sections.sources.perMetricHelp")} +

+ {overriddenMetrics.length === 0 ? ( +

+ {t("settings.sections.sources.perMetricEmpty")} +

+ ) : ( +
    + {overriddenMetrics.map((metric) => ( +
  • + + {t(METRIC_LABEL_KEYS[metric])} + + +
    • + ))} +
+ )} +
+ )} +
+ )} + + {/* ── v1.4.25 W8c — device-type override expander ── + One global ladder ("watch beats phone beats scale"). When + multiple device-types stream the same source's metric + (Apple Watch + iPhone → APPLE_HEALTH steps), the higher- + ranked device-type wins. Collapsed by default. */} + {priority && ( +
+ + {showDeviceType && ( +
+

+ {t("settings.sections.sources.deviceTypeHelp")} +

+
+ + {t("settings.sections.sources.deviceTypeDefault")} + + +
+
    + {( + priority.deviceTypePriority.default ?? + DEFAULT_DEVICE_TYPE_PRIORITY + ).map((deviceType, index, list) => ( +
  • + + {index + 1}. + + + {t(DEVICE_TYPE_LABEL_KEYS[deviceType])} + + + +
    • + ))} +
+
+ )} +
+ )} + {dirty && priority && (