Reapply "fix(web): demote Plugins and Integrations to nav rail footer (#1806)" (#2360)#2397
Merged
Merged
Conversation
Contributor
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
approved these changes
May 20, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.



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 currentmain.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
apps/weborapps/desktop(including Electron menu bar)odsubcommand or flag, newtools-dev/tools-pack/tools-prflag, or newOD_*env var/api/*endpoint, new SSE event, or changed shape inpackages/contractsScreenshots
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
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.