@gregoriusrippenstein/node-red-contrib-nodedev 0.5.1 → 0.5.3

package/nodes/10-node-factory.html

@@ -5,11 +5,17 @@
     </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">
+        <label for="node-input-nodename"><i class="fa fa-tag"></i> Node Type</label>
+        <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-nodename" placeholder="Node Type">
         </div>
     </div> 
 
+    <div class="form-row">
+        <label for="node-input-nodelabel"><i class="fa fa-tag"></i> Node Label</label>
+        <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-nodelabel" placeholder="Node Label">
+        </div>
+    </div>
+
     <div class="form-row">
         <label for="node-input-category"><i class="fa fa-tag"></i> Node Category</label>
         <div style="display: inline-block; width: calc(100% - 105px)"><input type="text" id="node-input-category" placeholder="Node Category">
@@ -195,6 +201,7 @@
         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["nodelabel"]   = $('#node-input-nodelabel').val();
         data["namelwr"]     = data["name"].toLowerCase();
         data["outputcount"] = $('#node-input-outputcount').val();
         data["category"]    = $('#node-input-category').val();
@@ -227,10 +234,11 @@
             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";
+        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";
+        data["name_escaped"] = data["name"].replaceAll("-",'_').replace(new RegExp(/[ \t\s]/g),'')
         
         postDataOff(node,data)
     }
@@ -241,6 +249,7 @@
         defaults: {
             name:           { value: "" },
             nodename:       { value: "", required: true },
+            nodelabel:      { value: "", required: true },
             color:          { value: "#e5e4ef" },
             hasbutton:      { value: false },
             minify:         { value: false },

package/nodes/templates/tmpl.html.js

@@ -54,6 +54,7 @@
     color: '{{ node.color }}',
     icon: "{{{ node.icon }}}",
     category: '{{ node.category }}',
+    paletteLabel: '{{ node.nodelabel }}',
     defaults: {
       name: {
         value:"",

package/nodes/templates/tmpl.js

@@ -1,5 +1,5 @@
 module.exports = function(RED) {
-  function Core{{ node.name }}Functionality(config) {
+  function Core{{ node.name_escaped }}Functionality(config) {
     RED.nodes.createNode(this,config);
 
     var node = this;
@@ -41,7 +41,7 @@ module.exports = function(RED) {
     });
   }
 
-  RED.nodes.registerType("{{ node.name }}", Core{{ node.name }}Functionality);
+  RED.nodes.registerType("{{ node.name }}", Core{{ node.name_escaped }}Functionality);
 
 {{ #node.frt2bakcomm }}
   RED.httpAdmin.post("/{{ node.name }}/:id",

package/nodes/templates/tmplsidebar.html

@@ -45,7 +45,7 @@
              hasUsers: false, 
              users: [],
              name: "{{ node.name }}",
-             label: function() { return this.name || "{{ node.name }}"},
+             label: function() { return "{{ node.nodelabel }}" || this.name },
              /* values and data defined by this config node */
              data: "some default value", // Default data
          }

package/nodes/templates/tmplsidebarnode.html

@@ -7,7 +7,7 @@
          name: { value: "" },
          data: { value: "" }
       },
-      paletteLabel: '{{ node.name }}Cfg',
+      paletteLabel: '{{ node.nodelabel }}',
       label: function () {
          return this.name;
       }

package/nodes/templates/tmplsidebarnode.js

@@ -1,9 +1,9 @@
 module.exports = function (RED) {
-  function Config{{ node.name }}Functionality(config) {
+  function Config{{ node.name_escaped }}Functionality(config) {
     RED.nodes.createNode(this, config)
   }
   
-  RED.nodes.registerType('{{ node.name }}Cfg', Config{{ node.name }}Functionality);
+  RED.nodes.registerType('{{ node.name }}Cfg', Config{{ node.name_escaped }}Functionality);
 
 {{ #node.frt2bakcomm }}
   RED.httpAdmin.post("/{{ node.name }}Cfg",

package/package.json

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

package/plugins/node-factory-sidebar.html

@@ -160,20 +160,24 @@
             }
       });
       
-      // Add first tab, pkg importer
       tabs.addTab({
             id: 'func-nodedev-pkgimporter-tab-pkgimport',
             iconClass: 'fa fa-industry',
             label: 'PkgImporter'
       });
 
-      // Add first tab, otp
       tabs.addTab({
             id: 'func-nodedev-pkgimporter-tab-otpgenerator',
             iconClass: 'fa fa-user-secret',
             label: 'OTP Generator'
       });
 
+      tabs.addTab({
+            id: 'func-nodedev-pkgimporter-tab-options',
+            iconClass: 'fa fa-cog',
+            label: 'Options'
+      });
+
       ensureYourConfigNodeExists();
 
       /*
@@ -464,5 +468,16 @@
             <input type="text" id="node-input-nodedev-sidebar-otp" placeholder="OTP...">
         </div>
     </div>
+
+    <div id="func-nodedev-pkgimporter-tab-options" style="display:none">
+        <div class="form-row" style="margin-left: 10px;">
+            Drag & Drop
+        </div>
+
+        <div class="form-row" style="margin-left: 10px;">
+            <input style="width: 10%;" type="checkbox" id="nodedev-drag-drop-generate-pkgfile-nodes"/>
+            <label for="nodedev-drag-drop-generate-pkgfile-nodes" style="width: 40%;"><i class="fa fa-code" ></i> Create PkgFile nodes on drop?</label>
+        </div>
+    </div>
 </div>
 </script>

package/plugins/support-drag-and-drop.html

@@ -9,6 +9,11 @@
             */
             window.ddEvent = event
 
+            // checkbox on the options tab
+            if ( !$("#nodedev-drag-drop-generate-pkgfile-nodes").is(":checked") ) {
+                return
+            }
+
             let itemPtr = event.originalEvent.dataTransfer.items
             let itemCount = itemPtr.length