From cdc2dc4e26d87141def011d07c2140fd11c43f76 Mon Sep 17 00:00:00 2001 From: Charis <26616127+charislam@users.noreply.github.com> Date: Thu, 2 Jul 2026 13:15:47 -0400 Subject: [PATCH] refactor(studio): import SQL editor store from source, delete facade + barrel (#47533) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 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 --- .../ExplainVisualizer/ExplainVisualizer.Header.tsx | 2 +- .../interfaces/SQLEditor/DownloadSnippetModal.tsx | 2 +- .../components/interfaces/SQLEditor/MoveQueryModal.tsx | 2 +- .../components/interfaces/SQLEditor/RenameQueryModal.tsx | 2 +- apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx | 5 ++++- .../interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx | 2 +- .../interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx | 2 +- .../interfaces/SQLEditor/UtilityPanel/ReadOnlyBadge.tsx | 2 +- .../interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx | 2 +- .../interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx | 2 +- .../interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx | 2 +- apps/studio/components/interfaces/SQLEditor/hooks.ts | 2 +- .../components/interfaces/SQLEditor/useAddDefinitions.ts | 2 +- .../components/interfaces/SQLEditor/useSnippetEditor.ts | 2 +- .../components/layouts/SQLEditorLayout/SQLEditorMenu.tsx | 2 +- .../SQLEditorNavV2/DeleteSnippetsModal.tsx | 2 +- .../SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx | 2 +- .../SQLEditorNavV2/SQLEditorTreeViewItem.tsx | 2 +- .../SQLEditorLayout/SQLEditorNavV2/ShareSnippetModal.tsx | 2 +- .../SQLEditorNavV2/UnshareSnippetModal.tsx | 2 +- .../studio/components/ui/AIAssistantPanel/AIAssistant.tsx | 2 +- apps/studio/components/ui/EditorPanel/EditorPanel.tsx | 2 +- apps/studio/pages/project/[ref]/sql/[id].tsx | 2 +- apps/studio/state/sql-editor-v2.ts | 8 -------- apps/studio/state/sql-editor/index.ts | 8 -------- 25 files changed, 26 insertions(+), 39 deletions(-) delete mode 100644 apps/studio/state/sql-editor-v2.ts delete mode 100644 apps/studio/state/sql-editor/index.ts diff --git a/apps/studio/components/interfaces/ExplainVisualizer/ExplainVisualizer.Header.tsx b/apps/studio/components/interfaces/ExplainVisualizer/ExplainVisualizer.Header.tsx index 6468599c6a1..7ce99765e42 100644 --- a/apps/studio/components/interfaces/ExplainVisualizer/ExplainVisualizer.Header.tsx +++ b/apps/studio/components/interfaces/ExplainVisualizer/ExplainVisualizer.Header.tsx @@ -7,7 +7,7 @@ import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/L import { AiAssistantDropdown } from '@/components/ui/AiAssistantDropdown' import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state' import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export interface ExplainSummary { totalTime: number diff --git a/apps/studio/components/interfaces/SQLEditor/DownloadSnippetModal.tsx b/apps/studio/components/interfaces/SQLEditor/DownloadSnippetModal.tsx index b6f809dd178..911791fc25e 100644 --- a/apps/studio/components/interfaces/SQLEditor/DownloadSnippetModal.tsx +++ b/apps/studio/components/interfaces/SQLEditor/DownloadSnippetModal.tsx @@ -27,7 +27,7 @@ import { } from './SQLEditor.utils' import { TwoOptionToggle } from '@/components/ui/TwoOptionToggle' import { DOCS_URL } from '@/lib/constants' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' const CLI_DOCS_URL = `${DOCS_URL}/guides/cli/local-development` diff --git a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx index af39f60b7ea..bb300f5beed 100644 --- a/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx +++ b/apps/studio/components/interfaces/SQLEditor/MoveQueryModal.tsx @@ -42,7 +42,7 @@ import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation import { useSQLSnippetFolderCreateMutation } from '@/data/content/sql-folder-create-mutation' import { Snippet } from '@/data/content/sql-folders-query' import type { SnippetWithContent } from '@/data/content/sql-folders-query' -import { useSnippetFolders, useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSnippetFolders, useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' interface MoveQueryModalProps { diff --git a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx index 1f92fc58090..525848f81cf 100644 --- a/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx +++ b/apps/studio/components/interfaces/SQLEditor/RenameQueryModal.tsx @@ -35,7 +35,7 @@ import { Snippet } from '@/data/content/sql-folders-query' import type { SqlSnippet } from '@/data/content/sql-snippets-query' import { useOrgAiOptInLevel } from '@/hooks/misc/useOrgOptedIntoAi' import { IS_PLATFORM } from '@/lib/constants' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' export interface RenameQueryModalProps { diff --git a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx index 1e943610ae0..085cfdf1714 100644 --- a/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx +++ b/apps/studio/components/interfaces/SQLEditor/SQLEditor.tsx @@ -92,9 +92,12 @@ import { import { SHORTCUT_IDS } from '@/state/shortcuts/registry' import { useShortcut } from '@/state/shortcuts/useShortcut' import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state' -import { getSqlEditorV2StateSnapshot, useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { useSqlEditorDiffRequestSnapshot } from '@/state/sql-editor/sql-editor-diff-request' import { useSqlEditorSessionSnapshot } from '@/state/sql-editor/sql-editor-session-state' +import { + getSqlEditorV2StateSnapshot, + useSqlEditorV2StateSnapshot, +} from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' // Load the monaco editor client-side only (does not behave well server-side) diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx index c9ec290ad1b..d95a2b75539 100644 --- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx +++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLExamples.tsx @@ -12,7 +12,7 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' import { useTrack } from '@/lib/telemetry/track' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' const SQLExamples = () => { const router = useRouter() diff --git a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx index 07f3d132460..0b855813393 100644 --- a/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx +++ b/apps/studio/components/interfaces/SQLEditor/SQLTemplates/SQLTemplates.tsx @@ -12,7 +12,7 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' import { useTrack } from '@/lib/telemetry/track' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' const SQLTemplates = () => { const router = useRouter() diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/ReadOnlyBadge.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/ReadOnlyBadge.tsx index 253675db650..b4d56ef40c6 100644 --- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/ReadOnlyBadge.tsx +++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/ReadOnlyBadge.tsx @@ -1,8 +1,8 @@ import { Badge } from 'ui' import { useProfile } from '@/lib/profile' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { isSnippetOwner } from '@/state/sql-editor/sql-editor-rules' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export type ReadOnlyBadgeProps = { id: string } const ReadOnlyBadge = ({ id }: ReadOnlyBadgeProps) => { diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx index 9f3e98ce218..cf10b862ce0 100644 --- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx +++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/SavingIndicator.tsx @@ -5,10 +5,10 @@ import { Button, Tooltip, TooltipContent, TooltipTrigger } from 'ui' import ReadOnlyBadge from './ReadOnlyBadge' import { useProfile } from '@/lib/profile' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { isSaveFailed, isSaving } from '@/state/sql-editor/sql-editor-lifecycle' import { isSnippetOwner } from '@/state/sql-editor/sql-editor-rules' import { useSqlEditorSaveCoordinator } from '@/state/sql-editor/sql-editor-save-coordinator' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export type SavingIndicatorProps = { id: string } diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx index 58b7f93131f..7164ea180ec 100644 --- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx +++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityActions.tsx @@ -24,8 +24,8 @@ import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage' import { IS_PLATFORM } from '@/lib/constants' import { hotkeyToKeys } from '@/state/shortcuts/formatShortcut' import { SHORTCUT_DEFINITIONS, SHORTCUT_IDS } from '@/state/shortcuts/registry' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { useSqlEditorSessionSnapshot } from '@/state/sql-editor/sql-editor-session-state' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export type UtilityActionsProps = { id: string diff --git a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx index 66b536def8e..60697aa58b1 100644 --- a/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx +++ b/apps/studio/components/interfaces/SQLEditor/UtilityPanel/UtilityPanel.tsx @@ -10,8 +10,8 @@ import { DownloadResultsButton } from '@/components/ui/DownloadResultsButton' import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation' import { Snippet } from '@/data/content/sql-folders-query' import { useTrack } from '@/lib/telemetry/track' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { useSqlEditorSessionSnapshot } from '@/state/sql-editor/sql-editor-session-state' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export type UtilityPanelProps = { id: string diff --git a/apps/studio/components/interfaces/SQLEditor/hooks.ts b/apps/studio/components/interfaces/SQLEditor/hooks.ts index 7e5ff47aaa4..7c7b2e391ce 100644 --- a/apps/studio/components/interfaces/SQLEditor/hooks.ts +++ b/apps/studio/components/interfaces/SQLEditor/hooks.ts @@ -14,7 +14,7 @@ import { import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export const useNewQuery = () => { const router = useRouter() diff --git a/apps/studio/components/interfaces/SQLEditor/useAddDefinitions.ts b/apps/studio/components/interfaces/SQLEditor/useAddDefinitions.ts index e26c2f4fd44..f3a0ceabbc9 100644 --- a/apps/studio/components/interfaces/SQLEditor/useAddDefinitions.ts +++ b/apps/studio/components/interfaces/SQLEditor/useAddDefinitions.ts @@ -12,7 +12,7 @@ import { useTableColumnsQuery } from '@/data/database/table-columns-query' import { useLocalStorageQuery } from '@/hooks/misc/useLocalStorage' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { formatSql } from '@/lib/formatSql' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export const useAddDefinitions = (id: string, monaco: Monaco | null) => { const { data: project } = useSelectedProjectQuery() diff --git a/apps/studio/components/interfaces/SQLEditor/useSnippetEditor.ts b/apps/studio/components/interfaces/SQLEditor/useSnippetEditor.ts index adf60851085..76c5a139296 100644 --- a/apps/studio/components/interfaces/SQLEditor/useSnippetEditor.ts +++ b/apps/studio/components/interfaces/SQLEditor/useSnippetEditor.ts @@ -5,9 +5,9 @@ import { useEffect, useEffectEvent } from 'react' import { createSqlSnippetSkeletonV2 } from './SQLEditor.utils' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { wasNeverPersisted } from '@/state/sql-editor/sql-editor-lifecycle' import { canEditSnippet } from '@/state/sql-editor/sql-editor-rules' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { useTabsStateSnapshot } from '@/state/tabs' /** diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx index dd1501bed02..2dc29b01f0d 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorMenu.tsx @@ -29,7 +29,7 @@ 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-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export const SQLEditorMenu = () => { const router = useRouter() diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/DeleteSnippetsModal.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/DeleteSnippetsModal.tsx index b4444814c2c..53a5cc3d01b 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/DeleteSnippetsModal.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/DeleteSnippetsModal.tsx @@ -5,7 +5,7 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal' import { useContentDeleteMutation } from '@/data/content/content-delete-mutation' import { Snippet } from '@/data/content/sql-folders-query' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' export const DeleteSnippetsModal = ({ diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx index 0d574cf6c1f..db4ade77062 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorNav.tsx @@ -38,8 +38,8 @@ import { useSqlSnippetsQuery } from '@/data/content/sql-snippets-query' import { useLocalStorage } from '@/hooks/misc/useLocalStorage' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' -import { useSnippetFolders, useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { isNewFolder } from '@/state/sql-editor/sql-editor-lifecycle' +import { useSnippetFolders, useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' interface SQLEditorNavProps { diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx index 17fa81ab0ef..828f99b7687 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/SQLEditorTreeViewItem.tsx @@ -36,12 +36,12 @@ import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions' import { useLatest } from '@/hooks/misc/useLatest' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { useProfile } from '@/lib/profile' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { isFolderEditing, isFolderSaving, type FolderStatus, } from '@/state/sql-editor/sql-editor-lifecycle' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' interface SQLEditorTreeViewItemProps extends Omit< ComponentProps, diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/ShareSnippetModal.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/ShareSnippetModal.tsx index 99d2c3e09ff..f3cd44d3ef6 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/ShareSnippetModal.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/ShareSnippetModal.tsx @@ -6,7 +6,7 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal' import { getContentById } from '@/data/content/content-id-query' import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation' import { Snippet } from '@/data/content/sql-folders-query' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import type { SqlSnippets } from '@/types' export const ShareSnippetModal = ({ diff --git a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/UnshareSnippetModal.tsx b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/UnshareSnippetModal.tsx index dfeb09ed800..ad35294d4c2 100644 --- a/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/UnshareSnippetModal.tsx +++ b/apps/studio/components/layouts/SQLEditorLayout/SQLEditorNavV2/UnshareSnippetModal.tsx @@ -6,7 +6,7 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal' import { getContentById } from '@/data/content/content-id-query' import { useContentUpsertMutation } from '@/data/content/content-upsert-mutation' import { Snippet } from '@/data/content/sql-folders-query' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import type { SqlSnippets } from '@/types' export const UnshareSnippetModal = ({ diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx index bc3f84853de..33a44479287 100644 --- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx +++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.tsx @@ -54,7 +54,7 @@ import { useAiAssistantState, useAiAssistantStateSnapshot } from '@/state/ai-ass import { SHORTCUT_IDS } from '@/state/shortcuts/registry' import { useShortcut } from '@/state/shortcuts/useShortcut' import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' interface AIAssistantProps { initialMessages?: MessageType[] | undefined diff --git a/apps/studio/components/ui/EditorPanel/EditorPanel.tsx b/apps/studio/components/ui/EditorPanel/EditorPanel.tsx index 929ba17fead..0e6de86ad76 100644 --- a/apps/studio/components/ui/EditorPanel/EditorPanel.tsx +++ b/apps/studio/components/ui/EditorPanel/EditorPanel.tsx @@ -66,7 +66,7 @@ import { editorPanelState, useEditorPanelStateSnapshot } from '@/state/editor-pa import { SHORTCUT_IDS } from '@/state/shortcuts/registry' import { useIsShortcutEnabled } from '@/state/shortcuts/useIsShortcutEnabled' import { useSidebarManagerSnapshot } from '@/state/sidebar-manager-state' -import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' +import { useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' export const EditorPanel = () => { const { diff --git a/apps/studio/pages/project/[ref]/sql/[id].tsx b/apps/studio/pages/project/[ref]/sql/[id].tsx index 0b1cd13dcf8..0cce211efea 100644 --- a/apps/studio/pages/project/[ref]/sql/[id].tsx +++ b/apps/studio/pages/project/[ref]/sql/[id].tsx @@ -17,8 +17,8 @@ import { useSqlSnippetByIdQuery } from '@/data/content/content-id-query' import { useDashboardHistory } from '@/hooks/misc/useDashboardHistory' import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject' import { IS_PLATFORM } from '@/lib/constants' -import { useSnippets, useSqlEditorV2StateSnapshot } from '@/state/sql-editor-v2' import { wasNeverPersisted } from '@/state/sql-editor/sql-editor-lifecycle' +import { useSnippets, useSqlEditorV2StateSnapshot } from '@/state/sql-editor/sql-editor-state' import { createTabId, useTabsStateSnapshot } from '@/state/tabs' import type { NextPageWithLayout } from '@/types' diff --git a/apps/studio/state/sql-editor-v2.ts b/apps/studio/state/sql-editor-v2.ts deleted file mode 100644 index 8c155a466fd..00000000000 --- a/apps/studio/state/sql-editor-v2.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type { StateSnippet, StateSnippetFolder } from './sql-editor' -export { - sqlEditorState, - getSqlEditorV2StateSnapshot, - useSqlEditorV2StateSnapshot, - useSnippetFolders, - useSnippets, -} from './sql-editor' diff --git a/apps/studio/state/sql-editor/index.ts b/apps/studio/state/sql-editor/index.ts deleted file mode 100644 index 8bc3e17850c..00000000000 --- a/apps/studio/state/sql-editor/index.ts +++ /dev/null @@ -1,8 +0,0 @@ -export type { StateSnippet, StateSnippetFolder } from './types' -export { - sqlEditorState, - getSqlEditorV2StateSnapshot, - useSqlEditorV2StateSnapshot, - useSnippetFolders, - useSnippets, -} from './sql-editor-state'