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 d40cd0ea81..f250ef3ab0 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 @@ -22,7 +22,6 @@ import { TaskCloudModule } from './task/task-cloud.module'; import { ProcessCloudModule } from './process/process-cloud.module'; import { GroupCloudModule } from './group/group-cloud.module'; import { FormCloudModule } from './form/form-cloud.module'; -import { TaskFormModule } from './task/task-form/task-form.module'; import { LocalPreferenceCloudService, PreferenceCloudServiceInterface, @@ -36,6 +35,7 @@ import { ApolloModule } from 'apollo-angular'; import { ProcessNameCloudPipe } from './pipes/process-name-cloud.pipe'; import { PeopleCloudComponent } from './people/components/people-cloud.component'; import { RichTextEditorComponent } from './rich-text-editor'; +import { TaskFormCloudComponent } from './task/task-form/components/task-form-cloud.component'; @NgModule({ imports: [ @@ -46,7 +46,7 @@ import { RichTextEditorComponent } from './rich-text-editor'; GroupCloudModule, PeopleCloudComponent, FormCloudModule, - TaskFormModule, + TaskFormCloudComponent, ProcessNameCloudPipe, ApolloModule, RichTextEditorComponent @@ -58,7 +58,7 @@ import { RichTextEditorComponent } from './rich-text-editor'; TaskCloudModule, GroupCloudModule, FormCloudModule, - TaskFormModule, + TaskFormCloudComponent, PeopleCloudComponent, ProcessNameCloudPipe, RichTextEditorComponent diff --git a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts index 023fa1b9a6..a0f5a824c0 100644 --- a/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts +++ b/lib/process-services-cloud/src/lib/task/directives/claim-task-cloud.directive.ts @@ -20,11 +20,11 @@ import { IdentityUserService } from '../../people/services/identity-user.service import { TaskCloudService } from '../services/task-cloud.service'; @Directive({ + standalone: true, // eslint-disable-next-line @angular-eslint/directive-selector selector: '[adf-cloud-claim-task]' }) export class ClaimTaskCloudDirective implements OnInit { - /** (Required) The id of the task. */ @Input() taskId: string; @@ -47,14 +47,14 @@ export class ClaimTaskCloudDirective implements OnInit { private readonly el: ElementRef, private readonly renderer: Renderer2, private taskListService: TaskCloudService, - private identityUserService: IdentityUserService) { } + private identityUserService: IdentityUserService + ) {} ngOnInit() { this.validateInputs(); } validateInputs() { - if (!this.isTaskValid()) { this.invalidParams.push('taskId'); } @@ -81,7 +81,6 @@ export class ClaimTaskCloudDirective implements OnInit { } catch (error) { this.error.emit(error); } - } private async claimTask() { diff --git a/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.ts b/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.ts index 1c8496850c..d30bcb011d 100644 --- a/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.ts +++ b/lib/process-services-cloud/src/lib/task/directives/complete-task.directive.ts @@ -19,11 +19,11 @@ import { Directive, Input, HostListener, Output, EventEmitter, OnInit, ElementRe import { TaskCloudService } from '../services/task-cloud.service'; @Directive({ + standalone: true, // eslint-disable-next-line @angular-eslint/directive-selector selector: '[adf-cloud-complete-task]' }) export class CompleteTaskDirective implements OnInit { - /** (Required) The id of the task. */ @Input() taskId: string; @@ -42,18 +42,13 @@ export class CompleteTaskDirective implements OnInit { invalidParams: string[] = []; - constructor( - private readonly el: ElementRef, - private readonly renderer: Renderer2, - private readonly taskListService: TaskCloudService - ) { } + constructor(private readonly el: ElementRef, private readonly renderer: Renderer2, private readonly taskListService: TaskCloudService) {} ngOnInit() { this.validateInputs(); } validateInputs() { - if (!this.isTaskValid()) { this.invalidParams.push('taskId'); } @@ -85,6 +80,5 @@ export class CompleteTaskDirective implements OnInit { this.renderer.removeAttribute(this.el.nativeElement, 'disabled'); this.error.emit(error); } - } } diff --git a/lib/process-services-cloud/src/lib/task/directives/task-directive.module.ts b/lib/process-services-cloud/src/lib/task/directives/task-directive.module.ts index 7269b46115..1fd7d18304 100644 --- a/lib/process-services-cloud/src/lib/task/directives/task-directive.module.ts +++ b/lib/process-services-cloud/src/lib/task/directives/task-directive.module.ts @@ -21,15 +21,7 @@ import { ClaimTaskCloudDirective } from './claim-task-cloud.directive'; import { UnClaimTaskCloudDirective } from './unclaim-task-cloud.directive'; @NgModule({ - declarations: [ - CompleteTaskDirective, - ClaimTaskCloudDirective, - UnClaimTaskCloudDirective - ], - exports: [ - CompleteTaskDirective, - ClaimTaskCloudDirective, - UnClaimTaskCloudDirective - ] + imports: [CompleteTaskDirective, ClaimTaskCloudDirective, UnClaimTaskCloudDirective], + exports: [CompleteTaskDirective, ClaimTaskCloudDirective, UnClaimTaskCloudDirective] }) -export class TaskDirectiveModule { } +export class TaskDirectiveModule {} diff --git a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts index cb9fe0eb3a..5d562a0c13 100644 --- a/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts +++ b/lib/process-services-cloud/src/lib/task/directives/unclaim-task-cloud.directive.ts @@ -19,11 +19,11 @@ import { Directive, Input, HostListener, Output, EventEmitter, OnInit, ElementRe import { TaskCloudService } from '../services/task-cloud.service'; @Directive({ + standalone: true, // eslint-disable-next-line @angular-eslint/directive-selector selector: '[adf-cloud-unclaim-task]' }) export class UnClaimTaskCloudDirective implements OnInit { - /** (Required) The id of the task. */ @Input() taskId: string; @@ -42,17 +42,13 @@ export class UnClaimTaskCloudDirective implements OnInit { invalidParams: string[] = []; - constructor( - private readonly el: ElementRef, - private readonly renderer: Renderer2, - private taskListService: TaskCloudService) { } + constructor(private readonly el: ElementRef, private readonly renderer: Renderer2, private taskListService: TaskCloudService) {} ngOnInit() { this.validateInputs(); } validateInputs() { - if (!this.isTaskValid()) { this.invalidParams.push('taskId'); } 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 26cbc9fd8b..e0f35e3a06 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 @@ -21,24 +21,10 @@ import { TaskFiltersCloudModule } from './task-filters/task-filters-cloud.module import { StartTaskCloudModule } from './start-task/start-task-cloud.module'; import { TaskHeaderCloudModule } from './task-header/task-header-cloud.module'; import { TaskDirectiveModule } from './directives/task-directive.module'; -import { TaskFormModule } from './task-form/task-form.module'; +import { TaskFormCloudComponent } from './task-form/components/task-form-cloud.component'; @NgModule({ - imports: [ - TaskListCloudModule, - TaskFiltersCloudModule, - StartTaskCloudModule, - TaskHeaderCloudModule, - TaskDirectiveModule, - TaskFormModule - ], - exports: [ - TaskListCloudModule, - TaskFiltersCloudModule, - StartTaskCloudModule, - TaskHeaderCloudModule, - TaskDirectiveModule, - TaskFormModule - ] + imports: [TaskListCloudModule, TaskFiltersCloudModule, StartTaskCloudModule, TaskHeaderCloudModule, TaskDirectiveModule, TaskFormCloudComponent], + exports: [TaskListCloudModule, TaskFiltersCloudModule, StartTaskCloudModule, TaskHeaderCloudModule, TaskDirectiveModule, TaskFormCloudComponent] }) -export class TaskCloudModule { } +export class TaskCloudModule {} diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.stories.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.stories.ts index e1d34d1ebc..de3079dbba 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.stories.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.stories.ts @@ -18,7 +18,6 @@ import { applicationConfig, Meta, moduleMetadata, StoryFn } from '@storybook/angular'; import { FormCloudService } from '../../../form/public-api'; import { TaskCloudService } from '../../services/task-cloud.service'; -import { TaskFormModule } from '../task-form.module'; import { TaskFormCloudComponent } from './task-form-cloud.component'; import { TaskCloudServiceMock } from '../../mock/task-cloud.service.mock'; import { FormCloudServiceMock } from '../../../form/mocks/form-cloud.service.mock'; @@ -30,16 +29,14 @@ export default { title: 'Process Services Cloud/Task Cloud/Task Form/Task Form Cloud', decorators: [ moduleMetadata({ - imports: [TaskFormModule], + imports: [TaskFormCloudComponent], providers: [ { provide: TaskCloudService, useClass: TaskCloudServiceMock }, { provide: FormCloudService, useClass: FormCloudServiceMock } ] }), applicationConfig({ - providers: [ - importProvidersFrom(ProcessServicesCloudStoryModule) - ] + providers: [importProvidersFrom(ProcessServicesCloudStoryModule)] }) ], argTypes: { diff --git a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts index 5a3097c4dd..8796db71b5 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/components/task-form-cloud.component.ts @@ -18,7 +18,15 @@ import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges, OnInit, ViewEncapsulation, OnDestroy, ViewChild } from '@angular/core'; import { TaskDetailsCloudModel } from '../../start-task/models/task-details-cloud.model'; import { TaskCloudService } from '../../services/task-cloud.service'; -import { FormRenderingService, FormModel, ContentLinkModel, FormOutcomeEvent, FormFieldValidator, FORM_FIELD_VALIDATORS } from '@alfresco/adf-core'; +import { + FormRenderingService, + FormModel, + ContentLinkModel, + FormOutcomeEvent, + FormFieldValidator, + FORM_FIELD_VALIDATORS, + EmptyContentComponent +} from '@alfresco/adf-core'; import { AttachFileCloudWidgetComponent } from '../../../form/components/widgets/attach-file/attach-file-cloud-widget.component'; import { DropdownCloudWidgetComponent } from '../../../form/components/widgets/dropdown/dropdown-cloud.widget'; import { DateCloudWidgetComponent } from '../../../form/components/widgets/date/date-cloud.widget'; @@ -26,9 +34,32 @@ import { takeUntil } from 'rxjs/operators'; import { Subject } from 'rxjs'; import { FormCloudDisplayModeConfiguration } from '../../../services/form-fields.interfaces'; import { FormCloudComponent } from '../../../form/components/form-cloud.component'; +import { CommonModule } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; +import { MatButtonModule } from '@angular/material/button'; +import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; +import { ClaimTaskCloudDirective } from '../../directives/claim-task-cloud.directive'; +import { UnClaimTaskCloudDirective } from '../../directives/unclaim-task-cloud.directive'; +import { CompleteTaskDirective } from '../../directives/complete-task.directive'; +import { MatCardModule } from '@angular/material/card'; +import { FormCustomOutcomesComponent } from '../../../form/components/form-cloud-custom-outcomes.component'; @Component({ selector: 'adf-cloud-task-form', + standalone: true, + imports: [ + CommonModule, + TranslateModule, + MatButtonModule, + MatProgressSpinnerModule, + ClaimTaskCloudDirective, + UnClaimTaskCloudDirective, + CompleteTaskDirective, + EmptyContentComponent, + MatCardModule, + FormCustomOutcomesComponent, + FormCloudComponent + ], templateUrl: './task-form-cloud.component.html', styleUrls: ['./task-form-cloud.component.scss'], encapsulation: ViewEncapsulation.None diff --git a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts index 4a23edf819..78346bfd0d 100644 --- a/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts +++ b/lib/process-services-cloud/src/lib/task/task-form/task-form.module.ts @@ -16,27 +16,11 @@ */ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MaterialModule } from '../../material.module'; -import { FormCloudModule } from '../../form/form-cloud.module'; -import { TaskDirectiveModule } from '../directives/task-directive.module'; - import { TaskFormCloudComponent } from './components/task-form-cloud.component'; -import { CoreModule } from '@alfresco/adf-core'; +/** @deprecated use TaskFormCloudComponent instead */ @NgModule({ - imports: [ - CoreModule, - CommonModule, - MaterialModule, - FormCloudModule, - TaskDirectiveModule - ], - declarations: [ - TaskFormCloudComponent - ], - exports: [ - TaskFormCloudComponent - ] + imports: [TaskFormCloudComponent], + exports: [TaskFormCloudComponent] }) -export class TaskFormModule { } +export class TaskFormModule {}