fix: restore focus for the audit drawer and the reset dialog after its trigger unmounts

A successful base reset clears the last database override, which unmounts the header Reset button before the dialog closes, so the reset dialog now receives the same page container fallback ConfirmSaveDialog already uses. The audit detail drawer's four raw Radix content branches had neither a trigger nor onCloseAutoFocus and now share one useReturnFocus wiring, and the hook test moves under __tests__ per the repo convention.

Author: dustinhealy

src/components/configuration/ConfigPage.tsx

@@ -1068,6 +1068,7 @@ export function ConfigPage({ initialTab, highlightField, initialScope }: t.Confi
         open={resetBaseOpen}
         resetting={resettingBase}
         error={resetBaseError}
+        fallbackRef={saveFallbackRef}
         onConfirm={handleResetBaseConfig}
         onCancel={() => {
           if (resettingBase) return;

src/components/configuration/ResetBaseConfigDialog.tsx

@@ -6,11 +6,12 @@ export function ResetBaseConfigDialog({
   open,
   resetting,
   error,
+  fallbackRef,
   onConfirm,
   onCancel,
 }: t.ResetBaseConfigDialogProps) {
   const localize = useLocalize();
-  const returnFocus = useReturnFocus(open);
+  const returnFocus = useReturnFocus(open, fallbackRef);
 
   return (
     <Dialog

src/components/grants/AuditLogDetailDrawer.tsx

@@ -13,7 +13,7 @@ import {
 } from './auditLogUtils';
 import { LoadingState } from '@/components/shared';
 import { getScopeTypeConfig } from '@/constants';
-import { useLocalize } from '@/hooks';
+import { useLocalize, useReturnFocus } from '@/hooks';
 import { cn } from '@/utils';
 
 interface AuditLogDetailDrawerProps {
@@ -135,6 +135,7 @@ export function AuditLogDetailDrawer({
   loadError = false,
 }: AuditLogDetailDrawerProps): ReactElement | null {
   const localize = useLocalize();
+  const returnFocus = useReturnFocus(open);
 
   // Keep the last non-null entry so the close animation has content to render
   // while Radix Dialog slides the panel out. Without this, unmounting on
@@ -225,6 +226,7 @@ export function AuditLogDetailDrawer({
           <Dialog.Content
             aria-label={localize('com_audit_detail_title')}
             onEscapeKeyDown={() => onClose()}
+            onCloseAutoFocus={returnFocus}
             className={cn(
               'fixed top-0 right-0 z-(--z-overlay) flex h-full w-full flex-col bg-(--cui-color-background-panel) shadow-xl sm:w-120',
               'border-l border-(--cui-color-stroke-default)',
@@ -272,6 +274,7 @@ export function AuditLogDetailDrawer({
           <Dialog.Content
             aria-label={localize('com_audit_detail_title')}
             onEscapeKeyDown={() => onClose()}
+            onCloseAutoFocus={returnFocus}
             className={cn(
               'fixed top-0 right-0 z-(--z-overlay) flex h-full w-full flex-col bg-(--cui-color-background-panel) shadow-xl sm:w-120',
               'border-l border-(--cui-color-stroke-default)',
@@ -324,6 +327,7 @@ export function AuditLogDetailDrawer({
           <Dialog.Content
             aria-label={localize('com_audit_detail_title')}
             onEscapeKeyDown={() => onClose()}
+            onCloseAutoFocus={returnFocus}
             className={cn(
               'fixed top-0 right-0 z-(--z-overlay) flex h-full w-full flex-col bg-(--cui-color-background-panel) shadow-xl sm:w-120',
               'border-l border-(--cui-color-stroke-default)',
@@ -389,6 +393,7 @@ export function AuditLogDetailDrawer({
         <Dialog.Content
           aria-label={localize('com_audit_detail_title')}
           onEscapeKeyDown={() => onClose()}
+          onCloseAutoFocus={returnFocus}
           className={cn(
             'fixed top-0 right-0 z-(--z-overlay) flex h-full w-full flex-col bg-(--cui-color-background-panel) shadow-xl sm:w-120',
             'border-l border-(--cui-color-stroke-default)',

src/hooks/useReturnFocus.test.tsx …/hooks/__tests__/useReturnFocus.test.tsxsrc/hooks/useReturnFocus.test.tsx renamed to src/hooks/__tests__/useReturnFocus.test.tsx src/hooks/useReturnFocus.test.tsx renamed to src/hooks/__tests__/useReturnFocus.test.tsx

@@ -2,7 +2,7 @@ import { describe, expect, it } from 'vitest';
 import { useRef, useState } from 'react';
 import { Dialog } from '@clickhouse/click-ui';
 import { fireEvent, render, screen, waitFor, within } from '@testing-library/react';
-import { useReturnFocus } from './useReturnFocus';
+import { useReturnFocus } from '../useReturnFocus';
 
 function Harness({ showTrigger }: { showTrigger: boolean }) {
   const [open, setOpen] = useState(false);

src/types/config-ui.ts

@@ -165,6 +165,7 @@ export interface ResetBaseConfigDialogProps {
   open: boolean;
   resetting: boolean;
   error?: string | null;
+  fallbackRef?: RefObject<HTMLElement | null>;
   onConfirm: () => void;
   onCancel: () => void;
 }