mirror of
https://github.com/supabase/supabase.git
synced 2026-10-07 10:25:06 +03:00
* update deps + image codemod (studio) * update next links (studio) * update deps * update links (ui) * remove next-transpile-modules * move next-themes dependency * chore: update ConfirmDialog * chore: remove old ConfirmModal js file. migrated to TS * dependency wrangling * remove empty page * update next links (www) * First run bump react-data-grid-v7 beta 4 * fix package-lock.json * more deps wrangling * update recharts * update sentry options * fix some broken things in www * studio fixes * fix graphiql * fix studio build * fix menu hydration * small build error * update turbo * fix www typescript errors * docs image codemod * links codemod docs * fix docs typescript errors * move useConsent to ui to prevent circular deps * Fix links * Fix homepage * Fix links * move studio/ to apps/ * Revert "move studio/ to apps/" This reverts commit1b0a985fcb. * disable outputFileTracingRoot * remove outputFileTracingRoot * fix homepage product cards * fix PrivacySettings links * Fix links * Fix the build for www. * Minor fixes for JWTGenerator. * Fix the docs and ui tests. * Revert codehike back to 0.8.3 * remove ConfirmAlert() * reenable babel because mobx hates me * fix blog image and comparison page avatar * Fix svg errors * update image synthax * Fix code hike * Move the button in a div so that it doesn't inherit its parent height and make the button look weird. * When components are defined in a component, they get recreated on each render. This makes them unstable in certain cases and causes infinite rerenders. * Replace the next/head usage with next/script. * Chore/upgrade next 13 fix table editor (#18431) * fix table editor styling and fix row deletion logic * Fix deleting selected rows from header, and fix checkboxes not clearing up * Fix deleting all rows when filter applied, and fix deleting all rows * Fix grid size styling issue * Fix TS error * Hydration errors * studio org pages fixes * fix more studio links * audit logs fixes * dropdown icon styling fixes * fix some images in www * upgrade to next 14 * try new sentry wrapper for api * see if this is even invoked * Revert "see if this is even invoked" This reverts commit86c3973ffa. * Revert "try new sentry wrapper for api" This reverts commitf67623ebad. * Revert "upgrade to next 14" This reverts commita24dd6131e. * chore: allow node version 19/20 * Try to fix the LogTable so that it renders with the newer "react-data-grid" version. * Fix type errors in the log renderer code. * Fix the replication screen. * Add the CSS for the GraphiQL. * Fix SQL editor results rendering * Lint * Fix SQL editor results height issue * Fix auth RLS not invalidating RQ when toggling RLS * Fix database tables new/edit column regressed * Fix migrations page empty state if migrations schema not yet created * Fix API side panel docs temp remove postgrest text for column description PK and FK * Fix + improve timeout handling in SQL editor --------- Co-authored-by: Jonathan Summers-Muir <MildTomato@users.noreply.github.com> Co-authored-by: Joshen Lim <joshenlimek@gmail.com> Co-authored-by: Francesco Sansalvadore <f.sansalvadore@gmail.com> Co-authored-by: Terry Sutton <saltcod@gmail.com> Co-authored-by: Ivan Vasilov <vasilov.ivan@gmail.com> Co-authored-by: Kevin Grüneberg <k.grueneberg1994@gmail.com>
236 lines
7.6 KiB
TypeScript
236 lines
7.6 KiB
TypeScript
import { zodResolver } from '@hookform/resolvers/zod'
|
|
import { useParams } from 'common'
|
|
import Link from 'next/link'
|
|
import { useEffect, useState } from 'react'
|
|
import { useForm } from 'react-hook-form'
|
|
import toast from 'react-hot-toast'
|
|
import {
|
|
Button,
|
|
FormControl_Shadcn_,
|
|
FormField_Shadcn_,
|
|
FormItem_Shadcn_,
|
|
FormMessage_Shadcn_,
|
|
Form_Shadcn_,
|
|
IconCheck,
|
|
IconExternalLink,
|
|
IconLoader,
|
|
Input_Shadcn_,
|
|
Modal,
|
|
} from 'ui'
|
|
import * as z from 'zod'
|
|
|
|
import AlertError from 'components/ui/AlertError'
|
|
import { GenericSkeletonLoader } from 'components/ui/ShimmeringLoader'
|
|
import { useBranchCreateMutation } from 'data/branches/branch-create-mutation'
|
|
import { useBranchesQuery } from 'data/branches/branches-query'
|
|
import { useCheckGithubBranchValidity } from 'data/integrations/integrations-github-branch-check'
|
|
import { useOrgIntegrationsQuery } from 'data/integrations/integrations-query-org-only'
|
|
import { useSelectedOrganization, useSelectedProject } from 'hooks'
|
|
|
|
interface CreateBranchModalProps {
|
|
visible: boolean
|
|
onClose: () => void
|
|
}
|
|
|
|
const CreateBranchModal = ({ visible, onClose }: CreateBranchModalProps) => {
|
|
const { ref } = useParams()
|
|
const projectDetails = useSelectedProject()
|
|
const selectedOrg = useSelectedOrganization()
|
|
|
|
// [Joshen] There's something weird with RHF that I can't figure out atm
|
|
// but calling form.formState.isValid somehow removes the onBlur check,
|
|
// and makes the validation run onChange instead. This is a workaround
|
|
const [isValid, setIsValid] = useState(false)
|
|
|
|
const isBranch = projectDetails?.parent_project_ref !== undefined
|
|
const projectRef =
|
|
projectDetails !== undefined ? (isBranch ? projectDetails.parent_project_ref : ref) : undefined
|
|
|
|
const {
|
|
data: integrations,
|
|
error: integrationsError,
|
|
isLoading: isLoadingIntegrations,
|
|
isSuccess: isSuccessIntegrations,
|
|
isError: isErrorIntegrations,
|
|
} = useOrgIntegrationsQuery({
|
|
orgSlug: selectedOrg?.slug,
|
|
})
|
|
|
|
const { data: branches } = useBranchesQuery({ projectRef })
|
|
const { mutateAsync: checkGithubBranchValidity, isLoading: isChecking } =
|
|
useCheckGithubBranchValidity({
|
|
onError: () => {},
|
|
})
|
|
|
|
const { mutate: createBranch, isLoading: isCreating } = useBranchCreateMutation({
|
|
onSuccess: () => {
|
|
toast.success('Successfully created new branch')
|
|
onClose()
|
|
},
|
|
})
|
|
|
|
const githubIntegration = integrations?.find(
|
|
(integration) =>
|
|
integration.integration.name === 'GitHub' &&
|
|
integration.connections.some(
|
|
(connection) => connection.supabase_project_ref === projectDetails?.parentRef
|
|
)
|
|
)
|
|
const githubConnection = githubIntegration?.connections?.find(
|
|
(connection) => connection.supabase_project_ref === projectDetails?.parentRef
|
|
)
|
|
const [repoOwner, repoName] = githubConnection?.metadata.name.split('/') || []
|
|
|
|
const formId = 'create-branch-form'
|
|
const FormSchema = z.object({
|
|
branchName: z.string().superRefine(async (val, ctx) => {
|
|
if ((branches ?? []).some((branch) => branch.git_branch === val)) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
message: 'This branch already has a Preview Branch',
|
|
})
|
|
return
|
|
}
|
|
|
|
if (val.length > 0) {
|
|
try {
|
|
await checkGithubBranchValidity({
|
|
organizationIntegrationId: githubIntegration?.id,
|
|
repoOwner,
|
|
repoName,
|
|
branchName: val,
|
|
})
|
|
setIsValid(true)
|
|
} catch (error) {
|
|
ctx.addIssue({
|
|
code: z.ZodIssueCode.custom,
|
|
message: `Unable to find branch from ${repoOwner}/${repoName}`,
|
|
})
|
|
setIsValid(false)
|
|
return
|
|
}
|
|
}
|
|
}),
|
|
})
|
|
const form = useForm<z.infer<typeof FormSchema>>({
|
|
mode: 'onBlur',
|
|
reValidateMode: 'onBlur',
|
|
resolver: zodResolver(FormSchema),
|
|
defaultValues: { branchName: '' },
|
|
})
|
|
|
|
const canSubmit = form.getValues('branchName').length > 0 && !isChecking && isValid
|
|
const onSubmit = (data: z.infer<typeof FormSchema>) => {
|
|
if (!projectRef) return console.error('Project ref is required')
|
|
createBranch({ projectRef, branchName: data.branchName, gitBranch: data.branchName })
|
|
}
|
|
|
|
useEffect(() => {
|
|
if (form && visible) {
|
|
setIsValid(false)
|
|
form.reset()
|
|
}
|
|
}, [form, visible])
|
|
|
|
return (
|
|
<Form_Shadcn_ {...form}>
|
|
<form
|
|
id={formId}
|
|
className="space-y-4"
|
|
onSubmit={form.handleSubmit(onSubmit)}
|
|
onChange={() => setIsValid(false)}
|
|
>
|
|
<Modal
|
|
hideFooter
|
|
size="medium"
|
|
modal={false}
|
|
visible={visible}
|
|
onCancel={onClose}
|
|
header="Create a new preview branch"
|
|
confirmText="Create Preview Branch"
|
|
>
|
|
<Modal.Content className="pt-3 pb-1">
|
|
{isLoadingIntegrations && <GenericSkeletonLoader />}
|
|
{isErrorIntegrations && (
|
|
<AlertError
|
|
error={integrationsError}
|
|
subject="Failed to retrieve Github repository information"
|
|
/>
|
|
)}
|
|
{isSuccessIntegrations && (
|
|
<div>
|
|
<p className="text-sm text-foreground-light">
|
|
Your project is currently connected to the repository:
|
|
</p>
|
|
<div className="flex items-center space-x-2">
|
|
<p>{githubConnection?.metadata.name}</p>
|
|
<Link
|
|
href={`https://github.com/${repoOwner}/${repoName}`}
|
|
target="_blank"
|
|
rel="noreferrer"
|
|
>
|
|
<IconExternalLink size={14} strokeWidth={1.5} />
|
|
</Link>
|
|
</div>
|
|
</div>
|
|
)}
|
|
</Modal.Content>
|
|
|
|
<Modal.Separator />
|
|
|
|
<Modal.Content className="pt-1 pb-3 space-y-3">
|
|
<p className="text-sm">
|
|
Choose a Git Branch to base your Preview Branch on. Any migration changes added to
|
|
this Git Branch will be run on this new Preview Branch.
|
|
</p>
|
|
<FormField_Shadcn_
|
|
control={form.control}
|
|
name="branchName"
|
|
render={({ field }) => (
|
|
<FormItem_Shadcn_ className="relative">
|
|
<label className="text-sm text-foreground-light">
|
|
Choose your branch to create a preview from
|
|
</label>
|
|
<FormControl_Shadcn_>
|
|
<Input_Shadcn_ {...field} placeholder="e.g feat/some-feature" />
|
|
</FormControl_Shadcn_>
|
|
<div className="absolute top-9 right-3">
|
|
{isChecking ? (
|
|
<IconLoader className="animate-spin" />
|
|
) : isValid ? (
|
|
<IconCheck className="text-brand" strokeWidth={2} />
|
|
) : null}
|
|
</div>
|
|
|
|
<FormMessage_Shadcn_ />
|
|
</FormItem_Shadcn_>
|
|
)}
|
|
/>
|
|
</Modal.Content>
|
|
|
|
<Modal.Separator />
|
|
|
|
<Modal.Content>
|
|
<div className="flex items-center justify-end space-x-2 py-2 pb-4">
|
|
<Button disabled={isCreating} type="default" onClick={() => onClose()}>
|
|
Cancel
|
|
</Button>
|
|
<Button
|
|
form={formId}
|
|
disabled={isCreating || !canSubmit}
|
|
loading={isCreating}
|
|
type="primary"
|
|
htmlType="submit"
|
|
>
|
|
Create Preview branch
|
|
</Button>
|
|
</div>
|
|
</Modal.Content>
|
|
</Modal>
|
|
</form>
|
|
</Form_Shadcn_>
|
|
)
|
|
}
|
|
|
|
export default CreateBranchModal
|