Skip to content

Commit

Permalink
MOBILE-4759 chore: Retrieve pages instead of modules on functions
Browse files Browse the repository at this point in the history
  • Loading branch information
crazyserver committed Feb 4, 2025
1 parent 8a63495 commit 7e686b3
Show file tree
Hide file tree
Showing 37 changed files with 51 additions and 78 deletions.
2 changes: 1 addition & 1 deletion src/addons/mod/assign/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Params } from '@angular/router';
import { CoreError } from '@classes/errors/error';
import { CoreSite } from '@classes/sites/site';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreGroupInfo, CoreGroups } from '@services/groups';
import { CoreNavigator } from '@services/navigator';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/bigbluebuttonbn/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { Component, OnInit, Optional } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreApp } from '@services/app';
import { CoreGroupInfo, CoreGroups } from '@services/groups';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/book/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { Component, Optional, OnInit, OnDestroy } from '@angular/core';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { AddonModBook, AddonModBookBookWSData, AddonModBookTocChapter } from '../../services/book';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { CorePromiseUtils } from '@singletons/promise-utils';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/chat/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import { Component, OnInit, Optional } from '@angular/core';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreNavigator } from '@services/navigator';
import { CoreTimeUtils } from '@services/utils/time';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/choice/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { Component, Optional, OnInit } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreSites } from '@services/sites';
import { CoreTimeUtils } from '@services/utils/time';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/data/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Component, OnDestroy, OnInit, Optional, Type } from '@angular/core';
import { Params } from '@angular/router';
import { CoreCommentsProvider } from '@features/comments/services/comments';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreRatingProvider } from '@features/rating/services/rating';
import { CoreRatingSyncProvider } from '@features/rating/services/rating-sync';
import { IonContent } from '@ionic/angular';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/feedback/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Component, Input, Optional, ViewChild, OnInit, OnDestroy } from '@angul
import { CoreError } from '@classes/errors/error';
import { CoreTabsComponent } from '@components/tabs/tabs';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreGroupInfo, CoreGroups } from '@services/groups';
import { CoreNavigator } from '@services/navigator';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/folder/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { Component, Input, OnInit, Optional } from '@angular/core';
import { Params } from '@angular/router';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { Md5 } from 'ts-md5';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/forum/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
} from '@addons/mod/forum/services/forum';
import { AddonModForumOffline } from '@addons/mod/forum/services/forum-offline';
import { Translate } from '@singletons';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { AddonModForumHelper } from '@addons/mod/forum/services/forum-helper';
import { CoreGroupInfo } from '@services/groups';
import { CoreEvents, CoreEventObserver } from '@singletons/events';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/forum/pages/discussion/discussion.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import {
ADDON_MOD_FORUM_REPLY_DISCUSSION_EVENT,
AddonModForumType,
} from '../../constants';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreToasts } from '@services/overlays/toasts';
import { CoreLoadings } from '@services/overlays/loadings';
import { CorePromiseUtils } from '@singletons/promise-utils';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import {
ADDON_MOD_FORUM_COMPONENT,
ADDON_MOD_FORUM_NEW_DISCUSSION_EVENT,
} from '../../constants';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreLoadings } from '@services/overlays/loadings';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreAlerts } from '@services/overlays/alerts';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/glossary/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import { CoreRoutedItemsManagerSourcesTracker } from '@classes/items-management/
import { CorePromisedValue } from '@classes/promised-value';
import { CoreSplitViewComponent } from '@components/split-view/split-view';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreRatingProvider } from '@features/rating/services/rating';
import { CoreRatingOffline } from '@features/rating/services/rating-offline';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/glossary/pages/entry/entry.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
import { CoreTime } from '@singletons/time';
import { CoreAnalytics, CoreAnalyticsEventType } from '@services/analytics';
import { ADDON_MOD_GLOSSARY_COMPONENT, ADDON_MOD_GLOSSARY_ENTRY_UPDATED, ADDON_MOD_GLOSSARY_PAGE_NAME } from '../../constants';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreToasts, ToastDuration } from '@services/overlays/toasts';
import { CoreLoadings } from '@services/overlays/loadings';
import { CoreAlerts } from '@services/overlays/alerts';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/h5pactivity/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { IonContent } from '@ionic/angular';
import { DownloadStatus } from '@/core/constants';
import { CoreSite } from '@classes/sites/site';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreH5PDisplayOptions } from '@features/h5p/classes/core';
import { CoreH5PHelper } from '@features/h5p/classes/helper';
import { CoreH5P } from '@features/h5p/services/h5p';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/imscp/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import { Component, OnInit, Optional } from '@angular/core';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreNavigator } from '@services/navigator';
import { AddonModImscp, AddonModImscpTocItem } from '../../services/imscp';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/lesson/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { Component, Input, ViewChild, ElementRef, OnInit, OnDestroy, Optional }

import { CoreTabsComponent } from '@components/tabs/tabs';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreUser } from '@features/user/services/user';
import { IonContent, IonInput } from '@ionic/angular';
import { CoreGroupInfo, CoreGroups } from '@services/groups';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/lti/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import { Component, Optional, OnInit } from '@angular/core';
import { IonContent } from '@ionic/angular';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { AddonModLti, AddonModLtiLti } from '../../services/lti';
import { AddonModLtiHelper } from '../../services/lti-helper';
import { ADDON_MOD_LTI_COMPONENT } from '../../constants';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/page/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import { Component, OnInit, Optional } from '@angular/core';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreText } from '@singletons/text';
import { CoreUtils } from '@singletons/utils';
import { AddonModPagePage, AddonModPage } from '../../services/page';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/quiz/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { isSafeNumber, safeNumber, SafeNumber } from '@/core/utils/types';
import { Component, OnDestroy, OnInit, Optional } from '@angular/core';

import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreQuestionBehaviourDelegate } from '@features/question/services/behaviour-delegate';
import { IonContent } from '@ionic/angular';
import { CoreNavigator } from '@services/navigator';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/resource/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { DownloadStatus } from '@/core/constants';
import { Component, OnDestroy, OnInit, Optional } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreCourseModulePrefetchDelegate } from '@features/course/services/module-prefetch-delegate';
import { CoreNetwork } from '@services/network';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/scorm/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { DownloadStatus } from '@/core/constants';
import { Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { IonContent } from '@ionic/angular';
import { CoreNavigator } from '@services/navigator';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/survey/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Component, OnInit, Optional } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreIonLoadingElement } from '@classes/ion-loading';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreSites } from '@services/sites';
import { CoreText } from '@singletons/text';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/url/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { CoreConstants } from '@/core/constants';
import { Component, OnInit, Optional } from '@angular/core';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainResourceComponent } from '@features/course/classes/main-resource-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreMimetypeUtils } from '@services/utils/mimetype';
import { CoreText } from '@singletons/text';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/wiki/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Component, Optional, Input, OnInit, OnDestroy } from '@angular/core';
import { Params } from '@angular/router';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { CoreCourse } from '@features/course/services/course';
import { CoreTag, CoreTagItem } from '@features/tag/services/tag';
import { CoreUser } from '@features/user/services/user';
Expand Down
2 changes: 1 addition & 1 deletion src/addons/mod/workshop/components/index/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Component, Input, OnDestroy, OnInit, Optional } from '@angular/core';
import { Params } from '@angular/router';
import { CoreError } from '@classes/errors/error';
import { CoreCourseModuleMainActivityComponent } from '@features/course/classes/main-activity-component';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';
import { IonContent } from '@ionic/angular';
import { CoreGroupInfo, CoreGroups } from '@services/groups';
import { CoreNavigator } from '@services/navigator';
Expand Down
5 changes: 5 additions & 0 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@ export type LazyRoutesModule = Type<any> |
// eslint-disable-next-line deprecation/deprecation, @typescript-eslint/no-explicit-any
Promise<NgModuleFactory<any> | Type<any> | Routes | DefaultExport<Type<any>> |DefaultExport<Routes>>;

/**
* Type to declare lazy standalone component. Extracted from Angular's LoadComponent type with default class.
*/
export type LazyDefaultStandaloneComponent = Promise<DefaultExport<Type<unknown>>>;

/**
* Build url matcher using a regular expression.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { CoreCourseModuleMainResourceComponent } from './main-resource-component
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreCourse } from '../services/course';
import { CorePromiseUtils } from '@singletons/promise-utils';
import { CoreCourseContentsPage } from '../pages/contents/contents';
import CoreCourseContentsPage from '../pages/contents/contents';
import { CoreSites } from '@services/sites';
import { CoreSyncResult } from '@services/sync';
import { CoreAlerts } from '@services/overlays/alerts';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import { Translate } from '@singletons';
import { CoreEventObserver, CoreEvents } from '@singletons/events';
import { CoreLogger } from '@singletons/logger';
import { CoreCourseModuleSummaryResult } from '../components/module-summary/module-summary';
import { CoreCourseContentsPage } from '../pages/contents/contents';
import CoreCourseContentsPage from '../pages/contents/contents';
import { CoreCourse, CoreCourseModuleContentFile } from '../services/course';
import { CoreCourseHelper, CoreCourseModuleData } from '../services/course-helper';
import { CoreCourseModuleDelegate, CoreCourseModuleMainComponent } from '../services/module-delegate';
Expand Down
2 changes: 1 addition & 1 deletion src/core/features/course/course-contents-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Injector, NgModule } from '@angular/core';
import { ROUTES, Routes } from '@angular/router';

import { resolveContentsRoutes } from '@features/course/course-contents-routing.module';
import { CoreCourseContentsPage } from '@features/course/pages/contents/contents';
import CoreCourseContentsPage from '@features/course/pages/contents/contents';

/**
* Build module routes.
Expand Down
2 changes: 1 addition & 1 deletion src/core/features/course/course-lazy.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function buildRoutes(injector: Injector): Routes {
},
{
path: ':courseId/summary',
loadChildren: () => CoreCourseHelper.getCourseSummaryRouteModule(),
loadComponent: () => CoreCourseHelper.getCourseSummaryPage(),
},
];
}
Expand Down
32 changes: 0 additions & 32 deletions src/core/features/course/course-summary-lazy.module.ts

This file was deleted.

8 changes: 4 additions & 4 deletions src/core/features/course/pages/contents/contents.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,16 +58,16 @@ import { CoreSharedModule } from '@/core/shared.module';
selector: 'page-core-course-contents',
templateUrl: 'contents.html',
providers: [{
provide: CORE_REFRESH_CONTEXT,
useExisting: forwardRef(() => CoreCourseContentsPage),
}],
provide: CORE_REFRESH_CONTEXT,
useExisting: forwardRef(() => CoreCourseContentsPage),
}],
standalone: true,
imports: [
CoreSharedModule,
CoreCourseFormatComponent,
],
})
export class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshContext {
export default class CoreCourseContentsPage implements OnInit, OnDestroy, CoreRefreshContext {

@ViewChild(IonContent) content?: IonContent;
@ViewChild(CoreCourseFormatComponent) formatComponent?: CoreCourseFormatComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import { CoreSharedModule } from '@/core/shared.module';
CoreRemindersDateComponent,
],
})
export class CoreCourseSummaryPage implements OnInit, OnDestroy {
export default class CoreCourseSummaryPage implements OnInit, OnDestroy {

@Input() course?: CoreCourseSummaryData;
@Input() courseId = 0;
Expand Down
Loading

0 comments on commit 7e686b3

Please sign in to comment.