@gregoriusrippenstein/node-red-contrib-nodedev 0.2.7 → 0.2.9

package/nodes/10-node-factory.html

@@ -132,34 +132,7 @@
         }
     });
 
-    function doSubmission(node) {
-
-        var data = {};
-
-        /* 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["color"]       = $('#node-input-colour').val();
-        data["icon"]        = $('#red-ui-editor-node-icon').val();
-        data["iconclass"]   = "fa " + data["icon"].split("/")[1]; /* Assume font-awesomeness */
-        data["name"]        = $('#node-input-nodename').val();
-        data["namelwr"]     = data["name"].toLowerCase();
-        data["outputcount"] = $('#node-input-outputcount').val();
-        data["category"]    = $('#node-input-category').val();
-
-        data["hasbutton"]      = $('#node-input-hasbutton').is(":checked");
-        data["minify"]         = $('#node-input-minify').is(":checked");
-        data["hasinput"]       = $('#node-input-hasinput').is(":checked");
-        data["bak2frtcomm"]    = $('#node-input-bak2frtcomm').is(":checked");
-        data["frt2bakcomm"]    = $('#node-input-frt2bakcomm').is(":checked");
-        data["createmanifest"] = $('#node-input-createmanifest').is(":checked");
-        data["isplugin"]       = $('#node-input-isplugin').is(":checked");
-
-        data["__task"]      = "generate_from_templates";
-                
+    function postDataOff(node,data) {
         $.ajax({
             url: "NodeFactory/" + node.id,
             type: "POST",
@@ -201,7 +174,52 @@
             }
         });
     }
-    
+
+    function doSubmission(node) {
+        let data = {};
+
+        /* 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["color"]       = $('#node-input-colour').val();
+        data["icon"]        = $('#red-ui-editor-node-icon').val();
+        data["iconclass"]   = "fa " + data["icon"].split("/")[1]; /* Assume font-awesomeness */
+        data["name"]        = $('#node-input-nodename').val();
+        data["namelwr"]     = data["name"].toLowerCase();
+        data["outputcount"] = $('#node-input-outputcount').val();
+        data["category"]    = $('#node-input-category').val();
+
+        data["hasbutton"]      = $('#node-input-hasbutton').is(":checked");
+        data["minify"]         = $('#node-input-minify').is(":checked");
+        data["hasinput"]       = $('#node-input-hasinput').is(":checked");
+        data["bak2frtcomm"]    = $('#node-input-bak2frtcomm').is(":checked");
+        data["frt2bakcomm"]    = $('#node-input-frt2bakcomm').is(":checked");
+        data["createmanifest"] = $('#node-input-createmanifest').is(":checked");
+        data["isplugin"]       = $('#node-input-isplugin').is(":checked");
+
+        data["__task"]      = "generate_from_templates";
+
+        postDataOff(node,data)        
+    }
+
+    function doButtonSubmission(node) {
+        let data = {}
+
+        Object.keys(node._def.defaults).forEach( attrname => {
+            data[attrname] = node[attrname]
+        })
+
+        data["name"]      = node.nodename; // name clashes with the default 'name' attribute
+        data["namelwr"]   = data["name"].toLowerCase();
+        data["iconclass"] = "fa " + data["icon"].split("/")[1]; /* Assume font-awesomeness */
+        data["__task"]    = "generate_from_templates";
+        
+        postDataOff(node,data)
+    }
+
     RED.nodes.registerType('NodeFactory', {
         color: "#e5e4ef",
         category: 'nodedev',
@@ -364,6 +382,22 @@
 
         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");
+                }
+
+                doButtonSubmission(this)
+            }
+        },
     });
 })();
 

package/nodes/10-node-factory.js

@@ -225,6 +225,7 @@ module.exports = function (RED) {
 
     function createSimpleNodeDefintions(msg,node) {
         var htmlPath = path.join(__dirname, 'templates', 'tmpl.html');
+        var htmlJsPath = path.join(__dirname, 'templates', 'tmpl.html.js');
         var jsPath = path.join(__dirname, 'templates', 'tmpl.js');
         var localeJsonPath = path.join(__dirname, 'templates', 'locale', 'en-US', 'tmpl.json')
         var localeHtmlPath = path.join(__dirname, 'templates', 'locale', 'en-US', 'tmpl.html')
@@ -233,6 +234,7 @@ module.exports = function (RED) {
 
         var promises = [
             handleTemplate(msg, node, fs.readFileSync(htmlPath, 'utf8')).then((c) => { content["html"] = c }),
+            handleTemplate(msg, node, fs.readFileSync(htmlJsPath, 'utf8')).then((c) => { content["htjs"] = c }),
             handleTemplate(msg, node, fs.readFileSync(jsPath, 'utf8')).then((c) => { content["jasc"] = c }),
             handleTemplate(msg, node, fs.readFileSync(localeJsonPath, 'utf8')).then((c) => { content["ljsn"] = c }),
             handleTemplate(msg, node, fs.readFileSync(localeHtmlPath, 'utf8')).then((c) => { content["lhtm"] = c }),
@@ -240,6 +242,7 @@ module.exports = function (RED) {
 
         return Promise.all(promises).then(() => {
             var secondId = RED.util.generateId();
+            var secondIdTempJs = RED.util.generateId();
             var thirdId = RED.util.generateId();
             var fourthId = RED.util.generateId();
 
@@ -254,7 +257,24 @@ module.exports = function (RED) {
                 output: "str",
                 x: 100,
                 y: 50,
-                wires: [[secondId]]
+                wires: [[secondIdTempJs]]
+            },
+            {
+                "id": secondIdTempJs,
+                "type": "template",
+                "name": msg.node.name + ".html.js",
+                "field": msg.node.name+ "TmplJs",
+                "fieldType": "msg",
+                "format": "javascript",
+                "syntax": "mustache",
+                "template": content["htjs"],
+                "x": 100,
+                "y": 100,
+                "wires": [
+                    [
+                        secondId
+                    ]
+                ]
             },
             {
                 id: secondId,
@@ -266,7 +286,7 @@ module.exports = function (RED) {
                 format: "html",
                 output: "str",
                 x: 100,
-                y: 100,
+                y: 150,
                 wires: [[thirdId]]
             },
             {
@@ -279,7 +299,7 @@ module.exports = function (RED) {
                 format: "json",
                 output: "str",
                 x: 120,
-                y: 150,
+                y: 200,
                 wires: [[fourthId]]
             },
             {
@@ -292,7 +312,7 @@ module.exports = function (RED) {
                 format: "html",
                 output: "str",
                 x: 120,
-                y: 200,
+                y: 250,
                 wires: [[]]
             }
             ]

package/nodes/templates/locale/en-US/tmpl.json

@@ -1,5 +1,5 @@
 {
-  "{{ node.name }}": {
+  "{{ node.namelwr }}": {
 {{#node.bak2frtcomm}}
       "label": {
          "commfrombackend": "Backend sent something to the frontend - check browser console.",
@@ -10,6 +10,8 @@
           "buttonpressed": "button pressed on frontend",
           "success": "Successfully sent something to the backend"
   {{ /node.frt2bakcomm }}
+         ,
+          "statusset": "Status Set"
       },
 {{/node.bak2frtcomm}}
 
@@ -18,7 +20,8 @@
       "label": {
           "submissionfailed": "submission failed",
           "buttonpressed": "button pressed on frontend",
-          "success": "Successfully sent something to the backend"
+          "success": "Successfully sent something to the backend",
+          "statusset": "Status Set"
       },
   {{/node.frt2bakcomm }}
 {{/node.bak2frtcomm}}
@@ -26,17 +29,11 @@
 {{^node.bak2frtcomm}}
   {{^node.frt2bakcomm }}
     "label": {
-      "hello": "world"
+      "statusset": "Status Set"
     },
   {{/node.frt2bakcomm }}
 {{/node.bak2frtcomm}}
 
-    "error": {
-
-    },
-    "tip": {
-
-    },
     "status": {
       "waiting": "Waiting for Godot",
       "timeout": "No more time to waiting"

package/nodes/templates/tmpl.html

@@ -1,145 +1,5 @@
 <script type="text/javascript">
-(function(){
-  
-{{ #node.frt2bakcomm }}
-    function sendToBackend(node,data = {}) {
-
-      $.ajax({
-        url:         "{{ node.name }}/" + node.id,
-        type:        "POST",
-        contentType: "application/json; charset=utf-8",
-
-        data: JSON.stringify({
-          ...data,
-          hello:  "world",
-        }),
-
-        success: function (resp) {
-          RED.notify( RED._("{{ node.name}}.label.success"), {
-            type: "warning",
-            id: "{{node.name}}",
-            timeout: 2000
-          });
-        },
-
-        error: function (jqXHR, textStatus, errorThrown) {
-          if (jqXHR.status == 404) {
-            RED.notify("Node has not yet been deployed, please deploy.", "error");
-          } else if (jqXHR.status == 405) {
-            RED.notify("Not Allowed.", "error");
-          } else if (jqXHR.status == 500) {
-            RED.notify(node._("common.notification.error", {
-              message: node._("inject.errors.failed")
-            }), "error");
-          } else if (jqXHR.status == 0) {
-            RED.notify(node._("common.notification.error", {
-              message: node._("common.notification.errors.no-response")
-            }), "error");
-          } else {
-            RED.notify(node._("common.notification.error", {
-              message: node._("common.notification.errors.unexpected", {
-                status: jqXHR.status, message: textStatus }) }), "error");
-          }
-        }
-      });
-    }
-{{ /node.frt2bakcomm }}
-
-  function frontendSupportFunction() {
-  }
-
-  var functTwo = (arg) => {
-
-  };
-  
-  RED.nodes.registerType('{{ node.name }}',{
-    color: '{{ node.color }}',
-    icon: "{{{ node.icon }}}",
-    category: '{{ node.category }}',
-    defaults: {
-      name: {
-        value:"",
-      },
-    {{#node.minify}}
-      l: { value: false },
-    {{/node.minify}}
-    },
-
-    {{#node.hasinput}}
-    inputs: 1,
-    {{/node.hasinput}}
-    {{^node.hasinput}}
-    inputs: 0,
-    {{/node.hasinput}}
-
-    outputs: {{ node.outputcount }},
-
-    label: function() {
-      return (this.name || this._def.paletteLabel);
-    },
-
-    labelStyle: function() {
-      return this.name?"node_label_italic":"";
-    },
-
-    onpaletteadd: function() {
-      {{#node.bak2frtcomm}}
-      this.messageFromBackendHandler = (topic,dataobj) => {
-        console.log( "here goes the code for handling a message from the backend", topic, dataobj);
-
-        RED.notify(RED._("{{ node.name}}.label.commfrombackend"), {
-            type: "success",
-            id: "{{node.name}}",
-            timeout: 2000
-        });
-      };
-      RED.comms.subscribe('{{node.name}}:message-from-backend',this.messageFromBackendHandler);
-      {{/node.bak2frtcomm}}
-    },
-
-    onpaletteremove: function() {
-      {{#node.bak2frtcomm}}
-      RED.comms.unsubscribe('{{node.name}}:message-from-backend',this.messageFromBackendHandler);
-      {{/node.bak2frtcomm}}
-    },
-
-    oneditprepare: function() {
-    },
-
-    oneditcancel: function() {
-    },
-
-    oneditsave: function() {
-    },
-
-    oneditresize: function(size) {
-    },
-
-    {{#node.hasbutton}}
-    button: {
-      enabled: function() {
-        return !this.changed
-      },
-
-      onclick: function () {
-        if (this.changed) {
-          return RED.notify(RED._("notification.warning", {
-            message: RED._("notification.warnings.undeployedChanges")
-          }), "warning");
-        }
-
-        {{ #node.frt2bakcomm }}
-        var that = this;
-        sendToBackend(that, {"payload": RED._("{{ node.name}}.label.buttonpressed")})
-        {{ /node.frt2bakcomm }}
-
-        /* here goes the button code to be executed on click */
-      }
-    },
-    {{/node.hasbutton}}
-
-  });
-})();
+  {{ __.ocb3 }} {{ node.name }}TmplJs {{ __.ccb3 }}
 </script>
 
 <script type="text/html" data-template-name="{{ node.name }}">

package/nodes/templates/tmpl.html.js

@@ -0,0 +1,139 @@
+(function(){
+  
+{{ #node.frt2bakcomm }}
+    function sendToBackend(node,data = {}) {
+
+      $.ajax({
+        url:         "{{ node.name }}/" + node.id,
+        type:        "POST",
+        contentType: "application/json; charset=utf-8",
+
+        data: JSON.stringify({
+          ...data,
+          hello:  "world",
+        }),
+
+        success: function (resp) {
+          RED.notify( node._("{{ node.namelwr }}.label.success"), {
+            type: "warning",
+            timeout: 2000
+          });
+        },
+
+        error: function (jqXHR, textStatus, errorThrown) {
+          if (jqXHR.status == 404) {
+            RED.notify("Node has not yet been deployed, please deploy.", "error");
+          } else if (jqXHR.status == 405) {
+            RED.notify("Not Allowed.", "error");
+          } else if (jqXHR.status == 500) {
+            RED.notify(node._("common.notification.error", {
+              message: node._("inject.errors.failed")
+            }), "error");
+          } else if (jqXHR.status == 0) {
+            RED.notify(node._("common.notification.error", {
+              message: node._("common.notification.errors.no-response")
+            }), "error");
+          } else {
+            RED.notify(node._("common.notification.error", {
+              message: node._("common.notification.errors.unexpected", {
+                status: jqXHR.status, message: textStatus }) }), "error");
+          }
+        }
+      });
+    }
+{{ /node.frt2bakcomm }}
+
+  function frontendSupportFunction() {
+  }
+
+  var functTwo = (arg) => {
+
+  };
+  
+  RED.nodes.registerType('{{ node.name }}',{
+    color: '{{ node.color }}',
+    icon: "{{{ node.icon }}}",
+    category: '{{ node.category }}',
+    defaults: {
+      name: {
+        value:"",
+      },
+    {{#node.minify}}
+      l: { value: false },
+    {{/node.minify}}
+    },
+
+    {{#node.hasinput}}
+    inputs: 1,
+    {{/node.hasinput}}
+    {{^node.hasinput}}
+    inputs: 0,
+    {{/node.hasinput}}
+
+    outputs: {{ node.outputcount }},
+
+    label: function() {
+      return (this.name || this._def.paletteLabel);
+    },
+
+    labelStyle: function() {
+      return this.name?"node_label_italic":"";
+    },
+
+    onpaletteadd: function() {
+      {{#node.bak2frtcomm}}
+      this.messageFromBackendHandler = (topic,dataobj) => {
+        console.log( "here goes the code for handling a message from the backend", topic, dataobj);
+
+        RED.notify(this._("{{ node.namelwr}}.label.commfrombackend"), {
+            type: "success",
+            timeout: 2000
+        });
+      };
+      RED.comms.subscribe('{{node.name}}:message-from-backend',this.messageFromBackendHandler);
+      {{/node.bak2frtcomm}}
+    },
+
+    onpaletteremove: function() {
+      {{#node.bak2frtcomm}}
+      RED.comms.unsubscribe('{{node.name}}:message-from-backend',this.messageFromBackendHandler);
+      {{/node.bak2frtcomm}}
+    },
+
+    oneditprepare: function() {
+    },
+
+    oneditcancel: function() {
+    },
+
+    oneditsave: function() {
+    },
+
+    oneditresize: function(size) {
+    },
+
+    {{#node.hasbutton}}
+    button: {
+      enabled: function() {
+        return !this.changed
+      },
+
+      onclick: function () {
+        if (this.changed) {
+          return RED.notify(RED._("notification.warning", {
+            message: RED._("notification.warnings.undeployedChanges")
+          }), "warning");
+        }
+
+        {{ #node.frt2bakcomm }}
+        var that = this;
+        sendToBackend(that, { "payload": that._("{{ node.namelwr}}.label.buttonpressed")})
+        {{ /node.frt2bakcomm }}
+
+        /* here goes the button code to be executed on click */
+      }
+    },
+    {{/node.hasbutton}}
+
+  });
+})();

package/nodes/templates/tmpl.js

@@ -15,12 +15,12 @@ module.exports = function(RED) {
         RED.comms.publish("{{node.name}}:message-from-backend",
                RED.util.encodeObject({
                   ...msg,
-                 "data": RED._("{{ node.name}}.label.msgfrombackend"),
+                 "data": RED._("{{ node.namelwr}}.label.msgfrombackend"),
                 })
         );
       {{/node.bak2frtcomm}}
         // How to send a status update
-        node.status({ fill: "green", shape: "ring", text: "status set" });
+        node.status({ fill: "green", shape: "ring", text: RED._("{{ node.namelwr}}.label.statusset") });
 
         // Send a message and how to handle errors.
         try {
@@ -66,7 +66,7 @@ module.exports = function(RED) {
         } catch (err) {
           console.error(err);
           res.status(500).send(err.toString());
-          node.error("{{ node.name }}: " + RED._("{{ node.name }}.label.submissionfailed") + ": " + err.toString(), { error: err })
+          node.error("{{ node.name }}: " + RED._("{{ node.namelwr }}.label.submissionfailed") + ": " + err.toString(), { error: err })
         }
       } else {
         res.sendStatus(404);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name" : "@gregoriusrippenstein/node-red-contrib-nodedev",
-  "version": "0.2.7",
+  "version": "0.2.9",
   "dependencies": {
     "pako":          "^2.1.0",
     "tar-stream":    "^3.1.6",