Skip to content

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

feat(storage): add version history to the file preview panel (FE-4163) (#49208)

Francesco Sansalvadore1b27761bec80
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx
index 48f79f84ce5..f5c6dd9ab05 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmDeleteModal.tsx
@@ -2,27 +2,54 @@ import { useEffect, useState } from 'react'
import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'
import { STORAGE_ROW_TYPES } from '../Storage.constants'
+import { getBucketVersioningState } from '../StorageVersioning.constants'
+import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
export const ConfirmDeleteModal = () => {
const [deleting, setDeleting] = useState(false)
- const { selectedItemsToDelete, deleteFolder, deleteFiles, setSelectedItemsToDelete } =
- useStorageExplorerStateSnapshot()
+ const {
+ selectedBucket,
+ selectedItemsToDelete,
+ deleteFolder,
+ deleteFiles,
+ setSelectedItemsToDelete,
+ } = useStorageExplorerStateSnapshot()
+
+ const isStorageVersioningEnabled = useIsStorageVersioningEnabled()
+ const isVersionedBucket =
+ isStorageVersioningEnabled && getBucketVersioningState(selectedBucket) !== 'disabled'
const visible = selectedItemsToDelete.length > 0
const multipleFiles = selectedItemsToDelete.length > 1
+ const [firstItem] = selectedItemsToDelete
- const title = multipleFiles
- ? `Confirm deletion of ${selectedItemsToDelete.length} items`
- : selectedItemsToDelete.length === 1
- ? `Confirm deletion of ${selectedItemsToDelete[0].name}`
- : ``
+ const getTitle = () => {
+ if (multipleFiles) {
+ const verb = isVersionedBucket ? 'Archive' : 'Delete'
+ return `${verb} ${selectedItemsToDelete.length} items?`
+ }
+ if (firstItem === undefined) return ''
+ return isVersionedBucket ? `Archive ${firstItem.name}?` : `Delete ${firstItem.name}?`
+ }
- const description = multipleFiles
- ? `Are you sure you want to delete the selected ${selectedItemsToDelete.length} items?`
- : selectedItemsToDelete.length === 1
- ? `Are you sure you want to delete the selected ${selectedItemsToDelete[0].type.toLowerCase()}?`
- : ``
+ const getSubject = () => {
+ if (multipleFiles) return `the selected ${selectedItemsToDelete.length} items`
+ if (firstItem === undefined) return 'the selected item'
+ return `the selected ${firstItem.type.toLowerCase()}`
+ }
+
+ const alert = isVersionedBucket
+ ? {
+ base: { variant: 'warning' as const },
+ title: 'Versions are retained',
+ description: `Archiving ${getSubject()} hides it from the bucket. Its noncurrent versions stay retained until you delete them individually or a lifecycle policy expires them.`,
+ }
+ : {
+ base: { variant: 'destructive' as const },
+ title: 'This action cannot be undone',
+ description: `Are you sure you want to delete ${getSubject()}?`,
+ }
const onDeleteSelectedFiles = async () => {
try {
@@ -49,16 +76,13 @@ export const ConfirmDeleteModal = () => {
<ConfirmationModal
size="medium"
visible={visible}
- title={<span className="wrap-break-word">{title}</span>}
+ title={<span className="wrap-break-word">{getTitle()}</span>}
+ confirmLabel={isVersionedBucket ? 'Archive' : 'Delete'}
loading={deleting}
onCancel={() => setSelectedItemsToDelete([])}
onConfirm={onDeleteSelectedFiles}
- variant="destructive"
- alert={{
- base: { variant: 'destructive' },
- title: 'This action cannot be undone',
- description,
- }}
+ variant={isVersionedBucket ? 'warning' : 'destructive'}
+ alert={alert}
/>
)
}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmPurgeModal.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmPurgeModal.tsx
new file mode 100644
index 00000000000..047b0d2055f
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/ConfirmPurgeModal.tsx
@@ -0,0 +1,62 @@
+import { toast } from 'sonner'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
+
+import { getStorageItemPath } from './StorageExplorer.utils'
+import { useStorageExplorerNavigation } from './StorageExplorerNavigation'
+import { useObjectPurgeMutation } from '@/data/storage/versioning/object-purge-mutation'
+import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
+
+/** Mounted once by the explorer. Confirmed separately from `ConfirmDeleteModal`, which archives. */
+export const ConfirmPurgeModal = () => {
+ const {
+ projectRef,
+ selectedBucket,
+ openedFolders,
+ itemToPurge,
+ setItemToPurge,
+ selectedFilePreview,
+ refetchAllOpenedFolders,
+ } = useStorageExplorerStateSnapshot()
+ const { clearPreviewedFile } = useStorageExplorerNavigation()
+
+ const { mutate: purgeObject, isPending: isPurging } = useObjectPurgeMutation({
+ onSuccess: async () => {
+ toast.success(`Permanently deleted ${itemToPurge?.name}`)
+ // Purging from a row menu shouldn't close a preview of something else.
+ if (selectedFilePreview?.id === itemToPurge?.id) clearPreviewedFile()
+ setItemToPurge(undefined)
+ await refetchAllOpenedFolders()
+ },
+ })
+
+ const onConfirm = () => {
+ if (!projectRef || !selectedBucket?.id || itemToPurge === undefined) return
+
+ // The endpoint addresses an object by full path; a row only knows its leaf name.
+ // The path captured when the row was targeted beats rebuilding it from folders
+ // that may have moved on; rows synthesized without one still need the rebuild.
+ const path = itemToPurge.path ?? getStorageItemPath({ openedFolders }, itemToPurge)
+
+ purgeObject({ projectRef, bucketId: selectedBucket.id, path })
+ }
+
+ return (
+ <ConfirmationModal
+ size="medium"
+ visible={itemToPurge !== undefined}
+ title={<span className="wrap-break-word">Permanently delete {itemToPurge?.name}?</span>}
+ confirmLabel="Delete permanently"
+ confirmLabelLoading="Deleting..."
+ loading={isPurging}
+ variant="destructive"
+ onCancel={() => setItemToPurge(undefined)}
+ onConfirm={onConfirm}
+ alert={{
+ base: { variant: 'destructive' },
+ title: 'This cannot be undone',
+ description:
+ 'Deletes the file and every version of it, bypassing versioning. Nothing is left to restore.',
+ }}
+ />
+ )
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
index 5865a4c8dd7..56b71d7690d 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx
@@ -2,6 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'
import { find, isEmpty, isEqual } from 'lodash'
import {
AlertCircle,
+ Archive,
Copy,
Download,
Edit,
@@ -37,11 +38,13 @@ import {
} from '../Storage.constants'
import { StorageItemWithColumn, type StorageItem } from '../Storage.types'
import { StorageRowIcon } from '../StorageRowIcon'
+import { getBucketVersioningState } from '../StorageVersioning.constants'
import { useFileExplorerContextMenu } from './FileExplorerRowContextMenu'
import { FileExplorerRowEditing } from './FileExplorerRowEditing'
import { copyStorageExplorerUrl, copyStoragePath } from './StorageExplorer.utils'
import { useStorageExplorerNavigation } from './StorageExplorerNavigation'
import { useCopyUrl } from './useCopyUrl'
+import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
@@ -78,6 +81,7 @@ export const FileExplorerRow = ({
setSelectedFileCustomExpiry,
setSelectedItems,
setSelectedItemsToDelete,
+ setItemToPurge,
downloadFile,
setSelectedItemToRename,
setSelectedItemsToMove,
@@ -95,6 +99,9 @@ export const FileExplorerRow = ({
openedFolders.length > columnIndex ? openedFolders[columnIndex].name === item.name : false
const isPreviewed = !isEmpty(selectedFilePreview) && isEqual(selectedFilePreview?.id, item.id)
const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const isStorageVersioningEnabled = useIsStorageVersioningEnabled()
+ const isVersionedBucket =
+ isStorageVersioningEnabled && getBucketVersioningState(selectedBucket) !== 'disabled'
const onCheckItem = (isShiftKeyHeld: boolean) => {
// Select a range if shift is held down
@@ -226,10 +233,24 @@ export const FileExplorerRow = ({
...(canUpdateFiles
? [
{
- name: 'Delete',
- icon: <Trash2 size={12} className="text-foreground-light" />,
+ // On a versioned bucket this is a soft delete, so it reads as Archive.
+ name: isVersionedBucket ? 'Archive' : 'Delete',
+ icon: isVersionedBucket ? (
+ <Archive size={12} className="text-foreground-light" />
+ ) : (
+ <Trash2 size={12} className="text-foreground-light" />
+ ),
onClick: () => setSelectedItemsToDelete([itemWithColumnIndex]),
},
+ ...(isVersionedBucket
+ ? [
+ {
+ name: 'Delete permanently',
+ icon: <Trash2 size={12} className="text-destructive" />,
+ onClick: () => setItemToPurge(itemWithColumnIndex),
+ },
+ ]
+ : []),
]
: []),
]
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.test.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.test.tsx
new file mode 100644
index 00000000000..3322f172959
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.test.tsx
@@ -0,0 +1,117 @@
+import { screen, waitFor } from '@testing-library/react'
+import { HttpResponse } from 'msw'
+import { describe, expect, it, vi } from 'vitest'
+
+import { FilePreview } from '@/components/interfaces/Storage/StorageExplorer/FilePreview'
+import { storageKeys } from '@/data/storage/keys'
+import { customRender as render } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
+
+const SIGNED_URL = '/storage/v1/object/sign/my-bucket/photo.png?token=abc'
+
+vi.mock('@/state/storage-explorer', () => ({
+ useStorageExplorerStateSnapshot: () => ({
+ projectRef: 'abcdef',
+ selectedBucket: { id: 'my-bucket', name: 'my-bucket', public: false },
+ }),
+}))
+
+const mockSignEndpoint = () => {
+ const bodies: Array<Record<string, unknown>> = []
+
+ addAPIMock({
+ method: 'post',
+ path: '/platform/storage/:ref/buckets/:id/objects/sign',
+ response: async ({ request }) => {
+ bodies.push((await request.json()) as Record<string, unknown>)
+ return HttpResponse.json<{ signedUrl: string }>({ signedUrl: SIGNED_URL })
+ },
+ })
+
+ return bodies
+}
+
+describe('FilePreview', () => {
+ it('asks for the specific version it was given', async () => {
+ const bodies = mockSignEndpoint()
+
+ render(
+ <FilePreview path="folder/photo.png" mimeType="image/png" size={100} versionId="v-older" />
+ )
+
+ await waitFor(() => expect(bodies).toHaveLength(1))
+ expect(bodies[0]).toMatchObject({
+ path: 'folder/photo.png',
+ options: { versionId: 'v-older' },
+ })
+ })
+
+ it('omits the version entirely when previewing the current one', async () => {
+ const bodies = mockSignEndpoint()
+
+ render(<FilePreview path="folder/photo.png" mimeType="image/png" size={100} />)
+
+ await waitFor(() => expect(bodies).toHaveLength(1))
+ expect(bodies[0].options).toBeUndefined()
+ })
+
+ it('renders the resolved URL rather than a placeholder for an image', async () => {
+ mockSignEndpoint()
+
+ const { container } = render(
+ <FilePreview path="photo.png" mimeType="image/png" size={100} versionId="v-older" />
+ )
+
+ await waitFor(() =>
+ expect(container.querySelector(`[style*="${SIGNED_URL}"]`)).toBeInTheDocument()
+ )
+ })
+
+ it('keys each version separately, so a new one cannot reuse the cached URL', () => {
+ const current = storageKeys.fileUrl({
+ projectRef: 'abcdef',
+ isBucketPublic: false,
+ bucketId: 'my-bucket',
+ path: 'photo.png',
+ })
+
+ expect(
+ storageKeys.fileUrl({
+ projectRef: 'abcdef',
+ isBucketPublic: false,
+ bucketId: 'my-bucket',
+ path: 'photo.png',
+ versionId: 'v-new',
+ })
+ ).not.toEqual(current)
+
+ // The version-less key is a prefix of every version's, so one invalidation clears all.
+ expect(
+ storageKeys
+ .fileUrl({
+ projectRef: 'abcdef',
+ isBucketPublic: false,
+ bucketId: 'my-bucket',
+ path: 'photo.png',
+ versionId: 'v-new',
+ })
+ .slice(0, current.length)
+ ).toEqual(current)
+ })
+
+ it('skips the request for a file too large to preview', async () => {
+ const bodies = mockSignEndpoint()
+
+ render(
+ <FilePreview
+ path="huge.png"
+ mimeType="image/png"
+ size={50 * 1024 * 1024}
+ versionId="v-older"
+ />
+ )
+
+ expect(await screen.findByText(/too large to preview/i)).toBeInTheDocument()
+ expect(bodies).toHaveLength(0)
+ })
+})
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.tsx
new file mode 100644
index 00000000000..679e293dcd7
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FilePreview.tsx
@@ -0,0 +1,97 @@
+import { LoaderCircle } from 'lucide-react'
+import SVG from 'react-inlinesvg'
+
+import { useFetchFileUrlQuery } from './useFetchFileUrlQuery'
+import { BASE_PATH } from '@/lib/constants'
+import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
+
+const PREVIEW_SIZE_LIMIT = 10 * 1024 * 1024 // 10MB
+
+const FileIcon = ({ className }: { className?: string }) => (
+ <SVG
+ src={`${BASE_PATH}/img/file-filled.svg`}
+ preProcessor={(code) =>
+ code.replace(
+ /svg/,
+ `svg class="${className ?? 'mx-auto w-32 h-32 text-color-inherit opacity-75'}"`
+ )
+ }
+ />
+)
+
+interface FilePreviewProps {
+ path: string
+ mimeType?: string
+ /** Bytes. Anything over the limit renders a placeholder instead. */
+ size?: number
+ /** Renders that version's bytes. Without it, the current ones. */
+ versionId?: string
+}
+
+export const FilePreview = ({ path, mimeType, size, versionId }: FilePreviewProps) => {
+ const { projectRef, selectedBucket } = useStorageExplorerStateSnapshot()
+
+ // An unknown size counts as too large, matching the pre-versioning behavior.
+ const effectiveSize = size ?? PREVIEW_SIZE_LIMIT + 1
+ const isSkipped = !!mimeType && effectiveSize > PREVIEW_SIZE_LIMIT
+
+ const { data: previewUrl, isPending } = useFetchFileUrlQuery(
+ { path, projectRef, bucket: selectedBucket, versionId },
+ { enabled: !isSkipped && !!projectRef && !!selectedBucket }
+ )
+
+ if (isSkipped) {
+ return (
+ <div className="flex h-full w-full flex-col items-center justify-center">
+ <FileIcon />
+ <p className="mt-2 w-2/5 text-center text-sm">
+ File size is too large to preview in the explorer
+ </p>
+ </div>
+ )
+ }
+
+ if (isPending) {
+ return (
+ <div className="flex h-full w-full items-center justify-center text-foreground-lighter">
+ <LoaderCircle size={14} className="animate-spin text-foreground-lighter" />
+ </div>
+ )
+ }
+
+ if (!mimeType || !previewUrl) return <FileIcon />
+
+ if (mimeType.includes('image')) {
+ return (
+ <div
+ className="h-full w-full bg-contain bg-center bg-no-repeat"
+ style={{ backgroundImage: `url('${previewUrl}')` }}
+ />
+ )
+ }
+ if (mimeType.includes('audio')) {
+ return (
+ <div className="flex h-full w-full items-center justify-center px-10">
+ <audio key={previewUrl} controls style={{ width: 'inherit' }}>
+ <source src={previewUrl} type="audio/mpeg" />
+ <p className="text-sm text-foreground-light">
+ Your browser does not support the audio element.
+ </p>
+ </audio>
+ </div>
+ )
+ }
+ if (mimeType.includes('video')) {
+ return (
+ <div className="flex h-full w-full items-center justify-center">
+ <video key={previewUrl} controls style={{ maxHeight: '100%' }}>
+ <source src={previewUrl} type="video/mp4" />
+ <p className="text-sm text-foreground-light">
+ Your browser does not support the video tag.
+ </p>
+ </video>
+ </div>
+ )
+ }
+ return <FileIcon />
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
index d551847736b..8255fb6d34e 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx
@@ -1,7 +1,11 @@
import { PermissionAction } from '@supabase/shared-types/out/constants'
-import { AlertCircle, ChevronDown, Copy, Download, LoaderCircle, Trash2, X } from 'lucide-react'
-import SVG from 'react-inlinesvg'
+import { useQuery } from '@tanstack/react-query'
+import { AlertCircle, Archive, ChevronDown, Copy, Download, Trash2, Upload, X } from 'lucide-react'
+import { parseAsBoolean, useQueryState } from 'nuqs'
+import { useRef, useState, type ReactNode } from 'react'
+import { toast } from 'sonner'
import {
+ Badge,
Button,
DropdownMenu,
DropdownMenuContent,
@@ -9,117 +13,241 @@ import {
DropdownMenuTrigger,
} from 'ui'
+import { fromLifecycleRules } from '../FilesBuckets/BucketVersioningFields/BucketVersioningFields.lifecycle'
import { URL_EXPIRY_DURATION } from '../Storage.constants'
import { StorageItem } from '../Storage.types'
+import { getBucketVersioningState } from '../StorageVersioning.constants'
+import { FilePreview } from './FilePreview'
+import { pickFile } from './pickFile'
+import { PreviewSection } from './PreviewSection'
import { getPathAlongOpenedFolders } from './StorageExplorer.utils'
import { useStorageExplorerNavigation } from './StorageExplorerNavigation'
import { useCopyUrl } from './useCopyUrl'
-import { useFetchFileUrlQuery } from './useFetchFileUrlQuery'
+import { VersionCompareWidget } from './VersionCompareWidget'
+import { VersionHistory } from './VersionHistory'
+import { useIsStorageVersioningEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
+import { bucketLifecycleQueryOptions } from '@/data/storage/bucket-lifecycle-query'
+import { useObjectVersionRestoreMutation } from '@/data/storage/versioning/object-version-restore-mutation'
+import {
+ objectVersionsQueryOptions,
+ type LifecyclePolicy,
+ type ObjectVersion,
+} from '@/data/storage/versioning/object-versions-query'
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
-import { BASE_PATH } from '@/lib/constants'
import { formatBytes } from '@/lib/helpers'
import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
-const PREVIEW_SIZE_LIMIT = 10 * 1024 * 1024 // 10MB
+const PANEL_WIDTH = 450
-const PreviewFile = ({ item }: { item: StorageItem }) => {
- const { projectRef, selectedBucket, openedFolders } = useStorageExplorerStateSnapshot()
- const folderPath = getPathAlongOpenedFolders({ openedFolders, selectedBucket }, false)
- const path = [folderPath, item.name].filter(Boolean).join('/')
+interface FileDetailsProps {
+ createdAt: string
+ updatedAt: string
+}
- const { data: previewUrl, isPending: isLoading } = useFetchFileUrlQuery({
- path,
- projectRef: projectRef,
- bucket: selectedBucket,
- })
+const FileDetails = ({ createdAt, updatedAt }: FileDetailsProps) => (
+ <div className="space-y-2">
+ <div>
+ <label className="mb-1 text-xs text-foreground-lighter">Added on</label>
+ <p className="text-sm text-foreground-light">{createdAt}</p>
+ </div>
+ <div>
+ <label className="mb-1 text-xs text-foreground-lighter">Last modified</label>
+ <p className="text-sm text-foreground-light">{updatedAt}</p>
+ </div>
+ </div>
+)
- // if the size is not available, we set it to be greater than the max size
- const size = +(item.metadata?.size ?? PREVIEW_SIZE_LIMIT + 1)
- const mimeType = item.metadata?.mimetype
+interface CurrentFilePreviewProps {
+ file: StorageItem
+ /** Full path within the bucket, which is what the URL endpoints address. */
+ path: string
+ mimeType?: string
+ size: string | null
+ isPublicBucket: boolean
+ isVersionedBucket: boolean
+ /** Sits beside Download. Omitted when replacing a file isn't on offer. */
+ replacementAction?: ReactNode
+ /** Pins the preview to the current version, so a new one busts the cached URL. */
+ currentVersionId?: string
+ hasCurrentVersion: boolean
+ canUpdateFiles: boolean
+ onCopyUrl: (path: string, expiry?: number) => void
+ onDownload: () => void
+ onCustomExpiry: () => void
+ onDelete: () => void
+ onPurge: () => void
+}
- const isSkipped = !!mimeType && !!size && size > PREVIEW_SIZE_LIMIT
+const CurrentFilePreview = ({
+ file,
+ path,
+ mimeType,
+ size,
+ isPublicBucket,
+ isVersionedBucket,
+ replacementAction,
+ currentVersionId,
+ hasCurrentVersion,
+ canUpdateFiles,
+ onCopyUrl,
+ onDownload,
+ onCustomExpiry,
+ onDelete,
+ onPurge,
+}: CurrentFilePreviewProps) => (
+ <div className="border-b border-overlay p-3">
+ <div
+ className="flex items-center justify-center overflow-hidden rounded-md border border-overlay"
+ style={{ height: 'clamp(120px, calc((100vh - 144px) * 0.4), 180px)' }}
+ >
+ <FilePreview
+ path={path}
+ mimeType={mimeType}
+ size={file.metadata?.size}
+ versionId={currentVersionId}
+ />
+ </div>
- if (isLoading) {
- return (
- <div className="flex h-full w-full items-center justify-center text-foreground-lighter">
- <LoaderCircle size={14} className="animate-spin text-foreground-lighter" />
- </div>
- )
- }
- if (isSkipped) {
- return (
- <div className="flex h-full w-full flex-col items-center justify-center">
- <SVG
- src={`${BASE_PATH}/img/file-filled.svg`}
- preProcessor={(code) =>
- code.replace(/svg/, 'svg class="mx-auto w-32 h-32 text-color-inherit opacity-75"')
- }
- />
- <p className="mt-2 w-2/5 text-center text-sm">
- File size is too large to preview in the explorer
+ <div className="mt-2 flex flex-col">
+ <div className="shrink">
+ {/* No `title`: the explorer rows use it as their handle, and a second
+ element carrying the same one makes `getByTitle` ambiguous. */}
+ <p className="truncate text-sm font-medium text-foreground">{file.name}</p>
+ <p className="mt-0.5 flex flex-wrap items-center gap-x-1.5 truncate text-xs text-foreground-light">
+ {mimeType}
+ {size && <>, {size}</>}
+ {isVersionedBucket && hasCurrentVersion && (
+ <Badge variant="success" className="-my-1">
+ Current
+ </Badge>
+ )}
</p>
+ {file.isCorrupted && (
+ <div className="mt-1 flex items-center gap-x-1.5">
+ <AlertCircle size={12} className="shrink-0 text-foreground-light" />
+ <p className="text-xs text-foreground-light">File is corrupted</p>
+ </div>
+ )}
</div>
- )
- }
- if (!mimeType || !previewUrl) {
- return (
- <SVG
- src={`${BASE_PATH}/img/file-filled.svg`}
- preProcessor={(code) =>
- code.replace(/svg/, 'svg class="mx-auto w-32 h-32 text-color-inherit opacity-75"')
- }
- />
- )
- }
- if (mimeType.includes('image')) {
- return (
- <div
- className="flex h-full w-full items-center justify-center bg-contain bg-center bg-no-repeat"
- style={{ backgroundImage: `url('${previewUrl}')` }}
- />
- )
- }
- if (mimeType.includes('audio')) {
- return (
- <div className="flex h-full w-full items-center justify-center px-10">
- <audio key={previewUrl} controls style={{ width: 'inherit' }}>
- <source src={previewUrl} type="audio/mpeg" />
- <p className="text-sm text-foreground-light">
- Your browser does not support the audio element.
- </p>
- </audio>
- </div>
- )
- }
- if (mimeType.includes('video')) {
- return (
- <div className="flex h-full w-full items-center justify-center">
- <video key={previewUrl} controls style={{ maxHeight: '100%' }}>
- <source src={previewUrl} type="video/mp4" />
- <p className="text-sm text-foreground-light">
- Your browser does not support the video tag.
- </p>
- </video>
+ <div className="mt-3 flex shrink-0 items-center gap-x-1">
+ <ButtonTooltip
+ variant="outline"
+ className="px-2"
+ icon={<Download size={14} />}
+ disabled={file.isCorrupted}
+ onClick={onDownload}
+ tooltip={{ content: { side: 'top', text: 'Download current' } }}
+ />
+
+ {replacementAction}
+
+ {isPublicBucket ? (
+ <Button
+ variant="outline"
+ size="tiny"
+ icon={<Copy size={14} />}
+ disabled={file.isCorrupted}
+ onClick={() => onCopyUrl(file.path!)}
+ >
+ Get URL
+ </Button>
+ ) : (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="outline"
+ size="tiny"
+ icon={<Copy size={14} />}
+ iconRight={<ChevronDown size={14} />}
+ disabled={file.isCorrupted}
+ aria-label={`Get URL for ${file.name}`}
+ >
+ Get URL
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.WEEK)}>
+ Expire in 1 week
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.MONTH)}>
+ Expire in 1 month
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.YEAR)}>
+ Expire in 1 year
+ </DropdownMenuItem>
+ <DropdownMenuItem onClick={onCustomExpiry}>Custom expiry</DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )}
+
+ {/* A delete in a versioned bucket is a soft delete/archive, unless specified explicitly */}
+ {canUpdateFiles && isVersionedBucket && (
+ <div className="flex">
+ <Button
+ variant="outline"
+ size="tiny"
+ className="rounded-r-none"
+ icon={<Archive size={14} />}
+ onClick={onDelete}
+ >
+ Archive
+ </Button>
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="outline"
+ size="tiny"
+ className="-ml-px shrink-0 rounded-l-none border-l-transparent px-1.5"
+ icon={<ChevronDown size={14} />}
+ aria-label="More delete options"
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ <DropdownMenuItem
+ className="flex w-full flex-col items-start gap-1.5"
+ onClick={onPurge}
+ >
+ <div className="flex items-center space-x-1 text-foreground">
+ <Trash2 size={14} className="shrink-0 text-destructive" />
+ <p>Delete permanently</p>
+ </div>
+ <p className="block text-foreground-light">
+ Also deletes every version of this file. This cannot be undone.
+ </p>
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ </div>
+ )}
+
+ {canUpdateFiles && !isVersionedBucket && (
+ <ButtonTooltip
+ variant="outline"
+ size="tiny"
+ icon={<Trash2 size={14} />}
+ onClick={onDelete}
+ tooltip={{ content: { side: 'top', text: 'Delete file' } }}
+ >
+ Delete file
+ </ButtonTooltip>
+ )}
</div>
- )
- }
- return (
- <SVG
- src={`${BASE_PATH}/img/file-filled.svg`}
- preProcessor={(code) =>
- code.replace(/svg/, 'svg class="mx-auto w-32 h-32 text-color-inherit opacity-75"')
- }
- />
- )
-}
+ </div>
+ </div>
+)
export const PreviewPane = () => {
const {
+ projectRef,
selectedBucket,
selectedFilePreview: file,
+ openedFolders,
setSelectedItemsToDelete,
+ setItemToPurge,
+ refetchAllOpenedFolders,
+ replaceFile,
setSelectedFileCustomExpiry,
downloadFile,
} = useStorageExplorerStateSnapshot()
@@ -127,146 +255,168 @@ export const PreviewPane = () => {
const { onCopyUrl } = useCopyUrl()
const { can: canUpdateFiles } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')
+ const isStorageVersioningEnabled = useIsStorageVersioningEnabled()
+
+ const [, setShowEditBucketModal] = useQueryState(
+ 'edit',
+ parseAsBoolean.withDefault(false).withOptions({ history: 'push', clearOnDefault: true })
+ )
+
+ const scrollContainerRef = useRef<HTMLDivElement>(null)
+ const [previewedVersion, setPreviewedVersion] = useState<ObjectVersion>()
+
+ const versioningState = getBucketVersioningState(selectedBucket)
+
+ // The version endpoints address an object by full path, not the leaf name in the row.
+ const folderPath = getPathAlongOpenedFolders({ openedFolders, selectedBucket }, false)
+ const filePath = file ? [folderPath, file.name].filter(Boolean).join('/') : undefined
+
+ const { data: lifecycle } = useQuery({
+ ...bucketLifecycleQueryOptions({ projectRef, bucketId: selectedBucket?.id }),
+ enabled: isStorageVersioningEnabled && !!projectRef && !!selectedBucket?.id,
+ })
+ const storedPolicy = fromLifecycleRules(lifecycle)
+ const lifecyclePolicy: LifecyclePolicy = {
+ expiryDays: storedPolicy.versionExpiryDays,
+ maxVersions: storedPolicy.maxNoncurrentVersions,
+ }
+
+ const { data: versions } = useQuery({
+ ...objectVersionsQueryOptions({
+ projectRef,
+ bucketId: selectedBucket?.id,
+ path: filePath,
+ lifecyclePolicy,
+ }),
+ enabled: isStorageVersioningEnabled && !!projectRef && !!selectedBucket?.id && !!filePath,
+ })
+
+ const { mutate: restoreVersion, isPending: isRestoring } = useObjectVersionRestoreMutation({
+ onSuccess: async () => {
+ toast.success('Version restored as the current version')
+ setPreviewedVersion(undefined)
+ await refetchAllOpenedFolders()
+ },
+ })
if (!file) return null
- const width = 450
const size = file.metadata ? formatBytes(file.metadata.size) : null
const mimeType = file.metadata ? file.metadata.mimetype : undefined
const createdAt = file.created_at ? new Date(file.created_at).toLocaleString() : 'Unknown'
const updatedAt = file.updated_at ? new Date(file.updated_at).toLocaleString() : 'Unknown'
+ const currentVersion = versions?.find((version) => version.isCurrent)
+ const isVersionedBucket = isStorageVersioningEnabled && versioningState !== 'disabled'
+ const isComparing = previewedVersion !== undefined && !previewedVersion.isCurrent
+
+ const handleRestore = () => {
+ if (!projectRef || !selectedBucket?.id || !previewedVersion || !filePath) return
+ restoreVersion({
+ projectRef,
+ bucketId: selectedBucket.id,
+ path: filePath,
+ versionId: previewedVersion.versionId,
+ })
+ }
+
+ const onReplaceFile = async () => {
+ const newFile = await pickFile()
+ if (newFile !== undefined) await replaceFile({ file: newFile, item: file })
+ }
+
+ // The compare widget replaces the top of the panel, so scroll up to show it.
+ const handlePreviewVersion = (version: ObjectVersion) => {
+ setPreviewedVersion(version)
+ scrollContainerRef.current?.scrollTo({ top: 0, behavior: 'smooth' })
+ }
+
return (
<div
- className="h-full border-l border-overlay bg-surface-100 p-4 overflow-y-auto"
- style={{ width }}
+ key={file.id ?? file.name}
+ className="flex h-full min-w-[390px] max-w-[600px] flex-col border-l border-overlay bg-surface-100"
+ style={{ width: PANEL_WIDTH }}
>
- {/* Preview Header */}
- <div className="flex w-full justify-end">
+ <div className="flex items-center gap-x-2 border-b border-overlay px-4 py-2.5">
+ <p className="min-w-0 flex-1 truncate text-sm font-medium text-foreground">File Preview</p>
<Button
variant="text"
- className="w-6 h-6 text-foreground-lighter hover:text-foreground"
- icon={<X size={14} />}
- aria-label="Close preview"
+ className="h-7 w-7 shrink-0 p-0"
onClick={clearPreviewedFile}
- />
- </div>
-
- {/* Preview Thumbnail*/}
- <div className="my-4 border border-overlay">
- <div className="flex h-56 w-full items-center 2xl:h-72">
- <PreviewFile item={file} />
- </div>
+ aria-label="Close preview"
+ >
+ <X size={14} />
+ </Button>
</div>
- <div className="w-full space-y-6">
- {/* Preview Information */}
- <div className="space-y-1">
- <h5 className="wrap-break-word text-base text-foreground">{file.name}</h5>
- {file.isCorrupted && (
- <div className="flex items-center space-x-2">
- <AlertCircle size={14} className="text-foreground-light" />
- <p className="text-sm text-foreground-light">
- File is corrupted, please delete and reupload this file again
- </p>
- </div>
- )}
- {mimeType && (
- <p className="text-sm text-foreground-light">
- {mimeType}
- {size && <span> - {size}</span>}
- </p>
- )}
- </div>
+ <div ref={scrollContainerRef} className="min-h-0 flex-1 overflow-y-auto">
+ {isComparing ? (
+ <VersionCompareWidget
+ path={filePath ?? file.name}
+ mimeType={mimeType}
+ selectedVersion={previewedVersion}
+ currentVersion={currentVersion}
+ isRestoring={isRestoring}
+ onRestore={handleRestore}
+ onDismiss={() => setPreviewedVersion(undefined)}
+ />
+ ) : (
+ <CurrentFilePreview
+ file={file}
+ path={filePath ?? file.name}
+ mimeType={mimeType}
+ size={size}
+ isPublicBucket={!!selectedBucket?.public}
+ isVersionedBucket={isVersionedBucket}
+ replacementAction={
+ canUpdateFiles && isStorageVersioningEnabled ? (
+ <ButtonTooltip
+ variant="outline"
+ className="px-2"
+ icon={<Upload size={14} />}
+ onClick={onReplaceFile}
+ tooltip={{
+ content: {
+ side: 'top',
+ text: isVersionedBucket ? 'Upload new version' : 'Replace file',
+ },
+ }}
+ />
+ ) : undefined
+ }
+ currentVersionId={currentVersion?.versionId}
+ hasCurrentVersion={currentVersion !== undefined}
+ canUpdateFiles={canUpdateFiles}
+ onCopyUrl={onCopyUrl}
+ onDownload={() => downloadFile(file)}
+ onCustomExpiry={() => setSelectedFileCustomExpiry(file)}
+ onDelete={() => setSelectedItemsToDelete([file])}
+ onPurge={() => setItemToPurge(file)}
+ />
+ )}
- {/* Preview Metadata */}
- <div className="space-y-2">
- <div>
- <label className="mb-1 text-xs text-foreground-lighter">Added on</label>
- <p className="text-sm text-foreground-light">{createdAt}</p>
- </div>
- <div>
- <label className="mb-1 text-xs text-foreground-lighter">Last modified</label>
- <p className="text-sm text-foreground-light">{updatedAt}</p>
- </div>
- </div>
+ <div className="space-y-3 px-4 pt-3">
+ <FileDetails createdAt={createdAt} updatedAt={updatedAt} />
- {/* Actions */}
- <div className="flex space-x-2 border-b border-overlay pb-4">
- <Button
- icon={<Download />}
- disabled={file.isCorrupted}
- onClick={() => downloadFile(file)}
- >
- Download
- </Button>
- {selectedBucket.public ? (
- <Button
- variant="outline"
- icon={<Copy />}
- onClick={() => onCopyUrl(file.path!)}
- disabled={file.isCorrupted}
- >
- Get URL
- </Button>
- ) : (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="outline"
- icon={<Copy />}
- iconRight={<ChevronDown />}
- disabled={file.isCorrupted}
- >
- Get URL
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent side="bottom" align="center">
- <DropdownMenuItem
- key="expires-one-week"
- onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.WEEK)}
- >
- Expire in 1 week
- </DropdownMenuItem>
- <DropdownMenuItem
- key="expires-one-month"
- onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.MONTH)}
- >
- Expire in 1 month
- </DropdownMenuItem>
- <DropdownMenuItem
- key="expires-one-year"
- onClick={() => onCopyUrl(file.path!, URL_EXPIRY_DURATION.YEAR)}
- >
- Expire in 1 year
- </DropdownMenuItem>
- <DropdownMenuItem
- key="custom-expiry"
- onClick={() => setSelectedFileCustomExpiry(file)}
- >
- Custom expiry
- </DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
+ {isStorageVersioningEnabled && (
+ <PreviewSection title="Versions" count={versions?.length} defaultOpen>
+ <VersionHistory
+ projectRef={projectRef}
+ bucketId={selectedBucket?.id}
+ objectName={file.name}
+ path={filePath ?? file.name}
+ versioningState={versioningState}
+ lifecyclePolicy={lifecyclePolicy}
+ expirationMode={storedPolicy.expirationMode}
+ mimeType={mimeType}
+ previewedVersionId={previewedVersion?.versionId}
+ onPreview={handlePreviewVersion}
+ clearPreview={() => setPreviewedVersion(undefined)}
+ onEditBucket={() => setShowEditBucketModal(true)}
+ />
+ </PreviewSection>
)}
</div>
- <ButtonTooltip
- variant="outline"
- disabled={!canUpdateFiles}
- size="tiny"
- icon={<Trash2 />}
- onClick={() => setSelectedItemsToDelete([file])}
- tooltip={{
- content: {
- side: 'bottom',
- text: !canUpdateFiles
- ? 'You need additional permissions to delete this file'
- : undefined,
- },
- }}
- >
- Delete file
- </ButtonTooltip>
</div>
</div>
)
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx
new file mode 100644
index 00000000000..6af9e1408df
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewSection.tsx
@@ -0,0 +1,43 @@
+import { ChevronRight } from 'lucide-react'
+import { useState, type ReactNode } from 'react'
+import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger } from 'ui'
+
+interface PreviewSectionProps {
+ title: string
+ count?: number
+ defaultOpen?: boolean
+ children: ReactNode
+}
+
+export const PreviewSection = ({
+ title,
+ count,
+ defaultOpen = false,
+ children,
+}: PreviewSectionProps) => {
+ const [isOpen, setIsOpen] = useState(defaultOpen)
+
+ return (
+ <Collapsible open={isOpen} onOpenChange={setIsOpen}>
+ <CollapsibleTrigger asChild>
+ <button
+ type="button"
+ tabIndex={0}
+ className="flex w-full items-center justify-between py-3 text-left text-sm font-medium text-foreground transition-colors hover:text-foreground-light"
+ >
+ <span className="flex items-center gap-x-2">
+ {title}
+ {count !== undefined && (
+ <span className="text-xs font-normal text-foreground-lighter">{count}</span>
+ )}
+ </span>
+ <ChevronRight
+ size={14}
+ className={cn('text-foreground-lighter transition-transform', isOpen && 'rotate-90')}
+ />
+ </button>
+ </CollapsibleTrigger>
+ <CollapsibleContent className="pb-4">{children}</CollapsibleContent>
+ </Collapsible>
+ )
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.test.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.test.ts
index 71876d4dfb2..4957abe6c66 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.test.ts
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.test.ts
@@ -10,9 +10,11 @@ import type { StorageItem } from '@/components/interfaces/Storage/Storage.types'
import {
copyStorageExplorerUrl,
copyStoragePath,
+ describeUploadFailure,
getPathAlongFoldersToIndex,
getPathAlongOpenedFolders,
getStorageExplorerUrlForItem,
+ getStorageItemPath,
getStoragePathForItem,
parseStoragePath,
sanitizeNameForDuplicateInColumn,
@@ -452,3 +454,57 @@ describe('clipboard helpers', () => {
expect(toast.success).toHaveBeenCalledWith('Copied URL for "photo.png"')
})
})
+
+describe('getStorageItemPath', () => {
+ const openedFolders = [makeFolder('images'), makeFolder('2024'), makeFolder('january')]
+
+ it('returns the bare name for an item at the bucket root', () => {
+ expect(getStorageItemPath({ openedFolders }, { name: 'avatar.png', columnIndex: 0 })).toBe(
+ 'avatar.png'
+ )
+ })
+
+ it('prefixes the folders opened above the item', () => {
+ expect(getStorageItemPath({ openedFolders }, { name: 'avatar.png', columnIndex: 2 })).toBe(
+ 'images/2024/avatar.png'
+ )
+ })
+
+ it('ignores folders opened below the item', () => {
+ // The user drilled into january, but the item sits in the 2024 column.
+ expect(getStorageItemPath({ openedFolders }, { name: 'notes.txt', columnIndex: 1 })).toBe(
+ 'images/notes.txt'
+ )
+ })
+})
+
+describe('describeUploadFailure', () => {
+ it('names the allowed types when the bucket rejects the mime type', () => {
+ expect(
+ describeUploadFailure({
+ status: 415,
+ fallback: 'tus: unexpected response',
+ allowedMimeTypes: ['image/png', 'image/jpeg'],
+ })
+ ).toBe(
+ 'that file type is not allowed in this bucket. Allowed MIME types: image/png, image/jpeg.'
+ )
+ })
+
+ it('omits the list when the bucket allows everything', () => {
+ expect(describeUploadFailure({ status: 415, fallback: 'tus: unexpected response' })).toBe(
+ 'that file type is not allowed in this bucket.'
+ )
+ })
+
+ it('explains a size rejection', () => {
+ expect(describeUploadFailure({ status: 413, fallback: 'tus: unexpected response' })).toBe(
+ 'the file exceeds the bucket file size limit.'
+ )
+ })
+
+ it('falls back to the raw message for anything else', () => {
+ expect(describeUploadFailure({ status: 500, fallback: 'network down' })).toBe('network down')
+ expect(describeUploadFailure({ fallback: 'network down' })).toBe('network down')
+ })
+})
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
index 92db153f72c..f8b58f4925a 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils.tsx
@@ -38,6 +38,15 @@ export function getPathAlongOpenedFolders(
* Returns the path to the folder at the given index in the openedFolders array,
* joining all folders from the root up to (but not including) the given index.
*/
+/** The object's full path within the bucket; a row only knows its leaf name and column. */
+export function getStorageItemPath(
+ state: Pick<StorageExplorerState, 'openedFolders'>,
+ item: { name: string; columnIndex: number }
+): string {
+ const folderPath = getPathAlongFoldersToIndex(state, item.columnIndex)
+ return folderPath.length > 0 ? `${folderPath}/${item.name}` : item.name
+}
+
export function getPathAlongFoldersToIndex(
state: Pick<StorageExplorerState, 'openedFolders'>,
index: number
@@ -316,3 +325,26 @@ const readEntriesPromise = async (directoryReader: FileSystemDirectoryReader) =>
console.error('readEntriesPromise error:', err)
}
}
+
+/**
+ * Storage rejects a write that breaks the bucket's own rules with a bare status and no
+ * usable message, so turn the ones a replace can hit into something actionable.
+ */
+export const describeUploadFailure = ({
+ status,
+ fallback,
+ allowedMimeTypes,
+}: {
+ status?: number
+ fallback: string
+ allowedMimeTypes?: string[] | null
+}) => {
+ if (status === 415) {
+ const allowed = allowedMimeTypes?.length
+ ? ` Allowed MIME types: ${allowedMimeTypes.join(', ')}.`
+ : ''
+ return `that file type is not allowed in this bucket.${allowed}`
+ }
+ if (status === 413) return 'the file exceeds the bucket file size limit.'
+ return fallback
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorerContent.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorerContent.tsx
index 10b97962418..3a6218a834b 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorerContent.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorerContent.tsx
@@ -3,6 +3,7 @@ import { useCallback } from 'react'
import { STORAGE_ROW_TYPES } from '../Storage.constants'
import { ConfirmDeleteModal } from './ConfirmDeleteModal'
+import { ConfirmPurgeModal } from './ConfirmPurgeModal'
import { CustomExpiryModal } from './CustomExpiryModal'
import { FileExplorer } from './FileExplorer'
import { FileExplorerHeader } from './FileExplorerHeader'
@@ -117,6 +118,8 @@ export const StorageExplorerContent = ({
<ConfirmDeleteModal />
+ <ConfirmPurgeModal />
+
<MoveItemsModal
visible={selectedItemsToMove.length > 0}
projectRef={projectRef}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx
new file mode 100644
index 00000000000..3ee9e54ad1c
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionCompareWidget.tsx
@@ -0,0 +1,87 @@
+import dayjs from 'dayjs'
+import { ArrowRight, RotateCcw, X } from 'lucide-react'
+import { Button } from 'ui'
+
+import { FilePreview } from './FilePreview'
+import type { ObjectVersion } from '@/data/storage/versioning/object-versions-query'
+import { formatBytes } from '@/lib/helpers'
+
+interface VersionCompareWidgetProps {
+ path: string
+ mimeType?: string
+ selectedVersion: ObjectVersion
+ currentVersion?: ObjectVersion
+ isRestoring: boolean
+ onRestore: () => void
+ onDismiss: () => void
+}
+
+export const VersionCompareWidget = ({
+ path,
+ mimeType,
+ selectedVersion,
+ currentVersion,
+ isRestoring,
+ onRestore,
+ onDismiss,
+}: VersionCompareWidgetProps) => (
+ <div className="space-y-3 border-b border-overlay bg-brand-200/30 p-3">
+ <div className="flex items-center gap-x-1.5">
+ <RotateCcw size={13} className="shrink-0 text-brand" />
+ <p className="truncate text-sm font-medium text-foreground">
+ Restore v.{selectedVersion.versionId}?
+ </p>
+ <button
+ type="button"
+ tabIndex={0}
+ className="ml-auto shrink-0 text-foreground-lighter transition-colors hover:text-foreground"
+ onClick={onDismiss}
+ aria-label="Cancel comparison"
+ >
+ <X size={13} />
+ </button>
+ </div>
+
+ <div className="flex items-center gap-x-2">
+ <div className="flex-1 space-y-1.5">
+ <div className="flex h-24 items-center justify-center overflow-hidden rounded-md border border-brand-400 bg-surface-200">
+ <FilePreview
+ path={path}
+ // This half shows the older bytes, which an overwrite may have retyped.
+ mimeType={selectedVersion.mimeType ?? mimeType}
+ size={selectedVersion.size}
+ versionId={selectedVersion.versionId}
+ />
+ </div>
+ <p className="truncate text-center font-mono text-xs text-brand">
+ {dayjs(selectedVersion.createdAt).format('MMM D')} · {formatBytes(selectedVersion.size)}
+ </p>
+ </div>
+ <ArrowRight size={14} className="shrink-0 text-foreground-lighter" />
+ <div className="flex-1 space-y-1.5">
+ <div className="flex h-24 items-center justify-center overflow-hidden rounded-md border border-overlay bg-surface-200">
+ {/* No `versionId`, so the endpoint resolves the current version. */}
+ <FilePreview path={path} mimeType={mimeType} size={currentVersion?.size} />
+ </div>
+ <p className="truncate text-center font-mono text-xs text-foreground-lighter">
+ Current{currentVersion && <> · {formatBytes(currentVersion.size)}</>}
+ </p>
+ </div>
+ </div>
+
+ <Button
+ variant="primary"
+ block
+ icon={<RotateCcw size={14} />}
+ loading={isRestoring}
+ onClick={onRestore}
+ >
+ Restore version as current
+ </Button>
+
+ <p className="text-xs leading-relaxed text-foreground-lighter">
+ {currentVersion && <strong>{currentVersion.versionId} </strong>}becomes a noncurrent version —
+ nothing is deleted.
+ </p>
+ </div>
+)
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.test.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.test.tsx
new file mode 100644
index 00000000000..46cc3a0b003
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.test.tsx
@@ -0,0 +1,93 @@
+import { screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { describe, expect, it, vi } from 'vitest'
+
+import { VersionHistory } from '@/components/interfaces/Storage/StorageExplorer/VersionHistory'
+import { customRender as render } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
+
+const refetchAllOpenedFolders = vi.fn().mockResolvedValue(undefined)
+
+vi.mock('@/state/storage-explorer', () => ({
+ useStorageExplorerStateSnapshot: () => ({
+ refetchAllOpenedFolders,
+ // The thumbnails resolve an image version's own bytes through the bucket.
+ projectRef: 'abcdef',
+ selectedBucket: { id: 'my-bucket', name: 'my-bucket', public: true },
+ }),
+}))
+// The versions query is platform-only, and `IS_PLATFORM` is false under vitest.
+vi.mock('@/lib/constants', async (importOriginal) => {
+ const actual = await importOriginal<Record<string, unknown>>()
+ return { ...actual, IS_PLATFORM: true }
+})
+
+const VERSIONS = [
+ {
+ id: 'obj-1',
+ name: 'photo.png',
+ version: 'v-current',
+ created_at: '2024-01-02T00:00:00Z',
+ updated_at: '2024-01-02T00:00:00Z',
+ last_accessed_at: null,
+ archived_at: null,
+ is_delete_marker: false,
+ metadata: { size: 200, mimetype: 'image/png' },
+ },
+ {
+ id: 'obj-1',
+ name: 'photo.png',
+ version: 'v-older',
+ created_at: '2024-01-01T00:00:00Z',
+ updated_at: '2024-01-01T00:00:00Z',
+ last_accessed_at: null,
+ // Anything with an `archived_at` is a noncurrent version, which is what can be restored.
+ archived_at: '2024-01-02T00:00:00Z',
+ is_delete_marker: false,
+ metadata: { size: 100, mimetype: 'image/png' },
+ },
+]
+
+const renderHistory = () =>
+ render(
+ <VersionHistory
+ projectRef="abcdef"
+ bucketId="my-bucket"
+ objectName="photo.png"
+ path="images/photo.png"
+ versioningState="enabled"
+ lifecyclePolicy={{ expiryDays: null, maxVersions: null }}
+ expirationMode="and"
+ clearPreview={vi.fn()}
+ onEditBucket={vi.fn()}
+ />
+ )
+
+describe('VersionHistory', () => {
+ it('refreshes the listing after a restore, so the row stops showing the old size', async () => {
+ addAPIMock({
+ method: 'post',
+ path: '/platform/storage/:ref/buckets/:id/objects/list',
+ response: () => Response.json(VERSIONS),
+ })
+ addAPIMock({
+ method: 'post',
+ path: '/platform/storage/:ref/buckets/:id/objects/move',
+ response: () => Response.json({ message: 'ok' }),
+ })
+ addAPIMock({
+ method: 'post',
+ path: '/platform/storage/:ref/buckets/:id/objects/public-url',
+ response: () => Response.json({ publicUrl: 'https://example.com/photo.png' }),
+ })
+
+ renderHistory()
+
+ await userEvent.click(await screen.findByRole('button', { name: /Actions for version/ }))
+ await userEvent.click(await screen.findByText('Restore as current'))
+
+ // A restore changes the object's size, type and modified date, and the row
+ // showing them lives in the explorer's state rather than a React Query cache.
+ await waitFor(() => expect(refetchAllOpenedFolders).toHaveBeenCalled())
+ })
+})
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx
new file mode 100644
index 00000000000..72b5ec59673
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistory.tsx
@@ -0,0 +1,383 @@
+import { useQuery } from '@tanstack/react-query'
+import dayjs from 'dayjs'
+import { MoreVertical, RotateCcw, Trash2 } from 'lucide-react'
+import { useMemo, useState } from 'react'
+import { toast } from 'sonner'
+import {
+ Badge,
+ Button,
+ cn,
+ DropdownMenu,
+ DropdownMenuContent,
+ DropdownMenuItem,
+ DropdownMenuSeparator,
+ DropdownMenuTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
+import { Admonition } from 'ui-patterns/Admonition'
+import { ConfirmationModal } from 'ui-patterns/Dialogs/ConfirmationModal'
+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
+
+import type { BucketVersioningState, ExpirationMode } from '../StorageVersioning.constants'
+import { computeVersionFate, type VersionFate } from './VersionHistory.utils'
+import { VersionHistoryPolicyRow } from './VersionHistoryPolicyRow'
+import { VersionThumbnail } from './VersionThumbnail'
+import { AlertError } from '@/components/ui/AlertError'
+import { useObjectVersionDeleteMutation } from '@/data/storage/versioning/object-version-delete-mutation'
+import { useObjectVersionRestoreMutation } from '@/data/storage/versioning/object-version-restore-mutation'
+import {
+ objectVersionsQueryOptions,
+ type LifecyclePolicy,
+ type ObjectVersion,
+} from '@/data/storage/versioning/object-versions-query'
+import { formatBytes } from '@/lib/helpers'
+import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
+
+/** Version IDs are long opaque strings; show enough to tell two rows apart. */
+export const shortVersion = (versionId: string) => `${versionId.slice(0, 6)}…${versionId.slice(-2)}`
+
+const VersionFateLabel = ({ fate }: { fate: VersionFate }) => {
+ switch (fate.type) {
+ case 'retained':
+ return null
+ case 'expires-in':
+ return (
+ <span className="shrink-0 text-xs text-foreground-lighter">
+ Expires in <span className="text-foreground-light">{fate.days}d</span>
+ </span>
+ )
+ case 'expires-on-next-upload':
+ return (
+ <div className="flex flex-col items-end">
+ <span className="shrink-0 text-xs text-warning-600">Expires on next upload</span>
+ <span className="shrink-0 text-xs text-warning-600">or in {fate.daysRemaining}d</span>
+ </div>
+ )
+ case 'expiry-due':
+ return (
+ <Tooltip>
+ <TooltipTrigger className="shrink-0 text-xs text-destructive">
+ Queued to expire
+ </TooltipTrigger>
+ <TooltipContent side="bottom" className="max-w-64">
+ Matches the lifecycle policy and will be permanently deleted. This action can take up to
+ 24 hours.
+ </TooltipContent>
+ </Tooltip>
+ )
+ }
+}
+
+const VersionRowBadge = ({
+ isCurrent,
+ isComparing,
+ fate,
+}: {
+ isCurrent: boolean
+ isComparing: boolean
+ fate?: VersionFate
+}) => {
+ if (isCurrent) return <Badge variant="success">Current</Badge>
+ if (isComparing) return <Badge variant="success">Comparing</Badge>
+ if (fate) return <VersionFateLabel fate={fate} />
+ return null
+}
+
+interface VersionActionsMenuProps {
+ version: ObjectVersion
+ isRestoring: boolean
+ onRestore: () => void
+ onDelete: () => void
+}
+
+const VersionActionsMenu = ({
+ version,
+ isRestoring,
+ onRestore,
+ onDelete,
+}: VersionActionsMenuProps) => {
+ const label = shortVersion(version.versionId)
+ const isDeleteMarker = version.action === 'delete marker'
+
+ if (version.isCurrent) return null
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="text"
+ size="tiny"
+ className="px-1.5"
+ icon={<MoreVertical size={14} />}
+ aria-label={isDeleteMarker ? 'Actions for delete marker' : `Actions for version ${label}`}
+ />
+ </DropdownMenuTrigger>
+ <DropdownMenuContent align="end">
+ {/* A marker holds no content, so there is nothing to restore to. */}
+ {!isDeleteMarker && (
+ <>
+ <DropdownMenuItem className="gap-x-2" disabled={isRestoring} onClick={onRestore}>
+ <RotateCcw size={14} />
+ Restore as current
+ </DropdownMenuItem>
+ <DropdownMenuSeparator />
+ </>
+ )}
+ <DropdownMenuItem
+ onClick={onDelete}
+ className="gap-x-2 text-destructive focus:text-destructive"
+ >
+ <Trash2 size={14} />
+ {isDeleteMarker ? 'Delete marker permanently' : 'Delete permanently'}
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ )
+}
+
+interface VersionHistoryProps {
+ projectRef?: string
+ bucketId?: string
+ objectName: string
+ /** Full path within the bucket, which is what the version endpoints address. */
+ path: string
+ versioningState: BucketVersioningState
+ lifecyclePolicy: LifecyclePolicy
+ expirationMode: ExpirationMode
+ mimeType?: string
+ previewedVersionId?: string
+ onPreview?: (version: ObjectVersion) => void
+ clearPreview: () => void
+ onEditBucket: () => void
+}
+
+export const VersionHistory = ({
+ projectRef,
+ bucketId,
+ objectName,
+ path,
+ versioningState,
+ lifecyclePolicy,
+ expirationMode,
+ mimeType,
+ previewedVersionId,
+ onPreview,
+ clearPreview,
+ onEditBucket,
+}: VersionHistoryProps) => {
+ const {
+ data: versions,
+ isPending,
+ isError,
+ error,
+ isSuccess,
+ } = useQuery(objectVersionsQueryOptions({ projectRef, bucketId, path, lifecyclePolicy }))
+
+ const { refetchAllOpenedFolders } = useStorageExplorerStateSnapshot()
+
+ const [versionToDelete, setVersionToDelete] = useState<ObjectVersion>()
+
+ const { mutate: restoreVersion, isPending: isRestoring } = useObjectVersionRestoreMutation({
+ onSuccess: async () => {
+ toast.success('Version restored as the current version')
+ // The restored version is the current one now, so the widget would be offering
+ // to restore the file to what it already is.
+ clearPreview()
+ // The object's size, type and modified date all change with it, and the row
+ // showing them is the explorer's own state.
+ await refetchAllOpenedFolders()
+ },
+ })
+
+ const { mutate: deleteVersion, isPending: isDeleting } = useObjectVersionDeleteMutation({
+ onSuccess: () => {
+ toast.success('Version permanently deleted')
+ // Nothing left to compare against if the widget was showing this one.
+ if (previewedVersionId === versionToDelete?.versionId) clearPreview()
+ setVersionToDelete(undefined)
+ },
+ })
+
+ const { expiryDays, maxVersions: cap } = lifecyclePolicy
+ const hasPolicy = (cap !== null && cap > 0) || (expiryDays !== null && expiryDays > 0)
+
+ // `versions` arrives newest-first, so the oldest sits at `chronoIndex` 0.
+ const fateByVersionId = useMemo(() => {
+ const noncurrentVersions = (versions ?? []).filter((version) => !version.isCurrent)
+ const noncurrentCount = noncurrentVersions.length
+
+ return new Map(
+ noncurrentVersions.map((version, index) => [
+ version.versionId,
+ computeVersionFate({
+ daysOld: dayjs().diff(dayjs(version.createdAt), 'day'),
+ chronoIndex: noncurrentCount - 1 - index,
+ noncurrentCount,
+ expiryDays,
+ cap,
+ mode: expirationMode,
+ }),
+ ])
+ )
+ }, [versions, expiryDays, cap, expirationMode])
+
+ const handleRestore = (version: ObjectVersion) => {
+ if (!projectRef || !bucketId) return
+ restoreVersion({ projectRef, bucketId, path, versionId: version.versionId })
+ }
+
+ if (isPending) return <GenericSkeletonLoader />
+ if (isError) return <AlertError error={error} subject="Failed to retrieve versions" />
+
+ return (
+ <div className="space-y-4">
+ {hasPolicy && (
+ <VersionHistoryPolicyRow
+ cap={cap}
+ expiryDays={expiryDays}
+ mode={expirationMode}
+ onEditBucket={onEditBucket}
+ />
+ )}
+
+ {versioningState === 'suspended' && (
+ <Admonition
+ type="default"
+ title="Versioning is suspended on this bucket"
+ description="New noncurrent versions are no longer created. Everything already retained here stays as it is until you delete it or a lifecycle policy expires it."
+ />
+ )}
+
+ {isSuccess && versions.length === 0 && versioningState === 'disabled' && (
+ <p className="text-sm text-foreground-light">
+ Versioning is off for this bucket, so previous versions aren&apos;t retained. Turn it on
+ in the bucket settings to start keeping them.
+ </p>
+ )}
+
+ {isSuccess && versions.length === 0 && versioningState !== 'disabled' && (
+ <p className="text-sm text-foreground-light">
+ No previous versions yet. Overwriting this file will retain a recoverable copy here.
+ </p>
+ )}
+
+ {isSuccess && versions.length > 0 && (
+ <ol className="flex flex-col gap-y-0.5">
+ {versions.map((version) => {
+ const isComparing = previewedVersionId === version.versionId
+ const isDeleteMarker = version.action === 'delete marker'
+
+ const rowContent = (
+ <>
+ <VersionThumbnail
+ // Falls back to the file's own type only for the version that is it.
+ mimeType={version.mimeType ?? (version.isCurrent ? mimeType : undefined)}
+ isCurrent={version.isCurrent}
+ isDeleteMarker={isDeleteMarker}
+ path={path}
+ versionId={version.versionId}
+ byteSize={version.size}
+ />
+ <span className="min-w-0 flex-1">
+ <span
+ className={cn(
+ 'block truncate text-sm text-foreground',
+ !isDeleteMarker && onPreview && 'group-hover:underline'
+ )}
+ >
+ {dayjs(version.createdAt).format('MMM D, HH:mm')}
+ </span>
+ <span className="block truncate font-mono text-xs text-foreground-lighter">
+ {isDeleteMarker ? 'Delete marker' : formatBytes(version.size)}
+ </span>
+ </span>
+ </>
+ )
+
+ return (
+ <li
+ key={version.versionId}
+ className={cn(
+ 'group -mx-2 flex items-center gap-x-2.5 rounded-md border border-transparent px-2 py-1.5',
+ isComparing && 'border-brand-500 bg-brand-200',
+ !isComparing && isDeleteMarker && 'opacity-70',
+ !isComparing && !isDeleteMarker && 'hover:bg-surface-200'
+ )}
+ >
+ {/* A marker has no content to preview */}
+ {isDeleteMarker ? (
+ <span className="flex min-w-0 flex-1 items-center gap-x-2.5">{rowContent}</span>
+ ) : (
+ <button
+ type="button"
+ tabIndex={0}
+ className="flex min-w-0 flex-1 items-center gap-x-2.5 text-left"
+ onClick={() => (version.isCurrent ? clearPreview() : onPreview?.(version))}
+ >
+ {rowContent}
+ </button>
+ )}
+
+ <VersionRowBadge
+ isCurrent={version.isCurrent}
+ isComparing={isComparing}
+ fate={fateByVersionId.get(version.versionId)}
+ />
+
+ <VersionActionsMenu
+ version={version}
+ isRestoring={isRestoring}
+ onRestore={() => handleRestore(version)}
+ onDelete={() => setVersionToDelete(version)}
+ />
+ </li>
+ )
+ })}
+ </ol>
+ )}
+
+ <ConfirmationModal
+ variant="destructive"
+ visible={versionToDelete !== undefined}
+ title={
+ versionToDelete?.action === 'delete marker'
+ ? 'Permanently delete this delete marker?'
+ : 'Permanently delete this version?'
+ }
+ confirmLabel={
+ versionToDelete?.action === 'delete marker' ? 'Delete marker' : 'Delete version'
+ }
+ confirmLabelLoading="Deleting..."
+ loading={isDeleting}
+ onCancel={() => setVersionToDelete(undefined)}
+ onConfirm={() => {
+ if (!projectRef || !bucketId || !versionToDelete) return
+ deleteVersion({
+ projectRef,
+ bucketId,
+ path,
+ versionId: versionToDelete.versionId,
+ })
+ }}
+ >
+ {versionToDelete?.action === 'delete marker' ? (
+ <p className="text-sm text-foreground-light">
+ The delete marker in {objectName}&apos;s history will be removed permanently. Other
+ versions of this file are not affected. This cannot be undone.
+ </p>
+ ) : (
+ <p className="text-sm text-foreground-light">
+ Version{' '}
+ <span className="font-mono text-foreground">
+ {versionToDelete ? shortVersion(versionToDelete.versionId) : ''}
+ </span>{' '}
+ of {objectName} will be deleted permanently. The current version is not affected. This
+ cannot be undone.
+ </p>
+ )}
+ </ConfirmationModal>
+ </div>
+ )
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx
new file mode 100644
index 00000000000..c9ad9b0ca23
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionHistoryPolicyRow.tsx
@@ -0,0 +1,108 @@
+import { Info } from 'lucide-react'
+import type { ReactNode } from 'react'
+import { Button, cn, HoverCard, HoverCardContent, HoverCardTrigger } from 'ui'
+
+import { BroomSparklesIcon } from '../BroomSparklesIcon'
+import type { ExpirationMode } from '../StorageVersioning.constants'
+
+const POLICY_CHIP_CLASSNAME = 'rounded-sm border px-1.5 py-0.5 font-mono text-xs'
+
+const PolicyChip = ({ children }: { children: ReactNode }) => (
+ <span className={cn(POLICY_CHIP_CLASSNAME, 'border-strong bg-surface-300 text-foreground-light')}>
+ {children}
+ </span>
+)
+
+const PolicyOperatorChip = ({ mode }: { mode: ExpirationMode }) => (
+ <span
+ className={cn(
+ POLICY_CHIP_CLASSNAME,
+ 'border-strong border-dashed uppercase tracking-wide text-foreground-lighter',
+ mode === 'and' && 'bg-surface-300'
+ )}
+ >
+ {mode === 'and' ? 'Both' : 'Either'}
+ </span>
+)
+
+interface PolicyRuleProps {
+ cap: number | null
+ expiryDays: number | null
+ mode: ExpirationMode
+}
+
+const PolicyFullRule = ({ cap, expiryDays, mode }: PolicyRuleProps) => {
+ const hasCap = cap !== null && cap > 0
+
+ if (!hasCap) {
+ return <>A noncurrent version is permanently deleted once it is older than {expiryDays} days.</>
+ }
+
+ if (mode === 'and') {
+ return (
+ <>
+ A noncurrent version is permanently deleted only once it is <em>both</em> older than{' '}
+ {expiryDays} days and beyond the {cap} newest noncurrent versions.
+ </>
+ )
+ }
+
+ return (
+ <>
+ A noncurrent version is permanently deleted as soon as it is <em>either</em> older than{' '}
+ {expiryDays} days <em>or</em> beyond the {cap} newest noncurrent versions.
+ </>
+ )
+}
+
+interface VersionHistoryPolicyRowProps extends PolicyRuleProps {
+ onEditBucket: () => void
+}
+
+export const VersionHistoryPolicyRow = ({
+ cap,
+ expiryDays,
+ mode,
+ onEditBucket,
+}: VersionHistoryPolicyRowProps) => {
+ const hasCap = cap !== null && cap > 0
+ const hasExpiryDays = expiryDays !== null && expiryDays > 0
+ const hasBoth = hasCap && hasExpiryDays
+
+ return (
+ <HoverCard openDelay={100}>
+ <HoverCardTrigger asChild>
+ <button
+ type="button"
+ tabIndex={0}
+ onClick={onEditBucket}
+ className="flex items-center gap-x-2 text-left"
+ aria-label="Lifecycle policy details"
+ >
+ <BroomSparklesIcon size={16} className="mr-1 shrink-0 text-foreground-lighter" />
+ <span className="flex items-center gap-x-1">
+ {hasExpiryDays && <PolicyChip>{expiryDays}d</PolicyChip>}
+ {hasBoth && <PolicyOperatorChip mode={mode} />}
+ {hasCap && <PolicyChip>{cap} noncurrent v. retained</PolicyChip>}
+ </span>
+ {hasExpiryDays && !hasCap && (
+ <span className="font-mono text-xs text-foreground-lighter">— no retention cap</span>
+ )}
+ <Info size={13} className="text-foreground-lighter" />
+ </button>
+ </HoverCardTrigger>
+ <HoverCardContent side="top" className="w-72 space-y-1.5 text-xs">
+ <div className="flex items-center gap-x-1">
+ <BroomSparklesIcon size={16} className="mr-1 shrink-0" />
+ <p className="font-medium text-foreground">Lifecycle policy</p>
+ </div>
+ <p className="text-foreground-light">
+ <PolicyFullRule cap={cap} expiryDays={expiryDays} mode={mode} />
+ </p>
+ <Button variant="default" onClick={onEditBucket}>
+ View bucket settings
+ </Button>
+ </HoverCardContent>
+ </HoverCard>
+ )
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/VersionThumbnail.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionThumbnail.tsx
new file mode 100644
index 00000000000..b4d4c599b47
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/VersionThumbnail.tsx
@@ -0,0 +1,100 @@
+import { Archive, File, Film, Image as ImageIcon, Music, RotateCcw } from 'lucide-react'
+import { cn } from 'ui'
+
+import { useFetchFileUrlQuery } from './useFetchFileUrlQuery'
+import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'
+
+// The box is 28px, so the whole object is downloaded to draw almost nothing.
+const THUMBNAIL_SIZE_LIMIT = 5 * 1024 * 1024 // 5MB
+
+const MimeTypeIcon = ({ mimeType, size }: { mimeType?: string; size: number }) => {
+ if (mimeType?.includes('image')) {
+ return <ImageIcon size={size} className="text-foreground-lighter" />
+ }
+ if (mimeType?.includes('audio')) {
+ return <Music size={size} className="text-foreground-lighter" />
+ }
+ if (mimeType?.includes('video')) {
+ return <Film size={size} className="text-foreground-lighter" />
+ }
+ return <File size={size} className="text-foreground-lighter" />
+}
+
+/** Falls back to the generic icon while the URL is in flight or if it fails. */
+const ThumbnailImage = ({
+ path,
+ versionId,
+ mimeType,
+ size,
+}: {
+ path: string
+ versionId?: string
+ mimeType?: string
+ size: number
+}) => {
+ const { projectRef, selectedBucket } = useStorageExplorerStateSnapshot()
+
+ const { data: url } = useFetchFileUrlQuery(
+ { path, projectRef, bucket: selectedBucket, versionId },
+ { enabled: !!projectRef && !!selectedBucket }
+ )
+
+ if (!url) return <MimeTypeIcon mimeType={mimeType} size={size} />
+
+ return (
+ <span
+ role="presentation"
+ className="h-full w-full rounded-sm bg-cover bg-center bg-no-repeat"
+ style={{ backgroundImage: `url('${url}')` }}
+ />
+ )
+}
+
+interface VersionThumbnailProps {
+ mimeType?: string
+ isCurrent: boolean
+ isDeleteMarker?: boolean
+ size?: number
+ /** Full path within the bucket. Given one, an image renders its own bytes. */
+ path?: string
+ /** Omit to render the object's current version. */
+ versionId?: string
+ /** Bytes, used to skip the fetch for a file too large to thumbnail. */
+ byteSize?: number
+}
+
+export const VersionThumbnail = ({
+ mimeType,
+ isCurrent,
+ isDeleteMarker = false,
+ size = 14,
+ path,
+ versionId,
+ byteSize,
+}: VersionThumbnailProps) => {
+ const isImage = !!mimeType?.includes('image')
+ const canShowImage =
+ isImage && !isDeleteMarker && !!path && (byteSize ?? Infinity) <= THUMBNAIL_SIZE_LIMIT
+
+ return (
+ <span
+ className={cn(
+ 'flex h-7 w-7 shrink-0 items-center justify-center overflow-hidden rounded-md border',
+ isCurrent && 'border-brand-400 bg-surface-200',
+ !isCurrent && isDeleteMarker && 'border-strong border-dashed bg-surface-100',
+ !isCurrent && !isDeleteMarker && 'border-overlay bg-surface-100'
+ )}
+ >
+ {canShowImage && (
+ <ThumbnailImage path={path} versionId={versionId} mimeType={mimeType} size={size} />
+ )}
+ {!canShowImage && isCurrent && <RotateCcw size={size} className="text-brand" />}
+ {!canShowImage && !isCurrent && isDeleteMarker && (
+ <Archive size={size} className="text-foreground-muted" />
+ )}
+ {!canShowImage && !isCurrent && !isDeleteMarker && (
+ <MimeTypeIcon mimeType={mimeType} size={size} />
+ )}
+ </span>
+ )
+}
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.test.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.test.ts
new file mode 100644
index 00000000000..183842fc52f
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.test.ts
@@ -0,0 +1,79 @@
+import { describe, expect, it, vi } from 'vitest'
+
+import { pickFile } from './pickFile'
+
+/** Captures the input `pickFile` creates, and whether `click()` happened synchronously. */
+const interceptInput = () => {
+ const created = { input: undefined as HTMLInputElement | undefined, clickedSync: false }
+ const realCreateElement = document.createElement.bind(document)
+
+ vi.spyOn(document, 'createElement').mockImplementation((tagName: string) => {
+ const element = realCreateElement(tagName)
+ if (tagName === 'input') {
+ created.input = element as HTMLInputElement
+ element.click = () => {
+ created.clickedSync = true
+ }
+ }
+ return element
+ })
+
+ return created
+}
+
+const setFiles = (input: HTMLInputElement, files: File[]) => {
+ Object.defineProperty(input, 'files', { value: files, configurable: true })
+}
+
+describe('pickFile', () => {
+ it('opens the picker synchronously, so the user gesture is not lost', () => {
+ const created = interceptInput()
+
+ void pickFile()
+
+ expect(created.clickedSync).toBe(true)
+ vi.restoreAllMocks()
+ })
+
+ it('resolves with the chosen file', async () => {
+ const created = interceptInput()
+ const pending = pickFile()
+ const file = new File(['hello'], 'avatar.png', { type: 'image/png' })
+
+ setFiles(created.input!, [file])
+ created.input!.dispatchEvent(new Event('change'))
+
+ await expect(pending).resolves.toBe(file)
+ vi.restoreAllMocks()
+ })
+
+ it('resolves undefined when the picker is dismissed', async () => {
+ const created = interceptInput()
+ const pending = pickFile()
+
+ created.input!.dispatchEvent(new Event('cancel'))
+
+ await expect(pending).resolves.toBeUndefined()
+ vi.restoreAllMocks()
+ })
+
+ it('resolves undefined when the picker closes with no selection', async () => {
+ const created = interceptInput()
+ const pending = pickFile()
+
+ setFiles(created.input!, [])
+ created.input!.dispatchEvent(new Event('change'))
+
+ await expect(pending).resolves.toBeUndefined()
+ vi.restoreAllMocks()
+ })
+
+ it('passes an accept filter through to the input', () => {
+ const created = interceptInput()
+
+ void pickFile({ accept: 'image/*' })
+
+ expect(created.input!.accept).toBe('image/*')
+ vi.restoreAllMocks()
+ })
+})
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.ts
new file mode 100644
index 00000000000..c81fcc43baf
--- /dev/null
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/pickFile.ts
@@ -0,0 +1,16 @@
+/**
+ * Created and clicked synchronously to stay inside the user gesture, which Safari
+ * requires — so no hidden input driven from an effect.
+ */
+export const pickFile = ({ accept }: { accept?: string } = {}): Promise<File | undefined> =>
+ new Promise((resolve) => {
+ const input = document.createElement('input')
+ input.type = 'file'
+ if (accept) input.accept = accept
+
+ input.addEventListener('change', () => resolve(input.files?.[0]), { once: true })
+ // Not supported everywhere, so this is a cleanup path rather than the one resolve needs.
+ input.addEventListener('cancel', () => resolve(undefined), { once: true })
+
+ input.click()
+ })
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
index 42ee7334534..8858579b4c0 100644
--- a/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx
@@ -13,13 +13,18 @@ export const fetchFileUrl = async (
projectRef: string,
bucketId: string,
isBucketPublic: boolean,
- expiresIn?: number
+ expiresIn?: number,
+ versionId?: string
) => {
+ // Omitted rather than sent as `undefined`, so current-version requests are unchanged.
+ const options = versionId === undefined ? undefined : { versionId }
+
if (isBucketPublic) {
const data = await getPublicUrlForBucketObject({
projectRef: projectRef,
bucketId: bucketId,
path: pathToFile,
+ options,
})
return data.publicUrl
} else {
@@ -28,6 +33,7 @@ export const fetchFileUrl = async (
bucketId: bucketId,
path: pathToFile,
expiresIn: expiresIn ?? DEFAULT_EXPIRY,
+ options,
})
return data.signedUrl
}
@@ -37,10 +43,12 @@ type UseFileUrlQueryVariables = {
path: string
projectRef: string
bucket: Bucket
+ /** Resolves a specific version of the object. Defaults to the current one. */
+ versionId?: string
}
export const useFetchFileUrlQuery = (
- { path, projectRef, bucket }: UseFileUrlQueryVariables,
+ { path, projectRef, bucket, versionId }: UseFileUrlQueryVariables,
{ ...options }: UseCustomQueryOptions<string, ResponseError> = {}
) => {
return useQuery<string, ResponseError, string>({
@@ -49,8 +57,10 @@ export const useFetchFileUrlQuery = (
isBucketPublic: bucket.public,
bucketId: bucket.id,
path,
+ versionId,
}),
- queryFn: () => fetchFileUrl(path, projectRef, bucket.id, bucket.public, DEFAULT_EXPIRY),
+ queryFn: () =>
+ fetchFileUrl(path, projectRef, bucket.id, bucket.public, DEFAULT_EXPIRY, versionId),
staleTime: DEFAULT_EXPIRY * 1000,
...options,
})
diff --git a/apps/studio/state/storage-explorer.tsx b/apps/studio/state/storage-explorer.tsx
index 4fc99bb8201..dfa65399781 100644
--- a/apps/studio/state/storage-explorer.tsx
+++ b/apps/studio/state/storage-explorer.tsx
@@ -32,11 +32,13 @@ import {
} from '@/components/interfaces/Storage/Storage.types'
import {
calculateTotalRemainingTime,
+ describeUploadFailure,
EMPTY_FOLDER_PLACEHOLDER_FILE_NAME,
formatFolderItems,
formatTime,
getFilesDataTransferItems,
getPathAlongFoldersToIndex,
+ getStorageItemPath,
sanitizeNameForDuplicateInColumn,
validateFolderName,
} from '@/components/interfaces/Storage/StorageExplorer/StorageExplorer.utils'
@@ -54,6 +56,7 @@ import { signBucketObjects } from '@/data/storage/bucket-object-sign-mutation'
import { listBucketObjects, StorageObject } from '@/data/storage/bucket-objects-list-mutation'
import { deleteBucketPrefix } from '@/data/storage/bucket-prefix-delete-mutation'
import type { Bucket } from '@/data/storage/buckets-query'
+import { storageKeys } from '@/data/storage/keys'
import { moveStorageObject } from '@/data/storage/object-move-mutation'
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
import { PROJECT_STATUS } from '@/lib/constants'
@@ -169,6 +172,12 @@ export function createStorageExplorerState({
state.selectedItemsToDelete = items
},
+ // Separate from `selectedItemsToDelete`, which only archives on a versioned bucket.
+ itemToPurge: undefined as StorageItemWithColumn | undefined,
+ setItemToPurge: (item?: StorageItemWithColumn) => {
+ state.itemToPurge = item
+ },
+
selectedItemsToMove: [] as StorageItemWithColumn[],
setSelectedItemsToMove: (items: StorageItemWithColumn[]) => {
state.selectedItemsToMove = items
@@ -1497,6 +1506,82 @@ export function createStorageExplorerState({
state.setSelectedItemsToMove([])
},
+ /**
+ * Overwrites an object in place, which on a versioned bucket is what creates a new
+ * version. Not `uploadFiles`: that renames rather than overwrites on a name clash.
+ */
+ replaceFile: async ({ file, item }: { file: File; item: StorageItemWithColumn }) => {
+ const path = getStorageItemPath(state, item)
+ const toastId = toast.loading(`Uploading a new version of ${item.name}...`)
+
+ state.updateRowStatus({
+ name: item.name,
+ status: STORAGE_ROW_STATUS.LOADING,
+ columnIndex: item.columnIndex,
+ })
+
+ try {
+ await new Promise<void>((resolve, reject) => {
+ const upload = new tus.Upload(file, {
+ endpoint: state.resumableUploadUrl,
+ retryDelays: [0, 200, 500, 1500, 3000, 5000],
+ // Without upsert the write is rejected as a conflict: the path exists.
+ headers: { 'x-source': 'supabase-dashboard', 'x-upsert': 'true' },
+ uploadDataDuringCreation: true,
+ removeFingerprintOnSuccess: true,
+ metadata: {
+ bucketName: state.selectedBucket.name,
+ objectName: path,
+ contentType: file.type || 'application/octet-stream',
+ cacheControl: '3600',
+ },
+ onBeforeRequest: async (req) => {
+ const { apiKey } = await getOrRefreshTemporaryApiKey(state.projectRef)
+ req.setHeader('apikey', apiKey)
+ if (!IS_PLATFORM) req.setHeader('Authorization', `Bearer ${apiKey}`)
+ },
+ onError: (error) => reject(error),
+ onSuccess: () => resolve(),
+ })
+
+ // No `findPreviousUploads`: a resumed upload would write the wrong file's bytes.
+ upload.start()
+ })
+
+ toast.success(`Uploaded a new version of ${item.name}`, { id: toastId })
+ await state.refetchAllOpenedFolders()
+ await Promise.all([
+ getQueryClient().invalidateQueries({
+ queryKey: storageKeys.objectVersions(state.projectRef, state.selectedBucket.id, path),
+ }),
+ // The preview URL is cached for a week against the path, so without this the
+ // panel keeps rendering the bytes from before the replace.
+ getQueryClient().invalidateQueries({
+ queryKey: storageKeys.fileUrl({
+ projectRef: state.projectRef,
+ isBucketPublic: state.selectedBucket.public,
+ bucketId: state.selectedBucket.id,
+ path,
+ }),
+ }),
+ ])
+ } catch (error) {
+ const status =
+ error instanceof tus.DetailedError ? error.originalResponse?.getStatus() : undefined
+ const reason = describeUploadFailure({
+ status,
+ fallback: error instanceof Error ? error.message : 'the upload failed.',
+ allowedMimeTypes: state.selectedBucket.allowed_mime_types,
+ })
+ toast.error(`Failed to upload a new version of ${item.name}: ${reason}`, { id: toastId })
+ state.updateRowStatus({
+ name: item.name,
+ status: STORAGE_ROW_STATUS.READY,
+ columnIndex: item.columnIndex,
+ })
+ }
+ },
+
deleteFiles: async ({
files,
isDeleteFolder = false,
diff --git a/e2e/studio/utils/storage-helpers.ts b/e2e/studio/utils/storage-helpers.ts
index b881b0ee08e..0c8d0cba046 100644
--- a/e2e/studio/utils/storage-helpers.ts
+++ b/e2e/studio/utils/storage-helpers.ts
@@ -202,8 +202,9 @@ export const deleteItem = async (page: Page, itemName: string) => {
// Click delete option from context menu
await page.getByRole('menuitem', { name: 'Delete' }).click()
- // Confirm deletion in the modal
- await page.getByRole('button', { name: 'Submit' }).click()
+ // Confirm deletion in the modal. The label says what it does rather than
+ // carrying ConfirmationModal's "Submit" default.
+ await page.getByRole('button', { name: 'Delete', exact: true }).click()
// Wait for deletion to complete
await page.waitForTimeout(1000)
diff --git a/knip.jsonc b/knip.jsonc
index 89373180d61..717c5fc0285 100644
--- a/knip.jsonc
+++ b/knip.jsonc
@@ -81,12 +81,6 @@
// alongside the rest of the Warehouse work so the values stay in one
// place until the project-creation surface that consumes them lands.
"components/interfaces/ProjectCreation/WarehouseFdwCustomImage.constants.ts": ["files"],
- // Storage object versioning: the file preview panel that calls these
- // lands in the next PR of the stack, which drops both entries.
- "components/interfaces/Storage/BroomSparklesIcon.tsx": ["files"],
- "data/storage/versioning/object-{purge,version-delete,version-restore}-mutation.ts": [
- "files",
- ],
},
// `vercel` is a globally installed CLI used by the `deploy:staging` script
"ignoreBinaries": ["vercel"],