The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
feat: Add a logo picker for OAuth app creation sheet (#44995)
Ivan Vasilov35905e70d5fe
diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsxindex 0b72b150ecb..b5ba3d43d2a 100644--- a/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx+++ b/apps/studio/components/interfaces/Auth/OAuthApps/CreateOrUpdateOAuthAppSheet.tsx@@ -5,8 +5,9 @@ import type {UpdateOAuthClientParams,} from '@supabase/supabase-js'import { useParams } from 'common'-import { Trash2, Upload, X } from 'lucide-react'-import { useEffect, useRef, useState, type ChangeEvent } from 'react'+import { Storage } from 'icons'+import { ImageOff, Trash2, X } from 'lucide-react'+import { useEffect, useState } from 'react'import { useForm } from 'react-hook-form'import { toast } from 'sonner'import {@@ -39,6 +40,7 @@ import { FormItemLayout } from 'ui-patterns/form/FormItemLayout/FormItemLayout'import { SingleValueFieldArray } from 'ui-patterns/form/SingleValueFieldArray/SingleValueFieldArray'import * as z from 'zod'+import { LogoPicker } from './LogoPicker'import { InlineLink } from '@/components/ui/InlineLink'import Panel from '@/components/ui/Panel'import { useProjectApiUrl } from '@/data/config/project-endpoint-query'@@ -95,12 +97,10 @@ export const CreateOrUpdateOAuthAppSheet = ({onCancel,}: CreateOrUpdateOAuthAppSheetProps) => {const { ref: projectRef } = useParams()- const uploadButtonRef = useRef<HTMLInputElement>(null)const [showRegenerateDialog, setShowRegenerateDialog] = useState(false)- const [logoFile, setLogoFile] = useState<File>()+ const [storagePickerOpen, setStoragePickerOpen] = useState(false)const [logoUrl, setLogoUrl] = useState<string>()- const [logoRemoved, setLogoRemoved] = useState(false)const isEditMode = !!appToEditconst hasLogo = logoUrl !== undefined@@ -136,10 +136,14 @@ export const CreateOrUpdateOAuthAppSheet = ({},})+ useEffect(() => {+ if (!visible) {+ setStoragePickerOpen(false)+ }+ }, [visible])+useEffect(() => {if (visible) {- setLogoFile(undefined)- setLogoRemoved(false)if (appToEdit) {form.reset({name: appToEdit.client_name,@@ -166,36 +170,12 @@ export const CreateOrUpdateOAuthAppSheet = ({}}, [visible, appToEdit, form])- const onFileUpload = async (event: ChangeEvent<HTMLInputElement>) => {- event.persist()- const files = event.target.files- if (files && files.length > 0) {- const file = files[0]- setLogoFile(file)- setLogoUrl(URL.createObjectURL(file))- setLogoRemoved(false)- event.target.value = ''- }- }-const onSubmit = async (data: z.infer<typeof FormSchema>) => {const validRedirectUris = data.redirect_uris.map((uri) => uri.value.trim()).filter((uri) => uri !== '')- let uploadedLogoUri: string | undefined = undefined-- if (logoRemoved) {- uploadedLogoUri = ''- } else if (logoFile) {- const reader = new FileReader()- uploadedLogoUri = await new Promise<string>((resolve) => {- reader.onloadend = () => resolve(reader.result as string)- reader.readAsDataURL(logoFile)- })- } else if (logoUrl) {- uploadedLogoUri = logoUrl- }+ const uploadedLogoUri = data.logo_uri?.trim() ?? ''if (isEditMode && appToEdit) {const payload: UpdateOAuthClientParams & { token_endpoint_auth_method?: string } = {@@ -252,21 +232,32 @@ export const CreateOrUpdateOAuthAppSheet = ({})}- const handleUploadLogo = () => uploadButtonRef.current?.click()+ const handlePickLogoFromStorage = (uri: string) => {+ setLogoUrl(uri)+ form.setValue('logo_uri', uri)+ }+const handleRemoveLogo = () => {- setLogoFile(undefined)setLogoUrl(undefined)- setLogoRemoved(true)+ form.setValue('logo_uri', '')}return (<>+ {projectRef ? (+ <LogoPicker+ open={storagePickerOpen}+ onOpenChange={setStoragePickerOpen}+ onSelect={handlePickLogoFromStorage}+ />+ ) : null}<Sheet open={visible} onOpenChange={() => onCancel()}><SheetContentsize="lg"showClose={false}className="flex flex-col gap-0"tabIndex={undefined}+ aria-describedby={undefined}><SheetHeader><div className="flex flex-row gap-3 items-center">@@ -305,47 +296,62 @@ export const CreateOrUpdateOAuthAppSheet = ({<FormFieldcontrol={form.control}name="logo_uri"- render={() => (- <FormItemLayout label="Logo" description="Upload a logo for your OAuth app">+ render={({ field }) => (+ <FormItemLayout+ label="Logo"+ description={`Paste an absolute image URL/path or select one from a public File Storage bucket.`}+ ><FormControl>- <div className="flex gap-4 items-center">- <button- type="button"- onClick={handleUploadLogo}- className={cn(- 'flex items-center justify-center h-10 w-10 shrink-0 text-foreground-lighter hover:text-foreground-light overflow-hidden rounded-full bg-cover border hover:border-strong'- )}- style={{- backgroundImage: logoUrl ? `url("${logoUrl}")` : 'none',- }}- >- {!hasLogo && <Upload size={14} />}- </button>- <div className="flex gap-2 items-center">- <Button- type="default"- size="tiny"- icon={<Upload size={14} />}- onClick={handleUploadLogo}+ <div className="flex w-full flex-col gap-3">+ <div className="flex flex-wrap items-center gap-2">+ <div+ className={cn(+ 'flex items-center justify-center h-10 w-10 shrink-0 text-foreground-lighter overflow-hidden rounded-full bg-cover border'+ )}+ title={logoUrl ? undefined : 'No image selected'}+ style={{+ backgroundImage: logoUrl ? `url("${logoUrl}")` : 'none',+ }}>- Upload- </Button>- {hasLogo && (- <Button- type="default"- size="tiny"- icon={<Trash2 size={12} />}- onClick={handleRemoveLogo}- />- )}+ {!hasLogo && <ImageOff size={14} />}+ </div>+ <div className="flex min-w-0 flex-1 items-center gap-2">+ <div className="group relative min-w-0 flex-1">+ <Input_Shadcn_+ {...field}+ value={field.value ?? ''}+ className={cn('flex-1', projectRef ? 'pr-10' : '')}+ placeholder="https://example.com/logo.png"+ onChange={(event) => {+ field.onChange(event)+ const next = event.target.value.trim()+ setLogoUrl(next.length > 0 ? next : undefined)+ }}+ />+ {projectRef ? (+ <Button+ type="default"+ size="tiny"+ icon={<Storage strokeWidth={1.5} />}+ className="absolute right-1 top-1/2 h-6 w-6 -translate-y-1/2 justify-center overflow-hidden px-1 transition-all duration-150 group-hover:w-36 group-focus-within:w-36 [&_span]:hidden group-hover:[&_span]:block group-focus-within:[&_span]:block"+ onClick={() => setStoragePickerOpen(true)}+ >+ <span className="hidden whitespace-nowrap opacity-0 transition-opacity duration-200 group-hover:opacity-100 group-focus-within:opacity-100">+ Select from Storage+ </span>+ </Button>+ ) : null}+ </div>+ {field.value ? (+ <Button+ type="default"+ size="tiny"+ icon={<Trash2 size={12} />}+ onClick={handleRemoveLogo}+ />+ ) : null}+ </div></div>- <input- type="file"- ref={uploadButtonRef}- className="hidden"- accept="image/png, image/jpeg"- onChange={onFileUpload}- /></div></FormControl></FormItemLayout>diff --git a/apps/studio/components/interfaces/Auth/OAuthApps/LogoPicker.tsx b/apps/studio/components/interfaces/Auth/OAuthApps/LogoPicker.tsxnew file mode 100644index 00000000000..3c5dd5305f7--- /dev/null+++ b/apps/studio/components/interfaces/Auth/OAuthApps/LogoPicker.tsx@@ -0,0 +1,124 @@+import { useBreakpoint } from 'common'+import { ChevronLeft } from 'lucide-react'+import { useEffect, useState } from 'react'+import {+ Button,+ Dialog,+ DialogContent,+ DialogHeader,+ DialogTitle,+ Sheet,+ SheetContent,+ SheetHeader,+ SheetTitle,+} from 'ui'++import { BucketFilePickerExplorer } from '../../Storage/BucketFilePickerDialog/BucketFilePickerExplorer'+import { BucketFilePickerStateContextProvider } from '../../Storage/BucketFilePickerDialog/BucketFilePickerState'+import { BucketsPicker } from '../../Storage/BucketsPickerDialog/BucketsPicker'+import type { Bucket } from '@/data/storage/buckets-query'++export type StorageFilePickerProps = {+ open: boolean+ onOpenChange: (open: boolean) => void+ onSelect: (value: string) => void+}++export function LogoPicker({ open, onOpenChange, onSelect }: StorageFilePickerProps) {+ const [selectedBucket, setSelectedBucket] = useState<Bucket | null>(null)++ const isMobileLayout = useBreakpoint('lg')++ useEffect(() => {+ if (!open) {+ setSelectedBucket(null)+ }+ }, [open])++ const handleSelect = (value: string) => {+ onSelect(value)+ onOpenChange(false)+ }++ return (+ <>+ {isMobileLayout ? (+ <Sheet open={open} onOpenChange={onOpenChange}>+ <SheetContent side="bottom" className="flex h-[85vh] flex-col gap-0 p-0">+ {selectedBucket ? (+ <SheetHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4">+ <Button+ type="text"+ size="tiny"+ icon={<ChevronLeft size={16} />}+ className="shrink-0"+ onClick={() => setSelectedBucket(null)}+ >+ Buckets+ </Button>+ <SheetTitle className="min-w-0 flex-1">Choose a file</SheetTitle>+ </SheetHeader>+ ) : (+ <SheetHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4">+ <SheetTitle className="min-w-0 flex-1">Select a bucket</SheetTitle>+ </SheetHeader>+ )}+ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col px-2 pb-3 pt-2">+ {selectedBucket ? (+ <BucketFilePickerStateContextProvider+ bucket={selectedBucket}+ maxFiles={1}+ acceptedFileExtensions={['.png', '.jpg', '.jpeg', '.svg']}+ >+ <BucketFilePickerExplorer onSelect={handleSelect} />+ </BucketFilePickerStateContextProvider>+ ) : (+ <BucketsPicker onSelectBucket={setSelectedBucket} allowedBucketType="public" />+ )}+ </div>+ </SheetContent>+ </Sheet>+ ) : (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent+ size="xxlarge"+ className="flex h-[85vh] max-h-[500px] max-w-5xl flex-col gap-0 overflow-hidden p-0"+ >+ {selectedBucket ? (+ <DialogHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4 h-[60px]">+ <Button+ type="text"+ size="tiny"+ icon={<ChevronLeft size={16} />}+ className="shrink-0"+ onClick={() => setSelectedBucket(null)}+ >+ Buckets+ </Button>+ <DialogTitle className="min-w-0 flex-1">Choose a file</DialogTitle>+ </DialogHeader>+ ) : (+ <DialogHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4 h-[60px]">+ <DialogTitle className="min-w-0 flex-1">Select a bucket</DialogTitle>+ </DialogHeader>+ )}++ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden p-3">+ {selectedBucket ? (+ <BucketFilePickerStateContextProvider+ bucket={selectedBucket}+ maxFiles={1}+ acceptedFileExtensions={['.png', '.jpg', '.jpeg', '.svg']}+ >+ <BucketFilePickerExplorer onSelect={handleSelect} />+ </BucketFilePickerStateContextProvider>+ ) : (+ <BucketsPicker onSelectBucket={setSelectedBucket} allowedBucketType="public" />+ )}+ </div>+ </DialogContent>+ </Dialog>+ )}+ </>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsxnew file mode 100644index 00000000000..9b0da9e47cf--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerColumn.tsx@@ -0,0 +1,432 @@+import { PermissionAction } from '@supabase/shared-types/out/constants'+import { useQueryClient } from '@tanstack/react-query'+import { useDebounce } from '@uidotdev/usehooks'+import { useParams } from 'common'+import { AnimatePresence, motion } from 'framer-motion'+import { compact, get, sum, uniqBy } from 'lodash'+import { Upload } from 'lucide-react'+import { DragEventHandler, useCallback, useMemo, useRef, useState } from 'react'+import { toast } from 'sonner'+import { Checkbox, cn } from 'ui'+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'++import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from '../Storage.constants'+import type { StorageItem } from '../Storage.types'+import { formatFolderItems } from '../StorageExplorer/StorageExplorer.utils'+import { useStoragePreference } from '../StorageExplorer/useStoragePreference'+import { uploadFilesToBucket } from './BucketFilePickerDialog.utils'+import { BucketFilePickerRow } from './BucketFilePickerRow'+import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'+import { InfiniteListDefault, LoaderForIconMenuItems } from '@/components/ui/InfiniteList'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'+import { useBucketObjectsInfiniteQuery } from '@/data/storage/bucket-objects-infinite-query'+import { storageKeys } from '@/data/storage/keys'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { formatBytes } from '@/lib/helpers'+import { noop } from '@/lib/void'++const SelectAllCheckbox = ({+ columnFiles,+ selectedFilesFromColumn,+ onChange,+}: {+ columnFiles: StorageItem[]+ selectedFilesFromColumn: StorageItem[]+ onChange: () => void+}) => (+ <Checkbox+ className="-mt-0.5"+ checked={columnFiles.length !== 0 && selectedFilesFromColumn.length === columnFiles.length}+ disabled={columnFiles.length === 0}+ onChange={onChange}+ />+)++const DragOverOverlay = ({+ isOpen,+ onDragLeave,+ onDrop,+ folderIsEmpty,+}: {+ isOpen: boolean+ onDragLeave: () => void+ onDrop: () => void+ folderIsEmpty: boolean+}) => {+ return (+ <AnimatePresence>+ {isOpen && (+ <motion.div+ initial={{ opacity: 0 }}+ animate={{ opacity: 1 }}+ exit={{ opacity: 0 }}+ transition={{ duration: 0.1, ease: 'easeOut' }}+ className="h-full w-full absolute top-0"+ >+ <div+ onDragLeave={onDragLeave}+ onDrop={onDrop}+ className="absolute top-0 flex h-full w-full items-center justify-center"+ style={{ backgroundColor: folderIsEmpty ? 'rgba(0,0,0,0.1)' : 'rgba(0,0,0,0.2)' }}+ >+ {!folderIsEmpty && (+ <div+ 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} />+ <p className="text-center text-sm text-white mt-2 pointer-events-none">+ Drop your files to upload to this folder+ </p>+ </div>+ )}+ </div>+ </motion.div>+ )}+ </AnimatePresence>+ )+}++export interface BucketFilePickerColumnProps {+ index: number+ fullWidth?: boolean+}++export const BucketFilePickerColumn = ({+ index,+ fullWidth = false,+}: BucketFilePickerColumnProps) => {+ const { ref: projectRef } = useParams()+ const queryClient = useQueryClient()++ const [isDraggedOver, setIsDraggedOver] = useState(false)+ const columnRef = useRef<HTMLDivElement | null>(null)++ const { hostEndpoint } = useProjectApiUrl({ projectRef: projectRef! })+ const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')++ const {+ columns,+ itemSearchString,+ bucket,+ maxFiles,+ acceptedFileExtensions,+ pushColumnAtIndex,+ selectedItems,+ setSelectedItems,+ clearSelectedItems,+ selectedFilePreview,+ setSelectedFilePreview,+ popColumnAtIndex,+ } = useBucketFilePickerStateSnapshot()++ const isFileAccepted = (fileName: string) => {+ if (!acceptedFileExtensions || acceptedFileExtensions.length === 0) return true+ const ext = fileName.split('.').pop()?.toLowerCase() ?? ''+ return acceptedFileExtensions.map((e) => e.replace(/^\./, '').toLowerCase()).includes(ext)+ }++ const path = columns.slice(0, index).join('/')+ const selectedFolder = columns[index]+ const setSelectedFolder = (folderName: string | null) => {+ if (folderName) {+ pushColumnAtIndex(folderName, index)+ }+ }+ const isLastFolder = index === columns.length++ const { view, sortBy, sortByOrder } = useStoragePreference(projectRef!)++ const debouncedSearchString = useDebounce(itemSearchString, 500)+ const { data, isLoading, isFetching, fetchNextPage, hasNextPage } = useBucketObjectsInfiniteQuery(+ {+ projectRef,+ bucketId: bucket.id,+ path,+ options: {+ sortBy: {+ column: sortBy,+ order: sortByOrder,+ },+ // When a user tries to search, only search in the last opened folder (rightmost column)+ ...(isLastFolder && debouncedSearchString ? { search: debouncedSearchString } : {}),+ },+ }+ )++ const items = useMemo(() => {+ const objs = data?.pages.flatMap((page) => page) || []+ return formatFolderItems(objs)+ }, [data])++ const haveSelectedItems = selectedItems.length > 0+ const columnItemsId = items.map((item) => item.id)+ const columnFiles = items.filter((item) => item.type === STORAGE_ROW_TYPES.FILE)+ const selectedItemsFromColumn = selectedItems.filter((item) => columnItemsId.includes(item.id))+ const selectedFilesFromColumn = selectedItemsFromColumn.filter(+ (item) => item.type === STORAGE_ROW_TYPES.FILE+ )++ const columnItems = items.map((item) => ({ ...item, columnIndex: index }))+ const columnItemsSize = sum(columnItems.map((item) => get(item, ['metadata', 'size'], 0)))++ const isEmpty = items.filter((item) => item.status !== STORAGE_ROW_STATUS.LOADING).length === 0++ const getItemKey = useCallback(+ (index: number) => {+ const item = columnItems[index]+ return item?.id || `file-explorer-item-${index}`+ },+ [columnItems]+ )++ const itemProps = useMemo(+ () => ({+ view: view,+ columnIndex: index,+ selectedItems,+ hideCheckbox: maxFiles === 1,+ }),+ [view, index, selectedItems, maxFiles]+ )++ const onSelectAllItemsInColumn = () => {+ const columnFiles = columnItems.filter((item) => item.type === STORAGE_ROW_TYPES.FILE)++ const columnFilesId = compact(columnFiles.map((item) => item.id))+ const selectedItemsFromColumn = selectedItems.filter(+ (item) => item.id && columnFilesId.includes(item.id)+ )++ if (selectedItemsFromColumn.length === columnFiles.length) {+ // Deselect all items from column+ const updatedSelectedItems = selectedItems.filter(+ (item) => item.id && !columnFilesId.includes(item.id)+ )+ setSelectedItems(updatedSelectedItems)+ } else {+ // Select all items from column+ const updatedSelectedItems = uniqBy(selectedItems.concat(columnFiles), 'id')+ setSelectedItems(updatedSelectedItems)+ }+ }++ const onSelectColumnEmptySpace = (columnIndex: number) => {+ popColumnAtIndex(columnIndex)+ setSelectedFilePreview(undefined)+ clearSelectedItems()+ }++ const onDragOver: DragEventHandler<HTMLDivElement> = (event) => {+ if (event) {+ event.stopPropagation()+ event.preventDefault()+ if (event.type === 'dragover' && !isDraggedOver) {+ setIsDraggedOver(true)+ }+ }+ }++ const onDrop: DragEventHandler<HTMLDivElement> = async (event) => {+ onDragOver(event)++ if (!canUpdateStorage) {+ toast('You need additional permissions to upload files to this project')+ return+ }+ if (!hostEndpoint) {+ toast.error('Unable to upload files at this time. Please try again.')+ return+ }++ const files = Array.from(event.dataTransfer?.files ?? []) as File[]+ await uploadFilesToBucket({+ files,+ projectRef: projectRef!,+ hostEndpoint: hostEndpoint,+ bucketName: bucket.name,+ bucketId: bucket.id,+ currentPath: columns.slice(0, index).join('/'),+ queryClient,+ })++ queryClient.invalidateQueries({+ queryKey: storageKeys.objects(projectRef!, bucket.id, columns.slice(0, index).join('/')),+ })++ setIsDraggedOver(false)+ }++ return (+ <>+ <div+ ref={columnRef}+ className={cn(+ fullWidth ? 'w-full' : 'w-64 border-r border-overlay',+ view === STORAGE_VIEWS.LIST && 'h-full',+ 'hide-scrollbar relative flex shrink-0 flex-col overflow-auto'+ )}+ onDragOver={onDragOver}+ onDrop={onDrop}+ onClick={(event) => {+ const eventTarget = get(event.target, ['className'], '')+ if (typeof eventTarget === 'string' && eventTarget.includes('react-contexify')) return+ onSelectColumnEmptySpace(index)+ }}+ >+ {/* Checkbox selection for select all */}+ {view === STORAGE_VIEWS.COLUMNS && maxFiles !== 1 && (+ <div+ className={cn(+ 'sticky top-0 z-10 mb-0 flex items-center bg-table-header-light px-2.5 in-data-[theme*=dark]:bg-table-header-dark',+ haveSelectedItems ? 'h-10 py-3 opacity-100' : 'h-0 py-0 opacity-0',+ 'transition-all duration-200'+ )}+ onClick={(event) => event.stopPropagation()}+ >+ {columnFiles.length > 0 ? (+ <>+ <SelectAllCheckbox+ columnFiles={columnFiles}+ selectedFilesFromColumn={selectedFilesFromColumn}+ onChange={() => onSelectAllItemsInColumn()}+ />+ <p className="text-sm text-foreground-light">+ Select all {columnFiles.length} files+ </p>+ </>+ ) : (+ <p className="text-sm text-foreground-light">No files available for selection</p>+ )}+ </div>+ )}++ {/* List Interface Header */}+ {view === STORAGE_VIEWS.LIST && (+ <div className="sticky top-0 py-2 z-10 flex min-w-min items-center border-b border-overlay bg-surface-100 px-2.5">+ <div className="flex w-[40%] min-w-[250px] items-center">+ {maxFiles !== 1 && (+ <SelectAllCheckbox+ columnFiles={columnFiles}+ selectedFilesFromColumn={selectedFilesFromColumn}+ onChange={() => onSelectAllItemsInColumn()}+ />+ )}+ <p className="text-sm">Name</p>+ </div>+ <p className="w-[11%] min-w-[100px] text-sm">Size</p>+ <p className="w-[14%] min-w-[100px] text-sm">Type</p>+ <p className="w-[15%] min-w-[160px] text-sm">Created at</p>+ <p className="w-[15%] min-w-[160px] text-sm">Last modified at</p>+ </div>+ )}++ {/* Shimmering loaders while fetching contents */}+ {isLoading && (+ <div+ className={`+ ${fullWidth ? 'w-full' : 'w-64 border-r border-default'}+ px-2 py-1 my-1 flex shrink-0 flex-col space-y-2 overflow-auto+ `}+ >+ <ShimmeringLoader />+ <ShimmeringLoader />+ <ShimmeringLoader />+ </div>+ )}++ {/* Column Interface */}+ {columnItems.length > 0 && (+ <InfiniteListDefault+ className="h-full"+ items={columnItems}+ itemProps={itemProps}+ getItemKey={getItemKey}+ getItemSize={(index) => (index !== 0 && index === columnItems.length ? 85 : 37)}+ // eslint-disable-next-line react/no-unstable-nested-components+ ItemComponent={(props) => {+ const item = props.item+ const isPreviewed = !!(+ selectedFilePreview?.id !== null && selectedFilePreview?.id === item.id+ )+ const isOpened =+ selectedFolder !== null &&+ item.type === STORAGE_ROW_TYPES.FOLDER &&+ selectedFolder === item.name++ return (+ <BucketFilePickerRow+ {...props}+ onCheck={noop}+ isPreviewed={isPreviewed}+ isOpened={isOpened}+ isSelected={!!props.selectedItems.find((i) => i.id === item.id)}+ hideCheckbox={maxFiles === 1}+ isDisabled={+ item.type === STORAGE_ROW_TYPES.FILE && !isFileAccepted(item.name ?? '')+ }+ onClick={(event) => {+ event.stopPropagation()+ event.preventDefault()+ if (item.status !== STORAGE_ROW_STATUS.LOADING && !isOpened && !isPreviewed) {+ if (item.type === STORAGE_ROW_TYPES.FOLDER) {+ setSelectedFilePreview(undefined)+ setSelectedFolder(item.name)+ } else {+ setSelectedFilePreview(item)+ // deselect all folders when previewing a file+ popColumnAtIndex(index)+ clearSelectedItems()+ }+ }+ }}+ />+ )+ }}+ LoaderComponent={LoaderForIconMenuItems}+ hasNextPage={hasNextPage}+ isLoadingNextPage={isFetching}+ onLoadNextPage={fetchNextPage}+ />+ )}++ {debouncedSearchString.length > 0 && isEmpty && !isLoading && (+ <div className="h-full w-full flex flex-col items-center justify-center">+ <p className="text-sm my-3 text-foreground">No results found in this folder</p>+ <p className="w-40 text-center text-sm text-foreground-light">+ Your search for "{debouncedSearchString}" did not return any results+ </p>+ </div>+ )}++ {debouncedSearchString.length === 0 && isEmpty && !isLoading && (+ <div className="h-full w-full flex flex-col items-center justify-center">+ <p className="text-sm my-3 opacity-75">Drop your files here</p>+ <p className="w-40 text-center text-xs text-foreground-light">+ Or upload them via the "Upload files" button above+ </p>+ </div>+ )}++ <DragOverOverlay+ isOpen={isDraggedOver}+ folderIsEmpty={isEmpty}+ onDragLeave={() => setIsDraggedOver(false)}+ onDrop={() => setIsDraggedOver(false)}+ />++ {/* List interface footer */}+ {view === STORAGE_VIEWS.LIST && (+ <div className="shrink-0 rounded-b-md z-10 flex min-w-min items-center bg-panel-footer-light px-2.5 py-2 in-data-[theme*=dark]:bg-panel-footer-dark w-full">+ <p className="text-sm">+ {formatBytes(columnItemsSize)} for {columnItems.length} items+ </p>+ </div>+ )}+ </div>+ {selectedFolder ? (+ <BucketFilePickerColumn key={`column-${index + 1}`} index={index + 1} />+ ) : null}+ </>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerDialog.utils.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerDialog.utils.tsxnew file mode 100644index 00000000000..a50bbf960bc--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerDialog.utils.tsx@@ -0,0 +1,44 @@+import { QueryClient } from '@tanstack/react-query'+import { toast } from 'sonner'++import { storageKeys } from '@/data/storage/keys'+import { createProjectSupabaseClient } from '@/lib/project-supabase-client'++export async function uploadFilesToBucket({+ files,+ projectRef,+ hostEndpoint,+ bucketName,+ bucketId,+ currentPath,+ queryClient,+}: {+ files: File[]+ projectRef: string+ hostEndpoint: string+ bucketName: string+ bucketId: string+ currentPath: string+ queryClient: QueryClient+}) {+ if (files.length === 0) return++ const client = await createProjectSupabaseClient(projectRef, hostEndpoint)+ let successCount = 0++ for (const file of files) {+ const filePath = currentPath ? `${currentPath}/${file.name}` : file.name+ const { error } = await client.storage.from(bucketName).upload(filePath, file, { upsert: true })+ if (error) {+ toast.error(`Failed to upload ${file.name}: ${error.message}`)+ } else {+ successCount+++ }+ }++ if (successCount > 0) {+ toast.success(`Successfully uploaded ${successCount} file${successCount > 1 ? 's' : ''}`)+ const queryKey = storageKeys.objects(projectRef, bucketId, '')+ await queryClient.refetchQueries({ queryKey, type: 'active' })+ }+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerExplorer.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerExplorer.tsxnew file mode 100644index 00000000000..d1bc400af9c--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerExplorer.tsx@@ -0,0 +1,45 @@+import { useParams } from 'common'+import { cn } from 'ui'++import { STORAGE_VIEWS } from '../Storage.constants'+import { useStoragePreference } from '../StorageExplorer/useStoragePreference'+import { BucketFilePickerColumn } from './BucketFilePickerColumn'+import { BucketFilePickerHeader } from './BucketFilePickerHeader'+import { BucketFilePickerHeaderSelection } from './BucketFilePickerHeaderSelection'+import { PreviewPane } from './BucketFilePickerPreviewPane'+import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'++export function BucketFilePickerExplorer({ onSelect }: { onSelect: (value: string) => void }) {+ const { ref: projectRef } = useParams()+ const { view } = useStoragePreference(projectRef!)+ const { selectedItems, columns } = useBucketFilePickerStateSnapshot()++ return (+ <div className="flex-1 min-h-0">+ <div className="bg-studio border rounded-md border-overlay flex h-full w-full flex-col">+ {selectedItems.length === 0 ? (+ <BucketFilePickerHeader />+ ) : (+ <BucketFilePickerHeaderSelection />+ )}+ <div className="flex flex-1 min-h-0">+ <div+ className={cn(+ 'file-explorer flex grow overflow-x-auto justify-between h-full w-full relative',+ view === STORAGE_VIEWS.LIST && 'flex-col'+ )}+ >+ {view === STORAGE_VIEWS.COLUMNS ? (+ <div className="flex">+ <BucketFilePickerColumn index={0} />+ </div>+ ) : (+ <BucketFilePickerColumn fullWidth index={columns.length} />+ )}+ </div>+ <PreviewPane onSelect={onSelect} />+ </div>+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsxnew file mode 100644index 00000000000..b5c158af756--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeader.tsx@@ -0,0 +1,375 @@+import { PermissionAction } from '@supabase/shared-types/out/constants'+import { useQueryClient } from '@tanstack/react-query'+import { useParams } from 'common'+import {+ ArrowLeft,+ Check,+ ChevronRight,+ Columns,+ List,+ RefreshCw,+ Search,+ Upload,+ X,+} from 'lucide-react'+import { useRef, useState, type ChangeEvent } from 'react'+import {+ Button,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuSeparator,+ DropdownMenuSub,+ DropdownMenuSubContent,+ DropdownMenuSubTrigger,+ DropdownMenuTrigger,+} from 'ui'+import { Input } from 'ui-patterns/DataInputs/Input'++import { STORAGE_SORT_BY, STORAGE_SORT_BY_ORDER, STORAGE_VIEWS } from '../Storage.constants'+import { useStoragePreference } from '../StorageExplorer/useStoragePreference'+import { uploadFilesToBucket } from './BucketFilePickerDialog.utils'+import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'+import { ButtonTooltip } from '@/components/ui/ButtonTooltip'+import { useProjectApiUrl } from '@/data/config/project-endpoint-query'+import { storageKeys } from '@/data/storage/keys'+import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'++const VIEW_OPTIONS = [+ { key: STORAGE_VIEWS.COLUMNS, name: 'As columns' },+ { key: STORAGE_VIEWS.LIST, name: 'As list' },+]++const SORT_BY_OPTIONS = [+ { key: STORAGE_SORT_BY.NAME, name: 'Name' },+ { key: STORAGE_SORT_BY.CREATED_AT, name: 'Time created' },+ { key: STORAGE_SORT_BY.UPDATED_AT, name: 'Time modified' },+ { key: STORAGE_SORT_BY.LAST_ACCESSED_AT, name: 'Time last accessed' },+]++const SORT_ORDER_OPTIONS = [+ { key: STORAGE_SORT_BY_ORDER.ASC, name: 'Ascending' },+ { key: STORAGE_SORT_BY_ORDER.DESC, name: 'Descending' },+]++const HeaderBreadcrumbs = ({+ breadcrumbs,+ selectBreadcrumb,+}: {+ 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 (+ <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>+ )+}++export const BucketFilePickerHeader = () => {+ const { ref: projectRef } = useParams()+ const queryClient = useQueryClient()++ const [isSearching, setIsSearching] = useState(false)+ const [isRefreshing, setIsRefreshing] = useState(false)+ const [isUploading, setIsUploading] = useState(false)++ const uploadButtonRef = useRef<HTMLInputElement | null>(null)++ const { hostEndpoint } = useProjectApiUrl({ projectRef: projectRef! })++ const { view, sortBy, sortByOrder, setSortBy, setSortByOrder, setView } = useStoragePreference(+ projectRef!+ )++ const {+ bucket,+ columns,+ itemSearchString,+ setItemSearchString,+ popColumn,+ popColumnAtIndex,+ setSelectedFilePreview,+ } = useBucketFilePickerStateSnapshot()++ const { can: canUpdateStorage } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')++ const breadcrumbs = columns+ const backDisabled = columns.length < 1++ const onSelectBack = () => {+ popColumn()+ setSelectedFilePreview(undefined)+ }++ const onSelectUpload = () => {+ if (uploadButtonRef.current) {+ uploadButtonRef.current.click()+ }+ }++ const handleFilesUpload = async (event: ChangeEvent<HTMLInputElement>) => {+ if (!hostEndpoint) {+ console.error('Host endpoint not available')+ return+ }+ const files = Array.from(event.target.files || [])+ try {+ setIsUploading(true)+ await uploadFilesToBucket({+ files,+ projectRef: projectRef!,+ hostEndpoint,+ bucketName: bucket.name,+ bucketId: bucket.id,+ currentPath: columns.join('/'),+ queryClient,+ })+ queryClient.invalidateQueries({+ queryKey: storageKeys.objects(projectRef!, bucket.id, columns.join('/')),+ })+ } catch (error) {+ console.error('Failed to upload files:', error)+ // Consider showing a toast notification to the user+ } finally {+ event.target.value = ''+ setIsUploading(false)+ }+ }++ /** Methods for searching */+ const toggleSearch = () => {+ setIsSearching(true)+ }++ const onCancelSearch = () => {+ setIsSearching(false)+ setItemSearchString('')+ }++ /** Methods for breadcrumbs */++ const selectBreadcrumb = (columnIndex: number) => {+ popColumnAtIndex(columnIndex)+ }++ const refreshData = async () => {+ setIsRefreshing(true)+ const queryKey = storageKeys.objects(projectRef!, bucket.id, '').filter(Boolean)+ try {+ await queryClient.refetchQueries({ queryKey: queryKey, type: 'active' })+ } finally {+ setIsRefreshing(false)+ }+ }++ 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 > 0 && (+ <>+ <Button+ icon={<ArrowLeft size={16} strokeWidth={2} />}+ size="tiny"+ type="text"+ className="shrink-0 px-1"+ disabled={backDisabled}+ onClick={() => {+ onSelectBack()+ }}+ />+ <div className="mx-1 h-5 shrink-0 border-r border-strong" />+ </>+ )}+ {breadcrumbs.length > 0 ? (+ <HeaderBreadcrumbs breadcrumbs={breadcrumbs} selectBreadcrumb={selectBreadcrumb} />+ ) : null}+ </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">+ <Button+ size="tiny"+ icon={<RefreshCw />}+ type="text"+ loading={isRefreshing}+ onClick={refreshData}+ >+ Reload+ </Button>++ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button+ type="text"+ icon={+ view === 'LIST' ? (+ <List size={16} strokeWidth={2} />+ ) : (+ <Columns size={16} strokeWidth={2} />+ )+ }+ >+ View+ </Button>+ </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} />+ )}+ </div>+ </DropdownMenuItem>+ ))}+ <DropdownMenuSeparator />+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>Sort by</DropdownMenuSubTrigger>+ <DropdownMenuSubContent className="w-44">+ {SORT_BY_OPTIONS.map((option) => (+ <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} />+ )}+ </div>+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ <DropdownMenuSub>+ <DropdownMenuSubTrigger>Sort order</DropdownMenuSubTrigger>+ <DropdownMenuSubContent>+ {SORT_ORDER_OPTIONS.map((option) => (+ <DropdownMenuItem+ key={option.key}+ onClick={() => setSortByOrder(option.key)}+ >+ <div className="flex items-center justify-between w-full">+ <p>{option.name}</p>+ {sortByOrder === option.key && (+ <Check size={16} className="text-brand" strokeWidth={2} />+ )}+ </div>+ </DropdownMenuItem>+ ))}+ </DropdownMenuSubContent>+ </DropdownMenuSub>+ </DropdownMenuContent>+ </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="hidden">+ <input ref={uploadButtonRef} type="file" multiple onChange={handleFilesUpload} />+ </div>+ <ButtonTooltip+ icon={<Upload size={16} strokeWidth={2} />}+ type="text"+ disabled={!canUpdateStorage}+ loading={isUploading}+ onClick={onSelectUpload}+ tooltip={{+ content: {+ side: 'bottom',+ text: !canUpdateStorage+ ? 'You need additional permissions to upload files'+ : undefined,+ },+ }}+ >+ Upload files+ </ButtonTooltip>+ </div>++ <div className="h-6 shrink-0 border-r border-control" />+ <div className="flex shrink-0 items-center px-2">+ {isSearching ? (+ <Input+ 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)}+ />+ ) : (+ <Button+ icon={<Search />}+ size="tiny"+ type="text"+ className="px-1"+ onClick={toggleSearch}+ />+ )}+ </div>+ </div>+ </div>+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeaderSelection.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeaderSelection.tsxnew file mode 100644index 00000000000..db44a8a8722--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerHeaderSelection.tsx@@ -0,0 +1,27 @@+import { X } from 'lucide-react'+import { Button } from 'ui'++import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'++export const BucketFilePickerHeaderSelection = () => {+ const { selectedItems, clearSelectedItems } = useBucketFilePickerStateSnapshot()++ return (+ <div className="z-10 flex h-[40px] items-center rounded-t-md bg-brand-400 px-2 py-1 shadow in-data-[theme*=dark]:bg-brand-500">+ <Button+ icon={<X size={16} strokeWidth={2} />}+ type="text"+ onClick={() => clearSelectedItems()}+ aria-label="Clear selected items"+ />+ <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="border-r border-green-900 py-3 opacity-50" />+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerPreviewPane.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerPreviewPane.tsxnew file mode 100644index 00000000000..82f8ec6aa29--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerPreviewPane.tsx@@ -0,0 +1,191 @@+import { useParams } from 'common'+import { AlertCircle, LoaderCircle, X } from 'lucide-react'+import SVG from 'react-inlinesvg'+import { Button } from 'ui'++import { StorageItemWithColumn } from '../Storage.types'+import { useFetchFileUrlQuery } from '../StorageExplorer/useFetchFileUrlQuery'+import { useBucketFilePickerStateSnapshot } from './BucketFilePickerState'+import { BASE_PATH } from '@/lib/constants'+import { formatBytes } from '@/lib/helpers'++const PREVIEW_SIZE_LIMIT = 10 * 1024 * 1024 // 10MB++const PreviewFile = ({ item }: { item: StorageItemWithColumn }) => {+ const { ref: projectRef } = useParams()+ const { bucket, columns } = useBucketFilePickerStateSnapshot()+ const path = columns.slice(0, item.columnIndex).concat(item.name).join('/')++ const { data: previewUrl, isPending: isLoading } = useFetchFileUrlQuery({+ path,+ projectRef: projectRef!,+ bucket,+ })++ // 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++ const isSkipped = !!mimeType && !!size && size > PREVIEW_SIZE_LIMIT++ 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" />+ </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+ </p>+ </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>+ )+ }+ 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"')+ }+ />+ )+}++export const PreviewPane = ({ onSelect }: { onSelect: (url: string) => void }) => {+ const { ref: projectRef } = useParams()+ const {+ selectedFilePreview: file,+ setSelectedFilePreview,+ bucket,+ columns,+ } = useBucketFilePickerStateSnapshot()++ const path = file ? columns.slice(0, file.columnIndex).concat(file.name).join('/') : ''+ const { data: previewUrl, isLoading } = useFetchFileUrlQuery(+ { path, projectRef: projectRef!, bucket },+ { enabled: !!file }+ )++ if (!file) return null++ 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'++ return (+ <div className="h-full border-l border-overlay bg-surface-100 overflow-y-auto w-[450px] pb-4">+ {/* Preview Header */}+ <div className="flex w-full justify-end items-center gap-2 sticky top-0 bg-surface-100 p-4 border-b">+ <Button+ size="tiny"+ onClick={() => onSelect(previewUrl!)}+ disabled={!previewUrl}+ loading={isLoading}+ >+ Select+ </Button>+ <div className="text-foreground-lighter transition-colors hover:text-foreground">+ <X+ className="cursor-pointer"+ size={14}+ strokeWidth={2}+ onClick={() => setSelectedFilePreview(undefined)}+ />+ </div>+ </div>++ {/* Preview Thumbnail*/}+ <div className="my-4 border border-overlay mx-4">+ <div className="flex h-56 w-full items-center 2xl:h-72">+ <PreviewFile item={file} />+ </div>+ </div>++ <div className="w-full space-y-6 px-4">+ {/* 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} strokeWidth={2} 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>++ {/* 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>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsxnew file mode 100644index 00000000000..5ec97e3b1bd--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerRow.tsx@@ -0,0 +1,184 @@+import { FilesBucket as FilesBucketIcon } from 'icons'+import { AlertCircle, File, Film, FolderOpen, Image, LoaderCircle, Music } from 'lucide-react'+import type { CSSProperties, MouseEvent } from 'react'+import { Checkbox, cn, Tooltip, TooltipContent, TooltipTrigger } from 'ui'++import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES, STORAGE_VIEWS } from '../Storage.constants'+import { type StorageItem } from '../Storage.types'+import { formatBytes } from '@/lib/helpers'++const RowIcon = ({+ view,+ status,+ fileType,+ isOpened = false,+ mimeType,+}: {+ view: STORAGE_VIEWS+ status: STORAGE_ROW_STATUS+ fileType: string+ isOpened?: boolean+ 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" />+ )+ }++ if (fileType === STORAGE_ROW_TYPES.FOLDER) {+ return isOpened ? (+ <FolderOpen size={16} strokeWidth={2} className="text-foreground-lighter" />+ ) : (+ <FilesBucketIcon size={16} strokeWidth={2} className="text-foreground-lighter" />+ )+ }++ if (mimeType?.includes('image')) {+ return <Image size={16} className="text-foreground-lighter" />+ }++ if (mimeType?.includes('audio')) {+ return <Music size={16} strokeWidth={2} className="text-foreground-lighter" />+ }++ if (mimeType?.includes('video')) {+ return <Film size={16} strokeWidth={2} className="text-foreground-lighter" />+ }++ return <File size={16} strokeWidth={2} className="text-foreground-lighter" />+}++interface BucketFilePickerRowProps {+ item: StorageItem+ view: STORAGE_VIEWS+ isSelected: boolean+ isPreviewed: boolean+ isOpened: boolean+ isDisabled?: boolean+ hideCheckbox: boolean+ onCheck: (isShiftKeyHeld: boolean) => void+ onClick?: (event: MouseEvent<HTMLDivElement>) => void+ style?: CSSProperties+}++export const BucketFilePickerRow = ({+ item,+ view = STORAGE_VIEWS.COLUMNS,+ onCheck,+ onClick,+ isSelected,+ isPreviewed,+ isOpened,+ isDisabled = false,+ hideCheckbox,+ style,+}: BucketFilePickerRowProps) => {+ const size = item.metadata ? formatBytes(item.metadata.size) : '-'+ const mimeType = item.metadata ? item.metadata.mimetype : '-'+ const createdAt = item.created_at ? new Date(item.created_at).toLocaleString() : '-'+ const updatedAt = item.updated_at ? new Date(item.updated_at).toLocaleString() : '-'++ const nameWidth =+ view === STORAGE_VIEWS.LIST && item.isCorrupted+ ? `calc(100% - 60px)`+ : view === STORAGE_VIEWS.LIST && !item.isCorrupted+ ? `calc(100% - 50px)`+ : '100%'++ return (+ <div style={style} className="h-full border-b border-default">+ <div+ className={cn(+ 'storage-row group flex h-full items-center px-2.5',+ 'hover:bg-panel-footer-light in-data-[theme*=dark]:hover:bg-panel-footer-dark',+ `${isOpened ? 'bg-selection' : ''}`,+ `${isSelected ? 'bg-selection' : ''}`,+ `${isPreviewed ? 'bg-selection hover:bg-selection' : ''}`,+ `${item.status !== STORAGE_ROW_STATUS.LOADING ? 'cursor-pointer' : ''}`,+ isDisabled && 'cursor-not-allowed opacity-40 hover:bg-transparent'+ )}+ onClick={isDisabled ? undefined : onClick}+ >+ <div+ className={cn(+ 'flex items-center',+ view === STORAGE_VIEWS.LIST ? 'w-[40%] min-w-[250px]' : 'w-[90%]'+ )}+ >+ <div className="relative w-[30px]" onClick={(event) => event.stopPropagation()}>+ <div+ className={cn('top-0.5', {+ absolute: !hideCheckbox,+ 'group-hover:hidden': !hideCheckbox && item.type === STORAGE_ROW_TYPES.FILE,+ hidden: isSelected,+ })}+ >+ <RowIcon+ view={view}+ status={item.status}+ fileType={item.type}+ isOpened={isOpened}+ mimeType={item.metadata?.mimetype}+ />+ </div>+ {!hideCheckbox && (+ <Checkbox+ className={cn(+ 'w-full',+ { invisible: item.type !== STORAGE_ROW_TYPES.FILE },+ isSelected ? 'opacity-100' : 'opacity-0 group-hover:opacity-100'+ )}+ checked={isSelected}+ onChange={(event) => {+ event.stopPropagation()+ onCheck((event.nativeEvent as KeyboardEvent).shiftKey)+ }}+ />+ )}+ </div>+ <p title={item.name} className="truncate text-sm" style={{ width: nameWidth }}>+ {item.name}+ </p>+ {item.isCorrupted && (+ <Tooltip>+ <TooltipTrigger>+ <AlertCircle size={18} strokeWidth={2} className="text-foreground-light" />+ </TooltipTrigger>+ <TooltipContent side="bottom">+ File is corrupted, please delete and reupload again.+ </TooltipContent>+ </Tooltip>+ )}+ </div>++ {view === STORAGE_VIEWS.LIST && (+ <>+ <p className="w-[11%] min-w-[100px] truncate text-sm">{size}</p>+ <p className="w-[14%] min-w-[100px] truncate text-sm">{mimeType}</p>+ <p className="w-[15%] min-w-[160px] truncate text-sm">{createdAt}</p>+ <p className="w-[15%] min-w-[160px] truncate text-sm">{updatedAt}</p>+ </>+ )}++ <div+ className={`flex items-center justify-end ${+ view === STORAGE_VIEWS.LIST ? 'grow' : 'w-[10%]'+ }`}+ onClick={(event) =>+ // Stops click event from this div, to resolve an issue with menu item's click event triggering unexpected row select+ event.stopPropagation()+ }+ >+ {item.status === STORAGE_ROW_STATUS.LOADING && (+ <LoaderCircle+ className={`animate-spin text-foreground-lighter ${view === STORAGE_VIEWS.LIST ? 'invisible' : ''}`}+ size={14}+ strokeWidth={2}+ />+ )}+ </div>+ </div>+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerState.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerState.tsxnew file mode 100644index 00000000000..7ff3c850a1d--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/BucketFilePickerState.tsx@@ -0,0 +1,86 @@+import { createContext, PropsWithChildren, useContext, useMemo } from 'react'+import { proxy, useSnapshot } from 'valtio'++import { StorageItemWithColumn } from '@/components/interfaces/Storage/Storage.types'+import type { Bucket } from '@/data/storage/buckets-query'++function createBucketFilePickerState({+ bucket,+ maxFiles,+ acceptedFileExtensions,+}: {+ bucket: Bucket+ maxFiles: number+ acceptedFileExtensions?: string[]+}) {+ const state = proxy({+ bucket: bucket,+ maxFiles: maxFiles,+ acceptedFileExtensions: acceptedFileExtensions,++ columns: [] as string[],+ popColumn: () => {+ const lastColumnIndex = state.columns.length - 1+ state.columns = state.columns.slice(0, lastColumnIndex)+ },+ popColumnAtIndex: (index: number) => {+ state.columns = state.columns.slice(0, index)+ },+ pushColumnAtIndex: (column: string, index: number) => {+ state.columns = state.columns.slice(0, index).concat([column])+ },++ selectedItems: [] as StorageItemWithColumn[],+ setSelectedItems: (items: StorageItemWithColumn[]) => (state.selectedItems = items),+ clearSelectedItems: (columnIndex?: number) => {+ if (columnIndex !== undefined) {+ state.selectedItems = state.selectedItems.filter((item) => item.columnIndex !== columnIndex)+ } else {+ state.selectedItems = []+ }+ },++ itemSearchString: '',+ setItemSearchString: (value: string) => (state.itemSearchString = value),++ selectedFilePreview: undefined as StorageItemWithColumn | undefined,+ setSelectedFilePreview: (file?: StorageItemWithColumn) => (state.selectedFilePreview = file),+ })++ return state+}++export type BucketFilePickerState = ReturnType<typeof createBucketFilePickerState>++const DEFAULT_STATE_CONFIG = {+ bucket: {} as Bucket,+ maxFiles: 1 as const,+}++const BucketFilePickerStateContext = createContext<BucketFilePickerState>(+ createBucketFilePickerState(DEFAULT_STATE_CONFIG)+)++export const BucketFilePickerStateContextProvider = ({+ bucket,+ maxFiles,+ acceptedFileExtensions,+ children,+}: PropsWithChildren<{ bucket: Bucket; maxFiles: number; acceptedFileExtensions?: string[] }>) => {+ const state = useMemo(+ () => createBucketFilePickerState({ bucket, maxFiles, acceptedFileExtensions }),+ // eslint-disable-next-line react-hooks/exhaustive-deps+ [bucket, maxFiles, acceptedFileExtensions?.join(',')]+ )++ return (+ <BucketFilePickerStateContext.Provider value={state}>+ {children}+ </BucketFilePickerStateContext.Provider>+ )+}++export function useBucketFilePickerStateSnapshot(options?: Parameters<typeof useSnapshot>[1]) {+ const state = useContext(BucketFilePickerStateContext)+ return useSnapshot(state, options) as BucketFilePickerState+}diff --git a/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/index.tsx b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/index.tsxnew file mode 100644index 00000000000..f829967b1ac--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketFilePickerDialog/index.tsx@@ -0,0 +1,81 @@+import { useBreakpoint } from 'common'+import {+ Dialog,+ DialogContent,+ DialogHeader,+ DialogTitle,+ Sheet,+ SheetContent,+ SheetHeader,+ SheetTitle,+} from 'ui'++import { BucketFilePickerExplorer } from './BucketFilePickerExplorer'+import { BucketFilePickerStateContextProvider } from './BucketFilePickerState'+import type { Bucket } from '@/data/storage/buckets-query'++export type BucketsFilePickerDialogProps = {+ open: boolean+ onOpenChange: (open: boolean) => void+ selectedBucket: Bucket+ acceptedFileExtensions?: string[]+ onSelect: (value: string) => void+}++export function BucketsFilePickerDialog({+ open,+ onOpenChange,+ selectedBucket,+ acceptedFileExtensions,+ onSelect,+}: BucketsFilePickerDialogProps) {+ const isMobileLayout = useBreakpoint('lg')++ const handleSelect = (value: string) => {+ onSelect(value)+ onOpenChange(false)+ }++ return (+ <>+ {isMobileLayout ? (+ <Sheet open={open} onOpenChange={onOpenChange}>+ <SheetContent side="bottom" className="flex h-[85vh] flex-col gap-0 p-0">+ <SheetHeader className="flex flex-row items-center gap-2 border-b border-overlay px-4 py-3 text-left">+ <SheetTitle className="min-w-0 flex-1 text-left">Choose a file</SheetTitle>+ </SheetHeader>+ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col px-2 pb-3 pt-2">+ <BucketFilePickerStateContextProvider+ bucket={selectedBucket}+ maxFiles={1}+ acceptedFileExtensions={acceptedFileExtensions}+ >+ <BucketFilePickerExplorer onSelect={handleSelect} />+ </BucketFilePickerStateContextProvider>+ </div>+ </SheetContent>+ </Sheet>+ ) : (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent+ size="xxlarge"+ className="flex h-[85vh] max-h-[500px] max-w-5xl flex-col gap-0 overflow-hidden p-0"+ >+ <DialogHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4">+ <DialogTitle className="min-w-0 flex-1">Choose a file</DialogTitle>+ </DialogHeader>+ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden p-3">+ <BucketFilePickerStateContextProvider+ bucket={selectedBucket}+ maxFiles={1}+ acceptedFileExtensions={acceptedFileExtensions}+ >+ <BucketFilePickerExplorer onSelect={handleSelect} />+ </BucketFilePickerStateContextProvider>+ </div>+ </DialogContent>+ </Dialog>+ )}+ </>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableHeader.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableHeader.tsxnew file mode 100644index 00000000000..c78b1c9e77d--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableHeader.tsx@@ -0,0 +1,41 @@+import { TableHead, TableHeader, TableRow } from 'ui'++import {+ VirtualizedTableHead,+ VirtualizedTableHeader,+ VirtualizedTableRow,+} from '@/components/ui/VirtualizedTable'++type BucketTableMode = 'standard' | 'virtualized'++type BucketTableHeaderProps = {+ mode: BucketTableMode+ hasBuckets?: boolean+}++export const BucketTableHeader = ({ mode, hasBuckets = true }: BucketTableHeaderProps) => {+ const BucketTableHeader = mode === 'standard' ? TableHeader : VirtualizedTableHeader+ const BucketTableRow = mode === 'standard' ? TableRow : VirtualizedTableRow+ const BucketTableHead = mode === 'standard' ? TableHead : VirtualizedTableHead++ const stickyClasses = 'sticky top-0 z-10 bg-200'++ return (+ <BucketTableHeader>+ <BucketTableRow>+ {hasBuckets && (+ <BucketTableHead className={`${stickyClasses} w-2 pr-1`}>+ <span className="sr-only">Icon</span>+ </BucketTableHead>+ )}+ <BucketTableHead className={stickyClasses}>Name</BucketTableHead>+ <BucketTableHead className={stickyClasses}>Policies</BucketTableHead>+ <BucketTableHead className={stickyClasses}>File size limit</BucketTableHead>+ <BucketTableHead className={stickyClasses}>Allowed MIME types</BucketTableHead>+ <BucketTableHead className={stickyClasses}>+ <span className="sr-only">Actions</span>+ </BucketTableHead>+ </BucketTableRow>+ </BucketTableHeader>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableRow.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableRow.tsxnew file mode 100644index 00000000000..41e6989fe89--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketTableRow.tsx@@ -0,0 +1,157 @@+import { FilesBucket as FilesBucketIcon } from 'icons'+import { ChevronRight } from 'lucide-react'+import { KeyboardEventHandler, MouseEventHandler } from 'react'+import { Badge, cn, TableCell, TableRow, Tooltip, TooltipContent, TooltipTrigger } from 'ui'++import type { AllowedBucketType } from './types'+import { PUBLIC_BUCKET_TOOLTIP } from '@/components/interfaces/Storage/Storage.constants'+import { useBucketPolicyCount } from '@/components/interfaces/Storage/useBucketPolicyCount'+import { VirtualizedTableCell, VirtualizedTableRow } from '@/components/ui/VirtualizedTable'+import { Bucket } from '@/data/storage/buckets-query'+import { formatBytes } from '@/lib/helpers'++type BucketTableMode = 'standard' | 'virtualized'++type BucketTableEmptyStateProps = {+ mode: BucketTableMode+ filterString: string+}++export const BucketTableEmptyState = ({ mode, filterString }: BucketTableEmptyStateProps) => {+ const BucketTableRow = mode === 'standard' ? TableRow : VirtualizedTableRow+ const BucketTableCell = mode === 'standard' ? TableCell : VirtualizedTableCell++ return (+ <BucketTableRow className="[&>td]:hover:bg-inherit">+ <BucketTableCell colSpan={5}>+ <p className="text-sm text-foreground">No results found</p>+ <p className="text-sm text-foreground-lighter">+ Your search for “{filterString}” did not return any results+ </p>+ </BucketTableCell>+ </BucketTableRow>+ )+}++type BucketTableRowProps = {+ mode: BucketTableMode+ bucket: Bucket+ onSelectBucket: (bucket: Bucket) => void+ allowedBucketType: AllowedBucketType+ formattedGlobalUploadLimit: string+}++export const BucketTableRow = ({+ mode,+ bucket,+ onSelectBucket,+ allowedBucketType,+ formattedGlobalUploadLimit,+}: BucketTableRowProps) => {+ const { getPolicyCount } = useBucketPolicyCount()++ const BucketTableRow = mode === 'standard' ? TableRow : VirtualizedTableRow+ const BucketTableCell = mode === 'standard' ? TableCell : VirtualizedTableCell++ const isDisabled = !(+ allowedBucketType === 'all' ||+ (allowedBucketType === 'public' && bucket.public) ||+ (allowedBucketType === 'private' && !bucket.public)+ )++ const handleRowActivate: MouseEventHandler<HTMLTableRowElement> = (e) => {+ e.preventDefault()+ if (isDisabled) return+ onSelectBucket(bucket)+ }++ const handleRowKeyDown: KeyboardEventHandler<HTMLTableRowElement> = (e) => {+ if (isDisabled) return+ if (e.key === 'Enter' || e.key === ' ') {+ e.preventDefault()+ onSelectBucket(bucket)+ }+ }++ return (+ <Tooltip>+ <TooltipTrigger asChild>+ <BucketTableRow+ key={bucket.id}+ data-bucket-id={bucket.id}+ className={cn(+ 'relative cursor-pointer h-16 group inset-focus',+ isDisabled && 'opacity-50 [&>td]:hover:bg-transparent cursor-not-allowed'+ )}+ onClick={handleRowActivate}+ onKeyDown={handleRowKeyDown}+ tabIndex={isDisabled ? -1 : 0}+ aria-disabled={isDisabled || undefined}+ >+ <BucketTableCell className="w-2 pr-1">+ <FilesBucketIcon aria-label="bucket icon" size={16} className="text-foreground-muted" />+ </BucketTableCell>+ <BucketTableCell className="flex-1">+ <div className="flex items-center gap-2.5">+ <p className="whitespace-nowrap max-w-[512px] truncate">{bucket.id}</p>+ {bucket.public && (+ <Tooltip>+ <TooltipTrigger asChild>+ <Badge variant="warning" className="flex">+ Public+ </Badge>+ </TooltipTrigger>+ <TooltipContent side="top">{PUBLIC_BUCKET_TOOLTIP}</TooltipContent>+ </Tooltip>+ )}+ </div>+ </BucketTableCell>++ <BucketTableCell>+ <p className="text-foreground-light">{getPolicyCount(bucket.id)}</p>+ </BucketTableCell>++ <BucketTableCell>+ <p+ className={`whitespace-nowrap ${bucket.file_size_limit ? 'text-foreground-light' : 'text-foreground-muted'}`}+ >+ {bucket.file_size_limit+ ? formatBytes(bucket.file_size_limit)+ : `Unset (${formattedGlobalUploadLimit})`}+ </p>+ </BucketTableCell>++ <BucketTableCell>+ <p+ className={+ bucket.allowed_mime_types ? 'text-foreground-light' : 'text-foreground-muted'+ }+ >+ {bucket.allowed_mime_types ? bucket.allowed_mime_types.join(', ') : 'Any'}+ </p>+ </BucketTableCell>++ <BucketTableCell>+ {!isDisabled && (+ <>+ <div className="flex justify-end items-center h-full">+ <ChevronRight aria-hidden={true} size={14} className="text-foreground-muted/60" />+ </div>+ <button tabIndex={-1} className="sr-only">+ Go to bucket details+ </button>+ </>+ )}+ </BucketTableCell>+ </BucketTableRow>+ </TooltipTrigger>+ {isDisabled && (+ <TooltipContent>+ {allowedBucketType === 'public'+ ? 'Private buckets are not selectable for this action. Please select a public bucket.'+ : 'Public buckets are not selectable for this action. Please select a private bucket.'}+ </TooltipContent>+ )}+ </Tooltip>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsxnew file mode 100644index 00000000000..15a6f353a90--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsPicker.tsx@@ -0,0 +1,165 @@+import { useDebounce } from '@uidotdev/usehooks'+import { useParams } from 'common'+import { ArrowDownNarrowWide, Search } from 'lucide-react'+import { useCallback, useMemo, useState } from 'react'+import {+ Button,+ Card,+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuRadioGroup,+ DropdownMenuRadioItem,+ DropdownMenuTrigger,+} from 'ui'+import { Admonition } from 'ui-patterns/admonition'+import { Input } from 'ui-patterns/DataInputs/Input'+import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'++import { CreateBucketModal } from '../CreateBucketModal'+import { EmptyBucketState } from '../EmptyBucketState'+import { CreateBucketButton } from '../NewBucketButton'+import { STORAGE_BUCKET_SORT } from '../Storage.constants'+import { useStoragePreference } from '../StorageExplorer/useStoragePreference'+import { BucketsTable } from './BucketsTable'+import type { AllowedBucketType } from './types'+import AlertError from '@/components/ui/AlertError'+import { InlineLink } from '@/components/ui/InlineLink'+import { useProjectStorageConfigQuery } from '@/data/config/project-storage-config-query'+import { usePaginatedBucketsQuery, type Bucket } from '@/data/storage/buckets-query'+import { IS_PLATFORM } from '@/lib/constants'+import { formatBytes } from '@/lib/helpers'++export const BucketsPicker = ({+ onSelectBucket,+ allowedBucketType = 'all',+}: {+ onSelectBucket: (bucket: Bucket) => void+ allowedBucketType?: AllowedBucketType+}) => {+ const { ref: projectRef } = useParams()+ const [createBucketShown, showCreateBucket] = useState(false)+ const { sortBucket, setSortBucket } = useStoragePreference(projectRef!)++ const [filterString, setFilterString] = useState('')+ const debouncedFilterString = useDebounce(filterString, 250)+ const normalizedSearch = debouncedFilterString.trim()++ const sortColumn = sortBucket === STORAGE_BUCKET_SORT.ALPHABETICAL ? 'name' : 'created_at'+ const sortOrder = sortBucket === STORAGE_BUCKET_SORT.ALPHABETICAL ? 'asc' : 'desc'++ const { data } = useProjectStorageConfigQuery({ projectRef }, { enabled: IS_PLATFORM })+ const {+ data: bucketsData,+ error: bucketsError,+ isError: isErrorBuckets,+ isPending: isLoadingBuckets,+ isSuccess: isSuccessBuckets,+ isFetching: isFetchingBuckets,+ fetchNextPage,+ hasNextPage,+ } = usePaginatedBucketsQuery({+ projectRef,+ search: normalizedSearch.length > 0 ? normalizedSearch : undefined,+ sortColumn,+ sortOrder,+ })+ const buckets = useMemo(() => bucketsData?.pages.flatMap((page) => page) ?? [], [bucketsData])+ const fileBuckets = buckets.filter((bucket) => !('type' in bucket) || bucket.type === 'STANDARD')+ const hasNoBuckets = fileBuckets.length === 0 && normalizedSearch.length === 0++ const formattedGlobalUploadLimit = formatBytes(data?.fileSizeLimit ?? 0)++ const hasNoApiKeys =+ isErrorBuckets && bucketsError.message.includes('Project has no active API keys')++ const handleLoadMoreBuckets = useCallback(() => {+ if (hasNextPage && !isFetchingBuckets) {+ fetchNextPage()+ }+ }, [hasNextPage, isFetchingBuckets, fetchNextPage])++ return (+ <div className="flex h-full min-h-0 w-full flex-1 flex-col gap-3">+ {isLoadingBuckets && <GenericSkeletonLoader />}+ {isErrorBuckets && (+ <>+ {hasNoApiKeys ? (+ <Admonition type="warning" title="Project has no active API keys enabled">+ <p className="leading-normal! text-sm">+ The Dashboard relies on having active API keys on the project to function. If you'd+ like to use Storage through the Dashboard, create a set of API keys{' '}+ <InlineLink href={`/project/${projectRef}/settings/api-keys/new`}>here</InlineLink>.+ </p>+ </Admonition>+ ) : (+ <AlertError error={bucketsError} subject="Failed to retrieve buckets" />+ )}+ </>+ )}+ {isSuccessBuckets && (+ <>+ {hasNoBuckets ? (+ <EmptyBucketState+ bucketType="files"+ onCreateBucket={() => showCreateBucket(true)}+ className="h-full justify-center"+ />+ ) : (+ <>+ <div className="flex items-center justify-between">+ <div className="flex items-center gap-x-2">+ <Input+ size="tiny"+ className="grow lg:grow-0 w-52"+ placeholder="Search for a bucket"+ value={filterString}+ onChange={(e) => setFilterString(e.target.value)}+ icon={<Search />}+ />+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Button type="default" icon={<ArrowDownNarrowWide />}>+ Sorted by {sortBucket === 'alphabetical' ? 'name' : 'created at'}+ </Button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="start" className="w-40">+ <DropdownMenuRadioGroup+ value={sortBucket}+ onValueChange={(value) => setSortBucket(value as STORAGE_BUCKET_SORT)}+ >+ <DropdownMenuRadioItem value="alphabetical">+ Sort by name+ </DropdownMenuRadioItem>+ <DropdownMenuRadioItem value="created_at">+ Sort by created at+ </DropdownMenuRadioItem>+ </DropdownMenuRadioGroup>+ </DropdownMenuContent>+ </DropdownMenu>+ </div>+ <CreateBucketButton onClick={() => showCreateBucket(true)} />+ </div>++ <Card className="min-h-0 flex-1 overflow-hidden">+ <BucketsTable+ buckets={fileBuckets}+ projectRef={projectRef ?? '_'}+ filterString={filterString}+ formattedGlobalUploadLimit={formattedGlobalUploadLimit}+ onSelectBucket={onSelectBucket}+ allowedBucketType={allowedBucketType}+ pagination={{+ hasMore: hasNextPage,+ isLoadingMore: isFetchingBuckets,+ onLoadMore: handleLoadMoreBuckets,+ }}+ />+ </Card>+ </>+ )}+ </>+ )}+ <CreateBucketModal open={createBucketShown} onOpenChange={showCreateBucket} />+ </div>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.LoadMoreRow.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.LoadMoreRow.tsxnew file mode 100644index 00000000000..6417c688ba8--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.LoadMoreRow.tsx@@ -0,0 +1,47 @@+import { useIntersectionObserver } from '@uidotdev/usehooks'+import { useEffect, type ReactNode } from 'react'+import { TableCell, TableRow } from 'ui'+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'++import type { BucketsTablePaginationProps } from './types'+import { VirtualizedTableCell, VirtualizedTableRow } from '@/components/ui/VirtualizedTable'++type LoadMoreRowProps = {+ mode: 'standard' | 'virtualized'+ colSpan: number+} & BucketsTablePaginationProps++export const LoadMoreRow = ({+ mode,+ colSpan,++ hasMore = false,+ isLoadingMore = false,+ onLoadMore,+}: LoadMoreRowProps): ReactNode => {+ const [sentinelRef, entry] = useIntersectionObserver({+ threshold: 0,+ rootMargin: '200px 0px 200px 0px',+ })++ useEffect(() => {+ if (entry?.isIntersecting && hasMore && !isLoadingMore) {+ onLoadMore?.()+ }+ }, [entry?.isIntersecting, hasMore, isLoadingMore, onLoadMore])++ if (!hasMore && !isLoadingMore) return null++ const RowComponent = mode === 'standard' ? TableRow : VirtualizedTableRow+ const CellComponent = mode === 'standard' ? TableCell : VirtualizedTableCell++ return (+ <RowComponent ref={sentinelRef}>+ {Array.from({ length: colSpan }, (_, idx) => (+ <CellComponent key={idx}>+ {idx !== 0 && idx !== colSpan - 1 && <ShimmeringLoader className="w-3/4" />}+ </CellComponent>+ ))}+ </RowComponent>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.tsxnew file mode 100644index 00000000000..a73e9f3c7ef--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/BucketsTable.tsx@@ -0,0 +1,124 @@+import { useRef } from 'react'+import { Table, TableBody } from 'ui'++import { LoadMoreRow } from './BucketsTable.LoadMoreRow'+import { BucketTableHeader } from './BucketTableHeader'+import { BucketTableEmptyState, BucketTableRow } from './BucketTableRow'+import type { AllowedBucketType, BucketsTablePaginationProps } from './types'+import { VirtualizedTable, VirtualizedTableBody } from '@/components/ui/VirtualizedTable'+import { type Bucket } from '@/data/storage/buckets-query'++type BucketsTableProps = {+ buckets: Bucket[]+ projectRef: string+ filterString: string+ formattedGlobalUploadLimit: string+ onSelectBucket: (bucket: Bucket) => void+ allowedBucketType: AllowedBucketType+ pagination: BucketsTablePaginationProps+}++export const BucketsTable = (props: BucketsTableProps) => {+ const isVirtualized = props.buckets.length > 50+ return isVirtualized ? (+ <BucketsTableVirtualized {...props} />+ ) : (+ <BucketsTableUnvirtualized {...props} />+ )+}++const BucketsTableUnvirtualized = ({+ buckets,+ filterString,+ formattedGlobalUploadLimit,+ onSelectBucket,+ allowedBucketType,+ pagination: { hasMore = false, isLoadingMore = false, onLoadMore },+}: BucketsTableProps) => {+ const showSearchEmptyState = buckets.length === 0 && filterString.length > 0++ return (+ <Table+ containerProps={{+ containerClassName: 'h-full overflow-auto',+ className: 'overflow-visible',+ }}+ >+ <BucketTableHeader mode="standard" hasBuckets={buckets.length > 0} />+ <TableBody>+ {showSearchEmptyState ? (+ <BucketTableEmptyState mode="standard" filterString={filterString} />+ ) : (+ buckets.map((bucket) => (+ <BucketTableRow+ mode="standard"+ key={bucket.id}+ bucket={bucket}+ onSelectBucket={onSelectBucket}+ allowedBucketType={allowedBucketType}+ formattedGlobalUploadLimit={formattedGlobalUploadLimit}+ />+ ))+ )}+ <LoadMoreRow+ mode="standard"+ colSpan={6}+ hasMore={hasMore}+ isLoadingMore={isLoadingMore}+ onLoadMore={onLoadMore}+ />+ </TableBody>+ </Table>+ )+}++const BucketsTableVirtualized = ({+ buckets,+ filterString,+ formattedGlobalUploadLimit,+ onSelectBucket,+ allowedBucketType,+ pagination: { hasMore = false, isLoadingMore = false, onLoadMore },+}: BucketsTableProps) => {+ const showSearchEmptyState = buckets.length === 0 && filterString.length > 0+ const scrollContainerRef = useRef<HTMLDivElement>(null)++ return (+ <VirtualizedTable+ data={buckets}+ estimateSize={() => 59}+ getItemKey={(bucket) => bucket.id}+ scrollContainerRef={scrollContainerRef}+ >+ <BucketTableHeader mode="virtualized" hasBuckets={buckets.length > 0} />+ <VirtualizedTableBody<Bucket>+ paddingColSpan={5}+ emptyContent={+ showSearchEmptyState ? (+ <BucketTableEmptyState mode="virtualized" filterString={filterString} />+ ) : undefined+ }+ trailingContent={+ <LoadMoreRow+ mode="virtualized"+ colSpan={6}+ hasMore={hasMore}+ isLoadingMore={isLoadingMore}+ onLoadMore={onLoadMore}+ />+ }+ >+ {(bucket) => (+ <BucketTableRow+ mode="virtualized"+ key={bucket.id}+ bucket={bucket}+ onSelectBucket={onSelectBucket}+ allowedBucketType={allowedBucketType}+ formattedGlobalUploadLimit={formattedGlobalUploadLimit}+ />+ )}+ </VirtualizedTableBody>+ </VirtualizedTable>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/index.tsx b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/index.tsxnew file mode 100644index 00000000000..a4675196516--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/index.tsx@@ -0,0 +1,71 @@+import { useBreakpoint } from 'common'+import {+ Button,+ Dialog,+ DialogContent,+ DialogHeader,+ DialogTitle,+ Sheet,+ SheetContent,+ SheetHeader,+ SheetTitle,+} from 'ui'++import { BucketsPicker } from './BucketsPicker'+import type { AllowedBucketType } from './types'+import type { Bucket } from '@/data/storage/buckets-query'++export type BucketsPickerDialogProps = {+ open: boolean+ onOpenChange: (open: boolean) => void+ acceptedFileExtensions?: string[]+ hideUnsupportedFiles?: boolean+ onSelect: (bucket: Bucket) => void+ allowedBucketType: AllowedBucketType+}++export function BucketsPickerDialog({+ open,+ onOpenChange,+ onSelect,+ allowedBucketType,+}: BucketsPickerDialogProps) {+ const isMobileLayout = useBreakpoint('lg')++ return (+ <>+ {isMobileLayout ? (+ <Sheet open={open} onOpenChange={onOpenChange}>+ <SheetContent side="bottom" className="flex h-[85vh] flex-col gap-0 p-0">+ <SheetHeader className="flex flex-row items-center gap-2 border-b border-overlay px-4 py-3 text-left">+ <Button type="text" size="tiny" className="shrink-0">+ Buckets+ </Button>+ <SheetTitle className="min-w-0 flex-1 text-left">Select a bucket</SheetTitle>+ </SheetHeader>+ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col px-2 pb-3 pt-2">+ <BucketsPicker onSelectBucket={onSelect} allowedBucketType={allowedBucketType} />+ </div>+ </SheetContent>+ </Sheet>+ ) : (+ <Dialog open={open} onOpenChange={onOpenChange}>+ <DialogContent+ size="xxlarge"+ className="flex h-[85vh] max-h-[500px] max-w-5xl flex-col gap-0 overflow-hidden p-0"+ >+ <DialogHeader className="flex flex-row items-center gap-2 border-b border-overlay px-6 py-4">+ <Button type="text" size="tiny" className="shrink-0">+ Buckets+ </Button>+ <DialogTitle className="min-w-0 flex-1">Select a bucket</DialogTitle>+ </DialogHeader>+ <div className="flex h-full min-h-0 min-w-0 flex-1 flex-col overflow-hidden p-3">+ <BucketsPicker onSelectBucket={onSelect} allowedBucketType={allowedBucketType} />+ </div>+ </DialogContent>+ </Dialog>+ )}+ </>+ )+}diff --git a/apps/studio/components/interfaces/Storage/BucketsPickerDialog/types.ts b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/types.tsnew file mode 100644index 00000000000..c73379d2ca2--- /dev/null+++ b/apps/studio/components/interfaces/Storage/BucketsPickerDialog/types.ts@@ -0,0 +1,7 @@+export type AllowedBucketType = 'all' | 'public' | 'private'++export type BucketsTablePaginationProps = {+ hasMore?: boolean+ isLoadingMore?: boolean+ onLoadMore?: () => void+}diff --git a/apps/studio/components/interfaces/Storage/EmptyBucketState.tsx b/apps/studio/components/interfaces/Storage/EmptyBucketState.tsxindex 61bb1d2eb72..7b152a46c03 100644--- a/apps/studio/components/interfaces/Storage/EmptyBucketState.tsx+++ b/apps/studio/components/interfaces/Storage/EmptyBucketState.tsx@@ -7,7 +7,7 @@ import { BUCKET_TYPES } from './Storage.constants'interface EmptyBucketStateProps {bucketType: keyof typeof BUCKET_TYPESclassName?: string- onCreateBucket?: () => void+ onCreateBucket: () => void}export const EmptyBucketState = ({diff --git a/apps/studio/components/interfaces/Storage/NewBucketButton.tsx b/apps/studio/components/interfaces/Storage/NewBucketButton.tsxindex 8d088f90377..06f56b37317 100644--- a/apps/studio/components/interfaces/Storage/NewBucketButton.tsx+++ b/apps/studio/components/interfaces/Storage/NewBucketButton.tsx@@ -8,7 +8,7 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'export const CreateBucketButton = ({onClick,}: {- onClick?: MouseEventHandler<HTMLButtonElement>+ onClick: MouseEventHandler<HTMLButtonElement>}) => {const { can: canCreateBuckets } = useAsyncCheckPermissions(PermissionAction.STORAGE_WRITE, '*')diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsxindex c8a3d53dbd1..43e848734a0 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/PreviewPane.tsx@@ -11,6 +11,7 @@ import {import { URL_EXPIRY_DURATION } from '../Storage.constants'import { StorageItem } from '../Storage.types'+import { getPathAlongOpenedFolders } from './StorageExplorer.utils'import { useCopyUrl } from './useCopyUrl'import { useFetchFileUrlQuery } from './useFetchFileUrlQuery'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'@@ -22,10 +23,12 @@ import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'const PREVIEW_SIZE_LIMIT = 10 * 1024 * 1024 // 10MBconst PreviewFile = ({ item }: { item: StorageItem }) => {- const { projectRef, selectedBucket } = useStorageExplorerStateSnapshot()+ const { projectRef, selectedBucket, openedFolders } = useStorageExplorerStateSnapshot()+ const folderPath = getPathAlongOpenedFolders({ openedFolders, selectedBucket }, false)+ const path = [folderPath, item.name].filter(Boolean).join('/')const { data: previewUrl, isPending: isLoading } = useFetchFileUrlQuery({- file: item,+ path,projectRef: projectRef,bucket: selectedBucket,})diff --git a/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx b/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsxindex 066153c513f..7304736dd5a 100644--- a/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx+++ b/apps/studio/components/interfaces/Storage/StorageExplorer/useFetchFileUrlQuery.tsx@@ -1,11 +1,8 @@import { useQuery } from '@tanstack/react-query'-import { StorageItem } from '../Storage.types'-import { getPathAlongOpenedFolders } from './StorageExplorer.utils'import { getPublicUrlForBucketObject } from '@/data/storage/bucket-object-get-public-url-mutation'import { signBucketObject } from '@/data/storage/bucket-object-sign-mutation'import { Bucket } from '@/data/storage/buckets-query'-import { useStorageExplorerStateSnapshot } from '@/state/storage-explorer'import type { ResponseError, UseCustomQueryOptions } from '@/types'const DEFAULT_EXPIRY = 7 * 24 * 60 * 60 // in seconds, default to 1 week@@ -36,23 +33,18 @@ export const fetchFileUrl = async (}type UseFileUrlQueryVariables = {- file: StorageItem+ path: stringprojectRef: stringbucket: Bucket}export const useFetchFileUrlQuery = (- { file, projectRef, bucket }: UseFileUrlQueryVariables,+ { path, projectRef, bucket }: UseFileUrlQueryVariables,{ ...options }: UseCustomQueryOptions<string, ResponseError> = {}) => {- const { openedFolders, selectedBucket } = useStorageExplorerStateSnapshot()- const pathToFile = getPathAlongOpenedFolders({ openedFolders, selectedBucket }, false)- const formattedPathToFile = [pathToFile, file?.name].join('/')-return useQuery<string, ResponseError, string>({- queryKey: [projectRef, 'buckets', bucket.public, bucket.id, 'file', formattedPathToFile],- queryFn: () =>- fetchFileUrl(formattedPathToFile, projectRef, bucket.id, bucket.public, DEFAULT_EXPIRY),+ queryKey: [projectRef, 'buckets', bucket.public, bucket.id, 'file', path],+ queryFn: () => fetchFileUrl(path, projectRef, bucket.id, bucket.public, DEFAULT_EXPIRY),staleTime: DEFAULT_EXPIRY * 1000,...options,})diff --git a/apps/studio/data/storage/bucket-objects-infinite-query.ts b/apps/studio/data/storage/bucket-objects-infinite-query.tsnew file mode 100644index 00000000000..eadaf31a821--- /dev/null+++ b/apps/studio/data/storage/bucket-objects-infinite-query.ts@@ -0,0 +1,55 @@+import { InfiniteData, useInfiniteQuery } from '@tanstack/react-query'++import { listBucketObjects, type StorageObject } from './bucket-objects-list-mutation'+import { storageKeys } from './keys'+import type { components } from '@/data/api'+import type { ResponseError, UseCustomInfiniteQueryOptions } from '@/types'++const DEFAULT_LIMIT = 200++type StorageObjectsQueryParams = {+ projectRef?: string+ bucketId?: string+ path: string+ options?: Omit<NonNullable<components['schemas']['GetObjectsBody']['options']>, 'offset'>+}++export type StorageObjectsData = StorageObject[]+export type StorageObjectsError = ResponseError++export const useBucketObjectsInfiniteQuery = <TData = StorageObjectsData>(+ { projectRef, bucketId, path, options }: StorageObjectsQueryParams,+ {+ enabled = true,+ ...queryOptions+ }: UseCustomInfiniteQueryOptions<+ StorageObjectsData,+ StorageObjectsError,+ InfiniteData<TData>,+ readonly unknown[],+ number+ > = {}+) => {+ const limit = options?.limit ?? DEFAULT_LIMIT++ return useInfiniteQuery({+ queryKey: storageKeys.objects(projectRef, bucketId, path, options),+ queryFn: ({ signal, pageParam }) =>+ listBucketObjects(+ {+ projectRef: projectRef!,+ bucketId,+ path,+ options: { ...options, limit, offset: pageParam * limit },+ },+ signal+ ) as Promise<StorageObjectsData>,+ enabled: enabled && !!projectRef && !!bucketId,+ initialPageParam: 0,+ getNextPageParam(lastPage, pages) {+ if (lastPage.length < limit) return undefined+ return pages.length+ },+ ...queryOptions,+ })+}diff --git a/apps/studio/data/storage/keys.ts b/apps/studio/data/storage/keys.tsindex 1747d8d97c7..70d12059147 100644--- a/apps/studio/data/storage/keys.ts+++ b/apps/studio/data/storage/keys.ts@@ -34,6 +34,26 @@ export const storageKeys = {archive: (projectRef: string | undefined) => ['projects', projectRef, 'archive'] as const,publicBucketsWithSelectPolicies: (projectRef: string | undefined, bucketId: string | undefined) =>['projects', projectRef, 'public-buckets-with-select-policies', bucketId] as const,+ objects: (+ projectRef: string | undefined,+ bucketId: string | undefined,+ path: string,+ params: {+ limit?: number+ search?: string+ sortColumn?: string+ sortOrder?: string+ } = {}+ ) =>+ [+ 'projects',+ projectRef,+ 'buckets',+ bucketId,+ 'objects',+ ...(path ? [path] : []),+ ...(params ? [params] : []),+ ] as const,icebergNamespaces: ({ projectRef, warehouse }: { projectRef?: string; warehouse?: string }) =>[projectRef, 'warehouse', warehouse, 'namespaces'] as const,icebergNamespace: ({