Merge branch 'master' into header-border

packages/node_modules/@node-red/editor-client/src/js/ui/editor.js

@@ -157,6 +157,12 @@ RED.editor = (function() {
             }
         }
         if (valid && "validate" in definition[property]) {
+            if (definition[property].hasOwnProperty("required") &&
+                definition[property].required === false) {
+                if (value === "") {
+                    return true;
+                }
+            }
             try {
                 var opt = {};
                 if (label) {
@@ -183,6 +189,11 @@ RED.editor = (function() {
                 });
             }
         } else if (valid) {
+            if (definition[property].hasOwnProperty("required") && definition[property].required === false) {
+                if (value === "") {
+                    return true;
+                }
+            }
             // If the validator is not provided in node property => Check if the input has a validator
             if ("category" in node._def) {
                 const isConfig = node._def.category === "config";

packages/node_modules/@node-red/editor-client/src/js/ui/editors/code-editors/monaco.js

@@ -165,7 +165,13 @@ RED.editor.codeEditor.monaco = (function() {
         //Handles orphaned models
         //ensure loaded models that are not explicitly destroyed by a call to .destroy() are disposed
         RED.events.on("editor:close",function() {
-            let models = window.monaco ? monaco.editor.getModels() : null;
+            if (!window.monaco) { return; }
+            const editors = window.monaco.editor.getEditors()
+            const orphanEditors = editors.filter(editor => editor && !document.body.contains(editor.getDomNode()))
+            orphanEditors.forEach(editor => {
+                editor.dispose();
+            });
+            let models = monaco.editor.getModels()
             if(models && models.length) {
                 console.warn("Cleaning up monaco models left behind. Any node that calls createEditor() should call .destroy().")
                 for (let index = 0; index < models.length; index++) {
@@ -1124,6 +1130,7 @@ RED.editor.codeEditor.monaco = (function() {
 
             $(el).remove();
             $(toolbarRow).remove();
+            ed.dispose();
         }
 
         ed.resize = function resize() {

packages/node_modules/@node-red/editor-client/src/js/ui/editors/mermaid.js

@@ -11,9 +11,22 @@ RED.editor.mermaid = (function () {
             
             if (!initializing) {
                 initializing = true
-                $.getScript(
-                    'vendor/mermaid/mermaid.min.js',
-                    function (data, stat, jqxhr) {
+                // Find the cache-buster:
+                let cacheBuster
+                $('script').each(function (i, el) { 
+                    if (!cacheBuster) {
+                        const src = el.getAttribute('src')
+                        const m = /\?v=(.+)$/.exec(src)
+                        if (m) {
+                            cacheBuster = m[1]
+                        }
+                    }
+                })
+                $.ajax({
+                    url: `vendor/mermaid/mermaid.min.js?v=${cacheBuster}`,
+                    dataType: "script",
+                    cache: true,
+                    success: function (data, stat, jqxhr) {
                         mermaid.initialize({
                             startOnLoad: false,
                             theme: RED.settings.get('mermaid', {}).theme
@@ -24,7 +37,7 @@ RED.editor.mermaid = (function () {
                             render(pending)
                         }
                     }
-                )
+                });
             }
         } else {
             const nodes = document.querySelectorAll(selector)