mirror of
https://github.com/node-red/node-red.git
synced 2023-10-10 13:36:53 +02:00
Add git config UI (#1506)
* Add Git config tab * Get usersetting data via admin HTTP API * Delete git committer edit form in Project Settings tab * Corresponding to the PR feedback
This commit is contained in:
Hideki Nakamura
Nick O'Leary
parent
91352e855a
commit
6d633b372a
@ -155,6 +155,7 @@ module.exports = function(grunt) {
|
||||
"editor/js/ui/userSettings.js",
|
||||
"editor/js/ui/projects.js",
|
||||
"editor/js/ui/projectSettings.js",
|
||||
"editor/js/ui/projectUserSettings.js",
|
||||
"editor/js/ui/tab-versionControl.js",
|
||||
"editor/js/ui/touch/radialMenu.js"
|
||||
],
|
||||
|
||||
@ -957,39 +957,11 @@ RED.projects.settings = (function() {
|
||||
|
||||
$('.projects-dialog-remote-list-entry-delete').show();
|
||||
remoteListAddButton.show();
|
||||
|
||||
gitUsernameLabel.hide();
|
||||
gitUsernameInput.show();
|
||||
gitEmailLabel.hide();
|
||||
gitEmailInput.show();
|
||||
});
|
||||
|
||||
var repoContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
|
||||
var subtitle = $('<h4></h4>').text("Committer Details").appendTo(repoContainer);
|
||||
$('<div style="display: inline-block; margin-left: 20px;"><small style="color:#aaa;"></small></div>').appendTo(subtitle).find('small').text("Leave blank to use system default");
|
||||
|
||||
var row = $('<div class="user-settings-row"></div>').appendTo(repoContainer);
|
||||
$('<label for=""></label>').text('Username').appendTo(row);
|
||||
var gitUsernameLabel = $('<div class="uneditable-input">').appendTo(row);
|
||||
var gitUsernameInput = $('<input type="text">').hide().appendTo(row);
|
||||
|
||||
row = $('<div class="user-settings-row"></div>').appendTo(repoContainer);
|
||||
$('<label for=""></label>').text('Email').appendTo(row);
|
||||
var gitEmailLabel = $('<div class="uneditable-input">').appendTo(row);
|
||||
var gitEmailInput = $('<input type="text">').hide().appendTo(row);
|
||||
|
||||
if (activeProject.git.user) {
|
||||
gitUsernameLabel.text(activeProject.git.user.name);
|
||||
gitUsernameInput.val(activeProject.git.user.name);
|
||||
|
||||
gitEmailLabel.text(activeProject.git.user.email);
|
||||
gitEmailInput.val(activeProject.git.user.email);
|
||||
}
|
||||
|
||||
|
||||
var grTitle = $('<h4></h4>').text("Git remotes").appendTo(repoContainer);
|
||||
|
||||
|
||||
row = $('<div class="user-settings-row projects-dialog-remote-list"></div>').appendTo(repoContainer);
|
||||
var remotesList = $('<ol>').appendTo(row);
|
||||
remotesList.editableList({
|
||||
@ -1043,12 +1015,6 @@ RED.projects.settings = (function() {
|
||||
formButtons.hide();
|
||||
$('.projects-dialog-remote-list-entry-delete').hide();
|
||||
remoteListAddButton.hide();
|
||||
|
||||
gitUsernameLabel.show();
|
||||
gitUsernameInput.hide();
|
||||
gitEmailLabel.show();
|
||||
gitEmailInput.hide();
|
||||
|
||||
}
|
||||
|
||||
var formButtons = $('<span class="button-group" style="position: relative; float: right; margin-right:0;"></span>')
|
||||
@ -1081,10 +1047,6 @@ RED.projects.settings = (function() {
|
||||
var spinner = utils.addSpinnerOverlay(repoContainer);
|
||||
|
||||
var body = {
|
||||
user: {
|
||||
name: gitUsernameInput.val(),
|
||||
email: gitEmailInput.val()
|
||||
},
|
||||
remotes: {}
|
||||
}
|
||||
|
||||
@ -1128,13 +1090,6 @@ RED.projects.settings = (function() {
|
||||
},
|
||||
200: function(data) {
|
||||
activeProject.git.remotes = data.git.remotes;
|
||||
activeProject.git.user = data.git.user;
|
||||
if (activeProject.git.user) {
|
||||
gitUsernameLabel.text(activeProject.git.user.name);
|
||||
gitUsernameInput.val(activeProject.git.user.name);
|
||||
gitEmailLabel.text(activeProject.git.user.email);
|
||||
gitEmailInput.val(activeProject.git.user.email);
|
||||
}
|
||||
|
||||
updateForm();
|
||||
done();
|
||||
|
||||
263
editor/js/ui/projectUserSettings.js
Normal file
263
editor/js/ui/projectUserSettings.js
Normal file
@ -0,0 +1,263 @@
|
||||
/**
|
||||
* Copyright JS Foundation and other contributors, http://js.foundation
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
**/
|
||||
|
||||
RED.projects.userSettings = (function() {
|
||||
|
||||
var trayWidth = 700;
|
||||
var settingsVisible = false;
|
||||
|
||||
function createRemoteRepositorySection(pane) {
|
||||
var title = $('<h3></h3>').text("Version Control").appendTo(pane);
|
||||
var editGitUserButton = $('<button class="editor-button editor-button-small" style="float: right;">edit</button>')
|
||||
.appendTo(title)
|
||||
.click(function(evt) {
|
||||
editGitUserButton.hide();
|
||||
formButtons.show();
|
||||
|
||||
gitUsernameLabel.hide();
|
||||
gitUsernameInput.show();
|
||||
gitEmailLabel.hide();
|
||||
gitEmailInput.show();
|
||||
});
|
||||
|
||||
var gitconfigContainer = $('<div class="user-settings-section"></div>').appendTo(pane);
|
||||
var subtitle = $('<h4></h4>').text("Committer Details").appendTo(gitconfigContainer);
|
||||
$('<div style="display: inline-block; margin-left: 20px;"><small style="color:#aaa;"></small></div>').appendTo(subtitle).find('small').text("Leave blank to use system default");
|
||||
|
||||
var row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
|
||||
$('<label for=""></label>').text('Username').appendTo(row);
|
||||
var gitUsernameLabel = $('<div class="uneditable-input">').appendTo(row);
|
||||
var gitUsernameInput = $('<input type="text">').hide().appendTo(row);
|
||||
|
||||
row = $('<div class="user-settings-row"></div>').appendTo(gitconfigContainer);
|
||||
$('<label for=""></label>').text('Email').appendTo(row);
|
||||
var gitEmailLabel = $('<div class="uneditable-input">').appendTo(row);
|
||||
var gitEmailInput = $('<input type="text">').hide().appendTo(row);
|
||||
|
||||
// var formButtons = $('<span class="button-group" style="position: relative; float: right; margin-right:0;"></span>')
|
||||
var formButtonArea = $('<div style="width: 100%; height: 35px;"></div>').appendTo(gitconfigContainer);
|
||||
var formButtons = $('<span class="button-group" style="position: absolute; right: 0px; margin-right:0;"></span>')
|
||||
.hide().appendTo(formButtonArea);
|
||||
|
||||
|
||||
// var sshkeyTitle = $('<h4></h4>').text("SSH Keys").appendTo(gitconfigContainer);
|
||||
// var generateSshKeyButton = $('<button class="editor-button editor-button-small" style="float: right;">generate new ssh key</button>')
|
||||
// .appendTo(sshkeyTitle)
|
||||
// .click(function(evt) {
|
||||
// console.log('click generateSshKeyButton');
|
||||
// });
|
||||
|
||||
// row = $('<div class="user-settings-row projects-dialog-remote-list"></div>').appendTo(gitconfigContainer);
|
||||
// var sshkeysList = $('<ol>').appendTo(row);
|
||||
// sshkeysList.editableList({
|
||||
// addButton: false,
|
||||
// height: 'auto',
|
||||
// addItem: function(outer,index,entry) {
|
||||
|
||||
// var header = $('<div class="projects-dialog-remote-list-entry-header"></div>').appendTo(outer);
|
||||
// entry.header = $('<span>').text(entry.path||"Add new remote").appendTo(header);
|
||||
// var body = $('<div>').appendTo(outer);
|
||||
// entry.body = body;
|
||||
// if (entry.path) {
|
||||
// entry.removeButton = $('<button class="editor-button editor-button-small projects-dialog-remote-list-entry-delete">remove</button>')
|
||||
// // .hide()
|
||||
// .appendTo(header)
|
||||
// .click(function(e) {
|
||||
// entry.removed = true;
|
||||
// body.fadeOut(100);
|
||||
// entry.header.css("text-decoration","line-through")
|
||||
// entry.header.css("font-style","italic")
|
||||
// if (entry.copyToClipboard) {
|
||||
// entry.copyToClipboard.hide();
|
||||
// }
|
||||
// $(this).hide();
|
||||
// });
|
||||
// if (entry.data) {
|
||||
// entry.copyToClipboard = $('<button class="editor-button editor-button-small projects-dialog-remote-list-entry-copy">copy</button>')
|
||||
// // .hide()
|
||||
// .appendTo(header)
|
||||
// .click(function(e) {
|
||||
// var textarea = document.createElement("textarea");
|
||||
// textarea.style.position = 'fixed';
|
||||
// textarea.style.top = 0;
|
||||
// textarea.style.left = 0;
|
||||
// textarea.style.width = '2em';
|
||||
// textarea.style.height = '2em';
|
||||
// textarea.style.padding = 0;
|
||||
// textarea.style.border = 'none';
|
||||
// textarea.style.outline = 'none';
|
||||
// textarea.style.boxShadow = 'none';
|
||||
// textarea.style.background = 'transparent';
|
||||
// textarea.value = entry.data;
|
||||
// document.body.appendChild(textarea);
|
||||
// textarea.select();
|
||||
// try {
|
||||
// var ret = document.execCommand('copy');
|
||||
// var msg = ret ? 'successful' : 'unsuccessful';
|
||||
// console.log('Copy text command was ' + msg);
|
||||
// } catch (err) {
|
||||
// console.log('Oops unable to copy');
|
||||
// }
|
||||
// document.body.removeChild(textarea);
|
||||
// });
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// });
|
||||
|
||||
// var remoteListAddButton = row.find(".red-ui-editableList-addButton").hide();
|
||||
|
||||
var hideGitUserEditForm = function() {
|
||||
editGitUserButton.show();
|
||||
formButtons.hide();
|
||||
// $('.projects-dialog-remote-list-entry-delete').hide();
|
||||
// remoteListAddButton.hide();
|
||||
|
||||
gitUsernameLabel.show();
|
||||
gitUsernameInput.hide();
|
||||
gitEmailLabel.show();
|
||||
gitEmailInput.hide();
|
||||
|
||||
}
|
||||
|
||||
$('<button class="editor-button">Cancel</button>')
|
||||
.appendTo(formButtons)
|
||||
.click(function(evt) {
|
||||
evt.preventDefault();
|
||||
hideGitUserEditForm();
|
||||
});
|
||||
|
||||
var saveButton = $('<button class="editor-button">Save</button>')
|
||||
.appendTo(formButtons)
|
||||
.click(function(evt) {
|
||||
evt.preventDefault();
|
||||
var spinner = utils.addSpinnerOverlay(gitconfigContainer);
|
||||
|
||||
var body = {
|
||||
git: {
|
||||
user: {
|
||||
name: gitUsernameInput.val(),
|
||||
email: gitEmailInput.val()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var done = function(err) {
|
||||
spinner.remove();
|
||||
if (err) {
|
||||
console.log(err);
|
||||
return;
|
||||
}
|
||||
hideGitUserEditForm();
|
||||
}
|
||||
|
||||
utils.sendRequest({
|
||||
url: "settings/user",
|
||||
type: "POST",
|
||||
responses: {
|
||||
0: function(error) {
|
||||
done(error);
|
||||
},
|
||||
200: function(data) {
|
||||
gitUsernameLabel.text(body.git.user.name);
|
||||
gitEmailLabel.text(body.git.user.email);
|
||||
done();
|
||||
},
|
||||
400: {
|
||||
'unexpected_error': function(error) {
|
||||
console.log(error);
|
||||
done(error);
|
||||
}
|
||||
},
|
||||
}
|
||||
},body);
|
||||
});
|
||||
var updateForm = function() {
|
||||
// sshkeysList.editableList('empty');
|
||||
// if (activeProject.git.hasOwnProperty('remotes')) {
|
||||
// for (var name in activeProject.git.remotes) {
|
||||
// if (activeProject.git.remotes.hasOwnProperty(name)) {
|
||||
// remotesList.editableList('addItem',{name:name,urls:activeProject.git.remotes[name]});
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// var sshkeyFiles = ["/User/hideki/.node-red/sshkeys/node-red-ssh-test01", "/User/hideki/.node-red/sshkeys/node-red-ssh-test02"];
|
||||
// if ( sshkeyFiles ) {
|
||||
// sshkeyFiles.map(function(sshkeyFilePath) {
|
||||
// sshkeysList.editableList('addItem', {path: sshkeyFilePath, data: 'XXXXXXX'});
|
||||
// });
|
||||
// }
|
||||
}
|
||||
|
||||
utils.sendRequest({
|
||||
url: "settings/user",
|
||||
type: "GET",
|
||||
responses: {
|
||||
0: function(error) {
|
||||
console.log(error);
|
||||
},
|
||||
200: function(result) {
|
||||
console.log(result);
|
||||
if ( result && result.git && result.git.user ) {
|
||||
var username = result.git.user.name || "";
|
||||
var email = result.git.user.email || "";
|
||||
gitUsernameLabel.text(username);
|
||||
gitUsernameInput.val(username);
|
||||
gitEmailLabel.text(email);
|
||||
gitEmailInput.val(email);
|
||||
}
|
||||
},
|
||||
400: {
|
||||
'unexpected_error': function(error) {
|
||||
console.log(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
updateForm();
|
||||
}
|
||||
|
||||
function createSettingsPane(activeProject) {
|
||||
var pane = $('<div id="user-settings-tab-gitconfig" class="project-settings-tab-pane node-help"></div>');
|
||||
createRemoteRepositorySection(pane);
|
||||
return pane;
|
||||
}
|
||||
|
||||
var popover;
|
||||
|
||||
var utils;
|
||||
function init(_utils) {
|
||||
utils = _utils;
|
||||
RED.userSettings.add({
|
||||
id:'gitconfig',
|
||||
title: "Git config", // TODO: nls
|
||||
get: createSettingsPane,
|
||||
close: function() {
|
||||
if (popover) {
|
||||
popover.close();
|
||||
popover = null;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
return {
|
||||
init: init,
|
||||
};
|
||||
})();
|
||||
|
||||
@ -953,6 +953,7 @@ RED.projects = (function() {
|
||||
addSpinnerOverlay:addSpinnerOverlay
|
||||
};
|
||||
RED.projects.settings.init(projectsAPI);
|
||||
RED.projects.userSettings.init(projectsAPI);
|
||||
RED.sidebar.versionControl.init(projectsAPI);
|
||||
initScreens();
|
||||
// initSidebar();
|
||||
|
||||
@ -650,6 +650,9 @@
|
||||
.projects-dialog-remote-list-entry-delete {
|
||||
float: right;
|
||||
}
|
||||
.projects-dialog-remote-list-entry-copy {
|
||||
float: right;
|
||||
}
|
||||
|
||||
/*
|
||||
.expandable-list-entry {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user