Repository navigation
fix organization switcher selection and permission typo - #19933
Merged
Merged
Conversation
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request updates the organization switching logic in both OrgSwitcher and SpaceSwitcher to use RTK Query mutations asynchronously with error handling, and corrects a disabled check in DeployConfirmationModal. However, in both switchers, the RTK Query mutation trigger updateSelectedOrg needs to call .unwrap() to ensure that errors are actually thrown and caught by the catch blocks, preventing the UI from reloading on a failed backend update.
Important
The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: Rishi Raj <[email protected]>
Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Signed-off-by: Rishi Raj <[email protected]>
Contributor
There was a problem hiding this comment.
Pull request overview
This PR aims to improve organization switching reliability in the Meshery UI by persisting the selected organization to the backend before reloading, ensuring the correct org is shown/used on the permission-denied (Oops) page, and correcting a permission check in the deploy confirmation flow.
Changes:
- Persist selected organization via the user preferences update flow before triggering an app reload.
- Make the Oops page org switcher fall back to backend-selected org when Redux org state is missing.
- Fix the
DeployConfirmationModalability check to use the correct permission “subject” field.
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| ui/components/workspaces/SpacesSwitcher/SpaceSwitcher.tsx | Adds notification-backed error handling around org selection persistence prior to reloading. |
| ui/components/general/error-404/OrgSwitcher.tsx | Uses backend-selected organization when Redux org is unavailable and persists selection before reload. |
| ui/components/designs/lifecycle/DeployConfirmationModal.tsx | Fixes the permission check to use subject for VALIDATE_DESIGN. |
Signed-off-by: Rishi Raj <[email protected]>
Contributor
|
Commit SHA: END-TO-END TESTS
📦 Test Result Summary
⌛ Duration: 11 minutes and 36 seconds Overall Result: 👎 Some tests failed. [Show/Hide] Test Result Details
❌ Failed Test Details The following tests failed. Click on each to see the failure reason: ❌ Grafana elements on metrics tab (Local - chromium-local-provider)File Location: Error Message: Code Snippet: ❌ Create a Model (Local - chromium-local-provider)File Location: Error Message: 🔗 Relationship Tests [Show/Hide] Relationship Test Details (18 tests)
|
yi-nuo426
approved these changes
Jun 8, 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.
Description
This PR fixes #19931 and addresses a few issues related to organization switching.
DeployConfirmationModal.OrgSwitcherthat were causing build issues.Approach
I found that the organization dropdown on the Oops page was not always showing the correct active organization. Since the global layout is not mounted on that page, the Redux organization state can be unavailable. To address this,
OrgSwitchernow uses the organization returned by the backend when Redux state is missing, ensuring the correct organization is displayed and other organizations remain selectable.I also updated the organization switch flow to save the selected organization on the backend before reloading the application. If the update fails, the reload is skipped and an error message is shown to prevent the UI from getting out of sync with the backend state.
Additionally, this PR fixes the permission check in
DeployConfirmationModaland updates RTK Query imports to use the correct path alias, resolving build issues.Verification
make ui-buildsuccessfully.Demo: Added a video demonstrating the fix.
Screen.Recording.2026-06-08.at.9.46.41.PM.mov
Signed commits