From c21b94ee3eb66704d971f9ab98d86be0c93d729e Mon Sep 17 00:00:00 2001
From: thfries <thomas.fries0@gmail.com>
Date: Sun, 15 Oct 2023 19:50:38 +0200
Subject: [PATCH] apply fixes regarding message templates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Thomas Jäckle <thomas.jaeckle@beyonnex.io>
---
 ui/modules/things/featureMessages.ts | 3 ++-
 ui/modules/things/thingMessages.ts   | 7 +++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui/modules/things/featureMessages.ts b/ui/modules/things/featureMessages.ts
index 707bd6ed61..6406f984d0 100644
--- a/ui/modules/things/featureMessages.ts
+++ b/ui/modules/things/featureMessages.ts
@@ -67,6 +67,7 @@ export async function ready() {
   dom.buttonMessageFavorite.onclick = () => {
     const templateName = dom.inputMessageTemplate.value;
     const featureId = theFeatureId;
+    const payload = acePayload.getValue();
     Utils.assert(featureId, 'Please select a Feature', dom.tableValidationFeature);
     Utils.assert(templateName, 'Please give a name for the template', dom.inputMessageTemplate);
     Environments.current().messageTemplates[featureId] = Environments.current().messageTemplates[featureId] || {};
@@ -79,7 +80,7 @@ export async function ready() {
       Environments.current().messageTemplates[featureId][templateName] = {
         subject: dom.inputMessageSubject.value,
         timeout: dom.inputMessageTimeout.value,
-        payload: JSON.parse(acePayload.getValue()),
+        ...(payload) && {payload: JSON.parse(payload)},
       };
       acePayload.session.getUndoManager().markClean();
     }
diff --git a/ui/modules/things/thingMessages.ts b/ui/modules/things/thingMessages.ts
index 7603938cfb..f2a6b7eca6 100644
--- a/ui/modules/things/thingMessages.ts
+++ b/ui/modules/things/thingMessages.ts
@@ -60,6 +60,7 @@ export async function ready() {
 
   dom.buttonThingMessageFavorite.onclick = () => {
     const templateName = dom.inputThingMessageTemplate.value;
+    const payload = acePayload.getValue();
     Utils.assert(templateName, 'Please give a name for the template', dom.inputThingMessageTemplate);
     Environments.current().messageTemplates['/'] = Environments.current().messageTemplates['/'] || {};
     if (Object.keys(Environments.current().messageTemplates['/']).includes(templateName) &&
@@ -71,7 +72,7 @@ export async function ready() {
       Environments.current().messageTemplates['/'][templateName] = {
         subject: dom.inputThingMessageSubject.value,
         timeout: dom.inputThingMessageTimeout.value,
-        payload: JSON.parse(acePayload.getValue()),
+        ...(payload) && {payload: JSON.parse(payload)},
       };
       acePayload.session.getUndoManager().markClean();
     }
@@ -132,9 +133,7 @@ function onEnvironmentChanged(modifiedField) {
   if (!modifiedField) {
     clearAllFields();
   }
-  if (modifiedField === 'messageTemplates') {
-    refillTemplates();
-  }
+  refillTemplates();
 }
 
 function clearAllFields() {