Track connected uib node by ID not just url to better handle uib rena…

…mes.

src/editor/uib-sender/editor.js

@@ -14,6 +14,9 @@
     /** Node's background color @constant {string} paletteColor */
     const paletteColor  = '#E6E0F8'
 
+    /** Copy of all deployed uibuilder node instances */
+    let uibInstances = null
+
     /** Get all of the current uibuilder URL's */
     function getUrls() {
         $.ajax({
@@ -25,12 +28,15 @@
                 'cmd': 'listinstances',
             },
             success: function(instances) {
-                // console.log('>>>>', instances)
+                console.log('>> Instances >>', instances, Object.entries(instances) )
+
+                uibInstances = instances
 
-                Object.keys(instances).forEach( (val, i, arr) => {
+                Object.keys(instances).forEach( (key, i, arr) => {
                     $('#node-input-url').append($('<option>', {
-                        value: instances[val],
-                        text: instances[val],
+                        value: instances[key],
+                        text: instances[key],
+                        'data-id': key,
                     }))
                 })
 
@@ -43,6 +49,8 @@
      * @param {*} node A node instance as seen from the Node-RED Editor
      */
     function onEditPrepare(node) {
+        console.log('uib-sender onEditPrepare ', node)
+
         // initial checkbox states
         if (!node.passthrough) node.passthrough = false
         $('#node-input-passthrough')
@@ -73,23 +81,55 @@
 
         // Deal with the url
         getUrls()
-        // $('#node-input-url')
-        //     .on('change', function() {
-        //         console.log('>>>>', this.value)
-        //     })
+
+        if ( node.uibId in uibInstances ) {
+            // console.log( 'uibuilder node ID is known', node.url, node.uibId)
+            // We know the ID, always look up the latest name
+            const chkUrl = uibInstances[node.uibId]
+            if (chkUrl !== node.url) { // The url for this node changed so force a re-deploy
+                RED.nodes.dirty(true)
+                node.changed = true
+            }
+            node.url = uibInstances[node.uibId]
+        } else if ( Object.values(uibInstances).includes(node.url) ) {
+            // console.log( 'We didnt know the id but we found the url', node.url, node.uibId, Object.keys(uibInstances)[Object.values(uibInstances).indexOf(node.url)])
+            // We didn't know the ID but we know the last url so set the ID - always force a redeploy in this case
+            node.uibId = uibInstances[Object.keys(uibInstances)[Object.values(uibInstances).indexOf(node.url)]]
+            RED.nodes.dirty(true)
+            node.changed = true
+        } else {
+            // console.log( 'Neither id nor url found', node.url, node.uibId)
+            node.valid = false
+        }
+
+        $('#node-input-url')
+            .on('change', function() {
+                node.uibId = Object.keys(uibInstances)[Object.values(uibInstances).indexOf(this.value)]
+                // console.log('>> URL Change >>', this.value, node.uibId, Object.keys(uibInstances)[Object.values(uibInstances).indexOf(this.value)])
+            })
+
         if ( node.url && node.url.length > 0 ) {
             $(`#node-input-url option[value="${node.url}"]`).prop('selected', true)
             $('#node-input-url').val(node.url)
         }
 
     } // ----- end of onEditPrepare() ----- //
 
+    /** When node type is added to the palette
+     * Which happens on load of the Editor
+     * @param {*} node -
+     */
+    function onPaletteAdd(node) {
+        // console.log('uib-sender onPaletteAdd ', node)
+    } // ---- End of onPaletteAdd ---- //
+
     // @ts-ignore
     RED.nodes.registerType(moduleName, {
         category: paletteCategory,
         color: paletteColor,
         defaults: {
             url: { value: '', required: true },
+            uibId: { value: '' }, // ID of selected uibuilder instance
             name: { value: '' },
             topic: { value: '' },
             passthrough: { value: false },
@@ -107,6 +147,9 @@
 
         oneditprepare: function() { onEditPrepare(this) },
 
+        /** When this node is added to the palette - happens on (re)load of Editor as well */
+        onpaletteadd: function() { onPaletteAdd(this) },
+
     }) // ---- End of registerType() ---- //
 
 }())

src/editor/uib-sender/panel.html

@@ -1,7 +1,7 @@
 <div aria-label="uibuilder URL to associate with" class="form-row" title="uibuilder URL to associate with">
     <label for="node-input-url"><i class="fa fa-globe"></i> URL</label>
     <select id="node-input-url">
-        <option value="">--choose a uibuilder instance--</option>
+        <option value="" name="">--choose a uibuilder instance--</option>
     </select>
 </div>
 

typedefs.js

@@ -342,6 +342,7 @@
  *   passthrough: boolean;
  *   return: boolean;
  *   url: string;
+ *   uibId: string;
  * }} senderNode1
  */