Skip to content

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

fix: updated to check fetch status if the user does not have permissions for audit logs (#41661)

Ali Waseem0500c21b37cc
diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
index 784883f2fcb..f2887ca1f4c 100644
--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
@@ -76,6 +76,7 @@ export const AuditLogs = () => {
isSuccess,
isError,
isRefetching,
+ fetchStatus,
refetch,
} = useOrganizationAuditLogsQuery(
{
@@ -140,6 +141,9 @@ export const AuditLogs = () => {
}
})
+ const shouldShowLoadingState =
+ (isLoading && fetchStatus !== 'idle') || isLoadingPermissions || isLoadingEntitlements
+
// This feature depends on the subscription tier of the user.
// The API limits the logs to maximum of 62 days and 5 minutes so when the page is
// viewed for more than 5 minutes, the call parameters needs to be updated. This also works with
@@ -256,7 +260,7 @@ export const AuditLogs = () => {
</div>
)}
- {isLoading || isLoadingPermissions || isLoadingEntitlements ? (
+ {shouldShowLoadingState ? (
<div className="space-y-2">
<ShimmeringLoader />
<ShimmeringLoader className="w-3/4" />