chore(release): 0.5.16

CHANGELOG.md

@@ -2,6 +2,18 @@
 
 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.5.16](https://github.com/antares-sql/antares/compare/v0.5.15...v0.5.16) (2022-08-26)
+
+
+### Bug Fixes
+
+* CTRL+Right/Left not working on text editor, closes [#427](https://github.com/antares-sql/antares/issues/427) ([ffc645b](https://github.com/antares-sql/antares/commit/ffc645ba5efb1c52670096e4f8c7f992b7335dae))
+* issue updating datetime cells with null value, closes [#423](https://github.com/antares-sql/antares/issues/423) ([ebc325a](https://github.com/antares-sql/antares/commit/ebc325ae0c656dca2eb8f7544ab271beaee9b47e))
+* ts exceptions ([df68114](https://github.com/antares-sql/antares/commit/df681147aaf0bfca69f3ffdc474cc1846541b1d8))
+* **UI:** editor themes group not visible in select element ([9dc700e](https://github.com/antares-sql/antares/commit/9dc700e13ea65bb8c6feac4ff4ffeadd32053614))
+* **UI:** wrong position of fields resizable area ([c90ab0e](https://github.com/antares-sql/antares/commit/c90ab0e8807ff30a9ab58e9aa3515cf427dd6e86))
+* unable to set null or delete rows without primary key ([39326eb](https://github.com/antares-sql/antares/commit/39326eb52e038728b5419d4a8de8024c7ead3002))
+
 ### [0.5.15](https://github.com/antares-sql/antares/compare/v0.5.14...v0.5.15) (2022-08-17)
 
 

README.md

@@ -34,6 +34,7 @@ We are actively working on it, hoping to provide new cool features, improvements
 - SSH tunnel support.
 - Manual commit mode.
 - Import and export database dumps.
+- Customizable keyboard shortcuts.
 - Dark and light theme.
 - Editor themes.
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "antares",
-  "version": "0.5.15",
+  "version": "0.5.16",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "antares",
-      "version": "0.5.15",
+      "version": "0.5.16",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "antares",
   "productName": "Antares",
-  "version": "0.5.15",
+  "version": "0.5.16",
   "description": "A modern, fast and productivity driven SQL client with a focus in UX.",
   "license": "MIT",
   "repository": "https://github.com/antares-sql/antares.git",

scripts/devtoolsInstaller.js

@@ -1,4 +1,5 @@
-// @ts-check
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 const fs = require('fs');
 const path = require('path');
 const https = require('https');

src/main/ipc-handlers/application.ts

@@ -1,4 +1,4 @@
-import { app, ipcMain, dialog, BrowserWindow } from 'electron';
+import { app, ipcMain, dialog } from 'electron';
 import { ShortcutRegister } from '../libs/ShortcutRegister';
 
 export default () => {
@@ -15,26 +15,22 @@ export default () => {
    });
 
    ipcMain.handle('resotre-default-shortcuts', () => {
-      const mainWindow = BrowserWindow.getAllWindows()[0];
-      const shortCutRegister = ShortcutRegister.getInstance({ mainWindow });
+      const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.restoreDefaults();
    });
 
    ipcMain.handle('reload-shortcuts', () => {
-      const mainWindow = BrowserWindow.getAllWindows()[0];
-      const shortCutRegister = ShortcutRegister.getInstance({ mainWindow });
+      const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.reload();
    });
 
    ipcMain.handle('update-shortcuts', (event, shortcuts) => {
-      const mainWindow = BrowserWindow.getAllWindows()[0];
-      const shortCutRegister = ShortcutRegister.getInstance({ mainWindow });
+      const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.updateShortcuts(shortcuts);
    });
 
    ipcMain.handle('unregister-shortcuts', () => {
-      const mainWindow = BrowserWindow.getAllWindows()[0];
-      const shortCutRegister = ShortcutRegister.getInstance({ mainWindow });
+      const shortCutRegister = ShortcutRegister.getInstance();
       shortCutRegister.unregister();
    });
 };

src/main/ipc-handlers/tables.ts

@@ -177,7 +177,10 @@ export default (connections: {[key: string]: antares.Client}) => {
                if (typeof orgRow[key] === 'string')
                   orgRow[key] = `'${orgRow[key]}'`;
 
-               orgRow[key] = `= ${orgRow[key]}`;
+               if (orgRow[key] === null)
+                  orgRow[key] = `IS ${orgRow[key]}`;
+               else
+                  orgRow[key] = `= ${orgRow[key]}`;
             }
 
             await connections[params.uid]

src/main/libs/ShortcutRegister.ts

@@ -1,4 +1,4 @@
-import { BrowserWindow, globalShortcut } from 'electron';
+import { BrowserWindow, globalShortcut, Menu, MenuItem, MenuItemConstructorOptions } from 'electron';
 import * as Store from 'electron-store';
 import { ShortcutRecord, shortcuts } from 'common/shortcuts';
 
@@ -6,19 +6,34 @@ const shortcutsStore = new Store({ name: 'shortcuts' });
 const isDevelopment = process.env.NODE_ENV !== 'production';
 const defaultShortcuts = shortcuts.filter(s => s.os.includes(process.platform));
 
+export type ShortcutMode = 'local' | 'global'
+export type OsMenu = {
+   [key in NodeJS.Platform]?: MenuItemConstructorOptions[];
+};
+
 export class ShortcutRegister {
    private _shortcuts: ShortcutRecord[];
    private _mainWindow: BrowserWindow;
+   private _menu: Menu;
+   private _menuTemplate: OsMenu;
+   private _mode: ShortcutMode;
    private static _instance: ShortcutRegister;
 
-   private constructor (args: { mainWindow: BrowserWindow }) {
+   private constructor (args: { mainWindow: BrowserWindow; menuTemplate?: OsMenu; mode: ShortcutMode }) {
       this._mainWindow = args.mainWindow;
+      this._menuTemplate = args.menuTemplate || {};
+      this._mode = args.mode;
       this.shortcuts = shortcutsStore.get('shortcuts', defaultShortcuts) as ShortcutRecord[];
    }
 
-   public static getInstance (args: { mainWindow: BrowserWindow }) {
-      if (!ShortcutRegister._instance)
-         ShortcutRegister._instance = new ShortcutRegister(args);
+   public static getInstance (args?: { mainWindow?: BrowserWindow; menuTemplate?: OsMenu; mode?: ShortcutMode }) {
+      if (!ShortcutRegister._instance && args.menuTemplate !== undefined && args.mode !== undefined) {
+         ShortcutRegister._instance = new ShortcutRegister({
+            mainWindow: args.mainWindow,
+            menuTemplate: args.menuTemplate,
+            mode: args.mode
+         });
+      }
 
       return ShortcutRegister._instance;
    }
@@ -33,24 +48,73 @@ export class ShortcutRegister {
    }
 
    init () {
+      this._mainWindow.webContents.send('update-shortcuts', this.shortcuts);
+
+      this.buildBaseMenu();
+
+      if (this._mode === 'global')
+         this.setGlobalShortcuts();
+      else if (this._mode === 'local')
+         this.setLocalShortcuts();
+      else
+         throw new Error(`Unknown mode "${this._mode}"`);
+
+      Menu.setApplicationMenu(this._menu);
+   }
+
+   private buildBaseMenu () {
+      if (Object.keys(this._menuTemplate).includes(process.platform))
+         this._menu = Menu.buildFromTemplate(this._menuTemplate[process.platform]);
+      else
+         this._menu = new Menu();
+   }
+
+   private setLocalShortcuts () {
       for (const shortcut of this.shortcuts) {
          if (shortcut.os.includes(process.platform)) {
             for (const key of shortcut.keys) {
                try {
-                  globalShortcut.register(key, () => {
-                     this._mainWindow.webContents.send(shortcut.event);
-                     if (isDevelopment) console.log('EVENT:', shortcut);
-                  });
+                  this._menu.append(new MenuItem({
+                     label: 'Shortcuts',
+                     submenu: [{
+                        label: String(key),
+                        accelerator: key,
+                        visible: false,
+                        click: () => {
+                           this._mainWindow.webContents.send(shortcut.event);
+                           if (isDevelopment) console.log('LOCAL EVENT:', shortcut);
+                        }
+                     }]
+                  }));
                }
                catch (error) {
+                  if (isDevelopment) console.log(error);
                   this.restoreDefaults();
                   throw error;
                }
             }
          }
       }
+   }
 
-      this._mainWindow.webContents.send('update-shortcuts', this.shortcuts);
+   private setGlobalShortcuts () {
+      for (const shortcut of this.shortcuts) {
+         if (shortcut.os.includes(process.platform)) {
+            for (const key of shortcut.keys) {
+               try {
+                  globalShortcut.register(key, () => {
+                     this._mainWindow.webContents.send(shortcut.event);
+                     if (isDevelopment) console.log('GLOBAL EVENT:', shortcut);
+                  });
+               }
+               catch (error) {
+                  if (isDevelopment) console.log(error);
+                  this.restoreDefaults();
+                  throw error;
+               }
+            }
+         }
+      }
    }
 
    reload () {
@@ -69,6 +133,6 @@ export class ShortcutRegister {
    }
 
    unregister () {
-      globalShortcut.unregisterAll();
+      if (this._mode === 'global') globalShortcut.unregisterAll();
    }
 }

src/main/main.ts

@@ -1,16 +1,14 @@
-import { app, BrowserWindow, globalShortcut, nativeImage, Menu, ipcMain } from 'electron';
+import { app, BrowserWindow, nativeImage, ipcMain } from 'electron';
 import * as path from 'path';
 import * as Store from 'electron-store';
 import * as windowStateKeeper from 'electron-window-state';
 import * as remoteMain from '@electron/remote/main';
 
 import ipcHandlers from './ipc-handlers';
-import { ShortcutRegister } from './libs/ShortcutRegister';
+import { OsMenu, ShortcutRegister } from './libs/ShortcutRegister';
 
 Store.initRenderer();
 const settingsStore = new Store({ name: 'settings' });
-
-let shortCutRegister: ShortcutRegister;
 const appTheme = settingsStore.get('application_theme');
 const isDevelopment = process.env.NODE_ENV !== 'production';
 const isMacOS = process.platform === 'darwin';
@@ -122,32 +120,12 @@ else {
       mainWindow = await createMainWindow();
       createAppMenu();
 
-      shortCutRegister = ShortcutRegister.getInstance({ mainWindow });
-
       if (isWindows)
          mainWindow.show();
 
       if (isDevelopment)
          mainWindow.webContents.openDevTools();
 
-      app.on('browser-window-focus', () => {
-      // Send registered shortcut events to window
-         shortCutRegister.init();
-
-         if (isDevelopment) { // Dev shortcuts
-            globalShortcut.register('Shift+CommandOrControl+F5', () => {
-               mainWindow.reload();
-            });
-            globalShortcut.register('Shift+CommandOrControl+F12', () => {
-               mainWindow.webContents.openDevTools();
-            });
-         }
-      });
-
-      app.on('browser-window-blur', () => {
-         shortCutRegister.unregister();
-      });
-
       process.on('uncaughtException', error => {
          mainWindow.webContents.send('unhandled-exception', error);
       });
@@ -167,10 +145,8 @@ else {
 }
 
 function createAppMenu () {
-   let menu: Electron.Menu = null;
-
-   if (isMacOS) {
-      menu = Menu.buildFromTemplate([
+   const menuTemplate: OsMenu = {
+      darwin: [
          {
             label: app.name,
             submenu: [
@@ -201,10 +177,11 @@ function createAppMenu () {
          {
             role: 'windowMenu'
          }
-      ]);
-   }
+      ]
+   };
 
-   Menu.setApplicationMenu(menu);
+   const shortCutRegister = ShortcutRegister.getInstance({ mainWindow, menuTemplate, mode: 'local' });
+   shortCutRegister.init();
 }
 
 function saveWindowState () {

src/renderer/components/ModalSettings.vue

@@ -395,7 +395,29 @@ const contributors = process.env.APP_CONTRIBUTORS;
 const appLogo = require('../images/logo.svg');
 const darkPreview = require('../images/dark.png');
 const lightPreview = require('../images/light.png');
-const editorThemes= [
+const exampleQuery = `-- This is an example
+SELECT 
+    employee.id,
+    employee.first_name,
+    employee.last_name,
+    SUM(DATEDIFF("SECOND", call.start, call.end)) AS call_duration
+FROM call
+INNER JOIN employee ON call.employee_id = employee.id
+GROUP BY
+    employee.id,
+    employee.first_name,
+    employee.last_name
+ORDER BY
+    employee.id ASC;
+`;
+
+const localLocale: Ref<AvailableLocale> = ref(null);
+const localPageSize: Ref<number> = ref(null);
+const localTimeout: Ref<number> = ref(null);
+const localEditorTheme: Ref<string> = ref(null);
+const selectedTab: Ref<string> = ref('general');
+
+const editorThemes = computed(() => [
    {
       group: t('word.light'),
       themes: [
@@ -443,28 +465,7 @@ const editorThemes= [
          { code: 'vibrant_ink', name: 'Vibrant Ink' }
       ]
    }
-];
-const exampleQuery = `-- This is an example
-SELECT 
-    employee.id,
-    employee.first_name,
-    employee.last_name,
-    SUM(DATEDIFF("SECOND", call.start, call.end)) AS call_duration
-FROM call
-INNER JOIN employee ON call.employee_id = employee.id
-GROUP BY
-    employee.id,
-    employee.first_name,
-    employee.last_name
-ORDER BY
-    employee.id ASC;
-`;
-
-const localLocale: Ref<AvailableLocale> = ref(null);
-const localPageSize: Ref<number> = ref(null);
-const localTimeout: Ref<number> = ref(null);
-const localEditorTheme: Ref<string> = ref(null);
-const selectedTab: Ref<string> = ref('general');
+]);
 
 const locales = computed(() => {
    const locales = [];

src/renderer/components/WorkspaceTabQueryTable.vue

@@ -377,7 +377,7 @@ const deleteSelected = () => {
    });
 
    const params = {
-      primary: primaryField.value.name,
+      primary: primaryField.value?.name,
       schema: getSchema(resultsetIndex.value),
       table: getTable(resultsetIndex.value),
       rows
@@ -389,7 +389,7 @@ const setNull = () => {
    const row = localResults.value.find((row: any) => selectedRows.value.includes(row._antares_id));
 
    const params = {
-      primary: primaryField.value.name,
+      primary: primaryField.value?.name,
       schema: getSchema(resultsetIndex.value),
       table: getTable(resultsetIndex.value),
       id: getPrimaryValue(row),
@@ -611,7 +611,7 @@ const onKey = async (e: KeyboardEvent) => {
       selectAllRows(e);
 
    // row navigation stuff
-   if ((e.code.includes('Arrow') || e.code === 'Tab') && sortedResults.value.length > 0 && !e.altKey) {
+   if (!(e.ctrlKey || e.metaKey) && (e.code.includes('Arrow') || e.code === 'Tab') && sortedResults.value.length > 0 && !e.altKey) {
       e.preventDefault();
 
       const aviableFields= Object.keys(sortedResults.value[0]).slice(0, -1); // removes _antares_id

src/renderer/components/WorkspaceTabQueryTableRow.vue

@@ -442,7 +442,7 @@ const editOFF = () => {
    let content;
    if (!BLOB.includes(editingType.value)) {
       if ([...DATETIME, ...TIME].includes(editingType.value)) {
-         if (editingContent.value.substring(editingContent.value.length - 1) === '.')
+         if (editingContent.value !== null && editingContent.value.substring(editingContent.value.length - 1) === '.')
             editingContent.value = editingContent.value.slice(0, -1);
       }
 

src/renderer/scss/main.scss

@@ -109,7 +109,8 @@ option:checked {
 
       > div {
         padding: 0.1rem 0.2rem;
-        min-width: fill-available;
+        /* stylelint-disable-next-line value-no-vendor-prefix */
+        min-width: -webkit-fill-available;
       }
     }