From 8c7bdd55a6f236ad66323001e2efafefdddca622 Mon Sep 17 00:00:00 2001
From: gatewayJ <835269233@qq.com>
Date: Wed, 7 Oct 2026 10:34:55 +0800
Subject: [PATCH 1/2] feat: add empty table catalog disable action

---
 app/(dashboard)/table-catalog/page.tsx | 34 ++++++++++++++++++++++++++
 docs/ui-review/register.md             |  2 ++
 hooks/use-table-catalog.ts             | 13 ++++++++++
 i18n/locales/ar-MA.json                |  4 +++
 i18n/locales/de-DE.json                |  4 +++
 i18n/locales/en-US.json                |  4 +++
 i18n/locales/es-ES.json                |  4 +++
 i18n/locales/fr-FR.json                |  4 +++
 i18n/locales/id-ID.json                |  4 +++
 i18n/locales/it-IT.json                |  4 +++
 i18n/locales/ja-JP.json                |  4 +++
 i18n/locales/ko-KR.json                |  4 +++
 i18n/locales/pt-BR.json                |  4 +++
 i18n/locales/ru-RU.json                |  4 +++
 i18n/locales/tr-TR.json                |  4 +++
 i18n/locales/vi-VN.json                |  4 +++
 i18n/locales/zh-CN.json                |  4 +++
 tests/lib/table-catalog-source.test.js |  8 ++++++
 18 files changed, 113 insertions(+)

diff --git a/app/(dashboard)/table-catalog/page.tsx b/app/(dashboard)/table-catalog/page.tsx
index 5fa609e7..f30ef91d 100644
--- a/app/(dashboard)/table-catalog/page.tsx
+++ b/app/(dashboard)/table-catalog/page.tsx
@@ -101,6 +101,7 @@ export default function TableCatalogPage() {
     getCatalogConfig,
     getTableBucket,
     enableTableBucket,
+    disableTableBucket,
     listNamespaces,
     dropNamespace,
     listTables,
@@ -472,6 +473,27 @@ export default function TableCatalogPage() {
     })
   }
 
+  const handleDisableBucket = () => {
+    if (!selectedBucket || !canEnableBucket || !selectedInfo?.enabled || !selectedInfo.disableSupported) return
+    const bucket = selectedBucket
+    dialog.warning({
+      title: t("Disable table bucket"),
+      content: `${bucket}: ${t("Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.")}`,
+      positiveText: t("Disable"),
+      negativeText: t("Cancel"),
+      onPositiveClick: async () => {
+        try {
+          const info = await disableTableBucket(bucket)
+          setBucketInfo((current) => ({ ...current, [bucket]: info }))
+          message.success(t("Table bucket disabled"))
+        } catch (error) {
+          message.error(errorText(error, t("Unable to disable table bucket.")))
+          throw error
+        }
+      },
+    })
+  }
+
   const handleDeleteNamespace = React.useCallback(
     (row: NamespaceSummary) => {
       if (!canDeleteNamespace || !selectedBucket) return
@@ -925,6 +947,18 @@ export default function TableCatalogPage() {
               ) : selectedInfo ? (
                 <Badge variant="outline">{t("Not enabled")}</Badge>
               ) : null}
+              {selectedInfo?.enabled && selectedInfo.disableSupported ? (
+                <Button
+                  variant="outline"
+                  size="sm"
+                  onClick={handleDisableBucket}
+                  disabled={
+                    !canEnableBucket || Boolean(bucketErrors[selectedBucket]) || bucketStatusLoading[selectedBucket]
+                  }
+                >
+                  {t("Disable table bucket")}
+                </Button>
+              ) : null}
               {selectedInfo?.enabled && activeTab === "tables" ? (
                 <Button
                   variant="default"
diff --git a/docs/ui-review/register.md b/docs/ui-review/register.md
index 5f618cdd..d2ddc952 100644
--- a/docs/ui-review/register.md
+++ b/docs/ui-review/register.md
@@ -50,6 +50,7 @@ Use the resolved rows for the PR description:
 | UI-030 | Bucket rule detail pages  | Events, Replication, and Lifecycle rendered Add/Refresh in a second toolbar below the page header, separate from Back navigation.                                                                                                                                                                                                                                 | Related page-level actions were split across two rows and displaced the table downward.                                                                                                               | Added a tab header render seam and composed Back, Add, and Refresh together in the page header for all three scoped bucket pages.                                                                                                                                                   | `layout-followup-27`       | Resolved |
 | UI-031 | Top navigation account    | The account artwork and its button trigger were both 32px high, so the circular avatar consumed the trigger's complete vertical space.                                                                                                                                                                                                                            | The avatar visually touched the trigger boundary and crowded adjacent top-navigation controls.                                                                                                        | Reduced the artwork to 24px while retaining the 32px button target, leaving a visible 4px inset around the avatar.                                                                                                                                                                  | `avatar-inset-28`          | Resolved |
 | UI-032 | Danger confirm buttons    | `text-destructive-foreground` was never registered in `@theme inline`, so the solid `bg-destructive` confirm buttons in the SSE discard, stop-KMS, and force-delete dialogs emitted no CSS and inherited `text-popover-foreground` (black on red). Two other sites pushed `text-white` onto the tinted `destructive` Button variant, which removed its red label. | Destructive confirmations were unreadable in both themes: 4.2:1 in light mode and 2.8:1 in dark mode for the SSE dialogs, 1.2:1 for the shared `dialog.error` confirms and the object delete confirm. | Registered `--destructive-foreground` as a light label on the light-theme red and a dark label on the lightened dark-theme red (4.6:1 / 6.9:1), and routed every filled danger button through one shared `DANGER_BUTTON_CLASS` so the fill and its label can no longer drift apart. | `danger-button-32` pending | Resolved |
+| UI-034 | Table bucket settings     | Enabled table buckets had no Console action to disable an empty catalog.                                                                                                                                                                                                                                                                                          | Operators could not restore ordinary bucket behavior through the Console.                                                                                                                             | Expose a permission-checked action only when the server advertises support, confirm lifecycle consequences, and update state only after successful deletion.                                                                                                                        | `table-catalog-disable-34` | Resolved |
 
 ### Reconciled border rule
 
@@ -88,6 +89,7 @@ The 2026-07-11 follow-up reviewed 44 candidate files containing cards, dialogs,
 - `avatar-inset-28` is a source-faithful static fixture for the exact 32px trigger and 32px-to-24px artwork change; source tests and component code remain authoritative.
 - `danger-button-32` has no before/after capture yet. The implementation proof is `tests/lib/danger-button.test.ts` plus the compiled CSS, which emits no `.text-destructive-foreground` rule before the change and `color: var(--destructive-foreground)` after it. Capture light and dark dialogs for the SSE discard, stop-KMS, force-delete, object delete, and a `dialog.error` confirm before citing this key.
 - `account-2fa-29` is a set of live runtime captures, not fixtures: a debug RustFS server with `RUSTFS_IAM_MASTER_KEY` set, this branch on `pnpm dev`, root identity, viewport 1585x1202 CSS px (the setup-dialog frame is 628 CSS px). It covers 2FA off/on, the setup QR, the recovery-code dismissal guard, the profile page, and the login second-factor step. It does **not** include a mobile viewport or a `main`-branch before-capture of the account menu; the responsive rules and the removed administrator gate are covered by source tests, which remain authoritative for those two.
+- `table-catalog-disable-34` captures the running Next.js S3 Tables page at 1440x1000 with mocked catalog responses and an enabled bucket. The before capture uses `main`; the after capture uses the capability-gated disable action. Browser checks cover old-server compatibility, permissions, cancellation, conflict retry, disable and re-enable, and mobile/dark confirmation. These are Console checks with controlled responses; backend safety is verified separately.
 - The full on-disk mapping is maintained in the screenshot manifest next to the image archive.
 
 ## Latest verification
diff --git a/hooks/use-table-catalog.ts b/hooks/use-table-catalog.ts
index f2e386cf..c9acb0f4 100644
--- a/hooks/use-table-catalog.ts
+++ b/hooks/use-table-catalog.ts
@@ -28,6 +28,7 @@ export interface CatalogConfig {
 export interface TableBucketInfo {
   tableBucket: string
   enabled: boolean
+  disableSupported: boolean
   catalogType: string
   warehouse: string
   warehouseLocation: string
@@ -201,6 +202,7 @@ export function normalizeTableBucket(value: unknown, fallbackBucket = ""): Table
   return {
     tableBucket: stringValue(value, "table-bucket", "tableBucket") || fallbackBucket,
     enabled: booleanValue(value, "enabled"),
+    disableSupported: booleanValue(value, "disable-supported", "disableSupported"),
     catalogType: stringValue(value, "catalog-type", "catalogType"),
     warehouse: stringValue(value, "warehouse") || fallbackBucket,
     warehouseLocation: stringValue(value, "warehouse-location", "warehouseLocation"),
@@ -368,6 +370,16 @@ export function useTableCatalog(catalogPrefix: string = TABLE_CATALOG_PREFIX) {
     [api, requestUrl],
   )
 
+  const disableTableBucket = useCallback(
+    async (bucket: string) => {
+      const response = await api.delete(requestUrl(tableBucketCatalogPath(bucket, catalogPrefixRef.current)), {
+        suppress403Redirect: true,
+      })
+      return normalizeTableBucket(response, bucket)
+    },
+    [api, requestUrl],
+  )
+
   const listNamespaces = useCallback(
     async (bucket: string) => {
       const items: NamespaceSummary[] = []
@@ -652,6 +664,7 @@ export function useTableCatalog(catalogPrefix: string = TABLE_CATALOG_PREFIX) {
     getCatalogConfig,
     getTableBucket,
     enableTableBucket,
+    disableTableBucket,
     listNamespaces,
     createNamespace,
     getNamespace,
diff --git a/i18n/locales/ar-MA.json b/i18n/locales/ar-MA.json
index 0d17ef2e..c98bdb10 100644
--- a/i18n/locales/ar-MA.json
+++ b/i18n/locales/ar-MA.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "تعطيل حاوية الجداول",
+  "Table bucket disabled": "تم تعطيل حاوية الجداول",
+  "Unable to disable table bucket.": "تعذر تعطيل حاوية الجداول.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "يمكن تعطيل كتالوج فارغ فقط. يتم الاحتفاظ بالكائنات الموجودة. راجع قواعد دورة حياة الحاوية قبل المتابعة: قد يُستأنف انتهاء الصلاحية ويحذف الكائنات.",
   "Bucket is required": "الحاوية مطلوبة",
   "Choose a suggested region or enter a new one.": "اختر منطقة مقترحة أو أدخل منطقة جديدة.",
   "Compliance or Object Lock retention may prevent deletion.": "قد تمنع سياسة الاحتفاظ Compliance أو Object Lock الحذف.",
diff --git a/i18n/locales/de-DE.json b/i18n/locales/de-DE.json
index c863f77c..380c551f 100644
--- a/i18n/locales/de-DE.json
+++ b/i18n/locales/de-DE.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Tabellen-Bucket deaktivieren",
+  "Table bucket disabled": "Tabellen-Bucket deaktiviert",
+  "Unable to disable table bucket.": "Tabellen-Bucket konnte nicht deaktiviert werden.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Nur ein leerer Katalog kann deaktiviert werden. Vorhandene Objekte bleiben erhalten. Prüfen Sie vor dem Fortfahren die Lebenszyklusregeln des Buckets: Die Ablaufverarbeitung kann wieder beginnen und Objekte löschen.",
   "Bucket is required": "Bucket ist erforderlich",
   "Choose a suggested region or enter a new one.": "Wählen Sie eine vorgeschlagene Region oder geben Sie eine neue ein.",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance- oder Object-Lock-Aufbewahrung kann das Löschen verhindern.",
diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json
index e9f60ed8..90e410b9 100644
--- a/i18n/locales/en-US.json
+++ b/i18n/locales/en-US.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Disable table bucket",
+  "Table bucket disabled": "Table bucket disabled",
+  "Unable to disable table bucket.": "Unable to disable table bucket.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.",
   "Bucket is required": "Bucket is required",
   "Choose a suggested region or enter a new one.": "Choose a suggested region or enter a new one.",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance or Object Lock retention may prevent deletion.",
diff --git a/i18n/locales/es-ES.json b/i18n/locales/es-ES.json
index 7e0dbffb..54fbe3fe 100644
--- a/i18n/locales/es-ES.json
+++ b/i18n/locales/es-ES.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Desactivar bucket de tablas",
+  "Table bucket disabled": "Bucket de tablas desactivado",
+  "Unable to disable table bucket.": "No se pudo desactivar el bucket de tablas.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Solo se puede desactivar un catálogo vacío. Los objetos existentes se conservan. Revise las reglas del ciclo de vida del bucket antes de continuar: la caducidad puede reanudarse y eliminar objetos.",
   "Bucket is required": "El bucket es obligatorio",
   "Choose a suggested region or enter a new one.": "Elija una región sugerida o introduzca una nueva.",
   "Compliance or Object Lock retention may prevent deletion.": "La retención de Compliance u Object Lock puede impedir la eliminación.",
diff --git a/i18n/locales/fr-FR.json b/i18n/locales/fr-FR.json
index 82d55a85..0426e82f 100644
--- a/i18n/locales/fr-FR.json
+++ b/i18n/locales/fr-FR.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Désactiver le bucket de tables",
+  "Table bucket disabled": "Bucket de tables désactivé",
+  "Unable to disable table bucket.": "Impossible de désactiver le bucket de tables.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Seul un catalogue vide peut être désactivé. Les objets existants sont conservés. Vérifiez les règles de cycle de vie du bucket avant de continuer : l’expiration peut reprendre et supprimer des objets.",
   "Bucket is required": "Le bucket est requis",
   "Choose a suggested region or enter a new one.": "Choisissez une région suggérée ou saisissez-en une nouvelle.",
   "Compliance or Object Lock retention may prevent deletion.": "La rétention Compliance ou Object Lock peut empêcher la suppression.",
diff --git a/i18n/locales/id-ID.json b/i18n/locales/id-ID.json
index 999a6372..f3ac36d5 100644
--- a/i18n/locales/id-ID.json
+++ b/i18n/locales/id-ID.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Nonaktifkan bucket tabel",
+  "Table bucket disabled": "Bucket tabel dinonaktifkan",
+  "Unable to disable table bucket.": "Tidak dapat menonaktifkan bucket tabel.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Hanya katalog kosong yang dapat dinonaktifkan. Objek yang ada tetap disimpan. Tinjau aturan siklus hidup bucket sebelum melanjutkan: proses kedaluwarsa dapat dilanjutkan dan menghapus objek.",
   "Bucket is required": "Bucket wajib diisi",
   "Choose a suggested region or enter a new one.": "Pilih region yang disarankan atau masukkan yang baru.",
   "Compliance or Object Lock retention may prevent deletion.": "Retensi Compliance atau Object Lock dapat mencegah penghapusan.",
diff --git a/i18n/locales/it-IT.json b/i18n/locales/it-IT.json
index f283147e..fa30363e 100644
--- a/i18n/locales/it-IT.json
+++ b/i18n/locales/it-IT.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Disattiva bucket delle tabelle",
+  "Table bucket disabled": "Bucket delle tabelle disattivato",
+  "Unable to disable table bucket.": "Impossibile disattivare il bucket delle tabelle.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "È possibile disattivare solo un catalogo vuoto. Gli oggetti esistenti vengono conservati. Controlla le regole del ciclo di vita del bucket prima di continuare: la scadenza può riprendere ed eliminare oggetti.",
   "Bucket is required": "Il bucket è obbligatorio",
   "Choose a suggested region or enter a new one.": "Scegli una regione suggerita o inseriscine una nuova.",
   "Compliance or Object Lock retention may prevent deletion.": "La conservazione Compliance o Object Lock può impedire l'eliminazione.",
diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json
index 50de1e76..0d0c6dad 100644
--- a/i18n/locales/ja-JP.json
+++ b/i18n/locales/ja-JP.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "テーブルバケットを無効化",
+  "Table bucket disabled": "テーブルバケットを無効化しました",
+  "Unable to disable table bucket.": "テーブルバケットを無効化できませんでした。",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "空のカタログのみ無効化できます。既存のオブジェクトは保持されます。続行する前にバケットのライフサイクルルールを確認してください。有効期限処理が再開され、オブジェクトが削除される場合があります。",
   "Bucket is required": "バケットは必須です",
   "Choose a suggested region or enter a new one.": "候補のリージョンを選択するか、新しいリージョンを入力してください。",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance または Object Lock の保持設定により削除できない場合があります。",
diff --git a/i18n/locales/ko-KR.json b/i18n/locales/ko-KR.json
index cc08ca5f..90285d62 100644
--- a/i18n/locales/ko-KR.json
+++ b/i18n/locales/ko-KR.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "테이블 버킷 비활성화",
+  "Table bucket disabled": "테이블 버킷이 비활성화되었습니다",
+  "Unable to disable table bucket.": "테이블 버킷을 비활성화할 수 없습니다.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "비어 있는 카탈로그만 비활성화할 수 있습니다. 기존 객체는 보존됩니다. 계속하기 전에 버킷 수명 주기 규칙을 확인하세요. 만료 처리가 다시 시작되어 객체가 삭제될 수 있습니다.",
   "Bucket is required": "버킷은 필수입니다",
   "Choose a suggested region or enter a new one.": "추천 리전을 선택하거나 새 리전을 입력하세요.",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance 또는 Object Lock 보존 정책으로 인해 삭제되지 않을 수 있습니다.",
diff --git a/i18n/locales/pt-BR.json b/i18n/locales/pt-BR.json
index d80fc1e9..679cde46 100644
--- a/i18n/locales/pt-BR.json
+++ b/i18n/locales/pt-BR.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Desativar bucket de tabelas",
+  "Table bucket disabled": "Bucket de tabelas desativado",
+  "Unable to disable table bucket.": "Não foi possível desativar o bucket de tabelas.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Somente um catálogo vazio pode ser desativado. Os objetos existentes são preservados. Revise as regras de ciclo de vida do bucket antes de continuar: a expiração pode ser retomada e excluir objetos.",
   "Bucket is required": "O bucket é obrigatório",
   "Choose a suggested region or enter a new one.": "Escolha uma região sugerida ou insira uma nova.",
   "Compliance or Object Lock retention may prevent deletion.": "A retenção de Compliance ou Object Lock pode impedir a exclusão.",
diff --git a/i18n/locales/ru-RU.json b/i18n/locales/ru-RU.json
index fbe4ca58..46b0e6e3 100644
--- a/i18n/locales/ru-RU.json
+++ b/i18n/locales/ru-RU.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Отключить бакет таблиц",
+  "Table bucket disabled": "Бакет таблиц отключён",
+  "Unable to disable table bucket.": "Не удалось отключить бакет таблиц.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Отключить можно только пустой каталог. Существующие объекты сохраняются. Перед продолжением проверьте правила жизненного цикла бакета: обработка срока хранения может возобновиться и удалить объекты.",
   "Bucket is required": "Требуется бакет",
   "Choose a suggested region or enter a new one.": "Выберите предложенный регион или введите новый.",
   "Compliance or Object Lock retention may prevent deletion.": "Политика хранения Compliance или Object Lock может препятствовать удалению.",
diff --git a/i18n/locales/tr-TR.json b/i18n/locales/tr-TR.json
index a4bd2cb2..d0a96fc8 100644
--- a/i18n/locales/tr-TR.json
+++ b/i18n/locales/tr-TR.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Tablo bucket’ını devre dışı bırak",
+  "Table bucket disabled": "Tablo bucket’ı devre dışı bırakıldı",
+  "Unable to disable table bucket.": "Tablo bucket’ı devre dışı bırakılamadı.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Yalnızca boş bir katalog devre dışı bırakılabilir. Mevcut nesneler korunur. Devam etmeden önce bucket yaşam döngüsü kurallarını gözden geçirin: süre sonu işlemleri yeniden başlayarak nesneleri silebilir.",
   "Bucket is required": "Bucket gereklidir",
   "Choose a suggested region or enter a new one.": "Önerilen bir region seçin veya yeni bir tane girin.",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance veya Object Lock saklama politikası silmeyi engelleyebilir.",
diff --git a/i18n/locales/vi-VN.json b/i18n/locales/vi-VN.json
index 31798ef0..ba2a07b6 100644
--- a/i18n/locales/vi-VN.json
+++ b/i18n/locales/vi-VN.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "Tắt bucket bảng",
+  "Table bucket disabled": "Đã tắt bucket bảng",
+  "Unable to disable table bucket.": "Không thể tắt bucket bảng.",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "Chỉ có thể tắt catalog trống. Các đối tượng hiện có được giữ nguyên. Hãy kiểm tra quy tắc vòng đời bucket trước khi tiếp tục: quá trình hết hạn có thể hoạt động trở lại và xóa đối tượng.",
   "Bucket is required": "Bắt buộc nhập bucket",
   "Choose a suggested region or enter a new one.": "Chọn region được đề xuất hoặc nhập region mới.",
   "Compliance or Object Lock retention may prevent deletion.": "Chính sách lưu giữ Compliance hoặc Object Lock có thể ngăn việc xóa.",
diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json
index 040982c3..d900377f 100644
--- a/i18n/locales/zh-CN.json
+++ b/i18n/locales/zh-CN.json
@@ -1,4 +1,8 @@
 {
+  "Disable table bucket": "关闭 table bucket",
+  "Table bucket disabled": "table bucket 已关闭",
+  "Unable to disable table bucket.": "无法关闭 table bucket。",
+  "Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.": "只能关闭内容为空的 Catalog。已有对象会被保留。请在继续之前检查 bucket lifecycle 规则：过期处理可能恢复并删除对象。",
   "Bucket is required": "Bucket 为必填项",
   "Choose a suggested region or enter a new one.": "选择建议区域或输入新区域。",
   "Compliance or Object Lock retention may prevent deletion.": "Compliance 或 Object Lock 保留策略可能阻止删除。",
diff --git a/tests/lib/table-catalog-source.test.js b/tests/lib/table-catalog-source.test.js
index cafc84d9..434e44b9 100644
--- a/tests/lib/table-catalog-source.test.js
+++ b/tests/lib/table-catalog-source.test.js
@@ -115,3 +115,11 @@ test("table catalog page stays within the first-phase CRUD scope", () => {
   assert.doesNotMatch(pageSource, /value="connect"|PyIceberg example|connectionSnippet/)
   assert.match(pageSource, /setWorkspaceRefreshVersion/)
 })
+
+test("table bucket disablement requires server support and management permission", () => {
+  assert.match(hookSource, /disableSupported: booleanValue\(value, "disable-supported", "disableSupported"\)/)
+  assert.match(hookSource, /const disableTableBucket = useCallback/)
+  assert.match(hookSource, /api\.delete\(requestUrl\(tableBucketCatalogPath\(bucket, catalogPrefixRef\.current\)/)
+  assert.match(pageSource, /!canEnableBucket \|\| !selectedInfo\?\.enabled \|\| !selectedInfo\.disableSupported/)
+  assert.match(pageSource, /expiration can resume and delete objects/)
+})

From 70e4a54ebaa2c6f6664cee72c9fa3075302c015f Mon Sep 17 00:00:00 2001
From: gatewayJ <835269233@qq.com>
Date: Wed, 7 Oct 2026 14:21:33 +0800
Subject: [PATCH 2/2] test: cover table catalog disable failure and retry

---
 app/(dashboard)/table-catalog/page.tsx  |  27 ++---
 lib/table-catalog-disable.ts            |  42 ++++++++
 tests/lib/table-catalog-disable.test.ts | 138 ++++++++++++++++++++++++
 tests/lib/table-catalog-source.test.js  |   3 +-
 4 files changed, 191 insertions(+), 19 deletions(-)
 create mode 100644 lib/table-catalog-disable.ts
 create mode 100644 tests/lib/table-catalog-disable.test.ts

diff --git a/app/(dashboard)/table-catalog/page.tsx b/app/(dashboard)/table-catalog/page.tsx
index f30ef91d..e307e156 100644
--- a/app/(dashboard)/table-catalog/page.tsx
+++ b/app/(dashboard)/table-catalog/page.tsx
@@ -48,6 +48,7 @@ import { ViewDialog, type ViewDialogMode } from "@/components/table-catalog/view
 import { ViewDetailDialog } from "@/components/table-catalog/view-detail-dialog"
 import { useDialog } from "@/lib/feedback/dialog"
 import { useMessage } from "@/lib/feedback/message"
+import { confirmTableBucketDisable } from "@/lib/table-catalog-disable"
 import { copyToClipboard } from "@/lib/clipboard"
 import { cn } from "@/lib/utils"
 import { displayNamespace, resolveTableCatalogPrefix, TABLE_CATALOG_PREFIX } from "@/lib/table-catalog-paths"
@@ -474,23 +475,15 @@ export default function TableCatalogPage() {
   }
 
   const handleDisableBucket = () => {
-    if (!selectedBucket || !canEnableBucket || !selectedInfo?.enabled || !selectedInfo.disableSupported) return
-    const bucket = selectedBucket
-    dialog.warning({
-      title: t("Disable table bucket"),
-      content: `${bucket}: ${t("Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.")}`,
-      positiveText: t("Disable"),
-      negativeText: t("Cancel"),
-      onPositiveClick: async () => {
-        try {
-          const info = await disableTableBucket(bucket)
-          setBucketInfo((current) => ({ ...current, [bucket]: info }))
-          message.success(t("Table bucket disabled"))
-        } catch (error) {
-          message.error(errorText(error, t("Unable to disable table bucket.")))
-          throw error
-        }
-      },
+    confirmTableBucketDisable({
+      bucket: selectedBucket,
+      canManage: canEnableBucket,
+      info: selectedInfo,
+      disable: disableTableBucket,
+      onDisabled: (bucket, info) => setBucketInfo((current) => ({ ...current, [bucket]: info })),
+      dialog,
+      message,
+      t,
     })
   }
 
diff --git a/lib/table-catalog-disable.ts b/lib/table-catalog-disable.ts
new file mode 100644
index 00000000..a6c025db
--- /dev/null
+++ b/lib/table-catalog-disable.ts
@@ -0,0 +1,42 @@
+import type { TableBucketInfo } from "../hooks/use-table-catalog"
+import type { DialogOptions } from "./feedback/dialog"
+
+interface DisableOptions {
+  bucket: string
+  canManage: boolean
+  info: TableBucketInfo | undefined
+  disable: (bucket: string) => Promise<TableBucketInfo>
+  onDisabled: (bucket: string, info: TableBucketInfo) => void
+  dialog: { warning: (options: DialogOptions) => unknown }
+  message: { success: (text: string) => unknown; error: (text: string) => unknown }
+  t: (key: string) => string
+}
+
+export function confirmTableBucketDisable({
+  bucket,
+  canManage,
+  info,
+  disable,
+  onDisabled,
+  dialog,
+  message,
+  t,
+}: DisableOptions) {
+  if (!bucket || !canManage || !info?.enabled || !info.disableSupported) return
+  dialog.warning({
+    title: t("Disable table bucket"),
+    content: `${bucket}: ${t("Only an empty catalog can be disabled. Existing objects are preserved. Review bucket lifecycle rules before continuing: expiration can resume and delete objects.")}`,
+    positiveText: t("Disable"),
+    negativeText: t("Cancel"),
+    onPositiveClick: async () => {
+      try {
+        const updated = await disable(bucket)
+        onDisabled(bucket, updated)
+        message.success(t("Table bucket disabled"))
+      } catch (error) {
+        message.error(error instanceof Error && error.message ? error.message : t("Unable to disable table bucket."))
+        throw error
+      }
+    },
+  })
+}
diff --git a/tests/lib/table-catalog-disable.test.ts b/tests/lib/table-catalog-disable.test.ts
new file mode 100644
index 00000000..2ad5eb7f
--- /dev/null
+++ b/tests/lib/table-catalog-disable.test.ts
@@ -0,0 +1,138 @@
+import test from "node:test"
+import assert from "node:assert/strict"
+import type { TableBucketInfo } from "../../hooks/use-table-catalog"
+import type { DialogOptions } from "../../lib/feedback/dialog"
+import { confirmTableBucketDisable } from "../../lib/table-catalog-disable"
+import { runDialogAction } from "../../lib/feedback/dialog-action"
+
+function bucketInfo(bucket = "analytics"): TableBucketInfo {
+  return {
+    tableBucket: bucket,
+    enabled: true,
+    disableSupported: true,
+    catalogType: "iceberg",
+    warehouse: bucket,
+    warehouseLocation: `s3://${bucket}/`,
+    catalogUri: `/iceberg/v1/${bucket}`,
+    compatCatalogUri: `/_iceberg/v1/${bucket}`,
+    credentialVending: "unsupported",
+    credentialScope: "warehouse-prefix",
+    credentialScopePrefix: `s3://${bucket}/`,
+    catalogEntryPresent: true,
+    properties: {},
+  }
+}
+
+function setup(overrides: { bucket?: string; canManage?: boolean; info?: TableBucketInfo | undefined } = {}) {
+  const state: Record<string, TableBucketInfo> = { analytics: bucketInfo(), other: bucketInfo("other") }
+  const requests: string[] = []
+  const errors: string[] = []
+  const successes: string[] = []
+  const dialogs: DialogOptions[] = []
+  const pendingIds = new Set<string>()
+  let closeCalls = 0
+  let respond: (bucket: string) => Promise<TableBucketInfo> = async (bucket) => ({ ...state[bucket], enabled: false })
+  confirmTableBucketDisable({
+    bucket: "analytics",
+    canManage: true,
+    info: state.analytics,
+    ...overrides,
+    disable: (bucket) => {
+      requests.push(bucket)
+      return respond(bucket)
+    },
+    onDisabled: (bucket, info) => {
+      state[bucket] = info
+    },
+    dialog: { warning: (options) => dialogs.push(options) },
+    message: { success: (text) => successes.push(text), error: (text) => errors.push(text) },
+    t: (key) => key,
+  })
+  return {
+    state,
+    requests,
+    errors,
+    successes,
+    dialogs,
+    pendingIds,
+    get closeCalls() {
+      return closeCalls
+    },
+    setResponse: (response: typeof respond) => {
+      respond = response
+    },
+    submit: () =>
+      runDialogAction({
+        dialogId: "disable",
+        pendingIds,
+        setPendingIds: () => {},
+        action: dialogs[0]?.onPositiveClick,
+        close: () => {
+          closeCalls += 1
+        },
+      }),
+  }
+}
+
+test("failed disable keeps the bucket enabled and dialog open, then retries the same action successfully", async () => {
+  const flow = setup()
+  const initial = flow.state.analytics
+  flow.setResponse(async () => {
+    throw new Error("Catalog is not empty")
+  })
+  assert.equal(await flow.submit(), false)
+  assert.equal(flow.state.analytics, initial)
+  assert.equal(flow.closeCalls, 0)
+  assert.equal(flow.pendingIds.size, 0)
+  assert.deepEqual(flow.errors, ["Catalog is not empty"])
+  assert.deepEqual(flow.successes, [])
+
+  flow.setResponse(async (bucket) => ({ ...flow.state[bucket], enabled: false }))
+  assert.equal(await flow.submit(), true)
+  assert.equal(flow.state.analytics.enabled, false)
+  assert.equal(flow.state.other.enabled, true)
+  assert.equal(flow.closeCalls, 1)
+  assert.deepEqual(flow.requests, ["analytics", "analytics"])
+  assert.deepEqual(flow.successes, ["Table bucket disabled"])
+})
+
+test("pending disable preserves state and prevents duplicate requests until the response arrives", async () => {
+  const flow = setup()
+  let resolveResponse!: (info: TableBucketInfo) => void
+  flow.setResponse(
+    () =>
+      new Promise((resolve) => {
+        resolveResponse = resolve
+      }),
+  )
+  const pending = flow.submit()
+  assert.equal(flow.state.analytics.enabled, true)
+  assert.equal(flow.closeCalls, 0)
+  assert.equal(await flow.submit(), false)
+  assert.deepEqual(flow.requests, ["analytics"])
+  resolveResponse({ ...flow.state.analytics, enabled: false })
+  await pending
+  assert.equal(flow.state.analytics.enabled, false)
+  assert.equal(flow.closeCalls, 1)
+})
+
+for (const [name, overrides] of [
+  ["missing management permission", { canManage: false }],
+  ["unsupported server capability", { info: { ...bucketInfo(), disableSupported: false } }],
+  ["disabled bucket", { info: { ...bucketInfo(), enabled: false } }],
+  ["unknown bucket status", { info: undefined }],
+  ["missing bucket selection", { bucket: "" }],
+] as const) {
+  test(`disable with ${name} opens no dialog and sends no request`, () => {
+    const flow = setup(overrides)
+    assert.deepEqual(flow.dialogs, [])
+    assert.deepEqual(flow.requests, [])
+    assert.equal(flow.state.analytics.enabled, true)
+  })
+}
+
+test("disable confirmation names the bucket and warns about lifecycle expiration", () => {
+  const flow = setup()
+  assert.match(flow.dialogs[0].content ?? "", /^analytics: .*expiration can resume and delete objects/)
+  assert.deepEqual(flow.requests, [])
+})
diff --git a/tests/lib/table-catalog-source.test.js b/tests/lib/table-catalog-source.test.js
index 434e44b9..580930ba 100644
--- a/tests/lib/table-catalog-source.test.js
+++ b/tests/lib/table-catalog-source.test.js
@@ -120,6 +120,5 @@ test("table bucket disablement requires server support and management permission
   assert.match(hookSource, /disableSupported: booleanValue\(value, "disable-supported", "disableSupported"\)/)
   assert.match(hookSource, /const disableTableBucket = useCallback/)
   assert.match(hookSource, /api\.delete\(requestUrl\(tableBucketCatalogPath\(bucket, catalogPrefixRef\.current\)/)
-  assert.match(pageSource, /!canEnableBucket \|\| !selectedInfo\?\.enabled \|\| !selectedInfo\.disableSupported/)
-  assert.match(pageSource, /expiration can resume and delete objects/)
+  assert.match(pageSource, /confirmTableBucketDisable\(/)
 })