fix: wait for workspace policy before creation
This commit is contained in:
@@ -8,7 +8,7 @@ import { getSettings } from "../api/settings";
|
||||
import { getWorkspace, listWorkspaces } from "../api/workspaces";
|
||||
import { listModels } from "../api/models";
|
||||
import { useSessionStore } from "../store/sessionStore";
|
||||
import { workspacePreferences, type WorkspacePreference } from "../workspaces/drafts";
|
||||
import { workspacePolicyGate, workspacePreferences, type WorkspacePreference } from "../workspaces/drafts";
|
||||
|
||||
const THINKING_LEVELS = ["low", "medium", "high"] as const;
|
||||
|
||||
@@ -84,6 +84,7 @@ export function SteerInput({
|
||||
setLastUserEntry({ kind: "input", text: trimmed });
|
||||
onSessionCreating?.(trimmed);
|
||||
try {
|
||||
await workspacePolicyGate.waitFor(workspacePreferences.load().workspaceId);
|
||||
const { id } = await createSession({ question: trimmed, ...workspacePreferences.load() });
|
||||
onSessionCreated?.(id);
|
||||
setText("");
|
||||
@@ -174,7 +175,7 @@ export function ComposerFooter() {
|
||||
|
||||
const workspace = preferences.workspaceId ?? settings?.workspace ?? "";
|
||||
const selectedWorkspace = workspaces.find((candidate) => candidate.id === workspace);
|
||||
const { data: workspaceRecord } = useQuery({
|
||||
const { data: workspaceRecord, isError: workspacePolicyError } = useQuery({
|
||||
queryKey: ["workspace", workspace],
|
||||
queryFn: () => getWorkspace(workspace),
|
||||
// Legacy metadata responses do not carry a registry revision, so retain the
|
||||
@@ -210,7 +211,18 @@ export function ComposerFooter() {
|
||||
setPreferences(next);
|
||||
}, [allowedModels, preferences, workspaceRecord]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!selectedWorkspace?.revision) return;
|
||||
if (workspaceRecord) workspacePolicyGate.resolve(workspace);
|
||||
else if (workspacePolicyError) workspacePolicyGate.reject(workspace);
|
||||
}, [selectedWorkspace, workspace, workspacePolicyError, workspaceRecord]);
|
||||
|
||||
function update(patch: WorkspacePreference) {
|
||||
if (
|
||||
patch.workspaceId
|
||||
&& patch.workspaceId !== workspace
|
||||
&& workspaces.some((candidate) => candidate.id === patch.workspaceId && candidate.revision)
|
||||
) workspacePolicyGate.begin(patch.workspaceId);
|
||||
const next = workspacePreferences.save({ ...preferences, ...patch });
|
||||
setPreferences(next);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user