git fetch origin git checkout <your-branch> git commit --amend -s --no-edit git push --force-with-lease

Signed-off-by: Vicky <vicky.kuo.contact@gmail.com>

Author: Vicky

mcpgateway/static/admin.js

@@ -6901,78 +6901,61 @@ console.log("🛡️ ContextForge MCP Gateway admin.js initialized");
 
 
 // ===================================================================
-// BULK IMPORT TOOLS — MODAL WIRING
+// BULK IMPORT MODAL WIRING
 // ===================================================================
 
-(function initBulkImportModal() {
-  // ensure it runs after the DOM is ready
-  window.addEventListener("DOMContentLoaded", function () {
-    const openBtn  = safeGetElement("open-bulk-import", true);
-    const modalId  = "bulk-import-modal";
-    const modal    = safeGetElement(modalId, true);
-
-    if (!openBtn || !modal) {
-      console.warn("Bulk Import modal wiring skipped (missing button or modal).");
-      return;
-    }
-
-    // avoid double-binding if admin.js gets evaluated more than once
-    if (openBtn.dataset.wired === "1") return;
-    openBtn.dataset.wired = "1";
-
-    const closeBtn = safeGetElement("close-bulk-import", true);
-    const backdrop = safeGetElement("bulk-import-backdrop", true);
+function clearBulkImportResult() {
     const resultEl = safeGetElement("import-result", true);
+    if (resultEl) resultEl.innerHTML = "";
+    const indicator = safeGetElement("import-indicator", true);
+    if (indicator) indicator.classList.add("hidden");
+}
 
-    const focusTarget =
-      modal.querySelector("#tools_json") ||
-      modal.querySelector("#tools_file") ||
-      modal.querySelector("[data-autofocus]");
-
-    // helpers
-    const open = (e) => {
-      if (e) e.preventDefault();
-      // clear previous results each time we open
-      if (resultEl) resultEl.innerHTML = "";
-      openModal(modalId);
-      // prevent background scroll
-      document.documentElement.classList.add("overflow-hidden");
-      document.body.classList.add("overflow-hidden");
-      if (focusTarget) setTimeout(() => focusTarget.focus(), 0);
-      return false;
-    };
+function setupBulkImportModal() {
+    const openBtn  = safeGetElement("open-bulk-import", true);
+    const modal    = safeGetElement("bulk-import-modal", true);
+    const backdrop = safeGetElement("bulk-import-backdrop", true);
+    const closeBtn = safeGetElement("close-bulk-import", true);
 
-    const close = () => {
-      // also clear results on close to keep things tidy
-      closeModal(modalId, "import-result");
-      document.documentElement.classList.remove("overflow-hidden");
-      document.body.classList.remove("overflow-hidden");
-    };
+    if (!openBtn || !modal) return;
+    if (openBtn.dataset.wired === "1") return; // prevent double wiring
+    openBtn.dataset.wired = "1";
 
-    // wire events
-    openBtn.addEventListener("click", open);
+    // OPEN → clear results, open modal, focus JSON/FILE
+    openBtn.addEventListener("click", (e) => {
+        e.preventDefault();
+        clearBulkImportResult();
+        openModal("bulk-import-modal");
+        setTimeout(() => {
+            const ta = modal.querySelector('textarea[name="tools_json"]');
+            const file = modal.querySelector('input[type="file"]');
+            (ta || file)?.focus?.();
+        }, 0);
+    });
 
+    // CLOSE BUTTON → close & clear
     if (closeBtn) {
-      closeBtn.addEventListener("click", (e) => {
-        e.preventDefault();
-        close();
-      });
+        closeBtn.addEventListener("click", (e) => {
+            e.preventDefault();
+            closeModal("bulk-import-modal", "import-result");
+        });
     }
 
-    // click on backdrop only (not the dialog content) closes the modal
+    // BACKDROP → close & clear
     if (backdrop) {
-      backdrop.addEventListener("click", (e) => {
-        if (e.target === backdrop) close();
-      });
+        backdrop.addEventListener("click", () => {
+            closeModal("bulk-import-modal", "import-result");
+        });
     }
 
-    // ESC to close
-    modal.addEventListener("keydown", (e) => {
-      if (e.key === "Escape") {
-        e.stopPropagation();
-        close();
-      }
+    // ESC → close & clear
+    document.addEventListener("keydown", (e) => {
+        if (e.key === "Escape" && AppState.isModalActive("bulk-import-modal")) {
+            closeModal("bulk-import-modal", "import-result");
+        }
     });
+}
 
-  });
-})();
+document.addEventListener("DOMContentLoaded", () => {
+    try { setupBulkImportModal(); } catch (_) { /* no-op */ }
+});