The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
chore: remove unnecessary `<PreventNavigationOnUnsavedChanges>` (#46763)
Gildas Garciaff34a6753c41
diff --git a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsxindex 51a24452e5e..be691be50fc 100644--- a/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx+++ b/apps/studio/components/interfaces/Auth/EmailTemplates/TemplateEditor.tsx@@ -27,7 +27,7 @@ import type { AuthTemplate } from './EmailTemplates.types'import { hasCustomEmailSender } from './EmailTemplates.utils'import { ResetTemplateDialog } from './ResetTemplateDialog'import { SpamValidation } from './SpamValidation'-import { PreventNavigationOnUnsavedChanges } from '@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges'+import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'import { InlineLink } from '@/components/ui/InlineLink'@@ -37,6 +37,7 @@ import { useAuthConfigQuery } from '@/data/auth/auth-config-query'import { useAuthConfigUpdateMutation } from '@/data/auth/auth-config-update-mutation'import { useValidateSpamMutation, ValidateSpamResponse } from '@/data/auth/validate-spam-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'+import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'import { DOCS_URL } from '@/lib/constants'interface TemplateEditorProps {@@ -270,6 +271,11 @@ export const TemplateEditor = ({ template, isReadOnly = false }: TemplateEditorPif (!canEdit) setActiveView('preview')}, [canEdit])+ const { handleCancelNavigation, handleConfirmNavigation, shouldConfirmNavigation } =+ usePreventNavigationOnUnsavedChanges({+ hasChanges,+ })+return (<Form {...form}><form onSubmit={form.handleSubmit(onSubmit)}>@@ -466,7 +472,11 @@ export const TemplateEditor = ({ template, isReadOnly = false }: TemplateEditorP</>)}</form>- <PreventNavigationOnUnsavedChanges hasChanges={hasChanges} />+ <DiscardChangesConfirmationDialog+ visible={shouldConfirmNavigation}+ onCancel={handleCancelNavigation}+ onClose={handleConfirmNavigation}+ /></Form>)}diff --git a/apps/studio/components/interfaces/Reports/Reports.tsx b/apps/studio/components/interfaces/Reports/Reports.tsxindex ea05dc5a7fe..5f360f319ac 100644--- a/apps/studio/components/interfaces/Reports/Reports.tsx+++ b/apps/studio/components/interfaces/Reports/Reports.tsx@@ -12,7 +12,7 @@ import { ChartConfig } from '../SQLEditor/UtilityPanel/ChartConfig'import { GridResize } from './GridResize'import { MetricOptions } from './MetricOptions'import { LAYOUT_COLUMN_COUNT } from './Reports.constants'-import { PreventNavigationOnUnsavedChanges } from '@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges'+import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { DatabaseSelector } from '@/components/ui/DatabaseSelector'import { DateRangePicker } from '@/components/ui/DateRangePicker'@@ -27,6 +27,7 @@ import {} from '@/data/content/content-upsert-mutation'import { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'import { Metric, TIME_PERIODS_REPORTS } from '@/lib/constants/metrics'import { uuidv4 } from '@/lib/helpers'import { useProfile } from '@/lib/profile'@@ -352,6 +353,11 @@ const Reports = () => {checkEditState()}, [config])+ const { handleCancelNavigation, handleConfirmNavigation, shouldConfirmNavigation } =+ usePreventNavigationOnUnsavedChanges({+ hasChanges: hasEdits,+ })+if (isLoading || isLoadingPermissions) {return <LogoLoader />}@@ -491,7 +497,11 @@ const Reports = () => {</div>)}</div>- <PreventNavigationOnUnsavedChanges hasChanges={hasEdits} />+ <DiscardChangesConfirmationDialog+ visible={shouldConfirmNavigation}+ onCancel={handleCancelNavigation}+ onClose={handleConfirmNavigation}+ /></>)}diff --git a/apps/studio/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges.tsx b/apps/studio/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges.tsxdeleted file mode 100644index 3ea9eb30008..00000000000--- a/apps/studio/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges.tsx+++ /dev/null@@ -1,26 +0,0 @@-import {- DiscardChangesConfirmationDialog,- type DiscardChangesConfirmationDialogProps,-} from './DiscardChangesConfirmationDialog'-import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'--export const PreventNavigationOnUnsavedChanges = ({- hasChanges,- ...props-}: { hasChanges: boolean } & Omit<- DiscardChangesConfirmationDialogProps,- 'visible' | 'onClose' | 'onCancel'->) => {- const { handleCancel, handleConfirm, shouldConfirm } = usePreventNavigationOnUnsavedChanges({- hasChanges,- })-- return (- <DiscardChangesConfirmationDialog- visible={shouldConfirm}- onCancel={handleCancel}- onClose={handleConfirm}- {...props}- />- )-}diff --git a/apps/studio/hooks/ui/usePreventNavigationOnUnsavedChanges.ts b/apps/studio/hooks/ui/usePreventNavigationOnUnsavedChanges.tsindex c80ac3fb2fd..bc8cf663fa5 100644--- a/apps/studio/hooks/ui/usePreventNavigationOnUnsavedChanges.ts+++ b/apps/studio/hooks/ui/usePreventNavigationOnUnsavedChanges.ts@@ -15,16 +15,16 @@ interface UsePreventNavigationOnUnsavedChangesReturn {/** Cancel the navigation and keep the changes*/- handleCancel: () => void+ handleCancelNavigation: () => void/** Confirm the navigation and lose the changes*/- handleConfirm: () => void+ handleConfirmNavigation: () => void/** Boolean indicating whether UI to request users confirmation for the navigation should be* displayed*/- shouldConfirm: boolean+ shouldConfirmNavigation: boolean}/*@@ -64,11 +64,11 @@ export const usePreventNavigationOnUnsavedChanges = ({// eslint-disable-next-line react-hooks/exhaustive-deps}, [confirmNavigate, hasChanges])- const handleCancel = useCallback(() => {+ const handleCancelNavigation = useCallback(() => {setNavigateUrl(undefined)}, [])- const handleConfirm = useCallback(() => {+ const handleConfirmNavigation = useCallback(() => {setConfirmNavigate(true)let urlToNavigate = navigateUrl ?? '/'if (BASE_PATH && urlToNavigate.startsWith(BASE_PATH)) {@@ -81,10 +81,10 @@ export const usePreventNavigationOnUnsavedChanges = ({return useMemo(() => ({- handleCancel,- handleConfirm,- shouldConfirm: !!navigateUrl,+ handleCancelNavigation,+ handleConfirmNavigation,+ shouldConfirmNavigation: !!navigateUrl,}),- [navigateUrl, handleCancel, handleConfirm]+ [navigateUrl, handleCancelNavigation, handleConfirmNavigation])}diff --git a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsxindex a5a2c56e354..416583a36f8 100644--- a/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx+++ b/apps/studio/pages/project/[ref]/functions/[functionSlug]/code.tsx@@ -10,7 +10,7 @@ import { DeployEdgeFunctionWarningModal } from '@/components/interfaces/EdgeFuncimport { formatFunctionBodyToFiles } from '@/components/interfaces/EdgeFunctions/EdgeFunctions.utils'import { DefaultLayout } from '@/components/layouts/DefaultLayout'import EdgeFunctionDetailsLayout from '@/components/layouts/EdgeFunctionsLayout/EdgeFunctionDetailsLayout'-import { PreventNavigationOnUnsavedChanges } from '@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges'+import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'import { FileExplorerAndEditor } from '@/components/ui/FileExplorerAndEditor'import { FileData } from '@/components/ui/FileExplorerAndEditor/FileExplorerAndEditor.types'@@ -21,6 +21,7 @@ import { useEdgeFunctionDeployMutation } from '@/data/edge-functions/edge-functiimport { useAsyncCheckPermissions } from '@/hooks/misc/useCheckPermissions'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'import { BASE_PATH } from '@/lib/constants'import { useTrack } from '@/lib/telemetry/track'@@ -141,6 +142,11 @@ const CodePage = () => {return !isEqual(normalizeFiles(initialFiles), normalizeFiles(files))}, [initialFiles, files])+ const { handleCancelNavigation, handleConfirmNavigation, shouldConfirmNavigation } =+ usePreventNavigationOnUnsavedChanges({+ hasChanges: hasUnsavedChanges,+ })+return (<div className="flex flex-col h-full">{isLoadingFiles && (@@ -243,7 +249,11 @@ const CodePage = () => {onConfirm={handleDeployConfirm}isDeploying={isDeploying}/>- <PreventNavigationOnUnsavedChanges hasChanges={hasUnsavedChanges} />+ <DiscardChangesConfirmationDialog+ visible={shouldConfirmNavigation}+ onCancel={handleCancelNavigation}+ onClose={handleConfirmNavigation}+ /></div>)}diff --git a/apps/studio/pages/project/[ref]/functions/new.tsx b/apps/studio/pages/project/[ref]/functions/new.tsxindex a640e634e41..79cba4beb28 100644--- a/apps/studio/pages/project/[ref]/functions/new.tsx+++ b/apps/studio/pages/project/[ref]/functions/new.tsx@@ -36,13 +36,14 @@ import { DefaultLayout } from '@/components/layouts/DefaultLayout'import EdgeFunctionsLayout from '@/components/layouts/EdgeFunctionsLayout/EdgeFunctionsLayout'import { PageLayout } from '@/components/layouts/PageLayout/PageLayout'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'-import { PreventNavigationOnUnsavedChanges } from '@/components/ui-patterns/Dialogs/PreventNavigationOnUnsavedChanges'+import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { FileExplorerAndEditor } from '@/components/ui/FileExplorerAndEditor'import { FileData } from '@/components/ui/FileExplorerAndEditor/FileExplorerAndEditor.types'import { useEdgeFunctionDeployMutation } from '@/data/edge-functions/edge-functions-deploy-mutation'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'+import { usePreventNavigationOnUnsavedChanges } from '@/hooks/ui/usePreventNavigationOnUnsavedChanges'import { BASE_PATH } from '@/lib/constants'import { useTrack } from '@/lib/telemetry/track'import { useAiAssistantStateSnapshot } from '@/state/ai-assistant-state'@@ -276,6 +277,10 @@ const NewFunctionPage = () => {}, [template])const hasUnsavedChanges = useMemo(() => !isEqual(INITIAL_FILES, files), [files])+ const { handleCancelNavigation, handleConfirmNavigation, shouldConfirmNavigation } =+ usePreventNavigationOnUnsavedChanges({+ hasChanges: hasUnsavedChanges && !hasDeployed,+ })return (<PageLayout@@ -413,7 +418,11 @@ const NewFunctionPage = () => {</Button></form></Form>- <PreventNavigationOnUnsavedChanges hasChanges={hasUnsavedChanges && !hasDeployed} />+ <DiscardChangesConfirmationDialog+ visible={shouldConfirmNavigation}+ onCancel={handleCancelNavigation}+ onClose={handleConfirmNavigation}+ /></PageLayout>)}