Added automatic saving for settings and persistent storage for image filter settings #9032
+197
−148
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
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## develop #9032 +/- ##
===========================================
+ Coverage 73.91% 73.94% +0.03%
===========================================
Files 428 428
Lines 44530 44593 +63
Branches 3881 3894 +13
===========================================
+ Hits 32915 32975 +60
- Misses 11615 11618 +3
|
bsekachev
reviewed
Feb 7, 2025
tests/cypress/e2e/actions_tasks/case_68_saving_settings_local_storage.js
Show resolved
Hide resolved
cvat-ui/src/components/header/settings-modal/shortcut-settings.tsx
Outdated
Show resolved
Hide resolved
cvat-ui/src/components/header/settings-modal/settings-modal.tsx
Outdated
Show resolved
Hide resolved
|
bsekachev
reviewed
Feb 11, 2025
| onClose(); | ||
| }, [onClose, settings, shortcuts]); | ||
| updateCachedSettings(settings, shortcuts); | ||
| }, [setSettingsInitialized, settings, shortcuts]); |
There was a problem hiding this comment.
Suggested change
| }, [setSettingsInitialized, settings, shortcuts]); | |
| }, [settingsInitialized, settings, shortcuts]); |
bsekachev
reviewed
Feb 11, 2025
Comment on lines
+494
to
+521
| const settingsForSaving: any = { | ||
| shortcuts: { | ||
| keyMap: {}, | ||
| }, | ||
| imageFilters: [], | ||
| }; | ||
| const supportedImageFilters = [ImageFilterAlias.GAMMA_CORRECTION]; | ||
| for (const [key, value] of Object.entries(settings)) { | ||
| if (['player', 'workspace'].includes(key)) { | ||
| settingsForSaving[key] = value; | ||
| } | ||
| if (key === 'imageFilters') { | ||
| const filters = []; | ||
| for (const filter of value) { | ||
| if (supportedImageFilters.includes(filter.alias)) { | ||
| filters.push(filter.modifier.toJSON()); | ||
| } | ||
| } | ||
| settingsForSaving.imageFilters = filters; | ||
| } | ||
| } | ||
| for (const [key] of Object.entries(shortcuts.keyMap)) { | ||
| if (key in shortcuts.defaultState) { | ||
| settingsForSaving.shortcuts.keyMap[key] = { | ||
| sequences: shortcuts.keyMap[key].sequences, | ||
| }; | ||
| } | ||
| } |
There was a problem hiding this comment.
What do you think about some refactoring?
Suggested change
| const settingsForSaving: any = { | |
| shortcuts: { | |
| keyMap: {}, | |
| }, | |
| imageFilters: [], | |
| }; | |
| const supportedImageFilters = [ImageFilterAlias.GAMMA_CORRECTION]; | |
| for (const [key, value] of Object.entries(settings)) { | |
| if (['player', 'workspace'].includes(key)) { | |
| settingsForSaving[key] = value; | |
| } | |
| if (key === 'imageFilters') { | |
| const filters = []; | |
| for (const filter of value) { | |
| if (supportedImageFilters.includes(filter.alias)) { | |
| filters.push(filter.modifier.toJSON()); | |
| } | |
| } | |
| settingsForSaving.imageFilters = filters; | |
| } | |
| } | |
| for (const [key] of Object.entries(shortcuts.keyMap)) { | |
| if (key in shortcuts.defaultState) { | |
| settingsForSaving.shortcuts.keyMap[key] = { | |
| sequences: shortcuts.keyMap[key].sequences, | |
| }; | |
| } | |
| } | |
| const supportedImageFilters = [ImageFilterAlias.GAMMA_CORRECTION]; | |
| const settingsForSaving = { | |
| player: settings.player, | |
| workspace: settings.workspace, | |
| shortcuts: { | |
| keyMap: Object.entries(shortcuts.keyMap).reduce(() => { ...TODO ...}), | |
| }, | |
| imageFilters: settings.imageFilters.filter((imageFilter) => supportedImageFilters.includes(filter.alias)).map((imageFilter) => imageFilter.modifier.toJSON()), | |
| }; |
bsekachev
reviewed
Feb 11, 2025
|
|
||
| export function restoreSettingsAsync(): ThunkAction { | ||
| return async (dispatch, getState): Promise<void> => { | ||
| const state: CombinedState = getState(); |
There was a problem hiding this comment.
I understand that you just copypasted the code, but the current implementation looks mind blowing. So, if you have ideas how it can be refactored, you are welcome
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.
Motivation and context
savebutton on the settings modal, now settings are auto savedHow has this been tested?
Checklist
developbranchLicense
Feel free to contact the maintainers if that's a concern.