Deprecate template type (#177)

config.schema.json

@@ -64,7 +64,10 @@
             },
             "type": {
               "$ref": "#/$defs/type",
-              "const": "template"
+              "const": "template",
+              "deprecated": true,
+              "title": "Schema change:",
+              "description": "Use 'tap' instead."
             }
           },
           "required": ["name", "content", "type"],
@@ -84,7 +87,10 @@
             },
             "type": {
               "$ref": "#/$defs/type",
-              "const": "template"
+              "const": "template",
+              "deprecated": true,
+              "title": "Schema change:",
+              "description": "Use 'tap' instead."
             },
             "tap_action": {
               "$ref": "#/$defs/tap_action"
@@ -108,6 +114,10 @@
           "$ref": "#/$defs/type",
           "const": "tap"
         },
+        "content": {
+          "$ref": "#/$defs/content",
+          "description": "Optional in a tap."
+        },
         "service": {
           "$ref": "#/$defs/entity",
           "deprecated": true,
@@ -118,14 +128,7 @@
           "$ref": "#/$defs/tap_action"
         }
       },
-      "oneOf": [
+      "required": ["name", "type"],
-        {
-          "required": ["name", "type", "service"]
-        },
-        {
-          "required": ["name", "type", "tap_action"]
-        }
-      ],
       "additionalProperties": false
     },
     "group": {

source/HomeAssistantApp.mc

@@ -34,7 +34,7 @@ class HomeAssistantApp extends Application.AppBase {
     private var mGlanceTimer       as Timer.Timer       or Null;
     private var mUpdateTimer       as Timer.Timer       or Null;
     // Array initialised by onReturnFetchMenuConfig()
-    private var mItemsToUpdate     as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTemplateMenuItem> or Null;
+    private var mItemsToUpdate     as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem> or Null;
     private var mIsGlance          as Lang.Boolean = false;
     private var mIsApp             as Lang.Boolean = false; // Or Widget
     private var mUpdating          as Lang.Boolean = false; // Don't start a second chain of updates

source/HomeAssistantMenuItemFactory.mc

@@ -79,7 +79,7 @@ class HomeAssistantMenuItemFactory {
         );
     }
 
-    function template_tap(
+    function tap(
         label    as Lang.String or Lang.Symbol,
         entity   as Lang.String or Null,
         template as Lang.String or Null,
@@ -94,57 +94,29 @@ class HomeAssistantMenuItemFactory {
                 data.put("entity_id", entity);
             }
         }
-        return new HomeAssistantTemplateMenuItem(
+        if (service != null) {
-            label,
+            return new HomeAssistantTapMenuItem(
-            template,
+                label,
-            service,
+                template,
-            confirm,
+                service,
-            data,
+                confirm,
-            mTapTypeIcon,
+                data,
-            mMenuItemOptions,
+                mTapTypeIcon,
-            mHomeAssistantService
+                mMenuItemOptions,
-        );
+                mHomeAssistantService
-    }
+            );
-
+        } else {
-    function template_notap(
+            return new HomeAssistantTapMenuItem(
-        label    as Lang.String or Lang.Symbol,
+                label,
-        template as Lang.String or Null
+                template,
-    ) as WatchUi.MenuItem {
+                service,
-        return new HomeAssistantTemplateMenuItem(
+                confirm,
-            label,
+                data,
-            template,
+                mInfoTypeIcon,
-            null,
+                mMenuItemOptions,
-            false,
+                mHomeAssistantService
-            null,
+            );
-            mInfoTypeIcon,
-            mMenuItemOptions,
-            mHomeAssistantService
-        );
-    }
-
-    function tap(
-        label   as Lang.String or Lang.Symbol,
-        entity  as Lang.String or Null,
-        service as Lang.String or Null,
-        confirm as Lang.Boolean,
-        data    as Lang.Dictionary or Null
-    ) as WatchUi.MenuItem {
-        if (entity != null) {
-            if (data == null) {
-                data = { "entity_id" => entity };
-            } else {
-                data.put("entity_id", entity);
-            }
         }
-        return new HomeAssistantTapMenuItem(
-            label,
-            service,
-            confirm,
-            data,
-            mTapTypeIcon,
-            mMenuItemOptions,
-            mHomeAssistantService
-        );
     }
 
     function group(

source/HomeAssistantTapMenuItem.mc

@@ -24,20 +24,22 @@ using Toybox.Graphics;
 
 class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
     private var mHomeAssistantService as HomeAssistantService;
-    private var mService              as Lang.String;
+    private var mTemplate             as Lang.String;
+    private var mService              as Lang.String or Null;
     private var mConfirm              as Lang.Boolean;
     private var mData                 as Lang.Dictionary or Null;
 
     function initialize(
-        label      as Lang.String or Lang.Symbol,
+        label     as Lang.String or Lang.Symbol,
-        service    as Lang.String or Null,
+        template  as Lang.String,
-        confirm    as Lang.Boolean,
+        service   as Lang.String or Null,
-        data       as Lang.Dictionary or Null,
+        confirm   as Lang.Boolean,
-        icon       as Graphics.BitmapType or WatchUi.Drawable,
+        data      as Lang.Dictionary or Null,
-        options    as {
+        icon      as Graphics.BitmapType or WatchUi.Drawable,
+        options   as {
             :alignment as WatchUi.MenuItem.Alignment
         } or Null,
-        haService  as HomeAssistantService
+        haService as HomeAssistantService
     ) {
         WatchUi.IconMenuItem.initialize(
             label,
@@ -48,16 +50,37 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
         );
 
         mHomeAssistantService = haService;
+        mTemplate             = template;
         mService              = service;
         mConfirm              = confirm;
         mData                 = data;
     }
 
-    function buildTemplate() as Lang.String or Null {
+    function hasTemplate() as Lang.Boolean {
-        return null;
+        return mTemplate != null;
     }
 
-    function updateState(data as Lang.String or Null) as Void {
+    function buildTemplate() as Lang.String or Null {
+        return mTemplate;
+    }
+
+    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
+        if (data == null) {
+            setSubLabel($.Rez.Strings.Empty);
+        } else if(data instanceof Lang.String) {
+            setSubLabel(data);
+        } else if(data instanceof Lang.Dictionary) {
+            // System.println("HomeAsistantTemplateMenuItem updateState() data = " + data);
+            if (data.get("error") != null) {
+                setSubLabel($.Rez.Strings.TemplateError);
+            } else {
+                setSubLabel($.Rez.Strings.PotentialError);
+            }
+        } else {
+            // The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error.
+            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
+        }
+        WatchUi.requestUpdate();
     }
 
     function callService() as Void {
@@ -68,13 +91,15 @@ class HomeAssistantTapMenuItem extends WatchUi.IconMenuItem {
                 WatchUi.SLIDE_IMMEDIATE
             );
         } else {
-            mHomeAssistantService.call(mService, mData);
+            onConfirm(false);
         }
     }
 
     // NB. Parameter 'b' is ignored
     function onConfirm(b as Lang.Boolean) as Void {
-        mHomeAssistantService.call(mService, mData);
+        if (mService != null) {
+            mHomeAssistantService.call(mService, mData);
+        }
     }
 
 }

source/HomeAssistantTemplateMenuItem.mc

@@ -1,105 +0,0 @@
-//-----------------------------------------------------------------------------------
-//
-// Distributed under MIT Licence
-//   See https://github.com/house-of-abbey/GarminHomeAssistant/blob/main/LICENSE.
-//
-//-----------------------------------------------------------------------------------
-//
-// GarminHomeAssistant is a Garmin IQ application written in Monkey C and routinely
-// tested on a Venu 2 device. The source code is provided at:
-//            https://github.com/house-of-abbey/GarminHomeAssistant.
-//
-// P A Abbey & J D Abbey, 12 January 2024
-//
-//
-// Description:
-//
-// Menu button that renders a Home Assistant Template, and optionally triggers a service.
-//
-// Reference:
-//  * https://developers.home-assistant.io/docs/api/rest/
-//  * https://www.home-assistant.io/docs/configuration/templating
-//
-//-----------------------------------------------------------------------------------
-
-using Toybox.Lang;
-using Toybox.WatchUi;
-using Toybox.Graphics;
-
-class HomeAssistantTemplateMenuItem extends WatchUi.IconMenuItem {
-    private var mHomeAssistantService as HomeAssistantService;
-    private var mTemplate             as Lang.String;
-    private var mService              as Lang.String or Null;
-    private var mConfirm              as Lang.Boolean;
-    private var mData                 as Lang.Dictionary or Null;
-
-    function initialize(
-        label     as Lang.String or Lang.Symbol,
-        template  as Lang.String,
-        service   as Lang.String or Null,
-        confirm   as Lang.Boolean,
-        data      as Lang.Dictionary or Null,
-        icon      as Graphics.BitmapType or WatchUi.Drawable,
-        options   as {
-            :alignment as WatchUi.MenuItem.Alignment
-        } or Null,
-        haService as HomeAssistantService
-    ) {
-        WatchUi.IconMenuItem.initialize(
-            label,
-            null,
-            null,
-            icon,
-            options
-        );
-
-        mHomeAssistantService = haService;
-        mTemplate             = template;
-        mService              = service;
-        mConfirm              = confirm;
-        mData                 = data;
-    }
-
-    function buildTemplate() as Lang.String or Null {
-        return mTemplate;
-    }
-
-    function updateState(data as Lang.String or Lang.Dictionary or Null) as Void {
-        if (data == null) {
-            setSubLabel($.Rez.Strings.Empty);
-        } else if(data instanceof Lang.String) {
-            setSubLabel(data);
-        } else if(data instanceof Lang.Dictionary) {
-            // System.println("HomeAsistantTemplateMenuItem updateState() data = " + data);
-            if (data.get("error") != null) {
-                setSubLabel($.Rez.Strings.TemplateError);
-            } else {
-                setSubLabel($.Rez.Strings.PotentialError);
-            }
-        } else {
-            // The template must return a Lang.String, a number can be either integer or float and hence cannot be formatted locally without error.
-            setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
-        }
-        WatchUi.requestUpdate();
-    }
-
-    function callService() as Void {
-        if (mConfirm) {
-            WatchUi.pushView(
-                new HomeAssistantConfirmation(),
-                new HomeAssistantConfirmationDelegate(method(:onConfirm), false),
-                WatchUi.SLIDE_IMMEDIATE
-            );
-        } else {
-            onConfirm(false);
-        }
-    }
-
-    // NB. Parameter 'b' is ignored
-    function onConfirm(b as Lang.Boolean) as Void {
-        if (mService != null) {
-            mHomeAssistantService.call(mService, mData);
-        }
-    }
-
-}

source/HomeAssistantView.mc

@@ -63,15 +63,8 @@ class HomeAssistantView extends WatchUi.Menu2 {
                 if (type != null && name != null) {
                     if (type.equals("toggle") && entity != null) {
                         addItem(HomeAssistantMenuItemFactory.create().toggle(name, entity, content, confirm));
-                    } else if (type.equals("template") && content != null) {
+                    } else if ((type.equals("tap") && service != null) || (type.equals("template") && content != null)) {
-                        if (service == null) {
+                        addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, content, service, confirm, data));
-                            addItem(HomeAssistantMenuItemFactory.create().template_notap(name, content));
-                        } else {
-                            addItem(HomeAssistantMenuItemFactory.create().template_tap(name, entity, content, service, confirm, data));
-                        }
-
-                    } else if (type.equals("tap") && service != null) {
-                        addItem(HomeAssistantMenuItemFactory.create().tap(name, entity, service, confirm, data));
                     } else if (type.equals("group")) {
                         addItem(HomeAssistantMenuItemFactory.create().group(items[i], content));
                     }
@@ -80,7 +73,7 @@ class HomeAssistantView extends WatchUi.Menu2 {
         }
     }
 
-    function getItemsToUpdate() as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTemplateMenuItem> {
+    function getItemsToUpdate() as Lang.Array<HomeAssistantToggleMenuItem or HomeAssistantTapMenuItem or HomeAssistantGroupMenuItem> {
         var fullList = [];
         var lmi = mItems as Lang.Array<WatchUi.MenuItem>;
 
@@ -95,8 +88,11 @@ class HomeAssistantView extends WatchUi.Menu2 {
                 fullList.addAll(item.getMenuView().getItemsToUpdate());
             } else if (item instanceof HomeAssistantToggleMenuItem) {
                 fullList.add(item);
-            } else if (item instanceof HomeAssistantTemplateMenuItem) {
+            } else if (item instanceof HomeAssistantTapMenuItem) {
-                fullList.add(item);
+                var tmi = item as HomeAssistantTapMenuItem;
+                if (tmi.hasTemplate()) {
+                    fullList.add(item);
+                }
             }
         }
 
@@ -156,10 +152,6 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
             var haItem = item as HomeAssistantTapMenuItem;
             // System.println(haItem.getLabel() + " " + haItem.getId());
             haItem.callService();
-        } else if (item instanceof HomeAssistantTemplateMenuItem) {
-            var haItem = item as HomeAssistantTemplateMenuItem;
-            // System.println(haItem.getLabel() + " " + haItem.getId());
-            haItem.callService();
         } else if (item instanceof HomeAssistantGroupMenuItem) {
             var haMenuItem = item as HomeAssistantGroupMenuItem;
             // System.println("IconMenu: " + haMenuItem.getLabel() + " " + haMenuItem.getId());