From 9f69a7d4ee5de67f97afe8ac20b39a78597c2ac7 Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 21 Oct 2019 16:10:19 +0100 Subject: [PATCH] add types and fix date probblem in process list (#5176) --- .../components/process-list.component.ts | 16 ++++++---------- .../task-list/components/task-list.component.ts | 3 ++- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/lib/process-services/src/lib/process-list/components/process-list.component.ts b/lib/process-services/src/lib/process-list/components/process-list.component.ts index 5f075bd000..143249e96a 100644 --- a/lib/process-services/src/lib/process-list/components/process-list.component.ts +++ b/lib/process-services/src/lib/process-list/components/process-list.component.ts @@ -47,17 +47,16 @@ import { processPresetsDefaultModel } from '../models/process-preset.model'; import { ProcessService } from '../services/process.service'; import { BehaviorSubject } from 'rxjs'; import { ProcessListModel } from '../models/process-list.model'; -import moment from 'moment-es6'; +import { ProcessInstanceRepresentation } from '@alfresco/js-api'; @Component({ selector: 'adf-process-instance-list', styleUrls: ['./process-list.component.css'], templateUrl: './process-list.component.html' }) -export class ProcessInstanceListComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent { +export class ProcessInstanceListComponent extends DataTableSchema implements OnChanges, AfterContentInit, PaginatedComponent { static PRESET_KEY = 'adf-process-list.presets'; - public FORMAT_DATE: string = 'll'; @ContentChild(CustomEmptyContentTemplateDirective) customEmptyContent: CustomEmptyContentTemplateDirective; @@ -75,7 +74,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On /** The id of the process instance. */ @Input() - processInstanceId: number|string; + processInstanceId: number | string; /** Defines the state of the processes. Possible values are `running`, `completed` and `all` */ @Input() @@ -290,18 +289,15 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On * Optimize name field * @param instances */ - private optimizeProcessDetails(instances: any[]): any[] { + private optimizeProcessDetails(instances: ProcessInstanceRepresentation[]): ProcessInstanceRepresentation[] { instances = instances.map((instance) => { instance.name = this.getProcessNameOrDescription(instance, 'medium'); - if (instance.started) { - instance.started = moment(instance.started).format(this.FORMAT_DATE); - } return instance; }); return instances; } - getProcessNameOrDescription(processInstance, dateFormat: string): string { + getProcessNameOrDescription(processInstance: ProcessInstanceRepresentation, dateFormat: string): string { let name = ''; if (processInstance) { name = processInstance.name || @@ -310,7 +306,7 @@ export class ProcessInstanceListComponent extends DataTableSchema implements On return name; } - getFormatDate(value: any, format: string) { + getFormatDate(value: Date, format: string) { const datePipe = new DatePipe('en-US'); try { return datePipe.transform(value, format); diff --git a/lib/process-services/src/lib/task-list/components/task-list.component.ts b/lib/process-services/src/lib/task-list/components/task-list.component.ts index 2f8dd4cef8..1535907aa1 100644 --- a/lib/process-services/src/lib/task-list/components/task-list.component.ts +++ b/lib/process-services/src/lib/task-list/components/task-list.component.ts @@ -30,6 +30,7 @@ import { taskPresetsDefaultModel } from '../models/task-preset.model'; import { TaskListService } from './../services/tasklist.service'; import moment from 'moment-es6'; import { takeUntil } from 'rxjs/operators'; +import { TaskDetailsModel } from '../models/task-details.model'; @Component({ selector: 'adf-tasklist', @@ -353,7 +354,7 @@ export class TaskListComponent extends DataTableSchema implements OnChanges, Aft * Optimize name field * @param instances */ - private optimizeTaskDetails(instances: any[]): any[] { + private optimizeTaskDetails(instances: TaskDetailsModel[]): TaskDetailsModel[] { instances = instances.map((task) => { if (!task.name) { task.name = 'No name';