From 840f60ed3b843d0b7dd3bcf34fc2b47620c6775a Mon Sep 17 00:00:00 2001
From: Michael Zanetti <michael_zanetti@gmx.net>
Date: Tue, 30 May 2023 23:42:30 +0200
Subject: [PATCH] Improve rules editor

Fixes: #1037
---
 libnymea-app/types/calendaritems.cpp          |  1 +
 nymea-app/ui/magic/EditRulePage.qml           | 14 ++++++++--
 nymea-app/ui/magic/StateEvaluatorDelegate.qml | 26 ++++++++++++++-----
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/libnymea-app/types/calendaritems.cpp b/libnymea-app/types/calendaritems.cpp
index eced513a..17264c49 100644
--- a/libnymea-app/types/calendaritems.cpp
+++ b/libnymea-app/types/calendaritems.cpp
@@ -66,6 +66,7 @@ void CalendarItems::removeCalendarItem(int index)
     beginRemoveRows(QModelIndex(), index, index);
     m_list.takeAt(index)->deleteLater();
     endRemoveRows();
+    emit countChanged();
 }
 
 CalendarItem *CalendarItems::createNewCalendarItem() const
diff --git a/nymea-app/ui/magic/EditRulePage.qml b/nymea-app/ui/magic/EditRulePage.qml
index 9bd0da3e..0fb8ad6c 100644
--- a/nymea-app/ui/magic/EditRulePage.qml
+++ b/nymea-app/ui/magic/EditRulePage.qml
@@ -100,11 +100,18 @@ Page {
         addEventDescriptor(true);
     }
 
-    function selectEventDescriptorData(eventDescriptor) {
+    function selectEventDescriptorData(eventDescriptor, destroyOnCancel) {
+        if (destroyOnCancel == undefined) {
+            destroyOnCancel = true
+        }
+
         var eventPage = pageStack.push(Qt.resolvedUrl("SelectEventDescriptorPage.qml"), {text: "Select event", eventDescriptor: eventDescriptor});
         eventPage.onBackPressed.connect(function() {
             eventPage.StackView.onRemoved.connect(function() {
-                eventDescriptor.destroy();
+                if (destroyOnCancel) {
+                    print("destroying event descriptor")
+                    eventDescriptor.destroy();
+                }
             });
             pageStack.pop();
         })
@@ -482,6 +489,9 @@ Page {
                     implicitWidth: parent.width
                     eventDescriptor: root.rule.eventDescriptors.get(index)
                     onRemoveEventDescriptor: root.rule.eventDescriptors.removeEventDescriptor(index)
+                    onClicked: {
+                        selectEventDescriptorData(eventDescriptor, false)
+                    }
                 }
             }
 
diff --git a/nymea-app/ui/magic/StateEvaluatorDelegate.qml b/nymea-app/ui/magic/StateEvaluatorDelegate.qml
index 6c0a66e7..c42555e7 100644
--- a/nymea-app/ui/magic/StateEvaluatorDelegate.qml
+++ b/nymea-app/ui/magic/StateEvaluatorDelegate.qml
@@ -37,7 +37,7 @@ import "../components"
 ItemDelegate {
 
     id: root
-    property var stateEvaluator: null
+    property StateEvaluator stateEvaluator: null
     readonly property Thing thing: stateEvaluator ? engine.thingManager.things.getThing(stateEvaluator.stateDescriptor.thingId) : null
     readonly property StateType stateType: thing ? thing.thingClass.stateTypes.getStateType(stateEvaluator.stateDescriptor.stateTypeId) : null
 
@@ -56,12 +56,20 @@ ItemDelegate {
         page.thingSelected.connect(function(thing) {
             root.stateEvaluator.stateDescriptor.interfaceName = "";
             root.stateEvaluator.stateDescriptor.thingId = thing.id;
-            selectStateDescriptorData()
+            var statePage = selectStateDescriptorData()
+            statePage.done.connect(function() {
+                pageStack.pop(StackView.Immediate)
+                pageStack.pop()
+            })
         });
         page.interfaceSelected.connect(function(interfaceName) {
             root.stateEvaluator.stateDescriptor.thingId = "";
             root.stateEvaluator.stateDescriptor.interfaceName = interfaceName;
-            selectStateDescriptorData();
+            var statePage = selectStateDescriptorData();
+            statePage.done.connect(function() {
+                pageStack.pop(StackView.Immediate)
+                pageStack.pop()
+            })
         });
     }
     function editInterfaceStateDescriptor() {
@@ -73,10 +81,11 @@ ItemDelegate {
             pageStack.pop();
         })
         statePage.done.connect(function() {
+            pageStack.pop(statePage, StackView.Immediate);
             pageStack.pop();
-            pageStack.pop();
-            pageStack.pop();
+//            pageStack.pop();
         })
+        return statePage
     }
 
     contentItem: ColumnLayout {
@@ -85,7 +94,12 @@ ItemDelegate {
             stateEvaluator: root.stateEvaluator
             swipe.enabled: root.canDelete
             onClicked: {
-                var page = pageStack.push(stateQuestionPageComponent);
+                print("opening editor:", root.stateEvaluator.stateDescriptor.thingId)
+                if (root.stateEvaluator.stateDescriptor.thingId.toString() !== "{00000000-0000-0000-0000-000000000000}") {
+                    selectStateDescriptorData()
+                } else {
+                    var page = pageStack.push(stateQuestionPageComponent);
+                }
             }
             onDeleteClicked: {
                 root.deleteClicked()