mirror of
https://github.com/supabase/supabase.git
synced 2026-09-22 13:37:53 +08:00
737b8595f2
## Problem platform, v1 and v2 have been already completely migrated and introduced some changes. Some types have been renamed, some outputs and inputs updated. ## Solution - Update the API types - Fix the TS errors ## Update Taking this over to unblock #50134, which needs the new scoped token permission ids from the regenerated types. - Merged `master`. - Regenerated `api-v2.d.ts` from the production spec. The previous files came from a local API that exposed a webhook events endpoint production doesn't have yet. Production has since added standardized 400 error responses on the v2 organization endpoints. `api-v1.d.ts` and `platform.d.ts` already matched production. - Fixed `verify-production-types`. It formatted the regenerated files in a temp directory outside the repository, so Prettier fell back to its defaults and the comparison could never match the committed files. It now passes the repository config explicitly. `pnpm api:verify-types` passes on this branch. - Verified locally: `pnpm typecheck`, `pnpm api:verify-types`, Studio unit tests. <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Bug Fixes** * Preserved descriptions when saving, sharing, moving, or unsharing notebooks, reports, SQL snippets, and saved queries. * Improved handling of empty or null values across notebook descriptions, billing usage, pooler settings, and infrastructure fields. * Improved read-replica connection handling, including read-only connection strings. * Updated storage configuration and capability handling to match current settings. * **API and Compatibility** * Updated organization, project, storage, OAuth, billing, and infrastructure data handling to match current API responses. * OAuth app creation and updates now require scopes. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Alaister Young <10985857+alaister@users.noreply.github.com>
88 lines
2.7 KiB
TypeScript
88 lines
2.7 KiB
TypeScript
import { useInfiniteQuery, UseInfiniteQueryOptions } from '@tanstack/react-query'
|
|
import type { ResponseError } from '~/types/fetch'
|
|
import { components } from 'api-types'
|
|
|
|
import { get } from './fetchWrappers'
|
|
|
|
const DEFAULT_LIMIT = 10
|
|
const projectKeys = {
|
|
listInfinite: (params?: {
|
|
limit: number
|
|
sort?: 'name_asc' | 'name_desc' | 'created_asc' | 'created_desc'
|
|
search?: string
|
|
}) => ['all-projects-infinite', params].filter(Boolean),
|
|
}
|
|
|
|
interface GetProjectsInfiniteVariables {
|
|
limit?: number
|
|
sort?: 'name_asc' | 'name_desc' | 'created_asc' | 'created_desc'
|
|
search?: string
|
|
page?: number
|
|
}
|
|
|
|
export type ProjectInfoInfinite =
|
|
components['schemas']['ListProjectsPaginatedResponse_Output']['projects'][number]
|
|
|
|
async function getProjects(
|
|
{
|
|
limit = DEFAULT_LIMIT,
|
|
page = 0,
|
|
sort = 'name_asc',
|
|
search: _search = '',
|
|
}: GetProjectsInfiniteVariables,
|
|
signal?: AbortSignal,
|
|
headers?: Record<string, string>
|
|
) {
|
|
const offset = page * limit
|
|
const search = _search.length === 0 ? undefined : _search
|
|
|
|
const { data, error } = await get('/platform/projects', {
|
|
// @ts-ignore [Joshen] API type issue for Version 2 endpoints
|
|
params: { query: { limit, offset, sort, search } },
|
|
signal,
|
|
headers: { ...headers, Version: '2' },
|
|
})
|
|
|
|
if (error) throw error
|
|
return data as unknown as components['schemas']['ListProjectsPaginatedResponse_Output']
|
|
}
|
|
|
|
export type ProjectsInfiniteData = Awaited<ReturnType<typeof getProjects>>
|
|
export type ProjectsInfiniteError = ResponseError
|
|
|
|
export const useProjectsInfiniteQuery = <
|
|
TData = { pages: ProjectsInfiniteData[]; pageParams: number[] },
|
|
>(
|
|
{ limit = DEFAULT_LIMIT, sort = 'name_asc', search }: GetProjectsInfiniteVariables,
|
|
{
|
|
enabled = true,
|
|
...options
|
|
}: Omit<
|
|
UseInfiniteQueryOptions<ProjectsInfiniteData, ProjectsInfiniteError, TData>,
|
|
'queryKey' | 'getNextPageParam' | 'initialPageParam'
|
|
>
|
|
) => {
|
|
return useInfiniteQuery<ProjectsInfiniteData, ProjectsInfiniteError, TData>({
|
|
enabled,
|
|
queryKey: projectKeys.listInfinite({ limit, sort, search }),
|
|
queryFn: ({ signal, pageParam }) =>
|
|
getProjects({ limit, page: pageParam as any, sort, search }, signal),
|
|
initialPageParam: 0,
|
|
getNextPageParam(lastPage, pages) {
|
|
const page = pages.length
|
|
const currentTotalCount = page * limit
|
|
// @ts-ignore [Joshen] API type issue for Version 2 endpoints
|
|
const totalCount = lastPage.pagination.count
|
|
|
|
if (currentTotalCount >= totalCount) return undefined
|
|
return page
|
|
},
|
|
staleTime: 30 * 60 * 1000, // 30 minutes
|
|
...options,
|
|
})
|
|
}
|
|
|
|
export function isProjectPaused(project: { status: string } | null): boolean | undefined {
|
|
return !project ? undefined : project.status === 'INACTIVE'
|
|
}
|