diff --git a/.cursor/rules/projects/nucleos-eleitorais.mdc b/.cursor/rules/projects/nucleos-eleitorais.mdc index 392a197b..c2655834 100644 --- a/.cursor/rules/projects/nucleos-eleitorais.mdc +++ b/.cursor/rules/projects/nucleos-eleitorais.mdc @@ -7,6 +7,8 @@ alwaysApply: false ## Status +- **Correções e débitos pós-B16 (2026-07-25):** a revisão paralela achou três defeitos funcionais, **corrigidos na própria entrega**: as facetas omitiam só o param multi, então "Prioritária" escondia os não-prioritários do popover de Município e "Sem assessor" esvaziava o de Assessores (cada faceta passou a omitir o grupo do seu popover — `slugs`+`priority`, `advisors`+`coverage`, com int test); "todas as tendências" tinha duas codificações (as três marcadas deixavam `trend=` inútil na URL com o funil inativo — agora `parseMunicipalityListParams` canonicaliza o conjunto completo para ausente e `narrowingMunicipalityTrends` foi deletado); e o Território havia sumido do mobile ao virar multi (voltou como `MobileMultiFilterField` alimentado pela faceta, via novo prop `regionFilterOptions`). O `/simplify` da entrega (quality / performance / reuse em paralelo) aplicou o cleanup barato no próprio branch — setter único sobre params crus em `municipalityUi.ts` (fim de três casts e da escada de `if`), resumo de filtros de três funções para uma, remoção do array `municipalitySlugFilterOptions` (435 objetos que iam no bundle sem leitor), linha de opção única no Popover, facetas reusando o escopo já carregado e `getEligibleAdvisorOptions` de volta a coordenador-only. O que sobrou é maior que cleanup e virou o fill-in **B16+**: `useOptimistic` no lugar do par `{baseKey,next}` manual, payload dos rótulos de município (~20 KB por navegação) e hrefs do Popover a partir de uma base `URLSearchParams` em vez de duas serializações por opção — [`escala-dry-pos-b16.md`](../../../docs/plans/escala-dry-pos-b16.md). Adiados com gatilho no plano: gêmeo `MunicipalityFilterHead` (3º header com filtro), `ui/Command` no Popover (2º popover de busca), predicado de busca unificado, multi-seleção mobile honesta. Fora do `/campanha`: o `next build` inteiro morre quando o global `metadata` vem vazio (`/abaixo-assinado/[id]` chama `stripTrailingSlash` no `undefined`) — registrado em "Site público" no roadmap. +- **B16 entregue em código (2026-07-25):** filtros no header das colunas em `/campanha/municipios` — funil + Popover (`MunicipalityHeaderFilter`) ao lado do sort do B15, com multi-seleção OR em Território (`region`), Município (`slug`, com busca acento-insensível e o check "Prioritária" no mesmo popover), Assessores (`advisor`, que também hospeda o toggle com/sem assessor) e Tendência (`trend`); "Limpar" nos multi grandes; mobile mantém os selects empilhados. Header sticky resolvendo contra o scroller do `
` (sem scroller interno na tabela) e empty state que troca só as linhas de conteúdo — visão geral e linha de filtros continuam montadas, senão o usuário fica preso em zero resultados. Facetas cross-filtradas (as opções de um filtro respeitam os demais, mantendo o que já está selecionado visível) reaproveitando o escopo já carregado em `loadMunicipalityListFilterFacets`. A pedido do usuário, a coluna "Assessoria" saiu: a ordenação `coverage` passou para "Assessores", o filtro com/sem assessor virou opção do popover, e o alerta "sem responsável" do E9 (prioridade alta sem ninguém) migrou para a célula de assessores, onde antes só haveria um "Sem assessor" apagado. Plano: [`filtros-no-header-lista-municipios.md`](../../../docs/plans/filtros-no-header-lista-municipios.md). - **E16 entregue em código (2026-07-25):** Dossiê do município (pré-agenda) — aba `?tab=dossie` no detalhe (`MunicipalityDossier.tsx`, server component em Suspense) compondo os loaders existentes via `municipalityDossierData.ts` (baseline TSE + rank A11, conta da cadeira E8, pledges, rede de lideranças com frescor `updatedAt`, agenda `actionPlan` `overrideAccess: false`, sinais C12, perfil IBGE A8 com caveat para zonas — reentrada do artefato órfão); caps 8 lideranças / 5 sinais / 3+2 planos com "ver tudo" por seção; novo campo staff-only `municipality.budgetNotes` ("Emendas aportadas", G11 manual-first) via migration `20260725_022155_add_municipality_budget_notes` (o `.json` da migration também sara a cadeia de snapshots pós-`campaign_goals`); form de estratégia + zod + view model estendidos; **print CSS** (chrome `print:hidden`, shells `print:h-auto print:overflow-visible`, tipografia A4 em `styles.css`) — dossiê imprime 1–2 páginas com capa autocontida ("Gerado em"). Int test `municipalityDossierData.int.spec.ts` (mock do `unstable_cache` do baseline). Gate verde (tsc/lint/knip/363 tests/build); Aikido bloqueado por sessão expirada (re-login navegador pendente). Plano: [`dossie-municipio.md`](../../../docs/plans/dossie-municipio.md). - **E18 entregue em código (2026-07-24):** documentação de conceitos de inteligência — rota staff-only `/campanha/conceitos` (`isCampaignStaff`, `leader` redirecionado) renderizando `src/lib/campaignIntelligenceConcepts.ts`, conteúdo curado por PR ao lado das fórmulas que descreve (não collection Payload). 7 conceitos de E8 agrupados em base do cálculo (válidos projetados, teto do campo) / diagnóstico (captura, share intracampo, roll-off) / meta e cobertura (meta e meta sugerida, cobertura da meta), cada um com o que mede, fórmula em texto, exemplo estático, por que importa e onde aparece na tela. Superfície de leitura, não cards: `article` por conceito com hairline, coluna em `max-w-prose`, índice sticky só em `lg`, `article:target` tintado para orientar quem cai por âncora. Dois caminhos de descoberta: "Saiba mais" por métrica nos tooltips do card (`MetricExplanation` ganhou `conceptID`) e link para a página inteira no Popover `CampaignInfoHint` do título — o Popover é o caminho de **teclado**, porque conteúdo de Tooltip do Radix não é tabulável; para o toque funcionar, `MunicipalityHoverTooltip` passou a tratar o próprio conteúdo como "dentro" no dismiss por `pointerdown` (antes o link era desmontado antes do clique chegar). Entrada na sidebar a pedido do usuário na mesma sessão: `staffSecondaryNav` num `SidebarGroup mt-auto` colado no rodapé da navegação — fora da `staffNav` (os 7 destinos de trabalho) e fora da barra inferior do mobile, porque é referência e não lugar de trabalhar; `getCampaignSecondaryNav` devolve vazio para `leader`. Corrigido no caminho um defeito de E8: `formatElectionNumber` renderizava a meta sugerida fracionária como "100,968" (lida como cem mil) — agora `maximumFractionDigits: 0`. Sem migration, sem collection, sem server action. Cada fatia futura do programa (E9/E10/B13/E11/E12/E13/E14) acrescenta sua seção ao array. Plano: [`documentacao-conceitos-campanha.md`](../../../docs/plans/documentacao-conceitos-campanha.md). - **E9 entregue em código (2026-07-24):** fila de alocação na própria lista de municípios (sem rota nova, sem coluna nova, sem migration). **Fase 0 — correção do E8:** a meta sintética deixou de ser decomposição proporcional ao teto do campo (que dava 2.911 a Vitória da Conquista, de 5.005 votos em 2022, e 813 a Campo Formoso, de 47) e passou a ser ancorada na votação própria de 2022, por cenário — `deriveSuggestedGoalsByScenario` em [`municipalityPotential.ts`](../../../src/utilities/municipalityPotential.ts): pessimista = base×(1−`margin`), central = base ("repetir 2022"), otimista = base×(`stateGoal` ÷ Σ base), com clamp em `max(central, otimista)` quando `stateGoal` < Σ base; `goalCoverage.ts` passou a receber `SuggestedGoalByScenario` no lugar do escalar, deixando `expectedVotes[S] ?? suggestedGoal[S]` simétrico. `stateGoal`/`margin` do global `campaignGoals` mantêm papel de cálculo (fator 1,163 = "2022 mais 16%"; corte pessimista, fallback 10%) — só `admin.description` mudou, daí a ausência de migration. **Fase 1 — frescor e ordenações:** `declaredAt`/`estimatedAt` entraram no `select` do agregado de pledges (`lastPledgeAt`), `lastSignalAt = max(municipality.lastUpdateAt, lastPledgeAt)` no view model, e duas sort keys novas — `deficit` (**novo default do staff**, desc) e `frescor` (sinal mais frio primeiro, nunca-teve-sinal na frente), ambas derivadas em memória sobre o bundle já carregado, no cenário `central` fixo. **Fase 2 — UI (Impeccable B):** frescor dobrado na coluna "Última atualização" ("há N dias", frio a partir de 21 dias), badge "sem responsável" na célula de assessoria quando `priority === 'alta'` e zero assessores, "coluna da vergonha" como `detail` da métrica de assessoria linkando `?priority=alta&coverage=sem_assessor`, tooltip da célula de cobertura nomeando o cenário ativo, e correção de copy Praças→Municípios no overview. O `critique` trocou o tom do sinal frio de `text-destructive` para `text-estimate-pending-foreground`: com badge de prioridade e "sem responsável" na mesma linha, o vermelho perdia impacto. `/simplify` pós-entrega (validado por três revisores paralelos): consolidou o comparador "latest de dois ISO timestamps" (`resolveMunicipalityLastSignalAt`/`laterTimestamp` eram a mesma função escrita duas vezes) num `latestIsoTimestamp` compartilhado em `campaignTime.ts`; removeu o passthrough morto `baseTotal`/`growthFactor`/`belowBase` e renomeou `computeStatewideGoalDecomposition` → `computeStatewideSuggestedGoals` (nada mais é "decomposto" desde a Fase 0); unificou o badge de assessor duplicado entre tabela/card (tinham divergido em qual ícone renderiza); e consolidou três literais de "cenário zerado" num `zeroByVoteEstimateScenario()` em `voteEstimate.ts`. **Cortes registrados no plano:** votos em jogo → **B13**, LQ/captura → **E10**, coluna dedicada de déficit → desnecessária (a célula do E8 já mostra % + déficit assinado); `sanityCheckSuggestedGoalsByTerritory` permanece sem consumidor de produção (E11/E12). Verificação: tsc/lint/knip limpos, 337 unit + 366 int testes verdes, build verde; Aikido sem achado novo. Plano: [`fila-de-alocacao.md`](../../../docs/plans/fila-de-alocacao.md). @@ -17,7 +19,7 @@ alwaysApply: false - **Avaliação: reorder de colunas por DnD (2026-07-24):** pedido para arrastar headers em `/campanha/municipios` → **fora de escopo** (não confundir com **B17** hide/show). Tecnicamente possível (~1–1,5d), mas conflita com sort B15 + filtros B16 no mesmo header, anti spreadsheet do PRODUCT, e não desbloqueia decisão de alocação. Gatilho em [`reordenar-colunas-lista-municipios.md`](../../../docs/plans/reordenar-colunas-lista-municipios.md). - **B17 registrado (2026-07-24):** seletor **mostrar/ocultar** colunas em `/campanha/municipios` (desktop) — Popover + `localStorage`; `name` obrigatória; soft B15/B16; prepara viewport para E9. Distinto do reorder DnD (fora de escopo). Sem migration. Plano: [`seletor-colunas-lista-municipios.md`](../../../docs/plans/seletor-colunas-lista-municipios.md). - **A11 entregue em código (2026-07-24):** posição em votos (rank denso 435 + % da própria votação estadual) no `MunicipalityBaselineCard` e coluna/ordenação `?sort=votos` na lista (default desc; header=`2022`); helper puro [`municipalityVoteRank.ts`](../../../src/lib/municipalityVoteRank.ts); consome o contrato URL `sort`/`dir` de B15. Plano: [`ranking-votos-municipio.md`](../../../docs/plans/ranking-votos-municipio.md). -- **B16 registrado (2026-07-24):** filtros no header das colunas em `/campanha/municipios` — relocaciona params URL existentes (`region`/`kind`/`trend`/`coverage`/`priority`) para o `TableHead` ao lado do sort B15; barra slim (busca + Limpar [+ Cenário]); mobile mantém disclosure. Sem migration. Plano: [`filtros-no-header-lista-municipios.md`](../../../docs/plans/filtros-no-header-lista-municipios.md). +- **B16 registrado (2026-07-24; entregue 2026-07-25 — ver acima):** filtros no header das colunas em `/campanha/municipios` — relocaciona params URL existentes (`region`/`kind`/`trend`/`coverage`/`priority`) para o `TableHead` ao lado do sort B15; barra slim (busca + resumo + Limpar); mobile selects empilhados. Sem migration. Plano: [`filtros-no-header-lista-municipios.md`](../../../docs/plans/filtros-no-header-lista-municipios.md). - **E17 entregue em código (2026-07-24):** tabela comparativa dos 27 Territórios de Identidade no Início staff (`/campanha`) — `src/utilities/territoryOverview.ts` (rollup puro, client-safe: `computeTerritoryRollup` + `sortTerritoryRows`) + `src/utilities/loadTerritoryOverview.ts` (loader server-only, `overrideAccess: true` — leitura regional completa para advisor é contexto, não gestão; exposição só agregados TI-level) + `src/components/campaign/TerritoryOverviewTable.tsx` (tabela shadcn densa, ordenação client-side default `% da própria votação desc`, Metropolitano decomposto em Salvador 19 zonas × Demais RMS, linha→`/campanha/municipios?region=`). Somas/razões apenas (salvaguarda MAUP); sem migration/collection. Unit `territoryOverview.unit.spec.ts` (10 testes); tsc/lint/knip/unit 266/int 345/build verde; Aikido 0 findings. Plano: [`tabela-ti-inicio.md`](../../../docs/plans/tabela-ti-inicio.md). Primeira fatia de E12 (estende com captura/LQ/cobertura de meta por TI). - **B15 entregue (2026-07-24):** ordenar `/campanha/municipios` pelo header da coluna — contrato URL `?sort=`/`?dir=`, clique no header (desktop) + select mobile; A11 consome a key `votos`. Verificação (tsc/lint/test/build/Aikido) passou. `/simplify` concluído no mesmo dia: reduziu os comparadores de ordenação a um helper genérico, unificou os dois ramos `payload.find` nativo/derivado, moveu labels/opções de sort para `municipalityUi.ts`, simplificou o ícone de chevron e removeu o cast `as unknown` do mock de roteador nos testes. Plano: [`ordenacao-colunas-lista-municipios.md`](../../../docs/plans/ordenacao-colunas-lista-municipios.md). - **Fill-in registrado (2026-07-24):** seletor **Cenário** de `/campanha/municipios` → fileira de `MunicipalityFilters` (provider envolve filtros+resultados; overview sem seletor). Plano: [`cenario-junto-filtros-municipios.md`](../../../docs/plans/cenario-junto-filtros-municipios.md). diff --git a/.impeccable/critique/2026-07-25T02-37-03Z__src-components-campaign-municipalitylist-tsx.md b/.impeccable/critique/2026-07-25T02-37-03Z__src-components-campaign-municipalitylist-tsx.md new file mode 100644 index 00000000..6b81b4a9 --- /dev/null +++ b/.impeccable/critique/2026-07-25T02-37-03Z__src-components-campaign-municipalitylist-tsx.md @@ -0,0 +1,41 @@ +--- +target: B16 municipality header filters +total_score: 25 +p0_count: 0 +p1_count: 3 +timestamp: 2026-07-25T02-37-03Z +slug: src-components-campaign-municipalitylist-tsx +--- +# Critique — B16 Municipality Header Filters + +Method: dual-agent (A: 8cdcb249-95fe-4f3d-8937-081b10b442bc · B: c641769d-fc5c-4a83-9442-4329cff5cf96) + +## Design Health Score + +| # | Heuristic | Score | Key Issue | +|---|-----------|-------|-----------| +| 1 | Visibility of System Status | 2 | Control lag until RSC (fixed post-critique: optimistic) | +| 2 | Match System / Real World | 3 | Priority on Município column | +| 3 | User Control and Freedom | 3 | Limpar + Todos clear | +| 4 | Consistency and Standards | 2 | Header vs mobile select duality | +| 5 | Error Prevention | 3 | Constrained options | +| 6 | Recognition Rather Than Recall | 2 | Icon-only funnels (Priority now labeled) | +| 7 | Flexibility and Efficiency | 3 | Column-local filters | +| 8 | Aesthetic and Minimalist Design | 3 | Slim bar succeeds | +| 9 | Error Recovery | 2 | Limpar primary recovery | +| 10 | Help and Documentation | 2 | Filter meanings sparse | +| **Total** | | **25/40** | **Acceptable** | + +## Anti-Patterns Verdict + +Not AI slop. Detector: 0 findings. Browser: skipped (auth/DB). + +## Priority Issues (as found) + +- P1 optimistic control feedback — **fixed in polish** +- P1 Priority discoverability — **fixed: labeled "Prioridade" trigger** +- P1 Region wall — **fixed: search-within-popover when ≥8 options** +- P2 truncated summary — **mitigated: allow wrap** +- P2 Assessoria vs Cobertura — deferred (label already Assessoria) + +No P0. diff --git a/docs/plans/escala-dry-pos-b16.md b/docs/plans/escala-dry-pos-b16.md new file mode 100644 index 00000000..9220c184 --- /dev/null +++ b/docs/plans/escala-dry-pos-b16.md @@ -0,0 +1,110 @@ +# Escala e DRY pós-B16 (filtros no header da lista) + +Status: rascunho +Atualizado em: 2026-07-25 +Item do roadmap: [docs/roadmap.md](../roadmap.md) (B16+, fill-in de engenharia) +Impeccable: A — N/A (sem superfície UI nova; as fases preservam o comportamento visível de B16) +Appetite: ~0,5–1 dia eng; três fases independentes, nenhuma com migration +Responsável: — + +## Dados → decisão → apresentação + +- **Vou apresentar dados?** Não (N/A) — o lote é custo de render/transferência das opções de filtro já entregues em B16; nenhuma métrica nova. +- **Anti-goals de dado:** N/A. + +## Contexto + +**B16** ([filtros-no-header-lista-municipios.md](filtros-no-header-lista-municipios.md), entregue 2026-07-25) colocou um Popover de filtro em cada header da lista de municípios, com multi-seleção OR em município (435 opções), território, assessores e tendência. A passagem `/simplify` da entrega (três revisores em paralelo — quality / performance / reuse, 2026-07-25) aplicou o cleanup barato na hora e deixou três achados **maiores que cleanup**, registrados aqui. + +**Defeitos funcionais achados na revisão e corrigidos na entrega (não reabrir):** (1) as facetas omitiam só o param multi, então marcar "Prioritária" escondia todo município não-prioritário da lista onde o próprio check mora, e "Sem assessor" esvaziava o popover de Assessores — agora cada faceta omite o **grupo de params do seu popover** (`slugs`+`priority`, `advisors`+`coverage`), coberto por int test; (2) "todas as tendências" tinha duas codificações — selecionar as três deixava três `trend=` na URL filtrando nada, com o funil se declarando inativo — agora `parseMunicipalityListParams` canonicaliza o conjunto completo para ausente e `narrowingMunicipalityTrends` sumiu; (3) o Território tinha desaparecido do mobile (o filtro virou multi e o mobile só montava `single|toggle`), de volta como `MobileMultiFilterField` alimentado pela faceta. + +**Já resolvido no simplify (não reabrir):** setter único sobre params crus em `municipalityUi.ts` (elimina as duas escadas de `if` e os três casts `as BahiaIdentityTerritory[]` / `as PoliticalTrendStatus[]` / `as MunicipalityListState['coverage']`, além do `state.trends!`); cadeia de três funções do resumo de filtros colapsada com helper `firstNamesLabel`; remoção do array `municipalitySlugFilterOptions` (435 objetos montados no bundle do cliente e nunca lidos), do modo de seleção `'name'` e do campo `clearWhenOptionsAtLeast`; unificação das duas linhas de opção do Popover num `FilterOptionLink` com prop `checkbox`; `useEffect` de limpeza da busca dobrado no `onOpenChange`; dois `onClick={stopPropagation}` que não protegiam nada; memoização dos rótulos normalizados para busca; empty state da tabela navegando pela transição compartilhada e preservando `sort`/`dir`; `colSpan` derivado de uma constante junto do header; facets reusando o escopo já carregado na request (`loadMunicipalityScope` passou a selecionar `region`); `getEligibleAdvisorOptions` de volta a coordenador-only, com `loadAdvisorSummaries` rotulando o facet de assessores e as duas leituras em `Promise.all`; `allParamValues` sem o split por vírgula que nada emitia. + +## Objetivos + +- Um único mecanismo de estado otimista nos controles de filtro/sort, sem janela de reversão visível em cliques encadeados. +- Abrir o Popover de município (435 opções) sem custo de render proporcional a duas serializações de estado por opção. +- Parar de mandar ~20 KB de rótulos de município do servidor para o cliente a cada navegação da lista. +- Guardrails: sem migration, sem collection, sem `Consent`; contrato de URL (`?slug=`/`?region=`/`?advisor=`/`?trend=`) e comportamento visível de B16 inalterados. + +## Decisões travadas + +- **Um plano B16+, três fases independentes.** Mesmo precedente de `A9+`/`O0+`/`RS+`: um registro no roadmap, PR por fase, nenhuma fase bloqueia a outra. **Rejeitado:** um item de trilha B (não é feature, é custo herdado); três fill-ins separados (poluiria a lista para ~0,5d de trabalho). +- **Contrato de URL congelado.** As fases são internas ao render e ao payload; qualquer mudança em nome de param ou semântica de "todas as tendências = sem filtro" sai do escopo — **B18** (filtros salvos) já vai depender desse contrato. **Rejeitado:** aproveitar a Fase 2 para encurtar params (`?s=`), que quebraria URLs compartilhadas e o `resolveMunicipalityListUrl`. +- **i18n e naming** seguem o AGENTS.md: identificadores em inglês (`useOptimistic`, `buildMunicipalityFilterHref`, `municipalityFilterOptionsForSlugs`), strings visíveis em pt-BR. + +## Questões em aberto + +- **Fase 2: mandar slugs e rotular no cliente, ou só omitir quando o facet = catálogo inteiro?** **Opções:** (A) `columnFilterOptions.name` vira `string[]` e o Popover rotula com `municipalityNameBySlug` (já no bundle); (B) servidor manda `undefined` quando o facet cobre as 435 e o cliente cai no catálogo; (C) manter. **Recomendação:** A — corta o payload nos dois casos (filtrado e não filtrado) e mantém uma fonte de rótulo só; o custo é a assimetria de a coluna `name` receber valores enquanto `region`/`advisor` recebem pares. +- **Fase 3: `URLSearchParams` base + swap de um param, ou cap de lista?** **Opções:** (A) montar a base uma vez e trocar só o param da opção; (B) renderizar as primeiras N até a busca estreitar; (C) as duas. **Recomendação:** A — mantém a lista completa navegável por teclado/scroll (B muda UX sem pedido de campo) e é onde está o custo real (~870 parses por abertura). +- **Fase 1 vale o risco?** A janela de reversão só aparece em dois cliques antes de o servidor responder. **Recomendação:** fazer, mas com verificação manual do caso que originou o mecanismo atual (clicar em "Prioritária" e ver se não desmarca sozinha) antes de considerar pronta — foi exatamente o bug relatado em campo em 2026-07-25. + +## Abordagem proposta + +```mermaid +flowchart TD + B16["B16 ✓ Filtros no header"] --> F1 + F1["Fase 1 — useOptimistic
no Popover + onNavigate
dentro do startTransition"] + B16 --> F2["Fase 2 — payload dos rótulos
de município (slugs no lugar de pares)"] + B16 --> F3["Fase 3 — hrefs do Popover
a partir de uma base URLSearchParams"] + B16 --> F4["Fase 4 — faceta no mesmo Promise.all
+ DRY dos gêmeos de filtro"] + F1 -.se a config atrapalhar.-> F5["Fase 5 (condicional) — comportamento
na config de filtros ou params explícitos"] +``` + +Componentes: + +- **`src/components/campaign/MunicipalityHeaderFilter.tsx`** (Fase 1): trocar o par `{ baseKey, next }` em `useState` por `useOptimistic(state, (_, next: MunicipalityListState) => next)`. React descarta o valor otimista quando a transição de navegação assenta, o que apaga a comparação `optimistic?.baseKey === stateKey`. Precedente no código: `ActionPlanTaskChecklist.tsx`. +- **`src/components/campaign/CampaignListPending.tsx`** (Fase 1): mover `onNavigate?.()` para **dentro** do callback de `startTransition` — `useOptimistic` fora de transição dispara warning do React. O anchor é compartilhado (`MunicipalitySortableHead`, paginação, empty state), então a mudança precisa de smoke nas três superfícies. +- **`src/app/(campaign)/campanha/(app)/municipios/page.tsx` + `MunicipalityList.tsx`** (Fase 2): `columnFilterOptions.name` passa a carregar slugs; o Popover rotula com `municipalityFilterOptionsForSlugs` (já existe em `municipalityUi.ts`) no cliente. +- **`src/utilities/municipalityUi.ts`** (Fase 3): expor um builder que receba os params canônicos uma vez e devolva o href de cada opção trocando um único valor, em vez de `toggleMunicipalityMultiFilterValue` + `buildMunicipalityFilterHref` (duas voltas state→raw→parse) por opção renderizada. +- **`src/utilities/municipalityPageData.ts`** (Fase 4): hoje `loadMunicipalityListFilterFacets` é aguardado **depois** do `Promise.all` das leituras principais, então toda request com filtro ativo paga um round-trip serial a mais. A chave da semente sai de `where` de forma síncrona, então dá para passar a **promise** do escopo como semente e entrar no mesmo `Promise.all`. +- **DRY que caiu no mesmo lote** (Fase 4, tudo pequeno): `municipalitySlugSet`/`municipalityNameBySlug` refazem o que `isMunicipalitySlug`/`getMunicipalityCatalogEntry` já exportam em `municipalityCatalog.ts`; "limpar tudo preservando o sort" está escrito literalmente igual em `MunicipalityFilters.tsx` e `MunicipalityList.tsx` (vira `clearMunicipalityListFilters`); os selects mobile continuam lendo a verdade do servidor enquanto os popovers desktop já são otimistas — se a Fase 1 virar um hook, o mobile usa o mesmo. +- **Sem migration, sem collection, sem server action.** + +## Dependências + +- **B16 ✓** (entregue 2026-07-25) — este plano só existe sobre o que ele entregou. +- Suave com **B17** (seletor de colunas) e **B18** (filtros salvos): ambos pousam na mesma barra/header; fazer a Fase 1 antes evita replicar o mecanismo otimista atual num terceiro controle. +- Reusa `campaignListUrl.ts`, `municipalityUi.ts`, `campaignMunicipalityScope.ts`, `municipalityViewModels.ts`. + +## Não escopo + +- Qualquer mudança de UX dos filtros (novos params, chips, ordenação de opções) → **B17**/**B18** ou fill-in próprio. +- Unificar a busca do Popover com a busca da lista (`matchesAtWordStart` vs `includes`) → ver Adiado com gatilho. +- Resiliência do build do site público ao global `metadata` ausente → bullet próprio na seção "Site público" do roadmap (pai diferente; não entra neste lote). + +## Rabbit holes + +- **"Já que estou no Popover, uso `ui/Command`."** O componente existe (`src/components/ui/command.tsx`), mas trocar a lista por `Command` reescreve seleção, teclado e o modo checkbox de quatro filtros de uma vez. **Mitigação:** fora deste lote; ver gatilho abaixo. +- **"Aproveito para tornar a config de filtros realmente genérica."** `municipalityFilterDefinitions` hoje é genérica na forma e especializada em todo consumidor. Consertar de verdade significa mover comportamento (`toApplied(state, value)`) para a config e reescrever os dois consumidores. **Mitigação:** Fase 4 condicional — só se a Fase 1 esbarrar nela; senão, aceitar e documentar. +- **"Enquanto mexo no payload, mando o catálogo inteiro pro cliente e acabou."** Isso ressuscita os 435 objetos que o simplify acabou de remover do bundle. **Mitigação:** a Fase 2 manda **slugs do facet**, não o catálogo. + +## Adiado com gatilho + +- **`MunicipalityFilterHead` vs `MunicipalitySortableHead` (gêmeos).** Revisitar quando existir um **3º** header não-ordenável com filtro — hoje só "Assessores" justifica o par. +- **Popover sobre `ui/Command`.** Revisitar quando um **2º** Popover de busca com multi-seleção aparecer no produto (candidato: B17/B18). +- **Predicado de busca unificado (`includes` no Popover vs `matchesAtWordStart` na lista).** Revisitar se alguém em campo estranhar que buscar "cruz" no Popover casa "Santa Cruz" mas a busca da lista não se comporta igual. +- **Multi-seleção mobile honesta.** O ` setQuery(event.target.value)} + placeholder="Buscar…" + aria-label={`Buscar em ${definition.label}`} + className="min-h-11" + autoFocus + /> + + ) : null} + + + + + ) +} diff --git a/src/components/campaign/MunicipalityList.tsx b/src/components/campaign/MunicipalityList.tsx index 65779439..e54b8fdd 100644 --- a/src/components/campaign/MunicipalityList.tsx +++ b/src/components/campaign/MunicipalityList.tsx @@ -1,31 +1,40 @@ -import { CircleAlertIcon, CircleCheckIcon } from 'lucide-react' +import { CircleAlertIcon, SearchXIcon } from 'lucide-react' import Link from 'next/link' -import { MunicipalityAdvisorAvatarStack } from '@/components/campaign/MunicipalityAdvisorAvatarStack' +import { CampaignTransitionAnchor } from '@/components/campaign/CampaignListPending' +import { + MissingAdvisorBadge, + MunicipalityAdvisorAvatarStack, +} from '@/components/campaign/MunicipalityAdvisorAvatarStack' import { MunicipalityListAdvisorsControl } from '@/components/campaign/MunicipalityListAdvisorsControl' import { MunicipalityListExpectedVotesControl } from '@/components/campaign/MunicipalityListExpectedVotesControl' import { MunicipalityListGoalCoverageCell } from '@/components/campaign/MunicipalityListGoalCoverageCell' import { MunicipalityListTrendControl } from '@/components/campaign/MunicipalityListTrendControl' import { MunicipalitySortableHead } from '@/components/campaign/MunicipalitySortableHead' import { Badge } from '@/components/ui/Badge' -import { Button } from '@/components/ui/button' +import { Button, buttonVariants } from '@/components/ui/button' +import { + Empty, + EmptyContent, + EmptyDescription, + EmptyHeader, + EmptyMedia, + EmptyTitle, +} from '@/components/ui/Empty' import { Table, TableBody, TableCaption, TableCell, - TableHead, TableHeader, TableRow, } from '@/components/ui/Table' import { formatElectionNumber } from '@/lib/electionInsights' -import { - formatMunicipalityVoteRank, - formatMunicipalityVoteShare, -} from '@/lib/municipalityVoteRank' +import { formatMunicipalityVoteRank, formatMunicipalityVoteShare } from '@/lib/municipalityVoteRank' import { cn } from '@/lib/utils' import type { CampaignFormActionState } from '@/utilities/campaignFormActionError' import { + buildMunicipalityListHref, formatMunicipalityConcentrationHint, formatMunicipalityGeographyLabel, formatMunicipalityListSortSummary, @@ -33,10 +42,10 @@ import { isMunicipalitySignalCold, MUNICIPALITY_COLD_SIGNAL_DAYS, municipalityKindLabels, - municipalityListCoverageLabels, municipalityPriorityLabels, municipalitySignalAgeInDays, resolveMunicipalityListSort, + type MunicipalityFilterOption, type MunicipalityListState, } from '@/utilities/municipalityUi' import type { @@ -57,12 +66,19 @@ type MunicipalityStaffFormAction = ( formData: FormData, ) => Promise +type MunicipalityColumnFilterOptions = { + name: MunicipalityFilterOption[] + region: MunicipalityFilterOption[] + advisor: MunicipalityFilterOption[] +} + export type MunicipalityListProps = { municipalities: MunicipalityListViewModel[] advisorNamesById: ReadonlyMap isStaffView: boolean isCoordinator: boolean advisorOptions: EligibleAdvisorOption[] + columnFilterOptions: MunicipalityColumnFilterOptions trendFormAction: MunicipalityStaffFormAction advisorsFormAction: MunicipalityStaffFormAction state: MunicipalityListState @@ -102,8 +118,8 @@ const VotePositionReadout = ({ * most municípios are past the 21-day threshold, and painting them all red * would drown the one state that really is an error in this list — a priority * município with nobody answering for it. Same reason it stays text with an - * icon instead of a third badge: the row already carries the priority and - * assessoria pills. + * icon instead of a third badge: the row already carries the priority pill and, + * when it applies, the missing-advisor one. */ const SignalAgeReadout = ({ lastSignalAt, @@ -143,30 +159,31 @@ const SignalAgeReadout = ({ ) } -/** - * E9: a priority município with nobody answering for it is the queue's - * loudest row, so it reads "Sem responsável" in destructive — the same words - * the overview's coluna da vergonha uses to count them. Non-priority ones - * keep the softer pending tone: they are a gap, not a fire. - */ -const AdvisorStatusBadge = ({ municipality }: { municipality: MunicipalityListViewModel }) => { - if (municipality.advisorIDs.length > 0) { - return ( - - - ) - } - - const isPriority = municipality.priority === 'alta' - return ( - - - ) -} +/** Replaces only the rows: the filter header row and the overview stay put. */ +const MunicipalityListEmptyState = ({ state }: { state: MunicipalityListState }) => ( + + + + + Nenhum município encontrado + + Ajuste a busca ou os filtros. Você só vê municípios dentro do seu escopo. + + + + {/* Same contract as the filter bar's Limpar: drop filters, keep the sort. */} + + Limpar busca e filtros + + + +) const advisorEntries = ( municipality: MunicipalityListViewModel, @@ -188,6 +205,7 @@ export const MunicipalityList = ({ isStaffView, isCoordinator, advisorOptions, + columnFilterOptions, trendFormAction, advisorsFormAction, state, @@ -199,6 +217,8 @@ export const MunicipalityList = ({ // The scenario picker is client state, so the server can only order by one // scenario — named here so the ordering never looks arbitrary. const deficitHint = `Ordena pelo que falta para a meta (meta − comprometido) no cenário ${voteEstimateScenarioLabels[DEFAULT_VOTE_ESTIMATE_SCENARIO]}, independente do cenário selecionado acima.` + // Keep in sync with the header row below. + const columnCount = isStaffView ? 9 : 5 return ( <> @@ -207,9 +227,11 @@ export const MunicipalityList = ({

+ {municipalities.length === 0 ? : null} {municipalities.map((municipality) => { const names = advisorNames(municipality, advisorNamesById) const position = municipality.votePosition2022 + const isPriority = municipality.priority === 'alta' return (
@@ -220,7 +242,7 @@ export const MunicipalityList = ({

{position ? : null}
- {municipality.priority === 'alta' && isStaffView ? ( + {isPriority && isStaffView ? ( {municipalityPriorityLabels.alta} ) : null}
@@ -263,13 +285,14 @@ export const MunicipalityList = ({
-
Assessoria
+
Assessores
{isCoordinator ? ( + )}
@@ -291,20 +314,34 @@ export const MunicipalityList = ({ })} -
- + {/* No inner scroller: the app shell's
scrolls, so the sticky header + resolves against it. A sticky
can't paint the row border, hence the + inset shadow standing in for it. */} +
+ {sortSummary}. Coluna 2022: {concentrationHint} - + - + Município - - Território de identidade + + Território - + Tipo {isStaffView ? ( <> - Assessores - + + Assessores + + Tendência @@ -329,9 +373,6 @@ export const MunicipalityList = ({ > Último sinal - - Assessoria - + {municipalities.length === 0 ? ( + + + + + + ) : null} {municipalities.map((municipality) => { + const isPriority = municipality.priority === 'alta' return ( @@ -359,7 +408,7 @@ export const MunicipalityList = ({ > {municipality.name} - {municipality.priority === 'alta' && isStaffView ? ( + {isPriority && isStaffView ? ( {municipalityPriorityLabels.alta} ) : null} @@ -386,6 +435,7 @@ export const MunicipalityList = ({ municipalityID={municipality.id} municipalitySlug={municipality.slug} currentAdvisorIDs={municipality.advisorIDs} + isPriority={isPriority} advisorNamesById={advisorNamesById} options={advisorOptions} formAction={advisorsFormAction} @@ -393,6 +443,7 @@ export const MunicipalityList = ({ ) : ( )} @@ -420,9 +471,6 @@ export const MunicipalityList = ({ layout="table" /> - - - options: EligibleAdvisorOption[] formAction: ( @@ -29,6 +31,7 @@ export const MunicipalityListAdvisorsControl = ({ municipalityID, municipalitySlug, currentAdvisorIDs, + isPriority, advisorNamesById, options, formAction, @@ -56,11 +59,7 @@ export const MunicipalityListAdvisorsControl = ({ className="min-h-11 rounded-md px-1 hover:bg-muted/60 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring" aria-label="Editar assessores" > - {names.length ? ( - - ) : ( - Sem assessor - )} + diff --git a/src/components/campaign/MunicipalitySortableHead.tsx b/src/components/campaign/MunicipalitySortableHead.tsx index a6d9075f..149ed42c 100644 --- a/src/components/campaign/MunicipalitySortableHead.tsx +++ b/src/components/campaign/MunicipalitySortableHead.tsx @@ -4,6 +4,7 @@ import { ChevronDownIcon, ChevronsUpDownIcon, ChevronUpIcon } from 'lucide-react import type { ReactNode } from 'react' import { CampaignTransitionAnchor } from '@/components/campaign/CampaignListPending' +import { MunicipalityHeaderFilter } from '@/components/campaign/MunicipalityHeaderFilter' import { MunicipalityHoverTooltip } from '@/components/campaign/MunicipalityHoverTooltip' import { TableHead } from '@/components/ui/Table' import { cn } from '@/lib/utils' @@ -12,6 +13,8 @@ import { defaultMunicipalityListSortDir, municipalityListSortLabels, resolveMunicipalityListSort, + type MunicipalityFilterOption, + type MunicipalityFilterParam, type MunicipalityListSortKey, type MunicipalityListState, } from '@/utilities/municipalityUi' @@ -23,6 +26,9 @@ type MunicipalitySortableHeadProps = { tooltip?: ReactNode className?: string align?: 'left' | 'center' | 'right' + filterParam?: MunicipalityFilterParam + filterOptions?: MunicipalityFilterOption[] + showPriorityFilter?: boolean } export const MunicipalitySortableHead = ({ @@ -32,6 +38,9 @@ export const MunicipalitySortableHead = ({ tooltip, className, align = 'left', + filterParam, + filterOptions, + showPriorityFilter, }: MunicipalitySortableHeadProps) => { const href = buildMunicipalitySortHref(state, sortKey) const { sort: activeSort, dir } = resolveMunicipalityListSort(state) @@ -51,12 +60,11 @@ export const MunicipalitySortableHead = ({ replace scroll={false} className={cn( - 'group inline-flex min-h-11 items-center gap-1 rounded-md focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring', - active - ? 'font-medium text-foreground hover:text-primary' - : 'font-normal text-muted-foreground hover:text-foreground', - align === 'right' && 'w-full justify-end', - align === 'center' && 'w-full justify-center', + 'group inline-flex min-h-11 items-center gap-1 rounded-md text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring', + 'hover:text-foreground', + active ? 'font-medium' : 'font-normal', + align === 'right' && !filterParam && 'w-full justify-end', + align === 'center' && !filterParam && 'w-full justify-center', )} aria-label={ active @@ -80,25 +88,46 @@ export const MunicipalitySortableHead = ({ ) + const labeledSort = tooltip ? ( + + {sortControl} + + ) : ( + sortControl + ) + return ( - {tooltip ? ( - - {sortControl} - + {labeledSort} + + ) : ( - sortControl + labeledSort )} ) diff --git a/src/components/ui/Table.tsx b/src/components/ui/Table.tsx index c2467b18..a7cb69d5 100644 --- a/src/components/ui/Table.tsx +++ b/src/components/ui/Table.tsx @@ -2,8 +2,19 @@ import * as React from 'react' import { cn } from '@/lib/utils' -const Table = ({ className, ...props }: React.ComponentProps<'table'>) => ( -
+const Table = ({ + className, + containerClassName, + ...props +}: React.ComponentProps<'table'> & { + /** Escape hatch for the scroll container — e.g. `overflow-x-visible` so a + * sticky header can resolve against the page scroller instead of this box. */ + containerClassName?: string +}) => ( +
export const firstValue = (value: string | string[] | undefined): string | undefined => Array.isArray(value) ? value[0] : value +/** Flatten a repeated query param into distinct trimmed values. */ +export const allParamValues = (value: string | string[] | undefined): string[] => { + if (value === undefined) return [] + const cells = Array.isArray(value) ? value : [value] + const seen = new Set() + for (const cell of cells) { + const trimmed = cell.trim() + if (trimmed) seen.add(trimmed) + } + return [...seen] +} + export const normalizedText = (value: string | undefined): string | undefined => { if (typeof value !== 'string') return undefined const normalized = value.trim() diff --git a/src/utilities/campaignMunicipalityScope.ts b/src/utilities/campaignMunicipalityScope.ts index 0c23dd0e..02b4bd97 100644 --- a/src/utilities/campaignMunicipalityScope.ts +++ b/src/utilities/campaignMunicipalityScope.ts @@ -13,7 +13,15 @@ import { /** Superset of the fields the dashboard, map, and list overview consume. */ export type ScopedMunicipalityDoc = Pick< Municipality, - 'id' | 'name' | 'slug' | 'kind' | 'ibgeCode' | 'advisors' | 'priority' | 'expectedVotes' + | 'id' + | 'name' + | 'slug' + | 'kind' + | 'region' + | 'ibgeCode' + | 'advisors' + | 'priority' + | 'expectedVotes' > export type MunicipalityScope = { @@ -35,6 +43,7 @@ const loadScope = async ( name: true, slug: true, kind: true, + region: true, ibgeCode: true, advisors: true, priority: true, diff --git a/src/utilities/municipalityPageData.ts b/src/utilities/municipalityPageData.ts index ef33d79e..bafe0526 100644 --- a/src/utilities/municipalityPageData.ts +++ b/src/utilities/municipalityPageData.ts @@ -1,6 +1,7 @@ -import type { Payload } from 'payload' +import type { Payload, Where } from 'payload' -import { getMunicipalityCatalogEntry } from '@/lib/municipalityCatalog' +import { bahiaIdentityTerritories } from '@/lib/bahiaTerritories' +import { getMunicipalityCatalogEntry, municipalityCatalog } from '@/lib/municipalityCatalog' import { compareMunicipalityVotesForSort, computeVoteRankByYear, @@ -19,6 +20,7 @@ import { resolveMunicipalityLastSignalAt, resolveMunicipalityListSort, type MunicipalityListSearchParams, + type MunicipalityListState, type MunicipalityListSortDirection, type MunicipalityListSortKey, } from '@/utilities/municipalityUi' @@ -62,12 +64,98 @@ export type MunicipalityListOverviewData = { goalCoverageByScenario: Record } +/** Values still reachable under the OTHER active filters (column-filter options). */ +type MunicipalityListFilterFacets = { + /** Catalog order. */ + slugs: string[] + regions: string[] + advisorIDs: number[] +} + export type MunicipalityListPageBundle = { municipalities: MunicipalityListViewModel[] totalDocs: number totalPages: number scopeTotal: number overview: MunicipalityListOverviewData | null + filterFacets: MunicipalityListFilterFacets +} + +const emptyMunicipalityListFilterFacets: MunicipalityListFilterFacets = { + slugs: [], + regions: [], + advisorIDs: [], +} + +type MunicipalityFacetRow = Pick + +/** + * Each facet applies every filter owned by ANOTHER popover (so it only offers + * values that still return rows) while omitting the ones its own popover owns — + * including the checkbox/toggle sharing that popover, or selecting "Prioritária" + * / "Sem assessor" would empty the very list it lives in. Identical `where` + * shapes collapse into one read, and the already-loaded scope seeds the + * unfiltered shape — with no filter active the facets cost no query at all. + */ +const loadMunicipalityListFilterFacets = async ( + payload: Payload, + user: CampaignUser, + state: MunicipalityListState, + loadedScope: { where: Where; rows: MunicipalityFacetRow[] } | null, +): Promise => { + const rowsByWhere = new Map>() + if (loadedScope) { + rowsByWhere.set(JSON.stringify(loadedScope.where), Promise.resolve(loadedScope.rows)) + } + const facetRows = (omit: Partial): Promise => { + const where = buildMunicipalityListWhere({ ...state, ...omit }) + const key = JSON.stringify(where) + const pending = rowsByWhere.get(key) + if (pending) return pending + + const rows = payload + .find({ + collection: 'municipality', + where, + depth: 0, + limit: 0, + pagination: false, + select: { slug: true, region: true, advisors: true }, + user, + overrideAccess: false, + }) + .then((result) => result.docs as MunicipalityFacetRow[]) + rowsByWhere.set(key, rows) + return rows + } + + const [slugRows, regionRows, advisorRows] = await Promise.all([ + facetRows({ slugs: undefined, priority: undefined }), + facetRows({ regions: undefined }), + facetRows({ advisors: undefined, coverage: undefined }), + ]) + + // Selected values are unioned in: a selection must stay visible to be undone. + const availableSlugs = new Set([...slugRows.map((row) => row.slug), ...(state.slugs ?? [])]) + const availableRegions = new Set([ + ...regionRows.map((row) => row.region), + ...(state.regions ?? []), + ]) + const availableAdvisorIDs = new Set(state.advisors ?? []) + for (const row of advisorRows) { + for (const advisor of row.advisors ?? []) { + const id = relationshipId(advisor) + if (id !== null) availableAdvisorIDs.add(id) + } + } + + return { + slugs: municipalityCatalog + .filter((entry) => availableSlugs.has(entry.slug)) + .map((entry) => entry.slug), + regions: bahiaIdentityTerritories.filter((territory) => availableRegions.has(territory)), + advisorIDs: [...availableAdvisorIDs].sort((left, right) => left - right), + } } const payloadSortFieldByKey: Partial> = { @@ -176,6 +264,7 @@ export const loadMunicipalityListPageBundle = async ( totalPages: 0, scopeTotal: 0, overview: null, + filterFacets: emptyMunicipalityListFilterFacets, } } @@ -214,6 +303,13 @@ export const loadMunicipalityListPageBundle = async ( isStaff ? loadMunicipalityScope(payload, user, where) : Promise.resolve(null), ]) + const filterFacets = await loadMunicipalityListFilterFacets( + payload, + user, + state, + staffScope ? { where, rows: staffScope.municipalities } : null, + ) + let overview: MunicipalityListOverviewData | null = null let pledgeAggregates = new Map() let goalCoverageByMunicipalityID = new Map< @@ -221,7 +317,9 @@ export const loadMunicipalityListPageBundle = async ( Record >() - if (staffScope && staffScope.municipalities.length > 0) { + // Computed even for an empty filtered scope: the overview stays on screen + // (zeroed) next to the empty state instead of disappearing with the rows. + if (staffScope) { pledgeAggregates = staffScope.pledgeAggregates const rollup = rollupMunicipalityStaffVotes(staffScope.municipalities, pledgeAggregates) const goalCoverageBundle = await loadMunicipalityGoalCoverageBundle( @@ -286,6 +384,7 @@ export const loadMunicipalityListPageBundle = async ( totalPages, scopeTotal: scopeCount.totalDocs, overview, + filterFacets, } } diff --git a/src/utilities/municipalityUi.ts b/src/utilities/municipalityUi.ts index 8981ab24..3f0f30f4 100644 --- a/src/utilities/municipalityUi.ts +++ b/src/utilities/municipalityUi.ts @@ -5,6 +5,7 @@ import { formatElectionNumber } from '@/lib/electionInsights' import { municipalityCatalog } from '@/lib/municipalityCatalog' import type { CampaignUser, Municipality } from '@/payload-types' import { + allParamValues, buildListHref, firstValue, normalizedText, @@ -27,7 +28,9 @@ export const municipalityPriorityLabels: Record['status']> +export type PoliticalTrendStatus = NonNullable< + NonNullable['status'] +> export const politicalTrendLabels: Record = { favoravel: 'Favorável', @@ -67,13 +70,13 @@ export const DEFAULT_MUNICIPALITY_LIST_SORT_DIR: MunicipalityListSortDirection = export const municipalityListSortLabels: Record = { name: 'Município', - region: 'Território de identidade', + region: 'Território', kind: 'Tipo', trend: 'Tendência', expectedVotes: 'Votos estimados', lastUpdateAt: 'Última atualização', - /** Advisor coverage — "Cobertura" alone now reads as the goal one (`deficit`). */ - coverage: 'Assessoria', + /** Sorts the "Assessores" column — "Cobertura" alone now reads as the goal one (`deficit`). */ + coverage: 'Assessores', /** Short header — definition lives on hover (`formatMunicipalityConcentrationHint`). */ votos: '2022', deficit: 'Cobertura da meta', @@ -83,11 +86,20 @@ export const municipalityListSortLabels: Record export type MunicipalityListState = { page: number q?: string - region?: BahiaIdentityTerritory + /** Multi-select (OR) identity territories. */ + regions?: BahiaIdentityTerritory[] + /** Multi-select (OR) catalog slugs. */ + slugs?: string[] + /** Multi-select (OR) campaignUser advisor IDs. */ + advisors?: number[] kind?: Municipality['kind'] coverage?: 'com_assessor' | 'sem_assessor' priority?: 'alta' - trend?: PoliticalTrendStatus + /** + * Multi-select (OR) political trends. Never holds the full set: "todas" is + * encoded as absent, canonicalized by `parseMunicipalityListParams`. + */ + trends?: PoliticalTrendStatus[] /** Candidate number for the map comparison mode (does not filter the list). */ compare?: number sort?: MunicipalityListSortKey @@ -99,6 +111,8 @@ export type MunicipalityListSearchParams = CampaignListRawSearchParams export const municipalityListParamNames = [ 'q', 'region', + 'slug', + 'advisor', 'kind', 'coverage', 'priority', @@ -109,6 +123,11 @@ export const municipalityListParamNames = [ 'page', ] as const +const municipalitySlugSet = new Set(municipalityCatalog.map((entry) => entry.slug)) +const municipalityNameBySlug = new Map( + municipalityCatalog.map((entry) => [entry.slug, entry.name] as const), +) + const municipalityListParamNameSet = new Set(municipalityListParamNames) // Derived from the label record (total over the union), so a new sort key is @@ -215,17 +234,85 @@ const canonicalTerritoryBySearchValue = new Map( bahiaIdentityTerritories.map((territory) => [normalizeSearchPhrase(territory), territory]), ) -export const parseMunicipalityListParams = (params: MunicipalityListSearchParams): MunicipalityListState => { +const parseRegionsParam = (raw: string | string[] | undefined): BahiaIdentityTerritory[] => { + const regions: BahiaIdentityTerritory[] = [] + const seen = new Set() + for (const token of allParamValues(raw)) { + const region = canonicalTerritoryBySearchValue.get(normalizeSearchPhrase(token)) + if (!region || seen.has(region)) continue + seen.add(region) + regions.push(region) + } + return regions +} + +const parseSlugsParam = (raw: string | string[] | undefined): string[] => { + const slugs: string[] = [] + const seen = new Set() + for (const token of allParamValues(raw)) { + if (!municipalitySlugSet.has(token) || seen.has(token)) continue + seen.add(token) + slugs.push(token) + } + return slugs +} + +const parseAdvisorsParam = (raw: string | string[] | undefined): number[] => { + const advisors: number[] = [] + const seen = new Set() + for (const token of allParamValues(raw)) { + const id = strictDecimalInteger(token) + if (id === undefined || seen.has(id)) continue + seen.add(id) + advisors.push(id) + } + return advisors.sort((left, right) => left - right) +} + +const politicalTrendStatusSet = new Set(Object.keys(politicalTrendLabels)) + +/** Selecting every trend means "todas", which is the same thing as selecting none. */ +const parseTrendsParam = (raw: string | string[] | undefined): PoliticalTrendStatus[] => { + const trends: PoliticalTrendStatus[] = [] + for (const token of allParamValues(raw)) { + if (!politicalTrendStatusSet.has(token)) continue + const trend = token as PoliticalTrendStatus + if (trends.includes(trend)) continue + trends.push(trend) + } + return trends.length < politicalTrendStatusSet.size ? trends : [] +} + +const municipalityListStateToRawParams = ( + state: MunicipalityListState, + page = state.page, +): MunicipalityListSearchParams => ({ + page: String(page), + q: state.q, + region: state.regions, + slug: state.slugs, + advisor: state.advisors?.map(String), + kind: state.kind, + coverage: state.coverage, + priority: state.priority, + trend: state.trends, + compare: state.compare === undefined ? undefined : String(state.compare), + sort: state.sort, + dir: state.dir, +}) + +export const parseMunicipalityListParams = ( + params: MunicipalityListSearchParams, +): MunicipalityListState => { const rawPage = strictDecimalInteger(firstValue(params.page)) const q = normalizedText(firstValue(params.q)) - const rawRegion = normalizedText(firstValue(params.region)) - const region = rawRegion - ? canonicalTerritoryBySearchValue.get(normalizeSearchPhrase(rawRegion)) - : undefined + const regions = parseRegionsParam(params.region) + const slugs = parseSlugsParam(params.slug) + const advisors = parseAdvisorsParam(params.advisor) const rawKind = firstValue(params.kind) const rawCoverage = firstValue(params.coverage) const rawPriority = firstValue(params.priority) - const rawTrend = firstValue(params.trend) + const trends = parseTrendsParam(params.trend) const rawCompare = strictDecimalInteger(firstValue(params.compare)) const rawSort = firstValue(params.sort) as MunicipalityListSortKey | undefined const sort = rawSort && municipalityListSortKeySet.has(rawSort) ? rawSort : undefined @@ -235,15 +322,15 @@ export const parseMunicipalityListParams = (params: MunicipalityListSearchParams return { page: rawPage ?? 1, ...(q ? { q } : {}), - ...(region ? { region } : {}), + ...(regions.length ? { regions } : {}), + ...(slugs.length ? { slugs } : {}), + ...(advisors.length ? { advisors } : {}), ...(rawKind === 'municipio' || rawKind === 'zona' ? { kind: rawKind } : {}), ...(rawCoverage === 'com_assessor' || rawCoverage === 'sem_assessor' ? { coverage: rawCoverage } : {}), ...(rawPriority === 'alta' ? { priority: 'alta' } : {}), - ...(rawTrend === 'favoravel' || rawTrend === 'neutra' || rawTrend === 'desfavoravel' - ? { trend: rawTrend } - : {}), + ...(trends.length ? { trends } : {}), ...(rawCompare && rawCompare <= 99999 ? { compare: rawCompare } : {}), ...(sort ? { sort } : {}), ...(dir ? { dir } : {}), @@ -261,7 +348,9 @@ export const buildMunicipalityListWhere = (state: MunicipalityListState): Where } filters.push({ or: searchFilters }) } - if (state.region) filters.push({ region: { equals: state.region } }) + if (state.regions?.length) filters.push({ region: { in: state.regions } }) + if (state.slugs?.length) filters.push({ slug: { in: state.slugs } }) + if (state.advisors?.length) filters.push({ advisors: { in: state.advisors } }) if (state.kind) filters.push({ kind: { equals: state.kind } }) if (state.coverage) { filters.push({ @@ -269,9 +358,7 @@ export const buildMunicipalityListWhere = (state: MunicipalityListState): Where }) } if (state.priority) filters.push({ priority: { equals: state.priority } }) - if (state.trend) { - filters.push({ 'politicalTrend.status': { equals: state.trend } }) - } + if (state.trends?.length) filters.push({ 'politicalTrend.status': { in: state.trends } }) return filters.length ? { and: filters } : {} } @@ -280,18 +367,7 @@ export const buildMunicipalityListSearchParams = ( state: MunicipalityListState, page = state.page, ): URLSearchParams => { - const canonicalState = parseMunicipalityListParams({ - page: String(page), - q: state.q, - region: state.region, - kind: state.kind, - coverage: state.coverage, - priority: state.priority, - trend: state.trend, - compare: state.compare === undefined ? undefined : String(state.compare), - sort: state.sort, - dir: state.dir, - }) + const canonicalState = parseMunicipalityListParams(municipalityListStateToRawParams(state, page)) const params = new URLSearchParams() const resolvedSort = canonicalState.sort ?? DEFAULT_MUNICIPALITY_LIST_SORT_KEY const resolvedDir = canonicalState.dir ?? defaultMunicipalityListSortDir(resolvedSort) @@ -300,14 +376,16 @@ export const buildMunicipalityListSearchParams = ( resolvedDir === defaultMunicipalityListSortDir(DEFAULT_MUNICIPALITY_LIST_SORT_KEY) if (canonicalState.q) params.set('q', canonicalState.q) - if (canonicalState.region) params.set('region', canonicalState.region) + for (const region of canonicalState.regions ?? []) params.append('region', region) + for (const slug of canonicalState.slugs ?? []) params.append('slug', slug) + for (const advisor of canonicalState.advisors ?? []) params.append('advisor', String(advisor)) if (canonicalState.kind) params.set('kind', canonicalState.kind) if (canonicalState.coverage) params.set('coverage', canonicalState.coverage) if (canonicalState.priority) params.set('priority', canonicalState.priority) - if (canonicalState.trend) params.set('trend', canonicalState.trend) + for (const trend of canonicalState.trends ?? []) params.append('trend', trend) if (canonicalState.compare) params.set('compare', String(canonicalState.compare)) - // Omit the mesa default pair (votos+desc). Keep `sort` whenever the pair is - // non-default so `dir` is never orphaned (e.g. votos+asc → sort=votos&dir=asc). + // Omit the default pair (staff: deficit+desc). Keep `sort` whenever the pair + // is non-default so `dir` is never orphaned (e.g. votos+asc → sort=votos&dir=asc). if (!isListDefault) { params.set('sort', resolvedSort) if (resolvedDir !== defaultMunicipalityListSortDir(resolvedSort)) { @@ -412,26 +490,250 @@ export const resolveMunicipalityListUrl = ( totalPages, }) -export const municipalityListCoverageLabels: Record, string> = { +export const municipalityListCoverageLabels: Record< + NonNullable, + string +> = { com_assessor: 'Com assessor', sem_assessor: 'Sem assessor', } +/** Column-header filter affordances (B16+). `name` = Município (priority + slugs). */ +export type MunicipalityFilterParam = 'name' | 'region' | 'kind' | 'coverage' | 'trend' | 'advisor' + +type MunicipalityFilterSelectionMode = 'single' | 'multi' | 'toggle' + +export type MunicipalityFilterOption = { + value: string + label: string +} + +/** Catalog labels for a (possibly cross-filtered) slug list. */ +export const municipalityFilterOptionsForSlugs = ( + slugs: readonly string[], +): MunicipalityFilterOption[] => + slugs.map((slug) => ({ value: slug, label: municipalityNameBySlug.get(slug) ?? slug })) + +export type MunicipalityFilterDefinition = { + param: MunicipalityFilterParam + label: string + /** Shown for exclusive single-select clear row; omitted for toggle/multi. */ + allLabel?: string + staffOnly: boolean + selection: MunicipalityFilterSelectionMode + /** Absent for the params whose options are cross-filtered server-side. */ + options?: MunicipalityFilterOption[] +} + +export const municipalityFilterDefinitions: MunicipalityFilterDefinition[] = [ + { + param: 'name', + label: 'Município', + staffOnly: false, + selection: 'multi', + }, + { + param: 'region', + label: 'Território', + staffOnly: false, + selection: 'multi', + }, + { + param: 'kind', + label: 'Tipo', + allLabel: 'Todos', + staffOnly: false, + selection: 'single', + options: ( + Object.keys(municipalityKindLabels) as Array + ).map((kind) => ({ value: kind, label: municipalityKindLabels[kind] })), + }, + { + param: 'advisor', + label: 'Assessores', + staffOnly: true, + selection: 'multi', + }, + { + param: 'coverage', + label: 'Assessoria', + staffOnly: true, + selection: 'toggle', + options: ( + Object.keys(municipalityListCoverageLabels) as Array< + keyof typeof municipalityListCoverageLabels + > + ).map((coverage) => ({ value: coverage, label: municipalityListCoverageLabels[coverage] })), + }, + { + param: 'trend', + label: 'Tendência', + staffOnly: true, + selection: 'multi', + options: (Object.keys(politicalTrendLabels) as Array).map( + (trend) => ({ value: trend, label: politicalTrendLabels[trend] }), + ), + }, +] + +const municipalityFilterDefinitionByParam = Object.fromEntries( + municipalityFilterDefinitions.map((definition) => [definition.param, definition]), +) as Record + +export const getMunicipalityFilterDefinition = ( + param: MunicipalityFilterParam, +): MunicipalityFilterDefinition => municipalityFilterDefinitionByParam[param] + +export const getMunicipalitySingleFilterValue = ( + state: MunicipalityListState, + param: 'kind' | 'coverage', +): string | undefined => state[param] + +export type MunicipalityMultiFilterParam = 'region' | 'slug' | 'advisor' | 'trend' + +export const getMunicipalityMultiFilterValues = ( + state: MunicipalityListState, + param: MunicipalityMultiFilterParam, +): string[] => { + if (param === 'region') return state.regions ?? [] + if (param === 'slug') return state.slugs ?? [] + if (param === 'trend') return state.trends ?? [] + return (state.advisors ?? []).map(String) +} + +const withMunicipalityListPageReset = (state: MunicipalityListState): MunicipalityListState => + parseMunicipalityListParams(municipalityListStateToRawParams({ ...state, page: 1 }, 1)) + +/** Exclusive single-value set/clear for `kind`. Empty (or invalid) clears. */ +export const applyMunicipalityKindFilter = ( + state: MunicipalityListState, + value: string | undefined, +): MunicipalityListState => + parseMunicipalityListParams({ + ...municipalityListStateToRawParams({ ...state, page: 1 }, 1), + kind: value || undefined, + }) + +/** Toggle exclusivity: clicking the active value clears (coverage). */ +export const toggleMunicipalityExclusiveFilterValue = ( + state: MunicipalityListState, + param: 'coverage', + value: string, +): MunicipalityListState => + withMunicipalityListPageReset({ + ...state, + [param]: state[param] === value ? undefined : (value as MunicipalityListState['coverage']), + }) + +export const toggleMunicipalityPriorityFilter = ( + state: MunicipalityListState, +): MunicipalityListState => + withMunicipalityListPageReset({ + ...state, + priority: state.priority === 'alta' ? undefined : 'alta', + }) + +/** + * Writes the RAW param and lets `parseMunicipalityListParams` validate, so no + * branch has to cast a `string[]` into the state's narrow value types. + */ +const setMunicipalityMultiFilterValues = ( + state: MunicipalityListState, + param: MunicipalityMultiFilterParam, + values: string[], +): MunicipalityListState => + parseMunicipalityListParams({ + ...municipalityListStateToRawParams({ ...state, page: 1 }, 1), + [param]: values, + }) + +export const toggleMunicipalityMultiFilterValue = ( + state: MunicipalityListState, + param: MunicipalityMultiFilterParam, + value: string, +): MunicipalityListState => { + const current = getMunicipalityMultiFilterValues(state, param) + return setMunicipalityMultiFilterValues( + state, + param, + current.includes(value) ? current.filter((entry) => entry !== value) : [...current, value], + ) +} + +export const clearMunicipalityMultiFilter = ( + state: MunicipalityListState, + param: MunicipalityMultiFilterParam, +): MunicipalityListState => setMunicipalityMultiFilterValues(state, param, []) + +/** Clear municipality-column filters (priority + selected slugs). */ +export const clearMunicipalityNameFilters = (state: MunicipalityListState): MunicipalityListState => + withMunicipalityListPageReset({ ...state, priority: undefined, slugs: undefined }) + +/** Clear advisor-column filters (com/sem assessor + selected advisors). */ +export const clearMunicipalityAdvisorFilters = ( + state: MunicipalityListState, +): MunicipalityListState => + withMunicipalityListPageReset({ ...state, coverage: undefined, advisors: undefined }) + +export const buildMunicipalityFilterHref = (next: MunicipalityListState): string => + buildMunicipalityListHref(next, 1) + +export const isMunicipalityColumnFilterActive = ( + state: MunicipalityListState, + param: MunicipalityFilterParam, +): boolean => { + switch (param) { + case 'name': + return Boolean(state.priority || state.slugs?.length) + case 'region': + return Boolean(state.regions?.length) + case 'advisor': + // The Assessores popover also owns the com/sem assessor toggle. + return Boolean(state.advisors?.length || state.coverage) + case 'kind': + return Boolean(state.kind) + case 'coverage': + return Boolean(state.coverage) + case 'trend': + return Boolean(state.trends?.length) + } +} + +/** "Irecê, Recôncavo +3" — the summary never grows past two names per filter. */ +const firstNamesLabel = (names: string[]): string => + names.length <= 2 ? names.join(', ') : `${names.slice(0, 2).join(', ')} +${names.length - 2}` + +export const formatMunicipalityActiveFiltersSummary = ( + state: MunicipalityListState, +): string | null => { + const parts: string[] = [] + if (state.priority) parts.push(municipalityPriorityLabels.alta) + if (state.slugs?.length) { + parts.push(firstNamesLabel(state.slugs.map((slug) => municipalityNameBySlug.get(slug) ?? slug))) + } + if (state.regions?.length) parts.push(firstNamesLabel([...state.regions])) + if (state.kind) parts.push(municipalityKindLabels[state.kind]) + if (state.advisors?.length) { + parts.push(state.advisors.length === 1 ? '1 assessor' : `${state.advisors.length} assessores`) + } + if (state.coverage) parts.push(municipalityListCoverageLabels[state.coverage]) + if (state.trends?.length) { + parts.push( + `Tendência ${state.trends.map((trend) => politicalTrendLabels[trend].toLowerCase()).join(', ')}`, + ) + } + if (state.q) parts.push(`Busca "${state.q}"`) + + return parts.length ? parts.join(' · ') : null +} + const MAX_MUNICIPALITY_LIST_VISIT_LABEL_LENGTH = 80 export const buildMunicipalityListVisitLabel = (state: MunicipalityListState): string | null => { - const parts: string[] = [] + const summary = formatMunicipalityActiveFiltersSummary(state) + if (!summary) return null - if (state.region) parts.push(state.region) - if (state.kind) parts.push(municipalityKindLabels[state.kind]) - if (state.coverage) parts.push(municipalityListCoverageLabels[state.coverage]) - if (state.priority) parts.push(municipalityPriorityLabels.alta) - if (state.trend) parts.push(`Tendência ${politicalTrendLabels[state.trend].toLowerCase()}`) - if (state.q) parts.push(`Busca "${state.q}"`) - - if (!parts.length) return null - - const label = `Municípios · ${parts.join(' · ')}` + const label = `Municípios · ${summary}` if (label.length <= MAX_MUNICIPALITY_LIST_VISIT_LABEL_LENGTH) return label return `${label.slice(0, MAX_MUNICIPALITY_LIST_VISIT_LABEL_LENGTH - 1)}…` } @@ -439,7 +741,10 @@ export const buildMunicipalityListVisitLabel = (state: MunicipalityListState): s export const buildMunicipalityListVisitHref = (state: MunicipalityListState): string => buildMunicipalityListHref(state, 1) -export const getCampaignScopeLabel = (role: CampaignUser['role'], municipalityCount: number): string => { +export const getCampaignScopeLabel = ( + role: CampaignUser['role'], + municipalityCount: number, +): string => { if (role === 'advisor') { return `${municipalityCount} ${municipalityCount === 1 ? 'município sob sua assessoria' : 'municípios sob sua assessoria'}` } diff --git a/tests/int/municipalityPageData.int.spec.ts b/tests/int/municipalityPageData.int.spec.ts index 033c1406..0abfb9ed 100644 --- a/tests/int/municipalityPageData.int.spec.ts +++ b/tests/int/municipalityPageData.int.spec.ts @@ -4,6 +4,7 @@ import type { Payload } from 'payload' import { getPayload } from 'payload' import { beforeAll, describe, expect, it } from 'vitest' +import { getMunicipalityCatalogEntry, municipalityCatalog } from '@/lib/municipalityCatalog' import config from '@/payload.config' import { loadMunicipalityListPageBundle } from '@/utilities/municipalityPageData' import { @@ -26,13 +27,17 @@ describe('loadMunicipalityListPageBundle', () => { payload = await getPayload({ config: await config }) }) - it('returns null overview when the filtered municipality set is empty', async () => { + it('keeps a zeroed overview when the filtered municipality set is empty', async () => { const coordinator = await campaignFixtures().createCampaignUser('coordinator') const bundle = await loadMunicipalityListPageBundle(payload, coordinator, { q: 'zzznomatch' }) + // The overview stays on screen next to the empty state instead of unmounting. expect(bundle.municipalities).toHaveLength(0) - expect(bundle.overview).toBeNull() + expect(bundle.overview).not.toBeNull() + expect(bundle.overview!.municipalityCount).toBe(0) + expect(bundle.overview!.staffVoteTotalByScenario.central).toBe(0) + expect(bundle.overview!.goalCoverageByScenario.central.goal).toBe(0) }) it('rolls up staffVoteTotal from expectedVotes when no pledge overrides apply', async () => { @@ -290,10 +295,73 @@ describe('loadMunicipalityListPageBundle', () => { administered.kind === 'zona' ? await loadMunicipalityListPageBundle(payload, advisor, { kind: 'municipio' }) : await loadMunicipalityListPageBundle(payload, advisor, { kind: 'zona' }) - expect(excluded.overview).toBeNull() + expect(excluded.overview?.municipalityCount).toBe(0) expect(excluded.municipalities).toHaveLength(0) }) + it('cross-filters column-filter options but never narrows a filter by itself', async () => { + const fixtures = campaignFixtures() + const coordinator = await fixtures.createCampaignUser('coordinator') + const municipality = await fixtures.getMunicipality() + const catalogEntry = getMunicipalityCatalogEntry(municipality.slug) + expect(catalogEntry).toBeDefined() + const outsideRegion = municipalityCatalog.find( + (entry) => entry.region !== catalogEntry!.region, + )! + + const bundle = await loadMunicipalityListPageBundle(payload, coordinator, { + region: catalogEntry!.region, + }) + + // The território filter narrows the Município options… + expect(bundle.filterFacets.slugs).toContain(municipality.slug) + expect(bundle.filterFacets.slugs).not.toContain(outsideRegion.slug) + expect(bundle.filterFacets.slugs.length).toBeLessThan(municipalityCatalog.length) + // …but not its own: the OR set must stay addable. + expect(bundle.filterFacets.regions.length).toBeGreaterThan(1) + + // A selected value stays listed even when other filters exclude it, so it + // can be undone from the popover. + const conflicting = await loadMunicipalityListPageBundle(payload, coordinator, { + region: catalogEntry!.region, + slug: outsideRegion.slug, + }) + expect(conflicting.municipalities).toHaveLength(0) + expect(conflicting.filterFacets.slugs).toContain(outsideRegion.slug) + }) + + it('keeps the options of filters that share a popover with the applied one', async () => { + const fixtures = campaignFixtures() + const coordinator = await fixtures.createCampaignUser('coordinator') + const advisor = await fixtures.createCampaignUser('advisor') + const priorityMunicipality = await fixtures.getMunicipality() + await payload.update({ + collection: 'municipality', + id: priorityMunicipality.id, + data: { priority: 'alta' }, + overrideAccess: true, + }) + const covered = await fixtures.getMunicipality( + municipalityCatalog.find((entry) => entry.slug !== priorityMunicipality.slug)!.slug, + ) + await fixtures.assignMunicipalityAdvisors(covered.id, [advisor.id]) + + // "Prioritária" lives in the Município popover, so it must not hide the + // municipalities that popover is there to offer. + const byPriority = await loadMunicipalityListPageBundle(payload, coordinator, { + priority: 'alta', + }) + expect(byPriority.municipalities.every((row) => row.priority === 'alta')).toBe(true) + expect(byPriority.filterFacets.slugs).toContain(covered.slug) + + // Same for the "Sem assessor" toggle inside the Assessores popover: it would + // otherwise leave that popover with nobody to pick. + const withoutAdvisor = await loadMunicipalityListPageBundle(payload, coordinator, { + coverage: 'sem_assessor', + }) + expect(withoutAdvisor.filterFacets.advisorIDs).toContain(advisor.id) + }) + it('returns an empty bundle for leaders (municipality list lockdown)', async () => { const fixtures = campaignFixtures() const municipality = await fixtures.getMunicipality() diff --git a/tests/unit/campaignComponents.unit.spec.ts b/tests/unit/campaignComponents.unit.spec.ts index ec0fa5b4..40a42fb6 100644 --- a/tests/unit/campaignComponents.unit.spec.ts +++ b/tests/unit/campaignComponents.unit.spec.ts @@ -15,7 +15,10 @@ import { Toggle } from '@/components/ui/Toggle' import { ToggleGroup, ToggleGroupItem } from '@/components/ui/ToggleGroup' import type { CampaignFormActionState } from '@/utilities/campaignFormActionError' import { createEmptyGoalCoverageByScenario } from '@/utilities/goalCoverage' -import type { MunicipalityAdvisorSummary, MunicipalityListViewModel } from '@/utilities/municipalityViewModels' +import type { + MunicipalityAdvisorSummary, + MunicipalityListViewModel, +} from '@/utilities/municipalityViewModels' import { toVoteEstimateScenarioViewModel } from '@/utilities/voteEstimate' import { createEmptyMunicipalityPledgeAggregate } from '@/utilities/votePledgeData' @@ -36,6 +39,7 @@ const noopListFormAction = async ( const municipalityListDefaultProps = { isCoordinator: false, advisorOptions: [], + columnFilterOptions: { name: [], region: [], advisor: [] }, trendFormAction: noopListFormAction, advisorsFormAction: noopListFormAction, state: { page: 1 }, @@ -220,8 +224,10 @@ describe('campaign visual foundation', () => { expect(html).toContain('1.500') expect(html).toContain('Cenários de estimativa') expect(html).toContain('Prioritária') - expect(html).toContain('Coberta') - expect(html).toContain('Sem assessor') + // The advisor column carries coverage on its own — no separate "Assessoria" column. + expect(html).toContain('Assessores') + expect(html).toContain('Ana Bastos') + expect(html).not.toContain('Assessoria') expect(html).toContain('Tendência') expect(html).toContain('Cobertura da meta') expect(html).toContain('80%') diff --git a/tests/unit/municipalityUi.unit.spec.ts b/tests/unit/municipalityUi.unit.spec.ts index 78dabd2b..4bf884fa 100644 --- a/tests/unit/municipalityUi.unit.spec.ts +++ b/tests/unit/municipalityUi.unit.spec.ts @@ -1,13 +1,20 @@ import { describe, expect, it } from 'vitest' +import { municipalityCatalog } from '@/lib/municipalityCatalog' import { + applyMunicipalityKindFilter, + buildMunicipalityFilterHref, buildMunicipalityListHref, + buildMunicipalityListWhere, buildMunicipalitySortHref, + formatMunicipalityActiveFiltersSummary, formatMunicipalityConcentrationHint, formatMunicipalityListSortSummary, formatMunicipalitySignalAgeLabel, + isMunicipalityColumnFilterActive, isMunicipalitySignalCold, MUNICIPALITY_COLD_SIGNAL_DAYS, + municipalityListSortLabels, municipalitySignalAgeInDays, parseMunicipalityListParams, parseMunicipalitySortValue, @@ -15,6 +22,9 @@ import { resolveMunicipalityListSort, serializeMunicipalitySortValue, shouldUpdateMunicipalitySearchUrl, + toggleMunicipalityExclusiveFilterValue, + toggleMunicipalityMultiFilterValue, + toggleMunicipalityPriorityFilter, } from '@/utilities/municipalityUi' describe('shouldUpdateMunicipalitySearchUrl', () => { @@ -95,9 +105,7 @@ describe('municipality list sort params (A11 + B15 + E9)', () => { expect(formatMunicipalityListSortSummary('votos', 'desc')).toBe('Ordenado por 2022 ↓') expect(formatMunicipalityListSortSummary('votos', 'asc')).toBe('Ordenado por 2022 ↑') expect(formatMunicipalityListSortSummary('name', 'asc')).toBe('Ordenado por nome (A–Z)') - expect(formatMunicipalityListSortSummary('region', 'asc')).toBe( - 'Ordenado por Território de identidade ↑', - ) + expect(formatMunicipalityListSortSummary('region', 'asc')).toBe('Ordenado por Território ↑') expect(formatMunicipalityListSortSummary('deficit', 'desc')).toBe( 'Ordenado por déficit da meta (maior primeiro)', ) @@ -112,6 +120,120 @@ describe('municipality list sort params (A11 + B15 + E9)', () => { expect(formatMunicipalityConcentrationHint()).not.toMatch(/^%/) expect(formatMunicipalityConcentrationHint(12)).toMatch(/12/) }) + + it('labels the advisor-count sort as Assessores (not Cobertura da meta)', () => { + expect(municipalityListSortLabels.coverage).toBe('Assessores') + expect(formatMunicipalityListSortSummary('coverage', 'asc')).toBe('Ordenado por Assessores ↑') + }) +}) + +describe('municipality list header filters (B16+)', () => { + it('toggles multi region OR filters and preserves sort/dir', () => { + const state = parseMunicipalityListParams({ + page: '3', + sort: 'votos', + dir: 'asc', + kind: 'zona', + }) + const withRegion = toggleMunicipalityMultiFilterValue(state, 'region', 'Irecê') + expect(withRegion.regions).toEqual(['Irecê']) + expect(withRegion.page).toBe(1) + expect(buildMunicipalityFilterHref(withRegion)).toBe( + '/campanha/municipios?region=Irec%C3%AA&kind=zona&sort=votos&dir=asc', + ) + + const withTwo = toggleMunicipalityMultiFilterValue(withRegion, 'region', 'Recôncavo') + expect(withTwo.regions).toEqual(['Irecê', 'Recôncavo']) + expect(buildMunicipalityListHref(withTwo, 1)).toContain('region=Irec') + expect(buildMunicipalityListHref(withTwo, 1)).toContain('region=Rec') + + const cleared = toggleMunicipalityMultiFilterValue(withRegion, 'region', 'Irecê') + expect(cleared.regions).toBeUndefined() + }) + + it('toggles the Prioritária filter in and out of the URL, keeping other filters', () => { + const state = parseMunicipalityListParams({ region: 'Irecê' }) + + const on = toggleMunicipalityPriorityFilter(state) + expect(on.priority).toBe('alta') + expect(buildMunicipalityFilterHref(on)).toBe( + '/campanha/municipios?region=Irec%C3%AA&priority=alta', + ) + + const off = toggleMunicipalityPriorityFilter(on) + expect(off.priority).toBeUndefined() + expect(buildMunicipalityFilterHref(off)).toBe('/campanha/municipios?region=Irec%C3%AA') + }) + + it('treats every trend selected as "todas" (no narrowing constraint)', () => { + const one = parseMunicipalityListParams({ trend: 'favoravel' }) + expect(one.trends).toEqual(['favoravel']) + expect(isMunicipalityColumnFilterActive(one, 'trend')).toBe(true) + expect(buildMunicipalityListWhere(one)).toEqual({ + and: [{ 'politicalTrend.status': { in: ['favoravel'] } }], + }) + + // "Todas" has a single encoding — absent — so the URL never carries params + // that filter nothing while the funnel reports itself inactive. + const all = parseMunicipalityListParams({ trend: ['favoravel', 'neutra', 'desfavoravel'] }) + expect(all.trends).toBeUndefined() + expect(isMunicipalityColumnFilterActive(all, 'trend')).toBe(false) + expect(buildMunicipalityListWhere(all)).toEqual({}) + expect(formatMunicipalityActiveFiltersSummary(all)).toBeNull() + expect(buildMunicipalityFilterHref(all)).toBe('/campanha/municipios') + + // Ticking the last unchecked box lands on that same canonical state. + const twoSelected = parseMunicipalityListParams({ trend: ['favoravel', 'neutra'] }) + expect( + toggleMunicipalityMultiFilterValue(twoSelected, 'trend', 'desfavoravel').trends, + ).toBeUndefined() + + const none = toggleMunicipalityMultiFilterValue(one, 'trend', 'favoravel') + expect(none.trends).toBeUndefined() + expect(buildMunicipalityFilterHref(none)).toBe('/campanha/municipios') + }) + + it('toggles coverage by re-clicking the active value', () => { + const state = parseMunicipalityListParams({}) + const on = toggleMunicipalityExclusiveFilterValue(state, 'coverage', 'com_assessor') + expect(on.coverage).toBe('com_assessor') + const off = toggleMunicipalityExclusiveFilterValue(on, 'coverage', 'com_assessor') + expect(off.coverage).toBeUndefined() + }) + + it('discards invalid filter values', () => { + const state = parseMunicipalityListParams({}) + expect( + toggleMunicipalityMultiFilterValue(state, 'region', 'NotATerritory').regions, + ).toBeUndefined() + expect(applyMunicipalityKindFilter(state, 'bairro').kind).toBeUndefined() + expect( + toggleMunicipalityExclusiveFilterValue(state, 'coverage', 'maybe').coverage, + ).toBeUndefined() + expect(toggleMunicipalityMultiFilterValue(state, 'trend', 'alta').trends).toBeUndefined() + expect(parseMunicipalityListParams({ slug: 'not-a-slug', advisor: 'x' }).slugs).toBeUndefined() + expect(parseMunicipalityListParams({ advisor: 'x' }).advisors).toBeUndefined() + }) + + it('parses repeated advisor and slug params as OR filters', () => { + const slug = municipalityCatalog[0]?.slug + expect(slug).toBeTruthy() + const state = parseMunicipalityListParams({ + slug: [slug!, 'also-invalid'], + advisor: ['12', '12', '7'], + }) + expect(state.slugs).toEqual([slug]) + expect(state.advisors).toEqual([7, 12]) + }) + + it('summarizes active filters for the slim bar', () => { + expect(formatMunicipalityActiveFiltersSummary(parseMunicipalityListParams({}))).toBeNull() + expect( + formatMunicipalityActiveFiltersSummary( + parseMunicipalityListParams({ region: 'Irecê', priority: 'alta', q: 'feira' }), + ), + ).toBe('Prioritária · Irecê · Busca "feira"') + }) }) describe('E9 frescor do sinal', () => {