MOBILE-4085 course-storage: Revert OnPush changes

main
Alfonso Salces 2022-11-25 07:53:03 +01:00
parent 5ddf7db897
commit fa0dcc0bfa
1 changed files with 17 additions and 20 deletions

View File

@ -13,7 +13,7 @@
// limitations under the License. // limitations under the License.
import { CoreConstants } from '@/core/constants'; import { CoreConstants } from '@/core/constants';
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, OnDestroy, OnInit } from '@angular/core'; import { Component, ElementRef, OnDestroy, OnInit } from '@angular/core';
import { CoreCourse, CoreCourseProvider } from '@features/course/services/course'; import { CoreCourse, CoreCourseProvider } from '@features/course/services/course';
import { import {
CoreCourseHelper, CoreCourseHelper,
@ -41,7 +41,6 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
selector: 'page-addon-storagemanager-course-storage', selector: 'page-addon-storagemanager-course-storage',
templateUrl: 'course-storage.html', templateUrl: 'course-storage.html',
styleUrls: ['course-storage.scss'], styleUrls: ['course-storage.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy { export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
@ -72,7 +71,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
protected isDestroyed = false; protected isDestroyed = false;
protected isGuest = false; protected isGuest = false;
constructor(protected elementRef: ElementRef, protected changeDetectorRef: ChangeDetectorRef) { constructor(protected elementRef: ElementRef) {
// Refresh the enabled flags if site is updated. // Refresh the enabled flags if site is updated.
this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => { this.siteUpdatedObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite(); this.downloadCourseEnabled = !CoreCourses.isDownloadCourseDisabledInSite();
@ -80,7 +79,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
this.initCoursePrefetch(); this.initCoursePrefetch();
this.initModulePrefetch(); this.initModulePrefetch();
this.changeDetectorRef.markForCheck();
}, CoreSites.getCurrentSiteId()); }, CoreSites.getCurrentSiteId());
} }
@ -136,7 +135,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
this.initCoursePrefetch(), this.initCoursePrefetch(),
this.initModulePrefetch(), this.initModulePrefetch(),
]); ]);
this.changeDetectorRef.markForCheck();
} }
/** /**
@ -314,13 +313,12 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
} }
module.calculatingSize = true; module.calculatingSize = true;
this.changeDetectorRef.markForCheck();
if (!section) { if (!section) {
section = this.sections.find((section) => section.modules.some((mod) => mod.id === module.id)); section = this.sections.find((section) => section.modules.some((mod) => mod.id === module.id));
if (section) { if (section) {
section.calculatingSize = true; section.calculatingSize = true;
this.changeDetectorRef.markForCheck();
} }
} }
@ -338,7 +336,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
// Ignore errors, it shouldn't happen. // Ignore errors, it shouldn't happen.
} finally { } finally {
module.calculatingSize = false; module.calculatingSize = false;
this.changeDetectorRef.markForCheck();
} }
})); }));
@ -346,7 +344,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
if (section) { if (section) {
section.calculatingSize = false; section.calculatingSize = false;
} }
this.changeDetectorRef.markForCheck();
} }
/** /**
@ -492,7 +490,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
await this.updateModulesSizes(modules, section); await this.updateModulesSizes(modules, section);
CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false); CoreCourseHelper.calculateSectionsStatus(this.sections, this.courseId, false, false);
this.changeDetectorRef.markForCheck();
} }
} }
@ -527,7 +525,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
*/ */
async prefecthSection(section: AddonStorageManagerCourseSection): Promise<void> { async prefecthSection(section: AddonStorageManagerCourseSection): Promise<void> {
section.isCalculating = true; section.isCalculating = true;
this.changeDetectorRef.markForCheck();
try { try {
await CoreCourseHelper.confirmDownloadSizeSection(this.courseId, section, this.sections); await CoreCourseHelper.confirmDownloadSizeSection(this.courseId, section, this.sections);
@ -540,19 +538,18 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
} }
} finally { } finally {
await this.updateModulesSizes(section.modules, section); await this.updateModulesSizes(section.modules, section);
this.changeDetectorRef.markForCheck();
} }
} catch (error) { } catch (error) {
// User cancelled or there was an error calculating the size. // User cancelled or there was an error calculating the size.
if (!this.isDestroyed && error) { if (!this.isDestroyed && error) {
CoreDomUtils.showErrorModal(error); CoreDomUtils.showErrorModal(error);
this.changeDetectorRef.markForCheck();
return; return;
} }
} finally { } finally {
section.isCalculating = false; section.isCalculating = false;
this.changeDetectorRef.markForCheck();
} }
} }
@ -576,7 +573,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
try { try {
// Get download size to ask for confirm if it's high. // Get download size to ask for confirm if it's high.
this.changeDetectorRef.markForCheck();
const size = await module.prefetchHandler.getDownloadSize(module, module.course, true); const size = await module.prefetchHandler.getDownloadSize(module, module.course, true);
await CoreCourseHelper.prefetchModule(module.prefetchHandler, module, size, module.course, refresh); await CoreCourseHelper.prefetchModule(module.prefetchHandler, module, size, module.course, refresh);
@ -590,7 +587,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
module.spinner = false; module.spinner = false;
await this.updateModulesSizes([module]); await this.updateModulesSizes([module]);
this.changeDetectorRef.markForCheck();
} }
} }
@ -609,7 +606,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
module.downloadStatus = status; module.downloadStatus = status;
module.handlerData?.updateStatus?.(status); module.handlerData?.updateStatus?.(status);
this.changeDetectorRef.markForCheck();
} }
/** /**
@ -649,7 +646,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
this.prefetchCourseData.icon = statusData.icon; this.prefetchCourseData.icon = statusData.icon;
this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable; this.prefetchCourseData.statusTranslatable = statusData.statusTranslatable;
this.prefetchCourseData.loading = statusData.loading; this.prefetchCourseData.loading = statusData.loading;
this.changeDetectorRef.markForCheck();
} }
/** /**
@ -671,7 +668,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
} }
try { try {
this.changeDetectorRef.markForCheck();
await CoreCourseHelper.confirmAndPrefetchCourse( await CoreCourseHelper.confirmAndPrefetchCourse(
this.prefetchCourseData, this.prefetchCourseData,
course, course,
@ -680,7 +677,7 @@ export class AddonStorageManagerCourseStoragePage implements OnInit, OnDestroy {
isGuest: this.isGuest, isGuest: this.isGuest,
}, },
); );
this.changeDetectorRef.markForCheck();
} catch (error) { } catch (error) {
if (this.isDestroyed) { if (this.isDestroyed) {
return; return;