merge upstream/dev

packages/node_modules/@node-red/editor-api/lib/admin/context.js

@@ -37,5 +37,20 @@ module.exports = {
         }).catch(function(err) {
             apiUtils.rejectHandler(req,res,err);
         })
+    },
+
+    delete: function(req,res) {
+        var opts = {
+            user: req.user,
+            scope: req.params.scope,
+            id: req.params.id,
+            key: req.params[0],
+            store: req.query['store']
+        }
+        runtimeAPI.context.delete(opts).then(function(result) {
+            res.status(204).end();
+        }).catch(function(err) {
+            apiUtils.rejectHandler(req,res,err);
+        })
     }
 }

packages/node_modules/@node-red/editor-api/lib/admin/index.js

@@ -62,6 +62,11 @@ module.exports = {
         adminApp.get("/context/:scope(node|flow)/:id",needsPermission("context.read"),context.get,apiUtil.errorHandler);
         adminApp.get("/context/:scope(node|flow)/:id/*",needsPermission("context.read"),context.get,apiUtil.errorHandler);
 
+        // adminApp.delete("/context/:scope(global)",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
+        adminApp.delete("/context/:scope(global)/*",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
+        // adminApp.delete("/context/:scope(node|flow)/:id",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
+        adminApp.delete("/context/:scope(node|flow)/:id/*",needsPermission("context.write"),context.delete,apiUtil.errorHandler);
+
         return adminApp;
     }
 }

packages/node_modules/@node-red/editor-client/locales/en-US/editor.json

@@ -515,7 +515,8 @@
             "empty": "empty",
             "node": "Node",
             "flow": "Flow",
-            "global": "Global"
+            "global": "Global",
+            "deleteConfirm": "Are you sure you want to delete this item?"
         },
         "palette": {
             "name": "Palette management",

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

@@ -131,6 +131,7 @@ RED.popover = (function() {
             }
         }
         var closePopup = function(instant) {
+            $(document).off('mousedown.modal-popover-close');
             if (!active) {
                 if (div) {
                     if (instant) {
@@ -171,6 +172,17 @@ RED.popover = (function() {
                     openPopup();
                 }
             });
+        } else if (trigger === 'modal') {
+            $(document).on('mousedown.modal-popover-close', function (event) {
+                var target = event.target;
+                while (target.nodeName !== 'BODY' && target !== div[0]) {
+                    target = target.parentElement;
+                }
+                if (target.nodeName === 'BODY') {
+                    active = false;
+                    closePopup();
+                }
+            });
         } else if (autoClose) {
             setTimeout(function() {
                 active = false;

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

@@ -237,29 +237,83 @@ RED.sidebar.context = (function() {
                     var propRow = $('<tr class="node-info-node-row"><td class="sidebar-context-property"></td><td></td></tr>').appendTo(container);
                     var obj = $(propRow.children()[0]);
                     obj.text(k);
-                    var tools = $('<span class="debug-message-tools button-group"></span>').appendTo(obj);
+                    var tools = $('<span class="button-group"></span>');
+
                     var refreshItem = $('<button class="editor-button editor-button-small"><i class="fa fa-refresh"></i></button>').appendTo(tools).click(function(e) {
                         e.preventDefault();
                         e.stopPropagation();
                         $.getJSON(baseUrl+"/"+k+"?store="+v.store, function(data) {
-                            $(propRow.children()[1]).empty();
+                            if (data.msg !== payload || data.format !== format) {
-                            var payload = data.msg;
+                                payload = data.msg;
-                            var format = data.format;
+                                format = data.format;
-                            payload = RED.utils.decodeObject(payload,format);
+                                tools.detach();
-                            RED.utils.createObjectElement(payload, {
+                                $(propRow.children()[1]).empty();
-                                typeHint: data.format,
+                                RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
-                                sourceId: id+"."+k
+                                    typeHint: data.format,
-                            }).appendTo(propRow.children()[1]);
+                                    sourceId: id+"."+k,
+                                    tools: tools
+                                }).appendTo(propRow.children()[1]);
+                            }
                         })
                     });
+                    var deleteItem = $('<button class="editor-button editor-button-small"><i class="fa fa-trash"></i></button>').appendTo(tools).click(function(e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                        var popover = RED.popover.create({
+                            trigger: 'modal',
+                            target: propRow,
+                            direction: "left",
+                            content: function() {
+                                var content = $('<div>');
+                                $('<p data-i18n="sidebar.context.deleteConfirm"></p>').appendTo(content);
+                                var row = $('<p>').appendTo(content);
+                                var bg = $('<span class="button-group"></span>').appendTo(row);
+                                $('<button class="editor-button" data-i18n="common.label.cancel"></button>').appendTo(bg).click(function(e) {
+                                    e.preventDefault();
+                                    popover.close();
+                                });
+                                bg = $('<span class="button-group"></span>').appendTo(row);
+                                $('<button class="editor-button primary" data-i18n="common.label.delete"></button>').appendTo(bg).click(function(e) {
+                                    e.preventDefault();
+                                    popover.close();
+                                    $.ajax({
+                                        url: baseUrl+"/"+k+"?store="+v.store,
+                                        type: "DELETE"
+                                    }).done(function(data,textStatus,xhr) {
+                                        $.getJSON(baseUrl+"/"+k+"?store="+v.store, function(data) {
+                                            if (data.format === 'undefined') {
+                                                propRow.remove();
+                                                if (container.children().length === 0) {
+                                                    $('<tr class="node-info-node-row red-ui-search-empty blank" colspan="2"><td data-i18n="sidebar.context.empty"></td></tr>').appendTo(container).i18n();
+                                                }
+                                            } else {
+                                                payload = data.msg;
+                                                format = data.format;
+                                                tools.detach();
+                                                $(propRow.children()[1]).empty();
+                                                RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
+                                                    typeHint: data.format,
+                                                    sourceId: id+"."+k,
+                                                    tools: tools
+                                                }).appendTo(propRow.children()[1]);
+                                            }
+                                        });
+                                    }).fail(function(xhr,textStatus,err) {
 
+                                    })
+                                });
+                                return content.i18n();
+                            }
+                        });
+                        popover.open();
 
+                    });
                     var payload = v.msg;
                     var format = v.format;
-                    payload = RED.utils.decodeObject(payload,format);
+                    RED.utils.createObjectElement(RED.utils.decodeObject(payload,format), {
-                    RED.utils.createObjectElement(payload, {
                         typeHint: v.format,
-                        sourceId: id+"."+k
+                        sourceId: id+"."+k,
+                        tools: tools
                     }).appendTo(propRow.children()[1]);
                     if (contextStores.length > 1) {
                         $("<span>",{class:"sidebar-context-property-storename"}).text(v.store).appendTo($(propRow.children()[0]))

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

@@ -113,7 +113,7 @@ RED.utils = (function() {
     var pinnedPaths = {};
     var formattedPaths = {};
 
-    function addMessageControls(obj,sourceId,key,msg,rootPath,strippedKey) {
+    function addMessageControls(obj,sourceId,key,msg,rootPath,strippedKey,extraTools) {
         if (!pinnedPaths.hasOwnProperty(sourceId)) {
             pinnedPaths[sourceId] = {}
         }
@@ -150,6 +150,10 @@ RED.utils = (function() {
             }).toggleClass("selected",isPinned);
             obj.toggleClass("debug-message-row-pinned",isPinned);
         }
+        if (extraTools) {
+            extraTools.addClass("debug-message-tools-other");
+            extraTools.appendTo(tools);
+        }
     }
     function checkExpanded(strippedKey,expandPaths,minRange,maxRange) {
         if (expandPaths && expandPaths.length > 0) {
@@ -243,6 +247,7 @@ RED.utils = (function() {
         var expandPaths = options.expandPaths;
         var ontoggle = options.ontoggle;
         var exposeApi = options.exposeApi;
+        var tools = options.tools;
 
         var subElements = {};
         var i;
@@ -262,7 +267,7 @@ RED.utils = (function() {
         }
         header = $('<span class="debug-message-row"></span>').appendTo(element);
         if (sourceId) {
-            addMessageControls(header,sourceId,path,obj,rootPath,strippedKey);
+            addMessageControls(header,sourceId,path,obj,rootPath,strippedKey,tools);
         }
         if (!key) {
             element.addClass("debug-message-top-level");

packages/node_modules/@node-red/editor-client/src/sass/debug.scss

@@ -81,6 +81,9 @@
             .debug-message-tools-pin {
                 display: inline-block;
             }
+            .debug-message-tools-other {
+                display: inline-block;
+            }
         }
     }
 }
@@ -134,6 +137,9 @@
     .debug-message-tools-copy {
         display: none;
     }
+    .debug-message-tools-other {
+        display: none;
+    }
 }
 .debug-message-payload {
     display: block;

packages/node_modules/@node-red/editor-client/src/sass/popover.scss

@@ -146,3 +146,16 @@
     border-radius:3px;
     padding: 1px 2px;
 }
+
+.red-ui-popover .editor-button {
+    &:not(.primary) {
+        color: #444 !important;
+        border-color: rgba(0,0,0,0);
+    }
+    &.primary {
+        border-color: #bbb;
+    }
+    &.primary:hover {
+        border-color: #666 !important;
+    }
+}

packages/node_modules/@node-red/runtime/lib/api/context.js

@@ -20,7 +20,6 @@
 
 var runtime;
 
-// TODO: move runtime/util to util/index
 var util = require("@node-red/util").util;
 
 function exportContextStore(scope,ctx, store, result, callback) {
@@ -152,5 +151,104 @@ var api = module.exports = {
                 resolve({});
             }
         })
+    },
+
+    /**
+    * Gets the info of an individual node set
+    * @param {Object} opts
+    * @param {User} opts.user - the user calling the api
+    * @param {String} opts.scope - the scope of the context
+    * @param {String} opts.id - the id of the context
+    * @param {String} opts.store - the context store
+    * @param {String} opts.key - the context key
+
+    * @return {Promise} - the node information
+    * @memberof RED.nodes
+    */
+    delete: function(opts) {
+        return new Promise(function(resolve,reject) {
+            var scope = opts.scope;
+            var id = opts.id;
+            var store = opts.store;
+            var key = opts.key;
+
+            var availableStores = runtime.nodes.listContextStores();
+            //{ default: 'default', stores: [ 'default', 'file' ] }
+            if (store && availableStores.stores.indexOf(store) === -1) {
+                runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"});
+                var err = new Error();
+                err.code = "not_found";
+                err.status = 404;
+                return reject(err);
+            }
+            var ctx;
+            if (scope === 'global') {
+                ctx = runtime.nodes.getContext('global');
+            } else if (scope === 'flow') {
+                ctx = runtime.nodes.getContext(id);
+            } else if (scope === 'node') {
+                var node = runtime.nodes.getNode(id);
+                if (node) {
+                    ctx = node.context();
+                }
+            }
+            if (ctx) {
+                if (key) {
+                    store = store || availableStores.default;
+                    ctx.set(key,undefined,store,function(err) {
+                        runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key});
+                        resolve();
+                    });
+                    return;
+                } else {
+                    // TODO: support deleting whole context
+                    runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key,error:"not_found"});
+                    var err = new Error();
+                    err.code = "not_found";
+                    err.status = 404;
+                    return reject(err);
+                    // var stores;
+                    // if (!store) {
+                    //     stores = availableStores.stores;
+                    // } else {
+                    //     stores = [store];
+                    // }
+                    //
+                    // var result = {};
+                    // var c = stores.length;
+                    // var errorReported = false;
+                    // stores.forEach(function(store) {
+                    //     exportContextStore(scope,ctx,store,result,function(err) {
+                    //         if (err) {
+                    //             // TODO: proper error reporting
+                    //             if (!errorReported) {
+                    //                 errorReported = true;
+                    //                 runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key,error:"unexpected_error"});
+                    //                 var err = new Error();
+                    //                 err.code = "unexpected_error";
+                    //                 err.status = 400;
+                    //                 return reject(err);
+                    //             }
+                    //
+                    //             return;
+                    //         }
+                    //         c--;
+                    //         if (c === 0) {
+                    //             if (!errorReported) {
+                    //                 runtime.log.audit({event: "context.get",scope:scope,id:id,store:store,key:key});
+                    //                 resolve(result);
+                    //             }
+                    //         }
+                    //     });
+                    // })
+                }
+            } else {
+                runtime.log.audit({event: "context.delete",scope:scope,id:id,store:store,key:key});
+                resolve();
+            }
+
+
+        });
     }
+
 }