EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-3947 calendar: Simplify observers management

main
Pau Ferrer Ocaña 2023-12-22 15:29:26 +01:00
parent 522d1e2c79
commit eb704d4203
1 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/addons/calendar/pages/day/day.ts
View File

@ -65,15 +65,8 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
protected currentSiteId: string; protected currentSiteId: string;
// Observers. // Observers.
protected newEventObserver: CoreEventObserver; protected eventObservers: CoreEventObserver[] = [];
protected discardedObserver: CoreEventObserver;
protected editEventObserver: CoreEventObserver;
protected deleteEventObserver: CoreEventObserver;
protected undeleteEventObserver: CoreEventObserver;
protected syncObserver: CoreEventObserver;
protected manualSyncObserver: CoreEventObserver;
protected onlineObserver: Subscription; protected onlineObserver: Subscription;
protected filterChangedObserver: CoreEventObserver;
protected managerUnsubscribe?: () => void; protected managerUnsubscribe?: () => void;
protected logView: () => void; protected logView: () => void;
@ -97,7 +90,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
this.currentSiteId = CoreSites.getCurrentSiteId(); this.currentSiteId = CoreSites.getCurrentSiteId();
// Listen for events added. When an event is added, reload the data. // Listen for events added. When an event is added, reload the data.
this.newEventObserver = CoreEvents.on( this.eventObservers.push(CoreEvents.on(
AddonCalendarProvider.NEW_EVENT_EVENT, AddonCalendarProvider.NEW_EVENT_EVENT,
(data) => { (data) => {
if (data && data.eventId) { if (data && data.eventId) {
@ -106,16 +99,16 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
} }
}, },
this.currentSiteId, this.currentSiteId,
); ));
// Listen for new event discarded event. When it does, reload the data. // Listen for new event discarded event. When it does, reload the data.
this.discardedObserver = CoreEvents.on(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, () => { this.eventObservers.push(CoreEvents.on(AddonCalendarProvider.NEW_EVENT_DISCARDED_EVENT, () => {
this.manager?.getSource().markAllItemsUnloaded(); this.manager?.getSource().markAllItemsUnloaded();
this.refreshData(true, true); this.refreshData(true, true);
}, this.currentSiteId); }, this.currentSiteId));
// Listen for events edited. When an event is edited, reload the data. // Listen for events edited. When an event is edited, reload the data.
this.editEventObserver = CoreEvents.on( this.eventObservers.push(CoreEvents.on(
AddonCalendarProvider.EDIT_EVENT_EVENT, AddonCalendarProvider.EDIT_EVENT_EVENT,
(data) => { (data) => {
if (data && data.eventId) { if (data && data.eventId) {
@ -124,25 +117,25 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
} }
}, },
this.currentSiteId, this.currentSiteId,
); ));
// Refresh data if calendar events are synchronized automatically. // Refresh data if calendar events are synchronized automatically.
this.syncObserver = CoreEvents.on(AddonCalendarSyncProvider.AUTO_SYNCED, () => { this.eventObservers.push(CoreEvents.on(AddonCalendarSyncProvider.AUTO_SYNCED, () => {
this.manager?.getSource().markAllItemsUnloaded(); this.manager?.getSource().markAllItemsUnloaded();
this.refreshData(false, true); this.refreshData(false, true);
}, this.currentSiteId); }, this.currentSiteId));
// Refresh data if calendar events are synchronized manually but not by this page. // Refresh data if calendar events are synchronized manually but not by this page.
this.manualSyncObserver = CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => { this.eventObservers.push(CoreEvents.on(AddonCalendarSyncProvider.MANUAL_SYNCED, (data) => {
const selectedDay = this.manager?.getSelectedItem(); const selectedDay = this.manager?.getSelectedItem();
if (data && (data.source != 'day' || !selectedDay || !data.moment || !selectedDay.moment.isSame(data.moment, 'day'))) { if (data && (data.source != 'day' || !selectedDay || !data.moment || !selectedDay.moment.isSame(data.moment, 'day'))) {
this.manager?.getSource().markAllItemsUnloaded(); this.manager?.getSource().markAllItemsUnloaded();
this.refreshData(false, true); this.refreshData(false, true);
} }
}, this.currentSiteId); }, this.currentSiteId));
// Update the events when an event is deleted. // Update the events when an event is deleted.
this.deleteEventObserver = CoreEvents.on( this.eventObservers.push(CoreEvents.on(
AddonCalendarProvider.DELETED_EVENT_EVENT, AddonCalendarProvider.DELETED_EVENT_EVENT,
(data) => { (data) => {
if (data && !data.sent) { if (data && !data.sent) {
@ -154,10 +147,10 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
} }
}, },
this.currentSiteId, this.currentSiteId,
); ));
// Listen for events "undeleted" (offline). // Listen for events "undeleted" (offline).
this.undeleteEventObserver = CoreEvents.on( this.eventObservers.push(CoreEvents.on(
AddonCalendarProvider.UNDELETED_EVENT_EVENT, AddonCalendarProvider.UNDELETED_EVENT_EVENT,
(data) => { (data) => {
if (!data || !data.eventId) { if (!data || !data.eventId) {
@ -168,9 +161,9 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
this.manager?.getSource().markAsDeleted(data.eventId, false); this.manager?.getSource().markAsDeleted(data.eventId, false);
}, },
this.currentSiteId, this.currentSiteId,
); ));
this.filterChangedObserver = CoreEvents.on( this.eventObservers.push(CoreEvents.on(
AddonCalendarProvider.FILTER_CHANGED_EVENT, AddonCalendarProvider.FILTER_CHANGED_EVENT,
async (data) => { async (data) => {
this.filter = data; this.filter = data;
@ -180,7 +173,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
this.manager?.getSource().filterAllDayEvents(this.filter); this.manager?.getSource().filterAllDayEvents(this.filter);
}, },
); ));
// Refresh online status when changes. // Refresh online status when changes.
this.onlineObserver = CoreNetwork.onChange().subscribe(() => { this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
@ -214,7 +207,7 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
} }
/** /**
* View loaded. * @inheritdoc
*/ */
ngOnInit(): void { ngOnInit(): void {
const types: string[] = []; const types: string[] = [];
@ -470,18 +463,11 @@ export class AddonCalendarDayPage implements OnInit, OnDestroy {
} }
/** /**
* Page destroyed. * @inheritdoc
*/ */
ngOnDestroy(): void { ngOnDestroy(): void {
this.newEventObserver?.off(); this.eventObservers.forEach((observer) => observer.off());
this.discardedObserver?.off();
this.editEventObserver?.off();
this.deleteEventObserver?.off();
this.undeleteEventObserver?.off();
this.syncObserver?.off();
this.manualSyncObserver?.off();
this.onlineObserver?.unsubscribe(); this.onlineObserver?.unsubscribe();
this.filterChangedObserver?.off();
this.manager?.getSource().forgetRelatedSources(); this.manager?.getSource().forgetRelatedSources();
this.manager?.destroy(); this.manager?.destroy();
this.managerUnsubscribe?.(); this.managerUnsubscribe?.();