Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

fix: add loading state to prevent API status flicker (#43729)

Vaibhavefa6f2070fad
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
index a65470a3d96..c0f575bcf38 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/PolicyTableRowHeader.tsx
@@ -16,6 +16,7 @@ interface PolicyTableRowHeaderProps {
table: PolicyTable
isLocked: boolean
hasApiAccess: boolean
+ isLoadingApiAccess: boolean
onSelectToggleRLS: (table: PolicyTable) => void
onSelectCreatePolicy: (table: PolicyTable) => void
}
@@ -24,6 +25,7 @@ export const PolicyTableRowHeader = ({
table,
isLocked,
hasApiAccess,
+ isLoadingApiAccess,
onSelectToggleRLS = noop,
onSelectCreatePolicy,
}: PolicyTableRowHeaderProps) => {
@@ -59,7 +61,7 @@ export const PolicyTableRowHeader = ({
RLS Disabled
</Badge>
)}
- {!hasApiAccess && (
+ {!isLoadingApiAccess && !hasApiAccess && (
<Badge variant="default" className="shrink-0">
API Disabled
</Badge>
diff --git a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
index a2ef83a4e49..8a41aa1b98b 100644
--- a/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
+++ b/apps/studio/components/interfaces/Auth/Policies/PolicyTableRow/index.tsx
@@ -66,11 +66,12 @@ const PolicyTableRowComponent = ({
[exposedSchemas, table.schema]
)
- const { data: tablesWithAnonAuthAccess = new Set() } = useTablesRolesAccessQuery({
- projectRef: project?.ref,
- connectionString: project?.connectionString,
- schema: table.schema,
- })
+ const { data: tablesWithAnonAuthAccess = new Set(), isLoading: isLoadingRolesAccess } =
+ useTablesRolesAccessQuery({
+ projectRef: project?.ref,
+ connectionString: project?.connectionString,
+ schema: table.schema,
+ })
const hasAnonAuthenticatedRolesAccess = tablesWithAnonAuthAccess.has(table.name)
const hasApiAccess = isTableExposedThroughAPI && hasAnonAuthenticatedRolesAccess
@@ -81,7 +82,7 @@ const PolicyTableRowComponent = ({
const isRealtimeMessagesTable = isRealtimeSchema && table.name === 'messages'
const isTableLocked = isRealtimeSchema ? !isRealtimeMessagesTable : isLocked
- const showPolicies = !isPoliciesLoading && !isPoliciesError
+ const showPolicies = !isPoliciesLoading && !isPoliciesError && !isLoadingRolesAccess
const shouldHideHeaderBorder =
isPubliclyReadableWritable ||
@@ -106,12 +107,13 @@ const PolicyTableRowComponent = ({
table={table}
isLocked={isLocked}
hasApiAccess={hasApiAccess}
+ isLoadingApiAccess={isLoadingRolesAccess}
onSelectToggleRLS={onSelectToggleRLS}
onSelectCreatePolicy={onSelectCreatePolicy}
/>
</CardHeader>
- {!isTableExposedThroughAPI && (
+ {!isLoadingRolesAccess && !isTableExposedThroughAPI && (
<Admonition
showIcon={false}
type="warning"
@@ -128,7 +130,8 @@ const PolicyTableRowComponent = ({
</Admonition>
)}
- {(isPubliclyReadableWritable || rlsEnabledNoPolicies || isApiDisabledDueToRoles) &&
+ {!isLoadingRolesAccess &&
+ (isPubliclyReadableWritable || rlsEnabledNoPolicies || isApiDisabledDueToRoles) &&
isTableExposedThroughAPI && (
<Admonition
showIcon={false}
@@ -139,7 +142,7 @@ const PolicyTableRowComponent = ({
</Admonition>
)}
- {isPoliciesLoading && (
+ {(isPoliciesLoading || isLoadingRolesAccess) && (
<CardContent>
<ShimmeringLoader />
</CardContent>