From c6ecdfcbd2a8e48b1fc5169629471ebb53d0909f Mon Sep 17 00:00:00 2001 From: Thomas <78288562+Kiokuu@users.noreply.github.com> Date: Sat, 21 Dec 2024 22:15:13 +0000 Subject: [PATCH] Fix wristFilter and notyFilter reset + split them. (#1042) --- html/src/classes/sharedFeed.js | 23 ++++++++++++----------- html/src/mixins/dialogs/feedFilters.pug | 4 ++-- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/html/src/classes/sharedFeed.js b/html/src/classes/sharedFeed.js index d572f596..89ad31fc 100644 --- a/html/src/classes/sharedFeed.js +++ b/html/src/classes/sharedFeed.js @@ -579,17 +579,18 @@ export default class extends baseClass { this.updateSharedFeed(true); }, - async resetSharedFeedFilters() { - if (await configRepository.getString('sharedFeedFilters')) { - this.sharedFeedFilters = JSON.parse( - await configRepository.getString( - 'sharedFeedFilters', - JSON.stringify(this.sharedFeedFiltersDefaults) - ) - ); - } else { - this.sharedFeedFilters = this.sharedFeedFiltersDefaults; - } + async resetNotyFeedFilters(){ + this.sharedFeedFilters.noty = { + ...this.sharedFeedFiltersDefaults.noty + }; + await configRepository.setString('sharedFeedFilters', JSON.stringify(this.sharedFeedFiltersDefaults)); + }, + + async resetWristFeedFilters(){ + this.sharedFeedFilters.wrist = { + ...this.sharedFeedFiltersDefaults.wrist + }; + await configRepository.setString('sharedFeedFilters', JSON.stringify(this.sharedFeedFiltersDefaults)); } }; } diff --git a/html/src/mixins/dialogs/feedFilters.pug b/html/src/mixins/dialogs/feedFilters.pug index fae0d54c..3c891fa8 100644 --- a/html/src/mixins/dialogs/feedFilters.pug +++ b/html/src/mixins/dialogs/feedFilters.pug @@ -245,7 +245,7 @@ mixin feedFilters() el-radio-button(label="Off") {{ $t('dialog.shared_feed_filters.off') }} el-radio-button(label="On") {{ $t('dialog.shared_feed_filters.on') }} template(#footer) - el-button(type="small" @click="resetSharedFeedFilters") {{ $t('dialog.shared_feed_filters.reset') }} + el-button(size="small" @click="resetNotyFeedFilters") {{ $t('dialog.shared_feed_filters.reset') }} el-button(size="small" type="primary" style="margin-left:10px" @click="notyFeedFiltersDialog.visible = false") {{ $t('dialog.shared_feed_filters.close') }} //- dialog: wrist feed filters @@ -499,5 +499,5 @@ mixin feedFilters() el-radio-button(label="Off") {{ $t('dialog.shared_feed_filters.off') }} el-radio-button(label="On") {{ $t('dialog.shared_feed_filters.on') }} template(#footer) - el-button(size="small" @click="resetSharedFeedFilters") {{ $t('dialog.shared_feed_filters.reset') }} + el-button(size="small" @click="resetWristFeedFilters") {{ $t('dialog.shared_feed_filters.reset') }} el-button(size="small" type="primary" @click="wristFeedFiltersDialog.visible = false") {{ $t('dialog.shared_feed_filters.close') }}