diff --git a/static/css/core-ui.css b/static/css/core-ui.css index 8278eb438..601b79981 100644 --- a/static/css/core-ui.css +++ b/static/css/core-ui.css @@ -1208,9 +1208,9 @@ a:focus { .co-checkable-menu-state.some:after { content: "-"; - font-size: 19px; - top: -6px; - left: 3px; + font-size: 24px; + top: -10px; + left: 4px; } @media (min-width: 768px) { diff --git a/static/css/directives/ui/service-keys-manager.css b/static/css/directives/ui/service-keys-manager.css index 8c1410db9..f3e7beb45 100644 --- a/static/css/directives/ui/service-keys-manager.css +++ b/static/css/directives/ui/service-keys-manager.css @@ -95,4 +95,22 @@ text-overflow: ellipsis; white-space: nowrap; vertical-align: middle; -} \ No newline at end of file +} + + +.service-keys-manager-element .keys-list { + list-style: circle; + padding: 10px; + padding-left: 40px; +} + +.service-keys-manager-element .keys-list li { + padding: 4px; + font-family: Consolas, "Lucida Console", Monaco, monospace; +} + +.service-keys-manager-element .expiration-form .datetime-picker { + margin-top: 4px; + display: block; + margin-bottom: 2px; +} diff --git a/static/directives/repo-view/repo-panel-tags.html b/static/directives/repo-view/repo-panel-tags.html index 91b3931da..360082a45 100644 --- a/static/directives/repo-view/repo-panel-tags.html +++ b/static/directives/repo-view/repo-panel-tags.html @@ -27,17 +27,17 @@
-
+
All Tags
-
+
No Tags
-
+
Commit SHAs
-
{{ it.image_id.substr(0, 12) }}
diff --git a/static/directives/service-keys-manager.html b/static/directives/service-keys-manager.html index 1b7b1d5ba..6cc6ec15e 100644 --- a/static/directives/service-keys-manager.html +++ b/static/directives/service-keys-manager.html @@ -11,12 +11,56 @@ build workers.
- - - Showing {{ orderedKeys.entries.length }} of {{ keys.length }} keys +
+ +
+ All Keys +
+
+ No Keys +
+
+ Unapproved Keys +
+
+ Expired Keys +
- - + + + + + + + + + + + + + + Showing {{ orderedKeys.entries.length }} of {{ keys.length }} keys + + + +
@@ -26,6 +70,7 @@ + - + + @@ -130,6 +178,24 @@ + +
+
+ Please choose the new expiration date and time (if any) for the following keys: +
    +
  • {{ getKeyTitle(key) }}
  • +
+ + + + If specified, the date and time at which the keys expire. It is highly recommended to have an expiration date. + + +
-
+ + If specified, the date and time that the key expires. It is highly recommended to have an expiration date. @@ -145,6 +212,19 @@
+ +
+ Are you sure you want to delete the follopwing service keys?
+ All external services that use these keys for authentication will fail. +
    +
  • {{ getKeyTitle(key) }}
  • +
+
+
+ +
+
+
+ Approve the following service keys? +
    +
  • {{ getKeyTitle(key) }}
  • +
+
+
+ + Enter optional notes for additional human-readable information about why the keys were approved. + + +
+
= keys.length) { + loadServiceKeys(); + callback(true); + return; + } + + var key = keys[counter]; + var errorHandler = function(resp) { + if (resp.status != 404) { + bootbox.alert(error_msg); + loadServiceKeys(); + callback(false); + return; + } + + performAction(); + }; + + counter++; + performer(key).then(performAction, errorHandler); + }; + + performAction(); + }; + + $scope.deleteKeys = function(info, callback) { + var performer = function(key) { + var params = { + 'kid': key.kid + }; + + return ApiService.deleteServiceKey(null, params); + }; + + forAllKeys(info.keys, 'Could not delete service key', performer, callback); + }; + + $scope.approveKeys = function(info, callback) { + var performer = function(key) { + var params = { + 'kid': key.kid + }; + + var data = { + 'notes': $scope.approveKeysInfo.notes + }; + + return ApiService.approveServiceKey(data, params); + }; + + forAllKeys(info.keys, 'Could not approve service key', performer, callback); + }; + + $scope.changeKeysExpiration = function(info, callback) { + var performer = function(key) { + var data = { + 'expiration': info.expiration_date || null + }; + + var params = { + 'kid': key.kid + }; + + return ApiService.updateServiceKey(data, params); + }; + + forAllKeys(info.keys, 'Could not update service key', performer, callback); + }; + $scope.$watch('options.filter', buildOrderedKeys); $scope.$watch('options.predicate', buildOrderedKeys); $scope.$watch('options.reverse', buildOrderedKeys);
Name @@ -44,8 +89,12 @@
Approved via key rotation - Awaiting Approval Approve Now