Merge pull request #26 from Samsung/dev

Release 1.1.7
Samsung · Jun 29, 2021 · acb89b8 · acb89b8
2 parents 8a0033d + a173390
commit acb89b8
Show file tree

Hide file tree

Showing 3 changed files with 875 additions and 814 deletions.
diff --git a/101-SmartThings.html b/101-SmartThings.html
@@ -374,7 +374,7 @@ <h3>Properties</h3>
     </div>
     <div class="logging-options">
         <label><i class="fa fa-align-right"></i> Log</label>
-        <div>            
+        <div>
             <input id="node-input-loggingEditor" type="checkbox" value="true" >
             <span class="logging-options__label" label_for="node-input-loggingEditor">Log to editor debug panel</span><br>
             <input id="node-input-loggingConsole" type="checkbox" value="false">
@@ -868,14 +868,6 @@ <h3>Properties</h3>
 		}
     }
 
-    var validateAutomationNext = function (id) {
-        //Automation 뒤에는 on device(event) 만 올 수 있다 (input 1, 해당 input port 에 연결된 wires 도 하나)
-        var backLinks = RED.nodes.filterLinks({"source": {"id": id}});
-        if (backLinks.length != 1) return false;
-        if (backLinks[0].target["type"] !== "event-device") return false;
-        return true;
-    }
-
     const SmartThingsProfile = new _SmartThingsProfile();
     SmartThingsProfile.loadMydeviceInfo()
         .then(SmartThingsProfile.setMyDeviceInfos)
@@ -895,7 +887,6 @@ <h3>Properties</h3>
     const ST_AUTOMATION = 'automation';
     const ST_DEVICE_NODES=[ST_EVENT_DEVICE,ST_STATUS_DEVICE,ST_COMMAND_DEVICE]
     const ST_NODES=[ST_AUTOMATION,ST_DEVICE_PROFILE,ST_MY_DEVICE,ST_EVENT_DEVICE,ST_STATUS_DEVICE,ST_COMMAND_DEVICE];
-    var stDevice = {};
 
     function STRefCheck() {
 
@@ -1119,9 +1110,7 @@ <h3>Properties</h3>
             return this.name|| this.alias || "My Device";
         },
         onpaletteadd: function(){
-
 
-
         },
         oneditsave: function () {
             if(document.querySelectorAll('#md_list .md_list__device.md_list__item--selected').length>0){
@@ -1324,11 +1313,12 @@ <h3>Properties</h3>
                 required: true
             },
             urlDate: {value: ""},
-            eqtype: {
-                value: "", validate: function (v) {
-                    return validateAutomationNext(this.id);
-                }
-            },
+			eqtype: {
+				value: "", validate: function (v) {
+					const after = RED.nodes.filterLinks({"source": {"id": this.id}});
+					return after.every(link=>link.target && link.target.type===ST_EVENT_DEVICE);
+				}
+			},
             loggingEditor:{value:false},
             loggingConsole:{value:false}
         },
@@ -1837,8 +1827,8 @@ <h3>Properties</h3>
                     fieldConfig.types.push({
                             value:"enum",
                             label:"enum",
-                            options:valueProp.enum || valueProp.items.enum,
-                            icon:"red/images/typedInput/AZ.png"
+                            // icon:"red/images/typedInput/AZ.png",
+                            options:valueProp.enum || valueProp.items.enum
                     });
                     fieldConfig.default = 'enum';
                 }else if (valueProp.type == 'string' ) {
@@ -1906,7 +1896,7 @@ <h3>Properties</h3>
                         fieldConfig.types.push({
                             value:"color",
                             label:"color",
-                            icon:"red/images/typedInput/target.png",
+                            // icon:"red/images/typedInput/target.png",
                             hasValue:false
                         });
                         fieldConfig.default = 'color';