ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5227 from FinnStutzenstein/projectorLoadChildrenCallback

Browse Source 
Use LoadChildrenCallback instead of deprecated NgModuleFactoryLoader
This commit is contained in:
Sean 2020-02-25 10:50:19 +01:00 committed by GitHub
commit 98146a29c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 63 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/slides/agenda/current-list-of-speakers/current-list-of-speakers-slide.module.ts
View File

@ -1,10 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { SLIDE } from '../../slide-token';
import { SharedModule } from 'app/shared/shared.module';
import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module';
import { CommonListOfSpeakersSlideComponent } from '../common/common-list-of-speakers-slide.component';
import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module';
import { SLIDE } from '../../slide-token';
@NgModule({
imports: [CommonModule, SharedModule, CommonListOfSpeakersSlideModule],

6
client/src/app/slides/agenda/list-of-speakers/list-of-speakers-slide.module.ts
View File

@ -1,10 +1,10 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core';
import { SLIDE } from '../../slide-token';
import { SharedModule } from 'app/shared/shared.module';
import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module';
import { CommonListOfSpeakersSlideComponent } from '../common/common-list-of-speakers-slide.component';
import { CommonListOfSpeakersSlideModule } from '../common/common-list-of-speakers-slide.module';
import { SLIDE } from '../../slide-token';
@NgModule({
imports: [CommonModule, SharedModule, CommonListOfSpeakersSlideModule],

46
client/src/app/slides/all-slides.ts
View File

@ -11,7 +11,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'agenda/item-list',
path: 'agenda/item-list',
loadChildren: './slides/agenda/item-list/item-list-slide.module#ItemListSlideModule',
loadChildren: () => import('./agenda/item-list/item-list-slide.module').then(m => m.ItemListSlideModule),
verboseName: 'Agenda',
elementIdentifiers: ['name'],
canBeMappedToModel: false
@ -19,7 +19,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'topics/topic',
path: 'topics/topic',
loadChildren: './slides/topics/topic/topic-slide.module#TopicSlideModule',
loadChildren: () => import('./topics/topic/topic-slide.module').then(m => m.TopicSlideModule),
verboseName: 'Topic',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -27,7 +27,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'motions/motion',
path: 'motions/motion',
loadChildren: './slides/motions/motion/motion-slide.module#MotionSlideModule',
loadChildren: () => import('./motions/motion/motion-slide.module').then(m => m.MotionSlideModule),
verboseName: 'Motion',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -35,7 +35,8 @@ export const allSlides: SlideManifest[] = [
{
slide: 'motions/motion-block',
path: 'motions/motion-block',
loadChildren: './slides/motions/motion-block/motion-block-slide.module#MotionBlockSlideModule',
loadChildren: () =>
import('./motions/motion-block/motion-block-slide.module').then(m => m.MotionBlockSlideModule),
verboseName: 'Motion block',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -43,7 +44,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'users/user',
path: 'users/user',
loadChildren: './slides/users/user/user-slide.module#UserSlideModule',
loadChildren: () => import('./users/user/user-slide.module').then(m => m.UserSlideModule),
verboseName: 'Participant',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -51,7 +52,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'core/clock',
path: 'core/clock',
loadChildren: './slides/core/clock/clock-slide.module#ClockSlideModule',
loadChildren: () => import('./core/clock/clock-slide.module').then(m => m.ClockSlideModule),
verboseName: 'Clock',
elementIdentifiers: ['name'],
canBeMappedToModel: false
@ -59,7 +60,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'core/countdown',
path: 'core/countdown',
loadChildren: './slides/core/countdown/countdown-slide.module#CountdownSlideModule',
loadChildren: () => import('./core/countdown/countdown-slide.module').then(m => m.CountdownSlideModule),
verboseName: 'Countdown',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -67,7 +68,8 @@ export const allSlides: SlideManifest[] = [
{
slide: 'core/projector-message',
path: 'core/projector-message',
loadChildren: './slides/core/projector-message/projector-message-slide.module#ProjectorMessageSlideModule',
loadChildren: () =>
import('./core/projector-message/projector-message-slide.module').then(m => m.ProjectorMessageSlideModule),
verboseName: 'Message',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -75,8 +77,10 @@ export const allSlides: SlideManifest[] = [
{
slide: 'agenda/current-list-of-speakers',
path: 'agenda/current-list-of-speakers',
loadChildren:
'./slides/agenda/current-list-of-speakers/current-list-of-speakers-slide.module#CurrentListOfSpeakersSlideModule',
loadChildren: () =>
import('./agenda/current-list-of-speakers/current-list-of-speakers-slide.module').then(
m => m.CurrentListOfSpeakersSlideModule
),
verboseName: 'Current list of speakers',
elementIdentifiers: ['name'],
canBeMappedToModel: false
@ -84,8 +88,10 @@ export const allSlides: SlideManifest[] = [
{
slide: 'agenda/current-list-of-speakers-overlay',
path: 'agenda/current-list-of-speakers-overlay',
loadChildren:
'./slides/agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module#CurrentListOfSpeakersOverlaySlideModule',
loadChildren: () =>
import('./agenda/current-list-of-speakers-overlay/current-list-of-speakers-overlay-slide.module').then(
m => m.CurrentListOfSpeakersOverlaySlideModule
),
verboseName: 'Current list of speakers overlay',
elementIdentifiers: ['name'],
canBeMappedToModel: false
@ -93,8 +99,10 @@ export const allSlides: SlideManifest[] = [
{
slide: 'agenda/current-speaker-chyron',
path: 'agenda/current-speaker-chyron',
loadChildren:
'./slides/agenda/current-speaker-chyron/current-speaker-chyron-slide.module#CurrentSpeakerChyronSlideModule',
loadChildren: () =>
import('./agenda/current-speaker-chyron/current-speaker-chyron-slide.module').then(
m => m.CurrentSpeakerChyronSlideModule
),
verboseName: 'Current speaker chyron',
elementIdentifiers: ['name'],
canBeMappedToModel: false
@ -102,7 +110,8 @@ export const allSlides: SlideManifest[] = [
{
slide: 'agenda/list-of-speakers',
path: 'agenda/list-of-speakers',
loadChildren: './slides/agenda/list-of-speakers/list-of-speakers-slide.module#ListOfSpeakersSlideModule',
loadChildren: () =>
import('./agenda/list-of-speakers/list-of-speakers-slide.module').then(m => m.ListOfSpeakersSlideModule),
verboseName: 'List of speakers',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: false
@ -110,7 +119,8 @@ export const allSlides: SlideManifest[] = [
{
slide: 'assignments/assignment',
path: 'assignments/assignment',
loadChildren: './slides/assignments/assignment/assignment-slide.module#AssignmentSlideModule',
loadChildren: () =>
import('./assignments/assignment/assignment-slide.module').then(m => m.AssignmentSlideModule),
verboseName: 'Election',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true
@ -118,7 +128,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'assignments/poll',
path: 'assignments/poll',
loadChildren: './slides/assignments/poll/poll-slide.module#PollSlideModule',
loadChildren: () => import('./assignments/poll/poll-slide.module').then(m => m.PollSlideModule),
verboseName: 'Poll',
elementIdentifiers: ['name', 'assignment_id', 'poll_id'],
canBeMappedToModel: false
@ -126,7 +136,7 @@ export const allSlides: SlideManifest[] = [
{
slide: 'mediafiles/mediafile',
path: 'mediafiles/mediafile',
loadChildren: './slides/mediafiles/mediafile/mediafile-slide.module#MediafileSlideModule',
loadChildren: () => import('./mediafiles/mediafile/mediafile-slide.module').then(m => m.MediafileSlideModule),
verboseName: 'File',
elementIdentifiers: ['name', 'id'],
canBeMappedToModel: true

16
client/src/app/slides/services/slide-manager.service.ts
View File

@ -1,4 +1,4 @@
import { ComponentFactory, Inject, Injectable, Injector, NgModuleFactoryLoader, Type } from '@angular/core';
import { Compiler, ComponentFactory, Inject, Injectable, Injector, NgModuleFactory, Type } from '@angular/core';
import { allSlidesDynamicConfiguration } from '../all-slide-configurations';
import { IdentifiableProjectorElement, ProjectorElement } from 'app/shared/models/core/projector';
@ -17,7 +17,7 @@ export class SlideManager {
public constructor(
@Inject(SLIDE_MANIFESTS) private manifests: SlideManifest[],
private loader: NgModuleFactoryLoader,
private compiler: Compiler,
private injector: Injector
) {
this.manifests.forEach(slideManifest => {
@ -88,7 +88,14 @@ export class SlideManager {
const manifest = this.getManifest(slideName);
// Load the module factory.
return this.loader.load(manifest.loadChildren).then(ngModuleFactory => {
let ngModuleFactory: NgModuleFactory<any>;
const loadedModule = await manifest.loadChildren();
if (loadedModule instanceof NgModuleFactory) {
ngModuleFactory = loadedModule;
} else {
ngModuleFactory = await this.compiler.compileModuleAsync(loadedModule);
}
// create the module
const moduleRef = ngModuleFactory.create(this.injector);
@ -104,7 +111,6 @@ export class SlideManager {
throw e;
}
// Resolve this component factory
return moduleRef.componentFactoryResolver.resolveComponentFactory<T>(dynamicComponentType);
});
return moduleRef.componentFactoryResolver.resolveComponentFactory(dynamicComponentType);
}
}

3
client/src/app/slides/slide-manifest.ts
View File

@ -1,4 +1,5 @@
import { InjectionToken } from '@angular/core';
import { LoadChildrenCallback } from '@angular/router';
import { TranslateService } from '@ngx-translate/core';
@ -38,7 +39,7 @@ export interface SlideDynamicConfiguration {
*/
export interface SlideManifest extends Slide {
path: string;
loadChildren: string;
loadChildren: LoadChildrenCallback;
verboseName: string;
elementIdentifiers: (keyof IdentifiableProjectorElement)[];
canBeMappedToModel: boolean;

4
client/src/app/slides/slides.module.ts
View File

@ -1,5 +1,5 @@
import { ModuleWithProviders } from '@angular/compiler/src/core';
import { NgModule, NgModuleFactoryLoader, SystemJsNgModuleLoader } from '@angular/core';
import { NgModule } from '@angular/core';
import { ROUTES } from '@angular/router';
import { allSlides } from './all-slides';
@ -15,7 +15,7 @@ import { SLIDE_MANIFESTS } from './slide-manifest';
* found and put in sepearte chunks.
*/
@NgModule({
providers: [SlideManager, { provide: NgModuleFactoryLoader, useClass: SystemJsNgModuleLoader }]
providers: [SlideManager]
})
export class SlidesModule {
public static forRoot(): ModuleWithProviders {