The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
Reinstate https://github.com/supabase/supabase/pull/45143 into latest master (#47433)
Joshen Lim1de298ff3148
diff --git a/apps/docs/content/guides/api/securing-your-api.mdx b/apps/docs/content/guides/api/securing-your-api.mdxindex de875e9e599..894b2e8179b 100644--- a/apps/docs/content/guides/api/securing-your-api.mdx+++ b/apps/docs/content/guides/api/securing-your-api.mdx@@ -104,7 +104,7 @@ Any table created through the Supabase Dashboard will have RLS enabled by defaul><TabPanel id="dashboard" label="Dashboard">-1. Go to the [Authentication > Policies](/dashboard/project/_/auth/policies) page in the Dashboard.+1. Go to the [Database > Policies](/dashboard/project/_/database/policies) page in the Dashboard.2. Select **Enable RLS** to enable Row Level Security.</TabPanel>diff --git a/apps/docs/content/guides/auth/general-configuration.mdx b/apps/docs/content/guides/auth/general-configuration.mdxindex 0e79c0625c7..fcb98df2791 100644--- a/apps/docs/content/guides/auth/general-configuration.mdx+++ b/apps/docs/content/guides/auth/general-configuration.mdx@@ -6,7 +6,7 @@ subtitle: 'General configuration options for Supabase Auth'This section covers the [general configuration options](/dashboard/project/_/auth) for Supabase Auth. If you are looking for another type of configuration, you may be interested in one of the following sections:-- [Policies](/dashboard/project/_/auth/policies) to manage Row Level Security policies for your tables.+- [Policies](/dashboard/project/_/database/policies) to manage Row Level Security policies for your tables.- [Sign In / Providers](/dashboard/project/_/auth/providers) to configure authentication providers and login methods for your users.- [Third Party Auth](/dashboard/project/_/auth/third-party) to use third-party authentication (TPA) systems based on JWTs to access your project.- [Sessions](/dashboard/project/_/auth/sessions) to configure settings for user sessions and refresh tokens.diff --git a/apps/docs/content/guides/auth/oauth-server/token-security.mdx b/apps/docs/content/guides/auth/oauth-server/token-security.mdxindex b5da836eb94..2fe88b440a2 100644--- a/apps/docs/content/guides/auth/oauth-server/token-security.mdx+++ b/apps/docs/content/guides/auth/oauth-server/token-security.mdx@@ -368,7 +368,7 @@ SELECT * FROM user_data WHERE user_id = 'test-user-uuid';RESET request.jwt.claims;```-Or use the Supabase Dashboard's [RLS policy tester](/dashboard/project/_/auth/policies).+Or use the Supabase Dashboard's [RLS policy tester](/dashboard/project/_/database/policies).## Troubleshootingdiff --git a/apps/docs/content/guides/deployment/going-into-prod.mdx b/apps/docs/content/guides/deployment/going-into-prod.mdxindex ce8879923f2..ffa3b028896 100644--- a/apps/docs/content/guides/deployment/going-into-prod.mdx+++ b/apps/docs/content/guides/deployment/going-into-prod.mdx@@ -22,7 +22,7 @@ Check and review issues in your database using [Security Advisor](/dashboard/pro- Tables that do not have RLS enabled with reasonable policies allow any client to access and modify their data. This is usually not what you want.- [Learn more about RLS](/docs/guides/database/postgres/row-level-security).- Enable replication on tables containing sensitive data by enabling RLS and setting row security policies:- - Go to the [**Authentication > Policies**](/dashboard/project/_/auth/policies) section of the Supabase Dashboard to enable RLS and create security policies.+ - Go to the [**Database > Policies**](/dashboard/project/_/database/policies) section of the Supabase Dashboard to enable RLS and create security policies.- Go to the [**Database > Publications**](/dashboard/project/_/database/publications) section of the Supabase Dashboard to manage replication tables.- Turn on [SSL Enforcement](/docs/guides/platform/ssl-enforcement) from the [**Database > Settings > SSL Configuration**](/dashboard/project/_/database/settings#ssl-configuration) section of the dashboard.- Enable [Network Restrictions](/docs/guides/platform/network-restrictions) for the database from the [**Database > Settings > Network Restrictions**](/dashboard/project/_/database/settings#network-restrictions) section of the dashboard.diff --git a/apps/studio/.github/eslint-rule-baselines.json b/apps/studio/.github/eslint-rule-baselines.jsonindex 9f8f48cc8f3..e8b45f1f023 100644--- a/apps/studio/.github/eslint-rule-baselines.json+++ b/apps/studio/.github/eslint-rule-baselines.json@@ -122,7 +122,7 @@"pages/logout.tsx": 1,"pages/new/index.tsx": 1,"pages/organizations.tsx": 1,- "pages/project/[ref]/auth/policies.tsx": 2,+ "pages/project/[ref]/database/policies.tsx": 2,"pages/project/[ref]/editor/[id].tsx": 1,"pages/project/[ref]/integrations/[id]/index.tsx": 1,"pages/project/[ref]/settings/jwt/legacy.tsx": 1,diff --git a/apps/studio/components/interfaces/App/CommandMenu/CreateCommands.tsx b/apps/studio/components/interfaces/App/CommandMenu/CreateCommands.tsxindex 29e4c0b8898..87fc8c7d932 100644--- a/apps/studio/components/interfaces/App/CommandMenu/CreateCommands.tsx+++ b/apps/studio/components/interfaces/App/CommandMenu/CreateCommands.tsx@@ -130,7 +130,7 @@ export function useCreateCommands(options?: CommandOptions) {{id: 'create-rls-policy',name: 'Create RLS Policy',- route: `/project/${ref}/auth/policies?new=true`,+ route: `/project/${ref}/database/policies?new=true`,icon: () => <ShieldPlus />,},...(IS_PLATFORMdiff --git a/apps/studio/components/interfaces/App/CommandMenu/PolicySearchResults.tsx b/apps/studio/components/interfaces/App/CommandMenu/PolicySearchResults.tsxindex e711dce37d8..89e13a7ef64 100644--- a/apps/studio/components/interfaces/App/CommandMenu/PolicySearchResults.tsx+++ b/apps/studio/components/interfaces/App/CommandMenu/PolicySearchResults.tsx@@ -141,14 +141,14 @@ export function PolicySearchResults({ query }: PolicySearchResultsProps) {getRoute={(result) => {const policy = policies?.find((p) => String(p.id) === result.id)if (!policy || !projectRef)- return `/project/${projectRef}/auth/policies` as `/${string}`+ return `/project/${projectRef}/database/policies` as `/${string}`const params = new URLSearchParams()params.set('edit', String(policy.id))if (policy.schema) {params.set('schema', policy.schema)}- return `/project/${projectRef}/auth/policies?${params.toString()}` as `/${string}`+ return `/project/${projectRef}/database/policies?${params.toString()}` as `/${string}`}}className="pb-9"/>diff --git a/apps/studio/components/interfaces/App/FeaturePreview/RLSTesterPreview.tsx b/apps/studio/components/interfaces/App/FeaturePreview/RLSTesterPreview.tsxindex 4f8a00c3def..01ea7cffdc5 100644--- a/apps/studio/components/interfaces/App/FeaturePreview/RLSTesterPreview.tsx+++ b/apps/studio/components/interfaces/App/FeaturePreview/RLSTesterPreview.tsx@@ -27,8 +27,8 @@ export const RLSTesterPreview = () => {<ul className="list-disc pl-6 text-sm text-foreground-light space-y-1"><li>Show the "Test" button on the{' '}- <InlineLink href={`/project/${ref}/auth/policies`}>- Authentication Policies page+ <InlineLink href={`/project/${ref}/database/policies`}>+ Database Policies page</InlineLink></li></ul>diff --git a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsxindex 2031567caaf..f470b23d02c 100644--- a/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx+++ b/apps/studio/components/interfaces/Auth/BasicAuthSettingsForm.tsx@@ -269,7 +269,7 @@ export const BasicAuthSettingsForm = () => {<code className="text-code-inline">authenticated</code> roles. Westrongly advise{' '}<Link- href={`/project/${projectRef}/auth/policies`}+ href={`/project/${projectRef}/database/policies`}className="text-foreground underline">reviewing your RLS policiesdiff --git a/apps/studio/components/interfaces/Auth/Policies/Policies.constants.ts b/apps/studio/components/interfaces/Database/Policies/Policies.constants.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/Policies.constants.tsrename to apps/studio/components/interfaces/Database/Policies/Policies.constants.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/Policies.tsx b/apps/studio/components/interfaces/Database/Policies/Policies.tsxsimilarity index 97%rename from apps/studio/components/interfaces/Auth/Policies/Policies.tsxrename to apps/studio/components/interfaces/Database/Policies/Policies.tsxindex 084d6b57ffe..b841b160ab4 100644--- a/apps/studio/components/interfaces/Auth/Policies/Policies.tsx+++ b/apps/studio/components/interfaces/Database/Policies/Policies.tsx@@ -9,8 +9,8 @@ import ConfirmationModal from 'ui-patterns/Dialogs/ConfirmationModal'import {PolicyTableRow,PolicyTableRowProps,-} from '@/components/interfaces/Auth/Policies/PolicyTableRow'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+} from '@/components/interfaces/Database/Policies/PolicyTableRow'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { ProtectedSchemaWarning } from '@/components/interfaces/Database/ProtectedSchemaWarning'import { RLSToggleDialog } from '@/components/interfaces/Database/RLSToggleDialog'import { NoSearchResults } from '@/components/ui/NoSearchResults'diff --git a/apps/studio/components/interfaces/Auth/Policies/Policies.types.ts b/apps/studio/components/interfaces/Database/Policies/Policies.types.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/Policies.types.tsrename to apps/studio/components/interfaces/Database/Policies/Policies.types.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/Policies.utils.test.ts b/apps/studio/components/interfaces/Database/Policies/Policies.utils.test.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/Policies.utils.test.tsrename to apps/studio/components/interfaces/Database/Policies/Policies.utils.test.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/Policies.utils.ts b/apps/studio/components/interfaces/Database/Policies/Policies.utils.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/Policies.utils.tsrename to apps/studio/components/interfaces/Database/Policies/Policies.utils.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PoliciesDataContext.tsx b/apps/studio/components/interfaces/Database/Policies/PoliciesDataContext.tsxsimilarity index 95%rename from apps/studio/components/interfaces/Auth/Policies/PoliciesDataContext.tsxrename to apps/studio/components/interfaces/Database/Policies/PoliciesDataContext.tsxindex 15d083b5935..a0cdef263c9 100644--- a/apps/studio/components/interfaces/Auth/Policies/PoliciesDataContext.tsx+++ b/apps/studio/components/interfaces/Database/Policies/PoliciesDataContext.tsx@@ -1,7 +1,7 @@import type { PropsWithChildren } from 'react'import { createContext, useCallback, useContext, useMemo } from 'react'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import type { ResponseError } from '@/types'type TableKey = `${string}.${string}`diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyAllowedOperation.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyAllowedOperation.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyAllowedOperation.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyAllowedOperation.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyDefinition.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyDefinition.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyDefinition.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyEditorFooter.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyEditorFooter.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyEditorFooter.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyEditorFooter.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyName.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyName.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyName.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyName.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyRoles.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/PolicyRoles.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditor/index.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditor/index.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditor/index.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.ts b/apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/PolicyEditorModal.constants.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/PolicyEditorModal.constants.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModalTitle.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/PolicyEditorModalTitle.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModalTitle.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/PolicyEditorModalTitle.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/index.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorModal/index.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorModal/index.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/LockedQuerySection.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/LockedQuerySection.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/LockedQuerySection.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/LockedQuerySection.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyDetailsV2.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyDetailsV2.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanel.utils.ts b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyEditorPanel.utils.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanel.utils.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyEditorPanel.utils.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyEditorPanelHeader.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyTemplates.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyTemplates.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/PolicyTemplates.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/PolicyTemplates.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/QueryError.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/QueryError.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/RLSCodeEditor.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/RLSCodeEditor.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/RLSCodeEditor.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsxsimilarity index 99%rename from apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsxindex 4f57ed54afe..872acd61db3 100644--- a/apps/studio/components/interfaces/Auth/Policies/PolicyEditorPanel/index.tsx+++ b/apps/studio/components/interfaces/Database/Policies/PolicyEditorPanel/index.tsx@@ -40,7 +40,7 @@ import { PolicyEditorPanelHeader } from './PolicyEditorPanelHeader'import { PolicyTemplates } from './PolicyTemplates'import { QueryError } from './QueryError'import { RLSCodeEditor } from './RLSCodeEditor'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { IStandaloneCodeEditor } from '@/components/interfaces/SQLEditor/SQLEditor.types'import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyReview.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyReview.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyReview.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsx b/apps/studio/components/interfaces/Database/Policies/PolicySelection.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicySelection.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicySelection.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.types.ts b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.types.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.types.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.types.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils.test.ts b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils.test.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils.test.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils.test.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils.ts b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRowHeader.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTableRow/index.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTableRow/index.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/PolicyTemplates.constants.ts b/apps/studio/components/interfaces/Database/Policies/PolicyTemplates/PolicyTemplates.constants.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/PolicyTemplates.constants.tsrename to apps/studio/components/interfaces/Database/Policies/PolicyTemplates/PolicyTemplates.constants.tsdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTemplates/TemplatePreview.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatePreview.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTemplates/TemplatePreview.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatesList.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTemplates/TemplatesList.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/TemplatesList.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTemplates/TemplatesList.tsxdiff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/index.tsx b/apps/studio/components/interfaces/Database/Policies/PolicyTemplates/index.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/Policies/PolicyTemplates/index.tsxrename to apps/studio/components/interfaces/Database/Policies/PolicyTemplates/index.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/InferredSQLViewer.tsx b/apps/studio/components/interfaces/Database/RLSTester/InferredSQLViewer.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/InferredSQLViewer.tsxrename to apps/studio/components/interfaces/Database/RLSTester/InferredSQLViewer.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsx b/apps/studio/components/interfaces/Database/RLSTester/RLSTableCard.tsxsimilarity index 98%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsxrename to apps/studio/components/interfaces/Database/RLSTester/RLSTableCard.tsxindex e1a9da41bea..8dd31f87109 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/RLSTableCard.tsx+++ b/apps/studio/components/interfaces/Database/RLSTester/RLSTableCard.tsx@@ -2,7 +2,7 @@ import { Check, ChevronDown, Edit, X } from 'lucide-react'import { useMemo } from 'react'import { cn, Collapsible, CollapsibleContent, CollapsibleTrigger, WarningIcon } from 'ui'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { ButtonTooltip } from '@/components/ui/ButtonTooltip'interface RLSTableCardProps {diff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTester.types.ts b/apps/studio/components/interfaces/Database/RLSTester/RLSTester.types.tssimilarity index 77%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTester.types.tsrename to apps/studio/components/interfaces/Database/RLSTester/RLSTester.types.tsindex b7495d6d48f..2948c48f477 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/RLSTester.types.ts+++ b/apps/studio/components/interfaces/Database/RLSTester/RLSTester.types.ts@@ -1,4 +1,4 @@-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { type User } from '@/data/auth/users-infinite-query'import { type ParseSQLQueryResponse } from '@/data/misc/parse-query-mutation'diff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterEmptyState.tsx b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterEmptyState.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTesterEmptyState.tsxrename to apps/studio/components/interfaces/Database/RLSTester/RLSTesterEmptyState.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterResults.tsx b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsxsimilarity index 98%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTesterResults.tsxrename to apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsxindex 6c8c9e3f1eb..f8bdb5b4179 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterResults.tsx+++ b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.tsx@@ -13,7 +13,7 @@ import { RLSTableCard } from './RLSTableCard'import { ParseQueryResults } from './RLSTester.types'import { deriveRLSTestState } from './RLSTesterResults.utils'import { useTestQueryRLS } from './useTestQueryRLS'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'interface RLSTesterResultsProps {results: Object[]diff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterResults.utils.ts b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.utils.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTesterResults.utils.tsrename to apps/studio/components/interfaces/Database/RLSTester/RLSTesterResults.utils.tsdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterSheet.tsx b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterSheet.tsxsimilarity index 99%rename from apps/studio/components/interfaces/Auth/RLSTester/RLSTesterSheet.tsxrename to apps/studio/components/interfaces/Database/RLSTester/RLSTesterSheet.tsxindex f379ed11ba5..afa2bd82912 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/RLSTesterSheet.tsx+++ b/apps/studio/components/interfaces/Database/RLSTester/RLSTesterSheet.tsx@@ -39,7 +39,7 @@ import { SandboxManagement } from './SandboxManagement'import { UserSelector } from './UserSelector'import { UserSqlEditor } from './UserSqlEditor'import { useTestQueryRLS } from './useTestQueryRLS'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { AiAssistantDropdown } from '@/components/ui/AiAssistantDropdown'import { FeaturePreviewBadge } from '@/components/ui/FeaturePreviewBadge'diff --git a/apps/studio/components/interfaces/Auth/RLSTester/RoleSelector.tsx b/apps/studio/components/interfaces/Database/RLSTester/RoleSelector.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/RoleSelector.tsxrename to apps/studio/components/interfaces/Database/RLSTester/RoleSelector.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/SandboxManagement.tsx b/apps/studio/components/interfaces/Database/RLSTester/SandboxManagement.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/SandboxManagement.tsxrename to apps/studio/components/interfaces/Database/RLSTester/SandboxManagement.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsx b/apps/studio/components/interfaces/Database/RLSTester/UserSelector.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/UserSelector.tsxrename to apps/studio/components/interfaces/Database/RLSTester/UserSelector.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/UserSqlEditor.tsx b/apps/studio/components/interfaces/Database/RLSTester/UserSqlEditor.tsxsimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/UserSqlEditor.tsxrename to apps/studio/components/interfaces/Database/RLSTester/UserSqlEditor.tsxdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.test.tsx b/apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.test.tsxsimilarity index 93%rename from apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.test.tsxrename to apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.test.tsxindex b4c4be6f599..ec30e1e41a6 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.test.tsx+++ b/apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.test.tsx@@ -2,16 +2,16 @@ import type { SafeSqlFragment } from '@supabase/pg-meta'import { screen } from '@testing-library/react'import { describe, expect, it, vi } from 'vitest'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'-import type { ParseQueryResults } from '@/components/interfaces/Auth/RLSTester/RLSTester.types'-import { RLSTesterResults } from '@/components/interfaces/Auth/RLSTester/RLSTesterResults'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { ParseQueryResults } from '@/components/interfaces/Database/RLSTester/RLSTester.types'+import { RLSTesterResults } from '@/components/interfaces/Database/RLSTester/RLSTesterResults'import { render } from '@/tests/helpers'-vi.mock('@/components/interfaces/Auth/RLSTester/useTestQueryRLS', () => ({+vi.mock('@/components/interfaces/Database/RLSTester/useTestQueryRLS', () => ({useTestQueryRLS: () => ({ limit: 100 }),}))-vi.mock('@/components/interfaces/Auth/RLSTester/RLSTableCard', () => ({+vi.mock('@/components/interfaces/Database/RLSTester/RLSTableCard', () => ({RLSTableCard: () => <div data-testid="rls-table-card" />,}))diff --git a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.utils.test.ts b/apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.utils.test.tssimilarity index 96%rename from apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.utils.test.tsrename to apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.utils.test.tsindex 2f18105da5e..3dff5da045f 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/RLSTesterResults.utils.test.ts+++ b/apps/studio/components/interfaces/Database/RLSTester/__tests__/RLSTesterResults.utils.test.ts@@ -1,9 +1,9 @@import type { SafeSqlFragment } from '@supabase/pg-meta'import { describe, expect, it } from 'vitest'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'-import type { ParseQueryResults } from '@/components/interfaces/Auth/RLSTester/RLSTester.types'-import { deriveRLSTestState } from '@/components/interfaces/Auth/RLSTester/RLSTesterResults.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { ParseQueryResults } from '@/components/interfaces/Database/RLSTester/RLSTester.types'+import { deriveRLSTestState } from '@/components/interfaces/Database/RLSTester/RLSTesterResults.utils'const sql = (s: string) => s as unknown as SafeSqlFragmentdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/useTestQueryRLS.utils.test.ts b/apps/studio/components/interfaces/Database/RLSTester/__tests__/useTestQueryRLS.utils.test.tssimilarity index 95%rename from apps/studio/components/interfaces/Auth/RLSTester/__tests__/useTestQueryRLS.utils.test.tsrename to apps/studio/components/interfaces/Database/RLSTester/__tests__/useTestQueryRLS.utils.test.tsindex adbfc577685..0803c5191c8 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/__tests__/useTestQueryRLS.utils.test.ts+++ b/apps/studio/components/interfaces/Database/RLSTester/__tests__/useTestQueryRLS.utils.test.ts@@ -1,7 +1,7 @@import { describe, expect, it } from 'vitest'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'-import { filterTablePolicies } from '@/components/interfaces/Auth/RLSTester/useTestQueryRLS.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'+import { filterTablePolicies } from '@/components/interfaces/Database/RLSTester/useTestQueryRLS.utils'const makePolicy = (overrides: Partial<Policy>): Policy =>({diff --git a/apps/studio/components/interfaces/Auth/RLSTester/useTestQueryRLS.ts b/apps/studio/components/interfaces/Database/RLSTester/useTestQueryRLS.tssimilarity index 100%rename from apps/studio/components/interfaces/Auth/RLSTester/useTestQueryRLS.tsrename to apps/studio/components/interfaces/Database/RLSTester/useTestQueryRLS.tsdiff --git a/apps/studio/components/interfaces/Auth/RLSTester/useTestQueryRLS.utils.ts b/apps/studio/components/interfaces/Database/RLSTester/useTestQueryRLS.utils.tssimilarity index 83%rename from apps/studio/components/interfaces/Auth/RLSTester/useTestQueryRLS.utils.tsrename to apps/studio/components/interfaces/Database/RLSTester/useTestQueryRLS.utils.tsindex d6862e5e1cd..cf4140e16ab 100644--- a/apps/studio/components/interfaces/Auth/RLSTester/useTestQueryRLS.utils.ts+++ b/apps/studio/components/interfaces/Database/RLSTester/useTestQueryRLS.utils.ts@@ -1,4 +1,4 @@-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import type { ParseSQLQueryResponse } from '@/data/misc/parse-query-mutation'export function filterTablePolicies({diff --git a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsxindex 03419956f64..463829e8318 100644--- a/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx+++ b/apps/studio/components/interfaces/Integrations/Queues/QueueTab.tsx@@ -151,7 +151,7 @@ export const QueueTab = () => {><LinkpassHref- href={`/project/${ref}/auth/policies?search=${queueTable?.id}&schema=pgmq`}+ href={`/project/${ref}/database/policies?search=${queueTable?.id}&schema=pgmq`}>Add RLS policy</Link>@@ -176,7 +176,7 @@ export const QueueTab = () => {><LinkpassHref- href={`/project/${ref}/auth/policies?search=${queueTable?.id}&schema=pgmq`}+ href={`/project/${ref}/database/policies?search=${queueTable?.id}&schema=pgmq`}>Auth {queuePolicies.length > 1 ? 'policies' : 'policy'}</Link>diff --git a/apps/studio/components/interfaces/Linter/Linter.utils.tsx b/apps/studio/components/interfaces/Linter/Linter.utils.tsxindex a7779893e6e..a9b00f7fda9 100644--- a/apps/studio/components/interfaces/Linter/Linter.utils.tsx+++ b/apps/studio/components/interfaces/Linter/Linter.utils.tsx@@ -43,7 +43,7 @@ export const lintInfoMap: LintInfo[] = [name: 'auth_rls_initplan',title: 'Auth RLS Initialization Plan',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,- link: ({ projectRef }) => `/project/${projectRef}/auth/policies`,+ link: ({ projectRef }) => `/project/${projectRef}/database/policies`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0003_auth_rls_initplan`,category: 'performance',@@ -72,7 +72,7 @@ export const lintInfoMap: LintInfo[] = [title: 'Multiple Permissive Policies',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,link: ({ projectRef, metadata }) =>- `/project/${projectRef}/auth/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,+ `/project/${projectRef}/database/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0006_multiple_permissive_policies`,category: 'performance',@@ -82,7 +82,7 @@ export const lintInfoMap: LintInfo[] = [title: 'Policy Exists RLS Disabled',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,link: ({ projectRef, metadata }) =>- `/project/${projectRef}/auth/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,+ `/project/${projectRef}/database/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0007_policy_exists_rls_disabled`,category: 'security',@@ -92,7 +92,7 @@ export const lintInfoMap: LintInfo[] = [title: 'RLS Enabled No Policy',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,link: ({ projectRef, metadata }) =>- `/project/${projectRef}/auth/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,+ `/project/${projectRef}/database/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,linkText: 'View table',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0008_rls_enabled_no_policy`,category: 'security',@@ -141,7 +141,7 @@ export const lintInfoMap: LintInfo[] = [title: 'RLS Disabled in Public',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,link: ({ projectRef, metadata }) =>- `/project/${projectRef}/auth/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,+ `/project/${projectRef}/database/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0013_rls_disabled_in_public`,category: 'security',@@ -187,7 +187,7 @@ export const lintInfoMap: LintInfo[] = [name: 'rls_references_user_metadata',title: 'RLS references user metadata',icon: <User className="text-foreground-muted" size={15} strokeWidth={1} />,- link: ({ projectRef }) => `/project/${projectRef}/auth/policies`,+ link: ({ projectRef }) => `/project/${projectRef}/database/policies`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?queryGroups=lint&lint=0015_rls_references_user_metadata`,category: 'security',@@ -325,7 +325,7 @@ export const lintInfoMap: LintInfo[] = [title: 'RLS Policy Always True',icon: <Table2 className="text-foreground-muted" size={15} strokeWidth={1} />,link: ({ projectRef, metadata }) =>- `/project/${projectRef}/auth/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,+ `/project/${projectRef}/database/policies?schema=${encodeURIComponent(metadata?.schema ?? '')}&search=${encodeURIComponent(metadata?.name ?? '')}`,linkText: 'View policies',docsLink: `${DOCS_URL}/guides/database/database-linter?lint=0024_permissive_rls_policy`,category: 'security',diff --git a/apps/studio/components/interfaces/Realtime/Policies.tsx b/apps/studio/components/interfaces/Realtime/Policies.tsxindex 8755f12af3c..fc407c3652d 100644--- a/apps/studio/components/interfaces/Realtime/Policies.tsx+++ b/apps/studio/components/interfaces/Realtime/Policies.tsx@@ -1,10 +1,10 @@import { useMemo, useState } from 'react'import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'-import { Policies } from '@/components/interfaces/Auth/Policies/Policies'-import { PoliciesDataProvider } from '@/components/interfaces/Auth/Policies/PoliciesDataContext'-import { PolicyEditorPanel } from '@/components/interfaces/Auth/Policies/PolicyEditorPanel'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import { Policies } from '@/components/interfaces/Database/Policies/Policies'+import { PoliciesDataProvider } from '@/components/interfaces/Database/Policies/PoliciesDataContext'+import { PolicyEditorPanel } from '@/components/interfaces/Database/Policies/PolicyEditorPanel'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { AlertError } from '@/components/ui/AlertError'import { useDatabasePoliciesQuery } from '@/data/database-policies/database-policies-query'import { useTablesQuery } from '@/data/tables/tables-query'diff --git a/apps/studio/components/interfaces/Storage/Storage.types.ts b/apps/studio/components/interfaces/Storage/Storage.types.tsindex e1828531762..d18cf5f3228 100644--- a/apps/studio/components/interfaces/Storage/Storage.types.ts+++ b/apps/studio/components/interfaces/Storage/Storage.types.ts@@ -1,5 +1,5 @@import { STORAGE_ROW_STATUS, STORAGE_ROW_TYPES } from './Storage.constants'-import type { PolicyFormField } from '@/components/interfaces/Auth/Policies/Policies.types'+import type { PolicyFormField } from '@/components/interfaces/Database/Policies/Policies.types'export interface StoragePolicyFormField extends PolicyFormField {allowedOperations: string[]diff --git a/apps/studio/components/interfaces/Storage/Storage.utils.ts b/apps/studio/components/interfaces/Storage/Storage.utils.tsindex 4bf56bb1569..0ba74d57c70 100644--- a/apps/studio/components/interfaces/Storage/Storage.utils.ts+++ b/apps/studio/components/interfaces/Storage/Storage.utils.ts@@ -3,7 +3,7 @@ import { useRouter } from 'next/router'import { STORAGE_CLIENT_LIBRARY_MAPPINGS } from './Storage.constants'import type { StoragePolicyFormField } from './Storage.types'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { WrapperMeta } from '@/components/interfaces/Integrations/Wrappers/Wrappers.types'import { convertKVStringArrayToJson } from '@/components/interfaces/Integrations/Wrappers/Wrappers.utils'import { FDW } from '@/data/fdw/fdws-query'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsxindex 54a5989eafd..64dfb572535 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicies.tsx@@ -22,9 +22,9 @@ import { StoragePoliciesEditPolicyModal } from './StoragePoliciesEditPolicyModalimport type {PostgresPolicyCreatePayload,PostgresPolicyUpdatePayload,-} from '@/components/interfaces/Auth/Policies/Policies.types'-import { PolicyEditorModal } from '@/components/interfaces/Auth/Policies/PolicyEditorModal'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+} from '@/components/interfaces/Database/Policies/Policies.types'+import { PolicyEditorModal } from '@/components/interfaces/Database/Policies/PolicyEditorModal'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { useDatabasePoliciesQuery } from '@/data/database-policies/database-policies-query'import { useDatabasePolicyCreateMutation } from '@/data/database-policies/database-policy-create-mutation'import { useDatabasePolicyDeleteMutation } from '@/data/database-policies/database-policy-delete-mutation'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsxindex 71a38c40a86..45980164747 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketRow.tsx@@ -18,8 +18,8 @@ import {TooltipTrigger,} from 'ui'-import { PolicyRow } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyRow'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import { PolicyRow } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyRow'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { PUBLIC_BUCKET_TOOLTIP } from '@/components/interfaces/Storage/Storage.constants'import { Bucket } from '@/data/storage/buckets-query'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsxindex a9539b9c58b..ac2243ddc8d 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesBucketsSection.tsx@@ -22,7 +22,7 @@ import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'import { StoragePoliciesBucketRow } from './StoragePoliciesBucketRow'import StoragePoliciesPlaceholder from './StoragePoliciesPlaceholder'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { useMainScrollContainer } from '@/components/layouts/MainScrollContainerContext'import { NoSearchResults } from '@/components/ui/NoSearchResults'import { type Bucket } from '@/data/storage/buckets-query'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsxindex 1ae1d79785e..4e4dd94f79e 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditPolicyModal.tsx@@ -12,9 +12,9 @@ import { STORAGE_POLICY_TEMPLATES } from './StoragePolicies.constants'import StoragePoliciesEditor from './StoragePoliciesEditor'import StoragePoliciesReview from './StoragePoliciesReview'import { StoragePolicyEditorModalTitle } from './StoragePolicyEditorModalTitle'-import { POLICY_MODAL_VIEWS } from '@/components/interfaces/Auth/Policies/Policies.constants'-import PolicySelection from '@/components/interfaces/Auth/Policies/PolicySelection'-import PolicyTemplates from '@/components/interfaces/Auth/Policies/PolicyTemplates'+import { POLICY_MODAL_VIEWS } from '@/components/interfaces/Database/Policies/Policies.constants'+import PolicySelection from '@/components/interfaces/Database/Policies/PolicySelection'+import PolicyTemplates from '@/components/interfaces/Database/Policies/PolicyTemplates'const newPolicyTemplate: any = {name: '',diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsxindex 07194051fe3..74fa9482b89 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePoliciesEditor.tsx@@ -3,8 +3,8 @@ import { Button, Checkbox, cn, DialogSection, DialogSectionSeparator } from 'ui'import { STORAGE_CLIENT_LIBRARY_MAPPINGS } from '../Storage.constants'import { deriveAllowedClientLibraryMethods } from '../Storage.utils'-import { PolicyName } from '@/components/interfaces/Auth/Policies/PolicyEditor/PolicyName'-import { PolicyRoles } from '@/components/interfaces/Auth/Policies/PolicyEditor/PolicyRoles'+import { PolicyName } from '@/components/interfaces/Database/Policies/PolicyEditor/PolicyName'+import { PolicyRoles } from '@/components/interfaces/Database/Policies/PolicyEditor/PolicyRoles'import { CodeEditor } from '@/components/ui/CodeEditor/CodeEditor'import { DOCS_URL } from '@/lib/constants'diff --git a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicyEditorModalTitle.tsx b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicyEditorModalTitle.tsxindex 820da1dd73b..6278433c9a6 100644--- a/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicyEditorModalTitle.tsx+++ b/apps/studio/components/interfaces/Storage/StoragePolicies/StoragePolicyEditorModalTitle.tsx@@ -3,7 +3,7 @@ import { ChevronLeft, X } from 'lucide-react'import { Dialog as DialogPrimitive } from 'radix-ui'import { cn } from 'ui'-import { POLICY_MODAL_VIEWS } from '@/components/interfaces/Auth/Policies/Policies.constants'+import { POLICY_MODAL_VIEWS } from '@/components/interfaces/Database/Policies/Policies.constants'import { DocsButton } from '@/components/ui/DocsButton'import { DOCS_URL } from '@/lib/constants'diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsxindex 9f7b919e671..ec146b9d980 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.tsx@@ -40,7 +40,7 @@ import { useIsQueueOperationsEnabled } from '@/components/interfaces/Account/Preimport {acceptGeneratedPolicy,type GeneratedPolicy,-} from '@/components/interfaces/Auth/Policies/Policies.utils'+} from '@/components/interfaces/Database/Policies/Policies.utils'import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialogs/DiscardChangesConfirmationDialog'import { databasePoliciesKeys } from '@/data/database-policies/keys'import { useDatabasePublicationCreateMutation } from '@/data/database-publications/database-publications-create-mutation'diff --git a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsxindex 990f13fa559..5221b41011d 100644--- a/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx+++ b/apps/studio/components/interfaces/TableGridEditor/SidePanelEditor/SidePanelEditor.utils.tsx@@ -26,7 +26,7 @@ import type { ColumnField, CreateColumnPayload, UpdateColumnPayload } from './Siimport { checkIfRelationChanged } from './TableEditor/ForeignKeysManagement/ForeignKeysManagement.utils'import type { ImportContent } from './TableEditor/TableEditor.types'import type { SupaRow } from '@/components/grid/types'-import { type AcceptedGeneratedPolicy } from '@/components/interfaces/Auth/Policies/Policies.utils'+import { type AcceptedGeneratedPolicy } from '@/components/interfaces/Database/Policies/Policies.utils'import { SparkBar } from '@/components/ui/SparkBar'import { createDatabaseColumn } from '@/data/database-columns/database-column-create-mutation'import { deleteDatabaseColumn } from '@/data/database-columns/database-column-delete-mutation'diff --git a/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.test.ts b/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.test.tsindex 1b7419f1326..e79948922f9 100644--- a/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.test.ts+++ b/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.test.ts@@ -181,7 +181,7 @@ describe('TableEntity.utils: formatTableRowsToSQL', () => {describe('TableEntity.utils: getTablePoliciesUrl', () => {it('builds the policies url for plain schema and name values', () => {expect(getTablePoliciesUrl('abc', 'public', 'users')).toBe(- '/project/abc/auth/policies?search=users&schema=public'+ '/project/abc/database/policies?search=users&schema=public')})diff --git a/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.ts b/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.tsindex ea9d789cc4d..dc09cc2b9d3 100644--- a/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.ts+++ b/apps/studio/components/interfaces/TableGridEditor/TableEntity.utils.ts@@ -29,7 +29,7 @@ export const getTablePoliciesUrl = (schema: string | undefined,name: string | undefined): string => {- return `/project/${projectRef ?? ''}/auth/policies?search=${encodeURIComponent(+ return `/project/${projectRef ?? ''}/database/policies?search=${encodeURIComponent(name ?? '')}&schema=${encodeURIComponent(schema ?? '')}`}diff --git a/apps/studio/components/layouts/AuthLayout/Auth.Commands.tsx b/apps/studio/components/layouts/AuthLayout/Auth.Commands.tsxindex 1d22aaf6203..3538c5e0ce0 100644--- a/apps/studio/components/layouts/AuthLayout/Auth.Commands.tsx+++ b/apps/studio/components/layouts/AuthLayout/Auth.Commands.tsx@@ -38,13 +38,6 @@ export function useAuthGotoCommands(options?: CommandOptions) {route: `/project/${ref}/auth/users`,defaultHidden: true,},- {- id: 'nav-auth-policies',- name: 'Policies',- value: 'Auth: Policies (RLS)',- route: `/project/${ref}/auth/policies`,- defaultHidden: true,- },...(authenticationSignInProviders? [{diff --git a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.test.ts b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.test.tsindex 557684c5246..dd425cce66c 100644--- a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.test.ts+++ b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.test.ts@@ -141,9 +141,11 @@ describe('generateAuthMenu', () => {const menu = generateAuthMenu({ ...allFeaturesEnabled, ref: 'my-project' })const users = findItem(menu, 'Users')const oauthApps = findItem(menu, 'OAuth Apps')+ const policies = findItem(menu, 'Policies')expect(users?.url).toBe('/project/my-project/auth/users')expect(oauthApps?.url).toBe('/project/my-project/auth/oauth-apps')+ expect(policies?.url).toBe('/project/my-project/database/policies')})it('hides Passkeys when passkeys feature is false', () => {diff --git a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.tsindex c27fa348dd8..632611d1292 100644--- a/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts+++ b/apps/studio/components/layouts/AuthLayout/AuthLayout.utils.ts@@ -1,10 +1,14 @@import { useFlag, useParams } from 'common'+import { ArrowUpRight } from 'lucide-react'+import { createElement } from 'react'import type { ProductMenuGroup } from '@/components/ui/ProductMenu/ProductMenu.types'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { IS_PLATFORM } from '@/lib/constants'import { SHORTCUT_IDS } from '@/state/shortcuts/registry'+const ExternalLinkIcon = createElement(ArrowUpRight, { strokeWidth: 1, className: 'h-4 w-4' })+export interface GenerateAuthMenuOptions {ref?: stringisPlatform: boolean@@ -87,9 +91,10 @@ export function generateAuthMenu(options: GenerateAuthMenuOptions): ProductMenuG{name: 'Policies',key: 'policies',- url: `${baseUrl}/policies`,+ url: `/project/${ref}/database/policies`,+ rightIcon: ExternalLinkIcon,items: [],- shortcutId: SHORTCUT_IDS.NAV_AUTH_POLICIES,+ // shortcutId: SHORTCUT_IDS.NAV_AUTH_POLICIES,},...(isPlatform? [diff --git a/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx b/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsxindex 47e1184dcaf..8c3787ae22f 100644--- a/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx+++ b/apps/studio/components/layouts/DatabaseLayout/Database.Commands.tsx@@ -60,6 +60,13 @@ export function useDatabaseGotoCommands(options?: CommandOptions) {route: `/project/${ref}/database/functions`,defaultHidden: true,},+ {+ id: 'nav-database-policies',+ name: 'Policies',+ value: 'Database: Policies (RLS)',+ route: `/project/${ref}/database/policies`,+ defaultHidden: true,+ },{id: 'nav-database-extensions',name: 'Extensions',@@ -157,6 +164,12 @@ export function useDatabaseGotoCommands(options?: CommandOptions) {route: `/project/${ref}/database/indexes`,icon: () => <Database />,},+ {+ id: 'run-view-database-policies',+ name: 'View and create RLS policies',+ route: `/project/${ref}/database/policies`,+ icon: () => <Database />,+ },...(databaseRoles? [{diff --git a/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx b/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsxindex d110a2ceee5..4e5bed9e943 100644--- a/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx+++ b/apps/studio/components/layouts/DatabaseLayout/DatabaseMenu.utils.tsx@@ -103,8 +103,14 @@ export const useGenerateDatabaseMenu = (): ProductMenuGroup[] => {],},{- title: 'Configuration',+ title: 'Access Control',items: [+ {+ name: 'Policies',+ key: 'policies',+ url: getDatabaseURL('policies'),+ shortcutId: SHORTCUT_IDS.NAV_DATABASE_POLICIES,+ },showRoles && {name: 'Roles',key: 'roles',@@ -117,12 +123,11 @@ export const useGenerateDatabaseMenu = (): ProductMenuGroup[] => {url: getDatabaseURL('column-privileges'),shortcutId: SHORTCUT_IDS.NAV_DATABASE_COLUMN_PRIVILEGES,},- {- name: 'Policies',- key: 'policies',- url: `/project/${ref}/auth/policies`,- rightIcon: ExternalLinkIcon,- },+ ].filter(Boolean) as ProductMenuGroupItem[],+ },+ {+ title: 'Configuration',+ items: [{name: 'Settings',key: 'settings',diff --git a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.test.tsx b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.test.tsxindex 6892203fd98..cdd4b125676 100644--- a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.test.tsx+++ b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.test.tsx@@ -205,7 +205,7 @@ describe('ProjectNeedsSecuring', () => {fireEvent.click(screen.getByText('invoices'))expect(mockRouterPush).toHaveBeenCalledWith(- '/project/project-ref/auth/policies?schema=public&search=invoices'+ '/project/project-ref/database/policies?schema=public&search=invoices')})diff --git a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.test.ts b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.test.tsindex 42d8dc33170..5684676a8ea 100644--- a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.test.ts+++ b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.test.ts@@ -63,7 +63,7 @@ describe('ProjectNeedsSecuring.utils: buildSecurityPromptMarkdown', () => {describe('ProjectNeedsSecuring.utils: getTablePoliciesHref', () => {it('builds the policies href with plain values', () => {expect(getTablePoliciesHref('abc', 'public', 'invoices')).toBe(- '/project/abc/auth/policies?schema=public&search=invoices'+ '/project/abc/database/policies?schema=public&search=invoices')})@@ -90,7 +90,7 @@ describe('ProjectNeedsSecuring.utils: getTablePoliciesHref', () => {it('falls back to empty strings for undefined inputs', () => {expect(getTablePoliciesHref(undefined, undefined, undefined)).toBe(- '/project//auth/policies?schema=&search='+ '/project//database/policies?schema=&search=')})})diff --git a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.ts b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.tsindex 86980be37e3..518b5ae6736 100644--- a/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.ts+++ b/apps/studio/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils.ts@@ -11,7 +11,7 @@ export const getTablePoliciesHref = (schema: string | undefined,name: string | undefined): string => {- return `/project/${projectRef ?? ''}/auth/policies?schema=${encodeURIComponent(+ return `/project/${projectRef ?? ''}/database/policies?schema=${encodeURIComponent(schema ?? '')}&search=${encodeURIComponent(name ?? '')}`}diff --git a/apps/studio/components/layouts/ProjectSettingsLayout/ProjectSettings.Commands.tsx b/apps/studio/components/layouts/ProjectSettingsLayout/ProjectSettings.Commands.tsxindex 1b7258539a0..9a992684534 100644--- a/apps/studio/components/layouts/ProjectSettingsLayout/ProjectSettings.Commands.tsx+++ b/apps/studio/components/layouts/ProjectSettingsLayout/ProjectSettings.Commands.tsx@@ -58,7 +58,7 @@ export function useProjectSettingsGotoCommands(options?: CommandOptions) {name: 'Auth Settings',route: authenticationSignInProviders? `/project/${ref}/auth/providers`- : `/project/${ref}/auth/policies`,+ : `/project/${ref}/database/policies`,defaultHidden: true,},...(platformWebhooksEnableddiff --git a/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx b/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsxindex c6a13814147..82b246ec302 100644--- a/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx+++ b/apps/studio/components/layouts/TableEditorLayout/EntityListItem.tsx@@ -365,7 +365,7 @@ export const EntityListItem = ({<DropdownMenuItem key="view-policies" className="space-x-2" asChild><Linkkey="view-policies"- href={`/project/${projectRef}/auth/policies?schema=${encodeURIComponent(selectedSchema ?? '')}&search=${encodeURIComponent(String(entity.id))}`}+ href={`/project/${projectRef}/database/policies?schema=${encodeURIComponent(selectedSchema ?? '')}&search=${encodeURIComponent(String(entity.id))}`}><Lock size={12} className="shrink-0" /><span>View policies</span>diff --git a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.tsindex f399e554541..801f35fb939 100644--- a/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts+++ b/apps/studio/components/ui/AIAssistantPanel/AIAssistant.utils.ts@@ -127,7 +127,7 @@ export const getContextualInvalidationKeys = ({({'auth/users': [authKeys.usersInfinite(ref)],- 'auth/policies': [databasePoliciesKeys.list(ref)],+ 'database/policies': [databasePoliciesKeys.list(ref)],'database/functions': [databaseKeys.databaseFunctions(ref)],'database/tables': [tableKeys.list(ref, schema, { includeColumns: true }),diff --git a/apps/studio/data/database-policies/database-policies-query.ts b/apps/studio/data/database-policies/database-policies-query.tsindex 38c687419d1..1a9bf0cea0a 100644--- a/apps/studio/data/database-policies/database-policies-query.ts+++ b/apps/studio/data/database-policies/database-policies-query.ts@@ -2,7 +2,7 @@ import { DEFAULT_PLATFORM_APPLICATION_NAME } from '@supabase/pg-meta/src/constanimport { useQuery } from '@tanstack/react-query'import { databasePoliciesKeys } from './keys'-import type { Policy } from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'+import type { Policy } from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'import { get, handleError } from '@/data/fetchers'import { useSelectedProjectQuery } from '@/hooks/misc/useSelectedProject'import { PROJECT_STATUS } from '@/lib/constants'diff --git a/apps/studio/pages/project/[ref]/auth/policies.tsx b/apps/studio/pages/project/[ref]/database/policies.tsxsimilarity index 94%rename from apps/studio/pages/project/[ref]/auth/policies.tsxrename to apps/studio/pages/project/[ref]/database/policies.tsxindex 43efa9f4c6c..fec4d768ee9 100644--- a/apps/studio/pages/project/[ref]/auth/policies.tsx+++ b/apps/studio/pages/project/[ref]/database/policies.tsx@@ -22,16 +22,16 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'import { useIsInlineEditorEnabled } from '@/components/interfaces/Account/Preferences/useDashboardSettings'import { useIsRLSTesterEnabled } from '@/components/interfaces/App/FeaturePreview/FeaturePreviewContext'-import { Policies } from '@/components/interfaces/Auth/Policies/Policies'-import { PoliciesDataProvider } from '@/components/interfaces/Auth/Policies/PoliciesDataContext'-import { getGeneralPolicyTemplates } from '@/components/interfaces/Auth/Policies/PolicyEditorModal/PolicyEditorModal.constants'-import { PolicyEditorPanel } from '@/components/interfaces/Auth/Policies/PolicyEditorPanel'+import { Policies } from '@/components/interfaces/Database/Policies/Policies'+import { PoliciesDataProvider } from '@/components/interfaces/Database/Policies/PoliciesDataContext'+import { getGeneralPolicyTemplates } from '@/components/interfaces/Database/Policies/PolicyEditorModal/PolicyEditorModal.constants'+import { PolicyEditorPanel } from '@/components/interfaces/Database/Policies/PolicyEditorPanel'import {generatePolicyUpdateSQL,type Policy,-} from '@/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRow.utils'-import { RLSTesterSheet } from '@/components/interfaces/Auth/RLSTester/RLSTesterSheet'-import AuthLayout from '@/components/layouts/AuthLayout/AuthLayout'+} from '@/components/interfaces/Database/Policies/PolicyTableRow/PolicyTableRow.utils'+import { RLSTesterSheet } from '@/components/interfaces/Database/RLSTester/RLSTesterSheet'+import DatabaseLayout from '@/components/layouts/DatabaseLayout/DatabaseLayout'import { DefaultLayout } from '@/components/layouts/DefaultLayout'import { SIDEBAR_KEYS } from '@/components/layouts/ProjectLayout/LayoutSidebar/LayoutSidebarProvider'import { getExposedSchemas } from '@/components/layouts/ProjectNeedsSecuring/ProjectNeedsSecuring.utils'@@ -97,7 +97,7 @@ const getTableFilterState = (tables: PGTable[], policies: Array<Policy>, searchSreturn { tables: sortedTables, visibleTableIds }}-const AuthPoliciesPage: NextPageWithLayout = () => {+const DatabasePoliciesPage: NextPageWithLayout = () => {const [schema, setSchema] = useQueryState('schema',parseAsString.withDefault('public').withOptions({ history: 'replace' })@@ -401,10 +401,10 @@ const AuthPoliciesPage: NextPageWithLayout = () => {)}-AuthPoliciesPage.getLayout = (page) => (+DatabasePoliciesPage.getLayout = (page) => (<DefaultLayout>- <AuthLayout title="Policies">{page}</AuthLayout>+ <DatabaseLayout title="Policies">{page}</DatabaseLayout></DefaultLayout>)-export default AuthPoliciesPage+export default DatabasePoliciesPagediff --git a/apps/studio/redirects.shared.ts b/apps/studio/redirects.shared.tsindex a786fac35d3..5576a0af821 100644--- a/apps/studio/redirects.shared.ts+++ b/apps/studio/redirects.shared.ts@@ -47,6 +47,11 @@ export const SHARED_REDIRECTS: StudioRedirect[] = [destination: '/project/:ref/auth/performance',permanent: true,},+ {+ source: '/project/:ref/auth/policies',+ destination: '/project/:ref/database/policies',+ permanent: true,+ },{source: '/project/:ref/database',destination: '/project/:ref/database/tables',diff --git a/apps/studio/state/shortcuts/registry/auth-nav.ts b/apps/studio/state/shortcuts/registry/auth-nav.tsindex 4aae5898777..361664ef00b 100644--- a/apps/studio/state/shortcuts/registry/auth-nav.ts+++ b/apps/studio/state/shortcuts/registry/auth-nav.ts@@ -13,7 +13,6 @@ export const AUTH_NAV_SHORTCUT_IDS = {NAV_AUTH_USERS: 'nav.auth-users',NAV_AUTH_OAUTH_APPS: 'nav.auth-oauth-apps',NAV_AUTH_EMAIL: 'nav.auth-email',- NAV_AUTH_POLICIES: 'nav.auth-policies',NAV_AUTH_SIGN_IN: 'nav.auth-sign-in',NAV_AUTH_PASSKEYS: 'nav.auth-passkeys',NAV_AUTH_OAUTH_SERVER: 'nav.auth-oauth-server',@@ -58,13 +57,6 @@ export const authNavRegistry: RegistryDefinations<AuthNavShortcutId> = {showInSettings: false,referenceGroup: SHORTCUT_REFERENCE_GROUPS.NAVIGATION_AUTH,},- [AUTH_NAV_SHORTCUT_IDS.NAV_AUTH_POLICIES]: {- id: AUTH_NAV_SHORTCUT_IDS.NAV_AUTH_POLICIES,- label: 'Go to Policies',- sequence: ['A', 'P'],- showInSettings: false,- referenceGroup: SHORTCUT_REFERENCE_GROUPS.NAVIGATION_AUTH,- },[AUTH_NAV_SHORTCUT_IDS.NAV_AUTH_SIGN_IN]: {id: AUTH_NAV_SHORTCUT_IDS.NAV_AUTH_SIGN_IN,label: 'Go to Sign In / Providers',diff --git a/apps/studio/state/shortcuts/registry/database-nav.ts b/apps/studio/state/shortcuts/registry/database-nav.tsindex 58ce0b116d6..499cfa02e79 100644--- a/apps/studio/state/shortcuts/registry/database-nav.ts+++ b/apps/studio/state/shortcuts/registry/database-nav.ts@@ -25,6 +25,7 @@ export const DATABASE_NAV_SHORTCUT_IDS = {NAV_DATABASE_COLUMN_PRIVILEGES: 'nav.database-column-privileges',NAV_DATABASE_SETTINGS: 'nav.database-settings',NAV_DATABASE_REPLICATION: 'nav.database-replication',+ NAV_DATABASE_POLICIES: 'nav.database-policies',}export type DatabaseNavShortcutId =@@ -129,4 +130,11 @@ export const databaseNavRegistry: RegistryDefinations<DatabaseNavShortcutId> = {showInSettings: false,referenceGroup: SHORTCUT_REFERENCE_GROUPS.NAVIGATION_DATABASE,},+ [DATABASE_NAV_SHORTCUT_IDS.NAV_DATABASE_POLICIES]: {+ id: DATABASE_NAV_SHORTCUT_IDS.NAV_DATABASE_POLICIES,+ label: 'Go to Policies',+ sequence: ['D', 'A'],+ showInSettings: false,+ referenceGroup: SHORTCUT_REFERENCE_GROUPS.NAVIGATION_DATABASE,+ },}diff --git a/e2e/studio/features/rls-policies.spec.ts b/e2e/studio/features/rls-policies.spec.tsindex 172871895c5..899afdefac7 100644--- a/e2e/studio/features/rls-policies.spec.ts+++ b/e2e/studio/features/rls-policies.spec.ts@@ -10,7 +10,7 @@ import { createApiResponseWaiter } from '../utils/wait-for-response.js'*/const navigateToPoliciesPage = async (page: Page, ref: string) => {const wait = createApiResponseWaiter(page, 'pg-meta', ref, 'policies')- await page.goto(toUrl(`/project/${ref}/auth/policies`))+ await page.goto(toUrl(`/project/${ref}/database/policies`))await waitawait page.waitForTimeout(500)}diff --git a/packages/common/telemetry-constants.ts b/packages/common/telemetry-constants.tsindex 6034b84443f..de486929d08 100644--- a/packages/common/telemetry-constants.ts+++ b/packages/common/telemetry-constants.ts@@ -3092,7 +3092,7 @@ export interface IntegrationUninstallCompletedEvent {** @group Events* @source studio- * @page /project/{ref}/auth/policies+ * @page /project/{ref}/database/policies*/export interface RlsEventTriggerBannerCreateButtonClickedEvent {action: 'rls_event_trigger_banner_create_button_clicked'