Skip to content

[pull] master from supabase:master #92

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 30, 2025
Merged

[pull] master from supabase:master #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
37e44be
feat: Add GTM (#35567)
ivasilov Jun 30, 2025
3cf5c3a
fix: supabase assets url (#36766)
alaister Jun 30, 2025
4984392
fix: prevent double submission of plan change (#36765)
kevcodez Jun 30, 2025
92eabe3
Auth + Database Report Fix (#36768)
jordienr Jun 30, 2025
2aee615
Chore/fix index delete (#36774)
saltcod Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/docker/ @supabase/dev-workflows

/apps/studio/next.config.js @supabase/security
/apps/studio/csp.js @supabase/security
/apps/studio/components/interfaces/Billing/Payment @supabase/security
/apps/studio/components/interfaces/Organization/BillingSettings/ @supabase/security
/apps/studio/components/interfaces/Organization/Documents/ @supabase/security
Expand Down
2 changes: 2 additions & 0 deletions apps/docs/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { genFaviconData } from 'common/MetaFavicons/app-router'
import { GlobalProviders } from '~/features/app.providers'
import { TopNavSkeleton } from '~/layouts/MainSkeleton'
import { BASE_PATH, IS_PRODUCTION } from '~/lib/constants'
import { TelemetryTagManager } from 'common'

const metadata: Metadata = {
applicationName: 'Supabase Docs',
Expand Down Expand Up @@ -47,6 +48,7 @@ const RootLayout = ({ children }: { children: React.ReactNode }) => {
return (
<html lang="en">
<body>
<TelemetryTagManager />
<GlobalProviders>
<TopNavSkeleton>{children}</TopNavSkeleton>
</GlobalProviders>
Expand Down
1 change: 1 addition & 0 deletions apps/docs/turbo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
"NEXT_PUBLIC_AUTH_PERSISTED_KEY",
"NEXT_PUBLIC_AUTH_NAVIGATOR_LOCK_KEY",
"NEXT_PUBLIC_AUTH_DETECT_SESSION_IN_URL",
"NEXT_PUBLIC_GOOGLE_TAG_MANAGER_ID",
"NEXT_PUBLIC_GOTRUE_URL",
"NEXT_PUBLIC_SUPABASE_ANON_KEY",
// These envs are technically passthrough env vars because they're only used on the server side of Nextjs
Expand Down
2 changes: 2 additions & 0 deletions apps/studio/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,5 @@ yarn-error.log*
/public/dashboard
# Sentry Auth Token
.sentryclirc

certificates
1 change: 1 addition & 0 deletions apps/studio/components/interfaces/Database/Indexes/Indexes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ const Indexes = () => {
projectRef: project.ref,
connectionString: project.connectionString,
name: index.name,
schema: selectedSchema,
})
}

Expand Down
8 changes: 6 additions & 2 deletions ...nts/interfaces/Organization/BillingSettings/Subscription/SubscriptionPlanUpdateDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { useQueryClient } from '@tanstack/react-query'
import { Check, InfoIcon } from 'lucide-react'
import Link from 'next/link'
import { useMemo, useRef, useState } from 'react'
Expand All @@ -11,7 +10,6 @@ import {
} from 'components/interfaces/Billing/Subscription/Subscription.utils'
import AlertError from 'components/ui/AlertError'
import ShimmeringLoader from 'components/ui/ShimmeringLoader'
import { organizationKeys } from 'data/organizations/keys'
import { OrganizationBillingSubscriptionPreviewResponse } from 'data/organizations/organization-billing-subscription-preview'
import { ProjectInfo } from 'data/projects/projects-query'
import { useOrgSubscriptionUpdateMutation } from 'data/subscriptions/org-subscription-update-mutation'
Expand Down Expand Up @@ -115,6 +113,7 @@ export const SubscriptionPlanUpdateDialog = ({
)

const onSuccessfulPlanChange = () => {
setPaymentConfirmationLoading(false)
toast.success(
`Successfully ${changeType === 'downgrade' ? 'downgraded' : 'upgraded'} subscription to ${subscriptionPlanMeta?.name}!`
)
Expand All @@ -133,6 +132,7 @@ export const SubscriptionPlanUpdateDialog = ({
onSuccessfulPlanChange()
},
onError: (error) => {
setPaymentConfirmationLoading(false)
toast.error(`Unable to update subscription: ${error.message}`)
},
}
Expand Down Expand Up @@ -168,9 +168,13 @@ export const SubscriptionPlanUpdateDialog = ({
if (!selectedOrganization?.slug) return console.error('org slug is required')
if (!selectedTier) return console.error('Selected plan is required')

setPaymentConfirmationLoading(true)

const paymentMethod = await paymentMethodSelection.current?.createPaymentMethod()
if (paymentMethod) {
setSelectedPaymentMethod(paymentMethod.id)
} else {
setPaymentConfirmationLoading(false)
}

if (
Expand Down
4 changes: 2 additions & 2 deletions apps/studio/components/interfaces/Reports/ReportChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* This component acts as a bridge between the data-fetching logic and the
* presentational chart component.
*/
import ComposedChartHandler from 'components/ui/Charts/ComposedChartHandler'
import LogChartHandler from 'components/ui/Charts/LogChartHandler'
import { useChartData } from 'hooks/useChartData'
import type { UpdateDateRange } from 'pages/project/[ref]/reports/database'
import type { MultiAttribute } from 'components/ui/Charts/ComposedChart.utils'
Expand Down Expand Up @@ -43,7 +43,7 @@ const ReportChart = ({
})

return (
<ComposedChartHandler
<LogChartHandler
{...chart}
attributes={
(chartAttributes.length > 0 ? chartAttributes : chart.attributes) as MultiAttribute[]
Expand Down
Loading
Loading