83e01477df
* refactor: extract shared shapes between jira and linear integrations Factors out the duplicated logic between internal/jira + internal/linear (backend) and components/jira + components/linear (frontend) into reusable shared shapes. Follow-up to PR #736. Backend: - New internal/integrations/secretadapter wraps secrets.SecretStore with the upsert API both jira.SecretStore and linear.SecretStore expect; drops both adapter copies from cmd/kandev/services.go. - New internal/integrations/healthpoll owns the 90s auth-health loop via a Prober interface; linear/poller.go is a thin wrapper, jira/poller.go keeps only its (jira-specific) issue-watch loop. - provideServices split into initGitHubService / initJiraService / initLinearService — now 75 lines (was ~125, exceeded the 80-line limit). Frontend: - New hooks/domains/integrations/use-integration-availability.ts and use-integration-enabled.ts; jira/linear hooks reduce to one-line delegates and move from components/<x>/ to hooks/domains/<x>/ per the project convention Greptile flagged on PR #736. - New components/integrations/{auth-status-banner,auth-error-message, validated-popover}.tsx; the four link/import-bar wrappers drop from ~110 lines to ~35 each, and JiraLinkButton picks up the clear-error-on-close behaviour LinearLinkButton already had. Docs: - New 'Adding a new third-party integration' section in CLAUDE.md/AGENTS.md documenting the shared shapes and intentional Jira/Linear divergence (transition vs state, JQL vs filter object, eventBus only on jira). * fix: address PR #759 review feedback - validated-popover: outline-with-label trigger now sets type="button" and honours triggerDisabled, matching ghost-icon (Greptile, Claude, CodeRabbit). - jira-link-button / linear-link-button: move updateTask() into the awaited fetch path so a failed title update surfaces as the popover's inline error instead of an unhandled rejection (CodeRabbit). - use-integration-availability: monotonic requestId race guard prevents a slow earlier probe from overwriting a newer auth result (CodeRabbit). - use-integration-enabled: drop unnecessary async on synchronous init (Claude). - jira/linear poller smoke tests: wrap in testing/synctest instead of time.After(2s) per backend testing convention (CodeRabbit nitpick). Skipped with reasoning on the threads: - secretadapter Set TOCTOU — single-process SQLite + single-writer per workspace; constraint violation on conflict surfaces as an error to the caller, not silent corruption. - healthpoll SetInterval validation — the function isn't called from production code today; a panic on misuse would be a footgun and silent ignore would just hide bugs differently. * fix: address PR #759 round-2 review feedback - jira-settings / linear-settings: drop the local STATUS_REFRESH_MS = 90_000 copies and import the shared INTEGRATION_STATUS_REFRESH_MS so changing the cadence only touches one file (Claude). - healthpoll: rename Poller.ProbeAll → probeAll. The only callers are the loop and the in-package tests, so widening the public API wasn't buying anything (Claude). * fix: invalidate ValidatedPopover in-flight submits on close If the user clicked Submit and dismissed the popover before the request settled, the next time they re-opened it would inherit `loading=true` (the disabled-while-loading submit button was stuck) and a late rejection from the previous session could repopulate `error` in the new one. Track the submit via a `useRef` token, bump it on close, and ignore any result/rejection whose token no longer matches. Also reset `loading` and `error` on close so the next open starts clean. Adds a regression test covering both the late-resolution and late-rejection paths. Addresses CodeRabbit review on PR #759. * ci: trigger workflow re-run GitHub Actions did not dispatch the pull_request workflows on the previous two pushes (1d869f0e,0ab6c034); only pull_request_target and CodeQL fired. Empty commit to nudge synchronize event. * fix: address PR #759 round-3 review feedback - jira.Poller.Stop: add nil-receiver guard so callers using the defer-Stop-after-NewPoller pattern don't panic when initJiraService returned nil (Greptile + Claude). Matches linear.Poller's guard. - healthpoll TestStart_RunsImmediateProbe + TestStart_IsIdempotent: rewrap in testing/synctest with synctest.Wait() instead of time.After(2s) wall-clock waits. Drops the now-unused probedAll signal channel from fakeProber (Claude). --------- Co-authored-by: Kandev Agent <agent@kandev.dev>
438 lines
13 KiB
TypeScript
438 lines
13 KiB
TypeScript
"use client";
|
|
|
|
import { useCallback, useEffect, useState } from "react";
|
|
import { IconHexagon } from "@tabler/icons-react";
|
|
import { Button } from "@kandev/ui/button";
|
|
import { Card, CardContent } from "@kandev/ui/card";
|
|
import { Input } from "@kandev/ui/input";
|
|
import { Label } from "@kandev/ui/label";
|
|
import { Separator } from "@kandev/ui/separator";
|
|
import { Alert, AlertDescription } from "@kandev/ui/alert";
|
|
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@kandev/ui/select";
|
|
import { Switch } from "@kandev/ui/switch";
|
|
import { useToast } from "@/components/toast-provider";
|
|
import { SettingsSection } from "@/components/settings/settings-section";
|
|
import { useLinearEnabled } from "@/hooks/domains/linear/use-linear-enabled";
|
|
import {
|
|
IntegrationAuthStatusBanner,
|
|
type IntegrationAuthHealth,
|
|
} from "@/components/integrations/auth-status-banner";
|
|
import { INTEGRATION_STATUS_REFRESH_MS } from "@/hooks/domains/integrations/use-integration-availability";
|
|
import {
|
|
getLinearConfig,
|
|
setLinearConfig,
|
|
deleteLinearConfig,
|
|
testLinearConnection,
|
|
listLinearTeams,
|
|
} from "@/lib/api/domains/linear-api";
|
|
import type { LinearConfig, LinearTeam, TestLinearConnectionResult } from "@/lib/types/linear";
|
|
|
|
type FormState = {
|
|
defaultTeamKey: string;
|
|
secret: string;
|
|
};
|
|
|
|
const emptyForm: FormState = { defaultTeamKey: "", secret: "" };
|
|
|
|
function configToForm(cfg: LinearConfig | null): FormState {
|
|
if (!cfg) return emptyForm;
|
|
return { defaultTeamKey: cfg.defaultTeamKey, secret: "" };
|
|
}
|
|
|
|
function saveLabel(saving: boolean, hasConfig: boolean): string {
|
|
if (saving) return "Saving...";
|
|
return hasConfig ? "Update" : "Save";
|
|
}
|
|
|
|
type FieldsRowProps = {
|
|
form: FormState;
|
|
loading: boolean;
|
|
update: <K extends keyof FormState>(key: K, value: FormState[K]) => void;
|
|
hasSavedSecret: boolean;
|
|
teams: LinearTeam[];
|
|
loadingTeams: boolean;
|
|
};
|
|
|
|
function SecretField({
|
|
form,
|
|
loading,
|
|
update,
|
|
hasSavedSecret,
|
|
}: Omit<FieldsRowProps, "teams" | "loadingTeams">) {
|
|
return (
|
|
<div className="space-y-1.5">
|
|
<Label htmlFor="linear-secret">
|
|
API key
|
|
{hasSavedSecret && (
|
|
<span className="text-xs text-muted-foreground ml-2">
|
|
(saved — leave blank to keep the current value)
|
|
</span>
|
|
)}
|
|
</Label>
|
|
<Input
|
|
id="linear-secret"
|
|
type="password"
|
|
placeholder={hasSavedSecret ? "••••••••" : "lin_api_..."}
|
|
value={form.secret}
|
|
onChange={(e) => update("secret", e.target.value)}
|
|
disabled={loading}
|
|
/>
|
|
<p className="text-xs text-muted-foreground">
|
|
Create a personal API key at{" "}
|
|
<a
|
|
className="underline cursor-pointer"
|
|
href="https://linear.app/settings/account/security"
|
|
target="_blank"
|
|
rel="noreferrer"
|
|
>
|
|
linear.app/settings/account/security
|
|
</a>
|
|
</p>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function TeamSelector({ form, loading, update, teams, loadingTeams }: FieldsRowProps) {
|
|
return (
|
|
<div className="space-y-1.5">
|
|
<Label htmlFor="linear-team">Default team (optional)</Label>
|
|
<Select
|
|
value={form.defaultTeamKey || "__none__"}
|
|
onValueChange={(v) => update("defaultTeamKey", v === "__none__" ? "" : v)}
|
|
disabled={loading || loadingTeams}
|
|
>
|
|
<SelectTrigger id="linear-team" className="w-full">
|
|
<SelectValue placeholder={loadingTeams ? "Loading teams…" : "Choose a team"} />
|
|
</SelectTrigger>
|
|
<SelectContent>
|
|
<SelectItem value="__none__">No default</SelectItem>
|
|
{teams.map((t) => (
|
|
<SelectItem key={t.id} value={t.key}>
|
|
{t.name} ({t.key})
|
|
</SelectItem>
|
|
))}
|
|
</SelectContent>
|
|
</Select>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
function TestResultAlert({ result }: { result: TestLinearConnectionResult | null }) {
|
|
if (!result) return null;
|
|
return (
|
|
<Alert variant={result.ok ? "default" : "destructive"}>
|
|
<AlertDescription>
|
|
{result.ok
|
|
? `Connected as ${result.displayName || result.email || result.userId}${result.orgName ? ` (${result.orgName})` : ""}`
|
|
: `Failed: ${result.error}`}
|
|
</AlertDescription>
|
|
</Alert>
|
|
);
|
|
}
|
|
|
|
function configToHealth(config: LinearConfig | null): IntegrationAuthHealth | null {
|
|
if (!config?.hasSecret) return null;
|
|
if (!config.lastCheckedAt) return { ok: false, error: "", checkedAt: null };
|
|
return {
|
|
ok: !!config.lastOk,
|
|
error: config.lastError ?? "",
|
|
checkedAt: new Date(config.lastCheckedAt),
|
|
};
|
|
}
|
|
|
|
type ActionBarProps = {
|
|
saving: boolean;
|
|
testing: boolean;
|
|
loading: boolean;
|
|
hasConfig: boolean;
|
|
disableSave: boolean;
|
|
disableTest: boolean;
|
|
onTest: () => void;
|
|
onSave: () => void;
|
|
onDelete: () => void;
|
|
};
|
|
|
|
function ActionBar({
|
|
saving,
|
|
testing,
|
|
loading,
|
|
hasConfig,
|
|
disableSave,
|
|
disableTest,
|
|
onTest,
|
|
onSave,
|
|
onDelete,
|
|
}: ActionBarProps) {
|
|
return (
|
|
<div className="flex flex-wrap items-center gap-2">
|
|
<Button
|
|
type="button"
|
|
variant="outline"
|
|
onClick={onTest}
|
|
disabled={testing || loading || disableTest}
|
|
className="cursor-pointer"
|
|
title={disableTest ? "Paste an API key to test the connection" : undefined}
|
|
>
|
|
{testing ? "Testing..." : "Test connection"}
|
|
</Button>
|
|
<Button type="button" onClick={onSave} disabled={disableSave} className="cursor-pointer">
|
|
{saveLabel(saving, hasConfig)}
|
|
</Button>
|
|
{hasConfig && (
|
|
<Button
|
|
type="button"
|
|
variant="destructive"
|
|
onClick={onDelete}
|
|
className="ml-auto cursor-pointer"
|
|
>
|
|
Remove configuration
|
|
</Button>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|
|
|
|
type LinearSettingsProps = {
|
|
workspaceId: string;
|
|
};
|
|
|
|
type SettingsActionsArgs = {
|
|
workspaceId: string;
|
|
form: FormState;
|
|
setConfig: (cfg: LinearConfig | null) => void;
|
|
setForm: (form: FormState) => void;
|
|
setTestResult: (r: TestLinearConnectionResult | null) => void;
|
|
};
|
|
|
|
function useSettingsActions({
|
|
workspaceId,
|
|
form,
|
|
setConfig,
|
|
setForm,
|
|
setTestResult,
|
|
}: SettingsActionsArgs) {
|
|
const { toast } = useToast();
|
|
const [saving, setSaving] = useState(false);
|
|
const [testing, setTesting] = useState(false);
|
|
|
|
const handleTest = useCallback(async () => {
|
|
setTesting(true);
|
|
setTestResult(null);
|
|
try {
|
|
const res = await testLinearConnection({
|
|
workspaceId,
|
|
authMethod: "api_key",
|
|
secret: form.secret || undefined,
|
|
});
|
|
setTestResult(res);
|
|
} catch (err) {
|
|
setTestResult({ ok: false, error: String(err) });
|
|
} finally {
|
|
setTesting(false);
|
|
}
|
|
}, [workspaceId, form, setTestResult]);
|
|
|
|
const handleSave = useCallback(async () => {
|
|
setSaving(true);
|
|
try {
|
|
const saved = await setLinearConfig({
|
|
workspaceId,
|
|
authMethod: "api_key",
|
|
defaultTeamKey: form.defaultTeamKey,
|
|
secret: form.secret || undefined,
|
|
});
|
|
setConfig(saved);
|
|
setForm(configToForm(saved));
|
|
setTestResult(null);
|
|
toast({ description: "Linear configuration saved", variant: "success" });
|
|
} catch (err) {
|
|
toast({ description: `Save failed: ${String(err)}`, variant: "error" });
|
|
} finally {
|
|
setSaving(false);
|
|
}
|
|
}, [workspaceId, form, toast, setConfig, setForm, setTestResult]);
|
|
|
|
const handleDelete = useCallback(async () => {
|
|
if (!confirm("Remove Linear configuration for this workspace?")) return;
|
|
try {
|
|
await deleteLinearConfig(workspaceId);
|
|
setConfig(null);
|
|
setForm(emptyForm);
|
|
setTestResult(null);
|
|
toast({ description: "Linear configuration removed", variant: "success" });
|
|
} catch (err) {
|
|
toast({ description: `Delete failed: ${String(err)}`, variant: "error" });
|
|
}
|
|
}, [workspaceId, toast, setConfig, setForm, setTestResult]);
|
|
|
|
return { saving, testing, handleTest, handleSave, handleDelete };
|
|
}
|
|
|
|
function useTeamsLoader(
|
|
workspaceId: string,
|
|
hasSecret: boolean | undefined,
|
|
lastOk: boolean | undefined,
|
|
) {
|
|
// `teams === null` means "no fetch attempt yet", so the dropdown can show a
|
|
// "Loading…" placeholder without us calling setState synchronously inside
|
|
// the effect (which the lint rule forbids). Once a fetch settles we always
|
|
// store an array, even if empty.
|
|
const [teams, setTeams] = useState<LinearTeam[] | null>(null);
|
|
// Fetch teams once a working configuration exists. Skips when there's no
|
|
// saved secret (the API call would 503). Stale teams from a previous save
|
|
// remain visible after deletion, but the dropdown is gated on hasSecret so
|
|
// the user never sees them.
|
|
useEffect(() => {
|
|
if (!hasSecret) return;
|
|
let cancelled = false;
|
|
listLinearTeams(workspaceId)
|
|
.then((res) => {
|
|
if (!cancelled) setTeams(res.teams ?? []);
|
|
})
|
|
.catch(() => {
|
|
if (!cancelled) setTeams([]);
|
|
});
|
|
return () => {
|
|
cancelled = true;
|
|
};
|
|
}, [workspaceId, hasSecret, lastOk]);
|
|
return { teams: teams ?? [], loadingTeams: teams === null && !!hasSecret };
|
|
}
|
|
|
|
function useLinearSettings(workspaceId: string) {
|
|
const { toast } = useToast();
|
|
const [config, setConfig] = useState<LinearConfig | null>(null);
|
|
const [form, setForm] = useState<FormState>(emptyForm);
|
|
const [loading, setLoading] = useState(true);
|
|
const [testResult, setTestResult] = useState<TestLinearConnectionResult | null>(null);
|
|
const health = configToHealth(config);
|
|
const { teams, loadingTeams } = useTeamsLoader(workspaceId, config?.hasSecret, config?.lastOk);
|
|
|
|
const load = useCallback(async () => {
|
|
setLoading(true);
|
|
try {
|
|
const cfg = await getLinearConfig(workspaceId);
|
|
setConfig(cfg);
|
|
setForm(configToForm(cfg));
|
|
} catch (err) {
|
|
toast({ description: `Failed to load Linear config: ${String(err)}`, variant: "error" });
|
|
} finally {
|
|
setLoading(false);
|
|
}
|
|
}, [workspaceId, toast]);
|
|
|
|
useEffect(() => {
|
|
void load();
|
|
}, [load]);
|
|
|
|
// Background refresh so the auth-health banner picks up new probe results.
|
|
useEffect(() => {
|
|
const id = setInterval(() => {
|
|
getLinearConfig(workspaceId)
|
|
.then((cfg) => setConfig(cfg))
|
|
.catch(() => {
|
|
/* transient failures are fine — next tick retries */
|
|
});
|
|
}, INTEGRATION_STATUS_REFRESH_MS);
|
|
return () => clearInterval(id);
|
|
}, [workspaceId]);
|
|
|
|
const update = useCallback(
|
|
<K extends keyof FormState>(key: K, value: FormState[K]) =>
|
|
setForm((prev) => ({ ...prev, [key]: value })),
|
|
[],
|
|
);
|
|
|
|
const { saving, testing, handleTest, handleSave, handleDelete } = useSettingsActions({
|
|
workspaceId,
|
|
form,
|
|
setConfig,
|
|
setForm,
|
|
setTestResult,
|
|
});
|
|
|
|
return {
|
|
config,
|
|
form,
|
|
loading,
|
|
saving,
|
|
testing,
|
|
testResult,
|
|
health,
|
|
teams,
|
|
loadingTeams,
|
|
update,
|
|
handleTest,
|
|
handleSave,
|
|
handleDelete,
|
|
};
|
|
}
|
|
|
|
function EnabledPill({ workspaceId }: { workspaceId: string }) {
|
|
const { enabled, setEnabled } = useLinearEnabled(workspaceId);
|
|
return (
|
|
<div className="flex items-center gap-2 rounded-full border bg-muted/30 px-3 py-1">
|
|
<Switch
|
|
id="linear-enabled"
|
|
checked={enabled}
|
|
onCheckedChange={setEnabled}
|
|
className="cursor-pointer"
|
|
/>
|
|
<Label htmlFor="linear-enabled" className="text-xs cursor-pointer">
|
|
{enabled ? "Enabled" : "Disabled"}
|
|
</Label>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export function LinearSettings({ workspaceId }: LinearSettingsProps) {
|
|
const s = useLinearSettings(workspaceId);
|
|
const missingSecret = !s.config?.hasSecret && !s.form.secret;
|
|
const disableSave = s.saving || missingSecret;
|
|
const disableTest = missingSecret;
|
|
|
|
return (
|
|
<div className="space-y-8">
|
|
<SettingsSection
|
|
icon={<IconHexagon className="h-5 w-5" />}
|
|
title="Linear integration"
|
|
description="Connect this workspace to Linear with a personal API key. Credentials are stored encrypted server-side."
|
|
action={<EnabledPill workspaceId={workspaceId} />}
|
|
>
|
|
<Card>
|
|
<CardContent className="space-y-4 pt-6">
|
|
<IntegrationAuthStatusBanner health={s.health} />
|
|
<SecretField
|
|
form={s.form}
|
|
loading={s.loading}
|
|
update={s.update}
|
|
hasSavedSecret={!!s.config?.hasSecret}
|
|
/>
|
|
<TeamSelector
|
|
form={s.form}
|
|
loading={s.loading}
|
|
update={s.update}
|
|
hasSavedSecret={!!s.config?.hasSecret}
|
|
teams={s.teams}
|
|
loadingTeams={s.loadingTeams}
|
|
/>
|
|
<TestResultAlert result={s.testResult} />
|
|
<Separator />
|
|
<ActionBar
|
|
saving={s.saving}
|
|
testing={s.testing}
|
|
loading={s.loading}
|
|
hasConfig={!!s.config}
|
|
disableSave={disableSave}
|
|
disableTest={disableTest}
|
|
onTest={s.handleTest}
|
|
onSave={s.handleSave}
|
|
onDelete={s.handleDelete}
|
|
/>
|
|
</CardContent>
|
|
</Card>
|
|
</SettingsSection>
|
|
</div>
|
|
);
|
|
}
|