chore(release): 0.7.21-beta.1

Feat/new scratchpad

.github/workflows/build-beta.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
       - name: Check out Git repository
@@ -26,7 +26,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       
       - name: Install dependencies
         run: npm i

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-11, ubuntu-latest, windows-latest]
+        os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
       - name: Exit if not on master branch
@@ -32,7 +32,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       
       - name: Install dependencies
         run: npm i

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

@@ -15,7 +15,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 18
+          node-version: 20
       
       - name: Install dependencies
         run: npm i

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

@@ -5,7 +5,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - name: Check out Git repository
         uses: actions/checkout@v3
@@ -13,7 +13,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
       
       - name: Install dependencies
         run: npm i

.github/workflows/create-artifact-macos.yml

@@ -13,7 +13,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: npm install & build
         run: |
@@ -29,3 +29,30 @@ jobs:
             build
             !build/*-unpacked
             !build/.icon-ico
+  build-beta:
+    runs-on: macos-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: 20
+
+      - name: npm install & build
+        run: |
+          npm install
+          npm run build
+
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: macos-build-beta
+          retention-days: 3
+          path: |
+            build
+            !build/*-unpacked
+            !build/.icon-ico

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

@@ -1,9 +1,9 @@
-name: Test end-to-end [WINDOWS]
+name: Test end-to-end
 
 on: 
   push:
     branches:
-        - master
+        - develop
 
 jobs:
   release:
@@ -20,7 +20,7 @@ jobs:
       - name: Install Node.js
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
       
       - name: Install dependencies
         run: npm i

.vscode/launch.json

@@ -17,15 +17,6 @@
       "sourceMaps": true,
       "type": "chrome",
       "webRoot": "${workspaceFolder}"
-    },
-    {
-      "name": "Electron: Worker",
-      "cwd": "${workspaceFolder}",
-      "port": 9224,
-      "request": "attach",
-      "sourceMaps": true,
-      "type": "node",
-      "timeout": 1000000
     }
   ],
   "compounds": [

.vscode/settings.json

@@ -10,7 +10,8 @@
       "translation",
       "Linux",
       "MacOS",
-      "deps"
+      "deps",
+      "Flatpak"
    ],
    "svg.preview.background": "transparent"
 }

CHANGELOG.md

@@ -2,6 +2,58 @@
 
 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.21-beta.1](https://github.com/antares-sql/antares/compare/v0.7.21-beta.0...v0.7.21-beta.1) (2024-01-06)
+
+
+### Bug Fixes
+
+* **PostgreSQL:** error adding MONEY fields to a table ([0f8d2cb](https://github.com/antares-sql/antares/commit/0f8d2cb4ef5c327f96f788179be0b309689b4ce8))
+* **PostgreSQL:** exception deleting a table with one or less tabs open ([23946ff](https://github.com/antares-sql/antares/commit/23946ff2cef6d63e1529e2c8c4357d7fdedc3284))
+* **PostgreSQL:** unhandled error on connection lost, fixes [#740](https://github.com/antares-sql/antares/issues/740) ([cdd2a11](https://github.com/antares-sql/antares/commit/cdd2a11f8e33d6607337989723774d60c7c1a030))
+
+### [0.7.21-beta.0](https://github.com/antares-sql/antares/compare/v0.7.20...v0.7.21-beta.0) (2023-12-25)
+
+
+### Features
+
+* ability to edit notes ([08e5a13](https://github.com/antares-sql/antares/commit/08e5a13f723bc3ae95b0f529b79f0b558bc2a377))
+* buttons to save and access to saved queryes from query tab ([a52fc3f](https://github.com/antares-sql/antares/commit/a52fc3fd923fec30cfdd3d804554e6fe4534c400))
+* highlithg sql in notes, history and console ([bfa3924](https://github.com/antares-sql/antares/commit/bfa3924d57c2ea2cc2857006d6bd6279865dbc99))
+* new notes system ([eaaf1b7](https://github.com/antares-sql/antares/commit/eaaf1b756a6b5ffb77f7f07f3e4c0971822d48c3))
+* open saved queries in a tab ([9a732ea](https://github.com/antares-sql/antares/commit/9a732ea1971d223f3278ad02d3dd77837fecb377))
+
+
+### Bug Fixes
+
+* JavaScript error at first startup, fixes [#736](https://github.com/antares-sql/antares/issues/736) ([b734b24](https://github.com/antares-sql/antares/commit/b734b246795fb240f6728714be68c22cc221bbe9))
+
+### [0.7.20](https://github.com/antares-sql/antares/compare/v0.7.20-beta.2...v0.7.20) (2023-12-08)
+
+
+### Bug Fixes
+
+* missing update indicator on setting icon ([b055350](https://github.com/antares-sql/antares/commit/b055350726774e05a4e04ea6d890c46f64f2112e))
+
+### [0.7.20-beta.2](https://github.com/antares-sql/antares/compare/v0.7.20-beta.1...v0.7.20-beta.2) (2023-12-06)
+
+
+### Bug Fixes
+
+* communication with worker thread not working ([6a72f6b](https://github.com/antares-sql/antares/commit/6a72f6b4ae3f4c1d6c42ca7a817d2f2c135696a7))
+
+### [0.7.20-beta.1](https://github.com/antares-sql/antares/compare/v0.7.20-beta.0...v0.7.20-beta.1) (2023-12-02)
+
+
+### Features
+
+* copy element names on sidebar from context menu, closes [#718](https://github.com/antares-sql/antares/issues/718) ([f13d4e6](https://github.com/antares-sql/antares/commit/f13d4e6dceb70b0c7cb8d56ddfb5f00e938571cc))
+* logging errors on log file ([315d9d8](https://github.com/antares-sql/antares/commit/315d9d84c2caa29852d68bd189750b2a4028d953))
+
+
+### Bug Fixes
+
+* **Flatpak:** import/export schema not working ([e26809f](https://github.com/antares-sql/antares/commit/e26809f260099ba194bf5d00671cae14d438197b))
+
 ### [0.7.20-beta.0](https://github.com/antares-sql/antares/compare/v0.7.19...v0.7.20-beta.0) (2023-11-15)
 
 

README.md

@@ -7,7 +7,7 @@
 
 # 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) ![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)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/fabio286/antares) ![GitHub](https://img.shields.io/github/license/fabio286/antares) ![Test e2e](https://github.com/antares-sql/antares/actions/workflows/test-e2e-win.yml/badge.svg?branch=develop) ![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.  
@@ -35,6 +35,7 @@ We are actively working on it, hoping to provide new cool features, improvements
 - Fake table data filler to generate tons of data for test purpose.
 - Query suggestions and auto complete.
 - Query history: search through the last 1000 queries.
+- Save queries, notes or todo.
 - SSH tunnel support.
 - Manual commit mode.
 - Import and export database dumps.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.7.20-beta.0",
+  "version": "0.7.21-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",
@@ -126,8 +126,8 @@
     "@turf/helpers": "~6.5.0",
     "@vueuse/core": "~10.4.1",
     "ace-builds": "~1.24.1",
-    "better-sqlite3": "~9.1.1",
-    "electron-log": "~4.4.1",
+    "better-sqlite3": "^8.0.1",
+    "electron-log": "~5.0.1",
     "electron-store": "~8.1.0",
     "electron-updater": "~4.6.5",
     "electron-window-state": "~5.0.3",
@@ -147,6 +147,7 @@
     "source-map-support": "~0.5.20",
     "spectre.css": "~0.5.9",
     "sql-formatter": "~13.0.0",
+    "sql-highlight": "~4.4.0",
     "v-mask": "~2.3.0",
     "vue": "~3.3.4",
     "vue-i18n": "~9.2.2",

scripts/devRunner.js

@@ -63,43 +63,39 @@ async function restartElectron () {
       if (!manualRestart) process.exit(0);
    });
 }
+function startWorkers () {
+   const compiler = webpack(workersConfig);
+   const { name } = compiler;
 
-function startMain () {
-   const webpackSetup = webpack([mainConfig, workersConfig]);
-
-   webpackSetup.compilers.forEach((compiler) => {
-      const { name } = compiler;
-
-      switch (name) {
-         case 'workers':
-            compiler.hooks.afterEmit.tap('afterEmit', async () => {
-               console.log(chalk.gray(`\nCompiled ${name} script!`));
-               console.log(
-                  chalk.gray(`\nWatching file changes for ${name} script...`)
-               );
-            });
-            break;
-         case 'main':
-         default:
-            compiler.hooks.afterEmit.tap('afterEmit', async () => {
-               console.log(chalk.gray(`\nCompiled ${name} script!`));
-
-               manualRestart = true;
-               await restartElectron();
-
-               setTimeout(() => {
-                  manualRestart = false;
-               }, 2500);
-
-               console.log(
-                  chalk.gray(`\nWatching file changes for ${name} script...`)
-               );
-            });
-            break;
-      }
+   compiler.hooks.afterEmit.tap('afterEmit', () => {
+      console.log(chalk.gray(`\nCompiled ${name} script!`));
+      console.log(chalk.gray(`\nWatching file changes for ${name} script...`));
    });
 
-   webpackSetup.watch({ aggregateTimeout: 500 }, err => {
+   compiler.watch({ aggregateTimeout: 500 }, err => {
+      if (err) console.error(chalk.red(err));
+   });
+}
+
+function startMain () {
+   const compiler = webpack(mainConfig);
+   const { name } = compiler;
+
+   compiler.hooks.afterEmit.tap('afterEmit', async () => {
+      console.log(chalk.gray(`\nCompiled ${name} script!`));
+
+      manualRestart = true;
+      await restartElectron();
+      startWorkers();
+
+      setTimeout(() => {
+         manualRestart = false;
+      }, 2500);
+
+      console.log(chalk.gray(`\nWatching file changes for ${name} script...`));
+   });
+
+   compiler.watch({ aggregateTimeout: 500 }, err => {
       if (err) console.error(chalk.red(err));
    });
 }
@@ -115,6 +111,7 @@ function startRenderer (callback) {
 
    const server = new WebpackDevServer(compiler, {
       port: 9080,
+      hot: true,
       client: {
          overlay: true,
          logging: 'warn'

scripts/devtoolsInstaller.js

@@ -42,6 +42,7 @@ const downloadFile = url => {
       await unzip(filePath, destFolder);
       fs.unlinkSync(filePath);
       fs.unlinkSync(`${destFolder}/package.json`);// <- Avoid to display annoyng npm script in vscode
+      process.exit();
    }
    catch (error) {
       console.log(error);

src/common/data-types/postgresql.ts

@@ -66,7 +66,7 @@ export default [
       group: 'monetary',
       types: [
          {
-            name: 'money',
+            name: 'MONEY',
             length: false,
             unsigned: true
          }

src/main/ipc-handlers/application.ts

@@ -36,9 +36,15 @@ export default () => {
          name: 'session',
          fileExtension: ''
       });
-      const encrypted = sessionStore.get('key') as string;
-      const key = safeStorage.decryptString(Buffer.from(encrypted, 'utf-8'));
-      event.returnValue = key;
+
+      try {
+         const encrypted = sessionStore.get('key') as string;
+         const key = safeStorage.decryptString(Buffer.from(encrypted, 'utf-8'));
+         event.returnValue = key;
+      }
+      catch (error) {
+         event.returnValue = false;
+      }
    });
 
    ipcMain.handle('show-open-dialog', (event, options) => {

src/main/ipc-handlers/schema.ts

@@ -1,17 +1,14 @@
-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 { Worker } from 'worker_threads';
 
 import { validateSender } from '../libs/misc/validateSender';
 
-const isDevelopment = process.env.NODE_ENV !== 'production';
-
 export default (connections: {[key: string]: antares.Client}) => {
-   let exporter: ChildProcess = null;
-   let importer: ChildProcess = null;
+   let exporter: Worker = null;
+   let importer: Worker = null;
 
    ipcMain.handle('create-schema', async (event, params) => {
       if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
@@ -202,7 +199,7 @@ export default (connections: {[key: string]: antares.Client}) => {
       if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
 
       if (exporter !== null) {
-         exporter.kill();
+         exporter.terminate();
          return;
       }
 
@@ -227,11 +224,12 @@ export default (connections: {[key: string]: antares.Client}) => {
                }
             }
 
-            // Init exporter process
-            exporter = fork(isDevelopment ? './dist/exporter.js' : path.resolve(__dirname, './exporter.js'), [], {
-               execArgv: isDevelopment ? ['--inspect=9224'] : undefined
-            });
-            exporter.send({
+            // Init exporter thread
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            exporter = new Worker(new URL('../workers/exporter', import.meta.url));
+
+            exporter.postMessage({
                type: 'init',
                client: {
                   name: type,
@@ -242,32 +240,34 @@ export default (connections: {[key: string]: antares.Client}) => {
             });
 
             // Exporter message listener
-            exporter.on('message', ({ type, payload }: workers.WorkerIpcMessage) => {
+            exporter.on('message', (message: workers.WorkerIpcMessage) => {
+               const { type, payload } = message;
+
                switch (type) {
                   case 'export-progress':
                      event.sender.send('export-progress', payload);
                      break;
                   case 'end':
-                     setTimeout(() => { // Ensures that writing process has finished
-                        exporter.kill();
+                     setTimeout(() => { // Ensures that writing thread has finished
+                        exporter?.terminate();
                         exporter = null;
                      }, 2000);
                      resolve({ status: 'success', response: payload });
                      break;
                   case 'cancel':
-                     exporter.kill();
+                     exporter?.terminate();
                      exporter = null;
                      resolve({ status: 'error', response: 'Operation cancelled' });
                      break;
                   case 'error':
-                     exporter.kill();
+                     exporter?.terminate();
                      exporter = null;
                      resolve({ status: 'error', response: payload });
                      break;
                }
             });
 
-            exporter.on('exit', code => {
+            exporter.on('close', code => {
                exporter = null;
                resolve({ status: 'error', response: `Operation ended with code: ${code}` });
             });
@@ -291,7 +291,7 @@ export default (connections: {[key: string]: antares.Client}) => {
 
          if (result.response === 1) {
             willAbort = true;
-            exporter.send({ type: 'cancel' });
+            exporter.postMessage({ type: 'cancel' });
          }
       }
 
@@ -302,7 +302,7 @@ export default (connections: {[key: string]: antares.Client}) => {
       if (!validateSender(event.senderFrame)) return { status: 'error', response: 'Unauthorized process' };
 
       if (importer !== null) {
-         importer.kill();
+         importer.terminate();
          return;
       }
 
@@ -310,18 +310,21 @@ export default (connections: {[key: string]: antares.Client}) => {
          (async () => {
             const dbConfig = await connections[options.uid].getDbConfig();
 
-            // Init importer process
-            importer = fork(isDevelopment ? './dist/importer.js' : path.resolve(__dirname, './importer.js'), [], {
-               execArgv: isDevelopment ? ['--inspect=9224'] : undefined
-            });
-            importer.send({
+            // Init importer thread
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            importer = new Worker(new URL('../workers/importer', import.meta.url));
+
+            importer.postMessage({
                type: 'init',
                dbConfig,
                options
             });
 
             // Importer message listener
-            importer.on('message', ({ type, payload }: workers.WorkerIpcMessage) => {
+            importer.on('message', (message: workers.WorkerIpcMessage) => {
+               const { type, payload } = message;
+
                switch (type) {
                   case 'import-progress':
                      event.sender.send('import-progress', payload);
@@ -331,23 +334,28 @@ export default (connections: {[key: string]: antares.Client}) => {
                      break;
                   case 'end':
                      setTimeout(() => { // Ensures that writing process has finished
-                        importer?.kill();
+                        importer?.terminate();
                         importer = null;
                      }, 2000);
                      resolve({ status: 'success', response: payload });
                      break;
                   case 'cancel':
-                     importer.kill();
+                     importer.terminate();
                      importer = null;
                      resolve({ status: 'error', response: 'Operation cancelled' });
                      break;
                   case 'error':
-                     importer.kill();
+                     importer.terminate();
                      importer = null;
                      resolve({ status: 'error', response: payload });
                      break;
                }
             });
+
+            importer.on('close', code => {
+               importer = null;
+               resolve({ status: 'error', response: `Operation ended with code: ${code}` });
+            });
          })();
       });
    });
@@ -368,7 +376,7 @@ export default (connections: {[key: string]: antares.Client}) => {
 
          if (result.response === 1) {
             willAbort = true;
-            importer.send({ type: 'cancel' });
+            importer.postMessage({ type: 'cancel' });
          }
       }
 

src/main/ipc-handlers/updates.ts

@@ -1,4 +1,5 @@
 import { ipcMain } from 'electron';
+import * as log from 'electron-log/main';
 import * as Store from 'electron-store';
 import { autoUpdater } from 'electron-updater';
 
@@ -59,7 +60,7 @@ export default () => {
       mainWindow.reply('update-downloaded');
    });
 
-   // autoUpdater.logger = require('electron-log');
-   // autoUpdater.logger.transports.console.format = '{h}:{i}:{s} {text}';
-   // autoUpdater.logger.transports.file.level = 'info';
+   log.transports.file.level = 'info';
+   // log.transports.console.format = '{h}:{i}:{s} {text}';
+   autoUpdater.logger = log;
 };

src/main/libs/clients/BaseClient.ts

@@ -10,7 +10,7 @@ const queryLogger = ({ sql, cUid }: {sql: string; cUid: string}) => {
       const mainWindow = require('electron').webContents.fromId(1);
       mainWindow.send('query-log', { cUid, sql: escapedSql, date: new Date() });
    }
-   if (process.env.NODE_ENV === 'development') console.log(escapedSql);
+   if (process.env.NODE_ENV === 'development' && process.type === 'browser') console.log(escapedSql);
 };
 
 /**

src/main/libs/clients/PostgreSQLClient.ts

@@ -232,6 +232,10 @@ export class PostgreSQLClient extends BaseClient {
          await this.keepAlive();
       }, this._keepaliveMs);
 
+      connection.on('error', err => { // Intercepts errors and converts to rejections
+         Promise.reject(err);
+      });
+
       return connection;
    }
 

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

@@ -1,6 +1,5 @@
 import * as exporter from 'common/interfaces/exporter';
 import { valueToSqlString } from 'common/libs/sqlUtils';
-import * as mysql from 'mysql2/promise';
 
 import { MySQLClient } from '../../clients/MySQLClient';
 import { SqlExporter } from './SqlExporter';
@@ -334,12 +333,10 @@ CREATE TABLE \`${view.Name}\`(
    }
 
    async _queryStream (sql: string) {
-      if (process.env.NODE_ENV === 'development') console.log('EXPORTER:', sql);
-      const isPool = 'getConnection' in this._client._connection;
-      const connection = isPool ? await (this._client._connection as mysql.Pool).getConnection() : this._client._connection;
+      const connection = await this._client.getConnection();
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const stream = (connection as any).connection.query(sql).stream();
-      const dispose = () => (connection as mysql.PoolConnection).release();
+      const dispose = () => connection.end();
 
       stream.on('end', dispose);
       stream.on('error', dispose);

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

@@ -425,7 +425,6 @@ SET row_security = off;\n\n\n`;
    }
 
    async _queryStream (sql: string) {
-      if (process.env.NODE_ENV === 'development') console.log('EXPORTER:', sql);
       const connection = await this._client.getConnection();
       const query = new QueryStream(sql, null);
       // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -33,8 +33,8 @@ export default class MySQLImporter extends BaseImporter {
             parser.on('error', reject);
 
             parser.on('close', async () => {
-               console.log('TOTAL QUERIES', queryCount);
-               console.log('import end');
+               // console.log('TOTAL QUERIES', queryCount);
+               // console.log('import end');
                resolve();
             });
 

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

@@ -33,8 +33,8 @@ export default class PostgreSQLImporter extends BaseImporter {
             parser.on('error', reject);
 
             parser.on('close', async () => {
-               console.log('TOTAL QUERIES', queryCount);
-               console.log('import end');
+               // console.log('TOTAL QUERIES', queryCount);
+               // console.log('import end');
                resolve();
             });
 

src/main/libs/misc/validateSender.ts

@@ -6,7 +6,7 @@ const isWindows = process.platform === 'win32';
 const indexPath = path.resolve(__dirname, 'index.html').split(path.sep).join('/');
 
 export function validateSender (frame: WebFrameMain) {
-   if (process.windowsStore) return true; // TEMP HOTFIX
+   if (isWindows) return true; // TEMP HOTFIX
    const frameUrl = new URL(frame.url);
    const prefix = isWindows ? 'file:///' : 'file://';
    const framePath = frameUrl.href.replace(prefix, '');

src/main/main.ts

@@ -1,5 +1,6 @@
 import * as remoteMain from '@electron/remote/main';
 import { app, BrowserWindow, ipcMain, nativeImage, safeStorage } from 'electron';
+import * as log from 'electron-log/main';
 import * as Store from 'electron-store';
 import * as windowStateKeeper from 'electron-window-state';
 import * as path from 'path';
@@ -8,6 +9,7 @@ import ipcHandlers from './ipc-handlers';
 import { OsMenu, ShortcutRegister } from './libs/ShortcutRegister';
 
 Store.initRenderer();
+log.errorHandler.startCatching();
 const settingsStore = new Store({ name: 'settings' });
 const appTheme = settingsStore.get('application_theme');
 const isDevelopment = process.env.NODE_ENV !== 'production';

src/main/workers/exporter.ts

@@ -1,5 +1,7 @@
 import * as antares from 'common/interfaces/antares';
+import * as log from 'electron-log/main';
 import * as fs from 'fs';
+import { parentPort } from 'worker_threads';
 
 import { MySQLClient } from '../libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../libs/clients/PostgreSQLClient';
@@ -8,63 +10,78 @@ 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 }: any) => {
+log.transports.file.fileName = 'workers.log';
+log.transports.console = null;
+log.errorHandler.startCatching();
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+const exportHandler = async (data: any) => {
+   const { type, client, tables, options } = data;
+
    if (type === 'init') {
-      const connection = await ClientsFactory.getClient({
-         client: client.name,
-         params: client.config,
-         poolSize: 5
-      }) as MySQLClient | PostgreSQLClient;
-      await connection.connect();
+      try {
+         const connection = await ClientsFactory.getClient({
+            client: client.name,
+            params: client.config,
+            poolSize: 5
+         }) as MySQLClient | PostgreSQLClient;
+         await connection.connect();
 
-      switch (client.name) {
-         case 'mysql':
-         case 'maria':
-            exporter = new MysqlExporter(connection as MySQLClient, tables, options);
-            break;
-         case 'pg':
-            exporter = new PostgreSQLExporter(connection as PostgreSQLClient, tables, options);
-            break;
-         default:
-            process.send({
+         switch (client.name) {
+            case 'mysql':
+            case 'maria':
+               exporter = new MysqlExporter(connection as MySQLClient, tables, options);
+               break;
+            case 'pg':
+               exporter = new PostgreSQLExporter(connection as PostgreSQLClient, tables, options);
+               break;
+            default:
+               parentPort.postMessage({
+                  type: 'error',
+                  payload: `"${client.name}" exporter not aviable`
+               });
+               return;
+         }
+
+         exporter.once('error', err => {
+            log.error(err.toString());
+            parentPort.postMessage({
                type: 'error',
-               payload: `"${client.name}" exporter not aviable`
+               payload: err.toString()
             });
-            return;
-      }
+         });
 
-      exporter.once('error', err => {
-         console.error(err);
-         process.send({
+         exporter.once('end', () => {
+            parentPort.postMessage({
+               type: 'end',
+               payload: { cancelled: exporter.isCancelled }
+            });
+         });
+
+         exporter.once('cancel', () => {
+            fs.unlinkSync(exporter.outputFile);
+            parentPort.postMessage({ type: 'cancel' });
+         });
+
+         exporter.on('progress', state => {
+            parentPort.postMessage({
+               type: 'export-progress',
+               payload: state
+            });
+         });
+
+         exporter.run();
+      }
+      catch (err) {
+         log.error(err.toString());
+         parentPort.postMessage({
             type: 'error',
             payload: err.toString()
          });
-      });
-
-      exporter.once('end', () => {
-         process.send({
-            type: 'end',
-            payload: { cancelled: exporter.isCancelled }
-         });
-         connection.destroy();
-      });
-
-      exporter.once('cancel', () => {
-         fs.unlinkSync(exporter.outputFile);
-         process.send({ type: 'cancel' });
-      });
-
-      exporter.on('progress', state => {
-         process.send({
-            type: 'export-progress',
-            payload: state
-         });
-      });
-
-      exporter.run();
+      }
    }
    else if (type === 'cancel')
       exporter.cancel();
-});
+};
 
-process.on('beforeExit', console.log);
+parentPort.on('message', exportHandler);

src/main/workers/importer.ts

@@ -1,8 +1,10 @@
 import SSHConfig from '@fabio286/ssh2-promise/lib/sshConfig';
 import * as antares from 'common/interfaces/antares';
 import { ImportOptions } from 'common/interfaces/importer';
+import * as log from 'electron-log/main';
 import * as mysql from 'mysql2';
 import * as pg from 'pg';
+import { parentPort } from 'worker_threads';
 
 import { MySQLClient } from '../libs/clients/MySQLClient';
 import { PostgreSQLClient } from '../libs/clients/PostgreSQLClient';
@@ -11,14 +13,18 @@ import MySQLImporter from '../libs/importers/sql/MySQLlImporter';
 import PostgreSQLImporter from '../libs/importers/sql/PostgreSQLImporter';
 let importer: antares.Importer;
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-process.on('message', async ({ type, dbConfig, options }: {
+log.transports.file.fileName = 'workers.log';
+log.transports.console = null;
+log.errorHandler.startCatching();
+
+const importHandler = async (data: {
    type: string;
    dbConfig: mysql.ConnectionOptions & { schema: string; ssl?: mysql.SslOptions; ssh?: SSHConfig; readonly: boolean }
       | pg.ClientConfig & { schema: string; ssl?: mysql.SslOptions; ssh?: SSHConfig; readonly: boolean }
       | { databasePath: string; readonly: boolean };
    options: ImportOptions;
 }) => {
+   const { type, dbConfig, options } = data;
    if (type === 'init') {
       try {
          const connection = await ClientsFactory.getClient({
@@ -41,7 +47,7 @@ process.on('message', async ({ type, dbConfig, options }: {
                importer = new PostgreSQLImporter(pool as unknown as pg.PoolClient, options);
                break;
             default:
-               process.send({
+               parentPort.postMessage({
                   type: 'error',
                   payload: `"${options.type}" importer not aviable`
                });
@@ -49,33 +55,33 @@ process.on('message', async ({ type, dbConfig, options }: {
          }
 
          importer.once('error', err => {
-            console.error(err);
-            process.send({
+            log.error(err.toString());
+            parentPort.postMessage({
                type: 'error',
                payload: err.toString()
             });
          });
 
          importer.once('end', () => {
-            process.send({
+            parentPort.postMessage({
                type: 'end',
                payload: { cancelled: importer.isCancelled }
             });
          });
 
          importer.once('cancel', () => {
-            process.send({ type: 'cancel' });
+            parentPort.postMessage({ type: 'cancel' });
          });
 
          importer.on('progress', state => {
-            process.send({
+            parentPort.postMessage({
                type: 'import-progress',
                payload: state
             });
          });
 
          importer.on('query-error', state => {
-            process.send({
+            parentPort.postMessage({
                type: 'query-error',
                payload: state
             });
@@ -84,8 +90,8 @@ process.on('message', async ({ type, dbConfig, options }: {
          importer.run();
       }
       catch (err) {
-         console.error(err);
-         process.send({
+         log.error(err.toString());
+         parentPort.postMessage({
             type: 'error',
             payload: err.toString()
          });
@@ -93,20 +99,6 @@ process.on('message', async ({ type, dbConfig, options }: {
    }
    else if (type === 'cancel')
       importer.cancel();
-});
+};
 
-process.on('uncaughtException', (err) => {
-   console.error(err);
-   process.send({
-      type: 'error',
-      payload: err.toString()
-   });
-});
-
-process.on('unhandledRejection', (err) => {
-   console.error(err);
-   process.send({
-      type: 'error',
-      payload: err.toString()
-   });
-});
+parentPort.on('message', importHandler);

src/renderer/components/BaseSelect.vue

@@ -280,7 +280,6 @@ export default defineComponent({
 
          if (props.searchable)
             searchInput.value.focus();
-
          else
             el.value.focus();
 

src/renderer/components/BaseVirtualScroll.vue

@@ -54,7 +54,7 @@ const updateWindow = () => {
    const totalScrollHeight = props.items.length * props.itemHeight;
    const offset = 50;
 
-   const scrollTop = localScrollElement.value.scrollTop;
+   const scrollTop = localScrollElement.value?.scrollTop;
 
    const firstVisibleIndex = Math.floor(scrollTop / props.itemHeight);
    const lastVisibleIndex = firstVisibleIndex + visibleItemsCount;

src/renderer/components/ModalAllConnections.vue

@@ -152,6 +152,14 @@
                                  />
                                  SSH
                               </div>
+                              <div v-if="connection.readonly" class="chip bg-success mt-2">
+                                 <BaseIcon
+                                    icon-name="mdiLock"
+                                    class="mr-1"
+                                    :size="18"
+                                 />
+                                 Read-only
+                              </div>
                            </div>
                         </div>
                      </div>

src/renderer/components/ModalHistory.vue

@@ -75,7 +75,7 @@
                                     <code
                                        class="cut-text"
                                        :title="query.sql"
-                                       v-html="highlightWord(query.sql)"
+                                       v-html="highlight(highlightWord(query.sql), {html: true})"
                                     />
                                  </div>
                                  <div class="tile-bottom-content">
@@ -126,13 +126,26 @@
 
 <script setup lang="ts">
 import { ConnectionParams } from 'common/interfaces/antares';
-import { Component, computed, ComputedRef, onBeforeUnmount, onMounted, onUpdated, Prop, Ref, ref, watch } from 'vue';
+import { highlight } from 'sql-highlight';
+import {
+   Component,
+   computed,
+   ComputedRef,
+   onBeforeUnmount,
+   onMounted,
+   onUpdated,
+   Prop,
+   Ref,
+   ref,
+   watch
+} from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import BaseIcon from '@/components/BaseIcon.vue';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
 import { useFilters } from '@/composables/useFilters';
 import { useFocusTrap } from '@/composables/useFocusTrap';
+import { copyText } from '@/libs/copyText';
 import { useConnectionsStore } from '@/stores/connections';
 import { HistoryRecord, useHistoryStore } from '@/stores/history';
 
@@ -162,7 +175,7 @@ const localSearchTerm = ref('');
 
 const connectionName = computed(() => getConnectionName(props.connection.uid));
 const history: ComputedRef<HistoryRecord[]> = computed(() => (getHistoryByWorkspace(props.connection.uid) || []));
-const filteredHistory = computed(() => history.value.filter(q => q.sql.toLowerCase().search(searchTerm.value.toLowerCase()) >= 0));
+const filteredHistory = computed(() => history.value.filter(q => q.sql.toLowerCase().search(localSearchTerm.value.toLowerCase()) >= 0));
 
 watch(searchTerm, () => {
    clearTimeout(searchTermInterval.value);
@@ -173,7 +186,7 @@ watch(searchTerm, () => {
 });
 
 const copyQuery = (sql: string) => {
-   navigator.clipboard.writeText(sql);
+   copyText(sql);
 };
 
 const deleteQuery = (query: HistoryRecord[]) => {

src/renderer/components/ModalNoteEdit.vue

@@ -0,0 +1,120 @@
+<template>
+   <ConfirmModal
+      size="medium"
+      :disable-autofocus="true"
+      :close-on-confirm="!!localNote.note.length"
+      :confirm-text="t('general.save')"
+      @confirm="updateNote"
+      @hide="$emit('hide')"
+   >
+      <template #header>
+         <div class="d-flex">
+            <BaseIcon
+               icon-name="mdiNoteEditOutline"
+               class="mr-1"
+               :size="24"
+            /> {{ t('application.editNote') }}
+         </div>
+      </template>
+      <template #body>
+         <form class="form">
+            <div class="form-group columns">
+               <div class="column col-8">
+                  <label class="form-label">{{ t('connection.connection') }}</label>
+                  <BaseSelect
+                     v-model="localNote.cUid"
+                     class="form-select"
+                     :options="connectionOptions"
+                     option-track-by="code"
+                     option-label="name"
+                     @change="null"
+                  />
+               </div>
+               <div class="column col-4">
+                  <label class="form-label">{{ t('application.tag') }}</label>
+                  <BaseSelect
+                     v-model="localNote.type"
+                     class="form-select"
+                     :options="noteTags"
+                     option-track-by="code"
+                     option-label="name"
+                     @change="null"
+                  />
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label">{{ t('general.content') }} <small
+                  v-if="localNote.type !== 'query'"
+                  style="line-height: 1;"
+                  class="text-gray"
+               >({{ t('application.markdownSupported') }})</small></label>
+               <BaseTextEditor
+                  v-model="localNote.note"
+                  :mode="editorMode"
+                  :show-line-numbers="false"
+               />
+            </div>
+         </form>
+      </template>
+   </ConfirmModal>
+</template>
+
+<script lang="ts" setup>
+import { inject, onBeforeMount, PropType, 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 BaseTextEditor from '@/components/BaseTextEditor.vue';
+import { ConnectionNote, TagCode, useScratchpadStore } from '@/stores/scratchpad';
+
+const { t } = useI18n();
+const { editNote } = useScratchpadStore();
+
+const emit = defineEmits(['hide']);
+
+const props = defineProps({
+   note: {
+      type: Object as PropType<ConnectionNote>,
+      required: true
+   }
+});
+
+const noteTags = inject<{code: TagCode; name: string}[]>('noteTags');
+const connectionOptions = inject<{code: string; name: string}[]>('connectionOptions');
+
+const editorMode = ref('markdown');
+const localNote: Ref<ConnectionNote> = ref({
+   uid: 'dummy',
+   cUid: null,
+   title: undefined,
+   note: '',
+   date: new Date(),
+   type: 'note',
+   isArchived: false
+});
+
+const updateNote = () => {
+   if (localNote.value.note) {
+      if (!localNote.value.title)// Set a default title
+         localNote.value.title = `${localNote.value.type.toLocaleUpperCase()}: ${localNote.value.uid}`;
+
+      localNote.value.date = new Date();
+      editNote(localNote.value);
+      emit('hide');
+   }
+};
+
+watch(() => localNote.value.type, () => {
+   if (localNote.value.type === 'query')
+      editorMode.value = 'sql';
+   else
+      editorMode.value = 'markdown';
+});
+
+onBeforeMount(() => {
+   localNote.value = JSON.parse(JSON.stringify(props.note));
+});
+
+</script>

src/renderer/components/ModalNoteNew.vue

@@ -0,0 +1,118 @@
+<template>
+   <ConfirmModal
+      size="medium"
+      :disable-autofocus="true"
+      :close-on-confirm="!!newNote.note.length"
+      :confirm-text="t('general.save')"
+      @confirm="createNote"
+      @hide="$emit('hide')"
+   >
+      <template #header>
+         <div class="d-flex">
+            <BaseIcon
+               icon-name="mdiNotePlusOutline"
+               class="mr-1"
+               :size="24"
+            /> {{ t('application.addNote') }}
+         </div>
+      </template>
+      <template #body>
+         <form class="form">
+            <div class="form-group columns">
+               <div class="column col-8">
+                  <label class="form-label">{{ t('connection.connection') }}</label>
+                  <BaseSelect
+                     v-model="newNote.cUid"
+                     class="form-select"
+                     :options="connectionOptions"
+                     option-track-by="code"
+                     option-label="name"
+                     @change="null"
+                  />
+               </div>
+               <div class="column col-4">
+                  <label class="form-label">{{ t('application.tag') }}</label>
+                  <BaseSelect
+                     v-model="newNote.type"
+                     class="form-select"
+                     :options="noteTags"
+                     option-track-by="code"
+                     option-label="name"
+                     @change="null"
+                  />
+               </div>
+            </div>
+            <div class="form-group">
+               <label class="form-label">{{ t('general.content') }} <small
+                  v-if="newNote.type !== 'query'"
+                  style="line-height: 1;"
+                  class="text-gray"
+               >({{ t('application.markdownSupported') }})</small></label>
+               <BaseTextEditor
+                  v-model="newNote.note"
+                  :mode="editorMode"
+                  :show-line-numbers="false"
+               />
+            </div>
+         </form>
+      </template>
+   </ConfirmModal>
+</template>
+
+<script lang="ts" setup>
+import { uidGen } from 'common/libs/uidGen';
+import { inject, 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 BaseTextEditor from '@/components/BaseTextEditor.vue';
+import { ConnectionNote, TagCode, useScratchpadStore } from '@/stores/scratchpad';
+
+const { t } = useI18n();
+const { addNote } = useScratchpadStore();
+
+const emit = defineEmits(['hide']);
+
+const noteTags = inject<{code: TagCode; name: string}[]>('noteTags');
+const selectedConnection = inject<Ref<null | string>>('selectedConnection');
+const selectedTag = inject<Ref<TagCode>>('selectedTag');
+const connectionOptions = inject<{code: string; name: string}[]>('connectionOptions');
+
+const editorMode = ref('markdown');
+
+const newNote: Ref<ConnectionNote> = ref({
+   uid: uidGen('N'),
+   cUid: null,
+   title: undefined,
+   note: '',
+   date: new Date(),
+   type: 'note',
+   isArchived: false
+});
+
+const createNote = () => {
+   if (newNote.value.note) {
+      if (!newNote.value.title)// Set a default title
+         newNote.value.title = `${newNote.value.type.toLocaleUpperCase()}: ${newNote.value.uid}`;
+
+      newNote.value.date = new Date();
+      addNote(newNote.value);
+      emit('hide');
+   }
+};
+
+watch(() => newNote.value.type, () => {
+   if (newNote.value.type === 'query')
+      editorMode.value = 'sql';
+   else
+      editorMode.value = 'markdown';
+});
+
+newNote.value.cUid = selectedConnection.value;
+
+if (selectedTag.value !== 'all')
+   newNote.value.type = selectedTag.value;
+
+</script>

src/renderer/components/ModalProcessesList.vue

@@ -161,6 +161,7 @@ import ModalProcessesListContext from '@/components/ModalProcessesListContext.vu
 import ModalProcessesListRow from '@/components/ModalProcessesListRow.vue';
 import { useFocusTrap } from '@/composables/useFocusTrap';
 import Schema from '@/ipc-api/Schema';
+import { copyText } from '@/libs/copyText';
 import { useConnectionsStore } from '@/stores/connections';
 import { useNotificationsStore } from '@/stores/notifications';
 
@@ -322,13 +323,13 @@ const closeContext = () => {
 const copyCell = () => {
    const row = results.value.find(row => Number(row.id) === selectedRow.value);
    const valueToCopy = row[selectedCell.value.field];
-   navigator.clipboard.writeText(valueToCopy);
+   copyText(valueToCopy);
 };
 
 const copyRow = () => {
    const row = results.value.find(row => Number(row.id) === selectedRow.value);
    const rowToCopy = JSON.parse(JSON.stringify(row));
-   navigator.clipboard.writeText(JSON.stringify(rowToCopy));
+   copyText(JSON.stringify(rowToCopy));
 };
 
 const closeModal = () => emit('close');

src/renderer/components/ModalSettings.vue

@@ -166,19 +166,6 @@
                                     </label>
                                  </div>
                               </div>
-                              <div class="form-group column col-12 mb-0">
-                                 <div class="col-5 col-sm-12">
-                                    <label class="form-label">
-                                       {{ t('application.disableScratchpad') }}
-                                    </label>
-                                 </div>
-                                 <div class="col-3 col-sm-12">
-                                    <label class="form-switch d-inline-block" @click.prevent="toggleDisableScratchpad">
-                                       <input type="checkbox" :checked="disableScratchpad">
-                                       <i class="form-icon" />
-                                    </label>
-                                 </div>
-                              </div>
                               <div class="form-group column col-12">
                                  <div class="col-5 col-sm-12">
                                     <label class="form-label">
@@ -499,7 +486,6 @@ const {
    restoreTabs,
    showTableSize,
    disableBlur,
-   disableScratchpad,
    applicationTheme,
    editorTheme,
    editorFontSize
@@ -512,7 +498,6 @@ const {
    changePageSize,
    changeRestoreTabs,
    changeDisableBlur,
-   changeDisableScratchpad,
    changeAutoComplete,
    changeLineWrap,
    changeExecuteSelected,
@@ -671,10 +656,6 @@ const toggleDisableBlur = () => {
    changeDisableBlur(!disableBlur.value);
 };
 
-const toggleDisableScratchpad = () => {
-   changeDisableScratchpad(!disableScratchpad.value);
-};
-
 const toggleAutoComplete = () => {
    changeAutoComplete(!selectedAutoComplete.value);
 };

src/renderer/components/ScratchpadNote.vue

@@ -0,0 +1,350 @@
+<template>
+   <div
+      class="tile my-2"
+      tabindex="0"
+      @click="$emit('select-note', note.uid)"
+   >
+      <BaseIcon
+         v-if="isBig"
+         class="tile-compress c-hand"
+         :icon-name="isSelected ? 'mdiChevronUp' : 'mdiChevronDown'"
+         :size="36"
+         @click.stop="$emit('toggle-note', note.uid)"
+      />
+      <div class="tile-icon">
+         <BaseIcon
+            :icon-name="note.type === 'query'
+               ? 'mdiStarOutline'
+               : note.type === 'todo'
+                  ? note.isArchived
+                     ? 'mdiCheckboxMarkedOutline'
+                     : 'mdiCheckboxBlankOutline'
+                  : 'mdiNoteEditOutline'"
+            :size="36"
+         />
+         <div class="tile-icon-type">
+            {{ note.type }}
+         </div>
+      </div>
+      <div class="tile-content">
+         <div class="tile-content-message" :class="[{'opened': isSelected}]">
+            <code
+               v-if="note.type === 'query'"
+               ref="noteParagraph"
+               class="tile-paragraph sql"
+               v-html="highlight(highlightWord(note.note), {html: true})"
+            />
+            <div
+               v-else
+               ref="noteParagraph"
+               class="tile-paragraph"
+               v-html="parseMarkdown(highlightWord(note.note))"
+            />
+            <div v-if="isBig && !isSelected" class="tile-paragraph-overlay" />
+         </div>
+         <div class="tile-bottom-content">
+            <small class="tile-subtitle">{{ getConnectionName(note.cUid) || t('general.all') }} · {{ formatDate(note.date) }}</small>
+            <div class="tile-history-buttons">
+               <button
+                  v-if="note.type === 'todo' && !note.isArchived"
+                  class="btn btn-link pl-1"
+                  @click.stop="$emit('archive-note', note.uid)"
+               >
+                  <BaseIcon
+                     icon-name="mdiCheck"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.archive') }}
+               </button>
+               <button
+                  v-if="note.type === 'todo' && note.isArchived"
+                  class="btn btn-link pl-1"
+                  @click.stop="$emit('restore-note', note.uid)"
+               >
+                  <BaseIcon
+                     icon-name="mdiRestore"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.undo') }}
+               </button>
+               <button
+                  v-if="note.type === 'query'"
+                  class="btn btn-link pl-1"
+                  @click.stop="$emit('select-query', note.note)"
+               >
+                  <BaseIcon
+                     icon-name="mdiOpenInApp"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.select') }}
+               </button>
+               <button
+                  v-if="note.type === 'query'"
+                  class="btn btn-link pl-1"
+                  @click.stop="copyText(note.note)"
+               >
+                  <BaseIcon
+                     icon-name="mdiContentCopy"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.copy') }}
+               </button>
+               <button
+                  v-if=" !note.isArchived"
+                  class="btn btn-link pl-1"
+                  @click.stop="$emit('edit-note')"
+               >
+                  <BaseIcon
+                     icon-name="mdiPencil"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.edit') }}
+               </button>
+               <button class="btn btn-link pl-1" @click.stop="$emit('delete-note', note.uid)">
+                  <BaseIcon
+                     icon-name="mdiDeleteForever"
+                     class="pr-1"
+                     :size="22"
+                  /> {{ t('general.delete') }}
+               </button>
+            </div>
+         </div>
+      </div>
+   </div>
+</template>
+<script setup lang="ts">
+import { useElementBounding } from '@vueuse/core';
+import { marked } from 'marked';
+import { highlight } from 'sql-highlight';
+import { computed, PropType, Ref, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import BaseIcon from '@/components/BaseIcon.vue';
+import { useFilters } from '@/composables/useFilters';
+import { copyText } from '@/libs/copyText';
+import { useConnectionsStore } from '@/stores/connections';
+import { ConnectionNote } from '@/stores/scratchpad';
+
+const props = defineProps({
+   note: {
+      type: Object as PropType<ConnectionNote>,
+      required: true
+   },
+   searchTerm: {
+      type: String,
+      default: () => ''
+   },
+   selectedNote: {
+      type: String,
+      default: () => ''
+   }
+});
+
+const { t } = useI18n();
+const { formatDate } = useFilters();
+const { getConnectionName } = useConnectionsStore();
+
+defineEmits([
+   'edit-note',
+   'delete-note',
+   'select-note',
+   'toggle-note',
+   'archive-note',
+   'restore-note',
+   'select-query'
+]);
+
+const noteParagraph: Ref<HTMLDivElement> = ref(null);
+const noteHeight = ref(useElementBounding(noteParagraph)?.height);
+
+const isSelected = computed(() => props.selectedNote === props.note.uid);
+const isBig = computed(() => noteHeight.value > 75);
+
+const parseMarkdown = (text: string) => {
+   const renderer = {
+      listitem (text: string) {
+         return `<li>${text.replace(/ *\([^)]*\) */g, '')}</li>`;
+      },
+      link (href: string, title: string, text: string) {
+         return `<a>${text}</a>`;
+      }
+   };
+
+   marked.use({ renderer });
+
+   return marked(text);
+};
+
+const highlightWord = (string: string) => {
+   string = string.replaceAll('<', '&lt;').replaceAll('>', '&gt;');
+
+   if (props.searchTerm) {
+      const regexp = new RegExp(`(${props.searchTerm.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
+      return string.replace(regexp, '<span class="text-primary text-bold">$1</span>');
+   }
+   else
+      return string;
+};
+</script>
+<style scoped lang="scss">
+.tile {
+   border-radius: $border-radius;
+   display: flex;
+   position: relative;
+   transition: none;
+
+   &:hover,
+   &:focus {
+     .tile-content {
+       .tile-bottom-content {
+         .tile-history-buttons {
+           opacity: 1;
+         }
+       }
+     }
+   }
+
+   .tile-compress {
+      position: absolute;
+      right: 2px;
+      top: 0px;
+      opacity: .7;
+      z-index: 2;
+   }
+
+   .tile-icon {
+     font-size: 1.2rem;
+     margin-left: 0.3rem;
+     margin-right: 0.3rem;
+     margin-top: 0.6rem;
+     width: 40px;
+     display: flex;
+     align-items: center;
+     flex-direction: column;
+     justify-content: center;
+     opacity: .8;
+
+     .tile-icon-type {
+       text-transform: uppercase;
+       font-size: .5rem;
+     }
+   }
+
+   .tile-content {
+     padding: 0.3rem;
+     padding-left: 0.1rem;
+     min-height: 75px;
+     display: flex;
+     flex-direction: column;
+     justify-content: space-between;
+
+     .tile-content-message{
+         position: relative;
+
+         &:not(.opened) {
+            max-height: 36px;
+            overflow: hidden;
+         }
+
+         .tile-paragraph-overlay {
+            height: 36px;
+            width: 100%;
+            position: absolute;
+            top: 0;
+         }
+     }
+
+     code, pre {
+       max-width: 100%;
+       display: inline-block;
+       font-size: 100%;
+       // color: $primary-color;
+       opacity: 0.8;
+       font-weight: 600;
+       white-space: break-spaces;
+     }
+
+     .tile-subtitle {
+       opacity: 0.8;
+     }
+
+     .tile-bottom-content {
+       display: flex;
+       justify-content: space-between;
+
+       .tile-history-buttons {
+          opacity: 0;
+          transition: opacity 0.2s;
+
+          button {
+             font-size: 0.7rem;
+             height: 1rem;
+             line-height: 1rem;
+             display: inline-flex;
+             align-items: center;
+             justify-content: center;
+          }
+       }
+     }
+   }
+ }
+
+ .theme-dark {
+   .tile {
+      .tile-paragraph-overlay {
+         background-image: linear-gradient(
+            to bottom,
+            rgba(255,0,0,0) 70%,
+            $body-bg-dark);
+      }
+
+      &:focus {
+         .tile-paragraph-overlay {
+            background-image: linear-gradient(
+               to bottom,
+               rgba(255,0,0,0)70%,
+               #323232);
+         }
+      }
+
+      &:hover{
+         .tile-paragraph-overlay {
+            background-image: linear-gradient(
+               to bottom,
+               rgba(255,0,0,0) 70%,
+               $bg-color-light-dark);
+         }
+      }
+   }
+ }
+
+ .theme-light {
+   .tile {
+      .tile-paragraph-overlay {
+         background-image: linear-gradient(
+            to bottom,
+            rgba(255,0,0,0) 70%,
+            #FFFF);
+      }
+
+      &:hover,
+      &:focus {
+         .tile-paragraph-overlay {
+            background-image: linear-gradient(
+               to bottom,
+               rgba(255,0,0,0) 70%,
+               $bg-color-light-gray);
+         }
+      }
+   }
+ }
+ </style>
+ <style lang="scss">
+ .tile-paragraph {
+   white-space: initial;
+
+    h1, h2, h3, h4, h5, h6, p, li {
+       margin: 0;
+    }
+ }
+ </style>

src/renderer/components/SettingBarContext.vue

@@ -15,6 +15,14 @@
                :size="18"
             /> {{ t('connection.disconnect') }}</span>
       </div>
+      <div class="context-element" @click.stop="showAppearanceModal">
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiBrushVariant"
+               :size="18"
+            /> {{ t('application.appearance') }}</span>
+      </div>
       <div
          v-if="!contextConnection.isFolder"
          class="context-element"
@@ -27,14 +35,6 @@
                :size="18"
             /> {{ t('general.duplicate') }}</span>
       </div>
-      <div class="context-element" @click.stop="showAppearanceModal">
-         <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">
             <BaseIcon

src/renderer/components/TheScratchpad.vue

@@ -1,66 +1,368 @@
 <template>
-   <ConfirmModal
-      :confirm-text="t('application.update')"
-      :cancel-text="t('general.close')"
-      size="large"
-      :hide-footer="true"
-      @hide="hideScratchpad"
-   >
-      <template #header>
-         <div class="d-flex">
-            <BaseIcon
-               icon-name="mdiNotebookEditOutline"
-               class="mr-1"
-               :size="24"
-            /> {{ t('application.scratchpad') }}
-         </div>
-      </template>
-      <template #body>
-         <div>
-            <div>
-               <TextEditor
-                  v-model="localNotes"
-                  editor-class="textarea-editor"
-                  mode="markdown"
-                  :auto-focus="true"
-                  :show-line-numbers="false"
-               />
+   <Teleport to="#window-content">
+      <div class="modal active">
+         <a class="modal-overlay" @click.stop="hideScratchpad" />
+         <div ref="trapRef" class="modal-container p-0 pb-4">
+            <div class="modal-header pl-2">
+               <div class="modal-title h6">
+                  <div class="d-flex">
+                     <BaseIcon
+                        icon-name="mdiNotebookOutline"
+                        class="mr-1"
+                        :size="24"
+                     />
+                     <span>{{ t('application.note', 2) }}</span>
+                  </div>
+               </div>
+               <a class="btn btn-clear c-hand" @click.stop="hideScratchpad" />
+            </div>
+            <div class="modal-body p-0 workspace-query-results">
+               <div
+                  ref="noteFilters"
+                  class="d-flex p-vcentered p-2"
+                  style="gap: 0 10px"
+               >
+                  <div style="flex: 1;">
+                     <BaseSelect
+                        v-model="localConnection"
+                        class="form-select"
+                        :options="connectionOptions"
+                        option-track-by="code"
+                        option-label="name"
+                        @change="null"
+                     />
+                  </div>
+                  <div class="btn-group btn-group-block text-uppercase">
+                     <div
+                        v-for="tag in [{ code: 'all', name: t('general.all') }, ...noteTags]"
+                        :key="tag.code"
+                        class="btn"
+                        :class="[selectedTag === tag.code ? 'btn-primary': 'btn-dark']"
+                        @click="setTag(tag.code)"
+                     >
+                        {{ tag.name }}
+                     </div>
+                  </div>
+                  <div class="">
+                     <div
+                        class="btn px-1 tooltip tooltip-left s-rounded archived-button"
+                        :class="[showArchived ? 'btn-primary' : 'btn-link']"
+                        :data-tooltip="showArchived ? t('application.hideArchivedNotes') : t('application.showArchivedNotes')"
+                        @click="showArchived = !showArchived"
+                     >
+                        <BaseIcon
+                           :icon-name="!showArchived ? 'mdiArchiveEyeOutline' : 'mdiArchiveCancelOutline'"
+                           class=""
+                           :size="24"
+                        />
+                     </div>
+                  </div>
+               </div>
+               <div>
+                  <div
+                     v-show="filteredNotes.length || searchTerm.length"
+                     ref="searchForm"
+                     class="form-group has-icon-right m-0 p-2"
+                  >
+                     <input
+                        v-model="searchTerm"
+                        class="form-input"
+                        type="text"
+                        :placeholder="t('general.search')"
+                     >
+                     <BaseIcon
+                        v-if="!searchTerm"
+                        icon-name="mdiMagnify"
+                        class="form-icon pr-2"
+                        :size="18"
+                     />
+                     <BaseIcon
+                        v-else
+                        icon-name="mdiBackspace"
+                        class="form-icon c-hand pr-2"
+                        :size="18"
+                        @click="searchTerm = ''"
+                     />
+                  </div>
+               </div>
+
+               <div
+                  v-if="filteredNotes.length"
+                  ref="tableWrapper"
+                  class="vscroll px-2"
+                  :style="{'height': resultsSize+'px'}"
+               >
+                  <div ref="table">
+                     <BaseVirtualScroll
+                        ref="resultTable"
+                        :items="filteredNotes"
+                        :item-height="83"
+                        :visible-height="resultsSize"
+                        :scroll-element="scrollElement"
+                     >
+                        <template #default="{ items }">
+                           <ScratchpadNote
+                              v-for="note in items"
+                              :key="note.uid"
+                              :search-term="searchTerm"
+                              :note="note"
+                              :selected-note="selectedNote"
+                              @select-note="selectedNote = note.uid"
+                              @toggle-note="toggleNote"
+                              @edit-note="startEditNote(note)"
+                              @delete-note="deleteNote"
+                              @archive-note="archiveNote"
+                              @restore-note="restoreNote"
+                              @select-query="selectQuery"
+                           />
+                        </template>
+                     </BaseVirtualScroll>
+                  </div>
+               </div>
+               <div v-else class="empty">
+                  <div class="empty-icon">
+                     <BaseIcon icon-name="mdiNoteSearch" :size="48" />
+                  </div>
+                  <p class="empty-title h5">
+                     {{ t('application.thereAreNoNotesYet') }}
+                  </p>
+               </div>
+               <div
+                  class="btn btn-primary p-0 add-button tooltip tooltip-left"
+                  :data-tooltip="t('application.addNote')"
+                  @click="isAddModal = true"
+               >
+                  <BaseIcon
+                     icon-name="mdiPlus"
+                     :size="48"
+                  />
+               </div>
             </div>
-            <small class="text-gray">{{ t('application.markdownSupported') }}</small>
          </div>
-      </template>
-   </ConfirmModal>
+      </div>
+   </Teleport>
+   <ModalNoteNew v-if="isAddModal" @hide="isAddModal = false" />
+   <ModalNoteEdit
+      v-if="isEditModal"
+      :note="noteToEdit"
+      @hide="closeEditModal"
+   />
 </template>
 
 <script setup lang="ts">
 import { storeToRefs } from 'pinia';
-import { Ref, ref, watch } from 'vue';
+import {
+   Component,
+   computed,
+   ComputedRef,
+   onBeforeUnmount,
+   onMounted,
+   onUpdated,
+   provide,
+   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 BaseSelect from '@/components/BaseSelect.vue';
+import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
+import ModalNoteEdit from '@/components/ModalNoteEdit.vue';
+import ModalNoteNew from '@/components/ModalNoteNew.vue';
+import ScratchpadNote from '@/components/ScratchpadNote.vue';
 import { useApplicationStore } from '@/stores/application';
-import { useScratchpadStore } from '@/stores/scratchpad';
+import { useConnectionsStore } from '@/stores/connections';
+import { ConnectionNote, TagCode, useScratchpadStore } from '@/stores/scratchpad';
+import { useWorkspacesStore } from '@/stores/workspaces';
 
 const { t } = useI18n();
 
 const applicationStore = useApplicationStore();
 const scratchpadStore = useScratchpadStore();
+const workspacesStore = useWorkspacesStore();
 
-const { notes } = storeToRefs(scratchpadStore);
+const { connectionNotes, selectedTag } = storeToRefs(scratchpadStore);
 const { changeNotes } = scratchpadStore;
 const { hideScratchpad } = applicationStore;
+const { getConnectionName } = useConnectionsStore();
+const { connections } = storeToRefs(useConnectionsStore());
+const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
+const { getWorkspaceTab, getWorkspace, newTab, updateTabContent } = workspacesStore;
 
-const localNotes = ref(notes.value);
-const debounceTimeout: Ref<NodeJS.Timeout> = ref(null);
+const localConnection = ref(null);
+const table: Ref<HTMLDivElement> = ref(null);
+const resultTable: Ref<Component & { updateWindow: () => void }> = ref(null);
+const tableWrapper: Ref<HTMLDivElement> = ref(null);
+const noteFilters: Ref<HTMLInputElement> = ref(null);
+const searchForm: Ref<HTMLInputElement> = ref(null);
+const resultsSize = ref(1000);
+const searchTermInterval: Ref<NodeJS.Timeout> = ref(null);
+const scrollElement: Ref<HTMLDivElement> = ref(null);
+const searchTerm = ref('');
+const localSearchTerm = ref('');
+const showArchived = ref(false);
+const isAddModal = ref(false);
+const isEditModal = ref(false);
+const noteToEdit: Ref<ConnectionNote> = ref(null);
+const selectedNote = ref(null);
 
-watch(localNotes, () => {
-   clearTimeout(debounceTimeout.value);
+const noteTags: ComputedRef<{code: TagCode; name: string}[]> = computed(() => [
+   { code: 'note', name: t('application.note') },
+   { code: 'todo', name: 'TODO' },
+   { code: 'query', name: 'Query' }
+]);
+const filteredNotes = computed(() => connectionNotes.value.filter(n => (
+   (n.type === selectedTag.value || selectedTag.value === 'all') &&
+   (n.cUid === localConnection.value || localConnection.value === null) &&
+   (!n.isArchived || showArchived.value) &&
+   (n.note.toLowerCase().search(localSearchTerm.value.toLowerCase()) >= 0)
+)));
+const connectionOptions = computed(() => {
+   return [
+      { code: null, name: t('general.all') },
+      ...connections.value.map(c => ({ code: c.uid, name: getConnectionName(c.uid) }))
+   ];
+});
 
-   debounceTimeout.value = setTimeout(() => {
-      changeNotes(localNotes.value);
+provide('noteTags', noteTags);
+provide('connectionOptions', connectionOptions);
+provide('selectedConnection', localConnection);
+provide('selectedTag', selectedTag);
+
+const resizeResults = () => {
+   if (resultTable.value) {
+      const el = tableWrapper.value.parentElement;
+
+      if (el)
+         resultsSize.value = el.offsetHeight - searchForm.value.offsetHeight - noteFilters.value.offsetHeight;
+
+      resultTable.value.updateWindow();
+   }
+};
+
+const refreshScroller = () => resizeResults();
+
+const setTag = (tag: string) => {
+   selectedTag.value = tag;
+};
+
+const toggleNote = (uid: string) => {
+   selectedNote.value = selectedNote.value !== uid ? uid : null;
+};
+
+const startEditNote = (note: ConnectionNote) => {
+   isEditModal.value = true;
+   noteToEdit.value = note;
+};
+
+const archiveNote = (uid: string) => {
+   const remappedNotes = connectionNotes.value.map(n => {
+      if (n.uid === uid)
+         n.isArchived = true;
+      return n;
+   });
+   changeNotes(remappedNotes);
+};
+
+const restoreNote = (uid: string) => {
+   const remappedNotes = connectionNotes.value.map(n => {
+      if (n.uid === uid)
+         n.isArchived = false;
+      return n;
+   });
+   changeNotes(remappedNotes);
+};
+
+const deleteNote = (uid: string) => {
+   const otherNotes = connectionNotes.value.filter(n => n.uid !== uid);
+   changeNotes(otherNotes);
+};
+
+const selectQuery = (query: string) => {
+   const workspace = getWorkspace(selectedWorkspace.value);
+   const selectedTab = getWorkspaceTab(workspace.selectedTab);
+
+   if (workspace.connectionStatus !== 'connected') return;
+
+   if (selectedTab.type === 'query') {
+      updateTabContent({
+         tab: selectedTab.uid,
+         uid: selectedWorkspace.value,
+         type: 'query',
+         content: query,
+         schema: workspace.breadcrumbs.schema
+      });
+   }
+   else {
+      newTab({
+         uid: selectedWorkspace.value,
+         type: 'query',
+         content: query,
+         autorun: false,
+         schema: workspace.breadcrumbs.schema
+      });
+   }
+
+   hideScratchpad();
+};
+
+const closeEditModal = () => {
+   isEditModal.value = false;
+   noteToEdit.value = null;
+};
+
+watch(searchTerm, () => {
+   clearTimeout(searchTermInterval.value);
+
+   searchTermInterval.value = setTimeout(() => {
+      localSearchTerm.value = searchTerm.value;
    }, 200);
 });
 
+onUpdated(() => {
+   if (table.value)
+      refreshScroller();
+
+   if (tableWrapper.value)
+      scrollElement.value = tableWrapper.value;
+});
+
+onMounted(() => {
+   resizeResults();
+   window.addEventListener('resize', resizeResults);
+
+   if (selectedWorkspace.value && selectedWorkspace.value !== 'NEW')
+      localConnection.value = selectedWorkspace.value;
+});
+
+onBeforeUnmount(() => {
+   window.removeEventListener('resize', resizeResults);
+   clearInterval(searchTermInterval.value);
+});
+
 </script>
+
+<style lang="scss" scoped>
+.vscroll {
+  height: 1000px;
+  overflow: auto;
+  overflow-anchor: none;
+}
+
+.add-button{
+   border: none;
+   height: 48px;
+   width: 48px;
+   border-radius: 50%;
+   position: fixed;
+   margin-top: -40px;
+   margin-left: 580px;
+   z-index: 9;
+}
+.archived-button {
+   border-radius: 50%;
+   width: 36px;
+   height: 36px;
+}
+</style>

src/renderer/components/TheSettingBar.vue

@@ -59,17 +59,16 @@
       <div class="settingbar-bottom-elements">
          <ul class="settingbar-elements">
             <li
-               v-if="!disableScratchpad"
                v-tooltip="{
                   strategy: 'fixed',
                   placement: 'right',
-                  content: t('application.scratchpad')
+                  content: t('application.note', 2)
                }"
                class="settingbar-element btn btn-link"
-               @click="showScratchpad"
+               @click="showScratchpad()"
             >
                <BaseIcon
-                  icon-name="mdiNotebookEditOutline"
+                  icon-name="mdiNotebookOutline"
                   class="settingbar-element-icon text-light"
                   :size="24"
                />
@@ -84,12 +83,15 @@
                @click="showSettingModal('general')"
             >
                <div class="settingbar-element-icon-wrapper">
-                  <BaseIcon
-                     icon-name="mdiCog"
+                  <div
                      class="settingbar-element-icon text-light"
                      :class="{ 'badge badge-update': hasUpdates }"
-                     :size="24"
-                  />
+                  >
+                     <BaseIcon
+                        icon-name="mdiCog"
+                        :size="24"
+                     />
+                  </div>
                </div>
             </li>
          </ul>
@@ -108,7 +110,6 @@ 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();
@@ -117,12 +118,10 @@ localStorage.setItem('opened-folders', '[]');
 const applicationStore = useApplicationStore();
 const connectionsStore = useConnectionsStore();
 const workspacesStore = useWorkspacesStore();
-const settingsStore = useSettingsStore();
 
 const { updateStatus } = storeToRefs(applicationStore);
 const { getSelected: selectedWorkspace } = storeToRefs(workspacesStore);
 const { connectionsOrder } = storeToRefs(connectionsStore);
-const { disableScratchpad } = storeToRefs(settingsStore);
 
 const { showSettingModal, showScratchpad } = applicationStore;
 const { updateConnectionsOrder, initConnectionsOrder } = connectionsStore;
@@ -266,7 +265,7 @@ if (!connectionsArr.value.length)
             .settingbar-element-icon {
                &.badge::after {
                   top: 10px;
-                  right: -6px;
+                  right: -3px;
                   position: absolute;
                }
 

src/renderer/components/TheTitleBar.vue

@@ -21,7 +21,7 @@
             class="titlebar-element"
             @click="openDevTools"
          >
-            <BaseIcon icon-name="mdiCodeTags" :size="24" />
+            <BaseIcon icon-name="mdiBugPlayOutline" :size="24" />
          </div>
          <div
             v-if="isDevelopment"

src/renderer/components/WorkspaceExploreBarMiscContext.vue

@@ -55,6 +55,14 @@
             /> {{ t('general.disable') }}
          </span>
       </div>
+      <div class="context-element" @click="copyName(selectedMisc.name)">
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiContentCopy"
+               :size="18"
+            /> {{ t('general.copyName') }}</span>
+      </div>
       <div class="context-element" @click="showDeleteModal">
          <span class="d-flex">
             <BaseIcon
@@ -108,6 +116,7 @@ import Functions from '@/ipc-api/Functions';
 import Routines from '@/ipc-api/Routines';
 import Schedulers from '@/ipc-api/Schedulers';
 import Triggers from '@/ipc-api/Triggers';
+import { copyText } from '@/libs/copyText';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useWorkspacesStore } from '@/stores/workspaces';
 
@@ -163,6 +172,11 @@ const deleteMessage = computed(() => {
    }
 });
 
+const copyName = (name: string) => {
+   copyText(name);
+   closeContext();
+};
+
 const showDeleteModal = () => {
    isDeleteModal.value = true;
 };

src/renderer/components/WorkspaceExploreBarSchemaContext.vue

@@ -102,6 +102,14 @@
             </div>
          </div>
       </div>
+      <div class="context-element" @click="copyName(selectedSchema)">
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiContentCopy"
+               :size="18"
+            /> {{ t('general.copyName') }}</span>
+      </div>
       <div
          v-if="workspace.customizations.schemaExport"
          class="context-element"
@@ -198,6 +206,7 @@ import ModalEditSchema from '@/components/ModalEditSchema.vue';
 import ModalImportSchema from '@/components/ModalImportSchema.vue';
 import Application from '@/ipc-api/Application';
 import Schema from '@/ipc-api/Schema';
+import { copyText } from '@/libs/copyText';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useSchemaExportStore } from '@/stores/schemaExport';
 import { useWorkspacesStore } from '@/stores/workspaces';
@@ -268,6 +277,11 @@ const openCreateSchedulerTab = () => {
    emit('open-create-scheduler-tab');
 };
 
+const copyName = (name: string) => {
+   copyText(name);
+   closeContext();
+};
+
 const showDeleteModal = () => {
    isDeleteModal.value = true;
 };

src/renderer/components/WorkspaceExploreBarTableContext.vue

@@ -15,6 +15,14 @@
                :size="18"
             /> {{ t('application.settings') }}</span>
       </div>
+      <div class="context-element" @click="copyName(selectedTable.name)">
+         <span class="d-flex">
+            <BaseIcon
+               class="text-light mt-1 mr-1"
+               icon-name="mdiContentCopy"
+               :size="18"
+            /> {{ t('general.copyName') }}</span>
+      </div>
       <div
          v-if="selectedTable && selectedTable.type === 'table' && customizations.schemaExport"
          class="context-element"
@@ -130,6 +138,7 @@ import ConfirmModal from '@/components/BaseConfirmModal.vue';
 import BaseContextMenu from '@/components/BaseContextMenu.vue';
 import BaseIcon from '@/components/BaseIcon.vue';
 import Tables from '@/ipc-api/Tables';
+import { copyText } from '@/libs/copyText';
 import { useNotificationsStore } from '@/stores/notifications';
 import { useSchemaExportStore } from '@/stores/schemaExport';
 import { useWorkspacesStore } from '@/stores/workspaces';
@@ -170,6 +179,11 @@ const showTableExportModal = () => {
    closeContext();
 };
 
+const copyName = (name: string) => {
+   copyText(name);
+   closeContext();
+};
+
 const showDeleteModal = () => {
    isDeleteModal.value = true;
 };

src/renderer/components/WorkspaceQueryConsole.vue

@@ -24,7 +24,7 @@
                tabindex="0"
                @contextmenu.prevent="contextMenu($event, wLog)"
             >
-               <span class="type-datetime">{{ moment(wLog.date).format('HH:mm:ss') }}</span>: <code class="query-console-log-sql">{{ wLog.sql }}</code>
+               <span class="type-datetime">{{ moment(wLog.date).format('HH:mm:ss') }}</span>: <code class="query-console-log-sql" v-html="highlight(wLog.sql, {html: true})" />
             </div>
          </div>
       </div>
@@ -47,11 +47,13 @@
 <script setup lang="ts">
 import * as moment from 'moment';
 import { storeToRefs } from 'pinia';
+import { highlight } from 'sql-highlight';
 import { computed, nextTick, onMounted, Ref, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import BaseContextMenu from '@/components/BaseContextMenu.vue';
 import BaseIcon from '@/components/BaseIcon.vue';
+import { copyText } from '@/libs/copyText';
 import { useConsoleStore } from '@/stores/console';
 
 const { t } = useI18n();
@@ -100,7 +102,7 @@ const contextMenu = (event: MouseEvent, wLog: {date: Date; sql: string}) => {
 };
 
 const copyQuery = () => {
-   navigator.clipboard.writeText(contextQuery.value);
+   copyText(contextQuery.value);
    isContext.value = false;
 };
 

src/renderer/components/WorkspaceTabQuery.vue

@@ -89,27 +89,37 @@
                <button
                   class="btn btn-dark btn-sm"
                   :disabled="!query || isQuering"
+                  :title="t('general.format')"
                   @click="beautify()"
                >
-                  <BaseIcon
-                     class="mr-1"
-                     icon-name="mdiBrush"
-                     :size="24"
-                  />
-                  <span>{{ t('general.format') }}</span>
+                  <BaseIcon icon-name="mdiBrush" :size="24" />
                </button>
                <button
                   class="btn btn-dark btn-sm"
                   :disabled="isQuering"
+                  :title="t('general.history')"
                   @click="openHistoryModal()"
                >
-                  <BaseIcon
-                     class="mr-1"
-                     icon-name="mdiHistory"
-                     :size="24"
-                  />
-                  <span>{{ t('general.history') }}</span>
+                  <BaseIcon icon-name="mdiHistory" :size="24" />
                </button>
+               <div class="btn-group">
+                  <button
+                     class="btn btn-dark btn-sm mr-0"
+                     :disabled="isQuering || (isQuerySaved || query.length < 5)"
+                     :title="t('general.save')"
+                     @click="saveQuery()"
+                  >
+                     <BaseIcon icon-name="mdiContentSaveOutline" :size="24" />
+                  </button>
+                  <button
+                     class="btn btn-dark btn-sm"
+                     :disabled="isQuering"
+                     :title="t('database.savedQueries')"
+                     @click="openSavedModal()"
+                  >
+                     <BaseIcon icon-name="mdiStarOutline" :size="24" />
+                  </button>
+               </div>
                <div class="dropdown table-dropdown pr-2">
                   <button
                      :disabled="!hasResults || isQuering"
@@ -237,6 +247,7 @@
 <script setup lang="ts">
 import { Ace } from 'ace-builds';
 import { ConnectionParams } from 'common/interfaces/antares';
+import { uidGen } from 'common/libs/uidGen';
 import { ipcRenderer } from 'electron';
 import { storeToRefs } from 'pinia';
 import { format } from 'sql-formatter';
@@ -252,9 +263,11 @@ import WorkspaceTabQueryEmptyState from '@/components/WorkspaceTabQueryEmptyStat
 import WorkspaceTabQueryTable from '@/components/WorkspaceTabQueryTable.vue';
 import { useResultTables } from '@/composables/useResultTables';
 import Schema from '@/ipc-api/Schema';
+import { useApplicationStore } from '@/stores/application';
 import { useConsoleStore } from '@/stores/console';
 import { useHistoryStore } from '@/stores/history';
 import { useNotificationsStore } from '@/stores/notifications';
+import { useScratchpadStore } from '@/stores/scratchpad';
 import { useSettingsStore } from '@/stores/settings';
 import { useWorkspacesStore } from '@/stores/workspaces';
 
@@ -279,6 +292,8 @@ const {
 const { saveHistory } = useHistoryStore();
 const { addNotification } = useNotificationsStore();
 const workspacesStore = useWorkspacesStore();
+const { showScratchpad } = useApplicationStore();
+const { addNote } = useScratchpadStore();
 
 const { consoleHeight } = storeToRefs(useConsoleStore());
 const { executeSelected } = storeToRefs(useSettingsStore());
@@ -304,6 +319,7 @@ const resultsCount = ref(0);
 const durationsCount = ref(0);
 const affectedCount = ref(null);
 const editorHeight = ref(200);
+const isQuerySaved = ref(false);
 const isHistoryOpen = ref(false);
 const debounceTimeout = ref(null);
 
@@ -329,6 +345,8 @@ watch(query, (val) => {
          schema: selectedSchema.value,
          content: val
       });
+
+      isQuerySaved.value = false;
    }, 200);
 });
 
@@ -351,6 +369,14 @@ watch(databaseSchemas, () => {
       selectedSchema.value = null;
 }, { deep: true });
 
+watch(() => props.tab.content, () => {
+   query.value = props.tab.content;
+   const editorValue = queryEditor.value.editor.session.getValue();
+
+   if (editorValue !== query.value)// If change not rendered in editor
+      queryEditor.value.editor.session.setValue(query.value);
+});
+
 const runQuery = async (query: string) => {
    if (!query || isQuering.value) return;
    isQuering.value = true;
@@ -496,6 +522,22 @@ const openHistoryModal = () => {
    isHistoryOpen.value = true;
 };
 
+const saveQuery = () => {
+   addNote({
+      uid: uidGen('N'),
+      cUid: workspace.value.uid,
+      type: 'query',
+      date: new Date(),
+      note: query.value,
+      isArchived: false
+   });
+   isQuerySaved.value = true;
+};
+
+const openSavedModal = () => {
+   showScratchpad('query');
+};
+
 const selectQuery = (sql: string) => {
    if (queryEditor.value)
       queryEditor.value.editor.session.setValue(sql);

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -270,6 +270,7 @@ import BaseSelect from '@/components/BaseSelect.vue';
 import BaseVirtualScroll from '@/components/BaseVirtualScroll.vue';
 import TableContext from '@/components/WorkspaceTabQueryTableContext.vue';
 import WorkspaceTabQueryTableRow from '@/components/WorkspaceTabQueryTableRow.vue';
+import { copyText } from '@/libs/copyText';
 import { unproxify } from '@/libs/unproxify';
 import { useConsoleStore } from '@/stores/console';
 import { useSettingsStore } from '@/stores/settings';
@@ -571,7 +572,7 @@ const copyCell = () => {
    let valueToCopy = row[cellName];
    if (typeof valueToCopy === 'object')
       valueToCopy = JSON.stringify(valueToCopy);
-   navigator.clipboard.writeText(valueToCopy);
+   copyText(valueToCopy);
 };
 
 const copyRow = (format: string) => {
@@ -593,7 +594,7 @@ const copyRow = (format: string) => {
    }
 
    if (format === 'json')
-      navigator.clipboard.writeText(JSON.stringify(contentToCopy));
+      copyText(JSON.stringify(contentToCopy));
    else if (format === 'sql') {
       if (!Array.isArray(contentToCopy)) contentToCopy = [contentToCopy];
 
@@ -605,7 +606,7 @@ const copyRow = (format: string) => {
          },
          table: getTable(resultsetIndex.value)
       });
-      navigator.clipboard.writeText(sqlInserts);
+      copyText(sqlInserts);
    }
    else if (format === 'csv') {
       const csv = [];
@@ -617,7 +618,7 @@ const copyRow = (format: string) => {
       for (const row of contentToCopy)
          csv.push(Object.values(row).map(col => typeof col === 'string' ? `"${col}"` : col).join(';'));
 
-      navigator.clipboard.writeText(csv.join('\n'));
+      copyText(csv.join('\n'));
    }
    else if (format === 'html') {
       const arrayContent = new Array<string[]>();
@@ -640,7 +641,7 @@ const copyRow = (format: string) => {
       if (!Array.isArray(contentToCopy)) contentToCopy = [contentToCopy];
       const printer = json2php.make({ linebreak: '\n', indent: '\t', shortArraySyntax: true });
       const phpString = printer(contentToCopy);
-      navigator.clipboard.writeText(phpString);
+      copyText(phpString);
    }
 };
 
@@ -878,7 +879,7 @@ const onKey = async (e: KeyboardEvent) => {
       const copyType = defaultCopyType.value;
       if (selectedRows.value.length >= 1) {
          if (selectedRows.value.length === 1 && copyType === 'cell')
-            await navigator.clipboard.writeText(scrollElement.value.querySelector('.td.selected').innerText);
+            await copyText(scrollElement.value.querySelector('.td.selected').innerText);
          else if (selectedRows.value.length > 1 && copyType === 'cell')
             copyRow('html');
          else

src/renderer/i18n/en-US.ts

@@ -1,3 +1,12 @@
+/**
+ * [TRANSLATION UPDATE HELPER]
+ * - Open a terminal in antares folder and run `npm run translation:check short-code` replacing short-code with the one you are updating.
+ * - The command will output which terms are missing or not translated from english.
+ * - Open antares folder with your editor of choice.
+ * - Go to antares/src/renderer/i18n/ and open the locale file you want to translate.
+ * - Add and translate missing terms and consider whether to translate untranslated terms.
+ */
+
 export const enUS = {
    general: { // General purpose terms
       edit: 'Edit',
@@ -65,9 +74,15 @@ export const enUS = {
       actionSuccessful: '{action} successful',
       outputFormat: 'Output format',
       singleFile: 'Single {ext} file',
-      zipCompressedFile: 'ZIP compressed {ext} file'
+      zipCompressedFile: 'ZIP compressed {ext} file',
+      copyName: 'Copy name',
+      search: 'Search',
+      title: 'Title',
+      archive: 'Archive', // verb
+      undo: 'Undo'
    },
    connection: { // Database connection
+      connection: 'Connection',
       connectionName: 'Connection name',
       hostName: 'Host name',
       client: 'Client',
@@ -265,12 +280,11 @@ export const enUS = {
       targetTable: 'Target table',
       switchDatabase: 'Switch the database',
       searchForElements: 'Search for elements',
-      searchForSchemas: 'Search for schemas'
+      searchForSchemas: 'Search for schemas',
+      savedQueries: 'Saved queries'
    },
    application: { // Application related terms
       settings: 'Settings',
-      scratchpad: 'Scratchpad',
-      disableScratchpad: 'Disable scratchpad',
       console: 'Console',
       general: 'General',
       themes: 'Themes',
@@ -341,7 +355,6 @@ export const enUS = {
       saveContent: 'Save content',
       openAllConnections: 'Open all connections',
       openSettings: 'Open settings',
-      openScratchpad: 'Open scratchpad',
       runOrReload: 'Run or reload',
       openFilter: 'Open filter',
       nextResultsPage: 'Next results page',
@@ -375,7 +388,14 @@ export const enUS = {
       ignoreDuplicates: 'Ignore duplicates',
       wrongImportPassword: 'Wrong import password',
       wrongFileFormat: 'Wrong file format',
-      dataImportSuccess: 'Data successfully imported'
+      dataImportSuccess: 'Data successfully imported',
+      note: 'Note | Notes',
+      thereAreNoNotesYet: 'There are no notes yet',
+      addNote: 'Add note',
+      editNote: 'Edit note',
+      showArchivedNotes: 'Show archived notes',
+      hideArchivedNotes: 'Hide archived notes',
+      tag: 'Tag' // Note tag
    },
    faker: { // Faker.js methods, used in random generated content
       address: 'Address',

src/renderer/libs/copyText.ts

@@ -0,0 +1,7 @@
+/**
+ * Copy a string on clipboard
+ * @param text
+ */
+export const copyText = (text: string) => {
+   navigator.clipboard.writeText(text);
+};

src/renderer/scss/main.scss

@@ -1,4 +1,4 @@
-/* stylelint-disable selector-class-pattern */
+/* stylelint-disable */
 @import "~spectre.css/src/variables";
 @import "variables";
 @import "transitions";
@@ -109,7 +109,6 @@ option:checked {
 
       > div {
         padding: 0.1rem 0.2rem;
-        /* stylelint-disable-next-line value-no-vendor-prefix */
         min-width: -webkit-fill-available;
       }
     }
@@ -429,3 +428,32 @@ option:checked {
     }
   }
 }
+
+/* sql-highlight */
+code.sql {
+  font-family: monospace;
+}
+
+.sql-hl-keyword {
+  color: $primary-color;
+}
+
+.sql-hl-function {
+  color: darkorchid;
+}
+
+.sql-hl-number {
+  color: $number-color;
+}
+
+.sql-hl-string {
+  color: $string-color;
+}
+
+.sql-hl-special {
+  color: goldenrod;
+}
+
+.sql-hl-bracket {
+  color: darkorchid;
+}

src/renderer/stores/application.ts

@@ -1,6 +1,8 @@
 import { Ace } from 'ace-builds';
 import * as Store from 'electron-store';
-import { defineStore } from 'pinia';
+import { defineStore, storeToRefs } from 'pinia';
+
+import { useScratchpadStore } from './scratchpad';
 
 const persistentStore = new Store({ name: 'settings' });
 export type UpdateStatus = 'noupdate' | 'available' | 'checking' | 'nocheck' | 'downloading' | 'downloaded' | 'disabled' | 'link';
@@ -15,14 +17,12 @@ export const useApplicationStore = defineStore('application', {
       isSettingModal: false,
       isScratchpad: false,
       selectedSettingTab: 'general',
-      selectedConection: {},
       updateStatus: 'noupdate' as UpdateStatus,
       downloadProgress: 0,
       baseCompleter: [] as Ace.Completer[] // Needed to reset ace editor, due global-only ace completer
    }),
    getters: {
       getBaseCompleter: state => state.baseCompleter,
-      getSelectedConnection: state => state.selectedConection,
       getDownloadProgress: state => Number(state.downloadProgress.toFixed(1))
    },
    actions: {
@@ -53,8 +53,12 @@ export const useApplicationStore = defineStore('application', {
       hideSettingModal () {
          this.isSettingModal = false;
       },
-      showScratchpad () {
+      showScratchpad (tag?: string) {
          this.isScratchpad = true;
+         if (tag) {
+            const { selectedTag } = storeToRefs(useScratchpadStore());
+            selectedTag.value = tag;
+         }
       },
       hideScratchpad () {
          this.isScratchpad = false;

src/renderer/stores/scratchpad.ts

@@ -1,15 +1,64 @@
 import * as Store from 'electron-store';
 import { defineStore } from 'pinia';
+
+export type TagCode = 'all' | 'note' | 'todo' | 'query'
+
+export interface ConnectionNote {
+   uid: string;
+   cUid: string | null;
+   title?: string;
+   isArchived: boolean;
+   type: TagCode;
+   note: string;
+   date: Date;
+}
+
 const persistentStore = new Store({ name: 'notes' });
 
+// Migrate old scratchpad on new notes TODO: remove in future releases
+const oldNotes = persistentStore.get('notes') as string;
+if (oldNotes) {
+   const newNotes = persistentStore.get('connectionNotes', []) as ConnectionNote[];
+   newNotes.unshift({
+      uid: 'N:LEGACY',
+      cUid: null,
+      isArchived: false,
+      type: 'note',
+      note: oldNotes,
+      date: new Date()
+   });
+
+   persistentStore.delete('notes');
+
+   persistentStore.set('connectionNotes', newNotes);
+}
+
 export const useScratchpadStore = defineStore('scratchpad', {
    state: () => ({
-      notes: persistentStore.get('notes', '# HOW TO SUPPORT ANTARES\n\n- [ ] Leave a star to Antares [GitHub repo](https://github.com/antares-sql/antares)\n- [ ] Send feedbacks and advices\n- [ ] Report for bugs\n- [ ] If you enjoy, share Antares with friends\n\n# ABOUT SCRATCHPAD\n\nThis is a scratchpad where you can save your **personal notes**. It supports `markdown` format, but you are free to use plain text.\nThis content is just a placeholder, feel free to clear it to make space for your notes.\n') as string
+      selectedTag: 'all',
+      /** Connection specific notes */
+      connectionNotes: persistentStore.get('connectionNotes', []) as ConnectionNote[]
    }),
    actions: {
-      changeNotes (notes: string) {
-         this.notes = notes;
-         persistentStore.set('notes', this.notes);
+      changeNotes (notes: ConnectionNote[]) {
+         this.connectionNotes = notes;
+         persistentStore.set('connectionNotes', this.connectionNotes);
+      },
+      addNote (note: ConnectionNote) {
+         this.connectionNotes = [
+            note,
+            ...this.connectionNotes
+         ];
+         persistentStore.set('connectionNotes', this.connectionNotes);
+      },
+      editNote (note: ConnectionNote) {
+         this.connectionNotes = (this.connectionNotes as ConnectionNote[]).map(n => {
+            if (n.uid === note.uid)
+               n = note;
+
+            return n;
+         });
+         persistentStore.set('connectionNotes', this.connectionNotes);
       }
    }
 });

src/renderer/stores/settings.ts

@@ -30,7 +30,6 @@ export const useSettingsStore = defineStore('settings', {
       editorFontSize: settingsStore.get('editor_font_size', 'medium') as EditorFontSize,
       restoreTabs: settingsStore.get('restore_tabs', true) as boolean,
       disableBlur: settingsStore.get('disable_blur', false) as boolean,
-      disableScratchpad: settingsStore.get('disable_scratchpad', false) as boolean,
       shortcuts: shortcutsStore.get('shortcuts', []) as ShortcutRecord[],
       defaultCopyType: settingsStore.get('default_copy_type', 'cell') as string
    }),
@@ -93,10 +92,6 @@ export const useSettingsStore = defineStore('settings', {
          this.disableBlur = val;
          settingsStore.set('disable_blur', this.disableBlur);
       },
-      changeDisableScratchpad (val: boolean) {
-         this.disableScratchpad = val;
-         settingsStore.set('disable_scratchpad', this.disableScratchpad);
-      },
       updateShortcuts (shortcuts: ShortcutRecord[]) {
          this.shortcuts = shortcuts;
       },

src/renderer/stores/workspaces.ts

@@ -66,8 +66,8 @@ export interface Workspace {
    uid: string;
    client?: ClientCode;
    database?: string;
-   connectionStatus: string;
-   selectedTab: string | number;
+   connectionStatus: 'connected' | 'disconnected' | 'failed';
+   selectedTab: string;
    searchTerm: string;
    tabs: WorkspaceTab[];
    structure: WorkspaceStructure[];
@@ -119,12 +119,12 @@ export const useWorkspacesStore = defineStore('workspaces', {
          return state.workspaces.find(workspace => workspace.uid === uid).variables.find(variable => variable.name === name);
       },
       getWorkspaceTab (state) {
-         return (tUid: string) => {
+         return (tUid: string): WorkspaceTab => {
             if (!this.getSelected) return;
             const workspace = state.workspaces.find(workspace => workspace.uid === this.getSelected);
             if ('tabs' in workspace)
                return workspace.tabs.find(tab => tab.uid === tUid);
-            return {};
+            return null;
          };
       },
       getConnected: state => {
@@ -410,7 +410,7 @@ export const useWorkspacesStore = defineStore('workspaces', {
          const workspace: Workspace = {
             uid,
             connectionStatus: 'disconnected',
-            selectedTab: 0,
+            selectedTab: '0',
             searchTerm: '',
             tabs: [],
             structure: [],
@@ -629,18 +629,43 @@ export const useWorkspacesStore = defineStore('workspaces', {
                   : false;
 
                if (existentTab) {
-                  this._replaceTab({ uid, tab: existentTab.uid, type, database: workspaceTabs.database, schema, elementName, elementType });
+                  this._replaceTab({ uid,
+                     tab: existentTab.uid,
+                     type,
+                     database: workspaceTabs.database,
+                     schema,
+                     elementName,
+                     elementType
+                  });
                   tabUid = existentTab.uid;
                }
                else {
                   tabUid = uidGen('T');
-                  this._addTab({ uid, tab: tabUid, content, type, autorun, database: workspaceTabs.database, schema, elementName, elementType });
+                  this._addTab({ uid,
+                     tab: tabUid,
+                     content,
+                     type,
+                     autorun,
+                     database: workspaceTabs.database,
+                     schema,
+                     elementName,
+                     elementType
+                  });
                }
             }
                break;
             default:
                tabUid = uidGen('T');
-               this._addTab({ uid, tab: tabUid, content, type, autorun, database: workspaceTabs.database, schema, elementName, elementType });
+               this._addTab({ uid,
+                  tab: tabUid,
+                  content,
+                  type,
+                  autorun,
+                  database: workspaceTabs.database,
+                  schema,
+                  elementName,
+                  elementType
+               });
                break;
          }
 
@@ -655,7 +680,8 @@ export const useWorkspacesStore = defineStore('workspaces', {
          if (!isSelectedExistent && workspace.tabs.length) {
             if (workspace.customizations.database) {
                const databaseTabs = workspace.tabs.filter(tab => tab.type === 'query' || tab.database === workspace.database);
-               this.selectTab({ uid, tab: databaseTabs[databaseTabs.length - 1].uid });
+               if (databaseTabs.length)
+                  this.selectTab({ uid, tab: databaseTabs[databaseTabs.length - 1].uid });
             }
             else
                this.selectTab({ uid, tab: workspace.tabs[workspace.tabs.length - 1].uid });

webpack.main.config.js

@@ -19,7 +19,15 @@ module.exports = { // Main
    output: {
       libraryTarget: 'commonjs2',
       path: path.join(__dirname, 'dist'),
-      filename: '[name].js'
+      filename: '[name].js',
+      assetModuleFilename: (pathData) => {
+         const { filename } = pathData;
+
+         if (filename.endsWith('.ts'))
+            return '[name].js';
+         else
+            return '[name][ext]';
+      }
    },
    node: {
       global: true,
@@ -43,7 +51,8 @@ module.exports = { // Main
       new ProgressPlugin(true),
       new webpack.DefinePlugin({
          'process.env': {
-            PACKAGE_VERSION: `"${version}"`
+            PACKAGE_VERSION: `"${version}"`,
+            DISTRIBUTION: `"${process.env.DISTRIBUTION || 'none'}"`
          }
       })
    ],

webpack.workers.config.js

@@ -62,7 +62,8 @@ const config = {
       new ProgressPlugin(true),
       new webpack.DefinePlugin({
          'process.env': {
-            PACKAGE_VERSION: `"${version}"`
+            PACKAGE_VERSION: `"${version}"`,
+            DISTRIBUTION: `"${process.env.DISTRIBUTION || 'none'}"`
          }
       })
    ]