Skip to content

Reapply "fix(web): demote Plugins and Integrations to nav rail footer (#1806)" (#2360)#2397

Merged
Siri-Ray merged 2 commits into
mainfrom
revert/pr-2360-restore-nav-rail-demote
May 20, 2026
Merged

Reapply "fix(web): demote Plugins and Integrations to nav rail footer (#1806)" (#2360)#2397
Siri-Ray merged 2 commits into
mainfrom
revert/pr-2360-restore-nav-rail-demote

Conversation

@lefarcen
Copy link
Copy Markdown
Contributor

This reverts #2360 (commit 1ab87580), which had itself reverted #1806. The end result is to re-apply #1806's nav-rail / hero changes on top of current main.

Why

#2360 rolled back #1806 to put Plugins / Integrations back in the primary nav-rail group, restore the avatar gear-button dropdown, and bring back the pre-#1806 HomeHero output-type chip layout. After living with that rollback for a day the previous decision still stands: Plugins and Integrations belong in the nav-rail footer, the gear button should open the Settings dialog directly without an intermediate dropdown, and HomeHero reads better with the demoted chip row. Rather than cherry-pick the pieces back, this PR reverts #2360 wholesale and reapplies the original #1806 design.

What users will see

Surface area

  • UI — new page / dialog / panel / menu item / setting / empty state in apps/web or apps/desktop (including Electron menu bar)
  • Keyboard shortcut — new or changed
  • CLI / env var — new od subcommand or flag, new tools-dev / tools-pack / tools-pr flag, or new OD_* env var
  • API / contract — new /api/* endpoint, new SSE event, or changed shape in packages/contracts
  • Extension point — new entry under `skills/`, `design-systems/`, `design-templates/`, or `craft/`, or change to the skills protocol
  • i18n keys — added new translation keys
  • New top-level dependency — adding any new entry to the root `package.json`
  • Default behavior change — changes what existing users experience without opting in (default model, default setting, file/SQLite schema, auto-network on startup, auto-install)
  • None — internal refactor, docs, tests, or translation update only

Screenshots

Verified locally under namespace `revert-2360` (http://127.0.0.1:17927) and compared side-by-side against a fresh checkout of `main`. Reviewers can reproduce with:

```
pnpm tools-dev run web --namespace revert-2360 --daemon-port 17926 --web-port 17927
```

Bug fix verification

N/A — this is a PR-level revert (of the #2360 rollback), not a targeted bug fix backed by a red spec.

Validation

  • `pnpm guard` — pass
  • `pnpm typecheck` — pass (whole repo)
  • `pnpm --filter @open-design/web test` — pass (193 test files / 1783 tests)
  • Local `pnpm tools-dev run web --namespace revert-2360 --daemon-port 17926 --web-port 17927` started, hand-compared against a `main` checkout.

Conflict resolution notes

Reverting #2360 hit one conflict file: `apps/web/src/components/EntryShell.tsx`, three blocks. Four PRs (#2285, #2330, #2390, #2386) had landed on top of #2360 and added analytics imports, an `onDeleteTemplate` prop, onboarding telemetry, and a Discord topbar badge. Resolution:

Outside the conflict blocks, all four later PRs' additions (#2330 `onDeleteTemplate` prop, #2390 OnboardingView telemetry, #2386 topbar Discord badge, #2285 `navElementForView` helper) auto-merge cleanly and are kept.

Diffstat matches #1806 in shape (16 files, +546 / -644 vs. #1806's +633 / -545), confirming this is a faithful re-apply of #1806 on top of the four follow-up PRs.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 20, 2026

Visual regression review

Head: 134fb62 · Base: a5e43ae

Some cases used the nearest available ancestor baseline instead of the exact base SHA.

1 changed · 0 unchanged · 0 missing baseline · 0 failed

Changed cases

Case Main PR Diff
visual-home
baseline 5 commit(s) behind
main pr diff

Visual diff is advisory only and does not block merging.

The revert of #2360 brought back EntryHelpMenu.tsx as #1806 originally
added it, with DISCORD_URL = 'https://discord.gg/BYShPgWpq'. #2386 later
rotated the Discord invite to mHAjSMV6gz, but only in the places that
existed on main at the time (EntryShell avatar dropdown + the e2e test);
EntryHelpMenu didn't exist then, so it never got updated. The e2e test
the revert reintroduced asserts the new URL, so the component must
match.
@Siri-Ray Siri-Ray merged commit 41a33ae into main May 20, 2026
15 checks passed
@lefarcen lefarcen requested a review from mrcfps May 20, 2026 13:10
@lefarcen lefarcen added size/XL PR changes 700-1500 lines risk/medium Medium risk: regular code changes type/feature New feature labels May 20, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

risk/medium Medium risk: regular code changes size/XL PR changes 700-1500 lines type/feature New feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants