Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ export default function useDeleteConnection(type: ConnectionType): UseMutationRe
},
} as unknown as Parameters<typeof http.request>[0]);
},
onSuccess: (_data, id) => {
queryClient.removeQueries({queryKey: [ConnectionQueryKeys.CONNECTION, type, id]});
onSuccess: () => {
queryClient.invalidateQueries({queryKey: [ConnectionQueryKeys.CONNECTIONS]}).catch(() => {
// Ignore invalidation errors
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export default function useGetConnectionUsages(
return useQuery<ConnectionUsagesResponse>({
queryKey: [ConnectionQueryKeys.CONNECTION_USAGES, type, id],
enabled: Boolean(id) && enabled,
retry: false,
queryFn: async (): Promise<ConnectionUsagesResponse> => {
const serverUrl: string = getServerUrl();
const response: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2025 The ThunderID Authors
// SPDX-License-Identifier: Apache-2.0

import {getErrorMessage} from '@thunderid/utils';
import {
Alert,
Button,
Expand Down Expand Up @@ -46,17 +47,22 @@ export default function ConnectionDeleteDialog({
}: ConnectionDeleteDialogProps): JSX.Element {
const {t} = useTranslation('connections');

const {data: usagesData, isLoading: isLoadingUsages} = useGetConnectionUsages(
connectionType,
connectionId || undefined,
open,
);
const usagesQuery = useGetConnectionUsages(connectionType, connectionId || undefined, open);
const {data: usagesData, isLoading: isLoadingUsages, isError: isUsagesError, error: usagesError} = usagesQuery;

const usagesKnown = usagesData !== undefined && usagesData.totalResults !== null;
const blockingUsages = usagesData?.usages.filter((usage) => usage.behaviorOnDelete === 'restrict') ?? [];
const hasBlockingUsages = usagesKnown && blockingUsages.length > 0;
const visibleBlocking = blockingUsages.slice(0, MAX_VISIBLE_USAGES);
const hiddenBlockingCount = blockingUsages.length - visibleBlocking.length;
const usagesErrorMessage = isUsagesError
? getErrorMessage(
usagesError,
t,
'delete.usages.error',
'Failed to check connection usage. Please try again.',
)
: null;

return (
<Dialog open={open} onClose={isPending ? undefined : onClose} maxWidth="sm" fullWidth>
Expand All @@ -68,6 +74,8 @@ export default function ConnectionDeleteDialog({
<Alert severity="info" icon={<CircularProgress size={16} />}>
{t('delete.usages.loading')}
</Alert>
) : isUsagesError ? (
<Alert severity="error">{usagesErrorMessage}</Alert>
) : hasBlockingUsages ? (
<Alert severity="error">
<Typography variant="body2" sx={{mb: 1}}>
Expand Down Expand Up @@ -108,7 +116,7 @@ export default function ConnectionDeleteDialog({
onClick={onConfirm}
color="error"
variant="contained"
disabled={isPending || isLoadingUsages || hasBlockingUsages}
disabled={isPending || isLoadingUsages || isUsagesError || hasBlockingUsages}
data-testid="connection-delete-confirm"
>
{t('common:actions.delete')}
Expand Down
Loading
Loading