feat(github): unify workspace GitHub access (#2084)
This commit is contained in:
@@ -20,11 +20,10 @@ import {
|
||||
DrawerTrigger,
|
||||
} from "@kandev/ui/drawer";
|
||||
import { useResponsiveBreakpoint } from "@/hooks/use-responsive-breakpoint";
|
||||
import type { TaskGitCredentialsState } from "@/hooks/domains/github/use-task-git-credentials";
|
||||
import type { GitHubStatus } from "@/lib/types/github";
|
||||
import { GitHubAuthMethodList, type GitHubAutomationMethod } from "./github-auth-method-list";
|
||||
import { GitHubAppConnectionPanel } from "./github-app-connection-panel";
|
||||
import { GitHubCLIForm } from "./github-cli-form";
|
||||
import { GitHubPATForm } from "./github-pat-form";
|
||||
import type { GitHubAutomationMethod } from "./github-auth-method-list";
|
||||
import { GitHubConnectionSettingsForm } from "./github-connection-settings-form";
|
||||
|
||||
function methodForStatus(status: GitHubStatus): GitHubAutomationMethod {
|
||||
if (status.automation?.source === "github_app_installation") return "app";
|
||||
@@ -35,37 +34,16 @@ function methodForStatus(status: GitHubStatus): GitHubAutomationMethod {
|
||||
const description =
|
||||
"This workspace uses one credential for repository sync, watches, background jobs, and managed agent GitHub access. Executor profile credentials can still take precedence.";
|
||||
|
||||
function ConnectionBody({
|
||||
method,
|
||||
workspaceId,
|
||||
onMethodChange,
|
||||
onSaved,
|
||||
}: {
|
||||
method: GitHubAutomationMethod;
|
||||
workspaceId: string;
|
||||
onMethodChange: (method: GitHubAutomationMethod) => void;
|
||||
onSaved: () => void;
|
||||
}) {
|
||||
return (
|
||||
<div className="space-y-5">
|
||||
<GitHubAuthMethodList value={method} onChange={onMethodChange} />
|
||||
<div className="border-t pt-5">
|
||||
{method === "pat" && <GitHubPATForm workspaceId={workspaceId} onSaved={onSaved} />}
|
||||
{method === "cli" && <GitHubCLIForm workspaceId={workspaceId} onSaved={onSaved} />}
|
||||
{method === "app" && <GitHubAppConnectionPanel workspaceId={workspaceId} />}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export function GitHubConnectionDialog({
|
||||
status,
|
||||
workspaceId,
|
||||
onSaved,
|
||||
taskAccess,
|
||||
}: {
|
||||
status: GitHubStatus;
|
||||
workspaceId: string;
|
||||
onSaved: () => void;
|
||||
taskAccess: TaskGitCredentialsState;
|
||||
}) {
|
||||
const [open, setOpen] = useState(false);
|
||||
const [method, setMethod] = useState<GitHubAutomationMethod>(() => methodForStatus(status));
|
||||
@@ -73,14 +51,13 @@ export function GitHubConnectionDialog({
|
||||
const connected = Boolean(status.automation);
|
||||
|
||||
useEffect(() => {
|
||||
setOpen(false);
|
||||
setMethod(methodForStatus(status));
|
||||
}, [status, workspaceId]);
|
||||
}, [status]);
|
||||
|
||||
const saved = useCallback(() => {
|
||||
onSaved();
|
||||
useEffect(() => {
|
||||
setOpen(false);
|
||||
}, [onSaved]);
|
||||
}, [workspaceId]);
|
||||
|
||||
const openChange = useCallback(
|
||||
(next: boolean) => {
|
||||
if (next) setMethod(methodForStatus(status));
|
||||
@@ -95,11 +72,16 @@ export function GitHubConnectionDialog({
|
||||
</Button>
|
||||
);
|
||||
const body = (
|
||||
<ConnectionBody
|
||||
<GitHubConnectionSettingsForm
|
||||
status={status}
|
||||
method={method}
|
||||
workspaceId={workspaceId}
|
||||
open={open}
|
||||
onMethodChange={setMethod}
|
||||
onSaved={saved}
|
||||
onSaved={onSaved}
|
||||
onComplete={() => setOpen(false)}
|
||||
taskAccess={taskAccess}
|
||||
isMobile={isMobile}
|
||||
/>
|
||||
);
|
||||
|
||||
@@ -115,9 +97,7 @@ export function GitHubConnectionDialog({
|
||||
<DrawerTitle>{connected ? "Change GitHub connection" : "Connect GitHub"}</DrawerTitle>
|
||||
<DrawerDescription>{description}</DrawerDescription>
|
||||
</DrawerHeader>
|
||||
<div className="min-h-0 flex-1 overflow-y-auto overscroll-contain px-4 pb-[calc(1rem+env(safe-area-inset-bottom,0px))] pt-4">
|
||||
{body}
|
||||
</div>
|
||||
{body}
|
||||
</DrawerContent>
|
||||
</Drawer>
|
||||
);
|
||||
@@ -128,13 +108,13 @@ export function GitHubConnectionDialog({
|
||||
<DialogTrigger asChild>{trigger}</DialogTrigger>
|
||||
<DialogContent
|
||||
data-testid="github-connection-desktop"
|
||||
className="flex max-h-[85dvh] flex-col overflow-hidden sm:max-w-2xl"
|
||||
className="flex max-h-[85dvh] flex-col overflow-hidden sm:max-w-4xl"
|
||||
>
|
||||
<DialogHeader className="shrink-0">
|
||||
<DialogTitle>{connected ? "Change GitHub connection" : "Connect GitHub"}</DialogTitle>
|
||||
<DialogDescription>{description}</DialogDescription>
|
||||
</DialogHeader>
|
||||
<div className="min-h-0 flex-1 overflow-y-auto overscroll-contain pr-1">{body}</div>
|
||||
{body}
|
||||
</DialogContent>
|
||||
</Dialog>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user