GRI-2144: playlist page sub-list, Own time badge and Reset #331

Merged
vivy merged 4 commits from feature/GRI-2144-playlist-page-sublist-ui into dev 2026-11-18 22:20:17 +00:00
Member

Summary

Implements the two UI pieces pinned down on forge #278 (comment 14538), against the fail-first tests in PR #300:

  1. A document item's pages now show as an inline expand/collapse sub-list on the item's own row (the same aria-expanded interaction MediaLibraryScreen uses for its document groups), with a thumbnail (loading="lazy"), page number, own-time field and "Skip this page" inline per page row — no separate "⚙ Page overrides" button/panel.
  2. A page whose own time is set shows an "Own time" badge (gx-tag) and a Reset button; a page that inherits shows neither, and its field carries the inherited (file) time as a placeholder. Reset clears the override outright (falls back page → file → playlist → campus → global) — it does not restore a prior value.

Everything else in forge #278 (file time cascading to pages with no own value, a page override winning, resolution order page → item → playlist default) was already shipped and tested (GRI-1961/GRI-2010) — no change needed there.

No server changes: the file-level time field, page overrides and push-time resolution (expand_items, Playlist::duration_of) already existed and are already covered by crates/server/tests/playlist_integration.rs.

Test plan

  • frontend-web: scripts/local-gates.sh --frontend-only — prettier, oxlint, tsc, vitest (220 tests, including the two previously fail-first tests from PR #300), and the production build all pass.
  • Both tests added in PR #300 now pass with no further test changes.

CI verdict: fj ci

## Summary Implements the two UI pieces pinned down on forge #278 ([comment 14538](https://git.grimoirix.org/Grimoirix/grimoire-of-digital-signage/issues/278#issuecomment-14538)), against the fail-first tests in PR #300: 1. A document item's pages now show as an inline expand/collapse sub-list on the item's own row (the same `aria-expanded` interaction `MediaLibraryScreen` uses for its document groups), with a thumbnail (`loading="lazy"`), page number, own-time field and "Skip this page" inline per page row — no separate "⚙ Page overrides" button/panel. 2. A page whose own time is set shows an "Own time" badge (`gx-tag`) and a Reset button; a page that inherits shows neither, and its field carries the inherited (file) time as a placeholder. Reset clears the override outright (falls back page → file → playlist → campus → global) — it does not restore a prior value. Everything else in forge #278 (file time cascading to pages with no own value, a page override winning, resolution order page → item → playlist default) was already shipped and tested (GRI-1961/GRI-2010) — no change needed there. No server changes: the file-level time field, page overrides and push-time resolution (`expand_items`, `Playlist::duration_of`) already existed and are already covered by `crates/server/tests/playlist_integration.rs`. ## Test plan - [x] `frontend-web`: `scripts/local-gates.sh --frontend-only` — prettier, oxlint, tsc, vitest (220 tests, including the two previously fail-first tests from PR #300), and the production build all pass. - [x] Both tests added in PR #300 now pass with no further test changes. CI verdict: `fj ci`
GRI-2144: test playlist page sub-list, override badge and Reset
Some checks failed
CI / the pre-push hook (pull_request) Successful in 3s
CI / cargo fmt (pull_request) Successful in 3s
CI / install.sh client upgrade (pull_request) Successful in 12s
CI / cargo deny (pull_request) Successful in 15s
CI / cargo deny advisories (pull_request) Successful in 17s
CI / repository boundary (pull_request) Successful in 4s
CI / cargo clippy (pull_request) Successful in 1m2s
CI / frontend-web (pull_request) Failing after 46s
CI / cargo test (pull_request) Successful in 3m30s
CI / Notify gate failed (pull_request) Successful in 1s
CI / CI (pull_request) Failing after 1s
f95d73d251
Replaces the cogwheel/panel-based page-overrides test with the
expand/collapse sub-list the chief of staff specified on forge #278
(comment 14538), and adds coverage for the Own-time badge and Reset
control. Both new tests fail against current dev: the gated panel
and cogwheel button still exist, and there is no badge or Reset yet.
GRI-2144: playlist page sub-list with Own time badge and Reset
Some checks failed
CI / the pre-push hook (pull_request) Successful in 3s
CI / cargo fmt (pull_request) Successful in 3s
CI / install.sh client upgrade (pull_request) Successful in 13s
CI / cargo clippy (pull_request) Successful in 1m42s
CI / cargo deny (pull_request) Successful in 17s
CI / cargo deny advisories (pull_request) Successful in 26s
CI / frontend-web (pull_request) Failing after 1m14s
CI / repository boundary (pull_request) Successful in 6s
CI / cargo test (pull_request) Successful in 6m27s
CI / CI (pull_request) Failing after 2s
CI / Notify gate failed (pull_request) Successful in 2s
8d5aa61270
GRI-2144: retrigger CI after unrelated frontend-web flake (AddMediaScreen.test.tsx timeout, not touched by this branch)
All checks were successful
CI / the pre-push hook (pull_request) Successful in 3s
CI / cargo fmt (pull_request) Successful in 3s
CI / install.sh client upgrade (pull_request) Successful in 12s
CI / cargo deny (pull_request) Successful in 17s
CI / cargo deny advisories (pull_request) Successful in 20s
CI / repository boundary (pull_request) Successful in 6s
CI / cargo clippy (pull_request) Successful in 1m12s
CI / frontend-web (pull_request) Successful in 1m1s
CI / cargo test (pull_request) Successful in 3m24s
CI / Notify gate failed (pull_request) Has been skipped
CI / CI (pull_request) Successful in 1s
ed6e18ed17
vivy approved these changes 2026-11-18 22:20:14 +00:00
vivy left a comment

Approved. Inline expand/collapse sub-list, Own time badge + Reset, lazy thumbnails, tests from #300 included. Nit for a follow-up (not blocking): expandedIndices is keyed by row index, so after Move up/down or Remove the open state stays on the position, not on the item.

Approved. Inline expand/collapse sub-list, Own time badge + Reset, lazy thumbnails, tests from #300 included. Nit for a follow-up (not blocking): expandedIndices is keyed by row index, so after Move up/down or Remove the open state stays on the position, not on the item.
vivy merged commit 4481da030c into dev 2026-11-18 22:20:17 +00:00
vivy deleted branch feature/GRI-2144-playlist-page-sublist-ui 2026-11-18 22:20:17 +00:00
Sign in to join this conversation.
No reviewers
No milestone
No project
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference
Grimoirix/grimoire-of-digital-signage!331
No description provided.