feat: move workspace info from properties panel to issue main pane
Display workspace branch, path, and status in a card on the issue main pane instead of in the properties sidebar. Only shown for non-default (isolated) workspaces. Edit controls are hidden behind an Edit toggle button. Co-Authored-By: Paperclip <noreply@paperclip.ing>
This commit is contained in:
parent
a6ca3a9418
commit
5ee4cd98e8
3 changed files with 321 additions and 203 deletions
|
|
@ -1,12 +1,10 @@
|
||||||
import { useCallback, useMemo, useRef, useState } from "react";
|
import { useMemo, useState } from "react";
|
||||||
import { pickTextColorForPillBg } from "@/lib/color-contrast";
|
import { pickTextColorForPillBg } from "@/lib/color-contrast";
|
||||||
import { Link } from "@/lib/router";
|
import { Link } from "@/lib/router";
|
||||||
import type { Issue } from "@paperclipai/shared";
|
import type { Issue } from "@paperclipai/shared";
|
||||||
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
|
||||||
import { agentsApi } from "../api/agents";
|
import { agentsApi } from "../api/agents";
|
||||||
import { authApi } from "../api/auth";
|
import { authApi } from "../api/auth";
|
||||||
import { executionWorkspacesApi } from "../api/execution-workspaces";
|
|
||||||
import { instanceSettingsApi } from "../api/instanceSettings";
|
|
||||||
import { issuesApi } from "../api/issues";
|
import { issuesApi } from "../api/issues";
|
||||||
import { projectsApi } from "../api/projects";
|
import { projectsApi } from "../api/projects";
|
||||||
import { useCompany } from "../context/CompanyContext";
|
import { useCompany } from "../context/CompanyContext";
|
||||||
|
|
@ -21,15 +19,9 @@ import { formatDate, cn, projectUrl } from "../lib/utils";
|
||||||
import { timeAgo } from "../lib/timeAgo";
|
import { timeAgo } from "../lib/timeAgo";
|
||||||
import { Separator } from "@/components/ui/separator";
|
import { Separator } from "@/components/ui/separator";
|
||||||
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
|
import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
|
||||||
import { User, Hexagon, ArrowUpRight, Tag, Plus, Trash2, Copy, Check } from "lucide-react";
|
import { User, Hexagon, ArrowUpRight, Tag, Plus, Trash2 } from "lucide-react";
|
||||||
import { AgentIcon } from "./AgentIconPicker";
|
import { AgentIcon } from "./AgentIconPicker";
|
||||||
|
|
||||||
const EXECUTION_WORKSPACE_OPTIONS = [
|
|
||||||
{ value: "shared_workspace", label: "Project default" },
|
|
||||||
{ value: "isolated_workspace", label: "New isolated workspace" },
|
|
||||||
{ value: "reuse_existing", label: "Reuse existing workspace" },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
function defaultProjectWorkspaceIdForProject(project: {
|
function defaultProjectWorkspaceIdForProject(project: {
|
||||||
workspaces?: Array<{ id: string; isPrimary: boolean }>;
|
workspaces?: Array<{ id: string; isPrimary: boolean }>;
|
||||||
executionWorkspacePolicy?: { defaultProjectWorkspaceId?: string | null } | null;
|
executionWorkspacePolicy?: { defaultProjectWorkspaceId?: string | null } | null;
|
||||||
|
|
@ -48,23 +40,6 @@ function defaultExecutionWorkspaceModeForProject(project: { executionWorkspacePo
|
||||||
return "shared_workspace";
|
return "shared_workspace";
|
||||||
}
|
}
|
||||||
|
|
||||||
function issueModeForExistingWorkspace(mode: string | null | undefined) {
|
|
||||||
if (mode === "isolated_workspace" || mode === "operator_branch" || mode === "shared_workspace") return mode;
|
|
||||||
if (mode === "adapter_managed" || mode === "cloud_sandbox") return "agent_default";
|
|
||||||
return "shared_workspace";
|
|
||||||
}
|
|
||||||
|
|
||||||
function shouldPresentExistingWorkspaceSelection(issue: Issue) {
|
|
||||||
const persistedMode =
|
|
||||||
issue.currentExecutionWorkspace?.mode
|
|
||||||
?? issue.executionWorkspaceSettings?.mode
|
|
||||||
?? issue.executionWorkspacePreference;
|
|
||||||
return Boolean(
|
|
||||||
issue.executionWorkspaceId &&
|
|
||||||
(persistedMode === "isolated_workspace" || persistedMode === "operator_branch"),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
interface IssuePropertiesProps {
|
interface IssuePropertiesProps {
|
||||||
issue: Issue;
|
issue: Issue;
|
||||||
onUpdate: (data: Record<string, unknown>) => void;
|
onUpdate: (data: Record<string, unknown>) => void;
|
||||||
|
|
@ -142,49 +117,6 @@ function PropertyPicker({
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Splits a string at `/` and `-` boundaries, inserting <wbr> for natural line breaks. */
|
|
||||||
function BreakablePath({ text }: { text: string }) {
|
|
||||||
const parts: React.ReactNode[] = [];
|
|
||||||
// Split on path separators and hyphens, keeping them in the output
|
|
||||||
const segments = text.split(/(?<=[\/-])/);
|
|
||||||
for (let i = 0; i < segments.length; i++) {
|
|
||||||
if (i > 0) parts.push(<wbr key={i} />);
|
|
||||||
parts.push(segments[i]);
|
|
||||||
}
|
|
||||||
return <>{parts}</>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Displays a value with a copy-to-clipboard icon and "Copied!" feedback. */
|
|
||||||
function CopyableValue({ value, label, mono, className }: { value: string; label?: string; mono?: boolean; className?: string }) {
|
|
||||||
const [copied, setCopied] = useState(false);
|
|
||||||
const timerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
|
|
||||||
const handleCopy = useCallback(async () => {
|
|
||||||
try {
|
|
||||||
await navigator.clipboard.writeText(value);
|
|
||||||
setCopied(true);
|
|
||||||
clearTimeout(timerRef.current);
|
|
||||||
timerRef.current = setTimeout(() => setCopied(false), 1500);
|
|
||||||
} catch { /* noop */ }
|
|
||||||
}, [value]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<div className={cn("flex items-start gap-1 group", className)}>
|
|
||||||
<span className="min-w-0" style={{ overflowWrap: "anywhere" }}>
|
|
||||||
{label && <span className="text-muted-foreground">{label} </span>}
|
|
||||||
<span className={mono ? "font-mono" : undefined}><BreakablePath text={value} /></span>
|
|
||||||
</span>
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
className="shrink-0 mt-0.5 p-0.5 rounded hover:bg-accent/50 transition-colors text-muted-foreground hover:text-foreground opacity-0 group-hover:opacity-100 focus:opacity-100"
|
|
||||||
onClick={handleCopy}
|
|
||||||
title={copied ? "Copied!" : "Copy to clipboard"}
|
|
||||||
>
|
|
||||||
{copied ? <Check className="h-3 w-3 text-green-500" /> : <Copy className="h-3 w-3" />}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function IssueProperties({ issue, onUpdate, inline }: IssuePropertiesProps) {
|
export function IssueProperties({ issue, onUpdate, inline }: IssuePropertiesProps) {
|
||||||
const { selectedCompanyId } = useCompany();
|
const { selectedCompanyId } = useCompany();
|
||||||
const queryClient = useQueryClient();
|
const queryClient = useQueryClient();
|
||||||
|
|
@ -202,10 +134,6 @@ export function IssueProperties({ issue, onUpdate, inline }: IssuePropertiesProp
|
||||||
queryKey: queryKeys.auth.session,
|
queryKey: queryKeys.auth.session,
|
||||||
queryFn: () => authApi.getSession(),
|
queryFn: () => authApi.getSession(),
|
||||||
});
|
});
|
||||||
const { data: experimentalSettings } = useQuery({
|
|
||||||
queryKey: queryKeys.instance.experimentalSettings,
|
|
||||||
queryFn: () => instanceSettingsApi.getExperimental(),
|
|
||||||
});
|
|
||||||
const currentUserId = session?.user?.id ?? session?.session?.userId;
|
const currentUserId = session?.user?.id ?? session?.session?.userId;
|
||||||
|
|
||||||
const { data: agents } = useQuery({
|
const { data: agents } = useQuery({
|
||||||
|
|
@ -275,48 +203,6 @@ export function IssueProperties({ issue, onUpdate, inline }: IssuePropertiesProp
|
||||||
const currentProject = issue.projectId
|
const currentProject = issue.projectId
|
||||||
? orderedProjects.find((project) => project.id === issue.projectId) ?? null
|
? orderedProjects.find((project) => project.id === issue.projectId) ?? null
|
||||||
: null;
|
: null;
|
||||||
const currentProjectExecutionWorkspacePolicy =
|
|
||||||
experimentalSettings?.enableIsolatedWorkspaces === true
|
|
||||||
? currentProject?.executionWorkspacePolicy ?? null
|
|
||||||
: null;
|
|
||||||
const currentProjectSupportsExecutionWorkspace = Boolean(currentProjectExecutionWorkspacePolicy?.enabled);
|
|
||||||
const { data: reusableExecutionWorkspaces } = useQuery({
|
|
||||||
queryKey: queryKeys.executionWorkspaces.list(companyId!, {
|
|
||||||
projectId: issue.projectId ?? undefined,
|
|
||||||
projectWorkspaceId: issue.projectWorkspaceId ?? undefined,
|
|
||||||
reuseEligible: true,
|
|
||||||
}),
|
|
||||||
queryFn: () =>
|
|
||||||
executionWorkspacesApi.list(companyId!, {
|
|
||||||
projectId: issue.projectId ?? undefined,
|
|
||||||
projectWorkspaceId: issue.projectWorkspaceId ?? undefined,
|
|
||||||
reuseEligible: true,
|
|
||||||
}),
|
|
||||||
enabled: Boolean(companyId) && Boolean(issue.projectId),
|
|
||||||
});
|
|
||||||
const deduplicatedReusableWorkspaces = useMemo(() => {
|
|
||||||
const workspaces = reusableExecutionWorkspaces ?? [];
|
|
||||||
const seen = new Map<string, typeof workspaces[number]>();
|
|
||||||
for (const ws of workspaces) {
|
|
||||||
const key = ws.cwd ?? ws.id;
|
|
||||||
const existing = seen.get(key);
|
|
||||||
if (!existing || new Date(ws.lastUsedAt) > new Date(existing.lastUsedAt)) {
|
|
||||||
seen.set(key, ws);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return Array.from(seen.values());
|
|
||||||
}, [reusableExecutionWorkspaces]);
|
|
||||||
const selectedReusableExecutionWorkspace =
|
|
||||||
deduplicatedReusableWorkspaces.find((workspace) => workspace.id === issue.executionWorkspaceId)
|
|
||||||
?? issue.currentExecutionWorkspace
|
|
||||||
?? null;
|
|
||||||
const currentExecutionWorkspaceSelection = shouldPresentExistingWorkspaceSelection(issue)
|
|
||||||
? "reuse_existing"
|
|
||||||
: (
|
|
||||||
issue.executionWorkspacePreference
|
|
||||||
?? issue.executionWorkspaceSettings?.mode
|
|
||||||
?? defaultExecutionWorkspaceModeForProject(currentProject)
|
|
||||||
);
|
|
||||||
const projectLink = (id: string | null) => {
|
const projectLink = (id: string | null) => {
|
||||||
if (!id) return null;
|
if (!id) return null;
|
||||||
const project = projects?.find((p) => p.id === id) ?? null;
|
const project = projects?.find((p) => p.id === id) ?? null;
|
||||||
|
|
@ -674,93 +560,6 @@ export function IssueProperties({ issue, onUpdate, inline }: IssuePropertiesProp
|
||||||
{projectContent}
|
{projectContent}
|
||||||
</PropertyPicker>
|
</PropertyPicker>
|
||||||
|
|
||||||
{currentProjectSupportsExecutionWorkspace && (
|
|
||||||
<PropertyRow label="Workspace">
|
|
||||||
<div className="w-full space-y-2">
|
|
||||||
<select
|
|
||||||
className="w-full rounded border border-border bg-transparent px-2 py-1.5 text-xs outline-none"
|
|
||||||
value={currentExecutionWorkspaceSelection}
|
|
||||||
onChange={(e) => {
|
|
||||||
const nextMode = e.target.value;
|
|
||||||
onUpdate({
|
|
||||||
executionWorkspacePreference: nextMode,
|
|
||||||
executionWorkspaceId: nextMode === "reuse_existing" ? issue.executionWorkspaceId : null,
|
|
||||||
executionWorkspaceSettings: {
|
|
||||||
mode:
|
|
||||||
nextMode === "reuse_existing"
|
|
||||||
? issueModeForExistingWorkspace(selectedReusableExecutionWorkspace?.mode)
|
|
||||||
: nextMode,
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{EXECUTION_WORKSPACE_OPTIONS.map((option) => (
|
|
||||||
<option key={option.value} value={option.value}>
|
|
||||||
{option.value === "reuse_existing" && selectedReusableExecutionWorkspace?.mode === "isolated_workspace"
|
|
||||||
? "Existing isolated workspace"
|
|
||||||
: option.label}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
|
|
||||||
{currentExecutionWorkspaceSelection === "reuse_existing" && (
|
|
||||||
<select
|
|
||||||
className="w-full rounded border border-border bg-transparent px-2 py-1.5 text-xs outline-none"
|
|
||||||
value={issue.executionWorkspaceId ?? ""}
|
|
||||||
onChange={(e) => {
|
|
||||||
const nextExecutionWorkspaceId = e.target.value || null;
|
|
||||||
const nextExecutionWorkspace = deduplicatedReusableWorkspaces.find(
|
|
||||||
(workspace) => workspace.id === nextExecutionWorkspaceId,
|
|
||||||
);
|
|
||||||
onUpdate({
|
|
||||||
executionWorkspacePreference: "reuse_existing",
|
|
||||||
executionWorkspaceId: nextExecutionWorkspaceId,
|
|
||||||
executionWorkspaceSettings: {
|
|
||||||
mode: issueModeForExistingWorkspace(nextExecutionWorkspace?.mode),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<option value="">Choose an existing workspace</option>
|
|
||||||
{deduplicatedReusableWorkspaces.map((workspace) => (
|
|
||||||
<option key={workspace.id} value={workspace.id}>
|
|
||||||
{workspace.name} · {workspace.status} · {workspace.branchName ?? workspace.cwd ?? workspace.id.slice(0, 8)}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</select>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{issue.currentExecutionWorkspace && (
|
|
||||||
<div className="text-[11px] text-muted-foreground space-y-0.5">
|
|
||||||
<div style={{ overflowWrap: "anywhere" }}>
|
|
||||||
Current:{" "}
|
|
||||||
<Link
|
|
||||||
to={`/execution-workspaces/${issue.currentExecutionWorkspace.id}`}
|
|
||||||
className="hover:text-foreground hover:underline"
|
|
||||||
>
|
|
||||||
<BreakablePath text={issue.currentExecutionWorkspace.name} />
|
|
||||||
</Link>
|
|
||||||
{" · "}
|
|
||||||
{issue.currentExecutionWorkspace.status}
|
|
||||||
</div>
|
|
||||||
{issue.currentExecutionWorkspace.cwd && (
|
|
||||||
<CopyableValue value={issue.currentExecutionWorkspace.cwd} mono className="text-[11px]" />
|
|
||||||
)}
|
|
||||||
{issue.currentExecutionWorkspace.branchName && (
|
|
||||||
<CopyableValue value={issue.currentExecutionWorkspace.branchName} label="Branch:" className="text-[11px]" />
|
|
||||||
)}
|
|
||||||
{issue.currentExecutionWorkspace.repoUrl && (
|
|
||||||
<CopyableValue value={issue.currentExecutionWorkspace.repoUrl} label="Repo:" mono className="text-[11px]" />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
)}
|
|
||||||
{!issue.currentExecutionWorkspace && currentProject?.primaryWorkspace?.cwd && (
|
|
||||||
<CopyableValue value={currentProject.primaryWorkspace.cwd} mono className="text-[11px] text-muted-foreground" />
|
|
||||||
)}
|
|
||||||
</div>
|
|
||||||
</PropertyRow>
|
|
||||||
)}
|
|
||||||
|
|
||||||
{issue.parentId && (
|
{issue.parentId && (
|
||||||
<PropertyRow label="Parent">
|
<PropertyRow label="Parent">
|
||||||
<Link
|
<Link
|
||||||
|
|
|
||||||
312
ui/src/components/IssueWorkspaceCard.tsx
Normal file
312
ui/src/components/IssueWorkspaceCard.tsx
Normal file
|
|
@ -0,0 +1,312 @@
|
||||||
|
import { useCallback, useMemo, useRef, useState } from "react";
|
||||||
|
import { Link } from "@/lib/router";
|
||||||
|
import type { Issue, ExecutionWorkspace } from "@paperclipai/shared";
|
||||||
|
import { useQuery } from "@tanstack/react-query";
|
||||||
|
import { executionWorkspacesApi } from "../api/execution-workspaces";
|
||||||
|
import { instanceSettingsApi } from "../api/instanceSettings";
|
||||||
|
import { useCompany } from "../context/CompanyContext";
|
||||||
|
import { queryKeys } from "../lib/queryKeys";
|
||||||
|
import { cn } from "../lib/utils";
|
||||||
|
import { Button } from "@/components/ui/button";
|
||||||
|
import { Check, Copy, GitBranch, FolderOpen, Pencil, X } from "lucide-react";
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Utility helpers (mirrored from IssueProperties for self-containment) */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
const EXECUTION_WORKSPACE_OPTIONS = [
|
||||||
|
{ value: "shared_workspace", label: "Project default" },
|
||||||
|
{ value: "isolated_workspace", label: "New isolated workspace" },
|
||||||
|
{ value: "reuse_existing", label: "Reuse existing workspace" },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
function issueModeForExistingWorkspace(mode: string | null | undefined) {
|
||||||
|
if (mode === "isolated_workspace" || mode === "operator_branch" || mode === "shared_workspace") return mode;
|
||||||
|
if (mode === "adapter_managed" || mode === "cloud_sandbox") return "agent_default";
|
||||||
|
return "shared_workspace";
|
||||||
|
}
|
||||||
|
|
||||||
|
function shouldPresentExistingWorkspaceSelection(issue: Issue) {
|
||||||
|
const persistedMode =
|
||||||
|
issue.currentExecutionWorkspace?.mode
|
||||||
|
?? issue.executionWorkspaceSettings?.mode
|
||||||
|
?? issue.executionWorkspacePreference;
|
||||||
|
return Boolean(
|
||||||
|
issue.executionWorkspaceId &&
|
||||||
|
(persistedMode === "isolated_workspace" || persistedMode === "operator_branch"),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function defaultExecutionWorkspaceModeForProject(project: { executionWorkspacePolicy?: { enabled?: boolean; defaultMode?: string | null } | null } | null | undefined) {
|
||||||
|
const defaultMode = project?.executionWorkspacePolicy?.enabled ? project.executionWorkspacePolicy.defaultMode : null;
|
||||||
|
if (defaultMode === "isolated_workspace" || defaultMode === "operator_branch") return defaultMode;
|
||||||
|
if (defaultMode === "adapter_default") return "agent_default";
|
||||||
|
return "shared_workspace";
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Sub-components */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
function BreakablePath({ text }: { text: string }) {
|
||||||
|
const parts: React.ReactNode[] = [];
|
||||||
|
const segments = text.split(/(?<=[\/-])/);
|
||||||
|
for (let i = 0; i < segments.length; i++) {
|
||||||
|
if (i > 0) parts.push(<wbr key={i} />);
|
||||||
|
parts.push(segments[i]);
|
||||||
|
}
|
||||||
|
return <>{parts}</>;
|
||||||
|
}
|
||||||
|
|
||||||
|
function CopyableInline({ value, label, mono }: { value: string; label?: string; mono?: boolean }) {
|
||||||
|
const [copied, setCopied] = useState(false);
|
||||||
|
const timerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
|
||||||
|
const handleCopy = useCallback(async () => {
|
||||||
|
try {
|
||||||
|
await navigator.clipboard.writeText(value);
|
||||||
|
setCopied(true);
|
||||||
|
clearTimeout(timerRef.current);
|
||||||
|
timerRef.current = setTimeout(() => setCopied(false), 1500);
|
||||||
|
} catch { /* noop */ }
|
||||||
|
}, [value]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span className="inline-flex items-center gap-1 group/copy">
|
||||||
|
{label && <span className="text-muted-foreground">{label}</span>}
|
||||||
|
<span className={cn("min-w-0", mono && "font-mono")} style={{ overflowWrap: "anywhere" }}>
|
||||||
|
<BreakablePath text={value} />
|
||||||
|
</span>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
className="shrink-0 p-0.5 rounded hover:bg-accent/50 transition-colors text-muted-foreground hover:text-foreground opacity-0 group-hover/copy:opacity-100 focus:opacity-100"
|
||||||
|
onClick={handleCopy}
|
||||||
|
title={copied ? "Copied!" : "Copy"}
|
||||||
|
>
|
||||||
|
{copied ? <Check className="h-3 w-3 text-green-500" /> : <Copy className="h-3 w-3" />}
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
function workspaceModeLabel(mode: string | null | undefined) {
|
||||||
|
switch (mode) {
|
||||||
|
case "isolated_workspace": return "Isolated workspace";
|
||||||
|
case "operator_branch": return "Operator branch";
|
||||||
|
case "cloud_sandbox": return "Cloud sandbox";
|
||||||
|
case "adapter_managed": return "Adapter managed";
|
||||||
|
default: return "Workspace";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function statusBadge(status: string) {
|
||||||
|
const colors: Record<string, string> = {
|
||||||
|
active: "bg-green-500/15 text-green-700 dark:text-green-400",
|
||||||
|
idle: "bg-muted text-muted-foreground",
|
||||||
|
in_review: "bg-blue-500/15 text-blue-700 dark:text-blue-400",
|
||||||
|
archived: "bg-muted text-muted-foreground",
|
||||||
|
};
|
||||||
|
return (
|
||||||
|
<span className={cn("text-[10px] px-1.5 py-0.5 rounded-full font-medium", colors[status] ?? colors.idle)}>
|
||||||
|
{status.replace(/_/g, " ")}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
/* Main component */
|
||||||
|
/* -------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
interface IssueWorkspaceCardProps {
|
||||||
|
issue: Issue;
|
||||||
|
project: { id: string; executionWorkspacePolicy?: { enabled?: boolean; defaultMode?: string | null; defaultProjectWorkspaceId?: string | null } | null; workspaces?: Array<{ id: string; isPrimary: boolean }> } | null;
|
||||||
|
onUpdate: (data: Record<string, unknown>) => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function IssueWorkspaceCard({ issue, project, onUpdate }: IssueWorkspaceCardProps) {
|
||||||
|
const { selectedCompanyId } = useCompany();
|
||||||
|
const companyId = issue.companyId ?? selectedCompanyId;
|
||||||
|
const [editing, setEditing] = useState(false);
|
||||||
|
|
||||||
|
const { data: experimentalSettings } = useQuery({
|
||||||
|
queryKey: queryKeys.instance.experimentalSettings,
|
||||||
|
queryFn: () => instanceSettingsApi.getExperimental(),
|
||||||
|
});
|
||||||
|
|
||||||
|
const policyEnabled = experimentalSettings?.enableIsolatedWorkspaces === true
|
||||||
|
&& Boolean(project?.executionWorkspacePolicy?.enabled);
|
||||||
|
|
||||||
|
const workspace = issue.currentExecutionWorkspace as ExecutionWorkspace | null | undefined;
|
||||||
|
|
||||||
|
// Only show this card for non-default workspaces
|
||||||
|
const isNonDefault = workspace && workspace.mode !== "shared_workspace";
|
||||||
|
|
||||||
|
const { data: reusableExecutionWorkspaces } = useQuery({
|
||||||
|
queryKey: queryKeys.executionWorkspaces.list(companyId!, {
|
||||||
|
projectId: issue.projectId ?? undefined,
|
||||||
|
projectWorkspaceId: issue.projectWorkspaceId ?? undefined,
|
||||||
|
reuseEligible: true,
|
||||||
|
}),
|
||||||
|
queryFn: () =>
|
||||||
|
executionWorkspacesApi.list(companyId!, {
|
||||||
|
projectId: issue.projectId ?? undefined,
|
||||||
|
projectWorkspaceId: issue.projectWorkspaceId ?? undefined,
|
||||||
|
reuseEligible: true,
|
||||||
|
}),
|
||||||
|
enabled: Boolean(companyId) && Boolean(issue.projectId) && editing,
|
||||||
|
});
|
||||||
|
|
||||||
|
const deduplicatedReusableWorkspaces = useMemo(() => {
|
||||||
|
const workspaces = reusableExecutionWorkspaces ?? [];
|
||||||
|
const seen = new Map<string, typeof workspaces[number]>();
|
||||||
|
for (const ws of workspaces) {
|
||||||
|
const key = ws.cwd ?? ws.id;
|
||||||
|
const existing = seen.get(key);
|
||||||
|
if (!existing || new Date(ws.lastUsedAt) > new Date(existing.lastUsedAt)) {
|
||||||
|
seen.set(key, ws);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return Array.from(seen.values());
|
||||||
|
}, [reusableExecutionWorkspaces]);
|
||||||
|
|
||||||
|
const selectedReusableExecutionWorkspace =
|
||||||
|
deduplicatedReusableWorkspaces.find((w) => w.id === issue.executionWorkspaceId)
|
||||||
|
?? workspace
|
||||||
|
?? null;
|
||||||
|
|
||||||
|
const currentSelection = shouldPresentExistingWorkspaceSelection(issue)
|
||||||
|
? "reuse_existing"
|
||||||
|
: (
|
||||||
|
issue.executionWorkspacePreference
|
||||||
|
?? issue.executionWorkspaceSettings?.mode
|
||||||
|
?? defaultExecutionWorkspaceModeForProject(project)
|
||||||
|
);
|
||||||
|
|
||||||
|
// Don't render if feature is off or workspace is default/absent
|
||||||
|
if (!policyEnabled || !isNonDefault) return null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="rounded-lg border border-border p-3 space-y-2">
|
||||||
|
{/* Header row */}
|
||||||
|
<div className="flex items-center justify-between gap-2">
|
||||||
|
<div className="flex items-center gap-2 text-sm font-medium text-foreground">
|
||||||
|
<GitBranch className="h-3.5 w-3.5 text-muted-foreground" />
|
||||||
|
{workspaceModeLabel(workspace.mode)}
|
||||||
|
{statusBadge(workspace.status)}
|
||||||
|
</div>
|
||||||
|
<Button
|
||||||
|
variant="ghost"
|
||||||
|
size="sm"
|
||||||
|
className="h-6 px-2 text-xs text-muted-foreground"
|
||||||
|
onClick={() => setEditing(!editing)}
|
||||||
|
>
|
||||||
|
{editing ? <><X className="h-3 w-3 mr-1" />Cancel</> : <><Pencil className="h-3 w-3 mr-1" />Edit</>}
|
||||||
|
</Button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Read-only info */}
|
||||||
|
{!editing && (
|
||||||
|
<div className="space-y-1.5 text-xs">
|
||||||
|
{workspace.branchName && (
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<GitBranch className="h-3 w-3 text-muted-foreground shrink-0" />
|
||||||
|
<CopyableInline value={workspace.branchName} mono />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{workspace.cwd && (
|
||||||
|
<div className="flex items-center gap-1.5">
|
||||||
|
<FolderOpen className="h-3 w-3 text-muted-foreground shrink-0" />
|
||||||
|
<CopyableInline value={workspace.cwd} mono />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
{workspace.repoUrl && (
|
||||||
|
<div className="flex items-center gap-1.5 text-muted-foreground">
|
||||||
|
<span className="text-[11px]">Repo:</span>
|
||||||
|
<CopyableInline value={workspace.repoUrl} mono />
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
<div className="pt-0.5">
|
||||||
|
<Link
|
||||||
|
to={`/execution-workspaces/${workspace.id}`}
|
||||||
|
className="text-[11px] text-muted-foreground hover:text-foreground hover:underline"
|
||||||
|
>
|
||||||
|
View workspace details →
|
||||||
|
</Link>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Editing controls */}
|
||||||
|
{editing && (
|
||||||
|
<div className="space-y-2 pt-1">
|
||||||
|
<select
|
||||||
|
className="w-full rounded border border-border bg-transparent px-2 py-1.5 text-xs outline-none"
|
||||||
|
value={currentSelection}
|
||||||
|
onChange={(e) => {
|
||||||
|
const nextMode = e.target.value;
|
||||||
|
onUpdate({
|
||||||
|
executionWorkspacePreference: nextMode,
|
||||||
|
executionWorkspaceId: nextMode === "reuse_existing" ? issue.executionWorkspaceId : null,
|
||||||
|
executionWorkspaceSettings: {
|
||||||
|
mode:
|
||||||
|
nextMode === "reuse_existing"
|
||||||
|
? issueModeForExistingWorkspace(selectedReusableExecutionWorkspace?.mode)
|
||||||
|
: nextMode,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{EXECUTION_WORKSPACE_OPTIONS.map((option) => (
|
||||||
|
<option key={option.value} value={option.value}>
|
||||||
|
{option.value === "reuse_existing" && selectedReusableExecutionWorkspace?.mode === "isolated_workspace"
|
||||||
|
? "Existing isolated workspace"
|
||||||
|
: option.label}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
|
||||||
|
{currentSelection === "reuse_existing" && (
|
||||||
|
<select
|
||||||
|
className="w-full rounded border border-border bg-transparent px-2 py-1.5 text-xs outline-none"
|
||||||
|
value={issue.executionWorkspaceId ?? ""}
|
||||||
|
onChange={(e) => {
|
||||||
|
const nextId = e.target.value || null;
|
||||||
|
const next = deduplicatedReusableWorkspaces.find((w) => w.id === nextId);
|
||||||
|
onUpdate({
|
||||||
|
executionWorkspacePreference: "reuse_existing",
|
||||||
|
executionWorkspaceId: nextId,
|
||||||
|
executionWorkspaceSettings: {
|
||||||
|
mode: issueModeForExistingWorkspace(next?.mode),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<option value="">Choose an existing workspace</option>
|
||||||
|
{deduplicatedReusableWorkspaces.map((w) => (
|
||||||
|
<option key={w.id} value={w.id}>
|
||||||
|
{w.name} · {w.status} · {w.branchName ?? w.cwd ?? w.id.slice(0, 8)}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
)}
|
||||||
|
|
||||||
|
{/* Current workspace summary when editing */}
|
||||||
|
{workspace && (
|
||||||
|
<div className="text-[11px] text-muted-foreground space-y-0.5 pt-1 border-t border-border/50">
|
||||||
|
<div style={{ overflowWrap: "anywhere" }}>
|
||||||
|
Current:{" "}
|
||||||
|
<Link
|
||||||
|
to={`/execution-workspaces/${workspace.id}`}
|
||||||
|
className="hover:text-foreground hover:underline"
|
||||||
|
>
|
||||||
|
<BreakablePath text={workspace.name} />
|
||||||
|
</Link>
|
||||||
|
{" · "}
|
||||||
|
{workspace.status}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -21,6 +21,7 @@ import { InlineEditor } from "../components/InlineEditor";
|
||||||
import { CommentThread } from "../components/CommentThread";
|
import { CommentThread } from "../components/CommentThread";
|
||||||
import { IssueDocumentsSection } from "../components/IssueDocumentsSection";
|
import { IssueDocumentsSection } from "../components/IssueDocumentsSection";
|
||||||
import { IssueProperties } from "../components/IssueProperties";
|
import { IssueProperties } from "../components/IssueProperties";
|
||||||
|
import { IssueWorkspaceCard } from "../components/IssueWorkspaceCard";
|
||||||
import { LiveRunWidget } from "../components/LiveRunWidget";
|
import { LiveRunWidget } from "../components/LiveRunWidget";
|
||||||
import type { MentionOption } from "../components/MarkdownEditor";
|
import type { MentionOption } from "../components/MarkdownEditor";
|
||||||
import { ScrollToBottom } from "../components/ScrollToBottom";
|
import { ScrollToBottom } from "../components/ScrollToBottom";
|
||||||
|
|
@ -991,6 +992,12 @@ export function IssueDetail() {
|
||||||
</div>
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
|
|
||||||
|
<IssueWorkspaceCard
|
||||||
|
issue={issue}
|
||||||
|
project={orderedProjects.find((p) => p.id === issue.projectId) ?? null}
|
||||||
|
onUpdate={(data) => updateIssue.mutate(data)}
|
||||||
|
/>
|
||||||
|
|
||||||
<Separator />
|
<Separator />
|
||||||
|
|
||||||
<Tabs value={detailTab} onValueChange={setDetailTab} className="space-y-3">
|
<Tabs value={detailTab} onValueChange={setDetailTab} className="space-y-3">
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue