style: format merged main files
This commit is contained in:
parent
ce2570460d
commit
3ce3d7b0ab
|
|
@ -11,7 +11,7 @@ on:
|
|||
workflow_dispatch:
|
||||
inputs:
|
||||
important:
|
||||
description: 'Mark this nightly as an important update (escalates the in-app restart prompt). Retro-flag an already-published nightly by re-running only the publish-feed job with this input set.'
|
||||
description: "Mark this nightly as an important update (escalates the in-app restart prompt). Retro-flag an already-published nightly by re-running only the publish-feed job with this input set."
|
||||
type: boolean
|
||||
default: false
|
||||
|
||||
|
|
|
|||
|
|
@ -41,13 +41,18 @@ export function OrchestratorReplacementDialog({
|
|||
<AlertTriangle className="size-4" aria-hidden="true" />
|
||||
</div>
|
||||
<div className="min-w-0 flex-1">
|
||||
<Dialog.Title className="text-sm font-medium text-foreground">Orchestrator replacement failed</Dialog.Title>
|
||||
<Dialog.Title className="text-sm font-medium text-foreground">
|
||||
Orchestrator replacement failed
|
||||
</Dialog.Title>
|
||||
<Dialog.Description className="mt-2 text-[13px] leading-5 text-muted-foreground">
|
||||
{error ?? "The project orchestrator could not be replaced."}
|
||||
</Dialog.Description>
|
||||
</div>
|
||||
<Dialog.Close asChild>
|
||||
<button className="rounded-md p-1 text-passive hover:bg-interactive-hover hover:text-foreground" type="button">
|
||||
<button
|
||||
className="rounded-md p-1 text-passive hover:bg-interactive-hover hover:text-foreground"
|
||||
type="button"
|
||||
>
|
||||
<X className="size-4" aria-hidden="true" />
|
||||
<span className="sr-only">Close</span>
|
||||
</button>
|
||||
|
|
|
|||
|
|
@ -95,7 +95,11 @@ beforeEach(() => {
|
|||
putMock.mockReset();
|
||||
postMock.mockReset();
|
||||
putMock.mockResolvedValue({ data: { project: {} }, error: undefined });
|
||||
postMock.mockResolvedValue({ data: { orchestrator: { id: "proj-1-orch-2" } }, error: undefined, response: { status: 200 } });
|
||||
postMock.mockResolvedValue({
|
||||
data: { orchestrator: { id: "proj-1-orch-2" } },
|
||||
error: undefined,
|
||||
response: { status: 200 },
|
||||
});
|
||||
});
|
||||
|
||||
describe("ProjectSettingsForm", () => {
|
||||
|
|
|
|||
|
|
@ -101,7 +101,12 @@ describe("useWorkspaceQuery", () => {
|
|||
await waitFor(() => expect(result.current.isSuccess).toBe(true));
|
||||
|
||||
const [workspace] = result.current.data ?? [];
|
||||
expect(workspace).toMatchObject({ id: "proj-1", name: "my-app", path: "/home/me/my-app", orchestratorAgent: "codex" });
|
||||
expect(workspace).toMatchObject({
|
||||
id: "proj-1",
|
||||
name: "my-app",
|
||||
path: "/home/me/my-app",
|
||||
orchestratorAgent: "codex",
|
||||
});
|
||||
expect(workspace.sessions).toHaveLength(2);
|
||||
expect(workspace.sessions[0]).toMatchObject({
|
||||
id: "sess-1",
|
||||
|
|
|
|||
|
|
@ -44,7 +44,10 @@ export async function restartProjectOrchestrator({
|
|||
});
|
||||
} catch (error) {
|
||||
await refreshWorkspaceState(queryClient);
|
||||
setOrchestratorReplacementError(projectId, error instanceof Error ? error.message : "Could not replace orchestrator");
|
||||
setOrchestratorReplacementError(
|
||||
projectId,
|
||||
error instanceof Error ? error.message : "Could not replace orchestrator",
|
||||
);
|
||||
onError?.(error);
|
||||
} finally {
|
||||
setProjectRestarting(projectId, false);
|
||||
|
|
|
|||
|
|
@ -239,7 +239,8 @@ describe("orchestratorHealth", () => {
|
|||
}),
|
||||
).toEqual({
|
||||
state: "duplicates",
|
||||
message: "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
|
||||
message:
|
||||
"Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
|
||||
});
|
||||
|
||||
expect(
|
||||
|
|
|
|||
|
|
@ -386,7 +386,8 @@ export function orchestratorHealth(workspace: WorkspaceSummary, restarting = fal
|
|||
if (active.length > 1) {
|
||||
return {
|
||||
state: "duplicates",
|
||||
message: "Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
|
||||
message:
|
||||
"Multiple orchestrators are active. The newest one is used; stale ones will be cleaned up on daemon reconcile.",
|
||||
};
|
||||
}
|
||||
const orchestrator = newestActiveOrchestrator(workspace.sessions);
|
||||
|
|
|
|||
Loading…
Reference in New Issue