Skip to content

Commit 2edf052

Browse files
feat(site): cascade disable models when deleting a provider
Provider deletion now disables associated models (enabled=false) instead of soft-deleting them. Disabled models remain visible in the admin model list so they can be reassigned to a different provider later. Changes: - ProviderForm: cascade calls onDisableModel (update with enabled:false) instead of onDeleteModel, dialog description says 'disable', escape guard prevents dismissal during cascade. - UpdateProviderPageView: replaced old DeleteDialog with type-to-confirm Dialog, cascade disables models via updateChatModelConfig, invalidates all 3 query keys via invalidateChatConfigurationQueries, guards against isLoading/isError on model configs query. - ModelsSection: disabled badge uses grey (variant=default) instead of orange (variant=warning). - AI Settings ProviderForm: name field description updated. - chats.ts: export invalidateChatConfigurationQueries for reuse.
1 parent eb2c279 commit 2edf052

7 files changed

Lines changed: 190 additions & 40 deletions

File tree

‎site/src/api/queries/chats.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1743,7 +1743,9 @@ export const deleteUserChatProviderKey = (queryClient: QueryClient) => ({
17431743
},
17441744
});
17451745

1746-
const invalidateChatConfigurationQueries = async (queryClient: QueryClient) => {
1746+
export const invalidateChatConfigurationQueries = async (
1747+
queryClient: QueryClient,
1748+
) => {
17471749
await Promise.all([
17481750
queryClient.invalidateQueries({ queryKey: chatProviderConfigsKey }),
17491751
queryClient.invalidateQueries({ queryKey: chatModelConfigsKey }),

‎site/src/pages/AISettingsPage/ProvidersPage/UpdateProviderPage/UpdateProviderPageView.tsx‎

Lines changed: 142 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,31 @@ import { useState } from "react";
44
import { useMutation, useQuery, useQueryClient } from "react-query";
55
import { Link, Navigate, useNavigate, useParams } from "react-router";
66
import { toast } from "sonner";
7+
import { API } from "#/api/api";
78
import { getErrorMessage } from "#/api/errors";
89
import {
910
aiProvider,
1011
deleteAIProviderMutation,
1112
updateAIProviderMutation,
1213
} from "#/api/queries/aiProviders";
14+
import {
15+
chatModelConfigs,
16+
invalidateChatConfigurationQueries,
17+
} from "#/api/queries/chats";
1318
import { Avatar } from "#/components/Avatar/Avatar";
1419
import { Badge } from "#/components/Badge/Badge";
1520
import { Button } from "#/components/Button/Button";
16-
import { DeleteDialog } from "#/components/Dialogs/DeleteDialog/DeleteDialog";
21+
import {
22+
Dialog,
23+
DialogContent,
24+
DialogFooter,
25+
DialogHeader,
26+
DialogTitle,
27+
} from "#/components/Dialog/Dialog";
28+
import { Input } from "#/components/Input/Input";
1729
import { Loader } from "#/components/Loader/Loader";
1830
import { SettingsHeaderTitle } from "#/components/SettingsHeader/SettingsHeader";
31+
import { Spinner } from "#/components/Spinner/Spinner";
1932
import { Switch } from "#/components/Switch/Switch";
2033
import { pageTitle } from "#/utils/page";
2134
import { ProviderForm } from "../components/ProviderForm";
@@ -36,6 +49,8 @@ const UpdateProviderPageView: React.FC = () => {
3649
const navigate = useNavigate();
3750

3851
const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
52+
const [deleteConfirmText, setDeleteConfirmText] = useState("");
53+
const [isCascadeDeleting, setIsCascadeDeleting] = useState(false);
3954

4055
const providerQuery = useQuery({
4156
...aiProvider(providerId ?? ""),
@@ -54,6 +69,16 @@ const UpdateProviderPageView: React.FC = () => {
5469
deleteAIProviderMutation(queryClient, providerId ?? ""),
5570
);
5671

72+
const modelConfigsQuery = useQuery({
73+
...chatModelConfigs(),
74+
enabled: Boolean(providerId),
75+
});
76+
77+
const associatedModels = (modelConfigsQuery.data ?? []).filter(
78+
(mc) => mc.ai_provider_id === provider?.id,
79+
);
80+
const associatedModelCount = associatedModels.length;
81+
5782
// Rendered into every non-redirect return so the document title reflects
5883
// the provider as soon as we know it; falls back to a placeholder while
5984
// the query is in flight.
@@ -210,36 +235,123 @@ const UpdateProviderPageView: React.FC = () => {
210235
}}
211236
/>
212237
</div>
213-
<DeleteDialog
214-
key={provider.name}
215-
isOpen={deleteDialogOpen}
216-
title="Delete provider"
217-
entity="provider"
218-
name={provider.name}
219-
confirmLoading={deleteMutation.isPending}
220-
onCancel={() => {
221-
setDeleteDialogOpen(false);
238+
<Dialog
239+
open={deleteDialogOpen}
240+
onOpenChange={(open) => {
241+
if (!open && !isCascadeDeleting && !deleteMutation.isPending) {
242+
setDeleteDialogOpen(false);
243+
setDeleteConfirmText("");
244+
}
222245
}}
223-
onConfirm={() => {
224-
deleteMutation.mutate(undefined, {
225-
onSuccess: () => {
226-
toast.success(
227-
`Provider "${provider.display_name || provider.name}" deleted.`,
228-
);
229-
setDeleteDialogOpen(false);
230-
void navigate(BACK_HREF, { replace: true });
231-
},
232-
onError: (error) => {
233-
toast.error(
234-
getErrorMessage(
235-
error,
236-
`Failed to delete provider "${provider.display_name || provider.name}".`,
237-
),
238-
);
239-
},
240-
});
241-
}}
242-
/>
246+
>
247+
<DialogContent variant="destructive">
248+
<DialogHeader>
249+
<DialogTitle>Delete provider</DialogTitle>
250+
</DialogHeader>
251+
<div className="flex flex-col gap-3 text-sm text-content-secondary">
252+
<p className="m-0 font-medium text-content-destructive">
253+
Deleting this provider is irreversible!
254+
</p>
255+
{associatedModelCount > 0 && (
256+
<ul className="m-0 pl-5">
257+
<li>
258+
Deleting this provider will also disable{" "}
259+
<strong className="text-content-primary">
260+
{associatedModelCount}{" "}
261+
{associatedModelCount === 1 ? "model" : "models"}
262+
</strong>{" "}
263+
from your settings.
264+
</li>
265+
</ul>
266+
)}
267+
<p className="m-0">
268+
Type{" "}
269+
<strong className="text-content-primary">
270+
{provider.name}
271+
</strong>{" "}
272+
to confirm.
273+
</p>
274+
<Input
275+
id="delete-confirm"
276+
aria-label={`Type ${provider.name} to confirm`}
277+
autoFocus
278+
autoComplete="off"
279+
placeholder={provider.name}
280+
value={deleteConfirmText}
281+
onChange={(e) => setDeleteConfirmText(e.target.value)}
282+
/>
283+
</div>
284+
<DialogFooter>
285+
<Button
286+
variant="outline"
287+
onClick={() => {
288+
setDeleteDialogOpen(false);
289+
setDeleteConfirmText("");
290+
}}
291+
disabled={isCascadeDeleting || deleteMutation.isPending}
292+
>
293+
Cancel
294+
</Button>
295+
<Button
296+
variant="destructive"
297+
className="disabled:border-border"
298+
disabled={
299+
deleteConfirmText !== provider.name ||
300+
isCascadeDeleting ||
301+
deleteMutation.isPending ||
302+
modelConfigsQuery.isLoading ||
303+
modelConfigsQuery.isError
304+
}
305+
onClick={() => {
306+
const deleteAll = async () => {
307+
setIsCascadeDeleting(true);
308+
try {
309+
for (const mc of associatedModels) {
310+
await API.experimental.updateChatModelConfig(mc.id, {
311+
enabled: false,
312+
});
313+
}
314+
await invalidateChatConfigurationQueries(queryClient);
315+
deleteMutation.mutate(undefined, {
316+
onSuccess: () => {
317+
toast.success(
318+
`Provider "${provider.display_name || provider.name}" deleted.`,
319+
);
320+
setDeleteDialogOpen(false);
321+
setDeleteConfirmText("");
322+
void navigate(BACK_HREF, { replace: true });
323+
},
324+
onError: (error) => {
325+
toast.error(
326+
getErrorMessage(
327+
error,
328+
`Failed to delete provider "${provider.display_name || provider.name}".`,
329+
),
330+
);
331+
},
332+
onSettled: () => {
333+
setIsCascadeDeleting(false);
334+
},
335+
});
336+
} catch (error) {
337+
toast.error(
338+
getErrorMessage(error, "Failed to delete provider."),
339+
);
340+
setIsCascadeDeleting(false);
341+
await invalidateChatConfigurationQueries(queryClient);
342+
}
343+
};
344+
void deleteAll();
345+
}}
346+
>
347+
{(isCascadeDeleting || deleteMutation.isPending) && (
348+
<Spinner className="h-4 w-4" loading />
349+
)}
350+
Delete provider
351+
</Button>
352+
</DialogFooter>
353+
</DialogContent>
354+
</Dialog>
243355
</div>
244356
</>
245357
);

‎site/src/pages/AISettingsPage/ProvidersPage/components/ProviderForm.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ export const ProviderForm: FC<ProviderFormProps> = ({
303303
required
304304
field={getFieldHelpers("name")}
305305
label="Name"
306-
description="Unique identifier (used in urls, can't be changed)"
306+
description="URL identifier. Cannot be changed."
307307
className="w-full"
308308
placeholder={namePlaceholder(form.values.type)}
309309
disabled={editing}
@@ -341,7 +341,7 @@ export const ProviderForm: FC<ProviderFormProps> = ({
341341
required
342342
field={getFieldHelpers("name")}
343343
label="Name"
344-
description="Unique identifier (used in urls, can't be changed)"
344+
description="URL identifier. Cannot be changed."
345345
className="w-full"
346346
placeholder={namePlaceholder(form.values.type)}
347347
disabled={editing}

‎site/src/pages/AgentsPage/components/ChatModelAdminPanel/ChatModelAdminPanel.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ export const ChatModelAdminPanel: FC<ChatModelAdminPanelProps> = ({
324324
onCreateProvider={onCreateProvider}
325325
onUpdateProvider={onUpdateProvider}
326326
onDeleteProvider={onDeleteProvider}
327+
onDisableModel={onUpdateModel}
327328
/>
328329
) : (
329330
<ModelsSection

‎site/src/pages/AgentsPage/components/ChatModelAdminPanel/ModelsSection.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,7 @@ export const ModelsSection: FC<ModelsSectionProps> = ({
377377
)}
378378
</div>
379379
{modelConfig.enabled === false && (
380-
<Badge size="xs" variant="warning">
380+
<Badge size="xs" variant="default">
381381
disabled
382382
</Badge>
383383
)}

‎site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProviderForm.tsx‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import {
88
useState,
99
} from "react";
1010
import { useNavigate } from "react-router";
11+
import { toast } from "sonner";
12+
import { getErrorMessage } from "#/api/errors";
1113
import type * as TypesGen from "#/api/typesGenerated";
1214
import { Alert, AlertDescription, AlertTitle } from "#/components/Alert/Alert";
1315
import { Button } from "#/components/Button/Button";
@@ -45,6 +47,10 @@ interface ProviderFormProps {
4547
req: TypesGen.UpdateChatProviderConfigRequest,
4648
) => Promise<unknown>;
4749
onDeleteProvider: (providerConfigId: string) => Promise<void>;
50+
onDisableModel: (
51+
modelConfigId: string,
52+
req: TypesGen.UpdateChatModelConfigRequest,
53+
) => Promise<unknown>;
4854
onBack: () => void;
4955
}
5056

@@ -55,6 +61,7 @@ export const ProviderForm: FC<ProviderFormProps> = ({
5561
onCreateProvider,
5662
onUpdateProvider,
5763
onDeleteProvider,
64+
onDisableModel,
5865
onBack,
5966
}) => {
6067
const navigate = useNavigate();
@@ -80,6 +87,7 @@ export const ProviderForm: FC<ProviderFormProps> = ({
8087
const [apiKeyModified, setApiKeyModified] = useState(false);
8188
const [baseURLValue, setBaseURLValue] = useState(initialValues.baseURL);
8289
const [confirmingDelete, setConfirmingDelete] = useState(false);
90+
const [isCascadeDeleting, setIsCascadeDeleting] = useState(false);
8391

8492
const isBedrockProvider = provider === "bedrock";
8593
const isAPIKeyEnvManaged = isEnvPreset && !providerConfig;
@@ -106,10 +114,11 @@ export const ProviderForm: FC<ProviderFormProps> = ({
106114
? "Bedrock runtime endpoint. Use the AWS region for the models this provider should call."
107115
: "Endpoint used to call this provider.";
108116
const apiKeyPlaceholder = isBedrockProvider ? "Enter bearer token" : "sk-...";
117+
const associatedModelCount = providerState.modelConfigs.length;
109118
const deleteProviderDescription =
110-
"Are you sure you want to delete this provider? The provider will be " +
111-
"disabled and hidden from new model configuration. Existing model " +
112-
"configs that reference it remain saved but cannot run until updated.";
119+
associatedModelCount > 0
120+
? `Deleting this provider will also disable ${associatedModelCount} ${associatedModelCount === 1 ? "model" : "models"} from your settings.`
121+
: "Are you sure you want to delete this provider? This action is irreversible.";
113122
const hasNewProviderConfiguration = !providerConfig;
114123

115124
const isDirty =
@@ -371,10 +380,29 @@ export const ProviderForm: FC<ProviderFormProps> = ({
371380
<ConfirmDeleteDialog
372381
entity="provider"
373382
description={deleteProviderDescription}
374-
onConfirm={() => void onDeleteProvider(providerConfig.id)}
375-
isPending={isProviderMutationPending}
383+
onConfirm={() => {
384+
setIsCascadeDeleting(true);
385+
const chain = providerState.modelConfigs.reduce<Promise<unknown>>(
386+
(prev, mc) =>
387+
prev.then(() => onDisableModel(mc.id, { enabled: false })),
388+
Promise.resolve(),
389+
);
390+
chain
391+
.then(() => onDeleteProvider(providerConfig.id))
392+
.catch((error: unknown) => {
393+
toast.error(
394+
getErrorMessage(error, "Failed to delete provider."),
395+
);
396+
})
397+
.then(() => setIsCascadeDeleting(false));
398+
}}
399+
isPending={isCascadeDeleting || isProviderMutationPending}
376400
open={confirmingDelete}
377-
onOpenChange={(open) => !open && setConfirmingDelete(false)}
401+
onOpenChange={(open) => {
402+
if (!open && !isCascadeDeleting && !isProviderMutationPending) {
403+
setConfirmingDelete(false);
404+
}
405+
}}
378406
/>
379407
)}
380408
</div>

‎site/src/pages/AgentsPage/components/ChatModelAdminPanel/ProvidersSection.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {
1010
type AIProviderType,
1111
AIProviderTypes,
1212
type CreateChatProviderConfigRequest,
13+
type UpdateChatModelConfigRequest,
1314
type UpdateChatProviderConfigRequest,
1415
} from "#/api/typesGenerated";
1516
import { Badge } from "#/components/Badge/Badge";
@@ -79,6 +80,10 @@ interface ProvidersSectionProps {
7980
req: UpdateChatProviderConfigRequest,
8081
) => Promise<unknown>;
8182
onDeleteProvider: (providerConfigId: string) => Promise<void>;
83+
onDisableModel: (
84+
modelConfigId: string,
85+
req: UpdateChatModelConfigRequest,
86+
) => Promise<unknown>;
8287
}
8388

8489
export const ProvidersSection: FC<ProvidersSectionProps> = ({
@@ -90,6 +95,7 @@ export const ProvidersSection: FC<ProvidersSectionProps> = ({
9095
onCreateProvider,
9196
onUpdateProvider,
9297
onDeleteProvider,
98+
onDisableModel,
9399
}) => {
94100
const [searchParams, setSearchParams] = useSearchParams();
95101
const navigate = useNavigate();
@@ -198,6 +204,7 @@ export const ProvidersSection: FC<ProvidersSectionProps> = ({
198204
}
199205
}}
200206
onBack={clearProviderView}
207+
onDisableModel={onDisableModel}
201208
/>
202209
);
203210
}

0 commit comments

Comments
 (0)