From f83c94f4148c342d7527e44007bfed4bd1e042d7 Mon Sep 17 00:00:00 2001 From: kunw Date: Sat, 23 Apr 2016 00:49:52 +0800 Subject: [PATCH] continuous updates for repository logs. --- .../details/add-member.directive.js | 28 ---------- .../details/switch-roles.directive.js | 55 ------------------- .../log/advanced-search.directive.html | 40 ++++++++++++++ .../log/advanced-search.directive.js | 53 ++++++++++++++++++ .../js/components/log/list-log.directive.html | 40 ++++++++------ .../js/components/log/list-log.directive.js | 14 ++++- .../resources/js/components/log/log.config.js | 9 +++ .../add-project-member.controller.js | 15 ----- .../add-project-member.directive.html} | 12 ++-- .../add-project-member.directive.js | 42 ++++++++++++++ .../delete-project-member.controller.js | 15 ----- .../edit-project-member.directive.html | 6 +- .../edit-project-member.directive.js | 38 ++++++------- .../list-project-member.directive.html | 10 ++-- .../list-project-member.directive.js | 17 ++++-- .../project-member/project-member.config.js | 33 +++++++++++ .../switch-role.directive.html} | 0 .../project-member/switch-role.directive.js | 41 ++++++++++++++ views/ng/sections/headerInclude.htm | 9 ++- 19 files changed, 303 insertions(+), 174 deletions(-) delete mode 100644 static/ng/resources/js/components/details/add-member.directive.js delete mode 100644 static/ng/resources/js/components/details/switch-roles.directive.js create mode 100644 static/ng/resources/js/components/log/advanced-search.directive.html create mode 100644 static/ng/resources/js/components/log/advanced-search.directive.js create mode 100644 static/ng/resources/js/components/log/log.config.js delete mode 100644 static/ng/resources/js/components/project-member/add-project-member.controller.js rename static/ng/resources/js/components/{details/add-member.directive.html => project-member/add-project-member.directive.html} (69%) create mode 100644 static/ng/resources/js/components/project-member/add-project-member.directive.js delete mode 100644 static/ng/resources/js/components/project-member/delete-project-member.controller.js create mode 100644 static/ng/resources/js/components/project-member/project-member.config.js rename static/ng/resources/js/components/{details/switch-roles.directive.html => project-member/switch-role.directive.html} (100%) create mode 100644 static/ng/resources/js/components/project-member/switch-role.directive.js diff --git a/static/ng/resources/js/components/details/add-member.directive.js b/static/ng/resources/js/components/details/add-member.directive.js deleted file mode 100644 index fbb70f7be..000000000 --- a/static/ng/resources/js/components/details/add-member.directive.js +++ /dev/null @@ -1,28 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('harbor.details') - .directive('addMember', addMember); - - function AddMemberController() { - var vm = this; - - } - - function addMember() { - var directive = { - 'restrict': 'E', - 'templateUrl': '/static/ng/resources/js/components/details/add-member.directive.html', - 'scope': { - - }, - 'controller': AddMemberController, - 'controllerAs': 'vm', - 'bindToController': true - } - return directive; - } - -})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-roles.directive.js b/static/ng/resources/js/components/details/switch-roles.directive.js deleted file mode 100644 index 289ff9684..000000000 --- a/static/ng/resources/js/components/details/switch-roles.directive.js +++ /dev/null @@ -1,55 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('harbor.details') - .directive('switchRoles', switchRoles); - - - SwitchRolesController.$inject = ['$scope']; - - function SwitchRolesController($scope) { - var vm = this; - - vm.currentRole = getRoleById(vm.roleId); - vm.selectRole = selectRole; - - function selectRole(role) { - vm.currentRole = getRoleById(role.id); - } - - function getRoleById(roleId) { - for(var i = 0; i < vm.roles.length; i++) { - var role = vm.roles[i]; - if(role.id == roleId) { - return role; - } - } - } - - } - - function switchRoles() { - var directive = { - 'restrict': 'E', - 'templateUrl': '/static/ng/resources/js/components/details/switch-roles.directive.html', - 'scope': { - 'roles': '=', - 'editMode': '=', - 'userId': '=', - 'roleId': '=' - }, - 'link' : link, - 'controller' : SwitchRolesController, - 'controllerAs': 'vm', - 'bindToController': true - }; - return directive; - - function link(scope, element, attrs, ctrl) { - - } - } - -})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/log/advanced-search.directive.html b/static/ng/resources/js/components/log/advanced-search.directive.html new file mode 100644 index 000000000..aaf3c4580 --- /dev/null +++ b/static/ng/resources/js/components/log/advanced-search.directive.html @@ -0,0 +1,40 @@ +
+
+
+
+
+ +
+
+  All   +  Create   +  Pull   +  Push   +  Delete   +  Others   + +
+ +
+ +
+
+ From: + + +    + To: + + +
+
+
+
+
+
+ +
+
+
+
+
\ No newline at end of file diff --git a/static/ng/resources/js/components/log/advanced-search.directive.js b/static/ng/resources/js/components/log/advanced-search.directive.js new file mode 100644 index 000000000..1497b6f27 --- /dev/null +++ b/static/ng/resources/js/components/log/advanced-search.directive.js @@ -0,0 +1,53 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.log') + .directive('advancedSearch', advancedSearch); + + AdvancedSearchController.$inject = ['ListLogService']; + + function AdvancedSearchController(ListLogService) { + var vm = this; + + vm.checkOperation = checkOperation; + vm.search = search; + + vm.opAll = true; + vm.opCreate = true; + vm.opPull = true; + vm.opPush = true; + vm.opDelete = true; + vm.opOthers = true; + + function checkOperation(e) { + if(e.checked == 'all') { + vm.opCreate = vm.opAll; + vm.opPull = vm.opAll; + vm.opPush = vm.opAll; + vm.opDelete = vm.opAll; + vm.opOthers = vm.opAll; + } + } + + function search() { + vm.isOpen = false; + } + } + + function advancedSearch() { + var directive = { + 'restrict': 'E', + 'templateUrl': '/static/ng/resources/js/components/log/advanced-search.directive.html', + 'scope': { + 'isOpen': '=' + }, + 'controller': AdvancedSearchController, + 'controllerAs': 'vm', + 'bindToController': true + }; + return directive; + } + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/log/list-log.directive.html b/static/ng/resources/js/components/log/list-log.directive.html index 8dfdd254b..cce0313d2 100644 --- a/static/ng/resources/js/components/log/list-log.directive.html +++ b/static/ng/resources/js/components/log/list-log.directive.html @@ -6,23 +6,31 @@ + + + + + +
+ +
+ + + + + + + + + + + + + + + +
UsernameRepository NameOperationTimestamp
Haoxmyrepo/UbuntuCreate2016-03-22 12:35:00
Haoxmyrepo/MySQLPush2016-03-22 12:35:00
Danielmyproject/GolangCreate2016-03-12 12:35:00
- - - - - - - - - - - - - - - -
UsernameRepository NameOperationTimestamp
Haoxmyrepo/UbuntuCreate2016-03-22 12:35:00
Haoxmyrepo/MySQLPush2016-03-22 12:35:00
Danielmyproject/GolangCreate2016-03-12 12:35:00
\ No newline at end of file diff --git a/static/ng/resources/js/components/log/list-log.directive.js b/static/ng/resources/js/components/log/list-log.directive.js index c4e43831a..a64dca46a 100644 --- a/static/ng/resources/js/components/log/list-log.directive.js +++ b/static/ng/resources/js/components/log/list-log.directive.js @@ -6,10 +6,20 @@ .module('harbor.log') .directive('listLog', listLog); -// ListLogController.$inject = ['ListLogService']; + ListLogController.$inject = ['ListLogService']; - function ListLogController() { + function ListLogController(ListLogService) { + var vm = this; + vm.isOpen = false; + vm.advancedSearch = advancedSearch; + function advancedSearch() { + if(vm.isOpen){ + vm.isOpen = false; + }else{ + vm.isOpen = true; + } + } } function listLog() { diff --git a/static/ng/resources/js/components/log/log.config.js b/static/ng/resources/js/components/log/log.config.js new file mode 100644 index 000000000..aa8bf34b8 --- /dev/null +++ b/static/ng/resources/js/components/log/log.config.js @@ -0,0 +1,9 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.log'); + + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/add-project-member.controller.js b/static/ng/resources/js/components/project-member/add-project-member.controller.js deleted file mode 100644 index de37d8c2e..000000000 --- a/static/ng/resources/js/components/project-member/add-project-member.controller.js +++ /dev/null @@ -1,15 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('harbor.project.member') - .controller('AddProjectMemberController', AddProjectMemberController); - - AddProjectMemberController.$inject = ['AddProjectMemberService']; - - function AddProjectMemberController(AddProjectMemberService) { - - } - -})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/details/add-member.directive.html b/static/ng/resources/js/components/project-member/add-project-member.directive.html similarity index 69% rename from static/ng/resources/js/components/details/add-member.directive.html rename to static/ng/resources/js/components/project-member/add-project-member.directive.html index aea4c8c5d..d34c2d667 100644 --- a/static/ng/resources/js/components/details/add-member.directive.html +++ b/static/ng/resources/js/components/project-member/add-project-member.directive.html @@ -3,23 +3,23 @@
- +
   -  Project Admin   -  Developer   -  Guest + +  //role.name//   +
- - + +
diff --git a/static/ng/resources/js/components/project-member/add-project-member.directive.js b/static/ng/resources/js/components/project-member/add-project-member.directive.js new file mode 100644 index 000000000..82e09f61e --- /dev/null +++ b/static/ng/resources/js/components/project-member/add-project-member.directive.js @@ -0,0 +1,42 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.project.member') + .directive('addProjectMember', addProjectMember); + + AddProjectMemberController.$inject = ['roles', 'AddProjectMemberService']; + + function AddProjectMemberController(roles, AddProjectMemberService) { + var vm = this; + vm.roles = roles(); + vm.optRole = 1; + vm.save = save; + vm.cancel = cancel; + + function save() { + console.log(vm.optRole); + } + + function cancel() { + vm.isOpen = false; + } + + } + + function addProjectMember() { + var directive = { + 'restrict': 'E', + 'templateUrl': '/static/ng/resources/js/components/project-member/add-project-member.directive.html', + 'scope': { + 'isOpen': '=' + }, + 'controller': AddProjectMemberController, + 'controllerAs': 'vm', + 'bindToController': true + } + return directive; + } + +})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/delete-project-member.controller.js b/static/ng/resources/js/components/project-member/delete-project-member.controller.js deleted file mode 100644 index 35bde2c5f..000000000 --- a/static/ng/resources/js/components/project-member/delete-project-member.controller.js +++ /dev/null @@ -1,15 +0,0 @@ -(function() { - - 'use strict'; - - angular - .module('harbor.project.member') - .controller('DeleteProjectMemberController', DeleteProjectMemberController); - - DeleteProjectMemberController.$inject = ['DeleteProjectMemberService']; - - function DeleteProjectMemberController(DeleteProjectMemberService) { - - } - -})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/edit-project-member.directive.html b/static/ng/resources/js/components/project-member/edit-project-member.directive.html index e5b197755..af641e696 100644 --- a/static/ng/resources/js/components/project-member/edit-project-member.directive.html +++ b/static/ng/resources/js/components/project-member/edit-project-member.directive.html @@ -1,9 +1,9 @@ //vm.username// - + - + - + \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/edit-project-member.directive.js b/static/ng/resources/js/components/project-member/edit-project-member.directive.js index 74f79b56b..68732e20e 100644 --- a/static/ng/resources/js/components/project-member/edit-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/edit-project-member.directive.js @@ -4,33 +4,31 @@ angular .module('harbor.project.member') - .constant('roles', roles) .directive('editProjectMember', editProjectMember); + + EditProjectMemberController.$inject = ['roles', 'EditProjectMemberService', 'DeleteProjectMemberService']; - function roles() { - return [ - {'id': '1', 'name': 'Project Admin'}, - {'id': '2', 'name': 'Developer'}, - {'id': '3', 'name': 'Guest'} - ]; - } - - EditProjectMemberController.$inject = ['roles', 'EditProjectMemberService', '$scope']; - - function EditProjectMemberController(roles, EditProjectMemberService, $scope) { + function EditProjectMemberController(roles, EditProjectMemberService) { var vm = this; vm.roles = roles(); vm.editMode = false; - vm.update = update; + vm.updateProjectMember = updateProjectMember; + vm.deleteProjectMember = deleteProjectMember; - - function update(e) { + function updateProjectMember(e) { if(vm.editMode) { vm.editMode = false; + + console.log('project_id:' + e.projectId + ', user_id:' + e.userId + ', role_id:' + e.roleId); + }else { - vm.editMode = true; + vm.editMode = true; } } + + function deleteProjectMember(e) { + console.log('project_id:' + e.projectId + ', user_id:' + e.userId); + } } function editProjectMember() { @@ -40,18 +38,14 @@ 'scope': { 'username': '=', 'userId': '=', - 'roleId': '=' + 'roleId': '=', + 'projectId': '=' }, - 'link': link, 'controller': EditProjectMemberController, 'controllerAs': 'vm', 'bindToController': true }; return directive; - - function link(scope, element, attrs) { - - } } })(); \ No newline at end of file diff --git a/static/ng/resources/js/components/project-member/list-project-member.directive.html b/static/ng/resources/js/components/project-member/list-project-member.directive.html index 2250ce531..ac86ada60 100644 --- a/static/ng/resources/js/components/project-member/list-project-member.directive.html +++ b/static/ng/resources/js/components/project-member/list-project-member.directive.html @@ -2,22 +2,22 @@
- + - +
- +
- +
- +
UsernameRoleOperation
diff --git a/static/ng/resources/js/components/project-member/list-project-member.directive.js b/static/ng/resources/js/components/project-member/list-project-member.directive.js index 26aa15024..cbd343255 100644 --- a/static/ng/resources/js/components/project-member/list-project-member.directive.js +++ b/static/ng/resources/js/components/project-member/list-project-member.directive.js @@ -9,9 +9,9 @@ function mockupProjectMembers() { var projectMembers = [ - {'id': '1', 'username': 'user1', 'roleId': '1'}, - {'id': '2', 'username': 'user2', 'roleId': '3'}, - {'id': '3', 'username': 'user3', 'roleId': '2'} + {'id': '1', 'username': 'user1', 'roleId': '1', 'project_id': '5'}, + {'id': '2', 'username': 'user2', 'roleId': '3', 'project_id': '5'}, + {'id': '3', 'username': 'user3', 'roleId': '2', 'project_id': '5'} ]; return projectMembers; } @@ -22,9 +22,16 @@ var vm = this; vm.isOpen = false; - vm.addMember = addMember; + vm.username = ""; - function addMember() { + vm.search = search; + vm.addProjectMember = addProjectMember; + + function search(e) { + console.log("search for:" + e.username); + } + + function addProjectMember() { if(vm.isOpen) { vm.isOpen = false; }else{ diff --git a/static/ng/resources/js/components/project-member/project-member.config.js b/static/ng/resources/js/components/project-member/project-member.config.js new file mode 100644 index 000000000..d94b671ab --- /dev/null +++ b/static/ng/resources/js/components/project-member/project-member.config.js @@ -0,0 +1,33 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.project.member') + .constant('roles', roles) + .factory('getRoleById', getRoleById); + + function roles() { + return [ + {'id': '1', 'name': 'Project Admin'}, + {'id': '2', 'name': 'Developer'}, + {'id': '3', 'name': 'Guest'} + ]; + } + + getRoleById.$inject = ['roles']; + + function getRoleById(roles) { + var r = roles(); + return getRole; + function getRole(roleId) { + + for(var i = 0; i < r.length; i++) { + var role = r[i]; + if(role.id == roleId) { + return role; + } + } + } + } +})(); \ No newline at end of file diff --git a/static/ng/resources/js/components/details/switch-roles.directive.html b/static/ng/resources/js/components/project-member/switch-role.directive.html similarity index 100% rename from static/ng/resources/js/components/details/switch-roles.directive.html rename to static/ng/resources/js/components/project-member/switch-role.directive.html diff --git a/static/ng/resources/js/components/project-member/switch-role.directive.js b/static/ng/resources/js/components/project-member/switch-role.directive.js new file mode 100644 index 000000000..e62f486a3 --- /dev/null +++ b/static/ng/resources/js/components/project-member/switch-role.directive.js @@ -0,0 +1,41 @@ +(function() { + + 'use strict'; + + angular + .module('harbor.project.member') + .directive('switchRole', switchRole); + + SwitchRoleController.$inject = ['getRoleById']; + + function SwitchRoleController(getRoleById) { + var vm = this; + + vm.currentRole = getRoleById(vm.roleId); + vm.selectRole = selectRole; + + function selectRole(role) { + vm.currentRole = getRoleById(role.id); + vm.roleId = role.id; + } + + } + + function switchRole() { + var directive = { + 'restrict': 'E', + 'templateUrl': '/static/ng/resources/js/components/project-member/switch-role.directive.html', + 'scope': { + 'roles': '=', + 'editMode': '=', + 'userId': '=', + 'roleId': '=' + }, + 'controller' : SwitchRoleController, + 'controllerAs': 'vm', + 'bindToController': true + }; + return directive; + } + +})(); \ No newline at end of file diff --git a/views/ng/sections/headerInclude.htm b/views/ng/sections/headerInclude.htm index eeba4e8f7..911f08903 100644 --- a/views/ng/sections/headerInclude.htm +++ b/views/ng/sections/headerInclude.htm @@ -56,8 +56,10 @@ + + @@ -73,18 +75,21 @@ - - + + + + +