From 80debf90c987746d8a45560c2b9e1f4c61f69fd3 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 23 Feb 2018 10:02:50 +0100
Subject: Switch to QVariantList + add logging everywhere!

---
 framework/src/sinkfabric.cpp |  6 ++++--
 views/log/qml/View.qml       | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/framework/src/sinkfabric.cpp b/framework/src/sinkfabric.cpp
index b2281a5d..8492f272 100644
--- a/framework/src/sinkfabric.cpp
+++ b/framework/src/sinkfabric.cpp
@@ -152,11 +152,13 @@ public:
             QVariantMap message;
             if (notification.type == Sink::Notification::Warning) {
                 message["type"] = "warning";
-                QStringList entities;
+
+                QVariantList entities;
                 for(const auto &entity : notification.entities) {
-                    entities << QString{entity};
+                    entities << entity;
                 }
                 message["entities"] = entities;
+
                 message["resource"] = QString{notification.resource};
                 if (notification.code == Sink::ApplicationDomain::TransmissionError) {
                     message["message"] = QObject::tr("Failed to send message.");
diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index df9e882f..0dbf3b5e 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -45,7 +45,16 @@ Controls.SplitView {
                 if (message.type == Kube.Notifications.error) {
                     root.pendingError = true
                 }
+
+                console.log("Message: " + message.message)
+                console.log("Type: " + message.type)
+                console.log("SubType: " + message.subtype)
+                console.log("Entities: " + message.entities)
+
                 var error = {timestamp: new Date(), message: message.message, details: message.details, resource: message.resource, entities: message.entities}
+
+                console.log("Error: " + JSON.stringify(error))
+
                 if (logModel.count > 0) {
                     var lastEntry = logModel.get(0)
                     //Merge if we get an entry of the same subtype
@@ -79,6 +88,7 @@ Controls.SplitView {
 
             onCurrentItemChanged: {
                 var error = currentItem.currentData.errors.get(0)
+                console.log("Current error: " + JSON.stringify(error));
                 if (!!error.resource) {
                     details.resourceId = error.resource
                 }
@@ -90,6 +100,9 @@ Controls.SplitView {
                     details.subtype = ""
                 }
 
+                console.log("Setting resource to: " + error.resource)
+                console.log("Setting entities to: " + error.entities)
+
                 details.entities = error.entities
             }
 
@@ -352,7 +365,7 @@ Controls.SplitView {
                     }
                     Kube.Label {
                         id: subHeadline
-                        text: "Account: " + accountName + "\nMessage-Id: " + entities[0];
+                        text: "Account: " + accountName + "\nMessage-Id: " + entities;
                         color: Kube.Colors.disabledTextColor
                         wrapMode: Text.Wrap
                     }
-- 
cgit v1.2.3