added installController with logic for server/container installation

client/ui/models/containers_model.cpp

@@ -2,7 +2,6 @@
 
 ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
 {
-    setSelectedServerIndex(m_settings->defaultServerIndex());
 }
 
 int ContainersModel::rowCount(const QModelIndex &parent) const
@@ -17,9 +16,23 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         return false;
     }
 
-    if (role == IsDefaultRole) {
-        DockerContainer container = ContainerProps::allContainers().at(index.row());
-        m_settings->setDefaultContainer(m_selectedServerIndex, container);
+    DockerContainer container = ContainerProps::allContainers().at(index.row());
+
+    switch (role) {
+    case NameRole:
+//        return ContainerProps::containerHumanNames().value(container);
+    case DescRole:
+//        return ContainerProps::containerDescriptions().value(container);
+    case ConfigRole:
+        m_settings->setContainerConfig(m_currentlyProcessedServerIndex, container, value.toJsonObject());
+    case ServiceTypeRole:
+//        return ContainerProps::containerService(container);
+    case DockerContainerRole:
+//        return container;
+    case IsInstalledRole:
+//        return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+    case IsDefaultRole:
+        m_settings->setDefaultContainer(m_currentlyProcessedServerIndex, container);
     }
 
     emit dataChanged(index, index);
@@ -41,40 +54,42 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
         case DescRole:
             return ContainerProps::containerDescriptions().value(container);
         case ConfigRole:
-            return m_settings->containerConfig(m_selectedServerIndex, container);
+            return m_settings->containerConfig(m_currentlyProcessedServerIndex, container);
         case ServiceTypeRole:
             return ContainerProps::containerService(container);
+        case DockerContainerRole:
+            return container;
         case IsInstalledRole:
-            return m_settings->containers(m_selectedServerIndex).contains(container);
+            return m_settings->containers(m_currentlyProcessedServerIndex).contains(container);
+        case IsCurrentlyInstalled:
+            return container == static_cast<DockerContainer>(m_currentlyInstalledContainerIndex);
         case IsDefaultRole:
-            return container == m_settings->defaultContainer(m_selectedServerIndex);
+            return container == m_settings->defaultContainer(m_currentlyProcessedServerIndex);
     }
 
     return QVariant();
 }
 
-void ContainersModel::setSelectedServerIndex(int index)
+void ContainersModel::setCurrentlyProcessedServerIndex(int index)
 {
     beginResetModel();
-    m_selectedServerIndex = index;
+    m_currentlyProcessedServerIndex = index;
     endResetModel();
 }
 
 void ContainersModel::setCurrentlyInstalledContainerIndex(int index)
 {
-//    beginResetModel();
-    m_currentlyInstalledContainerIndex = createIndex(index, 0);
-//    endResetModel();
-}
-
-QString ContainersModel::getCurrentlyInstalledContainerName()
-{
-    return data(m_currentlyInstalledContainerIndex, NameRole).toString();
+    m_currentlyInstalledContainerIndex = index;
 }
 
 DockerContainer ContainersModel::getDefaultContainer()
 {
-    return m_settings->defaultContainer(m_selectedServerIndex);
+    return m_settings->defaultContainer(m_currentlyProcessedServerIndex);
+}
+
+int ContainersModel::getCurrentlyInstalledContainerIndex()
+{
+    return m_currentlyInstalledContainerIndex;
 }
 
 QHash<int, QByteArray> ContainersModel::roleNames() const {
@@ -82,7 +97,9 @@ QHash<int, QByteArray> ContainersModel::roleNames() const {
     roles[NameRole] = "name";
     roles[DescRole] = "description";
     roles[ServiceTypeRole] = "serviceType";
+    roles[DockerContainerRole] = "dockerContainer";
     roles[IsInstalledRole] = "isInstalled";
+    roles[IsCurrentlyInstalled] = "isCurrentlyInstalled";
     roles[IsDefaultRole] = "isDefault";
     return roles;
 }

client/ui/models/containers_model.h

@@ -15,12 +15,14 @@ class ContainersModel : public QAbstractListModel
 public:
     ContainersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 public:
-    enum ContainersModelRoles {
+    enum Roles {
         NameRole = Qt::UserRole + 1,
         DescRole,
         ServiceTypeRole,
         ConfigRole,
+        DockerContainerRole,
         IsInstalledRole,
+        IsCurrentlyInstalled,
         IsDefaultRole
     };
 
@@ -28,20 +30,20 @@ public:
 
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
-    Q_INVOKABLE void setSelectedServerIndex(int index);
-    Q_INVOKABLE void setCurrentlyInstalledContainerIndex(int index);
-
-    Q_INVOKABLE QString getCurrentlyInstalledContainerName();
 
 public slots:
     DockerContainer getDefaultContainer();
 
+    void setCurrentlyProcessedServerIndex(int index);
+    void setCurrentlyInstalledContainerIndex(int index);
+    int getCurrentlyInstalledContainerIndex();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
-    int m_selectedServerIndex;
-    QModelIndex m_currentlyInstalledContainerIndex;
+    int m_currentlyProcessedServerIndex;
+    int m_currentlyInstalledContainerIndex;
     std::shared_ptr<Settings> m_settings;
 };
 

client/ui/models/servers_model.cpp

@@ -38,14 +38,14 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     const QJsonObject server = servers.at(index.row()).toObject();
 
     switch (role) {
-    case DescRole: {
+    case NameRole: {
         auto description = server.value(config_key::description).toString();
         if (description.isEmpty()) {
             return server.value(config_key::hostName).toString();
         }
         return description;
     }
-    case AddressRole:
+    case HostNameRole:
         return server.value(config_key::hostName).toString();
     case CredentialsRole:
         return QVariant::fromValue(m_settings->serverCredentials(index.row()));
@@ -74,10 +74,21 @@ const int ServersModel::getServersCount()
     return m_settings->serversCount();
 }
 
+void ServersModel::setCurrentlyProcessedServerIndex(int index)
+{
+    m_currenlyProcessedServerIndex = index;
+}
+
+ServerCredentials ServersModel::getCurrentlyProcessedServerCredentials()
+{
+    return qvariant_cast<ServerCredentials>(data(index(m_currenlyProcessedServerIndex), CredentialsRole));
+}
+
 QHash<int, QByteArray> ServersModel::roleNames() const {
     QHash<int, QByteArray> roles;
-    roles[DescRole] = "desc";
-    roles[AddressRole] = "address";
-    roles[IsDefaultRole] = "is_default";
+    roles[NameRole] = "name";
+    roles[HostNameRole] = "hostName";
+    roles[CredentialsRole] = "credentials";
+    roles[IsDefaultRole] = "isDefault";
     return roles;
 }

client/ui/models/servers_model.h

@@ -16,8 +16,8 @@ class ServersModel : public QAbstractListModel
     Q_OBJECT
 public:
     enum ServersModelRoles {
-        DescRole = Qt::UserRole + 1,
-        AddressRole,
+        NameRole = Qt::UserRole + 1,
+        HostNameRole,
         CredentialsRole,
         IsDefaultRole
     };
@@ -34,11 +34,16 @@ public slots:
     const int getDefaultServerIndex();
     const int getServersCount();
 
+    void setCurrentlyProcessedServerIndex(int index);
+    ServerCredentials getCurrentlyProcessedServerCredentials();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 
 private:
     std::shared_ptr<Settings> m_settings;
+
+    int m_currenlyProcessedServerIndex;
 };
 
 #endif // SERVERSMODEL_H