MOBILE-4660 course: Refactor how subsections are handled

This commit doesn't refactor course downloads yet, it will be done in another commit.

Author: dpalou

src/addons/block/activitymodules/components/activitymodules/activitymodules.ts

@@ -70,44 +70,41 @@ export class AddonBlockActivityModulesComponent extends CoreBlockBaseComponent i
         let modFullNames: Record<string, string> = {};
         const brandedIcons: Record<string, boolean|undefined> = {};
 
-        sections.forEach((section) => {
-            if (!section.modules) {
+        const modules = CoreCourseHelper.getSectionsModules(sections, {
+            ignoreSection: section => !CoreCourseHelper.canUserViewSection(section),
+            ignoreModule: module => !CoreCourseHelper.canUserViewModule(module) || !CoreCourse.moduleHasView(module),
+        });
+
+        modules.forEach((mod) => {
+            if (archetypes[mod.modname] !== undefined) {
                 return;
             }
 
-            section.modules.forEach((mod) => {
-                if (archetypes[mod.modname] !== undefined ||
-                    !CoreCourseHelper.canUserViewModule(mod, section) ||
-                    !CoreCourse.moduleHasView(mod)) {
-                    // Ignore this module.
-                    return;
-                }
-
-                // Get the archetype of the module type.
-                archetypes[mod.modname] = CoreCourseModuleDelegate.supportsFeature<number>(
-                    mod.modname,
-                    CoreConstants.FEATURE_MOD_ARCHETYPE,
-                    CoreConstants.MOD_ARCHETYPE_OTHER,
-                );
-
-                // Get the full name of the module type.
-                if (archetypes[mod.modname] === CoreConstants.MOD_ARCHETYPE_RESOURCE) {
-                    // All resources are gathered in a single "Resources" option.
-                    if (!modFullNames['resources']) {
-                        modFullNames['resources'] = Translate.instant('core.resources');
-                    }
-                } else {
-                    modFullNames[mod.modname] = mod.modplural;
+            // Get the archetype of the module type.
+            archetypes[mod.modname] = CoreCourseModuleDelegate.supportsFeature<number>(
+                mod.modname,
+                CoreConstants.FEATURE_MOD_ARCHETYPE,
+                CoreConstants.MOD_ARCHETYPE_OTHER,
+            );
+
+            // Get the full name of the module type.
+            if (archetypes[mod.modname] === CoreConstants.MOD_ARCHETYPE_RESOURCE) {
+                // All resources are gathered in a single "Resources" option.
+                if (!modFullNames['resources']) {
+                    modFullNames['resources'] = Translate.instant('core.resources');
                 }
+            } else {
+                modFullNames[mod.modname] = mod.modplural;
+            }
 
-                brandedIcons[mod.modname] = mod.branded;
+            brandedIcons[mod.modname] = mod.branded;
 
-                // If this is not a theme image, leave it undefined to avoid having specific activity icons.
-                if (CoreUrl.isThemeImageUrl(mod.modicon)) {
-                    modIcons[mod.modname] = mod.modicon;
-                }
-            });
+            // If this is not a theme image, leave it undefined to avoid having specific activity icons.
+            if (CoreUrl.isThemeImageUrl(mod.modicon)) {
+                modIcons[mod.modname] = mod.modicon;
+            }
         });
+
         // Sort the modnames alphabetically.
         modFullNames = CoreUtils.sortValues(modFullNames);
         for (const modName in modFullNames) {

src/addons/block/sitemainmenu/components/sitemainmenu/addon-block-sitemainmenu.html

@@ -12,6 +12,8 @@ <h2>{{ 'addon.block_sitemainmenu.pluginname' | translate }}</h2>
             </ion-label>
         </ion-item>
 
-        <core-course-module *ngFor="let module of mainMenuBlock.modules" [module]="module" [section]="mainMenuBlock" />
+        <ng-container *ngFor="let modOrSubsection of mainMenuBlock.contents">
+            <core-course-module *ngIf="isModule(modOrSubsection)" [module]="modOrSubsection" [section]="mainMenuBlock" />
+        </ng-container>
     </ion-list>
 </core-loading>

src/addons/block/sitemainmenu/components/sitemainmenu/sitemainmenu.ts

@@ -14,7 +14,7 @@
 
 import { Component, OnInit } from '@angular/core';
 import { CoreSites } from '@services/sites';
-import { CoreCourse } from '@features/course/services/course';
+import { CoreCourse, sectionContentIsModule } from '@features/course/services/course';
 import { CoreCourseHelper, CoreCourseSection } from '@features/course/services/course-helper';
 import { CoreSiteHome, FrontPageItemNames } from '@features/sitehome/services/sitehome';
 import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
@@ -39,6 +39,7 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
     component = 'AddonBlockSiteMainMenu';
     mainMenuBlock?: CoreCourseSection;
     siteHomeId = 1;
+    isModule = sectionContentIsModule;
 
     protected fetchContentDefaultError = 'Error getting main menu data.';
 
@@ -66,9 +67,12 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
         promises.push(CoreCourse.invalidateSections(this.siteHomeId));
         promises.push(CoreSiteHome.invalidateNewsForum(this.siteHomeId));
 
-        if (this.mainMenuBlock && this.mainMenuBlock.modules) {
+        if (this.mainMenuBlock?.contents.length) {
             // Invalidate modules prefetch data.
-            promises.push(CoreCourseModulePrefetchDelegate.invalidateModules(this.mainMenuBlock.modules, this.siteHomeId));
+            promises.push(CoreCourseModulePrefetchDelegate.invalidateModules(
+                CoreCourse.getSectionsModules([this.mainMenuBlock]),
+                this.siteHomeId,
+            ));
         }
 
         await Promise.all(promises);
@@ -114,11 +118,11 @@ export class AddonBlockSiteMainMenuComponent extends CoreBlockBaseComponent impl
         try {
             const forum = await CoreSiteHome.getNewsForum(this.siteHomeId);
             // Search the module that belongs to site news.
-            const forumIndex =
-                this.mainMenuBlock.modules.findIndex((mod) => mod.modname == 'forum' && mod.instance == forum.id);
+            const forumIndex = this.mainMenuBlock.contents.findIndex((mod) =>
+                sectionContentIsModule(mod) && mod.modname == 'forum' && mod.instance == forum.id);
 
             if (forumIndex >= 0) {
-                this.mainMenuBlock.modules.splice(forumIndex, 1);
+                this.mainMenuBlock.contents.splice(forumIndex, 1);
             }
         } catch {
             // Ignore errors.

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

@@ -19,7 +19,8 @@ import { CoreCourse } from '@features/course/services/course';
 import { CoreLoadings } from '@services/loadings';
 import { CoreDomUtils } from '@services/utils/dom';
 import { makeSingleton } from '@singletons';
-import { AddonModSubsection } from '../subsection';
+import { CoreSites } from '@services/sites';
+import { CoreCourseHelper } from '@features/course/services/course-helper';
 
 /**
  * Handler to treat links to subsection.
@@ -33,6 +34,29 @@ export class AddonModSubsectionIndexLinkHandlerService extends CoreContentLinksM
         super('AddonModSubsection', 'subsection', 'id');
     }
 
+    /**
+     * Open a subsection.
+     *
+     * @param sectionId Section ID.
+     * @param courseId Course ID.
+     * @param siteId Site ID. If not defined, current site.
+     * @returns Promise resolved when done.
+     */
+    async openSubsection(sectionId: number, courseId: number, siteId?: string): Promise<void> {
+        const pageParams = {
+            sectionId,
+        };
+
+        if (
+            (!siteId || siteId === CoreSites.getCurrentSiteId()) &&
+            CoreCourse.currentViewIsCourse(courseId)
+        ) {
+            CoreCourse.selectCourseTab('', pageParams);
+        } else {
+            await CoreCourseHelper.getAndOpenCourse(courseId, pageParams, siteId);
+        }
+    }
+
     /**
      * @inheritdoc
      */
@@ -51,7 +75,7 @@ export class AddonModSubsectionIndexLinkHandlerService extends CoreContentLinksM
                     // Get the module.
                     const module = await CoreCourse.getModule(moduleId, courseId, undefined, true, false, siteId);
 
-                    await AddonModSubsection.openSubsection(module.section, module.course, siteId);
+                    await this.openSubsection(module.section, module.course, siteId);
                 } catch (error) {
                     CoreDomUtils.showErrorModalDefault(error, 'Error opening link.');
                 } finally {

src/addons/mod/subsection/services/handlers/module.ts

@@ -14,17 +14,14 @@
 
 import { APP_INITIALIZER, NgModule } from '@angular/core';
 import { CoreContentLinksDelegate } from '@features/contentlinks/services/contentlinks-delegate';
-import { CoreCourseModuleDelegate } from '@features/course/services/module-delegate';
 import { AddonModSubsectionIndexLinkHandler } from './services/handlers/index-link';
-import { AddonModSubsectionModuleHandler } from './services/handlers/module';
 
 @NgModule({
     providers: [
         {
             provide: APP_INITIALIZER,
             multi: true,
             useValue: () => {
-                CoreCourseModuleDelegate.registerHandler(AddonModSubsectionModuleHandler.instance);
                 CoreContentLinksDelegate.registerHandler(AddonModSubsectionIndexLinkHandler.instance);
             },
         },

src/addons/mod/subsection/services/subsection.ts

@@ -240,7 +240,7 @@ export class AddonStorageManagerCoursesStoragePage implements OnInit, OnDestroy
      */
     private async calculateDownloadedCourseSize(courseId: number): Promise<number> {
         const sections = await CoreCourse.getSections(courseId);
-        const modules = sections.map((section) => section.modules).flat();
+        const modules = CoreCourseHelper.getSectionsModules(sections);
         const promisedModuleSizes = modules.map(async (module) => {
             const size = await CoreCourseModulePrefetchDelegate.getModuleStoredSize(module, courseId);
 

src/addons/mod/subsection/subsection.module.ts

@@ -12,9 +12,9 @@
             <core-dynamic-component [component]="singleSectionComponent" [data]="data">
                 <ion-accordion-group [multiple]="true" (ionChange)="accordionMultipleChange($event.detail)"
                     [value]="accordionMultipleValue">
-                    <core-course-section *ngIf="!selectedSection.hiddenbynumsections && selectedSection.id !== stealthModulesSectionId &&
-                        !selectedSection.component" [course]="course" [section]="selectedSection" [lastModuleViewed]="lastModuleViewed"
-                        [viewedModules]="viewedModules" [collapsible]="false" [subSections]="subSections" />
+                    <core-course-section *ngIf="!selectedSection.hiddenbynumsections && selectedSection.id !== stealthModulesSectionId"
+                        [course]="course" [section]="selectedSection" [lastModuleViewed]="lastModuleViewed" [viewedModules]="viewedModules"
+                        [collapsible]="false" />
                 </ion-accordion-group>
                 <core-empty-box *ngIf="!selectedSection.hasContent" icon="fas-table-cells-large"
                     [message]="'core.course.nocontentavailable' | translate" />
@@ -27,12 +27,11 @@
                 <ion-accordion-group [multiple]="true" (ionChange)="accordionMultipleChange($event.detail)"
                     [value]="accordionMultipleValue">
                     @for (section of sections; track section.id) {
-                        @if ($index <= lastShownSectionIndex && !section.hiddenbynumsections && section.id !== allSectionsId &&
-                            section.id !== stealthModulesSectionId && !section.component) {
-                            <core-course-section
-                                [course]="course" [section]="section" [lastModuleViewed]="lastModuleViewed" [viewedModules]="viewedModules"
-                                [collapsible]="true" [subSections]="subSections" />
-                        }
+                    @if ($index
+                    <= lastShownSectionIndex && !section.hiddenbynumsections && section.id !==allSectionsId && section.id
+                        !==stealthModulesSectionId) { <core-course-section [course]="course" [section]="section"
+                        [lastModuleViewed]="lastModuleViewed" [viewedModules]="viewedModules" [collapsible]="true" />
+                    }
                     }
                 </ion-accordion-group>
             </core-dynamic-component>