[ADF-3380] lazy loading fixes (#3609)

* lazy loading file viewer * fix issue with CoreModule referencing * fix issue with app config and lazy loading * test fixes * fix import * lazy loading workaround for content module * fix providers for lazy loading * fix tests * lazy loading for Process Services lib * lazy loading for Insights, module cleanup * fix issue with Translate module, optimise imports * lazy-load blob viewer (demo shell) * remove duplicate pdf init * update to more stable pdfjs * fix license header * fix lint issues * fix test import * fix pdf version
2025-07-31 17:38:48 +00:00 · 2018-08-07 23:03:20 +01:00
parent f3a513ca72
commit f606149344
55 changed files with 498 additions and 300 deletions
--- a/lib/core/about/about.module.ts
+++ b/lib/core/about/about.module.ts
@@ -27,7 +27,7 @@ import { DataColumnModule } from '../data-column/data-column.module';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        DataTableModule,
        DataColumnModule
    ],
--- a/lib/core/app-config/app-config.module.ts
+++ b/lib/core/app-config/app-config.module.ts
@@ -17,7 +17,6 @@

 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { AppConfigService } from './app-config.service';
 import { AppConfigPipe } from './app-config.pipe';

@NgModule({
@@ -27,9 +26,6 @@ import { AppConfigPipe } from './app-config.pipe';
    declarations: [
        AppConfigPipe
    ],
-    providers: [
-        AppConfigService
-    ],
    exports: [
        AppConfigPipe
    ]
--- a/lib/core/buttons-menu/buttons-menu.module.ts
+++ b/lib/core/buttons-menu/buttons-menu.module.ts
@@ -26,7 +26,7 @@ import { FlexLayoutModule } from '@angular/flex-layout';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        FlexLayoutModule
    ],
    declarations: [
--- a/lib/core/card-view/card-view.module.ts
+++ b/lib/core/card-view/card-view.module.ts
@@ -47,7 +47,7 @@ import { CardViewSelectItemComponent } from './components/card-view-selectitem/c
        CommonModule,
        FormsModule,
        FlexLayoutModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        MatDatepickerModule,
        MatNativeDateModule,
        MatCheckboxModule,
--- a/lib/core/collapsable/collapsable.module.ts
+++ b/lib/core/collapsable/collapsable.module.ts
@@ -36,9 +36,6 @@ import { AccordionComponent } from './accordion.component';
    exports: [
        AccordionComponent,
        AccordionGroupComponent
-    ],
-    providers: [
-        AccordionComponent
    ]
 })
 export class CollapsableModule {}
--- a/lib/core/comments/comments.module.ts
+++ b/lib/core/comments/comments.module.ts
@@ -36,7 +36,7 @@ import { CommentsComponent } from './comments.component';
        ReactiveFormsModule,
        MaterialModule,
        CommonModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        CommentListComponent,
--- a/lib/core/context-menu/context-menu-holder.component.spec.ts
+++ b/lib/core/context-menu/context-menu-holder.component.spec.ts
@@ -21,6 +21,7 @@ import { fakeAsync, ComponentFixture, TestBed, tick } from '@angular/core/testin
 import { ContextMenuHolderComponent } from './context-menu-holder.component';
 import { ContextMenuModule } from './context-menu.module';
 import { ContextMenuService } from './context-menu.service';
+import { CoreModule } from '../core.module';

 describe('ContextMenuHolderComponent', () => {
    let fixture: ComponentFixture<ContextMenuHolderComponent>;
@@ -53,6 +54,7 @@ describe('ContextMenuHolderComponent', () => {
    beforeEach(() => {
        TestBed.configureTestingModule({
                imports: [
+                    CoreModule.forRoot(),
                    ContextMenuModule
                ],
                providers: [
--- a/lib/core/context-menu/context-menu.module.ts
+++ b/lib/core/context-menu/context-menu.module.ts
@@ -22,13 +22,12 @@ import { TranslateModule } from '@ngx-translate/core';

 import { ContextMenuHolderComponent } from './context-menu-holder.component';
 import { ContextMenuDirective } from './context-menu.directive';
-import { ContextMenuService } from './context-menu.service';

@NgModule({
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        ContextMenuHolderComponent,
@@ -37,9 +36,6 @@ import { ContextMenuService } from './context-menu.service';
    exports: [
        ContextMenuHolderComponent,
        ContextMenuDirective
-    ],
-    providers: [
-        ContextMenuService
    ]
 })
 export class ContextMenuModule {}
--- a/lib/core/core.module.ts
+++ b/lib/core/core.module.ts
@@ -83,6 +83,17 @@ import { UserPreferencesService } from './services/user-preferences.service';
 import { SearchConfigurationService } from './services/search-configuration.service';
 import { startupServiceFactory } from './services/startup-service-factory';
 import { SortingPickerModule } from './sorting-picker/sorting-picker.module';
+import { AppConfigService } from './app-config/app-config.service';
+import { ContextMenuService } from './context-menu/context-menu.service';
+import { ActivitiContentService } from './form/services/activiti-alfresco.service';
+import { EcmModelService } from './form/services/ecm-model.service';
+import { FormRenderingService } from './form/services/form-rendering.service';
+import { FormService } from './form/services/form.service';
+import { NodeService } from './form/services/node.service';
+import { ProcessContentService } from './form/services/process-content.service';
+import { WidgetVisibilityService } from './form/services/widget-visibility.service';
+import { EcmUserService } from './userinfo/services/ecm-user.service';
+import { BpmUserService } from './userinfo/services/bpm-user.service';

 export function createTranslateLoader(http: HttpClient, logService: LogService) {
    return new TranslateLoaderService(http, logService);
@@ -124,7 +135,18 @@ export function providers() {
        CommentProcessService,
        CommentContentService,
        SearchConfigurationService,
-        DatePipe
+        DatePipe,
+        AppConfigService,
+        ContextMenuService,
+        ActivitiContentService,
+        EcmModelService,
+        FormRenderingService,
+        FormService,
+        NodeService,
+        ProcessContentService,
+        WidgetVisibilityService,
+        EcmUserService,
+        BpmUserService
    ];
 }

--- a/lib/core/datatable/datatable.module.ts
+++ b/lib/core/datatable/datatable.module.ts
@@ -44,7 +44,7 @@ import { EmptyCustomContentDirective } from './directives/empty-custom-content.d
        RouterModule,
        MaterialModule,
        CommonModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        ContextMenuModule,
        PipeModule,
        DirectiveModule
--- a/lib/core/form/form.module.ts
+++ b/lib/core/form/form.module.ts
@@ -36,14 +36,6 @@ import { FormComponent } from './components/form.component';
 import { StartFormComponent } from './components/start-form.component';
 import { ContentWidgetComponent } from './components/widgets/content/content.widget';
 import { WidgetComponent } from './components/widgets/widget.component';
-
-import { ActivitiContentService } from './services/activiti-alfresco.service';
-import { EcmModelService } from './services/ecm-model.service';
-import { FormRenderingService } from './services/form-rendering.service';
-import { FormService } from './services/form.service';
-import { NodeService } from './services/node.service';
-import { ProcessContentService } from './services/process-content.service';
-import { WidgetVisibilityService } from './services/widget-visibility.service';
 import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimepicker/core';

@NgModule({
@@ -52,7 +44,7 @@ import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimep
        DataTableModule,
        HttpClientModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        FormsModule,
        ReactiveFormsModule,
        DataColumnModule,
@@ -74,15 +66,6 @@ import { MatDatetimepickerModule, MatNativeDatetimeModule } from '@mat-datetimep
    entryComponents: [
        ...WIDGET_DIRECTIVES
    ],
-    providers: [
-        ActivitiContentService,
-        EcmModelService,
-        FormRenderingService,
-        FormService,
-        NodeService,
-        ProcessContentService,
-        WidgetVisibilityService
-    ],
    exports: [
        ContentWidgetComponent,
        FormFieldComponent,
--- a/lib/core/login/login.module.ts
+++ b/lib/core/login/login.module.ts
@@ -33,7 +33,7 @@ import { LoginHeaderDirective } from './directives/login-header.directive';
        FormsModule,
        ReactiveFormsModule,
        CommonModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        LoginComponent,
@@ -41,11 +41,9 @@ import { LoginHeaderDirective } from './directives/login-header.directive';
        LoginHeaderDirective
    ],
    exports: [
-        [
-            LoginComponent,
-            LoginFooterDirective,
-            LoginHeaderDirective
-        ]
+        LoginComponent,
+        LoginFooterDirective,
+        LoginHeaderDirective
    ]
 })
 export class LoginModule {
--- a/lib/core/package.json
+++ b/lib/core/package.json
@@ -32,7 +32,7 @@
    "hammerjs": "2.0.8",
    "minimatch-browser": "1.0.0",
    "moment": "^2.22.2",
-    "pdfjs-dist": "1.5.404",
+    "pdfjs-dist": "2.0.303",
    "reflect-metadata": "^0.1.12",
    "zone.js": "^0.8.26"
  },
--- a/lib/core/pagination/pagination.module.ts
+++ b/lib/core/pagination/pagination.module.ts
@@ -26,7 +26,7 @@ import { PaginationComponent } from './pagination.component';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        InfinitePaginationComponent,
--- a/lib/core/settings/host-settings.module.ts
+++ b/lib/core/settings/host-settings.module.ts
@@ -27,7 +27,7 @@ import { HostSettingsComponent } from './host-settings.component';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        FormsModule,
        ReactiveFormsModule
    ],
--- a/lib/core/sorting-picker/sorting-picker.module.ts
+++ b/lib/core/sorting-picker/sorting-picker.module.ts
@@ -25,7 +25,7 @@ import { SortingPickerComponent } from './sorting-picker.component';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        SortingPickerComponent
--- a/lib/core/templates/template.module.ts
+++ b/lib/core/templates/template.module.ts
@@ -26,7 +26,7 @@ import { EmptyContentComponent } from './empty-content/empty-content.component';
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule
+        TranslateModule.forChild()
    ],
    declarations: [
        ErrorContentComponent,
--- a/lib/core/userinfo/userinfo.module.ts
+++ b/lib/core/userinfo/userinfo.module.ts
@@ -22,23 +22,17 @@ import { TranslateModule } from '@ngx-translate/core';
 import { MaterialModule } from '../material.module';
 import { PipeModule } from '../pipes/pipe.module';
 import { UserInfoComponent } from './components/user-info.component';
-import { BpmUserService } from './services/bpm-user.service';
-import { EcmUserService } from './services/ecm-user.service';

@NgModule({
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        PipeModule
    ],
    declarations: [
        UserInfoComponent
    ],
-    providers: [
-        EcmUserService,
-        BpmUserService
-    ],
    exports: [
        UserInfoComponent
    ]
--- a/lib/core/viewer/viewer.module.ts
+++ b/lib/core/viewer/viewer.module.ts
@@ -44,7 +44,7 @@ import { ViewerToolbarActionsComponent } from './components/viewer-toolbar-actio
    imports: [
        CommonModule,
        MaterialModule,
-        TranslateModule,
+        TranslateModule.forChild(),
        FormsModule,
        ReactiveFormsModule,
        ToolbarModule,