From d964e2ed8c8014bd2bd8be6c4cba760fd114ea72 Mon Sep 17 00:00:00 2001 From: dragarcia Date: Tue, 21 Jun 2022 14:01:49 +0800 Subject: [PATCH] standardise to unix in seconds --- .../PITRBackupSelection/PITRBackupSelection.utils.ts | 4 ++-- .../Database/Backups/PITRBackupSelection/index.tsx | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/studio/components/interfaces/Database/Backups/PITRBackupSelection/PITRBackupSelection.utils.ts b/studio/components/interfaces/Database/Backups/PITRBackupSelection/PITRBackupSelection.utils.ts index 8fbce2583e1..545340e5e5d 100644 --- a/studio/components/interfaces/Database/Backups/PITRBackupSelection/PITRBackupSelection.utils.ts +++ b/studio/components/interfaces/Database/Backups/PITRBackupSelection/PITRBackupSelection.utils.ts @@ -19,9 +19,9 @@ export const getTimezoneOffset = (timezone: Timezone) => { return timezone.text.split(')')[0].slice(4) } -export const convertTimeStringtoUnixMs = (datetime: string, timezone: Timezone) => { +export const convertTimeStringtoUnixS = (datetime: string, timezone: Timezone) => { // Datetime in the format of YYYY-MM-DDTHH:mm:ss (from datetime-local input) const timezoneOffset = getTimezoneOffset(timezone) const datetimestringWithTimezone = `${datetime}${timezoneOffset}` - return dayjs(datetimestringWithTimezone).valueOf() + return dayjs(datetimestringWithTimezone).unix() } diff --git a/studio/components/interfaces/Database/Backups/PITRBackupSelection/index.tsx b/studio/components/interfaces/Database/Backups/PITRBackupSelection/index.tsx index 9848d44c07c..663cbf5ee46 100644 --- a/studio/components/interfaces/Database/Backups/PITRBackupSelection/index.tsx +++ b/studio/components/interfaces/Database/Backups/PITRBackupSelection/index.tsx @@ -16,7 +16,7 @@ import { ALL_TIMEZONES } from './PITRBackupSelection.constants' import { getClientTimezone, getTimezoneOffsetText, - convertTimeStringtoUnixMs, + convertTimeStringtoUnixS, } from './PITRBackupSelection.utils' interface Props {} @@ -75,13 +75,13 @@ const PITRBackupSelection: FC = () => { ) : ALL_TIMEZONES.map((option) => option.text) - const earliestAvailableBackup = dayjs( + const earliestAvailableBackup = dayjs.unix( configuration.physicalBackupData.earliestPhysicalBackupDateUnix ) .tz(selectedTimezone.utc[0]) .format('YYYY-MM-DDTHH:mm:ss') - const latestAvailableBackup = dayjs(configuration.physicalBackupData.latestPhysicalBackupDateUnix) + const latestAvailableBackup = dayjs.unix(configuration.physicalBackupData.latestPhysicalBackupDateUnix) .tz(selectedTimezone.utc[0]) .format('YYYY-MM-DDTHH:mm:ss') @@ -92,7 +92,7 @@ const PITRBackupSelection: FC = () => { if (!recoveryPoint) { setErrors({ recoveryPoint: 'Please enter a date to recovery your project from' }) } else { - const recoveryTimeTargetUnix = convertTimeStringtoUnixMs(recoveryPoint, selectedTimezone) + const recoveryTimeTargetUnix = convertTimeStringtoUnixS(recoveryPoint, selectedTimezone) const { earliestPhysicalBackupDateUnix, latestPhysicalBackupDateUnix } = configuration.physicalBackupData @@ -115,7 +115,7 @@ const PITRBackupSelection: FC = () => { if (!recoveryPoint) return // To unix milliseconds - const recoveryTimeTargetUnix = convertTimeStringtoUnixMs(recoveryPoint, selectedTimezone) + const recoveryTimeTargetUnix = convertTimeStringtoUnixS(recoveryPoint, selectedTimezone) try { post(`${API_URL}/database/${projectRef}/backups/pitr`, {