Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/ai-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
with:
sparse-checkout: |
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/authorize-vercel-deploys.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
# fetch only the root files and scripts folder
sparse-checkout: |
scripts
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/autofix_linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
sparse-checkout: |
packages
apps
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dashboard-pr-reminder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
with:
sparse-checkout: |
scripts
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-last-changed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
fetch-depth: 0
sparse-checkout: |
apps/docs
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-mgmt-api-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
ref: master
sparse-checkout: |
apps/docs
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-sync-troubleshooting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
with:
sparse-checkout: |
apps/docs
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ jobs:
sparse-checkout: |
apps/docs
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-tests-smoke.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ jobs:
sparse-checkout: |
apps/docs
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
examples
packages
supabase
patches

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pg-meta-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ jobs:
sparse-checkout: |
packages/pg-meta
packages/tsconfig
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ jobs:
- name: Check out repo
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4.3.0
with:
sparse-checkout: apps
sparse-checkout: |
apps
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
with:
Expand All @@ -46,6 +48,7 @@ jobs:
with:
sparse-checkout: |
i18n
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
with:
Expand All @@ -71,6 +74,7 @@ jobs:
sparse-checkout: |
apps/docs/pages
apps/docs/content
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/search.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ jobs:
examples
packages
supabase
patches

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/studio-lint-ratchet-decrease.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
.github
apps/studio
packages
patches

- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/studio-lint-ratchet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
.github
apps/studio
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand All @@ -41,5 +42,5 @@ jobs:
- name: Install deps
run: pnpm install --frozen-lockfile

- name: Run ratchet script
- name: Run ratchet script
run: pnpm --filter studio run lint:ratchet
3 changes: 3 additions & 0 deletions .github/workflows/studio-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ jobs:
sparse-checkout: |
apps/studio
packages
patches

- uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
id: filter
with:
Expand Down Expand Up @@ -83,6 +85,7 @@ jobs:
with:
sparse-checkout: |
apps/studio
patches
- name: Download coverage artifact
uses: actions/download-artifact@d3f86a106a0bac45b974a628896c90dbdf5c8093 # v4.3.0
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ui-patterns-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ jobs:
with:
sparse-checkout: |
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ jobs:
with:
sparse-checkout: |
packages
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
if: steps.filter.outputs.relevant == 'true'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/www-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
apps/www
packages
supabase
patches
- uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4.2.0
name: Install pnpm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ export const InfrastructureInfo = () => {
const { ref } = useParams()
const { data: project } = useSelectedProjectQuery()

const { projectAuthAll: authEnabled, projectSettingsDatabaseUpgrades: showDatabaseUpgrades } =
useIsFeatureEnabled(['project_auth:all', 'project_settings:database_upgrades'])
const {
projectAuthAll: authEnabled,
projectSettingsDatabaseUpgrades: showDatabaseUpgrades,
databaseReplication: showReplication,
} = useIsFeatureEnabled([
'project_auth:all',
'project_settings:database_upgrades',
'database:replication',
])

const {
data,
Expand Down Expand Up @@ -71,7 +78,7 @@ export const InfrastructureInfo = () => {
<>
<ScaffoldDivider />

{project?.cloud_provider !== 'FLY' && (
{project?.cloud_provider !== 'FLY' && showReplication && (
<ScaffoldContainer>
<ScaffoldSection isFullWidth>
<NoticeBar
Expand Down
4 changes: 2 additions & 2 deletions apps/studio/data/partners/keys.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const stripeProductKeys = {
get: (arId: string | undefined) => ['stripe', 'product', arId] as const,
export const stripeFabricKeys = {
get: (arId: string | undefined) => ['stripe', 'fabric', arId] as const,
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ async function confirmAccountRequest({ arId }: ConfirmAccountRequestVariables) {
if (!arId) throw new Error('Account request ID is required')

const { data, error } = await post(
'/platform/stripe/product/provisioning/account_requests/{id}/confirm',
'/platform/stripe/fabric/provisioning/account_requests/{id}/confirm',
{
params: { path: { id: arId } },
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { queryOptions } from '@tanstack/react-query'
import type { components } from 'api-types'

import { get, handleError } from '../fetchers'
import { stripeProductKeys } from './keys'
import { stripeFabricKeys } from './keys'

type GetAccountRequestVariables = {
arId?: string
Expand All @@ -13,7 +13,7 @@ export type AccountRequestDetails = components['schemas']['AccountRequestDetails
async function getAccountRequest({ arId }: GetAccountRequestVariables, signal?: AbortSignal) {
if (!arId) throw new Error('Account request ID is required')

const { data, error } = await get('/platform/stripe/product/provisioning/account_requests/{id}', {
const { data, error } = await get('/platform/stripe/fabric/provisioning/account_requests/{id}', {
params: { path: { id: arId } },
signal,
})
Expand All @@ -27,7 +27,7 @@ export const accountRequestQueryOptions = (
{ enabled = true }: { enabled?: boolean } = { enabled: true }
) => {
return queryOptions({
queryKey: stripeProductKeys.get(arId),
queryKey: stripeFabricKeys.get(arId),
queryFn: ({ signal }) => getAccountRequest({ arId }, signal),
enabled: enabled && typeof arId !== 'undefined',
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import {
} from 'ui'

import APIAuthorizationLayout from '@/components/layouts/APIAuthorizationLayout'
import { useConfirmAccountRequestMutation } from '@/data/partners/stripe-product-confirm-mutation'
import { accountRequestQueryOptions } from '@/data/partners/stripe-product-query'
import { useConfirmAccountRequestMutation } from '@/data/partners/stripe-fabric-confirm-mutation'
import { accountRequestQueryOptions } from '@/data/partners/stripe-fabric-query'
import { withAuth } from '@/hooks/misc/withAuth'
import { useSignOut } from '@/lib/auth'

const StripeProductLoginPage = () => {
const StripeFabricLoginPage = () => {
const router = useRouter()
const { ar_id } = useParams()

Expand Down Expand Up @@ -74,9 +74,9 @@ const StripeProductLoginPage = () => {
<LogoLoader />
) : isSuccess ? (
<>
<h2 className="py-2 text-lg font-medium">Stripe Product Account Request</h2>
<h2 className="py-2 text-lg font-medium">Stripe Fabric Account Request</h2>
<p className="text-center text-foreground-light">
Stripe Product wants to create a Supabase organization for{' '}
Stripe Fabric wants to create a Supabase organization for{' '}
<strong>{accountRequest.email}</strong>
{accountRequest.name && <> ({accountRequest.name})</>}.
</p>
Expand Down Expand Up @@ -118,4 +118,4 @@ const StripeProductLoginPage = () => {
)
}

export default withAuth(StripeProductLoginPage)
export default withAuth(StripeFabricLoginPage)
Loading
Loading