Merge pull request #4368 from crazyserver/MOBILE-4653

Mobile 4653

Author: dpalou

.travis.yml

@@ -2,7 +2,7 @@ os: linux
 dist: noble
 node_js: 20
 jdk:
-  - openjdk23
+  - openjdk17
 
 git:
   depth: 3

src/addons/block/recentlyaccesseditems/components/recentlyaccesseditems/recentlyaccesseditems.ts

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import { Component, OnInit } from '@angular/core';
-import { CoreSites } from '@services/sites';
 import { CoreBlockBaseComponent } from '@features/block/classes/base-block-component';
 import {
     AddonBlockRecentlyAccessedItems,
@@ -23,6 +22,7 @@ import { CoreText } from '@singletons/text';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { CoreUtils } from '@singletons/utils';
 import { CoreSharedModule } from '@/core/shared.module';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 
 /**
  * Component to render a recently accessed items block.
@@ -82,7 +82,6 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
      *
      * @param e Click event.
      * @param item Activity item info.
-     * @returns Promise resolved when done.
      */
     async action(e: Event, item: AddonBlockRecentlyAccessedItemsItemCalculatedData): Promise<void> {
         e.preventDefault();
@@ -92,7 +91,7 @@ export class AddonBlockRecentlyAccessedItemsComponent extends CoreBlockBaseCompo
         const modal = await CoreLoadings.show();
 
         try {
-            await CoreSites.visitLink(url);
+            await CoreContentLinksHelper.visitLink(url);
         } finally {
             modal.dismiss();
         }

src/addons/block/recentlyaccesseditems/services/recentlyaccesseditems.ts

@@ -14,7 +14,7 @@
 
 import { Injectable } from '@angular/core';
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreCourseModuleHelper } from '@features/course/services/course-module-helper';
 import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site';
 import { makeSingleton } from '@singletons';
@@ -67,10 +67,10 @@ export class AddonBlockRecentlyAccessedItemsProvider {
         const cmIds: number[] = [];
 
         const itemsToDisplay = await Promise.all(items.map(async (item: AddonBlockRecentlyAccessedItemsItemCalculatedData) => {
-            const modicon = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'src');
+            const modicon = item.icon && CoreDom.getHTMLElementAttribute(item.icon, 'src');
 
             item.iconUrl = await CoreCourseModuleDelegate.getModuleIconSrc(item.modname, modicon || undefined);
-            item.iconTitle = item.icon && CoreDomUtils.getHTMLElementAttribute(item.icon, 'title');
+            item.iconTitle = item.icon && CoreDom.getHTMLElementAttribute(item.icon, 'title');
             cmIds.push(item.cmid);
 
             return item;

src/addons/block/timeline/components/events/events.ts

@@ -20,6 +20,7 @@ import { CoreEnrolledCourseDataWithOptions } from '@features/courses/services/co
 import { AddonBlockTimelineDayEvents } from '@addons/block/timeline/classes/section';
 import { CoreSharedModule } from '@/core/shared.module';
 import { toBoolean } from '@/core/transforms/boolean';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 
 /**
  * Directive to render a list of events in course overview.
@@ -73,7 +74,7 @@ export class AddonBlockTimelineEventsComponent implements OnInit {
         const modal = await CoreLoadings.show();
 
         try {
-            await CoreSites.visitLink(url);
+            await CoreContentLinksHelper.visitLink(url);
         } finally {
             modal.dismiss();
         }

src/addons/messages/pages/discussion/discussion.ts

@@ -649,7 +649,7 @@ export default class AddonMessagesDiscussionPage implements OnInit, OnDestroy, A
 
         pagesToLoad--;
 
-        // Treat members. Don't use CoreUtilsProvider.arrayToObject because we don't want to override the existing object.
+        // Treat members. Don't use CoreArray.toObject because we don't want to override the existing object.
         if (result.members) {
             result.members.forEach((member) => {
                 this.members[member.id] = member;

src/addons/mod/book/services/book.ts

@@ -22,7 +22,7 @@ import { CoreCourse, CoreCourseModuleContentFile } from '@features/course/servic
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { CoreFilepool } from '@services/filepool';
 import { CoreText } from '@singletons/text';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreError } from '@classes/errors/error';
 import { CoreSiteWSPreSets } from '@classes/sites/authenticated-site';
 import { ADDON_MOD_BOOK_COMPONENT } from '../constants';
@@ -96,7 +96,7 @@ export class AddonModBookProvider {
         const content = await CoreWS.getText(url);
 
         // Now that we have the content, we update the SRC to point back to the external resource.
-        return CoreDomUtils.restoreSourcesInHtml(content, contentsMap[chapterId].paths);
+        return CoreDom.restoreSourcesInHtml(content, contentsMap[chapterId].paths);
     }
 
     /**

src/addons/mod/data/components/index/index.ts

@@ -24,7 +24,7 @@ import { IonContent } from '@ionic/angular';
 import { CoreGroupInfo, CoreGroups } from '@services/groups';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreTime } from '@singletons/time';
 import { CoreArray } from '@singletons/array';
 import { CoreEventObserver, CoreEvents } from '@singletons/events';
@@ -358,7 +358,7 @@ export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComp
                 this.fieldsArray,
             );
 
-            headerAndFooter = CoreDomUtils.fixHtml(headerAndFooter);
+            headerAndFooter = CoreDom.fixHtml(headerAndFooter);
 
             // Get first entry from the whole list.
             if (!this.search.searching || !this.firstEntry) {

src/addons/mod/data/services/data-helper.ts

@@ -19,7 +19,7 @@ import { CoreFileUploader, CoreFileUploaderStoreFilesResult } from '@features/fi
 import { CoreRatingOffline } from '@features/rating/services/rating-offline';
 import { FileEntry } from '@awesome-cordova-plugins/file/ngx';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreFormFields } from '@singletons/form';
 import { CoreText } from '@singletons/text';
 import { CorePromiseUtils } from '@singletons/promise-utils';
@@ -46,6 +46,7 @@ import {
     AddonModDataAction,
     AddonModDataTemplateType,
     AddonModDataTemplateMode,
+    ADDON_MOD_DATA_MODNAME,
 } from '../constants';
 import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
 import { CoreLoadings } from '@services/overlays/loadings';
@@ -528,7 +529,7 @@ export class AddonModDataHelperProvider {
 
         const module = await CoreCourse.getModuleBasicInfoByInstance(
             dataId,
-            'data',
+            ADDON_MOD_DATA_MODNAME,
             { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
         );
 
@@ -826,7 +827,7 @@ export class AddonModDataHelperProvider {
 
         if (type != AddonModDataTemplateType.LIST_HEADER && type != AddonModDataTemplateType.LIST_FOOTER) {
             // Try to fix syntax errors so the template can be parsed by Angular.
-            template = CoreDomUtils.fixHtml(template);
+            template = CoreDom.fixHtml(template);
         }
 
         // Add core-link directive to links.

src/addons/mod/feedback/pages/form/form.ts

@@ -48,6 +48,7 @@ import { CoreWSError } from '@classes/errors/wserror';
 import { CoreObject } from '@singletons/object';
 import { CoreAlerts } from '@services/overlays/alerts';
 import { CoreSharedModule } from '@/core/shared.module';
+import { CoreContentLinksHelper } from '@features/contentlinks/services/contentlinks-helper';
 
 /**
  * Page that displays feedback form.
@@ -458,7 +459,7 @@ export default class AddonModFeedbackFormPage implements OnInit, OnDestroy, CanL
         const modal = await CoreLoadings.show();
 
         try {
-            await CoreSites.visitLink(this.siteAfterSubmit, { siteId: this.currentSite.id });
+            await CoreContentLinksHelper.visitLink(this.siteAfterSubmit, { siteId: this.currentSite.id });
         } finally {
             modal.dismiss();
         }

src/addons/mod/forum/services/handlers/post-link.ts

@@ -20,7 +20,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { makeSingleton } from '@singletons';
-import { ADDON_MOD_FORUM_FEATURE_NAME, ADDON_MOD_FORUM_PAGE_NAME } from '../../constants';
+import { ADDON_MOD_FORUM_FEATURE_NAME, ADDON_MOD_FORUM_MODNAME, ADDON_MOD_FORUM_PAGE_NAME } from '../../constants';
 
 /**
  * Content links handler for forum new discussion.
@@ -49,7 +49,7 @@ export class AddonModForumPostLinkHandlerService extends CoreContentLinksHandler
                 try {
                     const module = await CoreCourse.getModuleBasicInfoByInstance(
                         forumId,
-                        'forum',
+                        ADDON_MOD_FORUM_MODNAME,
                         { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
                     );
 

src/addons/mod/glossary/services/handlers/entry-link.ts

@@ -20,7 +20,7 @@ import { CoreNavigator } from '@services/navigator';
 import { CoreSitesReadingStrategy } from '@services/sites';
 import { makeSingleton, Translate } from '@singletons';
 import { AddonModGlossary } from '../glossary';
-import { ADDON_MOD_GLOSSARY_FEATURE_NAME, ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
+import { ADDON_MOD_GLOSSARY_FEATURE_NAME, ADDON_MOD_GLOSSARY_MODNAME, ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { CoreAlerts } from '@services/overlays/alerts';
 
@@ -52,7 +52,7 @@ export class AddonModGlossaryEntryLinkHandlerService extends CoreContentLinksHan
 
                     const module = await CoreCourse.getModuleBasicInfoByInstance(
                         response.entry.glossaryid,
-                        'glossary',
+                        ADDON_MOD_GLOSSARY_MODNAME,
                         { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
                     );
 

src/addons/mod/glossary/services/handlers/prefetch.ts

@@ -188,7 +188,7 @@ export class AddonModGlossaryPrefetchHandlerService extends CoreCourseActivityPr
 
         // Prefetch data for link handlers.
         promises.push(CoreCourse.getModuleBasicInfo(module.id, { siteId }));
-        promises.push(CoreCourse.getModuleBasicInfoByInstance(glossary.id, 'glossary', { siteId }));
+        promises.push(CoreCourse.getModuleBasicInfoByInstance(glossary.id, ADDON_MOD_GLOSSARY_MODNAME, { siteId }));
 
         // Get course data, needed to determine upload max size if it's configured to be course limit.
         promises.push(CorePromiseUtils.ignoreErrors(CoreCourses.getCourseByField('id', courseId, siteId)));

src/addons/mod/h5pactivity/services/handlers/report-link.ts

@@ -22,7 +22,11 @@ import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
 import { CorePromiseUtils } from '@singletons/promise-utils';
 import { makeSingleton } from '@singletons';
 import { AddonModH5PActivity } from '../h5pactivity';
-import { ADDON_MOD_H5PACTIVITY_FEATURE_NAME, ADDON_MOD_H5PACTIVITY_PAGE_NAME } from '../../constants';
+import {
+    ADDON_MOD_H5PACTIVITY_FEATURE_NAME,
+    ADDON_MOD_H5PACTIVITY_MODNAME,
+    ADDON_MOD_H5PACTIVITY_PAGE_NAME,
+} from '../../constants';
 import { CoreLoadings } from '@services/overlays/loadings';
 import { CoreAlerts } from '@services/overlays/alerts';
 
@@ -53,7 +57,7 @@ export class AddonModH5PActivityReportLinkHandlerService extends CoreContentLink
 
                     const module = await CoreCourse.getModuleBasicInfoByInstance(
                         instanceId,
-                        'h5pactivity',
+                        ADDON_MOD_H5PACTIVITY_MODNAME,
                         { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
                     );
 

src/addons/mod/lesson/services/handlers/grade-link.ts

@@ -77,9 +77,8 @@ export class AddonModLessonGradeLinkHandlerService extends CoreContentLinksModul
                 );
             } else {
                 // User cannot view the report, go to lesson index.
-                CoreCourseHelper.navigateToModule(moduleId, {
+                CoreCourseHelper.navigateToModule(module.id, {
                     courseId: module.course,
-                    sectionId: module.section,
                     siteId,
                 });
             }

src/addons/mod/lesson/services/handlers/index-link.ts

@@ -38,13 +38,7 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
     }
 
     /**
-     * Get the list of actions for a link (url).
-     *
-     * @param siteIds List of sites the URL belongs to.
-     * @param url The URL to treat.
-     * @param params The params of the URL. E.g. 'mysite.com?id=1' -> {id: 1}
-     * @param courseId Course ID related to the URL. Optional but recommended.
-     * @returns List of (or promise resolved with list of) actions.
+     * @inheritdoc
      */
     getActions(
         siteIds: string[],
@@ -100,7 +94,6 @@ export class AddonModLessonIndexLinkHandlerService extends CoreContentLinksModul
 
             await CoreCourseHelper.navigateToModule(moduleId, {
                 courseId: module.course,
-                sectionId: module.section,
                 siteId,
             });
         } catch {

src/addons/mod/lesson/services/handlers/report-link.ts

@@ -142,7 +142,7 @@ export class AddonModLessonReportLinkHandlerService extends CoreContentLinksHand
                 { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
             );
             const params = {
-                retake: retake || 0,
+                retake: retake ?? 0,
             };
 
             CoreNavigator.navigateToSitePath(

src/addons/mod/lesson/services/lesson-helper.ts

@@ -15,7 +15,7 @@
 import { Injectable } from '@angular/core';
 import { FormBuilder, FormControl, FormGroup } from '@angular/forms';
 
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreFormFields } from '@singletons/form';
 import { CoreText } from '@singletons/text';
 import { CoreTime } from '@singletons/time';
@@ -598,7 +598,7 @@ export class AddonModLessonHelperProvider {
         const element = convertTextToHTMLElement(html);
 
         // Remove the question text.
-        CoreDomUtils.removeElement(element, '.generalbox:not(.feedback):not(.correctanswer)');
+        CoreDom.removeElement(element, '.generalbox:not(.feedback):not(.correctanswer)');
 
         return element.innerHTML.trim();
     }

src/addons/mod/page/services/page-helper.ts

@@ -18,7 +18,7 @@ import { CoreUrl } from '@singletons/url';
 import { CoreSites } from '@services/sites';
 import { CoreFilepool } from '@services/filepool';
 import { CoreWS } from '@services/ws';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { makeSingleton } from '@singletons';
 import { CoreCourseModuleContentFile } from '@features/course/services/course';
 import { ADDON_MOD_PAGE_COMPONENT_LEGACY } from '../constants';
@@ -74,7 +74,7 @@ export class AddonModPageHelperProvider {
 
         // Now that we have the content, we update the SRC to point back to the external resource.
         // That will be caught by core-format-text.
-        return CoreDomUtils.restoreSourcesInHtml(content, paths);
+        return CoreDom.restoreSourcesInHtml(content, paths);
     }
 
     /**

src/addons/mod/quiz/components/attempt-info/attempt-info.ts

@@ -18,7 +18,7 @@ import { AddonModQuiz, AddonModQuizWSAdditionalData } from '../../services/quiz'
 import { ADDON_MOD_QUIZ_COMPONENT_LEGACY, AddonModQuizAttemptStates } from '../../constants';
 import { CoreTime } from '@singletons/time';
 import { Translate } from '@singletons';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { isSafeNumber } from '@/core/utils/types';
 import { AddonModQuizAttemptStateComponent } from '../attempt-state/attempt-state';
 import { CoreSharedModule } from '@/core/shared.module';
@@ -56,7 +56,7 @@ export class AddonModQuizAttemptInfoComponent implements OnChanges {
         if (changes.additionalData) {
             this.additionalData?.forEach((data) => {
                 // Remove help links from additional data.
-                data.content = CoreDomUtils.removeElementFromHtml(data.content, '.helptooltip');
+                data.content = CoreDom.removeElementFromHtml(data.content, '.helptooltip');
             });
         }
 

src/addons/mod/quiz/services/quiz-helper.ts

@@ -19,7 +19,7 @@ import { CoreError } from '@classes/errors/error';
 import { CoreCourse } from '@features/course/services/course';
 import { CoreNavigator } from '@services/navigator';
 import { CoreSites, CoreSitesReadingStrategy } from '@services/sites';
-import { CoreDomUtils } from '@services/utils/dom';
+import { CoreDom } from '@singletons/dom';
 import { CoreWSError } from '@classes/errors/wserror';
 import { makeSingleton, Translate } from '@singletons';
 import { AddonModQuizAccessRuleDelegate } from './access-rules-delegate';
@@ -33,6 +33,7 @@ import {
 import { AddonModQuizOffline } from './quiz-offline';
 import {
     ADDON_MOD_QUIZ_IMMEDIATELY_AFTER_PERIOD,
+    ADDON_MOD_QUIZ_MODNAME,
     ADDON_MOD_QUIZ_PAGE_NAME,
     AddonModQuizAttemptStates,
     AddonModQuizDisplayOptionsAttemptStates,
@@ -311,7 +312,7 @@ export class AddonModQuizHelperProvider {
     getQuestionMarkFromHtml(html: string): string | undefined {
         const element = convertTextToHTMLElement(html);
 
-        return CoreDomUtils.getContentsOfElement(element, '.grade');
+        return CoreDom.getContentsOfElement(element, '.grade');
     }
 
     /**
@@ -352,7 +353,7 @@ export class AddonModQuizHelperProvider {
 
             const module = await CoreCourse.getModuleBasicInfoByInstance(
                 quizId,
-                'quiz',
+                ADDON_MOD_QUIZ_MODNAME,
                 { siteId, readingStrategy: CoreSitesReadingStrategy.PREFER_CACHE },
             );