',{class:"palette-module-header"}).appendTo(row);
+ if (entry.label) {
+ row.parent().addClass("palette-module-section");
+ headerRow.text(entry.label);
+ if (entry.index === 1) {
+ var addButton = $('
').appendTo(headerRow).click(function(evt) {
+ evt.preventDefault();
+ var deps = $.extend(true, {}, activeProject.dependencies);
+ for (var m in modulesInUse) {
+ if (modulesInUse.hasOwnProperty(m) && !modulesInUse[m].known) {
+ deps[m] = modulesInUse[m].version;
+ }
+ }
+ editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList);
+ });
+ } else if (entry.index === 3) {
+ var removeButton = $('
').appendTo(headerRow).click(function(evt) {
+ evt.preventDefault();
+ var deps = $.extend(true, {}, activeProject.dependencies);
+ for (var m in activeProject.dependencies) {
+ if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) {
+ delete deps[m];
+ }
+ }
+ editDependencies(activeProject,JSON.stringify(deps,"",4),pane,depsList);
+ });
+ }
+ } else {
+ headerRow.toggleClass("palette-module-unused",entry.count === 0);
+ entry.element = headerRow;
+ var titleRow = $('
').appendTo(headerRow);
+ var icon = $('
').appendTo(titleRow);
+ entry.icon = icon;
+ $('
').html(entry.module).appendTo(titleRow);
+ var metaRow = $('
').appendTo(headerRow);
+ var versionSpan = $('').html(entry.version).appendTo(metaRow);
+ if (!entry.known) {
+ headerRow.addClass("palette-module-unknown");
+ } else if (entry.known && entry.count === 0) {
+
+ }
+ }
+ },
+ sort: function(A,B) {
+ if (A.index && B.index) {
+ return A.index - B.index;
+ }
+ var Acategory = A.index?A.index:(A.known?(A.count>0?0:4):2);
+ var Bcategory = B.index?B.index:(B.known?(B.count>0?0:4):2);
+ if (Acategory === Bcategory) {
+ return A.module.localeCompare(B.module);
+ } else {
+ return Acategory - Bcategory;
+ }
+ }
+ });
+
+ updateProjectDependencies(activeProject,depsList);
+ return pane;
+
+ }
var utils;
+ var modulesInUse = {};
function init(_utils) {
utils = _utils;
addPane({
id:'main',
- title: "NLS: Project",
- get: createViewPane,
+ title: "Project", // TODO: nls
+ get: createMainPane,
close: function() { }
+ });
+ addPane({
+ id:'deps',
+ title: "Dependencies", // TODO: nls
+ get: createDependenciesPane,
+ close: function() { }
+ });
+
+ RED.events.on('nodes:add', function(n) {
+ if (!/^subflow:/.test(n.type)) {
+ var module = RED.nodes.registry.getNodeSetForType(n.type).module;
+ if (module !== 'node-red') {
+ if (!modulesInUse.hasOwnProperty(module)) {
+ modulesInUse[module] = {
+ module: module,
+ version: RED.nodes.registry.getModule(module).version,
+ count: 0,
+ known: false
+ }
+ }
+ modulesInUse[module].count++;
+ }
+ }
})
+ RED.events.on('nodes:remove', function(n) {
+ if (!/^subflow:/.test(n.type)) {
+ var module = RED.nodes.registry.getNodeSetForType(n.type).module;
+ if (module !== 'node-red' && modulesInUse.hasOwnProperty(module)) {
+ modulesInUse[module].count--;
+ if (modulesInUse[module].count === 0) {
+ if (!modulesInUse[module].known) {
+ delete modulesInUse[module];
+ }
+ }
+ }
+ }
+ })
+
+
+
}
return {
init: init,
diff --git a/editor/sass/projects.scss b/editor/sass/projects.scss
index 31cccf4d2..1e38fc596 100644
--- a/editor/sass/projects.scss
+++ b/editor/sass/projects.scss
@@ -200,14 +200,11 @@
}
}
-.sidebar-projects-dependencies {
- position: relative;
- height: 100%;
+#project-settings-tab-deps {
.red-ui-editableList-container {
padding: 0;
}
.red-ui-editableList-border {
- border: none;
border-radius: 0;
}
.red-ui-editableList-item-content {
@@ -240,6 +237,6 @@
left:0;
right:0;
bottom:0;
- overflow-y: scroll;
+ overflow-y: auto;
padding: 8px 20px 20px;
}
diff --git a/red/api/editor/projects/index.js b/red/api/editor/projects/index.js
index 207c61dda..98f3b2814 100644
--- a/red/api/editor/projects/index.js
+++ b/red/api/editor/projects/index.js
@@ -85,9 +85,7 @@ module.exports = {
req.body.hasOwnProperty('dependencies')||
req.body.hasOwnProperty('summary')) {
runtime.storage.projects.updateProject(req.params.id, req.body).then(function() {
- setTimeout(function() {
- res.redirect(303,req.baseUrl + '/');
- },5000);
+ res.redirect(303,req.baseUrl + '/');
}).otherwise(function(err) {
if (err.code) {
res.status(400).json({error:err.code, message: err.message});