Merge pull request #5060 from gorenje/patch-3

Add .editorconfig to .gitignore
Merge pull request #5062 from GogoVega/tab-config-changed-badge
2025-03-01 10:36:34 +00:00 · 2025-02-25 09:57:04 +00:00 · 2025-02-25 09:55:45 +00:00 · 2025-02-24 21:09:44 +01:00 · 2025-02-24 21:09:11 +01:00 · 2025-02-24 21:08:43 +01:00
6 changed files with 91 additions and 19 deletions
--- a/.gitignore
+++ b/.gitignore
@ -28,3 +28,4 @@ docs
 .nyc_output
 sync.ffs_db
 package-lock.json
+.editorconfig
--- a/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
+++ b/packages/node_modules/@node-red/editor-api/lib/editor/theme.js
@ -185,13 +185,12 @@ module.exports = {
        }

        if (theme.deployButton) {
+            themeSettings.deployButton = {};
+            if (theme.deployButton.label) {
+                themeSettings.deployButton.label = theme.deployButton.label;
+            }
            if (theme.deployButton.type == "simple") {
-                themeSettings.deployButton = {
-                    type: "simple"
-                }
-                if (theme.deployButton.label) {
-                    themeSettings.deployButton.label = theme.deployButton.label;
-                }
+                themeSettings.deployButton.type = theme.deployButton.type;
                if (theme.deployButton.icon) {
                    url = serveFile(themeApp,"/deploy/",theme.deployButton.icon);
                    if (url) {
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/deploy.js
@ -425,11 +425,15 @@ RED.deploy = (function() {
            const unknownNodes = [];
            const invalidNodes = [];

+            const isDisabled = function (node) {
+                return (node.d || RED.nodes.workspace(node.z)?.disabled);
+            };
+
            RED.nodes.eachConfig(function (node) {
                if (node.valid === undefined) {
                    RED.editor.validateNode(node);
                }
-                if (!node.valid && !node.d) {
+                if (!node.valid && !isDisabled(node)) {
                    invalidNodes.push(getNodeInfo(node));
                }
                if (node.type === "unknown") {
@ -439,7 +443,7 @@ RED.deploy = (function() {
                }
            });
            RED.nodes.eachNode(function (node) {
-                if (!node.valid && !node.d) {
+                if (!node.valid && !isDisabled(node)) {
                    invalidNodes.push(getNodeInfo(node));
                }
                if (node.type === "unknown") {
@ -453,7 +457,7 @@ RED.deploy = (function() {

            const unusedConfigNodes = [];
            RED.nodes.eachConfig(function (node) {
-                if ((node._def.hasUsers !== false) && (node.users.length === 0)) {
+                if ((node._def.hasUsers !== false) && (node.users.length === 0) && !isDisabled(node)) {
                    unusedConfigNodes.push(getNodeInfo(node));
                    hasUnusedConfig = true;
                }
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/editors/markdown.js
@ -27,6 +27,12 @@
        reader.readAsDataURL(file);
    }

+    function file2Text(file,cb) {
+        file.arrayBuffer().then(d => {
+            cb( new TextDecoder().decode(d) )
+        }).catch(ex => { cb(`error: ${ex}`) })
+    }
+
    var initialized = false;
    var currentEditor = null;
    /**
@ -52,6 +58,7 @@
                    if (files.length === 1) {
                        var file = files[0];
                        var name = file.name.toLowerCase();
+                        var fileType = file.type.toLowerCase();
                        
                        if (name.match(/\.(apng|avif|gif|jpeg|png|svg|webp)$/)) {
                            file2base64Image(file, function (image) {
@ -63,6 +70,29 @@
                            });
                            return;
                        }
+
+                        if ( fileType.startsWith("text/") ) {
+                            file2Text(file, function (txt) {
+                                var session = currentEditor.getSession();
+                                var pos = session.getCursorPosition();
+                                session.insert(pos, txt);
+                                $("#red-ui-image-drop-target").hide();
+                            });
+                            return;
+                        }
+                        
+                    }
+                } else if ($.inArray("text/plain", ev.originalEvent.dataTransfer.types) != -1) {
+                    let item = Object.values(ev.originalEvent.dataTransfer.items).filter(d => d.type == "text/plain")[0]
+
+                    if (item) {
+                         item.getAsString(txt => {
+                            var session = currentEditor.getSession();
+                            var pos = session.getCursorPosition();
+                            session.insert(pos, txt);
+                            $("#red-ui-image-drop-target").hide();
+                         })
+                         return
                    }                    
                }
                $("#red-ui-image-drop-target").hide();
--- a/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
+++ b/packages/node_modules/@node-red/editor-client/src/js/ui/tab-config.js
@ -56,7 +56,16 @@ RED.sidebar.config = (function() {
            } else {
                $('<span class="red-ui-palette-node-config-label" data-i18n="sidebar.config.'+name+'">').appendTo(header);
            }
+
            $('<span class="red-ui-sidebar-node-config-filter-info"></span>').appendTo(header);
+
+            const changeBadgeContainer = $('<svg class="red-ui-sidebar-config-category-changed red-ui-flow-node-changed" width="10" height="10" viewBox="-1 -1 12 12"></svg>').appendTo(header);
+            const changeBadge = document.createElementNS("http://www.w3.org/2000/svg", "circle");
+            changeBadge.setAttribute("cx", "5");
+            changeBadge.setAttribute("cy", "5");
+            changeBadge.setAttribute("r", "5");
+            changeBadgeContainer.append(changeBadge);
+
            category = $('<ul class="red-ui-palette-content red-ui-sidebar-node-config-list"></ul>').appendTo(container);
            category.on("click", function(e) {
                $(content).find(".red-ui-palette-node").removeClass("selected");
@ -150,9 +159,6 @@ RED.sidebar.config = (function() {
                    $('<li class="red-ui-palette-node-config-type">'+node.type+'</li>').appendTo(list);
                    currentType = node.type;
                }
-                if (node.changed) {
-                    labelText += "!!"
-                }
                var entry = $('<li class="red-ui-palette-node_id_'+node.id.replace(/\./g,"-")+'"></li>').appendTo(list);
                var nodeDiv = $('<div class="red-ui-palette-node-config red-ui-palette-node"></div>').appendTo(entry);
                entry.data('node',node.id);
@ -181,15 +187,29 @@ RED.sidebar.config = (function() {
                    }
                }

+                if (node.changed) {
+                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-changed" width="10" height="10" viewBox="-1 -1 12 12"></svg>').appendTo(nodeDiv);
+                    const changeBadge = document.createElementNS("http://www.w3.org/2000/svg", "circle");
+                    changeBadge.setAttribute("cx", "5");
+                    changeBadge.setAttribute("cy", "5");
+                    changeBadge.setAttribute("r", "5");
+                    nodeDivAnnotations.append($(changeBadge));
+
+                    const categoryHeader = list.parent().find(".red-ui-sidebar-config-tray-header.red-ui-palette-header");
+                    categoryHeader.addClass("red-ui-sidebar-config-changed");
+                    nodeDiv.addClass("red-ui-palette-node-config-changed");
+                }
+
                if (!node.valid) {
-                    nodeDiv.addClass("red-ui-palette-node-config-invalid")
-                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv)
-                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg","path");
-                    errorBadge.setAttribute("d","M 0,9 l 10,0 -5,-8 z");
-                    nodeDivAnnotations.append($(errorBadge))
+                    const nodeDivAnnotations = $('<svg class="red-ui-palette-node-annotations red-ui-flow-node-error" width="10" height="10"></svg>').appendTo(nodeDiv);
+                    const errorBadge = document.createElementNS("http://www.w3.org/2000/svg", "path");
+                    errorBadge.setAttribute("d", "M 0,9 l 10,0 -5,-8 z");
+                    nodeDivAnnotations.append($(errorBadge));
+
+                    nodeDiv.addClass("red-ui-palette-node-config-invalid");
                    RED.popover.tooltip(nodeDivAnnotations, function () {
                        if (node.validationErrors && node.validationErrors.length > 0) {
-                            return RED._("editor.errors.invalidProperties")+"<br>  - "+node.validationErrors.join("<br>  - ")
+                            return RED._("editor.errors.invalidProperties") + "<br>  - " + node.validationErrors.join("<br>  - ");
                        }
                    })
                }
@ -252,6 +272,10 @@ RED.sidebar.config = (function() {
                $(this).remove();
                delete categories[id];
            }
+
+            // Remove the `changed` badge from the category header
+            const categoryHeader = $(this).find(".red-ui-sidebar-config-tray-header.red-ui-palette-header");
+            categoryHeader.removeClass("red-ui-sidebar-config-changed");
        })
        var globalConfigNodes = [];
        var configList = {};
--- a/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
+++ b/packages/node_modules/@node-red/editor-client/src/sass/tab-config.scss
@ -84,6 +84,11 @@ ul.red-ui-sidebar-node-config-list {
    background: var(--red-ui-node-config-background);
    color: var(--red-ui-primary-text-color);
    cursor: pointer;
+    &.red-ui-palette-node-config-invalid.red-ui-palette-node-config-changed {
+        .red-ui-palette-node-annotations.red-ui-flow-node-error {
+            left: calc(100% - 28px);
+        }
+    }
 }
 ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
    color: var(--red-ui-secondary-text-color);
@ -115,6 +120,15 @@ ul.red-ui-sidebar-node-config-list li.red-ui-palette-node-config-type {
 .red-ui-palette-node-config-invalid {
    border-color: var(--red-ui-form-input-border-error-color)
 }
+.red-ui-sidebar-config-tray-header.red-ui-palette-header:not(.red-ui-sidebar-config-changed) .red-ui-flow-node-changed {
+    display: none;
+}
+.red-ui-sidebar-config-tray-header.red-ui-palette-header.red-ui-sidebar-config-changed .red-ui-flow-node-changed {
+    display: inline-block;
+    position: absolute;
+    top: 1px;
+    right: 1px;
+}
 .red-ui-palette-node-annotations {
    position: absolute;
    left: calc(100% - 15px);
Author	SHA1	Message	Date
Nick O'Leary	2feb290ae3	Merge pull request #5060 from gorenje/patch-3 Add .editorconfig to .gitignore	2025-02-25 09:57:04 +00:00
Nick O'Leary	45bcb74dae	Merge pull request #5062 from GogoVega/tab-config-changed-badge Add the `changed` badge to the config node	2025-02-25 09:55:45 +00:00
GogoVega	6da890bf88	Manage badge locations with pure CSS + cleanup	2025-02-24 21:09:44 +01:00
GogoVega	b8eeef182c	Add `changed` badge for category header + fix cropped badge	2025-02-24 21:09:11 +01:00
GogoVega	54e0de64a7	Add the `changed` badge for the config node	2025-02-24 21:08:43 +01:00
Gerrit Riessen	3bd1b58217	Add .editorconfig to .gitignore I use [EditorConfig](https://editorconfig.org/) to adjust my editor settings for indentation. My settings should probably be best ignored, unless there is a desire to have a project wide .editorconfig	2025-02-24 19:01:17 +01:00
Nick O'Leary	71f8de94b0	Merge pull request #5056 from gorenje/master Support text drag & drop into markdown editor	2025-02-24 16:26:19 +00:00
Nick O'Leary	4723378f2f	Merge pull request #5054 from GogoVega/deployment-ignore-disabled Ignore state of disabled nodes/flows during deployment	2025-02-24 16:11:55 +00:00
Nick O'Leary	8837597ff5	Merge pull request #5053 from matiseni51/fix-include-label-themeSettings-config fix: set label in themeSettings.deployButton despite type attribute	2025-02-24 16:08:47 +00:00
Gerrit Riessen	473b93f497	Support text drag & drop into markdown editor Along with image drop, this change adds text drop into the editor. This is useful for highlighting text and then drag that text into the description of a node. Similar creating a mermaid diagram using a third-party tool and then drag the text into the description. Also drop text files is also supported for longer texts.	2025-02-20 09:30:50 +01:00
GogoVega	d9c5144fe2	Ignore state of disabled nodes/flows during deployment	2025-02-17 14:05:51 +01:00
matiseni51	cbc91a9ac8	Merge branch 'master' into fix-include-label-themeSettings-config	2025-02-16 14:03:24 +01:00
matiseni51	88c946d401	fix: set label in themeSettings.deployButton despite type attribute	2025-02-16 13:44:22 +01:00