mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-24 17:32:15 +00:00
[ACS-5878] Migrated moment occurrences to date-fns equivalent in ProcessService (#8879)
* [ACS-5878] migrated moment to date-fns for ProcessService * [ACS-5878] reverted variable renaming * [ACS-5878] linting fixes
This commit is contained in:
committed by
GitHub
parent
3638ed06ef
commit
926347b8fc
@@ -22,8 +22,7 @@ import { ProcessInstanceVariable } from '../models/process-instance-variable.mod
|
||||
import { ProcessService } from './process.service';
|
||||
import { CoreModule } from '@alfresco/adf-core';
|
||||
import { ProcessTestingModule } from '../../testing/process.testing.module';
|
||||
|
||||
declare let moment: any;
|
||||
import { format } from 'date-fns';
|
||||
|
||||
describe('ProcessService', () => {
|
||||
let service: ProcessService;
|
||||
@@ -289,7 +288,7 @@ describe('ProcessService', () => {
|
||||
const task = tasks[0];
|
||||
expect(task.id).toBe(fakeTasks[0].id);
|
||||
expect(task.name).toBe(fakeTasks[0].name);
|
||||
expect(task.created).toEqual(moment(new Date('2016-11-10T00:00:00+00:00'), 'YYYY-MM-DD').format());
|
||||
expect(task.created).toEqual(format(new Date('2016-11-10T00:00:00+00:00'), 'yyyy-MM-dd'));
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
@@ -34,8 +34,7 @@ import { ProcessInstance } from '../models/process-instance.model';
|
||||
import { ProcessListModel } from '../models/process-list.model';
|
||||
import { map, catchError } from 'rxjs/operators';
|
||||
import { DatePipe } from '@angular/common';
|
||||
|
||||
declare let moment: any;
|
||||
import { format } from 'date-fns';
|
||||
|
||||
@Injectable({
|
||||
providedIn: 'root'
|
||||
@@ -214,7 +213,7 @@ export class ProcessService {
|
||||
.pipe(
|
||||
map(this.extractData),
|
||||
map((tasks) => tasks.map((task: any) => {
|
||||
task.created = moment(task.created, 'YYYY-MM-DD').format();
|
||||
task.created = format(new Date(task.created), 'yyyy-MM-dd');
|
||||
return task;
|
||||
})),
|
||||
catchError((err) => this.handleProcessError(err))
|
||||
@@ -358,11 +357,11 @@ export class ProcessService {
|
||||
return name;
|
||||
}
|
||||
|
||||
private getFormatDate(value: Date, format: string) {
|
||||
private getFormatDate(value: Date, dateFormat: string) {
|
||||
const datePipe = new DatePipe('en-US');
|
||||
|
||||
try {
|
||||
return datePipe.transform(value, format);
|
||||
return datePipe.transform(value, dateFormat);
|
||||
} catch (err) {
|
||||
return '';
|
||||
}
|
||||
|
Reference in New Issue
Block a user