Improve option send as device usability

Author: mirkokurt

arduino-iot-cloud.html

@@ -54,6 +54,7 @@
 
         if (nodeName === "property out") {
             ret['sendasdevice'] = {value: false};
+            ret["device"] = {value: ""};
         }
 
         return ret;
@@ -83,6 +84,7 @@
                     }
                     initThings(this.connection, this._, this.thing, this.organization);
                     initProperties(this.connection, this.thing, this.organization, this.property, outs, this._);
+                    initDevice(this.connection, this.thing.id, this.organization, this._);
                 }
                 $("select#node-input-connection").change((e) => {
                     var msg = this._("arduino-iot-cloud.config.connection.placeholders.no-conn-selected");
@@ -105,8 +107,16 @@
                     }
                 });
                 $("#node-input-sendasdevice").change(() => {
-                    sendasdevice = $("#node-input-sendasdevice").val();
-                    this.sendasdevice = sendasdevice;
+                    if ($("#node-input-sendasdevice").is(":checked")) {
+                        const connection = $("#node-input-connection").val();
+                        const thing_id = $("#node-input-thing").val();
+                        const organization = $("#node-input-organization").val();
+                        initDevice(connection, thing_id, organization, this._);
+                        $("#node-input-device-line").show()
+                    } else {
+                        $("#node-input-device-line").hide()
+                        $("#node-input-device").val("");
+                    }
                 });
                 $("#node-input-organization").change(() => {
                     const connection = $("#node-input-connection").val();
@@ -143,6 +153,7 @@
                         } else {
                             $("select#node-input-property").empty();
                             initProperties(connection, thing_id, organization, this.property, outs, this._);
+                            initDevice(connection, thing_id, organization, this._);
                         }
                     }
                 });
@@ -251,6 +262,30 @@
         }
     }
 
+    function initDevice(connection, thing_id, organization_id, label_func) {
+        let queryString = prepareQueryString(connection);
+        if (!queryString || queryString === "")
+            return;
+        if (!thing_id || thing_id === "" || thing_id === "0" || thing_id === "updating")
+            return;
+        queryString = `${queryString}&thing_id=${thing_id}`;
+
+        $("select#node-input-device").empty();
+        $("<option value='" + "updating" + "'> " + "" + "</option>").appendTo("#node-input-device");
+        $("select#node-input-device").val("updating");
+
+        setupOrganization(organization_id);
+        $.getJSON(`thing?${queryString}`, thing => {
+            $("select#node-input-device").empty();
+            msg = label_func("arduino-iot-cloud.config.node.placeholders.device-select");
+            $("<option value='" + "" + "'> " + msg + "</option>").appendTo("#node-input-device");
+            if(thing){
+                $("<option value='" + thing.device_id + "'>" + thing.device_name + "</option>").appendTo("#node-input-device");
+                $("select#node-input-device").val(thing.device_id);
+            }
+        });
+    }
+
     function initProperties(connection, thing_id, organization_id, property_id, outs, label_func) {
         let queryString = prepareQueryString(connection);
         if (!queryString || queryString === "")
@@ -394,7 +429,11 @@
       <label for="node-input-name"><i class="fa fa-tag fa-fw"></i><span data-i18n="arduino-iot-cloud.config.node.send-mode"></span></label>
       <input type="checkbox" id="node-input-sendasdevice">
   </div>
-
+  <div class="form-row" id="node-input-device-line">
+    <label for="node-input-device"><i class="fa fa-cube fa-fw"></i> <span data-i18n="arduino-iot-cloud.config.node.device-id"></span></label>
+    <select id="node-input-device" type="hidden" data-i18n="[placeholder]arduino-iot-cloud.config.node.placeholders.device-select">
+    </select>
+  </div>
 </script>
 
 

arduino-iot-cloud.js

@@ -83,24 +83,13 @@ module.exports = function (RED) {
               this.propertyId = config.property;
               this.propertyName = config.name;
               this.sendasdevice = config.sendasdevice;
-
-              if (this.sendasdevice) {
-                try {
-                  const opts = {}
-                  if (this.organization) {
-                    opts.xOrganization = this.organization;
-                  }
-                  ret = await this.arduinoRestClient.getThing(this.thing, opts);
-                  this.device_id = ret.device_id;
-                } catch (error) {
-                  // Handle API call error
-                  console.error('Error making API call:', error.message);
-                }
-              }
+              this.device = config.device
 
               this.on('input', async function (msg) {
                 try {
-                  await this.arduinoRestClient.setProperty(this.thing, this.propertyId, msg.payload, this.sendasdevice ? this.device_id : undefined);
+                  console.log("dev_id", this.device);
+                  console.log("send_device", this.sendasdevice);
+                  await this.arduinoRestClient.setProperty(this.thing, this.propertyId, msg.payload, this.sendasdevice ? this.device : undefined);
                   var s;
                   if (typeof msg.payload !== "object") {
                     s = getStatus(msg.payload);
@@ -459,7 +448,15 @@ module.exports = function (RED) {
           opts.xOrganization = organization;
         }
         return res.send(JSON.stringify(await arduinoRestClient.getProperties(thing_id, opts)));
-      } else {
+      } else if (thingsOrProperties === "device") {
+        const thing_id = req.query.thing_id;
+        const organization = req.headers.organization;
+        const opts = {}
+        if (organization) {
+          opts.xOrganization = organization;
+        }
+        return res.send(JSON.stringify(await arduinoRestClient.getThing(thing_id, opts)));
+      }else {
         str=RED._("arduino-iot-cloud.connection-error.wrong-param");
         console.log(str);
         return res.send(JSON.stringify({ error: str }));
@@ -478,6 +475,10 @@ module.exports = function (RED) {
     return getThingsOrProperties(req, res, "properties");
   });
 
+  RED.httpAdmin.get("/thing", RED.auth.needsPermission('Property-in.read'), async function (req, res) {
+    return getThingsOrProperties(req, res, "device");
+  });
+
   function getStatus(value) {
     if (typeof value !== "object") {
       if (typeof value === "number" && !(Number.isInteger(value)))

locales/en-US/arduino-iot-cloud.json

@@ -9,6 +9,7 @@
         "organization": "Space ID",
         "hist-label":"Time filter",
         "poll-label":"Poll Every",
+        "device-id": "Device",
         "send-mode":"Send as device",
         "placeholders":{
           "name":"Name",
@@ -18,7 +19,8 @@
           "no-things-available":"No things available",
           "property-select":"Select a property",
           "no-property-available":"No properties available",
-          "no-property-writable-av":"No writable properties available"
+          "no-property-writable-av":"No writable properties available",
+          "device-select":"No device associated"
         }
       },
       "time":{