@cyprnet/node-red-contrib-uibuilder-formgen 0.5.18 → 0.5.19

package/CHANGELOG.md

@@ -19,6 +19,10 @@ All notable changes to this package will be documented in this file.
 - Lookup/Auto-fill (dynamic): improved per-selection requests and pending/timeout handling to make <code>lookup:get</code> reliable.
 - Documentation: expanded <code>schema.lookups</code> formatting guidance and added dynamic lookup examples in Node-RED help + Schema Builder help.
 
+## 0.5.19
+
+- Legacy node: fixed license resolution for <code>uibuilder-formgen-uib2</code> to match other nodes and clarified the “logo disabled” warning when custom branding is not enabled by the license policy.
+
 ## 0.5.18
 
 - Added <code>uibuilder-formgen-uib2</code> legacy generator for <strong>uibuilder 2.x</strong> (vendor Vue 2 + Bootstrap-Vue v2 stack).

package/nodes/uibuilder-formgen-uib2.js

@@ -85,6 +85,14 @@ module.exports = function(RED) {
     return typeof v === "string" && v.trim().length > 0;
   }
 
+  function firstNonEmptyString(...candidates) {
+    for (const c of candidates) {
+      const s = String(c ?? "").trim();
+      if (s) return s;
+    }
+    return "";
+  }
+
   function safeBasename(filename) {
     // Basic hardening: strip path separators
     return path.basename(String(filename || "").replace(/[/\\]+/g, "_"));
@@ -365,18 +373,13 @@ module.exports = function(RED) {
           if (Array.isArray(parsed)) exportFormats = parsed;
         } catch (e) { /* ignore */ }
 
-        // Resolve license
-        const perNodeLicense = String(node.credentials && node.credentials.licenseKey ? node.credentials.licenseKey : "").trim();
-        const sharedLicense = String(licenseConfigNode && licenseConfigNode.credentials ? licenseConfigNode.credentials.licenseKey : "").trim();
-        const envLicense = String(process.env.PORTALSMITH_LICENSE || "").trim();
-        const rawLicense = String(msg.options?.licenseKey ?? msg.licenseKey ?? perNodeLicense ?? sharedLicense ?? envLicense ?? "").trim();
-
-        const licenseResolved = licensing.resolveLicenseString(rawLicense);
+        // Resolve license (use the shared resolver so behavior matches other nodes)
+        const licenseResolved = licensing.resolveLicense({ node, RED, licenseConfigNode });
         const licensePublic = {
           licensed: licenseResolved.licensed,
           tier: licenseResolved.tier,
-          watermark: licenseResolved.policy && licenseResolved.policy.watermark === false ? false : !licenseResolved.licensed,
-          brandingLocked: licenseResolved.policy && licenseResolved.policy.brandingLocked === false ? false : !licenseResolved.licensed,
+          watermark: Boolean(licenseResolved.policy && licenseResolved.policy.watermark),
+          brandingLocked: Boolean(licenseResolved.policy && licenseResolved.policy.brandingLocked),
           displayName: licenseResolved.display && licenseResolved.display.displayName ? licenseResolved.display.displayName : (licenseResolved.licensed ? "Licensed" : "Free"),
           reason: licenseResolved.reason,
           brandingAttempted: false,
@@ -398,7 +401,11 @@ module.exports = function(RED) {
           DEFAULT_LOGO_MAX_WIDTH_PX
         );
         if (isNonEmptyString(logoPathRaw) && licensePublic.brandingLocked) {
-          node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          if (licensePublic.licensed) {
+            node.warn("PortalSmith FormGen: custom logo is disabled by your license policy (customBranding is not enabled). Using default branding.");
+          } else {
+            node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          }
           licensePublic.brandingAttempted = Boolean(logoRequested);
           logoPathRaw = "";
         }

package/nodes/uibuilder-formgen-v3.js

@@ -436,7 +436,11 @@ module.exports = function(RED) {
           DEFAULT_LOGO_MAX_WIDTH_PX
         );
         if (isNonEmptyString(logoPathRaw) && licensePublic.brandingLocked) {
-          node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          if (licensePublic.licensed) {
+            node.warn("PortalSmith FormGen: custom logo is disabled by your license policy (customBranding is not enabled). Using default branding.");
+          } else {
+            node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          }
           licensePublic.brandingAttempted = Boolean(logoRequested);
           logoPathRaw = "";
         }
@@ -524,7 +528,7 @@ module.exports = function(RED) {
           "src/form.schema.json": { sha256: await sha256FileHex(targetSchema) },
         };
         const runtimeData = {
-          generatorVersion: "0.5.18",
+          generatorVersion: "0.5.19",
           generatorNode: "uibuilder-formgen-v3",
           timestamp: new Date().toISOString(),
           instanceName: instanceName,

package/nodes/uibuilder-formgen.js

@@ -442,7 +442,11 @@ module.exports = function(RED) {
           DEFAULT_LOGO_MAX_WIDTH_PX
         );
         if (isNonEmptyString(logoPathRaw) && licensePublic.brandingLocked) {
-          node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          if (licensePublic.licensed) {
+            node.warn("PortalSmith FormGen: custom logo is disabled by your license policy (customBranding is not enabled). Using default branding.");
+          } else {
+            node.warn("PortalSmith FormGen: custom logo is disabled in Free mode (watermarked). Using default branding.");
+          }
           licensePublic.brandingAttempted = Boolean(logoRequested);
           logoPathRaw = "";
         }
@@ -556,7 +560,7 @@ module.exports = function(RED) {
           "src/form.schema.json": { sha256: await sha256FileHex(targetSchema) },
         };
         const runtimeData = {
-          generatorVersion: "0.5.18",
+          generatorVersion: "0.5.19",
           timestamp: new Date().toISOString(),
           instanceName: instanceName,
           storageMode: storageMode,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cyprnet/node-red-contrib-uibuilder-formgen",
-  "version": "0.5.18",
+  "version": "0.5.19",
   "description": "PortalSmith: Generate schema-driven uibuilder form portals from JSON",
   "keywords": [
     "node-red",