bvandeusenandClaude Opus 5
fa89da1fab
CI & Build / Build now, or wait for Android? (push) Successful in 3s
CI & Build / Python lint (push) Successful in 4s
CI & Build / TypeScript typecheck (push) Successful in 7s
CI & Build / Python tests (push) Successful in 14s
CI & Build / integration (push) Successful in 19s
CI & Build / Build & push image (push) Skipped
Desktop (Tauri) / Tauri desktop (Linux) (push) Failing after 2m28s
Desktop (Tauri) / Windows installer (cross-compiled) (push) Successful in 2m52s
Desktop (Tauri) / Update manifest (push) Skipped
Android / Kotlin + Rust (APK) (push) Failing after 4m1s
Step 3 of M315, and the destructive half. Steps 1 and 2 stopped every read of this field: a card is one neutral surface per theme, and the only coloured thing on a board is a tag. What was left was a column written by a picker and read by nothing. Rule 22 — the old path comes out completely. No flag, no fallback, no "override if set". Server: the column, the `?color=` facet, the create/update/serialise paths, the sync assignment, the front-matter line, and Keep's colour map. Alembic 0029 drops it and sweeps `"color"` out of stored saved-filter params — a view that silently filtered on a field the app no longer has would return nothing and never say why. That sweep is Python, not `params::jsonb - 'color'`, because Postgres has no try-cast and one malformed blob would abort a migration that is running over somebody's saved views. `NOTE_COLORS` moves from `models/note.py` to `colors.py`. A palette defined on the model that lost one is an invitation to put the column back; labels still name a colour, so the vocabulary belongs where the normalizer already is. Core: the field, the facet, the `NoteCreateInput`, and every read and write in store/push/pull. Local schema v9 drops the column and does the same saved-filter sweep, guarded on `json_valid` so a corrupt blob loses a key rather than becoming NULL. The uniffi layer drops `NoteEdit::Color` and `NoteDraft.color` with it. Web: `ColorPicker.vue`, the per-card swatch popover and its stylesheet rule, the FilterBar colour row, the facet in the query round-trip, and the colour half of the editor's baseline-and-save. Android: the `ColorSheet`, the `Picker.COLOR` case, the toolbar's swatch dot, `EditorAction.SetColor`. ## The protocol: v4, and the floor deliberately stays at 3 Checked against `compat.rs` and the push handler rather than trusting the `#[serde(default)]` annotation, because the v2 precedent points the other way: v2 dropped `kind` and `title` and DID raise both floors, on the rule that dropping a field a client sends and expects back is breaking. `color` fails the second half of that test. A v3 client reading a v4 note gets `"default"` from its own serde default and draws the colour it derives locally — the board it drew yesterday. A v3 client pushing `color` has the key ignored, since `_assign_note_fields` reads its payload key by key and never validates the shape. Neither direction errors and neither shows anything wrong. `title` was the note's NAME; this is a field that no longer renders. So `SYNC_PROTOCOL_VERSION` and `CLIENT_PROTOCOL_VERSION` go to 4, and both floors stay at 3. `docs/sync.md` carries the reasoning and the per-version history, and its push example is brought back in line — it still listed `title`, `kind` and `items`, all gone before this. Import stays tolerant: a pre-M315 export or a Keep takeout carrying `color:` imports fine, the key simply read past. Old exports must still import. #3041 Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
49 lines
1.7 KiB
TypeScript
49 lines
1.7 KiB
TypeScript
// Convert between the board's URL query and a NoteFacets object. The URL query IS the
|
|
// filter state (so a lens is shareable/bookmarkable and a saved view is just a link).
|
|
import type { LocationQuery, LocationQueryRaw } from "vue-router";
|
|
import type { NoteFacets } from "../stores/notes";
|
|
|
|
function one(v: LocationQuery[string]): string | undefined {
|
|
return (Array.isArray(v) ? v[0] : v) ?? undefined;
|
|
}
|
|
|
|
export function facetsFromQuery(q: LocationQuery): NoteFacets {
|
|
const rawLabel = q.label;
|
|
const labels = (Array.isArray(rawLabel) ? rawLabel : [rawLabel]).filter(
|
|
(x): x is string => typeof x === "string" && x.length > 0,
|
|
);
|
|
const f: NoteFacets = {};
|
|
const text = one(q.q);
|
|
if (text) f.q = text;
|
|
if (labels.length) f.label = labels;
|
|
if (one(q.has_reminder) === "true") f.has_reminder = true;
|
|
if (one(q.has_attachment) === "true") f.has_attachment = true;
|
|
const after = one(q.created_after);
|
|
if (after) f.created_after = after;
|
|
const before = one(q.created_before);
|
|
if (before) f.created_before = before;
|
|
return f;
|
|
}
|
|
|
|
export function facetsToQuery(f: NoteFacets): LocationQueryRaw {
|
|
const q: LocationQueryRaw = {};
|
|
if (f.q) q.q = f.q;
|
|
if (f.label?.length) q.label = f.label;
|
|
if (f.has_reminder) q.has_reminder = "true";
|
|
if (f.has_attachment) q.has_attachment = "true";
|
|
if (f.created_after) q.created_after = f.created_after;
|
|
if (f.created_before) q.created_before = f.created_before;
|
|
return q;
|
|
}
|
|
|
|
// How many facets are active (labels counted individually) — drives the "Filters (N)" badge.
|
|
export function facetCount(f: NoteFacets): number {
|
|
let n = 0;
|
|
if (f.q) n++;
|
|
n += f.label?.length ?? 0;
|
|
if (f.has_reminder) n++;
|
|
if (f.has_attachment) n++;
|
|
if (f.created_after || f.created_before) n++;
|
|
return n;
|
|
}
|