Implement connection groups

Fix #3367

src/app/events.h

@@ -45,9 +45,6 @@ class Events : public QObject, public QEnableSharedFromThis<Events> {
                     std::function<void()> callback, int dbIndex,
                     QString keyPrefix);
 
-  // Connections
-  void createNewConnection(RedisClient::ConnectionConfig config);
-
   // Notifications
   void error(const QString& msg);
 

src/app/models/connectionconf.cpp

@@ -1,14 +1,22 @@
 #include "connectionconf.h"
 
 ServerConfig::ServerConfig(const QString &host, const QString &auth, const uint port, const QString &name)
-    : RedisClient::ConnectionConfig(host, auth, port, name)
+    : RedisClient::ConnectionConfig(host, auth, port, name),
+      m_owner(QSharedPointer<TreeOperations>())
 {
 }
 
-ServerConfig::ServerConfig(const RedisClient::ConnectionConfig &other)
+ServerConfig::ServerConfig(const QVariantHash &options)
+    : RedisClient::ConnectionConfig(options),
+      m_owner(QSharedPointer<TreeOperations>())
 {
-    m_parameters = other.getInternalParameters();
-    m_owner = other.getOwner();
+
+}
+
+ServerConfig::ServerConfig(const ServerConfig &other)
+{
+    m_parameters = other.m_parameters;
+    m_owner = other.m_owner;
 }
 
 QString ServerConfig::keysPattern() const
@@ -45,3 +53,13 @@ bool ServerConfig::useSshTunnel() const
 {
     return RedisClient::ConnectionConfig::useSshTunnel();
 }
+
+QWeakPointer<TreeOperations> ServerConfig::owner() const
+{
+    return m_owner;
+}
+
+void ServerConfig::setOwner(QWeakPointer<TreeOperations> o)
+{
+    m_owner = o;
+}

src/app/models/connectionconf.h

@@ -2,6 +2,9 @@
 #include <QObject>
 #include <qredisclient/connectionconfig.h>
 
+
+class TreeOperations;
+
 class ServerConfig : public RedisClient::ConnectionConfig
 {
     Q_GADGET
@@ -47,7 +50,9 @@ class ServerConfig : public RedisClient::ConnectionConfig
     ServerConfig(const QString & host = "127.0.0.1", const QString & auth = "",
                      const uint port = DEFAULT_REDIS_PORT, const QString & name = "");
 
-    ServerConfig(const RedisClient::ConnectionConfig&);
+    ServerConfig(const QVariantHash& options);
+
+    ServerConfig(const ServerConfig& options);
 
     QString keysPattern() const;
     void setKeysPattern(QString keyGlobPattern);
@@ -62,6 +67,12 @@ class ServerConfig : public RedisClient::ConnectionConfig
     void setDatabaseScanLimit(uint limit);
 
     Q_INVOKABLE bool useSshTunnel() const;
+
+    QWeakPointer<TreeOperations> owner() const;
+    void setOwner(QWeakPointer<TreeOperations> o);
+
+private:
+    QWeakPointer<TreeOperations> m_owner;
 };
 
 Q_DECLARE_METATYPE(ServerConfig)

src/app/models/connectiongroup.cpp

@@ -0,0 +1,22 @@
+#include "connectiongroup.h"
+
+#include "connections-tree/items/servergroup.h"
+
+ConnectionGroup::ConnectionGroup(QSharedPointer<ConnectionsTree::ServerGroup> g)
+    : m_group(g) {}
+
+ConnectionGroup::ConnectionGroup() : m_group(nullptr) {}
+
+QString ConnectionGroup::name() const {
+  if (!m_group) return QString();
+
+  return m_group->getDisplayName();
+}
+
+void ConnectionGroup::setName(const QString &n) {
+  if (m_group) m_group->setName(n);
+}
+
+QSharedPointer<ConnectionsTree::ServerGroup> ConnectionGroup::serverGroup() const {
+  return m_group;
+}

src/app/models/connectiongroup.h

@@ -0,0 +1,29 @@
+#pragma once
+#include <QObject>
+#include <QSharedPointer>
+
+namespace ConnectionsTree {
+class ServerGroup;
+}
+
+class ConnectionGroup {
+  Q_GADGET
+
+  Q_PROPERTY(QString name READ name WRITE setName)
+
+ public:
+  ConnectionGroup();
+
+  ConnectionGroup(QSharedPointer<ConnectionsTree::ServerGroup> g);
+
+  QString name() const;
+
+  void setName(const QString& n);
+
+  QSharedPointer<ConnectionsTree::ServerGroup> serverGroup() const;
+
+ private:
+  QSharedPointer<ConnectionsTree::ServerGroup> m_group;
+};
+
+Q_DECLARE_METATYPE(ConnectionGroup)