Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

Joshen/fe 2441 backup restore dialog shows incorrect utc timestamp (#42307)

Joshen Lima95fc1bff281
diff --git a/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx b/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx
index bc5308857ad..95c564b7422 100644
--- a/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx
+++ b/apps/studio/components/interfaces/Database/Backups/BackupsList.tsx
@@ -1,20 +1,21 @@
-import dayjs from 'dayjs'
-import { Clock } from 'lucide-react'
-import { useRouter } from 'next/router'
-import { useState } from 'react'
-import { toast } from 'sonner'
-
import { useParams } from 'common'
import Panel from 'components/ui/Panel'
import { UpgradeToPro } from 'components/ui/UpgradeToPro'
import { useBackupRestoreMutation } from 'data/database/backup-restore-mutation'
import { DatabaseBackup, useBackupsQuery } from 'data/database/backups-query'
import { useSetProjectStatus } from 'data/projects/project-detail-query'
+import dayjs from 'dayjs'
import { useCheckEntitlements } from 'hooks/misc/useCheckEntitlements'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from 'lib/constants'
-import { Admonition } from 'ui-patterns/admonition'
+import { Clock } from 'lucide-react'
+import { useRouter } from 'next/router'
+import { useState } from 'react'
+import { toast } from 'sonner'
+import { TimestampInfo } from 'ui-patterns'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
+import { Admonition } from 'ui-patterns/admonition'
+
import { BackupItem } from './BackupItem'
import { BackupsEmpty } from './BackupsEmpty'
import { BackupsStorageAlert } from './BackupsStorageAlert'
@@ -111,11 +112,17 @@ export const BackupsList = () => {
}}
>
<div className="space-y-3">
- <p className="text-sm">
- This will restore your database to the backup made on{' '}
- {dayjs(selectedBackup?.inserted_at).format('DD MMM YYYY')} at{' '}
- {dayjs(selectedBackup?.inserted_at).format('HH:mm:ss')} UTC.
- </p>
+ {!!selectedBackup && (
+ <p className="text-sm">
+ This will restore your database to the backup made on{' '}
+ <TimestampInfo
+ displayAs="utc"
+ utcTimestamp={selectedBackup.inserted_at}
+ labelFormat="DD MMM YYYY HH:mm:ss (ZZ)"
+ className="!text-sm"
+ />
+ </p>
+ )}
<Admonition
showIcon={false}
diff --git a/apps/studio/data/database/backups-query.ts b/apps/studio/data/database/backups-query.ts
index 1ab9ad3d076..f9fd0abf8ca 100644
--- a/apps/studio/data/database/backups-query.ts
+++ b/apps/studio/data/database/backups-query.ts
@@ -1,9 +1,9 @@
import { useQuery } from '@tanstack/react-query'
-
import type { components } from 'data/api'
import { get, handleError } from 'data/fetchers'
import { useIsOrioleDbInAws } from 'hooks/misc/useSelectedProject'
import type { ResponseError, UseCustomQueryOptions } from 'types'
+
import { databaseKeys } from './keys'
export type BackupsVariables = {