Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Serialize 'disabledProfileSources' #9038

Merged
merged 1 commit into from
Feb 5, 2021
Merged

Serialize 'disabledProfileSources' #9038

merged 1 commit into from
Feb 5, 2021

Conversation

carlos-zamora
Copy link
Member

Summary of the Pull Request

"disabledProfileSources" is saved to CascadiaSettings not GlobalAppSettings (and, even then, it's only read when it's used, never saved). This PR specifically detects if it was defined in settings.json, and copies it over when the settings are serialized.

References

#6800 - Settings UI epic

Validation Steps Performed

  1. Added "disabledProfileSources" to settings.json, then serialized. --> "disabledProfileSources" is now maintained.
  2. Updated CascadiaSettings serialization test

Closes #9032

@ghost ghost added Area-Settings UI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-DataLoss A bug that causes the user's data to be lost, unintentionally labels Feb 4, 2021
@carlos-zamora carlos-zamora added zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes. Area-Settings UI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-DataLoss A bug that causes the user's data to be lost, unintentionally and removed Area-Settings UI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-DataLoss A bug that causes the user's data to be lost, unintentionally labels Feb 4, 2021
@carlos-zamora carlos-zamora added the Needs-Second It's a PR that needs another sign-off label Feb 4, 2021
@DHowett
Copy link
Member

DHowett commented Feb 4, 2021

Just making sure - there aren't any OTHER settings we need to do this for, right?

@carlos-zamora
Copy link
Member Author

Just making sure - there aren't any OTHER settings we need to do this for, right?

For whatever reason, disabledProfileSources is the only setting we save to CascadiaSettings. All settings added to GlobalAppSettings and Profile are already handled thanks to ToJson.

@DHowett DHowett removed the Needs-Second It's a PR that needs another sign-off label Feb 5, 2021
@DHowett DHowett merged commit 230fad5 into main Feb 5, 2021
@DHowett DHowett deleted the dev/cazamor/tsm/serialize-dps branch February 5, 2021 00:42
@DHowett DHowett removed the zPreview-Service-Queued-1.13 A floating label that tracks the current Preview version for servicing purposes. label Feb 5, 2021
DHowett pushed a commit that referenced this pull request Feb 5, 2021
@carlos-zamora @DHowett
Serialize 'disabledProfileSources' (#9038)
9444617 
"disabledProfileSources" is saved to `CascadiaSettings` _not_
`GlobalAppSettings` (and, even then, it's only read when it's used,
never saved). This PR specifically detects if it was defined in
settings.json, and copies it over when the settings are serialized.

## Validation Steps Performed
1. Added "disabledProfileSources" to settings.json, then serialized. -->
   "disabledProfileSources" is now maintained.
2. Updated `CascadiaSettings` serialization test

Closes #9032

(cherry picked from commit 230fad5)
@ghost
Copy link

ghost commented Feb 11, 2021

🎉Windows Terminal Preview v1.6.10412.0 has been released which incorporates this pull request.:tada:

Handy links:

@ghost ghost mentioned this pull request Feb 11, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DHowett DHowett DHowett approved these changes

@zadjii-msft zadjii-msft zadjii-msft approved these changes

@miniksa miniksa Awaiting requested review from miniksa

@leonMSFT leonMSFT Awaiting requested review from leonMSFT

@PankajBhojwani PankajBhojwani Awaiting requested review from PankajBhojwani

Assignees
No one assigned
Labels
Area-Settings UI Anything specific to the SUI Issue-Bug It either shouldn't be doing this or needs an investigation. Priority-1 A description (P1) Product-Terminal The new Windows Terminal. Severity-DataLoss A bug that causes the user's data to be lost, unintentionally
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

SettingsUI removes "disabledProfileSources"
3 participants
@carlos-zamora @DHowett @zadjii-msft