Skip to content

Plan tab: merge Objectives + Upcoming activities into one Agenda list#84

Merged
cipher813 merged 1 commit into
mainfrom
feat/plan-agenda-merge
Jul 7, 2026
Merged

Plan tab: merge Objectives + Upcoming activities into one Agenda list#84
cipher813 merged 1 commit into
mainfrom
feat/plan-agenda-merge

Conversation

@cipher813

Copy link
Copy Markdown
Contributor

Summary

  • Collapses the Calendar sub-tab's two stacked "Objectives" and "Upcoming activities" flat lists into a single chronological "Agenda" section.
  • Both were discovery lists over data already rendered as markers on the month grid (fuchsia band/peak for objectives, sky ring badge for activities) — no unique data, pure duplication of what's spatially visible and what DaySheet already shows on tap.
  • The derived focus objective keeps its full card (milestones, coach strategy summary, Generate/Regenerate plan CTA) at the top; other dated objectives and upcoming activities merge into one date-sorted list below, each keeping their existing distinct styling (fuchsia pin vs. sky pin).
  • Bug fix riding along: the prior ObjectiveSection rendered all of active.objectives, which per the /objectives/active API includes standing (open-ended) goals — duplicating what the Status tab's GeneralObjectivesSection already shows for those. The new AgendaSection scopes to kind === 'dated' only (except the focus card, which shows regardless of kind since it drives Generate Plan).
  • Header now has explicit + Objective / + Activity quick-add actions since the two flows open different sheets.

Test plan

  • npx tsc -b — clean
  • npm run lint (oxlint) — clean (one pre-existing unrelated warning)
  • npx vitest run — 141/141 passing across all 17 test files (updated PlanPage.test.tsx for the new merged empty-state/header-driven add flows)

Both sections were flat lists over data already rendered as markers on
the calendar grid (fuchsia band/peak for objectives, sky ring for
activities), duplicating spatial info with no added detail beyond what
DaySheet already surfaces on tap. Collapse them into a single
chronological Agenda: the derived focus objective keeps its full card
(milestones, coach strategy, generate-plan CTA), other dated objectives
and upcoming activities are merged into one date-sorted list below.

Also scopes the section to dated objectives only — the prior
ObjectiveSection rendered ALL of active.objectives, which per the API
includes standing (open-ended) goals, duplicating what the Status tab's
GeneralObjectivesSection already shows for those.
@cipher813 cipher813 merged commit 3208bcb into main Jul 7, 2026
3 checks passed
@cipher813 cipher813 deleted the feat/plan-agenda-merge branch July 7, 2026 20:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant