Display corresponding account information with log entry

3 files changed, 62 insertions, 4 deletions

diff --git a/components/kube/contents/ui/LogView.qml b/components/kube/contents/ui/LogView.qml
index f3297ac6..0d01ed6f 100644
--- a/components/kube/contents/ui/LogView.qml
+++ b/components/kube/contents/ui/LogView.qml
@@ -50,9 +50,7 @@ Controls.SplitView {
             }
 
             onCurrentItemChanged: {
-                if (details.resourceId) {
-                    details.resourceId = currentItem.currentData.resource
-                }
+                details.resourceId = currentItem.currentData.resource
                 details.message = currentItem.currentData.message
                 details.timestamp = currentItem.currentData.timestamp
             }
@@ -123,9 +121,25 @@ Controls.SplitView {
         id: details
         property date timestamp
         property string message
-        //TODO get account name from resource id
         property string resourceId: ""
+        property string accountId: ""
+        property string accountName: ""
         color: Kube.Colors.backgroundColor
+        Repeater {
+            model: Kube.AccountsModel {
+                id: accountsModel
+                resourceId: details.resourceId
+            }
+            Item {
+                property string account: model.accountId
+                property string accountName: model.name
+                onAccountChanged: {
+                    details.accountId = account
+                    details.accountName = name
+                }
+                visible: false
+            }
+        }
         Rectangle {
             anchors {
                 fill: parent
@@ -136,6 +150,22 @@ Controls.SplitView {
                 anchors.fill: parent
                 columns: 2
                 Kube.Label {
+                    text: qsTr("Account:")
+                    visible: details.accountName
+                }
+                Kube.Label {
+                    text: details.accountName
+                    visible: details.accountName
+                }
+                Kube.Label {
+                    text: qsTr("Account Id:")
+                    visible: details.accountId
+                }
+                Kube.Label {
+                    text: details.accountId
+                    visible: details.accountId
+                }
+                Kube.Label {
                     text: qsTr("Resource Id:")
                     visible: details.resourceId
                 }
diff --git a/framework/src/accounts/accountsmodel.cpp b/framework/src/accounts/accountsmodel.cpp
index 8b46f4d3..153cdc45 100644
--- a/framework/src/accounts/accountsmodel.cpp
+++ b/framework/src/accounts/accountsmodel.cpp
@@ -103,3 +103,27 @@ QByteArray AccountsModel::accountId() const
 {
     return {};
 }
+
+void AccountsModel::setResourceId(const QByteArray &resourceId)
+{
+    qWarning() << "Setting resource id" << resourceId;
+    if (resourceId.isEmpty()) {
+        setSourceModel(nullptr);
+        mModel.clear();
+        return;
+    }
+
+    Sink::Store::fetchOne<SinkResource>(Sink::Query{}.filter(resourceId)).guard(this).then([this] (const Sink::ApplicationDomain::SinkResource &resource) {
+        Sink::Query query;
+        query.filter(resource.getAccount());
+        query.request<SinkAccount::Name>();
+        query.request<SinkAccount::Icon>();
+        query.request<SinkAccount::Status>();
+        runQuery(query);
+    }).exec();
+}
+
+QByteArray AccountsModel::resourceId() const
+{
+    return {};
+}
diff --git a/framework/src/accounts/accountsmodel.h b/framework/src/accounts/accountsmodel.h
index 2c82a8b9..4991f7e0 100644
--- a/framework/src/accounts/accountsmodel.h
+++ b/framework/src/accounts/accountsmodel.h
@@ -33,6 +33,7 @@ class AccountsModel : public QIdentityProxyModel
     Q_OBJECT
 
     Q_PROPERTY (QByteArray accountId READ accountId WRITE setAccountId)
+    Q_PROPERTY (QByteArray resourceId READ resourceId WRITE setResourceId)
 public:
     enum Status {
         OfflineStatus,
@@ -61,6 +62,9 @@ public:
     void setAccountId(const QByteArray &id);
     QByteArray accountId() const;
 
+    void setResourceId(const QByteArray &id);
+    QByteArray resourceId() const;
+
 private:
     void runQuery(const Sink::Query &query);
     QSharedPointer<QAbstractItemModel> mModel;