chore(release): 0.7.17-beta.1

feat(translation): Update Dutch

.all-contributorsrc

@@ -211,8 +211,55 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "m1khal3v",
+      "name": "Anton Mikhalev",
+      "avatar_url": "https://avatars.githubusercontent.com/u/41085561?v=4",
+      "profile": "https://github.com/m1khal3v",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "64knl",
+      "name": "René",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3864423?v=4",
+      "profile": "https://64k.nl/",
+      "contributions": [
+        "code",
+        "translation"
+      ]
+    },
+    {
+      "login": "zxp19821005",
+      "name": "Woodenman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4915850?v=4",
+      "profile": "https://github.com/zxp19821005",
+      "contributions": [
+        "platform"
+      ]
+    },
+    {
+      "login": "markusand",
+      "name": "Marc Vilella",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12972543?v=4",
+      "profile": "https://github.com/markusand",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Lawondyss",
+      "name": "Ladislav Vondráček",
+      "avatar_url": "https://avatars.githubusercontent.com/u/272130?v=4",
+      "profile": "https://github.com/Lawondyss",
+      "contributions": [
+        "translation"
+      ]
     }
   ],
   "contributorsPerLine": 7,
-  "skipCi": true
+  "skipCi": true,
+  "commitType": "docs"
 }

.eslintrc

@@ -18,7 +18,8 @@
     },
     "plugins": [
         "vue",
-        "@typescript-eslint"
+        "@typescript-eslint",
+        "simple-import-sort"
     ],
     "rules": {
         "space-infix-ops": "off",
@@ -91,6 +92,8 @@
                 }
             }
         ],
-        "@typescript-eslint/no-var-requires": "off"
+        "@typescript-eslint/no-var-requires": "off",
+        "simple-import-sort/imports": "error",
+        "simple-import-sort/exports": "error"
     }
 }

.github/dependabot.yml

@@ -11,3 +11,4 @@ updates:
     directory: "/"
     schedule:
       interval: "monthly" 
+    target-branch: "develop"

.github/workflows/build-beta.yml

@@ -0,0 +1,42 @@
+name: Build & release [BETA]
+
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+'
+
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-11, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+        with: 
+          ref: beta
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      
+      - name: Install dependencies
+        run: npm i
+        
+      - name: "Build"
+        run: npm run build
+
+      - name: Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: "build/*.AppImage,build/*.yml,build/*.deb,build/*.dmg,build/*.blockmap,build/*.zip,build/*.exe"
+          allowUpdates: true
+          draft: true
+          generateReleaseNotes: true

.github/workflows/build.yml

@@ -1,9 +1,12 @@
-name: Build & release
+name: Build & release [STABLE]
 
 on:
   push:
     tags:
-      - "v*"
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+env:
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
 
 jobs:
   release:
@@ -11,11 +14,19 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-11, ubuntu-20.04, windows-latest]
+        os: [macos-11, ubuntu-latest, windows-latest]
 
     steps:
+      - name: Exit if not on master branch
+        if: contains(env.BRANCH_NAME, 'master') == false
+        run: | 
+          echo "Wrong environment ${{env.BRANCH_NAME}}"
+          exit 0
+
       - name: Check out Git repository
         uses: actions/checkout@v3
+        with: 
+          ref: master
 
       - name: Install Node.js
         uses: actions/setup-node@v3

.github/workflows/create-artifact-linux-arm64.yml

@@ -0,0 +1,34 @@
+name: Create artifact [LINUX ARM64]
+
+on: 
+  workflow_dispatch: {}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v3
+        with: 
+          ref: master
+
+      - name: Install Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      
+      - name: Install dependencies
+        run: npm i
+        
+      - name: "Build"
+        run: npm run build -- --arm64 --linux deb AppImage
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux-build
+          retention-days: 3
+          path: |
+            build
+            !build/*-unpacked
+            !build/.icon-ico

.github/workflows/test-e2e-win.yml

@@ -1,6 +1,9 @@
 name: Test end-to-end [WINDOWS]
 
-on: push
+on: 
+  push:
+    branches:
+        - master
 
 jobs:
   release:

CHANGELOG.md

@@ -2,6 +2,165 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [0.7.17-beta.1](https://github.com/antares-sql/antares/compare/v0.7.17-beta.0...v0.7.17-beta.1) (2023-09-23)
+
+
+### Bug Fixes
+
+* flip not working on BaseIcon component ([922f56f](https://github.com/antares-sql/antares/commit/922f56f69b168302a9d1ff86565d3f09400d6a7c))
+* **SQLite:** field length lost when editing a table, fixes [#664](https://github.com/antares-sql/antares/issues/664) ([b321e64](https://github.com/antares-sql/antares/commit/b321e64b835e0b39da116c4a77bac50247f240f3))
+* **SQLite:** table content not refresh after an update, fixes [#665](https://github.com/antares-sql/antares/issues/665) ([6dceaf0](https://github.com/antares-sql/antares/commit/6dceaf09be7bd46f1915721abd03253ffc517256))
+* table filter not working when search string on integer field, [#671](https://github.com/antares-sql/antares/issues/671) ([7e36260](https://github.com/antares-sql/antares/commit/7e36260cdb0438197152b5c6ac61db8ae8a9791a))
+* **UI:** small icons in sidebar elements with long name ([354928e](https://github.com/antares-sql/antares/commit/354928e302437d608903d1434d99d68eb79aa6e9))
+
+### [0.7.17-beta.0](https://github.com/antares-sql/antares/compare/v0.7.16...v0.7.17-beta.0) (2023-09-17)
+
+
+### Features
+
+* customize keep-alive-interval for ssh-tunnel ([b4731d6](https://github.com/antares-sql/antares/commit/b4731d67a5b819bf87c437eb626f30a7489477f9))
+* keep alive interval in seconds ([8d605ee](https://github.com/antares-sql/antares/commit/8d605ee2872c20495f0ac4de84bf17d61c6455ae))
+* **translation:** Update Dutch ([b43c400](https://github.com/antares-sql/antares/commit/b43c4000d5905838348c391f25b3228dc6a6b2ac))
+
+
+### Bug Fixes
+
+* empty workspace deleting connections in some conditions ([0de5ef8](https://github.com/antares-sql/antares/commit/0de5ef8a985cc8d9f1fa4479eeaf7dbb20f5fd7c))
+* **SQLite:** disconnecting a sqlite connection does not truly close it, fixes [#661](https://github.com/antares-sql/antares/issues/661) ([757a2b3](https://github.com/antares-sql/antares/commit/757a2b3cbf0d7f4df37eb5d90faa2f9821794e5f))
+* **UI:** update notification indicator moves settings icon ([e6f45d7](https://github.com/antares-sql/antares/commit/e6f45d71c75206187a7ae87e5f90a22d288a53ef))
+
+
+### Improvements
+
+* **core:** improved app security, fixes [#666](https://github.com/antares-sql/antares/issues/666) ([1359242](https://github.com/antares-sql/antares/commit/13592425afc643fe7188463fe4a2d02b6e27f87c))
+* improved ipc validation on Linux ([9de5f67](https://github.com/antares-sql/antares/commit/9de5f67d189c9b56fff41b29e6df69a3909bfa26))
+* migration from font icons to svg icons ([e7bec0a](https://github.com/antares-sql/antares/commit/e7bec0aaaf019fe0c3040d2d9443233e46a60188))
+
+### [0.7.16](https://github.com/antares-sql/antares/compare/v0.7.16-beta.1...v0.7.16) (2023-08-26)
+
+### [0.7.16-beta.1](https://github.com/antares-sql/antares/compare/v0.7.16-beta.0...v0.7.16-beta.1) (2023-08-18)
+
+
+### Features
+
+* ability to export connections ([f5b86e5](https://github.com/antares-sql/antares/commit/f5b86e59e7e41bbbe1555ec8a85ec1f849e8271d))
+* ability to import connections ([6df2145](https://github.com/antares-sql/antares/commit/6df214558f8186dd5fbf101505465f4c07c8ad5f))
+* Add catalan language ([9c6f1a9](https://github.com/antares-sql/antares/commit/9c6f1a9ea52b4791082bdbae91b764c486684c3b))
+
+
+### Bug Fixes
+
+* add some missing titles of buttons ([52e42fa](https://github.com/antares-sql/antares/commit/52e42fa1b529512154c0680124c5e425964a5b1a))
+* **SQLite:** improved view body parsing ([832aa75](https://github.com/antares-sql/antares/commit/832aa75ebe46776b9c365dde2dd13db3746adcd5))
+
+### [0.7.16-beta.0](https://github.com/antares-sql/antares/compare/v0.7.15...v0.7.16-beta.0) (2023-08-11)
+
+
+### Features
+
+* ability to change sql dump file name ([2e39d81](https://github.com/antares-sql/antares/commit/2e39d810b519401d0410cbb76520c07c595329fc))
+* ability to export a table dump from table context menu ([84b2255](https://github.com/antares-sql/antares/commit/84b2255bf405431070511890b2bca770fc4cc2bc))
+* support to links in changelog ([ad7e459](https://github.com/antares-sql/antares/commit/ad7e459c689d70ca664b9a3091d3dcab3f26ce4d))
+
+
+### Bug Fixes
+
+* **MySQL:** missing error details on mysql importer with some exceptione ([7b1cb4f](https://github.com/antares-sql/antares/commit/7b1cb4ff86dddb5fb4b4d960b47ea17f38a24aa6))
+
+### [0.7.15](https://github.com/antares-sql/antares/compare/v0.7.14...v0.7.15) (2023-07-31)
+
+
+### Features
+
+* export file name with hour, minutes and seconds, closes [#610](https://github.com/antares-sql/antares/issues/610) ([2f5fa0f](https://github.com/antares-sql/antares/commit/2f5fa0f2e416e88753c9dc2bf32edefba8c4e072))
+
+
+### Bug Fixes
+
+* display content of BLOB fields if not binary, fixes [#628](https://github.com/antares-sql/antares/issues/628) ([f831fcd](https://github.com/antares-sql/antares/commit/f831fcd442f16a03f0ea83ff5bf77a4a79906eb6))
+* **MySQL:** error insertinf new fields with some MySQL configurations, fixes [#360](https://github.com/antares-sql/antares/issues/360) ([51b1419](https://github.com/antares-sql/antares/commit/51b14195a8a6c7e7f1b12bd4b86b7164a56b2aa5))
+* **MySQL:** unable to set more than one value in SET fields ([7c820b1](https://github.com/antares-sql/antares/commit/7c820b18276e4ed5e381d91110acd032862a5be9))
+
+### [0.7.14](https://github.com/antares-sql/antares/compare/v0.7.13...v0.7.14) (2023-07-07)
+
+
+### Features
+
+* button to open view settings tab ([32bbc45](https://github.com/antares-sql/antares/commit/32bbc453294736970ddbcadd3cc45597277f5bda))
+
+
+### Bug Fixes
+
+* unable to insert new rows ([1c73503](https://github.com/antares-sql/antares/commit/1c735031380c48aa8b08ed5ce3df80008dc72af8))
+
+
+### Improvements
+
+* **PostgreSQL:** minor improvement to schema selection ([9d8e9a5](https://github.com/antares-sql/antares/commit/9d8e9a5e1fda190ee7b3d4fd59e6178dd5ec1651))
+
+### [0.7.13](https://github.com/antares-sql/antares/compare/v0.7.12...v0.7.13) (2023-07-06)
+
+
+### Features
+
+* button to open table settings tab, closes [#608](https://github.com/antares-sql/antares/issues/608) ([38bfea2](https://github.com/antares-sql/antares/commit/38bfea279ce93366dfd2021d0e91622a5a88878e))
+* update connection ([462ede8](https://github.com/antares-sql/antares/commit/462ede8dc701aaf9c6089b3ec41eea0f31babdf9))
+
+
+### Bug Fixes
+
+* **PostgreSQL:** unable to connect to database, fixes [#614](https://github.com/antares-sql/antares/issues/614) ([e808b86](https://github.com/antares-sql/antares/commit/e808b86c52b8488e0c079a9f0ddce225338af4c0))
+* unable to copy as sql inserts with BIT fileds, fixes [#613](https://github.com/antares-sql/antares/issues/613) ([6e01f0f](https://github.com/antares-sql/antares/commit/6e01f0f2e7194284341f89a44839d16398358f9b))
+
+### [0.7.12](https://github.com/antares-sql/antares/compare/v0.7.11...v0.7.12) (2023-07-03)
+
+
+### Features
+
+* add Dutch language support ([4ff1d10](https://github.com/antares-sql/antares/commit/4ff1d107b8837887ceb3ffecaed46b9bdb908127))
+* format options of csv export, closes [#196](https://github.com/antares-sql/antares/issues/196) ([3ad1e51](https://github.com/antares-sql/antares/commit/3ad1e51f42f3cc37ad66bdab64e9a8a0eadea74b))
+* more translations ([575c8ea](https://github.com/antares-sql/antares/commit/575c8ea8cabc1fb315bad1693df6cd4ccd869838))
+* **PostgreSQL:** ability to switch the database, closes [#432](https://github.com/antares-sql/antares/issues/432) ([89815bf](https://github.com/antares-sql/antares/commit/89815bf5e7c4062950b7418b31b45552ae0e1276))
+* Sort available languages alphabetically ([3ff8d25](https://github.com/antares-sql/antares/commit/3ff8d2571be306a8a72e5ad2b9f963b285e8db26))
+
+
+### Bug Fixes
+
+* **PostgreSQL:** unable to export as sql inserts ([e07e7b7](https://github.com/antares-sql/antares/commit/e07e7b736ef29368262ec4b17d9e1f54ef3ec390))
+* rename components and variables in SettingBarContext ([8a4a099](https://github.com/antares-sql/antares/commit/8a4a099e37c9bbc1365f322f6276f32153e24379))
+* spelling corrections ([93e16fd](https://github.com/antares-sql/antares/commit/93e16fdda29601f3e898b1a9470bd8546ea95df6))
+* update source string to fix spelling ([001983c](https://github.com/antares-sql/antares/commit/001983c5a2ebe17c943a9be3a58cc587f5cd09e3))
+
+### [0.7.11](https://github.com/antares-sql/antares/compare/v0.7.10...v0.7.11) (2023-06-04)
+
+
+### Features
+
+* context menu to close tabs, closes [#392](https://github.com/antares-sql/antares/issues/392) ([787014c](https://github.com/antares-sql/antares/commit/787014c38df743315c04962871a3801805a93c55))
+
+
+### Bug Fixes
+
+* disable filter during table content loading, fixes [#588](https://github.com/antares-sql/antares/issues/588) ([e60726c](https://github.com/antares-sql/antares/commit/e60726c741276b7da0d54c0986d2a45ed9979bc9))
+* **MySQL:** unable to get users list with some db settings ([9046707](https://github.com/antares-sql/antares/commit/904670781d47b1ac0dcfd982215ba1786f8c8145))
+* unique keys not recognized in table settings on some MariaDB versions ([4461998](https://github.com/antares-sql/antares/commit/446199827be4b07382453739f42d46fa0201d04c))
+* weird behavior in some text editors ([22bdaac](https://github.com/antares-sql/antares/commit/22bdaac18b1c46a57802cbbd3ad339ee075ec70b))
+
+### [0.7.10](https://github.com/antares-sql/antares/compare/v0.7.9...v0.7.10) (2023-05-28)
+
+
+### Features
+
+* copy rows as PHP array ([03638c0](https://github.com/antares-sql/antares/commit/03638c05534e9ce2e594ce5945485587ed99e609))
+* DDL query in table settings for MySQL and PostgreSQL, closes [#581](https://github.com/antares-sql/antares/issues/581) ([f454b4b](https://github.com/antares-sql/antares/commit/f454b4bb1ca79eec285b3b4039a2ef66802ff82a))
+* export table content or query results as PHP array, closes [#575](https://github.com/antares-sql/antares/issues/575) ([8968179](https://github.com/antares-sql/antares/commit/8968179c11f4fe3e624873aac4685a5a33521024))
+* keepalive on mysql/postgre connections, should fix [#577](https://github.com/antares-sql/antares/issues/577) ([17eeb6d](https://github.com/antares-sql/antares/commit/17eeb6d38e45b553e35e004b748569971743ca18))
+
+
+### Bug Fixes
+
+* disable shorctut to show Ace editor settings, fixes [#585](https://github.com/antares-sql/antares/issues/585) ([2c0b4ff](https://github.com/antares-sql/antares/commit/2c0b4ffe1f2e418f5e9120a40787788d8e7fd27e))
+
 ### [0.7.9](https://github.com/antares-sql/antares/compare/v0.7.8...v0.7.9) (2023-05-01)
 
 

README.md

@@ -7,7 +7,8 @@
 
 # Antares SQL Client
 
-![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Ffabio286%2Fantares%2Fbadge&style=flat)](https://actions-badge.atrox.dev/fabio286/antares/goto) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares) [![Twitter Follow](https://img.shields.io/twitter/follow/AntaresSQL?style=social)](https://twitter.com/AntaresSQL) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) ![GitHub](https://img.shields.io/github/license/fabio286/antares) [![Build Status](https://img.shields.io/endpoint.svg?url=https%3A%2F%2Factions-badge.atrox.dev%2Ffabio286%2Fantares%2Fbadge&style=flat)](https://actions-badge.atrox.dev/fabio286/antares/goto) [![antares](https://snapcraft.io/antares/badge.svg)](https://snapcraft.io/antares) [![antares](https://snapcraft.io/antares/trending.svg?name=0)](https://snapcraft.io/antares)
+![Mastodon Follow](https://img.shields.io/mastodon/follow/%20110860460902482117?domain=https%3A%2F%2Ffosstodon.org&style=social) [![Twitter Follow](https://img.shields.io/twitter/follow/AntaresSQL?style=social)](https://twitter.com/AntaresSQL) [![Plant a Tree](https://raw.githubusercontent.com/Fabio286/treedom-badge/master/svg/plant-a-tree.svg)](https://www.treedom.net/en/user/fabio-di-stasio/event/antares-for-the-planet)
 
 Antares is an SQL client based on [Electron.js](https://github.com/electron/electron) and [Vue.js](https://github.com/vuejs/vue) that aims to become a useful tool, especially for developers.  
 Our target is to support as many databases as possible, and all major operating systems, including the ARM versions.  
@@ -17,9 +18,12 @@ However, there are all the features necessary to have a pleasant database manage
 We are actively working on it, hoping to provide new cool features, improvements and fixes as soon as possible.  
 
 🔗 If you are curious to try Antares you can download and install the [latest release](https://github.com/Fabio286/antares/releases/latest).  
-👁 To stay tuned for new releases [follow Antares SQL](https://twitter.com/AntaresSQL) on Twitter.  
+👁 To stay tuned for new releases follow Antares SQL on [Mastodon](https://fosstodon.org/@AntaresSQL) or [Twitter](https://twitter.com/AntaresSQL).  
 🌟 Don't forget to **leave a star** if you appreciate this project.  
-🗳️ Poll: **[Which is the main OS you use Antares on?](https://github.com/antares-sql/antares/discussions/379)**
+
+🗳️ Polls: 
+- **[Which is the main OS you use Antares on?](https://github.com/antares-sql/antares/discussions/379)**
+- **[Which database do you use the most?](https://github.com/antares-sql/antares/discussions/594)**
 
 ## Current key features
 
@@ -63,7 +67,7 @@ On macOS you can run `.dmg` distribution following [this guide](https://support.
 
 ## Download
 
-[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/antares) [![Get it from AUR](https://raw.githubusercontent.com/Fabio286/antares/3e00c4bae6e036300c752c1a40c5a038fea9c169/docs/aur-badge.svg)](https://aur.archlinux.org/packages/antares-sql/) [<img src="https://developer.microsoft.com/store/badges/images/English_get-it-from-MS.png" style="height: 56px">](https://www.microsoft.com/p/antares-sql-client/9nhtb9sq51r1?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)  
+[![Get it from the Snap Store](https://snapcraft.io/static/images/badges/en/snap-store-black.svg)](https://snapcraft.io/antares) [![Get it from AUR](https://raw.githubusercontent.com/Fabio286/antares/3e00c4bae6e036300c752c1a40c5a038fea9c169/docs/aur-badge.svg)](https://aur.archlinux.org/packages/antares-sql-bin) [<img src="https://developer.microsoft.com/store/badges/images/English_get-it-from-MS.png" style="height: 56px">](https://www.microsoft.com/p/antares-sql-client/9nhtb9sq51r1?cid=storebadge&ocid=badge&rtc=1&activetab=pivot:overviewtab)  
 🚀 **[Other Downloads](https://github.com/Fabio286/antares/releases/latest)**
 
 ## Coming soon
@@ -146,6 +150,11 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/555cider"><img src="https://avatars.githubusercontent.com/u/73565447?v=4?s=100" width="100px;" alt="555cider"/><br /><sub><b>555cider</b></sub></a><br /><a href="#translation-555cider" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/m1khal3v"><img src="https://avatars.githubusercontent.com/u/41085561?v=4?s=100" width="100px;" alt="Anton Mikhalev"/><br /><sub><b>Anton Mikhalev</b></sub></a><br /><a href="#translation-m1khal3v" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://64k.nl/"><img src="https://avatars.githubusercontent.com/u/3864423?v=4?s=100" width="100px;" alt="René"/><br /><sub><b>René</b></sub></a><br /><a href="https://github.com/antares-sql/antares/commits?author=64knl" title="Code">💻</a> <a href="#translation-64knl" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zxp19821005"><img src="https://avatars.githubusercontent.com/u/4915850?v=4?s=100" width="100px;" alt="Woodenman"/><br /><sub><b>Woodenman</b></sub></a><br /><a href="#platform-zxp19821005" title="Packaging/porting to new platform">📦</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/markusand"><img src="https://avatars.githubusercontent.com/u/12972543?v=4?s=100" width="100px;" alt="Marc Vilella"/><br /><sub><b>Marc Vilella</b></sub></a><br /><a href="#translation-markusand" title="Translation">🌍</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Lawondyss"><img src="https://avatars.githubusercontent.com/u/272130?v=4?s=100" width="100px;" alt="Ladislav Vondráček"/><br /><sub><b>Ladislav Vondráček</b></sub></a><br /><a href="#translation-Lawondyss" title="Translation">🌍</a></td>
     </tr>
   </tbody>
 </table>

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.9",
+  "version": "0.7.17-beta.1",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",
@@ -16,9 +16,10 @@
     "build:appx": "npm run build -- --win appx",
     "rebuild:electron": "rimraf ./dist &&  npm run postinstall && npm run devtools:install",
     "release": "standard-version",
-    "release:pre": "npm run release -- --prerelease alpha",
+    "release:beta": "npm run release -- --prerelease beta",
     "devtools:install": "node scripts/devtoolsInstaller",
     "postinstall": "electron-builder install-app-deps",
+    "translation:check": "ts-node ./scripts/translationCheck.ts",
     "test:e2e": "npm run compile && npm run test:e2e-dry",
     "test:e2e-dry": "xvfb-maybe -- playwright test",
     "lint": "eslint . --ext .js,.ts,.vue && stylelint \"./src/**/*.{css,scss,sass,vue}\"",
@@ -66,16 +67,14 @@
           "target": "deb",
           "arch": [
             "x64",
-            "armv7l",
+            "armv7l"
-            "arm64"
           ]
         },
         {
           "target": "AppImage",
           "arch": [
             "x64",
-            "armv7l",
+            "armv7l"
-            "arm64"
           ]
         }
       ],
@@ -121,10 +120,12 @@
   "dependencies": {
     "@electron/remote": "~2.0.1",
     "@faker-js/faker": "~6.1.2",
-    "@mdi/font": "~7.1.96",
+    "@jamescoyle/vue-icon": "~0.1.2",
+    "@mdi/font": "~7.2.96",
+    "@mdi/js": "~7.2.96",
     "@turf/helpers": "~6.5.0",
-    "@vueuse/core": "~8.7.5",
+    "@vueuse/core": "~10.4.1",
-    "ace-builds": "~1.14.0",
+    "ace-builds": "~1.24.1",
     "better-sqlite3": "~8.0.0",
     "electron-log": "~4.4.1",
     "electron-store": "~8.1.0",
@@ -132,22 +133,23 @@
     "electron-window-state": "~5.0.3",
     "encoding": "~0.1.13",
     "floating-vue": "~2.0.0-beta.20",
+    "json2php": "~0.0.7",
     "leaflet": "~1.7.1",
     "marked": "~4.0.19",
     "moment": "~2.29.4",
-    "mysql2": "~2.3.2",
+    "mysql2": "~3.5.2",
     "node-firebird": "~1.1.4",
-    "pg": "~8.7.1",
+    "pg": "~8.11.1",
     "pg-connection-string": "~2.5.0",
     "pg-query-stream": "~4.2.3",
     "pgsql-ast-parser": "~7.2.1",
-    "pinia": "~2.0.28",
+    "pinia": "~2.1.6",
     "source-map-support": "~0.5.20",
     "spectre.css": "~0.5.9",
-    "sql-formatter": "~12.0.3",
+    "sql-formatter": "~13.0.0",
     "ssh2-promise": "~1.0.2",
     "v-mask": "~2.3.0",
-    "vue": "~3.2.45",
+    "vue": "~3.3.4",
     "vue-i18n": "~9.2.2",
     "vuedraggable": "~4.1.0"
   },
@@ -170,13 +172,14 @@
     "chalk": "~4.1.2",
     "cross-env": "~7.0.2",
     "css-loader": "~6.5.0",
-    "electron": "~22.0.3",
+    "electron": "~22.3.23",
     "electron-builder": "~22.10.3",
     "eslint": "~7.32.0",
     "eslint-config-standard": "~16.0.3",
     "eslint-plugin-import": "~2.24.2",
     "eslint-plugin-node": "~11.1.0",
     "eslint-plugin-promise": "~5.2.0",
+    "eslint-plugin-simple-import-sort": "~10.0.0",
     "eslint-plugin-vue": "~8.0.3",
     "file-loader": "~6.2.0",
     "html-webpack-plugin": "~5.5.0",
@@ -197,6 +200,7 @@
     "stylelint-scss": "~4.3.0",
     "tree-kill": "~1.2.2",
     "ts-loader": "~9.2.8",
+    "ts-node": "~10.9.1",
     "typescript": "~4.6.3",
     "unzip-crx-3": "~0.2.0",
     "vue-eslint-parser": "~8.3.0",

scripts/translationCheck.ts

@@ -0,0 +1,45 @@
+/* eslint-disable @typescript-eslint/ban-ts-comment */
+import { enUS } from '../src/renderer/i18n/en-US';
+import { localesNames } from '../src/renderer/i18n/supported-locales';
+const locale = process.argv[2];
+let fullCount = 0;
+let checkCount = 0;
+
+if (!locale) {
+   console.log('Please specify locale code as first argument.');
+   process.exit();
+}
+
+if (!Object.keys(localesNames).includes(locale)) {
+   console.log(`Translation ${locale} not fount in supported locales.`);
+   process.exit();
+}
+
+console.log('Checking missing translations for:', locale);
+
+const i18nFile = require(`../src/renderer/i18n/${locale}`)[locale.replace('-', '')];
+
+for (const group in enUS) {
+   // @ts-ignore
+   fullCount += Object.keys(enUS[group]).length;
+
+   if (!Object.keys(i18nFile).includes(group)) {
+      console.log(`Group "\u001b[31m${group}\u001b[0m" missing!`);
+      continue;
+   }
+
+   // @ts-ignore
+   for (const term in enUS[group]) {
+      if (!Object.keys(i18nFile[group]).includes(term))
+         console.log(`Translation "\u001b[33m${group}.${term}\u001b[0m" missing!`);
+      // @ts-ignore
+      else if (i18nFile[group][term] === enUS[group][term]) {
+         console.log(`Term "\u001b[36m${group}.${term}\u001b[0m" not translated!`);
+         checkCount++;
+      }
+      else
+         checkCount++;
+   }
+}
+
+console.log(checkCount, 'of', fullCount, 'strings are present in', locale, `(\u001b[32m${(checkCount*100/fullCount).toFixed(1)}%\u001b[0m)`);

snap/snapcraft.yaml

@@ -4,7 +4,7 @@ summary: Open source SQL client made to be simple and complete.
 description: |
   Antares is an SQL client that aims to become an useful and complete tool, especially for developers.
   The target is to support as many databases as possible, and all major operating systems, including the ARM versions.
-base: core20
+base: core22
 
 grade: stable
 confinement: strict
@@ -31,10 +31,10 @@ parts:
       fi
       # Get the latest releases json
       echo "Get GitHub releases..."
-      wget --quiet https://api.github.com/repos/fabio286/antares/releases/latest -O releases.json
+      wget --quiet https://api.github.com/repos/fabio286/antares/releases -O releases.json
       # Get the version from the tag_name and the download URL.
-      VERSION=$(jq . releases.json | grep tag_name | cut -d'"' -f4 | sed s'/release-//')
+      VERSION=$(jq . releases.json | grep tag_name | head -1 | cut -d'"' -f4 | sed s'/release-//')
-      DEB_URL=$(cat releases.json | jq -r ".assets[] | select(.name | test(\"${FILTER}\")) | .browser_download_url")
+      DEB_URL=$(cat releases.json | jq -r ".[0].assets[] | select(.name | test(\"${FILTER}\")) | .browser_download_url")
       DEB=$(basename "${DEB_URL}")
       echo "Downloading ${DEB_URL}..."
       wget --quiet "${DEB_URL}" -O "${SNAPCRAFT_PART_INSTALL}/${DEB}"
@@ -79,7 +79,7 @@ parts:
       - libdb5.3
       - libdbus-1-3
       - libexpat1
-      - libffi7
+      - libffi8
       - libgcc-s1
       - libgcrypt20
       - libglib2.0-0
@@ -87,9 +87,9 @@ parts:
       - libgnutls30
       - libgpg-error0
       - libgssapi-krb5-2
-      - libhogweed5
+      - libhogweed6
       - libidn2-0
-      - libjson-c4
+      - libjson-c5
       - libk5crypto3
       - libkeyutils1
       - libkrb5-3
@@ -97,12 +97,12 @@ parts:
       - liblz4-1
       - liblzma5
       - libmount1
-      - libnettle7
+      - libnettle8
       - libp11-kit0
       - libpcre2-8-0
       - libselinux1
       - libsqlite3-0
-      - libssl1.1
+      - libssl3
       - libstdc++6
       - libsystemd0
       - libtasn1-6
@@ -119,10 +119,10 @@ parts:
   cleanup:
     after: [antares]
     plugin: nil
-    build-snaps: [gnome-3-38-2004]
+    build-snaps: [gnome-42-2204]
     override-prime: |
       set -eux
-      cd /snap/gnome-3-38-2004/current
+      cd /snap/gnome-42-2204/current
       find . -type f,l -exec rm -f $SNAPCRAFT_PRIME/{} \;
 
   mdns-lookup:
@@ -136,7 +136,7 @@ parts:
       - libnss-mdns
     override-prime: |
       set -eux
-      sed -Ee 's/^\s*hosts:(\s+)files/hosts:\1files mdns4_minimal \[NOTFOUND=return\]/' /snap/core20/current/etc/nsswitch.conf > $SNAPCRAFT_STAGE/etc/nsswitch.conf
+      sed -Ee 's/^\s*hosts:(\s+)files/hosts:\1files mdns4_minimal \[NOTFOUND=return\]/' /snap/core22/current/etc/nsswitch.conf > $SNAPCRAFT_STAGE/etc/nsswitch.conf
       snapcraftctl prime
     prime:
       - lib/$SNAPCRAFT_ARCH_TRIPLET/libnss_mdns4_minimal*
@@ -146,10 +146,7 @@ apps:
   antares:
     command: opt/Antares/antares --no-sandbox
     desktop: usr/share/applications/antares.desktop
-    extensions: [gnome-3-38]
+    extensions: [gnome]
-    environment:
-      # Fallback to XWayland if running in a Wayland session.
-      DISABLE_WAYLAND: 1
     plugs:
       - browser-support
       - cups-control

src/common/customizations/defaults.ts

@@ -31,11 +31,12 @@ export const defaults: Customizations = {
    routines: false,
    functions: false,
    schedulers: false,
-   // Settings
+   // Misc
    elementsWrapper: '',
    stringsWrapper: '"',
    tableAdd: false,
    tableTruncateDisableFKCheck: false,
+   tableDdl: false,
    viewAdd: false,
    triggerAdd: false,
    triggerFunctionAdd: false,

src/common/customizations/firebird.ts

@@ -1,6 +1,6 @@
+import firebirdTypes from '../data-types/firebird';
 import { Customizations } from '../interfaces/customizations';
 import { defaults } from './defaults';
-import firebirdTypes from '../data-types/firebird';
 
 export const customizations: Customizations = {
    ...defaults,

src/common/customizations/index.ts

@@ -1,7 +1,7 @@
+import * as firebird from 'common/customizations/firebird';
 import * as mysql from 'common/customizations/mysql';
 import * as postgresql from 'common/customizations/postgresql';
 import * as sqlite from 'common/customizations/sqlite';
-import * as firebird from 'common/customizations/firebird';
 import { Customizations } from 'common/interfaces/customizations';
 
 export default {

src/common/customizations/mysql.ts

@@ -1,6 +1,6 @@
+import mysqlTypes from '../data-types/mysql';
 import { Customizations } from '../interfaces/customizations';
 import { defaults } from './defaults';
-import mysqlTypes from '../data-types/mysql';
 
 export const customizations: Customizations = {
    ...defaults,
@@ -44,6 +44,7 @@ export const customizations: Customizations = {
    tableAdd: true,
    tableTruncateDisableFKCheck: true,
    tableDuplicate: true,
+   tableDdl: true,
    viewAdd: true,
    triggerAdd: true,
    routineAdd: true,

src/common/customizations/postgresql.ts

@@ -1,6 +1,6 @@
+import postgresqlTypes from '../data-types/postgresql';
 import { Customizations } from '../interfaces/customizations';
 import { defaults } from './defaults';
-import postgresqlTypes from '../data-types/postgresql';
 
 export const customizations: Customizations = {
    ...defaults,
@@ -35,11 +35,12 @@ export const customizations: Customizations = {
    triggerFunctions: true,
    routines: true,
    functions: true,
-   // Settings
+   // Misc
    elementsWrapper: '"',
    stringsWrapper: '\'',
    tableAdd: true,
    tableDuplicate: true,
+   tableDdl: true,
    viewAdd: true,
    triggerAdd: true,
    triggerFunctionAdd: true,

src/common/customizations/sqlite.ts

@@ -1,6 +1,6 @@
+import sqliteTypes from '../data-types/sqlite';
 import { Customizations } from '../interfaces/customizations';
 import { defaults } from './defaults';
-import sqliteTypes from '../data-types/sqlite';
 
 export const customizations: Customizations = {
    ...defaults,

src/common/interfaces/antares.ts

@@ -1,14 +1,15 @@
 import * as mysql from 'mysql2/promise';
 import * as pg from 'pg';
+import { FirebirdSQLClient } from 'src/main/libs/clients/FirebirdSQLClient';
 import MysqlExporter from 'src/main/libs/exporters/sql/MysqlExporter';
 import PostgreSQLExporter from 'src/main/libs/exporters/sql/PostgreSQLExporter';
 import MySQLImporter from 'src/main/libs/importers/sql/MySQLlImporter';
 import PostgreSQLImporter from 'src/main/libs/importers/sql/PostgreSQLImporter';
 import SSHConfig from 'ssh2-promise/lib/sshConfig';
+
 import { MySQLClient } from '../../main/libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../../main/libs/clients/PostgreSQLClient';
 import { SQLiteClient } from '../../main/libs/clients/SQLiteClient';
-import { FirebirdSQLClient } from 'src/main/libs/clients/FirebirdSQLClient';
 
 export type Client = MySQLClient | PostgreSQLClient | SQLiteClient | FirebirdSQLClient
 export type ClientCode = 'mysql' | 'maria' | 'pg' | 'sqlite' | 'firebird'
@@ -64,6 +65,7 @@ export interface ConnectionParams {
    sshKey?: string;
    sshPort?: number;
    sshPassphrase?: string;
+   sshKeepAliveInterval?: number;
 }
 
 export interface TypeInformations {

src/common/interfaces/customizations.ts

@@ -30,7 +30,7 @@ export interface Customizations {
    routines?: boolean;
    functions?: boolean;
    schedulers?: boolean;
-   // Settings
+   // Misc
    elementsWrapper: string;
    stringsWrapper: string;
    tableAdd?: boolean;
@@ -39,6 +39,7 @@ export interface Customizations {
    tableArray?: boolean;
    tableRealCount?: boolean;
    tableTruncateDisableFKCheck?: boolean;
+   tableDdl?: boolean;
    viewAdd?: boolean;
    viewSettings?: boolean;
    triggerAdd?: boolean;

src/common/libs/encrypter.ts

@@ -0,0 +1,28 @@
+import * as crypto from 'crypto';
+
+const algorithm = 'aes-256-gcm';
+
+function encrypt (text: string, password: string) {
+   const iv = crypto.randomBytes(16);
+   const key = crypto.scryptSync(password, 'antares', 32);
+   const cipher = crypto.createCipheriv(algorithm, key, iv);
+   const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
+   const authTag = cipher.getAuthTag();
+
+   return {
+      iv: iv.toString('hex'),
+      authTag: authTag.toString('hex'),
+      content: encrypted.toString('hex')
+   };
+}
+
+function decrypt (hash: { iv: string; content: string; authTag: string }, password: string) {
+   const key = crypto.scryptSync(password, 'antares', 32);
+   const decipher = crypto.createDecipheriv(algorithm, key, Buffer.from(hash.iv, 'hex'));
+   decipher.setAuthTag(Buffer.from(hash.authTag, 'hex'));
+   const decrpyted = decipher.update(hash.content, 'hex', 'utf8') + decipher.final('utf8');
+
+   return decrpyted;
+}
+
+export { decrypt, encrypt };

src/common/libs/sqlUtils.ts

@@ -1,12 +1,13 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-useless-escape */
-import * as moment from 'moment';
 import { lineString, point, polygon } from '@turf/helpers';
+import { BIT, BLOB, DATE, DATETIME, FLOAT, IS_MULTI_SPATIAL, NUMBER, SPATIAL, TEXT_SEARCH } from 'common/fieldTypes';
+import * as moment from 'moment';
+
 import customizations from '../customizations';
 import { ClientCode } from '../interfaces/antares';
-import { BLOB, BIT, DATE, DATETIME, FLOAT, SPATIAL, IS_MULTI_SPATIAL, NUMBER, TEXT_SEARCH } from 'common/fieldTypes';
-import hexToBinary, { HexChar } from './hexToBinary';
 import { getArrayDepth } from './getArrayDepth';
+import hexToBinary, { HexChar } from './hexToBinary';
 
 /**
  * Escapes a string fo SQL use
@@ -72,7 +73,7 @@ export const escapeAndQuote = (val: string, client: ClientCode) => {
 export const valueToSqlString = (args: {
       val: any;
       client: ClientCode;
-      field: {type: string; datePrecision: number; isArray?: boolean};
+      field: {type: string; datePrecision?: number; precision?: number | false; isArray?: boolean};
    }): string => {
    let parsedValue;
    const { val, client, field } = args;
@@ -105,7 +106,7 @@ export const valueToSqlString = (args: {
    else if (TEXT_SEARCH.includes(field.type))
       parsedValue = `'${val.replaceAll('\'', '\'\'')}'`;
    else if (BIT.includes(field.type))
-      parsedValue = `b'${hexToBinary(Buffer.from(val).toString('hex') as undefined as HexChar[])}'`;
+      parsedValue = `b'${hexToBinary(Buffer.from(new Uint8Array(Object.values(val))).toString('hex') as undefined as HexChar[])}'`;
    else if (BLOB.includes(field.type)) {
       let buffer: Buffer;
       if (val instanceof Uint8Array)

src/common/shortcuts.ts

@@ -1,22 +1,22 @@
 export const shortcutEvents: { [key: string]: { l18n: string; l18nParam?: string | number; context?: 'tab' }} = {
-   'run-or-reload': { l18n: 'message.runOrReload', context: 'tab' },
+   'run-or-reload': { l18n: 'application.runOrReload', context: 'tab' },
-   'open-new-tab': { l18n: 'message.openNewTab', context: 'tab' },
+   'open-new-tab': { l18n: 'application.openNewTab', context: 'tab' },
-   'close-tab': { l18n: 'message.closeTab', context: 'tab' },
+   'close-tab': { l18n: 'application.closeTab', context: 'tab' },
-   'format-query': { l18n: 'message.formatQuery', context: 'tab' },
+   'format-query': { l18n: 'database.formatQuery', context: 'tab' },
-   'kill-query': { l18n: 'message.killQuery', context: 'tab' },
+   'kill-query': { l18n: 'database.killQuery', context: 'tab' },
-   'query-history': { l18n: 'message.queryHistory', context: 'tab' },
+   'query-history': { l18n: 'database.queryHistory', context: 'tab' },
-   'clear-query': { l18n: 'message.clearQuery', context: 'tab' },
+   'clear-query': { l18n: 'database.clearQuery', context: 'tab' },
-   'next-tab': { l18n: 'message.nextTab' },
+   'next-tab': { l18n: 'application.nextTab' },
-   'prev-tab': { l18n: 'message.previousTab' },
+   'prev-tab': { l18n: 'application.previousTab' },
-   'open-all-connections': { l18n: 'message.openAllConnections' },
+   'open-all-connections': { l18n: 'application.openAllConnections' },
-   'open-filter': { l18n: 'message.openFilter' },
+   'open-filter': { l18n: 'application.openFilter' },
-   'next-page': { l18n: 'message.nextResultsPage' },
+   'next-page': { l18n: 'application.nextResultsPage' },
-   'prev-page': { l18n: 'message.previousResultsPage' },
+   'prev-page': { l18n: 'application.previousResultsPage' },
-   'toggle-console': { l18n: 'message.toggleConsole' },
+   'toggle-console': { l18n: 'application.toggleConsole' },
-   'save-content': { l18n: 'message.saveContent' },
+   'save-content': { l18n: 'application.saveContent' },
-   'create-connection': { l18n: 'message.createNewConnection' },
+   'create-connection': { l18n: 'connection.createNewConnection' },
-   'open-settings': { l18n: 'message.openSettings' },
+   'open-settings': { l18n: 'application.openSettings' },
-   'open-scratchpad': { l18n: 'message.openScratchpad' }
+   'open-scratchpad': { l18n: 'application.openScratchpad' }
 };
 
 interface ShortcutRecord {
@@ -124,7 +124,7 @@ const shortcuts: ShortcutRecord[] = [
 
 for (let i = 1; i <= 9; i++) {
    shortcutEvents[`select-tab-${i}`] = {
-      l18n: 'message.selectTabNumber',
+      l18n: 'application.selectTabNumber',
       l18nParam: i
    };
 
@@ -135,4 +135,4 @@ for (let i = 1; i <= 9; i++) {
    });
 }
 
-export { shortcuts, ShortcutRecord };
+export { ShortcutRecord, shortcuts };

src/main/ipc-handlers/application.ts

@@ -1,35 +1,44 @@
-import { app, ipcMain, dialog } from 'electron';
+import { app, dialog, ipcMain } from 'electron';
+
+import { validateSender } from '../libs/misc/validateSender';
 import { ShortcutRegister } from '../libs/ShortcutRegister';
 
 export default () => {
-   ipcMain.on('close-app', () => {
+   ipcMain.on('close-app', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       app.exit();
    });
 
    ipcMain.handle('show-open-dialog', (event, options) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       return dialog.showOpenDialog(options);
    });
 
-   ipcMain.handle('get-download-dir-path', () => {
+   ipcMain.handle('get-download-dir-path', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       return app.getPath('downloads');
    });
 
-   ipcMain.handle('resotre-default-shortcuts', () => {
+   ipcMain.handle('resotre-default-shortcuts', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.restoreDefaults();
    });
 
-   ipcMain.handle('reload-shortcuts', () => {
+   ipcMain.handle('reload-shortcuts', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.reload();
    });
 
    ipcMain.handle('update-shortcuts', (event, shortcuts) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.updateShortcuts(shortcuts);
    });
 
-   ipcMain.handle('unregister-shortcuts', () => {
+   ipcMain.handle('unregister-shortcuts', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.unregister();
    });

src/main/ipc-handlers/connection.ts

@@ -1,11 +1,15 @@
 import * as antares from 'common/interfaces/antares';
-import * as fs from 'fs';
 import { ipcMain } from 'electron';
-import { ClientsFactory } from '../libs/ClientsFactory';
+import * as fs from 'fs';
 import { SslOptions } from 'mysql2';
 
+import { ClientsFactory } from '../libs/ClientsFactory';
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('test-connection', async (event, conn: antares.ConnectionParams) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       const params = {
          host: conn.host,
          port: +conn.port,
@@ -23,6 +27,7 @@ export default (connections: {[key: string]: antares.Client}) => {
             port: number;
             privateKey: string;
             passphrase: string;
+            keepaliveInterval: number;
          }
       };
 
@@ -49,7 +54,8 @@ export default (connections: {[key: string]: antares.Client}) => {
             password: conn.sshPass,
             port: conn.sshPort ? conn.sshPort : 22,
             privateKey: conn.sshKey ? fs.readFileSync(conn.sshKey).toString() : null,
-            passphrase: conn.sshPassphrase
+            passphrase: conn.sshPassphrase,
+            keepaliveInterval: conn.sshKeepAliveInterval ?? conn.sshKeepAliveInterval*1000
          };
       }
 
@@ -80,6 +86,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('connect', async (event, conn: antares.ConnectionParams) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       const params = {
          host: conn.host,
          port: +conn.port,
@@ -98,6 +106,7 @@ export default (connections: {[key: string]: antares.Client}) => {
             port: number;
             privateKey: string;
             passphrase: string;
+            keepaliveInterval: number;
          }
       };
 
@@ -127,7 +136,8 @@ export default (connections: {[key: string]: antares.Client}) => {
             password: conn.sshPass,
             port: conn.sshPort ? conn.sshPort : 22,
             privateKey: conn.sshKey ? fs.readFileSync(conn.sshKey).toString() : null,
-            passphrase: conn.sshPassphrase
+            passphrase: conn.sshPassphrase,
+            keepaliveInterval: conn.sshKeepAliveInterval ?? conn.sshKeepAliveInterval*1000
          };
       }
 
@@ -153,6 +163,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('disconnect', (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       connections[uid].destroy();
       delete connections[uid];
    });

src/main/ipc-handlers/database.ts

@@ -0,0 +1,18 @@
+import * as antares from 'common/interfaces/antares';
+import { ipcMain } from 'electron';
+
+import { validateSender } from '../libs/misc/validateSender';
+
+export default (connections: {[key: string]: antares.Client}) => {
+   ipcMain.handle('get-databases', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
+      try {
+         const result = await connections[uid].getDatabases();
+         return { status: 'success', response: result };
+      }
+      catch (err) {
+         return { status: 'error', response: err.toString() };
+      }
+   });
+};

src/main/ipc-handlers/functions.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-function-informations', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getFunctionInformations(params);
          return { status: 'success', response: result };
@@ -13,6 +17,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-function', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropFunction(params);
          return { status: 'success' };
@@ -23,6 +29,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-function', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterFunction(params);
          return { status: 'success' };
@@ -33,6 +41,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-trigger-function', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterTriggerFunction(params);
          return { status: 'success' };
@@ -43,6 +53,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-function', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createFunction(params);
          return { status: 'success' };
@@ -53,6 +65,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-trigger-function', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createTriggerFunction(params);
          return { status: 'success' };

src/main/ipc-handlers/index.ts

@@ -1,16 +1,17 @@
 import * as antares from 'common/interfaces/antares';
 
-import connection from './connection';
-import tables from './tables';
-import views from './views';
-import triggers from './triggers';
-import routines from './routines';
-import functions from './functions';
-import schedulers from './schedulers';
-import updates from './updates';
 import application from './application';
+import connection from './connection';
+import database from './database';
+import functions from './functions';
+import routines from './routines';
+import schedulers from './schedulers';
 import schema from './schema';
+import tables from './tables';
+import triggers from './triggers';
+import updates from './updates';
 import users from './users';
+import views from './views';
 
 const connections: {[key: string]: antares.Client} = {};
 
@@ -22,6 +23,7 @@ export default () => {
    routines(connections);
    functions(connections);
    schedulers(connections);
+   database(connections);
    schema(connections);
    users(connections);
    updates();

src/main/ipc-handlers/routines.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-routine-informations', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getRoutineInformations(params);
          return { status: 'success', response: result };
@@ -13,6 +17,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-routine', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropRoutine(params);
          return { status: 'success' };
@@ -23,6 +29,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-routine', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterRoutine(params);
          return { status: 'success' };
@@ -33,6 +41,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-routine', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createRoutine(params);
          return { status: 'success' };

src/main/ipc-handlers/schedulers.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-scheduler-informations', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getEventInformations(params);
          return { status: 'success', response: result };
@@ -13,6 +17,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-scheduler', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropEvent(params);
          return { status: 'success' };
@@ -23,6 +29,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-scheduler', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterEvent(params);
          return { status: 'success' };
@@ -33,6 +41,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-scheduler', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createEvent(params);
          return { status: 'success' };
@@ -43,6 +53,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('toggle-scheduler', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          if (!params.enabled)
             await connections[params.uid].enableEvent({ ...params });

src/main/ipc-handlers/schema.ts

@@ -1,9 +1,11 @@
+import { ChildProcess, fork } from 'child_process';
 import * as antares from 'common/interfaces/antares';
 import * as workers from 'common/interfaces/workers';
+import { dialog, ipcMain } from 'electron';
 import * as fs from 'fs';
 import * as path from 'path';
-import { ChildProcess, fork } from 'child_process';
+
-import { ipcMain, dialog } from 'electron';
+import { validateSender } from '../libs/misc/validateSender';
 
 const isDevelopment = process.env.NODE_ENV !== 'production';
 
@@ -12,6 +14,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    let importer: ChildProcess = null;
 
    ipcMain.handle('create-schema', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createSchema(params);
 
@@ -23,6 +27,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('update-schema', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterSchema(params);
 
@@ -34,6 +40,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('delete-schema', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropSchema(params);
 
@@ -45,6 +53,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-schema-collation', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const collation = await connections[params.uid].getDatabaseCollation(
             params
@@ -61,6 +71,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-structure', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const structure: unknown = await connections[params.uid].getStructure(
             params.schemas
@@ -74,6 +86,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-collations', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].getCollations();
 
@@ -85,6 +99,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-variables', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].getVariables();
 
@@ -96,6 +112,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-engines', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result: unknown = await connections[uid].getEngines();
 
@@ -107,6 +125,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-version', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].getVersion();
 
@@ -118,6 +138,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-processes', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].getProcesses();
 
@@ -129,6 +151,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('kill-process', async (event, { uid, pid }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].killProcess(pid);
 
@@ -140,6 +164,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('use-schema', async (event, { uid, schema }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!schema) return;
 
       try {
@@ -152,6 +178,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('raw-query', async (event, { uid, query, schema, tabUid, autocommit }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!query) return;
 
       try {
@@ -171,6 +199,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('export', (event, { uid, type, tables, ...rest }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (exporter !== null) {
          exporter.kill();
          return;
@@ -245,7 +275,9 @@ export default (connections: {[key: string]: antares.Client}) => {
       });
    });
 
-   ipcMain.handle('abort-export', async () => {
+   ipcMain.handle('abort-export', async (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       let willAbort = false;
 
       if (exporter) {
@@ -267,6 +299,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('import-sql', async (event, options) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (importer !== null) {
          importer.kill();
          return;
@@ -318,7 +352,9 @@ export default (connections: {[key: string]: antares.Client}) => {
       });
    });
 
-   ipcMain.handle('abort-import-sql', async () => {
+   ipcMain.handle('abort-import-sql', async (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       let willAbort = false;
 
       if (importer) {
@@ -340,6 +376,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('kill-tab-query', async (event, { uid, tabUid }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!tabUid) return;
 
       try {
@@ -352,6 +390,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('commit-tab', async (event, { uid, tabUid }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!tabUid) return;
 
       try {
@@ -364,6 +404,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('rollback-tab', async (event, { uid, tabUid }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!tabUid) return;
 
       try {
@@ -376,6 +418,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('destroy-connection-to-commit', async (event, { uid, tabUid }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (!tabUid) return;
 
       try {

src/main/ipc-handlers/tables.ts

@@ -1,15 +1,19 @@
-import * as fs from 'fs';
+import { faker } from '@faker-js/faker';
+import customizations from 'common/customizations';
+import { ARRAY, BIT, BLOB, BOOLEAN, DATE, DATETIME, FLOAT, LONG_TEXT, NUMBER, TEXT, TEXT_SEARCH } from 'common/fieldTypes';
 import * as antares from 'common/interfaces/antares';
 import { InsertRowsParams } from 'common/interfaces/tableApis';
-import { ipcMain } from 'electron';
-import { faker } from '@faker-js/faker';
-import * as moment from 'moment';
 import { sqlEscaper } from 'common/libs/sqlUtils';
-import { TEXT, LONG_TEXT, ARRAY, TEXT_SEARCH, NUMBER, FLOAT, BLOB, BIT, DATE, DATETIME, BOOLEAN } from 'common/fieldTypes';
+import { ipcMain } from 'electron';
-import customizations from 'common/customizations';
+import * as fs from 'fs';
+import * as moment from 'moment';
+
+import { validateSender } from '../libs/misc/validateSender';
 
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-table-columns', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getTableColumns(params);
          return { status: 'success', response: result };
@@ -20,6 +24,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-table-data', async (event, { uid, schema, table, limit, page, sortParams, where }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const offset = (page - 1) * limit;
          const query = connections[uid]
@@ -45,6 +51,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-table-count', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getTableApproximateCount(params);
          return { status: 'success', response: result };
@@ -55,6 +63,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-table-options', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getTableOptions(params);
          return { status: 'success', response: result };
@@ -65,6 +75,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-table-indexes', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getTableIndexes(params);
 
@@ -75,7 +87,22 @@ export default (connections: {[key: string]: antares.Client}) => {
       }
    });
 
+   ipcMain.handle('get-table-ddl', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
+      try {
+         const result = await connections[params.uid].getTableDll(params);
+
+         return { status: 'success', response: result };
+      }
+      catch (err) {
+         return { status: 'error', response: err.toString() };
+      }
+   });
+
    ipcMain.handle('get-key-usage', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getKeyUsage(params);
 
@@ -87,6 +114,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('update-table-cell', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       delete params.row._antares_id;
       const { stringsWrapper: sw } = customizations[connections[params.uid]._client];
 
@@ -216,6 +245,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('delete-table-rows', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (params.primary) {
          // eslint-disable-next-line @typescript-eslint/no-explicit-any
          const idString = params.rows.map((row: {[key: string]: any}) => {
@@ -270,6 +301,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('insert-table-fake-rows', async (event, params: InsertRowsParams) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try { // TODO: move to client classes
          const rows: {[key: string]: string | number | boolean | Date | Buffer}[] = [];
 
@@ -392,6 +425,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('get-foreign-list', async (event, { uid, schema, table, column, description }) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const query = connections[uid]
             .select(`${column} AS foreign_column`)
@@ -425,6 +460,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-table', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createTable(params);
          return { status: 'success' };
@@ -435,6 +472,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-table', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterTable(params);
          return { status: 'success' };
@@ -445,6 +484,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('duplicate-table', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].duplicateTable(params);
          return { status: 'success' };
@@ -455,6 +496,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('truncate-table', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].truncateTable(params);
          return { status: 'success' };
@@ -465,6 +508,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-table', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropTable(params);
          return { status: 'success' };

src/main/ipc-handlers/triggers.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-trigger-informations', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getTriggerInformations(params);
          return { status: 'success', response: result };
@@ -13,6 +17,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-trigger', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropTrigger(params);
          return { status: 'success' };
@@ -23,6 +29,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-trigger', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterTrigger(params);
          return { status: 'success' };
@@ -33,6 +41,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-trigger', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createTrigger(params);
          return { status: 'success' };
@@ -43,6 +53,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('toggle-trigger', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          if (!params.enabled)
             await connections[params.uid].enableTrigger(params);

src/main/ipc-handlers/updates.ts

@@ -1,14 +1,27 @@
 import { ipcMain } from 'electron';
-import { autoUpdater } from 'electron-updater';
 import * as Store from 'electron-store';
-const persistentStore = new Store({ name: 'settings', clearInvalidConfig: true });
+import { autoUpdater } from 'electron-updater';
-const isMacOS = process.platform === 'darwin';
 
+import { validateSender } from '../libs/misc/validateSender';
+
+const persistentStore = new Store({
+   name: 'settings',
+   clearInvalidConfig: true,
+   migrations: {
+      '0.7.15': store => {
+         store.set('allow_prerelease', false);
+      }
+   }
+});
+
+const isMacOS = process.platform === 'darwin';
 let mainWindow: Electron.IpcMainEvent;
-autoUpdater.allowPrerelease = persistentStore.get('allow_prerelease', true) as boolean;
+autoUpdater.allowPrerelease = persistentStore.get('allow_prerelease', false) as boolean;
 
 export default () => {
    ipcMain.on('check-for-updates', event => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       mainWindow = event;
       if (process.windowsStore || (process.platform === 'linux' && !process.env.APPIMAGE))
          mainWindow.reply('no-auto-update');
@@ -22,31 +35,38 @@ export default () => {
       }
    });
 
-   ipcMain.on('restart-to-update', () => {
+   ipcMain.on('restart-to-update', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       autoUpdater.quitAndInstall();
    });
 
    // auto-updater events
-   autoUpdater.on('checking-for-update', () => {
+   autoUpdater.on('checking-for-update', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       mainWindow.reply('checking-for-update');
    });
 
-   autoUpdater.on('update-available', () => {
+   autoUpdater.on('update-available', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       if (isMacOS)
          mainWindow.reply('link-to-download');
       else
          mainWindow.reply('update-available');
    });
 
-   autoUpdater.on('update-not-available', () => {
+   autoUpdater.on('update-not-available', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       mainWindow.reply('update-not-available');
    });
 
-   autoUpdater.on('download-progress', data => {
+   autoUpdater.on('download-progress', event => {
-      mainWindow.reply('download-progress', data);
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+      mainWindow.reply('download-progress', event);
    });
 
-   autoUpdater.on('update-downloaded', () => {
+   autoUpdater.on('update-downloaded', (event) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
       mainWindow.reply('update-downloaded');
    });
 

src/main/ipc-handlers/users.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-users', async (event, uid) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[uid].getUsers();
          return { status: 'success', response: result };

src/main/ipc-handlers/views.ts

@@ -1,8 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import { ipcMain } from 'electron';
 
+import { validateSender } from '../libs/misc/validateSender';
+
 export default (connections: {[key: string]: antares.Client}) => {
    ipcMain.handle('get-view-informations', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          const result = await connections[params.uid].getViewInformations(params);
          return { status: 'success', response: result };
@@ -13,6 +17,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('drop-view', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].dropView(params);
          return { status: 'success' };
@@ -23,6 +29,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('alter-view', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].alterView(params);
          return { status: 'success' };
@@ -33,6 +41,8 @@ export default (connections: {[key: string]: antares.Client}) => {
    });
 
    ipcMain.handle('create-view', async (event, params) => {
+      if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
+
       try {
          await connections[params.uid].createView(params);
          return { status: 'success' };

src/main/libs/AntaresCore.ts

@@ -162,6 +162,10 @@ export abstract class AntaresCore {
       throw new Error('Method "getDbConfig" not implemented');
    }
 
+   getDatabases () {
+      throw new Error('Method "getDatabases" not implemented');
+   }
+
    createSchema (...args: any) {
       throw new Error('Method "createSchema" not implemented');
    }
@@ -174,6 +178,10 @@ export abstract class AntaresCore {
       throw new Error('Method "dropSchema" not implemented');
    }
 
+   getTableDll (...args: any) {
+      throw new Error('Method "getTableDll" not implemented');
+   }
+
    getDatabaseCollation (...args: any) {
       throw new Error('Method "getDatabaseCollation" not implemented');
    }

src/main/libs/ClientsFactory.ts

@@ -1,8 +1,9 @@
 import * as antares from 'common/interfaces/antares';
+
+import { FirebirdSQLClient } from './clients/FirebirdSQLClient';
 import { MySQLClient } from './clients/MySQLClient';
 import { PostgreSQLClient } from './clients/PostgreSQLClient';
 import { SQLiteClient } from './clients/SQLiteClient';
-import { FirebirdSQLClient } from './clients/FirebirdSQLClient';
 
 export class ClientsFactory {
    static getClient (args: antares.ClientParams) {

src/main/libs/ShortcutRegister.ts

@@ -1,6 +1,6 @@
+import { ShortcutRecord, shortcuts } from 'common/shortcuts';
 import { BrowserWindow, globalShortcut, Menu, MenuItem, MenuItemConstructorOptions } from 'electron';
 import * as Store from 'electron-store';
-import { ShortcutRecord, shortcuts } from 'common/shortcuts';
 
 const shortcutsStore = new Store({ name: 'shortcuts' });
 const isDevelopment = process.env.NODE_ENV !== 'production';

src/main/libs/clients/FirebirdSQLClient.ts

@@ -1,9 +1,10 @@
-import * as path from 'path';
-import * as antares from 'common/interfaces/antares';
-import * as firebird from 'node-firebird';
-import { AntaresCore } from '../AntaresCore';
 import dataTypes from 'common/data-types/firebird';
 import { FLOAT, NUMBER } from 'common/fieldTypes';
+import * as antares from 'common/interfaces/antares';
+import * as firebird from 'node-firebird';
+import * as path from 'path';
+
+import { AntaresCore } from '../AntaresCore';
 
 export class FirebirdSQLClient extends AntaresCore {
    private _schema?: string;

src/main/libs/clients/MySQLClient.ts

@@ -1,7 +1,8 @@
+import dataTypes from 'common/data-types/mysql';
 import * as antares from 'common/interfaces/antares';
 import * as mysql from 'mysql2/promise';
+
 import { AntaresCore } from '../AntaresCore';
-import dataTypes from 'common/data-types/mysql';
 import SSH2Promise = require('ssh2-promise');
 import SSHConfig from 'ssh2-promise/lib/sshConfig';
 
@@ -9,6 +10,8 @@ export class MySQLClient extends AntaresCore {
    private _schema?: string;
    private _runningConnections: Map<string, number>;
    private _connectionsToCommit: Map<string, mysql.Connection | mysql.PoolConnection>;
+   private _keepaliveTimer: NodeJS.Timer;
+   private _keepaliveMs: number;
    _connection?: mysql.Connection | mysql.Pool;
    _params: mysql.ConnectionOptions & {schema: string; ssl?: mysql.SslOptions; ssh?: SSHConfig; readonly: boolean};
 
@@ -52,6 +55,7 @@ export class MySQLClient extends AntaresCore {
       this._schema = null;
       this._runningConnections = new Map();
       this._connectionsToCommit = new Map();
+      this._keepaliveMs = 10*60*1000;
    }
 
    private _getType (field: mysql.FieldPacket & { columnType?: number; columnLength?: number }) {
@@ -152,7 +156,6 @@ export class MySQLClient extends AntaresCore {
 
             this._ssh = new SSH2Promise({
                ...this._params.ssh,
-               keepaliveInterval: 30*60*1000,
                debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
             });
 
@@ -182,6 +185,8 @@ export class MySQLClient extends AntaresCore {
 
    destroy () {
       this._connection.end();
+      clearInterval(this._keepaliveTimer);
+      this._keepaliveTimer = undefined;
       if (this._ssh) this._ssh.close();
    }
 
@@ -243,9 +248,19 @@ export class MySQLClient extends AntaresCore {
             conn.query(`SET SESSION sql_mode = '${sqlMode.filter((m: string) => !['ANSI', 'ANSI_QUOTES'].includes(m)).join(',')}'`);
       });
 
+      this._keepaliveTimer = setInterval(async () => {
+         await this.keepAlive();
+      }, this._keepaliveMs);
+
       return connection;
    }
 
+   private async keepAlive () {
+      const connection = await (this._connection as mysql.Pool).getConnection();
+      await connection.ping();
+      connection.release();
+   }
+
    use (schema: string) {
       this._schema = schema;
       return this.raw(`USE \`${schema}\``);
@@ -567,7 +582,7 @@ export class MySQLClient extends AntaresCore {
       return rows.map((field) => {
          const numLengthMatch = field.COLUMN_TYPE.match(/int\(([^)]+)\)/);
          const numLength = numLengthMatch ? +numLengthMatch.pop() : field.NUMERIC_PRECISION || null;
-         const enumValues = /(enum|set)/.test(field.COLUMN_TYPE)
+         const enumValues = /(enum)/.test(field.COLUMN_TYPE)
             ? field.COLUMN_TYPE.match(/\(([^)]+)\)/)[0].slice(1, -1)
             : null;
 
@@ -674,11 +689,11 @@ export class MySQLClient extends AntaresCore {
 
       return rows.map(row => {
          return {
-            unique: !row.Non_unique,
+            unique: !Number(row.Non_unique),
             name: row.Key_name,
             column: row.Column_name,
             indexType: row.Index_type,
-            type: row.Key_name === 'PRIMARY' ? 'PRIMARY' : !row.Non_unique ? 'UNIQUE' : row.Index_type === 'FULLTEXT' ? 'FULLTEXT' : 'INDEX',
+            type: row.Key_name === 'PRIMARY' ? 'PRIMARY' : !Number(row.Non_unique) ? 'UNIQUE' : row.Index_type === 'FULLTEXT' ? 'FULLTEXT' : 'INDEX',
             cardinality: row.Cardinality,
             comment: row.Comment,
             indexComment: row.Index_comment
@@ -686,6 +701,17 @@ export class MySQLClient extends AntaresCore {
       });
    }
 
+   async getTableDll ({ schema, table }: { schema: string; table: string }) {
+      const { rows } = await this.raw<antares.QueryResult<{
+         'Create Table'?: string;
+         Table: string;
+      }>>(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
+
+      if (rows.length)
+         return rows[0]['Create Table'];
+      else return '';
+   }
+
    async getKeyUsage ({ schema, table }: { schema: string; table: string }) {
       interface KeyResult {
          TABLE_SCHEMA: string;
@@ -738,7 +764,7 @@ export class MySQLClient extends AntaresCore {
    }
 
    async getUsers () {
-      const { rows } = await this.raw('SELECT `user`, `host`, authentication_string AS `password` FROM `mysql`.`user`');
+      const { rows } = await this.raw('SELECT `user` as \'user\', `host` as \'host\', authentication_string AS `password` FROM `mysql`.`user`');
 
       return rows.map(row => {
          return {
@@ -839,21 +865,23 @@ export class MySQLClient extends AntaresCore {
          options
       } = params;
 
-      let sql = `ALTER TABLE \`${schema}\`.\`${table}\` `;
+      const sql = `ALTER TABLE \`${schema}\`.\`${table}\` `;
-      const alterColumns: string[] = [];
+      const alterColumnsAdd: string[] = [];
+      const alterColumnsChange: string[] = [];
+      const alterColumnsDrop: string[] = [];
 
       // OPTIONS
-      if ('comment' in options) alterColumns.push(`COMMENT='${options.comment}'`);
+      if ('comment' in options) alterColumnsChange.push(`COMMENT='${options.comment}'`);
-      if ('engine' in options) alterColumns.push(`ENGINE=${options.engine}`);
+      if ('engine' in options) alterColumnsChange.push(`ENGINE=${options.engine}`);
-      if ('autoIncrement' in options) alterColumns.push(`AUTO_INCREMENT=${+options.autoIncrement}`);
+      if ('autoIncrement' in options) alterColumnsChange.push(`AUTO_INCREMENT=${+options.autoIncrement}`);
-      if ('collation' in options) alterColumns.push(`COLLATE='${options.collation}'`);
+      if ('collation' in options) alterColumnsChange.push(`COLLATE='${options.collation}'`);
 
       // ADD FIELDS
       additions.forEach(addition => {
          const typeInfo = this.getTypeInfo(addition.type);
          const length = typeInfo.length ? addition.enumValues || addition.numLength || addition.charLength || addition.datePrecision : false;
 
-         alterColumns.push(`ADD COLUMN \`${addition.name}\` 
+         alterColumnsAdd.push(`ADD COLUMN \`${addition.name}\` 
             ${addition.type.toUpperCase()}${length ? `(${length}${addition.numScale ? `,${addition.numScale}` : ''})` : ''} 
             ${addition.unsigned ? 'UNSIGNED' : ''} 
             ${addition.zerofill ? 'ZEROFILL' : ''}
@@ -872,18 +900,18 @@ export class MySQLClient extends AntaresCore {
          let type = addition.type;
 
          if (type === 'PRIMARY')
-            alterColumns.push(`ADD PRIMARY KEY (${fields})`);
+            alterColumnsAdd.push(`ADD PRIMARY KEY (${fields})`);
          else {
             if (type === 'UNIQUE')
                type = 'UNIQUE INDEX';
 
-            alterColumns.push(`ADD ${type} \`${addition.name}\` (${fields})`);
+            alterColumnsAdd.push(`ADD ${type} \`${addition.name}\` (${fields})`);
          }
       });
 
       // ADD FOREIGN KEYS
       foreignChanges.additions.forEach(addition => {
-         alterColumns.push(`ADD CONSTRAINT \`${addition.constraintName}\` FOREIGN KEY (\`${addition.field}\`) REFERENCES \`${addition.refTable}\` (\`${addition.refField}\`) ON UPDATE ${addition.onUpdate} ON DELETE ${addition.onDelete}`);
+         alterColumnsAdd.push(`ADD CONSTRAINT \`${addition.constraintName}\` FOREIGN KEY (\`${addition.field}\`) REFERENCES \`${addition.refTable}\` (\`${addition.refField}\`) ON UPDATE ${addition.onUpdate} ON DELETE ${addition.onDelete}`);
       });
 
       // CHANGE FIELDS
@@ -891,7 +919,7 @@ export class MySQLClient extends AntaresCore {
          const typeInfo = this.getTypeInfo(change.type);
          const length = typeInfo.length ? change.enumValues || change.numLength || change.charLength || change.datePrecision : false;
 
-         alterColumns.push(`CHANGE COLUMN \`${change.orgName}\` \`${change.name}\` 
+         alterColumnsChange.push(`CHANGE COLUMN \`${change.orgName}\` \`${change.name}\` 
             ${change.type.toUpperCase()}${length ? `(${length}${change.numScale ? `,${change.numScale}` : ''})` : ''} 
             ${change.unsigned ? 'UNSIGNED' : ''} 
             ${change.zerofill ? 'ZEROFILL' : ''}
@@ -907,53 +935,56 @@ export class MySQLClient extends AntaresCore {
       // CHANGE INDEX
       indexChanges.changes.forEach(change => {
          if (change.oldType === 'PRIMARY')
-            alterColumns.push('DROP PRIMARY KEY');
+            alterColumnsChange.push('DROP PRIMARY KEY');
          else
-            alterColumns.push(`DROP INDEX \`${change.oldName}\``);
+            alterColumnsChange.push(`DROP INDEX \`${change.oldName}\``);
 
          const fields = change.fields.map(field => `\`${field}\``).join(',');
          let type = change.type;
 
          if (type === 'PRIMARY')
-            alterColumns.push(`ADD PRIMARY KEY (${fields})`);
+            alterColumnsChange.push(`ADD PRIMARY KEY (${fields})`);
          else {
             if (type === 'UNIQUE')
                type = 'UNIQUE INDEX';
 
-            alterColumns.push(`ADD ${type} \`${change.name}\` (${fields})`);
+            alterColumnsChange.push(`ADD ${type} \`${change.name}\` (${fields})`);
          }
       });
 
       // CHANGE FOREIGN KEYS
       foreignChanges.changes.forEach(change => {
-         alterColumns.push(`DROP FOREIGN KEY \`${change.oldName}\``);
+         alterColumnsChange.push(`DROP FOREIGN KEY \`${change.oldName}\``);
-         alterColumns.push(`ADD CONSTRAINT \`${change.constraintName}\` FOREIGN KEY (\`${change.field}\`) REFERENCES \`${change.refTable}\` (\`${change.refField}\`) ON UPDATE ${change.onUpdate} ON DELETE ${change.onDelete}`);
+         alterColumnsChange.push(`ADD CONSTRAINT \`${change.constraintName}\` FOREIGN KEY (\`${change.field}\`) REFERENCES \`${change.refTable}\` (\`${change.refField}\`) ON UPDATE ${change.onUpdate} ON DELETE ${change.onDelete}`);
       });
 
       // DROP FIELDS
       deletions.forEach(deletion => {
-         alterColumns.push(`DROP COLUMN \`${deletion.name}\``);
+         alterColumnsDrop.push(`DROP COLUMN \`${deletion.name}\``);
       });
 
       // DROP INDEX
       indexChanges.deletions.forEach(deletion => {
          if (deletion.type === 'PRIMARY')
-            alterColumns.push('DROP PRIMARY KEY');
+            alterColumnsDrop.push('DROP PRIMARY KEY');
          else
-            alterColumns.push(`DROP INDEX \`${deletion.name}\``);
+            alterColumnsDrop.push(`DROP INDEX \`${deletion.name}\``);
       });
 
       // DROP FOREIGN KEYS
       foreignChanges.deletions.forEach(deletion => {
-         alterColumns.push(`DROP FOREIGN KEY \`${deletion.constraintName}\``);
+         alterColumnsDrop.push(`DROP FOREIGN KEY \`${deletion.constraintName}\``);
       });
 
-      sql += alterColumns.join(', ');
+      const alterQueryes = [];
+      if (alterColumnsAdd.length) alterQueryes.push(sql+alterColumnsAdd.join(', '));
+      if (alterColumnsChange.length) alterQueryes.push(sql+alterColumnsChange.join(', '));
+      if (alterColumnsDrop.length) alterQueryes.push(sql+alterColumnsDrop.join(', '));
 
       // RENAME
-      if (options.name) sql += `; RENAME TABLE \`${schema}\`.\`${table}\` TO \`${schema}\`.\`${options.name}\``;
+      if (options.name) alterQueryes.push(`RENAME TABLE \`${schema}\`.\`${table}\` TO \`${schema}\`.\`${options.name}\``);
 
-      return await this.raw(sql);
+      return await this.raw(alterQueryes.join(';'));
    }
 
    async duplicateTable (params: { schema: string; table: string }) {

src/main/libs/clients/PostgreSQLClient.ts

@@ -1,11 +1,12 @@
+import dataTypes from 'common/data-types/postgresql';
 import * as antares from 'common/interfaces/antares';
-import * as mysql from 'mysql2';
 import * as pg from 'pg';
 import * as pgAst from 'pgsql-ast-parser';
+
 import { AntaresCore } from '../AntaresCore';
-import dataTypes from 'common/data-types/postgresql';
 import SSH2Promise = require('ssh2-promise');
 import SSHConfig from 'ssh2-promise/lib/sshConfig';
+import { ConnectionOptions } from 'tls';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function pgToString (value: any) {
@@ -84,6 +85,8 @@ export class PostgreSQLClient extends AntaresCore {
    private _schema?: string;
    private _runningConnections: Map<string, number>;
    private _connectionsToCommit: Map<string, pg.Client | pg.PoolClient>;
+   private _keepaliveTimer: NodeJS.Timer;
+   private _keepaliveMs: number;
    protected _connection?: pg.Client | pg.Pool;
    private types: {[key: string]: string} = {};
    private _arrayTypes: {[key: string]: string} = {
@@ -96,7 +99,7 @@ export class PostgreSQLClient extends AntaresCore {
       _varchar: 'CHARACTER VARYING'
    }
 
-   _params: pg.ClientConfig & {schema: string; ssl?: mysql.SslOptions; ssh?: SSHConfig; readonly: boolean};
+   _params: pg.ClientConfig & {schema: string; ssl?: ConnectionOptions; ssh?: SSHConfig; readonly: boolean};
 
    constructor (args: antares.ClientParams) {
       super(args);
@@ -104,6 +107,7 @@ export class PostgreSQLClient extends AntaresCore {
       this._schema = null;
       this._runningConnections = new Map();
       this._connectionsToCommit = new Map();
+      this._keepaliveMs = 10*60*1000;
 
       for (const key in pg.types.builtins) {
          const builtinKey = key as builtinsTypes;
@@ -151,9 +155,9 @@ export class PostgreSQLClient extends AntaresCore {
          host: this._params.host,
          port: this._params.port,
          user: this._params.user,
-         database: undefined as string | undefined,
+         database: 'postgres' as string,
          password: this._params.password,
-         ssl: null as mysql.SslOptions
+         ssl: null as ConnectionOptions
       };
 
       if (this._params.database?.length) dbConfig.database = this._params.database;
@@ -164,7 +168,6 @@ export class PostgreSQLClient extends AntaresCore {
          try {
             this._ssh = new SSH2Promise({
                ...this._params.ssh,
-               keepaliveInterval: 30*60*1000,
                debug: process.env.NODE_ENV !== 'production' ? (s) => console.log(s) : null
             });
 
@@ -222,14 +225,26 @@ export class PostgreSQLClient extends AntaresCore {
          });
       }
 
+      this._keepaliveTimer = setInterval(async () => {
+         await this.keepAlive();
+      }, this._keepaliveMs);
+
       return connection;
    }
 
    destroy () {
       this._connection.end();
+      clearInterval(this._keepaliveTimer);
+      this._keepaliveTimer = undefined;
       if (this._ssh) this._ssh.close();
    }
 
+   private async keepAlive () {
+      const connection = await this._connection.connect() as pg.PoolClient;
+      await connection.query('SELECT 1+1');
+      connection.release();
+   }
+
    use (schema: string, connection?: pg.Client | pg.PoolClient) {
       this._schema = schema;
 
@@ -247,6 +262,18 @@ export class PostgreSQLClient extends AntaresCore {
       return [];
    }
 
+   async getDatabases () {
+      const { rows } = await this.raw('SELECT datname FROM pg_database WHERE datistemplate = false');
+      if (rows) {
+         return rows.reduce((acc, cur) => {
+            acc.push(cur.datname);
+            return acc;
+         }, [] as string[]);
+      }
+      else
+         return [];
+   }
+
    async getStructure (schemas: Set<string>) {
       /* eslint-disable camelcase */
       interface ShowTableResult {
@@ -567,6 +594,142 @@ export class PostgreSQLClient extends AntaresCore {
       }, {} as {table: string; schema: string}[]);
    }
 
+   // eslint-disable-next-line @typescript-eslint/no-unused-vars
+   async getTableDll ({ schema, table }: { schema: string; table: string }) {
+      // const { rows } = await this.raw<antares.QueryResult<{'ddl'?: string}>>(`
+      //    SELECT
+      //       'CREATE TABLE ' || relname || E'\n(\n' ||
+      //             array_to_string(
+      //                array_agg('    ' || column_name || ' ' ||  type || ' '|| not_null)
+      //                , E',\n'
+      //             ) || E'\n);\n' AS ddl
+      //    FROM (
+      //          SELECT
+      //             a.attname AS column_name
+      //             , pg_catalog.format_type(a.atttypid, a.atttypmod) AS type
+      //             , CASE WHEN a.attnotnull THEN 'NOT NULL' ELSE 'NULL' END AS not_null
+      //             , c.relname
+      //          FROM pg_attribute a, pg_class c, pg_type t
+      //          WHERE a.attnum > 0
+      //             AND a.attrelid = c.oid
+      //             AND a.atttypid = t.oid
+      //             AND c.relname = '${table}'
+      //          ORDER BY a.attnum
+      //    ) AS tabledefinition
+      //    GROUP BY relname
+      // `);
+
+      // if (rows.length)
+      //    return rows[0].ddl;
+      // else return '';
+
+      /* eslint-disable camelcase */
+      interface SequenceRecord {
+         sequence_catalog: string;
+         sequence_schema: string;
+         sequence_name: string;
+         data_type: string;
+         numeric_precision: number;
+         numeric_precision_radix: number;
+         numeric_scale: number;
+         start_value: string;
+         minimum_value: string;
+         maximum_value: string;
+         increment: string;
+         cycle_option: string;
+      }
+      /* eslint-enable camelcase */
+
+      let createSql = '';
+      const sequences = [];
+      const columnsSql = [];
+      const arrayTypes: {[key: string]: string} = {
+         _int2: 'smallint',
+         _int4: 'integer',
+         _int8: 'bigint',
+         _float4: 'real',
+         _float8: 'double precision',
+         _char: '"char"',
+         _varchar: 'character varying'
+      };
+
+      // Table columns
+      const { rows } = await this.raw(`
+         SELECT * 
+         FROM "information_schema"."columns" 
+         WHERE "table_schema" = '${schema}' 
+         AND "table_name" = '${table}' 
+         ORDER BY "ordinal_position" ASC
+      `, { schema: 'information_schema' });
+
+      if (!rows.length) return '';
+
+      for (const column of rows) {
+         let fieldType = column.data_type;
+         if (fieldType === 'USER-DEFINED') fieldType = `"${schema}".${column.udt_name}`;
+         else if (fieldType === 'ARRAY') {
+            if (Object.keys(arrayTypes).includes(fieldType))
+               fieldType = arrayTypes[column.udt_name] + '[]';
+            else
+               fieldType = column.udt_name.replaceAll('_', '') + '[]';
+         }
+
+         const columnArr = [
+            `"${column.column_name}"`,
+            `${fieldType}${column.character_maximum_length ? `(${column.character_maximum_length})` : ''}`
+         ];
+
+         if (column.column_default) {
+            columnArr.push(`DEFAULT ${column.column_default}`);
+            if (column.column_default.includes('nextval')) {
+               const sequenceName = column.column_default.split('\'')[1];
+               sequences.push(sequenceName);
+            }
+         }
+         if (column.is_nullable === 'NO') columnArr.push('NOT NULL');
+
+         columnsSql.push(columnArr.join(' '));
+      }
+
+      // Table sequences
+      for (let sequence of sequences) {
+         if (sequence.includes('.')) sequence = sequence.split('.')[1];
+
+         const { rows } = await this.select('*')
+            .schema('information_schema')
+            .from('sequences')
+            .where({ sequence_schema: `= '${schema}'`, sequence_name: `= '${sequence}'` })
+            .run<SequenceRecord>();
+
+         if (rows.length) {
+            createSql += `CREATE SEQUENCE "${schema}"."${sequence}"
+   START WITH ${rows[0].start_value}
+   INCREMENT BY ${rows[0].increment}
+   MINVALUE ${rows[0].minimum_value}
+   MAXVALUE ${rows[0].maximum_value}
+   CACHE 1;\n`;
+         }
+      }
+
+      // Table create
+      createSql += `\nCREATE TABLE "${schema}"."${table}"(
+   ${columnsSql.join(',\n   ')}
+);\n`;
+
+      // Table indexes
+      createSql += '\n';
+      const { rows: indexes } = await this.select('*')
+         .schema('pg_catalog')
+         .from('pg_indexes')
+         .where({ schemaname: `= '${schema}'`, tablename: `= '${table}'` })
+         .run<{indexdef: string}>();
+
+      for (const index of indexes)
+         createSql += `${index.indexdef};\n`;
+
+      return createSql;
+   }
+
    async getKeyUsage ({ schema, table }: { schema: string; table: string }) {
       /* eslint-disable camelcase */
       interface KeyResult {
@@ -1416,7 +1579,7 @@ export class PostgreSQLClient extends AntaresCore {
       if (args.tabUid && isPool)
          this._runningConnections.set(args.tabUid, (connection as pg.PoolClient & { processID: number }).processID);
 
-      if (args.schema && args.schema !== 'public')
+      if (args.schema)
          await this.use(args.schema, connection);
 
       for (const query of queries) {

src/main/libs/clients/SQLiteClient.ts

@@ -1,8 +1,9 @@
-import * as antares from 'common/interfaces/antares';
 import * as sqlite from 'better-sqlite3';
-import { AntaresCore } from '../AntaresCore';
 import dataTypes from 'common/data-types/sqlite';
-import { NUMBER, FLOAT, TIME, DATETIME } from 'common/fieldTypes';
+import { DATETIME, FLOAT, NUMBER, TIME } from 'common/fieldTypes';
+import * as antares from 'common/interfaces/antares';
+
+import { AntaresCore } from '../AntaresCore';
 
 export class SQLiteClient extends AntaresCore {
    private _schema?: string;
@@ -34,8 +35,8 @@ export class SQLiteClient extends AntaresCore {
       });
    }
 
-   destroy (): void {
+   destroy () {
-      return null;
+      this._connection.close();
    }
 
    use (): void {
@@ -295,7 +296,13 @@ export class SQLiteClient extends AntaresCore {
       // ADD FIELDS
       fields.forEach(field => {
          const typeInfo = this.getTypeInfo(field.type);
-         const length = typeInfo?.length ? field.enumValues || field.numLength || field.charLength || field.datePrecision : false;
+         const length = typeInfo?.length
+            ? field.enumValues ||
+              field.numLength ||
+              field.numPrecision ||
+              field.charLength ||
+              field.datePrecision
+            : false;
 
          newColumns.push(`"${field.name}" 
             ${field.type.toUpperCase()}${length ? `(${length})` : ''} 
@@ -425,7 +432,7 @@ export class SQLiteClient extends AntaresCore {
 
       return results.rows.map(row => {
          return {
-            sql: row.sql.match(/(?<=AS ).*?$/gs)[0],
+            sql: row.sql.match(/(?<=(AS|as)( |\n)).*?$/gs)[0],
             name: view
          };
       })[0];

src/main/libs/exporters/BaseExporter.ts

@@ -1,8 +1,8 @@
 import * as exporter from 'common/interfaces/exporter';
-import * as fs from 'fs';
-import { createGzip, Gzip } from 'zlib';
-import * as path from 'path';
 import * as EventEmitter from 'events';
+import * as fs from 'fs';
+import * as path from 'path';
+import { createGzip, Gzip } from 'zlib';
 
 export class BaseExporter extends EventEmitter {
    protected _tables;

src/main/libs/exporters/sql/MysqlExporter.ts

@@ -1,8 +1,9 @@
 import * as exporter from 'common/interfaces/exporter';
-import * as mysql from 'mysql2/promise';
-import { SqlExporter } from './SqlExporter';
-import { MySQLClient } from '../../clients/MySQLClient';
 import { valueToSqlString } from 'common/libs/sqlUtils';
+import * as mysql from 'mysql2/promise';
+
+import { MySQLClient } from '../../clients/MySQLClient';
+import { SqlExporter } from './SqlExporter';
 
 export default class MysqlExporter extends SqlExporter {
    protected _client: MySQLClient;

src/main/libs/exporters/sql/PostgreSQLExporter.ts

@@ -1,11 +1,12 @@
 import * as antares from 'common/interfaces/antares';
 import * as exporter from 'common/interfaces/exporter';
-import { SqlExporter } from './SqlExporter';
+import { valueToSqlString } from 'common/libs/sqlUtils';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import * as QueryStream from 'pg-query-stream';
+
 import { PostgreSQLClient } from '../../clients/PostgreSQLClient';
-import { valueToSqlString } from 'common/libs/sqlUtils';
+import { SqlExporter } from './SqlExporter';
 
 export default class PostgreSQLExporter extends SqlExporter {
    constructor (client: PostgreSQLClient, tables: exporter.TableParams[], options: exporter.ExportOptions) {

src/main/libs/exporters/sql/SqlExporter.ts

@@ -1,4 +1,5 @@
 import * as moment from 'moment';
+
 import { MySQLClient } from '../../clients/MySQLClient';
 import { PostgreSQLClient } from '../../clients/PostgreSQLClient';
 import { BaseExporter } from '../BaseExporter';

src/main/libs/importers/BaseImporter.ts

@@ -1,6 +1,6 @@
 import * as importer from 'common/interfaces/importer';
-import * as fs from 'fs';
 import * as EventEmitter from 'events';
+import * as fs from 'fs';
 
 export class BaseImporter extends EventEmitter {
    protected _options;

src/main/libs/importers/sql/MySQLlImporter.ts

@@ -1,6 +1,7 @@
-import * as mysql from 'mysql2';
 import * as importer from 'common/interfaces/importer';
 import * as fs from 'fs/promises';
+import * as mysql from 'mysql2';
+
 import MySQLParser from '../../parsers/MySQLParser';
 import { BaseImporter } from '../BaseImporter';
 
@@ -47,7 +48,7 @@ export default class MySQLImporter extends BaseImporter {
                catch (error) {
                   this.emit('query-error', {
                      sql: query,
-                     message: error.sqlMessage,
+                     message: error.sqlMessage || error.message,
                      sqlSnippet: error.sql,
                      time: new Date().getTime()
                   });

src/main/libs/importers/sql/PostgreSQLImporter.ts

@@ -1,6 +1,7 @@
-import * as pg from 'pg';
 import * as importer from 'common/interfaces/importer';
 import * as fs from 'fs/promises';
+import * as pg from 'pg';
+
 import PostgreSQLParser from '../../parsers/PostgreSQLParser';
 import { BaseImporter } from '../BaseImporter';
 

src/main/libs/misc/validateSender.ts

@@ -0,0 +1,15 @@
+import { WebFrameMain } from 'electron';
+import * as path from 'path';
+
+const isDevelopment = process.env.NODE_ENV !== 'production';
+const isWindows = process.platform === 'win32';
+const indexPath = path.resolve(__dirname, 'index.html').split(path.sep).join('/');
+
+export function validateSender (frame: WebFrameMain) {
+   const frameUrl = new URL(frame.url);
+   const prefix = isWindows ? 'file:///' : 'file://';
+   const framePath = frameUrl.href.replace(prefix, '');
+
+   if ((isDevelopment && frameUrl.host === 'localhost:9080') || framePath === indexPath) return true;
+   return false;
+}

src/main/main.ts

@@ -1,8 +1,8 @@
-import { app, BrowserWindow, nativeImage, ipcMain } from 'electron';
+import * as remoteMain from '@electron/remote/main';
-import * as path from 'path';
+import { app, BrowserWindow, ipcMain, nativeImage } from 'electron';
 import * as Store from 'electron-store';
 import * as windowStateKeeper from 'electron-window-state';
-import * as remoteMain from '@electron/remote/main';
+import * as path from 'path';
 
 import ipcHandlers from './ipc-handlers';
 import { OsMenu, ShortcutRegister } from './libs/ShortcutRegister';
@@ -142,6 +142,14 @@ else {
          const extensionPath = path.resolve(__dirname, `../../misc/${antares.devtoolsId}`);
          window.webContents.session.loadExtension(extensionPath, { allowFileAccess: true }).catch(console.error);
       }
+
+      window.webContents.on('will-navigate', (e) => { // Prevent browser navigation
+         e.preventDefault();
+      });
+
+      window.webContents.on('did-create-window', (w) => { // Close new windows
+         w.close();
+      });
    });
 }
 

src/main/workers/exporter.ts

@@ -1,5 +1,6 @@
 import * as antares from 'common/interfaces/antares';
 import * as fs from 'fs';
+
 import { MySQLClient } from '../libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../libs/clients/PostgreSQLClient';
 import { ClientsFactory } from '../libs/ClientsFactory';
@@ -7,7 +8,7 @@ import MysqlExporter from '../libs/exporters/sql/MysqlExporter';
 import PostgreSQLExporter from '../libs/exporters/sql/PostgreSQLExporter';
 let exporter: antares.Exporter;
 
-process.on('message', async ({ type, client, tables, options }) => {
+process.on('message', async ({ type, client, tables, options }: any) => {
    if (type === 'init') {
       const connection = await ClientsFactory.getClient({
          client: client.name,

src/main/workers/importer.ts

@@ -1,13 +1,14 @@
 import * as antares from 'common/interfaces/antares';
-import * as pg from 'pg';
+import { ImportOptions } from 'common/interfaces/importer';
 import * as mysql from 'mysql2';
+import * as pg from 'pg';
+import SSHConfig from 'ssh2-promise/lib/sshConfig';
+
 import { MySQLClient } from '../libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../libs/clients/PostgreSQLClient';
 import { ClientsFactory } from '../libs/ClientsFactory';
 import MySQLImporter from '../libs/importers/sql/MySQLlImporter';
 import PostgreSQLImporter from '../libs/importers/sql/PostgreSQLImporter';
-import SSHConfig from 'ssh2-promise/lib/sshConfig';
-import { ImportOptions } from 'common/interfaces/importer';
 let importer: antares.Importer;
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

src/renderer/App.vue

@@ -21,21 +21,32 @@
             <BaseTextEditor class="d-none" value="" />
          </div>
       </div>
-      <ModalAllConnections v-if="isAllConnectionsModal" @close="isAllConnectionsModal = false" />
+      <ModalAllConnections
+         v-if="isAllConnectionsModal"
+         @close="isAllConnectionsModal = false"
+      />
+
+      <ModalExportSchema
+         v-if="isExportSchemaModal"
+         @close="hideExportModal"
+      />
    </div>
 </template>
 
 <script setup lang="ts">
-import { defineAsyncComponent, onMounted, Ref, ref } from 'vue';
+import { getCurrentWindow, Menu } from '@electron/remote';
-import { storeToRefs } from 'pinia';
 import { ipcRenderer } from 'electron';
+import { storeToRefs } from 'pinia';
+import { defineAsyncComponent, onMounted, Ref, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { Menu, getCurrentWindow } from '@electron/remote';
+
+import ModalExportSchema from '@/components/ModalExportSchema.vue';
+import TheSettingBar from '@/components/TheSettingBar.vue';
 import { useApplicationStore } from '@/stores/application';
 import { useConnectionsStore } from '@/stores/connections';
+import { useSchemaExportStore } from '@/stores/schemaExport';
 import { useSettingsStore } from '@/stores/settings';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import TheSettingBar from '@/components/TheSettingBar.vue';
 
 const { t } = useI18n();
 
@@ -65,6 +76,10 @@ const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
 const { checkVersionUpdate } = applicationStore;
 const { changeApplicationTheme } = settingsStore;
 
+const schemaExportStore = useSchemaExportStore();
+const { hideExportModal } = schemaExportStore;
+const { isExportModal: isExportSchemaModal } = storeToRefs(schemaExportStore);
+
 const isAllConnectionsModal: Ref<boolean> = ref(false);
 
 document.addEventListener('DOMContentLoaded', () => {
@@ -95,22 +110,22 @@ onMounted(() => {
 
    const InputMenu = Menu.buildFromTemplate([
       {
-         label: t('word.cut'),
+         label: t('general.cut'),
          role: 'cut'
       },
       {
-         label: t('word.copy'),
+         label: t('general.copy'),
          role: 'copy'
       },
       {
-         label: t('word.paste'),
+         label: t('general.paste'),
          role: 'paste'
       },
       {
          type: 'separator'
       },
       {
-         label: t('message.selectAll'),
+         label: t('general.selectAll'),
          role: 'selectAll'
       }
    ]);

src/renderer/components/BaseConfirmModal.vue

@@ -31,13 +31,13 @@
                      class="btn btn-primary mr-2"
                      @click.stop="confirmModal"
                   >
-                     {{ confirmText || t('word.confirm') }}
+                     {{ confirmText || t('general.confirm') }}
                   </button>
                   <button
                      class="btn btn-link"
                      @click="hideModal"
                   >
-                     {{ cancelText || t('word.cancel') }}
+                     {{ cancelText || t('general.cancel') }}
                   </button>
                </div>
             </div>
@@ -47,10 +47,11 @@
 </template>
 
 <script setup lang="ts">
-import { useFocusTrap } from '@/composables/useFocusTrap';
 import { computed, onBeforeUnmount, PropType, useSlots } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import { useFocusTrap } from '@/composables/useFocusTrap';
+
 const { t } = useI18n();
 
 const props = defineProps({

src/renderer/components/BaseIcon.vue

@@ -0,0 +1,62 @@
+<template>
+   <SvgIcon
+      :type="type"
+      :path="iconPath"
+      :size="size"
+      :rotate="rotate"
+      :class="iconFlip"
+   />
+</template>
+
+<script setup lang="ts">
+import SvgIcon from '@jamescoyle/vue-icon';
+import * as Icons from '@mdi/js';
+import { computed, PropType } from 'vue';
+
+const props = defineProps({
+   iconName: {
+      type: String,
+      required: true
+   },
+   size: {
+      type: Number,
+      default: 48
+   },
+   type: {
+      type: String,
+      default: () => 'mdi'
+   },
+   flip: {
+      type: String as PropType<'horizontal' | 'vertical' | 'both'>,
+      default: () => null
+   },
+   rotate: {
+      type: Number,
+      default: () => null
+   }
+});
+
+const iconPath = computed(() => {
+   return (Icons as {[k:string]: string})[props.iconName];
+});
+
+const iconFlip = computed(() => {
+   if (['horizontal', 'vertical', 'both'].includes(props.flip))
+      return `flip-${props.flip}`;
+   else return '';
+});
+</script>
+
+<style lang="scss" scoped>
+.flip-horizontal {
+    transform: scaleX(-1);
+}
+
+.flip-vertical {
+    transform: scaleY(-1);
+}
+
+.flip-both {
+    transform: scale(-1, -1);
+}
+</style>

src/renderer/components/BaseMap.vue

@@ -3,15 +3,15 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, PropType, Ref, ref } from 'vue';
-import * as L from 'leaflet';
 import {
-   point,
    lineString,
+   point,
    polygon
 } from '@turf/helpers';
-import { GeoJsonObject } from 'geojson';
 import { getArrayDepth } from 'common/libs/getArrayDepth';
+import { GeoJsonObject } from 'geojson';
+import * as L from 'leaflet';
+import { onMounted, PropType, Ref, ref } from 'vue';
 
 interface Coordinates { x: number; y: number }
 

src/renderer/components/BaseNotification.vue

@@ -1,13 +1,18 @@
 <template>
    <div class="toast mt-2" :class="notificationStatus.className">
       <span class="p-vcentered text-left" :class="{'expanded': isExpanded}">
-         <i class="mdi mdi-24px mr-2" :class="notificationStatus.iconName" />
+         <BaseIcon
+            :icon-name="notificationStatus.iconName"
+            class="mr-2"
+            :size="24"
+         />
          <span class="notification-message">{{ message }}</span>
       </span>
-      <i
+      <BaseIcon
          v-if="isExpandable"
-         class="mdi mdi-24px c-hand expand-btn"
+         :icon-name="isExpanded ? 'mdiChevronUp' : 'mdiChevronDown'"
-         :class="isExpanded ? 'mdi-chevron-up' : 'mdi-chevron-down'"
+         class=" c-hand expand-btn"
+         :size="24"
          @click="toggleExpand"
       />
       <button class="btn btn-clear ml-2" @click="hideToast" />
@@ -17,6 +22,8 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 
+import BaseIcon from '@/components/BaseIcon.vue';
+
 const props = defineProps({
    message: {
       type: String,
@@ -36,19 +43,19 @@ const notificationStatus = computed(() => {
    switch (props.status) {
       case 'success':
          className = 'toast-success';
-         iconName = 'mdi-check';
+         iconName = 'mdiCheck';
          break;
       case 'error':
          className = 'toast-error';
-         iconName = 'mdi-alert-rhombus';
+         iconName = 'mdiAlertRhombus';
          break;
       case 'warning':
          className = 'toast-warning';
-         iconName = 'mdi-alert';
+         iconName = 'mdiAlert';
          break;
       case 'primary':
          className = 'toast-primary';
-         iconName = 'mdi-information-outline';
+         iconName = 'mdiInformationOutline';
          break;
    }
 

src/renderer/components/BaseSelect.vue

@@ -70,7 +70,7 @@
 </template>
 
 <script>
-import { defineComponent, computed, ref, watch, nextTick, onMounted, onUnmounted } from 'vue';
+import { computed, defineComponent, nextTick, onMounted, onUnmounted, ref, watch } from 'vue';
 
 export default defineComponent({
    name: 'BaseSelect',

src/renderer/components/BaseTextEditor.vue

@@ -10,12 +10,16 @@
 </template>
 
 <script setup lang="ts">
-import { onMounted, watch } from 'vue';
+/* eslint-disable simple-import-sort/imports */
 import * as ace from 'ace-builds';
 import 'ace-builds/webpack-resolver';
-import { storeToRefs } from 'pinia';
+/* eslint-enable simple-import-sort/imports */
-import { useSettingsStore } from '@/stores/settings';
+
 import { uidGen } from 'common/libs/uidGen';
+import { storeToRefs } from 'pinia';
+import { onMounted, watch } from 'vue';
+
+import { useSettingsStore } from '@/stores/settings';
 
 const props = defineProps({
    modelValue: String,
@@ -44,6 +48,11 @@ watch(() => props.mode, () => {
       editor.session.setMode(`ace/mode/${props.mode}`);
 });
 
+watch(() => props.modelValue, () => {
+   if (editor && props.readOnly)
+      editor.session.setValue(props.modelValue);
+});
+
 watch(editorTheme, () => {
    if (editor)
       editor.setTheme(`ace/theme/${editorTheme.value}`);
@@ -113,6 +122,8 @@ onMounted(() => {
       }, 20);
    }
 
+   editor.commands.removeCommand('showSettingsMenu');
+
    setTimeout(() => {
       editor.resize();
    }, 20);

src/renderer/components/BaseToast.vue

@@ -1,76 +0,0 @@
-<template>
-   <div
-      :style="{display: isVisible ? 'flex' : 'none'}"
-      class="toast mt-2"
-      :class="toastStatus.className"
-   >
-      <span class="p-vcentered text-left"><i class="mdi mdi-24px mr-1" :class="toastStatus.iconName" /> {{ message }}</span>
-      <button class="btn btn-clear" @click="hideToast" />
-   </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-
-const props = defineProps({
-   message: {
-      type: String,
-      default: ''
-   },
-   status: {
-      type: String,
-      default: ''
-   }
-});
-
-const isVisible = ref(false);
-const message = ref(props.message);
-
-const emit = defineEmits(['close']);
-
-const toastStatus = computed(() => {
-   let className = '';
-   let iconName = '';
-   switch (props.status) {
-      case 'success':
-         className = 'toast-success';
-         iconName = 'mdi-check';
-         break;
-      case 'error':
-         className = 'toast-error';
-         iconName = 'mdi-alert-rhombus';
-         break;
-      case 'warning':
-         className = 'toast-warning';
-         iconName = 'mdi-alert';
-         break;
-      case 'primary':
-         className = 'toast-primary';
-         iconName = 'mdi-information-outline';
-         break;
-   }
-
-   return { className, iconName };
-});
-
-watch(message, () => {
-   if (message.value)
-      isVisible.value = true;
-   else
-      isVisible.value = false;
-});
-
-const hideToast = () => {
-   isVisible.value = false;
-   emit('close');
-};
-</script>
-
-<style scoped>
-  .toast {
-    display: flex;
-    justify-content: space-between;
-    user-select: text;
-    word-break: break-all;
-  }
-</style>

src/renderer/components/BaseUploadInput.vue

@@ -1,14 +1,20 @@
 <template>
    <label :for="`id_${id}`" class="file-uploader">
       <span class="file-uploader-message">
-         <i class="mdi mdi-folder-open mr-1" />{{ message }}
+         <BaseIcon
+            icon-name="mdiFolderOpen"
+            class="mr-1 mt-1"
+            :size="18"
+         />{{ message }}
       </span>
       <span class="text-ellipsis file-uploader-value">
          {{ lastPart(modelValue, 19) }}
       </span>
-      <i
+      <BaseIcon
          v-if="modelValue"
-         class="file-uploader-reset mdi mdi-close"
+         class="file-upload-icon-clear"
+         icon-name="mdiClose"
+         :size="18"
          @click.prevent="clear"
       />
       <form :ref="`form_${id}`">
@@ -16,6 +22,7 @@
             :id="`id_${id}`"
             class="file-uploader-input"
             type="file"
+            :accept="accept"
             @change="$emit('change', $event)"
          >
       </form>
@@ -24,6 +31,8 @@
 
 <script setup lang="ts">
 import { uidGen } from 'common/libs/uidGen';
+
+import BaseIcon from '@/components/BaseIcon.vue';
 import { useFilters } from '@/composables/useFilters';
 
 const { lastPart } = useFilters();
@@ -33,6 +42,10 @@ defineProps({
       default: 'Browse',
       type: String
    },
+   accept: {
+      default: '',
+      type: String
+   },
    modelValue: {
       default: '',
       type: String
@@ -59,6 +72,12 @@ const clear = () => {
   position: relative;
   flex: 1 1 auto;
 
+  .file-upload-icon-clear {
+   position: absolute;
+   right: 4px;
+   top: 8px;
+  }
+
   > span {
     padding: 0.25rem 0.4rem;
   }

src/renderer/components/FakerSelect.vue

@@ -4,7 +4,7 @@
          v-model="selectedGroup"
          class="form-select"
          :options="[{name: 'manual'}, ...fakerGroups]"
-         :option-label="(opt: any) => opt.name === 'manual' ? t('message.manualValue') : t(`faker.${opt.name}`)"
+         :option-label="(opt: any) => opt.name === 'manual' ? t('general.manualValue') : t(`faker.${opt.name}`)"
          option-track-by="name"
          :disabled="!isChecked"
          :style="'flex-grow: 0;'"
@@ -41,7 +41,7 @@
       <BaseUploadInput
          v-else-if="inputProps().type === 'file'"
          :model-value="selectedValue"
-         :message="t('word.browse')"
+         :message="t('general.browse')"
          @clear="clearValue"
          @change="filesChange($event)"
       />
@@ -86,13 +86,14 @@
 </template>
 
 <script setup lang="ts">
+import FakerMethods from 'common/FakerMethods';
+import { BIT, BLOB, DATE, DATETIME, FLOAT, IS_BIGINT, LONG_TEXT, NUMBER, TEXT, TIME, UUID } from 'common/fieldTypes';
 import { computed, PropType, Ref, ref, watch } from 'vue';
-import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT, UUID, IS_BIGINT } from 'common/fieldTypes';
+import { useI18n } from 'vue-i18n';
+
+import BaseSelect from '@/components/BaseSelect.vue';
 import BaseUploadInput from '@/components/BaseUploadInput.vue';
 import ForeignKeySelect from '@/components/ForeignKeySelect.vue';
-import FakerMethods from 'common/FakerMethods';
-import BaseSelect from '@/components/BaseSelect.vue';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 

src/renderer/components/ForeignKeySelect.vue

@@ -13,15 +13,16 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref, watch } from 'vue';
+import { LONG_TEXT, TEXT } from 'common/fieldTypes';
+import { TableField } from 'common/interfaces/antares';
 import { storeToRefs } from 'pinia';
+import { computed, Ref, ref, watch } from 'vue';
+
+import BaseSelect from '@/components/BaseSelect.vue';
+import { useFilters } from '@/composables/useFilters';
 import Tables from '@/ipc-api/Tables';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import { TEXT, LONG_TEXT } from 'common/fieldTypes';
-import BaseSelect from '@/components/BaseSelect.vue';
-import { TableField } from 'common/interfaces/antares';
-import { useFilters } from '@/composables/useFilters';
 
 const props = defineProps({
    modelValue: [String, Number],

src/renderer/components/KeyPressDetector.vue

@@ -4,17 +4,23 @@
          class="form-input"
          type="text"
          :value="pressedKeys"
-         :placeholder="t('message.registerAShortcut')"
+         :placeholder="t('application.registerAShortcut')"
          @focus="isFocus = true"
          @blur="isFocus = false"
          @keydown.prevent.stop="onKey"
       >
-      <i class="form-icon mdi mdi-keyboard-outline mdi-24px" />
+      <BaseIcon
+         icon-name="mdiKeyboardOutline"
+         class="form-icon"
+         :size="24"
+      />
    </div>
 </template>
 <script setup lang="ts">
 import { computed, PropType, Ref, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
 import Application from '@/ipc-api/Application';
 
 const { t } = useI18n();
@@ -49,7 +55,7 @@ const pressedKeys = computed(() => {
          keys.push('Shift');
       if (keyboardEvent.value.code) {
          if (keys.length === 0 && (keyboardEvent.value.key.length === 1 || singleKeysToIgnore.includes(keyboardEvent.value.key)))
-            return t('message.invalidShortcutMessage');
+            return t('application.invalidShortcutMessage');
          else if (!specialKeys.includes(keyboardEvent.value.key)) {
             if (keyboardEvent.value.key === 'Dead') {
                keys.push(keyboardEvent.value.code
@@ -82,7 +88,7 @@ const pressedKeys = computed(() => {
             }
          }
          else
-            return t('message.invalidShortcutMessage');
+            return t('application.invalidShortcutMessage');
       }
    }
 
@@ -96,7 +102,7 @@ const onKey = (e: KeyboardEvent) => {
 };
 
 watch(pressedKeys, (value) => {
-   if (value !== t('message.invalidShortcutMessage'))
+   if (value !== t('application.invalidShortcutMessage'))
       emit('update:modelValue', pressedKeys.value);
 });
 

src/renderer/components/ModalAllConnections.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-apps mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.allConnections') }}</span>
+                        icon-name="mdiApps"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('connection.allConnections') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -21,13 +25,20 @@
                               v-model="searchTerm"
                               class="form-input"
                               type="text"
-                              :placeholder="t('message.searchForConnections')"
+                              :placeholder="t('connection.searchForConnections')"
                               @keypress.esc="searchTerm = ''"
                            >
-                           <i v-if="!searchTerm" class="form-icon mdi mdi-magnify mdi-18px pr-4" />
+                           <BaseIcon
-                           <i
+                              v-if="!searchTerm"
+                              icon-name="mdiMagnify"
+                              class="form-icon pr-4"
+                              :size="18"
+                           />
+                           <BaseIcon
                               v-else
-                              class="form-icon c-hand mdi mdi-backspace mdi-18px pr-4"
+                              icon-name="mdiBackspace"
+                              class="form-icon c-hand pr-4"
+                              :size="18"
                               @click="searchTerm = ''"
                            />
                         </div>
@@ -56,9 +67,11 @@
                                  {{ clients.get(connection.client) || connection.client }}
                               </div>
                               <div class="all-connections-buttons p-absolute d-flex" :style="'top: 0; right: 0;'">
-                                 <i
+                                 <BaseIcon
-                                    class="all-connections-delete mdi mdi-delete mdi-18px ml-2"
+                                    icon-name="mdiDelete"
-                                    :title="t('word.delete')"
+                                    class="all-connections-delete ml-2"
+                                    :title="t('general.delete')"
+                                    :size="18"
                                     @click.stop="askToDelete(connection)"
                                  />
                               </div>
@@ -66,32 +79,57 @@
                            <div class="panel-body text-center">
                               <div v-if="connection.databasePath">
                                  <div class="text-ellipsis" :title="connection.databasePath">
-                                    <i class="mdi mdi-database d-inline" /> <span class="text-bold">{{
+                                    <BaseIcon
+                                       icon-name="mdiDatabase"
+                                       class="p-relative"
+                                       :style="'top:3px'"
+                                       :size="18"
+                                    /> <span class="text-bold">{{
                                        connection.databasePath
                                     }}</span>
                                  </div>
                               </div>
                               <div v-else>
                                  <div class="text-ellipsis" :title="`${connection.host}:${connection.port}`">
-                                    <i class="mdi mdi-server d-inline" /> <span class="text-bold">{{ connection.host
+                                    <BaseIcon
+                                       icon-name="mdiServer"
+                                       class="p-relative"
+                                       :style="'top:3px'"
+                                       :size="18"
+                                    /> <span class="text-bold">{{ connection.host
                                     }}:{{ connection.port }}</span>
                                  </div>
                               </div>
                               <div v-if="connection.user">
                                  <div class="text-ellipsis">
-                                    <i class="mdi mdi-account d-inline" /> <span class="text-bold">{{ connection.user
+                                    <BaseIcon
+                                       icon-name="mdiAccount"
+                                       class="p-relative"
+                                       :style="'top:3px'"
+                                       :size="18"
+                                    /> <span class="text-bold">{{ connection.user
                                     }}</span>
                                  </div>
                               </div>
                               <div v-if="connection.schema">
                                  <div class="text-ellipsis">
-                                    <i class="mdi mdi-database d-inline" /> <span class="text-bold">{{ connection.schema
+                                    <BaseIcon
+                                       icon-name="mdiDatabase"
+                                       class="p-relative"
+                                       :style="'top:3px'"
+                                       :size="18"
+                                    /> <span class="text-bold">{{ connection.schema
                                     }}</span>
                                  </div>
                               </div>
                               <div v-if="connection.database">
                                  <div class="text-ellipsis">
-                                    <i class="mdi mdi-database d-inline" /> <span class="text-bold">{{
+                                    <BaseIcon
+                                       icon-name="mdiDatabase"
+                                       class="p-relative"
+                                       :style="'top:3px'"
+                                       :size="18"
+                                    /> <span class="text-bold">{{
                                        connection.database
                                     }}</span>
                                  </div>
@@ -99,11 +137,19 @@
                            </div>
                            <div class="panel-footer text-center py-0">
                               <div v-if="connection.ssl" class="chip bg-success mt-2">
-                                 <i class="mdi mdi-shield-key mdi-18px mr-1" />
+                                 <BaseIcon
+                                    icon-name="mdiShieldKey"
+                                    class="mr-1"
+                                    :size="18"
+                                 />
                                  SSL
                               </div>
                               <div v-if="connection.ssh" class="chip bg-success mt-2">
-                                 <i class="mdi mdi-console-network mdi-18px mr-1" />
+                                 <BaseIcon
+                                    icon-name="mdiConsoleNetwork"
+                                    class="mr-1"
+                                    :size="18"
+                                 />
                                  SSH
                               </div>
                            </div>
@@ -130,12 +176,16 @@
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-server-remove mr-1" /> {{ t('message.deleteConnection') }}
+               <BaseIcon
+                  icon-name="mdiServerRemove"
+                  class="mr-1"
+                  :size="24"
+               /> {{ t('connection.deleteConnection') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
-               {{ t('message.deleteCorfirm') }} <b>{{ selectedConnectionName }}</b>?
+               {{ t('general.deleteConfirm') }} <b>{{ selectedConnectionName }}</b>?
             </div>
          </template>
       </ConfirmModal>
@@ -143,14 +193,16 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount, Ref, ref } from 'vue';
+import { ConnectionParams } from 'common/interfaces/antares';
 import { storeToRefs } from 'pinia';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import { useConnectionsStore } from '@/stores/connections';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
-import { ConnectionParams } from 'common/interfaces/antares';
 
 const { t } = useI18n();
 

src/renderer/components/ModalAskCredentials.vue

@@ -6,7 +6,11 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-key-variant mr-1" /> {{ t('word.credentials') }}
+                     <BaseIcon
+                        icon-name="mdiKeyVariant"
+                        class="mr-1"
+                        :size="24"
+                     /> {{ t('connection.credentials') }}
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -16,7 +20,7 @@
                   <form class="form-horizontal">
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.user') }}</label>
+                           <label class="form-label">{{ t('connection.user') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -29,7 +33,7 @@
                      </div>
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.password') }}</label>
+                           <label class="form-label">{{ t('connection.password') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -44,10 +48,10 @@
             </div>
             <div class="modal-footer">
                <button class="btn btn-primary mr-2" @click.stop="sendCredentials">
-                  {{ t('word.send') }}
+                  {{ t('general.send') }}
                </button>
                <button class="btn btn-link" @click.stop="closeModal">
-                  {{ t('word.close') }}
+                  {{ t('general.close') }}
                </button>
             </div>
          </div>
@@ -57,9 +61,11 @@
 
 <script setup lang="ts">
 import { Ref, ref } from 'vue';
-import { useFocusTrap } from '@/composables/useFocusTrap';
 import { useI18n } from 'vue-i18n';
 
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFocusTrap } from '@/composables/useFocusTrap';
+
 const { t } = useI18n();
 
 const { trapRef } = useFocusTrap();

src/renderer/components/ModalAskParameters.vue

@@ -1,15 +1,19 @@
 <template>
    <ConfirmModal
-      :confirm-text="t('word.run')"
+      :confirm-text="t('general.run')"
-      :cancel-text="t('word.cancel')"
+      :cancel-text="t('general.cancel')"
       size="400"
       @confirm="runRoutine"
       @hide="closeModal"
    >
       <template #header>
          <div class="d-flex">
-            <i class="mdi mdi-24px mdi-play mr-1" />
+            <BaseIcon
-            <span class="cut-text">{{ t('word.parameters') }}: {{ localRoutine.name }}</span>
+               icon-name="mdiPlay"
+               class="mr-1"
+               :size="24"
+            />
+            <span class="cut-text">{{ t('database.parameters') }}: {{ localRoutine.name }}</span>
          </div>
       </template>
       <template #body>
@@ -48,13 +52,15 @@
 </template>
 
 <script setup lang="ts">
-import { computed, PropType, Ref, ref } from 'vue';
+import { FLOAT, NUMBER } from 'common/fieldTypes';
-import { NUMBER, FLOAT } from 'common/fieldTypes';
 import { FunctionInfos, RoutineInfos } from 'common/interfaces/antares';
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import { computed, PropType, Ref, ref } from 'vue';
-import { useFilters } from '@/composables/useFilters';
 import { useI18n } from 'vue-i18n';
 
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFilters } from '@/composables/useFilters';
+
 const { t } = useI18n();
 
 const { wrapNumber } = useFilters();

src/renderer/components/ModalConnectionAppearance.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-brush-variant mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.editConnectionAppearence') }}</span>
+                        icon-name="mdiBrushVariant"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('application.editConnectionAppearance') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -17,7 +21,7 @@
                   <form class="form-horizontal">
                      <div class="form-group mb-4">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.label') }}</label>
+                           <label class="form-label">{{ t('application.label') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -31,28 +35,41 @@
                      </div>
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.icon') }}</label>
+                           <label class="form-label">{{ t('application.icon') }}</label>
                         </div>
                         <div class="col-9 icons-wrapper">
                            <div
                               v-for="icon in icons"
                               :key="icon.name"
-                              class="icon-box"
+                           >
-                              :title="icon.name"
+                              <BaseIcon
-                              :class="[icon.code ? `mdi ${icon.code} mdi-36px` : `dbi dbi-${connection.client}`, {'selected': localConnection.icon === icon.code}]"
+                                 v-if="icon.code"
-                              @click="localConnection.icon = icon.code"
+                                 :icon-name="camelize(icon.code)"
-                           />
+                                 :size="36"
+                                 class="icon-box"
+                                 :title="icon.name"
+                                 :class="[{'selected': localConnection.icon === icon.code}]"
+                                 @click="localConnection.icon = icon.code"
+                              />
+                              <div
+                                 v-else
+                                 class="icon-box"
+                                 :title="icon.name"
+                                 :class="[`dbi dbi-${connection.client}`, {'selected': localConnection.icon === icon.code}]"
+                                 @click="localConnection.icon = icon.code"
+                              />
+                           </div>
                         </div>
                      </div>
                   </form>
                </div>
             </div>
             <div class="modal-footer">
-               <button class="btn btn-primary mr-2" @click.stop="editFolderAppearence">
+               <button class="btn btn-primary mr-2" @click.stop="editFolderAppearance">
-                  {{ t('word.update') }}
+                  {{ t('application.update') }}
                </button>
                <button class="btn btn-link" @click.stop="closeModal">
-                  {{ t('word.close') }}
+                  {{ t('general.close') }}
                </button>
             </div>
          </div>
@@ -62,10 +79,12 @@
 
 <script setup lang="ts">
 import { onBeforeUnmount, PropType, Ref, ref } from 'vue';
-import { useFocusTrap } from '@/composables/useFocusTrap';
 import { useI18n } from 'vue-i18n';
-import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFocusTrap } from '@/composables/useFocusTrap';
 import { unproxify } from '@/libs/unproxify';
+import { SidebarElement, useConnectionsStore } from '@/stores/connections';
 
 const connectionsStore = useConnectionsStore();
 
@@ -136,11 +155,21 @@ const { trapRef } = useFocusTrap();
 const firstInput: Ref<HTMLInputElement> = ref(null);
 const localConnection: Ref<SidebarElement> = ref(unproxify(props.connection));
 
-const editFolderAppearence = () => {
+const editFolderAppearance = () => {
    updateConnectionOrder(localConnection.value);
    closeModal();
 };
 
+const camelize = (text: string) => {
+   const textArr = text.split('-');
+   for (let i = 0; i < textArr.length; i++) {
+      if (i === 0) continue;
+      textArr[i] = textArr[i].charAt(0).toUpperCase() + textArr[i].slice(1);
+   }
+
+   return textArr.join('');
+};
+
 const closeModal = () => emit('close');
 
 const onKey =(e: KeyboardEvent) => {

src/renderer/components/ModalDiscardChanges.vue

@@ -1,28 +1,34 @@
 <template>
    <ConfirmModal
-      :confirm-text="t('word.discard')"
+      :confirm-text="t('general.discard')"
-      :cancel-text="t('word.stay')"
+      :cancel-text="t('general.stay')"
       @confirm="emit('confirm')"
       @hide="emit('close')"
    >
       <template #header>
          <div class="d-flex">
-            <i class="mdi mdi-24px mdi-content-save-alert mr-1" /> {{ t('message.unsavedChanges') }}
+            <BaseIcon
+               icon-name="mdiContentSaveAlert"
+               class="mr-1"
+               :size="24"
+            /> {{ t('application.unsavedChanges') }}
          </div>
       </template>
       <template #body>
          <div>
-            {{ t('message.discardUnsavedChanges') }}
+            {{ t('application.discardUnsavedChanges') }}
          </div>
       </template>
    </ConfirmModal>
 </template>
 
 <script setup lang="ts">
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
 import { onBeforeUnmount } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+
 const { t } = useI18n();
 
 const emit = defineEmits(['confirm', 'close']);

src/renderer/components/ModalEditSchema.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-database-edit mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.editSchema') }}</span>
+                        icon-name="mdiDatabaseEdit"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('database.editSchema') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -17,7 +21,7 @@
                   <form class="form-horizontal">
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.name') }}</label>
+                           <label class="form-label">{{ t('general.name') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -26,14 +30,14 @@
                               class="form-input"
                               type="text"
                               required
-                              :placeholder="t('message.schemaName')"
+                              :placeholder="t('database.schemaName')"
                               readonly
                            >
                         </div>
                      </div>
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.collation') }}</label>
+                           <label class="form-label">{{ t('database.collation') }}</label>
                         </div>
                         <div class="col-9">
                            <BaseSelect
@@ -44,7 +48,7 @@
                               option-label="collation"
                               option-track-by="collation"
                            />
-                           <small>{{ t('message.serverDefault') }}: {{ defaultCollation }}</small>
+                           <small>{{ t('database.serverDefault') }}: {{ defaultCollation }}</small>
                         </div>
                      </div>
                   </form>
@@ -52,10 +56,10 @@
             </div>
             <div class="modal-footer">
                <button class="btn btn-primary mr-2" @click.stop="updateSchema">
-                  {{ t('word.update') }}
+                  {{ t('application.update') }}
                </button>
                <button class="btn btn-link" @click.stop="closeModal">
-                  {{ t('word.close') }}
+                  {{ t('general.close') }}
                </button>
             </div>
          </div>
@@ -64,14 +68,16 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount, Ref, ref } from 'vue';
 import { storeToRefs } from 'pinia';
-import { useNotificationsStore } from '@/stores/notifications';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
-import { useWorkspacesStore } from '@/stores/workspaces';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Schema from '@/ipc-api/Schema';
-import BaseSelect from '@/components/BaseSelect.vue';
+import { useNotificationsStore } from '@/stores/notifications';
-import { useI18n } from 'vue-i18n';
+import { useWorkspacesStore } from '@/stores/workspaces';
 
 const { t } = useI18n();
 

src/renderer/components/ModalExportSchema.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-database-export mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.exportSchema') }}</span>
+                        icon-name="mdiDatabaseExport"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('database.exportSchema') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -16,7 +20,7 @@
                <div class="container">
                   <div class="columns">
                      <div class="col-3">
-                        <label class="form-label">{{ t('message.directoryPath') }}</label>
+                        <label class="form-label">{{ t('general.directoryPath') }}</label>
                      </div>
                      <div class="col-9">
                         <fieldset class="input-group">
@@ -26,14 +30,14 @@
                               type="text"
                               required
                               readonly
-                              :placeholder="t('message.schemaName')"
+                              @click.prevent="openPathDialog"
                            >
                            <button
                               type="button"
                               class="btn btn-primary input-group-btn"
                               @click.prevent="openPathDialog"
                            >
-                              {{ t('word.change') }}
+                              {{ t('general.change') }}
                            </button>
                         </fieldset>
                      </div>
@@ -42,35 +46,45 @@
 
                <div class="columns export-options">
                   <div class="column col-8 left">
-                     <div class="columns mb-2">
+                     <div class="columns mb-2 mt-1 p-vcentered">
-                        <div class="column col-auto d-flex text-italic ">
+                        <div class="column col-auto input-group d-flex text-italic" :style="'flex-grow: 1'">
-                           <i class="mdi mdi-file-document-outline mr-2" />
+                           <BaseIcon
-                           {{ filename }}
+                              icon-name="mdiFileDocumentOutline"
+                              class="input-group-addon"
+                              :size="36"
+                           />
+                           <input
+                              v-model="chosenFilename"
+                              class="form-input"
+                              type="text"
+                              :placeholder="filename"
+                              :title="t('application.fileName')"
+                           >
                         </div>
 
                         <div class="column col-auto col-ml-auto ">
                            <button
-                              class="btn btn-dark btn-sm"
+                              class="btn btn-dark btn-sm pt-1"
-                              :title="t('word.refresh')"
+                              :title="t('general.refresh')"
                               @click="refresh"
                            >
-                              <i class="mdi mdi-database-refresh" />
+                              <BaseIcon icon-name="mdiRefresh" :size="15" />
                            </button>
                            <button
-                              class="btn btn-dark btn-sm mx-1"
+                              class="btn btn-dark btn-sm mx-1 pt-1"
-                              :title="t('message.uncheckAllTables')"
+                              :title="t('database.uncheckAllTables')"
                               :disabled="isRefreshing"
                               @click="uncheckAllTables"
                            >
-                              <i class="mdi mdi-file-tree-outline" />
+                              <BaseIcon icon-name="mdiCheckboxBlankOutline" :size="15" />
                            </button>
                            <button
-                              class="btn btn-dark btn-sm"
+                              class="btn btn-dark btn-sm pt-1"
-                              :title="t('message.checkAllTables')"
+                              :title="t('database.checkAllTables')"
                               :disabled="isRefreshing"
                               @click="checkAllTables"
                            >
-                              <i class="mdi mdi-file-tree" />
+                              <BaseIcon icon-name="mdiCheckboxMarkedOutline" :size="15" />
                            </button>
                         </div>
                      </div>
@@ -122,22 +136,22 @@
                               <div class="tr">
                                  <div class="th" :style="'width: 50%;'">
                                     <div class="table-column-title">
-                                       <span>{{ t('word.table') }}</span>
+                                       <span>{{ t('database.table') }}</span>
                                     </div>
                                  </div>
                                  <div class="th text-center">
                                     <div class="table-column-title">
-                                       <span>{{ t('word.structure') }}</span>
+                                       <span>{{ t('database.structure') }}</span>
                                     </div>
                                  </div>
                                  <div class="th text-center">
                                     <div class="table-column-title">
-                                       <span>{{ t('word.content') }}</span>
+                                       <span>{{ t('general.content') }}</span>
                                     </div>
                                  </div>
                                  <div class="th text-center">
                                     <div class="table-column-title">
-                                       <span>{{ t('word.drop') }}</span>
+                                       <span>{{ t('database.drop') }}</span>
                                     </div>
                                  </div>
                               </div>
@@ -148,6 +162,7 @@
                                  v-for="item in tables"
                                  :key="item.table"
                                  class="tr"
+                                 :class="{'selected': item.table === selectedTable}"
                               >
                                  <div class="td">
                                     {{ item.table }}
@@ -183,19 +198,19 @@
                   </div>
                   <div class="column col-4">
                      <h5 class="h5">
-                        {{ t('word.options') }}
+                        {{ t('general.options') }}
                      </h5>
-                     <span class="h6">{{ t('word.includes') }}:</span>
+                     <span class="h6">{{ t('general.includes') }}:</span>
                      <label
                         v-for="(_, key) in options.includes"
                         :key="key"
                         class="form-checkbox"
                      >
-                        <input v-model="options.includes[key]" type="checkbox"><i class="form-icon" /> {{ t(`word.${key}`, 2) }}
+                        <input v-model="options.includes[key]" type="checkbox"><i class="form-icon" /> {{ t(`database.${String(key).slice(0, -1)}`, 2) }}
                      </label>
                      <div v-if="clientCustoms.exportByChunks">
                         <div class="h6 mt-4 mb-2">
-                           {{ t('message.newInserStmtEvery') }}:
+                           {{ t('database.newInsertStmtEvery') }}:
                         </div>
                         <div class="columns">
                            <div class="column col-6">
@@ -209,21 +224,21 @@
                               <BaseSelect
                                  v-model="options.sqlInsertDivider"
                                  class="form-select"
-                                 :options="[{value: 'bytes', label: 'KiB'}, {value: 'rows', label: t('word.row', 2)}]"
+                                 :options="[{value: 'bytes', label: 'KiB'}, {value: 'rows', label: t('database.row', 2)}]"
                               />
                            </div>
                         </div>
                      </div>
 
                      <div class="h6 mb-2 mt-4">
-                        {{ t('message.ourputFormat') }}:
+                        {{ t('general.outputFormat') }}:
                      </div>
                      <div class="columns">
                         <div class="column h5 mb-4">
                            <BaseSelect
                               v-model="options.outputFormat"
                               class="form-select"
-                              :options="[{value: 'sql', label: t('message.singleFile', {ext: '.sql'})}, {value: 'sql.zip', label: t('message.zipCompressedFile', {ext: '.sql'})}]"
+                              :options="[{value: 'sql', label: t('general.singleFile', {ext: '.sql'})}, {value: 'sql.zip', label: t('general.zipCompressedFile', {ext: '.sql'})}]"
                            />
                         </div>
                      </div>
@@ -244,8 +259,8 @@
                   </div>
                </div>
                <div class="column col-auto px-0">
-                  <button class="btn btn-link" @click.stop="closeModal">
+                  <button class="btn btn-link mr-2" @click.stop="closeModal">
-                     {{ t('word.close') }}
+                     {{ t('general.close') }}
                   </button>
                   <button
                      class="btn btn-primary mr-2"
@@ -254,7 +269,7 @@
                      autofocus
                      @click.prevent="startExport"
                   >
-                     {{ t('word.export') }}
+                     {{ t('database.export') }}
                   </button>
                </div>
             </div>
@@ -264,30 +279,30 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount, Ref, ref } from 'vue';
-import * as moment from 'moment';
-import { ipcRenderer } from 'electron';
-import { storeToRefs } from 'pinia';
-import { useI18n } from 'vue-i18n';
 import { ClientCode, SchemaInfos } from 'common/interfaces/antares';
+import { Customizations } from 'common/interfaces/customizations';
 import { ExportOptions, ExportState } from 'common/interfaces/exporter';
-import { useNotificationsStore } from '@/stores/notifications';
+import { ipcRenderer } from 'electron';
-import { useWorkspacesStore } from '@/stores/workspaces';
+import * as moment from 'moment';
+import { storeToRefs } from 'pinia';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Application from '@/ipc-api/Application';
 import Schema from '@/ipc-api/Schema';
-import { Customizations } from 'common/interfaces/customizations';
+import { useNotificationsStore } from '@/stores/notifications';
-import BaseSelect from '@/components/BaseSelect.vue';
+import { useSchemaExportStore } from '@/stores/schemaExport';
-
+import { useWorkspacesStore } from '@/stores/workspaces';
-const props = defineProps({
-   selectedSchema: String
-});
 
 const emit = defineEmits(['close']);
 const { t } = useI18n();
 
 const { addNotification } = useNotificationsStore();
 const workspacesStore = useWorkspacesStore();
+const schemaExportStore = useSchemaExportStore();
 
 const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
 
@@ -298,6 +313,8 @@ const {
    refreshSchema
 } = workspacesStore;
 
+const { selectedTable, selectedSchema } = storeToRefs(schemaExportStore);
+
 const isExporting = ref(false);
 const isRefreshing = ref(false);
 const progressPercentage = ref(0);
@@ -309,28 +326,29 @@ const tables: Ref<{
    includeDropStatement: boolean;
 }[]> = ref([]);
 const options: Ref<Partial<ExportOptions>> = ref({
-   schema: props.selectedSchema,
+   schema: selectedSchema.value,
    includes: {} as {[key: string]: boolean},
    outputFormat: 'sql' as 'sql' | 'sql.zip',
    sqlInsertAfter: 250,
    sqlInsertDivider: 'bytes' as 'bytes' | 'rows'
 });
 const basePath = ref('');
+const chosenFilename = ref('');
 
 const currentWorkspace = computed(() => getWorkspace(selectedWorkspace.value));
 const clientCustoms: Ref<Customizations> = computed(() => currentWorkspace.value.customizations);
 const schemaItems = computed(() => {
-   const db: SchemaInfos = currentWorkspace.value.structure.find((db: SchemaInfos) => db.name === props.selectedSchema);
+   const db: SchemaInfos = currentWorkspace.value.structure.find((db: SchemaInfos) => db.name === selectedSchema.value);
    if (db)
       return db.tables.filter(table => table.type === 'table');
 
    return [];
 });
 const filename = computed(() => {
-   const date = moment().format('YYYY-MM-DD');
+   const date = moment().format('YYYY-MM-DD_HH-mm-ss');
-   return `${props.selectedSchema}_${date}.${options.value.outputFormat}`;
+   return `${selectedTable.value || selectedSchema.value}_${date}`;
 });
-const dumpFilePath = computed(() => `${basePath.value}/${filename.value}`);
+const dumpFilePath = computed(() => `${basePath.value}/${chosenFilename.value || filename.value}.${options.value.outputFormat}`);
 const includeStructureStatus = computed(() => {
    if (tables.value.every(item => item.includeStructure)) return 1;
    else if (tables.value.some(item => item.includeStructure)) return 2;
@@ -353,7 +371,7 @@ const startExport = async () => {
    const params = {
       uid,
       type: client,
-      schema: props.selectedSchema,
+      schema: selectedSchema.value,
       outputFile: dumpFilePath.value,
       tables: [...tables.value],
       ...options.value
@@ -362,7 +380,7 @@ const startExport = async () => {
    try {
       const { status, response } = await Schema.export(params);
       if (status === 'success')
-         progressStatus.value = response.cancelled ? t('word.aborted') : t('word.completed');
+         progressStatus.value = response.cancelled ? t('general.aborted') : t('general.completed');
       else {
          progressStatus.value = response;
          addNotification({ status: 'error', message: response });
@@ -379,13 +397,13 @@ const updateProgress = (event: Event, state: ExportState) => {
    progressPercentage.value = Number((state.currentItemIndex / state.totalItems * 100).toFixed(1));
    switch (state.op) {
       case 'PROCESSING':
-         progressStatus.value = t('message.processingTableExport', { table: state.currentItem });
+         progressStatus.value = t('database.processingTableExport', { table: state.currentItem });
          break;
       case 'FETCH':
-         progressStatus.value = t('message.fechingTableExport', { table: state.currentItem });
+         progressStatus.value = t('database.fetchingTableExport', { table: state.currentItem });
          break;
       case 'WRITE':
-         progressStatus.value = t('message.writingTableExport', { table: state.currentItem });
+         progressStatus.value = t('database.writingTableExport', { table: state.currentItem });
          break;
    }
 };
@@ -431,7 +449,7 @@ const toggleAllTablesOption = (option: 'includeStructure' | 'includeContent' |'i
 
 const refresh = async () => {
    isRefreshing.value = true;
-   await refreshSchema({ uid: currentWorkspace.value.uid, schema: props.selectedSchema });
+   await refreshSchema({ uid: currentWorkspace.value.uid, schema: selectedSchema.value });
    isRefreshing.value = false;
 };
 
@@ -446,12 +464,31 @@ const openPathDialog = async () => {
 
    window.addEventListener('keydown', onKey);
 
+   if (selectedTable.value) {
+      setTimeout(() => {
+         const element = document.querySelector<HTMLElement>('.modal.active .selected');
+
+         if (element) {
+            const rect = element.getBoundingClientRect();
+            const elemTop = rect.top;
+            const elemBottom = rect.bottom;
+            const isVisible = (elemTop >= 0) && (elemBottom <= window.innerHeight);
+
+            if (!isVisible) {
+               element.setAttribute('tabindex', '-1');
+               element.focus();
+               element.removeAttribute('tabindex');
+            }
+         }
+      }, 100);
+   }
+
    basePath.value = await Application.getDownloadPathDirectory();
    tables.value = schemaItems.value.map(item => ({
       table: item.name,
-      includeStructure: true,
+      includeStructure: !selectedTable.value ? true : selectedTable.value === item.name,
-      includeContent: true,
+      includeContent: !selectedTable.value ? true : selectedTable.value === item.name,
-      includeDropStatement: true
+      includeDropStatement: !selectedTable.value ? true : selectedTable.value === item.name
    }));
 
    const structure = ['functions', 'views', 'triggers', 'routines', 'schedulers'];
@@ -459,7 +496,7 @@ const openPathDialog = async () => {
    structure.forEach((feat: keyof Customizations) => {
       const val = clientCustoms.value[feat];
       if (val)
-         options.value.includes[feat] = true;
+         options.value.includes[feat] = !selectedTable.value;
    });
 
    ipcRenderer.on('export-progress', updateProgress);

src/renderer/components/ModalFakerRows.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-playlist-plus mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.insertRow', 2) }}</span>
+                        icon-name="mdiPlaylistPlus"
+                        :size="24"
+                        class="mr-1"
+                     />
+                     <span class="cut-text">{{ t('database.insertRow', 2) }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -39,7 +43,7 @@
                                  <span class="input-group-addon field-type" :class="typeClass(field.type)">
                                     {{ field.type }} {{ wrapNumber(fieldLength(field)) }}
                                  </span>
-                                 <label class="form-checkbox ml-3" :title="t('word.insert')">
+                                 <label class="form-checkbox ml-3" :title="t('general.insert')">
                                     <input
                                        type="checkbox"
                                        :checked="!fieldsToExclude.includes(field.name)"
@@ -55,7 +59,7 @@
             </div>
             <div class="modal-footer columns">
                <div class="column d-flex" :class="hasFakes ? 'col-4' : 'col-2'">
-                  <div class="input-group tooltip tooltip-right" :data-tooltip="t('message.numberOfInserts')">
+                  <div class="input-group tooltip tooltip-right" :data-tooltip="t('database.numberOfInserts')">
                      <input
                         v-model="nInserts"
                         type="number"
@@ -64,13 +68,13 @@
                         :disabled="isInserting"
                      >
                      <span class="input-group-addon">
-                        <i class="mdi mdi-24px mdi-repeat" />
+                        <BaseIcon icon-name="mdiRepeat" :size="24" />
                      </span>
                   </div>
                   <div
                      v-if="hasFakes"
                      class="tooltip tooltip-right ml-2"
-                     :data-tooltip="t('message.fakeDataLanguage')"
+                     :data-tooltip="t('database.fakeDataLanguage')"
                   >
                      <BaseSelect
                         v-model="fakerLocale"
@@ -85,10 +89,10 @@
                      :class="{'loading': isInserting}"
                      @click.stop="insertRows"
                   >
-                     {{ t('word.insert') }}
+                     {{ t('general.insert') }}
                   </button>
                   <button class="btn btn-link" @click.stop="closeModal">
-                     {{ t('word.close') }}
+                     {{ t('general.close') }}
                   </button>
                </div>
             </div>
@@ -98,19 +102,21 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeMount, onMounted, Prop, Ref, ref, watch } from 'vue';
+import { BIT, BLOB, DATE, DATETIME, FLOAT, LONG_TEXT, NUMBER, TEXT, TIME } from 'common/fieldTypes';
-import * as moment from 'moment';
 import { TableField, TableForeign } from 'common/interfaces/antares';
+import * as moment from 'moment';
 import { storeToRefs } from 'pinia';
-import { TEXT, LONG_TEXT, NUMBER, FLOAT, DATE, TIME, DATETIME, BLOB, BIT } from 'common/fieldTypes';
+import { computed, onBeforeMount, onMounted, Prop, Ref, ref, watch } from 'vue';
-import { useNotificationsStore } from '@/stores/notifications';
+import { useI18n } from 'vue-i18n';
-import { useWorkspacesStore } from '@/stores/workspaces';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
+import FakerSelect from '@/components/FakerSelect.vue';
+import { useFilters } from '@/composables/useFilters';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Tables from '@/ipc-api/Tables';
-import FakerSelect from '@/components/FakerSelect.vue';
+import { useNotificationsStore } from '@/stores/notifications';
-import BaseSelect from '@/components/BaseSelect.vue';
+import { useWorkspacesStore } from '@/stores/workspaces';
-import { useFilters } from '@/composables/useFilters';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 

src/renderer/components/ModalFolderAppearance.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-folder-edit mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.editFolder') }}</span>
+                        icon-name="mdiFolderEdit"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('application.editFolder') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -17,7 +21,7 @@
                   <form class="form-horizontal">
                      <div class="form-group mb-4">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.name') }}</label>
+                           <label class="form-label">{{ t('general.name') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -26,13 +30,13 @@
                               class="form-input"
                               type="text"
                               required
-                              :placeholder="t('message.folderName')"
+                              :placeholder="t('application.folderName')"
                            >
                         </div>
                      </div>
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.color') }}</label>
+                           <label class="form-label">{{ t('application.color') }}</label>
                         </div>
                         <div class="col-9 color-wrapper">
                            <div
@@ -43,7 +47,11 @@
                               :style="`background-color: ${color.hex}`"
                               @click="localFolder.color = color.hex"
                            >
-                              <i v-if="localFolder.color === color.hex" class="mdi mdi-check" />
+                              <BaseIcon
+                                 v-if="localFolder.color === color.hex"
+                                 icon-name="mdiCheck"
+                                 :size="16"
+                              />
                            </div>
                         </div>
                      </div>
@@ -51,11 +59,11 @@
                </div>
             </div>
             <div class="modal-footer">
-               <button class="btn btn-primary mr-2" @click.stop="editFolderAppearence">
+               <button class="btn btn-primary mr-2" @click.stop="editFolderAppearance">
-                  {{ t('word.update') }}
+                  {{ t('application.update') }}
                </button>
                <button class="btn btn-link" @click.stop="closeModal">
-                  {{ t('word.close') }}
+                  {{ t('general.close') }}
                </button>
             </div>
          </div>
@@ -65,10 +73,12 @@
 
 <script setup lang="ts">
 import { onBeforeUnmount, PropType, Ref, ref } from 'vue';
-import { useFocusTrap } from '@/composables/useFocusTrap';
 import { useI18n } from 'vue-i18n';
-import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFocusTrap } from '@/composables/useFocusTrap';
 import { unproxify } from '@/libs/unproxify';
+import { SidebarElement, useConnectionsStore } from '@/stores/connections';
 
 const connectionsStore = useConnectionsStore();
 
@@ -110,7 +120,7 @@ const { trapRef } = useFocusTrap();
 const firstInput: Ref<HTMLInputElement> = ref(null);
 const localFolder: Ref<SidebarElement> = ref(unproxify(props.folder));
 
-const editFolderAppearence = () => {
+const editFolderAppearance = () => {
    updateConnectionOrder(localFolder.value);
    closeModal();
 };

src/renderer/components/ModalHistory.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-history mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('word.history') }}: {{ connectionName }}</span>
+                        icon-name="mdiHistory"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('general.history') }}: {{ connectionName }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -22,19 +26,26 @@
                      v-model="searchTerm"
                      class="form-input"
                      type="text"
-                     :placeholder="t('message.searchForQueries')"
+                     :placeholder="t('database.searchForQueries')"
                   >
-                  <i v-if="!searchTerm" class="form-icon mdi mdi-magnify mdi-18px pr-4" />
+                  <BaseIcon
-                  <i
+                     v-if="!searchTerm"
+                     icon-name="mdiMagnify"
+                     class="form-icon pr-2"
+                     :size="18"
+                  />
+                  <BaseIcon
                      v-else
-                     class="form-icon c-hand mdi mdi-backspace mdi-18px pr-4"
+                     icon-name="mdiBackspace"
+                     class="form-icon c-hand pr-2"
+                     :size="18"
                      @click="searchTerm = ''"
                   />
                </div>
                <div
                   v-if="history.length"
                   ref="tableWrapper"
-                  class="vscroll px-1 "
+                  class="vscroll px-1"
                   :style="{'height': resultsSize+'px'}"
                >
                   <div ref="table">
@@ -53,7 +64,11 @@
                               tabindex="0"
                            >
                               <div class="tile-icon">
-                                 <i class="mdi mdi-code-tags pr-1" />
+                                 <BaseIcon
+                                    icon-name="mdiCodeTags"
+                                    class="pr-1"
+                                    :size="24"
+                                 />
                               </div>
                               <div class="tile-content">
                                  <div class="tile-title">
@@ -67,13 +82,25 @@
                                     <small class="tile-subtitle">{{ query.schema }} · {{ formatDate(query.date) }}</small>
                                     <div class="tile-history-buttons">
                                        <button class="btn btn-link pl-1" @click.stop="$emit('select-query', query.sql)">
-                                          <i class="mdi mdi-open-in-app pr-1" /> {{ t('word.select') }}
+                                          <BaseIcon
+                                             icon-name="mdiOpenInApp"
+                                             class="pr-1"
+                                             :size="22"
+                                          /> {{ t('general.select') }}
                                        </button>
                                        <button class="btn btn-link pl-1" @click="copyQuery(query.sql)">
-                                          <i class="mdi mdi-content-copy pr-1" /> {{ t('word.copy') }}
+                                          <BaseIcon
+                                             icon-name="mdiContentCopy"
+                                             class="pr-1"
+                                             :size="22"
+                                          /> {{ t('general.copy') }}
                                        </button>
                                        <button class="btn btn-link pl-1" @click="deleteQuery(query)">
-                                          <i class="mdi mdi-delete-forever pr-1" /> {{ t('word.delete') }}
+                                          <BaseIcon
+                                             icon-name="mdiDeleteForever"
+                                             class="pr-1"
+                                             :size="22"
+                                          /> {{ t('general.delete') }}
                                        </button>
                                     </div>
                                  </div>
@@ -85,10 +112,10 @@
                </div>
                <div v-else class="empty">
                   <div class="empty-icon">
-                     <i class="mdi mdi-history mdi-48px" />
+                     <BaseIcon icon-name="mdiHistory" :size="48" />
                   </div>
                   <p class="empty-title h5">
-                     {{ t('message.thereIsNoQueriesYet') }}
+                     {{ t('database.thereIsNoQueriesYet') }}
                   </p>
                </div>
             </div>
@@ -98,14 +125,16 @@
 </template>
 
 <script setup lang="ts">
+import { ConnectionParams } from 'common/interfaces/antares';
 import { Component, computed, ComputedRef, onBeforeUnmount, onMounted, onUpdated, Prop, Ref, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { ConnectionParams } from 'common/interfaces/antares';
+
-import { HistoryRecord, useHistoryStore } from '@/stores/history';
+import BaseIcon from '@/components/BaseIcon.vue';
-import { useConnectionsStore } from '@/stores/connections';
-import { useFocusTrap } from '@/composables/useFocusTrap';
-import { useFilters } from '@/composables/useFilters';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
+import { useFilters } from '@/composables/useFilters';
+import { useFocusTrap } from '@/composables/useFocusTrap';
+import { useConnectionsStore } from '@/stores/connections';
+import { HistoryRecord, useHistoryStore } from '@/stores/history';
 
 const { t } = useI18n();
 const { formatDate } = useFilters();

src/renderer/components/ModalImportSchema.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-database-import mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.importSchema') }}</span>
+                        icon-name="mdiDatabaseImport"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('database.importSchema') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -15,7 +19,7 @@
             <div class="modal-body pb-0">
                {{ sqlFile }}
                <div v-if="queryErrors.length > 0" class="mt-2">
-                  <label>{{ t('message.importQueryErrors', queryErrors.length) }}</label>
+                  <label>{{ t('database.importQueryErrors', queryErrors.length) }}</label>
                   <textarea
                      v-model="formattedQueryErrors"
                      class="form-input"
@@ -28,7 +32,7 @@
                <div class="column col modal-progress-wrapper text-left">
                   <div class="import-progress">
                      <span class="progress-status">
-                        {{ progressPercentage }}% - {{ progressStatus }} - {{ t('message.executedQueries', queryCount) }}
+                        {{ progressPercentage }}% - {{ progressStatus }} - {{ t('database.executedQueries', queryCount) }}
                      </span>
                      <progress
                         class="progress d-block"
@@ -39,7 +43,7 @@
                </div>
                <div class="column col-auto px-0">
                   <button class="btn btn-link" @click.stop="closeModal">
-                     {{ completed ? t('word.close') : t('word.cancel') }}
+                     {{ completed ? t('general.close') : t('general.cancel') }}
                   </button>
                </div>
             </div>
@@ -50,15 +54,17 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount, Ref, ref } from 'vue';
+import { ImportState } from 'common/interfaces/importer';
 import { ipcRenderer } from 'electron';
 import * as moment from 'moment';
 import { storeToRefs } from 'pinia';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import Schema from '@/ipc-api/Schema';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import Schema from '@/ipc-api/Schema';
-import { ImportState } from 'common/interfaces/importer';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 
@@ -108,7 +114,7 @@ const startImport = async (file: string) => {
       const { status, response } = await Schema.import(params);
 
       if (status === 'success')
-         progressStatus.value = response.cancelled ? t('word.aborted') : t('word.completed');
+         progressStatus.value = response.cancelled ? t('general.aborted') : t('general.completed');
       else {
          progressStatus.value = response;
          addNotification({ status: 'error', message: response });

src/renderer/components/ModalNewSchema.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-database-plus mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.createNewSchema') }}</span>
+                        icon-name="mdiDatabasePlus"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('database.createNewSchema') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -17,7 +21,7 @@
                   <form class="form-horizontal" @submit.prevent="createSchema">
                      <div class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.name') }}</label>
+                           <label class="form-label">{{ t('general.name') }}</label>
                         </div>
                         <div class="col-9">
                            <input
@@ -26,13 +30,13 @@
                               class="form-input"
                               type="text"
                               required
-                              :placeholder="t('message.schemaName')"
+                              :placeholder="t('database.schemaName')"
                            >
                         </div>
                      </div>
                      <div v-if="customizations.collations" class="form-group">
                         <div class="col-3">
-                           <label class="form-label">{{ t('word.collation') }}</label>
+                           <label class="form-label">{{ t('database.collation') }}</label>
                         </div>
                         <div class="col-9">
                            <BaseSelect
@@ -43,7 +47,7 @@
                               option-label="collation"
                               option-track-by="collation"
                            />
-                           <small>{{ t('message.serverDefault') }}: {{ defaultCollation }}</small>
+                           <small>{{ t('database.serverDefault') }}: {{ defaultCollation }}</small>
                         </div>
                      </div>
                   </form>
@@ -55,10 +59,10 @@
                   :class="{'loading': isLoading}"
                   @click.stop="createSchema"
                >
-                  {{ t('word.add') }}
+                  {{ t('general.add') }}
                </button>
                <button class="btn btn-link" @click.stop="closeModal">
-                  {{ t('word.close') }}
+                  {{ t('general.close') }}
                </button>
             </div>
          </div>
@@ -67,14 +71,16 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onBeforeUnmount, Ref, ref } from 'vue';
 import { storeToRefs } from 'pinia';
-import { useNotificationsStore } from '@/stores/notifications';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
-import { useWorkspacesStore } from '@/stores/workspaces';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Schema from '@/ipc-api/Schema';
-import BaseSelect from '@/components/BaseSelect.vue';
+import { useNotificationsStore } from '@/stores/notifications';
-import { useI18n } from 'vue-i18n';
+import { useWorkspacesStore } from '@/stores/workspaces';
 
 const { t } = useI18n();
 

src/renderer/components/ModalProcessesList.vue

@@ -16,8 +16,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-memory mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('message.processesList') }}: {{ connectionName }}</span>
+                        icon-name="mdiMemory"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('database.processesList') }}: {{ connectionName }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click.stop="closeModal" />
@@ -29,17 +33,27 @@
                         <button
                            class="btn btn-dark btn-sm mr-0 pr-1 d-flex"
                            :class="{'loading':isQuering}"
-                           :title="`${t('word.refresh')}`"
+                           :title="`${t('general.refresh')}`"
                            @click="getProcessesList"
                         >
-                           <i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh mr-1" />
+                           <BaseIcon
-                           <i v-else class="mdi mdi-24px mdi-history mdi-flip-h mr-1" />
+                              v-if="!+autorefreshTimer"
+                              icon-name="mdiRefresh"
+                              :size="24"
+                           />
+                           <BaseIcon
+                              v-else
+                              icon-name="mdiHistory"
+                              flip="horizontal"
+                              class="mr-1"
+                              :size="24"
+                           />
                         </button>
                         <div class="btn btn-dark btn-sm dropdown-toggle pl-0 pr-0" tabindex="0">
-                           <i class="mdi mdi-24px mdi-menu-down" />
+                           <BaseIcon icon-name="mdiMenuDown" :size="24" />
                         </div>
                         <div class="menu px-3">
-                           <span>{{ t('word.autoRefresh') }}: <b>{{ +autorefreshTimer ? `${autorefreshTimer}s` : 'OFF' }}</b></span>
+                           <span>{{ t('general.autoRefresh') }}: <b>{{ +autorefreshTimer ? `${autorefreshTimer}s` : 'OFF' }}</b></span>
                            <input
                               v-model="autorefreshTimer"
                               class="slider no-border"
@@ -58,9 +72,9 @@
                         class="btn btn-dark btn-sm dropdown-toggle d-flex mr-0 pr-0"
                         tabindex="0"
                      >
-                        <i class="mdi mdi-24px mdi-file-export mr-1" />
+                        <BaseIcon icon-name="mdiFileExport" :size="24" />
-                        <span>{{ t('word.export') }}</span>
+                        <span>{{ t('database.export') }}</span>
-                        <i class="mdi mdi-24px mdi-menu-down" />
+                        <BaseIcon icon-name="mdiMenuDown" :size="24" />
                      </button>
                      <ul class="menu text-left">
                         <li class="menu-item">
@@ -74,7 +88,7 @@
                </div>
                <div class="workspace-query-info">
                   <div v-if="sortedResults.length">
-                     {{ t('word.processes') }}: <b>{{ sortedResults.length.toLocaleString() }}</b>
+                     {{ t('database.processes') }}: <b>{{ sortedResults.length.toLocaleString() }}</b>
                   </div>
                </div>
             </div>
@@ -95,10 +109,12 @@
                               <div ref="columnResize" class="column-resizable">
                                  <div class="table-column-title" @click="sort(field)">
                                     <span>{{ field.toUpperCase() }}</span>
-                                    <i
+
+                                    <BaseIcon
                                        v-if="currentSort === field"
-                                       class="mdi sort-icon"
+                                       :icon-name="currentSortDir === 'asc' ? 'mdiSortAscending':'mdiSortDescending'"
-                                       :class="currentSortDir === 'asc' ? 'mdi-sort-ascending':'mdi-sort-descending'"
+                                       :size="18"
+                                       class="ml-1"
                                     />
                                  </div>
                               </div>
@@ -134,18 +150,21 @@
 </template>
 
 <script setup lang="ts">
-import { Component, computed, onBeforeUnmount, onMounted, onUpdated, Prop, Ref, ref } from 'vue';
-import { ipcRenderer } from 'electron';
 import { ConnectionParams } from 'common/interfaces/antares';
-import { exportRows } from '../libs/exportRows';
+import { ipcRenderer } from 'electron';
-import { useNotificationsStore } from '@/stores/notifications';
+import { Component, computed, onBeforeUnmount, onMounted, onUpdated, Prop, Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
+import ModalProcessesListContext from '@/components/ModalProcessesListContext.vue';
+import ModalProcessesListRow from '@/components/ModalProcessesListRow.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Schema from '@/ipc-api/Schema';
 import { useConnectionsStore } from '@/stores/connections';
-import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
+import { useNotificationsStore } from '@/stores/notifications';
-import ModalProcessesListRow from '@/components/ModalProcessesListRow.vue';
+
-import ModalProcessesListContext from '@/components/ModalProcessesListContext.vue';
+import { exportRows } from '../libs/exportRows';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 

src/renderer/components/ModalProcessesListContext.vue

@@ -4,8 +4,16 @@
       @close-context="closeContext"
    >
       <div v-if="props.selectedRow" class="context-element">
-         <span class="d-flex"><i class="mdi mdi-18px mdi-content-copy text-light pr-1" /> {{ t('word.copy') }}</span>
+         <span class="d-flex"><BaseIcon
-         <i class="mdi mdi-18px mdi-chevron-right text-light pl-1" />
+            icon-name="mdiContentCopy"
+            class="text-light mt-1 mr-1"
+            :size="18"
+         /> {{ t('general.copy') }}</span>
+         <BaseIcon
+            icon-name="mdiChevronRight"
+            class="text-light"
+            :size="18"
+         />
          <div class="context-submenu">
             <div
                v-if="props.selectedRow"
@@ -13,7 +21,12 @@
                @click="copyCell"
             >
                <span class="d-flex">
-                  <i class="mdi mdi-18px mdi-numeric-0 mdi-rotate-90 text-light pr-1" /> {{ t('word.cell', 1) }}
+                  <BaseIcon
+                     icon-name="mdiNumeric0"
+                     :rotate="90"
+                     class="text-light mt-1 mr-1"
+                     :size="18"
+                  /> {{ t('database.cell', 1) }}
                </span>
             </div>
             <div
@@ -22,7 +35,11 @@
                @click="copyRow"
             >
                <span class="d-flex">
-                  <i class="mdi mdi-18px mdi-table-row text-light pr-1" /> {{ t('word.row', 1) }}
+                  <BaseIcon
+                     icon-name="mdiTableRow"
+                     class="text-light mt-1 mr-1"
+                     :size="18"
+                  /> {{ t('database.row', 1) }}
                </span>
             </div>
          </div>
@@ -33,16 +50,22 @@
          @click="killProcess"
       >
          <span class="d-flex">
-            <i class="mdi mdi-18px mdi-close-circle-outline text-light pr-1" /> {{ t('message.killProcess') }}
+            <BaseIcon
+               icon-name="mdiCloseCircleOutline"
+               class="text-light mt-1 mr-1"
+               :size="18"
+            /> {{ t('database.killProcess') }}
          </span>
       </div>
    </BaseContextMenu>
 </template>
 
 <script setup lang="ts">
-import BaseContextMenu from '@/components/BaseContextMenu.vue';
 import { useI18n } from 'vue-i18n';
 
+import BaseContextMenu from '@/components/BaseContextMenu.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+
 const { t } = useI18n();
 
 const props = defineProps({

src/renderer/components/ModalProcessesListRow.vue

@@ -16,15 +16,19 @@
       </div>
       <ConfirmModal
          v-if="isInfoModal"
-         :confirm-text="t('word.update')"
+         :confirm-text="t('application.update')"
-         :cancel-text="t('word.close')"
+         :cancel-text="t('general.close')"
          size="medium"
          :hide-footer="true"
          @hide="hideInfoModal"
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-information-outline mr-1" /> {{ t('message.processInfo') }}
+               <BaseIcon
+                  icon-name="mdiInformationOutline"
+                  :size="24"
+                  class="mr-1"
+               /> {{ t('database.processInfo') }}
             </div>
          </template>
          <template #body>
@@ -46,10 +50,12 @@
 
 <script setup lang="ts">
 import { Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
 import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
 import TextEditor from '@/components/BaseTextEditor.vue';
 import { useFilters } from '@/composables/useFilters';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 

src/renderer/components/ModalSettings.vue

@@ -6,8 +6,12 @@
             <div class="modal-header pl-2">
                <div class="modal-title h6">
                   <div class="d-flex">
-                     <i class="mdi mdi-24px mdi-cog mr-1" />
+                     <BaseIcon
-                     <span class="cut-text">{{ t('word.settings') }}</span>
+                        icon-name="mdiCog"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span class="cut-text">{{ t('application.settings') }}</span>
                   </div>
                </div>
                <a class="btn btn-clear c-hand" @click="closeModal" />
@@ -21,21 +25,28 @@
                            :class="{'active': selectedTab === 'general'}"
                            @click="selectTab('general')"
                         >
-                           <a class="tab-link">{{ t('word.general') }}</a>
+                           <a class="tab-link">{{ t('application.general') }}</a>
                         </li>
                         <li
                            class="tab-item c-hand"
                            :class="{'active': selectedTab === 'themes'}"
                            @click="selectTab('themes')"
                         >
-                           <a class="tab-link">{{ t('word.themes') }}</a>
+                           <a class="tab-link">{{ t('application.themes') }}</a>
                         </li>
                         <li
                            class="tab-item c-hand"
                            :class="{'active': selectedTab === 'shortcuts'}"
                            @click="selectTab('shortcuts')"
                         >
-                           <a class="tab-link">{{ t('word.shortcuts') }}</a>
+                           <a class="tab-link">{{ t('application.shortcuts') }}</a>
+                        </li>
+                        <li
+                           class="tab-item c-hand"
+                           :class="{'active': selectedTab === 'data'}"
+                           @click="selectTab('data')"
+                        >
+                           <a class="tab-link">{{ t('application.data') }}</a>
                         </li>
                         <li
                            v-if="updateStatus !== 'disabled'"
@@ -43,21 +54,21 @@
                            :class="{'active': selectedTab === 'update'}"
                            @click="selectTab('update')"
                         >
-                           <a class="tab-link" :class="{'badge badge-update': hasUpdates}">{{ t('word.update') }}</a>
+                           <a class="tab-link" :class="{'badge badge-update': hasUpdates}">{{ t('application.update') }}</a>
                         </li>
                         <li
                            class="tab-item c-hand"
                            :class="{'active': selectedTab === 'changelog'}"
                            @click="selectTab('changelog')"
                         >
-                           <a class="tab-link">{{ t('word.changelog') }}</a>
+                           <a class="tab-link">{{ t('application.changelog') }}</a>
                         </li>
                         <li
                            class="tab-item c-hand"
                            :class="{'active': selectedTab === 'about'}"
                            @click="selectTab('about')"
                         >
-                           <a class="tab-link">{{ t('word.about') }}</a>
+                           <a class="tab-link">{{ t('application.about') }}</a>
                         </li>
                      </ul>
                   </div>
@@ -65,14 +76,18 @@
                      <div class="container">
                         <form class="form-horizontal columns">
                            <div class="column col-12 h6 text-uppercase mb-1">
-                              {{ t('word.application') }}
+                              {{ t('application.application') }}
                            </div>
                            <div class="column col-12 col-sm-12 mb-2 columns">
                               <div class="form-group column col-12">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       <i class="mdi mdi-18px mdi-translate mr-1" />
+                                       <BaseIcon
-                                       {{ t('word.language') }}
+                                          icon-name="mdiTranslate"
+                                          class="mr-1"
+                                          :size="18"
+                                       />
+                                       {{ t('application.language') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -87,15 +102,15 @@
                                  </div>
                                  <div class="col-4 col-sm-12 px-2 p-vcentered">
                                     <small class="d-block" :style="'line-height: 1.1; font-size: 70%;'">
-                                       {{ t('message.missingOrIncompleteTranslation') }}<br>
+                                       {{ t('application.missingOrIncompleteTranslation') }}<br>
-                                       <a class="text-bold c-hand" @click="openOutside('https://github.com/antares-sql/antares/wiki/Translate-Antares')">{{ t('message.findOutHowToContribute') }}</a>
+                                       <a class="text-bold c-hand" @click="openOutside('https://github.com/antares-sql/antares/wiki/Translate-Antares')">{{ t('application.findOutHowToContribute') }}</a>
                                     </small>
                                  </div>
                               </div>
                               <div class="form-group column col-12">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.dataTabPageSize') }}
+                                       {{ t('application.dataTabPageSize') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -110,7 +125,7 @@
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.restorePreviourSession') }}
+                                       {{ t('application.restorePreviousSession') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -123,7 +138,7 @@
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.showTableSize') }}
+                                       {{ t('application.showTableSize') }}
                                     </label>
                                  </div>
                                  <div class="col-1 col-sm-12">
@@ -134,14 +149,14 @@
                                  </div>
                                  <div class="col-6 col-sm-12 px-2 p-vcentered">
                                     <small class="d-block" :style="'line-height: 1.1; font-size: 70%;'">
-                                       {{ t('message.showTableSizeDescription') }}
+                                       {{ t('application.showTableSizeDescription') }}
                                     </small>
                                  </div>
                               </div>
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.disableBlur') }}
+                                       {{ t('application.disableBlur') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -154,7 +169,7 @@
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.disableScratchpad') }}
+                                       {{ t('application.disableScratchpad') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -167,7 +182,7 @@
                               <div class="form-group column col-12">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.notificationsTimeout') }}
+                                       {{ t('application.notificationsTimeout') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -179,19 +194,19 @@
                                           min="1"
                                           @focusout="checkNotificationsTimeout"
                                        >
-                                       <span class="input-group-addon">{{ t('word.seconds') }}</span>
+                                       <span class="input-group-addon">{{ t('general.seconds') }}</span>
                                     </div>
                                  </div>
                               </div>
                            </div>
                            <div class="column col-12 h6 mt-4 text-uppercase mb-1">
-                              {{ t('word.editor') }}
+                              {{ t('application.editor') }}
                            </div>
                            <div class="column col-12 col-sm-12 columns">
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('word.autoCompletion') }}
+                                       {{ t('application.autoCompletion') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -204,7 +219,7 @@
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.wrapLongLines') }}
+                                       {{ t('application.wrapLongLines') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -217,7 +232,7 @@
                               <div class="form-group column col-12 mb-0">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.executeSelectedQuery') }}
+                                       {{ t('database.executeSelectedQuery') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -229,13 +244,13 @@
                               </div>
                            </div>
                            <div class="column col-12 h6 mt-4 text-uppercase mb-1">
-                              {{ t('word.resultsTable') }}
+                              {{ t('database.resultsTable') }}
                            </div>
                            <div class="column col-12 col-sm-12 columns">
                               <div class="form-group column col-12">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
-                                       {{ t('message.defaultCopyType') }}
+                                       {{ t('application.defaultCopyType') }}
                                     </label>
                                  </div>
                                  <div class="col-3 col-sm-12">
@@ -258,7 +273,7 @@
                      <div class="container">
                         <div class="columns">
                            <div class="column col-12 h6 text-uppercase mb-2">
-                              {{ t('message.applicationTheme') }}
+                              {{ t('application.applicationTheme') }}
                            </div>
                            <div
                               class="column col-6 c-hand theme-block"
@@ -267,9 +282,13 @@
                            >
                               <img :src="darkPreview" class="img-responsive img-fit-cover s-rounded">
                               <div class="theme-name text-light">
-                                 <i class="mdi mdi-moon-waning-crescent mdi-48px" />
+                                 <BaseIcon
+                                    icon-name="mdiMoonWaningCrescent"
+                                    class="mr-1"
+                                    :size="48"
+                                 />
                                  <div class="h6 mt-4">
-                                    {{ t('word.dark') }}
+                                    {{ t('application.dark') }}
                                  </div>
                               </div>
                            </div>
@@ -280,9 +299,13 @@
                            >
                               <img :src="lightPreview" class="img-responsive img-fit-cover s-rounded">
                               <div class="theme-name text-dark">
-                                 <i class="mdi mdi-white-balance-sunny mdi-48px" />
+                                 <BaseIcon
+                                    icon-name="mdiWhiteBalanceSunny"
+                                    class="mr-1"
+                                    :size="48"
+                                 />
                                  <div class="h6 mt-4">
-                                    {{ t('word.light') }}
+                                    {{ t('application.light') }}
                                  </div>
                               </div>
                            </div>
@@ -290,7 +313,7 @@
 
                         <div class="columns mt-4">
                            <div class="column col-12 h6 text-uppercase mb-2 mt-4">
-                              {{ t('message.editorTheme') }}
+                              {{ t('application.editorTheme') }}
                            </div>
                            <div class="column col-5 h5 mb-4">
                               <BaseSelect
@@ -366,6 +389,9 @@
                   <div v-show="selectedTab === 'shortcuts'" class="panel-body py-4">
                      <ModalSettingsShortcuts />
                   </div>
+                  <div v-show="selectedTab === 'data'" class="panel-body py-4">
+                     <ModalSettingsData />
+                  </div>
                   <div v-show="selectedTab === 'update'" class="panel-body py-4">
                      <ModalSettingsUpdate />
                   </div>
@@ -378,16 +404,48 @@
                         <img :src="appLogo" width="128">
                         <h4>{{ appName }}</h4>
                         <p class="mb-2">
-                           {{ t('word.version') }} {{ appVersion }}<br>
+                           {{ t('general.version') }} {{ appVersion }}<br>
-                           <a class="c-hand" @click="openOutside('https://github.com/antares-sql/antares')"><i class="mdi mdi-github d-inline" /> GitHub</a> • <a class="c-hand" @click="openOutside('https://twitter.com/AntaresSQL')"><i class="mdi mdi-twitter d-inline" /> Twitter</a> • <a class="c-hand" @click="openOutside('https://antares-sql.app/')"><i class="mdi mdi-web d-inline" /> Website</a><br>
+                           <a
-                           <small>{{ t('word.author') }} <a class="c-hand" @click="openOutside('https://github.com/Fabio286')">{{ appAuthor }}</a></small><br>
+                              class="c-hand"
+                              :style="'align-items: center; display: inline-flex;'"
+                              @click="openOutside('https://github.com/antares-sql/antares')"
+                           ><BaseIcon
+                              icon-name="mdiGithub"
+                              class="d-inline mr-1"
+                              :size="16"
+                           /> GitHub</a> • <a
+                              class="c-hand"
+                              :style="'align-items: center; display: inline-flex;'"
+                              @click="openOutside('https://fosstodon.org/@AntaresSQL')"
+                           ><BaseIcon
+                              icon-name="mdiMastodon"
+                              class="d-inline mr-1"
+                              :size="16"
+                           /> Mastodon</a> • <a
+                              class="c-hand"
+                              :style="'align-items: center; display: inline-flex;'"
+                              @click="openOutside('https://twitter.com/AntaresSQL')"
+                           ><BaseIcon
+                              icon-name="mdiTwitter"
+                              class="d-inline mr-1"
+                              :size="16"
+                           /> Twitter</a> • <a
+                              class="c-hand"
+                              :style="'align-items: center; display: inline-flex;'"
+                              @click="openOutside('https://antares-sql.app/')"
+                           ><BaseIcon
+                              icon-name="mdiWeb"
+                              class="d-inline mr-1"
+                              :size="16"
+                           /> Website</a><br>
+                           <small>{{ t('general.author') }} <a class="c-hand" @click="openOutside('https://github.com/Fabio286')">{{ appAuthor }}</a></small><br>
                         </p>
                         <div class="mb-2">
-                           <small class="d-block text-uppercase">{{ t('word.contributors') }}:</small>
+                           <small class="d-block text-uppercase">{{ t('general.contributors') }}:</small>
                            <div class="d-block py-1">
                               <small v-for="(contributor, i) in otherContributors" :key="i">{{ i !== 0 ? ', ' : '' }}{{ contributor }}</small>
                            </div>
-                           <small>{{ t('message.madeWithJS') }}</small>
+                           <small>{{ t('application.madeWithJS') }}</small>
                         </div>
                      </div>
                   </div>
@@ -399,21 +457,24 @@
 </template>
 
 <script setup lang="ts">
-import { onBeforeUnmount, Ref, ref, computed } from 'vue';
 import { shell } from 'electron';
 import { storeToRefs } from 'pinia';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
+import BaseTextEditor from '@/components/BaseTextEditor.vue';
+import ModalSettingsChangelog from '@/components/ModalSettingsChangelog.vue';
+import ModalSettingsData from '@/components/ModalSettingsData.vue';
+import ModalSettingsShortcuts from '@/components/ModalSettingsShortcuts.vue';
+import ModalSettingsUpdate from '@/components/ModalSettingsUpdate.vue';
+import { useFocusTrap } from '@/composables/useFocusTrap';
+import { AvailableLocale } from '@/i18n';
+import { localesNames } from '@/i18n/supported-locales';
 import { useApplicationStore } from '@/stores/application';
 import { useSettingsStore } from '@/stores/settings';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import { useFocusTrap } from '@/composables/useFocusTrap';
-import { localesNames } from '@/i18n/supported-locales';
-import ModalSettingsUpdate from '@/components/ModalSettingsUpdate.vue';
-import ModalSettingsChangelog from '@/components/ModalSettingsChangelog.vue';
-import ModalSettingsShortcuts from '@/components/ModalSettingsShortcuts.vue';
-import BaseTextEditor from '@/components/BaseTextEditor.vue';
-import BaseSelect from '@/components/BaseSelect.vue';
-import { AvailableLocale } from '@/i18n';
 
 const { t } = useI18n();
 
@@ -500,7 +561,7 @@ const selectedTab: Ref<string> = ref('general');
 
 const editorThemes = computed(() => [
    {
-      group: t('word.light'),
+      group: t('application.light'),
       themes: [
          { code: 'chrome', name: 'Chrome' },
          { code: 'clouds', name: 'Clouds' },
@@ -520,7 +581,7 @@ const editorThemes = computed(() => [
       ]
    },
    {
-      group: t('word.dark'),
+      group: t('application.dark'),
       themes: [
          { code: 'ambiance', name: 'Ambiance' },
          { code: 'chaos', name: 'Chaos' },
@@ -553,12 +614,12 @@ const locales = computed(() => {
    for (const locale of Object.keys(localesNames))
       locales.push({ code: locale, name: localesNames[locale] });
 
-   return locales;
+   return locales.sort((a, b) => (a.name.localeCompare(b.name)));
 });
 
 const copyTypes = computed(() => [
-   { code: 'cell', name: t('word.cell') },
+   { code: 'cell', name: t('database.cell') },
-   { code: 'html', name: t('word.table') },
+   { code: 'html', name: t('database.table') },
    { code: 'json', name: 'JSON' },
    { code: 'csv', name: 'CSV' },
    { code: 'sql', name: 'SQL insert' }
@@ -648,10 +709,14 @@ onBeforeUnmount(() => {
     .modal-body {
       overflow: hidden;
 
-      .tab-link {
+      .tab-item {
-        overflow: hidden;
+         max-width: 20%;
-        white-space: nowrap;
+
-        text-overflow: ellipsis;
+         .tab-link {
+           overflow: hidden;
+           white-space: nowrap;
+           text-overflow: ellipsis;
+         }
       }
 
       .panel-body {

src/renderer/components/ModalSettingsChangelog.vue

@@ -8,16 +8,19 @@
       />
       <div v-if="isError" class="empty">
          <div class="empty-icon">
-            <i class="mdi mdi-48px mdi-alert-outline" />
+            <BaseIcon icon-name="mdiAlertOutline" :size="48" />
          </div>
       </div>
    </div>
 </template>
 <script setup lang="ts">
+import { shell } from 'electron';
 import { marked } from 'marked';
+import { ref } from 'vue';
+
+import BaseIcon from '@/components/BaseIcon.vue';
 import BaseLoader from '@/components/BaseLoader.vue';
 import { useApplicationStore } from '@/stores/application';
-import { ref } from 'vue';
 
 const { appVersion } = useApplicationStore();
 
@@ -26,6 +29,10 @@ const isLoading = ref(true);
 const error = ref('');
 const isError = ref(false);
 
+const openOutside = (link: string) => {
+   shell.openExternal(link);
+};
+
 const getChangelog = async () => {
    try {
       const apiRes = await fetch(`https://api.github.com/repos/antares-sql/antares/releases/tags/v${appVersion}`, {
@@ -40,7 +47,7 @@ const getChangelog = async () => {
 
       const renderer = {
          link (href: string, title: string, text: string) {
-            return text;
+            return `<a class="changelog-link" href="${href}" title="${title || ''}" target="_blank">${text}</a>`;
          },
          listitem (text: string) {
             return `<li>${text.replace(/ *\([^)]*\) */g, '')}</li>`;
@@ -57,6 +64,17 @@ const getChangelog = async () => {
    }
 
    isLoading.value = false;
+
+   setTimeout(() => {
+      const links = document.querySelectorAll<HTMLAnchorElement>('.changelog-link');
+
+      for (const link of links) {
+         link.addEventListener('click', e => {
+            e.preventDefault();
+            openOutside(link.href);
+         });
+      }
+   }, 0);
 };
 
 getChangelog();

src/renderer/components/ModalSettingsData.vue

@@ -0,0 +1,69 @@
+<template>
+   <div class="container">
+      <div class="columns">
+         <div class="column col-12 h6 text-uppercase mb-2">
+            {{ t('application.exportData') }}
+         </div>
+         <div class="column col-12">
+            {{ t('application.exportDataExplanation') }}
+         </div>
+         <div class="column col-12 text-right">
+            <button
+               class="btn btn-primary d-inline-flex"
+               @click="isExportModal=true"
+            >
+               <BaseIcon
+                  icon-name="mdiTrayArrowUp"
+                  class="mr-2"
+                  :size="24"
+               />
+               <span>{{ t('application.exportData') }}</span>
+            </button>
+         </div>
+      </div>
+
+      <div class="columns mt-4 mb-2">
+         <div class="column col-12 h6 text-uppercase mb-2 mt-4">
+            {{ t('application.importData') }}
+         </div>
+         <div class="column col-12">
+            {{ t('application.importDataExplanation') }}
+         </div>
+         <div class="column col-12 text-right">
+            <button
+               class="btn btn-dark d-inline-flex ml-auto"
+               @click="isImportModal=true"
+            >
+               <BaseIcon
+                  icon-name="mdiTrayArrowDown"
+                  class="mr-2"
+                  :size="24"
+               />
+               <span>{{ t('application.importData') }}</span>
+            </button>
+         </div>
+      </div>
+      <ModalSettingsDataExport
+         v-if="isExportModal"
+         @close="isExportModal = false"
+      />
+      <ModalSettingsDataImport
+         v-if="isImportModal"
+         @close="isImportModal = false"
+      />
+   </div>
+</template>
+<script setup lang="ts">
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import ModalSettingsDataExport from '@/components/ModalSettingsDataExport.vue';
+import ModalSettingsDataImport from '@/components/ModalSettingsDataImport.vue';
+
+const { t } = useI18n();
+
+const isExportModal = ref(false);
+const isImportModal = ref(false);
+
+</script>

src/renderer/components/ModalSettingsDataExport.vue

@@ -0,0 +1,347 @@
+<template>
+   <Teleport to="#window-content">
+      <div class="modal active">
+         <a class="modal-overlay" @click.stop="closeModal" />
+         <div ref="trapRef" class="modal-container p-0">
+            <div class="modal-header pl-2">
+               <div class="modal-title h6">
+                  <div class="d-flex">
+                     <BaseIcon
+                        icon-name="mdiTrayArrowUp"
+                        class="mr-1"
+                        :size="24"
+                     /> {{ t('application.exportData') }}
+                  </div>
+               </div>
+               <a class="btn btn-clear c-hand" @click.stop="closeModal" />
+            </div>
+            <div class="modal-body pb-0">
+               <div class="columns export-options">
+                  <div class="column col-8 left">
+                     <div class="workspace-query-results" :style="'min-height: 300px;'">
+                        <div ref="table" class="table table-hover">
+                           <div class="thead">
+                              <div class="tr text-center">
+                                 <div class="th no-border" :style="'width:50%'" />
+                                 <div class="th no-border" />
+                                 <div class="th no-border">
+                                    <label
+                                       class="form-checkbox m-0 px-2 form-inline"
+                                       @click.prevent="toggleAllConnections()"
+                                    >
+                                       <input
+                                          type="checkbox"
+                                          :indeterminate="includeConnectionStatus === 2"
+                                          :checked="!!includeConnectionStatus"
+                                       >
+                                       <i class="form-icon" />
+                                    </label>
+                                 </div>
+                              </div>
+                              <div class="tr">
+                                 <div class="th">
+                                    <div class="table-column-title">
+                                       <span>{{ t('connection.connectionName') }}</span>
+                                    </div>
+                                 </div>
+                                 <div class="th">
+                                    <div class="table-column-title">
+                                       <span>{{ t('connection.client') }}</span>
+                                    </div>
+                                 </div>
+                                 <div class="th text-center">
+                                    <div class="table-column-title">
+                                       <span>{{ t('general.include') }}</span>
+                                    </div>
+                                 </div>
+                              </div>
+                           </div>
+
+                           <div class="tbody">
+                              <div
+                                 v-for="(item, i) in connections"
+                                 :key="i"
+                                 class="tr"
+                              >
+                                 <div class="td">
+                                    {{ getConnectionName(item.uid) }}
+                                 </div>
+                                 <div class="td">
+                                    {{ item.client }}
+                                 </div>
+                                 <div class="td text-center">
+                                    <label class="form-checkbox m-0 px-2 form-inline">
+                                       <input v-model="connectionToggles[item.uid]" type="checkbox">
+                                       <i class="form-icon" />
+                                    </label>
+                                 </div>
+                              </div>
+                           </div>
+                        </div>
+                     </div>
+                  </div>
+                  <div class="column col-4">
+                     <h5 class="h5">
+                        {{ t('general.options') }}
+                     </h5>
+                     <label class="form-checkbox">
+                        <input v-model="options.includes.passwords" type="checkbox">
+                        <i class="form-icon" />
+                        {{ t(`application.includeConnectionPasswords`) }}
+                     </label>
+                     <label class="form-checkbox">
+                        <input v-model="options.includes.folders" type="checkbox">
+                        <i class="form-icon" />
+                        {{ t(`application.includeFolders`) }}
+                     </label>
+                     <div class="h6 mt-4 mb-2">
+                        {{ t('application.encryptionPassword') }}
+                     </div>
+                     <fieldset class="form-group" :class="{'has-error': isPasswordError}">
+                        <div class="input-group">
+                           <input
+                              ref="passkey"
+                              v-model="options.passkey"
+                              :type="isPasswordVisible ? 'text' : 'password'"
+                              class="form-input"
+                              :placeholder="t('application.required')"
+                           >
+                           <button
+                              type="button"
+                              class="btn btn-link input-group-addon"
+                              @click="isPasswordVisible = !isPasswordVisible"
+                           >
+                              <BaseIcon
+                                 v-if="isPasswordVisible"
+                                 icon-name="mdiEye"
+                                 class="mt-1 mx-1"
+                                 :size="16"
+                              />
+                              <BaseIcon
+                                 v-else
+                                 icon-name="mdiEyeOff"
+                                 class="mt-1 mx-1"
+                                 :size="16"
+                              />
+                           </button>
+                        </div>
+                        <span v-if="isPasswordError" class="form-input-hint">
+                           {{ t('application.encryptionPasswordError') }}
+                        </span>
+                     </fieldset>
+                  </div>
+               </div>
+            </div>
+            <div class="modal-footer">
+               <button class="btn btn-link mr-2" @click.stop="closeModal">
+                  {{ t('general.close') }}
+               </button>
+               <button
+                  class="btn btn-primary mr-2"
+                  autofocus
+                  @click.prevent="exportData()"
+               >
+                  {{ t('database.export') }}
+               </button>
+            </div>
+         </div>
+      </div>
+   </Teleport>
+</template>
+
+<script setup lang="ts">
+import { ConnectionParams } from 'common/interfaces/antares';
+import { encrypt } from 'common/libs/encrypter';
+import { uidGen } from 'common/libs/uidGen';
+import * as moment from 'moment';
+import { storeToRefs } from 'pinia';
+import { computed, onBeforeUnmount, Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFocusTrap } from '@/composables/useFocusTrap';
+import { unproxify } from '@/libs/unproxify';
+import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+
+const { t } = useI18n();
+const emit = defineEmits(['close']);
+
+const { trapRef } = useFocusTrap();
+
+const { getConnectionName } = useConnectionsStore();
+const { connectionsOrder, connections } = storeToRefs(useConnectionsStore());
+const localConnections = unproxify<ConnectionParams[]>(connections.value);
+const localConnectionsOrder = unproxify<SidebarElement[]>(connectionsOrder.value);
+
+const isPasswordVisible = ref(false);
+const isPasswordError = ref(false);
+const connectionToggles: Ref<{[k:string]: boolean}> = ref({});
+const options = ref({
+   passkey: '',
+   includes: {
+      passwords: true,
+      folders: true
+   }
+});
+const filename = computed(() => {
+   const date = moment().format('YYYY-MM-DD');
+   return `backup_${date}`;
+});
+const includeConnectionStatus = computed(() => {
+   if (Object.values(connectionToggles.value).every(item => item)) return 1;
+   else if (Object.values(connectionToggles.value).some(item => item)) return 2;
+   else return 0;
+});
+
+const exportData = () => {
+   if (options.value.passkey.length < 8)
+      isPasswordError.value = true;
+   else {
+      isPasswordError.value = false;
+      const connectionsToInclude: string[] = [];
+      const connectionsUidMap = new Map<string, string>();
+      for (const cUid in connectionToggles.value)
+         if (connectionToggles.value[cUid]) connectionsToInclude.push(cUid);
+
+      let filteredConnections = unproxify<typeof localConnections>(localConnections.filter(conn => connectionsToInclude.includes(conn.uid)));
+      filteredConnections = filteredConnections.map(c => {
+         const newUid = uidGen('C');
+         connectionsUidMap.set(c.uid, newUid);
+         c.uid = newUid;
+         return c;
+      });
+
+      if (!options.value.includes.passwords) { // Remove passwords and set ask:true
+         filteredConnections.map(c => {
+            if (c.password) {
+               c.password = '';
+               c.ask = true;
+            }
+            return c;
+         });
+      }
+
+      let filteredOrders = [];
+      for (const [oldVal, newVal] of connectionsUidMap) {
+         const connOrder = unproxify(localConnectionsOrder.find(c => c.uid === oldVal));
+         connOrder.uid = newVal;
+         filteredOrders.push(connOrder);
+      }
+
+      if (options.value.includes.folders) { // Includes folders
+         const oldConnUids = Array.from(connectionsUidMap.keys());
+         const newConnUids = Array.from(connectionsUidMap.values());
+         const foldersToInclude = unproxify(localConnectionsOrder).filter(f => (
+            f.isFolder && oldConnUids.some(uid => f.connections.includes(uid))
+         )).map(f => {
+            f.uid = uidGen('F');
+            f.connections = f.connections
+               .map(fc => connectionsUidMap.get(fc))
+               .filter(fc => newConnUids.includes(fc));
+            return f;
+         });
+
+         filteredOrders = [...filteredOrders, ...foldersToInclude];
+      }
+
+      const exportObj = encrypt(JSON.stringify({
+         connections: filteredConnections,
+         connectionsOrder: filteredOrders
+      }), options.value.passkey);
+
+      // console.log(exportObj, JSON.parse(decrypt(exportObj, options.value.passkey)));
+
+      const blobContent = Buffer.from(JSON.stringify(exportObj), 'utf-8').toString('hex');
+      const file = new Blob([blobContent], { type: 'application/octet-stream' });
+      const downloadLink = document.createElement('a');
+      downloadLink.download = `${filename.value}.antares`;
+      downloadLink.href = window.URL.createObjectURL(file);
+      downloadLink.style.display = 'none';
+      document.body.appendChild(downloadLink);
+      downloadLink.click();
+      downloadLink.remove();
+
+      closeModal();
+   }
+};
+
+const closeModal = () => {
+   emit('close');
+};
+
+const onKey = (e: KeyboardEvent) => {
+   e.stopPropagation();
+   if (e.key === 'Escape')
+      closeModal();
+};
+
+const toggleAllConnections = () => {
+   if (includeConnectionStatus.value !== 1) {
+      connectionToggles.value = localConnections.reduce((acc, curr) => {
+         acc[curr.uid] = true;
+         return acc;
+      }, {} as {[k:string]: boolean});
+   }
+   else {
+      connectionToggles.value = localConnections.reduce((acc, curr) => {
+         acc[curr.uid] = false;
+         return acc;
+      }, {} as {[k:string]: boolean});
+   }
+};
+
+connectionToggles.value = localConnections.reduce((acc, curr) => {
+   acc[curr.uid] = true;
+   return acc;
+}, {} as {[k:string]: boolean});
+
+window.addEventListener('keydown', onKey);
+
+onBeforeUnmount(() => {
+   window.removeEventListener('keydown', onKey);
+});
+
+</script>
+
+<style lang="scss" scoped>
+.export-options {
+  flex: 1;
+  overflow: hidden;
+
+  .left {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+}
+
+.workspace-query-results {
+  flex: 1 0 1px;
+
+  .table {
+    width: 100% !important;
+  }
+
+  .form-checkbox {
+    min-height: 0.8rem;
+    padding: 0;
+
+    .form-icon {
+      top: 0.1rem;
+    }
+  }
+}
+
+.modal {
+  .modal-container {
+    max-width: 800px;
+  }
+
+  .modal-body {
+    max-height: 60vh;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+</style>

src/renderer/components/ModalSettingsDataImport.vue

@@ -0,0 +1,284 @@
+<template>
+   <Teleport to="#window-content">
+      <div class="modal modal-sm active">
+         <a class="modal-overlay" @click.stop="closeModal" />
+         <div ref="trapRef" class="modal-container p-0">
+            <div class="modal-header pl-2">
+               <div class="modal-title h6">
+                  <div class="d-flex">
+                     <BaseIcon
+                        icon-name="mdiTrayArrowDown"
+                        class="mr-1"
+                        :size="24"
+                     /> {{ t('application.importData') }}
+                  </div>
+               </div>
+               <a class="btn btn-clear c-hand" @click.stop="closeModal" />
+            </div>
+            <div class="modal-body pb-0">
+               <div class="mb-2">
+                  <div class="h6 mb-2">
+                     {{ t('application.choseFile') }}
+                  </div>
+                  <BaseUploadInput
+                     :model-value="filePath"
+                     :message="t('general.browse')"
+                     accept=".antares"
+                     @clear="clearPath"
+                     @change="filesChange($event)"
+                  />
+               </div>
+               <div class="mb-2">
+                  <div class="h6 mb-2">
+                     {{ t('application.password') }}
+                  </div>
+                  <fieldset class="form-group" :class="{'has-error': isPasswordError}">
+                     <div class="input-group">
+                        <input
+                           ref="passkey"
+                           v-model="options.passkey"
+                           :type="isPasswordVisible ? 'text' : 'password'"
+                           class="form-input"
+                           :placeholder="t('application.required')"
+                        >
+                        <button
+                           type="button"
+                           class="btn btn-link input-group-addon"
+                           @click="isPasswordVisible = !isPasswordVisible"
+                        >
+                           <BaseIcon
+                              v-if="isPasswordVisible"
+                              icon-name="mdiEye"
+                              class="mt-1 mx-1"
+                              :size="16"
+                           />
+                           <BaseIcon
+                              v-else
+                              icon-name="mdiEyeOff"
+                              class="mt-1 mx-1"
+                              :size="16"
+                           />
+                        </button>
+                     </div>
+                     <span v-if="isPasswordError" class="form-input-hint">
+                        {{ t('application.encryptionPasswordError') }}
+                     </span>
+                  </fieldset>
+               </div>
+               <div class="mb-2">
+                  <label class="form-checkbox">
+                     <input v-model="options.ignoreDuplicates" type="checkbox">
+                     <i class="form-icon" />
+                     {{ t(`application.ignoreDuplicates`) }}
+                  </label>
+               </div>
+            </div>
+            <div class="modal-footer">
+               <button
+                  class="btn btn-link mr-2"
+                  @click.stop="closeModal"
+               >
+                  {{ t('general.close') }}
+               </button>
+               <button
+                  class="btn btn-primary mr-2"
+                  :disabled="!filePath"
+                  @click.prevent="importData()"
+               >
+                  {{ t('database.import') }}
+               </button>
+            </div>
+         </div>
+      </div>
+   </Teleport>
+</template>
+
+<script setup lang="ts">
+import { ConnectionParams } from 'common/interfaces/antares';
+import { decrypt } from 'common/libs/encrypter';
+import { storeToRefs } from 'pinia';
+import { onBeforeUnmount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseUploadInput from '@/components/BaseUploadInput.vue';
+import { unproxify } from '@/libs/unproxify';
+import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+import { useNotificationsStore } from '@/stores/notifications';
+
+const { t } = useI18n();
+const emit = defineEmits(['close']);
+
+const { addNotification } = useNotificationsStore();
+
+const connectionsStore = useConnectionsStore();
+const { importConnections } = connectionsStore;
+const { connections } = storeToRefs(connectionsStore);
+
+const filePath = ref('');
+const fileContent = ref(null);
+const isPasswordVisible = ref(false);
+const isPasswordError = ref(false);
+const options = ref({
+   passkey: '',
+   ignoreDuplicates: true
+});
+
+const closeModal = () => {
+   emit('close');
+};
+
+const filesChange = ({ target } : {target: HTMLInputElement }) => {
+   const { files } = target;
+   if (!files.length) return;
+
+   const reader = new FileReader();
+   reader.readAsText(files[0]);
+   reader.onload = () => {
+      fileContent.value = reader.result;
+      filePath.value = files[0].path;
+   };
+};
+
+const clearPath = () => {
+   filePath.value = '';
+   fileContent.value = null;
+};
+
+const importData = () => {
+   if (options.value.passkey.length < 8)
+      isPasswordError.value = true;
+   else {
+      try {
+         const hash = JSON.parse(Buffer.from(fileContent.value, 'hex').toString('utf-8'));
+
+         try {
+            const importObj: {
+               connections: ConnectionParams[];
+               connectionsOrder: SidebarElement[];
+            } = JSON.parse(decrypt(hash, options.value.passkey));
+
+            if (options.value.ignoreDuplicates) {
+               const actualConnections = unproxify(connections.value).map(c => {
+                  delete c.uid;
+
+                  delete c.name;
+                  delete c.password;
+                  delete c.ask;
+
+                  delete c.key;
+                  delete c.cert;
+                  delete c.ca;
+
+                  delete c.sshKey;
+
+                  return JSON.stringify(c);
+               });
+
+               const incomingConnections = unproxify<ConnectionParams[]>(importObj.connections).map(c => {
+                  const uid = c.uid;
+                  delete c.uid;
+
+                  delete c.name;
+                  delete c.password;
+                  delete c.ask;
+
+                  delete c.key;
+                  delete c.cert;
+                  delete c.ca;
+
+                  delete c.sshKey;
+
+                  return { uid, jsonString: JSON.stringify(c) };
+               });
+
+               const newConnectionsUid = incomingConnections
+                  .filter(c => !actualConnections.includes(c.jsonString))
+                  .reduce((acc, cur) => {
+                     acc.push(cur.uid);
+                     return acc;
+                  }, [] as string[]);
+
+               importObj.connections = importObj.connections.filter(c => newConnectionsUid.includes(c.uid));
+               importObj.connectionsOrder = importObj.connectionsOrder
+                  .filter(c => newConnectionsUid
+                     .includes(c.uid) ||
+                     (c.isFolder && c.connections.every(c => newConnectionsUid.includes(c))));
+            }
+
+            importConnections(importObj);
+
+            addNotification({
+               status: 'success',
+               message: t('application.dataImportSuccess')
+            });
+            closeModal();
+         }
+         catch (error) {
+            addNotification({
+               status: 'error',
+               message: t('application.wrongImportPassword')
+            });
+         }
+      }
+      catch (error) {
+         addNotification({
+            status: 'error',
+            message: t('application.wrongFileFormat')
+         });
+      }
+   }
+};
+
+const onKey = (e: KeyboardEvent) => {
+   e.stopPropagation();
+   if (e.key === 'Escape')
+      closeModal();
+};
+
+window.addEventListener('keydown', onKey);
+
+onBeforeUnmount(() => {
+   window.removeEventListener('keydown', onKey);
+});
+
+</script>
+
+<style lang="scss" scoped>
+.export-options {
+  flex: 1;
+  overflow: hidden;
+
+  .left {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+  }
+}
+
+.workspace-query-results {
+  flex: 1 0 1px;
+
+  .table {
+    width: 100% !important;
+  }
+
+  .form-checkbox {
+    min-height: 0.8rem;
+    padding: 0;
+
+    .form-icon {
+      top: 0.1rem;
+    }
+  }
+}
+
+.modal {
+  .modal-body {
+    max-height: 60vh;
+    display: flex;
+    flex-direction: column;
+  }
+}
+
+</style>

src/renderer/components/ModalSettingsShortcuts.vue

@@ -2,10 +2,18 @@
    <div class="p-relative">
       <div class="shortcuts-tools pb-2 px-2">
          <button class="btn btn-dark btn-sm d-flex ml-2" @click="showAddModal">
-            <i class="mdi mdi-24px mdi-plus mr-1" /><span>{{ t('message.addShortcut') }}</span>
+            <BaseIcon
+               icon-name="mdiPlus"
+               class="mr-1"
+               :size="24"
+            /><span>{{ t('application.addShortcut') }}</span>
          </button>
          <button class="btn btn-dark btn-sm d-flex ml-2" @click="isConfirmRestoreModal = true">
-            <i class="mdi mdi-24px mdi-undo mr-1" /><span>{{ t('message.restoreDefaults') }}</span>
+            <BaseIcon
+               icon-name="mdiUndo"
+               class="mr-1"
+               :size="24"
+            /><span>{{ t('application.restoreDefaults') }}</span>
          </button>
       </div>
       <div class="container workspace-query-results">
@@ -14,12 +22,12 @@
                <div class="tr text-uppercase">
                   <div class="th no-border">
                      <div>
-                        {{ t('word.event') }}
+                        {{ t('application.event') }}
                      </div>
                   </div>
                   <div class="th no-border" style="width: 100%;">
                      <div>
-                        {{ t('word.key', 2) }}
+                        {{ t('application.key', 2) }}
                      </div>
                   </div>
                   <div class="th no-border" />
@@ -43,10 +51,20 @@
                   />
                   <div class="td py-1 pr-2">
                      <button class="shortcut-button btn btn-link btn-sm d-flex p-0 px-1 mr-2" @click="showEditModal({...shortcut, index: i})">
-                        <span>{{ t('word.edit') }}</span><i class="mdi mdi-pencil ml-1" />
+                        <span>{{ t('general.edit') }}</span>
+                        <BaseIcon
+                           icon-name="mdiPencil"
+                           class="ml-1"
+                           :size="16"
+                        />
                      </button>
                      <button class="shortcut-button btn btn-link btn-sm d-flex p-0 px-1" @click="showDeleteModal(shortcut)">
-                        <span>{{ t('word.delete') }}</span><i class="mdi mdi-delete-outline ml-1" />
+                        <span>{{ t('general.delete') }}</span>
+                        <BaseIcon
+                           icon-name="mdiDeleteOutline"
+                           class="ml-1"
+                           :size="16"
+                        />
                      </button>
                   </div>
                </div>
@@ -58,20 +76,24 @@
       <ConfirmModal
          v-if="isConfirmAddModal"
          :disable-autofocus="true"
-         :confirm-text="t('word.save')"
+         :confirm-text="t('general.save')"
          :close-on-confirm="false"
          @confirm="addShortcut"
          @hide="closeAddModal"
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-plus mr-1" /> {{ t('message.addShortcut') }}
+               <BaseIcon
+                  icon-name="mdiPlus"
+                  class="mr-1"
+                  :size="24"
+               /> {{ t('application.addShortcut') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
                <div class="form-group">
-                  <label class="form-label">{{ t('word.event') }}</label>
+                  <label class="form-label">{{ t('application.event') }}</label>
                   <BaseSelect
                      v-model="shortcutToAdd.event"
                      class="form-select"
@@ -81,31 +103,35 @@
             </div>
             <div class="mb-2">
                <div class="form-group">
-                  <label class="form-label">{{ t('word.key', 2) }}</label>
+                  <label class="form-label">{{ t('application.key', 2) }}</label>
                   <KeyPressDetector v-model="typedShortcut" />
                </div>
             </div>
-            <small v-if="doesShortcutExists" class="text-warning">{{ t('message.shortcutAlreadyExists') }}</small>
+            <small v-if="doesShortcutExists" class="text-warning">{{ t('application.shortcutAlreadyExists') }}</small>
          </template>
       </ConfirmModal>
 
       <ConfirmModal
          v-if="isConfirmEditModal"
          :disable-autofocus="true"
-         :confirm-text="t('word.save')"
+         :confirm-text="t('general.save')"
          :close-on-confirm="false"
          @confirm="editShortcut"
          @hide="closeEditModal"
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-plus mr-1" /> {{ t('message.editShortcut') }}
+               <BaseIcon
+                  icon-name="mdiPencil"
+                  class="mr-1"
+                  :size="24"
+               /> {{ t('application.editShortcut') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
                <div class="form-group">
-                  <label class="form-label">{{ t('word.event') }}</label>
+                  <label class="form-label">{{ t('application.event') }}</label>
                   <BaseSelect
                      v-model="shortcutToEdit.event"
                      class="form-select"
@@ -116,11 +142,11 @@
             </div>
             <div class="mb-2">
                <div class="form-group">
-                  <label class="form-label">{{ t('word.key', 2) }}</label>
+                  <label class="form-label">{{ t('application.key', 2) }}</label>
                   <KeyPressDetector v-model="shortcutToEdit.keys[0]" />
                </div>
             </div>
-            <small v-if="doesShortcutExists" class="text-warning">{{ t('message.shortcutAlreadyExists') }}</small>
+            <small v-if="doesShortcutExists" class="text-warning">{{ t('application.shortcutAlreadyExists') }}</small>
          </template>
       </ConfirmModal>
 
@@ -132,12 +158,16 @@
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-delete mr-1" /> {{ t('message.deleteShortcut') }}
+               <BaseIcon
+                  icon-name="mdiDelete"
+                  class="mr-1"
+                  :size="24"
+               /> {{ t('application.deleteShortcut') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
-               {{ t('message.deleteCorfirm') }} <b>{{ t(shortcutEvents[shortcutToDelete.event].l18n, {param: shortcutEvents[shortcutToDelete.event].l18nParam}) }} (<span v-html="parseKeys(shortcutToDelete.keys)" />)</b>?
+               {{ t('general.deleteConfirm') }} <b>{{ t(shortcutEvents[shortcutToDelete.event].l18n, {param: shortcutEvents[shortcutToDelete.event].l18nParam}) }} (<span v-html="parseKeys(shortcutToDelete.keys)" />)</b>?
             </div>
          </template>
       </ConfirmModal>
@@ -150,29 +180,36 @@
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mdi-undo mr-1" /> {{ t('message.restoreDefaults') }}
+               <BaseIcon
+                  icon-name="mdiUndo"
+                  class="mr-1"
+                  :size="24"
+               /> {{ t('application.restoreDefaults') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
-               {{ t('message.restoreDefaultsQuestion') }}
+               {{ t('application.restoreDefaultsQuestion') }}
             </div>
          </template>
       </ConfirmModal>
    </Teleport>
 </template>
 <script setup lang="ts">
-import { Ref, ref, watch } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useI18n } from 'vue-i18n';
-import { useSettingsStore } from '@/stores/settings';
-import KeyPressDetector from './KeyPressDetector.vue';
-import Application from '@/ipc-api/Application';
-import { shortcutEvents, ShortcutRecord } from 'common/shortcuts';
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
-import BaseSelect from '@/components/BaseSelect.vue';
 import { computed } from '@vue/reactivity';
+import { shortcutEvents, ShortcutRecord } from 'common/shortcuts';
+import { storeToRefs } from 'pinia';
+import { Ref, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
 import { useFilters } from '@/composables/useFilters';
+import Application from '@/ipc-api/Application';
+import { useSettingsStore } from '@/stores/settings';
+
+import KeyPressDetector from './KeyPressDetector.vue';
 
 const { parseKeys } = useFilters();
 

src/renderer/components/ModalSettingsUpdate.vue

@@ -1,7 +1,7 @@
 <template>
    <div class="empty">
       <div class="empty-icon">
-         <i class="mdi mdi-48px mdi-cloud-download" />
+         <BaseIcon icon-name="mdiCloudDownload" :size="48" />
       </div>
       <p class="empty-title h5">
          {{ updateMessage }}
@@ -26,37 +26,39 @@
             :class="{'loading': updateStatus === 'checking'}"
             @click="checkForUpdates"
          >
-            {{ t('message.checkForUpdates') }}
+            {{ t('application.checkForUpdates') }}
          </button>
          <button
             v-else-if="updateStatus === 'downloaded'"
             class="btn btn-primary"
             @click="restartToUpdate"
          >
-            {{ t('message.restartToInstall') }}
+            {{ t('application.restartToInstall') }}
          </button>
          <button
             v-else-if="updateStatus === 'link'"
             class="btn btn-primary"
             @click="openOutside('https://antares-sql.app/download.html')"
          >
-            {{ t('message.goToDownloadPage') }}
+            {{ t('application.goToDownloadPage') }}
          </button>
       </div>
       <div class="form-group mt-4">
-         <label class="form-switch d-inline-block disabled" @click.prevent="toggleAllowPrerelease">
+         <label class="form-switch d-inline-block" @click.prevent="toggleAllowPrerelease">
             <input type="checkbox" :checked="allowPrerelease">
-            <i class="form-icon" /> {{ t('message.includeBetaUpdates') }}
+            <i class="form-icon" /> {{ t('application.includeBetaUpdates') }}
          </label>
       </div>
    </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { ipcRenderer, shell } from 'electron';
 import { storeToRefs } from 'pinia';
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
 import { useApplicationStore } from '@/stores/application';
 import { useSettingsStore } from '@/stores/settings';
 
@@ -76,19 +78,19 @@ const { changeAllowPrerelease } = settingsStore;
 const updateMessage = computed(() => {
    switch (updateStatus.value) {
       case 'noupdate':
-         return t('message.noUpdatesAvailable');
+         return t('application.noUpdatesAvailable');
       case 'checking':
-         return t('message.checkingForUpdate');
+         return t('application.checkingForUpdate');
       case 'nocheck':
-         return t('message.checkFailure');
+         return t('application.checkFailure');
       case 'available':
-         return t('message.updateAvailable');
+         return t('application.updateAvailable');
       case 'downloading':
-         return t('message.downloadingUpdate');
+         return t('application.downloadingUpdate');
       case 'downloaded':
-         return t('message.updateDownloaded');
+         return t('application.updateDownloaded');
       case 'link':
-         return t('message.updateAvailable');
+         return t('application.updateAvailable');
       default:
          return updateStatus.value;
    }

src/renderer/components/QueryEditor.vue

@@ -9,16 +9,20 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, Prop, Ref, ref, toRef, watch } from 'vue';
+/* eslint-disable simple-import-sort/imports */
 import * as ace from 'ace-builds';
-import 'ace-builds/webpack-resolver';
 import '../libs/ext-language_tools';
-import { storeToRefs } from 'pinia';
+import 'ace-builds/webpack-resolver';
+/* eslint-enable simple-import-sort/imports */
+
 import { uidGen } from 'common/libs/uidGen';
+import { storeToRefs } from 'pinia';
+import { computed, onMounted, Prop, Ref, ref, toRef, watch } from 'vue';
+
+import Tables from '@/ipc-api/Tables';
 import { useApplicationStore } from '@/stores/application';
 import { useSettingsStore } from '@/stores/settings';
 import { Workspace } from '@/stores/workspaces';
-import Tables from '@/ipc-api/Tables';
 
 const editor: Ref<ace.Ace.Editor> = ref(null);
 const applicationStore = useApplicationStore();
@@ -373,6 +377,8 @@ onMounted(() => {
       e.stop();
    });
 
+   editor.value.commands.removeCommand('showSettingsMenu');
+
    if (props.autoFocus) {
       setTimeout(() => {
          editor.value.focus();

src/renderer/components/SettingBarConnections.vue

@@ -41,12 +41,28 @@
                   @dragleave="coveredElement = false"
                   @change="createFolder"
                />
-               <i v-if="coveredElement === element.uid && draggedElement !== coveredElement" class="settingbar-element-icon mdi mdi-folder-plus mdi-36px" />
+               <BaseIcon
+                  v-if="coveredElement === element.uid && draggedElement !== coveredElement"
+                  class="settingbar-element-icon"
+                  icon-name="mdiFolderPlus"
+                  :size="36"
+               />
                <template v-else>
                   <div class="settingbar-element-icon-wrapper">
-                     <i
+                     <div
+                        v-if="element.icon"
+                        class="settingbar-element-icon"
+                        :class="[getStatusBadge(element.uid)]"
+                     >
+                        <BaseIcon
+                           :icon-name="camelize(element.icon)"
+                           :size="36"
+                        />
+                     </div>
+                     <div
+                        v-else
                         class="settingbar-element-icon dbi"
-                        :class="[element.icon ? `mdi ${element.icon} mdi-36px`: `dbi-${element.client}`, getStatusBadge(element.uid)]"
+                        :class="[`dbi-${element.client}`, getStatusBadge(element.uid)]"
                      />
                      <small class="settingbar-element-name">{{ element.name || getConnectionName(element.uid) }}</small>
                   </div>
@@ -71,12 +87,14 @@
    </Draggable>
 </template>
 <script setup lang="ts">
-import { computed, PropType, Ref, ref, watch } from 'vue';
 import { storeToRefs } from 'pinia';
+import { computed, PropType, Ref, ref, watch } from 'vue';
 import * as Draggable from 'vuedraggable';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import SettingBarConnectionsFolder from '@/components/SettingBarConnectionsFolder.vue';
 import { SidebarElement, useConnectionsStore } from '@/stores/connections';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import SettingBarConnectionsFolder from '@/components/SettingBarConnectionsFolder.vue';
 
 const workspacesStore = useWorkspacesStore();
 const connectionsStore = useConnectionsStore();
@@ -147,6 +165,16 @@ const getStatusBadge = (uid: string) => {
    }
 };
 
+const camelize = (text: string) => {
+   const textArr = text.split('-');
+   for (let i = 0; i < textArr.length; i++) {
+      if (i === 0) continue;
+      textArr[i] = textArr[i].charAt(0).toUpperCase() + textArr[i].slice(1);
+   }
+
+   return textArr.join('');
+};
+
 watch(() => dummyNested.value.length, () => {
    dummyNested.value = [];
 });

src/renderer/components/SettingBarConnectionsFolder.vue

@@ -38,8 +38,16 @@
                :style="`color: ${folder.color};`"
                @click="closeFolder"
             >
-               <i class="folder-icon-open mdi mdi-folder-open mdi-36px" />
+               <BaseIcon
-               <i class="folder-icon-close mdi mdi-folder mdi-36px" />
+                  class="folder-icon-open"
+                  icon-name="mdiFolderOpen"
+                  :size="36"
+               />
+               <BaseIcon
+                  class="folder-icon-close"
+                  icon-name="mdiFolder"
+                  :size="36"
+               />
             </div>
          </template>
          <template #item="{ element }">
@@ -55,9 +63,20 @@
                @click="emit('select-workspace', element)"
                @contextmenu.stop="emit('context', {event: $event, content: getConnectionOrderByUid(element)})"
             >
-               <i
+               <div
+                  v-if="getConnectionOrderByUid(element).icon"
+                  class="folder-element-icon"
+                  :class="[getStatusBadge(element)]"
+               >
+                  <BaseIcon
+                     :icon-name="camelize(getConnectionOrderByUid(element).icon)"
+                     :size="36"
+                  />
+               </div>
+               <div
+                  v-else
                   class="folder-element-icon dbi"
-                  :class="[getConnectionOrderByUid(element)?.icon ? `mdi ${getConnectionOrderByUid(element).icon}`: `dbi-${getConnectionOrderByUid(element)?.client}`, getStatusBadge(element)]"
+                  :class="[`dbi-${getConnectionOrderByUid(element).client}`, getStatusBadge(element)]"
                />
                <small v-if="isOpen" class="folder-element-name">{{ getConnectionOrderByUid(element)?.name || getConnectionName(element) }}</small>
             </div>
@@ -76,12 +95,14 @@
    </div>
 </template>
 <script setup lang="ts">
-import { computed, PropType, ref, watch } from 'vue';
 import { storeToRefs } from 'pinia';
+import { computed, PropType, ref, watch } from 'vue';
 import * as Draggable from 'vuedraggable';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import SettingBarConnections from '@/components/SettingBarConnections.vue';
 import { SidebarElement, useConnectionsStore } from '@/stores/connections';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import SettingBarConnections from '@/components/SettingBarConnections.vue';
 
 const workspacesStore = useWorkspacesStore();
 const connectionsStore = useConnectionsStore();
@@ -176,6 +197,16 @@ const dragStop = () => {
    emit('folder-drag', false);
 };
 
+const camelize = (text: string) => {
+   const textArr = text.split('-');
+   for (let i = 0; i < textArr.length; i++) {
+      if (i === 0) continue;
+      textArr[i] = textArr[i].charAt(0).toUpperCase() + textArr[i].slice(1);
+   }
+
+   return textArr.join('');
+};
+
 watch(() => dummyNested.value.length, () => {
    dummyNested.value = [];
 });
@@ -380,7 +411,7 @@ emit('folder-sort');// To apply changes on component key change
          overflow: hidden;
          white-space: nowrap;
          text-overflow: ellipsis;
-         line-height: 1;
+         line-height: 1.02;
          transition: bottom .2s;
       }
    }
@@ -388,7 +419,8 @@ emit('folder-sort');// To apply changes on component key change
    &:not(.opened){
       .folder-element {
 
-         .folder-element-icon {
+         .folder-element-icon,
+         .folder-element-icon svg {
             width: 21px;
             height: 21px;
             font-size: 16px;
@@ -444,7 +476,7 @@ emit('folder-sort');// To apply changes on component key change
          overflow: hidden;
          white-space: nowrap;
          text-overflow: ellipsis;
-         line-height: 1;
+         line-height: 1.02;
       }
    }
 }

src/renderer/components/SettingBarContext.vue

@@ -8,20 +8,40 @@
          class="context-element"
          @click="disconnect"
       >
-         <span class="d-flex"><i class="mdi mdi-18px mdi-power text-light pr-1" /> {{ t('word.disconnect') }}</span>
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiPower"
+               :size="18"
+            /> {{ t('connection.disconnect') }}</span>
       </div>
       <div
          v-if="!contextConnection.isFolder"
          class="context-element"
          @click="duplicateConnection"
       >
-         <span class="d-flex"><i class="mdi mdi-18px mdi-content-duplicate text-light pr-1" /> {{ t('word.duplicate') }}</span>
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiContentDuplicate"
+               :size="18"
+            /> {{ t('general.duplicate') }}</span>
       </div>
-      <div class="context-element" @click.stop="showAppearenceModal">
+      <div class="context-element" @click.stop="showAppearanceModal">
-         <span class="d-flex"><i class="mdi mdi-18px mdi-brush-variant text-light pr-1" /> {{ t('word.appearence') }}</span>
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiBrushVariant"
+               :size="18"
+            /> {{ t('application.appearance') }}</span>
       </div>
       <div class="context-element" @click="showConfirmModal">
-         <span class="d-flex"><i class="mdi mdi-18px mdi-delete text-light pr-1" /> {{ t('word.delete') }}</span>
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiDelete"
+               :size="18"
+            /> {{ t('general.delete') }}</span>
       </div>
 
       <ConfirmModal
@@ -31,39 +51,44 @@
       >
          <template #header>
             <div class="d-flex">
-               <i class="mdi mdi-24px mr-1" :class="[contextConnection.isFolder ? 'mdi-folder-remove' : 'mdi-server-remove']" /> {{ t(contextConnection.isFolder ? 'message.deleteFolder' : 'message.deleteConnection') }}
+               <BaseIcon
+                  class="text-light mr-1"
+                  :icon-name="contextConnection.isFolder ? 'mdiFolderRemove' : 'mdiServerRemove'"
+                  :size="24"
+               /> {{ t(contextConnection.isFolder ? 'application.deleteFolder' : 'connection.deleteConnection') }}
             </div>
          </template>
          <template #body>
             <div class="mb-2">
-               {{ t('message.deleteCorfirm') }} <b>{{ connectionName }}</b>?
+               {{ t('general.deleteConfirm') }} <b>{{ connectionName }}</b>?
             </div>
          </template>
       </ConfirmModal>
-      <ModalFolderAppearence
+      <ModalFolderAppearance
          v-if="isFolderEdit"
          :folder="contextConnection"
-         @close="hideAppearenceModal"
+         @close="hideAppearanceModal"
       />
-      <ModalConnectionAppearence
+      <ModalConnectionAppearance
          v-if="isConnectionEdit"
          :connection="contextConnection"
-         @close="hideAppearenceModal"
+         @close="hideAppearanceModal"
       />
    </BaseContextMenu>
 </template>
 
 <script setup lang="ts">
-import { computed, Prop, ref } from 'vue';
-import { storeToRefs } from 'pinia';
 import { uidGen } from 'common/libs/uidGen';
+import { computed, Prop, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseContextMenu from '@/components/BaseContextMenu.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+import ModalConnectionAppearance from '@/components/ModalConnectionAppearance.vue';
+import ModalFolderAppearance from '@/components/ModalFolderAppearance.vue';
 import { SidebarElement, useConnectionsStore } from '@/stores/connections';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import BaseContextMenu from '@/components/BaseContextMenu.vue';
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
-import ModalFolderAppearence from '@/components/ModalFolderAppearence.vue';
-import ModalConnectionAppearence from '@/components/ModalConnectionAppearence.vue';
 
 const { t } = useI18n();
 
@@ -77,10 +102,8 @@ const {
 } = connectionsStore;
 
 const workspacesStore = useWorkspacesStore();
-const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
 
 const {
-   selectWorkspace,
    removeConnected: disconnectWorkspace,
    getWorkspace
 } = workspacesStore;
@@ -96,12 +119,12 @@ const isConfirmModal = ref(false);
 const isFolderEdit = ref(false);
 const isConnectionEdit = ref(false);
 
-const connectionName = computed(() => props.contextConnection.name || getConnectionName(props.contextConnection.uid) || t('word.folder', 1));
+const connectionName = computed(() => props.contextConnection.name || getConnectionName(props.contextConnection.uid) || t('general.folder', 1));
 const isConnected = computed(() => getWorkspace(props.contextConnection.uid)?.connectionStatus === 'connected');
 
 const confirmDeleteConnection = () => {
-   if (selectedWorkspace.value === props.contextConnection.uid)
+   if (isConnected.value)
-      selectWorkspace(null);
+      disconnectWorkspace(props.contextConnection.uid);
    deleteConnection(props.contextConnection);
    closeContext();
 };
@@ -118,14 +141,14 @@ const duplicateConnection = () => {
    closeContext();
 };
 
-const showAppearenceModal = () => {
+const showAppearanceModal = () => {
    if (props.contextConnection.isFolder)
       isFolderEdit.value = true;
    else
       isConnectionEdit.value = true;
 };
 
-const hideAppearenceModal = () => {
+const hideAppearanceModal = () => {
    isConnectionEdit.value = false;
    isFolderEdit.value = false;
    closeContext();

src/renderer/components/TheFooter.vue

@@ -7,19 +7,35 @@
       <div class="footer-left-elements">
          <ul class="footer-elements">
             <li class="footer-element">
-               <i class="mdi mdi-18px mdi-database mr-1" />
+               <BaseIcon
+                  icon-name="mdiServer"
+                  class="mr-1"
+                  :size="18"
+               />
                <small>{{ versionString }}</small>
             </li>
             <li v-if="connectionInfos && connectionInfos.readonly" class="footer-element">
-               <i class="mdi mdi-18px mdi-lock mr-1" />
+               <BaseIcon
-               <small>{{ t('message.readOnlyMode') }}</small>
+                  icon-name="mdiLock"
+                  class="mr-1"
+                  :size="18"
+               />
+               <small>{{ t('connection.readOnlyMode') }}</small>
             </li>
             <li v-if="connectionInfos && connectionInfos.ssl" class="footer-element">
-               <i class="mdi mdi-18px mdi-shield-key mr-1" />
+               <BaseIcon
+                  icon-name="mdiShieldKey"
+                  class="mr-1"
+                  :size="18"
+               />
                <small>SSL</small>
             </li>
             <li v-if="connectionInfos && connectionInfos.ssh" class="footer-element">
-               <i class="mdi mdi-18px mdi-console-network mr-1" />
+               <BaseIcon
+                  icon-name="mdiConsoleNetwork"
+                  class="mr-1"
+                  :size="18"
+               />
                <small>SSH</small>
             </li>
          </ul>
@@ -32,26 +48,34 @@
                class="footer-element footer-link"
                @click="toggleConsole()"
             >
-               <i class="mdi mdi-18px mdi-console-line mr-1" />
+               <BaseIcon
-               <small>{{ t('word.console') }}</small>
+                  icon-name="mdiConsoleLine"
+                  class="mr-1"
+                  :size="18"
+               />
+               <small>{{ t('application.console') }}</small>
             </li>
             <li class="footer-element footer-link" @click="openOutside('https://www.paypal.com/paypalme/fabiodistasio')">
-               <i class="mdi mdi-18px mdi-coffee mr-1" />
+               <BaseIcon
-               <small>{{ t('word.donate') }}</small>
+                  icon-name="mdiCoffee"
+                  class="mr-1"
+                  :size="18"
+               />
+               <small>{{ t('general.donate') }}</small>
             </li>
             <li
                class="footer-element footer-link"
-               :title="t('message.reportABug')"
+               :title="t('application.reportABug')"
                @click="openOutside('https://github.com/antares-sql/antares/issues')"
             >
-               <i class="mdi mdi-18px mdi-bug" />
+               <BaseIcon icon-name="mdiBug" :size="18" />
             </li>
             <li
                class="footer-element footer-link"
-               :title="t('word.about')"
+               :title="t('application.about')"
                @click="showSettingModal('about')"
             >
-               <i class="mdi mdi-18px mdi-information-outline" />
+               <BaseIcon icon-name="mdiInformationOutline" :size="18" />
             </li>
          </ul>
       </div>
@@ -61,12 +85,14 @@
 <script setup lang="ts">
 import { shell } from 'electron';
 import { storeToRefs } from 'pinia';
-import { useI18n } from 'vue-i18n';
-import { useApplicationStore } from '@/stores/application';
-import { useWorkspacesStore } from '@/stores/workspaces';
 import { computed, ComputedRef } from 'vue';
-import { useConsoleStore } from '@/stores/console';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useApplicationStore } from '@/stores/application';
 import { useConnectionsStore } from '@/stores/connections';
+import { useConsoleStore } from '@/stores/console';
+import { useWorkspacesStore } from '@/stores/workspaces';
 
 const { t } = useI18n();
 

src/renderer/components/TheNotificationsBoard.vue

@@ -17,11 +17,12 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref, watch } from 'vue';
 import { storeToRefs } from 'pinia';
+import { computed, Ref, ref, watch } from 'vue';
+
+import BaseNotification from '@/components/BaseNotification.vue';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useSettingsStore } from '@/stores/settings';
-import BaseNotification from '@/components/BaseNotification.vue';
 
 const notificationsStore = useNotificationsStore();
 const settingsStore = useSettingsStore();

src/renderer/components/TheScratchpad.vue

@@ -1,14 +1,18 @@
 <template>
    <ConfirmModal
-      :confirm-text="t('word.update')"
+      :confirm-text="t('application.update')"
-      :cancel-text="t('word.close')"
+      :cancel-text="t('general.close')"
       size="large"
       :hide-footer="true"
       @hide="hideScratchpad"
    >
       <template #header>
          <div class="d-flex">
-            <i class="mdi mdi-24px mdi-notebook-edit-outline mr-1" /> {{ t('word.scratchpad') }}
+            <BaseIcon
+               icon-name="mdiNotebookEditOutline"
+               class="mr-1"
+               :size="24"
+            /> {{ t('application.scratchpad') }}
          </div>
       </template>
       <template #body>
@@ -22,20 +26,22 @@
                   :show-line-numbers="false"
                />
             </div>
-            <small class="text-gray">{{ t('message.markdownSupported') }}</small>
+            <small class="text-gray">{{ t('application.markdownSupported') }}</small>
          </div>
       </template>
    </ConfirmModal>
 </template>
 
 <script setup lang="ts">
-import { ref, Ref, watch } from 'vue';
 import { storeToRefs } from 'pinia';
+import { Ref, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import ConfirmModal from '@/components/BaseConfirmModal.vue';
+import BaseIcon from '@/components/BaseIcon.vue';
+import TextEditor from '@/components/BaseTextEditor.vue';
 import { useApplicationStore } from '@/stores/application';
 import { useScratchpadStore } from '@/stores/scratchpad';
-import ConfirmModal from '@/components/BaseConfirmModal.vue';
-import TextEditor from '@/components/BaseTextEditor.vue';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 

src/renderer/components/TheSettingBar.vue

@@ -22,27 +22,35 @@
                v-tooltip="{
                   strategy: 'fixed',
                   placement: 'right',
-                  content: t('message.allConnections')
+                  content: t('connection.allConnections')
                }"
                class="settingbar-element btn btn-link"
                @click="emit('show-connections-modal')"
             >
                <div class="settingbar-element-icon-wrapper">
-                  <i class="settingbar-element-icon mdi mdi-24px mdi-dots-horizontal text-light" />
+                  <BaseIcon
+                     icon-name="mdiDotsHorizontal"
+                     class="settingbar-element-icon text-light"
+                     :size="24"
+                  />
                </div>
             </li>
             <li
                v-tooltip="{
                   strategy: 'fixed',
                   placement: 'right',
-                  content: t('message.addConnection')
+                  content: t('connection.addConnection')
                }"
                class="settingbar-element btn btn-link"
                :class="{ 'selected': 'NEW' === selectedWorkspace }"
                @click="selectWorkspace('NEW')"
             >
                <div class="settingbar-element-icon-wrapper">
-                  <i class="settingbar-element-icon mdi mdi-24px mdi-plus text-light" />
+                  <BaseIcon
+                     icon-name="mdiPlus"
+                     class="settingbar-element-icon text-light"
+                     :size="24"
+                  />
                </div>
             </li>
          </ul>
@@ -55,26 +63,34 @@
                v-tooltip="{
                   strategy: 'fixed',
                   placement: 'right',
-                  content: t('word.scratchpad')
+                  content: t('application.scratchpad')
                }"
                class="settingbar-element btn btn-link"
                @click="showScratchpad"
             >
-               <i class="settingbar-element-icon mdi mdi-24px mdi-notebook-edit-outline text-light" />
+               <BaseIcon
+                  icon-name="mdiNotebookEditOutline"
+                  class="settingbar-element-icon text-light"
+                  :size="24"
+               />
             </li>
             <li
                v-tooltip="{
                   strategy: 'fixed',
                   placement: 'right',
-                  content: t('word.settings')
+                  content: t('application.settings')
                }"
                class="settingbar-element btn btn-link"
                @click="showSettingModal('general')"
             >
-               <i
+               <div class="settingbar-element-icon-wrapper">
-                  class="settingbar-element-icon mdi mdi-24px mdi-cog text-light"
+                  <BaseIcon
-                  :class="{ ' badge badge-update': hasUpdates }"
+                     icon-name="mdiCog"
-               />
+                     class="settingbar-element-icon text-light"
+                     :class="{ 'badge badge-update': hasUpdates }"
+                     :size="24"
+                  />
+               </div>
             </li>
          </ul>
       </div>
@@ -82,17 +98,19 @@
 </template>
 
 <script setup lang="ts">
-import { ref, Ref, computed, watch } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useApplicationStore } from '@/stores/application';
-import { useConnectionsStore, SidebarElement } from '@/stores/connections';
-import { useWorkspacesStore } from '@/stores/workspaces';
-import { useSettingsStore } from '@/stores/settings';
-import SettingBarContext from '@/components/SettingBarContext.vue';
-import SettingBarConnections from '@/components/SettingBarConnections.vue';
 import { useElementBounding } from '@vueuse/core';
+import { storeToRefs } from 'pinia';
+import { computed, Ref, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
+import BaseIcon from '@/components/BaseIcon.vue';
+import SettingBarConnections from '@/components/SettingBarConnections.vue';
+import SettingBarContext from '@/components/SettingBarContext.vue';
+import { useApplicationStore } from '@/stores/application';
+import { SidebarElement, useConnectionsStore } from '@/stores/connections';
+import { useSettingsStore } from '@/stores/settings';
+import { useWorkspacesStore } from '@/stores/workspaces';
+
 const { t } = useI18n();
 localStorage.setItem('opened-folders', '[]');
 
@@ -238,7 +256,7 @@ if (!connectionsArr.value.length)
             border-radius: $border-radius;
          }
 
-         .settingbar-element-icon-wrapper{
+         .settingbar-element-icon-wrapper {
             display: flex;
             flex-direction: column;
             align-items: center;

src/renderer/components/TheTitleBar.vue

@@ -21,14 +21,14 @@
             class="titlebar-element"
             @click="openDevTools"
          >
-            <i class="mdi mdi-24px mdi-code-tags" />
+            <BaseIcon icon-name="mdiCodeTags" :size="24" />
          </div>
          <div
             v-if="isDevelopment"
             class="titlebar-element"
             @click="reload"
          >
-            <i class="mdi mdi-24px mdi-refresh" />
+            <BaseIcon icon-name="mdiRefresh" :size="24" />
          </div>
          <div v-if="isWindows" :style="'width: 140px;'" />
       </div>
@@ -36,13 +36,15 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onUnmounted, ref, watch } from 'vue';
-import { storeToRefs } from 'pinia';
 import { getCurrentWindow } from '@electron/remote';
+import { ipcRenderer } from 'electron';
+import { storeToRefs } from 'pinia';
+import { computed, onUnmounted, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
 import { useConnectionsStore } from '@/stores/connections';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import { useI18n } from 'vue-i18n';
-import { ipcRenderer } from 'electron';
 
 const { t } = useI18n();
 
@@ -63,7 +65,7 @@ const isLinux = process.platform === 'linux';
 
 const windowTitle = computed(() => {
    if (!selectedWorkspace.value) return '';
-   if (selectedWorkspace.value === 'NEW') return t('message.createNewConnection');
+   if (selectedWorkspace.value === 'NEW') return t('connection.createNewConnection');
 
    const connectionName = getConnectionName(selectedWorkspace.value);
    const workspace = getWorkspace(selectedWorkspace.value);

src/renderer/components/Workspace.vue

@@ -1,5 +1,15 @@
 <template>
    <div v-show="isSelected" class="workspace column columns col-gapless">
+      <WorkspaceTabsContext
+         v-if="isTabContext"
+         :context-event="contextEvent"
+         :selected-tab="selectedContextTab"
+         @close-all-tabs="closeAllTabs"
+         @close-other-tabs="closeOtherTabs"
+         @close-to-left="closeTabsToLeft"
+         @close-to-right="closeTabsToRight"
+         @close-context="closeContext"
+      />
       <WorkspaceExploreBar
          v-if="workspace?.connectionStatus === 'connected'"
          :connection="connection"
@@ -23,18 +33,23 @@
                   :class="{'active': selectedTab === element.uid}"
                   @mousedown.left="selectTab({uid: workspace.uid, tab: element.uid})"
                   @mouseup.middle="closeTab(element)"
+                  @contextmenu.prevent="contextMenu($event, element)"
                >
                   <a
                      v-if="element.type === 'query'"
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-18px mdi-code-tags mr-1" />
+                     <BaseIcon
+                        class="mt-1 mr-1"
+                        icon-name="mdiCodeTags"
+                        :size="18"
+                     />
                      <span>
                         <span>{{ cutText(element.content || 'Query', 20, true) }} #{{ element.index }}</span>
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -46,12 +61,16 @@
                      class="tab-link"
                      @dblclick="openAsPermanentTab(element)"
                   >
-                     <i class="mdi mdi-18px mr-1" :class="element.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
+                     <BaseIcon
-                     <span :title="`${t('word.data').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mt-1 mr-1"
+                        :icon-name="element.elementType === 'view' ? 'mdiTableEye' : 'mdiTable'"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.data').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
                         <span class=" text-italic">{{ cutText(element.elementName, 20, true) }}</span>
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -59,12 +78,16 @@
                   </a>
 
                   <a v-else-if="element.type === 'data'" class="tab-link">
-                     <i class="mdi mdi-18px mr-1" :class="element.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
+                     <BaseIcon
-                     <span :title="`${t('word.data').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mt-1 mr-1"
+                        :icon-name="element.elementType === 'view' ? 'mdiTableEye' : 'mdiTable'"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.data').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
                         {{ cutText(element.elementName, 20, true) }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -76,12 +99,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newTable') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newTable') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -93,12 +120,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.settings').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
+                        icon-name="mdiWrenchCog"
+                        :size="18"
+                     />
+                     <span :title="`${t('application.settings').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
                         {{ cutText(element.elementName, 20, true) }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -110,12 +141,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.settings').toUpperCase()}: ${t(`word.view`)}`">
+                        class="mr-1"
+                        icon-name="mdiWrenchCog"
+                        :size="18"
+                     />
+                     <span :title="`${t('application.settings').toUpperCase()}: ${t(`database.view`)}`">
                         {{ cutText(element.elementName, 20, true) }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -127,12 +162,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newView') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newView') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -144,12 +183,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newTrigger') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newTrigger') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -161,12 +204,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newRoutine') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newRoutine') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -178,12 +225,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newFunction') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newFunction') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -195,12 +246,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newTriggerFunction') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newTriggerFunction') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -212,12 +267,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.new').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
-                        {{ t('message.newScheduler') }}
+                        icon-name="mdiShapeSquarePlus"
+                        :size="18"
+                     />
+                     <span :title="`${t('general.new').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
+                        {{ t('database.newScheduler') }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -230,12 +289,16 @@
                      :class="{'badge': element.isChanged}"
                      @dblclick="openAsPermanentTab(element)"
                   >
-                     <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.settings').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
+                        icon-name="mdiWrenchCog"
+                        :size="18"
+                     />
+                     <span :title="`${t('application.settings').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
                         <span class=" text-italic">{{ cutText(element.elementName, 20, true) }}</span>
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -247,12 +310,16 @@
                      class="tab-link"
                      :class="{'badge': element.isChanged}"
                   >
-                     <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
+                     <BaseIcon
-                     <span :title="`${t('word.settings').toUpperCase()}: ${t(`word.${element.elementType}`)}`">
+                        class="mr-1"
+                        icon-name="mdiWrenchCog"
+                        :size="18"
+                     />
+                     <span :title="`${t('application.settings').toUpperCase()}: ${t(`database.${element.elementType}`)}`">
                         {{ cutText(element.elementName, 20, true) }}
                         <span
                            class="btn btn-clear"
-                           :title="t('word.close')"
+                           :title="t('general.close')"
                            @mousedown.left.stop
                            @click.stop="closeTab(element)"
                         />
@@ -268,21 +335,29 @@
                   <a
                      class="tab-link workspace-tools-link dropdown-toggle"
                      tabindex="0"
-                     :title="t('word.tools')"
+                     :title="t('general.tools')"
                   >
-                     <i class="mdi mdi-24px mdi-tools" />
+                     <BaseIcon icon-name="mdiTools" :size="24" />
                   </a>
                   <ul v-if="hasTools" class="menu text-left text-uppercase">
                      <li class="menu-item">
                         <a class="c-hand p-vcentered" @click="showProcessesModal">
-                           <i class="mdi mdi-memory mr-1 tool-icon" />
+                           <BaseIcon
-                           <span>{{ t('message.processesList') }}</span>
+                              icon-name="mdiMemory"
+                              :size="18"
+                              class="mr-1 tool-icon"
+                           />
+                           <span>{{ t('database.processesList') }}</span>
                         </a>
                      </li>
                      <li class="menu-item">
                         <a class="c-hand p-vcentered" @click="toggleConsole">
-                           <i class="mdi mdi-console-line mr-1 tool-icon" />
+                           <BaseIcon
-                           <span>{{ t('word.console') }}</span>
+                              icon-name="mdiConsoleLine"
+                              :size="18"
+                              class="mr-1 tool-icon"
+                           />
+                           <span>{{ t('application.console') }}</span>
                         </a>
                      </li>
                      <li
@@ -291,8 +366,12 @@
                         title="Coming..."
                      >
                         <a class="c-hand p-vcentered disabled">
-                           <i class="mdi mdi-shape mr-1 tool-icon" />
+                           <BaseIcon
-                           <span>{{ t('word.variables') }}</span>
+                              icon-name="mdiShape"
+                              :size="18"
+                              class="mr-1 tool-icon"
+                           />
+                           <span>{{ t('database.variables') }}</span>
                         </a>
                      </li>
                      <li
@@ -301,8 +380,12 @@
                         title="Coming..."
                      >
                         <a class="c-hand p-vcentered disabled">
-                           <i class="mdi mdi-account-group mr-1 tool-icon" />
+                           <BaseIcon
-                           <span>{{ t('message.manageUsers') }}</span>
+                              icon-name="mdiAccountGroup"
+                              :size="18"
+                              class="mr-1 tool-icon"
+                           />
+                           <span>{{ t('database.manageUsers') }}</span>
                         </a>
                      </li>
                   </ul>
@@ -312,16 +395,16 @@
                <li class="tab-item">
                   <a
                      class="tab-add"
-                     :title="t('message.openNewTab')"
+                     :title="t('application.openNewTab')"
                      @click="addQueryTab"
                   >
-                     <i class="mdi mdi-24px mdi-plus" />
+                     <BaseIcon icon-name="mdiPlus" :size="24" />
                   </a>
                </li>
             </template>
          </Draggable>
-         <WorkspaceEmptyState v-if="!workspace.tabs.length" @new-tab="addQueryTab" />
+         <WorkspaceEmptyState v-if="!draggableTabs.length" @new-tab="addQueryTab" />
-         <template v-for="tab of workspace.tabs" :key="tab.uid">
+         <template v-for="tab of draggableTabs" :key="tab.uid">
             <WorkspaceTabQuery
                v-if="tab.type ==='query'"
                :tab-uid="tab.uid"
@@ -477,41 +560,41 @@
 </template>
 
 <script setup lang="ts">
-import { ipcRenderer } from 'electron';
-import { computed, onMounted, Prop, ref, watch } from 'vue';
-import { storeToRefs } from 'pinia';
-import * as Draggable from 'vuedraggable';
-import Connection from '@/ipc-api/Connection';
-import { useWorkspacesStore, WorkspaceTab } from '@/stores/workspaces';
-import { useConsoleStore } from '@/stores/console';
 import { ConnectionParams } from 'common/interfaces/antares';
-import { useFilters } from '@/composables/useFilters';
+import { ipcRenderer } from 'electron';
+import { storeToRefs } from 'pinia';
+import { computed, onMounted, Prop, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import * as Draggable from 'vuedraggable';
 
+import BaseIcon from '@/components/BaseIcon.vue';
+import ModalDiscardChanges from '@/components/ModalDiscardChanges.vue';
+import ModalProcessesList from '@/components/ModalProcessesList.vue';
+import WorkspaceEditConnectionPanel from '@/components/WorkspaceEditConnectionPanel.vue';
 import WorkspaceEmptyState from '@/components/WorkspaceEmptyState.vue';
 import WorkspaceExploreBar from '@/components/WorkspaceExploreBar.vue';
-import WorkspaceEditConnectionPanel from '@/components/WorkspaceEditConnectionPanel.vue';
-import WorkspaceTabQuery from '@/components/WorkspaceTabQuery.vue';
-import WorkspaceTabTable from '@/components/WorkspaceTabTable.vue';
 import WorkspaceQueryConsole from '@/components/WorkspaceQueryConsole.vue';
-
-import WorkspaceTabNewTable from '@/components/WorkspaceTabNewTable.vue';
-import WorkspaceTabNewView from '@/components/WorkspaceTabNewView.vue';
-import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger.vue';
-import WorkspaceTabNewRoutine from '@/components/WorkspaceTabNewRoutine.vue';
 import WorkspaceTabNewFunction from '@/components/WorkspaceTabNewFunction.vue';
+import WorkspaceTabNewRoutine from '@/components/WorkspaceTabNewRoutine.vue';
 import WorkspaceTabNewScheduler from '@/components/WorkspaceTabNewScheduler.vue';
+import WorkspaceTabNewTable from '@/components/WorkspaceTabNewTable.vue';
+import WorkspaceTabNewTrigger from '@/components/WorkspaceTabNewTrigger.vue';
 import WorkspaceTabNewTriggerFunction from '@/components/WorkspaceTabNewTriggerFunction.vue';
-
+import WorkspaceTabNewView from '@/components/WorkspaceTabNewView.vue';
+import WorkspaceTabPropsFunction from '@/components/WorkspaceTabPropsFunction.vue';
+import WorkspaceTabPropsRoutine from '@/components/WorkspaceTabPropsRoutine.vue';
+import WorkspaceTabPropsScheduler from '@/components/WorkspaceTabPropsScheduler.vue';
 import WorkspaceTabPropsTable from '@/components/WorkspaceTabPropsTable.vue';
-import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView.vue';
 import WorkspaceTabPropsTrigger from '@/components/WorkspaceTabPropsTrigger.vue';
 import WorkspaceTabPropsTriggerFunction from '@/components/WorkspaceTabPropsTriggerFunction.vue';
-import WorkspaceTabPropsRoutine from '@/components/WorkspaceTabPropsRoutine.vue';
+import WorkspaceTabPropsView from '@/components/WorkspaceTabPropsView.vue';
-import WorkspaceTabPropsFunction from '@/components/WorkspaceTabPropsFunction.vue';
+import WorkspaceTabQuery from '@/components/WorkspaceTabQuery.vue';
-import WorkspaceTabPropsScheduler from '@/components/WorkspaceTabPropsScheduler.vue';
+import WorkspaceTabsContext from '@/components/WorkspaceTabsContext.vue';
-import ModalProcessesList from '@/components/ModalProcessesList.vue';
+import WorkspaceTabTable from '@/components/WorkspaceTabTable.vue';
-import ModalDiscardChanges from '@/components/ModalDiscardChanges.vue';
+import { useFilters } from '@/composables/useFilters';
-import { useI18n } from 'vue-i18n';
+import Connection from '@/ipc-api/Connection';
+import { useConsoleStore } from '@/stores/console';
+import { useWorkspacesStore, WorkspaceTab } from '@/stores/workspaces';
 
 const { t } = useI18n();
 
@@ -545,12 +628,19 @@ const hasWheelEvent = ref(false);
 const isProcessesModal = ref(false);
 const unsavedTab = ref(null);
 const tabWrap = ref(null);
+const contextEvent = ref(null);
+const isTabContext = ref(false);
+const selectedContextTab = ref(null);
 
 const workspace = computed(() => getWorkspace(props.connection.uid));
 
 const draggableTabs = computed<WorkspaceTab[]>({
    get () {
-      return workspace.value.tabs;
+      if (workspace.value.customizations.database)
+         return workspace.value.tabs.filter(tab => tab.type === 'query' || tab.database === workspace.value.database);
+
+      else
+         return workspace.value.tabs;
    },
    set (val) {
       updateTabs({ uid: props.connection.uid, tabs: val });
@@ -627,6 +717,34 @@ const closeTab = (tab: WorkspaceTab, force = false) => {
    removeTab({ uid: props.connection.uid, tab: tab.uid });
 };
 
+const closeAllTabs = () => {
+   for (const tab of draggableTabs.value)
+      removeTab({ uid: props.connection.uid, tab: tab.uid });
+};
+
+const closeOtherTabs = () => {
+   const otherTabs = draggableTabs.value.filter(t => t.uid !== selectedContextTab.value.uid);
+
+   for (const tab of otherTabs)
+      removeTab({ uid: props.connection.uid, tab: tab.uid });
+};
+
+const closeTabsToLeft = () => {
+   const tabIndex = draggableTabs.value.findIndex(t => t.uid === selectedContextTab.value.uid);
+   const leftTabs = draggableTabs.value.filter((t, i) => i < tabIndex);
+
+   for (const tab of leftTabs)
+      removeTab({ uid: props.connection.uid, tab: tab.uid });
+};
+
+const closeTabsToRight = () => {
+   const tabIndex = draggableTabs.value.findIndex(t => t.uid === selectedContextTab.value.uid);
+   const leftTabs = draggableTabs.value.filter((t, i) => i > tabIndex);
+
+   for (const tab of leftTabs)
+      removeTab({ uid: props.connection.uid, tab: tab.uid });
+};
+
 const showProcessesModal = () => {
    isProcessesModal.value = true;
 };
@@ -647,6 +765,16 @@ const addWheelEvent = () => {
    }
 };
 
+const contextMenu = (event: MouseEvent, tab: WorkspaceTab) => {
+   selectedContextTab.value = tab;
+   contextEvent.value = event;
+   isTabContext.value = true;
+};
+
+const closeContext = () => {
+   isTabContext.value = false;
+};
+
 (async () => {
    await addWorkspace(props.connection.uid);
    const isInitiated = await Connection.checkConnection(props.connection.uid);

src/renderer/components/WorkspaceAddConnectionPanel.vue

@@ -8,7 +8,7 @@
                   :class="{'active': selectedTab === 'general'}"
                   @click="selectTab('general')"
                >
-                  <a class="tab-link">{{ t('word.general') }}</a>
+                  <a class="tab-link">{{ t('application.general') }}</a>
                </li>
                <li
                   v-if="clientCustomizations.sslConnection"
@@ -16,7 +16,7 @@
                   :class="{'active': selectedTab === 'ssl'}"
                   @click="selectTab('ssl')"
                >
-                  <a class="tab-link">{{ t('word.ssl') }}</a>
+                  <a class="tab-link">{{ t('connection.ssl') }}</a>
                </li>
                <li
                   v-if="clientCustomizations.sshConnection"
@@ -24,7 +24,7 @@
                   :class="{'active': selectedTab === 'ssh'}"
                   @click="selectTab('ssh')"
                >
-                  <a class="tab-link">{{ t('word.sshTunnel') }}</a>
+                  <a class="tab-link">{{ t('connection.sshTunnel') }}</a>
                </li>
             </ul>
          </div>
@@ -33,10 +33,10 @@
                <form class="form-horizontal">
                   <fieldset class="m-0" :disabled="isBusy">
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionName') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionName') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               ref="firstInput"
                               v-model="connection.name"
@@ -46,10 +46,10 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.client') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.client') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseSelect
                               v-model="connection.client"
                               :options="clients"
@@ -60,10 +60,10 @@
                         </div>
                      </div>
                      <div v-if="connection.client === 'pg'" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.connectionString') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.connectionString') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               ref="pgString"
                               v-model="connection.pgConnString"
@@ -73,10 +73,10 @@
                         </div>
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.host"
                               class="form-input"
@@ -85,23 +85,23 @@
                         </div>
                      </div>
                      <div v-if="clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseUploadInput
                               :model-value="connection.databasePath"
-                              :message="t('word.browse')"
+                              :message="t('general.browse')"
                               @clear="pathClear('databasePath')"
                               @change="pathSelection($event, 'databasePath')"
                            />
                         </div>
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.port"
                               class="form-input"
@@ -112,22 +112,23 @@
                         </div>
                      </div>
                      <div v-if="clientCustomizations.database" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.database') }}</label>
+                           <label class="form-label cut-text">{{ t('database.database') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.database"
                               class="form-input"
                               type="text"
+                              :placeholder="clientCustomizations.defaultDatabase"
                            >
                         </div>
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.user"
                               class="form-input"
@@ -137,10 +138,10 @@
                         </div>
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.password"
                               class="form-input"
@@ -150,31 +151,31 @@
                         </div>
                      </div>
                      <div v-if="clientCustomizations.connectionSchema" class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.schema') }}</label>
+                           <label class="form-label cut-text">{{ t('database.schema') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.schema"
                               class="form-input"
                               type="text"
-                              :placeholder="t('word.all')"
+                              :placeholder="t('general.all')"
                            >
                         </div>
                      </div>
                      <div v-if="clientCustomizations.readOnlyMode" class="form-group columns">
-                        <div class="column col-4 col-sm-12" />
+                        <div class="column col-5 col-sm-12" />
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <label class="form-checkbox form-inline">
-                              <input v-model="connection.readonly" type="checkbox"><i class="form-icon" /> {{ t('message.readOnlyMode') }}
+                              <input v-model="connection.readonly" type="checkbox"><i class="form-icon" /> {{ t('connection.readOnlyMode') }}
                            </label>
                         </div>
                      </div>
                      <div v-if="!clientCustomizations.fileConnection" class="form-group columns">
-                        <div class="column col-4 col-sm-12" />
+                        <div class="column col-5 col-sm-12" />
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <label class="form-checkbox form-inline">
-                              <input v-model="connection.ask" type="checkbox"><i class="form-icon" /> {{ t('message.askCredentials') }}
+                              <input v-model="connection.ask" type="checkbox"><i class="form-icon" /> {{ t('connection.askCredentials') }}
                            </label>
                         </div>
                      </div>
@@ -186,12 +187,12 @@
             <div>
                <form class="form-horizontal">
                   <div class="form-group columns">
-                     <div class="column col-4 col-sm-12">
+                     <div class="column col-5 col-sm-12">
                         <label class="form-label cut-text">
-                           {{ t('message.enableSsl') }}
+                           {{ t('connection.enableSsl') }}
                         </label>
                      </div>
-                     <div class="column col-8 col-sm-12">
+                     <div class="column col-7 col-sm-12">
                         <label class="form-switch d-inline-block" @click.prevent="toggleSsl">
                            <input type="checkbox" :checked="connection.ssl">
                            <i class="form-icon" />
@@ -200,49 +201,49 @@
                   </div>
                   <fieldset class="m-0" :disabled="isBusy || !connection.ssl">
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseUploadInput
                               :model-value="connection.key"
-                              :message="t('word.browse')"
+                              :message="t('general.browse')"
                               @clear="pathClear('key')"
                               @change="pathSelection($event, 'key')"
                            />
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.certificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.certificate') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseUploadInput
                               :model-value="connection.cert"
-                              :message="t('word.browse')"
+                              :message="t('general.browse')"
                               @clear="pathClear('cert')"
                               @change="pathSelection($event, 'cert')"
                            />
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.caCertificate') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.caCertificate') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseUploadInput
                               :model-value="connection.ca"
-                              :message="t('word.browse')"
+                              :message="t('general.browse')"
                               @clear="pathClear('ca')"
                               @change="pathSelection($event, 'ca')"
                            />
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.ciphers') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.ciphers') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               ref="firstInput"
                               v-model="connection.ciphers"
@@ -252,10 +253,10 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12" />
+                        <div class="column col-5 col-sm-12" />
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <label class="form-checkbox form-inline">
-                              <input v-model="connection.untrustedConnection" type="checkbox"><i class="form-icon" /> {{ t('message.untrustedConnection') }}
+                              <input v-model="connection.untrustedConnection" type="checkbox"><i class="form-icon" /> {{ t('connection.untrustedConnection') }}
                            </label>
                         </div>
                      </div>
@@ -267,12 +268,12 @@
             <div>
                <form class="form-horizontal">
                   <div class="form-group columns">
-                     <div class="column col-4 col-sm-12">
+                     <div class="column col-5 col-sm-12">
                         <label class="form-label cut-text">
-                           {{ t('message.enableSsh') }}
+                           {{ t('connection.enableSsh') }}
                         </label>
                      </div>
-                     <div class="column col-8 col-sm-12">
+                     <div class="column col-7 col-sm-12">
                         <label class="form-switch d-inline-block" @click.prevent="toggleSsh">
                            <input type="checkbox" :checked="connection.ssh">
                            <i class="form-icon" />
@@ -281,10 +282,10 @@
                   </div>
                   <fieldset class="m-0" :disabled="isBusy || !connection.ssh">
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.hostName') }}/IP</label>
+                           <label class="form-label cut-text">{{ t('connection.hostName') }}/IP</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.sshHost"
                               class="form-input"
@@ -293,10 +294,10 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.user') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.user') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.sshUser"
                               class="form-input"
@@ -305,10 +306,10 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.password') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.password') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.sshPass"
                               class="form-input"
@@ -317,10 +318,10 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.port') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.port') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.sshPort"
                               class="form-input"
@@ -331,23 +332,23 @@
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.privateKey') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.privateKey') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <BaseUploadInput
                               :model-value="connection.sshKey"
-                              :message="t('word.browse')"
+                              :message="t('general.browse')"
                               @clear="pathClear('sshKey')"
                               @change="pathSelection($event, 'sshKey')"
                            />
                         </div>
                      </div>
                      <div class="form-group columns">
-                        <div class="column col-4 col-sm-12">
+                        <div class="column col-5 col-sm-12">
-                           <label class="form-label cut-text">{{ t('word.passphrase') }}</label>
+                           <label class="form-label cut-text">{{ t('connection.passphrase') }}</label>
                         </div>
-                        <div class="column col-8 col-sm-12">
+                        <div class="column col-7 col-sm-12">
                            <input
                               v-model="connection.sshPassphrase"
                               class="form-input"
@@ -355,6 +356,22 @@
                            >
                         </div>
                      </div>
+                     <div class="form-group columns">
+                        <div class="column col-5 col-sm-12">
+                           <label class="form-label cut-text">{{ t('connection.keepAliveInterval') }}</label>
+                        </div>
+                        <div class="column col-7 col-sm-12">
+                           <div class="input-group">
+                              <input
+                                 v-model="connection.sshKeepAliveInterval"
+                                 class="form-input"
+                                 type="number"
+                                 min="1"
+                              >
+                              <span class="input-group-addon">{{ t('general.seconds') }}</span>
+                           </div>
+                        </div>
+                     </div>
                   </fieldset>
                </form>
             </div>
@@ -367,8 +384,12 @@
                :disabled="isBusy"
                @click="startTest"
             >
-               <i class="mdi mdi-24px mdi-lightning-bolt mr-1" />
+               <BaseIcon
-               {{ t('message.testConnection') }}
+                  icon-name="mdiLightningBolt"
+                  :size="24"
+                  class="mr-1"
+               />
+               {{ t('connection.testConnection') }}
             </button>
             <button
                id="connection-save"
@@ -376,8 +397,12 @@
                :disabled="isBusy"
                @click="saveConnection"
             >
-               <i class="mdi mdi-24px mdi-content-save mr-1" />
+               <BaseIcon
-               {{ t('word.save') }}
+                  icon-name="mdiContentSave"
+                  :size="24"
+                  class="mr-1"
+               />
+               {{ t('general.save') }}
             </button>
          </div>
       </div>
@@ -390,18 +415,20 @@
 </template>
 
 <script setup lang="ts">
-import { computed, Ref, ref, watch } from 'vue';
 import customizations from 'common/customizations';
-import Connection from '@/ipc-api/Connection';
+import { ConnectionParams } from 'common/interfaces/antares';
 import { uidGen } from 'common/libs/uidGen';
+import { computed, Ref, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import BaseSelect from '@/components/BaseSelect.vue';
+import BaseUploadInput from '@/components/BaseUploadInput.vue';
+import ModalAskCredentials from '@/components/ModalAskCredentials.vue';
+import Connection from '@/ipc-api/Connection';
 import { useConnectionsStore } from '@/stores/connections';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useWorkspacesStore } from '@/stores/workspaces';
-import ModalAskCredentials from '@/components/ModalAskCredentials.vue';
-import BaseUploadInput from '@/components/BaseUploadInput.vue';
-import BaseSelect from '@/components/BaseSelect.vue';
-import { ConnectionParams } from 'common/interfaces/antares';
-import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 
@@ -416,7 +443,7 @@ const clients = [
    { name: 'MariaDB', slug: 'maria' },
    { name: 'PostgreSQL', slug: 'pg' },
    { name: 'SQLite', slug: 'sqlite' },
-   { name: 'Firebird SQL (experimental)', slug: 'firebird' }
+   { name: 'Firebird SQL', slug: 'firebird' }
 ];
 
 const connection = ref({
@@ -441,8 +468,10 @@ const connection = ref({
    sshHost: '',
    sshUser: '',
    sshPass: '',
+   sshPassphrase: null,
    sshKey: '',
    sshPort: 22,
+   sshKeepAliveInterval: 1800,
    pgConnString: ''
 }) as Ref<ConnectionParams & { pgConnString: string }>;
 
@@ -483,7 +512,7 @@ const startTest = async () => {
          if (res.status === 'error')
             addNotification({ status: 'error', message: res.response.message || res.response.toString() });
          else
-            addNotification({ status: 'success', message: t('message.connectionSuccessfullyMade') });
+            addNotification({ status: 'success', message: t('connection.connectionSuccessfullyMade') });
       }
       catch (err) {
          addNotification({ status: 'error', message: err.stack });
@@ -507,7 +536,7 @@ const continueTest = async (credentials: { user: string; password: string }) =>
          if (res.status === 'error')
             addNotification({ status: 'error', message: res.response.message || res.response.toString() });
          else
-            addNotification({ status: 'success', message: t('message.connectionSuccessfullyMade') });
+            addNotification({ status: 'success', message: t('connection.connectionSuccessfullyMade') });
       }
    }
    catch (err) {