Generalize OCI device setup and remove unused catalog hashes

AppImage/components/script-terminal-modal.tsx

@@ -649,7 +649,7 @@ const initMessage = {
       return
     }
 
-    if (value === "cancel" || value === "") {
+    if (value === "cancel") {
       setCurrentInteraction(null)
       setInteractionInput("")
       handleCloseModal()
@@ -755,7 +755,7 @@ const initMessage = {
 
   return (
     <>
-      <Dialog open={isOpen} onOpenChange={onClose}>
+      <Dialog open={isOpen} onOpenChange={(open) => { if (!open) onClose() }}>
         <DialogContent
           className="max-w-7xl p-0 flex flex-col gap-0 overflow-hidden"
           style={{

AppImage/components/virtual-machines.tsx

@@ -3598,7 +3598,7 @@ const handleDownloadLogs = async (vmid: number, vmName: string) => {
           // user tapped the terminal's Close button and got kicked
           // all the way back to the guest list.
           if (open) return
-          if (applyOpen || terminalOpen) return
+          if (applyOpen || terminalOpen || ociAction) return
           setSelectedVM(null)
           setVMDetails(null)
           setCurrentView("main")
@@ -3624,10 +3624,10 @@ const handleDownloadLogs = async (vmid: number, vmName: string) => {
           // remaining vectors (mobile tap slop reaching the parent's
           // scrim, ESC not consumed by the child) at the DOM level.
           onInteractOutside={(e) => {
-            if (applyOpen || terminalOpen) e.preventDefault()
+            if (applyOpen || terminalOpen || ociAction) e.preventDefault()
           }}
           onEscapeKeyDown={(e) => {
-            if (applyOpen || terminalOpen) e.preventDefault()
+            if (applyOpen || terminalOpen || ociAction) e.preventDefault()
           }}
         >
           {currentView === "main" ? (