From 96e14c88da1b0c886127b268409fc7bb818d690e Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 20 Sep 2024 13:11:19 -0400 Subject: [PATCH] migrate cloud components --- .../attach-file-cloud-widget.component.ts | 10 +-- .../file-properties-table-cloud.component.ts | 2 +- .../src/lib/form/public-api.ts | 4 +- .../src/lib/material.module.ts | 3 +- .../src/lib/process-services-cloud.module.ts | 7 +- .../start-process-cloud.component.spec.ts | 4 +- .../src/lib/task/task-cloud.module.ts | 4 +- ...ervice-task-filter-cloud.component.spec.ts | 4 +- ...dit-service-task-filter-cloud.component.ts | 39 +++++++++- .../edit-task-filter-cloud.component.spec.ts | 4 +- .../edit-task-filter-cloud.component.ts | 71 ++++++++++++------- .../task-assignment-filter.component.html | 1 - .../task-assignment-filter.component.spec.ts | 4 +- .../task-assignment-filter.component.ts | 11 ++- ...task-filter-dialog-cloud.component.spec.ts | 3 +- .../task-filter-dialog-cloud.component.ts | 24 ++++--- .../src/lib/task/task-filters/public-api.ts | 3 +- .../task-filters/task-filters-cloud.module.ts | 45 ++++-------- 18 files changed, 144 insertions(+), 99 deletions(-) diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts index 7ccc70c69b..da8dd472c7 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/attach-file-cloud-widget.component.ts @@ -48,11 +48,11 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { FilePropertiesTableCloudComponent } from './file-properties-table-cloud.component'; -export const RETRIEVE_METADATA_OPTION = 'retrieveMetadata'; -export const ALIAS_ROOT_FOLDER = '-root-'; -export const ALIAS_USER_FOLDER = '-my-'; -export const APP_NAME = '-appname-'; -export const VALID_ALIAS = [ALIAS_ROOT_FOLDER, ALIAS_USER_FOLDER, '-shared-']; +const RETRIEVE_METADATA_OPTION = 'retrieveMetadata'; +const ALIAS_ROOT_FOLDER = '-root-'; +const ALIAS_USER_FOLDER = '-my-'; +const APP_NAME = '-appname-'; +const VALID_ALIAS = [ALIAS_ROOT_FOLDER, ALIAS_USER_FOLDER, '-shared-']; @Component({ selector: 'adf-cloud-attach-file-cloud-widget', diff --git a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.ts b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.ts index 87e10174e6..8c7ddc0ad8 100644 --- a/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/form/components/widgets/attach-file/file-properties-table-cloud.component.ts @@ -30,7 +30,7 @@ import { MatTableModule } from '@angular/material/table'; import { MatLineModule } from '@angular/material/core'; import { MatListModule } from '@angular/material/list'; -export const RETRIEVE_METADATA_OPTION = 'retrieveMetadata'; +const RETRIEVE_METADATA_OPTION = 'retrieveMetadata'; @Component({ selector: 'adf-cloud-file-properties-table', diff --git a/lib/process-services-cloud/src/lib/form/public-api.ts b/lib/process-services-cloud/src/lib/form/public-api.ts index a56eb07785..4be58184f3 100644 --- a/lib/process-services-cloud/src/lib/form/public-api.ts +++ b/lib/process-services-cloud/src/lib/form/public-api.ts @@ -17,18 +17,20 @@ export * from './models/task-variable-cloud.model'; +export * from './components/spinner/form-spinner.component'; export * from './components/form-cloud-custom-outcomes.component'; export * from './components/form-cloud.component'; export * from './components/form-definition-selector-cloud.component'; export * from './components/cloud-form-rendering.service'; - export * from './components/widgets/attach-file/attach-file-cloud-widget.component'; +export * from './components/widgets/attach-file/file-properties-table-cloud.component'; export * from './components/widgets/attach-file/upload-cloud.widget'; export * from './components/widgets/date/date-cloud.widget'; export * from './components/widgets/dropdown/dropdown-cloud.widget'; export * from './components/widgets/group/group-cloud.widget'; export * from './components/widgets/people/people-cloud.widget'; export * from './components/widgets/properties-viewer/properties-viewer.widget'; +export * from './components/widgets/properties-viewer/properties-viewer-wrapper/properties-viewer-wrapper.component'; export * from './components/widgets/file-viewer/file-viewer.widget'; export * from './components/widgets/display-rich-text/display-rich-text.widget'; diff --git a/lib/process-services-cloud/src/lib/material.module.ts b/lib/process-services-cloud/src/lib/material.module.ts index b9a832560a..4a693dc9d3 100644 --- a/lib/process-services-cloud/src/lib/material.module.ts +++ b/lib/process-services-cloud/src/lib/material.module.ts @@ -22,7 +22,6 @@ import { MatCardModule } from '@angular/material/card'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { MatChipsModule } from '@angular/material/chips'; import { MatNativeDateModule, MatRippleModule, MatOptionModule } from '@angular/material/core'; -import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; import { MatDatepickerModule } from '@angular/material/datepicker'; import { MatDialogModule } from '@angular/material/dialog'; import { MatExpansionModule } from '@angular/material/expansion'; @@ -38,8 +37,8 @@ import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { MatTableModule } from '@angular/material/table'; import { MatTabsModule } from '@angular/material/tabs'; +/** @deprecated this module should not be used */ @NgModule({ - providers: [{ provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'never' } }], imports: [ MatAutocompleteModule, MatButtonModule, 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 50537b8669..48b85c8ed7 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 @@ -42,6 +42,7 @@ import { IdentityGroupService } from './group/services/identity-group.service'; import { IDENTITY_USER_SERVICE_TOKEN } from './people/services/identity-user-service.token'; import { IdentityUserService } from './people/services/identity-user.service'; import { TaskListCloudService } from './task/task-list/services/task-list-cloud.service'; +import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field'; @NgModule({ imports: [ @@ -57,7 +58,11 @@ import { TaskListCloudService } from './task/task-list/services/task-list-cloud. ApolloModule, RichTextEditorComponent ], - providers: [provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'), ProcessNameCloudPipe], + providers: [ + provideTranslations('adf-process-services-cloud', 'assets/adf-process-services-cloud'), + ProcessNameCloudPipe, + { provide: MAT_FORM_FIELD_DEFAULT_OPTIONS, useValue: { floatLabel: 'never' } } + ], exports: [ ...APP_LIST_CLOUD_DIRECTIVES, ...PROCESS_CLOUD_DIRECTIVES, diff --git a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts index 24b562ce3e..21a8344cbd 100755 --- a/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/process/start-process/components/start-process-cloud.component.spec.ts @@ -41,13 +41,13 @@ import { ProcessServiceCloudTestingModule } from '../../../testing/process-servi import { ProcessNameCloudPipe } from '../../../pipes/process-name-cloud.pipe'; import { ProcessInstanceCloud } from '../models/process-instance-cloud.model'; import { ESCAPE } from '@angular/cdk/keycodes'; -import { ProcessDefinitionCloud } from '../../../models/process-definition-cloud.model'; -import { TaskVariableCloud } from '../../../form/models/task-variable-cloud.model'; import { first } from 'rxjs/operators'; import { HarnessLoader } from '@angular/cdk/testing'; import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatAutocompleteHarness } from '@angular/material/autocomplete/testing'; import { MatButtonHarness } from '@angular/material/button/testing'; +import { TaskVariableCloud } from '../../../form/models/task-variable-cloud.model'; +import { ProcessDefinitionCloud } from '../../../models/process-definition-cloud.model'; describe('StartProcessCloudComponent', () => { let loader: HarnessLoader; diff --git a/lib/process-services-cloud/src/lib/task/task-cloud.module.ts b/lib/process-services-cloud/src/lib/task/task-cloud.module.ts index 65051f4327..5dca598e1a 100644 --- a/lib/process-services-cloud/src/lib/task/task-cloud.module.ts +++ b/lib/process-services-cloud/src/lib/task/task-cloud.module.ts @@ -16,7 +16,7 @@ */ import { NgModule } from '@angular/core'; -import { TaskFiltersCloudModule } from './task-filters/task-filters-cloud.module'; +import { TASK_FILTERS_CLOUD_DIRECTIVES } from './task-filters/task-filters-cloud.module'; import { TaskFormCloudComponent } from './task-form/components/task-form-cloud.component'; import { StartTaskCloudComponent } from './start-task/components/start-task-cloud.component'; import { TaskHeaderCloudComponent } from './task-header/components/task-header-cloud.component'; @@ -29,7 +29,7 @@ import { ServiceTaskListCloudComponent } from './task-list/components/service-ta export const TASK_CLOUD_DIRECTIVES = [ TaskListCloudComponent, ServiceTaskListCloudComponent, - TaskFiltersCloudModule, + ...TASK_FILTERS_CLOUD_DIRECTIVES, StartTaskCloudComponent, TaskHeaderCloudComponent, TaskFormCloudComponent, diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts index dab0a9da56..44e1a40b7c 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.spec.ts @@ -24,12 +24,10 @@ import { LocalPreferenceCloudService } from '../../../../services/local-preferen import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; import { AppsProcessCloudService } from '../../../../app/services/apps-process-cloud.service'; import { fakeApplicationInstance, fakeApplicationInstanceWithEnvironment } from '../../../../app/mock/app-model.mock'; -import { TaskFiltersCloudModule } from '../../task-filters-cloud.module'; import { ServiceTaskFilterCloudService } from '../../services/service-task-filter-cloud.service'; import { TaskCloudService } from '../../../services/task-cloud.service'; import { fakeServiceFilter } from '../../mock/task-filters-cloud.mock'; import { EditServiceTaskFilterCloudComponent } from './edit-service-task-filter-cloud.component'; -import { MatIconTestingModule } from '@angular/material/icon/testing'; import { ProcessDefinitionCloud } from '../../../../models/process-definition-cloud.model'; import { TaskFilterDialogCloudComponent } from '../task-filter-dialog/task-filter-dialog-cloud.component'; import { fakeEnvironmentList } from '../../../../common/mock/environment.mock'; @@ -54,7 +52,7 @@ describe('EditServiceTaskFilterCloudComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessServiceCloudTestingModule, TaskFiltersCloudModule, MatIconTestingModule], + imports: [ProcessServiceCloudTestingModule, EditServiceTaskFilterCloudComponent], providers: [MatDialog, { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }] }); fixture = TestBed.createComponent(EditServiceTaskFilterCloudComponent); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts index deebc8a348..a1e5167c8e 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-service-task-filter-cloud.component.ts @@ -21,9 +21,44 @@ import { Observable } from 'rxjs'; import { TaskFilterProperties, TaskFilterAction, ServiceTaskFilterCloudModel } from '../../models/filter-cloud.model'; import { ServiceTaskFilterCloudService } from '../../services/service-task-filter-cloud.service'; import { BaseEditTaskFilterCloudComponent, DropdownOption } from './base-edit-task-filter-cloud.component'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { IconComponent } from '@alfresco/adf-core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { MatInputModule } from '@angular/material/input'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateRangeFilterComponent } from '../../../../common/date-range-filter/date-range-filter.component'; +import { PeopleCloudComponent } from '../../../../people/components/people-cloud.component'; +import { TaskAssignmentFilterCloudComponent } from '../task-assignment-filter/task-assignment-filter.component'; +import { MatExpansionModule } from '@angular/material/expansion'; @Component({ selector: 'adf-cloud-edit-service-task-filter', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + IconComponent, + MatButtonModule, + MatProgressSpinnerModule, + ReactiveFormsModule, + MatFormFieldModule, + MatSelectModule, + MatInputModule, + MatDatepickerModule, + MatIconModule, + MatCheckboxModule, + DateRangeFilterComponent, + PeopleCloudComponent, + TaskAssignmentFilterCloudComponent, + MatExpansionModule + ], templateUrl: './base-edit-task-filter-cloud.component.html', styleUrls: ['./base-edit-task-filter-cloud.component.scss'], encapsulation: ViewEncapsulation.None @@ -62,9 +97,7 @@ export class EditServiceTaskFilterCloudComponent extends BaseEditTaskFilterCloud } protected addFilter(filterToAdd: ServiceTaskFilterCloudModel): Observable { - return this.serviceTaskFilterCloudService - .addFilter(filterToAdd) - .pipe(takeUntil(this.onDestroy$)); + return this.serviceTaskFilterCloudService.addFilter(filterToAdd).pipe(takeUntil(this.onDestroy$)); } isDisabledForDefaultFilters(action: TaskFilterAction): boolean { diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts index 157a287eaf..13c8bdf140 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.spec.ts @@ -25,7 +25,6 @@ import { LocalPreferenceCloudService } from '../../../../services/local-preferen import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; import { AppsProcessCloudService } from '../../../../app/services/apps-process-cloud.service'; import { fakeApplicationInstance } from '../../../../app/mock/app-model.mock'; -import { TaskFiltersCloudModule } from '../../task-filters-cloud.module'; import { EditTaskFilterCloudComponent } from './edit-task-filter-cloud.component'; import { TaskFilterCloudService } from '../../services/task-filter-cloud.service'; import { TaskCloudService } from '../../../services/task-cloud.service'; @@ -55,7 +54,6 @@ import { TestbedHarnessEnvironment } from '@angular/cdk/testing/testbed'; import { MatSelectHarness } from '@angular/material/select/testing'; import { MatExpansionPanelHarness } from '@angular/material/expansion/testing'; import { MatProgressSpinnerHarness } from '@angular/material/progress-spinner/testing'; -import { PeopleCloudComponent } from '@alfresco/adf-process-services-cloud'; describe('EditTaskFilterCloudComponent', () => { let loader: HarnessLoader; @@ -73,7 +71,7 @@ describe('EditTaskFilterCloudComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessServiceCloudTestingModule, TaskFiltersCloudModule, PeopleCloudComponent], + imports: [ProcessServiceCloudTestingModule, EditTaskFilterCloudComponent], providers: [MatDialog, { provide: TASK_FILTERS_SERVICE_TOKEN, useClass: LocalPreferenceCloudService }] }); fixture = TestBed.createComponent(EditTaskFilterCloudComponent); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts index d4196ac102..5aacee7ce2 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/edit-task-filters/edit-task-filter-cloud.component.ts @@ -23,9 +23,44 @@ import { TaskFilterCloudService } from '../../services/task-filter-cloud.service import { DateCloudFilterType } from '../../../../models/date-cloud-filter.model'; import { BaseEditTaskFilterCloudComponent, DropdownOption } from './base-edit-task-filter-cloud.component'; import { set } from 'date-fns'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { IconComponent } from '@alfresco/adf-core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { ReactiveFormsModule } from '@angular/forms'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatSelectModule } from '@angular/material/select'; +import { MatInputModule } from '@angular/material/input'; +import { MatDatepickerModule } from '@angular/material/datepicker'; +import { MatIconModule } from '@angular/material/icon'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { DateRangeFilterComponent } from '../../../../common/date-range-filter/date-range-filter.component'; +import { PeopleCloudComponent } from '../../../../people/components/people-cloud.component'; +import { TaskAssignmentFilterCloudComponent } from '../task-assignment-filter/task-assignment-filter.component'; +import { MatExpansionModule } from '@angular/material/expansion'; @Component({ selector: 'adf-cloud-edit-task-filter', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + IconComponent, + MatButtonModule, + MatProgressSpinnerModule, + ReactiveFormsModule, + MatFormFieldModule, + MatSelectModule, + MatInputModule, + MatDatepickerModule, + MatIconModule, + MatCheckboxModule, + DateRangeFilterComponent, + PeopleCloudComponent, + TaskAssignmentFilterCloudComponent, + MatExpansionModule + ], templateUrl: './base-edit-task-filter-cloud.component.html', styleUrls: ['./base-edit-task-filter-cloud.component.scss'], encapsulation: ViewEncapsulation.None @@ -45,21 +80,14 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone } protected getTaskFilterById(appName: string, id: string) { - return this.taskFilterCloudService - .getTaskFilterById(appName, id) - .pipe( - map(response => new TaskFilterCloudModel(response)) - ); + return this.taskFilterCloudService.getTaskFilterById(appName, id).pipe(map((response) => new TaskFilterCloudModel(response))); } createAndFilterProperties() { const result = super.createAndFilterProperties(); if (this.hasLastModifiedProperty()) { - return [ - ...result, - ...this.createLastModifiedProperty() - ]; + return [...result, ...this.createLastModifiedProperty()]; } return result; @@ -75,14 +103,11 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone private setLastModifiedToFilter(formValues: TaskFilterCloudModel) { if (formValues.lastModifiedTo && Date.parse(formValues.lastModifiedTo.toString())) { - const lastModifiedToFilterValue = set( - new Date(formValues.lastModifiedTo), - { - hours: 23, - minutes: 59, - seconds: 59 - } - ); + const lastModifiedToFilterValue = set(new Date(formValues.lastModifiedTo), { + hours: 23, + minutes: 59, + seconds: 59 + }); formValues.lastModifiedTo = lastModifiedToFilterValue.toISOString(); } } @@ -96,9 +121,7 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone } protected addFilter(filterToAdd: TaskFilterCloudModel): Observable { - return this.taskFilterCloudService - .addFilter(filterToAdd) - .pipe(takeUntil(this.onDestroy$)); + return this.taskFilterCloudService.addFilter(filterToAdd).pipe(takeUntil(this.onDestroy$)); } isDisabledForDefaultFilters(action: TaskFilterAction): boolean { @@ -244,7 +267,7 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone label: 'ADF_CLOUD_EDIT_TASK_FILTER.LABEL.DUE_DATE', type: 'date-range', key: 'dueDateRange', - attributes: { dateType: 'dueDateType', from: '_dueDateFrom', to: '_dueDateTo'}, + attributes: { dateType: 'dueDateType', from: '_dueDateFrom', to: '_dueDateTo' }, value: { dueDateType: this.taskFilter.dueDateType || null, _dueDateFrom: this.taskFilter.dueDateFrom || null, @@ -262,7 +285,7 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone label: 'ADF_CLOUD_EDIT_TASK_FILTER.LABEL.COMPLETED_DATE', type: 'date-range', key: 'completedDateRange', - attributes: { dateType: 'completedDateType', from: '_completedFrom', to: '_completedTo'}, + attributes: { dateType: 'completedDateType', from: '_completedFrom', to: '_completedTo' }, value: { completedDateType: this.taskFilter.completedDateType || null, _completedFrom: this.taskFilter.completedFrom || null, @@ -273,7 +296,7 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone label: 'ADF_CLOUD_EDIT_TASK_FILTER.LABEL.CREATED_DATE', type: 'date-range', key: 'createdDateRange', - attributes: { dateType: 'createdDateType', from: '_createdFrom', to: '_createdTo'}, + attributes: { dateType: 'createdDateType', from: '_createdFrom', to: '_createdTo' }, value: { createdDateType: this.taskFilter.createdDateType || null, _createdFrom: this.taskFilter.createdFrom || null, @@ -291,7 +314,7 @@ export class EditTaskFilterCloudComponent extends BaseEditTaskFilterCloudCompone label: 'ADF_CLOUD_EDIT_TASK_FILTER.LABEL.ASSIGNMENT', type: 'assignment', key: 'assignment', - attributes: { assignedUsers: 'assignedUsers', candidateGroups: 'candidateGroups'}, + attributes: { assignedUsers: 'assignedUsers', candidateGroups: 'candidateGroups' }, value: { assignedUsers: this.taskFilter.assignedUsers || [], candidateGroups: this.taskFilter.candidateGroups || [] diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.html b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.html index 6c970f44d0..0e12c5fa2b 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.html +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.html @@ -21,7 +21,6 @@ { let component: TaskAssignmentFilterCloudComponent; @@ -58,7 +56,7 @@ describe('TaskAssignmentFilterComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessServiceCloudTestingModule, GroupCloudComponent, TaskFiltersCloudModule] + imports: [ProcessServiceCloudTestingModule, TaskAssignmentFilterCloudComponent] }); }); diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts index 390529ffab..b6bfad589d 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-assignment-filter/task-assignment-filter.component.ts @@ -16,21 +16,26 @@ */ import { Component, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges } from '@angular/core'; -import { MatSelectChange } from '@angular/material/select'; +import { MatSelectChange, MatSelectModule } from '@angular/material/select'; import { AssignmentType, TaskFilterProperties, TaskStatusFilter } from '../../models/filter-cloud.model'; import { IdentityUserModel } from '../../../../people/models/identity-user.model'; import { IdentityUserService } from '../../../../people/services/identity-user.service'; import { IdentityGroupModel } from '../../../../group/models/identity-group.model'; import { DropdownOption } from '../edit-task-filters/base-edit-task-filter-cloud.component'; -import { FormControl } from '@angular/forms'; +import { FormControl, FormsModule } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { PeopleCloudComponent } from '../../../../people/components/people-cloud.component'; +import { GroupCloudComponent } from '../../../../group/components/group-cloud.component'; @Component({ selector: 'adf-cloud-task-assignment-filter', + standalone: true, + imports: [CommonModule, PeopleCloudComponent, GroupCloudComponent, TranslateModule, MatSelectModule, FormsModule], templateUrl: './task-assignment-filter.component.html', styleUrls: ['./task-assignment-filter.component.scss'] }) export class TaskAssignmentFilterCloudComponent implements OnInit, OnChanges { - @Input() appName: string; @Input() taskFilterProperty: TaskFilterProperties; diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts index 3681ccad49..d8036c88b0 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { TaskFilterDialogCloudComponent } from './task-filter-dialog-cloud.component'; -import { TaskFiltersCloudModule } from '../../task-filters-cloud.module'; import { ProcessServiceCloudTestingModule } from '../../../../testing/process-service-cloud.testing.module'; describe('TaskFilterDialogCloudComponent', () => { @@ -36,7 +35,7 @@ describe('TaskFilterDialogCloudComponent', () => { beforeEach(() => { TestBed.configureTestingModule({ - imports: [ProcessServiceCloudTestingModule, TaskFiltersCloudModule], + imports: [ProcessServiceCloudTestingModule, TaskFilterDialogCloudComponent], providers: [ { provide: MatDialogRef, useValue: mockDialogRef }, { provide: MAT_DIALOG_DATA, useValue: mockDialogData } diff --git a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts index f36ef366ff..76700b4d0c 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/components/task-filter-dialog/task-filter-dialog-cloud.component.ts @@ -16,17 +16,23 @@ */ import { Component, Inject, OnInit, ViewEncapsulation } from '@angular/core'; -import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; -import { AbstractControl, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogModule, MatDialogRef } from '@angular/material/dialog'; +import { AbstractControl, ReactiveFormsModule, UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatCardModule } from '@angular/material/card'; +import { MatInputModule } from '@angular/material/input'; @Component({ - selector: 'adf-cloud-task-filter-dialog', - templateUrl: './task-filter-dialog-cloud.component.html', - styleUrls: ['./task-filter-dialog-cloud.component.scss'], - encapsulation: ViewEncapsulation.None + selector: 'adf-cloud-task-filter-dialog', + standalone: true, + imports: [CommonModule, TranslateModule, MatButtonModule, MatCardModule, MatInputModule, ReactiveFormsModule, MatDialogModule], + templateUrl: './task-filter-dialog-cloud.component.html', + styleUrls: ['./task-filter-dialog-cloud.component.scss'], + encapsulation: ViewEncapsulation.None }) export class TaskFilterDialogCloudComponent implements OnInit { - // eslint-disable-next-line @typescript-eslint/naming-convention public static ACTION_SAVE = 'SAVE'; defaultIcon = 'inbox'; @@ -36,8 +42,8 @@ export class TaskFilterDialogCloudComponent implements OnInit { constructor( private fb: UntypedFormBuilder, public dialogRef: MatDialogRef, - @Inject(MAT_DIALOG_DATA) public data) { - } + @Inject(MAT_DIALOG_DATA) public data + ) {} ngOnInit() { this.filterForm = this.fb.group({ diff --git a/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts b/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts index 4a7d9f2c06..3af57c311a 100644 --- a/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts +++ b/lib/process-services-cloud/src/lib/task/task-filters/public-api.ts @@ -19,7 +19,8 @@ export * from './components/task-filters-cloud.component'; export * from './components/service-task-filters-cloud.component'; export * from './components/edit-task-filters/edit-task-filter-cloud.component'; export * from './components/edit-task-filters/edit-service-task-filter-cloud.component'; - +export * from './components/task-filter-dialog/task-filter-dialog-cloud.component'; +export * from './components/task-assignment-filter/task-assignment-filter.component'; export * from './models/filter-cloud.model'; export * from './services/task-filter-cloud.service'; 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 53585f318a..65f38db84c 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 @@ -16,46 +16,25 @@ */ import { NgModule } from '@angular/core'; -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 { HttpClientModule } from '@angular/common/http'; -import { APP_LIST_CLOUD_DIRECTIVES } from './../../app/app-list-cloud.module'; import { EditServiceTaskFilterCloudComponent } from './components/edit-task-filters/edit-service-task-filter-cloud.component'; import { EditTaskFilterCloudComponent } from './components/edit-task-filters/edit-task-filter-cloud.component'; import { TaskFilterDialogCloudComponent } from './components/task-filter-dialog/task-filter-dialog-cloud.component'; import { ServiceTaskFiltersCloudComponent } from './components/service-task-filters-cloud.component'; import { TaskAssignmentFilterCloudComponent } from './components/task-assignment-filter/task-assignment-filter.component'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { DateRangeFilterComponent } from '../../common/date-range-filter/date-range-filter.component'; -import { PeopleCloudComponent } from '../../people/components/people-cloud.component'; -import { GroupCloudComponent } from '../../group/components/group-cloud.component'; +export const TASK_FILTERS_CLOUD_DIRECTIVES = [ + TaskFiltersCloudComponent, + ServiceTaskFiltersCloudComponent, + EditTaskFilterCloudComponent, + EditServiceTaskFilterCloudComponent, + TaskAssignmentFilterCloudComponent, + TaskFilterDialogCloudComponent +] as const; + +/** @deprecated use individual standalone components instead */ @NgModule({ - imports: [ - FormsModule, - ReactiveFormsModule, - HttpClientModule, - CommonModule, - MaterialModule, - ...APP_LIST_CLOUD_DIRECTIVES, - CoreModule, - GroupCloudComponent, - DateRangeFilterComponent, - PeopleCloudComponent, - MatProgressSpinnerModule, - // - TaskFiltersCloudComponent, - ServiceTaskFiltersCloudComponent - ], - declarations: [ - EditTaskFilterCloudComponent, - EditServiceTaskFilterCloudComponent, - TaskFilterDialogCloudComponent, - TaskAssignmentFilterCloudComponent - ], - exports: [TaskFiltersCloudComponent, ServiceTaskFiltersCloudComponent, EditTaskFilterCloudComponent, EditServiceTaskFilterCloudComponent] + imports: [...TASK_FILTERS_CLOUD_DIRECTIVES], + exports: [...TASK_FILTERS_CLOUD_DIRECTIVES] }) export class TaskFiltersCloudModule {}