From bf0ca383506aed7ba43e4550175e7d247c87b0c4 Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Mon, 29 Apr 2024 02:12:08 +0900 Subject: [PATCH 1/2] Enable updating dependencies of package.json in project feature --- .../editor-client/src/js/ui/projects/projectSettings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js index 37a5ef1a8..c5dbfbdbf 100644 --- a/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js +++ b/packages/node_modules/@node-red/editor-client/src/js/ui/projects/projectSettings.js @@ -287,7 +287,7 @@ RED.projects.settings = (function() { var notInstalledCount = 0; for (var m in modulesInUse) { - if (modulesInUse.hasOwnProperty(m)) { + if (modulesInUse.hasOwnProperty(m) && !activeProject.dependencies.hasOwnProperty(m)) { depsList.editableList('addItem',{ id: modulesInUse[m].module, version: modulesInUse[m].version, @@ -307,8 +307,8 @@ RED.projects.settings = (function() { if (activeProject.dependencies) { for (var m in activeProject.dependencies) { - if (activeProject.dependencies.hasOwnProperty(m) && !modulesInUse.hasOwnProperty(m)) { - var installed = !!RED.nodes.registry.getModule(m); + if (activeProject.dependencies.hasOwnProperty(m)) { + var installed = !!RED.nodes.registry.getModule(m) && activeProject.dependencies[m] === modulesInUse[m].version; depsList.editableList('addItem',{ id: m, version: activeProject.dependencies[m], //RED.nodes.registry.getModule(module).version, From 361391ceb87139cc3ff60de475c6e690db07b53a Mon Sep 17 00:00:00 2001 From: Kazuhito Yokoi Date: Mon, 29 Apr 2024 16:02:56 +0900 Subject: [PATCH 2/2] Load the latest project files when retrieving project information --- .../runtime/lib/storage/localfilesystem/projects/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js index b2b8c7052..ca87d76e9 100644 --- a/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js +++ b/packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/index.js @@ -242,7 +242,9 @@ function loadProject(name) { function getProject(user, name) { checkActiveProject(name); - return Promise.resolve(activeProject.export()); + return loadProject(name).then(function () { + return Promise.resolve(activeProject.export()); + }); } function deleteProject(user, name) {