From 3a6754c0f0b4b89ad48eb60a111876451ddc28be Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Thu, 19 Sep 2024 17:27:04 -0400 Subject: [PATCH] migrate cloud components --- .../src/lib/process/process-cloud.module.ts | 6 ++-- .../process-list-cloud.component.spec.ts | 16 +++++++--- .../process-list-cloud.component.ts | 31 +++++++++++++++++-- .../process-list/process-list-cloud.module.ts | 20 ++---------- 4 files changed, 47 insertions(+), 26 deletions(-) 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 79e7470304..f5704a67da 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 @@ -17,23 +17,23 @@ 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, LocalizedDatePipe } 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'; +import { ProcessListCloudComponent } from './process-list/components/process-list-cloud.component'; @NgModule({ imports: [ CoreModule, ProcessFiltersCloudModule, - ProcessListCloudModule, + ProcessListCloudComponent, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule ], - exports: [ProcessFiltersCloudModule, ProcessListCloudModule, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule], + exports: [ProcessFiltersCloudModule, ProcessListCloudComponent, StartProcessCloudModule, ProcessHeaderCloudModule, ProcessDirectiveModule], providers: [ProcessNameCloudPipe, LocalizedDatePipe] }) export class ProcessCloudModule {} diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts index c03ad0330a..328e3de3bc 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.spec.ts @@ -82,8 +82,9 @@ describe('ProcessListCloudComponent', () => { }); appConfig = TestBed.inject(AppConfigService); processListCloudService = TestBed.inject(ProcessListCloudService); - preferencesService = TestBed.inject(PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN); fixture = TestBed.createComponent(ProcessListCloudComponent); + preferencesService = fixture.debugElement.injector.get(PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN); + component = fixture.componentInstance; appConfig.config = Object.assign(appConfig.config, { 'adf-cloud-process-list': { @@ -614,6 +615,8 @@ describe('ProcessListCloudComponent: Injecting custom columns for task list - Cu describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTemplateComponent', () => { @Component({ + standalone: true, + imports: [ProcessListCloudComponent, CustomEmptyContentTemplateDirective], template: ` @@ -635,9 +638,14 @@ describe('ProcessListCloudComponent: Creating an empty custom template - EmptyTe beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessServiceCloudTestingModule, MatProgressSpinnerModule, CustomEmptyContentTemplateDirective], - providers: [{ provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, useValue: preferencesService }], - declarations: [EmptyTemplateComponent, ProcessListCloudComponent] + imports: [ + ProcessServiceCloudTestingModule, + MatProgressSpinnerModule, + CustomEmptyContentTemplateDirective, + ProcessListCloudComponent, + EmptyTemplateComponent + ], + providers: [{ provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, useValue: preferencesService }] }); fixtureEmpty = TestBed.createComponent(EmptyTemplateComponent); fixtureEmpty.detectChanges(); diff --git a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts index dfd63c9989..43cf163463 100644 --- a/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/process/process-list/components/process-list-cloud.component.ts @@ -42,7 +42,12 @@ import { DataCellEvent, DataRowActionEvent, DataTableComponent, - DataColumn + DataColumn, + EmptyContentComponent, + NoContentTemplateDirective, + LoadingContentTemplateDirective, + MainMenuDataTableTemplateDirective, + ColumnsSelectorComponent } from '@alfresco/adf-core'; import { ProcessListCloudService } from '../services/process-list-cloud.service'; import { BehaviorSubject, Subject, of } from 'rxjs'; @@ -56,19 +61,41 @@ import { ProcessListCloudPreferences } from '../models/process-cloud-preferences import { ProcessListDatatableAdapter } from '../datatable/process-list-datatable-adapter'; import { ProcessListDataColumnCustomData, PROCESS_LIST_CUSTOM_VARIABLE_COLUMN } from '../../../models/data-column-custom-data'; import { VariableMapperService } from '../../../services/variable-mapper.sevice'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { LocalPreferenceCloudService } from '../../../services/local-preference-cloud.service'; const PRESET_KEY = 'adf-cloud-process-list.presets'; @Component({ selector: 'adf-cloud-process-list', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + EmptyContentComponent, + NoContentTemplateDirective, + MatProgressSpinnerModule, + LoadingContentTemplateDirective, + MainMenuDataTableTemplateDirective, + ColumnsSelectorComponent, + DataTableComponent + ], + providers: [ + { + provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, + useClass: LocalPreferenceCloudService + } + ], templateUrl: './process-list-cloud.component.html', styleUrls: ['./process-list-cloud.component.scss'], encapsulation: ViewEncapsulation.None }) +// eslint-disable-next-line @typescript-eslint/brace-style export class ProcessListCloudComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent, OnDestroy -// eslint-disable-next-line @typescript-eslint/brace-style { @ViewChild(DataTableComponent) dataTable: DataTableComponent; 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..f6d9a5fe38 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 @@ -16,25 +16,11 @@ */ 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 { LocalPreferenceCloudService } from '../../services/local-preference-cloud.service'; -import { PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN } from '../../services/cloud-token.service'; +/** @deprecated use ProcessListCloudComponent instead */ @NgModule({ - imports: [ - CommonModule, - MaterialModule, - CoreModule - - ], - providers: [{ - provide: PROCESS_LISTS_PREFERENCES_SERVICE_TOKEN, - useClass: LocalPreferenceCloudService - }], - declarations: [ProcessListCloudComponent], + imports: [ProcessListCloudComponent], exports: [ProcessListCloudComponent] }) -export class ProcessListCloudModule { } +export class ProcessListCloudModule {}