Make CoreModule a legacy module

This commit is contained in:
mauriziovitale
2024-08-06 12:19:45 +01:00
parent 3b637819c8
commit 725eb46e52
44 changed files with 152 additions and 283 deletions

View File

@@ -22,7 +22,7 @@ import { NgChartsModule } from 'ng2-charts';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations'; import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
import { TranslateModule } from '@ngx-translate/core'; 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 { ExtensionsModule } from '@alfresco/adf-extensions';
import { AppComponent } from './app.component'; import { AppComponent } from './app.component';
import { MaterialModule } from './material.module'; import { MaterialModule } from './material.module';
@@ -82,7 +82,7 @@ import { CoreAutomationService } from '../testing/automation.service';
HttpClientModule, HttpClientModule,
MaterialModule, MaterialModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreLegacyModule.forRoot(),
ContentModule.forRoot(), ContentModule.forRoot(),
InsightsModule.forRoot(), InsightsModule.forRoot(),
ProcessModule.forRoot(), ProcessModule.forRoot(),

View File

@@ -19,21 +19,17 @@ import { NgModule } from '@angular/core';
import { CardViewComponent } from './card-view.component'; import { CardViewComponent } from './card-view.component';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: CardViewComponent component: CardViewComponent
} }
]; ];
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, CoreLegacyModule, RouterModule.forChild(routes)],
CommonModule,
CoreModule,
RouterModule.forChild(routes)
],
declarations: [CardViewComponent] declarations: [CardViewComponent]
}) })
export class AppCardViewModule {} export class AppCardViewModule {}

View File

@@ -22,19 +22,11 @@ import { MatDialogModule } from '@angular/material/dialog';
import { MatInputModule } from '@angular/material/input'; import { MatInputModule } from '@angular/material/input';
import { MatSelectModule } from '@angular/material/select'; import { MatSelectModule } from '@angular/material/select';
import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatSlideToggleModule } from '@angular/material/slide-toggle';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, CoreLegacyModule, MatDialogModule, MatInputModule, MatSelectModule, MatSlideToggleModule],
CommonModule, declarations: [CloudSettingsComponent],
CoreModule, exports: [CommonModule, CloudSettingsComponent]
MatDialogModule,
MatInputModule,
MatSelectModule,
MatSlideToggleModule
],
declarations: [ CloudSettingsComponent ],
exports: [ CommonModule, CloudSettingsComponent]
}) })
export class AppCloudSharedModule {} export class AppCloudSharedModule {}

View File

@@ -18,7 +18,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { Routes, RouterModule } from '@angular/router'; 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 { ContentModule, ContentDirectiveModule, VersionManagerModule, ContentMetadataModule } from '@alfresco/adf-content-services';
import { FileViewComponent } from './file-view.component'; import { FileViewComponent } from './file-view.component';
@@ -33,7 +33,7 @@ const routes: Routes = [
imports: [ imports: [
CommonModule, CommonModule,
RouterModule.forChild(routes), RouterModule.forChild(routes),
CoreModule, CoreLegacyModule,
ContentModule, ContentModule,
InfoDrawerModule, InfoDrawerModule,
ContentModule, ContentModule,
@@ -44,6 +44,4 @@ const routes: Routes = [
declarations: [FileViewComponent], declarations: [FileViewComponent],
exports: [FileViewComponent] exports: [FileViewComponent]
}) })
export class FileViewModule { export class FileViewModule {}
}

View File

@@ -19,23 +19,18 @@ import { NgModule } from '@angular/core';
import { LoginComponent } from './login.component'; import { LoginComponent } from './login.component';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { ContentModule } from '@alfresco/adf-content-services'; import { ContentModule } from '@alfresco/adf-content-services';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: LoginComponent component: LoginComponent
} }
]; ];
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, CoreLegacyModule, RouterModule.forChild(routes), ContentModule.forChild()],
CommonModule,
CoreModule,
RouterModule.forChild(routes),
ContentModule.forChild()
],
declarations: [LoginComponent] declarations: [LoginComponent]
}) })
export class AppLoginModule {} export class AppLoginModule {}

View File

@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
import { ProcessListDemoComponent } from './process-list-demo.component'; import { ProcessListDemoComponent } from './process-list-demo.component';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { ProcessModule } from '@alfresco/adf-process-services'; import { ProcessModule } from '@alfresco/adf-process-services';
const routes: Routes = [ const routes: Routes = [
@@ -34,7 +34,7 @@ const routes: Routes = [
]; ];
@NgModule({ @NgModule({
imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule], imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, ProcessModule],
declarations: [ProcessListDemoComponent] declarations: [ProcessListDemoComponent]
}) })
export class AppProcessListModule {} export class AppProcessListModule {}

View File

@@ -19,28 +19,19 @@ import { NgModule } from '@angular/core';
import { SettingsComponent } from './settings.component'; import { SettingsComponent } from './settings.component';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HostSettingsComponent } from './host-settings.component'; import { HostSettingsComponent } from './host-settings.component';
const routes: Routes = [ const routes: Routes = [
{ {
path: '', path: '',
component: SettingsComponent component: SettingsComponent
} }
]; ];
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, FormsModule, ReactiveFormsModule],
CommonModule, declarations: [SettingsComponent, HostSettingsComponent]
RouterModule.forChild(routes),
CoreModule,
FormsModule,
ReactiveFormsModule
],
declarations: [
SettingsComponent,
HostSettingsComponent
]
}) })
export class AppSettingsModule {} export class AppSettingsModule {}

View File

@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
import { TaskListDemoComponent } from './task-list-demo.component'; import { TaskListDemoComponent } from './task-list-demo.component';
import { Routes, RouterModule } from '@angular/router'; import { Routes, RouterModule } from '@angular/router';
import { CommonModule } from '@angular/common'; 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'; import { ProcessModule } from '@alfresco/adf-process-services';
const routes: Routes = [ const routes: Routes = [
@@ -34,7 +34,7 @@ const routes: Routes = [
]; ];
@NgModule({ @NgModule({
imports: [CommonModule, RouterModule.forChild(routes), CoreModule, ProcessModule, LocalizedDatePipe, FullNamePipe], imports: [CommonModule, RouterModule.forChild(routes), CoreLegacyModule, ProcessModule, LocalizedDatePipe, FullNamePipe],
declarations: [TaskListDemoComponent] declarations: [TaskListDemoComponent]
}) })
export class AppTaskListModule {} export class AppTaskListModule {}

View File

@@ -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-list` is now `adf-analytics-report-list`.
- `analytics-report-parameters` is now `adf-analytics-report-parameters`. - `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 - `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 - [`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.
- `<adf-upload-drag-area>`: The `parentId` input has been renamed as `rootFolderId`. The old - `<adf-upload-drag-area>`: The `parentId` input has been renamed as `rootFolderId`. The old
name was deprecated in v2.4.0. 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 - The `createFolder` event of the [`UploadBase`](../../lib/content-services/src/lib/upload/components/base-upload/upload-base.ts) class (emitted when a folder was

View File

@@ -180,7 +180,7 @@ A new input parameter processDefinitionId has been added to the Tasklist and the
### Lazy loading improvements ### 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. 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 ### Localization

View File

@@ -23,7 +23,7 @@ import { ContentNodeSelectorPanelComponent } from './content-node-selector-panel
import { ContentNodeSelectorComponent } from './content-node-selector.component'; import { ContentNodeSelectorComponent } from './content-node-selector.component';
import { BREADCRUMB_DIRECTIVES } from '../breadcrumb/breadcrumb.module'; import { BREADCRUMB_DIRECTIVES } from '../breadcrumb/breadcrumb.module';
import { SearchModule } from '../search/search.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 { DocumentListModule } from '../document-list/document-list.module';
import { NameLocationCellComponent } from './name-location-cell/name-location-cell.component'; import { NameLocationCellComponent } from './name-location-cell/name-location-cell.component';
import { CONTENT_UPLOAD_DIRECTIVES } from '../upload/upload.module'; import { CONTENT_UPLOAD_DIRECTIVES } from '../upload/upload.module';
@@ -35,7 +35,7 @@ import { DropdownSitesComponent } from './site-dropdown/sites-dropdown.component
imports: [ imports: [
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
CoreModule, CoreLegacyModule,
CommonModule, CommonModule,
MaterialModule, MaterialModule,
DropdownSitesComponent, DropdownSitesComponent,

View File

@@ -20,7 +20,7 @@ import { By } from '@angular/platform-browser';
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { DOCUMENT } from '@angular/common'; import { DOCUMENT } from '@angular/common';
import { ContentTestingModule } from '../testing/content.testing.module'; 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'; import { NodeSharedDirective } from '@alfresco/adf-content-services';
@Component({ @Component({
@@ -53,7 +53,7 @@ describe('NodeSharedDirective', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [CoreModule.forRoot(), ContentTestingModule, NodeShareTestComponent] imports: [CoreLegacyModule.forRoot(), ContentTestingModule, NodeShareTestComponent]
}); });
fixture = TestBed.createComponent(NodeShareTestComponent); fixture = TestBed.createComponent(NodeShareTestComponent);
document = TestBed.inject(DOCUMENT); document = TestBed.inject(DOCUMENT);

View File

@@ -18,7 +18,7 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule, ModuleWithProviders, APP_INITIALIZER } from '@angular/core'; import { NgModule, ModuleWithProviders, APP_INITIALIZER } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; 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 { MaterialModule } from './material.module';
import { CONTENT_TAG_DIRECTIVES } from './tag/tag.module'; import { CONTENT_TAG_DIRECTIVES } from './tag/tag.module';
import { DocumentListModule } from './document-list/document-list.module'; import { DocumentListModule } from './document-list/document-list.module';
@@ -51,7 +51,7 @@ import { TreeViewComponent } from './tree-view';
@NgModule({ @NgModule({
imports: [ imports: [
...CONTENT_PIPES, ...CONTENT_PIPES,
CoreModule, CoreLegacyModule,
...CONTENT_TAG_DIRECTIVES, ...CONTENT_TAG_DIRECTIVES,
CommonModule, CommonModule,
FormsModule, FormsModule,

View File

@@ -17,7 +17,7 @@
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NgModule } from '@angular/core'; 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 { MaterialModule } from '../material.module';
import { UploadModule } from '../upload/upload.module'; import { UploadModule } from '../upload/upload.module';
@@ -39,7 +39,7 @@ import { NodeNameTooltipPipe } from '../pipes';
@NgModule({ @NgModule({
imports: [ imports: [
CoreModule, CoreLegacyModule,
CommonModule, CommonModule,
MaterialModule, MaterialModule,
UploadModule, UploadModule,

View File

@@ -18,10 +18,10 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { NodeCommentsComponent } from './node-comments.component'; import { NodeCommentsComponent } from './node-comments.component';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
@NgModule({ @NgModule({
imports: [CommonModule, CoreModule], imports: [CommonModule, CoreLegacyModule],
declarations: [NodeCommentsComponent], declarations: [NodeCommentsComponent],
exports: [NodeCommentsComponent] exports: [NodeCommentsComponent]
}) })

View File

@@ -20,7 +20,7 @@ import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../material.module'; 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 { SearchControlComponent } from './components/search-control.component';
import { SearchComponent } from './components/search.component'; import { SearchComponent } from './components/search.component';
@@ -66,7 +66,7 @@ export const CONTENT_SEARCH_DIRECTIVES = [SearchCheckListComponent, SearchChipAu
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
MaterialModule, MaterialModule,
CoreModule, CoreLegacyModule,
SearchTextModule, SearchTextModule,
SearchInputComponent SearchInputComponent
], ],

View File

@@ -19,7 +19,7 @@ import { NgModule, APP_INITIALIZER } from '@angular/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { import {
CoreModule, CoreLegacyModule,
AlfrescoApiService, AlfrescoApiService,
AppConfigService, AppConfigService,
TranslationService, TranslationService,
@@ -42,7 +42,7 @@ import { MatIconTestingModule } from '@angular/material/icon/testing';
NoopAnimationsModule, NoopAnimationsModule,
RouterTestingModule, RouterTestingModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule, CoreLegacyModule,
ContentModule, ContentModule,
MatIconTestingModule MatIconTestingModule
], ],
@@ -58,6 +58,6 @@ import { MatIconTestingModule } from '@angular/material/icon/testing';
multi: true multi: true
} }
], ],
exports: [NoopAnimationsModule, TranslateModule, CoreModule, ContentModule] exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ContentModule]
}) })
export class ContentTestingModule {} export class ContentTestingModule {}

View File

@@ -142,10 +142,10 @@ import { IconComponent } from './icon';
DynamicChipListModule DynamicChipListModule
] ]
}) })
export class CoreModule { export class CoreLegacyModule {
static forRoot(): ModuleWithProviders<CoreModule> { static forRoot(): ModuleWithProviders<CoreLegacyModule> {
return { return {
ngModule: CoreModule, ngModule: CoreLegacyModule,
providers: [ providers: [
TranslateStore, TranslateStore,
TranslateService, TranslateService,
@@ -184,9 +184,13 @@ export class CoreModule {
}; };
} }
static forChild(): ModuleWithProviders<CoreModule> { /**
* @deprecated this api is deprecated, import `CoreLegacyModule` instead
* @returns ModuleWithProviders<CoreLegacyModule>
*/
static forChild(): ModuleWithProviders<CoreLegacyModule> {
return { return {
ngModule: CoreModule ngModule: CoreLegacyModule
}; };
} }

View File

@@ -16,14 +16,14 @@
*/ */
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CoreModule } from '../core.module'; import { CoreLegacyModule } from '../core-legacy.module';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { provideTranslations } from '../translation/translation.service'; import { provideTranslations } from '../translation/translation.service';
import { provideAnimations } from '@angular/platform-browser/animations'; import { provideAnimations } from '@angular/platform-browser/animations';
import { AuthModule } from '../auth/oidc/auth.module'; import { AuthModule } from '../auth/oidc/auth.module';
@NgModule({ @NgModule({
imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreModule.forRoot()], imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreLegacyModule.forRoot()],
providers: [provideTranslations('adf-core', 'assets/adf-core'), provideAnimations()] providers: [provideTranslations('adf-core', 'assets/adf-core'), provideAnimations()]
}) })
export class CoreStoryModule {} export class CoreStoryModule {}

View File

@@ -19,7 +19,7 @@ import { NgModule, APP_INITIALIZER } from '@angular/core';
import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { NoopAnimationsModule } from '@angular/platform-browser/animations';
import { RouterTestingModule } from '@angular/router/testing'; import { RouterTestingModule } from '@angular/router/testing';
import { TranslateModule } from '@ngx-translate/core'; 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 { AlfrescoApiService } from '../services/alfresco-api.service';
import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock'; import { AlfrescoApiServiceMock } from '../mock/alfresco-api.service.mock';
import { AppConfigService } from '../app-config/app-config.service'; import { AppConfigService } from '../app-config/app-config.service';
@@ -42,7 +42,7 @@ import { EMPTY, of } from 'rxjs';
RouterTestingModule, RouterTestingModule,
HttpClientModule, HttpClientModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot() CoreLegacyModule.forRoot()
], ],
providers: [ providers: [
DatePipe, DatePipe,
@@ -58,6 +58,6 @@ import { EMPTY, of } from 'rxjs';
}, },
{ provide: RedirectAuthService, useValue: { onLogin: EMPTY, init: () => {}, onTokenReceived: of() } } { provide: RedirectAuthService, useValue: { onLogin: EMPTY, init: () => {}, onTokenReceived: of() } }
], ],
exports: [NoopAnimationsModule, CoreModule, TranslateModule, RouterTestingModule] exports: [NoopAnimationsModule, CoreLegacyModule, TranslateModule, RouterTestingModule]
}) })
export class CoreTestingModule {} export class CoreTestingModule {}

View File

@@ -19,7 +19,7 @@ import { TestBed } from '@angular/core/testing';
import { TranslateLoaderService } from './translate-loader.service'; import { TranslateLoaderService } from './translate-loader.service';
import { TranslationService } from './translation.service'; import { TranslationService } from './translation.service';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { CoreModule } from '../core.module'; import { CoreLegacyModule } from '../core-legacy.module';
import { AuthModule } from '../auth'; import { AuthModule } from '../auth';
declare let jasmine: any; declare let jasmine: any;
@@ -30,14 +30,8 @@ describe('TranslateLoader', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [ imports: [AuthModule.forRoot({ useHash: true }), TranslateModule.forRoot(), CoreLegacyModule.forRoot()],
AuthModule.forRoot({ useHash: true }), providers: [TranslationService]
TranslateModule.forRoot(),
CoreModule.forRoot()
],
providers: [
TranslationService
]
}); });
translationService = TestBed.inject(TranslationService); translationService = TestBed.inject(TranslationService);
customLoader = translationService.translate.currentLoader as TranslateLoaderService; customLoader = translationService.translate.currentLoader as TranslateLoaderService;

View File

@@ -61,4 +61,4 @@ export * from './lib/auth';
export * from './lib/common'; export * from './lib/common';
export * from './lib/material.module'; export * from './lib/material.module';
export * from './lib/core.module'; export * from './lib/core-legacy.module';

View File

@@ -26,17 +26,17 @@ import {
AppConfigServiceMock, AppConfigServiceMock,
TranslationService, TranslationService,
TranslationMock, TranslationMock,
CoreModule, CoreLegacyModule,
AuthModule AuthModule
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
@NgModule({ @NgModule({
imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreModule.forRoot(), InsightsModule], imports: [AuthModule.forRoot({ useHash: true }), NoopAnimationsModule, TranslateModule.forRoot(), CoreLegacyModule.forRoot(), InsightsModule],
providers: [ providers: [
{ provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock }, { provide: AlfrescoApiService, useClass: AlfrescoApiServiceMock },
{ provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock } { provide: TranslationService, useClass: TranslationMock }
], ],
exports: [NoopAnimationsModule, TranslateModule, CoreModule, InsightsModule] exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, InsightsModule]
}) })
export class InsightsTestingModule {} export class InsightsTestingModule {}

View File

@@ -20,23 +20,11 @@ import { MaterialModule } from '../material.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { AppDetailsCloudComponent } from './components/app-details-cloud.component'; import { AppDetailsCloudComponent } from './components/app-details-cloud.component';
import { AppListCloudComponent } from './components/app-list-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({ @NgModule({
imports: [ imports: [CommonModule, TemplateModule, MaterialModule, CoreLegacyModule],
CommonModule, declarations: [AppListCloudComponent, AppDetailsCloudComponent],
TemplateModule, exports: [AppListCloudComponent, AppDetailsCloudComponent]
MaterialModule,
CoreModule
],
declarations: [
AppListCloudComponent,
AppDetailsCloudComponent
],
exports: [
AppListCloudComponent,
AppDetailsCloudComponent
]
}) })
export class AppListCloudModule { export class AppListCloudModule {}
}

View File

@@ -16,24 +16,16 @@
*/ */
import { NgModule } from '@angular/core'; 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 { DateRangeFilterComponent } from './date-range-filter/date-range-filter.component';
import { MaterialModule } from '../material.module'; import { MaterialModule } from '../material.module';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { DateRangeFilterService } from './date-range-filter/date-range-filter.service'; import { DateRangeFilterService } from './date-range-filter/date-range-filter.service';
@NgModule({ @NgModule({
declarations: [ DateRangeFilterComponent ], declarations: [DateRangeFilterComponent],
imports: [ imports: [CommonModule, CoreLegacyModule, MaterialModule],
CommonModule, exports: [DateRangeFilterComponent],
CoreModule, providers: [DateRangeFilterService]
MaterialModule
],
exports: [
DateRangeFilterComponent
],
providers: [
DateRangeFilterService
]
}) })
export class ProcessCommonModule {} export class ProcessCommonModule {}

View File

@@ -21,7 +21,7 @@ import { VersionCompatibilityService } from '@alfresco/adf-content-services';
import { import {
AlfrescoApiService, AlfrescoApiService,
ContentLinkModel, ContentLinkModel,
CoreModule, CoreLegacyModule,
FormFieldModel, FormFieldModel,
FormFieldTypes, FormFieldTypes,
FormModel, FormModel,
@@ -1470,7 +1470,7 @@ describe('Multilingual Form', () => {
AuthModule.forRoot({ useHash: true }), AuthModule.forRoot({ useHash: true }),
NoopAnimationsModule, NoopAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreLegacyModule.forRoot(),
ProcessServicesCloudModule.forRoot() ProcessServicesCloudModule.forRoot()
], ],
providers: [provideTranslations('app', 'resources')] providers: [provideTranslations('app', 'resources')]
@@ -1540,7 +1540,13 @@ describe('retrieve metadata on submit', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ 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: [ providers: [
provideTranslations('app', 'resources'), provideTranslations('app', 'resources'),
{ {

View File

@@ -17,7 +17,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; 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 { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../material.module'; import { MaterialModule } from '../material.module';
import { FormCloudComponent } from './components/form-cloud.component'; import { FormCloudComponent } from './components/form-cloud.component';
@@ -56,7 +56,7 @@ import { FormCloudSpinnerService } from './services/spinner/form-cloud-spinner.s
MaterialModule, MaterialModule,
FormsModule, FormsModule,
ReactiveFormsModule, ReactiveFormsModule,
CoreModule, CoreLegacyModule,
ContentNodeSelectorModule, ContentNodeSelectorModule,
PeopleCloudModule, PeopleCloudModule,
GroupCloudModule, GroupCloudModule,

View File

@@ -19,7 +19,7 @@ import { NgModule } from '@angular/core';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { MaterialModule } from '../material.module'; import { MaterialModule } from '../material.module';
import { GroupCloudComponent } from './components/group-cloud.component'; import { GroupCloudComponent } from './components/group-cloud.component';
import { InitialGroupNamePipe } from './pipe/group-initial.pipe'; 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'; import { IdentityGroupService } from './services/identity-group.service';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreLegacyModule],
CommonModule,
MaterialModule,
FormsModule,
ReactiveFormsModule,
CoreModule
],
declarations: [GroupCloudComponent, InitialGroupNamePipe], declarations: [GroupCloudComponent, InitialGroupNamePipe],
providers: [ providers: [{ provide: IDENTITY_GROUP_SERVICE_TOKEN, useExisting: IdentityGroupService }],
{ provide: IDENTITY_GROUP_SERVICE_TOKEN, useExisting: IdentityGroupService }
],
exports: [GroupCloudComponent, InitialGroupNamePipe] exports: [GroupCloudComponent, InitialGroupNamePipe]
}) })
export class GroupCloudModule { } export class GroupCloudModule {}

View File

@@ -19,13 +19,13 @@ import { NgModule } from '@angular/core';
import { PeopleCloudComponent } from './components/people-cloud.component'; import { PeopleCloudComponent } from './components/people-cloud.component';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MaterialModule } from '../material.module'; 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 { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { IdentityUserService } from './services/identity-user.service'; import { IdentityUserService } from './services/identity-user.service';
import { IDENTITY_USER_SERVICE_TOKEN } from './services/identity-user-service.token'; import { IDENTITY_USER_SERVICE_TOKEN } from './services/identity-user-service.token';
@NgModule({ @NgModule({
imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreModule, FullNamePipe, InitialUsernamePipe], imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, CoreLegacyModule, FullNamePipe, InitialUsernamePipe],
declarations: [PeopleCloudComponent], declarations: [PeopleCloudComponent],
exports: [PeopleCloudComponent], exports: [PeopleCloudComponent],
providers: [{ provide: IDENTITY_USER_SERVICE_TOKEN, useExisting: IdentityUserService }] providers: [{ provide: IDENTITY_USER_SERVICE_TOKEN, useExisting: IdentityUserService }]

View File

@@ -16,7 +16,7 @@
*/ */
import { NgModule, ModuleWithProviders } from '@angular/core'; 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 { AppListCloudModule } from './app/app-list-cloud.module';
import { TaskCloudModule } from './task/task-cloud.module'; import { TaskCloudModule } from './task/task-cloud.module';
import { ProcessCloudModule } from './process/process-cloud.module'; import { ProcessCloudModule } from './process/process-cloud.module';
@@ -39,7 +39,7 @@ import { RichTextEditorModule } from './rich-text-editor/rich-text-editor.module
@NgModule({ @NgModule({
imports: [ imports: [
CoreModule, CoreLegacyModule,
AppListCloudModule, AppListCloudModule,
ProcessCloudModule, ProcessCloudModule,
TaskCloudModule, TaskCloudModule,
@@ -51,9 +51,7 @@ import { RichTextEditorModule } from './rich-text-editor/rich-text-editor.module
ApolloModule, ApolloModule,
RichTextEditorModule RichTextEditorModule
], ],
providers: [ providers: [provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud')],
provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud')
],
exports: [ exports: [
AppListCloudModule, AppListCloudModule,
ProcessCloudModule, ProcessCloudModule,

View File

@@ -19,27 +19,21 @@ import { NgModule } from '@angular/core';
import { ProcessFiltersCloudModule } from './process-filters/process-filters-cloud.module'; import { ProcessFiltersCloudModule } from './process-filters/process-filters-cloud.module';
import { ProcessListCloudModule } from './process-list/process-list-cloud.module'; import { ProcessListCloudModule } from './process-list/process-list-cloud.module';
import { StartProcessCloudModule } from './start-process/start-process-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 { ProcessHeaderCloudModule } from './process-header/process-header-cloud.module';
import { ProcessDirectiveModule } from './directives/process-directive.module'; import { ProcessDirectiveModule } from './directives/process-directive.module';
import { ProcessNameCloudPipe } from '../pipes/process-name-cloud.pipe'; import { ProcessNameCloudPipe } from '../pipes/process-name-cloud.pipe';
@NgModule({ @NgModule({
imports: [ imports: [
CoreModule, CoreLegacyModule,
ProcessFiltersCloudModule,
ProcessListCloudModule,
StartProcessCloudModule,
ProcessHeaderCloudModule,
ProcessDirectiveModule
],
exports: [
ProcessFiltersCloudModule, ProcessFiltersCloudModule,
ProcessListCloudModule, ProcessListCloudModule,
StartProcessCloudModule, StartProcessCloudModule,
ProcessHeaderCloudModule, ProcessHeaderCloudModule,
ProcessDirectiveModule ProcessDirectiveModule
], ],
exports: [ProcessFiltersCloudModule, ProcessListCloudModule, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule],
providers: [ProcessNameCloudPipe] providers: [ProcessNameCloudPipe]
}) })
export class ProcessCloudModule { } export class ProcessCloudModule {}

View File

@@ -20,7 +20,7 @@ import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { ProcessFiltersCloudComponent } from './components/process-filters-cloud.component'; import { ProcessFiltersCloudComponent } from './components/process-filters-cloud.component';
import { MaterialModule } from '../../material.module'; import { MaterialModule } from '../../material.module';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { EditProcessFilterCloudComponent } from './components/edit-process-filter-cloud.component'; import { EditProcessFilterCloudComponent } from './components/edit-process-filter-cloud.component';
import { ProcessFilterDialogCloudComponent } from './components/process-filter-dialog-cloud.component'; import { ProcessFilterDialogCloudComponent } from './components/process-filter-dialog-cloud.component';
@@ -36,11 +36,11 @@ import { PeopleCloudModule } from '../../people/people-cloud.module';
CommonModule, CommonModule,
MaterialModule, MaterialModule,
AppListCloudModule, AppListCloudModule,
CoreModule, CoreLegacyModule,
ProcessCommonModule, ProcessCommonModule,
PeopleCloudModule PeopleCloudModule
], ],
declarations: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent], declarations: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent],
exports: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent] exports: [ProcessFiltersCloudComponent, EditProcessFilterCloudComponent, ProcessFilterDialogCloudComponent]
}) })
export class ProcessFiltersCloudModule { } export class ProcessFiltersCloudModule {}

View File

@@ -18,17 +18,12 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module'; 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'; import { ProcessHeaderCloudComponent } from './components/process-header-cloud.component';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, CoreLegacyModule],
CommonModule,
MaterialModule,
CoreModule
],
declarations: [ProcessHeaderCloudComponent], declarations: [ProcessHeaderCloudComponent],
exports: [ProcessHeaderCloudComponent] exports: [ProcessHeaderCloudComponent]
}) })
export class ProcessHeaderCloudModule { } export class ProcessHeaderCloudModule {}

View File

@@ -19,22 +19,19 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { ProcessListCloudComponent } from './components/process-list-cloud.component'; import { ProcessListCloudComponent } from './components/process-list-cloud.component';
import { MaterialModule } from '../../material.module'; 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 { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service';
import { PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service'; import { PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, CoreLegacyModule],
CommonModule, providers: [
MaterialModule, {
CoreModule provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN,
useClass: LocalPreferenceCloudService
}
], ],
providers: [{
provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN,
useClass: LocalPreferenceCloudService
}],
declarations: [ProcessListCloudComponent], declarations: [ProcessListCloudComponent],
exports: [ProcessListCloudComponent] exports: [ProcessListCloudComponent]
}) })
export class ProcessListCloudModule { } export class ProcessListCloudModule {}

View File

@@ -21,21 +21,10 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MaterialModule } from '../../material.module'; import { MaterialModule } from '../../material.module';
import { FormCloudModule } from '../../form/form-cloud.module'; import { FormCloudModule } from '../../form/form-cloud.module';
import { StartProcessCloudComponent } from './components/start-process-cloud.component'; import { StartProcessCloudComponent } from './components/start-process-cloud.component';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
@NgModule({ @NgModule({
imports: [ imports: [FormsModule, CommonModule, FormCloudModule, MaterialModule, ReactiveFormsModule, CoreLegacyModule],
FormsModule, declarations: [StartProcessCloudComponent],
CommonModule, exports: [StartProcessCloudComponent]
FormCloudModule,
MaterialModule,
ReactiveFormsModule,
CoreModule
],
declarations: [
StartProcessCloudComponent
],
exports: [
StartProcessCloudComponent
]
}) })
export class StartProcessCloudModule { } export class StartProcessCloudModule {}

View File

@@ -18,7 +18,7 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module'; 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 { StartTaskCloudComponent } from './components/start-task-cloud.component';
import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { GroupCloudModule } from '../../group/group-cloud.module'; 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'; import { PeopleCloudModule } from '../../people/people-cloud.module';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, FormsModule, ReactiveFormsModule, GroupCloudModule, CoreLegacyModule, FormCloudModule, PeopleCloudModule],
CommonModule,
MaterialModule,
FormsModule,
ReactiveFormsModule,
GroupCloudModule,
CoreModule,
FormCloudModule,
PeopleCloudModule
],
declarations: [StartTaskCloudComponent], declarations: [StartTaskCloudComponent],
exports: [ exports: [StartTaskCloudComponent]
StartTaskCloudComponent
]
}) })
export class StartTaskCloudModule { export class StartTaskCloudModule {}
}

View File

@@ -20,7 +20,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { TaskFiltersCloudComponent } from './components/task-filters-cloud.component'; import { TaskFiltersCloudComponent } from './components/task-filters-cloud.component';
import { MaterialModule } from '../../material.module'; import { MaterialModule } from '../../material.module';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
import { HttpClientModule } from '@angular/common/http'; import { HttpClientModule } from '@angular/common/http';
import { AppListCloudModule } from './../../app/app-list-cloud.module'; import { AppListCloudModule } from './../../app/app-list-cloud.module';
import { ProcessCommonModule } from '../../common/process-common.module'; import { ProcessCommonModule } from '../../common/process-common.module';
@@ -41,7 +41,7 @@ import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
CommonModule, CommonModule,
MaterialModule, MaterialModule,
AppListCloudModule, AppListCloudModule,
CoreModule, CoreLegacyModule,
GroupCloudModule, GroupCloudModule,
ProcessCommonModule, ProcessCommonModule,
PeopleCloudModule, PeopleCloudModule,

View File

@@ -22,21 +22,11 @@ import { FormCloudModule } from '../../form/form-cloud.module';
import { TaskDirectiveModule } from '../directives/task-directive.module'; import { TaskDirectiveModule } from '../directives/task-directive.module';
import { TaskFormCloudComponent } from './components/task-form-cloud.component'; import { TaskFormCloudComponent } from './components/task-form-cloud.component';
import { CoreModule } from '@alfresco/adf-core'; import { CoreLegacyModule } from '@alfresco/adf-core';
@NgModule({ @NgModule({
imports: [ imports: [CoreLegacyModule, CommonModule, MaterialModule, FormCloudModule, TaskDirectiveModule],
CoreModule, declarations: [TaskFormCloudComponent],
CommonModule, exports: [TaskFormCloudComponent]
MaterialModule,
FormCloudModule,
TaskDirectiveModule
],
declarations: [
TaskFormCloudComponent
],
exports: [
TaskFormCloudComponent
]
}) })
export class TaskFormModule { } export class TaskFormModule {}

View File

@@ -18,20 +18,12 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common'; import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module'; 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'; import { TaskHeaderCloudComponent } from './components/task-header-cloud.component';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, CoreLegacyModule.forChild()],
CommonModule, declarations: [TaskHeaderCloudComponent],
MaterialModule, exports: [TaskHeaderCloudComponent]
CoreModule.forChild()
],
declarations: [
TaskHeaderCloudComponent
],
exports: [
TaskHeaderCloudComponent
]
}) })
export class TaskHeaderCloudModule { } export class TaskHeaderCloudModule {}

View File

@@ -20,25 +20,15 @@ import { CommonModule } from '@angular/common';
import { MaterialModule } from '../../material.module'; import { MaterialModule } from '../../material.module';
import { TaskListCloudComponent } from './components/task-list-cloud.component'; import { TaskListCloudComponent } from './components/task-list-cloud.component';
import { ServiceTaskListCloudComponent } from './components/service-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 { TASK_LIST_CLOUD_TOKEN, TASK_LIST_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service';
import { TaskListCloudService } from './services/task-list-cloud.service'; import { TaskListCloudService } from './services/task-list-cloud.service';
import { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service'; import { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service';
@NgModule({ @NgModule({
imports: [ imports: [CommonModule, MaterialModule, CoreLegacyModule],
CommonModule, declarations: [TaskListCloudComponent, ServiceTaskListCloudComponent],
MaterialModule, exports: [TaskListCloudComponent, ServiceTaskListCloudComponent],
CoreModule
],
declarations: [
TaskListCloudComponent,
ServiceTaskListCloudComponent
],
exports: [
TaskListCloudComponent,
ServiceTaskListCloudComponent
],
providers: [ providers: [
{ {
provide: TASK_LIST_CLOUD_TOKEN, provide: TASK_LIST_CLOUD_TOKEN,
@@ -50,4 +40,4 @@ import { LocalPreferenceCloudService } from '../../services/local-preference-clo
} }
] ]
}) })
export class TaskListCloudModule { } export class TaskListCloudModule {}

View File

@@ -25,7 +25,8 @@ import {
AppConfigServiceMock, AppConfigServiceMock,
TranslationService, TranslationService,
TranslationMock, TranslationMock,
CoreModule, AuthModule CoreLegacyModule,
AuthModule
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { TranslateModule } from '@ngx-translate/core'; import { TranslateModule } from '@ngx-translate/core';
import { ProcessServicesCloudModule } from '../process-services-cloud.module'; import { ProcessServicesCloudModule } from '../process-services-cloud.module';
@@ -38,7 +39,7 @@ import { RouterTestingModule } from '@angular/router/testing';
NoopAnimationsModule, NoopAnimationsModule,
RouterTestingModule, RouterTestingModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreLegacyModule.forRoot(),
ProcessServicesCloudModule.forRoot() ProcessServicesCloudModule.forRoot()
], ],
providers: [ providers: [
@@ -46,11 +47,6 @@ import { RouterTestingModule } from '@angular/router/testing';
{ provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: AppConfigService, useClass: AppConfigServiceMock },
{ provide: TranslationService, useClass: TranslationMock } { provide: TranslationService, useClass: TranslationMock }
], ],
exports: [ exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ProcessServicesCloudModule]
NoopAnimationsModule,
TranslateModule,
CoreModule,
ProcessServicesCloudModule
]
}) })
export class ProcessServiceCloudTestingModule {} export class ProcessServiceCloudTestingModule {}

View File

@@ -16,21 +16,13 @@
*/ */
import { NgModule } from '@angular/core'; 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 { TranslateModule } from '@ngx-translate/core';
import { ProcessServicesCloudModule } from '../process-services-cloud.module'; import { ProcessServicesCloudModule } from '../process-services-cloud.module';
import { provideAnimations } from '@angular/platform-browser/animations'; import { provideAnimations } from '@angular/platform-browser/animations';
@NgModule({ @NgModule({
imports: [ imports: [AuthModule.forRoot(), TranslateModule.forRoot(), CoreLegacyModule.forRoot(), ProcessServicesCloudModule.forRoot()],
AuthModule.forRoot(), providers: [provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'), provideAnimations()]
TranslateModule.forRoot(),
CoreModule.forRoot(),
ProcessServicesCloudModule.forRoot()
],
providers: [
provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'),
provideAnimations()
]
}) })
export class ProcessServicesCloudStoryModule { } export class ProcessServicesCloudStoryModule {}

View File

@@ -18,7 +18,7 @@
import { TestBed } from '@angular/core/testing'; import { TestBed } from '@angular/core/testing';
import { exampleProcess } from '../../testing/mock'; import { exampleProcess } from '../../testing/mock';
import { ProcessService } from './process.service'; 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 { ProcessTestingModule } from '../../testing/process.testing.module';
import { ProcessInstanceQueryRepresentation, ProcessDefinitionRepresentation, RestVariable, TaskRepresentation } from '@alfresco/js-api'; import { ProcessInstanceQueryRepresentation, ProcessDefinitionRepresentation, RestVariable, TaskRepresentation } from '@alfresco/js-api';
@@ -55,7 +55,7 @@ describe('ProcessService', () => {
beforeEach(() => { beforeEach(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
imports: [CoreModule.forRoot(), ProcessTestingModule] imports: [CoreLegacyModule.forRoot(), ProcessTestingModule]
}); });
service = TestBed.inject(ProcessService); service = TestBed.inject(ProcessService);
}); });

View File

@@ -25,7 +25,7 @@ import {
AppConfigServiceMock, AppConfigServiceMock,
TranslationService, TranslationService,
TranslationMock, TranslationMock,
CoreModule, CoreLegacyModule,
FormRenderingService, FormRenderingService,
AuthModule AuthModule
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
@@ -38,7 +38,7 @@ import { RouterTestingModule } from '@angular/router/testing';
AuthModule.forRoot({ useHash: true }), AuthModule.forRoot({ useHash: true }),
NoopAnimationsModule, NoopAnimationsModule,
TranslateModule.forRoot(), TranslateModule.forRoot(),
CoreModule.forRoot(), CoreLegacyModule.forRoot(),
ProcessModule.forRoot(), ProcessModule.forRoot(),
RouterTestingModule RouterTestingModule
], ],
@@ -49,6 +49,6 @@ import { RouterTestingModule } from '@angular/router/testing';
FormRenderingService, FormRenderingService,
{ provide: FormRenderingService, useClass: ProcessFormRenderingService } { provide: FormRenderingService, useClass: ProcessFormRenderingService }
], ],
exports: [NoopAnimationsModule, TranslateModule, CoreModule, ProcessModule] exports: [NoopAnimationsModule, TranslateModule, CoreLegacyModule, ProcessModule]
}) })
export class ProcessTestingModule {} export class ProcessTestingModule {}