From 1d2a7f917025f8892f3479aeb1fe30633bd82ac5 Mon Sep 17 00:00:00 2001 From: Roman Date: Fri, 19 Feb 2021 01:41:03 +0200 Subject: [PATCH] fix: sorting in cronjobs, more Date.now() replacements Signed-off-by: Roman --- src/renderer/components/+workloads-cronjobs/cronjobs.tsx | 2 +- src/renderer/utils/__tests__/formatDuration.test.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx index 08b84c0671..7c06cfbfdc 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjobs.tsx +++ b/src/renderer/components/+workloads-cronjobs/cronjobs.tsx @@ -46,7 +46,7 @@ export class CronJobs extends React.Component { [columnId.suspend]: (cronJob: CronJob) => cronJob.getSuspendFlag(), [columnId.active]: (cronJob: CronJob) => cronJobStore.getActiveJobsNum(cronJob), [columnId.lastSchedule]: (cronJob: CronJob) => cronJob.getLastScheduleTime(), - [columnId.age]: (cronJob: CronJob) => cronJob.metadata.creationTimestamp, + [columnId.age]: (cronJob: CronJob) => cronJob.getTimeDiffFromNow(), }} searchFilters={[ (cronJob: CronJob) => cronJob.getSearchFields(), diff --git a/src/renderer/utils/__tests__/formatDuration.test.ts b/src/renderer/utils/__tests__/formatDuration.test.ts index 7c19ba93f9..30dc81a6fc 100644 --- a/src/renderer/utils/__tests__/formatDuration.test.ts +++ b/src/renderer/utils/__tests__/formatDuration.test.ts @@ -50,7 +50,7 @@ describe("human format durations", () => { }); test("durations less than 8 years returns years and days", () => { - const timeValue = new Date().getTime() - new Date(moment().subtract(2, "years").subtract(5, "days").subtract(2, "hours").toDate()).getTime(); + const timeValue = Date.now() - new Date(moment().subtract(2, "years").subtract(5, "days").subtract(2, "hours").toDate()).getTime(); const res = formatDuration(timeValue); @@ -58,7 +58,7 @@ describe("human format durations", () => { }); test("durations more than 8 years returns years", () => { - const timeValue = new Date().getTime() - new Date(moment().subtract(9, "years").subtract(5, "days").toDate()).getTime(); + const timeValue = Date.now() - new Date(moment().subtract(9, "years").subtract(5, "days").toDate()).getTime(); const res = formatDuration(timeValue);