From fc7aafe08f922fb15d077304b130071bb9e69392 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 26 Feb 2018 14:38:03 +0100
Subject: Finishing test log view + proper message display in log view

---
 views/log/qml/View.qml | 72 +++++++++++++++++++++++++++++++++++---------------
 1 file changed, 50 insertions(+), 22 deletions(-)

(limited to 'views/log/qml/View.qml')

diff --git a/views/log/qml/View.qml b/views/log/qml/View.qml
index 0dbf3b5e..7e95e20f 100644
--- a/views/log/qml/View.qml
+++ b/views/log/qml/View.qml
@@ -46,14 +46,16 @@ Controls.SplitView {
                     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))
+                var error = {
+                    timestamp: new Date(),
+                    message: message.message,
+                    details: message.details,
+                    resource: message.resource,
+                    // TODO: if we passed entities as a list, it would get
+                    // converted to a ListModel, in all likelihood because of
+                    // ListDelegate, which we should rewrite in C++
+                    entities: {elements: message.entities}
+                }
 
                 if (logModel.count > 0) {
                     var lastEntry = logModel.get(0)
@@ -88,7 +90,6 @@ Controls.SplitView {
 
             onCurrentItemChanged: {
                 var error = currentItem.currentData.errors.get(0)
-                console.log("Current error: " + JSON.stringify(error));
                 if (!!error.resource) {
                     details.resourceId = error.resource
                 }
@@ -100,9 +101,6 @@ Controls.SplitView {
                     details.subtype = ""
                 }
 
-                console.log("Setting resource to: " + error.resource)
-                console.log("Setting entities to: " + error.entities)
-
                 details.entities = error.entities
             }
 
@@ -357,19 +355,49 @@ Controls.SplitView {
                     right: parent.right
                 }
                 spacing: Kube.Units.largeSpacing
+
+                Kube.Heading {
+                    id: heading
+                    text: qsTr("Failed to send the message.")
+                    color: Kube.Colors.warningColor
+                }
+
                 Column {
-                    Kube.Heading {
-                        id: heading
-                        text: qsTr("Failed to send the message.")
-                        color: Kube.Colors.warningColor
-                    }
-                    Kube.Label {
-                        id: subHeadline
-                        text: "Account: " + accountName + "\nMessage-Id: " + entities;
-                        color: Kube.Colors.disabledTextColor
-                        wrapMode: Text.Wrap
+                    spacing: Kube.Units.largeSpacing
+
+                    Repeater {
+                        model: Kube.MailListModel {
+                            entityId: entities.elements[0]
+                        }
+                        delegate: Column {
+                            id: subHeadline
+
+                            Kube.Label {
+                                text: qsTr("Account") + ": " + accountName
+                                color: Kube.Colors.disabledTextColor
+                                wrapMode: Text.Wrap
+                            }
+                            Kube.Label {
+                                text: qsTr("Subject") + ": " + model.subject
+                                color: Kube.Colors.disabledTextColor
+                                wrapMode: Text.Wrap
+                            }
+                            Kube.Label {
+                                text: qsTr("To") + ": " + model.to
+                                color: Kube.Colors.disabledTextColor
+                                wrapMode: Text.Wrap
+                            }
+                            Kube.Label {
+                                visible: !!model.cc
+                                text: qsTr("Cc") + ": " + model.cc;
+                                color: Kube.Colors.disabledTextColor
+                                wrapMode: Text.Wrap
+                            }
+
+                        }
                     }
                 }
+
                 Kube.Button {
                     text: qsTr("Try again")
                     onClicked: {
-- 
cgit v1.2.3