Skip to content

fix: Wake the digest drawer Apply up only on a real change - EXO-89484 - eXIP7.3.0.22 #6046

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

Merged
azayati merged 2 commits into from
Sep 1, 2026
Merged

fix: Wake the digest drawer Apply up only on a real change - EXO-89484 - eXIP7.3.0.22 #6046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce1b1a2
fix: Wake the digest drawer Apply up only on a real change - EXO-8948…
azayati Sep 1, 2026
481f5b0
fix: Compare the digest drawer choices on their effective state - EXO…
azayati Sep 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions ...rc/main/webapp/vue-apps/notification-user-settings/components/UserSettingDigestDrawer.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,30 @@ export default {
dailyCategories: [],
weekly: false,
weeklyCategories: [],
loadedSettings: null,
}),
computed: {
allCategoryIds() {
return this.categories.map(category => category.id);
},
// An enabled frequency with no category would send an empty digest, the
// server refuses it as well
// The comparison is on the effective state: the categories of a frequency
// that is off don't count, unchecking a frequency after having played with
// its categories is going back to the initial state
changed() {
return this.loadedSettings
&& (this.daily !== this.loadedSettings.daily
|| this.weekly !== this.loadedSettings.weekly
|| this.daily && !this.sameCategories(this.dailyCategories, this.loadedSettings.dailyCategories)
|| this.weekly && !this.sameCategories(this.weeklyCategories, this.loadedSettings.weeklyCategories));
},
// Apply stays disabled until the user changes something, then follows the
// server rule: an enabled frequency with no category would send an empty
// digest, the server refuses it as well. Unchecking everything stays a
// change to apply: it is how the user switches his digest off
disabled() {
return this.saving
|| this.loading
|| !this.changed
|| this.daily && !this.dailyCategories.length
|| this.weekly && !this.weeklyCategories.length;
},
Expand Down Expand Up @@ -130,6 +145,14 @@ export default {
// categories already loaded to leave the choices of the user alone
this.daily = settings?.daily || false;
this.weekly = settings?.weekly || false;
// What the server holds right now: Apply wakes up when the choices
// differ from it
this.loadedSettings = {
daily: this.daily,
dailyCategories: this.dailyCategories.slice(),
weekly: this.weekly,
weeklyCategories: this.weeklyCategories.slice(),
};
})
.catch(() => {
this.$root.$emit('alert-message', this.$t('UserSettings.digest.error.load'), 'error');
Expand All @@ -146,8 +169,13 @@ export default {
this.dailyCategories = [];
this.weekly = false;
this.weeklyCategories = [];
this.loadedSettings = null;
this.saving = false;
},
sameCategories(categories, loadedCategories) {
return categories.length === loadedCategories.length
&& categories.every(id => loadedCategories.includes(id));
},
save() {
this.saving = true;
const dailyCategories = this.daily && this.dailyCategories || [];
Expand Down
Loading