diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b64191c1..fb81992c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,10 +68,9 @@ jobs: uses: actions/setup-node@v4 with: node-version: 20.17.0 - cache: 'npm' - # - name: Clear npm cache - # run: npm cache clean --force + - name: Clear npm cache + run: npm cache clean --force - name: Get credits and add them to the database run: | diff --git a/.gitignore b/.gitignore index fba0b3e5..0c43d4d9 100755 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ main/bin/* **/__pycache__ .env +package-lock.json diff --git a/localization/ar.json b/localization/ar.json index 7ff0b4b9..c66b72eb 100755 --- a/localization/ar.json +++ b/localization/ar.json @@ -58,6 +58,7 @@ "checks": "فحوصات", "clear all statements": "مسح جميع العبارات", "clear": "مسح", + "click to select": "اضغط لتحديد", "client certificate file": "ملف شهادة العميل", "client key file": "ملف مفتاح العميل", "close all active work areas": "إغلاق جميع مساحات العمل النشطة", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "هل تريد مسح العنقود المحلي [b]$data[/b] بالكامل؟", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "هل تريد مسح مساحة العمل [b]$data[/b] بالكامل؟ هذه عملية لا يمكن التراجع عنها", "download the block": "تحميل الكتلة", - "drag and drop or click to select workspace(s)": "اسحب وافلت أو اضغط لتحديد مساحة/مساحات العمل", + "drag and drop": "اسحب وافلت", "duplicate name": "اسم مكرر", "edit cluster": "تعديل عنقود", "edit workspace": "تعديل مساحة عمل", @@ -352,6 +353,7 @@ "workspace name": "اسم مساحة العمل", "workspace path": "مسار مساحة العمل", "workspace settings": "إعدادات مساحة العمل", + "workspace(s)": "مساحة/مساحات العمل", "workspaces": "مساحات العمل", "you can now complete the update": "يمكنك الآن استكمال التحديث", "you may now save it": "يمكنك الآن حفظه", diff --git a/localization/en.json b/localization/en.json index b727b7c8..d3b31dda 100755 --- a/localization/en.json +++ b/localization/en.json @@ -57,6 +57,7 @@ "checks": "checks", "clear all statements": "clear all statements", "clear": "clear", + "click to select": "click to select", "client certificate file": "client certificate file", "client key file": "client key file", "close all active work areas": "close all active work areas", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "do you want to entirely delete the local cluster [b]$data[/b]?", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo", "download the block": "download the block", - "drag and drop or click to select workspace(s)": "drag and drop or click to select workspace(s)", + "drag and drop": "drag and drop", "duplicate name": "duplicate name", "edit cluster": "edit cluster", "edit workspace": "edit workspace", @@ -353,6 +354,7 @@ "workspace name": "workspace name", "workspace path": "workspace path", "workspace settings": "workspace settings", + "workspace(s)": "workspace(s)", "workspaces": "workspaces", "you can now complete the update": "you can now complete the update", "you may now save it": "you may now save it", diff --git a/localization/es.json b/localization/es.json index 2db942db..d0575b62 100644 --- a/localization/es.json +++ b/localization/es.json @@ -57,6 +57,7 @@ "checks": "Cheques", "clear all statements": "borrar todas las declaraciones", "clear": "claro", + "click to select": "haz clic para seleccionar", "client certificate file": "Archivo de certificado de cliente", "client key file": "Archivo de clave de cliente", "close all active work areas": "Cierre todas las áreas de trabajo activas", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "¿Desea eliminar por completo el clúster local [b]$data[/b]?", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "¿Desea eliminar por completo el espacio de trabajo [b]$data[/b]? Una vez que confirme, no hay forma de deshacer", "download the block": "Descargar el bloque", - "drag and drop or click to select workspace(s)": "Arrastre y suelte o haga clic para seleccionar espacios de trabajo", + "drag and drop": "arrastrar y soltar", "duplicate name": "Nombre duplicado", "edit cluster": "Editar clúster", "edit workspace": "Editar espacio de trabajo", @@ -353,6 +354,7 @@ "workspace name": "Nombre del espacio de trabajo", "workspace path": "Ruta del área de trabajo", "workspace settings": "Configuración del espacio de trabajo", + "workspace(s)": "espacio(s) de trabajo", "workspaces": "Espacios de trabajo", "you can now complete the update": "Ahora puede completar la actualización", "you may now save it": "Ahora puedes guardarlo", diff --git a/localization/fr.json b/localization/fr.json index 6d7080d3..6e9b509b 100755 --- a/localization/fr.json +++ b/localization/fr.json @@ -57,6 +57,7 @@ "checks": "Contrôles", "clear all statements": "effacer toutes les déclarations", "clear": "clair", + "click to select": "cliquez pour sélectionner", "client certificate file": "Fichier de certificat client", "client key file": "fichier de clé client", "close all active work areas": "Fermer toutes les zones de travail actives", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "Voulez-vous supprimer entièrement le cluster local [b]$data[/b] ?", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "Voulez-vous supprimer entièrement l’espace de travail [b]$data[/b] ? Une fois que vous avez confirmé, il n’y a pas d’annulation", "download the block": "Télécharger le bloc", - "drag and drop or click to select workspace(s)": "Glisser-déposer ou cliquer pour sélectionner un ou plusieurs espaces de travail", + "drag and drop": "glisser-déposer", "duplicate name": "Nom en double", "edit cluster": "Modifier le cluster", "edit workspace": "Modifier l’espace de travail", @@ -353,6 +354,7 @@ "workspace name": "Nom de l’espace de travail", "workspace path": "Chemin d’accès à l’espace de travail", "workspace settings": "Paramètres de l’espace de travail", + "workspace(s)": "espace(s) de travail", "workspaces": "Espaces de travail", "you can now complete the update": "Vous pouvez maintenant terminer la mise à jour", "you may now save it": "Vous pouvez maintenant l’enregistrer", diff --git a/localization/gl.json b/localization/gl.json index 1e84ed00..fc0c5b7f 100755 --- a/localization/gl.json +++ b/localization/gl.json @@ -57,6 +57,7 @@ "checks": "Comprobacións", "clear all statements": "borrar todas as declaracións", "clear": "Claro", + "click to select": "faga click para selecionar", "client certificate file": "Ficheiro certificado de cliente", "client key file": "ficheiro clave do cliente", "close all active work areas": "Pechar todas as áreas de traballo activas", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "Queres eliminar por completo o clúster local [b]$data[/b]?", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "Queres eliminar completamente o espazo de traballo [b]$data[/b]? Unha vez confirmados, non hai desfacer", "download the block": "Descargar o bloque", - "drag and drop or click to select workspace(s)": "arrastrar e soltar ou premer para seleccionar o(s) espazo de traballo(s)", + "drag and drop": "arrastrar e soltar", "duplicate name": "Nome duplicado", "edit cluster": "Editar cluster", "edit workspace": "editar espazo de traballo", @@ -353,6 +354,7 @@ "workspace name": "Nome do espazo de traballo", "workspace path": "Camiño do espazo de traballo", "workspace settings": "Configuración do espazo de traballo", + "workspace(s)": "espazo(s) de traballo", "workspaces": "Espazos de traballo", "you can now complete the update": "Xa podes completar a actualización", "you may now save it": "Agora podes gardalo", diff --git a/localization/iw.json b/localization/iw.json index c56c5d34..74ef7564 100755 --- a/localization/iw.json +++ b/localization/iw.json @@ -57,6 +57,7 @@ "checks": "בודק", "clear all statements": "נקה את כל ההצהרות", "clear": "צלול", + "click to select": "לחץ לבחירה", "client certificate file": "קובץ אישור לקוח", "client key file": "קובץ מפתח לקוח", "close all active work areas": "סגור את כל אזורי העבודה הפעילים", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "האם ברצונך למחוק לחלוטין את האשכול המקומי [b]$data[/b]?", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "האם ברצונך למחוק לחלוטין את סביבת העבודה [b]$data[/b]? ברגע שאתה מאשר, אין ביטול", "download the block": "הורד את הבלוק", - "drag and drop or click to select workspace(s)": "גרור ושחרר או לחץ כדי לבחור סביבות עבודה", + "drag and drop": "גרור ושחרר", "duplicate name": "שם כפול", "edit cluster": "עריכת אשכול", "edit workspace": "עריכת סביבת עבודה", @@ -353,6 +354,7 @@ "workspace name": "שם סביבת עבודה", "workspace path": "נתיב סביבת עבודה", "workspace settings": "הגדרות סביבת עבודה", + "workspace(s)": "מרחבי עבודה", "workspaces": "סביבות עבודה", "you can now complete the update": "כעת באפשרותך להשלים את העדכון", "you may now save it": "כעת תוכל לשמור אותו", diff --git a/localization/zh.json b/localization/zh.json index 8126b93f..94da2540 100755 --- a/localization/zh.json +++ b/localization/zh.json @@ -57,6 +57,7 @@ "checks": "检查", "clear all statements": "清除所有语句", "clear": "清楚", + "click to select": "单击以选择", "client certificate file": "客户端证书文件", "client key file": "客户端密钥文件", "close all active work areas": "关闭所有活动工作区", @@ -118,7 +119,7 @@ "do you want to entirely delete the local cluster [b]$data[/b]?": "是否要完全删除本地集群 [b]$data[/b]？", "do you want to entirely delete the workspace [b]$data[/b]? once you confirm, there is no undo": "是否要完全删除工作区 [b]$data[/b]？确认后，没有撤消", "download the block": "下载区块", - "drag and drop or click to select workspace(s)": "拖放或单击以选择工作区", + "drag and drop": "拖放", "duplicate name": "重复名称", "edit cluster": "编辑集群", "edit workspace": "编辑工作区", @@ -353,6 +354,7 @@ "workspace name": "工作区名称", "workspace path": "工作区路径", "workspace settings": "工作区设置", + "workspace(s)": "工作区", "workspaces": "工作区", "you can now complete the update": "您现在可以完成更新", "you may now save it": "您现在可以保存它", diff --git a/package-lock.json b/package-lock.json index 9f7784c2..84565c89 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ }, "devDependencies": { "@electron/rebuild": "^3.6.0", - "electron": "^27.3.11", + "electron": "^31.6.0", "electron-builder": "^25.0.5", "license-checker": "^25.0.1" }, @@ -440,6 +440,18 @@ "node": "^12.13.0 || ^14.15.0 || >=16.0.0" } }, + "node_modules/@electron/rebuild/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/@electron/rebuild/node_modules/minipass": { "version": "3.3.6", "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", @@ -1709,12 +1721,12 @@ "dev": true }, "node_modules/@types/node": { - "version": "18.19.50", - "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.50.tgz", - "integrity": "sha512-xonK+NRrMBRtkL1hVCc3G+uXtjh1Al4opBLjqVmipe5ZAaBYWW6cNAiBVZ1BvmkBhep698rP3UM3aRAdSALuhg==", + "version": "20.16.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz", + "integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==", "devOptional": true, "dependencies": { - "undici-types": "~5.26.4" + "undici-types": "~6.19.2" } }, "node_modules/@types/plist": { @@ -1957,21 +1969,6 @@ "node": ">=12" } }, - "node_modules/app-builder-lib/node_modules/minimatch": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", - "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": "20 || >=22" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/appdata-path": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/appdata-path/-/appdata-path-1.0.0.tgz", @@ -3283,14 +3280,14 @@ } }, "node_modules/electron": { - "version": "27.3.11", - "resolved": "https://registry.npmjs.org/electron/-/electron-27.3.11.tgz", - "integrity": "sha512-E1SiyEoI8iW5LW/MigCr7tJuQe7+0105UjqY7FkmCD12e2O6vtUbQ0j05HaBh2YgvkcEVgvQ2A8suIq5b5m6Gw==", + "version": "31.6.0", + "resolved": "https://registry.npmjs.org/electron/-/electron-31.6.0.tgz", + "integrity": "sha512-J64VtIF8DI/zsGgoYd3p5LbxAWjt59tk2cBSHJNzVhzgiVgDyPFkBwsqmN4gUvyv+6l6+WoYpYmYdapr2o4bPw==", "dev": true, "hasInstallScript": true, "dependencies": { "@electron/get": "^2.0.0", - "@types/node": "^18.11.18", + "@types/node": "^20.9.0", "extract-zip": "^2.0.1" }, "bin": { @@ -3911,6 +3908,18 @@ "minimatch": "^5.0.1" } }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/flat-colors": { "version": "3.3.12", "resolved": "https://registry.npmjs.org/flat-colors/-/flat-colors-3.3.12.tgz", @@ -5457,15 +5466,18 @@ } }, "node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz", + "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": "20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { @@ -6241,9 +6253,9 @@ } }, "node_modules/pump": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.1.tgz", - "integrity": "sha512-2ynnAmUu45oUSq51AQbeugLkMSKaz8FqVpZ6ykTqzOVkzXe8u/ezkGsYrFJqKZx+D9cVxoDrSbR7CeAwxFa5cQ==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.2.tgz", + "integrity": "sha512-tUPXtzlGM8FE3P0ZL6DVs/3P58k9nk8/jZeQCurTJylQA8qFYzHFfhBJkuqyE0FifOsQ0uKWekiZ5g8wtr28cw==", "dependencies": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -6396,6 +6408,19 @@ "minimatch": "^5.1.0" } }, + "node_modules/readdir-glob/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "peer": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/readdir-scoped-modules": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/readdir-scoped-modules/-/readdir-scoped-modules-1.1.0.tgz", @@ -6972,9 +6997,9 @@ "integrity": "sha512-Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==" }, "node_modules/ssh2": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.15.0.tgz", - "integrity": "sha512-C0PHgX4h6lBxYx7hcXwu3QWdh4tg6tZZsTfXcdvc5caW/EMxaB4H9dWsl7qk+F7LAW762hp8VbXOX7x4xUYvEw==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/ssh2/-/ssh2-1.16.0.tgz", + "integrity": "sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==", "hasInstallScript": true, "dependencies": { "asn1": "^0.2.6", @@ -6984,8 +7009,8 @@ "node": ">=10.16.0" }, "optionalDependencies": { - "cpu-features": "~0.0.9", - "nan": "^2.18.0" + "cpu-features": "~0.0.10", + "nan": "^2.20.0" } }, "node_modules/ssri": { @@ -7351,9 +7376,9 @@ } }, "node_modules/traverse": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.9.tgz", - "integrity": "sha512-7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==", + "version": "0.6.10", + "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.10.tgz", + "integrity": "sha512-hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA==", "dependencies": { "gopd": "^1.0.1", "typedarray.prototype.slice": "^1.0.3", @@ -7541,9 +7566,9 @@ } }, "node_modules/undici-types": { - "version": "5.26.5", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", - "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "devOptional": true }, "node_modules/unique-filename": { diff --git a/package.json b/package.json index 2d8320f9..5f6ba6f2 100755 --- a/package.json +++ b/package.json @@ -116,7 +116,7 @@ "repository": "https://github.com/axonops/axonops-workbench-cassandra", "devDependencies": { "@electron/rebuild": "^3.6.0", - "electron": "^27.3.11", + "electron": "^31.6.0", "electron-builder": "^25.0.5", "license-checker": "^25.0.1" }, diff --git a/renderer/js/init.js b/renderer/js/init.js index b6d9fe62..d30db37a 100755 --- a/renderer/js/init.js +++ b/renderer/js/init.js @@ -1273,10 +1273,23 @@ $(document).on('initialize', () => { }) /* - * Whether or not the content protection should be shown in the app's settings - * This feature is hidden from Linux platform only + * Whether or not the content protection - and other features - should be shown in the app's settings + * Those features are disabled on Linux */ -$(document).on('initialize', () => $(`div.row#contentProtectionContainer`).toggle(OS.platform() != 'linux')) +$(document).on('initialize', () => { + let isPlatformLinux = OS.platform() == 'linux' + + try { + if (!isPlatformLinux) + throw 0 + + // Hide the content protection feature + $(`div.row#contentProtectionContainer`).hide() + + // NOTE: In case we've faced the multi-selection bug on Linux we can enable this line + // setTimeout(() => $('span[selection-feautre]').hide();$('div.modal-section div.drag-drop-workspaces').unbind('click').css('cursor', 'default'), 1000) + } catch (e) {} +}) $(document).on('initialize', () => { diff --git a/renderer/views/index.html b/renderer/views/index.html index dc2e785f..38e64025 100755 --- a/renderer/views/index.html +++ b/renderer/views/index.html @@ -1477,7 +1477,12 @@
- + + + + + +