shopping: multi-list, DnD ordering, phone layout; fix flaky tests
Shopping lists:
- Multiple lists per tenant: picker uses checkboxes instead of
radios. Relay schema migrated to composite PK (tenant_id,
card_uid) with a position column for display ordering.
- Picker rows are drag-and-drop reorderable (grip handle +
accent drop indicator). Order persists in localStorage and is
pushed to the relay as position integers — phone renders lists
in that order (ORDER BY position, title).
- Each picker row has a goto-arrow that closes the popup,
switches to the card's bucket if needed, and opens the card.
- Relay DELETE /api/shopping removes deactivated lists. Client
proxy forwards DELETE. Deactivating a list in the picker
immediately removes it from the relay.
- Phone UI renders multiple lists as stacked boxes with headers.
Section headings (# h1–h6) get 14px top padding for breathing
room. CSS selectors fixed to match div-based headings inside
the new .shopping-list-box containers.
- Help text updated for multi-list wording.
- pullOne preserves the synced position so a pull doesn't cause
a spurious re-push of the same order.
Test fixes:
- Line-numbers gutter height tolerance bumped 50%→60% — OS text
shaping can push the divergence past 50%.
- Find/replace flaky: replaced sleep(200) with waitFor on the
confirm dialog so slow renders don't miss the OK click.
- Shopping picker test updated: checkboxes instead of radios.
Bumps to 1.9.25.
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
thandClaude Opus 4.6 committed
1 parent
4c3954d989
commit
be7eb1523e
12 files changed
+370
-192
No files matched your search
+30
-5
@@ -233,19 +233,44 @@ $db->exec('CREATE TABLE IF NOT EXISTS chat_room_members (
|
||||
)');
|
||||
$db->exec('CREATE INDEX IF NOT EXISTS idx_chat_room_member_tenant ON chat_room_members(tenant_id, room_uid)');
|
||||
|
||||
// Shopping list: one active card per tenant, body mirrored from the
|
||||
// client. Phone toggles checkboxes in-place via the session UI — no
|
||||
// multi-list fan-out, no history, no attachments. hyprcrd remains the
|
||||
// only surface that edits item text.
|
||||
// Shopping lists: multiple active cards per tenant, each mirrored from
|
||||
// the client. Phone toggles checkboxes in-place via the session UI.
|
||||
// hyprcrd remains the only surface that edits item text.
|
||||
$db->exec('CREATE TABLE IF NOT EXISTS shopping_state (
|
||||
tenant_id INTEGER PRIMARY KEY,
|
||||
tenant_id INTEGER NOT NULL,
|
||||
card_uid TEXT NOT NULL,
|
||||
title TEXT NOT NULL DEFAULT "",
|
||||
body TEXT NOT NULL DEFAULT "",
|
||||
position INTEGER NOT NULL DEFAULT 0,
|
||||
updated_at_client TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at_server TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (tenant_id, card_uid),
|
||||
FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE
|
||||
)');
|
||||
// Migrate from old single-PK schema (tenant_id only) to composite PK
|
||||
// + ensure position column exists (may be missing on tables created
|
||||
// before the multi-list update).
|
||||
$shoppingInfo = $db->query("PRAGMA table_info(shopping_state)")->fetchAll();
|
||||
$shoppingPk = array_filter($shoppingInfo, fn($c) => $c['pk'] > 0);
|
||||
$shoppingColNames = array_column($shoppingInfo, 'name');
|
||||
if (count($shoppingPk) === 1) {
|
||||
$db->exec('ALTER TABLE shopping_state RENAME TO _shopping_old');
|
||||
$db->exec('CREATE TABLE shopping_state (
|
||||
tenant_id INTEGER NOT NULL,
|
||||
card_uid TEXT NOT NULL,
|
||||
title TEXT NOT NULL DEFAULT "",
|
||||
body TEXT NOT NULL DEFAULT "",
|
||||
position INTEGER NOT NULL DEFAULT 0,
|
||||
updated_at_client TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
updated_at_server TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||
PRIMARY KEY (tenant_id, card_uid),
|
||||
FOREIGN KEY (tenant_id) REFERENCES tenants(id) ON DELETE CASCADE
|
||||
)');
|
||||
$db->exec('INSERT OR IGNORE INTO shopping_state (tenant_id, card_uid, title, body, updated_at_client, updated_at_server) SELECT tenant_id, card_uid, title, body, updated_at_client, updated_at_server FROM _shopping_old');
|
||||
$db->exec('DROP TABLE _shopping_old');
|
||||
} elseif (!in_array('position', $shoppingColNames)) {
|
||||
$db->exec('ALTER TABLE shopping_state ADD COLUMN position INTEGER NOT NULL DEFAULT 0');
|
||||
}
|
||||
|
||||
// Sync-event notifications: replaces the old bot-chat mechanism. When a
|
||||
// client syncs a card they received, they POST here; the sender polls
|
||||
|
||||
@@ -1,53 +1,50 @@
|
||||
<?php
|
||||
// Shopping-list routes:
|
||||
// POST /api/shopping (client) upsert active card {uid, title, body, updated_at}
|
||||
// GET /api/shopping (client + session) read current state
|
||||
// POST /api/shopping/check (session) toggle one line {line, checked}
|
||||
// GET /shopping (session) phone-friendly UI
|
||||
// POST /api/shopping (client) upsert one list {card_uid, title, body}
|
||||
// GET /api/shopping (client + session) all active lists for tenant
|
||||
// POST /api/shopping/check (session) toggle one line {card_uid, line, checked}
|
||||
// DELETE /api/shopping (client) remove a deactivated list {card_uid}
|
||||
//
|
||||
// Plaintext on purpose — shopping-list content is low-stakes and
|
||||
// everything here is session- or client-auth'd. No per-tenant key
|
||||
// dance like chat / collab-buckets. If that needs tightening later,
|
||||
// it's a one-table migration.
|
||||
// Multiple lists per tenant (composite PK: tenant_id + card_uid).
|
||||
// Plaintext on purpose — shopping-list content is low-stakes.
|
||||
|
||||
if (!defined('RELAY_BOOTSTRAPPED')) { http_response_code(404); exit; }
|
||||
|
||||
$clientTenant = $clientTenant ?? authClient($db);
|
||||
$tenant = $sessionTenant ?: $clientTenant;
|
||||
|
||||
function shoppingLoad(PDO $db, int $tenantId): ?array {
|
||||
$stmt = $db->prepare('SELECT card_uid, title, body, updated_at_client, updated_at_server FROM shopping_state WHERE tenant_id = :t');
|
||||
function shoppingLoadAll(PDO $db, int $tenantId): array {
|
||||
$stmt = $db->prepare('SELECT card_uid, title, body, position, updated_at_client, updated_at_server FROM shopping_state WHERE tenant_id = :t ORDER BY position, title');
|
||||
$stmt->execute(['t' => $tenantId]);
|
||||
return $stmt->fetchAll() ?: [];
|
||||
}
|
||||
|
||||
function shoppingLoadOne(PDO $db, int $tenantId, string $cardUid): ?array {
|
||||
$stmt = $db->prepare('SELECT card_uid, title, body, updated_at_client, updated_at_server FROM shopping_state WHERE tenant_id = :t AND card_uid = :u');
|
||||
$stmt->execute(['t' => $tenantId, 'u' => $cardUid]);
|
||||
$row = $stmt->fetch();
|
||||
return $row ?: null;
|
||||
}
|
||||
|
||||
// ── POST /api/shopping ────────────────────────────────────────
|
||||
// Client pushes the currently-active card's content. `updated_at`
|
||||
// is the client's timestamp — used for lose-the-race checks.
|
||||
|
||||
if ($route === '/api/shopping' && $method === 'POST') {
|
||||
if (!$clientTenant) jsonResponse(['error' => 'unauthorized'], 401);
|
||||
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||
$uid = trim((string)($input['card_uid'] ?? ''));
|
||||
$title = (string)($input['title'] ?? '');
|
||||
$body = (string)($input['body'] ?? '');
|
||||
$pos = (int)($input['position'] ?? 0);
|
||||
$clientTs = trim((string)($input['updated_at'] ?? '')) ?: gmdate('Y-m-d H:i:s');
|
||||
if ($uid === '') jsonResponse(['error' => 'card_uid required'], 400);
|
||||
|
||||
// No server-side staleness guard: the client decides whether to
|
||||
// push by diffing its last-synced body against the current card,
|
||||
// not by timestamp, so cross-timezone clock comparisons can't
|
||||
// silently block edits. Last-writer per tick wins — phone-toggle
|
||||
// races lose at most one tick of flips (rare by design).
|
||||
$now = gmdate('Y-m-d H:i:s');
|
||||
$db->prepare('
|
||||
INSERT INTO shopping_state (tenant_id, card_uid, title, body, updated_at_client, updated_at_server)
|
||||
VALUES (:t, :u, :ti, :b, :c, :s)
|
||||
ON CONFLICT(tenant_id) DO UPDATE SET
|
||||
card_uid = excluded.card_uid,
|
||||
INSERT INTO shopping_state (tenant_id, card_uid, title, body, position, updated_at_client, updated_at_server)
|
||||
VALUES (:t, :u, :ti, :b, :p, :c, :s)
|
||||
ON CONFLICT(tenant_id, card_uid) DO UPDATE SET
|
||||
title = excluded.title,
|
||||
body = excluded.body,
|
||||
position = excluded.position,
|
||||
updated_at_client = excluded.updated_at_client,
|
||||
updated_at_server = excluded.updated_at_server
|
||||
')->execute([
|
||||
@@ -55,39 +52,42 @@ if ($route === '/api/shopping' && $method === 'POST') {
|
||||
'u' => $uid,
|
||||
'ti' => $title,
|
||||
'b' => $body,
|
||||
'p' => $pos,
|
||||
'c' => $clientTs,
|
||||
's' => $now,
|
||||
]);
|
||||
jsonResponse(['ok' => true, 'stored' => true, 'updated_at_server' => $now]);
|
||||
}
|
||||
|
||||
// ── GET /api/shopping ────────────────────────────────────────
|
||||
// Both the client (to pull phone-made toggles back) and the
|
||||
// session-auth'd phone UI poll this.
|
||||
// ── DELETE /api/shopping ─────────────────────────────────────
|
||||
if ($route === '/api/shopping' && $method === 'DELETE') {
|
||||
if (!$clientTenant) jsonResponse(['error' => 'unauthorized'], 401);
|
||||
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||
$uid = trim((string)($input['card_uid'] ?? ''));
|
||||
if ($uid === '') jsonResponse(['error' => 'card_uid required'], 400);
|
||||
$db->prepare('DELETE FROM shopping_state WHERE tenant_id = :t AND card_uid = :u')
|
||||
->execute(['t' => $clientTenant['id'], 'u' => $uid]);
|
||||
jsonResponse(['ok' => true]);
|
||||
}
|
||||
|
||||
// ── GET /api/shopping ────────────────────────────────────────
|
||||
if ($route === '/api/shopping' && $method === 'GET') {
|
||||
if (!$tenant) jsonResponse(['error' => 'unauthorized'], 401);
|
||||
$state = shoppingLoad($db, (int)$tenant['id']);
|
||||
if (!$state) jsonResponse(['ok' => true, 'state' => null]);
|
||||
jsonResponse(['ok' => true, 'state' => $state]);
|
||||
$lists = shoppingLoadAll($db, (int)$tenant['id']);
|
||||
jsonResponse(['ok' => true, 'lists' => $lists]);
|
||||
}
|
||||
|
||||
// ── POST /api/shopping/check ─────────────────────────────────
|
||||
// Phone-side toggle. Body: { line: "- [ ] milk", checked: true }.
|
||||
// We match the exact line once to keep merges simple; if the line
|
||||
// isn't found (hyprcrd just rewrote it), the caller reloads and
|
||||
// retries. Bumps updated_at_server so the next client pull sees
|
||||
// the change.
|
||||
|
||||
if ($route === '/api/shopping/check' && $method === 'POST') {
|
||||
if (!$sessionTenant) jsonResponse(['error' => 'unauthorized'], 401);
|
||||
$input = json_decode(file_get_contents('php://input'), true) ?: [];
|
||||
$uid = trim((string)($input['card_uid'] ?? ''));
|
||||
$line = (string)($input['line'] ?? '');
|
||||
$checked = !empty($input['checked']);
|
||||
if ($line === '') jsonResponse(['error' => 'line required'], 400);
|
||||
if ($uid === '' || $line === '') jsonResponse(['error' => 'card_uid and line required'], 400);
|
||||
|
||||
$state = shoppingLoad($db, (int)$sessionTenant['id']);
|
||||
if (!$state) jsonResponse(['error' => 'no active list'], 404);
|
||||
$state = shoppingLoadOne($db, (int)$sessionTenant['id'], $uid);
|
||||
if (!$state) jsonResponse(['error' => 'list not found'], 404);
|
||||
$body = $state['body'];
|
||||
$lines = preg_split("/\r\n|\n|\r/", $body);
|
||||
$hit = false;
|
||||
@@ -96,7 +96,7 @@ if ($route === '/api/shopping/check' && $method === 'POST') {
|
||||
$toggled = $checked
|
||||
? preg_replace('/^(\s*-\s*)\[\s\]/', '$1[x]', $l, 1)
|
||||
: preg_replace('/^(\s*-\s*)\[[xX]\]/', '$1[ ]', $l, 1);
|
||||
if ($toggled === $l) continue; // not a checkbox line
|
||||
if ($toggled === $l) continue;
|
||||
$lines[$i] = $toggled;
|
||||
$hit = true;
|
||||
break;
|
||||
@@ -105,11 +105,7 @@ if ($route === '/api/shopping/check' && $method === 'POST') {
|
||||
|
||||
$newBody = implode("\n", $lines);
|
||||
$now = gmdate('Y-m-d H:i:s');
|
||||
$db->prepare('UPDATE shopping_state SET body = :b, updated_at_server = :s WHERE tenant_id = :t')
|
||||
->execute(['b' => $newBody, 's' => $now, 't' => $sessionTenant['id']]);
|
||||
$db->prepare('UPDATE shopping_state SET body = :b, updated_at_server = :s WHERE tenant_id = :t AND card_uid = :u')
|
||||
->execute(['b' => $newBody, 's' => $now, 't' => $sessionTenant['id'], 'u' => $uid]);
|
||||
jsonResponse(['ok' => true, 'updated_at_server' => $now]);
|
||||
}
|
||||
|
||||
// Shopping list lives inside the relay UI as a regular view (see
|
||||
// relay/ui/layout.php + app.js). No separate /shopping page — login
|
||||
// and navigation are the same as for every other relay feature.
|
||||
Reference in new issue
Block a user