command enabling refactor

packages/web/src/tabs/FreeTableTab.svelte

@@ -65,7 +65,6 @@
     modelState={$modelState}
     {dispatchModel}
     onSave={handleSave}
-    generalAllowSave
     focusOnVisible
   />
 {/if}

packages/web/src/tabs/MarkdownEditorTab.svelte

@@ -1,13 +1,12 @@
 <script lang="ts" context="module">
-  const lastFocusedEditor = writable(null);
-  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
-    editor?.getTabId && editor?.getTabId() == tabid ? editor : null
-  );
+  let lastFocusedEditor = null;
+  const getCurrentEditor = () =>
+    lastFocusedEditor?.getTabId && lastFocusedEditor?.getTabId() == getActiveTabId() ? lastFocusedEditor : null;
 
   registerFileCommands({
     idPrefix: 'markdown',
     category: 'Markdown',
-    editorStore: currentEditor,
+    getCurrentEditor,
     folder: 'markdown',
     format: 'text',
     fileExtension: 'md',
@@ -23,8 +22,8 @@
     icon: 'icon run',
     toolbar: true,
     keyText: 'F5 | Ctrl+Enter',
-    enabledStore: derived(currentEditor, query => query != null),
-    onClick: () => (get(currentEditor) as any).preview(),
+    testEnabled: () => getCurrentEditor() != null,
+    onClick: () => getCurrentEditor().preview(),
   });
 </script>
 
@@ -39,11 +38,12 @@
   import AceEditor from '../query/AceEditor.svelte';
   import RunnerOutputPane from '../query/RunnerOutputPane.svelte';
   import useEditorData from '../query/useEditorData';
-  import { activeTabId, nullStore } from '../stores';
+  import { activeTabId, getActiveTabId, nullStore } from '../stores';
   import axiosInstance from '../utility/axiosInstance';
   import memberStore from '../utility/memberStore';
   import socket from '../utility/socket';
   import useEffect from '../utility/useEffect';
+import invalidateCommands from '../commands/invalidateCommands';
 
   export let tabid;
 
@@ -100,7 +100,10 @@
   value={$editorState.value || ''}
   menu={createMenu()}
   on:input={e => setEditorData(e.detail)}
-  on:focus={() => lastFocusedEditor.set(instance)}
+  on:focus={() => {
+    lastFocusedEditor = instance;
+    invalidateCommands();
+  }}
   bind:this={domEditor}
   mode="markdown"
 />

packages/web/src/tabs/QueryTab.svelte

@@ -1,22 +1,19 @@
 <script lang="ts" context="module">
-  const lastFocusedEditor = writable(null);
-  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
-    editor?.getTabId && editor?.getTabId() == tabid ? editor : null
-  );
-  const currentEditorStatus = memberStore(currentEditor, editor => editor?.getStatus() || nullStore);
+  let lastFocusedEditor = null;
+  const getCurrentEditor = () =>
+    lastFocusedEditor?.getTabId && lastFocusedEditor?.getTabId() == getActiveTabId() ? lastFocusedEditor : null;
 
   registerCommand({
     id: 'query.formatCode',
     category: 'Query',
     name: 'Format code',
-    enabledStore: derived(currentEditor, query => query != null),
-    onClick: () => get(currentEditor).formatCode(),
+    testEnabled: () => getCurrentEditor() != null,
+    onClick: () => getCurrentEditor().formatCode(),
   });
   registerFileCommands({
     idPrefix: 'query',
     category: 'Query',
-    editorStore: currentEditor,
-    editorStatusStore: currentEditorStatus,
+    getCurrentEditor,
     folder: 'sql',
     format: 'text',
     fileExtension: 'sql',
@@ -38,7 +35,7 @@
   import VerticalSplitter from '../elements/VerticalSplitter.svelte';
   import SqlEditor from '../query/SqlEditor.svelte';
   import useEditorData from '../query/useEditorData';
-  import { activeTabId, extensions, nullStore } from '../stores';
+  import { activeTabId, extensions, getActiveTabId, nullStore } from '../stores';
   import applySqlTemplate from '../utility/applySqlTemplate';
   import axiosInstance from '../utility/axiosInstance';
   import { changeTab } from '../utility/common';
@@ -49,6 +46,7 @@
   import useEffect from '../utility/useEffect';
   import ResultTabs from '../query/ResultTabs.svelte';
   import { registerFileCommands } from '../commands/stdCommands';
+  import invalidateCommands from '../commands/invalidateCommands';
 
   export let tabid;
   export let conid;
@@ -65,11 +63,6 @@
 
   let domEditor;
 
-  const status = writable({
-    busy,
-    canKill: false,
-  });
-
   $: connection = useConnectionInfo({ conid });
 
   $: effect = useEffect(() => {
@@ -91,16 +84,23 @@
   }
 
   $: {
-    status.set({
-      busy,
-      canKill: !!sessionId,
-    });
+    busy;
+    sessionId;
+    invalidateCommands();
   }
 
   $: if ($tabVisible && domEditor) {
     domEditor?.getEditor()?.focus();
   }
 
+  export function canKill() {
+    return !!sessionId;
+  }
+
+  export function isBusy() {
+    return busy;
+  }
+
   export function getTabId() {
     return tabid;
   }
@@ -137,9 +137,9 @@
     // timerLabel.stop();
   }
 
-  export function getStatus() {
-    return status;
-  }
+  // export function getStatus() {
+  //   return status;
+  // }
 
   export function getData() {
     return $editorState.value || '';
@@ -207,7 +207,7 @@
       value={$editorState.value || ''}
       menu={createMenu()}
       on:input={e => setEditorData(e.detail)}
-      on:focus={() => lastFocusedEditor.set(instance)}
+      on:focus={() => {lastFocusedEditor = instance; invalidateCommands(); }}
       bind:this={domEditor}
     />
   </svelte:fragment>

packages/web/src/tabs/ShellTab.svelte

@@ -1,15 +1,12 @@
 <script lang="ts" context="module">
-  const lastFocusedEditor = writable(null);
-  const currentEditor = derived([lastFocusedEditor, activeTabId], ([editor, tabid]) =>
-    editor?.getTabId && editor?.getTabId() == tabid ? editor : null
-  );
-  const currentEditorStatus = memberStore(currentEditor, editor => editor?.getStatus() || nullStore);
+  let lastFocusedEditor = null;
+  const getCurrentEditor = () =>
+    lastFocusedEditor?.getTabId && lastFocusedEditor?.getTabId() == getActiveTabId() ? lastFocusedEditor : null;
 
   registerFileCommands({
     idPrefix: 'shell',
     category: 'Shell',
-    editorStore: currentEditor,
-    editorStatusStore: currentEditorStatus,
+    getCurrentEditor,
     folder: 'shell',
     format: 'text',
     fileExtension: 'js',
@@ -28,6 +25,7 @@
   import { getContext, get_current_component } from 'svelte/internal';
 
   import { derived, writable } from 'svelte/store';
+  import invalidateCommands from '../commands/invalidateCommands';
   import registerCommand from '../commands/registerCommand';
   import { registerFileCommands } from '../commands/stdCommands';
 
@@ -35,7 +33,7 @@
   import AceEditor from '../query/AceEditor.svelte';
   import RunnerOutputPane from '../query/RunnerOutputPane.svelte';
   import useEditorData from '../query/useEditorData';
-  import { activeTabId, nullStore } from '../stores';
+  import { activeTabId, getActiveTabId, nullStore } from '../stores';
   import axiosInstance from '../utility/axiosInstance';
   import memberStore from '../utility/memberStore';
   import socket from '../utility/socket';
@@ -54,16 +52,21 @@
 
   let domEditor;
 
-  const status = writable({
-    busy,
-    canKill: false,
-  });
+  // const status = writable({
+  //   busy,
+  //   canKill: false,
+  // });
+
+  // $: {
+  //   status.set({
+  //     busy,
+  //     canKill: busy,
+  //   });
+  // }
 
   $: {
-    status.set({
-      busy,
-      canKill: busy,
-    });
+    busy;
+    invalidateCommands();
   }
 
   $: if ($tabVisible && domEditor) {
@@ -90,9 +93,9 @@
     // timerLabel.stop();
   }
 
-  export function getStatus() {
-    return status;
-  }
+  // export function getStatus() {
+  //   return status;
+  // }
 
   export function getData() {
     return $editorState.value || '';
@@ -114,6 +117,10 @@
     return tabid;
   }
 
+  export function isBusy() {
+    return busy;
+  }
+
   export async function execute() {
     if (busy) return;
     executeNumber += 1;
@@ -165,7 +172,10 @@
       value={$editorState.value || ''}
       menu={createMenu()}
       on:input={e => setEditorData(e.detail)}
-      on:focus={() => lastFocusedEditor.set(instance)}
+      on:focus={() => {
+        lastFocusedEditor = instance;
+        invalidateCommands();
+      }}
       bind:this={domEditor}
       mode="javascript"
     />

packages/web/src/tabs/TableDataTab.svelte

@@ -17,6 +17,7 @@
   import { findEngineDriver } from 'dbgate-tools';
   import { writable } from 'svelte/store';
   import createUndoReducer from '../utility/createUndoReducer';
+  import invalidateCommands from '../commands/invalidateCommands';
 
   export let tabid;
   export let conid;
@@ -28,6 +29,11 @@
   const cache = writable(createGridCache());
 
   const [changeSetStore, dispatchChangeSet] = createUndoReducer(createChangeSet());
+
+  $: {
+    $changeSetStore;
+    invalidateCommands();
+  }
 </script>
 
 <TableDataGrid