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

Merge pull request #3342 from alfonso-salces/MOBILE-4085 

MOBILE-4085 core: Fix change detection
main
Noel De Martin 2022-07-11 17:11:53 +02:00 committed by GitHub
parent 51410fd697 b3d1a910fb
commit 2698e64a34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/directives/format-text.ts
View File

@ -25,6 +25,7 @@ import {
ViewChild,
OnDestroy,
Inject,
ChangeDetectorRef,
} from '@angular/core';
import { IonContent } from '@ionic/angular';
@ -177,6 +178,9 @@ export class CoreFormatTextDirective implements OnChanges, OnDestroy, AsyncCompo
extContent.ngAfterViewInit();
const changeDetectorRef = this.viewContainerRef.injector.get(ChangeDetectorRef);
changeDetectorRef.markForCheck();
return extContent;
}

4
src/core/features/course/components/module/core-course-module.html
View File

@ -17,8 +17,8 @@
</core-format-text>
<ion-icon name="fas-lock" *ngIf="module.visible === 0 || module.uservisible === false"
[attr.aria-label]="'core.restricted' | translate"></ion-icon>
<ion-icon [name]="prefetchStatusIcon" *ngIf="prefetchStatusIcon" color="success"
[attr.aria-label]="prefetchStatusText | translate"></ion-icon>
<ion-icon *ngIf="prefetchStatusIcon$ | async as prefetchStatusIcon" [name]="prefetchStatusIcon" color="success"
[attr.aria-label]="((prefetchStatusText$ | async) || '') | translate"></ion-icon>
</p>
<div class="core-module-additional-info">

17
src/core/features/course/components/module/module.ts
View File

@ -29,6 +29,7 @@ import {
} from '@features/course/services/module-prefetch-delegate';
import { CoreConstants } from '@/core/constants';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { BehaviorSubject } from 'rxjs';
/**
* Component to display a module entry in a list of modules.
@ -55,8 +56,8 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
modNameTranslated = '';
hasInfo = false;
showManualCompletion = false; // Whether to show manual completion when completion conditions are disabled.
prefetchStatusIcon = ''; // Module prefetch status icon.
prefetchStatusText = ''; // Module prefetch status text.
prefetchStatusIcon$ = new BehaviorSubject<string>(''); // Module prefetch status icon.
prefetchStatusText$ = new BehaviorSubject<string>(''); // Module prefetch status text.
autoCompletionTodo = false;
moduleHasView = true;
@ -137,16 +138,16 @@ export class CoreCourseModuleComponent implements OnInit, OnDestroy {
switch (prefetchstatus) {
case CoreConstants.OUTDATED:
this.prefetchStatusIcon = CoreConstants.ICON_OUTDATED;
this.prefetchStatusText = 'core.outdated';
this.prefetchStatusIcon$.next(CoreConstants.ICON_OUTDATED);
this.prefetchStatusText$.next('core.outdated');
break;
case CoreConstants.DOWNLOADED:
this.prefetchStatusIcon = CoreConstants.ICON_DOWNLOADED;
this.prefetchStatusText = 'core.downloaded';
this.prefetchStatusIcon$.next(CoreConstants.ICON_DOWNLOADED);
this.prefetchStatusText$.next('core.downloaded');
break;
default:
this.prefetchStatusIcon = '';
this.prefetchStatusText = '';
this.prefetchStatusIcon$.next('');
this.prefetchStatusText$.next('');
break;
}

2
src/core/features/h5p/components/h5p-player/core-h5p-player.html
View File

@ -5,7 +5,7 @@
</ion-button>
<div class="core-h5p-placeholder-download-container">
<core-download-refresh [status]="state" [enabled]="canDownload" [loading]="calculating" [canTrustDownload]="true"
<core-download-refresh [status]="state" [enabled]="canDownload$ | async" [loading]="calculating$ | async" [canTrustDownload]="true"
(action)="download()">
</core-download-refresh>
</div>

19
src/core/features/h5p/components/h5p-player/h5p-player.ts
View File

@ -26,6 +26,7 @@ import { CoreEvents, CoreEventObserver } from '@singletons/events';
import { CoreLogger } from '@singletons/logger';
import { CoreH5P } from '@features/h5p/services/h5p';
import { CoreH5PDisplayOptions } from '../../classes/core';
import { BehaviorSubject } from 'rxjs';
/**
* Component to render an H5P package.
@ -43,8 +44,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
showPackage = false;
state?: string;
canDownload = false;
calculating = true;
canDownload$ = new BehaviorSubject(false);
calculating$ = new BehaviorSubject(true);
displayOptions?: CoreH5PDisplayOptions;
urlParams?: {[name: string]: string};
@ -93,7 +94,7 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
this.displayOptions = CoreH5P.h5pPlayer.getDisplayOptionsFromUrlParams(this.urlParams);
this.showPackage = true;
if (!this.canDownload || (this.state != CoreConstants.OUTDATED && this.state != CoreConstants.NOT_DOWNLOADED)) {
if (!this.canDownload$.getValue() || (this.state != CoreConstants.OUTDATED && this.state != CoreConstants.NOT_DOWNLOADED)) {
return;
}
@ -181,8 +182,8 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
}
} else {
this.calculating = false;
this.canDownload = false;
this.calculating$.next(false);
this.canDownload$.next(false);
}
}
@ -194,18 +195,18 @@ export class CoreH5PPlayerComponent implements OnInit, OnChanges, OnDestroy {
* @return Promise resolved when done.
*/
protected async calculateState(): Promise<void> {
this.calculating = true;
this.calculating$.next(true);
// Get the status of the file.
try {
const state = await CoreFilepool.getFileStateByUrl(this.siteId, this.urlParams!.url);
this.canDownload = true;
this.canDownload$.next(true);
this.state = state;
} catch (error) {
this.canDownload = false;
this.canDownload$.next(false);
} finally {
this.calculating = false;
this.calculating$.next(false);
}
}