Tidy up branch/remote list in projectSettings

red/api/editor/projects/index.js

@@ -77,7 +77,7 @@ module.exports = {
             //TODO: validate the payload properly
             if (req.body.active) {
                 var currentProject = runtime.storage.projects.getActiveProject(req.user);
-                if (req.params.id !== currentProject.name) {
+                if (!currentProject || req.params.id !== currentProject.name) {
                     runtime.storage.projects.setActiveProject(req.user, req.params.id).then(function() {
                         res.redirect(303,req.baseUrl + '/');
                     }).catch(function(err) {
@@ -465,8 +465,52 @@ module.exports = {
             })
         });
 
+        // Get a list of remotes
+        app.get("/:id/remotes", needsPermission("projects.read"), function(req, res) {
+            var projectName = req.params.id;
+            runtime.storage.projects.getRemotes(req.user, projectName).then(function(data) {
+                res.json(data);
+            })
+            .catch(function(err) {
+                console.log(err.stack);
+                if (err.code) {
+                    res.status(400).json({error:err.code, message: err.message});
+                } else {
+                    res.status(400).json({error:"unexpected_error", message:err.toString()});
+                }
+            })
+        });
 
+        // Add a remote
+        app.post("/:id/remotes", needsPermission("projects.write"), function(req,res) {
+            var projectName = req.params.id;
+            runtime.storage.projects.addRemote(req.user, projectName, req.body).then(function() {
+                res.redirect(303,req.baseUrl+"/"+projectName+"/remotes");
+            }).catch(function(err) {
+                console.log(err.stack);
+                if (err.code) {
+                    res.status(400).json({error:err.code, message: err.message});
+                } else {
+                    res.status(400).json({error:"unexpected_error", message:err.toString()});
+                }
+            })
+        });
 
+        // Delete a remote
+        app.delete("/:id/remotes/:remoteName", needsPermission("projects.write"), function(req, res) {
+            var projectName = req.params.id;
+            var remoteName = req.params.remoteName;
+            runtime.storage.projects.removeRemote(req.user, projectName, remoteName).then(function(data) {
+                res.redirect(303,req.baseUrl+"/"+projectName+"/remotes");
+            })
+            .catch(function(err) {
+                if (err.code) {
+                    res.status(400).json({error:err.code, message: err.message});
+                } else {
+                    res.status(400).json({error:"unexpected_error", message:err.toString()});
+                }
+            });
+        });
 
         return app;
     }

red/runtime/storage/localfilesystem/projects/Project.js

@@ -117,7 +117,6 @@ Project.prototype.loadRemotes = function() {
     }).then(function() {
         return project.loadBranches();
     }).then(function() {
-
         var allRemotes = Object.keys(project.remotes);
         var match = "";
         allRemotes.forEach(function(remote) {
@@ -519,6 +518,41 @@ Project.prototype.setBranch = function (branchName, isCreate) {
 Project.prototype.getBranchStatus = function (branchName) {
     return gitTools.getBranchStatus(this.path,branchName);
 };
+
+
+
+Project.prototype.getRemotes = function (user) {
+    return gitTools.getRemotes(this.path).then(function(remotes) {
+        var result = [];
+        for (var name in remotes) {
+            if (remotes.hasOwnProperty(name)) {
+                remotes[name].name = name;
+                result.push(remotes[name]);
+            }
+        }
+        return {remotes:result};
+    })
+};
+Project.prototype.addRemote = function(user,remote,options) {
+    var project = this;
+    return gitTools.addRemote(this.path,remote,options).then(function() {
+        return project.loadRemotes()
+    });
+}
+Project.prototype.updateRemote = function(user,remote,options) {
+    // TODO: once the sshkey support is added, move the updating of remotes,
+    // including their auth details, down here.
+}
+Project.prototype.removeRemote = function(user, remote) {
+    // TODO: if this was the last remote using this url, then remove the authCache
+    // details.
+    var project = this;
+    return gitTools.removeRemote(this.path,remote).then(function() {
+        return project.loadRemotes()
+    });
+}
+
+
 Project.prototype.getFlowFile = function() {
     console.log("Project.getFlowFile = ",this.paths.flowFile);
     if (this.paths.flowFile) {

red/runtime/storage/localfilesystem/projects/git/index.js

@@ -58,6 +58,8 @@ function runGitCommand(args,cwd,env) {
                     err.code = "git_pull_merge_conflict";
                 } else if (/not fully merged/.test(stderr)) {
                     err.code = "git_delete_branch_unmerged";
+                } else if (/remote .* already exists/.test(stderr)) {
+                    err.code = "git_remote_already_exists";
                 }
                 return reject(err);
             }

red/runtime/storage/localfilesystem/projects/index.js

@@ -252,6 +252,21 @@ function getBranchStatus(user, project,branchName) {
     checkActiveProject(project);
     return activeProject.getBranchStatus(branchName);
 }
+
+
+function getRemotes(user, project) {
+    checkActiveProject(project);
+    return activeProject.getRemotes(user);
+}
+function addRemote(user, project, options) {
+    checkActiveProject(project);
+    return activeProject.addRemote(user, options.name, options);
+}
+function removeRemote(user, project, remote) {
+    checkActiveProject(project);
+    return activeProject.removeRemote(user, remote);
+}
+
 function getActiveProject(user) {
     return activeProject;
 }
@@ -473,6 +488,9 @@ module.exports = {
     deleteBranch: deleteBranch,
     setBranch: setBranch,
     getBranchStatus:getBranchStatus,
+    getRemotes: getRemotes,
+    addRemote: addRemote,
+    removeRemote: removeRemote,
 
     getFlows: getFlows,
     saveFlows: saveFlows,