This repository has been archived by the owner on Sep 11, 2024. It is now read-only.
Cleanup tasks in the Settings code #12125
Merged
Conversation
This file contains 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
richvdh
added
the
T-Task
richvdh
force-pushed
the
rav/settings_cleanup
branch
from
ac97e93
to
cbc994e
Compare
richvdh
force-pushed
the
rav/settings_cleanup
branch
from
cbc994e
to
a4fae31
Compare
This was basically the same as `SettingsStore.canSetValue` only more confusing, so let's get rid of it.
The current magic where this only works for features (but not beta features!) is, well, magical. And I need more flexibility here.
I don't know if this was ever intended to have different semantics to `LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG`, but if it was, those semantics shuold have been written down. They now seem to be used entirely interchangably.
richvdh
force-pushed
the
rav/settings_cleanup
branch
from
a4fae31
to
92cd467
Compare
richvdh
commented
Jan 10, 2024
|
|
||
| const label = this.props.label ?? SettingsStore.getDisplayName(this.props.name, this.props.level); | ||
| const description = SettingsStore.getDescription(this.props.name); | ||
| const shouldWarn = SettingsStore.shouldHaveWarning(this.props.name); | ||
| const disabled = this.state.disabled || !canChange; |
There was a problem hiding this comment.
note that it was impossible for canChange to be true while state.disabled was true, so this was equivalent to const disabled = !canChange;.
dbkr
approved these changes
Jan 11, 2024
| @@ -62,7 +62,7 @@ export default class CryptographyPanel extends React.Component<IProps, IState> { | |||
| } | |||
|
|
|||
| let noSendUnverifiedSetting: JSX.Element | undefined; | |||
| if (SettingsStore.isEnabled("blacklistUnverifiedDevices")) { | |||
| if (SettingsStore.canSetValue("blacklistUnverifiedDevices", null, SettingLevel.DEVICE)) { | |||
There was a problem hiding this comment.
This line is at true if we can set the blacklistUnverifiedDevices settings on this device ?
There was a problem hiding this comment.
Yes. Which makes sense, because that's what's going to happen when you toggle the SettingsFlag.
3 tasks
github-merge-queue bot
pushed a commit
that referenced
this pull request
Jan 16, 2024
Follow-up on #12125
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
A few cleanups; suggest reviewing commit-by-commit.
The changes are, approximately:
SettingsStore.isEnabledandSettingsStore.canSetValue. Having two methods which do nearly-but-not-quite the same thing is confusing, and there's no good reason to have both.Settings.configDisablesSettingto replace the magic where this works for a magic subset of settings.LEVELS_FEATUREwith the identical but more descriptiveLEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG.This change is marked as an internal change (Task), so will not be included in the changelog.