The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Storage file bucket design (#46184)
Saxon Fletchere13486e35859
diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsxindex e0a6e66b610..82191b1239d 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerColumn.tsx@@ -57,7 +57,7 @@ const DragOverOverlay = ({ isOpen, onDragLeave, onDrop, folderIsEmpty }: any) =>className="w-3/4 h-32 border-2 border-dashed border-muted rounded-md flex flex-col items-center justify-center p-6 pointer-events-none"style={{ backgroundColor: 'rgba(0,0,0,0.4)' }}>- <Upload className="text-white pointer-events-none" size={20} strokeWidth={2} />+ <Upload className="text-white pointer-events-none" size={20} /><p className="text-center text-sm text-white mt-2 pointer-events-none">Drop your files to upload to this folder</p>diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsxindex 48aebd88953..594e087836f 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.test.tsx@@ -83,7 +83,7 @@ describe('FileExplorerHeader', () => {mockUseAsyncCheckPermissions.mockReturnValue({ can: true })})- it('renders full breadcrumbs in column view and places Navigate before Reload', () => {+ it('does not render folder breadcrumbs in column view and places Navigate before Reload', () => {render(<FileExplorerHeaderitemSearchString=""@@ -92,17 +92,9 @@ describe('FileExplorerHeader', () => {/>)- const rootBreadcrumb = screen.getByRole('button', { name: 'my-bucket' })- const inactiveBreadcrumb = screen.getByRole('button', { name: 'images' })- const activeBreadcrumb = screen.getByText('2024')-- expect(rootBreadcrumb).toBeInTheDocument()- expect(inactiveBreadcrumb).toBeInTheDocument()- expect(activeBreadcrumb).toBeInTheDocument()- expect(inactiveBreadcrumb).toHaveClass('text-foreground-lighter')- expect(activeBreadcrumb).toHaveClass('text-foreground')- expect(activeBreadcrumb).not.toHaveClass('text-foreground-lighter')- expect(screen.queryByRole('button', { name: '2024' })).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'my-bucket' })).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'images' })).not.toBeInTheDocument()+ expect(screen.queryByText('2024')).not.toBeInTheDocument()const navigateButton = screen.getByRole('button', { name: 'Navigate' })const reloadButton = screen.getByRole('button', { name: 'Reload' })@@ -112,9 +104,40 @@ describe('FileExplorerHeader', () => {).toBeTruthy()})- it('uses breadcrumb buttons to navigate back to a previous folder level with keyboard input', async () => {+ it('renders a go-up button to the left of search when not at bucket root', () => {+ mockUseStoragePreference.mockReturnValue(createPreference(STORAGE_VIEWS.LIST))++ render(+ <FileExplorerHeader+ itemSearchString=""+ setItemSearchString={vi.fn()}+ onFilesUpload={vi.fn()}+ />+ )++ expect(screen.getByRole('button', { name: 'Go up one level' })).toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'my-bucket' })).not.toBeInTheDocument()+ expect(screen.queryByRole('button', { name: 'images' })).not.toBeInTheDocument()+ expect(screen.getByPlaceholderText('Search in 2024...')).toBeInTheDocument()+ })++ it('does not render the go-up button in column view when not at bucket root', () => {+ render(+ <FileExplorerHeader+ itemSearchString=""+ setItemSearchString={vi.fn()}+ onFilesUpload={vi.fn()}+ />+ )++ expect(screen.queryByRole('button', { name: 'Go up one level' })).not.toBeInTheDocument()+ })++ it('does not render the go-up button at bucket root', () => {const snapshot = createSnapshot()+ snapshot.columns = [makeColumn('my-bucket')]mockUseStorageExplorerStateSnapshot.mockReturnValue(snapshot)+ mockUseStoragePreference.mockReturnValue(createPreference(STORAGE_VIEWS.LIST))render(<FileExplorerHeader@@ -124,12 +147,28 @@ describe('FileExplorerHeader', () => {/>)- const breadcrumbButton = screen.getByRole('button', { name: 'images' })- breadcrumbButton.focus()- await userEvent.keyboard('{Enter}')+ expect(screen.queryByRole('button', { name: 'Go up one level' })).not.toBeInTheDocument()+ expect(screen.getByPlaceholderText('Search in root directory...')).toBeInTheDocument()+ })++ it('goes up one folder level when the go-up button is clicked', async () => {+ const snapshot = createSnapshot()+ mockUseStorageExplorerStateSnapshot.mockReturnValue(snapshot)+ mockUseStoragePreference.mockReturnValue(createPreference(STORAGE_VIEWS.LIST))- expect(snapshot.popColumnAtIndex).toHaveBeenCalledWith(1)- expect(snapshot.popOpenedFoldersAtIndex).toHaveBeenCalledWith(0)+ render(+ <FileExplorerHeader+ itemSearchString=""+ setItemSearchString={vi.fn()}+ onFilesUpload={vi.fn()}+ />+ )++ await userEvent.click(screen.getByRole('button', { name: 'Go up one level' }))++ expect(snapshot.popColumn).toHaveBeenCalled()+ expect(snapshot.popOpenedFolders).toHaveBeenCalled()+ expect(snapshot.setSelectedFilePreview).toHaveBeenCalledWith(undefined)})it('opens path edit mode from Navigate and tracks the click', async () => {diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsxindex 020bd99a1af..559a7fa86dc 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeader.tsx@@ -3,12 +3,10 @@ import { compact, isEqual, noop } from 'lodash'import {ArrowLeft,Check,- ChevronRight,Columns,Edit2,FolderPlus,List,- LoaderCircle,RefreshCw,Search,Upload,@@ -45,6 +43,7 @@ import {import { Input } from 'ui-patterns/DataInputs/Input'import { STORAGE_SORT_BY, STORAGE_SORT_BY_ORDER, STORAGE_VIEWS } from '../Storage.constants'+import { pageChromeRowClassName } from './storageExplorerChrome'import { useFileExplorerHeaderShortcuts } from './useFileExplorerHeaderShortcuts'import { useStoragePreference } from './useStoragePreference'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'@@ -131,71 +130,6 @@ const NavigateDialog = ({)}-const HeaderBreadcrumbs = ({- loading,- breadcrumbs,- selectBreadcrumb,-}: {- loading: { isLoading: boolean; message: string }- breadcrumbs: string[]- selectBreadcrumb: (i: number) => void-}) => {- // Max 5 crumbs, otherwise replace middle segment with ellipsis and only- // have the first 2 and last 2 crumbs visible- const ellipsis = '...'- const breadcrumbsWithIndexes = breadcrumbs.map((name: string, index: number) => {- return { name, index }- })-- const formattedBreadcrumbs =- breadcrumbsWithIndexes.length <= 5- ? breadcrumbsWithIndexes- : breadcrumbsWithIndexes- .slice(0, 2)- .concat([{ name: ellipsis, index: -1 }])- .concat(- breadcrumbsWithIndexes.slice(- breadcrumbsWithIndexes.length - 2,- breadcrumbsWithIndexes.length- )- )-- return loading.isLoading ? (- <div className="ml-2 flex items-center">- <LoaderCircle size={14} strokeWidth={2} className="animate-spin text-foreground-lighter" />- <p className="ml-3 text-sm">{loading.message}</p>- </div>- ) : (- <div className="ml-3 flex min-w-0 flex-1 items-center overflow-hidden">- {formattedBreadcrumbs.map((crumb, idx: number) => {- const isEllipsis = crumb.name === ellipsis- const isActive = crumb.index === breadcrumbs.length - 1-- return (- <div className="flex shrink-0 items-center" key={`${crumb.index}-${crumb.name}`}>- {idx !== 0 && (- <ChevronRight size={14} strokeWidth={2} className="text-foreground-muted mx-1" />- )}- {isEllipsis ? (- <span className="max-w-24 truncate text-sm text-foreground-light">{crumb.name}</span>- ) : isActive ? (- <span className="max-w-24 truncate text-sm text-foreground">{crumb.name}</span>- ) : (- <button- type="button"- className="max-w-24 truncate border-0 bg-transparent p-0 text-left text-sm text-foreground-lighter transition-colors hover:text-foreground focus-visible:text-foreground"- onClick={() => selectBreadcrumb(crumb.index)}- >- {crumb.name}- </button>- )}- </div>- )- })}- </div>- )-}-interface FileExplorerHeader {itemSearchString: stringsetItemSearchString: (value: string) => void@@ -225,7 +159,6 @@ export const FileExplorerHeader = ({popColumn,popColumnAtIndex,popOpenedFolders,- popOpenedFoldersAtIndex,fetchFoldersByPath,refetchAllOpenedFolders,refreshAll,@@ -244,7 +177,12 @@ export const FileExplorerHeader = ({} = useStoragePreference(projectRef)const breadcrumbs = columns.map((column) => column.name)- const backDisabled = columns.length <= 1+ const isListView = view === STORAGE_VIEWS.LIST+ const isBucketRoot = breadcrumbs.length <= 1+ const currentFolderName = breadcrumbs[breadcrumbs.length - 1]+ const searchPlaceholder = isBucketRoot+ ? 'Search in root directory...'+ : `Search in ${currentFolderName}...`const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')useFileExplorerHeaderShortcuts({@@ -337,21 +275,15 @@ export const FileExplorerHeader = ({/** Methods for searching */// Search is currently within local scope when the view is set to list// Searching for column view requires much more thinking- const toggleSearch = () => {- setIsPathDialogOpen(false)- snap.setIsSearching(true)- }-const onCancelSearch = () => {snap.setIsSearching(false)setItemSearchString('')}- /** Methods for breadcrumbs */-- const selectBreadcrumb = (columnIndex: number) => {- popColumnAtIndex(columnIndex)- popOpenedFoldersAtIndex(columnIndex - 1)+ const onSearchChange = (event: ChangeEvent<HTMLInputElement>) => {+ const value = event.target.value+ setItemSearchString(value)+ snap.setIsSearching(value.length > 0)}const refreshData = async () => {@@ -364,85 +296,91 @@ export const FileExplorerHeader = ({}return (- <div className="rounded-t-md border-b border-overlay bg-surface-100">- <div className="overflow-x-auto overflow-y-hidden">- <div className="flex min-h-[40px] w-max min-w-full items-center justify-between">- {/* Navigation */}- <div className="flex min-w-0 flex-1 items-center overflow-hidden pl-2 py-[7px]">- {breadcrumbs.length > 1 && (- <>- <Button- icon={<ArrowLeft size={16} strokeWidth={2} />}- size="tiny"- type="text"- className="shrink-0 px-1"- disabled={backDisabled}- onClick={() => {- setIsPathDialogOpen(false)- onSelectBack()- }}- />- <div className="mx-1 h-5 shrink-0 border-r border-strong" />- </>- )}- {breadcrumbs.length > 1 ? (- <HeaderBreadcrumbs- loading={loading}- breadcrumbs={breadcrumbs}- selectBreadcrumb={selectBreadcrumb}+ <div className="border-b border-overlay bg-surface-100">+ <div className="overflow-x-auto">+ <div className={pageChromeRowClassName}>+ <div className="flex min-w-0 flex-1 items-center gap-2">+ {isListView && !isBucketRoot && (+ <Button+ size="tiny"+ type="outline"+ aria-label="Go up one level"+ className="w-7 shrink-0 px-1"+ icon={<ArrowLeft size={14} />}+ onClick={() => {+ setIsPathDialogOpen(false)+ onSelectBack()+ }}/>- ) : null}+ )}+ <Input+ ref={searchInputRef}+ size="tiny"+ className="w-52"+ icon={<Search />}+ actions={+ itemSearchString.length > 0+ ? [+ <Button+ key="cancel"+ size="tiny"+ type="text"+ icon={<X />}+ onClick={onCancelSearch}+ className="p-0 h-5 w-5"+ />,+ ]+ : undefined+ }+ placeholder={searchPlaceholder}+ type="text"+ value={itemSearchString}+ onChange={onSearchChange}+ onFocus={() => setIsPathDialogOpen(false)}+ /></div>- {/* Actions */}- <div className="flex shrink-0 items-center whitespace-nowrap py-[7px]">- <div className="flex shrink-0 items-center space-x-1 px-2">+ <div className="flex shrink-0 items-center gap-2 whitespace-nowrap">+ <div className="flex shrink-0 items-center gap-1">{view === STORAGE_VIEWS.COLUMNS && (<Buttonsize="tiny"icon={<Edit2 />}- type="text"+ type="outline"+ aria-label="Navigate"+ className="w-7 px-1"disabled={isPathDialogOpen || loading.isLoading}onClick={onOpenNavigate}- >- Navigate- </Button>+ />)}<ShortcutTooltip shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_REFRESH} side="bottom"><Buttonsize="tiny"icon={<RefreshCw />}- type="text"+ type="outline"+ aria-label="Reload"+ className="w-7 px-1"loading={isRefreshing}onClick={refreshData}- >- Reload- </Button>+ /></ShortcutTooltip><DropdownMenu><DropdownMenuTrigger asChild><Button- type="text"- icon={- view === 'LIST' ? (- <List size={16} strokeWidth={2} />- ) : (- <Columns size={16} strokeWidth={2} />- )- }- >- View- </Button>+ type="outline"+ size="tiny"+ aria-label="View options"+ className="w-7 px-1"+ icon={view === 'LIST' ? <List size={16} /> : <Columns size={16} />}+ /></DropdownMenuTrigger><DropdownMenuContent align="end" className="w-40 min-w-0">{VIEW_OPTIONS.map((option) => (<DropdownMenuItem key={option.key} onClick={() => setView(option.key)}><div className="flex items-center justify-between w-full"><p>{option.name}</p>- {view === option.key && (- <Check size={16} className="text-brand" strokeWidth={2} />- )}+ {view === option.key && <Check size={16} className="text-brand" />}</div></DropdownMenuItem>))}@@ -454,9 +392,7 @@ export const FileExplorerHeader = ({<DropdownMenuItem key={option.key} onClick={() => setSortBy(option.key)}><div className="flex items-center justify-between w-full"><p>{option.name}</p>- {sortBy === option.key && (- <Check size={16} className="text-brand" strokeWidth={2} />- )}+ {sortBy === option.key && <Check size={16} className="text-brand" />}</div></DropdownMenuItem>))}@@ -473,7 +409,7 @@ export const FileExplorerHeader = ({<div className="flex items-center justify-between w-full"><p>{option.name}</p>{sortByOrder === option.key && (- <Check size={16} className="text-brand" strokeWidth={2} />+ <Check size={16} className="text-brand" />)}</div></DropdownMenuItem>@@ -484,97 +420,55 @@ export const FileExplorerHeader = ({</DropdownMenu></div>- <div className="h-6 shrink-0 border-r border-control" />- <div className="flex shrink-0 items-center space-x-1 px-2">+ <div className="flex shrink-0 items-center gap-1"><div className="hidden"><input ref={uploadButtonRef} type="file" multiple onChange={onFilesUpload} /></div><ShortcutTooltip- shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_UPLOAD}+ shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_NEW_FOLDER}side="bottom"open={!canUpdateStorage ? false : undefined}><ButtonTooltip- icon={<Upload size={16} strokeWidth={2} />}- type="text"+ icon={<FolderPlus size={16} />}+ type="outline"disabled={!canUpdateStorage || breadcrumbs.length === 0}- onClick={onSelectUpload}+ onClick={() => addNewFolderPlaceholder(-1)}tooltip={{content: {side: 'bottom',text: !canUpdateStorage- ? 'You need additional permissions to upload files'+ ? 'You need additional permissions to create folders': undefined,},}}>- Upload files+ Create folder</ButtonTooltip></ShortcutTooltip><ShortcutTooltip- shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_NEW_FOLDER}+ shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_UPLOAD}side="bottom"open={!canUpdateStorage ? false : undefined}><ButtonTooltip- icon={<FolderPlus size={16} strokeWidth={2} />}- type="text"+ icon={<Upload size={16} />}+ type="primary"disabled={!canUpdateStorage || breadcrumbs.length === 0}- onClick={() => addNewFolderPlaceholder(-1)}+ onClick={onSelectUpload}tooltip={{content: {side: 'bottom',text: !canUpdateStorage- ? 'You need additional permissions to create folders'+ ? 'You need additional permissions to upload files': undefined,},}}>- Create folder+ Upload files</ButtonTooltip></ShortcutTooltip></div>-- <div className="h-6 shrink-0 border-r border-control" />- <div className="flex shrink-0 items-center px-2">- {snap.isSearching ? (- <Input- ref={searchInputRef}- size="tiny"- autoFocus- className="w-52"- icon={<Search />}- actions={[- <Button- key="cancel"- size="tiny"- type="text"- icon={<X />}- onClick={onCancelSearch}- className="p-0 h-5 w-5"- />,- ]}- placeholder="Search for a file or folder"- type="text"- value={itemSearchString}- onChange={(event) => setItemSearchString(event.target.value)}- />- ) : (- <ShortcutTooltip- shortcutId={SHORTCUT_IDS.LIST_PAGE_FOCUS_SEARCH}- label="Search files"- side="bottom"- >- <Button- icon={<Search />}- size="tiny"- type="text"- className="px-1"- onClick={toggleSearch}- />- </ShortcutTooltip>- )}- </div></div></div></div>diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsxindex 9663749b997..155d1be59d1 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerHeaderSelection.tsx@@ -2,6 +2,7 @@ import { PermissionAction } from '@supabase/shared-types/out/constants'import { Download, Move, Trash2, X } from 'lucide-react'import { Button } from 'ui'+import { bulkActionBarClassName } from './storageExplorerChrome'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { ShortcutTooltip } from '@/components/ui/ShortcutTooltip'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'@@ -20,22 +21,20 @@ export const FileExplorerHeaderSelection = () => {setSelectedItemsToMove,} = useStorageExplorerStateSnapshot()+ const count = selectedItems.length+return (- <div className="z-10 flex h-[40px] items-center rounded-t-md bg-brand-400 px-2 py-1 shadow-sm in-data-[theme*=dark]:bg-brand-500">- <Button- icon={<X size={16} strokeWidth={2} />}- type="text"- onClick={() => clearSelectedItems()}- />- <div className="ml-1 flex items-center space-x-3">- <p className="mb-0 text-sm text-foreground">- <span style={{ fontVariantNumeric: 'tabular-nums' }}>{selectedItems.length}</span> items- selected- </p>+ <div className={bulkActionBarClassName}>+ <span className="font-mono text-xs text-foreground-light">+ <span className="tabular-nums">{count}</span> item{count !== 1 ? 's' : ''} selected+ </span>++ <div className="ml-auto flex items-center gap-1"><ShortcutTooltip shortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_DOWNLOAD_SELECTED} side="bottom"><Button- icon={<Download size={16} strokeWidth={2} />}- type="primary"+ type="default"+ size="tiny"+ icon={<Download size={12} />}onClick={async () => {if (selectedItems.length === 1) {await downloadFile(selectedItems[0])@@ -47,7 +46,6 @@ export const FileExplorerHeaderSelection = () => {Download</Button></ShortcutTooltip>- <div className="border-r border-green-900 py-3 opacity-50" /><ShortcutTooltipshortcutId={SHORTCUT_IDS.STORAGE_EXPLORER_DELETE_SELECTED}@@ -55,8 +53,9 @@ export const FileExplorerHeaderSelection = () => {open={!canUpdateFiles ? false : undefined}><ButtonTooltip- icon={<Trash2 size={16} strokeWidth={2} />}- type="primary"+ type="default"+ size="tiny"+ icon={<Trash2 size={12} />}disabled={!canUpdateFiles}onClick={() => setSelectedItemsToDelete(selectedItems)}tooltip={{@@ -78,8 +77,9 @@ export const FileExplorerHeaderSelection = () => {open={!canUpdateFiles ? false : undefined}><ButtonTooltip- icon={<Move size={16} strokeWidth={2} />}- type="primary"+ type="default"+ size="tiny"+ icon={<Move size={12} />}disabled={!canUpdateFiles}onClick={() => setSelectedItemsToMove(selectedItems)}tooltip={{@@ -92,6 +92,15 @@ export const FileExplorerHeaderSelection = () => {Move</ButtonTooltip></ShortcutTooltip>++ <Button+ type="text"+ size="tiny"+ icon={<X size={12} />}+ title="Clear selection"+ className="px-1.5 text-foreground-lighter hover:text-foreground"+ onClick={() => clearSelectedItems()}+ /></div></div>)diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsxindex 7e521de0cb5..48c7bc68b5d 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/FileExplorerRow.tsx@@ -63,16 +63,14 @@ export const RowIcon = ({mimeType: string | undefined}) => {if (view === STORAGE_VIEWS.LIST && status === STORAGE_ROW_STATUS.LOADING) {- return (- <LoaderCircle size={14} strokeWidth={2} className="animate-spin text-foreground-lighter" />- )+ return <LoaderCircle size={14} className="animate-spin text-foreground-lighter" />}if (fileType === STORAGE_ROW_TYPES.FOLDER) {return isOpened ? (- <FolderOpen size={16} strokeWidth={2} className="text-foreground-lighter" />+ <FolderOpen size={16} className="text-foreground-lighter" />) : (- <FilesBucketIcon size={16} strokeWidth={2} className="text-foreground-lighter" />+ <FilesBucketIcon size={16} className="text-foreground-lighter" />)}@@ -81,14 +79,14 @@ export const RowIcon = ({}if (mimeType?.includes('audio')) {- return <Music size={16} strokeWidth={2} className="text-foreground-lighter" />+ return <Music size={16} className="text-foreground-lighter" />}if (mimeType?.includes('video')) {- return <Film size={16} strokeWidth={2} className="text-foreground-lighter" />+ return <Film size={16} className="text-foreground-lighter" />}- return <File size={16} strokeWidth={2} className="text-foreground-lighter" />+ return <File size={16} className="text-foreground-lighter" />}interface FileExplorerRowProps {@@ -350,7 +348,7 @@ export const FileExplorerRow = ({{item.isCorrupted && (<Tooltip><TooltipTrigger>- <AlertCircle size={18} strokeWidth={2} className="text-foreground-light" />+ <AlertCircle size={18} className="text-foreground-light" /></TooltipTrigger><TooltipContent side="bottom">File is corrupted, please delete and reupload again.@@ -381,13 +379,12 @@ export const FileExplorerRow = ({<LoaderCircleclassName={`animate-spin text-foreground-lighter ${view === STORAGE_VIEWS.LIST ? 'invisible' : ''}`}size={14}- strokeWidth={2}/>) : (<DropdownMenu><DropdownMenuTrigger><div className="storage-row-menu opacity-0">- <MoreVertical size={16} strokeWidth={2} />+ <MoreVertical size={16} /><span className="sr-only">{item.name} actions</span></div></DropdownMenuTrigger>diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsxindex 43e848734a0..49ceb6c3289 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx@@ -42,7 +42,7 @@ const PreviewFile = ({ item }: { item: StorageItem }) => {if (isLoading) {return (<div className="flex h-full w-full items-center justify-center text-foreground-lighter">- <LoaderCircle size={14} strokeWidth={2} className="animate-spin text-foreground-lighter" />+ <LoaderCircle size={14} className="animate-spin text-foreground-lighter" /></div>)}@@ -142,12 +142,7 @@ export const PreviewPane = () => {>{/* Preview Header */}<div className="flex w-full justify-end text-foreground-lighter transition-colors hover:text-foreground">- <X- className="cursor-pointer"- size={14}- strokeWidth={2}- onClick={() => setSelectedFilePreview(undefined)}- />+ <X className="cursor-pointer" size={14} onClick={() => setSelectedFilePreview(undefined)} /></div>{/* Preview Thumbnail*/}@@ -163,7 +158,7 @@ export const PreviewPane = () => {<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} strokeWidth={2} className="text-foreground-light" />+ <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>@@ -253,7 +248,7 @@ export const PreviewPane = () => {type="outline"disabled={!canUpdateFiles}size="tiny"- icon={<Trash2 strokeWidth={2} />}+ icon={<Trash2 />}onClick={() => setSelectedItemsToDelete([file])}tooltip={{content: {diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsxindex b1d4197234a..72288d4f102 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/StorageExplorer.tsx@@ -154,10 +154,7 @@ export const StorageExplorer = () => {}return (- <div- ref={storageExplorerRef}- className="bg-studio border rounded-md border-overlay flex h-full w-full flex-col"- >+ <div ref={storageExplorerRef} className="bg-studio flex h-full w-full flex-col">{selectedItems.length === 0 ? (<FileExplorerHeaderitemSearchString={itemSearchString}diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/storageExplorerChrome.ts b/apps/studio/components/interfaces/Storage/StorageExplorer/storageExplorerChrome.tsnew file mode 100644index 00000000000..c29750412ea--- /dev/null+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/storageExplorerChrome.ts@@ -0,0 +1,5 @@+export const pageChromeRowClassName =+ 'flex min-h-(--header-height) w-max min-w-full items-center justify-between gap-4 px-4 py-2 xl:px-4'++export const bulkActionBarClassName =+ 'flex min-h-(--header-height) w-max min-w-full items-center gap-2 border-b border-overlay bg-surface-200 px-4 py-2 xl:px-4'diff --git a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsxindex 0c437756d23..29f468423d2 100644--- a/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx+++ b/apps/studio/pages/project/[ref]/storage/files/buckets/[bucketId].tsx@@ -7,6 +7,11 @@ import { useEffect } from 'react'import { toast } from 'sonner'import {Badge,+ BreadcrumbItem,+ BreadcrumbLink,+ BreadcrumbList,+ BreadcrumbPage,+ BreadcrumbSeparator,Button,DropdownMenu,DropdownMenuContent,@@ -17,6 +22,8 @@ import {TooltipContent,TooltipTrigger,} from 'ui'+import { PageBreadcrumbs, PageBreadcrumbsActions } from 'ui-patterns/PageBreadcrumbs'+import { PageContainer } from 'ui-patterns/PageContainer'import { DeleteBucketModal } from '@/components/interfaces/Storage/DeleteBucketModal'import { EditBucketModal } from '@/components/interfaces/Storage/EditBucketModal'@@ -28,7 +35,6 @@ import StorageBucketsError from '@/components/interfaces/Storage/StorageBucketsEimport { StorageExplorer } from '@/components/interfaces/Storage/StorageExplorer/StorageExplorer'import { useBucketPolicyCount } from '@/components/interfaces/Storage/useBucketPolicyCount'import DefaultLayout from '@/components/layouts/DefaultLayout'-import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'import StorageLayout from '@/components/layouts/StorageLayout/StorageLayout'import { StorageExplorerStateContextProvider } from '@/state/storage-explorer'import type { NextPageWithLayout } from '@/types'@@ -68,96 +74,105 @@ const BucketPage: NextPageWithLayout = () => {return (<StorageExplorerStateContextProvider key={`storage-explorer-state-${ref}`}>- <PageLayout- size="full"- isCompact- className="[&>div:first-child]:border-b-0!" // Override the border-b from ScaffoldContainer- title={- <div className="flex items-center gap-2 min-w-0 flex-1">- <span className="truncate">{bucketId}</span>- {bucket?.public && (- <Tooltip>- <TooltipTrigger asChild>- <Badge variant="warning" className="flex shrink-0">- Public- </Badge>- </TooltipTrigger>- <TooltipContent side="bottom">{PUBLIC_BUCKET_TOOLTIP}</TooltipContent>- </Tooltip>- )}- </div>- }- breadcrumbs={[- {- label: 'Files',- href: `/project/${ref}/storage/files`,- },- {- label: 'Buckets',- href: `/project/${ref}/storage/files`,- },- ]}- primaryActions={- <>- <Button- asChild- type="default"- icon={<Shield size={14} />}- iconRight={- policyCount > 0 ? (- <span className="w-4 h-4 bg-surface-200 text-foreground-light text-xs rounded-full flex items-center justify-center font-medium">- {policyCount}- </span>- ) : undefined- }- >- <Link- href={`/project/${ref}/storage/files/policies?search=${encodeURIComponent(bucket?.name ?? '')}`}+ <div className="w-full min-h-full flex flex-col items-stretch">+ <PageBreadcrumbs+ actions={+ <PageBreadcrumbsActions>+ <Button+ asChild+ type="outline"+ size="tiny"+ icon={<Shield size={14} />}+ iconRight={+ policyCount > 0 ? (+ <span className="w-4 h-4 bg-surface-200 text-foreground-light text-xs rounded-full flex items-center justify-center font-medium">+ {policyCount}+ </span>+ ) : undefined+ }>- Policies- </Link>- </Button>- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Button type="default" iconRight={<ChevronDown size={14} />}>- Edit bucket- </Button>- </DropdownMenuTrigger>- <DropdownMenuContent align="end" className="w-40">- <DropdownMenuItem- className="flex items-center space-x-2"- onClick={() => setShowEditModal(true)}- >- <Settings size={12} />- <p>Bucket settings</p>- </DropdownMenuItem>- <DropdownMenuSeparator />- <DropdownMenuItem- className="flex items-center space-x-2"- onClick={() => setShowEmptyModal(true)}+ <Link+ href={`/project/${ref}/storage/files/policies?search=${encodeURIComponent(bucket?.name ?? '')}`}>- <FolderOpen size={12} />- <p>Empty bucket</p>- </DropdownMenuItem>- <DropdownMenuItem- className="flex items-center space-x-2"- onClick={() => setShowDeleteModal(true)}- >- <Trash2 size={12} />- <p>Delete bucket</p>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </>- }- >- <div className="flex-1 min-h-0 px-6 pb-6 flex flex-col gap-4">- {ref && bucketId && <PublicBucketWarning projectRef={ref} bucketId={bucketId} />}+ Policies+ </Link>+ </Button>+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button type="outline" size="tiny" iconRight={<ChevronDown size={14} />}>+ Edit bucket+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end" className="w-40">+ <DropdownMenuItem+ className="flex items-center space-x-2"+ onClick={() => setShowEditModal(true)}+ >+ <Settings size={12} />+ <p>Bucket settings</p>+ </DropdownMenuItem>+ <DropdownMenuSeparator />+ <DropdownMenuItem+ className="flex items-center space-x-2"+ onClick={() => setShowEmptyModal(true)}+ >+ <FolderOpen size={12} />+ <p>Empty bucket</p>+ </DropdownMenuItem>+ <DropdownMenuItem+ className="flex items-center space-x-2"+ onClick={() => setShowDeleteModal(true)}+ >+ <Trash2 size={12} />+ <p>Delete bucket</p>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ </PageBreadcrumbsActions>+ }+ >+ <BreadcrumbList>+ <BreadcrumbItem>+ <BreadcrumbLink asChild>+ <Link href={`/project/${ref}/storage/files`}>Files</Link>+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ <BreadcrumbItem>+ <BreadcrumbLink asChild>+ <Link href={`/project/${ref}/storage/files`}>Buckets</Link>+ </BreadcrumbLink>+ </BreadcrumbItem>+ <BreadcrumbSeparator />+ <BreadcrumbItem className="min-w-0">+ <BreadcrumbPage className="flex min-w-0 items-center gap-2">+ <span className="truncate">{bucketId}</span>+ {bucket?.public && (+ <Tooltip>+ <TooltipTrigger asChild>+ <Badge variant="warning" className="flex shrink-0">+ Public+ </Badge>+ </TooltipTrigger>+ <TooltipContent side="bottom">{PUBLIC_BUCKET_TOOLTIP}</TooltipContent>+ </Tooltip>+ )}+ </BreadcrumbPage>+ </BreadcrumbItem>+ </BreadcrumbList>+ </PageBreadcrumbs>++ <PageContainer size="full" className="flex flex-1 min-h-0 flex-col px-0 xl:px-0">+ {ref && bucketId && (+ <div className="px-4 py-4 empty:hidden">+ <PublicBucketWarning projectRef={ref} bucketId={bucketId} />+ </div>+ )}<div className="flex-1 min-h-0"><StorageExplorer /></div>- </div>- </PageLayout>+ </PageContainer>+ </div>{bucket && (<>diff --git a/e2e/studio/features/storage.spec.ts b/e2e/studio/features/storage.spec.tsindex 9182c92ec0d..8c98463cd24 100644--- a/e2e/studio/features/storage.spec.ts+++ b/e2e/studio/features/storage.spec.ts@@ -9,6 +9,7 @@ import {deleteBucket,deleteItem,downloadFile,+ getStorageRowNameInput,navigateToBucket,navigateToStorageFiles,renameItem,@@ -320,7 +321,7 @@ test.describe('Storage', () => {await page.getByRole('menuitem', { name: 'Rename' }).click()// Clear the input and press Enter with empty name- const nameInput = page.getByRole('textbox')+ const nameInput = getStorageRowNameInput(page)await expect(nameInput, 'Rename input should be visible').toBeVisible()await nameInput.clear()await nameInput.press('Enter')@@ -355,7 +356,7 @@ test.describe('Storage', () => {await page.getByRole('menuitem', { name: 'Rename' }).click()// Clear the input and click outside to blur- const nameInput = page.getByRole('textbox')+ const nameInput = getStorageRowNameInput(page)await expect(nameInput, 'Rename input should be visible').toBeVisible()await nameInput.clear()diff --git a/e2e/studio/utils/storage-helpers.ts b/e2e/studio/utils/storage-helpers.tsindex 97d59ce4f18..1ab31eef214 100644--- a/e2e/studio/utils/storage-helpers.ts+++ b/e2e/studio/utils/storage-helpers.ts@@ -4,6 +4,9 @@ import { dismissToastsIfAny } from './dismiss-toast.js'import { toUrl } from './to-url.js'import { waitForApiResponse } from './wait-for-response.js'+/** Inline rename/create input in the storage file explorer (not the search box). */+export const getStorageRowNameInput = (page: Page) => page.locator('.storage-row-input')+/*** Navigates to a the storage home view* @param page - Playwright page instance@@ -149,8 +152,8 @@ export const createFolder = async (page: Page, folderName: string) => {await expect(createFolderBtn, 'Create folder button should be visible').toBeVisible()await createFolderBtn.click()- // A textbox with "Untitled folder" appears - type the new name- const nameInput = page.getByRole('textbox')+ // Inline folder name input appears (search box is a separate textbox)+ const nameInput = getStorageRowNameInput(page)await expect(nameInput, 'Folder name input should be visible').toBeVisible()await nameInput.fill(folderName)await nameInput.press('Enter')@@ -223,8 +226,8 @@ export const renameItem = async (page: Page, oldName: string, newName: string) =// Click rename option from context menuawait page.getByRole('menuitem', { name: 'Rename' }).click()- // A textbox appears - clear and type new name- const nameInput = page.getByRole('textbox')+ const nameInput = getStorageRowNameInput(page)+ await expect(nameInput, 'Rename input should be visible').toBeVisible()await nameInput.fill(newName)await nameInput.press('Enter')diff --git a/packages/ui-patterns/src/PageBreadcrumbs/index.tsx b/packages/ui-patterns/src/PageBreadcrumbs/index.tsxindex fbef062eb92..66e79291658 100644--- a/packages/ui-patterns/src/PageBreadcrumbs/index.tsx+++ b/packages/ui-patterns/src/PageBreadcrumbs/index.tsx@@ -50,11 +50,11 @@ const PageBreadcrumbs = ({...props}: PageBreadcrumbsProps) => {return (- <div data-slot="page-breadcrumbs" className="border-b">+ <div data-slot="page-breadcrumbs"><PageContainersize="full"className={cn(- 'flex min-h-12 items-center justify-between gap-4 py-2',+ 'flex min-h-(--header-height) items-center justify-between gap-4 border-b py-2',pageChromeClassName,containerClassName)}diff --git a/packages/ui-patterns/src/PageNav/index.tsx b/packages/ui-patterns/src/PageNav/index.tsxindex fb7d4ec9fc1..7b99d520331 100644--- a/packages/ui-patterns/src/PageNav/index.tsx+++ b/packages/ui-patterns/src/PageNav/index.tsx@@ -18,13 +18,13 @@ const PageNav = ({ className, ...props }: PageNavProps) => {<PageContainerdata-slot="page-nav"size="full"- className={cn('flex min-h-12 items-center border-b', pageChromeClassName)}+ className={cn('flex min-h-(--header-height) items-center border-b', pageChromeClassName)}><divdata-slot="page-nav-menu"className={cn(- 'flex min-h-12 w-full items-center',- '[&>nav]:flex [&>nav]:h-12 [&>nav]:items-center [&>nav]:border-b-0',+ 'flex min-h-(--header-height) w-full items-center',+ '[&>nav]:flex [&>nav]:h-(--header-height) [&>nav]:items-center [&>nav]:border-b-0','[&>nav>ul]:h-full [&>nav>ul]:items-center','[&>nav>ul>li]:h-full',className