{{ badge.name }}
+ @let badgeToShow = badge(); + @if (badgeToShow) { +{{ badgeToShow.name }}
} @else {{{ 'addon.badges.badgedetails' | translate }}
} @@ -13,68 +14,68 @@{{ 'addon.badges.badgedetails' | translate }}
{{ 'core.name' | translate}}
-{{ badge.name }}
+{{ badgeToShow.name }}
{{ 'addon.badges.issuername' | translate}}
-
{{ 'core.course' | translate}}
-
{{ 'core.description' | translate}}
-{{ badge.description }}
+{{ badgeToShow.description }}
{{ 'addon.badges.alignment' | translate}}
{{ alignment.targetName }}
diff --git a/src/addons/badges/pages/badge-class/badge-class.ts b/src/addons/badges/pages/badge-class/badge-class.ts index 1af8131e333..e3023f439c4 100644 --- a/src/addons/badges/pages/badge-class/badge-class.ts +++ b/src/addons/badges/pages/badge-class/badge-class.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnInit, inject } from '@angular/core'; +import { Component, OnInit, inject, signal } from '@angular/core'; import { CorePromiseUtils } from '@singletons/promise-utils'; import { CoreNavigator } from '@services/navigator'; import { ActivatedRoute } from '@angular/router'; @@ -38,9 +38,8 @@ export default class AddonBadgesBadgeClassPage implements OnInit { protected badgeId = 0; protected logView: (badge: AddonBadgesBadgeClass) => void; - badge?: AddonBadgesBadgeClass; - badgeLoaded = false; - currentTime = 0; + readonly badge = signal
- @if (badge) {
-
- ![]()
- @if (badge.dateexpire && currentTime >= badge.dateexpire) {
+ ![]()
+ @if (badgeToShow.dateexpire && currentTime() >= badgeToShow.dateexpire) {
+ {$a: (badgeToShow.dateexpire * 1000 | coreFormatDate)} }}" />
}
}
+ {$a: (badgeToShow.dateexpire * 1000 | coreFormatDate)} }}" />
}
- {{ 'addon.badges.awardedto' | translate: {$a: badge.recipientfullname } }} + {{ 'addon.badges.awardedto' | translate: {$a: badgeToShow.recipientfullname } }}
- {{ 'addon.badges.issuedon' | translate: {$a: (badge.dateissued * 1000 | coreFormatDate)} }} + {{ 'addon.badges.issuedon' | translate: + {$a: (badgeToShow.dateissued * 1000 | coreFormatDate)} }}
} - @if (badge.dateexpire) { - @if (currentTime < badge.dateexpire) { + @if (badgeToShow.dateexpire) { + @if (currentTime() < badgeToShow.dateexpire) {- {{ 'addon.badges.expiresin' | translate: {$a: (badge.dateexpire * 1000 | coreFormatDate)} }} + {{ 'addon.badges.expiresin' | translate: + {$a: (badgeToShow.dateexpire * 1000 | coreFormatDate)} }}
} @else {- {{ 'addon.badges.expiredin' | translate: {$a: (badge.dateexpire * 1000 | coreFormatDate)} }} + {{ 'addon.badges.expiredin' | translate: + {$a: (badgeToShow.dateexpire * 1000 | coreFormatDate)} }}
} } @@ -74,21 +78,21 @@+
-
{{ badge.description }}
+{{ badgeToShow.description }}
{{ 'addon.badges.version' | translate}}
-{{ badge.version }}
+{{ badgeToShow.version }}
{{ 'addon.badges.language' | translate}}
-{{ badge.language }}
+{{ badgeToShow.language }}
{{ 'addon.badges.imagecaption' | translate}}
-{{ badge.imagecaption }}
+{{ badgeToShow.imagecaption }}
{{ 'addon.badges.bendorsement' | translate}}
{{ 'addon.badges.issuername' | translate}}
-{{ badge.endorsement.issuername }}
+{{ badgeToShow.endorsement.issuername }}
{{ 'addon.badges.issueremail' | translate}}
- - {{ badge.endorsement.issueremail }} + + {{ badgeToShow.endorsement.issueremail }}
{{ 'addon.badges.issuerurl' | translate}}
-{{ 'addon.badges.dateawarded' | translate}}
-{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}
+{{ badgeToShow.endorsement.dateissued * 1000 | coreFormatDate }}
{{ 'addon.badges.claimid' | translate}}
-{{ 'addon.badges.claimcomment' | translate}}
-{{ badge.endorsement.claimcomment }}
+{{ badgeToShow.endorsement.claimcomment }}
{{ 'addon.badges.bendorsement' | translate}}
} - @if (badge.relatedbadges?.length > 0) { + @if (badgeToShow.relatedbadges?.length > 0) {{{ 'addon.badges.relatedbages' | translate}}
{{ relatedBadge.name }}
@@ -231,14 +235,14 @@{{ 'addon.badges.relatedbages' | translate}}
} - @if (badge.alignment?.length > 0) { + @if (badgeToShow.alignment?.length > 0) {{{ 'addon.badges.alignment' | translate}}
{{ alignment.targetName }}
diff --git a/src/addons/badges/pages/issued-badge/issued-badge.ts b/src/addons/badges/pages/issued-badge/issued-badge.ts index 841238b5469..2d4d5f39b77 100644 --- a/src/addons/badges/pages/issued-badge/issued-badge.ts +++ b/src/addons/badges/pages/issued-badge/issued-badge.ts @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -import { Component, OnDestroy, OnInit, inject } from '@angular/core'; +import { Component, OnDestroy, OnInit, computed, inject, signal } from '@angular/core'; import { CoreSites } from '@services/sites'; import { CoreUser } from '@features/user/services/user'; import { AddonBadges, AddonBadgesUserBadge } from '../../services/badges'; @@ -41,23 +41,31 @@ import { CoreAlerts } from '@services/overlays/alerts'; }) export default class AddonBadgesIssuedBadgePage implements OnInit, OnDestroy { + readonly courseId = CoreNavigator.getRouteNumberParam('courseId') || 0; // Use 0 for site badges. + protected readonly badgeHash = CoreNavigator.getRouteParam('badgeHash') || ''; + protected readonly userId = CoreNavigator.getRouteNumberParam('userId') || CoreSites.getRequiredCurrentSite().getUserId(); + protected route = inject(ActivatedRoute); - protected badgeHash = ''; - protected userId!: number; protected logView: (badge: AddonBadgesUserBadge) => void; - courseId = 0; - badge?: AddonBadgesUserBadge; - issuerWithMail = ''; - badges?: CoreSwipeNavigationItemsManager; - badgeLoaded = false; - currentTime = 0; + readonly badge = signal{{ 'addon.badges.badges' | translate }}
{{ badge.name }}
-{{ badge.dateissued * 1000 | coreFormatDate :'strftimedatetimeshort' }}
-{{ badge.name }}
+{{ badge.dateissued * 1000 | coreFormatDate :'strftimedatetimeshort' }}
+{{ 'addon.calendar.calendarevents' | translate }}
- {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
-
// Reload reminders if default notification time changes.
this.defaultTimeChangedObserver = CoreEvents.on(REMINDERS_DEFAULT_NOTIFICATION_TIME_CHANGED, () => {
this.loadReminders();
@@ -215,7 +206,6 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
* @returns Promise resolved when done.
*/
async fetchEvent(sync = false, showErrors = false): Promise {
- this.isOnline = CoreNetwork.isOnline();
if (sync) {
const deleted = await this.syncEvents(showErrors);
@@ -685,7 +675,6 @@ export default class AddonCalendarEventPage implements OnInit, OnDestroy {
this.editEventObserver.off();
this.syncObserver.off();
this.manualSyncObserver.off();
- this.onlineObserver.unsubscribe();
this.newEventObserver.off();
this.events?.destroy();
this.appResumeSubscription.unsubscribe();
diff --git a/src/addons/calendar/pages/index/index.html b/src/addons/calendar/pages/index/index.html
index e20082c93fa..b7511c397f2 100644
--- a/src/addons/calendar/pages/index/index.html
+++ b/src/addons/calendar/pages/index/index.html
@@ -23,7 +23,7 @@ {{ 'addon.calendar.calendar' | translate }}
}
diff --git a/src/addons/calendar/pages/index/index.ts b/src/addons/calendar/pages/index/index.ts
index b1bfa57cd92..fd5ce539613 100644
--- a/src/addons/calendar/pages/index/index.ts
+++ b/src/addons/calendar/pages/index/index.ts
@@ -21,8 +21,7 @@ import { AddonCalendar } from '../../services/calendar';
import { AddonCalendarOffline } from '../../services/calendar-offline';
import { AddonCalendarSync } from '../../services/calendar-sync';
import { AddonCalendarFilter, AddonCalendarHelper } from '../../services/calendar-helper';
-import { NgZone, Translate } from '@singletons';
-import { Subscription } from 'rxjs';
+import { Translate } from '@singletons';
import { CoreEnrolledCourseData } from '@features/courses/services/courses';
import { ActivatedRoute, Params } from '@angular/router';
import { AddonCalendarCalendarComponent } from '../../components/calendar/calendar';
@@ -73,7 +72,6 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
protected undeleteEventObserver?: CoreEventObserver;
protected syncObserver?: CoreEventObserver;
protected manualSyncObserver?: CoreEventObserver;
- protected onlineObserver?: Subscription;
protected filterChangedObserver?: CoreEventObserver;
protected route = inject(ActivatedRoute);
@@ -83,7 +81,7 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
courses: CoreEnrolledCourseData[] = [];
loaded = false;
hasOffline = false;
- isOnline = false;
+ readonly isOnline = CoreNetwork.onlineSignal();
syncIcon = CoreConstants.ICON_LOADING;
showCalendar = true;
loadUpcoming = false;
@@ -165,14 +163,6 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
this.canCreate = await AddonCalendarHelper.canEditEvents(this.filter.courseId);
},
);
-
- // Refresh online status when changes.
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
}
/**
@@ -209,7 +199,6 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
async fetchData(sync?: boolean, showErrors?: boolean): Promise {
this.syncIcon = CoreConstants.ICON_LOADING;
- this.isOnline = CoreNetwork.isOnline();
let refreshComponent = false;
@@ -418,7 +407,6 @@ export default class AddonCalendarIndexPage implements OnInit, OnDestroy {
this.syncObserver?.off();
this.manualSyncObserver?.off();
this.filterChangedObserver?.off();
- this.onlineObserver?.unsubscribe();
}
}
diff --git a/src/addons/coursecompletion/constants.ts b/src/addons/coursecompletion/constants.ts
new file mode 100644
index 00000000000..34b2307f1b9
--- /dev/null
+++ b/src/addons/coursecompletion/constants.ts
@@ -0,0 +1,35 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+/**
+ * Course completion criteria aggregation method.
+ */
+export enum AddonCourseCompletionAggregation {
+ ALL = 1,
+ ANY = 2,
+}
+
+/**
+ * Criteria type constant, primarily for storing criteria type in the database.
+ */
+export enum AddonCourseCompletionCriteriaType {
+ SELF = 1, // Self completion criteria type.
+ DATE = 2, // Date completion criteria type.
+ UNENROL = 3, // Unenrol completion criteria type.
+ ACTIVITY = 4, // Activity completion criteria type.
+ DURATION = 5, // Duration completion criteria type.
+ GRADE = 6, // Grade completion criteria type.
+ ROLE = 7, // Role completion criteria type.
+ COURSE = 8, // Course completion criteria type.
+}
diff --git a/src/addons/coursecompletion/pages/report/report.html b/src/addons/coursecompletion/pages/report/report.html
index e5f06895d6b..5a41a438035 100644
--- a/src/addons/coursecompletion/pages/report/report.html
+++ b/src/addons/coursecompletion/pages/report/report.html
@@ -9,34 +9,35 @@ {{ 'addon.coursecompletion.coursecompletion' | translate }}
-
+
-
- @if (user) {
+
+ @let userDisplay = user();
+ @if (userDisplay) {
-
- {{user.fullname}}
+ {{userDisplay.fullname}}
}
- @if (completion && tracked) {
+ @let completionDisplay = completion();
+ @if (completionDisplay && tracked()) {
{{ 'addon.coursecompletion.status' | translate }}
- {{ statusText! | translate }}
+ {{ statusText() | translate }}
{{ 'addon.coursecompletion.required' | translate }}
- @if (completion.aggregation === 1) {
+ @if (completionDisplay.aggregation === aggregationType.ALL) {
{{ 'addon.coursecompletion.criteriarequiredall' | translate }}
- }
- @if (completion.aggregation === 2) {
+ } @else if (completionDisplay.aggregation === aggregationType.ANY) {
{{ 'addon.coursecompletion.criteriarequiredany' | translate }}
}
@@ -48,21 +49,25 @@ {{ 'addon.coursecompletion.coursecompletion' | translate }}
{{ 'addon.coursecompletion.requiredcriteria' | translate }}
{{ 'addon.calendar.calendar' | translate }}
}{{ 'addon.coursecompletion.coursecompletion' | translate }}
{{user.fullname}}
+{{userDisplay.fullname}}
{{ 'addon.coursecompletion.status' | translate }}
-{{ statusText! | translate }}
+{{ statusText() | translate }}
{{ 'addon.coursecompletion.required' | translate }}
- @if (completion.aggregation === 1) { + @if (completionDisplay.aggregation === aggregationType.ALL) {{{ 'addon.coursecompletion.criteriarequiredall' | translate }}
- } - @if (completion.aggregation === 2) { + } @else if (completionDisplay.aggregation === aggregationType.ANY) {{{ 'addon.coursecompletion.criteriarequiredany' | translate }}
}{{ 'addon.coursecompletion.coursecompletion' | translate }}
{{ 'addon.coursecompletion.requiredcriteria' | translate }}
{{ 'addon.coursecompletion.manualselfcompletion' | translate }}
{{ 'addon.mod_chat.currentusers' | translate }}
{{ user.fullname }}
- @if (currentUserId !== user.id && isOnline) { + @if (currentUserId !== user.id && isOnline()) {{{ 'addon.mod_chat.mustbeonlinetosendmessages' | translate }}
diff --git a/src/addons/mod/chat/pages/chat/chat.ts b/src/addons/mod/chat/pages/chat/chat.ts index edf196fa841..424ac83befc 100644 --- a/src/addons/mod/chat/pages/chat/chat.ts +++ b/src/addons/mod/chat/pages/chat/chat.ts @@ -20,9 +20,8 @@ import { CoreNetwork } from '@services/network'; import { CoreNavigator } from '@services/navigator'; import { CoreSites } from '@services/sites'; import { CorePromiseUtils } from '@singletons/promise-utils'; -import { NgZone, Translate } from '@singletons'; +import { Translate } from '@singletons'; import { CoreEvents } from '@singletons/events'; -import { Subscription } from 'rxjs'; import { AddonModChatUsersModalResult } from '../../components/users-modal/users-modal'; import { AddonModChat, AddonModChatUser } from '../../services/chat'; import { AddonModChatFormattedMessage, AddonModChatHelper } from '../../services/chat-helper'; @@ -58,7 +57,7 @@ export default class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave messages: AddonModChatFormattedMessage[] = []; newMessage?: string; polling?: number; - isOnline: boolean; + readonly isOnline = CoreNetwork.onlineSignal(); currentUserId: number; sending = false; courseId!: number; @@ -68,7 +67,6 @@ export default class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave protected sessionId?: string; protected lastTime = 0; protected oldContentHeight = 0; - protected onlineSubscription: Subscription; protected viewDestroyed = false; protected pollingRunning = false; protected users: AddonModChatUser[] = []; @@ -76,13 +74,6 @@ export default class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave constructor() { this.currentUserId = CoreSites.getCurrentSiteUserId(); - this.isOnline = CoreNetwork.isOnline(); - this.onlineSubscription = CoreNetwork.onChange().subscribe(() => { - // Execute the callback in the Angular zone, so change detection doesn't stop working. - NgZone.run(() => { - this.isOnline = CoreNetwork.isOnline(); - }); - }); this.logView = CoreTime.once(() => { CoreAnalytics.logEvent({ @@ -393,7 +384,6 @@ export default class AddonModChatChatPage implements OnInit, OnDestroy, CanLeave * @inheritdoc */ ngOnDestroy(): void { - this.onlineSubscription && this.onlineSubscription.unsubscribe(); this.stopPolling(); this.viewDestroyed = true; } diff --git a/src/addons/mod/feedback/pages/form/form.html b/src/addons/mod/feedback/pages/form/form.html index aa772e8a8ee..c455e9010b4 100644 --- a/src/addons/mod/feedback/pages/form/form.html +++ b/src/addons/mod/feedback/pages/form/form.html @@ -118,11 +118,11 @@
@case ('captcha') {
@if (!preview) {
- @if (!offline) {
+ @if (!offline()) {
diff --git a/src/addons/mod/feedback/pages/form/form.ts b/src/addons/mod/feedback/pages/form/form.ts
index 497d06d6756..3467d9aebc2 100644
--- a/src/addons/mod/feedback/pages/form/form.ts
+++ b/src/addons/mod/feedback/pages/form/form.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnDestroy, OnInit, viewChild } from '@angular/core';
+import { Component, effect, OnInit, signal, viewChild } from '@angular/core';
import { CoreSite } from '@classes/sites/site';
import { CoreCourse, CoreCourseCommonModWSOptions } from '@features/course/services/course';
import { CoreCourseModuleData } from '@features/course/services/course-helper';
@@ -22,9 +22,8 @@ import { CoreNetwork } from '@services/network';
import { CoreNavigator } from '@services/navigator';
import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
import { CoreUtils } from '@singletons/utils';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreEvents } from '@singletons/events';
-import { Subscription } from 'rxjs';
import {
AddonModFeedback,
AddonModFeedbackGetFeedbackAccessInformationWSResponse,
@@ -61,13 +60,12 @@ import { CoreContentLinksHelper } from '@features/contentlinks/services/contentl
CoreSharedModule,
],
})
-export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanLeave {
+export default class AddonModFeedbackFormPage implements OnInit, CanLeave {
readonly content = viewChild(IonContent);
protected module?: CoreCourseModuleData;
protected currentPage?: number;
- protected onlineObserver: Subscription;
protected originalData?: Record;
protected currentSite: CoreSite;
protected forceLeave = false;
@@ -80,7 +78,8 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
feedback?: AddonModFeedbackWSFeedback;
completionPageContents?: string;
component = ADDON_MOD_FEEDBACK_COMPONENT_LEGACY;
- offline = false;
+ readonly offline = signal(false);
+ readonly isOnline = CoreNetwork.onlineSignal();
feedbackLoaded = false;
access?: AddonModFeedbackGetFeedbackAccessInformationWSResponse;
items: AddonModFeedbackFormItem[] = [];
@@ -93,13 +92,9 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
constructor() {
this.currentSite = CoreSites.getRequiredCurrentSite();
- // Refresh online status when changes.
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.offline = !CoreNetwork.isOnline();
- });
- });
+ effect((() => {
+ this.offline.set(!this.isOnline());
+ }));
}
/**
@@ -182,10 +177,9 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
try {
this.module = await CoreCourse.getModule(this.cmId, this.courseId, undefined, true, false, this.currentSite.getId());
- this.offline = !CoreNetwork.isOnline();
const options = {
cmId: this.cmId,
- readingStrategy: this.offline ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
+ readingStrategy: this.offline() ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
siteId: this.currentSite.getId(),
};
@@ -226,13 +220,13 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
try {
this.access = await AddonModFeedback.getFeedbackAccessInformation(this.feedback.id, options);
} catch (error) {
- if (this.offline || CoreWSError.isWebServiceError(error)) {
+ if (this.offline() || CoreWSError.isWebServiceError(error)) {
// Already offline or shouldn't go offline, fail.
throw error;
}
// If it fails, go offline.
- this.offline = true;
+ this.offline.set(true);
options.readingStrategy = CoreSitesReadingStrategy.PREFER_CACHE;
this.access = await AddonModFeedback.getFeedbackAccessInformation(this.feedback.id, options);
@@ -253,13 +247,13 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
try {
return await AddonModFeedback.getResumePage(this.feedback.id, options);
} catch (error) {
- if (this.offline || CoreWSError.isWebServiceError(error)) {
+ if (this.offline() || CoreWSError.isWebServiceError(error)) {
// Already offline or shouldn't go offline, fail.
throw error;
}
// Go offline.
- this.offline = true;
+ this.offline.set(true);
options.readingStrategy = CoreSitesReadingStrategy.PREFER_CACHE;
return AddonModFeedback.getResumePage(this.feedback.id, options);
@@ -300,7 +294,7 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
const options = {
cmId: this.cmId,
- readingStrategy: this.offline ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
+ readingStrategy: this.offline() ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
siteId: this.currentSite.getId(),
};
@@ -321,13 +315,13 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
try {
response = await AddonModFeedback.getPageItemsWithValues(this.feedback.id, page, options);
} catch (error) {
- if (this.offline || CoreWSError.isWebServiceError(error)) {
+ if (this.offline() || CoreWSError.isWebServiceError(error)) {
// Already offline or shouldn't go offline, fail.
throw error;
}
// Go offline.
- this.offline = true;
+ this.offline.set(true);
options.readingStrategy = CoreSitesReadingStrategy.PREFER_CACHE;
response = await AddonModFeedback.getPageItemsWithValues(this.feedback.id, page, options);
@@ -391,7 +385,7 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
await this.fetchAccessData({
cmId: this.cmId,
- readingStrategy: this.offline ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
+ readingStrategy: this.offline() ? CoreSitesReadingStrategy.PREFER_CACHE : CoreSitesReadingStrategy.ONLY_NETWORK,
siteId: this.currentSite.getId(),
});
@@ -500,11 +494,4 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
});
}
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- this.onlineObserver.unsubscribe();
- }
-
}
diff --git a/src/addons/mod/forum/pages/discussion/discussion.html b/src/addons/mod/forum/pages/discussion/discussion.html
index 1d7543d90a5..e0fa1ae896a 100644
--- a/src/addons/mod/forum/pages/discussion/discussion.html
+++ b/src/addons/mod/forum/pages/discussion/discussion.html
@@ -16,11 +16,11 @@
- @if (discussionLoaded && !postHasOffline && isOnline) {
+ @if (discussionLoaded && !postHasOffline && isOnline()) {
{
try {
+ const isOnline = CoreNetwork.isOnline();
const result = await AddonModGlossary.getEntry(entryId);
- const canDeleteEntries = CoreNetwork.isOnline() && await AddonModGlossary.canDeleteEntries();
- const canUpdateEntries = CoreNetwork.isOnline() && await AddonModGlossary.canUpdateEntries();
+ const canDeleteEntries = isOnline && await AddonModGlossary.canDeleteEntries();
+ const canUpdateEntries = isOnline && await AddonModGlossary.canUpdateEntries();
this.onlineEntry = result.entry;
this.ratingInfo = result.ratinginfo;
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index c3c93f07910..5b8e3229090 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -31,7 +31,7 @@
[courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()" />
- @if (triedToPlay && !isOnline && (!siteCanDownload || hasMissingDependencies)) {
+ @if (triedToPlay && !isOnline() && (!siteCanDownload || hasMissingDependencies)) {
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index dc815abacbc..a27153a7322 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -51,8 +51,7 @@ import {
} from '../../constants';
import { CoreH5PMissingDependenciesError } from '@features/h5p/classes/errors/missing-dependencies-error';
import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
-import { Subscription } from 'rxjs';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreError } from '@classes/errors/error';
import { CoreErrorHelper } from '@services/error-helper';
import { CoreAlerts } from '@services/overlays/alerts';
@@ -105,7 +104,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
hasMissingDependencies = false;
saveFreq?: number;
contentState?: string;
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
triedToPlay = false;
protected fetchContentDefaultError = 'addon.mod_h5pactivity.errorgetactivity';
@@ -114,7 +113,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
protected observer?: CoreEventObserver;
protected messageListenerFunction: (event: MessageEvent) => Promise;
protected checkCompletionAfterLog = false; // It's called later, when the user plays the package.
- protected onlineObserver: Subscription;
protected offlineErrorAlert: HTMLIonAlertElement | null = null;
constructor() {
@@ -126,47 +124,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
// Listen for messages from the iframe.
this.messageListenerFunction = (event) => this.onIframeMessage(event);
window.addEventListener('message', this.messageListenerFunction);
-
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.networkChanged();
- });
- });
- }
-
- /**
- * React to a network status change.
- */
- protected async networkChanged(): Promise {
- const wasOnline = this.isOnline;
- this.isOnline = CoreNetwork.isOnline();
-
- if (this.isOnline && this.offlineErrorAlert) {
- // Back online, dismiss the offline error alert.
- this.offlineErrorAlert.dismiss();
- this.offlineErrorAlert = null;
- }
-
- if (this.playing && !this.fileUrl && !this.isOnline && wasOnline && this.trackComponent) {
- // User lost connection while playing an online package with tracking. Show an error.
- this.offlineErrorAlert = await CoreAlerts.showError(
- new CoreError(Translate.instant('core.course.changesofflinemaybelost'), {
- title: Translate.instant('core.youreoffline'),
- }),
- );
-
- return;
- }
-
- if (this.isOnline && this.triedToPlay) {
- // User couldn't play the package because he was offline, but he reconnected. Try again.
- this.triedToPlay = false;
- this.play();
-
- return;
- }
}
/**
@@ -517,7 +474,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
return;
}
- if (!this.fileUrl && !this.isOnline) {
+ if (!this.fileUrl && !this.isOnline()) {
this.triedToPlay = true;
CoreAlerts.showError(new CoreError(Translate.instant('core.connectandtryagain'), {
@@ -821,7 +778,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
super.ngOnDestroy();
this.observer?.off();
- this.onlineObserver.unsubscribe();
// Wait a bit to make sure all messages have been received.
setTimeout(() => {
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index f027fc6d046..a2d6fafc7dd 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -114,7 +114,7 @@
@if (mode === 'external') {
- @if (isIOS && (!shouldOpenInBrowser || !isOnline)) {
+ @if (isIOS && (!shouldOpenInBrowser || !isOnline())) {
{{ 'core.openwith' | translate }}
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index c44c41672cf..1948fd36722 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -13,7 +13,7 @@
// limitations under the License.
import { DownloadStatus } from '@/core/constants';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourse } from '@features/course/services/course';
@@ -23,8 +23,7 @@ import { CoreFileHelper } from '@services/file-helper';
import { CoreSites } from '@services/sites';
import { CoreMimetype } from '@singletons/mimetype';
import { CoreText } from '@singletons/text';
-import { NgZone, Translate } from '@singletons';
-import { Subscription } from 'rxjs';
+import { Translate } from '@singletons';
import {
AddonModResource,
AddonModResourceCustomData,
@@ -52,7 +51,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreCourseModuleNavigationComponent,
],
})
-export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
+export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
component = ADDON_MOD_RESOURCE_COMPONENT_LEGACY;
pluginName = 'resource';
@@ -64,7 +63,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
warning = '';
isIOS = false;
openFileAction = OpenFileAction;
- isOnline = false;
+ readonly isOnline = CoreNetwork.onlineSignal();
isStreamedFile = false;
shouldOpenInBrowser = false;
@@ -76,8 +75,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
isExternalFile = false;
outdatedStatus = DownloadStatus.OUTDATED;
- protected onlineObserver?: Subscription;
-
/**
* @inheritdoc
*/
@@ -85,15 +82,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
super.ngOnInit();
this.isIOS = CorePlatform.isIOS();
- this.isOnline = CoreNetwork.isOnline();
-
- // Refresh online status when changes.
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
await this.loadContent();
}
@@ -204,7 +192,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
* Opens a file.
*
* @param iOSOpenFileAction Action to do in iOS.
- * @returns Promise resolved when done.
*/
async open(iOSOpenFileAction?: OpenFileAction): Promise {
let downloadable = await CoreCourseModulePrefetchDelegate.isModuleDownloadable(this.module, this.courseId);
@@ -215,7 +202,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
if (downloadable) {
- if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline && !this.isExternalFile) {
+ if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline() && !this.isExternalFile) {
// Warn the user that the file isn't updated.
const alert = await CoreAlerts.show({
message: Translate.instant('addon.mod_resource.resourcestatusoutdatedconfirm'),
@@ -224,20 +211,14 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
await alert.onWillDismiss();
}
- return AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+ await AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+
+ return;
}
}
// The resource cannot be downloaded, open the activity in browser.
- await CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(this.module.url || '');
- }
-
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- super.ngOnDestroy();
- this.onlineObserver?.unsubscribe();
+ await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLogin(this.module.url ?? '');
}
}
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index c4432cd4e37..6d7c29cd145 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -183,7 +183,6 @@ export class AddonModResourceHelperProvider {
* @param module Module where to get the contents.
* @param courseId Course Id, used for completion purposes.
* @param options Options to open the file.
- * @returns Resolved when done.
*/
async openModuleFile(module: CoreCourseModuleData, courseId: number, options: CoreOpenerOpenFileOptions = {}): Promise {
const modal = await CoreLoadings.show();
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index d3c82ba2f40..b346c188d93 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -236,7 +236,7 @@ {{'core.grades.grades' | translate}}
}
- @if (useOnlinePlayer && !isOnline) {
+ @if (useOnlinePlayer && !isOnline()) {
@@ -248,7 +248,7 @@ {{'core.grades.grades' | translate}}
}
- @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline)) {
+ @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline())) {
@if (!downloading && !skip) {
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 022978f8345..e2078149069 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -20,7 +20,7 @@ import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { CoreSync } from '@services/sync';
import { CoreObject } from '@singletons/object';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { AddonModScormPrefetchHandler } from '../../services/handlers/prefetch';
import {
@@ -50,7 +50,6 @@ import {
import { CoreWait } from '@singletons/wait';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
import { CoreAlerts } from '@services/overlays/alerts';
import { CoreCourseModuleNavigationComponent } from '@features/course/components/module-navigation/module-navigation';
import { CoreCourseModuleInfoComponent } from '@features/course/components/module-info/module-info';
@@ -104,7 +103,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
onlineAttempts: AttemptGrade[] = []; // Grades for online attempts.
offlineAttempts: AttemptGrade[] = []; // Grades for offline attempts.
gradesExpanded = false;
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
protected fetchContentDefaultError = 'addon.mod_scorm.errorgetscorm'; // Default error to show when loading contents.
protected syncEventName = ADDON_MOD_SCORM_DATA_AUTO_SYNCED;
@@ -115,19 +114,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
protected dataSentObserver?: CoreEventObserver; // To detect data sent to server.
protected dataSent = false; // Whether some data was sent to server while playing the SCORM.
protected useOnlinePlayer = false; // Whether the SCORM needs to be played using an online player.
- protected onlineObserver: Subscription;
-
- constructor() {
- super();
-
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
- }
/**
* @inheritdoc
@@ -516,7 +502,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
if (this.useOnlinePlayer) {
// No need to download the package, just open it.
- if (this.isOnline) {
+ if (this.isOnline()) {
this.openScorm(scoId, preview);
}
@@ -666,13 +652,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
return result;
}
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- this.onlineObserver.unsubscribe();
- }
-
}
/**
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index c8cb815fd42..54c2d603a7e 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -20,7 +20,7 @@
@if (canEdit) {
- @if (isOnline || pageIsOffline) {
+ @if (isOnline() || pageIsOffline) {
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index b465fd243a9..dc53e556494 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -28,7 +28,7 @@ import {
import { IonContent } from '@ionic/angular';
import { ContextLevel, CoreConstants } from '@/core/constants';
import { CoreNavigator } from '@services/navigator';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreUser } from '@features/user/services/user';
import { CoreText } from '@singletons/text';
@@ -38,7 +38,6 @@ import { CoreCommentsDBRecord } from '@features/comments/services/database/comme
import { CoreTime } from '@singletons/time';
import { CoreNetwork } from '@services/network';
import { dayjs } from '@/core/utils/dayjs';
-import { Subscription } from 'rxjs';
import { CoreAnimations } from '@components/animations';
import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
import { CoreLoadings } from '@services/overlays/loadings';
@@ -89,11 +88,10 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
currentUserId: number;
sending = false;
newComment = '';
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
protected addDeleteCommentsAvailable = false;
protected syncObserver?: CoreEventObserver;
- protected onlineObserver: Subscription;
protected viewDestroyed = false;
protected scrollBottom = true;
protected scrollElement?: HTMLElement;
@@ -120,14 +118,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
}
}, CoreSites.getCurrentSiteId());
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
-
effect(() => {
const shown = CoreKeyboard.keyboardShownSignal();
@@ -701,7 +691,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
*/
ngOnDestroy(): void {
this.syncObserver?.off();
- this.onlineObserver.unsubscribe();
this.viewDestroyed = true;
}
diff --git a/src/core/features/course/classes/base-course-format-component.ts b/src/core/features/course/classes/base-course-format-component.ts
new file mode 100644
index 00000000000..83b95ad6b15
--- /dev/null
+++ b/src/core/features/course/classes/base-course-format-component.ts
@@ -0,0 +1,43 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Input, Component, EventEmitter, Output } from '@angular/core';
+import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreCourseFormatComponent } from '../components/course-format/course-format';
+import { CoreCourseSection, CoreCourseModuleCompletionData } from '../services/course-helper';
+import { CoreCourseSectionToDisplay } from '../components/course-section/course-section';
+
+/**
+ * Template class to easily create components for course formats.
+ */
+@Component({
+ template: '',
+})
+export abstract class CoreCourseFormatBaseComponent {
+
+ @Input() course?: CoreCourseAnyCourseData; // The course to render.
+ @Input() sections?: CoreCourseSection[]; // List of course sections.
+ @Input() section?: CoreCourseSectionToDisplay; // Current section.
+ @Input() initialSectionId?: number; // The section to load first (by ID).
+ @Input() initialSectionNumber?: number; // The section to load first (by number).
+ @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
+
+ // Special input, allows access to the parent instance properties and methods.
+ // Please notice that all the other inputs/outputs are also accessible through this instance, so they could be removed.
+ // However, we decided to keep them to support ngOnChanges and to make templates easier to read.
+ @Input() coreCourseFormatComponent?: CoreCourseFormatComponent;
+
+ @Output() completionChanged = new EventEmitter(); // Notify when any module completion changes.
+
+}
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index e5891e4dd9e..85f1327e6a6 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -257,7 +257,7 @@
}
-@if (loaded && isOnline && displayOptions.displayRefresh) {
+@if (loaded && isOnline() && displayOptions.displayRefresh) {
@if (!hasOffline) {
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 3e2ae787450..159bb1fff9b 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -29,9 +29,8 @@ import { CoreNavigator } from '@services/navigator';
import { CoreSites } from '@services/sites';
import { CoreText } from '@singletons/text';
import { CoreUtils } from '@singletons/utils';
-import { ModalController, NgZone, Translate } from '@singletons';
+import { ModalController, Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { Subscription } from 'rxjs';
import { CoreSharedModule } from '@/core/shared.module';
import { toBoolean } from '@/core/transforms/boolean';
import { CorePromiseUtils } from '@singletons/promise-utils';
@@ -75,13 +74,12 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
downloadTimeReadable = ''; // Last download time in a readable format.
grades?: CoreGradesFormattedTableRow[];
blog = false; // If blog is available.
- isOnline = false; // If the app is online or not.
+ readonly isOnline = CoreNetwork.onlineSignal();
course?: CoreCourseAnyCourseData;
modicon = '';
moduleNameTranslated = '';
isTeacher = false;
- protected onlineSubscription: Subscription; // It will observe the status of the network connection.
protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
protected fileStatusObserver?: CoreEventObserver; // Observer of file status.
protected siteId: string;
@@ -89,15 +87,6 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
constructor() {
this.siteId = CoreSites.getCurrentSiteId();
- this.isOnline = CoreNetwork.isOnline();
-
- // Refresh online status when changes.
- this.onlineSubscription = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
}
/**
@@ -403,7 +392,6 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
this.isDestroyed = true;
this.packageStatusObserver?.off();
this.fileStatusObserver?.off();
- this.onlineSubscription.unsubscribe();
}
}
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index 7770ff8d32c..894370c5731 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, Input, OnChanges, SimpleChange, Output, EventEmitter, Type, viewChild } from '@angular/core';
+import { Component, OnChanges, SimpleChange, Type, viewChild } from '@angular/core';
import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreCourseModuleCompletionData, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
import { CoreCourse } from '@features/course/services/course';
import type { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreSharedModule } from '@/core/shared.module';
+import { CoreCourseFormatBaseComponent } from '@features/course/classes/base-course-format-component';
/**
* Component to display single activity format. It will determine the right component to use and instantiate it.
@@ -36,14 +36,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreSharedModule,
],
})
-export class CoreCourseFormatSingleActivityComponent implements OnChanges {
-
- @Input() course?: CoreCourseAnyCourseData; // The course to render.
- @Input() sections?: CoreCourseSection[]; // List of course sections.
- @Input() initialSectionId?: number; // The section to load first (by ID).
- @Input() initialSectionNumber?: number; // The section to load first (by number).
- @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
- @Output() completionChanged = new EventEmitter(); // Notify when any module completion changes.
+export class CoreCourseFormatSingleActivityComponent extends CoreCourseFormatBaseComponent implements OnChanges {
readonly dynamicComponent = viewChild(CoreDynamicComponent);
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 0d2b56e8ae9..4de6f66f452 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -108,7 +108,8 @@ {{ 'core.login.firsttime' | translate }}
}
@if (siteCheckError) {
-
+
+
{{ 'core.tryagain' | translate }}
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 18a23eb0d34..c5522dff12b 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -41,19 +41,19 @@ {{ 'core.settings.preferences' | translate}}
+ [disabled]="!isOnline() || (dataSaver && limitedConnection())">
- @if (!isOnline || (dataSaver && limitedConnection)) {
+ @if (!isOnline() || (dataSaver && limitedConnection())) {
- @if (isOnline && dataSaver && limitedConnection) {
+ @if (isOnline() && dataSaver && limitedConnection()) {
{{ 'core.settings.connectwifitosync' | translate }}
}
- @if (!isOnline) {
+ @if (!isOnline()) {
{{ 'core.settings.connecttosync' | translate }}
}
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index 3753edacf0c..963ef1ab1a4 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -23,8 +23,7 @@ import { CoreListItemsManager } from '@classes/items-management/list-items-manag
import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreConstants } from '@/core/constants';
import { CoreConfig } from '@services/config';
import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source';
@@ -49,12 +48,11 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
handlers: CoreListItemsManager;
dataSaver = false;
- limitedConnection = false;
- isOnline = true;
+ readonly limitedConnection = CoreNetwork.isCellularSignal();
+ readonly isOnline = CoreNetwork.onlineSignal();
protected siteId: string;
protected sitesObserver: CoreEventObserver;
- protected networkObserver: Subscription;
protected isDestroyed = false;
get handlerItems(): CoreSettingsHandlerToDisplay[] {
@@ -71,17 +69,6 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
this.refreshData();
}, this.siteId);
-
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
-
- this.networkObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
- });
- });
}
/**
@@ -163,7 +150,6 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
ngOnDestroy(): void {
this.isDestroyed = true;
this.sitesObserver.off();
- this.networkObserver.unsubscribe();
this.handlers.destroy();
}
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 097f0031140..134a4e2bca3 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -29,16 +29,16 @@ {{ 'core.settings.syncsettings' | translate }}
- @if (!isOnline || (dataSaver && limitedConnection)) {
+ @if (!isOnline() || (dataSaver && limitedConnection())) {
- @if (isOnline && dataSaver && limitedConnection) {
+ @if (isOnline() && dataSaver && limitedConnection()) {
{{ 'core.settings.connectwifitosync' | translate }}
}
- @if (!isOnline) {
+ @if (!isOnline()) {
{{ 'core.settings.connecttosync' | translate }}
}
diff --git a/src/core/features/settings/pages/synchronization/synchronization.ts b/src/core/features/settings/pages/synchronization/synchronization.ts
index 9da24d55b43..0f42b051e13 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.ts
+++ b/src/core/features/settings/pages/synchronization/synchronization.ts
@@ -19,10 +19,9 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreSites } from '@services/sites';
import { CoreConfig } from '@services/config';
import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/login-helper';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
import { CoreNavigator } from '@services/navigator';
import { CoreToasts } from '@services/overlays/toasts';
import { CoreAlerts } from '@services/overlays/alerts';
@@ -48,12 +47,11 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
sitesLoaded = false;
dataSaver = false;
- limitedConnection = false;
- isOnline = true;
+ readonly limitedConnection = CoreNetwork.isCellularSignal();
+ readonly isOnline = CoreNetwork.onlineSignal();
protected isDestroyed = false;
protected sitesObserver: CoreEventObserver;
- protected networkObserver: Subscription;
constructor() {
@@ -92,17 +90,6 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
}
});
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
-
- this.networkObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
- });
- });
-
}
/**
@@ -186,7 +173,6 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
ngOnDestroy(): void {
this.isDestroyed = true;
this.sitesObserver.off();
- this.networkObserver.unsubscribe();
}
}
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index 270f9ae91c6..184317036d6 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -12,15 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnChanges, Input, viewChild } from '@angular/core';
+import { Component, OnChanges, viewChild } from '@angular/core';
-import { CoreCourseFormatComponent } from '@features/course/components/course-format/course-format';
-import { CoreCourseSection } from '@features/course/services/course-helper';
import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
import { CoreSitePlugins, CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-content';
import { CoreSharedModule } from '@/core/shared.module';
+import { CoreCourseFormatBaseComponent } from '@features/course/classes/base-course-format-component';
/**
* Component that displays the index of a course format site plugin.
@@ -37,18 +35,7 @@ import { CoreSharedModule } from '@/core/shared.module';
'[class]': 'component',
},
})
-export class CoreSitePluginsCourseFormatComponent implements OnChanges {
-
- @Input() course?: CoreCourseAnyCourseData; // The course to render.
- @Input() sections?: CoreCourseSection[]; // List of course sections. The status will be calculated in this component.
- @Input() initialSectionId?: number; // The section to load first (by ID).
- @Input() initialSectionNumber?: number; // The section to load first (by number).
- @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
-
- // Special input, allows access to the parent instance properties and methods.
- // Please notice that all the other inputs/outputs are also accessible through this instance, so they could be removed.
- // However, we decided to keep them to support ngOnChanges and to make templates easier to read.
- @Input() coreCourseFormatComponent?: CoreCourseFormatComponent;
+export class CoreSitePluginsCourseFormatComponent extends CoreCourseFormatBaseComponent implements OnChanges {
readonly content = viewChild(CoreSitePluginsPluginContentComponent);
diff --git a/src/core/services/network.ts b/src/core/services/network.ts
index f2d13169e26..0f143b5f280 100644
--- a/src/core/services/network.ts
+++ b/src/core/services/network.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { effect, Injectable, Signal, signal } from '@angular/core';
+import { computed, effect, Injectable, Signal, signal } from '@angular/core';
import { CorePlatform } from '@services/platform';
import { Network } from '@awesome-cordova-plugins/network/ngx';
import { makeSingleton } from '@singletons';
@@ -326,6 +326,24 @@ export class CoreNetworkService extends Network {
return this.connectionType === CoreNetworkConnectionType.CELL;
}
+ /**
+ * Returns a signal to watch if the device uses a cellular connection.
+ *
+ * @returns Signal.
+ */
+ isCellularSignal(): Signal {
+ return computed(() => this.connectionTypeSignal()() === CoreNetworkConnectionType.CELL);
+ }
+
+ /**
+ * Returns a signal to watch if the device uses a wifi connection.
+ *
+ * @returns Signal.
+ */
+ isWifiSignal(): Signal {
+ return computed(() => this.connectionTypeSignal()() === CoreNetworkConnectionType.WIFI);
+ }
+
}
export const CoreNetwork = makeSingleton(CoreNetworkService);
diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts
index 445192f5c08..f0456088f5b 100644
--- a/src/core/services/screen.ts
+++ b/src/core/services/screen.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Injectable } from '@angular/core';
+import { Injectable, signal } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { distinctUntilChanged, map } from 'rxjs/operators';
@@ -66,6 +66,7 @@ export class CoreScreenService {
protected breakpointsSubject: BehaviorSubject>;
private _layoutObservable: Observable;
+ readonly orientationSignal = signal(CoreScreenOrientation.PORTRAIT);
constructor() {
this.breakpointsSubject = new BehaviorSubject(BREAKPOINT_NAMES.reduce((breakpoints, breakpoint) => ({
@@ -104,9 +105,7 @@ export class CoreScreenService {
}
get orientation(): CoreScreenOrientation {
- return screen.orientation.type.startsWith(CoreScreenOrientation.LANDSCAPE)
- ? CoreScreenOrientation.LANDSCAPE
- : CoreScreenOrientation.PORTRAIT;
+ return this.orientationSignal();
}
get isPortrait(): boolean {
@@ -124,7 +123,13 @@ export class CoreScreenService {
await CorePlatform.ready();
screen.orientation.addEventListener('change', () => {
- CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation: this.orientation });
+ this.orientationSignal.set(
+ screen.orientation.type.startsWith(CoreScreenOrientation.LANDSCAPE)
+ ? CoreScreenOrientation.LANDSCAPE
+ : CoreScreenOrientation.PORTRAIT,
+ );
+
+ CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation: this.orientationSignal() });
});
}
diff --git a/src/testing/services/behat-blocking.ts b/src/testing/services/behat-blocking.ts
index 19011b82817..f03972b2d75 100644
--- a/src/testing/services/behat-blocking.ts
+++ b/src/testing/services/behat-blocking.ts
@@ -27,6 +27,16 @@ import {
import { filter } from 'rxjs';
import { CoreNavigator } from '@services/navigator';
+enum BehatBlocking {
+ DOM_MUTATION = 'dom-mutation',
+ BLOCKED = 'blocked',
+ FORCED_DELAY = 'forced-delay',
+ DELAY = 'DELAY', // Special entry to indicate there are pending entries.
+ HTTP_REQUEST = 'httprequest-', // Prefix for HTTP requests.
+ GENERATED = 'generated-', // Prefix for generated keys.
+ NAVIGATION = 'navigation-', // Prefix for navigation keys.
+}
+
/**
* Behat block JS manager.
*/
@@ -136,10 +146,10 @@ export class TestingBehatBlockingService {
block(key = ''): string {
// Add a special DELAY entry whenever another entry is added.
if (this.pendingList.length === 0) {
- this.pendingList.push('DELAY');
+ this.pendingList.push(BehatBlocking.DELAY);
}
if (!key) {
- key = `generated-${this.keyIndex}`;
+ key = `${BehatBlocking.GENERATED}${this.keyIndex}`;
this.keyIndex++;
}
this.pendingList.push(key);
@@ -187,7 +197,7 @@ export class TestingBehatBlockingService {
* Adds a pending key to the array, but removes it after some ticks.
*/
async delay(): Promise {
- const key = this.block('forced-delay');
+ const key = this.block(BehatBlocking.FORCED_DELAY);
await this.unblock(key);
}
@@ -218,7 +228,7 @@ export class TestingBehatBlockingService {
if (!this.recentMutation) {
this.recentMutation = true;
- this.block('dom-mutation');
+ this.block(BehatBlocking.DOM_MUTATION);
setTimeout(() => {
this.pollRecentMutation();
@@ -246,7 +256,7 @@ export class TestingBehatBlockingService {
protected pollRecentMutation(): void {
if (Date.now() - this.lastMutation > 500) {
this.recentMutation = false;
- this.unblock('dom-mutation');
+ this.unblock(BehatBlocking.DOM_MUTATION);
return;
}
@@ -285,12 +295,12 @@ export class TestingBehatBlockingService {
if (isBlocked) {
if (!this.waitingBlocked) {
- this.block('blocked');
+ this.block(BehatBlocking.BLOCKED);
this.waitingBlocked = true;
}
} else {
if (this.waitingBlocked) {
- this.unblock('blocked');
+ this.unblock(BehatBlocking.BLOCKED);
this.waitingBlocked = false;
}
}
@@ -306,7 +316,7 @@ export class TestingBehatBlockingService {
XMLHttpRequest.prototype.open = function(...args) {
NgZone.run(() => {
const index = requestIndex++;
- const key = `httprequest-${index}`;
+ const key = `${BehatBlocking.HTTP_REQUEST}${index}`;
const isAsync = args[2] !== false;
try {
- @if (discussionLoaded && !postHasOffline && isOnline) {
+ @if (discussionLoaded && !postHasOffline && isOnline()) {
{
try {
+ const isOnline = CoreNetwork.isOnline();
const result = await AddonModGlossary.getEntry(entryId);
- const canDeleteEntries = CoreNetwork.isOnline() && await AddonModGlossary.canDeleteEntries();
- const canUpdateEntries = CoreNetwork.isOnline() && await AddonModGlossary.canUpdateEntries();
+ const canDeleteEntries = isOnline && await AddonModGlossary.canDeleteEntries();
+ const canUpdateEntries = isOnline && await AddonModGlossary.canUpdateEntries();
this.onlineEntry = result.entry;
this.ratingInfo = result.ratinginfo;
diff --git a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
index c3c93f07910..5b8e3229090 100644
--- a/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
+++ b/src/addons/mod/h5pactivity/components/index/addon-mod-h5pactivity-index.html
@@ -31,7 +31,7 @@
[courseId]="courseId" [hasDataToSync]="hasOffline" (completionChanged)="onCompletionChange()" />
- @if (triedToPlay && !isOnline && (!siteCanDownload || hasMissingDependencies)) {
+ @if (triedToPlay && !isOnline() && (!siteCanDownload || hasMissingDependencies)) {
diff --git a/src/addons/mod/h5pactivity/components/index/index.ts b/src/addons/mod/h5pactivity/components/index/index.ts
index dc815abacbc..a27153a7322 100644
--- a/src/addons/mod/h5pactivity/components/index/index.ts
+++ b/src/addons/mod/h5pactivity/components/index/index.ts
@@ -51,8 +51,7 @@ import {
} from '../../constants';
import { CoreH5PMissingDependenciesError } from '@features/h5p/classes/errors/missing-dependencies-error';
import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
-import { Subscription } from 'rxjs';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreError } from '@classes/errors/error';
import { CoreErrorHelper } from '@services/error-helper';
import { CoreAlerts } from '@services/overlays/alerts';
@@ -105,7 +104,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
hasMissingDependencies = false;
saveFreq?: number;
contentState?: string;
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
triedToPlay = false;
protected fetchContentDefaultError = 'addon.mod_h5pactivity.errorgetactivity';
@@ -114,7 +113,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
protected observer?: CoreEventObserver;
protected messageListenerFunction: (event: MessageEvent) => Promise;
protected checkCompletionAfterLog = false; // It's called later, when the user plays the package.
- protected onlineObserver: Subscription;
protected offlineErrorAlert: HTMLIonAlertElement | null = null;
constructor() {
@@ -126,47 +124,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
// Listen for messages from the iframe.
this.messageListenerFunction = (event) => this.onIframeMessage(event);
window.addEventListener('message', this.messageListenerFunction);
-
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.networkChanged();
- });
- });
- }
-
- /**
- * React to a network status change.
- */
- protected async networkChanged(): Promise {
- const wasOnline = this.isOnline;
- this.isOnline = CoreNetwork.isOnline();
-
- if (this.isOnline && this.offlineErrorAlert) {
- // Back online, dismiss the offline error alert.
- this.offlineErrorAlert.dismiss();
- this.offlineErrorAlert = null;
- }
-
- if (this.playing && !this.fileUrl && !this.isOnline && wasOnline && this.trackComponent) {
- // User lost connection while playing an online package with tracking. Show an error.
- this.offlineErrorAlert = await CoreAlerts.showError(
- new CoreError(Translate.instant('core.course.changesofflinemaybelost'), {
- title: Translate.instant('core.youreoffline'),
- }),
- );
-
- return;
- }
-
- if (this.isOnline && this.triedToPlay) {
- // User couldn't play the package because he was offline, but he reconnected. Try again.
- this.triedToPlay = false;
- this.play();
-
- return;
- }
}
/**
@@ -517,7 +474,7 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
return;
}
- if (!this.fileUrl && !this.isOnline) {
+ if (!this.fileUrl && !this.isOnline()) {
this.triedToPlay = true;
CoreAlerts.showError(new CoreError(Translate.instant('core.connectandtryagain'), {
@@ -821,7 +778,6 @@ export class AddonModH5PActivityIndexComponent extends CoreCourseModuleMainActiv
super.ngOnDestroy();
this.observer?.off();
- this.onlineObserver.unsubscribe();
// Wait a bit to make sure all messages have been received.
setTimeout(() => {
diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
index f027fc6d046..a2d6fafc7dd 100644
--- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html
+++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html
@@ -114,7 +114,7 @@
@if (mode === 'external') {
- @if (isIOS && (!shouldOpenInBrowser || !isOnline)) {
+ @if (isIOS && (!shouldOpenInBrowser || !isOnline())) {
{{ 'core.openwith' | translate }}
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index c44c41672cf..1948fd36722 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -13,7 +13,7 @@
// limitations under the License.
import { DownloadStatus } from '@/core/constants';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourse } from '@features/course/services/course';
@@ -23,8 +23,7 @@ import { CoreFileHelper } from '@services/file-helper';
import { CoreSites } from '@services/sites';
import { CoreMimetype } from '@singletons/mimetype';
import { CoreText } from '@singletons/text';
-import { NgZone, Translate } from '@singletons';
-import { Subscription } from 'rxjs';
+import { Translate } from '@singletons';
import {
AddonModResource,
AddonModResourceCustomData,
@@ -52,7 +51,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreCourseModuleNavigationComponent,
],
})
-export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
+export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
component = ADDON_MOD_RESOURCE_COMPONENT_LEGACY;
pluginName = 'resource';
@@ -64,7 +63,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
warning = '';
isIOS = false;
openFileAction = OpenFileAction;
- isOnline = false;
+ readonly isOnline = CoreNetwork.onlineSignal();
isStreamedFile = false;
shouldOpenInBrowser = false;
@@ -76,8 +75,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
isExternalFile = false;
outdatedStatus = DownloadStatus.OUTDATED;
- protected onlineObserver?: Subscription;
-
/**
* @inheritdoc
*/
@@ -85,15 +82,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
super.ngOnInit();
this.isIOS = CorePlatform.isIOS();
- this.isOnline = CoreNetwork.isOnline();
-
- // Refresh online status when changes.
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
await this.loadContent();
}
@@ -204,7 +192,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
* Opens a file.
*
* @param iOSOpenFileAction Action to do in iOS.
- * @returns Promise resolved when done.
*/
async open(iOSOpenFileAction?: OpenFileAction): Promise {
let downloadable = await CoreCourseModulePrefetchDelegate.isModuleDownloadable(this.module, this.courseId);
@@ -215,7 +202,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
if (downloadable) {
- if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline && !this.isExternalFile) {
+ if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline() && !this.isExternalFile) {
// Warn the user that the file isn't updated.
const alert = await CoreAlerts.show({
message: Translate.instant('addon.mod_resource.resourcestatusoutdatedconfirm'),
@@ -224,20 +211,14 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
await alert.onWillDismiss();
}
- return AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+ await AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+
+ return;
}
}
// The resource cannot be downloaded, open the activity in browser.
- await CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(this.module.url || '');
- }
-
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- super.ngOnDestroy();
- this.onlineObserver?.unsubscribe();
+ await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLogin(this.module.url ?? '');
}
}
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index c4432cd4e37..6d7c29cd145 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -183,7 +183,6 @@ export class AddonModResourceHelperProvider {
* @param module Module where to get the contents.
* @param courseId Course Id, used for completion purposes.
* @param options Options to open the file.
- * @returns Resolved when done.
*/
async openModuleFile(module: CoreCourseModuleData, courseId: number, options: CoreOpenerOpenFileOptions = {}): Promise {
const modal = await CoreLoadings.show();
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index d3c82ba2f40..b346c188d93 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -236,7 +236,7 @@ {{'core.grades.grades' | translate}}
}
- @if (useOnlinePlayer && !isOnline) {
+ @if (useOnlinePlayer && !isOnline()) {
@@ -248,7 +248,7 @@ {{'core.grades.grades' | translate}}
}
- @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline)) {
+ @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline())) {
@if (!downloading && !skip) {
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 022978f8345..e2078149069 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -20,7 +20,7 @@ import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { CoreSync } from '@services/sync';
import { CoreObject } from '@singletons/object';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { AddonModScormPrefetchHandler } from '../../services/handlers/prefetch';
import {
@@ -50,7 +50,6 @@ import {
import { CoreWait } from '@singletons/wait';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
import { CoreAlerts } from '@services/overlays/alerts';
import { CoreCourseModuleNavigationComponent } from '@features/course/components/module-navigation/module-navigation';
import { CoreCourseModuleInfoComponent } from '@features/course/components/module-info/module-info';
@@ -104,7 +103,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
onlineAttempts: AttemptGrade[] = []; // Grades for online attempts.
offlineAttempts: AttemptGrade[] = []; // Grades for offline attempts.
gradesExpanded = false;
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
protected fetchContentDefaultError = 'addon.mod_scorm.errorgetscorm'; // Default error to show when loading contents.
protected syncEventName = ADDON_MOD_SCORM_DATA_AUTO_SYNCED;
@@ -115,19 +114,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
protected dataSentObserver?: CoreEventObserver; // To detect data sent to server.
protected dataSent = false; // Whether some data was sent to server while playing the SCORM.
protected useOnlinePlayer = false; // Whether the SCORM needs to be played using an online player.
- protected onlineObserver: Subscription;
-
- constructor() {
- super();
-
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
- }
/**
* @inheritdoc
@@ -516,7 +502,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
if (this.useOnlinePlayer) {
// No need to download the package, just open it.
- if (this.isOnline) {
+ if (this.isOnline()) {
this.openScorm(scoId, preview);
}
@@ -666,13 +652,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
return result;
}
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- this.onlineObserver.unsubscribe();
- }
-
}
/**
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index c8cb815fd42..54c2d603a7e 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -20,7 +20,7 @@
@if (canEdit) {
- @if (isOnline || pageIsOffline) {
+ @if (isOnline() || pageIsOffline) {
diff --git a/src/core/features/comments/pages/viewer/viewer.ts b/src/core/features/comments/pages/viewer/viewer.ts
index b465fd243a9..dc53e556494 100644
--- a/src/core/features/comments/pages/viewer/viewer.ts
+++ b/src/core/features/comments/pages/viewer/viewer.ts
@@ -28,7 +28,7 @@ import {
import { IonContent } from '@ionic/angular';
import { ContextLevel, CoreConstants } from '@/core/constants';
import { CoreNavigator } from '@services/navigator';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreUser } from '@features/user/services/user';
import { CoreText } from '@singletons/text';
@@ -38,7 +38,6 @@ import { CoreCommentsDBRecord } from '@features/comments/services/database/comme
import { CoreTime } from '@singletons/time';
import { CoreNetwork } from '@services/network';
import { dayjs } from '@/core/utils/dayjs';
-import { Subscription } from 'rxjs';
import { CoreAnimations } from '@components/animations';
import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
import { CoreLoadings } from '@services/overlays/loadings';
@@ -89,11 +88,10 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
currentUserId: number;
sending = false;
newComment = '';
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
protected addDeleteCommentsAvailable = false;
protected syncObserver?: CoreEventObserver;
- protected onlineObserver: Subscription;
protected viewDestroyed = false;
protected scrollBottom = true;
protected scrollElement?: HTMLElement;
@@ -120,14 +118,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
}
}, CoreSites.getCurrentSiteId());
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
-
effect(() => {
const shown = CoreKeyboard.keyboardShownSignal();
@@ -701,7 +691,6 @@ export default class CoreCommentsViewerPage implements OnInit, OnDestroy, AfterV
*/
ngOnDestroy(): void {
this.syncObserver?.off();
- this.onlineObserver.unsubscribe();
this.viewDestroyed = true;
}
diff --git a/src/core/features/course/classes/base-course-format-component.ts b/src/core/features/course/classes/base-course-format-component.ts
new file mode 100644
index 00000000000..83b95ad6b15
--- /dev/null
+++ b/src/core/features/course/classes/base-course-format-component.ts
@@ -0,0 +1,43 @@
+// (C) Copyright 2015 Moodle Pty Ltd.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+import { Input, Component, EventEmitter, Output } from '@angular/core';
+import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
+import { CoreCourseFormatComponent } from '../components/course-format/course-format';
+import { CoreCourseSection, CoreCourseModuleCompletionData } from '../services/course-helper';
+import { CoreCourseSectionToDisplay } from '../components/course-section/course-section';
+
+/**
+ * Template class to easily create components for course formats.
+ */
+@Component({
+ template: '',
+})
+export abstract class CoreCourseFormatBaseComponent {
+
+ @Input() course?: CoreCourseAnyCourseData; // The course to render.
+ @Input() sections?: CoreCourseSection[]; // List of course sections.
+ @Input() section?: CoreCourseSectionToDisplay; // Current section.
+ @Input() initialSectionId?: number; // The section to load first (by ID).
+ @Input() initialSectionNumber?: number; // The section to load first (by number).
+ @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
+
+ // Special input, allows access to the parent instance properties and methods.
+ // Please notice that all the other inputs/outputs are also accessible through this instance, so they could be removed.
+ // However, we decided to keep them to support ngOnChanges and to make templates easier to read.
+ @Input() coreCourseFormatComponent?: CoreCourseFormatComponent;
+
+ @Output() completionChanged = new EventEmitter(); // Notify when any module completion changes.
+
+}
diff --git a/src/core/features/course/components/module-summary/module-summary.html b/src/core/features/course/components/module-summary/module-summary.html
index e5891e4dd9e..85f1327e6a6 100644
--- a/src/core/features/course/components/module-summary/module-summary.html
+++ b/src/core/features/course/components/module-summary/module-summary.html
@@ -257,7 +257,7 @@
}
-@if (loaded && isOnline && displayOptions.displayRefresh) {
+@if (loaded && isOnline() && displayOptions.displayRefresh) {
@if (!hasOffline) {
diff --git a/src/core/features/course/components/module-summary/module-summary.ts b/src/core/features/course/components/module-summary/module-summary.ts
index 3e2ae787450..159bb1fff9b 100644
--- a/src/core/features/course/components/module-summary/module-summary.ts
+++ b/src/core/features/course/components/module-summary/module-summary.ts
@@ -29,9 +29,8 @@ import { CoreNavigator } from '@services/navigator';
import { CoreSites } from '@services/sites';
import { CoreText } from '@singletons/text';
import { CoreUtils } from '@singletons/utils';
-import { ModalController, NgZone, Translate } from '@singletons';
+import { ModalController, Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
-import { Subscription } from 'rxjs';
import { CoreSharedModule } from '@/core/shared.module';
import { toBoolean } from '@/core/transforms/boolean';
import { CorePromiseUtils } from '@singletons/promise-utils';
@@ -75,13 +74,12 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
downloadTimeReadable = ''; // Last download time in a readable format.
grades?: CoreGradesFormattedTableRow[];
blog = false; // If blog is available.
- isOnline = false; // If the app is online or not.
+ readonly isOnline = CoreNetwork.onlineSignal();
course?: CoreCourseAnyCourseData;
modicon = '';
moduleNameTranslated = '';
isTeacher = false;
- protected onlineSubscription: Subscription; // It will observe the status of the network connection.
protected packageStatusObserver?: CoreEventObserver; // Observer of package status.
protected fileStatusObserver?: CoreEventObserver; // Observer of file status.
protected siteId: string;
@@ -89,15 +87,6 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
constructor() {
this.siteId = CoreSites.getCurrentSiteId();
- this.isOnline = CoreNetwork.isOnline();
-
- // Refresh online status when changes.
- this.onlineSubscription = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
}
/**
@@ -403,7 +392,6 @@ export class CoreCourseModuleSummaryComponent implements OnInit, OnDestroy {
this.isDestroyed = true;
this.packageStatusObserver?.off();
this.fileStatusObserver?.off();
- this.onlineSubscription.unsubscribe();
}
}
diff --git a/src/core/features/course/format/singleactivity/components/singleactivity.ts b/src/core/features/course/format/singleactivity/components/singleactivity.ts
index 7770ff8d32c..894370c5731 100644
--- a/src/core/features/course/format/singleactivity/components/singleactivity.ts
+++ b/src/core/features/course/format/singleactivity/components/singleactivity.ts
@@ -12,16 +12,16 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, Input, OnChanges, SimpleChange, Output, EventEmitter, Type, viewChild } from '@angular/core';
+import { Component, OnChanges, SimpleChange, Type, viewChild } from '@angular/core';
import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
import { CoreCourseUnsupportedModuleComponent } from '@features/course/components/unsupported-module/unsupported-module';
import { CoreDynamicComponent } from '@components/dynamic-component/dynamic-component';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
-import { CoreCourseModuleCompletionData, CoreCourseModuleData, CoreCourseSection } from '@features/course/services/course-helper';
+import { CoreCourseModuleData } from '@features/course/services/course-helper';
import { CoreCourse } from '@features/course/services/course';
import type { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreSharedModule } from '@/core/shared.module';
+import { CoreCourseFormatBaseComponent } from '@features/course/classes/base-course-format-component';
/**
* Component to display single activity format. It will determine the right component to use and instantiate it.
@@ -36,14 +36,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreSharedModule,
],
})
-export class CoreCourseFormatSingleActivityComponent implements OnChanges {
-
- @Input() course?: CoreCourseAnyCourseData; // The course to render.
- @Input() sections?: CoreCourseSection[]; // List of course sections.
- @Input() initialSectionId?: number; // The section to load first (by ID).
- @Input() initialSectionNumber?: number; // The section to load first (by number).
- @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
- @Output() completionChanged = new EventEmitter(); // Notify when any module completion changes.
+export class CoreCourseFormatSingleActivityComponent extends CoreCourseFormatBaseComponent implements OnChanges {
readonly dynamicComponent = viewChild(CoreDynamicComponent);
diff --git a/src/core/features/login/pages/credentials/credentials.html b/src/core/features/login/pages/credentials/credentials.html
index 0d2b56e8ae9..4de6f66f452 100644
--- a/src/core/features/login/pages/credentials/credentials.html
+++ b/src/core/features/login/pages/credentials/credentials.html
@@ -108,7 +108,8 @@ {{ 'core.login.firsttime' | translate }}
}
@if (siteCheckError) {
-
+
+
{{ 'core.tryagain' | translate }}
diff --git a/src/core/features/settings/pages/site/site.html b/src/core/features/settings/pages/site/site.html
index 18a23eb0d34..c5522dff12b 100644
--- a/src/core/features/settings/pages/site/site.html
+++ b/src/core/features/settings/pages/site/site.html
@@ -41,19 +41,19 @@ {{ 'core.settings.preferences' | translate}}
+ [disabled]="!isOnline() || (dataSaver && limitedConnection())">
- @if (!isOnline || (dataSaver && limitedConnection)) {
+ @if (!isOnline() || (dataSaver && limitedConnection())) {
- @if (isOnline && dataSaver && limitedConnection) {
+ @if (isOnline() && dataSaver && limitedConnection()) {
{{ 'core.settings.connectwifitosync' | translate }}
}
- @if (!isOnline) {
+ @if (!isOnline()) {
{{ 'core.settings.connecttosync' | translate }}
}
diff --git a/src/core/features/settings/pages/site/site.ts b/src/core/features/settings/pages/site/site.ts
index 3753edacf0c..963ef1ab1a4 100644
--- a/src/core/features/settings/pages/site/site.ts
+++ b/src/core/features/settings/pages/site/site.ts
@@ -23,8 +23,7 @@ import { CoreListItemsManager } from '@classes/items-management/list-items-manag
import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/routed-items-manager-sources-tracker';
import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreConstants } from '@/core/constants';
import { CoreConfig } from '@services/config';
import { CoreSettingsHandlersSource } from '@features/settings/classes/settings-handlers-source';
@@ -49,12 +48,11 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
handlers: CoreListItemsManager;
dataSaver = false;
- limitedConnection = false;
- isOnline = true;
+ readonly limitedConnection = CoreNetwork.isCellularSignal();
+ readonly isOnline = CoreNetwork.onlineSignal();
protected siteId: string;
protected sitesObserver: CoreEventObserver;
- protected networkObserver: Subscription;
protected isDestroyed = false;
get handlerItems(): CoreSettingsHandlerToDisplay[] {
@@ -71,17 +69,6 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
this.sitesObserver = CoreEvents.on(CoreEvents.SITE_UPDATED, () => {
this.refreshData();
}, this.siteId);
-
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
-
- this.networkObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
- });
- });
}
/**
@@ -163,7 +150,6 @@ export default class CoreSitePreferencesPage implements AfterViewInit, OnDestroy
ngOnDestroy(): void {
this.isDestroyed = true;
this.sitesObserver.off();
- this.networkObserver.unsubscribe();
this.handlers.destroy();
}
diff --git a/src/core/features/settings/pages/synchronization/synchronization.html b/src/core/features/settings/pages/synchronization/synchronization.html
index 097f0031140..134a4e2bca3 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.html
+++ b/src/core/features/settings/pages/synchronization/synchronization.html
@@ -29,16 +29,16 @@ {{ 'core.settings.syncsettings' | translate }}
- @if (!isOnline || (dataSaver && limitedConnection)) {
+ @if (!isOnline() || (dataSaver && limitedConnection())) {
- @if (isOnline && dataSaver && limitedConnection) {
+ @if (isOnline() && dataSaver && limitedConnection()) {
{{ 'core.settings.connectwifitosync' | translate }}
}
- @if (!isOnline) {
+ @if (!isOnline()) {
{{ 'core.settings.connecttosync' | translate }}
}
diff --git a/src/core/features/settings/pages/synchronization/synchronization.ts b/src/core/features/settings/pages/synchronization/synchronization.ts
index 9da24d55b43..0f42b051e13 100644
--- a/src/core/features/settings/pages/synchronization/synchronization.ts
+++ b/src/core/features/settings/pages/synchronization/synchronization.ts
@@ -19,10 +19,9 @@ import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreSites } from '@services/sites';
import { CoreConfig } from '@services/config';
import { CoreSettingsHelper } from '@features/settings/services/settings-helper';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreAccountsList, CoreLoginHelper } from '@features/login/services/login-helper';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
import { CoreNavigator } from '@services/navigator';
import { CoreToasts } from '@services/overlays/toasts';
import { CoreAlerts } from '@services/overlays/alerts';
@@ -48,12 +47,11 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
sitesLoaded = false;
dataSaver = false;
- limitedConnection = false;
- isOnline = true;
+ readonly limitedConnection = CoreNetwork.isCellularSignal();
+ readonly isOnline = CoreNetwork.onlineSignal();
protected isDestroyed = false;
protected sitesObserver: CoreEventObserver;
- protected networkObserver: Subscription;
constructor() {
@@ -92,17 +90,6 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
}
});
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
-
- this.networkObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- this.limitedConnection = CoreNetwork.isCellular();
- });
- });
-
}
/**
@@ -186,7 +173,6 @@ export default class CoreSettingsSynchronizationPage implements OnInit, OnDestro
ngOnDestroy(): void {
this.isDestroyed = true;
this.sitesObserver.off();
- this.networkObserver.unsubscribe();
}
}
diff --git a/src/core/features/siteplugins/components/course-format/course-format.ts b/src/core/features/siteplugins/components/course-format/course-format.ts
index 270f9ae91c6..184317036d6 100644
--- a/src/core/features/siteplugins/components/course-format/course-format.ts
+++ b/src/core/features/siteplugins/components/course-format/course-format.ts
@@ -12,15 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Component, OnChanges, Input, viewChild } from '@angular/core';
+import { Component, OnChanges, viewChild } from '@angular/core';
-import { CoreCourseFormatComponent } from '@features/course/components/course-format/course-format';
-import { CoreCourseSection } from '@features/course/services/course-helper';
import { CoreCourseFormatDelegate } from '@features/course/services/format-delegate';
-import { CoreCourseAnyCourseData } from '@features/courses/services/courses';
import { CoreSitePlugins, CoreSitePluginsContent } from '@features/siteplugins/services/siteplugins';
import { CoreSitePluginsPluginContentComponent } from '../plugin-content/plugin-content';
import { CoreSharedModule } from '@/core/shared.module';
+import { CoreCourseFormatBaseComponent } from '@features/course/classes/base-course-format-component';
/**
* Component that displays the index of a course format site plugin.
@@ -37,18 +35,7 @@ import { CoreSharedModule } from '@/core/shared.module';
'[class]': 'component',
},
})
-export class CoreSitePluginsCourseFormatComponent implements OnChanges {
-
- @Input() course?: CoreCourseAnyCourseData; // The course to render.
- @Input() sections?: CoreCourseSection[]; // List of course sections. The status will be calculated in this component.
- @Input() initialSectionId?: number; // The section to load first (by ID).
- @Input() initialSectionNumber?: number; // The section to load first (by number).
- @Input() moduleId?: number; // The module ID to scroll to. Must be inside the initial selected section.
-
- // Special input, allows access to the parent instance properties and methods.
- // Please notice that all the other inputs/outputs are also accessible through this instance, so they could be removed.
- // However, we decided to keep them to support ngOnChanges and to make templates easier to read.
- @Input() coreCourseFormatComponent?: CoreCourseFormatComponent;
+export class CoreSitePluginsCourseFormatComponent extends CoreCourseFormatBaseComponent implements OnChanges {
readonly content = viewChild(CoreSitePluginsPluginContentComponent);
diff --git a/src/core/services/network.ts b/src/core/services/network.ts
index f2d13169e26..0f143b5f280 100644
--- a/src/core/services/network.ts
+++ b/src/core/services/network.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { effect, Injectable, Signal, signal } from '@angular/core';
+import { computed, effect, Injectable, Signal, signal } from '@angular/core';
import { CorePlatform } from '@services/platform';
import { Network } from '@awesome-cordova-plugins/network/ngx';
import { makeSingleton } from '@singletons';
@@ -326,6 +326,24 @@ export class CoreNetworkService extends Network {
return this.connectionType === CoreNetworkConnectionType.CELL;
}
+ /**
+ * Returns a signal to watch if the device uses a cellular connection.
+ *
+ * @returns Signal.
+ */
+ isCellularSignal(): Signal {
+ return computed(() => this.connectionTypeSignal()() === CoreNetworkConnectionType.CELL);
+ }
+
+ /**
+ * Returns a signal to watch if the device uses a wifi connection.
+ *
+ * @returns Signal.
+ */
+ isWifiSignal(): Signal {
+ return computed(() => this.connectionTypeSignal()() === CoreNetworkConnectionType.WIFI);
+ }
+
}
export const CoreNetwork = makeSingleton(CoreNetworkService);
diff --git a/src/core/services/screen.ts b/src/core/services/screen.ts
index 445192f5c08..f0456088f5b 100644
--- a/src/core/services/screen.ts
+++ b/src/core/services/screen.ts
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-import { Injectable } from '@angular/core';
+import { Injectable, signal } from '@angular/core';
import { BehaviorSubject, Observable } from 'rxjs';
import { distinctUntilChanged, map } from 'rxjs/operators';
@@ -66,6 +66,7 @@ export class CoreScreenService {
protected breakpointsSubject: BehaviorSubject>;
private _layoutObservable: Observable;
+ readonly orientationSignal = signal(CoreScreenOrientation.PORTRAIT);
constructor() {
this.breakpointsSubject = new BehaviorSubject(BREAKPOINT_NAMES.reduce((breakpoints, breakpoint) => ({
@@ -104,9 +105,7 @@ export class CoreScreenService {
}
get orientation(): CoreScreenOrientation {
- return screen.orientation.type.startsWith(CoreScreenOrientation.LANDSCAPE)
- ? CoreScreenOrientation.LANDSCAPE
- : CoreScreenOrientation.PORTRAIT;
+ return this.orientationSignal();
}
get isPortrait(): boolean {
@@ -124,7 +123,13 @@ export class CoreScreenService {
await CorePlatform.ready();
screen.orientation.addEventListener('change', () => {
- CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation: this.orientation });
+ this.orientationSignal.set(
+ screen.orientation.type.startsWith(CoreScreenOrientation.LANDSCAPE)
+ ? CoreScreenOrientation.LANDSCAPE
+ : CoreScreenOrientation.PORTRAIT,
+ );
+
+ CoreEvents.trigger(CoreEvents.ORIENTATION_CHANGE, { orientation: this.orientationSignal() });
});
}
diff --git a/src/testing/services/behat-blocking.ts b/src/testing/services/behat-blocking.ts
index 19011b82817..f03972b2d75 100644
--- a/src/testing/services/behat-blocking.ts
+++ b/src/testing/services/behat-blocking.ts
@@ -27,6 +27,16 @@ import {
import { filter } from 'rxjs';
import { CoreNavigator } from '@services/navigator';
+enum BehatBlocking {
+ DOM_MUTATION = 'dom-mutation',
+ BLOCKED = 'blocked',
+ FORCED_DELAY = 'forced-delay',
+ DELAY = 'DELAY', // Special entry to indicate there are pending entries.
+ HTTP_REQUEST = 'httprequest-', // Prefix for HTTP requests.
+ GENERATED = 'generated-', // Prefix for generated keys.
+ NAVIGATION = 'navigation-', // Prefix for navigation keys.
+}
+
/**
* Behat block JS manager.
*/
@@ -136,10 +146,10 @@ export class TestingBehatBlockingService {
block(key = ''): string {
// Add a special DELAY entry whenever another entry is added.
if (this.pendingList.length === 0) {
- this.pendingList.push('DELAY');
+ this.pendingList.push(BehatBlocking.DELAY);
}
if (!key) {
- key = `generated-${this.keyIndex}`;
+ key = `${BehatBlocking.GENERATED}${this.keyIndex}`;
this.keyIndex++;
}
this.pendingList.push(key);
@@ -187,7 +197,7 @@ export class TestingBehatBlockingService {
* Adds a pending key to the array, but removes it after some ticks.
*/
async delay(): Promise {
- const key = this.block('forced-delay');
+ const key = this.block(BehatBlocking.FORCED_DELAY);
await this.unblock(key);
}
@@ -218,7 +228,7 @@ export class TestingBehatBlockingService {
if (!this.recentMutation) {
this.recentMutation = true;
- this.block('dom-mutation');
+ this.block(BehatBlocking.DOM_MUTATION);
setTimeout(() => {
this.pollRecentMutation();
@@ -246,7 +256,7 @@ export class TestingBehatBlockingService {
protected pollRecentMutation(): void {
if (Date.now() - this.lastMutation > 500) {
this.recentMutation = false;
- this.unblock('dom-mutation');
+ this.unblock(BehatBlocking.DOM_MUTATION);
return;
}
@@ -285,12 +295,12 @@ export class TestingBehatBlockingService {
if (isBlocked) {
if (!this.waitingBlocked) {
- this.block('blocked');
+ this.block(BehatBlocking.BLOCKED);
this.waitingBlocked = true;
}
} else {
if (this.waitingBlocked) {
- this.unblock('blocked');
+ this.unblock(BehatBlocking.BLOCKED);
this.waitingBlocked = false;
}
}
@@ -306,7 +316,7 @@ export class TestingBehatBlockingService {
XMLHttpRequest.prototype.open = function(...args) {
NgZone.run(() => {
const index = requestIndex++;
- const key = `httprequest-${index}`;
+ const key = `${BehatBlocking.HTTP_REQUEST}${index}`;
const isAsync = args[2] !== false;
try {
@if (mode === 'external') {
- @if (isIOS && (!shouldOpenInBrowser || !isOnline)) {
+ @if (isIOS && (!shouldOpenInBrowser || !isOnline())) {
{{ 'core.openwith' | translate }}
diff --git a/src/addons/mod/resource/components/index/index.ts b/src/addons/mod/resource/components/index/index.ts
index c44c41672cf..1948fd36722 100644
--- a/src/addons/mod/resource/components/index/index.ts
+++ b/src/addons/mod/resource/components/index/index.ts
@@ -13,7 +13,7 @@
// limitations under the License.
import { DownloadStatus } from '@/core/constants';
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourse } from '@features/course/services/course';
@@ -23,8 +23,7 @@ import { CoreFileHelper } from '@services/file-helper';
import { CoreSites } from '@services/sites';
import { CoreMimetype } from '@singletons/mimetype';
import { CoreText } from '@singletons/text';
-import { NgZone, Translate } from '@singletons';
-import { Subscription } from 'rxjs';
+import { Translate } from '@singletons';
import {
AddonModResource,
AddonModResourceCustomData,
@@ -52,7 +51,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreCourseModuleNavigationComponent,
],
})
-export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit, OnDestroy {
+export class AddonModResourceIndexComponent extends CoreCourseModuleMainResourceComponent implements OnInit {
component = ADDON_MOD_RESOURCE_COMPONENT_LEGACY;
pluginName = 'resource';
@@ -64,7 +63,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
warning = '';
isIOS = false;
openFileAction = OpenFileAction;
- isOnline = false;
+ readonly isOnline = CoreNetwork.onlineSignal();
isStreamedFile = false;
shouldOpenInBrowser = false;
@@ -76,8 +75,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
isExternalFile = false;
outdatedStatus = DownloadStatus.OUTDATED;
- protected onlineObserver?: Subscription;
-
/**
* @inheritdoc
*/
@@ -85,15 +82,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
super.ngOnInit();
this.isIOS = CorePlatform.isIOS();
- this.isOnline = CoreNetwork.isOnline();
-
- // Refresh online status when changes.
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
await this.loadContent();
}
@@ -204,7 +192,6 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
* Opens a file.
*
* @param iOSOpenFileAction Action to do in iOS.
- * @returns Promise resolved when done.
*/
async open(iOSOpenFileAction?: OpenFileAction): Promise {
let downloadable = await CoreCourseModulePrefetchDelegate.isModuleDownloadable(this.module, this.courseId);
@@ -215,7 +202,7 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
downloadable = await AddonModResourceHelper.isMainFileDownloadable(this.module);
if (downloadable) {
- if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline && !this.isExternalFile) {
+ if (this.currentStatus === DownloadStatus.OUTDATED && !this.isOnline() && !this.isExternalFile) {
// Warn the user that the file isn't updated.
const alert = await CoreAlerts.show({
message: Translate.instant('addon.mod_resource.resourcestatusoutdatedconfirm'),
@@ -224,20 +211,14 @@ export class AddonModResourceIndexComponent extends CoreCourseModuleMainResource
await alert.onWillDismiss();
}
- return AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+ await AddonModResourceHelper.openModuleFile(this.module, this.courseId, { iOSOpenFileAction });
+
+ return;
}
}
// The resource cannot be downloaded, open the activity in browser.
- await CoreSites.getCurrentSite()?.openInBrowserWithAutoLogin(this.module.url || '');
- }
-
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- super.ngOnDestroy();
- this.onlineObserver?.unsubscribe();
+ await CoreSites.getRequiredCurrentSite().openInBrowserWithAutoLogin(this.module.url ?? '');
}
}
diff --git a/src/addons/mod/resource/services/resource-helper.ts b/src/addons/mod/resource/services/resource-helper.ts
index c4432cd4e37..6d7c29cd145 100644
--- a/src/addons/mod/resource/services/resource-helper.ts
+++ b/src/addons/mod/resource/services/resource-helper.ts
@@ -183,7 +183,6 @@ export class AddonModResourceHelperProvider {
* @param module Module where to get the contents.
* @param courseId Course Id, used for completion purposes.
* @param options Options to open the file.
- * @returns Resolved when done.
*/
async openModuleFile(module: CoreCourseModuleData, courseId: number, options: CoreOpenerOpenFileOptions = {}): Promise {
const modal = await CoreLoadings.show();
diff --git a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
index d3c82ba2f40..b346c188d93 100644
--- a/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
+++ b/src/addons/mod/scorm/components/index/addon-mod-scorm-index.html
@@ -236,7 +236,7 @@
@@ -248,7 +248,7 @@
}
- @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline)) {
+ @if ((!scorm.lastattemptlock || attemptsLeft > 0) && (!useOnlinePlayer || isOnline())) {
@if (!downloading && !skip) {
diff --git a/src/addons/mod/scorm/components/index/index.ts b/src/addons/mod/scorm/components/index/index.ts
index 022978f8345..e2078149069 100644
--- a/src/addons/mod/scorm/components/index/index.ts
+++ b/src/addons/mod/scorm/components/index/index.ts
@@ -20,7 +20,7 @@ import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { CoreSync } from '@services/sync';
import { CoreObject } from '@singletons/object';
-import { NgZone, Translate } from '@singletons';
+import { Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { AddonModScormPrefetchHandler } from '../../services/handlers/prefetch';
import {
@@ -50,7 +50,6 @@ import {
import { CoreWait } from '@singletons/wait';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreNetwork } from '@services/network';
-import { Subscription } from 'rxjs';
import { CoreAlerts } from '@services/overlays/alerts';
import { CoreCourseModuleNavigationComponent } from '@features/course/components/module-navigation/module-navigation';
import { CoreCourseModuleInfoComponent } from '@features/course/components/module-info/module-info';
@@ -104,7 +103,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
onlineAttempts: AttemptGrade[] = []; // Grades for online attempts.
offlineAttempts: AttemptGrade[] = []; // Grades for offline attempts.
gradesExpanded = false;
- isOnline: boolean;
+ readonly isOnline = CoreNetwork.onlineSignal();
protected fetchContentDefaultError = 'addon.mod_scorm.errorgetscorm'; // Default error to show when loading contents.
protected syncEventName = ADDON_MOD_SCORM_DATA_AUTO_SYNCED;
@@ -115,19 +114,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
protected dataSentObserver?: CoreEventObserver; // To detect data sent to server.
protected dataSent = false; // Whether some data was sent to server while playing the SCORM.
protected useOnlinePlayer = false; // Whether the SCORM needs to be played using an online player.
- protected onlineObserver: Subscription;
-
- constructor() {
- super();
-
- this.isOnline = CoreNetwork.isOnline();
- this.onlineObserver = CoreNetwork.onChange().subscribe(() => {
- // Execute the callback in the Angular zone, so change detection doesn't stop working.
- NgZone.run(() => {
- this.isOnline = CoreNetwork.isOnline();
- });
- });
- }
/**
* @inheritdoc
@@ -516,7 +502,7 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
if (this.useOnlinePlayer) {
// No need to download the package, just open it.
- if (this.isOnline) {
+ if (this.isOnline()) {
this.openScorm(scoId, preview);
}
@@ -666,13 +652,6 @@ export class AddonModScormIndexComponent extends CoreCourseModuleMainActivityCom
return result;
}
- /**
- * @inheritdoc
- */
- ngOnDestroy(): void {
- this.onlineObserver.unsubscribe();
- }
-
}
/**
diff --git a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
index c8cb815fd42..54c2d603a7e 100644
--- a/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
+++ b/src/addons/mod/wiki/components/index/addon-mod-wiki-index.html
@@ -20,7 +20,7 @@
@if (canEdit) {
- @if (isOnline || pageIsOffline) {
+ @if (isOnline() || pageIsOffline) {