From a703dcc53eb920117bc346a3c21f0c729c0ad96d Mon Sep 17 00:00:00 2001
From: Fabio Di Stasio <fabio286@gmail.com>
Date: Sat, 2 Jul 2022 15:30:36 +0200
Subject: [PATCH] feat: modal with all connections

---
 package-lock.json                             |  94 ++++++++++
 package.json                                  |   1 +
 src/renderer/App.vue                          | 168 ++++++++---------
 .../components/ModalAllConnections.vue        | 171 ++++++++++++++++++
 src/renderer/components/TheSettingBar.vue     |  52 ++++--
 .../components/WorkspaceTabNewTable.vue       |   5 +-
 src/renderer/i18n/en-US.ts                    |   3 +-
 src/renderer/scss/themes/dark-theme.scss      |   2 -
 src/renderer/scss/themes/light-theme.scss     |   2 -
 tsconfig.json                                 |   1 +
 10 files changed, 394 insertions(+), 105 deletions(-)
 create mode 100644 src/renderer/components/ModalAllConnections.vue

diff --git a/package-lock.json b/package-lock.json
index dfdad196..ef8de288 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "@mdi/font": "~6.1.95",
         "@turf/helpers": "~6.5.0",
         "@vscode/vscode-languagedetection": "~1.0.21",
+        "@vueuse/core": "~8.7.5",
         "ace-builds": "~1.4.13",
         "better-sqlite3": "~7.5.0",
         "electron-log": "~4.4.1",
@@ -2872,6 +2873,11 @@
       "dev": true,
       "optional": true
     },
+    "node_modules/@types/web-bluetooth": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
+      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
+    },
     "node_modules/@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
@@ -3205,6 +3211,63 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz",
       "integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg=="
     },
+    "node_modules/@vueuse/core": {
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.7.5.tgz",
+      "integrity": "sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==",
+      "dependencies": {
+        "@types/web-bluetooth": "^0.0.14",
+        "@vueuse/metadata": "8.7.5",
+        "@vueuse/shared": "8.7.5",
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.1.0",
+        "vue": "^2.6.0 || ^3.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/core/node_modules/@vueuse/shared": {
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.7.5.tgz",
+      "integrity": "sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw==",
+      "dependencies": {
+        "vue-demi": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      },
+      "peerDependencies": {
+        "@vue/composition-api": "^1.1.0",
+        "vue": "^2.6.0 || ^3.2.0"
+      },
+      "peerDependenciesMeta": {
+        "@vue/composition-api": {
+          "optional": true
+        },
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vueuse/metadata": {
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.7.5.tgz",
+      "integrity": "sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg==",
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
@@ -19790,6 +19853,11 @@
       "dev": true,
       "optional": true
     },
+    "@types/web-bluetooth": {
+      "version": "0.0.14",
+      "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.14.tgz",
+      "integrity": "sha512-5d2RhCard1nQUC3aHcq/gHzWYO6K0WJmAbjO7mQJgCQKtZpgXxv1rOM6O/dBDhDYYVutk1sciOgNSe+5YyfM8A=="
+    },
     "@types/yargs": {
       "version": "16.0.4",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz",
@@ -20029,6 +20097,32 @@
       "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.2.33.tgz",
       "integrity": "sha512-UBc1Pg1T3yZ97vsA2ueER0F6GbJebLHYlEi4ou1H5YL4KWvMOOWwpYo9/QpWq93wxKG6Wo13IY74Hcn/f7c7Bg=="
     },
+    "@vueuse/core": {
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-8.7.5.tgz",
+      "integrity": "sha512-tqgzeZGoZcXzoit4kOGLWJibDMLp0vdm6ZO41SSUQhkhtrPhAg6dbIEPiahhUu6sZAmSYvVrZgEr5aKD51nrLA==",
+      "requires": {
+        "@types/web-bluetooth": "^0.0.14",
+        "@vueuse/metadata": "8.7.5",
+        "@vueuse/shared": "8.7.5",
+        "vue-demi": "*"
+      },
+      "dependencies": {
+        "@vueuse/shared": {
+          "version": "8.7.5",
+          "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-8.7.5.tgz",
+          "integrity": "sha512-THXPvMBFmg6Gf6AwRn/EdTh2mhqwjGsB2Yfp374LNQSQVKRHtnJ0I42bsZTn7nuEliBxqUrGQm/lN6qUHmhJLw==",
+          "requires": {
+            "vue-demi": "*"
+          }
+        }
+      }
+    },
+    "@vueuse/metadata": {
+      "version": "8.7.5",
+      "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-8.7.5.tgz",
+      "integrity": "sha512-emJZKRQSaEnVqmlu39NpNp8iaW+bPC2kWykWoWOZMSlO/0QVEmO/rt8A5VhOEJTKLX3vwTevqbiRy9WJRwVOQg=="
+    },
     "@webassemblyjs/ast": {
       "version": "1.11.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.11.1.tgz",
diff --git a/package.json b/package.json
index 2a440deb..974d6f36 100644
--- a/package.json
+++ b/package.json
@@ -120,6 +120,7 @@
     "@mdi/font": "~6.1.95",
     "@turf/helpers": "~6.5.0",
     "@vscode/vscode-languagedetection": "~1.0.21",
+    "@vueuse/core": "~8.7.5",
     "ace-builds": "~1.4.13",
     "better-sqlite3": "~7.5.0",
     "electron-log": "~4.4.1",
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
index 93248659..b0202052 100644
--- a/src/renderer/App.vue
+++ b/src/renderer/App.vue
@@ -2,7 +2,7 @@
    <div id="wrapper" :class="[`theme-${applicationTheme}`, !disableBlur || 'no-blur']">
       <TheTitleBar />
       <div id="window-content">
-         <TheSettingBar />
+         <TheSettingBar @show-connections-modal="isAllConnectionsModal = true" />
          <div id="main-content" class="container">
             <div class="columns col-gapless">
                <Workspace
@@ -21,13 +21,15 @@
             <BaseTextEditor class="d-none" value="" />
          </div>
       </div>
+      <ModalAllConnections v-if="isAllConnectionsModal" @close="isAllConnectionsModal = false" />
    </div>
 </template>
 
-<script lang="ts">
-import { defineAsyncComponent } from 'vue';
+<script setup lang="ts">
+import { defineAsyncComponent, onBeforeUnmount, onMounted, Ref, ref } from 'vue';
 import { storeToRefs } from 'pinia';
 import { ipcRenderer } from 'electron';
+import { useI18n } from 'vue-i18n';
 import { Menu, getCurrentWindow } from '@electron/remote';
 import { useApplicationStore } from '@/stores/application';
 import { useConnectionsStore } from '@/stores/connections';
@@ -35,98 +37,88 @@ import { useSettingsStore } from '@/stores/settings';
 import { useWorkspacesStore } from '@/stores/workspaces';
 import TheSettingBar from '@/components/TheSettingBar.vue';
 
-export default {
-   name: 'App',
-   components: {
-      TheTitleBar: defineAsyncComponent(() => import(/* webpackChunkName: "TheTitleBar" */'@/components/TheTitleBar.vue')),
-      TheSettingBar,
-      TheFooter: defineAsyncComponent(() => import(/* webpackChunkName: "TheFooter" */'@/components/TheFooter.vue')),
-      TheNotificationsBoard: defineAsyncComponent(() => import(/* webpackChunkName: "TheNotificationsBoard" */'@/components/TheNotificationsBoard.vue')),
-      Workspace: defineAsyncComponent(() => import(/* webpackChunkName: "Workspace" */'@/components/Workspace.vue')),
-      WorkspaceAddConnectionPanel: defineAsyncComponent(() => import(/* webpackChunkName: "WorkspaceAddConnectionPanel" */'@/components/WorkspaceAddConnectionPanel.vue')),
-      ModalSettings: defineAsyncComponent(() => import(/* webpackChunkName: "ModalSettings" */'@/components/ModalSettings.vue')),
-      TheScratchpad: defineAsyncComponent(() => import(/* webpackChunkName: "TheScratchpad" */'@/components/TheScratchpad.vue')),
-      BaseTextEditor: defineAsyncComponent(() => import(/* webpackChunkName: "BaseTextEditor" */'@/components/BaseTextEditor.vue'))
-   },
-   setup () {
-      const applicationStore = useApplicationStore();
-      const connectionsStore = useConnectionsStore();
-      const settingsStore = useSettingsStore();
-      const workspacesStore = useWorkspacesStore();
+const { t } = useI18n();
 
-      const {
-         isLoading,
-         isSettingModal,
-         isScratchpad
-      } = storeToRefs(applicationStore);
-      const { connections } = storeToRefs(connectionsStore);
-      const { applicationTheme, disableBlur } = storeToRefs(settingsStore);
-      const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
+const TheTitleBar = defineAsyncComponent(() => import(/* webpackChunkName: "TheTitleBar" */'@/components/TheTitleBar.vue'));
+const TheFooter = defineAsyncComponent(() => import(/* webpackChunkName: "TheFooter" */'@/components/TheFooter.vue'));
+const TheNotificationsBoard = defineAsyncComponent(() => import(/* webpackChunkName: "TheNotificationsBoard" */'@/components/TheNotificationsBoard.vue'));
+const Workspace = defineAsyncComponent(() => import(/* webpackChunkName: "Workspace" */'@/components/Workspace.vue'));
+const WorkspaceAddConnectionPanel = defineAsyncComponent(() => import(/* webpackChunkName: "WorkspaceAddConnectionPanel" */'@/components/WorkspaceAddConnectionPanel.vue'));
+const ModalSettings = defineAsyncComponent(() => import(/* webpackChunkName: "ModalSettings" */'@/components/ModalSettings.vue'));
+const ModalAllConnections = defineAsyncComponent(() => import(/* webpackChunkName: "ModalAllConnections" */'@/components/ModalAllConnections.vue'));
+const TheScratchpad = defineAsyncComponent(() => import(/* webpackChunkName: "TheScratchpad" */'@/components/TheScratchpad.vue'));
+const BaseTextEditor = defineAsyncComponent(() => import(/* webpackChunkName: "BaseTextEditor" */'@/components/BaseTextEditor.vue'));
 
-      const { checkVersionUpdate } = applicationStore;
-      const { changeApplicationTheme } = settingsStore;
+const applicationStore = useApplicationStore();
+const connectionsStore = useConnectionsStore();
+const settingsStore = useSettingsStore();
+const workspacesStore = useWorkspacesStore();
 
-      document.addEventListener('DOMContentLoaded', () => {
-         setTimeout(() => {
-            changeApplicationTheme(applicationTheme.value);// Forces persistentStore to save on file and mail process
-         }, 1000);
-      });
+const {
+   isSettingModal,
+   isScratchpad
+} = storeToRefs(applicationStore);
+const { connections } = storeToRefs(connectionsStore);
+const { applicationTheme, disableBlur } = storeToRefs(settingsStore);
+const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
 
-      return {
-         isLoading,
-         isSettingModal,
-         isScratchpad,
-         checkVersionUpdate,
-         changeApplicationTheme,
-         connections,
-         applicationTheme,
-         disableBlur,
-         selectedWorkspace
-      };
-   },
-   mounted () {
-      ipcRenderer.send('check-for-updates');
-      this.checkVersionUpdate();
+const { checkVersionUpdate } = applicationStore;
+const { changeApplicationTheme } = settingsStore;
 
-      const InputMenu = Menu.buildFromTemplate([
-         {
-            label: this.$t('word.cut'),
-            role: 'cut'
-         },
-         {
-            label: this.$t('word.copy'),
-            role: 'copy'
-         },
-         {
-            label: this.$t('word.paste'),
-            role: 'paste'
-         },
-         {
-            type: 'separator'
-         },
-         {
-            label: this.$t('message.selectAll'),
-            role: 'selectAll'
+const isAllConnectionsModal: Ref<boolean> = ref(false);
+
+document.addEventListener('DOMContentLoaded', () => {
+   setTimeout(() => {
+      changeApplicationTheme(applicationTheme.value);// Forces persistentStore to save on file and mail process
+   }, 1000);
+});
+
+onMounted(() => {
+   ipcRenderer.send('check-for-updates');
+   checkVersionUpdate();
+
+   const InputMenu = Menu.buildFromTemplate([
+      {
+         label: t('word.cut'),
+         role: 'cut'
+      },
+      {
+         label: t('word.copy'),
+         role: 'copy'
+      },
+      {
+         label: t('word.paste'),
+         role: 'paste'
+      },
+      {
+         type: 'separator'
+      },
+      {
+         label: t('message.selectAll'),
+         role: 'selectAll'
+      }
+   ]);
+
+   document.body.addEventListener('contextmenu', (e) => {
+      e.preventDefault();
+      e.stopPropagation();
+
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      let node: any = e.target;
+
+      while (node) {
+         if (node.nodeName.match(/^(input|textarea)$/i) || node.isContentEditable) {
+            InputMenu.popup({ window: getCurrentWindow() });
+            break;
          }
-      ]);
+         node = node.parentNode;
+      }
+   });
+});
 
-      document.body.addEventListener('contextmenu', (e) => {
-         e.preventDefault();
-         e.stopPropagation();
-
-         // eslint-disable-next-line @typescript-eslint/no-explicit-any
-         let node: any = e.target;
-
-         while (node) {
-            if (node.nodeName.match(/^(input|textarea)$/i) || node.isContentEditable) {
-               InputMenu.popup({ window: getCurrentWindow() });
-               break;
-            }
-            node = node.parentNode;
-         }
-      });
-   }
-};
+onBeforeUnmount(() => {
+   window.removeEventListener('keydown', console.log);
+});
 </script>
 
 <style lang="scss">
diff --git a/src/renderer/components/ModalAllConnections.vue b/src/renderer/components/ModalAllConnections.vue
new file mode 100644
index 00000000..7486c60d
--- /dev/null
+++ b/src/renderer/components/ModalAllConnections.vue
@@ -0,0 +1,171 @@
+<template>
+   <Teleport to="#window-content">
+      <div class="modal active">
+         <a class="modal-overlay" @click.stop="closeModal" />
+         <div ref="trapRef" class="modal-container p-0 pb-4">
+            <div class="modal-header pl-2">
+               <div class="modal-title h6">
+                  <div class="d-flex">
+                     <i class="mdi mdi-24px mdi-apps mr-1" />
+                     <span class="cut-text">{{ $t('message.allConnections') }}</span>
+                  </div>
+               </div>
+               <a class="btn btn-clear c-hand" @click.stop="closeModal" />
+            </div>
+            <div class="modal-body py-0">
+               <div class="columns">
+                  <div
+                     v-for="connection in connections"
+                     :key="connection.uid"
+                     class="column col-md-6 col-lg-4 col-3 p-3"
+                  >
+                     <div class="panel">
+                        <div class="panel-header text-center">
+                           <figure class="avatar avatar-lg">
+                              <i class="settingbar-element-icon dbi" :class="[`dbi-${connection.client}`]" />
+                           </figure>
+                           <div class="panel-title h6 mt-10">
+                              {{ getConnectionName(connection.uid) }}
+                           </div>
+                           <div class="panel-subtitle">
+                              {{ connection.client }}
+                           </div>
+                        </div>
+                        <div class="panel-body text-center">
+                           <div v-if="connection.databasePath">
+                              <div class="pl-1 text-break">
+                                 <span class="text-bold">PATH:</span> {{ connection.databasePath }}
+                              </div>
+                           </div>
+                           <div v-else>
+                              <div class="pl-1 text-break">
+                                 <span class="text-bold">HOST:</span> {{ connection.host }}
+                              </div>
+                           </div>
+                           <div v-if="connection.user">
+                              <div class="pl-1 text-break">
+                                 <span class="text-bold">USER:</span> {{ connection.user }}
+                              </div>
+                           </div>
+                           <div v-if="connection.schema">
+                              <div class="pl-1 text-break">
+                                 <span class="text-bold">SCHEMA:</span> {{ connection.schema }}
+                              </div>
+                           </div>
+                           <div v-if="connection.database">
+                              <div class="pl-1 text-break">
+                                 <span class="text-bold">DATABASE:</span> {{ connection.database }}
+                              </div>
+                           </div>
+                        </div>
+                        <div class="panel-footer text-center py-0">
+                           <div v-if="connection.ssl" class="chip bg-success mt-2">
+                              SSL
+                           </div>
+                           <div v-if="connection.ssh" class="chip bg-success mt-2">
+                              SSH
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+               </div>
+            </div>
+         </div>
+      </div>
+   </Teleport>
+</template>
+
+<script setup lang="ts">
+import { useFocusTrap } from '@/composables/useFocusTrap';
+import { useConnectionsStore } from '@/stores/connections';
+import { useWorkspacesStore } from '@/stores/workspaces';
+import { storeToRefs } from 'pinia';
+
+const connectionsStore = useConnectionsStore();
+const workspacesStore = useWorkspacesStore();
+
+const { connections } = storeToRefs(connectionsStore);
+const { getConnectionName } = connectionsStore;
+const { getWorkspace } = workspacesStore;
+
+const { trapRef } = useFocusTrap();
+
+const emit = defineEmits(['close']);
+
+const closeModal = () => emit('close');
+
+const onKey = (e:KeyboardEvent) => {
+   e.stopPropagation();
+   if (e.key === 'Escape')
+      closeModal();
+};
+
+const getStatusBadge = (uid: string) => {
+   if (getWorkspace(uid)) {
+      const status = getWorkspace(uid).connectionStatus;
+
+      switch (status) {
+         case 'connected':
+            return 'badge badge-connected';
+         case 'connecting':
+            return 'badge badge-connecting';
+         case 'failed':
+            return 'badge badge-failed';
+         default:
+            return '';
+      }
+   }
+};
+
+window.addEventListener('keydown', onKey, { capture: true });
+</script>
+
+<style lang="scss" scoped>
+.vscroll {
+  height: 1000px;
+  overflow: auto;
+  overflow-anchor: none;
+}
+
+.column-resizable {
+  &:hover,
+  &:active {
+    resize: horizontal;
+    overflow: hidden;
+  }
+}
+
+.table-column-title {
+  display: flex;
+  align-items: center;
+}
+
+.sort-icon {
+  font-size: 0.7rem;
+  line-height: 1;
+  margin-left: 0.2rem;
+}
+
+.result-tabs {
+  background: transparent !important;
+  margin: 0;
+}
+
+.modal {
+  align-items: flex-start;
+
+  .modal-container {
+    max-width: 75vw;
+    margin-top: 10vh;
+
+    .modal-body {
+      height: 80vh;
+    }
+  }
+}
+
+.processes-toolbar {
+  display: flex;
+  justify-content: space-between;
+}
+</style>
diff --git a/src/renderer/components/TheSettingBar.vue b/src/renderer/components/TheSettingBar.vue
index 4cb1db38..45885ef0 100644
--- a/src/renderer/components/TheSettingBar.vue
+++ b/src/renderer/components/TheSettingBar.vue
@@ -1,6 +1,6 @@
 <template>
    <div id="settingbar">
-      <div class="settingbar-top-elements">
+      <div ref="sidebarConnections" class="settingbar-top-elements">
          <SettingBarContext
             v-if="isContext"
             :context-event="contextEvent"
@@ -24,7 +24,7 @@
                      @mouseover.self="tooltipPosition"
                   >
                      <i class="settingbar-element-icon dbi" :class="[`dbi-${element.client}`, getStatusBadge(element.uid), (pinnedConnections.has(element.uid) ? 'settingbar-element-pin' : false)]" />
-                     <span v-if="!isDragging" class="ex-tooltip-content">{{ getConnectionName(element.uid) }}</span>
+                     <span v-if="!isDragging && !isScrolling" class="ex-tooltip-content">{{ getConnectionName(element.uid) }}</span>
                   </li>
                </template>
             </Draggable>
@@ -41,7 +41,21 @@
                @mouseover.self="tooltipPosition"
             >
                <i class="settingbar-element-icon dbi" :class="[`dbi-${connection.client}`, getStatusBadge(connection.uid)]" />
-               <span v-if="!isDragging" class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
+               <span v-if="!isDragging && !isScrolling" class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
+            </li>
+         </ul>
+      </div>
+
+      <div class="settingbar-middle-elements">
+         <ul class="settingbar-elements">
+            <li
+               v-if="isScrollable"
+               class="settingbar-element btn btn-link ex-tooltip"
+               @click="emit('show-connections-modal')"
+               @mouseover.self="tooltipPosition"
+            >
+               <i class="settingbar-element-icon mdi mdi-24px mdi-dots-horizontal text-light" />
+               <span class="ex-tooltip-content">{{ $t('message.allConnections') }}</span>
             </li>
             <li
                class="settingbar-element btn btn-link ex-tooltip"
@@ -79,6 +93,7 @@ import { useWorkspacesStore } from '@/stores/workspaces';
 import * as Draggable from 'vuedraggable';
 import SettingBarContext from '@/components/SettingBarContext.vue';
 import { ConnectionParams } from 'common/interfaces/antares';
+import { useElementBounding, useScroll } from '@vueuse/core';
 
 const applicationStore = useApplicationStore();
 const connectionsStore = useConnectionsStore();
@@ -92,11 +107,18 @@ const { showSettingModal, showScratchpad } = applicationStore;
 const { getConnectionName, updatePinnedConnections } = connectionsStore;
 const { getWorkspace, selectWorkspace } = workspacesStore;
 
+const emit = defineEmits(['show-connections-modal']);
+
 const isLinux = process.platform === 'linux';
+
+const sidebarConnections: Ref<HTMLDivElement> = ref(null);
 const isContext: Ref<boolean> = ref(false);
 const isDragging: Ref<boolean> = ref(false);
+const isScrollable: Ref<boolean> = ref(false);
+const isScrolling = ref(useScroll(sidebarConnections)?.isScrolling);
 const contextEvent: Ref<MouseEvent> = ref(null);
 const contextConnection: Ref<ConnectionParams> = ref(null);
+const sidebarConnectionsHeight = ref(useElementBounding(sidebarConnections)?.height);
 
 const pinnedConnectionsArr = computed({
    get: () => [...pinnedConnections.value].map(c => storedConnections.value.find(sc => sc.uid === c)).filter(Boolean),
@@ -133,11 +155,14 @@ const contextMenu = (event: MouseEvent, connection: ConnectionParams) => {
 };
 
 const tooltipPosition = (e: Event) => {
-   const el = e.target ? e.target : e;
-   const fromTop = isLinux
-      ? window.scrollY + (el as HTMLElement).getBoundingClientRect().top + ((el as HTMLElement).offsetHeight / 4)
-      : window.scrollY + (el as HTMLElement).getBoundingClientRect().top - ((el as HTMLElement).offsetHeight / 4);
-   (el as HTMLElement).querySelector<HTMLElement>('.ex-tooltip-content').style.top = `${fromTop}px`;
+   const el = (e.target ? e.target : e) as unknown as HTMLElement;
+   const tooltip = el.querySelector<HTMLElement>('.ex-tooltip-content');
+   if (tooltip) {
+      const fromTop = isLinux
+         ? window.scrollY + el.getBoundingClientRect().top + (el.offsetHeight / 4)
+         : window.scrollY + el.getBoundingClientRect().top - (el.offsetHeight / 4);
+      tooltip.style.top = `${fromTop}px`;
+   }
 };
 
 const getStatusBadge = (uid: string) => {
@@ -166,6 +191,10 @@ const dragStop = (e: any) => {
    }, 200);
 };
 
+watch(sidebarConnectionsHeight, (value) => {
+   isScrollable.value = value < sidebarConnections.value.scrollHeight;
+});
+
 watch(unpinnedConnectionsArr, (newVal, oldVal) => {
    if (JSON.stringify(newVal) !== JSON.stringify(oldVal)) {
       setTimeout(() => {
@@ -193,7 +222,7 @@ watch(unpinnedConnectionsArr, (newVal, oldVal) => {
     height: calc(100vh - #{$excluding-size});
     display: flex;
     flex-direction: column;
-    justify-content: space-between;
+   //  justify-content: space-between;
     align-items: center;
     padding: 0;
     z-index: 9;
@@ -201,7 +230,7 @@ watch(unpinnedConnectionsArr, (newVal, oldVal) => {
     .settingbar-top-elements {
       overflow-x: hidden;
       overflow-y: overlay;
-      max-height: calc((100vh - 3.5rem) - #{$excluding-size});
+      // max-height: calc((100vh - 3.5rem) - #{$excluding-size});
 
       &::-webkit-scrollbar {
         width: 3px;
@@ -209,8 +238,8 @@ watch(unpinnedConnectionsArr, (newVal, oldVal) => {
     }
 
     .settingbar-bottom-elements {
-      padding-top: 0.5rem;
       z-index: 1;
+      margin-top: auto;
     }
 
     .settingbar-elements {
@@ -273,6 +302,7 @@ watch(unpinnedConnectionsArr, (newVal, oldVal) => {
           &::before {
             font: normal normal normal 14px/1 "Material Design Icons";
             content: "\F0403";
+            color: $body-font-color-dark;
             transform: rotate(45deg);
             opacity: .25;
             bottom: -8px;
diff --git a/src/renderer/components/WorkspaceTabNewTable.vue b/src/renderer/components/WorkspaceTabNewTable.vue
index e22fb532..7ff53ca0 100644
--- a/src/renderer/components/WorkspaceTabNewTable.vue
+++ b/src/renderer/components/WorkspaceTabNewTable.vue
@@ -332,7 +332,10 @@ const addField = () => {
       collation: defaultCollation.value,
       autoIncrement: false,
       onUpdate: '',
-      comment: ''
+      comment: '',
+      alias: '',
+      tableAlias: '',
+      orgTable: ''
    });
 
    setTimeout(() => {
diff --git a/src/renderer/i18n/en-US.ts b/src/renderer/i18n/en-US.ts
index 77b93013..b5ca1708 100644
--- a/src/renderer/i18n/en-US.ts
+++ b/src/renderer/i18n/en-US.ts
@@ -293,7 +293,8 @@ module.exports = {
       untrustedConnection: 'Untrusted connection',
       missingOrIncompleteTranslation: 'Missing or incomplete translation?',
       findOutHowToContribute: 'Find out how to contribute',
-      disableFKChecks: 'Disable foreigh key checks'
+      disableFKChecks: 'Disable foreigh key checks',
+      allConnections: 'All connections'
    },
    faker: {
       address: 'Address',
diff --git a/src/renderer/scss/themes/dark-theme.scss b/src/renderer/scss/themes/dark-theme.scss
index ee384d18..83551ddb 100644
--- a/src/renderer/scss/themes/dark-theme.scss
+++ b/src/renderer/scss/themes/dark-theme.scss
@@ -400,9 +400,7 @@
     }
 
     .settingbar-bottom-elements {
-      padding-top: 0.5rem;
       background: $bg-color-light-dark;
-      z-index: 1;
     }
 
     .settingbar-elements {
diff --git a/src/renderer/scss/themes/light-theme.scss b/src/renderer/scss/themes/light-theme.scss
index 6bec75e0..89c29573 100644
--- a/src/renderer/scss/themes/light-theme.scss
+++ b/src/renderer/scss/themes/light-theme.scss
@@ -169,9 +169,7 @@
     }
 
     .settingbar-bottom-elements {
-      padding-top: 0.5rem;
       background: $bg-color-light-dark;
-      z-index: 1;
     }
 
     .settingbar-elements {
diff --git a/tsconfig.json b/tsconfig.json
index 6b3be750..e0b74f67 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -5,6 +5,7 @@
     "./src/renderer/**/*", 
     "./src/common/interfaces/antares.ts"
   ],
+  "exclude": ["./src/renderer/libs/ext-language_tools.js"],
   "compilerOptions": {
     "baseUrl": "./",
     "target": "es2021",