@vitormnm/node-red-simple-opcua 1.6.2 → 1.7.0

package/server/view/opcua-server.js

@@ -12,13 +12,136 @@
     var isSyncing = false;
     var DEFAULT_NAMESPACE_ID = 2;
 
+    var selectedCertFolder = "rejected";
+    var selectedCertName = "";
+    var certificatesData = { trusted: [], rejected: [] };
+
     function syncModalBodyClass() {
-        $("body").toggleClass("opcua-tree-modal-open", $("#node-input-tree-modal").is(":visible") || $("#node-input-auth-modal").is(":visible"));
+        $("body").toggleClass("opcua-tree-modal-open", 
+            $("#node-input-tree-modal").is(":visible") || 
+            $("#node-input-auth-modal").is(":visible") ||
+            $("#node-input-cert-modal").is(":visible") ||
+            $("#node-input-settings-modal").is(":visible")
+        );
     }
     function openTreeModal() { $("#node-input-tree-modal").show(); syncModalBodyClass(); }
     function closeTreeModal() { $("#node-input-tree-modal").hide(); syncModalBodyClass(); }
     function openAuthModal() { $("#node-input-auth-modal").show(); syncModalBodyClass(); renderAuthEditor(); }
     function closeAuthModal() { $("#node-input-auth-modal").hide(); syncModalBodyClass(); }
+    function openCertModal() { $("#node-input-cert-modal").show(); syncModalBodyClass(); initCertEditor(); }
+    function closeCertModal() { $("#node-input-cert-modal").hide(); syncModalBodyClass(); }
+    function openSettingsModal() { $("#node-input-settings-modal").show(); syncModalBodyClass(); }
+    function closeSettingsModal() { $("#node-input-settings-modal").hide(); syncModalBodyClass(); }
+
+    function initCertEditor() {
+        selectedCertFolder = "rejected";
+        selectedCertName = "";
+        $("#opcua-cert-details").hide();
+        $("#opcua-cert-folders .opcua-cert-item").removeClass("is-selected");
+        $('#opcua-cert-folders .opcua-cert-item[data-folder="rejected"]').addClass("is-selected");
+        fetchCertificates();
+    }
+
+    function fetchCertificates() {
+        var filesContainer = $("#opcua-cert-files");
+        filesContainer.empty().append('<div class="opcua-tree-empty"><i class="fa fa-spinner fa-spin"></i> Loading certificates...</div>');
+        
+        var currentServerName = $("#node-input-serverName").val() || "";
+
+        $.ajax({
+            url: "opc-ua-server/certificates",
+            type: "GET",
+            data: {
+                serverName: currentServerName
+            },
+            dataType: "json",
+            success: function (data) {
+                certificatesData = data || { trusted: [], rejected: [] };
+                renderCertificatesList();
+            },
+            error: function (xhr, textStatus, errorThrown) {
+                filesContainer.empty().append('<div class="opcua-tree-empty" style="color: #d9534f;"><i class="fa fa-exclamation-triangle"></i> Failed to load certificates.</div>');
+            }
+        });
+    }
+
+    function renderCertificatesList() {
+        var filesContainer = $("#opcua-cert-files");
+        filesContainer.empty();
+        
+        var list = certificatesData[selectedCertFolder] || [];
+        if (list.length === 0) {
+            filesContainer.append('<div class="opcua-tree-empty">No certificates found in this folder.</div>');
+            $("#opcua-cert-details").hide();
+            return;
+        }
+
+        list.forEach(function (filename) {
+            var item = $('<div class="opcua-cert-item"></div>');
+            item.attr("data-name", filename);
+            item.append('<i class="fa fa-certificate"></i> ' + escapeHtml(filename));
+            if (filename === selectedCertName) {
+                item.addClass("is-selected");
+            }
+            filesContainer.append(item);
+        });
+
+        // If previously selected cert is not in the list, hide details
+        if (selectedCertName && list.indexOf(selectedCertName) === -1) {
+            selectedCertName = "";
+            $("#opcua-cert-details").hide();
+        } else if (selectedCertName) {
+            showCertificateDetails();
+        }
+    }
+
+    function showCertificateDetails() {
+        $("#opcua-selected-cert-name").text(selectedCertName);
+        var targetSelect = $("#opcua-cert-target-folder");
+        targetSelect.empty();
+        
+        if (selectedCertFolder === "rejected") {
+            targetSelect.append('<option value="trusted">Trusted Certificates</option>');
+        } else {
+            targetSelect.append('<option value="rejected">Rejected Certificates</option>');
+        }
+        
+        $("#opcua-cert-details").show();
+    }
+
+    function moveCertificate() {
+        if (!selectedCertName) return;
+        var targetFolder = $("#opcua-cert-target-folder").val();
+        if (!targetFolder) return;
+
+        var currentServerName = $("#node-input-serverName").val() || "";
+        var moveBtn = $("#opcua-cert-move-btn");
+        moveBtn.addClass("disabled").append(' <i class="fa fa-spinner fa-spin"></i>');
+
+        $.ajax({
+            url: "opc-ua-server/certificates/move",
+            type: "POST",
+            contentType: "application/json",
+            data: JSON.stringify({
+                serverName: currentServerName,
+                filename: selectedCertName,
+                fromFolder: selectedCertFolder,
+                toFolder: targetFolder
+            }),
+            success: function (res) {
+                moveBtn.removeClass("disabled").find("i.fa-spin").remove();
+                selectedCertName = "";
+                $("#opcua-cert-details").hide();
+                RED.notify("Certificate moved successfully.", "success");
+                fetchCertificates();
+            },
+            error: function (xhr, textStatus, errorThrown) {
+                moveBtn.removeClass("disabled").find("i.fa-spin").remove();
+                var errMsg = xhr.responseJSON && xhr.responseJSON.error ? xhr.responseJSON.error : "Failed to move certificate.";
+                RED.notify(errMsg, "error");
+            }
+        });
+    }
 
     function parseTree(rawValue, strict) {
         if (!rawValue) return { objects: [], folders: [], objectsTypes: [], enumerations: [], nameSpaces: [] };
@@ -174,19 +297,20 @@
             variableNodeId: alarm.variableNodeId ? String(alarm.variableNodeId) : "",
             type: type,
             enabled: alarm.enabled !== undefined ? !!alarm.enabled : true,
+            sendValue: alarm.sendValue !== undefined ? !!alarm.sendValue : true,
             severity: alarm.severity !== undefined ? alarm.severity : 500,
             description: alarm.description ? String(alarm.description) : "",
             displayName: alarm.displayName ? String(alarm.displayName) : "",
             nodeId: alarm.nodeId ? String(alarm.nodeId) : "",
             namespaceId: normalizeNamespaceId(alarm.namespaceId),
             accessPermission: normalizeAccessPermissionValues(alarm.accessPermission || alarm.accessPermissions),
-            highHighLimit: alarm.highHighLimit !== undefined ? alarm.highHighLimit : 100,
+            highHighLimit: alarm.highHighLimit !== undefined ? alarm.highHighLimit : 90,
             highHighMessage: alarm.highHighMessage ? String(alarm.highHighMessage) : "High High alarm",
             highLimit: alarm.highLimit !== undefined ? alarm.highLimit : 80,
             highMessage: alarm.highMessage ? String(alarm.highMessage) : "High alarm",
             lowLimit: alarm.lowLimit !== undefined ? alarm.lowLimit : 20,
             lowMessage: alarm.lowMessage ? String(alarm.lowMessage) : "Low alarm",
-            lowLowLimit: alarm.lowLowLimit !== undefined ? alarm.lowLowLimit : 0,
+            lowLowLimit: alarm.lowLowLimit !== undefined ? alarm.lowLowLimit : 10,
             lowLowMessage: alarm.lowLowMessage ? String(alarm.lowLowMessage) : "Low Low alarm",
             normalStateValue: alarm.normalStateValue !== undefined ? alarm.normalStateValue : 0,
             digitalMessage: alarm.digitalMessage ? String(alarm.digitalMessage) : "Digital alarm"
@@ -320,6 +444,7 @@
     function normalizeSearchTerm(value) { return String(value || "").trim().toLowerCase(); }
     function isExpanded(path, defaultValue) { if (expansionState[path] === undefined) expansionState[path] = !!defaultValue; return expansionState[path]; }
     function nodeClassFromPath(path) {
+        if (path && path.indexOf("virtual:") === 0) return "VisualFolder";
         var tokens = pathToTokens(path);
         if (!tokens.length) return "Object";
 
@@ -333,7 +458,18 @@
         if (collectionToken === "folders") return "Folder";
         return "Object";
     }
-    function getNodeDisplayName(path) { var item = getAtPath(editorState, path); return item ? (item.name || "(unnamed)") : ""; }
+    function getVirtualNodeName(path) {
+        if (path === "virtual:Objects") return "Objects";
+        if (path === "virtual:Types") return "Types";
+        if (path === "virtual:Types.ObjectTypes") return "ObjectTypes";
+        if (path === "virtual:Types.DataTypes") return "DataTypes";
+        return "";
+    }
+    function getNodeDisplayName(path) {
+        if (path && path.indexOf("virtual:") === 0) return getVirtualNodeName(path);
+        var item = getAtPath(editorState, path);
+        return item ? (item.name || "(unnamed)") : "";
+    }
     function getNamespaceOptions() {
         return Array.isArray(editorState.nameSpaces) ? editorState.nameSpaces.slice().sort(function (left, right) { return left.id - right.id; }) : [];
     }
@@ -444,7 +580,7 @@
     function nodeIdSuffixFromValue(nodeId, defaultSuffix) {
         var raw = String(nodeId || "").trim();
         if (!raw) return defaultSuffix;
-        var match = /^ns=\d+;s=(.*)$/.exec(raw);
+        var match = /^ns=\d+;[si]=(.*)$/.exec(raw);
         if (match) return match[1];
         return raw;
     }
@@ -485,8 +621,69 @@
         var item = getAtPath(editorState, path);
         if (isObjectTypeModelPath(path)) return buildGeneratedNodeIdForPath(path);
         var customNodeId = item && item.nodeId ? String(item.nodeId).trim() : "";
-        var suffix = nodeIdSuffixFromValue(customNodeId, buildDefaultNodeIdSuffixFromEditorPath(path));
-        return getNodeIdPrefix(getNodeNamespaceId(path)) + suffix;
+        if (customNodeId) {
+            if (/^ns=\d+;[si]=/.test(customNodeId)) {
+                return customNodeId;
+            }
+            return getNodeIdPrefix(getNodeNamespaceId(path)) + customNodeId;
+        }
+        return buildGeneratedNodeIdForPath(path);
+    }
+    function parseNodeId(nodeId, defaultSuffix) {
+        var raw = String(nodeId || "").trim();
+        if (!raw) {
+            return { type: "s", value: defaultSuffix };
+        }
+        var match = /^ns=\d+;([si])=(.*)$/.exec(raw);
+        if (match) {
+            return { type: match[1], value: match[2] };
+        }
+        return { type: "s", value: raw };
+    }
+    function updateNodeIdValueInputState(mode, type) {
+        var inputId = "#opcua-" + mode + "-nodeid-value";
+        var labelId = "#opcua-" + mode + "-nodeid-value-label";
+        var input = $(inputId);
+        var label = $(labelId);
+
+        if (type === "i") {
+            if (label.length) label.text("nodeId Value (Numeric)");
+            input.attr("type", "number");
+            input.attr("step", "1");
+            input.attr("placeholder", "Enter a number");
+        } else {
+            if (label.length) label.text("nodeId Value (String)");
+            input.attr("type", "text");
+            input.removeAttr("step");
+            if (mode === "create") {
+                input.attr("placeholder", "Leave blank for default (s)");
+            } else {
+                input.attr("placeholder", "Enter a string");
+            }
+        }
+    }
+    function saveDetailNodeId(path) {
+        if (!path) return;
+        var type = $("#opcua-detail-nodeid-type").val();
+        var rawVal = $("#opcua-detail-nodeid-value").val();
+        var nsId = getNodeNamespaceId(path);
+        
+        var customNodeId = "";
+        if (rawVal) {
+            if (type === "i") {
+                var numVal = parseInt(rawVal, 10);
+                if (!isNaN(numVal)) {
+                    customNodeId = "ns=" + nsId + ";i=" + numVal;
+                }
+            } else {
+                var defaultSuffix = buildDefaultNodeIdSuffixFromEditorPath(path);
+                var nextSuffix = String(rawVal).trim();
+                if (nextSuffix && nextSuffix !== defaultSuffix) {
+                    customNodeId = "ns=" + nsId + ";s=" + nextSuffix;
+                }
+            }
+        }
+        updateNode(path, { nodeId: customNodeId });
     }
     function normalizeCustomNodeIdFromSuffix(path, suffix) {
         if (isObjectTypeModelPath(path)) return "";
@@ -527,6 +724,25 @@
     }
 
     function getChildrenByPath(path) {
+        if (path === "virtual:Objects") {
+            var children = [];
+            (editorState.folders || []).forEach(function (_, i) { children.push("folders." + i); });
+            (editorState.objects || []).forEach(function (_, i) { children.push("objects." + i); });
+            return children;
+        }
+        if (path === "virtual:Types") {
+            return ["virtual:Types.ObjectTypes", "virtual:Types.DataTypes"];
+        }
+        if (path === "virtual:Types.ObjectTypes") {
+            var children = [];
+            (editorState.objectsTypes || []).forEach(function (_, i) { children.push("objectsTypes." + i); });
+            return children;
+        }
+        if (path === "virtual:Types.DataTypes") {
+            var children = [];
+            (editorState.enumerations || []).forEach(function (_, i) { children.push("enumerations." + i); });
+            return children;
+        }
         var item = getAtPath(editorState, path);
         if (!item) return [];
         var children = [];
@@ -540,11 +756,7 @@
     }
 
     function getTopLevelPaths() {
-        var paths = [];
-        (editorState.folders || []).forEach(function (_, i) { paths.push("folders." + i); });
-        (editorState.objects || []).forEach(function (_, i) { paths.push("objects." + i); });
-        (editorState.objectsTypes || []).forEach(function (_, i) { paths.push("objectsTypes." + i); });
-        (editorState.enumerations || []).forEach(function (_, i) { paths.push("enumerations." + i); });
+        var paths = ["virtual:Objects", "virtual:Types"];
         (editorState.nameSpaces || []).forEach(function (_, i) { paths.push("nameSpaces." + i); });
         return paths;
     }
@@ -556,6 +768,9 @@
 
     function nodeMatchesSearch(path) {
         if (!treeSearchTerm) return true;
+        if (path && path.indexOf("virtual:") === 0) {
+            return getVirtualNodeName(path).toLowerCase().indexOf(treeSearchTerm) !== -1;
+        }
         var item = getAtPath(editorState, path);
         if (!item) return false;
         var values = [path, item.name, item.displayName, item.description, nodeClassFromPath(path), item.type, item.value, item.id, item.namespaceId];
@@ -568,7 +783,7 @@
     }
 
     function iconForNodeClass(nodeClass) {
-        if (nodeClass === "Folder") return "fa-folder";
+        if (nodeClass === "Folder" || nodeClass === "VisualFolder") return "fa-folder";
         if (nodeClass === "Object") return "fa-cube";
         if (nodeClass === "Variable") return "fa-tag";
         if (nodeClass === "ObjectType") return "fa-cubes";
@@ -594,7 +809,7 @@
     }
 
     function appendNodeToFrag(frag, path, depth, ancestorMatched) {
-        var item = getAtPath(editorState, path);
+        var item = (path && path.indexOf("virtual:") === 0) ? {} : getAtPath(editorState, path);
         if (!item) return;
         var nodeClass = nodeClassFromPath(path);
         var hasChildren = nodeClass !== "Variable" && nodeClass !== "Alarm" && nodeClass !== "Namespace" && getChildrenByPath(path).length > 0;
@@ -607,11 +822,13 @@
         var row = document.createElement("div");
         row.className = "opcua-tree-row" + (path === selectedPath ? " is-selected" : "");
         row.setAttribute("data-path", path);
+        var label = (path && path.indexOf("virtual:") === 0) ? getVirtualNodeName(path) : (item.name || "(unnamed)");
+        var displayClass = (path && path.indexOf("virtual:") === 0) ? "Folder" : nodeClass;
         row.innerHTML = indents
             + '<span class="opcua-tree-twisty">' + (hasChildren ? '<i class="fa ' + (expanded ? "fa-caret-down" : "fa-caret-right") + '"></i>' : "") + "</span>"
             + '<span class="opcua-tree-icon"><i class="fa ' + iconForNodeClass(nodeClass) + '"></i></span>'
-            + '<span class="opcua-tree-label">' + escapeHtml(item.name || "(unnamed)") + "</span>"
-            + '<span class="opcua-tree-type">' + escapeHtml(nodeClass) + "</span>";
+            + '<span class="opcua-tree-label">' + escapeHtml(label) + "</span>"
+            + '<span class="opcua-tree-type">' + escapeHtml(displayClass) + "</span>";
         frag.appendChild(row);
 
         if (hasChildren && expanded) {
@@ -650,9 +867,28 @@
     function renderBreadcrumbs() {
         var el = $("#opcua-tree-breadcrumbs");
         if (!selectedPath) { el.text("No selection"); return; }
+        if (selectedPath.indexOf("virtual:") === 0) {
+            var parts = [];
+            if (selectedPath === "virtual:Objects") parts = ["Objects"];
+            else if (selectedPath === "virtual:Types") parts = ["Types"];
+            else if (selectedPath === "virtual:Types.ObjectTypes") parts = ["Types", "ObjectTypes"];
+            else if (selectedPath === "virtual:Types.DataTypes") parts = ["Types", "DataTypes"];
+            el.text(parts.join("."));
+            return;
+        }
         var tokens = pathToTokens(selectedPath);
         var cursor = [];
         var parts = [];
+        var rootToken = tokens[0];
+        if (rootToken === "folders" || rootToken === "objects") {
+            parts.push("Objects");
+        } else if (rootToken === "objectsTypes") {
+            parts.push("Types");
+            parts.push("ObjectTypes");
+        } else if (rootToken === "enumerations") {
+            parts.push("Types");
+            parts.push("DataTypes");
+        }
         tokens.forEach(function (token) {
             cursor.push(token);
             if (/^\d+$/.test(token)) parts.push(getNodeDisplayName(cursor.join(".")) || ("#" + token));
@@ -672,14 +908,38 @@
 
     function openCreateForm(path, kind) {
         if (!path) return;
-        if (nodeClassFromPath(path) === "Variable" || nodeClassFromPath(path) === "Namespace") {
+        if (path.indexOf("virtual:") === 0) {
+            if (path === "virtual:Objects") {
+                if (kind !== "folder" && kind !== "object") {
+                    RED.notify("Only Folders and Objects can be added directly under Objects", "warning");
+                    return;
+                }
+            } else if (path === "virtual:Types.ObjectTypes") {
+                if (kind !== "objecttype") {
+                    RED.notify("Only ObjectTypes can be added under ObjectTypes", "warning");
+                    return;
+                }
+            } else if (path === "virtual:Types.DataTypes") {
+                if (kind !== "enumeration") {
+                    RED.notify("Only Enumerations can be added under DataTypes", "warning");
+                    return;
+                }
+            } else {
+                RED.notify("Cannot add children to this visual folder", "warning");
+                return;
+            }
+        } else if (nodeClassFromPath(path) === "Variable" || nodeClassFromPath(path) === "Namespace") {
             RED.notify("Selected item cannot have children", "warning");
             return;
         }
+        var parentSuffix = path.indexOf("virtual:") === 0 ? "" : buildDefaultNodeIdSuffixFromEditorPath(path);
+        var defaultName = kind === "variable" ? "newVariable" : kind === "enum-variable" ? "newEnumVariable" : "newObject";
+        var defaultSuffix = parentSuffix ? parentSuffix + "." + defaultName : defaultName;
+
         pendingCreate = {
             parentPath: path,
             kind: kind,
-            name: kind === "variable" ? "newVariable" : kind === "enum-variable" ? "newEnumVariable" : kind === "folder" ? "newFolder" : kind === "objecttype" ? "newObjectType" : kind === "alarm" ? "newAlarm" : kind === "method" ? "newMethod" : "newObject",
+            name: defaultName,
             displayName: "",
             dataType: kind === "enum-variable" ? (getDefinedEnumerationNames()[0] || "") : "Int32",
             value: "",
@@ -689,16 +949,19 @@
             alarmType: "levelAlarm",
             variableNodeId: "",
             severity: 500,
-            highHighLimit: 100,
+            sendValue: true,
+            highHighLimit: 90,
             highHighMessage: "High High alarm",
             highLimit: 80,
             highMessage: "High alarm",
             lowLimit: 20,
             lowMessage: "Low alarm",
-            lowLowLimit: 0,
+            lowLowLimit: 10,
             lowLowMessage: "Low Low alarm",
             normalStateValue: 0,
-            digitalMessage: "Digital alarm"
+            digitalMessage: "Digital alarm",
+            nodeIdType: "s",
+            nodeIdValue: (kind === "variable" || kind === "enum-variable") ? defaultSuffix : ""
         };
         renderDetails();
     }
@@ -707,27 +970,51 @@
         if (!pendingCreate) return;
         var parentPath = pendingCreate.parentPath;
         var kind = pendingCreate.kind;
-        var branchTargetPath = (kind === "variable" || kind === "enum-variable")
-            ? (parentPath + ".variables")
-            : kind === "folder"
-                ? (parentPath + ".folders")
-                : kind === "objecttype"
-                    ? (parentPath + ".objectsTypes")
-                    : kind === "alarm"
-                        ? (parentPath + ".alarms")
-                        : kind === "method"
-                            ? (parentPath + ".methods")
-                            : (parentPath + ".objects");
+        var branchTargetPath;
+        if (parentPath.indexOf("virtual:") === 0) {
+            if (parentPath === "virtual:Objects") {
+                branchTargetPath = kind === "folder" ? "folders" : "objects";
+            } else if (parentPath === "virtual:Types.ObjectTypes") {
+                branchTargetPath = "objectsTypes";
+            } else {
+                return;
+            }
+        } else {
+            branchTargetPath = (kind === "variable" || kind === "enum-variable")
+                ? (parentPath + ".variables")
+                : kind === "folder"
+                    ? (parentPath + ".folders")
+                    : kind === "objecttype"
+                        ? (parentPath + ".objectsTypes")
+                        : kind === "alarm"
+                            ? (parentPath + ".alarms")
+                            : kind === "method"
+                                ? (parentPath + ".methods")
+                                : (parentPath + ".objects");
+        }
         var target = getAtPath(editorState, branchTargetPath);
         if (!Array.isArray(target)) return;
         if (kind === "variable" || kind === "enum-variable") {
+            var customNodeId = "";
+            var nsId = getNodeNamespaceId(parentPath);
+            if (pendingCreate.nodeIdValue) {
+                if (pendingCreate.nodeIdType === "i") {
+                    var numVal = parseInt(pendingCreate.nodeIdValue, 10);
+                    if (!isNaN(numVal)) {
+                        customNodeId = "ns=" + nsId + ";i=" + numVal;
+                    }
+                } else {
+                    customNodeId = "ns=" + nsId + ";s=" + pendingCreate.nodeIdValue.trim();
+                }
+            }
             target.push(normalizeVariable({
                 name: pendingCreate.name,
                 displayName: pendingCreate.displayName || "",
                 type: pendingCreate.dataType,
                 value: pendingCreate.value,
                 access: pendingCreate.access || "readwrite",
-                accessPermission: pendingCreate.accessPermission
+                accessPermission: pendingCreate.accessPermission,
+                nodeId: customNodeId
             }));
         } else if (kind === "folder") {
             target.push(normalizeBranch({ name: pendingCreate.name, displayName: pendingCreate.displayName || "", accessPermission: pendingCreate.accessPermission }));
@@ -742,6 +1029,7 @@
                 type: pendingCreate.alarmType,
                 variableNodeId: pendingCreate.variableNodeId,
                 severity: Number(pendingCreate.severity || 500),
+                sendValue: pendingCreate.sendValue,
                 highHighLimit: pendingCreate.highHighLimit,
                 highHighMessage: pendingCreate.highHighMessage,
                 highLimit: pendingCreate.highLimit,
@@ -784,6 +1072,8 @@
                 panel.append('<div class="form-row"><label>dataType</label>' + typeHtml + '</div>');
                 panel.append('<div class="form-row"><label>Value</label><input type="text" id="opcua-create-value"></div>');
                 panel.append('<div class="form-row"><label>Access</label><select id="opcua-create-access"><option value="readwrite">readwrite</option><option value="readonly">readonly</option></select></div>');
+                panel.append('<div class="form-row"><label>nodeId Type</label><select id="opcua-create-nodeid-type"><option value="s">s (String)</option><option value="i">i (Numeric)</option></select></div>');
+                panel.append('<div class="form-row" id="opcua-create-nodeid-value-row"><label id="opcua-create-nodeid-value-label">nodeId Value</label><input type="text" id="opcua-create-nodeid-value" placeholder="Leave blank for default (s)"></div>');
             }
             if (pendingCreate.kind === "objecttype") {
                 panel.append('<div class="form-row"><label>objectsType</label>' + buildObjectTypeSelect("opcua-create-objectstype", pendingCreate.objectsType || "") + '</div>');
@@ -792,6 +1082,7 @@
                 panel.append('<div class="form-row"><label>alarmType</label><select id="opcua-create-alarm-type"><option value="levelAlarm">levelAlarm</option><option value="digitalAlarm">digitalAlarm</option></select></div>');
                 panel.append('<div class="form-row"><label>variablePath</label><input type="text" id="opcua-create-variable-nodeid"></div>');
                 panel.append('<div class="form-row"><label>severity</label><input type="number" id="opcua-create-severity"></div>');
+                panel.append('<div class="form-row"><label for="opcua-create-sendvalue">Send alarm value</label><input type="checkbox" id="opcua-create-sendvalue" style="width: auto; flex: 0 0 auto; min-width: 0;"></div>');
                 if (pendingCreate.alarmType === "levelAlarm") {
                     panel.append('<div class="form-row"><label>highHighLimit</label><input type="number" id="opcua-create-highhighlimit"></div>');
                     panel.append('<div class="form-row"><label>highHighMessage</label><input type="text" id="opcua-create-highhighmessage"></div>');
@@ -812,6 +1103,11 @@
             $("#opcua-create-name").val(pendingCreate.name);
             $("#opcua-create-displayname").val(pendingCreate.displayName || "");
             $("#opcua-create-accesspermission").val(normalizeAccessPermissionValues(pendingCreate.accessPermission));
+            if (pendingCreate.kind === "variable" || pendingCreate.kind === "enum-variable") {
+                $("#opcua-create-nodeid-type").val(pendingCreate.nodeIdType || "s");
+                $("#opcua-create-nodeid-value").val(pendingCreate.nodeIdValue || "");
+                updateNodeIdValueInputState("create", pendingCreate.nodeIdType || "s");
+            }
             $("#opcua-create-type").val(pendingCreate.dataType);
             $("#opcua-create-value").val(pendingCreate.value);
             $("#opcua-create-objectstype").val(pendingCreate.objectsType);
@@ -819,6 +1115,7 @@
             $("#opcua-create-alarm-type").val(pendingCreate.alarmType);
             $("#opcua-create-variable-nodeid").val(pendingCreate.variableNodeId);
             $("#opcua-create-severity").val(pendingCreate.severity);
+            $("#opcua-create-sendvalue").prop("checked", pendingCreate.sendValue !== false);
             $("#opcua-create-highhighlimit").val(pendingCreate.highHighLimit);
             $("#opcua-create-highhighmessage").val(pendingCreate.highHighMessage);
             $("#opcua-create-highlimit").val(pendingCreate.highLimit);
@@ -832,6 +1129,11 @@
             return;
         }
         if (!selectedPath) { panel.append('<div class="opcua-tree-empty">Select a node to edit browseName, namespace, nodeId, and description.</div>'); return; }
+        if (selectedPath.indexOf("virtual:") === 0) {
+            var visualName = getVirtualNodeName(selectedPath);
+            panel.append('<div class="opcua-tree-empty">Visual folder: <strong>' + escapeHtml(visualName) + '</strong><br><span style="font-size: 11px; color: #666;">This folder is used strictly for visual organization within the modal.</span></div>');
+            return;
+        }
         var item = getAtPath(editorState, selectedPath);
         if (!item) { panel.append('<div class="opcua-tree-empty">Selected node not found.</div>'); return; }
         var nodeClass = nodeClassFromPath(selectedPath);
@@ -883,7 +1185,18 @@
         panel.append('<div class="form-row"><label>browseName</label><input type="text" id="opcua-detail-name"></div>');
         panel.append('<div class="form-row"><label>nodeClass</label><input type="text" id="opcua-detail-class" readonly></div>');
         panel.append('<div class="form-row"><label>namespace</label><select id="opcua-detail-namespace"></select></div>');
-        panel.append('<div class="form-row"><label>nodeId</label><div class="opcua-nodeid-field"><span class="opcua-nodeid-prefix">' + getNodeIdPrefix(namespaceId) + '</span><input type="text" id="opcua-detail-nodeid"' + (nodeIdLocked ? ' readonly title="Generated automatically for object type models."' : '') + '><a href="#" id="opcua-detail-copy-nodeid" class="editor-button editor-button-small"><i class="fa fa-copy"></i> Copy</a></div></div>');
+        if (nodeClass === "Variable" && !nodeIdLocked) {
+            panel.append('<div class="form-row"><label>nodeId</label>' +
+                '<div class="opcua-nodeid-field">' +
+                '<span class="opcua-nodeid-prefix">ns=' + namespaceId + ';</span>' +
+                '<select id="opcua-detail-nodeid-type" style="width: 70px; flex: 0 0 auto;"><option value="s">s</option><option value="i">i</option></select>' +
+                '<span style="padding: 0 4px; flex: 0 0 auto;">=</span>' +
+                '<input type="text" id="opcua-detail-nodeid-value" style="flex: 1 1 auto; font-family: monospace;">' +
+                '<a href="#" id="opcua-detail-copy-nodeid" class="editor-button editor-button-small"><i class="fa fa-copy"></i> Copy</a>' +
+                '</div></div>');
+        } else {
+            panel.append('<div class="form-row"><label>nodeId</label><div class="opcua-nodeid-field"><span class="opcua-nodeid-prefix">' + getNodeIdPrefix(namespaceId) + '</span><input type="text" id="opcua-detail-nodeid"' + (nodeIdLocked ? ' readonly title="Generated automatically for object type models."' : '') + '><a href="#" id="opcua-detail-copy-nodeid" class="editor-button editor-button-small"><i class="fa fa-copy"></i> Copy</a></div></div>');
+        }
         panel.append('<div class="form-row"><label>Description</label><input type="text" id="opcua-detail-description"></div>');
         panel.append('<div class="form-row"><label>displayName</label><input type="text" id="opcua-detail-displayname" placeholder="Leave blank to use browseName"></div>');
         panel.append('<div class="form-row"><label>accessPermission</label>' + buildAccessPermissionSelect("opcua-detail-accesspermission", item.accessPermission || ["public"]) + '</div>');
@@ -942,6 +1255,7 @@
             panel.append('<div class="form-row"><label>alarmType</label><select id="opcua-detail-alarm-type"><option value="levelAlarm">levelAlarm</option><option value="digitalAlarm">digitalAlarm</option></select></div>');
             panel.append('<div class="form-row"><label>variablePath</label><input type="text" id="opcua-detail-variable-nodeid"></div>');
             panel.append('<div class="form-row"><label>severity</label><input type="number" id="opcua-detail-severity"></div>');
+            panel.append('<div class="form-row"><label for="opcua-detail-sendvalue">Send alarm value</label><input type="checkbox" id="opcua-detail-sendvalue" style="width: auto; flex: 0 0 auto; min-width: 0;"></div>');
             if ((item.type || "levelAlarm") === "levelAlarm") {
                 panel.append('<div class="form-row"><label>highHighLimit</label><input type="number" id="opcua-detail-highhighlimit"></div>');
                 panel.append('<div class="form-row"><label>highHighMessage</label><input type="text" id="opcua-detail-highhighmessage"></div>');
@@ -959,7 +1273,14 @@
         panel.append('<div class="form-row"><label style="width:90px;">Actions</label><div><a href="#" id="opcua-detail-edit" class="editor-button editor-button-small"><i class="fa fa-pencil"></i> Edit</a> <a href="#" id="opcua-detail-remove" class="editor-button editor-button-small"><i class="fa fa-trash"></i> Remove</a></div></div>');
         $("#opcua-detail-name").val(item.name || "");
         $("#opcua-detail-class").val(nodeClass);
-        $("#opcua-detail-nodeid").val(nodeIdLocked ? buildDefaultNodeIdSuffixFromEditorPath(selectedPath) : nodeIdSuffix);
+        if (nodeClass === "Variable" && !nodeIdLocked) {
+            var parsed = parseNodeId(item.nodeId, buildDefaultNodeIdSuffixFromEditorPath(selectedPath));
+            $("#opcua-detail-nodeid-type").val(parsed.type);
+            $("#opcua-detail-nodeid-value").val(parsed.value);
+            updateNodeIdValueInputState("detail", parsed.type);
+        } else {
+            $("#opcua-detail-nodeid").val(nodeIdLocked ? buildDefaultNodeIdSuffixFromEditorPath(selectedPath) : nodeIdSuffix);
+        }
         $("#opcua-detail-description").val(item.description || "");
         namespaceOptions.forEach(function (option) {
             $("#opcua-detail-namespace").append($("<option></option>").val(option.id).text(getNamespaceLabel(option.id)));
@@ -973,13 +1294,14 @@
             $("#opcua-detail-alarm-type").val(item.type || "levelAlarm");
             $("#opcua-detail-variable-nodeid").val(item.variableNodeId || "");
             $("#opcua-detail-severity").val(item.severity !== undefined ? item.severity : 500);
-            $("#opcua-detail-highhighlimit").val(item.highHighLimit !== undefined ? item.highHighLimit : 100);
+            $("#opcua-detail-sendvalue").prop("checked", item.sendValue !== false);
+            $("#opcua-detail-highhighlimit").val(item.highHighLimit !== undefined ? item.highHighLimit : 90);
             $("#opcua-detail-highhighmessage").val(item.highHighMessage || "High High alarm");
             $("#opcua-detail-highlimit").val(item.highLimit !== undefined ? item.highLimit : 80);
             $("#opcua-detail-highmessage").val(item.highMessage || "High alarm");
             $("#opcua-detail-lowlimit").val(item.lowLimit !== undefined ? item.lowLimit : 20);
             $("#opcua-detail-lowmessage").val(item.lowMessage || "Low alarm");
-            $("#opcua-detail-lowlowlimit").val(item.lowLowLimit !== undefined ? item.lowLowLimit : 0);
+            $("#opcua-detail-lowlowlimit").val(item.lowLowLimit !== undefined ? item.lowLowLimit : 10);
             $("#opcua-detail-lowlowmessage").val(item.lowLowMessage || "Low Low alarm");
             $("#opcua-detail-normalstatevalue").val(item.normalStateValue !== undefined ? item.normalStateValue : 0);
             $("#opcua-detail-digitalmessage").val(item.digitalMessage || "Digital alarm");
@@ -993,6 +1315,10 @@
 
     function removeNode(path) {
         if (!path) return;
+        if (path.indexOf("virtual:") === 0) {
+            RED.notify("Visual folders cannot be removed.", "warning");
+            return;
+        }
         if (nodeClassFromPath(path) === "Namespace") {
             var namespaceItem = getAtPath(editorState, path);
             if (normalizeNamespaceId(namespaceItem && namespaceItem.id) === DEFAULT_NAMESPACE_ID) {
@@ -1246,8 +1572,48 @@
 
     $(document).on("contextmenu", ".opcua-tree-row", function (event) {
         event.preventDefault();
-        selectNode($(this).attr("data-path"));
-        $("#opcua-tree-context-menu").css({ left: event.clientX + "px", top: event.clientY + "px" }).show();
+        var path = $(this).attr("data-path");
+        selectNode(path);
+        
+        var contextMenu = $("#opcua-tree-context-menu");
+        contextMenu.find("a").hide();
+        
+        if (path.indexOf("virtual:") === 0) {
+            if (path === "virtual:Objects") {
+                contextMenu.find('[data-action="add-folder"]').show();
+                contextMenu.find('[data-action="add-object"]').show();
+            } else if (path === "virtual:Types.ObjectTypes") {
+                contextMenu.find('[data-action="add-objecttype"]').show();
+            } else if (path === "virtual:Types.DataTypes") {
+                contextMenu.find('[data-action="add-enumeration"]').show();
+            }
+        } else {
+            var nodeClass = nodeClassFromPath(path);
+            if (nodeClass === "Folder" || nodeClass === "Object" || nodeClass === "ObjectType") {
+                contextMenu.find('[data-action="add-folder"]').show();
+                contextMenu.find('[data-action="add-object"]').show();
+                contextMenu.find('[data-action="add-variable"]').show();
+                contextMenu.find('[data-action="add-enum-variable"]').show();
+                contextMenu.find('[data-action="add-alarm"]').show();
+                contextMenu.find('[data-action="add-method"]').show();
+                contextMenu.find('[data-action="edit"]').show();
+                contextMenu.find('[data-action="remove"]').show();
+            } else if (nodeClass === "Enumeration") {
+                contextMenu.find('[data-action="edit"]').show();
+                contextMenu.find('[data-action="remove"]').show();
+            } else if (nodeClass === "Namespace") {
+                contextMenu.find('[data-action="edit"]').show();
+                var item = getAtPath(editorState, path);
+                if (item && normalizeNamespaceId(item.id) !== DEFAULT_NAMESPACE_ID) {
+                    contextMenu.find('[data-action="remove"]').show();
+                }
+            } else {
+                contextMenu.find('[data-action="edit"]').show();
+                contextMenu.find('[data-action="remove"]').show();
+            }
+        }
+        
+        contextMenu.css({ left: event.clientX + "px", top: event.clientY + "px" }).show();
     });
 
     $(document).on("click", function () { $("#opcua-tree-context-menu").hide(); });
@@ -1344,13 +1710,25 @@
         var item = getAtPath(editorState, selectedPath);
         if (!item) return;
         item.namespaceId = nextNamespaceId;
-        item.nodeId = normalizeCustomNodeIdFromSuffix(selectedPath, $("#opcua-detail-nodeid").val());
+        if (nodeClassFromPath(selectedPath) === "Variable" && !isObjectTypeModelPath(selectedPath)) {
+            saveDetailNodeId(selectedPath);
+        } else {
+            item.nodeId = normalizeCustomNodeIdFromSuffix(selectedPath, $("#opcua-detail-nodeid").val());
+        }
         syncStateToJson(false);
         renderTree();
         renderBreadcrumbs();
         renderDetails();
     });
     $(document).on("input", "#opcua-detail-nodeid", function () { updateNode(selectedPath, { nodeId: normalizeCustomNodeIdFromSuffix(selectedPath, $(this).val()) }); });
+    $(document).on("change", "#opcua-detail-nodeid-type", function () {
+        var type = $(this).val();
+        updateNodeIdValueInputState("detail", type);
+        saveDetailNodeId(selectedPath);
+    });
+    $(document).on("input", "#opcua-detail-nodeid-value", function () {
+        saveDetailNodeId(selectedPath);
+    });
     $(document).on("click", "#opcua-detail-copy-nodeid", function (event) {
         event.preventDefault();
         copyNodeIdValue(buildDisplayNodeIdFromEditorPath(selectedPath));
@@ -1389,6 +1767,7 @@
     });
     $(document).on("input", "#opcua-detail-variable-nodeid", function () { updateNode(selectedPath, { variableNodeId: $(this).val() }); });
     $(document).on("input", "#opcua-detail-severity", function () { updateNode(selectedPath, { severity: Number($(this).val() || 0) }); });
+    $(document).on("change", "#opcua-detail-sendvalue", function () { updateNode(selectedPath, { sendValue: $(this).is(":checked") }); });
     $(document).on("input", "#opcua-detail-highhighlimit", function () { updateNode(selectedPath, { highHighLimit: Number($(this).val() || 0) }); });
     $(document).on("input", "#opcua-detail-highhighmessage", function () { updateNode(selectedPath, { highHighMessage: $(this).val() }); });
     $(document).on("input", "#opcua-detail-highlimit", function () { updateNode(selectedPath, { highLimit: Number($(this).val() || 0) }); });
@@ -1399,8 +1778,35 @@
     $(document).on("input", "#opcua-detail-lowlowmessage", function () { updateNode(selectedPath, { lowLowMessage: $(this).val() }); });
     $(document).on("input", "#opcua-detail-normalstatevalue", function () { updateNode(selectedPath, { normalStateValue: Number($(this).val() || 0) }); });
     $(document).on("input", "#opcua-detail-digitalmessage", function () { updateNode(selectedPath, { digitalMessage: $(this).val() }); });
-    $(document).on("input", "#opcua-create-name", function () { if (pendingCreate) pendingCreate.name = $(this).val(); });
+    $(document).on("input", "#opcua-create-name", function () {
+        if (pendingCreate) {
+            var oldName = pendingCreate.name;
+            var nextName = $(this).val();
+            pendingCreate.name = nextName;
+
+            if (pendingCreate.kind === "variable" || pendingCreate.kind === "enum-variable") {
+                if (pendingCreate.nodeIdType === "s") {
+                    var parentSuffix = buildDefaultNodeIdSuffixFromEditorPath(pendingCreate.parentPath);
+                    var oldAutoSuffix = parentSuffix ? parentSuffix + "." + oldName : oldName;
+                    var nextAutoSuffix = parentSuffix ? parentSuffix + "." + nextName : nextName;
+
+                    if (!pendingCreate.nodeIdValue || pendingCreate.nodeIdValue === oldAutoSuffix) {
+                        pendingCreate.nodeIdValue = nextAutoSuffix;
+                        $("#opcua-create-nodeid-value").val(nextAutoSuffix);
+                    }
+                }
+            }
+        }
+    });
     $(document).on("input", "#opcua-create-displayname", function () { if (pendingCreate) pendingCreate.displayName = $(this).val(); });
+    $(document).on("change", "#opcua-create-nodeid-type", function () {
+        var type = $(this).val();
+        if (pendingCreate) pendingCreate.nodeIdType = type;
+        updateNodeIdValueInputState("create", type);
+    });
+    $(document).on("input", "#opcua-create-nodeid-value", function () {
+        if (pendingCreate) pendingCreate.nodeIdValue = $(this).val();
+    });
     $(document).on("change", "#opcua-create-accesspermission", function () { if (pendingCreate) pendingCreate.accessPermission = normalizeAccessPermissionValues($(this).val()); });
     $(document).on("change", "#opcua-create-type", function () { if (pendingCreate) pendingCreate.dataType = $(this).val(); });
     $(document).on("input", "#opcua-create-value", function () { if (pendingCreate) pendingCreate.value = $(this).val(); });
@@ -1414,6 +1820,7 @@
     });
     $(document).on("input", "#opcua-create-variable-nodeid", function () { if (pendingCreate) pendingCreate.variableNodeId = $(this).val(); });
     $(document).on("input", "#opcua-create-severity", function () { if (pendingCreate) pendingCreate.severity = Number($(this).val() || 0); });
+    $(document).on("change", "#opcua-create-sendvalue", function () { if (pendingCreate) pendingCreate.sendValue = $(this).is(":checked"); });
     $(document).on("input", "#opcua-create-highhighlimit", function () { if (pendingCreate) pendingCreate.highHighLimit = Number($(this).val() || 0); });
     $(document).on("input", "#opcua-create-highhighmessage", function () { if (pendingCreate) pendingCreate.highHighMessage = $(this).val(); });
     $(document).on("input", "#opcua-create-highlimit", function () { if (pendingCreate) pendingCreate.highLimit = Number($(this).val() || 0); });
@@ -1475,9 +1882,12 @@
         color: "#d9edf7",
         credentials: { username: { type: "text" }, password: { type: "password" }, users: { type: "text" }, groups: { type: "text" } },
         defaults: {
-            name: { value: "" }, resourcePath: { value: "/" }, serverName: { value: "Node-RED OPC UA Server", required: true }, allowAnonymous: { value: true },
+            name: { value: "" }, resourcePath: { value: "/" }, serverName: { value: "Node-RED OPC UA Server", required: true }, allowAnonymous: { value: true }, automaticallyAcceptUnknownCertificate: { value: true },
             port: { value: 4840, required: true, validate: function (value) { var port = Number(value); return Number.isInteger(port) && port > 0 && port < 65536; } },
             maxConnections: { value: 10, required: true, validate: function (value) { var n = Number(value); return Number.isInteger(n) && n > 0; } },
+            minSessionTimeout: { value: 100, required: true, validate: function (value) { var n = Number(value); return Number.isInteger(n) && n >= 0; } },
+            defaultSessionTimeout: { value: 30000, required: true, validate: function (value) { var n = Number(value); return Number.isInteger(n) && n >= 0; } },
+            maxSessionTimeout: { value: 3000000, required: true, validate: function (value) { var n = Number(value); return Number.isInteger(n) && n >= 0; } },
             securityPolicy: { value: "None", required: true }, securityMode: { value: "None", required: true }, namespaceUri: { value: "urn:node-red:opc-ua-server", required: true },
             tree: {
                 value: "{\n  \"folders\": [],\n  \"objects\": [],\n  \"objectsTypes\": [],\n  \"nameSpaces\": [\n    {\n      \"id\": 2,\n      \"name\": \"urn:node-red:opc-ua-server\"\n    }\n  ]\n}",
@@ -1493,6 +1903,15 @@
         label: function () { return this.name || this.serverName || "opc-ua-server"; },
         oneditprepare: function () {
             var node = this;
+            if (!$("#node-input-minSessionTimeout").val()) {
+                $("#node-input-minSessionTimeout").val(100);
+            }
+            if (!$("#node-input-defaultSessionTimeout").val()) {
+                $("#node-input-defaultSessionTimeout").val(30000);
+            }
+            if (!$("#node-input-maxSessionTimeout").val()) {
+                $("#node-input-maxSessionTimeout").val(3000000);
+            }
             editorState = cloneTree(normalizeTree(parseTree(node.tree)));
             authGroups = normalizeAuthGroups($("#node-input-groups").val());
             authUsers = normalizeAuthUsers($("#node-input-users").val());
@@ -1501,6 +1920,35 @@
                 $("#node-input-namespaceUri").val(defaultNamespaceEntry.name);
             }
             syncAuthCredentialFields();
+            $("#node-input-securityPolicy").typedInput({
+                types: [
+                    {
+                        value: "securityPolicy",
+                        multiple: "true",
+                        options: [
+                            { value: "None", label: "None" },
+                            { value: "Basic128Rsa15", label: "Basic128Rsa15" },
+                            { value: "Basic256", label: "Basic256" },
+                            { value: "Basic256Sha256", label: "Basic256Sha256" },
+                            { value: "Aes128_Sha256_RsaOaep", label: "Aes128_Sha256_RsaOaep" },
+                            { value: "Aes256_Sha256_RsaPss", label: "Aes256_Sha256_RsaPss" }
+                        ]
+                    }
+                ]
+            });
+            $("#node-input-securityMode").typedInput({
+                types: [
+                    {
+                        value: "securityMode",
+                        multiple: "true",
+                        options: [
+                            { value: "None", label: "None" },
+                            { value: "Sign", label: "Sign" },
+                            { value: "SignAndEncrypt", label: "SignAndEncrypt" }
+                        ]
+                    }
+                ]
+            });
             updateTreeField(prettyTree(editorState), false);
             $("#node-input-tree-editor").typedInput({ type: "json", types: ["json"] });
             $("#node-input-tree-editor").typedInput("value", prettyTree(editorState));
@@ -1524,6 +1972,35 @@
             $("#node-input-add-auth-group").off("click").on("click", function (event) { event.preventDefault(); addAuthGroup(); });
             $("#node-input-add-auth-user").off("click").on("click", function (event) { event.preventDefault(); addAuthUser(); });
 
+            $("#node-input-open-cert-modal").off("click").on("click", function (event) { event.preventDefault(); openCertModal(); });
+            $("#node-input-close-cert-modal").off("click").on("click", function (event) { event.preventDefault(); closeCertModal(); });
+            $("#node-input-cert-modal").off("click").on("click", function (event) { if (event.target === this) closeCertModal(); });
+
+            $("#node-input-open-settings-modal").off("click").on("click", function (event) { event.preventDefault(); openSettingsModal(); });
+            $("#node-input-close-settings-modal").off("click").on("click", function (event) { event.preventDefault(); closeSettingsModal(); });
+            $("#node-input-settings-modal").off("click").on("click", function (event) { if (event.target === this) closeSettingsModal(); });
+
+            $("#opcua-cert-folders").off("click", ".opcua-cert-item").on("click", ".opcua-cert-item", function () {
+                $("#opcua-cert-folders .opcua-cert-item").removeClass("is-selected");
+                $(this).addClass("is-selected");
+                selectedCertFolder = $(this).attr("data-folder");
+                selectedCertName = "";
+                $("#opcua-cert-details").hide();
+                renderCertificatesList();
+            });
+
+            $("#opcua-cert-files").off("click", ".opcua-cert-item").on("click", ".opcua-cert-item", function () {
+                $("#opcua-cert-files .opcua-cert-item").removeClass("is-selected");
+                $(this).addClass("is-selected");
+                selectedCertName = $(this).attr("data-name");
+                showCertificateDetails();
+            });
+
+            $("#opcua-cert-move-btn").off("click").on("click", function (event) {
+                event.preventDefault();
+                moveCertificate();
+            });
+
             $("#node-input-tree-search").off("input").on("input", debounce(function () {
                 treeSearchValue = $(this).val(); treeSearchTerm = normalizeSearchTerm(treeSearchValue);
                 $("#node-input-tree-search-clear").toggle(!!treeSearchTerm); renderTree();
@@ -1546,6 +2023,10 @@
                     closeAuthModal();
                     return;
                 }
+                if ($("#node-input-cert-modal").is(":visible")) {
+                    closeCertModal();
+                    return;
+                }
                 closeTreeModal();
             });