Updates related to keyspaces actions in the treeview, ticket #547 (#566)

axonops · Nov 25, 2024 · e8527dd · e8527dd
1 parent d1a4d7a
commit e8527dd
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/renderer/js/events/clusters.js b/renderer/js/events/clusters.js
@@ -1973,7 +1973,7 @@
                                 }]
 
                                 try {
-                                  if (nodeType != 'cluster' && nodeType != 'keyspace')
+                                  if (['cluster'].every((type) => nodeType != type))
                                     throw 0
 
                                   contextMenu = contextMenu.concat([{
@@ -2013,6 +2013,12 @@
                                     throw 0
 
                                   contextMenu = contextMenu.concat([{
+                                      type: 'separator'
+                                    },
+                                    {
+                                      label: I18next.capitalizeFirstLetter(I18next.t('actions')),
+                                      enabled: false
+                                    }, {
                                       label: I18next.capitalizeFirstLetter(I18next.t('alter keyspace')),
                                       action: 'alter',
                                       click: `() => views.main.webContents.send('alter-keyspace', {
@@ -2037,6 +2043,27 @@
                                     contextMenu = contextMenu.filter((item) => item.action != 'drop')
                                 } catch (e) {}
 
+                                try {
+                                  if (nodeType != 'keyspaces')
+                                    throw 0
+
+                                  contextMenu = [{
+                                      label: I18next.capitalizeFirstLetter(I18next.t('actions')),
+                                      enabled: false
+                                    },
+                                    {
+                                      label: I18next.capitalizeFirstLetter(I18next.t('create keyspace')),
+                                      action: 'create',
+                                      click: `() => views.main.webContents.send('create-keyspace', {
+                                        datacenters: '${getAttributes(clusterElement, 'data-datacenters')}',
+                                        tabID: '_${cqlshSessionContentID}',
+                                        textareaID: '_${cqlshSessionStatementInputID}',
+                                        btnID: '_${executeStatementBtnID}'
+                                      })`
+                                    }
+                                  ]
+                                } catch (e) {}
+
                                 // Send a request to the main thread regards pop-up a menu
                                 IPCRenderer.send('show-context-menu', JSON.stringify(contextMenu))
                               })
@@ -5657,6 +5684,10 @@
                                   clusterElement.attr('data-latest-cassandra-version', `${status.version}`)
                                 } catch (e) {}
 
+                                try {
+                                  clusterElement.attr('data-datacenters', `${JSON.stringify(status.datacenters)}`)
+                                } catch (e) {}
+
                                 // If the process has been terminated then skip the upcoming code and stop the process
                                 if (status.terminated || isTerminated) {
                                   // Update the associated flag

diff --git a/renderer/js/funcs.js b/renderer/js/funcs.js
@@ -949,6 +949,10 @@ let buildTreeview = (metadata, ignoreTitles = false) => {
             'text': `Keyspaces (<span>${metadata.keyspaces.length}</span>)`,
             'type': 'default',
             'icon': normalizePath(Path.join(extraIconsPath, 'keyspaces.png')),
+            'a_attr': {
+              'allow-right-context': 'true',
+              'type': 'keyspaces'
+            }
           }
         ]
       },