Merge pull request #942 from dbgate/feature-prevent-spawning-same-modal

feat: prevent spawning the same modal if one instance is opened

packages/web/src/modals/modalTools.ts

@@ -2,18 +2,22 @@ import { openedModals } from '../stores';
 import { get } from 'svelte/store';
 import uuidv1 from 'uuid/v1';
 import _ from 'lodash';
+import invalidateCommands from '../commands/invalidateCommands';
 
 export function showModal(component, props = {}) {
   const modalId = uuidv1();
   openedModals.update(x => [...x, { component, modalId, props }]);
+  invalidateCommands();
 }
 
 export function closeModal(modalId) {
   openedModals.update(x => x.filter(y => y.modalId != modalId));
+  invalidateCommands();
 }
 
 export function closeCurrentModal() {
   openedModals.update(modals => modals.slice(0, modals.length - 1));
+  invalidateCommands();
 }
 
 export function getActiveModalId() {

packages/web/src/stores.ts

@@ -323,3 +323,9 @@ appliedCurrentSchema.subscribe(value => {
   appliedCurrentSchemaValue = value;
 });
 export const getAppliedCurrentSchema = () => appliedCurrentSchemaValue;
+
+let openedModalsValue = [];
+openedModals.subscribe(value => {
+  openedModalsValue = value;
+});
+export const getOpenedModals = () => openedModalsValue;

packages/web/src/tabpanel/TabsPanel.svelte

@@ -224,7 +224,12 @@
     category: 'Tabs',
     name: 'Close tab',
     keyText: isElectronAvailable() ? 'CtrlOrCommand+W' : null,
-    testEnabled: () => getOpenedTabs().filter(x => !x.closedTime).length >= 1,
+    testEnabled: () => {
+      const hasAnyOtherTab = getOpenedTabs().filter(x => !x.closedTime).length >= 1;
+      const hasAnyModalOpen = getOpenedModals().length > 0;
+
+      return hasAnyOtherTab && !hasConfirmModalOpen;
+    },
     onClick: closeCurrentTab,
   });
 
@@ -283,6 +288,7 @@
     draggingDbGroupTarget,
     draggingTab,
     draggingTabTarget,
+    getOpenedModals,
   } from '../stores';
   import tabs from '../tabs';
   import { setSelectedTab, switchCurrentDatabase } from '../utility/common';