@gregoriusrippenstein/node-red-contrib-nodedev 0.0.7 → 0.0.8

package/nodes/10-node-factory.html

@@ -4,13 +4,6 @@
         <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-name" placeholder="Name"></div>
     </div>
 
-    <div class="form-row">
-        <label for="node-input-autoimport">
-                <span>Auto Import of Nodes?</span>
-            </label>
-        <input type="checkbox" id="node-input-autoimport" style="display:inline-block; width:15px; vertical-align:baseline;">
-    </div>
-
     <div class="form-row">
         <label for="node-input-nodename"><i class="fa fa-tag"></i> Node Name</label>
         <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-nodename" placeholder="Node Name">
@@ -69,6 +62,12 @@
         </div>
     </div>
 
+
+    <div class="form-row">
+        <button id="node-input-generate-tmplnodes-but"
+                     class="red-ui-button">Generate Template Nodes</button>
+    </div>
+
 </script>
 
 <script type="text/javascript">
@@ -76,25 +75,37 @@
 
    RED.comms.subscribe("nodedev:perform-autoimport-nodes", (event,data) => {
      if ( data.msg == "autoimport" ) {
-        RED.clipboard.import();
-        
         setTimeout(() => {
-            $('#red-ui-clipboard-dialog-import-text').val(
-               data.payload
-            ).trigger("paste");
-        }, 300);
+            RED.clipboard.import();
+        
+            setTimeout(() => {
+                $('#red-ui-clipboard-dialog-import-text').val(
+                   data.payload
+                ).trigger("paste");
+            }, 300);
+        },400)
      }
     });
 
     function doSubmission(node) {
 
         var data = {};
-        Object.keys(node._def.defaults).forEach( (nam) => {
-            data[nam] = node[nam]
-        })
-        data["name"] = node.nodename;
-        data["__task"] = "generate_from_templates";
-        
+
+        /* the data has not been stored on the node when this is called, 
+            need to retrieve everything from the various fields...
+        */
+        data["summary"]     = node.editorSummary.getValue();
+        data["description"] = node.editorDesc.getValue();
+        data["hasbutton"]   = $('#node-input-hasbutton').is(":checked");
+        data["hasinput"]    = $('#node-input-hasinput').is(":checked");
+        data["color"]       = $('#node-input-colour').val();
+        data["icon"]        = $('#red-ui-editor-node-icon').val();
+        data["name"]        = $('#node-input-nodename').val();
+        data["outputcount"] = $('#node-input-outputcount').val();
+        data["category"]    = $('#node-input-category').val();
+
+        data["__task"]      = "generate_from_templates";
+                
         $.ajax({
             url: "NodeFactory/" + node.id,
             type: "POST",
@@ -105,22 +116,19 @@
             }),
 
             success: function (resp) {
+                $('#node-dialog-ok').trigger('click');
+
                 RED.notify("Data sent", {
                     type: "warning",
-                    id: "FlowHubPush",
                     timeout: 2000
                 });
             },
 
             error: function (jqXHR, textStatus, errorThrown) {
                 if (jqXHR.status == 404) {
-                    RED.notify(node._("common.notification.error", {
-                        message: node._("common.notification.errors.not-deployed")
-                    }), "error");
+                    RED.notify("Node has not yet been deployed, please deploy.", "error");
                 } else if (jqXHR.status == 405) {
-                    RED.notify(node._("common.notification.not_allowed", {
-                        message: node._("inject.errors.not_allowed")
-                    }), "error");
+                    RED.notify("Not Allowed.", "error");
                 } else if (jqXHR.status == 500) {
                     RED.notify(node._("common.notification.error", {
                         message: node._("inject.errors.failed")
@@ -150,7 +158,6 @@
             hasbutton: { value: false },
             hasinput: { value: true },
             outputcount: { value: 1 },
-            autoimport: { value: true },
             category: { value: "" },
             summary: { value: ""},
             description: { value: ""},
@@ -178,6 +185,11 @@
             
             sltObj.val(this.outputcount || "1");
 
+            $('#node-input-generate-tmplnodes-but').on('click', (e) => {
+                e.preventDefault()
+                doSubmission(that)
+            });
+
             var colorPalette = [
                 "#DDAA99",
                 "#3FADB5", "#87A980", "#A6BBCF",
@@ -290,22 +302,7 @@
 
         oneditresize: function (size) {
         },
-
-        button: {
-            enabled: function () {
-                return !this.changed
-            },
-
-            onclick: function () {
-                if (this.changed) {
-                    return RED.notify(RED._("notification.warning", {
-                        message: RED._("notification.warnings.undeployedChanges")
-                    }), "warning");
-                }
-
-                doSubmission(this)
-            }
-        },
     });
 })();
+
 </script>

package/nodes/10-node-factory.js

@@ -213,18 +213,16 @@ module.exports = function (RED) {
 
                             send({ payload: nodeImpStr })
 
-                            if (cfg.autoimport) {
-                                RED.comms.publish(
-                                    "nodedev:perform-autoimport-nodes",
-                                    RED.util.encodeObject({
-                                        msg: "autoimport",
-                                        payload: nodeImpStr,
-                                        topic: msg.topic,
-                                        nodeid: node.id,
-                                        _msg: msg
-                                    })
-                                );
-                            }
+                            RED.comms.publish(
+                                "nodedev:perform-autoimport-nodes",
+                                RED.util.encodeObject({
+                                    msg: "autoimport",
+                                    payload: nodeImpStr,
+                                    topic: msg.topic,
+                                    nodeid: node.id,
+                                    _msg: msg
+                                })
+                            );
 
                             done()
                         }).catch((err) => {
@@ -316,18 +314,16 @@ module.exports = function (RED) {
                         msg.payload = JSON.stringify(allFiles);
                         send(msg)
 
-                        if (cfg.autoimport) {
-                            RED.comms.publish(
-                                "nodedev:perform-autoimport-nodes",
-                                RED.util.encodeObject({
-                                    msg: "autoimport",
-                                    payload: msg.payload,
-                                    topic: msg.topic,
-                                    nodeid: node.id,
-                                    _msg: msg
-                                })
-                            );
-                        }
+                        RED.comms.publish(
+                            "nodedev:perform-autoimport-nodes",
+                            RED.util.encodeObject({
+                                msg: "autoimport",
+                                payload: msg.payload,
+                                topic: msg.topic,
+                                nodeid: node.id,
+                                _msg: msg
+                            })
+                        );
 
                         done()
                     })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@gregoriusrippenstein/node-red-contrib-nodedev",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "dependencies": {
     "pako":          "latest",
     "tar-stream":    "latest",