[no-issue] Fix translate module - 1st iteration (#4290)

* [no-issue] Fix translate module - 1st iteration * restore translate exports * move i18n to the app level, fix lazy loading * improve i18n imports * update unit tests * fix unit tests * test fixes
2025-07-24 17:32:15 +00:00 · 2019-02-12 05:56:05 +00:00
parent 0683c4d226
commit 7bf5e59740
20 changed files with 68 additions and 198 deletions
--- a/lib/process-services-cloud/src/lib/app/app-list-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/app/app-list-cloud.module.ts
@@ -22,21 +22,15 @@ import { CommonModule } from '@angular/common';
 import { AppDetailsCloudComponent } from './components/app-details-cloud.component';
 import { AppListCloudComponent } from './components/app-list-cloud.component';
 import { AppsProcessCloudService } from './services/apps-process-cloud.service';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TemplateModule, TranslateLoaderService } from '@alfresco/adf-core';
+import { TemplateModule, CoreModule } from '@alfresco/adf-core';

@NgModule({
    imports: [
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        TemplateModule,
        MaterialModule,
-        FlexLayoutModule
+        FlexLayoutModule,
+        CoreModule.forChild()
    ],
    declarations: [
        AppListCloudComponent,
--- a/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts
+++ b/lib/process-services-cloud/src/lib/app/components/app-list-cloud.component.spec.ts
@@ -17,7 +17,7 @@

 import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { of } from 'rxjs';

 import { fakeApplicationInstance } from '../mock/app-model.mock';
@@ -35,7 +35,7 @@ describe('AppListCloudComponent', () => {
    let getAppsSpy: jasmine.Spy;

    setupTestBed({
-        imports: [ProcessServiceCloudTestingModule, AppListCloudModule],
+        imports: [CoreModule.forRoot(), ProcessServiceCloudTestingModule, AppListCloudModule],
        providers: [AppsProcessCloudService]
    });

--- a/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts
+++ b/lib/process-services-cloud/src/lib/app/services/apps-process-cloud.service.spec.ts
@@ -17,7 +17,7 @@

 import { TestBed } from '@angular/core/testing';
 import { of, throwError } from 'rxjs';
-import { setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { HttpErrorResponse } from '@angular/common/http';
 import { AppsProcessCloudService } from './apps-process-cloud.service';
 import { fakeApplicationInstance } from '../mock/app-model.mock';
@@ -29,7 +29,7 @@ describe('AppsProcessCloudService', () => {
    let service: AppsProcessCloudService;

    setupTestBed({
-        imports: [ProcessServiceCloudTestingModule],
+        imports: [CoreModule.forRoot(), ProcessServiceCloudTestingModule],
        providers: [AppsProcessCloudService]
    });

--- a/lib/process-services-cloud/src/lib/group/group-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/group/group-cloud.module.ts
@@ -19,29 +19,23 @@ import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';

-import { TemplateModule, TranslateLoaderService, FormModule, PipeModule } from '@alfresco/adf-core';
+import { TemplateModule, FormModule, PipeModule, CoreModule } from '@alfresco/adf-core';
 import { MaterialModule } from '../material.module';
 import { GroupCloudComponent } from './components/group-cloud.component';
 import { InitialGroupNamePipe } from './pipe/group-initial.pipe';

@NgModule({
-  imports: [
-    CommonModule,
-    PipeModule,
-    TranslateModule.forRoot({
-          loader: {
-              provide: TranslateLoader,
-              useClass: TranslateLoaderService
-          }
-      }),
-      TemplateModule,
-      FlexLayoutModule,
-      MaterialModule,
-      FormsModule,
-      ReactiveFormsModule,
-      FormModule
+    imports: [
+        CommonModule,
+        PipeModule,
+        TemplateModule,
+        FlexLayoutModule,
+        MaterialModule,
+        FormsModule,
+        ReactiveFormsModule,
+        FormModule,
+        CoreModule.forChild()
    ],
    declarations: [GroupCloudComponent, InitialGroupNamePipe],
    exports: [GroupCloudComponent, InitialGroupNamePipe]
--- a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts
@@ -16,7 +16,7 @@
 */

 import { NgModule } from '@angular/core';
-import { TRANSLATION_PROVIDER } from '@alfresco/adf-core';
+import { TRANSLATION_PROVIDER, CoreModule } from '@alfresco/adf-core';
 import { AppListCloudModule } from './app/app-list-cloud.module';
 import { TaskCloudModule } from './task/task-cloud.module';
 import { ProcessCloudModule } from './process/process-cloud.module';
@@ -24,6 +24,7 @@ import { GroupCloudModule } from './group/group-cloud.module';

@NgModule({
    imports: [
+        CoreModule.forChild(),
        AppListCloudModule,
        ProcessCloudModule,
        TaskCloudModule,
--- a/lib/process-services-cloud/src/lib/process/process-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process/process-cloud.module.ts
@@ -19,12 +19,14 @@ import { NgModule } from '@angular/core';
 import { ProcessFiltersCloudModule } from './process-filters/process-filters-cloud.module';
 import { ProcessListCloudModule } from './process-list/process-list-cloud.module';
 import { StartProcessCloudModule } from './start-process/start-process-cloud.module';
+import { CoreModule } from '@alfresco/adf-core';

@NgModule({
    imports: [
        ProcessFiltersCloudModule,
        ProcessListCloudModule,
-        StartProcessCloudModule
+        StartProcessCloudModule,
+        CoreModule.forChild()
    ],
    exports: [
        ProcessFiltersCloudModule,
--- a/lib/process-services-cloud/src/lib/process/process-filters/process-filters-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process/process-filters/process-filters-cloud.module.ts
@@ -21,8 +21,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { ProcessFiltersCloudComponent } from './components/process-filters-cloud.component';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService, LogService, StorageService } from '@alfresco/adf-core';
+import { LogService, StorageService, CoreModule } from '@alfresco/adf-core';
 import { ProcessFilterCloudService } from './services/process-filter-cloud.service';
 import { HttpClientModule } from '@angular/common/http';
 import { EditProcessFilterCloudComponent } from './components/edit-process-filter-cloud.component';
@@ -34,15 +33,11 @@ import { AppListCloudModule } from './../../app/app-list-cloud.module';
        ReactiveFormsModule,
        HttpClientModule,
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        FlexLayoutModule,
        MaterialModule,
-        AppListCloudModule
+        AppListCloudModule,
+        CoreModule.forChild()
+
    ],
    declarations: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent],
    exports: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent],
--- a/lib/process-services-cloud/src/lib/process/process-list/process-list-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process/process-list/process-list-cloud.module.ts
@@ -19,22 +19,17 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { ProcessListCloudComponent } from './components/process-list-cloud.component';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService, DataTableModule, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, TemplateModule, CoreModule } from '@alfresco/adf-core';
 import { ProcessListCloudService } from './services/process-list-cloud.service';

@NgModule({
    imports: [
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        MaterialModule,
        DataTableModule,
-        TemplateModule
+        TemplateModule,
+        CoreModule.forChild()
+
    ],
    declarations: [ProcessListCloudComponent],
    exports: [ProcessListCloudComponent],
--- a/lib/process-services-cloud/src/lib/process/process-list/testing/process-list.testing.module.ts
+++ b/lib/process-services-cloud/src/lib/process/process-list/testing/process-list.testing.module.ts
@@ -28,13 +28,15 @@ import {
    TranslationService,
    TranslationMock,
    UserPreferencesService,
-    ContextMenuModule
+    ContextMenuModule,
+    CoreModule
 } from '@alfresco/adf-core';
@NgModule({
    imports: [
        HttpClientModule,
        NoopAnimationsModule,
        ProcessListCloudModule,
+        CoreModule.forRoot(),
        ContextMenuModule
    ],
    providers: [
--- a/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts
+++ b/lib/process-services-cloud/src/lib/process/start-process/services/start-process-cloud.service.spec.ts
@@ -16,7 +16,7 @@
 */

 import { TestBed } from '@angular/core/testing';
-import { setupTestBed } from '@alfresco/adf-core';
+import { setupTestBed, CoreModule } from '@alfresco/adf-core';
 import { of, throwError } from 'rxjs';
 import {
    AlfrescoApiService,
@@ -36,7 +36,7 @@ describe('StartTaskCloudService', () => {
    let service: StartProcessCloudService;

    setupTestBed({
-        imports: [ProcessCloudModule],
+        imports: [CoreModule.forRoot(), ProcessCloudModule],
        providers: [StartProcessCloudService, AlfrescoApiService, AppConfigService, LogService, StorageService]
    });

--- a/lib/process-services-cloud/src/lib/process/start-process/start-process-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/process/start-process/start-process-cloud.module.ts
@@ -20,23 +20,17 @@ import { CommonModule } from '@angular/common';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService } from '@alfresco/adf-core';
 import { StartProcessCloudComponent } from './components/start-process-cloud.component';
 import { StartProcessCloudService } from './services/start-process-cloud.service';
+import { CoreModule } from '@alfresco/adf-core';
@NgModule({
    imports: [
        FormsModule,
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        MaterialModule,
        FlexLayoutModule,
-        ReactiveFormsModule
+        ReactiveFormsModule,
+        CoreModule.forChild()
    ],
    declarations: [
        StartProcessCloudComponent
--- a/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/start-task/start-task-cloud.module.ts
@@ -19,8 +19,7 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TemplateModule, TranslateLoaderService, FormModule, PipeModule } from '@alfresco/adf-core';
+import { TemplateModule, FormModule, PipeModule, CoreModule } from '@alfresco/adf-core';
 import { StartTaskCloudComponent } from './components/start-task-cloud.component';
 import { StartTaskCloudService } from './services/start-task-cloud.service';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -31,12 +30,6 @@ import { GroupCloudModule } from '../../group/group-cloud.module';
    imports: [
      CommonModule,
      PipeModule,
-      TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        TemplateModule,
        FlexLayoutModule,
        MaterialModule,
@@ -44,7 +37,8 @@ import { GroupCloudModule } from '../../group/group-cloud.module';
        ReactiveFormsModule,
        GroupCloudModule,
        FormModule,
-        GroupCloudModule
+        GroupCloudModule,
+        CoreModule.forChild()
    ],
    declarations: [StartTaskCloudComponent, PeopleCloudComponent],
    providers: [
--- a/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-filters/task-filters-cloud.module.ts
@@ -21,8 +21,7 @@ import { CommonModule } from '@angular/common';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { TaskFiltersCloudComponent } from './components/task-filters-cloud.component';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService, LogService, StorageService } from '@alfresco/adf-core';
+import { LogService, StorageService, CoreModule } from '@alfresco/adf-core';
 import { TaskFilterCloudService } from './services/task-filter-cloud.service';
 import { HttpClientModule } from '@angular/common/http';
 import { EditTaskFilterCloudComponent } from './components/edit-task-filter-cloud.component';
@@ -36,14 +35,9 @@ import { AppListCloudModule } from './../../app/app-list-cloud.module';
        HttpClientModule,
        CommonModule,
        FlexLayoutModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        MaterialModule,
-        AppListCloudModule
+        AppListCloudModule,
+        CoreModule.forChild()
    ],
    declarations: [TaskFiltersCloudComponent, EditTaskFilterCloudComponent, TaskFilterDialogCloudComponent],
    exports: [TaskFiltersCloudComponent, EditTaskFilterCloudComponent],
--- a/lib/process-services-cloud/src/lib/task/task-header/task-header-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-header/task-header-cloud.module.ts
@@ -18,24 +18,18 @@
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MaterialModule } from '../../material.module';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService, DataTableModule, TemplateModule, CardViewModule } from '@alfresco/adf-core';
+import { DataTableModule, TemplateModule, CardViewModule, CoreModule } from '@alfresco/adf-core';
 import { TaskHeaderCloudComponent } from './components/task-header-cloud.component';
 import { TaskHeaderCloudService } from './services/task-header-cloud.service';

@NgModule({
    imports: [
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        MaterialModule,
        DataTableModule,
        TemplateModule,
-        CardViewModule
+        CardViewModule,
+        CoreModule.forChild()
    ],
    declarations: [
        TaskHeaderCloudComponent
--- a/lib/process-services-cloud/src/lib/task/task-list/task-list-cloud.module.ts
+++ b/lib/process-services-cloud/src/lib/task/task-list/task-list-cloud.module.ts
@@ -19,22 +19,16 @@ import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { MaterialModule } from '../../material.module';
 import { TaskListCloudComponent } from './components/task-list-cloud.component';
-import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateLoaderService, DataTableModule, TemplateModule } from '@alfresco/adf-core';
+import { DataTableModule, TemplateModule, CoreModule } from '@alfresco/adf-core';
 import { TaskListCloudService } from './services/task-list-cloud.service';

@NgModule({
    imports: [
        CommonModule,
-        TranslateModule.forRoot({
-            loader: {
-                provide: TranslateLoader,
-                useClass: TranslateLoaderService
-            }
-        }),
        MaterialModule,
        DataTableModule,
-        TemplateModule
+        TemplateModule,
+        CoreModule.forChild()
    ],
    declarations: [TaskListCloudComponent],
    exports: [TaskListCloudComponent],
--- a/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts
+++ b/lib/process-services-cloud/src/lib/testing/process-service-cloud.testing.module.ts
@@ -28,13 +28,15 @@ import {
    TranslationService,
    TranslationMock,
    UserPreferencesService,
-    ContextMenuModule
+    ContextMenuModule,
+    CoreModule
 } from '@alfresco/adf-core';

@NgModule({
    imports: [
        HttpClientModule,
        NoopAnimationsModule,
+        CoreModule.forRoot(),
        ContextMenuModule
    ],
    providers: [