From 725eb46e52204356a57e79aea88d4d6a980f789a Mon Sep 17 00:00:00 2001 From: mauriziovitale Date: Tue, 6 Aug 2024 12:19:45 +0100 Subject: [PATCH] Make CoreModule a legacy module --- demo-shell/src/app/app.module.ts | 4 ++-- .../components/card-view/card-view.module.ts | 12 ++++------ .../cloud/shared/cloud.shared.module.ts | 16 ++++---------- .../components/file-view/file-view.module.ts | 8 +++---- .../src/app/components/login/login.module.ts | 13 ++++------- .../process-list-demo/process-list.module.ts | 4 ++-- .../components/settings/settings.module.ts | 19 +++++----------- .../task-list-demo/task-list.module.ts | 4 ++-- .../breaking-change-2.6.0-3.0.0.md | 4 ++-- docs/release-notes/RelNote250.md | 2 +- .../content-node-selector.module.ts | 4 ++-- .../content-node-share.directive.spec.ts | 4 ++-- .../src/lib/content.module.ts | 4 ++-- .../lib/document-list/document-list.module.ts | 4 ++-- .../lib/node-comments/node-comments.module.ts | 4 ++-- .../src/lib/search/search.module.ts | 4 ++-- .../src/lib/testing/content.testing.module.ts | 6 ++--- .../{core.module.ts => core-legacy.module.ts} | 14 +++++++----- lib/core/src/lib/testing/core.story.module.ts | 4 ++-- .../src/lib/testing/core.testing.module.ts | 6 ++--- .../lib/translation/translate-loader.spec.ts | 12 +++------- lib/core/src/public-api.ts | 2 +- .../lib/testing/insights.testing.module.ts | 6 ++--- .../src/lib/app/app-list-cloud.module.ts | 22 +++++-------------- .../src/lib/common/process-common.module.ts | 18 +++++---------- .../components/form-cloud.component.spec.ts | 12 +++++++--- .../src/lib/form/form-cloud.module.ts | 4 ++-- .../src/lib/group/group-cloud.module.ts | 16 ++++---------- .../src/lib/people/people-cloud.module.ts | 4 ++-- .../src/lib/process-services-cloud.module.ts | 8 +++---- .../src/lib/process/process-cloud.module.ts | 14 ++++-------- .../process-filters-cloud.module.ts | 6 ++--- .../process-header-cloud.module.ts | 11 +++------- .../process-list/process-list-cloud.module.ts | 19 +++++++--------- .../start-process-cloud.module.ts | 21 +++++------------- .../start-task/start-task-cloud.module.ts | 20 ++++------------- .../task-filters/task-filters-cloud.module.ts | 4 ++-- .../lib/task/task-form/task-form.module.ts | 20 +++++------------ .../task-header/task-header-cloud.module.ts | 18 +++++---------- .../task/task-list/task-list-cloud.module.ts | 20 +++++------------ .../process-service-cloud.testing.module.ts | 12 ++++------ .../process-services-cloud-story.module.ts | 16 ++++---------- .../services/process.service.spec.ts | 4 ++-- .../src/lib/testing/process.testing.module.ts | 6 ++--- 44 files changed, 152 insertions(+), 283 deletions(-) rename lib/core/src/lib/{core.module.ts => core-legacy.module.ts} (95%) diff --git a/demo-shell/src/app/app.module.ts b/demo-shell/src/app/app.module.ts index 0f1e8225a2..2975d87b56 100644 --- a/demo-shell/src/app/app.module.ts +++ b/demo-shell/src/app/app.module.ts @@ -22,7 +22,7 @@ import { NgChartsModule } from 'ng2-charts'; import { HttpClientModule } from '@angular/common/http'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { TranslateModule } from '@ngx-translate/core'; -import { AppConfigService, DebugAppConfigService, CoreModule, AuthModule, provideTranslations } from '@alfresco/adf-core'; +import { AppConfigService, DebugAppConfigService, CoreLegacyModule, AuthModule, provideTranslations } from '@alfresco/adf-core'; import { ExtensionsModule } from '@alfresco/adf-extensions'; import { AppComponent } from './app.component'; import { MaterialModule } from './material.module'; @@ -82,7 +82,7 @@ import { CoreAutomationService } from '../testing/automation.service'; HttpClientModule, MaterialModule, TranslateModule.forRoot(), - CoreModule.forRoot(), + CoreLegacyModule.forRoot(), ContentModule.forRoot(), InsightsModule.forRoot(), ProcessModule.forRoot(), diff --git a/demo-shell/src/app/components/card-view/card-view.module.ts b/demo-shell/src/app/components/card-view/card-view.module.ts index 94da390446..968c00dd8e 100644 --- a/demo-shell/src/app/components/card-view/card-view.module.ts +++ b/demo-shell/src/app/components/card-view/card-view.module.ts @@ -19,21 +19,17 @@ import { NgModule } from '@angular/core'; import { CardViewComponent } from './card-view.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; const routes: Routes = [ { - path: '', - component: CardViewComponent + path: '', + component: CardViewComponent } ]; @NgModule({ - imports: [ - CommonModule, - CoreModule, - RouterModule.forChild(routes) - ], + imports: [CommonModule, CoreLegacyModule, RouterModule.forChild(routes)], declarations: [CardViewComponent] }) export class AppCardViewModule {} diff --git a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts index 00cf011aaf..7fdca18ae0 100644 --- a/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts +++ b/demo-shell/src/app/components/cloud/shared/cloud.shared.module.ts @@ -22,19 +22,11 @@ import { MatDialogModule } from '@angular/material/dialog'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; @NgModule({ - imports: [ - CommonModule, - CoreModule, - MatDialogModule, - MatInputModule, - MatSelectModule, - MatSlideToggleModule - ], - declarations: [ CloudSettingsComponent ], - exports: [ CommonModule, CloudSettingsComponent] + imports: [CommonModule, CoreLegacyModule, MatDialogModule, MatInputModule, MatSelectModule, MatSlideToggleModule], + declarations: [CloudSettingsComponent], + exports: [CommonModule, CloudSettingsComponent] }) - export class AppCloudSharedModule {} diff --git a/demo-shell/src/app/components/file-view/file-view.module.ts b/demo-shell/src/app/components/file-view/file-view.module.ts index a5ab81a664..4872f515ff 100644 --- a/demo-shell/src/app/components/file-view/file-view.module.ts +++ b/demo-shell/src/app/components/file-view/file-view.module.ts @@ -18,7 +18,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { Routes, RouterModule } from '@angular/router'; -import { CoreModule, InfoDrawerModule } from '@alfresco/adf-core'; +import { CoreLegacyModule, InfoDrawerModule } from '@alfresco/adf-core'; import { ContentModule, ContentDirectiveModule, VersionManagerModule, ContentMetadataModule } from '@alfresco/adf-content-services'; import { FileViewComponent } from './file-view.component'; @@ -33,7 +33,7 @@ const routes: Routes = [ imports: [ CommonModule, RouterModule.forChild(routes), - CoreModule, + CoreLegacyModule, ContentModule, InfoDrawerModule, ContentModule, @@ -44,6 +44,4 @@ const routes: Routes = [ declarations: [FileViewComponent], exports: [FileViewComponent] }) -export class FileViewModule { - -} +export class FileViewModule {} diff --git a/demo-shell/src/app/components/login/login.module.ts b/demo-shell/src/app/components/login/login.module.ts index 41c901e098..aefdd55b17 100644 --- a/demo-shell/src/app/components/login/login.module.ts +++ b/demo-shell/src/app/components/login/login.module.ts @@ -19,23 +19,18 @@ import { NgModule } from '@angular/core'; import { LoginComponent } from './login.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { ContentModule } from '@alfresco/adf-content-services'; const routes: Routes = [ { - path: '', - component: LoginComponent + path: '', + component: LoginComponent } ]; @NgModule({ - imports: [ - CommonModule, - CoreModule, - RouterModule.forChild(routes), - ContentModule.forChild() - ], + imports: [CommonModule, CoreLegacyModule, RouterModule.forChild(routes), ContentModule.forChild()], declarations: [LoginComponent] }) export class AppLoginModule {} diff --git a/demo-shell/src/app/components/process-list-demo/process-list.module.ts b/demo-shell/src/app/components/process-list-demo/process-list.module.ts index 083668b8a5..6f70a3ac23 100644 --- a/demo-shell/src/app/components/process-list-demo/process-list.module.ts +++ b/demo-shell/src/app/components/process-list-demo/process-list.module.ts @@ -19,7 +19,7 @@ import { NgModule } from '@angular/core'; import { ProcessListDemoComponent } from './process-list-demo.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { ProcessModule } from '@alfresco/adf-process-services'; const routes: Routes = [ @@ -34,7 +34,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule], + imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, ProcessModule], declarations: [ProcessListDemoComponent] }) export class AppProcessListModule {} diff --git a/demo-shell/src/app/components/settings/settings.module.ts b/demo-shell/src/app/components/settings/settings.module.ts index 92f04bcb0d..2eccc41c98 100644 --- a/demo-shell/src/app/components/settings/settings.module.ts +++ b/demo-shell/src/app/components/settings/settings.module.ts @@ -19,28 +19,19 @@ import { NgModule } from '@angular/core'; import { SettingsComponent } from './settings.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { HostSettingsComponent } from './host-settings.component'; const routes: Routes = [ { - path: '', - component: SettingsComponent + path: '', + component: SettingsComponent } ]; @NgModule({ - imports: [ - CommonModule, - RouterModule.forChild(routes), - CoreModule, - FormsModule, - ReactiveFormsModule - ], - declarations: [ - SettingsComponent, - HostSettingsComponent - ] + imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, FormsModule, ReactiveFormsModule], + declarations: [SettingsComponent, HostSettingsComponent] }) export class AppSettingsModule {} diff --git a/demo-shell/src/app/components/task-list-demo/task-list.module.ts b/demo-shell/src/app/components/task-list-demo/task-list.module.ts index 7196e67536..4d2ce82361 100644 --- a/demo-shell/src/app/components/task-list-demo/task-list.module.ts +++ b/demo-shell/src/app/components/task-list-demo/task-list.module.ts @@ -19,7 +19,7 @@ import { NgModule } from '@angular/core'; import { TaskListDemoComponent } from './task-list-demo.component'; import { Routes, RouterModule } from '@angular/router'; import { CommonModule } from '@angular/common'; -import { CoreModule, FullNamePipe, LocalizedDatePipe } from '@alfresco/adf-core'; +import { CoreLegacyModule, FullNamePipe, LocalizedDatePipe } from '@alfresco/adf-core'; import { ProcessModule } from '@alfresco/adf-process-services'; const routes: Routes = [ @@ -34,7 +34,7 @@ const routes: Routes = [ ]; @NgModule({ - imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule, LocalizedDatePipe, FullNamePipe], + imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, ProcessModule, LocalizedDatePipe, FullNamePipe], declarations: [TaskListDemoComponent] }) export class AppTaskListModule {} diff --git a/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md b/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md index 1099f466db..0961efb7ae 100644 --- a/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md +++ b/docs/breaking-changes/breaking-change-2.6.0-3.0.0.md @@ -49,9 +49,9 @@ This document lists all the deprecated ADF v2.x components that were removed for - `analytics-report-list` is now `adf-analytics-report-list`. - `analytics-report-parameters` is now `adf-analytics-report-parameters`. - `CommentProcessModel` was moved into the Core library with the name [`CommentModel`](../../lib/core/src/lib/models/comment.model.ts) in v2.3.0. Now you - can only import it from [`CoreModule`](../../lib/core/src/lib/core.module.ts). + can only import it from [`CoreLegacyModule`](../../lib/core/src/lib/core.module.ts). - [`CommentsModule`](../../lib/core/src/lib/comments/comments.module.ts), [`CommentListComponent`](../core/components/comment-list.component.md), and [`CommentsComponent`](../core/components/comments.component.md) are no longer exported from - [`ProcessModule`](../../lib/process-services/src/lib/process.module.ts) but now from [`CoreModule`](../../lib/core/src/lib/core.module.ts). The old usage was deprecated in v2.3.0. + [`ProcessModule`](../../lib/process-services/src/lib/process.module.ts) but now from [`CoreLegacyModule`](../../lib/core/src/lib/core.module.ts). The old usage was deprecated in v2.3.0. - ``: The `parentId` input has been renamed as `rootFolderId`. The old name was deprecated in v2.4.0. - The `createFolder` event of the [`UploadBase`](../../lib/content-services/src/lib/upload/components/base-upload/upload-base.ts) class (emitted when a folder was diff --git a/docs/release-notes/RelNote250.md b/docs/release-notes/RelNote250.md index 26988efdfc..eef4824a33 100644 --- a/docs/release-notes/RelNote250.md +++ b/docs/release-notes/RelNote250.md @@ -180,7 +180,7 @@ A new input parameter processDefinitionId has been added to the Tasklist and the ### Lazy loading improvements You can now use ADF libraries with the lazy-loaded feature modules. Every ADF library now supports "forRoot" and "forChild" semantics for the main modules. -For example, you should use ["CoreModule](lib/core/src/lib/core.module.ts).forRoot()" in the main application module, and ["CoreModule](lib/core/src/lib/core.module.ts).forChild()" in the lazy modules. +For example, you should use ["CoreLegacyModule](lib/core/src/lib/core.module.ts).forRoot()" in the main application module, and ["CoreLegacyModule](lib/core/src/lib/core.module.ts).forChild()" in the lazy modules. ### Localization diff --git a/lib/content-services/src/lib/content-node-selector/content-node-selector.module.ts b/lib/content-services/src/lib/content-node-selector/content-node-selector.module.ts index bb2f131c40..3e133fd43d 100644 --- a/lib/content-services/src/lib/content-node-selector/content-node-selector.module.ts +++ b/lib/content-services/src/lib/content-node-selector/content-node-selector.module.ts @@ -23,7 +23,7 @@ import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel import { ContentNodeSelectorComponent } from './content-node-selector.component'; import { BREADCRUMB_DIRECTIVES } from '../breadcrumb/breadcrumb.module'; import { SearchModule } from '../search/search.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { DocumentListModule } from '../document-list/document-list.module'; import { NameLocationCellComponent } from './name-location-cell/name-location-cell.component'; import { CONTENT_UPLOAD_DIRECTIVES } from '../upload/upload.module'; @@ -35,7 +35,7 @@ import { DropdownSitesComponent } from './site-dropdown/sites-dropdown.component imports: [ FormsModule, ReactiveFormsModule, - CoreModule, + CoreLegacyModule, CommonModule, MaterialModule, DropdownSitesComponent, diff --git a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts index 65b77e4f9a..515398646e 100644 --- a/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts +++ b/lib/content-services/src/lib/content-node-share/content-node-share.directive.spec.ts @@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser'; import { Component } from '@angular/core'; import { DOCUMENT } from '@angular/common'; import { ContentTestingModule } from '../testing/content.testing.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { NodeSharedDirective } from '@alfresco/adf-content-services'; @Component({ @@ -53,7 +53,7 @@ describe('NodeSharedDirective', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot(), ContentTestingModule, NodeShareTestComponent] + imports: [CoreLegacyModule.forRoot(), ContentTestingModule, NodeShareTestComponent] }); fixture = TestBed.createComponent(NodeShareTestComponent); document = TestBed.inject(DOCUMENT); diff --git a/lib/content-services/src/lib/content.module.ts b/lib/content-services/src/lib/content.module.ts index e4ab61c6f9..af44a155dc 100644 --- a/lib/content-services/src/lib/content.module.ts +++ b/lib/content-services/src/lib/content.module.ts @@ -18,7 +18,7 @@ import { CommonModule } from '@angular/common'; import { NgModule, ModuleWithProviders, APP_INITIALIZER } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { CoreModule, SearchTextModule, provideTranslations } from '@alfresco/adf-core'; +import { CoreLegacyModule, SearchTextModule, provideTranslations } from '@alfresco/adf-core'; import { MaterialModule } from './material.module'; import { CONTENT_TAG_DIRECTIVES } from './tag/tag.module'; import { DocumentListModule } from './document-list/document-list.module'; @@ -51,7 +51,7 @@ import { TreeViewComponent } from './tree-view'; @NgModule({ imports: [ ...CONTENT_PIPES, - CoreModule, + CoreLegacyModule, ...CONTENT_TAG_DIRECTIVES, CommonModule, FormsModule, diff --git a/lib/content-services/src/lib/document-list/document-list.module.ts b/lib/content-services/src/lib/document-list/document-list.module.ts index bacf96ab1c..7b6c8f7180 100644 --- a/lib/content-services/src/lib/document-list/document-list.module.ts +++ b/lib/content-services/src/lib/document-list/document-list.module.ts @@ -17,7 +17,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; -import { CoreModule, EditJsonDialogModule } from '@alfresco/adf-core'; +import { CoreLegacyModule, EditJsonDialogModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; import { UploadModule } from '../upload/upload.module'; @@ -39,7 +39,7 @@ import { NodeNameTooltipPipe } from '../pipes'; @NgModule({ imports: [ - CoreModule, + CoreLegacyModule, CommonModule, MaterialModule, UploadModule, diff --git a/lib/content-services/src/lib/node-comments/node-comments.module.ts b/lib/content-services/src/lib/node-comments/node-comments.module.ts index ca4d5d1e9d..bdc5428021 100644 --- a/lib/content-services/src/lib/node-comments/node-comments.module.ts +++ b/lib/content-services/src/lib/node-comments/node-comments.module.ts @@ -18,10 +18,10 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { NodeCommentsComponent } from './node-comments.component'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; @NgModule({ - imports: [CommonModule, CoreModule], + imports: [CommonModule, CoreLegacyModule], declarations: [NodeCommentsComponent], exports: [NodeCommentsComponent] }) diff --git a/lib/content-services/src/lib/search/search.module.ts b/lib/content-services/src/lib/search/search.module.ts index f2bb9eedbd..0ddf9dccda 100644 --- a/lib/content-services/src/lib/search/search.module.ts +++ b/lib/content-services/src/lib/search/search.module.ts @@ -20,7 +20,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../material.module'; -import { CoreModule, SearchTextModule } from '@alfresco/adf-core'; +import { CoreLegacyModule, SearchTextModule } from '@alfresco/adf-core'; import { SearchControlComponent } from './components/search-control.component'; import { SearchComponent } from './components/search.component'; @@ -66,7 +66,7 @@ export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent, SearchChipAu FormsModule, ReactiveFormsModule, MaterialModule, - CoreModule, + CoreLegacyModule, SearchTextModule, SearchInputComponent ], diff --git a/lib/content-services/src/lib/testing/content.testing.module.ts b/lib/content-services/src/lib/testing/content.testing.module.ts index 8be15282f1..26410c06fb 100644 --- a/lib/content-services/src/lib/testing/content.testing.module.ts +++ b/lib/content-services/src/lib/testing/content.testing.module.ts @@ -19,7 +19,7 @@ import { NgModule, APP_INITIALIZER } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { - CoreModule, + CoreLegacyModule, AlfrescoApiService, AppConfigService, TranslationService, @@ -42,7 +42,7 @@ import { MatIconTestingModule } from '@angular/material/icon/testing'; NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot(), - CoreModule, + CoreLegacyModule, ContentModule, MatIconTestingModule ], @@ -58,6 +58,6 @@ import { MatIconTestingModule } from '@angular/material/icon/testing'; multi: true } ], - exports: [NoopAnimationsModule, TranslateModule, CoreModule, ContentModule] + exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ContentModule] }) export class ContentTestingModule {} diff --git a/lib/core/src/lib/core.module.ts b/lib/core/src/lib/core-legacy.module.ts similarity index 95% rename from lib/core/src/lib/core.module.ts rename to lib/core/src/lib/core-legacy.module.ts index 8d6e1000fd..4142b03320 100644 --- a/lib/core/src/lib/core.module.ts +++ b/lib/core/src/lib/core-legacy.module.ts @@ -142,10 +142,10 @@ import { IconComponent } from './icon'; DynamicChipListModule ] }) -export class CoreModule { - static forRoot(): ModuleWithProviders { +export class CoreLegacyModule { + static forRoot(): ModuleWithProviders { return { - ngModule: CoreModule, + ngModule: CoreLegacyModule, providers: [ TranslateStore, TranslateService, @@ -184,9 +184,13 @@ export class CoreModule { }; } - static forChild(): ModuleWithProviders { + /** + * @deprecated this api is deprecated, import `CoreLegacyModule` instead + * @returns ModuleWithProviders + */ + static forChild(): ModuleWithProviders { return { - ngModule: CoreModule + ngModule: CoreLegacyModule }; } diff --git a/lib/core/src/lib/testing/core.story.module.ts b/lib/core/src/lib/testing/core.story.module.ts index 57cc4e9a8c..326fd5cadc 100644 --- a/lib/core/src/lib/testing/core.story.module.ts +++ b/lib/core/src/lib/testing/core.story.module.ts @@ -16,14 +16,14 @@ */ import { NgModule } from '@angular/core'; -import { CoreModule } from '../core.module'; +import { CoreLegacyModule } from '../core-legacy.module'; import { TranslateModule } from '@ngx-translate/core'; import { provideTranslations } from '../translation/translation.service'; import { provideAnimations } from '@angular/platform-browser/animations'; import { AuthModule } from '../auth/oidc/auth.module'; @NgModule({ - imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreModule.forRoot()], + imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreLegacyModule.forRoot()], providers: [provideTranslations('adf-core', 'assets/adf-core'), provideAnimations()] }) export class CoreStoryModule {} diff --git a/lib/core/src/lib/testing/core.testing.module.ts b/lib/core/src/lib/testing/core.testing.module.ts index b7dba3f9f7..1b05ee1625 100644 --- a/lib/core/src/lib/testing/core.testing.module.ts +++ b/lib/core/src/lib/testing/core.testing.module.ts @@ -19,7 +19,7 @@ import { NgModule, APP_INITIALIZER } from '@angular/core'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { RouterTestingModule } from '@angular/router/testing'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreModule } from '../core.module'; +import { CoreLegacyModule } from '../core-legacy.module'; import { AlfrescoApiService } from '../services/alfresco-api.service'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { AppConfigService } from '../app-config/app-config.service'; @@ -42,7 +42,7 @@ import { EMPTY, of } from 'rxjs'; RouterTestingModule, HttpClientModule, TranslateModule.forRoot(), - CoreModule.forRoot() + CoreLegacyModule.forRoot() ], providers: [ DatePipe, @@ -58,6 +58,6 @@ import { EMPTY, of } from 'rxjs'; }, { provide: RedirectAuthService, useValue: { onLogin: EMPTY, init: () => {}, onTokenReceived: of() } } ], - exports: [NoopAnimationsModule, CoreModule, TranslateModule, RouterTestingModule] + exports: [NoopAnimationsModule, CoreLegacyModule, TranslateModule, RouterTestingModule] }) export class CoreTestingModule {} diff --git a/lib/core/src/lib/translation/translate-loader.spec.ts b/lib/core/src/lib/translation/translate-loader.spec.ts index d32f2d68c6..cb1348fe62 100644 --- a/lib/core/src/lib/translation/translate-loader.spec.ts +++ b/lib/core/src/lib/translation/translate-loader.spec.ts @@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing'; import { TranslateLoaderService } from './translate-loader.service'; import { TranslationService } from './translation.service'; import { TranslateModule } from '@ngx-translate/core'; -import { CoreModule } from '../core.module'; +import { CoreLegacyModule } from '../core-legacy.module'; import { AuthModule } from '../auth'; declare let jasmine: any; @@ -30,14 +30,8 @@ describe('TranslateLoader', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ - AuthModule.forRoot({ useHash: true }), - TranslateModule.forRoot(), - CoreModule.forRoot() - ], - providers: [ - TranslationService - ] + imports: [AuthModule.forRoot({ useHash: true }), TranslateModule.forRoot(), CoreLegacyModule.forRoot()], + providers: [TranslationService] }); translationService = TestBed.inject(TranslationService); customLoader = translationService.translate.currentLoader as TranslateLoaderService; diff --git a/lib/core/src/public-api.ts b/lib/core/src/public-api.ts index 645edf1c46..d52d411f45 100644 --- a/lib/core/src/public-api.ts +++ b/lib/core/src/public-api.ts @@ -61,4 +61,4 @@ export * from './lib/auth'; export * from './lib/common'; export * from './lib/material.module'; -export * from './lib/core.module'; +export * from './lib/core-legacy.module'; diff --git a/lib/insights/src/lib/testing/insights.testing.module.ts b/lib/insights/src/lib/testing/insights.testing.module.ts index e06356a971..1f422422b5 100644 --- a/lib/insights/src/lib/testing/insights.testing.module.ts +++ b/lib/insights/src/lib/testing/insights.testing.module.ts @@ -26,17 +26,17 @@ import { AppConfigServiceMock, TranslationService, TranslationMock, - CoreModule, + CoreLegacyModule, AuthModule } from '@alfresco/adf-core'; @NgModule({ - imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), InsightsModule], + imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreLegacyModule.forRoot(), InsightsModule], providers: [ { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: TranslationService, useClass: TranslationMock } ], - exports: [NoopAnimationsModule, TranslateModule, CoreModule, InsightsModule] + exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, InsightsModule] }) export class InsightsTestingModule {} diff --git 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 index 9624b9237c..f1e78908f6 100644 --- 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 @@ -20,23 +20,11 @@ import { MaterialModule } from '../material.module'; import { CommonModule } from '@angular/common'; import { AppDetailsCloudComponent } from './components/app-details-cloud.component'; import { AppListCloudComponent } from './components/app-list-cloud.component'; -import { TemplateModule, CoreModule } from '@alfresco/adf-core'; +import { TemplateModule, CoreLegacyModule } from '@alfresco/adf-core'; @NgModule({ - imports: [ - CommonModule, - TemplateModule, - MaterialModule, - CoreModule - ], - declarations: [ - AppListCloudComponent, - AppDetailsCloudComponent - ], - exports: [ - AppListCloudComponent, - AppDetailsCloudComponent - ] + imports: [CommonModule, TemplateModule, MaterialModule, CoreLegacyModule], + declarations: [AppListCloudComponent, AppDetailsCloudComponent], + exports: [AppListCloudComponent, AppDetailsCloudComponent] }) -export class AppListCloudModule { -} +export class AppListCloudModule {} diff --git a/lib/process-services-cloud/src/lib/common/process-common.module.ts b/lib/process-services-cloud/src/lib/common/process-common.module.ts index d153f5994e..adb3c06d4f 100644 --- a/lib/process-services-cloud/src/lib/common/process-common.module.ts +++ b/lib/process-services-cloud/src/lib/common/process-common.module.ts @@ -16,24 +16,16 @@ */ import { NgModule } from '@angular/core'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { DateRangeFilterComponent } from './date-range-filter/date-range-filter.component'; import { MaterialModule } from '../material.module'; import { CommonModule } from '@angular/common'; import { DateRangeFilterService } from './date-range-filter/date-range-filter.service'; @NgModule({ - declarations: [ DateRangeFilterComponent ], - imports: [ - CommonModule, - CoreModule, - MaterialModule - ], - exports: [ - DateRangeFilterComponent - ], - providers: [ - DateRangeFilterService - ] + declarations: [DateRangeFilterComponent], + imports: [CommonModule, CoreLegacyModule, MaterialModule], + exports: [DateRangeFilterComponent], + providers: [DateRangeFilterService] }) export class ProcessCommonModule {} diff --git a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts index 4274990743..e282d0df12 100644 --- a/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/form/components/form-cloud.component.spec.ts @@ -21,7 +21,7 @@ import { VersionCompatibilityService } from '@alfresco/adf-content-services'; import { AlfrescoApiService, ContentLinkModel, - CoreModule, + CoreLegacyModule, FormFieldModel, FormFieldTypes, FormModel, @@ -1470,7 +1470,7 @@ describe('Multilingual Form', () => { AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), - CoreModule.forRoot(), + CoreLegacyModule.forRoot(), ProcessServicesCloudModule.forRoot() ], providers: [provideTranslations('app', 'resources')] @@ -1540,7 +1540,13 @@ describe('retrieve metadata on submit', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), FormCloudModule], + imports: [ + AuthModule.forRoot({ useHash: true }), + NoopAnimationsModule, + TranslateModule.forRoot(), + CoreLegacyModule.forRoot(), + FormCloudModule + ], providers: [ provideTranslations('app', 'resources'), { diff --git a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts index e37e1a16b0..852336c4d3 100644 --- a/lib/process-services-cloud/src/lib/form/form-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/form/form-cloud.module.ts @@ -17,7 +17,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { CoreModule, FormatSpacePipe, ToolbarModule } from '@alfresco/adf-core'; +import { CoreLegacyModule, FormatSpacePipe, ToolbarModule } from '@alfresco/adf-core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../material.module'; import { FormCloudComponent } from './components/form-cloud.component'; @@ -56,7 +56,7 @@ import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.s MaterialModule, FormsModule, ReactiveFormsModule, - CoreModule, + CoreLegacyModule, ContentNodeSelectorModule, PeopleCloudModule, GroupCloudModule, diff --git a/lib/process-services-cloud/src/lib/group/group-cloud.module.ts b/lib/process-services-cloud/src/lib/group/group-cloud.module.ts index 509de8ed62..1a25ff0e0a 100644 --- 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,7 +19,7 @@ import { NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { MaterialModule } from '../material.module'; import { GroupCloudComponent } from './components/group-cloud.component'; import { InitialGroupNamePipe } from './pipe/group-initial.pipe'; @@ -27,17 +27,9 @@ import { IDENTITY_GROUP_SERVICE_TOKEN } from './services/identity-group-service. import { IdentityGroupService } from './services/identity-group.service'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - FormsModule, - ReactiveFormsModule, - CoreModule - ], + imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreLegacyModule], declarations: [GroupCloudComponent, InitialGroupNamePipe], - providers: [ - { provide: IDENTITY_GROUP_SERVICE_TOKEN, useExisting: IdentityGroupService } - ], + providers: [{ provide: IDENTITY_GROUP_SERVICE_TOKEN, useExisting: IdentityGroupService }], exports: [GroupCloudComponent, InitialGroupNamePipe] }) -export class GroupCloudModule { } +export class GroupCloudModule {} diff --git a/lib/process-services-cloud/src/lib/people/people-cloud.module.ts b/lib/process-services-cloud/src/lib/people/people-cloud.module.ts index 96fc7b8129..87da694ef3 100644 --- a/lib/process-services-cloud/src/lib/people/people-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/people/people-cloud.module.ts @@ -19,13 +19,13 @@ import { NgModule } from '@angular/core'; import { PeopleCloudComponent } from './components/people-cloud.component'; import { CommonModule } from '@angular/common'; import { MaterialModule } from '../material.module'; -import { CoreModule, FullNamePipe, InitialUsernamePipe } from '@alfresco/adf-core'; +import { CoreLegacyModule, FullNamePipe, InitialUsernamePipe } from '@alfresco/adf-core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { IdentityUserService } from './services/identity-user.service'; import { IDENTITY_USER_SERVICE_TOKEN } from './services/identity-user-service.token'; @NgModule({ - imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreModule, FullNamePipe, InitialUsernamePipe], + imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreLegacyModule, FullNamePipe, InitialUsernamePipe], declarations: [PeopleCloudComponent], exports: [PeopleCloudComponent], providers: [{ provide: IDENTITY_USER_SERVICE_TOKEN, useExisting: IdentityUserService }] diff --git a/lib/process-services-cloud/src/lib/process-services-cloud.module.ts b/lib/process-services-cloud/src/lib/process-services-cloud.module.ts index 2bebb21b91..9ac7ea3d65 100644 --- 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, ModuleWithProviders } from '@angular/core'; -import { CoreModule, FormRenderingService, provideTranslations } from '@alfresco/adf-core'; +import { CoreLegacyModule, FormRenderingService, provideTranslations } 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'; @@ -39,7 +39,7 @@ import { RichTextEditorModule } from './rich-text-editor/rich-text-editor.module @NgModule({ imports: [ - CoreModule, + CoreLegacyModule, AppListCloudModule, ProcessCloudModule, TaskCloudModule, @@ -51,9 +51,7 @@ import { RichTextEditorModule } from './rich-text-editor/rich-text-editor.module ApolloModule, RichTextEditorModule ], - providers: [ - provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud') - ], + providers: [provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud')], exports: [ AppListCloudModule, ProcessCloudModule, diff --git a/lib/process-services-cloud/src/lib/process/process-cloud.module.ts b/lib/process-services-cloud/src/lib/process/process-cloud.module.ts index c54b67af54..4b7c35ec45 100644 --- 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,27 +19,21 @@ 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'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { ProcessHeaderCloudModule } from './process-header/process-header-cloud.module'; import { ProcessDirectiveModule } from './directives/process-directive.module'; import { ProcessNameCloudPipe } from '../pipes/process-name-cloud.pipe'; @NgModule({ imports: [ - CoreModule, - ProcessFiltersCloudModule, - ProcessListCloudModule, - StartProcessCloudModule, - ProcessHeaderCloudModule, - ProcessDirectiveModule - ], - exports: [ + CoreLegacyModule, ProcessFiltersCloudModule, ProcessListCloudModule, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule ], + exports: [ProcessFiltersCloudModule, ProcessListCloudModule, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule], providers: [ProcessNameCloudPipe] }) -export class ProcessCloudModule { } +export class ProcessCloudModule {} diff --git 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 index f2f0f464ff..e3003344c1 100644 --- 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 @@ -20,7 +20,7 @@ import { CommonModule } from '@angular/common'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { ProcessFiltersCloudComponent } from './components/process-filters-cloud.component'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { HttpClientModule } from '@angular/common/http'; import { EditProcessFilterCloudComponent } from './components/edit-process-filter-cloud.component'; import { ProcessFilterDialogCloudComponent } from './components/process-filter-dialog-cloud.component'; @@ -36,11 +36,11 @@ import { PeopleCloudModule } from '../../people/people-cloud.module'; CommonModule, MaterialModule, AppListCloudModule, - CoreModule, + CoreLegacyModule, ProcessCommonModule, PeopleCloudModule ], declarations: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent], exports: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent] }) -export class ProcessFiltersCloudModule { } +export class ProcessFiltersCloudModule {} diff --git a/lib/process-services-cloud/src/lib/process/process-header/process-header-cloud.module.ts b/lib/process-services-cloud/src/lib/process/process-header/process-header-cloud.module.ts index 802a8e4307..deac653360 100644 --- a/lib/process-services-cloud/src/lib/process/process-header/process-header-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/process/process-header/process-header-cloud.module.ts @@ -18,17 +18,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { ProcessHeaderCloudComponent } from './components/process-header-cloud.component'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - CoreModule - - ], + imports: [CommonModule, MaterialModule, CoreLegacyModule], declarations: [ProcessHeaderCloudComponent], exports: [ProcessHeaderCloudComponent] }) -export class ProcessHeaderCloudModule { } +export class ProcessHeaderCloudModule {} diff --git 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 index 28d5de3e25..2dbb493ac2 100644 --- 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,19 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ProcessListCloudComponent } from './components/process-list-cloud.component'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service'; import { PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - CoreModule - + imports: [CommonModule, MaterialModule, CoreLegacyModule], + providers: [ + { + provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, + useClass: LocalPreferenceCloudService + } ], - providers: [{ - provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, - useClass: LocalPreferenceCloudService - }], declarations: [ProcessListCloudComponent], exports: [ProcessListCloudComponent] }) -export class ProcessListCloudModule { } +export class ProcessListCloudModule {} diff --git 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 index e0dbd711a2..497cd99f3b 100644 --- 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 @@ -21,21 +21,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MaterialModule } from '../../material.module'; import { FormCloudModule } from '../../form/form-cloud.module'; import { StartProcessCloudComponent } from './components/start-process-cloud.component'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; @NgModule({ - imports: [ - FormsModule, - CommonModule, - FormCloudModule, - MaterialModule, - ReactiveFormsModule, - CoreModule - ], - declarations: [ - StartProcessCloudComponent - ], - exports: [ - StartProcessCloudComponent - ] + imports: [FormsModule, CommonModule, FormCloudModule, MaterialModule, ReactiveFormsModule, CoreLegacyModule], + declarations: [StartProcessCloudComponent], + exports: [StartProcessCloudComponent] }) -export class StartProcessCloudModule { } +export class StartProcessCloudModule {} diff --git 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 index f5364bfe8e..9b3bb971c5 100644 --- 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 @@ -18,7 +18,7 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { StartTaskCloudComponent } from './components/start-task-cloud.component'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { GroupCloudModule } from '../../group/group-cloud.module'; @@ -26,20 +26,8 @@ import { FormCloudModule } from '../../form/form-cloud.module'; import { PeopleCloudModule } from '../../people/people-cloud.module'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - FormsModule, - ReactiveFormsModule, - GroupCloudModule, - CoreModule, - FormCloudModule, - PeopleCloudModule - ], + imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, GroupCloudModule, CoreLegacyModule, FormCloudModule, PeopleCloudModule], declarations: [StartTaskCloudComponent], - exports: [ - StartTaskCloudComponent - ] + exports: [StartTaskCloudComponent] }) -export class StartTaskCloudModule { -} +export class StartTaskCloudModule {} diff --git 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 index 225e4630f8..bb2c04b09c 100644 --- 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 @@ -20,7 +20,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { CommonModule } from '@angular/common'; import { TaskFiltersCloudComponent } from './components/task-filters-cloud.component'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { HttpClientModule } from '@angular/common/http'; import { AppListCloudModule } from './../../app/app-list-cloud.module'; import { ProcessCommonModule } from '../../common/process-common.module'; @@ -41,7 +41,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; CommonModule, MaterialModule, AppListCloudModule, - CoreModule, + CoreLegacyModule, GroupCloudModule, ProcessCommonModule, PeopleCloudModule, diff --git a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts index 4a23edf819..3571111136 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts @@ -22,21 +22,11 @@ import { FormCloudModule } from '../../form/form-cloud.module'; import { TaskDirectiveModule } from '../directives/task-directive.module'; import { TaskFormCloudComponent } from './components/task-form-cloud.component'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; @NgModule({ - imports: [ - CoreModule, - CommonModule, - MaterialModule, - FormCloudModule, - TaskDirectiveModule - ], - declarations: [ - TaskFormCloudComponent - ], - exports: [ - TaskFormCloudComponent - ] + imports: [CoreLegacyModule, CommonModule, MaterialModule, FormCloudModule, TaskDirectiveModule], + declarations: [TaskFormCloudComponent], + exports: [TaskFormCloudComponent] }) -export class TaskFormModule { } +export class TaskFormModule {} diff --git 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 index 9536b793f9..36046fdb12 100644 --- 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,20 +18,12 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../material.module'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { TaskHeaderCloudComponent } from './components/task-header-cloud.component'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - CoreModule.forChild() - ], - declarations: [ - TaskHeaderCloudComponent - ], - exports: [ - TaskHeaderCloudComponent - ] + imports: [CommonModule, MaterialModule, CoreLegacyModule.forChild()], + declarations: [TaskHeaderCloudComponent], + exports: [TaskHeaderCloudComponent] }) -export class TaskHeaderCloudModule { } +export class TaskHeaderCloudModule {} diff --git 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 index 48ff4d03d0..b5aacc92b9 100644 --- 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 @@ -20,25 +20,15 @@ import { CommonModule } from '@angular/common'; import { MaterialModule } from '../../material.module'; import { TaskListCloudComponent } from './components/task-list-cloud.component'; import { ServiceTaskListCloudComponent } from './components/service-task-list-cloud.component'; -import { CoreModule } from '@alfresco/adf-core'; +import { CoreLegacyModule } from '@alfresco/adf-core'; import { TASK_LIST_CLOUD_TOKEN, TASK_LIST_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service'; import { TaskListCloudService } from './services/task-list-cloud.service'; import { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service'; @NgModule({ - imports: [ - CommonModule, - MaterialModule, - CoreModule - ], - declarations: [ - TaskListCloudComponent, - ServiceTaskListCloudComponent - ], - exports: [ - TaskListCloudComponent, - ServiceTaskListCloudComponent - ], + imports: [CommonModule, MaterialModule, CoreLegacyModule], + declarations: [TaskListCloudComponent, ServiceTaskListCloudComponent], + exports: [TaskListCloudComponent, ServiceTaskListCloudComponent], providers: [ { provide: TASK_LIST_CLOUD_TOKEN, @@ -50,4 +40,4 @@ import { LocalPreferenceCloudService } from '../../services/local-preference-clo } ] }) -export class TaskListCloudModule { } +export class TaskListCloudModule {} diff --git 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 index 8be4061a2a..8e0117fa97 100644 --- 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 @@ -25,7 +25,8 @@ import { AppConfigServiceMock, TranslationService, TranslationMock, - CoreModule, AuthModule + CoreLegacyModule, + AuthModule } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServicesCloudModule } from '../process-services-cloud.module'; @@ -38,7 +39,7 @@ import { RouterTestingModule } from '@angular/router/testing'; NoopAnimationsModule, RouterTestingModule, TranslateModule.forRoot(), - CoreModule.forRoot(), + CoreLegacyModule.forRoot(), ProcessServicesCloudModule.forRoot() ], providers: [ @@ -46,11 +47,6 @@ import { RouterTestingModule } from '@angular/router/testing'; { provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: TranslationService, useClass: TranslationMock } ], - exports: [ - NoopAnimationsModule, - TranslateModule, - CoreModule, - ProcessServicesCloudModule - ] + exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ProcessServicesCloudModule] }) export class ProcessServiceCloudTestingModule {} diff --git a/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts b/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts index 81b6def6e8..34a8187b4b 100644 --- a/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts +++ b/lib/process-services-cloud/src/lib/testing/process-services-cloud-story.module.ts @@ -16,21 +16,13 @@ */ import { NgModule } from '@angular/core'; -import { AuthModule, CoreModule, provideTranslations } from '@alfresco/adf-core'; +import { AuthModule, CoreLegacyModule, provideTranslations } from '@alfresco/adf-core'; import { TranslateModule } from '@ngx-translate/core'; import { ProcessServicesCloudModule } from '../process-services-cloud.module'; import { provideAnimations } from '@angular/platform-browser/animations'; @NgModule({ - imports: [ - AuthModule.forRoot(), - TranslateModule.forRoot(), - CoreModule.forRoot(), - ProcessServicesCloudModule.forRoot() - ], - providers: [ - provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'), - provideAnimations() - ] + imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreLegacyModule.forRoot(), ProcessServicesCloudModule.forRoot()], + providers: [provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'), provideAnimations()] }) -export class ProcessServicesCloudStoryModule { } +export class ProcessServicesCloudStoryModule {} diff --git a/lib/process-services/src/lib/process-list/services/process.service.spec.ts b/lib/process-services/src/lib/process-list/services/process.service.spec.ts index 968b8a9f9c..84b3001e98 100644 --- a/lib/process-services/src/lib/process-list/services/process.service.spec.ts +++ b/lib/process-services/src/lib/process-list/services/process.service.spec.ts @@ -18,7 +18,7 @@ import { TestBed } from '@angular/core/testing'; import { exampleProcess } from '../../testing/mock'; import { ProcessService } from './process.service'; -import { CoreModule, DateFnsUtils } from '@alfresco/adf-core'; +import { CoreLegacyModule, DateFnsUtils } from '@alfresco/adf-core'; import { ProcessTestingModule } from '../../testing/process.testing.module'; import { ProcessInstanceQueryRepresentation, ProcessDefinitionRepresentation, RestVariable, TaskRepresentation } from '@alfresco/js-api'; @@ -55,7 +55,7 @@ describe('ProcessService', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [CoreModule.forRoot(), ProcessTestingModule] + imports: [CoreLegacyModule.forRoot(), ProcessTestingModule] }); service = TestBed.inject(ProcessService); }); diff --git a/lib/process-services/src/lib/testing/process.testing.module.ts b/lib/process-services/src/lib/testing/process.testing.module.ts index dd9c4a24df..8c693eafd8 100644 --- a/lib/process-services/src/lib/testing/process.testing.module.ts +++ b/lib/process-services/src/lib/testing/process.testing.module.ts @@ -25,7 +25,7 @@ import { AppConfigServiceMock, TranslationService, TranslationMock, - CoreModule, + CoreLegacyModule, FormRenderingService, AuthModule } from '@alfresco/adf-core'; @@ -38,7 +38,7 @@ import { RouterTestingModule } from '@angular/router/testing'; AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), - CoreModule.forRoot(), + CoreLegacyModule.forRoot(), ProcessModule.forRoot(), RouterTestingModule ], @@ -49,6 +49,6 @@ import { RouterTestingModule } from '@angular/router/testing'; FormRenderingService, { provide: FormRenderingService, useClass: ProcessFormRenderingService } ], - exports: [NoopAnimationsModule, TranslateModule, CoreModule, ProcessModule] + exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ProcessModule] }) export class ProcessTestingModule {}