mirror of
https://github.com/supabase/supabase.git
synced 2026-10-09 11:25:06 +03:00
## What Final PR of the SQL editor state re-layering stack. Removes the compatibility shims left in place during the migration: - Migrates all **23** consumers of the `@/state/sql-editor-v2` facade to import directly from `@/state/sql-editor/sql-editor-state`, where `useSqlEditorV2StateSnapshot`, `getSqlEditorV2StateSnapshot`, `useSnippets`, and `useSnippetFolders` actually live. - Deletes `state/sql-editor-v2.ts` (the facade) and `state/sql-editor/index.ts` (the barrel). Both re-exported the same symbols; nothing imports them after the migration. This collapses the two-layer re-export (`sql-editor-v2` → `index` → source) into direct source imports, matching the repo convention to avoid barrel re-export files. ## Notes - Pure import-path migration — no behavior change. All 23 consumers imported only value symbols that resolve to `sql-editor-state.ts`; none imported the `StateSnippet`/`StateSnippetFolder` types via the facade. - Symbol names keep their `V2` suffix for now — renaming `useSqlEditorV2StateSnapshot` etc. is a separate, larger churn best done on its own. - 25 files: 23 one-line import changes + 2 deletions (23 insertions / 39 deletions). ## Validation - `pnpm --filter studio typecheck` ✅ (confirms no dangling facade/barrel imports anywhere) - `pnpm exec vitest --run state/sql-editor/` ✅ (113 passed) - lint ✅ (0 errors; no ratcheted-rule regressions — a path swap can't add `any`/deps/nested-component violations, and no import-order rule is enforced) - grep confirms zero remaining `sql-editor-v2` references --------- Co-authored-by: supabase-autofix-bot <noreply@supabase.com>
176 lines
6.3 KiB
TypeScript
176 lines
6.3 KiB
TypeScript
import { PermissionAction } from '@supabase/shared-types/out/constants'
|
|
import { useDebounce } from '@uidotdev/usehooks'
|
|
import { LOCAL_STORAGE_KEYS, useParams } from 'common'
|
|
import { FilePlus, FolderPlus, Plus, X } from 'lucide-react'
|
|
import { useRouter } from 'next/router'
|
|
import { useEffect, useState } from 'react'
|
|
import { toast } from 'sonner'
|
|
import {
|
|
Button,
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuTrigger,
|
|
Tooltip,
|
|
TooltipContent,
|
|
TooltipTrigger,
|
|
} from 'ui'
|
|
import {
|
|
InnerSideBarFilters,
|
|
InnerSideBarFilterSearchInput,
|
|
InnerSideBarFilterSortDropdown,
|
|
InnerSideBarFilterSortDropdownItem,
|
|
} from 'ui-patterns/InnerSideMenu'
|
|
|
|
import { SearchList } from './SQLEditorNavV2/SearchList'
|
|
import { SQLEditorNav } from './SQLEditorNavV2/SQLEditorNav'
|
|
import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'
|
|
import { useLocalStorage } from '@/hooks/misc/useLocalStorage'
|
|
import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'
|
|
import { useProfile } from '@/lib/profile'
|
|
import { getAppStateSnapshot } from '@/state/app-state'
|
|
import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state'
|
|
|
|
export const SQLEditorMenu = () => {
|
|
const router = useRouter()
|
|
const { ref } = useParams()
|
|
const { profile } = useProfile()
|
|
const { data: project } = useSelectedProjectQuery()
|
|
const snapV2 = useSqlEditorV2StateSnapshot()
|
|
|
|
const [search, setSearch] = useState('')
|
|
const [showSearch, setShowSearch] = useState(false)
|
|
const [sort, setSort] = useLocalStorage<'name' | 'inserted_at'>(
|
|
LOCAL_STORAGE_KEYS.SQL_EDITOR_SORT(ref ?? ''),
|
|
'inserted_at'
|
|
)
|
|
|
|
const appState = getAppStateSnapshot()
|
|
const debouncedSearch = useDebounce(search, 500)
|
|
|
|
const { can: canCreateSQLSnippet } = useAsyncCheckPermissions(
|
|
PermissionAction.CREATE,
|
|
'user_content',
|
|
{
|
|
resource: { type: 'sql', owner_id: profile?.id },
|
|
subject: { id: profile?.id },
|
|
}
|
|
)
|
|
|
|
const createNewFolder = () => {
|
|
if (!ref) return console.error('Project ref is required')
|
|
setSearch('')
|
|
setShowSearch(false)
|
|
snapV2.addNewFolder({ projectRef: ref })
|
|
}
|
|
|
|
const handleNewQuery = async () => {
|
|
if (!ref) return console.error('Project ref is required')
|
|
if (!project) return console.error('Project is required')
|
|
if (!profile) return console.error('Profile is required')
|
|
if (!canCreateSQLSnippet) {
|
|
return toast('Your queries will not be saved as you do not have sufficient permissions')
|
|
}
|
|
try {
|
|
router.push(`/project/${ref}/sql/new?skip=true`)
|
|
setSearch('')
|
|
setShowSearch(false)
|
|
} catch (error: any) {
|
|
toast.error(`Failed to create new query: ${error.message}`)
|
|
}
|
|
}
|
|
|
|
useEffect(() => {
|
|
setShowSearch(debouncedSearch.length > 0)
|
|
}, [debouncedSearch])
|
|
|
|
return (
|
|
<div className="h-full flex flex-col justify-between">
|
|
<div className="flex flex-col gap-y-4 grow">
|
|
<div className="mt-4 mx-4 flex items-center justify-between gap-x-2">
|
|
<InnerSideBarFilters className="w-full p-0 gap-0">
|
|
<InnerSideBarFilterSearchInput
|
|
name="search-queries"
|
|
placeholder="Search queries..."
|
|
aria-labelledby="Search queries"
|
|
value={search}
|
|
onChange={(e) => {
|
|
const value = e.target.value
|
|
setSearch(value)
|
|
if (value.length === 0) setShowSearch(false)
|
|
}}
|
|
onKeyDown={(e) => {
|
|
if (e.code === 'Escape') {
|
|
setSearch('')
|
|
setShowSearch(false)
|
|
}
|
|
}}
|
|
>
|
|
{showSearch ? (
|
|
<Tooltip>
|
|
<TooltipTrigger
|
|
className="absolute right-1 top-[.4rem] md:top-[.3rem] transition-colors text-foreground-light hover:text-foreground"
|
|
onClick={() => {
|
|
setSearch('')
|
|
setShowSearch(false)
|
|
}}
|
|
>
|
|
<X size={18} />
|
|
</TooltipTrigger>
|
|
<TooltipContent>Clear search</TooltipContent>
|
|
</Tooltip>
|
|
) : (
|
|
<InnerSideBarFilterSortDropdown
|
|
value={sort}
|
|
onValueChange={(value: any) => setSort(value)}
|
|
>
|
|
<InnerSideBarFilterSortDropdownItem key="name" value="name">
|
|
Alphabetical
|
|
</InnerSideBarFilterSortDropdownItem>
|
|
<InnerSideBarFilterSortDropdownItem key="inserted_at" value="inserted_at">
|
|
Created At
|
|
</InnerSideBarFilterSortDropdownItem>
|
|
</InnerSideBarFilterSortDropdown>
|
|
)}
|
|
</InnerSideBarFilterSearchInput>
|
|
</InnerSideBarFilters>
|
|
<DropdownMenu>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button
|
|
data-testid="sql-editor-new-query-button"
|
|
variant="default"
|
|
icon={<Plus className="text-foreground" />}
|
|
className="w-[26px]"
|
|
aria-label="Create a new query"
|
|
/>
|
|
</DropdownMenuTrigger>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="bottom">Create a new query</TooltipContent>
|
|
</Tooltip>
|
|
<DropdownMenuContent align="end" side="bottom" className="w-48">
|
|
<DropdownMenuItem className="gap-x-2" onClick={() => handleNewQuery()}>
|
|
<FilePlus size={14} />
|
|
Create a new snippet
|
|
</DropdownMenuItem>
|
|
<DropdownMenuItem className="gap-x-2" onClick={() => createNewFolder()}>
|
|
<FolderPlus size={14} />
|
|
Create a new folder
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
</div>
|
|
|
|
{showSearch ? <SearchList search={debouncedSearch} /> : <SQLEditorNav sort={sort} />}
|
|
</div>
|
|
|
|
<div className="p-4 border-t sticky bottom-0 bg-studio">
|
|
<Button block variant="default" onClick={() => appState.setOnGoingQueriesPanelOpen(true)}>
|
|
View running queries
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
)
|
|
}
|