-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
Expand file tree
/
Copy pathresources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
More file actions
917 lines (837 loc) · 32.1 KB
/
resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
File metadata and controls
917 lines (837 loc) · 32.1 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
import { conform, useForm } from "@conform-to/react";
import { parse } from "@conform-to/zod";
import { CheckCircleIcon, LockClosedIcon, PlusIcon } from "@heroicons/react/20/solid";
import { Form, useActionData, useNavigation, useNavigate, useSearchParams, useLocation } from "@remix-run/react";
import { type ActionFunctionArgs, type LoaderFunctionArgs, json } from "@remix-run/server-runtime";
import { redirect,
typedjson, useTypedFetcher } from "remix-typedjson";
import { z } from "zod";
import { OctoKitty } from "~/components/GitHubLoginButton";
import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
import { DialogClose } from "@radix-ui/react-dialog";
import { Button, LinkButton } from "~/components/primitives/Buttons";
import { Fieldset } from "~/components/primitives/Fieldset";
import { FormButtons } from "~/components/primitives/FormButtons";
import { FormError } from "~/components/primitives/FormError";
import { Hint } from "~/components/primitives/Hint";
import { Input } from "~/components/primitives/Input";
import { InputGroup } from "~/components/primitives/InputGroup";
import { Label } from "~/components/primitives/Label";
import { Paragraph } from "~/components/primitives/Paragraph";
import { Select, SelectItem } from "~/components/primitives/Select";
import { SpinnerWhite } from "~/components/primitives/Spinner";
import { Switch } from "~/components/primitives/Switch";
import { TextLink } from "~/components/primitives/TextLink";
import { DateTime } from "~/components/primitives/DateTime";
import { InfoIconTooltip } from "~/components/primitives/Tooltip";
import {
EnvironmentIcon,
environmentFullTitle,
environmentTextClassName,
} from "~/components/environments/EnvironmentLabel";
import { GitBranchIcon } from "lucide-react";
import {
redirectBackWithErrorMessage,
redirectBackWithSuccessMessage,
redirectWithErrorMessage,
redirectWithSuccessMessage,
} from "~/models/message.server";
import { findProjectBySlug } from "~/models/project.server";
import { findEnvironmentBySlug } from "~/models/runtimeEnvironment.server";
import { ProjectSettingsService } from "~/services/projectSettings.server";
import { logger } from "~/services/logger.server";
import { triggerInitialDeployment } from "~/services/platform.v3.server";
import { requireUserId } from "~/services/session.server";
import {
githubAppInstallPath,
EnvironmentParamSchema,
v3ProjectSettingsIntegrationsPath,
} from "~/utils/pathBuilder";
import { cn } from "~/utils/cn";
import { type BranchTrackingConfig } from "~/v3/github";
import { GitHubSettingsPresenter } from "~/presenters/v3/GitHubSettingsPresenter.server";
import { useEffect, useState } from "react";
// ============================================================================
// Types
// ============================================================================
export type GitHubRepository = {
id: string;
name: string;
fullName: string;
private: boolean;
htmlUrl: string;
};
export type GitHubAppInstallation = {
id: string;
appInstallationId: bigint;
targetType: string;
accountHandle: string;
repositories: GitHubRepository[];
};
export type ConnectedGitHubRepo = {
branchTracking: BranchTrackingConfig | undefined;
previewDeploymentsEnabled: boolean;
createdAt: Date;
repository: GitHubRepository;
};
// ============================================================================
// Schemas
// ============================================================================
export const ConnectGitHubRepoFormSchema = z.object({
action: z.literal("connect-repo"),
installationId: z.string(),
repositoryId: z.string(),
redirectUrl: z.string().optional(),
});
export const DisconnectGitHubRepoFormSchema = z.object({
action: z.literal("disconnect-repo"),
redirectUrl: z.string().optional(),
});
export const UpdateGitSettingsFormSchema = z.object({
action: z.literal("update-git-settings"),
productionBranch: z.string().trim().optional(),
stagingBranch: z.string().trim().optional(),
previewDeploymentsEnabled: z
.string()
.optional()
.transform((val) => val === "on"),
redirectUrl: z.string().optional(),
});
const GitHubActionSchema = z.discriminatedUnion("action", [
ConnectGitHubRepoFormSchema,
DisconnectGitHubRepoFormSchema,
UpdateGitSettingsFormSchema,
]);
// ============================================================================
// Loader
// ============================================================================
export async function loader({ request, params }: LoaderFunctionArgs) {
const userId = await requireUserId(request);
const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
const project = await findProjectBySlug(organizationSlug, projectParam, userId);
if (!project) {
throw new Response("Not Found", { status: 404 });
}
const environment = await findEnvironmentBySlug(project.id, envParam, userId);
if (!environment) {
throw new Response("Not Found", { status: 404 });
}
const presenter = new GitHubSettingsPresenter();
const resultOrFail = await presenter.call({
projectId: project.id,
organizationId: project.organizationId,
});
if (resultOrFail.isErr()) {
throw new Response("Failed to load GitHub settings", { status: 500 });
}
return typedjson(resultOrFail.value);
}
// ============================================================================
// Action
// ============================================================================
function redirectWithMessage(
request: Request,
redirectUrl: string | undefined,
message: string,
type: "success" | "error"
) {
if (type === "success") {
return redirectUrl
? redirectWithSuccessMessage(redirectUrl, request, message)
: redirectBackWithSuccessMessage(request, message);
}
return redirectUrl
? redirectWithErrorMessage(redirectUrl, request, message)
: redirectBackWithErrorMessage(request, message);
}
export async function action({ request, params }: ActionFunctionArgs) {
const userId = await requireUserId(request);
const { organizationSlug, projectParam, envParam } = EnvironmentParamSchema.parse(params);
const project = await findProjectBySlug(organizationSlug, projectParam, userId);
if (!project) {
throw new Response("Not Found", { status: 404 });
}
const environment = await findEnvironmentBySlug(project.id, envParam, userId);
if (!environment) {
throw new Response("Not Found", { status: 404 });
}
const formData = await request.formData();
const submission = parse(formData, { schema: GitHubActionSchema });
if (!submission.value || submission.intent !== "submit") {
return json(submission);
}
const projectSettingsService = new ProjectSettingsService();
const membershipResultOrFail = await projectSettingsService.verifyProjectMembership(
organizationSlug,
projectParam,
userId
);
if (membershipResultOrFail.isErr()) {
return json({ errors: { body: membershipResultOrFail.error.type } }, { status: 404 });
}
const { projectId, organizationId } = membershipResultOrFail.value;
const { action: actionType } = submission.value;
// Handle connect-repo action
if (actionType === "connect-repo") {
const { repositoryId, installationId, redirectUrl } = submission.value;
const resultOrFail = await projectSettingsService.connectGitHubRepo(
projectId,
organizationId,
repositoryId,
installationId
);
if (resultOrFail.isOk()) {
// Trigger initial deployment for marketplace flows now that GitHub is connected
if (redirectUrl) {
try {
if (redirectUrl.includes("origin=marketplace")) {
await triggerInitialDeployment(projectId, { environment: "prod" });
}
} catch (error) {
logger.error("Invalid redirect URL, skipping initial deployment trigger", { redirectUrl, error });
// Invalid redirectUrl, skip initial deployment check
}
}
return redirectWithMessage(
request,
redirectUrl,
"GitHub repository connected successfully",
"success"
);
}
const errorType = resultOrFail.error.type;
if (errorType === "gh_repository_not_found") {
return redirectWithMessage(request, redirectUrl, "GitHub repository not found", "error");
}
if (errorType === "project_already_has_connected_repository") {
return redirectWithMessage(
request,
redirectUrl,
"Project already has a connected repository",
"error"
);
}
logger.error("Failed to connect GitHub repository", { error: resultOrFail.error });
return redirectWithMessage(
request,
redirectUrl,
"Failed to connect GitHub repository",
"error"
);
}
// Handle disconnect-repo action
if (actionType === "disconnect-repo") {
const { redirectUrl } = submission.value;
const resultOrFail = await projectSettingsService.disconnectGitHubRepo(projectId);
if (resultOrFail.isOk()) {
return redirectWithMessage(
request,
redirectUrl,
"GitHub repository disconnected successfully",
"success"
);
}
logger.error("Failed to disconnect GitHub repository", { error: resultOrFail.error });
return redirectWithMessage(
request,
redirectUrl,
"Failed to disconnect GitHub repository",
"error"
);
}
// Handle update-git-settings action
if (actionType === "update-git-settings") {
const { productionBranch, stagingBranch, previewDeploymentsEnabled, redirectUrl } =
submission.value;
const resultOrFail = await projectSettingsService.updateGitSettings(
projectId,
productionBranch,
stagingBranch,
previewDeploymentsEnabled
);
if (resultOrFail.isOk()) {
return redirectWithMessage(
request,
redirectUrl,
"Git settings updated successfully",
"success"
);
}
const errorType = resultOrFail.error.type;
const errorMessages: Record<string, string> = {
github_app_not_enabled: "GitHub app is not enabled",
connected_gh_repository_not_found: "Connected GitHub repository not found",
production_tracking_branch_not_found: "Production tracking branch not found",
staging_tracking_branch_not_found: "Staging tracking branch not found",
};
const message = errorMessages[errorType];
if (message) {
return redirectWithMessage(request, redirectUrl, message, "error");
}
logger.error("Failed to update Git settings", { error: resultOrFail.error });
return redirectWithMessage(request, redirectUrl, "Failed to update Git settings", "error");
}
// Exhaustive check - this should never be reached
submission.value satisfies never;
return redirectBackWithErrorMessage(request, "Failed to process request");
}
// ============================================================================
// Helper: Build resource URL for fetching GitHub data
// ============================================================================
export function gitHubResourcePath(
organizationSlug: string,
projectSlug: string,
environmentSlug: string
) {
return `/resources/orgs/${organizationSlug}/projects/${projectSlug}/env/${environmentSlug}/github`;
}
// ============================================================================
// Components
// ============================================================================
export function ConnectGitHubRepoModal({
gitHubAppInstallations,
organizationSlug,
projectSlug,
environmentSlug,
redirectUrl,
preventDismiss,
}: {
gitHubAppInstallations: GitHubAppInstallation[];
organizationSlug: string;
projectSlug: string;
environmentSlug: string;
redirectUrl?: string;
/** When true, prevents closing the modal via Escape key or clicking outside */
preventDismiss?: boolean;
}) {
const [isModalOpen, setIsModalOpen] = useState(false);
const lastSubmission = useActionData() as any;
const navigate = useNavigate();
const [selectedInstallation, setSelectedInstallation] = useState<
GitHubAppInstallation | undefined
>(gitHubAppInstallations.at(0));
const [selectedRepository, setSelectedRepository] = useState<GitHubRepository | undefined>(
undefined
);
const navigation = useNavigation();
const isConnectRepositoryLoading =
navigation.formData?.get("action") === "connect-repo" &&
(navigation.state === "submitting" || navigation.state === "loading");
const [form, { installationId, repositoryId }] = useForm({
id: "connect-repo",
lastSubmission: lastSubmission,
shouldRevalidate: "onSubmit",
onValidate({ formData }) {
return parse(formData, {
schema: ConnectGitHubRepoFormSchema,
});
},
});
const [searchParams, setSearchParams] = useSearchParams();
useEffect(() => {
const params = new URLSearchParams(searchParams);
if (params.get("openGithubRepoModal") === "1") {
setIsModalOpen(true);
params.delete("openGithubRepoModal");
setSearchParams(params);
}
}, [searchParams, setSearchParams]);
useEffect(() => {
if (lastSubmission && "success" in lastSubmission && lastSubmission.success === true) {
setIsModalOpen(false);
}
}, [lastSubmission]);
const actionUrl = gitHubResourcePath(organizationSlug, projectSlug, environmentSlug);
return (
<Dialog
open={isModalOpen}
onOpenChange={(open) => {
// When preventDismiss is true, only allow opening, not closing
if (preventDismiss && !open) {
return;
}
setIsModalOpen(open);
}}
>
<DialogTrigger asChild>
<Button type="button" variant={"secondary/medium"} LeadingIcon={OctoKitty}>
Connect GitHub repo
</Button>
</DialogTrigger>
<DialogContent
showCloseButton={!preventDismiss}
onInteractOutside={(e) => {
if (preventDismiss) {
e.preventDefault();
}
}}
onEscapeKeyDown={(e) => {
if (preventDismiss) {
e.preventDefault();
}
}}
>
<DialogHeader>Connect GitHub repository</DialogHeader>
<div className="mt-2 flex flex-col gap-4">
<Form method="post" action={actionUrl} {...form.props} className="w-full">
{redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
<Paragraph className="mb-3">
Choose a GitHub repository to connect to your project.
</Paragraph>
<Fieldset className="max-w-full gap-y-3">
<InputGroup className="max-w-full">
<Label htmlFor={installationId.id}>Account</Label>
<Select
name={installationId.name}
id={installationId.id}
value={selectedInstallation?.id}
defaultValue={gitHubAppInstallations.at(0)?.id}
setValue={(value) => {
if (Array.isArray(value)) return;
const installation = gitHubAppInstallations.find((i) => i.id === value);
setSelectedInstallation(installation);
setSelectedRepository(undefined);
}}
items={gitHubAppInstallations}
variant="tertiary/small"
placeholder="Select account"
dropdownIcon
text={selectedInstallation ? selectedInstallation.accountHandle : undefined}
>
{[
...gitHubAppInstallations.map((installation) => (
<SelectItem
key={installation.id}
value={installation.id}
icon={<OctoKitty className="size-3 text-text-dimmed" />}
>
{installation.accountHandle}
</SelectItem>
)),
<SelectItem
onClick={(e) => {
e.preventDefault();
navigate(
githubAppInstallPath(
organizationSlug,
`${v3ProjectSettingsIntegrationsPath(
{ slug: organizationSlug },
{ slug: projectSlug },
{ slug: environmentSlug }
)}?openGithubRepoModal=1`
)
);
}}
key="new-account"
icon={<PlusIcon className="size-3 text-text-dimmed" />}
>
Add account
</SelectItem>,
]}
</Select>
<FormError id={installationId.errorId}>{installationId.error}</FormError>
</InputGroup>
<InputGroup className="max-w-full">
<Label htmlFor={repositoryId.id}>Repository</Label>
<Select
name={repositoryId.name}
id={repositoryId.id}
value={selectedRepository ? selectedRepository.id : undefined}
setValue={(value) => {
if (Array.isArray(value)) return;
const repository = selectedInstallation?.repositories.find(
(r) => r.id === value
);
setSelectedRepository(repository);
}}
variant="tertiary/small"
placeholder="Select repository"
heading="Filter repositories"
dropdownIcon
items={selectedInstallation?.repositories ?? []}
filter={{ keys: ["name"] }}
disabled={!selectedInstallation || selectedInstallation.repositories.length === 0}
text={selectedRepository ? selectedRepository.name : null}
>
{(matches) =>
matches.map((repo) => (
<SelectItem key={repo.id} value={repo.id}>
<div className="flex items-center gap-1">
{repo.name}
{repo.private && <LockClosedIcon className="size-3 text-text-dimmed" />}
</div>
</SelectItem>
))
}
</Select>
<Hint className={cn("invisible", selectedInstallation && "visible")}>
Configure repository access in{" "}
<TextLink
target="_blank"
rel="noreferrer noopener"
to={`https://github.com/settings/installations/${selectedInstallation?.appInstallationId}`}
>
GitHub
</TextLink>
.
</Hint>
<FormError id={repositoryId.errorId}>{repositoryId.error}</FormError>
</InputGroup>
<FormError>{form.error}</FormError>
<FormButtons
confirmButton={
<Button
type="submit"
name="action"
value="connect-repo"
variant="primary/medium"
LeadingIcon={isConnectRepositoryLoading ? SpinnerWhite : undefined}
leadingIconClassName="text-white"
disabled={isConnectRepositoryLoading}
>
Connect repository
</Button>
}
cancelButton={
preventDismiss ? undefined : (
<DialogClose asChild>
<Button variant="tertiary/medium">Cancel</Button>
</DialogClose>
)
}
/>
</Fieldset>
</Form>
</div>
</DialogContent>
</Dialog>
);
}
export function GitHubConnectionPrompt({
gitHubAppInstallations,
organizationSlug,
projectSlug,
environmentSlug,
redirectUrl,
}: {
gitHubAppInstallations: GitHubAppInstallation[];
organizationSlug: string;
projectSlug: string;
environmentSlug: string;
redirectUrl?: string;
}) {
const githubInstallationRedirect = redirectUrl || v3ProjectSettingsIntegrationsPath({ slug: organizationSlug }, { slug: projectSlug }, { slug: environmentSlug });
return (
<Fieldset>
<InputGroup fullWidth>
{gitHubAppInstallations.length === 0 && (
<LinkButton
to={githubAppInstallPath(
organizationSlug,
`${githubInstallationRedirect}?openGithubRepoModal=1`
)}
variant={"secondary/medium"}
LeadingIcon={OctoKitty}
>
Install GitHub app
</LinkButton>
)}
{gitHubAppInstallations.length !== 0 && (
<div className="flex items-center gap-3">
<ConnectGitHubRepoModal
gitHubAppInstallations={gitHubAppInstallations}
organizationSlug={organizationSlug}
projectSlug={projectSlug}
environmentSlug={environmentSlug}
redirectUrl={redirectUrl}
/>
<span className="flex items-center gap-1 text-xs text-text-dimmed">
<CheckCircleIcon className="size-4 text-success" /> GitHub app is installed
</span>
</div>
)}
</InputGroup>
</Fieldset>
);
}
export function ConnectedGitHubRepoForm({
connectedGitHubRepo,
previewEnvironmentEnabled,
organizationSlug,
projectSlug,
environmentSlug,
billingPath,
redirectUrl,
}: {
connectedGitHubRepo: ConnectedGitHubRepo;
previewEnvironmentEnabled?: boolean;
organizationSlug: string;
projectSlug: string;
environmentSlug: string;
billingPath: string;
redirectUrl?: string;
}) {
const lastSubmission = useActionData() as any;
const navigation = useNavigation();
const [hasGitSettingsChanges, setHasGitSettingsChanges] = useState(false);
const [gitSettingsValues, setGitSettingsValues] = useState({
productionBranch: connectedGitHubRepo.branchTracking?.prod?.branch || "",
stagingBranch: connectedGitHubRepo.branchTracking?.staging?.branch || "",
previewDeploymentsEnabled: connectedGitHubRepo.previewDeploymentsEnabled,
});
useEffect(() => {
const hasChanges =
gitSettingsValues.productionBranch !==
(connectedGitHubRepo.branchTracking?.prod?.branch || "") ||
gitSettingsValues.stagingBranch !==
(connectedGitHubRepo.branchTracking?.staging?.branch || "") ||
gitSettingsValues.previewDeploymentsEnabled !== connectedGitHubRepo.previewDeploymentsEnabled;
setHasGitSettingsChanges(hasChanges);
}, [gitSettingsValues, connectedGitHubRepo]);
const [gitSettingsForm, fields] = useForm({
id: "update-git-settings",
lastSubmission: lastSubmission,
shouldRevalidate: "onSubmit",
onValidate({ formData }) {
return parse(formData, {
schema: UpdateGitSettingsFormSchema,
});
},
});
const isGitSettingsLoading =
navigation.formData?.get("action") === "update-git-settings" &&
(navigation.state === "submitting" || navigation.state === "loading");
const actionUrl = gitHubResourcePath(organizationSlug, projectSlug, environmentSlug);
return (
<>
<div className="mb-4 flex items-center justify-between rounded-sm border bg-grid-dimmed p-2">
<div className="flex items-center gap-2">
<OctoKitty className="size-4" />
<a
href={connectedGitHubRepo.repository.htmlUrl}
target="_blank"
rel="noreferrer noopener"
className="max-w-52 truncate text-sm text-text-bright hover:underline"
>
{connectedGitHubRepo.repository.fullName}
</a>
{connectedGitHubRepo.repository.private && (
<LockClosedIcon className="size-3 text-text-dimmed" />
)}
<span className="text-xs text-text-dimmed">
<DateTime
date={connectedGitHubRepo.createdAt}
includeTime={false}
includeSeconds={false}
showTimezone={false}
showTooltip={false}
/>
</span>
</div>
<Dialog>
<DialogTrigger asChild>
<Button variant="minimal/small">Disconnect</Button>
</DialogTrigger>
<DialogContent className="max-w-md">
<DialogHeader>Disconnect GitHub repository</DialogHeader>
<div className="flex flex-col gap-3 pt-3">
<Paragraph className="mb-1">
Are you sure you want to disconnect{" "}
<span className="font-semibold">{connectedGitHubRepo.repository.fullName}</span>?
This will stop automatic deployments from GitHub.
</Paragraph>
<FormButtons
confirmButton={
<Form method="post" action={actionUrl}>
<input type="hidden" name="action" value="disconnect-repo" />
{redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
<Button type="submit" variant="danger/medium">
Disconnect repository
</Button>
</Form>
}
cancelButton={
<DialogClose asChild>
<Button variant="tertiary/medium">Cancel</Button>
</DialogClose>
}
/>
</div>
</DialogContent>
</Dialog>
</div>
<Form method="post" action={actionUrl} {...gitSettingsForm.props}>
{redirectUrl && <input type="hidden" name="redirectUrl" value={redirectUrl} />}
<Fieldset>
<InputGroup fullWidth>
<Hint>
Every push to the selected tracking branch creates a deployment in the corresponding
environment.
</Hint>
<div className="mt-1 grid grid-cols-[120px_1fr] gap-3">
<div className="flex items-center gap-1.5">
<EnvironmentIcon environment={{ type: "PRODUCTION" }} className="size-4" />
<span className={`text-sm ${environmentTextClassName({ type: "PRODUCTION" })}`}>
{environmentFullTitle({ type: "PRODUCTION" })}
</span>
</div>
<Input
{...conform.input(fields.productionBranch, { type: "text" })}
defaultValue={connectedGitHubRepo.branchTracking?.prod?.branch}
placeholder="none"
variant="tertiary"
className="font-mono"
icon={GitBranchIcon}
onChange={(e) => {
setGitSettingsValues((prev) => ({
...prev,
productionBranch: e.target.value,
}));
}}
/>
<div className="flex items-center gap-1.5">
<EnvironmentIcon environment={{ type: "STAGING" }} className="size-4" />
<span className={`text-sm ${environmentTextClassName({ type: "STAGING" })}`}>
{environmentFullTitle({ type: "STAGING" })}
</span>
</div>
<Input
{...conform.input(fields.stagingBranch, { type: "text" })}
defaultValue={connectedGitHubRepo.branchTracking?.staging?.branch}
placeholder="none"
variant="tertiary"
className="font-mono"
icon={GitBranchIcon}
onChange={(e) => {
setGitSettingsValues((prev) => ({
...prev,
stagingBranch: e.target.value,
}));
}}
/>
<div className="flex items-center gap-1.5">
<EnvironmentIcon environment={{ type: "PREVIEW" }} className="size-4" />
<span className={`text-sm ${environmentTextClassName({ type: "PREVIEW" })}`}>
{environmentFullTitle({ type: "PREVIEW" })}
</span>
</div>
<div className="flex items-center gap-1.5">
<Switch
name="previewDeploymentsEnabled"
disabled={!previewEnvironmentEnabled}
defaultChecked={
connectedGitHubRepo.previewDeploymentsEnabled && previewEnvironmentEnabled
}
variant="small"
label="Create preview deployments for pull requests"
labelPosition="right"
onCheckedChange={(checked) => {
setGitSettingsValues((prev) => ({
...prev,
previewDeploymentsEnabled: checked,
}));
}}
/>
{!previewEnvironmentEnabled && (
<InfoIconTooltip
content={
<span className="text-xs">
<TextLink to={billingPath}>Upgrade</TextLink> your plan to enable preview
branches
</span>
}
/>
)}
</div>
</div>
<FormError>{fields.productionBranch?.error}</FormError>
<FormError>{fields.stagingBranch?.error}</FormError>
<FormError>{fields.previewDeploymentsEnabled?.error}</FormError>
<FormError>{gitSettingsForm.error}</FormError>
</InputGroup>
<FormButtons
confirmButton={
<Button
type="submit"
name="action"
value="update-git-settings"
variant="secondary/small"
disabled={isGitSettingsLoading || !hasGitSettingsChanges}
LeadingIcon={isGitSettingsLoading ? SpinnerWhite : undefined}
>
Save
</Button>
}
/>
</Fieldset>
</Form>
</>
);
}
// ============================================================================
// Main GitHub Settings Panel Component
// ============================================================================
export function GitHubSettingsPanel({
organizationSlug,
projectSlug,
environmentSlug,
billingPath,
}: {
organizationSlug: string;
projectSlug: string;
environmentSlug: string;
billingPath: string;
}) {
const fetcher = useTypedFetcher<typeof loader>();
const location = useLocation();
// Use provided redirectUrl or fall back to current path (without search params)
const effectiveRedirectUrl = location.pathname;
useEffect(() => {
fetcher.load(gitHubResourcePath(organizationSlug, projectSlug, environmentSlug));
}, [organizationSlug, projectSlug, environmentSlug]);
const data = fetcher.data;
// Loading state
if (fetcher.state === "loading" && !data) {
return (
<div className="flex items-center gap-2 text-text-dimmed">
<SpinnerWhite className="size-4" />
<span className="text-sm">Loading GitHub settings...</span>
</div>
);
}
// GitHub app not enabled
if (!data || !data.enabled) {
return null;
}
// Connected repository exists - show form
if (data.connectedRepository) {
return (
<ConnectedGitHubRepoForm
connectedGitHubRepo={data.connectedRepository}
previewEnvironmentEnabled={data.isPreviewEnvironmentEnabled}
organizationSlug={organizationSlug}
projectSlug={projectSlug}
environmentSlug={environmentSlug}
billingPath={billingPath}
redirectUrl={effectiveRedirectUrl}
/>
);
}
// No connected repository - show connection prompt
return (
<div className="flex flex-col gap-2">
<GitHubConnectionPrompt
gitHubAppInstallations={data.installations ?? []}
organizationSlug={organizationSlug}
projectSlug={projectSlug}
environmentSlug={environmentSlug}
redirectUrl={effectiveRedirectUrl}
/>
{!data.connectedRepository && (
<Hint>
Connect your GitHub repository to automatically deploy your changes.
</Hint>
)}
</div>
);
}