mirror of
https://github.com/MBombeck/HealthLog.git
synced 2026-11-15 23:12:04 +00:00
feat(concurrency): echo the base token from the prefs write clients and document it
Wire the notification-prefs cards, the module toggles, the coach-preferences save, and the two mood-tag manage cards to echo the optimistic-concurrency token they last read and to reload on a 409 instead of resaving over a newer change. Document the token and the 409 on the four write endpoints in the OpenAPI registry via the shared base-token field and conflict-response fragments.
This commit is contained in:
1 parent
8849f2cecd
commit
3f33a30415
12 files changed
+352
-44
No files matched your search
@@ -59,6 +59,12 @@ import {
|
||||
apiPost,
|
||||
apiPut,
|
||||
} from "@/lib/api/api-fetch";
|
||||
import {
|
||||
readUpdatedAtToken,
|
||||
withBaseToken,
|
||||
isConflict,
|
||||
} from "@/lib/api/optimistic-token";
|
||||
import { queryKeys } from "@/lib/query-keys";
|
||||
import { reorderById } from "@/lib/insights-layout-reorder";
|
||||
import { prefersReducedMotion } from "@/lib/charts/reduced-motion";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
@@ -72,6 +78,7 @@ import {
|
||||
snapshotManageCache,
|
||||
updateManageCache,
|
||||
type ManageCatalog,
|
||||
type MoodTagLayoutResolved,
|
||||
} from "./use-mood-tag-manage";
|
||||
|
||||
/**
|
||||
@@ -141,11 +148,31 @@ export function TagGroupsCard({ catalog }: TagGroupsCardProps) {
|
||||
reorderGroups(current, nextOrder),
|
||||
);
|
||||
try {
|
||||
await apiPut("/api/mood/tags/layout", { groupOrder: nextOrder });
|
||||
// v1.32.22 (R5b) — echo the base token this order was based on. The two
|
||||
// cards on this page write DIFFERENT fields of the same blob (group order
|
||||
// vs tag placements); a stale merge would resurrect the other card's
|
||||
// overwritten field, which the token now 409s instead. Seed the token
|
||||
// from the response so the next write on this surface is guarded too.
|
||||
const resolved = await apiPut<MoodTagLayoutResolved>(
|
||||
"/api/mood/tags/layout",
|
||||
withBaseToken(
|
||||
{ groupOrder: nextOrder },
|
||||
readUpdatedAtToken(queryClient, queryKeys.moodTagLayout()),
|
||||
),
|
||||
);
|
||||
queryClient.setQueryData(queryKeys.moodTagLayout(), resolved);
|
||||
toast.success(t("mood.manage.orderSaved"));
|
||||
return true;
|
||||
} catch (err) {
|
||||
rollback();
|
||||
if (isConflict(err)) {
|
||||
// Drop the stale token so a deliberate retry writes against the tree
|
||||
// the invalidation below reloads; nudge — the optimistic delta rolled
|
||||
// back and nothing was clobbered.
|
||||
queryClient.removeQueries({ queryKey: queryKeys.moodTagLayout() });
|
||||
toast.message(t("common.conflictReloaded"));
|
||||
return false;
|
||||
}
|
||||
toast.error(err instanceof ApiError ? err.message : t("common.error"));
|
||||
return false;
|
||||
} finally {
|
||||
|
||||
@@ -47,6 +47,12 @@ import {
|
||||
DropdownMenuTrigger,
|
||||
} from "@/components/ui/dropdown-menu";
|
||||
import { ApiError, apiPatch, apiPut } from "@/lib/api/api-fetch";
|
||||
import {
|
||||
readUpdatedAtToken,
|
||||
withBaseToken,
|
||||
isConflict,
|
||||
} from "@/lib/api/optimistic-token";
|
||||
import { queryKeys } from "@/lib/query-keys";
|
||||
import { reorderById } from "@/lib/insights-layout-reorder";
|
||||
import { prefersReducedMotion } from "@/lib/charts/reduced-motion";
|
||||
import { useTranslations } from "@/lib/i18n/context";
|
||||
@@ -65,6 +71,7 @@ import {
|
||||
type ManageCatalog,
|
||||
type ManageCategory,
|
||||
type ManageTag,
|
||||
type MoodTagLayoutResolved,
|
||||
} from "./use-mood-tag-manage";
|
||||
|
||||
/**
|
||||
@@ -139,13 +146,26 @@ export function TagManagerCard({ catalog }: TagManagerCardProps) {
|
||||
const rollback = await snapshotManageCache(queryClient);
|
||||
updateManageCache(queryClient, () => mergeBack(catalog, nextCatalog));
|
||||
try {
|
||||
await apiPut("/api/mood/tags/layout", {
|
||||
placements: buildVisiblePlacements(nextCatalog),
|
||||
});
|
||||
// v1.32.22 (R5b) — echo + seed the layout token (see `putGroupOrder` in
|
||||
// the groups card): the sibling group-order card writes the same blob, so
|
||||
// a stale placements merge is exactly the overwrite the token 409s.
|
||||
const resolved = await apiPut<MoodTagLayoutResolved>(
|
||||
"/api/mood/tags/layout",
|
||||
withBaseToken(
|
||||
{ placements: buildVisiblePlacements(nextCatalog) },
|
||||
readUpdatedAtToken(queryClient, queryKeys.moodTagLayout()),
|
||||
),
|
||||
);
|
||||
queryClient.setQueryData(queryKeys.moodTagLayout(), resolved);
|
||||
toast.success(t("mood.manage.orderSaved"));
|
||||
return true;
|
||||
} catch (err) {
|
||||
rollback();
|
||||
if (isConflict(err)) {
|
||||
queryClient.removeQueries({ queryKey: queryKeys.moodTagLayout() });
|
||||
toast.message(t("common.conflictReloaded"));
|
||||
return false;
|
||||
}
|
||||
toast.error(err instanceof ApiError ? err.message : t("common.error"));
|
||||
return false;
|
||||
} finally {
|
||||
@@ -237,12 +257,24 @@ export function TagManagerCard({ catalog }: TagManagerCardProps) {
|
||||
}
|
||||
// Both kinds pin the resulting per-group order in the layout blob
|
||||
// so the resolved tree matches what the user just saw happen.
|
||||
await apiPut("/api/mood/tags/layout", {
|
||||
placements: buildVisiblePlacements(moved),
|
||||
});
|
||||
// v1.32.22 (R5b) — echo + seed the layout token so a concurrent write to
|
||||
// the same blob 409s instead of clobbering.
|
||||
const resolved = await apiPut<MoodTagLayoutResolved>(
|
||||
"/api/mood/tags/layout",
|
||||
withBaseToken(
|
||||
{ placements: buildVisiblePlacements(moved) },
|
||||
readUpdatedAtToken(queryClient, queryKeys.moodTagLayout()),
|
||||
),
|
||||
);
|
||||
queryClient.setQueryData(queryKeys.moodTagLayout(), resolved);
|
||||
toast.success(t("common.saved"));
|
||||
} catch (err) {
|
||||
rollback();
|
||||
if (isConflict(err)) {
|
||||
queryClient.removeQueries({ queryKey: queryKeys.moodTagLayout() });
|
||||
toast.message(t("common.conflictReloaded"));
|
||||
return;
|
||||
}
|
||||
toast.error(err instanceof ApiError ? err.message : t("common.error"));
|
||||
} finally {
|
||||
void invalidateMoodTagCaches(queryClient);
|
||||
|
||||
@@ -62,6 +62,19 @@ export interface ManageCatalog {
|
||||
categories: ManageCategory[];
|
||||
}
|
||||
|
||||
/**
|
||||
* v1.32.22 (R5b) — the resolved `GET/PUT /api/mood/tags/layout` response.
|
||||
* `updatedAt` is the optimistic-concurrency token the two management cards
|
||||
* echo on their next write; no active query reads this key (it is only ever
|
||||
* invalidated), so the token is seeded straight from each write response into
|
||||
* `queryKeys.moodTagLayout()` and read back at mutate time.
|
||||
*/
|
||||
export interface MoodTagLayoutResolved {
|
||||
groupOrder: string[];
|
||||
placements: Record<string, string[]>;
|
||||
updatedAt?: string;
|
||||
}
|
||||
|
||||
export function useMoodTagManage(enabled: boolean) {
|
||||
return useQuery({
|
||||
queryKey: queryKeys.moodTagManage(),
|
||||
|
||||
Reference in new issue
Block a user