diff --git a/e2e/process-services-cloud/process/process-filter-results.e2e.ts b/e2e/process-services-cloud/process/process-filter-results.e2e.ts index fe6362a6ba..1162451a69 100644 --- a/e2e/process-services-cloud/process/process-filter-results.e2e.ts +++ b/e2e/process-services-cloud/process/process-filter-results.e2e.ts @@ -36,6 +36,7 @@ import { ProcessListPage } from '../../process-services/pages/process-list.page' import { EditProcessFilterConfiguration } from './../config/edit-process-filter.config'; import { ProcessListCloudConfiguration } from './../config/process-list-cloud.config'; import { addDays, format, subDays } from 'date-fns'; +import { DateFnsUtils } from '@alfresco/adf-core'; describe('Process filters cloud', () => { @@ -67,9 +68,9 @@ describe('Process filters cloud', () => { const queryService = new QueryService(apiService); const tasksService = new TasksService(apiService); - const beforeDate = format(subDays(new Date(), 1), 'dd/MM/yyyy'); + const beforeDate = DateFnsUtils.formatDate(subDays(new Date(), 1), 'DD/MM/YYYY'); const currentDate = DateUtil.formatDate('DD/MM/YYYY'); - const afterDate = format(addDays(new Date(), 1), 'dd/MM/yyyy'); + const afterDate = DateFnsUtils.formatDate(addDays(new Date(), 1), 'DD/MM/YYYY'); const processListCloudConfiguration = new ProcessListCloudConfiguration(); const editProcessFilterConfiguration = new EditProcessFilterConfiguration(); const processListCloudConfigFile = processListCloudConfiguration.getConfiguration(); diff --git a/e2e/process-services/tasks/task-details.e2e.ts b/e2e/process-services/tasks/task-details.e2e.ts index 7687c27e4e..9108744b71 100644 --- a/e2e/process-services/tasks/task-details.e2e.ts +++ b/e2e/process-services/tasks/task-details.e2e.ts @@ -36,6 +36,7 @@ import TaskModel = require('../../models/APS/TaskModel'); import FormModel = require('../../models/APS/FormModel'); import CONSTANTS = require('../../util/constants'); import { format } from 'date-fns'; +import { DateFnsUtils } from '@alfresco/adf-core'; describe('Task Details component', () => { const app = browser.params.resources.Files.SIMPLE_APP_WITH_USER_FORM; @@ -55,7 +56,7 @@ describe('Task Details component', () => { let processUserModel: UserModel; let appModel: AppDefinitionRepresentation; const tasks = ['Modifying task', 'Information box', 'No form', 'Not Created', 'Refreshing form', 'Assignee task', 'Attach File']; - const TASK_DATE_FORMAT = 'PP'; + const TASK_DATE_FORMAT = 'll'; let formModel: any; const taskFormModel = { @@ -96,7 +97,8 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(taskModel.getDescription()); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -126,7 +128,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(taskModel.getDescription()); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -160,7 +162,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -191,7 +193,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -233,7 +235,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -270,7 +272,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(allTasks.data[0]); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); @@ -301,7 +303,7 @@ describe('Task Details component', () => { const taskModel = new TaskModel(getTaskResponse); await taskPage.tasksListPage().checkContentIsDisplayed(taskModel.getName()); - await expect(await taskPage.taskDetails().getCreated()).toEqual(format(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); + await expect(await taskPage.taskDetails().getCreated()).toEqual(DateFnsUtils.formatDate(new Date(taskModel.getCreated()), TASK_DATE_FORMAT)); await expect(await taskPage.taskDetails().getId()).toEqual(taskModel.getId()); await expect(await taskPage.taskDetails().getDescription()).toEqual(CONSTANTS.TASK_DETAILS.NO_DESCRIPTION); await expect(await taskPage.taskDetails().getAssignee()).toEqual(taskModel.getAssignee().getEntireName()); diff --git a/lib/core/src/lib/common/utils/date-fns-utils.ts b/lib/core/src/lib/common/utils/date-fns-utils.ts index 3333224624..7d7a908939 100644 --- a/lib/core/src/lib/common/utils/date-fns-utils.ts +++ b/lib/core/src/lib/common/utils/date-fns-utils.ts @@ -86,7 +86,8 @@ export class DateFnsUtils { static momentToDateFnsMap = { D: 'd', Y: 'y', - A: 'a' + A: 'a', + ll: 'PP' }; /** @@ -95,7 +96,8 @@ export class DateFnsUtils { static dateFnsToMomentMap = { d: 'D', y: 'Y', - a: 'A' + a: 'A', + PP: 'll' }; /**