Merge pull request #59 from skylord123/fixes

Bunch of fixes and an improvement

Author: naimo84

src/docker-config-actions.ts

@@ -147,7 +147,7 @@ module.exports = function (RED: Red) {
     }
 
 
-    RED.httpAdmin.post("/configSearch", function (req, res) {
+    RED.httpAdmin.post("/configSearch", RED.auth.needsPermission('flows.write'), function (req, res) {
         RED.log.debug("POST /configSearch");
 
         const nodeId = req.body.id;

src/docker-configuration.html

@@ -22,8 +22,8 @@
 
 <script type="text/x-red" data-template-name="docker-configuration">
     <div class="form-row">
-        <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-        <input type="text" id="node-input-name">
+        <label for="node-config-input-name"><i class="fa fa-tag"></i> Name</label>
+        <input type="text" id="node-config-input-name">
     </div>
     <div class="form-row">
         <label for="node-config-input-host"><i class="icon-bookmark"></i> Host/Path to docker.sock</label>

src/docker-configuration.ts

@@ -23,7 +23,7 @@ module.exports = function (RED: Red) {
 
         let node: DockerConfiguration = this;
         node.host = n.host;
-        node.port = n.port;
+        node.port = n.port || "2375";
         node.options = n.options;
         node.ca = n.ca;
         node.key = n.key;

src/docker-container-actions.html

@@ -15,9 +15,10 @@
             imagetype: { value: "" },
             pullimage: { value: false },
             deletecontainer: { value: false },
+            outputFinished: { value: false },
             stream: { value: false },
-            createOptions: {},
-            startOptions: {},
+            createOptions: { value: "{}" },
+            startOptions: { value: "{}" },
             createOptionsType: {},
             startOptionsType: {}
         },
@@ -74,28 +75,35 @@
                     let name = element.Names[0].replace('/', '');
                     dataArray.push(name);
                 });
+                console.log("dataArray", dataArray);
             });
 
-
-
             $("#node-input-container").typedInput({
-                types: ["str", "msg"],
-                typeField: "#node-input-containertype",
-                autoComplete: function (val) {
-                    var matches = [];
-                    dataArray.forEach(v => {
-                        var i = v.toLowerCase().indexOf(val.toLowerCase());
-                        if (i > -1) {
-                            matches.push({
-                                value: v,
-                                label: v,
-                                i: i
-                            })
+                type: "node-input-container",
+                types: [
+                    {
+                        value: "str",
+                        label: "string",
+                        icon: "red/images/typedInput/az.svg",
+                        autoComplete: function (val) {
+                            console.log("autocomplete", val);
+                            var matches = [];
+                            dataArray.forEach(v => {
+                                var i = v.toLowerCase().indexOf(val.toLowerCase());
+                                if (i > -1) {
+                                    matches.push({
+                                        value: v,
+                                        label: v,
+                                        i: i
+                                    })
+                                }
+                            });
+                            matches.sort(function (A, B) { return A.i - B.i })
+                            return matches
                         }
-                    });
-                    matches.sort(function (A, B) { return A.i - B.i })
-                    return matches
-                }
+                    },
+                    "msg"
+                ],
             });
 
             $("#node-input-image").typedInput({
@@ -205,13 +213,13 @@
             <i id="node-config-lookup-uuid-icon" class="fa fa-plus-square"></i>
         </a>
     </div>
-    <div class="form-row" id="options">
+    <div class="form-row">
         <label for="node-input-image"><i class="icon-tag"></i> Image</label>
         <input type="text" id="node-input-image">
         <input type="hidden" id="node-input-imagetype">
 
     </div>
-    <div class="form-row" id="options">
+    <div class="form-row">
         <label for="node-input-options"><i class="icon-tag"></i> Options/Command</label>
         <input type="text" id="node-input-options">
         <input type="hidden" id="node-input-optionstype">
@@ -222,23 +230,26 @@
         <input type="checkbox" id="node-input-stream" style="width:auto">
     </div>
     <div id="pull-options">
-        <div class="form-row" id="options">
+        <div class="form-row">
             <label for="node-input-createOptions"><i class="icon-tag"></i> createOptions</label>
             <input type="text" id="node-input-createOptions">
             <input type="hidden" id="node-input-createOptionsType">
 
         </div>
-        <div class="form-row" id="options">
+        <div class="form-row">
             <label for="node-input-startOptions"><i class="icon-tag"></i> startOptions</label>
             <input type="text" id="node-input-startOptions">
             <input type="hidden" id="node-input-startOptionsType">
-    
         </div>
-        <div class="form-row" >
+        <div class="form-row">
             <label for="node-input-deletecontainer"><i class="icon-tag"></i> Delete Container after run</label>
             <input type="checkbox" id="node-input-deletecontainer" style="width:auto">
         </div>
-        <div class="form-row" >
+        <div class="form-row">
+            <label for="node-input-outputFinished"><i class="icon-tag"></i> Output full stdout on finish</label>
+            <input type="checkbox" id="node-input-outputFinished" style="width:auto">
+        </div>
+        <div class="form-row">
             <label for="node-input-pullimage"><i class="icon-tag"></i> Pull Image Always</label>
             <input type="checkbox" id="node-input-pullimage" style="width:auto">
             <div class="form-tips" id="hint_v1">