settings_ui: Disable settings overridden by current organization - #58326
Merged
Conversation
tomhoule
force-pushed
the
tomhoule-ownvkuurxnsy
branch
2 times, most recently
from
June 2, 2026 12:52
1265c8b to
b56bf29
Compare
tomhoule
marked this pull request as ready for review
June 2, 2026 14:48
maxdeviant
reviewed
Jun 2, 2026
tomhoule
force-pushed
the
tomhoule-ownvkuurxnsy
branch
from
June 2, 2026 14:50
b56bf29 to
b10ab11
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the Settings UI to recognize settings that are overridden by the currently selected organization configuration, visually indicating the override and disabling the corresponding control to prevent local changes.
Changes:
- Extend
SettingFieldwith anorganization_overridehook and use it to detect org-enforced settings. - Disable toggle/dropdown controls (and show an “Overridden by Organization” warning icon + tooltip) when the org provides an override value.
- Add
cloud_api_typesdependency to accessOrganizationConfigurationin the settings UI.
Reviewed changes
Copilot reviewed 4 out of 6 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| crates/settings_ui/src/settings_ui.rs | Adds org-override plumbing, override detection, UI warning indicator, and disables certain controls based on org config. |
| crates/settings_ui/src/pages/edit_prediction_provider_setup.rs | Updates SettingField initializers to include the new organization_override field. |
| crates/settings_ui/src/page_data.rs | Wires organization overrides for specific settings (e.g., agent feedback, edit prediction data collection) and updates SettingField initializers. |
| crates/settings_ui/src/components/dropdown.rs | Adds a disabled state to the enum dropdown component and forwards it to the underlying UI element. |
| crates/settings_ui/Cargo.toml | Adds cloud_api_types dependency for OrganizationConfiguration. |
| Cargo.lock | Lockfile update for the new dependency. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
probably-neb
approved these changes
Jun 5, 2026
probably-neb
left a comment
Collaborator
There was a problem hiding this comment.
The two remaining copilot reviews are correct I think, other than that it looks good!
configuration Co-Authored-By: probablyneb <ben@zed.dev>
tomhoule
force-pushed
the
tomhoule-ownvkuurxnsy
branch
from
June 5, 2026 13:41
b10ab11 to
820de43
Compare
Contributor
Author
|
The two suggestions are applied. I think this is ready to go. |
tomhoule
force-pushed
the
tomhoule-ownvkuurxnsy
branch
from
June 5, 2026 13:50
820de43 to
1b84872
Compare
tomhoule
enabled auto-merge
June 5, 2026 13:58
TomPlanche
pushed a commit
to TomPlanche/zed
that referenced
this pull request
Jun 8, 2026
…-industries#58326) <img width="2258" height="832" alt="image" src="https://github.com/user-attachments/assets/47006348-0b51-4b4e-b427-4c016e45d4ec" /> Release Notes: - N/A --------- Co-authored-by: probablyneb <ben@zed.dev> Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
Closed
This was referenced Jul 1, 2026
This was referenced Jul 10, 2026
jonx
pushed a commit
to jonx/zed-aros
that referenced
this pull request
Jul 17, 2026
…-industries#58326) <img width="2258" height="832" alt="image" src="https://github.com/user-attachments/assets/47006348-0b51-4b4e-b427-4c016e45d4ec" /> Release Notes: - N/A --------- Co-authored-by: probablyneb <ben@zed.dev> Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
jolutz
pushed a commit
to jolutz/zed
that referenced
this pull request
Aug 8, 2026
…-industries#58326) <img width="2258" height="832" alt="image" src="https://github.com/user-attachments/assets/47006348-0b51-4b4e-b427-4c016e45d4ec" /> Release Notes: - N/A --------- Co-authored-by: probablyneb <ben@zed.dev> Co-authored-by: Gaauwe Rombouts <mail@grombouts.nl>
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.
Release Notes: