From 0ebfa5bca507229bb409b1fa2f61f16d2244192c Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Sun, 30 Aug 2020 15:46:39 +0200
Subject: [PATCH] Fix more views that broke on the LogsModel transition

---
 nymea-app/ui/devicepages/ButtonDevicePage.qml | 34 +++++--------------
 .../FingerprintReaderDevicePage.qml           | 13 ++-----
 .../devicepages/NotificationsDevicePage.qml   | 16 ++-------
 nymea-app/ui/devicepages/StateLogPage.qml     | 11 ------
 4 files changed, 14 insertions(+), 60 deletions(-)

diff --git a/nymea-app/ui/devicepages/ButtonDevicePage.qml b/nymea-app/ui/devicepages/ButtonDevicePage.qml
index 3182eb75..0b41ac3a 100644
--- a/nymea-app/ui/devicepages/ButtonDevicePage.qml
+++ b/nymea-app/ui/devicepages/ButtonDevicePage.qml
@@ -53,35 +53,19 @@ DevicePageBase {
         id: logView
         anchors.fill: parent
 
-        logsModel: engine.jsonRpcClient.ensureServerVersion("1.10") ? logsModelNg : logsModel
-        LogsModelNg {
-            id: logsModelNg
-            engine: _engine
-            deviceId: root.device.id
-            live: true
-            typeIds: {
-                var ret = [];
-                ret.push(root.deviceClass.eventTypes.findByName("pressed").id)
-                if (root.deviceClass.eventTypes.findByName("longPressed")) {
-                    ret.push(root.deviceClass.eventTypes.findByName("longPressed").id)
-                }
-                return ret;
-            }
-        }
-        LogsModel {
+        logsModel: LogsModel {
             id: logsModel
             engine: _engine
-            deviceId: root.device.id
+            thingId: root.thing.id
             live: true
             typeIds: {
                 var ret = [];
-                ret.push(root.deviceClass.eventTypes.findByName("pressed").id)
-                if (root.deviceClass.eventTypes.findByName("longPressed")) {
-                    ret.push(root.deviceClass.eventTypes.findByName("longPressed").id)
+                ret.push(root.thing.thingClass.eventTypes.findByName("pressed").id)
+                if (root.thing.thingClass.eventTypes.findByName("longPressed")) {
+                    ret.push(root.thing.thingClass.eventTypes.findByName("longPressed").id)
                 }
                 return ret;
             }
-            Component.onCompleted: update()
         }
 
         onAddRuleClicked: {
@@ -89,17 +73,17 @@ DevicePageBase {
             var typeId = logView.logsModel.get(index).typeId
             var rule = engine.ruleManager.createNewRule();
             var eventDescriptor = rule.eventDescriptors.createNewEventDescriptor();
-            eventDescriptor.deviceId = device.id;
-            var eventType = root.deviceClass.eventTypes.getEventType(typeId);
+            eventDescriptor.deviceId = root.thing.id;
+            var eventType = root.thing.thingClass.eventTypes.getEventType(typeId);
             eventDescriptor.eventTypeId = eventType.id;
-            rule.name = root.device.name + " - " + eventType.displayName;
+            rule.name = root.thing.name + " - " + eventType.displayName;
             if (eventType.paramTypes.count === 1) {
                 var paramType = eventType.paramTypes.get(0);
                 eventDescriptor.paramDescriptors.setParamDescriptor(paramType.id, value, ParamDescriptor.ValueOperatorEquals);
                 rule.eventDescriptors.addEventDescriptor(eventDescriptor);
                 rule.name = rule.name + " - " + value
             }
-            var rulePage = pageStack.push(Qt.resolvedUrl("../magic/DeviceRulesPage.qml"), {device: root.device});
+            var rulePage = pageStack.push(Qt.resolvedUrl("../magic/DeviceRulesPage.qml"), {device: root.thing});
             rulePage.addRule(rule);
         }
     }
diff --git a/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml b/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
index 73095d21..6acef592 100644
--- a/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
+++ b/nymea-app/ui/devicepages/FingerprintReaderDevicePage.qml
@@ -68,20 +68,11 @@ DevicePageBase {
             Layout.fillHeight: true
             Layout.fillWidth: true
 
-            logsModel: engine.jsonRpcClient.ensureServerVersion("1.10") ? logsModelNg : logsModel
-            LogsModelNg {
-                id: logsModelNg
-                deviceId: root.device.id
-                engine: _engine
-                live: true
-                typeIds: [root.accessGrantedEventType.id, root.accessDeniedEventType.id];
-            }
-            LogsModel {
+            logsModel: LogsModel {
                 id: logsModel
-                deviceId: root.device.id
+                thingId: root.device.id
                 engine: _engine
                 live: true
-                Component.onCompleted: update()
                 typeIds: [root.accessGrantedEventType.id, root.accessDeniedEventType.id];
             }
 
diff --git a/nymea-app/ui/devicepages/NotificationsDevicePage.qml b/nymea-app/ui/devicepages/NotificationsDevicePage.qml
index 7561f178..900e4d2d 100644
--- a/nymea-app/ui/devicepages/NotificationsDevicePage.qml
+++ b/nymea-app/ui/devicepages/NotificationsDevicePage.qml
@@ -113,21 +113,11 @@ DevicePageBase {
             Layout.fillHeight: true
             Layout.fillWidth: true
 
-            logsModel: engine.jsonRpcClient.ensureServerVersion("1.10") ? logsModelNg : logsModel
-            LogsModelNg {
-                id: logsModelNg
-                deviceId: root.device.id
-                engine: _engine
-                live: true
-                typeIds: [root.deviceClass.actionTypes.findByName("notify").id];
-            }
-
-            LogsModel {
+            logsModel: LogsModel {
                 id: logsModel
-                deviceId: root.device.id
-                live: true
+                thingId: root.device.id
                 engine: _engine
-                Component.onCompleted: update()
+                live: true
                 typeIds: [root.deviceClass.actionTypes.findByName("notify").id];
             }
 
diff --git a/nymea-app/ui/devicepages/StateLogPage.qml b/nymea-app/ui/devicepages/StateLogPage.qml
index 9f5344ef..a442afb2 100644
--- a/nymea-app/ui/devicepages/StateLogPage.qml
+++ b/nymea-app/ui/devicepages/StateLogPage.qml
@@ -59,17 +59,6 @@ Page {
         onBackPressed: pageStack.pop()
     }
 
-    LogsModel {
-        id: logsModel
-        engine: _engine
-        deviceId: root.device.id
-        live: true
-        Component.onCompleted: {
-            update()
-        }
-        typeIds: [root.stateType.id]
-    }
-
     LogsModelNg {
         id: logsModelNg
         engine: _engine