Rebase from main

.github/workflows/release.yml

@@ -35,24 +35,25 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Check if package.json has the right version
+      - name: Change the package.json version to match the tag
         run: |
-          grep -q "\"version\": \"${{ github.ref_name }}\"" package.json
-          if [ $? -ne 0 ]; then
-            echo "Error: package.json does not have the right version"
-            exit 1
-          fi
+          sed -i.bak 's/"version": "[^"]*"/"version": "'"$GITHUB_REF_NAME"'"/' package.json && rm package.json.bak
+          rm -f package.json.bak
+
 
       - name: Download CQLSH prebuilt binaries from axonops-workbench-cqlsh
         run: |
           mkdir -p main/bin
           for binary in cqlsh-410 cqlsh-407 keys_generator; do
-            curl -fL ${CQLSH_GITHUB_URL}/${binary}-$(uname -s)-$(uname -m).tar | tar xf - -C main/bin
+            curl -fL ${CQLSH_GITHUB_URL}/${CQLSH_BUILD_VERSION}/${binary}-$(uname -s)-$(uname -m).tar | tar xf - -C main/bin
             mv main/bin/${binary}-$(uname -s)-$(uname -m) main/bin/${binary}
             mv main/bin/${binary}/${binary}-$(uname -s)-$(uname -m) main/bin/${binary}/${binary}
           done
+          sed -i.bak "s/%CQLSH_VERSION%/$CQLSH_BUILD_VERSION/g" renderer/views/index.html
+          rm -f renderer/views/index.html.bak
         env:
-          CQLSH_GITHUB_URL: "${{ secrets.CQLSH_GITHUB_URL || 'https://github.com/axonops/axonops-workbench-cqlsh/releases/download/0.8.0' }}"
+          CQLSH_BUILD_VERSION: "0.11.0"
+          CQLSH_GITHUB_URL: "${{ secrets.CQLSH_GITHUB_URL || 'https://github.com/axonops/axonops-workbench-cqlsh/releases/download' }}"
 
       - name: Setup Python v3.12
         uses: actions/setup-python@v5
@@ -225,7 +226,7 @@ jobs:
   release-brew:
     runs-on: ubuntu-latest
     needs: [build]
-    if: ${{ !cancelled() && (success() || failure() || needs.build.result == 'skipped') }}
+    if: ${{ !cancelled() && success() }}
 
     steps:
       - uses: actions/checkout@v4
@@ -290,7 +291,7 @@ jobs:
   release-choco:
     runs-on: ubuntu-latest
     needs: [build]
-    if: ${{ !cancelled() && (success() || failure() || needs.build.result == 'skipped') }}
+    if: ${{ !cancelled() && success() }}
 
     steps:
       - uses: actions/checkout@v4
@@ -341,7 +342,7 @@ jobs:
   release-debian-redhat:
     runs-on: ubuntu-latest
     needs: [build]
-    if: ${{ !cancelled() && (success() || failure() || needs.build.result == 'skipped') }}
+    if: ${{ !cancelled() && success() }}
 
     steps:
       - id: "auth"

.github/workflows/trivy.yml.PENDING

@@ -0,0 +1,43 @@
+name: Trivy Scan
+on:
+  pull_request:
+
+jobs:
+  build:
+    name: Trivy Scans
+    runs-on: ubuntu-22.04
+    steps:
+
+    - name: Checkout code
+      uses: actions/checkout@v3
+
+    - name: Setup Python v3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: 3.12
+
+    - name: Setup Node.js v20.17.0
+      uses: actions/setup-node@v4
+      with:
+        node-version: 20.17.0
+
+    - name: Run Trivy vulnerability scanner in fs mode
+      uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # 0.24.0
+      with:
+        scan-type: 'fs'
+        scan-ref: '.'
+        format: json
+        severity: 'CRITICAL,HIGH,MEDIUM'
+        output: 'trivy-results.json'
+        github-pat: ${{ secrets.GITHUB_TOKEN }}
+
+    - uses: actions/upload-artifact@v4
+      with:
+        name: trivy-scan
+        path: 'trivy-results.json'
+
+    # # Upload the SARIF file generated in the previous step
+    # - name: Upload SARIF results file
+    #   uses: github/codeql-action/upload-sarif@v3
+    #   with:
+    #     sarif_file: 'trivy-results.sarif'

CODEOWNERS

@@ -1,4 +1,4 @@
 # These owners will be the default owners for everything in the repo.
-*           @digiserg @millerjp
-*.js        @mhmdkrmabd
-.github/*   @digiserg
+*           @digiserg @millerjp @rgooding @brainJamStark
+*.js        @mhmdkrmabd @digiserg @millerjp @rgooding @brainJamStark
+.github/*   @digiserg @digiserg @rgooding @brainJamStark

localization/ar.json

@@ -34,6 +34,7 @@
       "adjust the variable scope": "إعادة ضبط نطاق المتغير",
       "all $data-connection scripts of connection [b]$data[/b] have been successfully executed": "كل سكربتات ما $data-الاتصال المضافة للاتصال [b]$data[/b] تم تنفيذها بنجاح",
       "all $data-connection scripts of the connection have been successfully executed": "كل سكربتات ما $data-الاتصال المضافة للاتصال تم تنفيذها بنجاح",
+      "all history statements for connection [b]$data[/b] have been successfully cleared": "لقد تم مسح جميع العبارات المحفوظة للاتصال [b]$data[/b] بنجاح",
       "allowed running instances": "العدد المسموح تشغيله بشكل متزامن",
       "an error has occurred while executing $data-connection scripts of connection [b]$data[/b]": "لقد حدث خطأ أثناء تنفيذ سكربتات ما $data-الاتصال المضافة للاتصال [b]$data[/b]",
       "an error has occurred while executing $data-connection scripts of the connection": "لقد حدث خطأ أثناء تنفيذ سكربتات ما $data-الاتصال المضافة للاتصال",
@@ -55,6 +56,7 @@
       "change their values": "تغيير قيمتهم",
       "changes": "فروقات",
       "checks": "فحوصات",
+      "clear all statements": "مسح جميع العبارات",
       "clear": "مسح",
       "client certificate file": "ملف شهادة العميل",
       "client key file": "ملف مفتاح العميل",
@@ -259,6 +261,7 @@
       "settings have been successfully saved": "تم حفظ الإعدادات بنجاح",
       "settings": "الإعدادات",
       "show differentiation": "إظهار الفرق",
+      "show more": "إظهار المزيد",
       "snapshot suffix": "لاحقة اللقطة",
       "some settings have been successfully saved, however, an error has occurred with variables, $data": "تم حفظ بعض الإعدادات بنجاح، مع ذلك، لقد حدث خطأ يتعلق بالمتغيرات، $data",
       "something went wrong while attempt to test connection [b]$data[/b] in workspace [b]$data[/b], mostly it is an issue with <code>cqlsh.rc</code> file": "لقد حدث خطأ أثناء محاولة تجربة الاتصال [b]$data[/b] في مساحة العمل [b]$data[/b]، يبدو أنها مشكلة في ملف الإعدادات <code>cqlsh.rc</code> الخاص بالاتصال",

localization/en.json

@@ -15,8 +15,8 @@
       "SSL configuration": "SSL configuration",
       "a collision has been detected in variable $data, please consider to $data to prevent that collision": "a collision has been detected in variable $data, please consider to $data to prevent that collision",
       "a connection is already exists with the given name [b]$data[/b] in workspace [b]$data[/b], please provide a unique valid name": "a connection is already exists with the given name [b]$data[/b] in workspace [b]$data[/b], please provide a unique valid name",
-      "about apache cassandra®": "about apache cassandra®",
       "about AxonOps™": "about AxonOps™",
+      "about apache cassandra®": "about apache cassandra®",
       "about": "about",
       "actions": "actions",
       "activate connection": "activate connection",
@@ -29,6 +29,7 @@
       "ai assistant": "ai assistant",
       "all $data-connection scripts of connection [b]$data[/b] have been successfully executed": "all $data-connection scripts of connection [b]$data[/b] have been successfully executed",
       "all $data-connection scripts of the connection have been successfully executed": "all $data-connection scripts of the connection have been successfully executed",
+      "all history statements for connection [b]$data[/b] have been successfully cleared": "all history statements for connection [b]$data[/b] have been successfully cleared",
       "allowed running instances": "allowed running instances",
       "an error has occurred while executing $data-connection scripts of connection [b]$data[/b]": "an error has occurred while executing $data-connection scripts of connection [b]$data[/b]",
       "an error has occurred while executing $data-connection scripts of the connection": "an error has occurred while executing $data-connection scripts of the connection",
@@ -54,6 +55,7 @@
       "change their values": "change their values",
       "changes": "changes",
       "checks": "checks",
+      "clear all statements": "clear all statements",
       "clear": "clear",
       "client certificate file": "client certificate file",
       "client key file": "client key file",
@@ -260,6 +262,7 @@
       "settings have been successfully saved": "settings have been successfully saved",
       "settings": "settings",
       "show differentiation": "show differentiation",
+      "show more": "show more",
       "snapshot suffix": "snapshot suffix",
       "some settings have been successfully saved, however, an error has occurred with variables, $data": "some settings have been successfully saved, however, an error has occurred with variables, $data",
       "something went wrong while attempt to test connection [b]$data[/b] in workspace [b]$data[/b], mostly it is an issue with <code>cqlsh.rc</code> file": "something went wrong while attempt to test connection [b]$data[/b] in workspace [b]$data[/b], mostly it is an issue with <code>cqlsh.rc</code> file",

localization/es.json

@@ -15,8 +15,8 @@
       "SSL configuration": "Configuración de SSL",
       "a collision has been detected in variable $data, please consider to $data to prevent that collision": "Se ha detectado una colisión en $data variable, considere $data para evitar esa colisión",
       "a connection is already exists with the given name [b]$data[/b] in workspace [b]$data[/b], please provide a unique valid name": "Ya existe una conexión con el nombre de pila [b]$data[/b] en el espacio de trabajo [b]$data[/b], proporcione un nombre válido único",
-      "about apache cassandra®": "Acerca de Apache Cassandra®",
       "about AxonOps™": "Acerca de AxonOps™",
+      "about apache cassandra®": "Acerca de Apache Cassandra®",
       "about": "acerca de",
       "actions": "Acciones",
       "activate connection": "Activar conexión",
@@ -29,6 +29,7 @@
       "ai assistant": "Asistente de IA",
       "all $data-connection scripts of connection [b]$data[/b] have been successfully executed": "Todos los scripts de conexión $data de conexión [b]$data[/b] se han ejecutado con éxito",
       "all $data-connection scripts of the connection have been successfully executed": "Todos los scripts de conexión $data de la conexión se han ejecutado correctamente",
+      "all history statements for connection [b]$data[/b] have been successfully cleared": "todas las declaraciones del historial para la conexión [b]$data[/b] se han borrado correctamente",
       "allowed running instances": "Instancias en ejecución permitidas",
       "an error has occurred while executing $data-connection scripts of connection [b]$data[/b]": "Se ha producido un error al ejecutar scripts de conexión $data de conexión [b]$data[/b]",
       "an error has occurred while executing $data-connection scripts of the connection": "Se ha producido un error al ejecutar scripts de conexión $data de la conexión",
@@ -54,6 +55,7 @@
       "change their values": "Cambiar sus valores",
       "changes": "Cambios",
       "checks": "Cheques",
+      "clear all statements": "borrar todas las declaraciones",
       "clear": "claro",
       "client certificate file": "Archivo de certificado de cliente",
       "client key file": "Archivo de clave de cliente",
@@ -260,6 +262,7 @@
       "settings have been successfully saved": "La configuración se ha guardado con éxito",
       "settings": "Configuración",
       "show differentiation": "Mostrar diferenciación",
+      "show more": "mostrar más",
       "snapshot suffix": "Sufijo de instantánea",
       "some settings have been successfully saved, however, an error has occurred with variables, $data": "Algunas configuraciones se han guardado correctamente, sin embargo, se ha producido un error con las variables, $data",
       "something went wrong while attempt to test connection [b]$data[/b] in workspace [b]$data[/b], mostly it is an issue with <code>cqlsh.rc</code> file": "Algo salió mal al intentar probar la conexión [b]$data[/b] en el espacio de trabajo [b]$data[/b], principalmente es un problema con el archivo <code>cqlsh.rc</code>",

localization/fr.json

@@ -15,8 +15,8 @@
       "SSL configuration": "Configuration SSL",
       "a collision has been detected in variable $data, please consider to $data to prevent that collision": "Une collision a été détectée dans la variable $data, veuillez envisager de $data pour éviter cette collision",
       "a connection is already exists with the given name [b]$data[/b] in workspace [b]$data[/b], please provide a unique valid name": "Une connexion existe déjà avec le prénom [b]$data[/b] dans l’espace de travail [b]$data[/b], veuillez fournir un nom unique valide",
-      "about apache cassandra®": "À propos d’Apache Cassandra®",
       "about AxonOps™": "à propos d’AxonOps™",
+      "about apache cassandra®": "À propos d’Apache Cassandra®",
       "about": "environ",
       "actions": "Actions",
       "activate connection": "Activer la connexion",
@@ -29,6 +29,7 @@
       "ai assistant": "Assistant IA",
       "all $data-connection scripts of connection [b]$data[/b] have been successfully executed": "Tous les scripts de connexion $data de connexion [b]$data[/b] ont été exécutés avec succès",
       "all $data-connection scripts of the connection have been successfully executed": "Tous les scripts de $data-connexion de la connexion ont été exécutés avec succès",
+      "all history statements for connection [b]$data[/b] have been successfully cleared": "toutes les déclarations d'historique pour la connexion [b]$data[/b] ont été effacées avec succès",
       "allowed running instances": "Instances en cours d’exécution autorisées",
       "an error has occurred while executing $data-connection scripts of connection [b]$data[/b]": "Une erreur s’est produite lors de l’exécution des scripts de connexion $data de connexion [b]$data[/b]",
       "an error has occurred while executing $data-connection scripts of the connection": "Une erreur s’est produite lors de l’exécution des scripts de $data-connexion de la connexion",
@@ -54,6 +55,7 @@
       "change their values": "changer leurs valeurs",
       "changes": "changements",
       "checks": "Contrôles",
+      "clear all statements": "effacer toutes les déclarations",
       "clear": "clair",
       "client certificate file": "Fichier de certificat client",
       "client key file": "fichier de clé client",
@@ -260,6 +262,7 @@
       "settings have been successfully saved": "Les paramètres ont été enregistrés avec succès",
       "settings": "Paramètres",
       "show differentiation": "Différenciation de l’écran",
+      "show more": "Afficher plus",
       "snapshot suffix": "suffixe d’instantané",
       "some settings have been successfully saved, however, an error has occurred with variables, $data": "Certains paramètres ont été enregistrés avec succès, cependant, une erreur s’est produite avec les variables, $data",
       "something went wrong while attempt to test connection [b]$data[/b] in workspace [b]$data[/b], mostly it is an issue with <code>cqlsh.rc</code> file": "Quelque chose s’est mal passé lors de la tentative de test de connexion [b]$data[/b] dans l’espace de travail [b]$data[/b], il s’agit principalement d’un problème avec <code>le fichier cqlsh.rc</code>",