Files
sure/app/views/reports/index.html.erb
Guillem Arias Fauste 12785754c8 feat(design-system): split DS::Menu into strict action-list + new DS::Popover (#1850)
* feat(design-system): split DS::Menu into strict action-list + new DS::Popover for mixed content

Closes #1743.

DS::Menu used to absorb both action-list dropdowns (row context menus,
"more actions") AND mixed-content panels (user-account dropdown,
filter forms, picker pop-ups). The two shapes carry incompatible a11y
contracts:

- **Action list**: `role="menu"` container, `role="menuitem"` children,
  Up/Down arrow nav per WAI-ARIA APG.
- **Mixed content**: NO menu role — `role="menu"` restricts AT users
  to menuitem-only navigation and breaks any panel with forms,
  headings, or generic groupings.

This PR splits the component:

## DS::Menu (tightened)

Strict action-list primitive. Variants reduced to `:icon` and
`:button` (no `:avatar`). `custom_content` slot removed. Bakes in:

- `role="menu"` on the panel, `aria-haspopup="menu"` +
  `aria-expanded` + `aria-controls` on the trigger.
- `role="menuitem"` + `tabindex="-1"` on every DS::MenuItem; the
  controller installs roving tabindex (first item gets `tabindex="0"`
  when the menu opens) and handles ArrowUp/Down/Home/End +
  Escape + Enter/Space activation.
- `role="separator"` on the divider variant.
- Stable per-instance `menu-<8-char hex>` id so the trigger's
  `aria-controls` resolves correctly.

`DS::Menu.new(variant: :avatar, ...)` now raises ArgumentError
pointing at DS::Popover.

## DS::Popover (new)

Positioned panel for **mixed**, **non-action-list** content: account
menus, picker forms, filter forms, embedded controls. Slots: `button`,
`header`, `custom_content`. Variants: `:icon`, `:button`, `:avatar`.
NO `role="menu"` — the panel announces as a generic dialog-popup
(`aria-haspopup="dialog"`, `aria-expanded`, `aria-controls`).
Mirrors DS::Menu's floating-ui positioning + Escape/outside-click
lifecycle in its own Stimulus controller (`DS--popover`). Avatar
variant ships a focus ring + bumped touch target (44×44 via `w-11
h-11` per #1738).

## Migrated callsites (7 → DS::Popover)

- `app/views/users/_user_menu.html.erb` — avatar trigger + profile
  header + nav links (items kept as DS::MenuItem inside
  `custom_content` for visual parity)
- `app/views/categories/_menu.html.erb` — turbo-framed category picker
- `app/views/budgets/_budget_header.html.erb` — budget picker
- `app/views/reports/index.html.erb` — period picker
- `app/views/holdings/_cost_basis_cell.html.erb` — cost-basis edit form
- `app/views/transactions/searches/_form.html.erb` — filter form
- `app/components/UI/account/activity_feed.html.erb:70` — status
  checkboxes (the row-level "new" menu on line 9 stays as DS::Menu)

The other 33 DS::Menu callsites stay as-is — pure action lists.

Locale: `ds.popover.avatar_default_label` + `users.user_menu.aria_label`
keys added (en only; other locales handled in a separate i18n pass).

* fix(test): update sidebar user-menu selector for Menu→Popover migration

The user-menu now renders as `DS::Popover` (variant: :avatar) instead
of `DS::Menu` after the menu split, so its trigger carries
`data-DS--popover-target="button"` rather than the old
`data-DS--menu-target`. Update the sidebar-driven settings test helper
to match — every system test that drives Settings via the sidebar
gates on this selector.

* fix(review): DS::Popover/Menu trigger a11y + caller-attr preservation

- popover.rb / menu.rb: button slot now merges (not overwrites) caller-
  provided data and aria hashes, sets aria-haspopup/expanded/controls on
  the :button variant, defaults type="button" on block-rendered buttons.
- menu.rb / menu.html.erb: drop renders_one :header (strict-menu API
  shouldn't expose an arbitrary-markup escape hatch); preview updated.
- menu_controller.js: handle Enter/Space activation on focused menuitem
  so keyboard navigation matches the ARIA menu pattern.
- cost_basis_cell / transactions/searches/_menu: retarget cancel button
  data-action from DS--menu#close to DS--popover#close (host controller
  changed in the migration).

* fix: apply CodeRabbit auto-fixes

Fixed 1 file(s) based on 1 unresolved review comment.

Co-authored-by: CodeRabbit <noreply@coderabbit.ai>

* fix(review): MenuItem roving: false for DS::Popover usage

Codex P1 on #1850: \`DS::MenuItem\` hard-codes \`tabindex=\"-1\"\` and
\`role=\"menuitem\"\` for both link and button variants — correct
inside \`DS::Menu\` (which provides arrow-key roving and announces
\`role=\"menu\"\`), but breaks every \`DS::MenuItem\` rendered inside
\`DS::Popover\` (\`app/views/users/_user_menu.html.erb\`). Popover has
no roving handler, so Tab skips every item — Settings, Changelog,
Feedback, Contact, Log out become keyboard-unreachable.

Add a \`roving:\` keyword (default \`true\`) to \`DS::MenuItem\` that
gates both \`tabindex=\"-1\"\` and \`role=\"menuitem\"\`. \`DS::Menu\`
callers keep the default (roving menu semantics intact). Pass
\`roving: false\` from \`_user_menu.html.erb\` so user-menu items land
in the normal Tab order. Existing \`menu.with_item(...)\` callers in
the design system still default to \`true\`, so no behavior change for
\`DS::Menu\` consumers.

* fix(review): make menuitem_attrs authoritative on roving

CodeRabbit Major on #1850: \`merged_opts\` was splatted AFTER
\`menuitem_attrs\` in \`DS::MenuItem#wrapper\`, so a stray
\`role: :button\` or \`tabindex: 0\` from a \`menu.with_item(..., role: …)\`
caller could silently downgrade the \`DS::Menu\` ARIA contract that
\`menuitem_attrs\` enforces.

Strip \`:role\` and \`:tabindex\` from \`merged_opts\` whenever
\`roving\` is enabled, then splat \`menuitem_attrs\` last. When
\`roving: false\` (popover usage in \`_user_menu.html.erb\`) callers
keep full control — Tab order and explicit ARIA stay tunable by the
caller.

---------

Signed-off-by: Juan José Mata <juanjo.mata@gmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: CodeRabbit <noreply@coderabbit.ai>
Co-authored-by: Juan José Mata <juanjo.mata@gmail.com>
2026-05-20 18:30:25 +02:00

212 lines
9.3 KiB
Plaintext

<% content_for :page_header do %>
<div class="space-y-4 mb-6">
<header class="flex justify-between items-center text-primary font-medium gap-4">
<div class="space-y-1">
<h1 class="text-xl lg:text-3xl font-medium text-primary">
<%= t("reports.index.title") %>
</h1>
<p class="text-sm lg:text-base text-secondary">
<%= t("reports.index.subtitle") %>
</p>
</div>
<%# Flash messages %>
<% if flash[:alert].present? %>
<div class="p-3 rounded-lg bg-destructive-surface text-sm text-destructive">
<%= flash[:alert] %>
</div>
<% end %>
<%# Print Report Button %>
<%= link_to print_reports_path(period_type: @period_type, start_date: @start_date, end_date: @end_date),
target: "_blank",
rel: "noopener",
aria: { label: t("reports.index.print_report") },
class: "font-medium whitespace-nowrap inline-flex items-center gap-1 rounded-lg px-3 py-2 text-sm text-primary border border-secondary bg-transparent hover:bg-surface-hover" do %>
<%= icon("printer", size: "sm") %>
<span class="hidden sm:inline"><%= t("reports.index.print_report") %></span>
<% end %>
</header>
<%# Period Navigation Tabs %>
<div class="flex items-center justify-between gap-4">
<div class="flex items-center gap-2 overflow-x-auto no-scrollbar">
<%= render DS::Link.new(
text: t("reports.index.periods.monthly"),
variant: @period_type == :monthly ? "secondary" : "ghost",
href: reports_path(period_type: :monthly),
size: :sm
) %>
<%= render DS::Link.new(
text: t("reports.index.periods.quarterly"),
variant: @period_type == :quarterly ? "secondary" : "ghost",
href: reports_path(period_type: :quarterly),
size: :sm
) %>
<%= render DS::Link.new(
text: t("reports.index.periods.ytd"),
variant: @period_type == :ytd ? "secondary" : "ghost",
href: reports_path(period_type: :ytd),
size: :sm
) %>
<%= render DS::Link.new(
text: t("reports.index.periods.last_6_months"),
variant: @period_type == :last_6_months ? "secondary" : "ghost",
href: reports_path(period_type: :last_6_months),
size: :sm
) %>
<%= render DS::Link.new(
text: t("reports.index.periods.custom"),
variant: @period_type == :custom ? "secondary" : "ghost",
href: reports_path(period_type: :custom),
size: :sm
) %>
</div>
</div>
<%# Custom Date Range Picker (only shown when custom is selected) %>
<% if @period_type == :custom %>
<%= form_with url: reports_path, method: :get, data: { controller: "auto-submit-form" }, class: "flex items-center gap-3 bg-surface-inset p-3 rounded-lg" do |f| %>
<%= f.hidden_field :period_type, value: :custom %>
<div class="flex items-center gap-2">
<label class="text-sm font-medium text-secondary"><%= t("reports.index.date_range.from") %></label>
<%= f.date_field :start_date,
value: @start_date.strftime("%Y-%m-%d"),
data: { auto_submit_form_target: "auto" },
autocomplete: "off",
class: "px-3 py-1.5 border border-primary rounded-lg text-sm bg-container-inset text-primary" %>
</div>
<span class="text-secondary">—</span>
<div class="flex items-center gap-2">
<label class="text-sm font-medium text-secondary"><%= t("reports.index.date_range.to") %></label>
<%= f.date_field :end_date,
value: @end_date.strftime("%Y-%m-%d"),
data: { auto_submit_form_target: "auto" },
autocomplete: "off",
class: "px-3 py-1.5 border border-primary rounded-lg text-sm bg-container-inset text-primary" %>
</div>
<% end %>
<% end %>
<%# Period Display %>
<% if @nav %>
<div class="flex items-center gap-1 mb-4">
<div class="flex items-center gap-2">
<%= render DS::Link.new(
variant: "icon",
icon: "chevron-left",
href: reports_path(period_type: @period_type, start_date: @nav[:prev_start], end_date: @nav[:prev_end]),
aria: { label: t("reports.index.previous_period") },
) %>
<% if @nav[:at_latest] %>
<button disabled aria-label="<%= t('reports.index.next_period') %>" class="text-subdued inline-flex items-center justify-center w-9 h-9 rounded-lg cursor-not-allowed">
<%= icon("chevron-right", color: "current") %>
</button>
<% else %>
<%= render DS::Link.new(
variant: "icon",
icon: "chevron-right",
href: reports_path(period_type: @period_type, start_date: @nav[:next_start], end_date: @nav[:next_end]),
aria: { label: t("reports.index.next_period") },
) %>
<% end %>
</div>
<% if [:monthly, :quarterly, :ytd].include?(@period_type) %>
<%= render DS::Popover.new(variant: "button") do |popover| %>
<% popover.with_button class: "flex items-center gap-1 hover:bg-alpha-black-25 cursor-pointer rounded-md p-2" do %>
<span class="text-primary font-medium text-lg lg:text-base"><%= @nav[:label] %></span>
<%= icon("chevron-down") %>
<% end %>
<% popover.with_custom_content do %>
<%= render "reports/period_picker", period_type: @period_type, start_date: @start_date %>
<% end %>
<% end %>
<% else %>
<span class="text-primary font-medium text-lg lg:text-base"><%= @nav[:label] %></span>
<% end %>
<div class="ml-auto">
<%= render DS::Link.new(
text: t("reports.index.today"),
variant: "outline",
href: reports_path(period_type: @period_type),
) %>
</div>
</div>
<% end %>
</div>
<% end %>
<div class="w-full space-y-6 lg:pb-6">
<% if Current.family.transactions.any? %>
<%# Summary Dashboard - Always visible, not collapsible %>
<section>
<%= render partial: "reports/summary_dashboard", locals: {
metrics: @summary_metrics,
period_type: @period_type
} %>
</section>
<%# Collapsible & Reorderable Sections %>
<div data-controller="reports-sortable" data-action="dragover->reports-sortable#dragOver drop->reports-sortable#drop" role="list" aria-label="Reports sections">
<% @reports_sections.each do |section| %>
<% next unless section[:visible] %>
<section
class="bg-container rounded-xl shadow-border-xs transition-all mb-6 group focus:outline-none focus-visible:ring-2 focus-visible:ring-gray-900 focus-visible:ring-offset-2"
data-reports-sortable-target="section"
data-section-key="<%= section[:key] %>"
data-controller="reports-section"
data-reports-section-section-key-value="<%= section[:key] %>"
data-reports-section-collapsed-value="<%= Current.user.reports_section_collapsed?(section[:key]) %>"
draggable="true"
tabindex="0"
role="listitem"
aria-grabbed="false"
aria-label="<%= t(section[:title]) %> section. Press Enter or Space to grab for reordering, then use arrow keys to move."
data-action="
dragstart->reports-sortable#dragStart
dragend->reports-sortable#dragEnd
touchstart->reports-sortable#touchStart
touchmove->reports-sortable#touchMove
touchend->reports-sortable#touchEnd
keydown->reports-sortable#handleKeyDown">
<div class="px-4 py-2 flex items-center justify-between">
<div class="flex items-center gap-2">
<button
type="button"
class="text-secondary hover:text-primary transition-colors p-0.5"
data-action="click->reports-section#toggle keydown->reports-section#handleToggleKeydown"
data-reports-section-target="button"
aria-label="<%= t("reports.index.toggle_section") %>"
aria-expanded="<%= !Current.user.reports_section_collapsed?(section[:key]) %>">
<%= icon("chevron-down", size: "sm", class: "transition-transform", data: { reports_section_target: "chevron" }) %>
</button>
<h2 class="text-base font-medium">
<%= t(section[:title]) %>
</h2>
</div>
<button
type="button"
class="cursor-grab active:cursor-grabbing text-secondary hover:text-primary transition-colors p-0.5 opacity-0 group-hover:opacity-100"
aria-label="<%= t("reports.index.drag_to_reorder") %>">
<%= icon("grip-vertical", size: "sm") %>
</button>
</div>
<div class="p-4" data-reports-section-target="content">
<%= render partial: section[:partial], locals: section[:locals] %>
</div>
</section>
<% end %>
</div>
<% else %>
<%# Empty State %>
<section>
<%= render partial: "reports/empty_state" %>
</section>
<% end %>
</div>