node-red-contrib-huemagic 3.0.0 → 4.0.3

package/huemagic/hue-light.html

@@ -1,38 +1,40 @@
 <script type="text/x-red" data-template-name="hue-light">
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="hue-light.config.name"></span></label>
-        <input type="text" id="node-input-name" data-i18n="[placeholder]hue-light.config.input-name">
+        <input type="text" id="node-input-name" data-i18n="[placeholder]hue-light.config.input-name" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
         <label for="node-input-bridge"><i class="fa fa-server"></i> Bridge</label>
-        <input type="text" id="node-input-bridge">
+        <input type="text" id="node-input-bridge" style="width: calc(100% - 105px)">
     </div>
     <div class="form-row">
         <label for="node-input-lightid"><i class="fa fa-lightbulb-o"></i> <span data-i18n="hue-light.config.light"></span></label>
-        <div style="display: inline-block; position: relative; width: 70%; height: 20px;">
-            <div style="position: absolute; left: 0px; right: 40px;">
-                <input type="text" id="node-input-lightid" placeholder="1" style="width: 100%"/>
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <div id="input-select-toggle" style="flex-grow: 1;">
+                <input type="text" id="node-input-lightid" placeholder="00000000-0000-0000-0000-000000000000" style="width: 100%"/>
             </div>
-            <a id="node-config-input-scan-lights" class="editor-button" style="position: absolute; right: 0px; top: 0px;">
+            <button id="node-config-input-scan-lights" type="button" class="red-ui-button" style="margin-left: 10px;">
                 <i class="fa fa-search"></i>
-            </a>
+            </button>
         </div>
     </div>
-    <div class="form-row">
-        <label for="node-input-colornamer"><i class="fa fa-check-circle"></i> <span data-i18n="hue-light.config.colornamer"></span></label>
-        <label for="node-input-colornamer" style="width:70%">
-        <input type="checkbox" id="node-input-colornamer" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="hue-light.config.colornamer-info"></span>
-        </label>
+    <div class="form-row" style="margin-top: 30px">
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-colornamer" style="flex: 15px;">
+            <span data-i18n="hue-light.config.colornamer-info" style="width: 100%; margin-left: 10px;"></span>
+        </div>
     </div>
     <div class="form-row">
-        <label for="node-input-skipevents"><i class="fa fa-sign-out"></i> <span data-i18n="hue-light.config.skipevents"></span></label>
-        <input type="checkbox" id="node-input-skipevents" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="hue-light.config.skipevents-node"></span>
-        </label>
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-skipevents" style="flex: 15px;">
+            <span data-i18n="hue-light.config.skipevents-node" style="width: 100%; margin-left: 10px;"></span>
+        </div>
     </div>
     <div class="form-row">
-        <label for="node-input-universalevents"><i class="fa fa-bullhorn"></i> <span data-i18n="hue-light.config.universalevents"></span></label>
-        <input type="checkbox" id="node-input-universalevents" style="display:inline-block; width:22px; vertical-align:baseline;"><span data-i18n="hue-light.config.universalevents-node"></span>
-        </label>
+        <div style="display: inline-flex; width: calc(100% - 105px)">
+            <input type="checkbox" id="node-input-initevents" style="flex: 15px;">
+            <span data-i18n="hue-light.config.sendinitevents-node" style="width: 100%; margin-left: 10px;"></span>
+        </div>
     </div>
 </script>
 
@@ -41,96 +43,162 @@
         category: 'HueMagic',
         color: '#47c0e8',
         defaults: {
-            name: {value:""},
-            bridge: {type: "hue-bridge", required: true},
-            lightid: {value:"", required: false, validate: function(id) {
-                if(id.length < 1) { return true; }
-                else if(!isNaN(id)) { return true; }
-                else { return false; }
-            }},
-            colornamer: {value: true},
-            skipevents: {value: false},
-            universalevents: {value: false}
+            name: { value:"" },
+            bridge: { type: "hue-bridge", required: true },
+            lightid: { value:"", required: false },
+            colornamer: { value: true },
+            skipevents: { value: false },
+            initevents: { value: false }
         },
+        align: 'left',
+        icon: "hue-light.png",
         inputs: 1,
         outputs: 1,
+        label: function() {
+            return this.name || this._("hue-light.node.title");
+        },
+        paletteLabel: function() {
+            return this._("hue-light.node.title");
+        },
         inputLabels: function() {
             return this._("hue-light.node.input");
         },
         outputLabels: function() {
             return this._("hue-light.node.output");
         },
-        align: 'right',
-        icon: "hue-light.png",
-        paletteLabel: function() {
-            return this._("hue-light.node.title");
-        },
-        label: function() {
-            return this.name || this._("hue-light.node.title");
-        },
         oneditprepare: function()
         {
-            var scope = this;
+            const scope = this;
+            let options = [];
 
-            function manualLightID()
+            function manualInput()
             {
+                // GET CURRENT SELECTED VALUE
                 var current = $('#node-input-lightid').val();
-                $('#node-input-lightid').replaceWith('<input type="text" id="node-input-lightid" style="width: 100%"/>');
-                $('#node-input-lightid').val(current);
+
+                // REMOVE SELECT FIELD
+                $('#input-select-toggle').empty();
+
+                // CREATE NEW INPUT FIELD
+                $('#input-select-toggle').append('<input type="text" id="node-input-lightid" placeholder="00000000-0000-0000-0000-000000000000" style="width: 100%" value="'+current+'" />');
+
+                // CHANGE BUTTON ICON
+                var button = $("#node-config-input-scan-lights");
+                var buttonIcon = button.find("i");
+                buttonIcon.removeClass("fa-pencil");
+                buttonIcon.addClass("fa-search");
             }
 
-            function searchAndSelectLightID()
+            function searchAndSelect()
             {
+                // GET CURRENT BRIDGE CONFIGURATION
+                var bridgeConfig = RED.nodes.node($('#node-input-bridge option:selected').val());
+                if(!bridgeConfig) { return false; }
+
+                // GET CURRENT SELECTED VALUE
                 var current = $('#node-input-lightid').val();
-                $('#node-input-lightid').replaceWith('<select id="node-input-lightid" style="width: 100%"></select>');
-                $('#node-input-lightid').append('<option selected="selected" value="null">'+scope._("hue-light.config.searching")+'</option>');
 
-                var bridgeConfig = RED.nodes.node($('#node-input-bridge option:selected').val());
-                $.get('hue/lights', {bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "ZLLPresence"})
-                .done(function(data) {
-                    var lightBulbs = JSON.parse(data);
+                // TRIGGER SEARCHING NOTIFICATION
+                var notification = RED.notify(scope._("hue-light.config.searching"), { type: "compact", modal: true, fixed: true });
 
-                    if(lightBulbs.length <= 0)
+                // GET THE LIGHTS
+                $.get('hue/resources', { bridge: bridgeConfig.bridge, key: bridgeConfig.key, type: "light" })
+                .done( function(data) {
+                    var allResources = JSON.parse(data);
+                    if(allResources.length <= 0)
                     {
-                        RED.notify(scope._("hue-light.config.none-found"), "error");
+                        notification.close();
+                        RED.notify(scope._("hue-light.config.none-found"), { type: "error" });
+                        return false;
                     }
 
-                    // RESET OPTIONS
-                    $('#node-input-lightid').empty();
-
-                    // SET LIGHTS AS OPTIONS
-                    lightBulbs.forEach(function(light)
+                    // SET OPTIONS
+                    allResources.forEach(function(resource)
                     {
-                        $('#node-input-lightid').append('<option value="' + light.id + '">' + light.name + '</option>');
+                        if(resource.model)
+                        {
+                            options[resource.id] = { value: resource.id, label: resource.name + " ("+resource.model+")" };
+                        }
+                        else
+                        {
+                            options[resource.id] = { value: resource.id, label: resource.name };
+                        }
                     });
 
                     // SELECT CURRENT VALUE
-                    $('#node-input-lightid').val(current);
+                    $("#node-input-lightid").typedInput({
+                        types: [
+                            {
+                                value: current,
+                                options: Object.values(options)
+                            }
+                        ]
+                    });
+
+                    // CHANGE BUTTON ICON
+                    var button = $("#node-config-input-scan-lights");
+                    var buttonIcon = button.find("i");
+                    buttonIcon.removeClass("fa-search");
+                    buttonIcon.addClass("fa-pencil");
+
+                    // CLOSE SEARCH NOTIFICATION
+                    notification.close();
                 })
                 .fail(function()
                 {
+                    notification.close();
                     RED.notify(scope._("hue-light.config.unknown-error"), "error");
                 });
             }
 
-            $(document).on('change', '#node-input-lightid', function()
+            // CHANGED LIGHT ID? -> REPLACE NAME (IF POSSIBLE)
+            $(document).on('change', '#node-input-lightid', function(e)
             {
-                var lightName = $('#node-input-lightid option:selected').text();
-                if(lightName.length > 0)
+                let currentSelectedOptionID = $(e.currentTarget).val();
+                let currentSelectedOptionValue = (currentSelectedOptionID.length > 0 && options[currentSelectedOptionID]) ? options[currentSelectedOptionID].label : false;
+
+                if(currentSelectedOptionValue !== false)
                 {
-                    $('#node-input-name').val(lightName);
+                    $('#node-input-name').val(currentSelectedOptionValue.split(" (")[0]);
                 }
             });
 
+            // TOGGLE SELECT/INPUT FIELD
             $('#node-config-input-scan-lights').click(function()
             {
-                if($('#node-input-lightid').prop("tagName") === "INPUT")
+                if($('#input-select-toggle').find(".red-ui-typedInput-container").length > 0)
+                {
+                    manualInput();
+                }
+                else
                 {
-                    searchAndSelectLightID();
-                } else {
-                    manualLightID();
+                    searchAndSelect();
                 }
             });
+        },
+        button: {
+            enabled: function() {
+                return (this.lightid && this.lightid.length > 1)
+            },
+            visible: function() {
+                return (this.lightid && this.lightid.length > 1)
+            },
+            onclick: function()
+            {
+                const node = this;
+                if(node.bridge)
+                {
+                    $.ajax({
+                        url: "inject/" + node.id,
+                        type: "POST",
+                        data: JSON.stringify({ __user_inject_props__: "status"}),
+                        contentType: "application/json; charset=utf-8",
+                        success: function (resp) {
+                            RED.notify(node.name + ": " + node._("hue-light.node.statusmsg"), { type: "success", id: "status", timeout: 2000 });
+                        }
+                    });
+                }
+            }
         }
     });
 </script>