Skip to content

Commit 3a6f027

Browse files
committed
MOBILE-4759 siteplugins: Use Activity components only in the proper site plugin
1 parent cdf5955 commit 3a6f027

File tree

30 files changed

+57
-126
lines changed

30 files changed

+57
-126
lines changed

src/addons/mod/assign/assign.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ export async function getModAssignServices(): Promise<Type<unknown>[]> {
6161
*
6262
* @returns Assign component modules.
6363
*/
64-
export async function getModAssignComponentModules(): Promise<unknown[]> {
64+
export async function getModAssignComponentModules(): Promise<Type<unknown>[]> {
6565
const { AddonModAssignSubmissionPluginComponent } =
6666
await import('@addons/mod/assign/components/submission-plugin/submission-plugin');
6767
const { AddonModAssignFeedbackPluginComponent } =

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import { CorePromiseUtils } from '@singletons/promise-utils';
5656
import { CoreObject } from '@singletons/object';
5757
import { CoreAlerts } from '@services/overlays/alerts';
5858
import { Translate } from '@singletons';
59-
import { CoreCompileHtmlComponentModule } from '@features/compile/components/compile-html/compile-html.module';
59+
import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html';
6060
import { CoreCourseComponentsModule } from '@features/course/components/components.module';
6161
import { CoreSharedModule } from '@/core/shared.module';
6262

@@ -73,7 +73,7 @@ const contentToken = '<!-- CORE-DATABASE-CONTENT-GOES-HERE -->';
7373
imports: [
7474
CoreSharedModule,
7575
CoreCourseComponentsModule,
76-
CoreCompileHtmlComponentModule,
76+
CoreCompileHtmlComponent,
7777
],
7878
})
7979
export class AddonModDataIndexComponent extends CoreCourseModuleMainActivityComponent implements OnInit, OnDestroy {

src/addons/mod/data/components/search-modal/search-modal.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import { AddonModDataHelper } from '../../services/data-helper';
3131
import { AddonModDataSearchDataParams } from '../index';
3232
import { AddonModDataTemplateType } from '../../constants';
3333
import { CoreSharedModule } from '@/core/shared.module';
34-
import { CoreCompileHtmlComponentModule } from '@features/compile/components/compile-html/compile-html.module';
34+
import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html';
3535

3636
/**
3737
* Page that displays the search modal.
@@ -43,7 +43,7 @@ import { CoreCompileHtmlComponentModule } from '@features/compile/components/com
4343
standalone: true,
4444
imports: [
4545
CoreSharedModule,
46-
CoreCompileHtmlComponentModule,
46+
CoreCompileHtmlComponent,
4747
],
4848
})
4949
export class AddonModDataSearchModalComponent implements OnInit {

src/addons/mod/data/pages/edit/edit.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { CoreLoadings } from '@services/overlays/loadings';
4747
import { CoreWSError } from '@classes/errors/wserror';
4848
import { CoreArray } from '@singletons/array';
4949
import { CoreAlerts } from '@services/overlays/alerts';
50-
import { CoreCompileHtmlComponentModule } from '@features/compile/components/compile-html/compile-html.module';
50+
import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html';
5151
import { CoreSharedModule } from '@/core/shared.module';
5252

5353
/**
@@ -60,7 +60,7 @@ import { CoreSharedModule } from '@/core/shared.module';
6060
standalone: true,
6161
imports: [
6262
CoreSharedModule,
63-
CoreCompileHtmlComponentModule,
63+
CoreCompileHtmlComponent,
6464
],
6565
})
6666
export default class AddonModDataEditPage implements OnInit {

src/addons/mod/data/pages/entry/entry.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { CoreAlerts } from '@services/overlays/alerts';
4747
import { Translate } from '@singletons';
4848
import { CoreCommentsComponentsModule } from '@features/comments/components/components.module';
4949
import { CoreRatingComponentsModule } from '@features/rating/components/components.module';
50-
import { CoreCompileHtmlComponentModule } from '@features/compile/components/compile-html/compile-html.module';
50+
import { CoreCompileHtmlComponent } from '@features/compile/components/compile-html/compile-html';
5151
import { CoreSharedModule } from '@/core/shared.module';
5252

5353
/**
@@ -60,7 +60,7 @@ import { CoreSharedModule } from '@/core/shared.module';
6060
standalone: true,
6161
imports: [
6262
CoreSharedModule,
63-
CoreCompileHtmlComponentModule,
63+
CoreCompileHtmlComponent,
6464
CoreRatingComponentsModule,
6565
CoreCommentsComponentsModule,
6666
],

src/addons/mod/quiz/quiz.module.ts

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,6 @@ export async function getModQuizServices(): Promise<Type<unknown>[]> {
5757
];
5858
}
5959

60-
/**
61-
* Get quiz component modules.
62-
*
63-
* @returns Quiz component modules.
64-
*/
65-
export async function getModQuizComponentModules(): Promise<unknown[]> {
66-
const { AddonModQuizAttemptInfoComponent } = await import('@addons/mod/quiz/components/attempt-info/attempt-info');
67-
const { AddonModQuizAttemptStateComponent } = await import('@addons/mod/quiz/components/attempt-state/attempt-state');
68-
const { AddonModQuizQuestionCardComponent } = await import('@addons/mod/quiz/components/question-card/question-card');
69-
70-
return [
71-
AddonModQuizAttemptInfoComponent,
72-
AddonModQuizAttemptStateComponent,
73-
AddonModQuizQuestionCardComponent,
74-
];
75-
}
76-
7760
const routes: Routes = [
7861
{
7962
path: ADDON_MOD_QUIZ_PAGE_NAME,

src/addons/mod/workshop/workshop.module.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export async function getModWorkshopServices(): Promise<Type<unknown>[]> {
5858
*
5959
* @returns Workshop component modules.
6060
*/
61-
export async function getModWorkshopComponentModules(): Promise<unknown[]> {
61+
export async function getModWorkshopComponentModules(): Promise<Type<unknown>[]> {
6262
const { AddonModWorkshopAssessmentStrategyComponent } =
6363
await import('@addons/mod/workshop/components/assessment-strategy/assessment-strategy');
6464

src/core/features/compile/components/compile-html/compile-html.module.ts

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/core/features/compile/components/compile-html/compile-html.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import { CorePromiseUtils } from '@singletons/promise-utils';
4747
import { CoreWS } from '@services/ws';
4848
import { CoreDom } from '@singletons/dom';
4949
import { CoreAlerts } from '@services/overlays/alerts';
50+
import { CoreSharedModule } from '@/core/shared.module';
5051

5152
/**
5253
* This component has a behaviour similar to $compile for AngularJS. Given an HTML code, it will compile it so all its
@@ -56,7 +57,7 @@ import { CoreAlerts } from '@services/overlays/alerts';
5657
* component is used, so it can slow down the app.
5758
*
5859
* This component has its own module to prevent circular dependencies. If you want to use it,
59-
* you need to import CoreCompileHtmlComponentModule.
60+
* you need to import CoreCompileHtmlComponent.
6061
*
6162
* You can provide some Javascript code (as text) to be executed inside the component. The context of the javascript code (this)
6263
* will be the component instance created to compile the template. This means your javascript code can interact with the template.
@@ -67,6 +68,8 @@ import { CoreAlerts } from '@services/overlays/alerts';
6768
selector: 'core-compile-html',
6869
template: '<core-loading [hideUntil]="loaded"><ng-container #dynamicComponent /></core-loading>',
6970
styles: [':host { display: contents; }'],
71+
standalone: true,
72+
imports: [CoreSharedModule],
7073
})
7174
export class CoreCompileHtmlComponent implements OnChanges, OnDestroy, DoCheck {
7275

src/core/features/compile/services/compile.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@ import { getCompetencyServices } from '@addons/competency/competency.module';
122122
import { getCourseCompletionServices } from '@addons/coursecompletion/coursecompletion.module';
123123
import { getMessageOutputServices } from '@addons/messageoutput/messageoutput.module';
124124
import { getMessagesServices } from '@addons/messages/messages.module';
125-
import { getModAssignComponentModules, getModAssignServices } from '@addons/mod/assign/assign.module';
126-
import { getModQuizComponentModules, getModQuizServices } from '@addons/mod/quiz/quiz.module';
127-
import { getModWorkshopComponentModules, getModWorkshopServices } from '@addons/mod/workshop/workshop.module';
125+
import { getModAssignServices } from '@addons/mod/assign/assign.module';
126+
import { getModQuizServices } from '@addons/mod/quiz/quiz.module';
127+
import { getModWorkshopServices } from '@addons/mod/workshop/workshop.module';
128128
import { getNotesServices } from '@addons/notes/notes.module';
129129
import { getNotificationsServices } from '@addons/notifications/notifications.module';
130130
import { getPrivateFilesServices } from '@addons/privatefiles/privatefiles.module';
@@ -172,9 +172,6 @@ export class CoreCompileProvider {
172172
];
173173

174174
protected readonly LAZY_IMPORTS = [
175-
getModAssignComponentModules,
176-
getModQuizComponentModules,
177-
getModWorkshopComponentModules,
178175
getCoreStandaloneComponents,
179176
getCourseStandaloneComponents,
180177
getSitePluginsDirectives,

0 commit comments

Comments
 (0)