The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
refactor: move /incident-status to app router (#43881)
Charisa4641d0b9fe6
diff --git a/apps/studio/pages/api/incident-status.ts b/apps/studio/app/api/incident-status/route.tssimilarity index 72%rename from apps/studio/pages/api/incident-status.tsrename to apps/studio/app/api/incident-status/route.tsindex ded8eb02d98..456806054a9 100644--- a/apps/studio/pages/api/incident-status.ts+++ b/apps/studio/app/api/incident-status/route.ts@@ -1,5 +1,5 @@import { IS_PLATFORM } from 'common'-import { NextApiRequest, NextApiResponse } from 'next'+import { NextResponse } from 'next/server'import { InternalServerError } from '@/lib/api/apiHelpers'import { getActiveIncidents, type IncidentCache } from '@/lib/api/incident-status'@@ -42,22 +42,26 @@ async function fetchIncidentCache(incidentIds: Array<string>): Promise<Map<strinreturn cacheMap}-async function handler(req: NextApiRequest, res: NextApiResponse) {- if (!IS_PLATFORM) {- return res.status(404).end()- }+export async function OPTIONS() {+ if (!IS_PLATFORM) return new Response(null, { status: 404 })+ return new Response(null, {+ status: 204,+ headers: {+ Allow: 'GET, HEAD, OPTIONS',+ },+ })+}- const { method } = req+export async function HEAD() {+ if (!IS_PLATFORM) return new Response(null, { status: 404 })+ return new Response(null, {+ status: 200,+ headers: { 'Cache-Control': CACHE_CONTROL_SETTINGS },+ })+}- if (method === 'HEAD') {- res.setHeader('Cache-Control', CACHE_CONTROL_SETTINGS)- return res.status(200).end()- }-- if (method !== 'GET') {- res.setHeader('Allow', ['GET', 'HEAD'])- return res.status(405).json({ error: `Method ${method} Not Allowed` })- }+export async function GET() {+ if (!IS_PLATFORM) return new Response(null, { status: 404 })try {const allIncidents = await getActiveIncidents()@@ -75,17 +79,18 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {cache: cacheMap.get(incident.id) ?? null,}))- res.setHeader('Cache-Control', CACHE_CONTROL_SETTINGS)-- return res.status(200).json(enrichedIncidents)+ return NextResponse.json(enrichedIncidents, {+ headers: { 'Cache-Control': CACHE_CONTROL_SETTINGS },+ })} catch (error) {let errorCode = 500+ const headers = new Headers()if (error instanceof InternalServerError) {if (typeof error.details?.status === 'number') errorCode = error.details.statusif (errorCode === 420) errorCode = 429if (errorCode === 429 && typeof error.details?.retryAfter === 'string') {- res.setHeader('Retry-After', error.details.retryAfter)+ headers.set('Retry-After', error.details.retryAfter)}console.error('Failed to fetch active StatusPage incidents: %O', {message: error.message,@@ -95,8 +100,9 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {console.error('Unexpected error fetching active StatusPage incidents: %O', error)}- return res.status(errorCode).json({ error: 'Unable to fetch incidents at this time' })+ return NextResponse.json(+ { error: 'Unable to fetch incidents at this time' },+ { status: errorCode, headers }+ )}}--export default handlerdiff --git a/apps/studio/components/grid/SupabaseGrid.utils.ts b/apps/studio/components/grid/SupabaseGrid.utils.tsindex 289acb87910..65765ff8072 100644--- a/apps/studio/components/grid/SupabaseGrid.utils.ts+++ b/apps/studio/components/grid/SupabaseGrid.utils.ts@@ -242,8 +242,8 @@ export function useSyncTableEditorStateFromLocalStorageWithUrl({// Use nextjs useSearchParams to get the latest URL paramsconst searchParams = useSearchParams()const urlParams = useMemo(() => {- const sort = searchParams.getAll('sort')- const filter = searchParams.getAll('filter')+ const sort = searchParams?.getAll('sort') ?? []+ const filter = searchParams?.getAll('filter') ?? []return { sort, filter }}, [searchParams])diff --git a/apps/studio/components/layouts/ProjectLayout/UpgradingState/index.tsx b/apps/studio/components/layouts/ProjectLayout/UpgradingState/index.tsxindex 42ed5734c16..7a115e941a9 100644--- a/apps/studio/components/layouts/ProjectLayout/UpgradingState/index.tsx+++ b/apps/studio/components/layouts/ProjectLayout/UpgradingState/index.tsx@@ -36,7 +36,7 @@ export const UpgradingState = () => {{projectRef: ref,projectStatus: project?.status,- trackingId: queryParams.get('trackingId'),+ trackingId: queryParams?.get('trackingId'),},{enabled: IS_PLATFORM,diff --git a/apps/studio/lib/api/incident-status.ts b/apps/studio/lib/api/incident-status.tsindex 0ea751dcae9..670aa261a0c 100644--- a/apps/studio/lib/api/incident-status.ts+++ b/apps/studio/lib/api/incident-status.ts@@ -1,7 +1,6 @@-import z from 'zod'-import { IS_PLATFORM } from 'common'import { InternalServerError } from 'lib/api/apiHelpers'+import z from 'zod'export type IncidentCache = {affected_regions: Array<string> | null@@ -81,7 +80,7 @@ export async function getActiveIncidents(): Promise<IncidentInfo[]> {Accept: 'application/json','Content-Type': 'application/json',},- cache: 'no-store',+ next: { revalidate: 180 },signal: AbortSignal.timeout(30_000),})const responseText = await response.text()diff --git a/apps/studio/pages/project/[ref]/sql/quickstarts.tsx b/apps/studio/pages/project/[ref]/sql/quickstarts.tsxindex 2b69bbc2512..ea7b3b34d43 100644--- a/apps/studio/pages/project/[ref]/sql/quickstarts.tsx+++ b/apps/studio/pages/project/[ref]/sql/quickstarts.tsx@@ -12,7 +12,7 @@ import type { NextPageWithLayout } from 'types'const SqlQuickstarts: NextPageWithLayout = () => {const router = useRouter()- const { ref } = useParams<{ ref: string }>()+ const ref = useParams<{ ref: string }>()?.refconst tabs = useTabsStateSnapshot()useEffect(() => {diff --git a/apps/studio/pages/project/[ref]/sql/templates.tsx b/apps/studio/pages/project/[ref]/sql/templates.tsxindex 2e219edaa52..c1e2db63994 100644--- a/apps/studio/pages/project/[ref]/sql/templates.tsx+++ b/apps/studio/pages/project/[ref]/sql/templates.tsx@@ -12,7 +12,7 @@ import type { NextPageWithLayout } from 'types'const SqlTemplates: NextPageWithLayout = () => {const router = useRouter()- const { ref } = useParams<{ ref: string }>()+ const ref = useParams<{ ref: string }>()?.refconst tabs = useTabsStateSnapshot()useEffect(() => {diff --git a/apps/studio/tsconfig.json b/apps/studio/tsconfig.jsonindex 4ae881822a2..f6061f9781c 100644--- a/apps/studio/tsconfig.json+++ b/apps/studio/tsconfig.json@@ -36,7 +36,8 @@"**/*.js","**/*.jsx",".next/types/**/*.ts",- "./../../packages/ui/src/**/*.d.ts"+ "./../../packages/ui/src/**/*.d.ts",+ ".next/dev/types/**/*.ts"],"exclude": ["node_modules", "public/deno/*.ts"]}