Skip to content

fix: move org override to org-level super admin settings#1880

Merged
adaam2 merged 2 commits intomainfrom
fix/org-level-override
Mar 13, 2026
Merged

fix: move org override to org-level super admin settings#1880
adaam2 merged 2 commits intomainfrom
fix/org-level-override

Conversation

@adaam2
Copy link
Member

@adaam2 adaam2 commented Mar 13, 2026

Summary

  • Move the admin org override (impersonation) feature from project-level settings to a new dedicated org-level Super Admin page at /:orgSlug/admin-settings
  • Add "Super Admin" entry to the org sidebar, visible only to admins
  • Add "Organization Override" quick-access item to the user avatar dropdown menu, visible only to admins
  • Keep RegistryCacheSection in project settings (it requires project-scoped auth context)

Test plan

  • Verify the "Super Admin" sidebar item only appears for admin users in org-level navigation
  • Verify the "Organization Override" dropdown item only appears for admin users in the user menu
  • Verify the org override form works correctly (enter slug, go to org, clear override)
  • Verify non-admin users see "You do not have access" when navigating directly to /admin-settings
  • Verify RegistryCacheSection still works in project-level settings for admins

🤖 Generated with Claude Code

Resolves AGE-1581


Open with Devin

Move the admin org override (impersonation) feature from project-level
settings to a dedicated org-level "Super Admin" page. Add sidebar nav
item and user dropdown menu entry, both gated behind isAdmin.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@adaam2 adaam2 requested a review from a team as a code owner March 13, 2026 16:58
@adaam2 adaam2 added the enhancement New feature or request label Mar 13, 2026
@linear
Copy link

linear bot commented Mar 13, 2026

@changeset-bot
Copy link

changeset-bot bot commented Mar 13, 2026

⚠️ No Changeset found

Latest commit: 27a8bf7

Merging this PR will not cause a version bump for any packages. If these changes should not result in a new version, you're good to go. If these changes should result in a version bump, you need to add a changeset.

This PR includes no changesets

When changesets are added to this PR, you'll see the packages that this PR includes changesets for and the associated semver types

Click here to learn what changesets are, and how to add one.

Click here if you're a maintainer who wants to add a changeset to this PR

@vercel
Copy link

vercel bot commented Mar 13, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
gram-docs-redirect Ready Ready Preview, Comment Mar 13, 2026 5:04pm

Request Review

Copy link
Contributor

@devin-ai-integration devin-ai-integration bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 3 potential issues.

⚠️ 1 issue in files not directly in the diff

⚠️ New admin-settings org route missing from ORG_ROUTE_PATHS backwards-compat redirect guard (client/dashboard/src/contexts/Auth.tsx:234-240)

The ORG_ROUTE_PATHS list in client/dashboard/src/contexts/Auth.tsx:234-240 is a hardcoded safeguard that prevents org-level URL segments from being mistakenly treated as project slugs during the backwards-compat redirect (/:orgSlug/:projectSlug/.../:orgSlug/projects/:projectSlug/...). The new admin-settings route added in client/dashboard/src/routes.tsx:550-555 is not included in this list. If a project happens to have the slug "admin-settings", navigating to /:orgSlug/admin-settings will be incorrectly redirected to /:orgSlug/projects/admin-settings, making the admin settings page unreachable.

View 2 additional findings in Devin Review.

Open in Devin Review

…display

- Remove duplicate admin override form from project-menu.tsx (now lives
  in org-level Super Admin page)
- Keep org/project ID display in project-menu for quick reference
- Restore org ID and project ID display in project Settings admin section

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Copy link
Contributor

@devin-ai-integration devin-ai-integration bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Devin Review found 3 new potential issues.

⚠️ 1 issue in files not directly in the diff

⚠️ New admin-settings org route missing from ORG_ROUTE_PATHS backwards-compat redirect guard (client/dashboard/src/contexts/Auth.tsx:234-240)

The ORG_ROUTE_PATHS list in client/dashboard/src/contexts/Auth.tsx:234-240 is a hardcoded safeguard that prevents org-level URL segments from being mistakenly treated as project slugs during the backwards-compat redirect (/:orgSlug/:projectSlug/.../:orgSlug/projects/:projectSlug/...). The new admin-settings route added in client/dashboard/src/routes.tsx:550-555 is not included in this list. If a project happens to have the slug "admin-settings", navigating to /:orgSlug/admin-settings will be incorrectly redirected to /:orgSlug/projects/admin-settings, making the admin settings page unreachable.

View 3 additional findings in Devin Review.

Open in Devin Review

@adaam2 adaam2 merged commit 1a0aa07 into main Mar 13, 2026
32 checks passed
@adaam2 adaam2 deleted the fix/org-level-override branch March 13, 2026 17:30
@github-actions github-actions bot locked and limited conversation to collaborators Mar 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants