Skip to content

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

refactor(studio): remove unpaginated buckets list (#42216)

Charis1d125f5b9dbf
diff --git a/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx b/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
index 22747ec2364..3cdb377c011 100644
--- a/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
+++ b/apps/studio/components/interfaces/Storage/__tests__/DeleteBucketModal.test.tsx
@@ -63,7 +63,7 @@ describe(`DeleteBucketModal`, () => {
status: 'ACTIVE_HEALTHY',
},
})
- // useBucketsQuery
+ // usePaginatedBucketsQuery
addAPIMock({
method: `get`,
path: `/platform/storage/:ref/buckets`,
diff --git a/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts b/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts
index 1dbf7c6b3b6..b392c1f8ff2 100644
--- a/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts
+++ b/apps/studio/components/interfaces/Storage/useBucketPolicyCount.ts
@@ -1,24 +1,35 @@
-import { formatPoliciesForStorage } from 'components/interfaces/Storage/Storage.utils'
+import { useCallback, useMemo } from 'react'
+
+import { extractBucketNameFromDefinition } from 'components/interfaces/Storage/Storage.utils'
import { useDatabasePoliciesQuery } from 'data/database-policies/database-policies-query'
-import { useBucketsQuery } from 'data/storage/buckets-query'
import { useSelectedProjectQuery } from 'hooks/misc/useSelectedProject'
-export const useBucketPolicyCount = () => {
- const { data: project, isPending: isLoadingProject } = useSelectedProjectQuery()
- const { data: buckets = [], isPending: isLoadingBuckets } = useBucketsQuery({
- projectRef: project?.ref,
- })
- const { data: policiesData = [], isPending: isLoadingPolicies } = useDatabasePoliciesQuery({
+export function useBucketPolicyCount() {
+ const { data: project, isPending: isProjectPending } = useSelectedProjectQuery()
+ const { data: policiesData = [], isPending: isPoliciesPending } = useDatabasePoliciesQuery({
projectRef: project?.ref,
connectionString: project?.connectionString,
schema: 'storage',
})
- const storageObjectsPolicies = policiesData.filter((policy: any) => policy.table === 'objects')
- const formattedPolicies = formatPoliciesForStorage(buckets, storageObjectsPolicies)
- const getPolicyCount = (bucketName: string) => {
- return formattedPolicies.find((x) => x.name === bucketName)?.policies.length ?? 0
- }
+ const policyCountByBucket = useMemo(() => {
+ const countMap = new Map<string, number>()
+ for (const policy of policiesData) {
+ if (policy.table !== 'objects') continue
+ const bucketName =
+ extractBucketNameFromDefinition(policy.definition) ??
+ extractBucketNameFromDefinition(policy.check)
+ if (bucketName) {
+ countMap.set(bucketName, (countMap.get(bucketName) ?? 0) + 1)
+ }
+ }
+ return countMap
+ }, [policiesData])
+
+ const getPolicyCount = useCallback(
+ (bucketName: string) => policyCountByBucket.get(bucketName) ?? 0,
+ [policyCountByBucket]
+ )
- return { getPolicyCount, isLoading: isLoadingProject || isLoadingBuckets || isLoadingPolicies }
+ return { getPolicyCount, isLoading: isProjectPending || isPoliciesPending }
}
diff --git a/apps/studio/data/storage/buckets-query.ts b/apps/studio/data/storage/buckets-query.ts
index a41b5d87bca..15a4efee5be 100644
--- a/apps/studio/data/storage/buckets-query.ts
+++ b/apps/studio/data/storage/buckets-query.ts
@@ -133,25 +133,6 @@ export const useBucketQuery = <TData = BucketData>(
})
}
-/**
- * @deprecated - use usePaginatedBucketsQuery instead for better performance
- */
-export const useBucketsQuery = <TData = BucketsData>(
- { projectRef }: BucketsVariables,
- { enabled = true, ...options }: UseCustomQueryOptions<BucketsData, BucketsError, TData> = {}
-) => {
- const { data: project } = useSelectedProjectQuery()
- const isActive = project?.status === PROJECT_STATUS.ACTIVE_HEALTHY
-
- return useQuery<BucketsData, BucketsError, TData>({
- queryKey: storageKeys.buckets(projectRef),
- queryFn: ({ signal }) => getBuckets({ projectRef }, signal),
- enabled: enabled && typeof projectRef !== 'undefined' && isActive,
- ...options,
- retry: shouldRetryBucketsQuery,
- })
-}
-
export const useBucketNumberEstimateQuery = (
{ projectRef }: BucketsVariables,
{ enabled = true, ...options }: UseCustomQueryOptions<number | undefined, ResponseError> = {}