fixed multiple shortcuts handling #898

CHANGELOG.md

@@ -13,7 +13,8 @@ Builds:
 - ADDED: MySQL - specify table engine, show table engine in table list
 - FIXED: Hidden primary key name in PK editor for DB engines with anonymous PK (MySQL)
 - CHANGED: Import/export dialog is now tab instead of modal
-- ADDED: Saving impor/export job
+- ADDED: Saving import/export job
+- REMOVED: Ability to reopen export/import wizard from generated script. This was a bit hack, now you could save import/export job instead
 - ADDED: Autodetect CSV delimited
 - FIXED: Import CSV files with spaces around quotes
 - ADDED: JSON file import
@@ -30,6 +31,7 @@ Builds:
 - FIXED: (MySQL) Fixed importing SQL dump exported from mysqldump (#702)
 - FIXED: (PostgreSQL) Fixed filtering JSONB fields (#889)
 - FIXED: OIDC authentication not working anymore (#891)
+- ADDED: Added tests for import from CSV and JSON
 
 ### 5.4.4
 - CHANGED: Improved autoupdate, notification is now in app

packages/web/src/utility/common.ts

@@ -62,21 +62,21 @@ export function isMac() {
 export function formatKeyText(keyText: string): string {
   if (isMac()) {
     return keyText
-      .replace('CtrlOrCommand+', '⌘ ')
-      .replace('Shift+', '⇧ ')
-      .replace('Alt+', '⌥ ')
-      .replace('Command+', '⌘ ')
-      .replace('Ctrl+', '⌃ ')
-      .replace('Backspace', '⌫ ');
+      .replace(/CtrlOrCommand\+/g, '⌘ ')
+      .replace(/Shift\+/g, '⇧ ')
+      .replace(/Alt\+g/, '⌥ ')
+      .replace(/Command\+/g, '⌘ ')
+      .replace(/Ctrl\+/g, '⌃ ')
+      .replace(/Backspace/g, '⌫ ');
   }
-  return keyText.replace('CtrlOrCommand+', 'Ctrl+');
+  return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
 }
 
 export function resolveKeyText(keyText: string): string {
   if (isMac()) {
-    return keyText.replace('CtrlOrCommand+', 'Command+');
+    return keyText.replace(/CtrlOrCommand\+/g, 'Command+');
   }
-  return keyText.replace('CtrlOrCommand+', 'Ctrl+');
+  return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
 }
 
 export function isCtrlOrCommandKey(event) {