bump(github.com/openshift/origin-web-console): aac7d52b246630d467ea19881b724a34d1ed08e2

Author: OpenShift Bot

pkg/assets/bindata.go

@@ -6570,6 +6570,16 @@ details:e
 }, v = function() {
 d.disableAddForm = !1, d.newBinding.name = "", d.newBinding.namespace = o, d.newBinding.newRole = null;
 }, w = function(a) {
+i.list("serviceaccounts", a).then(function(a) {
+var b = _.keys(a.by("metadata.name")).sort();
+angular.extend(d, {
+serviceAccounts:b,
+refreshServiceAccounts:function(a) {
+a && !_.includes(d.serviceAccounts, a) ? d.serviceAccounts = [ a ].concat(b) :d.serviceAccounts = b;
+}
+});
+});
+}, x = function(a) {
 i.list("rolebindings", n, null, {
 errorNotification:!1
 }).then(function(a) {
@@ -6581,9 +6591,9 @@ subjectKindsForUI:k.mapRolebindingsForUI(a.by("metadata.name"), s)
 }, function() {
 a && (d.roleBindings[a.metadata.name] = a, d.subjectKindsForUI = k.mapRolebindingsForUI(d.roleBindings, s)), v();
 });
-}, x = function(b, c) {
+}, y = function(b, c) {
 d.disableAddForm = !0, l.create(b, c, o, n).then(function() {
-w(), u("rolebindingCreate", "success", t.update.subject.success({
+x(), u("rolebindingCreate", "success", t.update.subject.success({
 roleName:b.metadata.name,
 subjectName:c.name
 }));
@@ -6595,9 +6605,9 @@ subjectName:c.name
 httpErr:a("getErrorDetails")(d)
 }));
 });
-}, y = function(b, c, e) {
+}, z = function(b, c, e) {
 d.disableAddForm = !0, l.addSubject(b, c, e, n).then(function() {
-w(), u("rolebindingUpdate", "success", t.update.subject.success({
+x(), u("rolebindingUpdate", "success", t.update.subject.success({
 roleName:b.roleRef.name,
 subjectName:c.name
 }));
@@ -6609,16 +6619,16 @@ subjectName:c.name
 httpErr:a("getErrorDetails")(d)
 }));
 });
-}, z = {};
-c.tab && (z[c.tab] = !0);
-var A = k.getSubjectKinds();
+}, A = {};
+c.tab && (A[c.tab] = !0);
+var B = k.getSubjectKinds();
 angular.extend(d, {
-selectedTab:z,
+selectedTab:A,
 projectName:o,
 alerts:{},
 forms:{},
 emptyMessage:"Loading...",
-subjectKinds:A,
+subjectKinds:B,
 newBinding:{
 role:"",
 kind:c.tab || "User",
@@ -6631,7 +6641,7 @@ mode:{
 edit:!1
 },
 selectTab:function(a) {
-d.newBinding.kind = a;
+d.newBinding.kind = a, d.newBinding.name = "";
 }
 }), angular.extend(d, {
 excludeExistingRoles:function(a) {
@@ -6651,7 +6661,7 @@ return a ? e + (q(a, "description") || b) :b;
 }
 }
 });
-var B = function(a, b, c, e) {
+var C = function(a, b, c, e) {
 var f = {
 alerts:{},
 detailsMarkup:t.remove.areYouSure.html.subject({
@@ -6673,22 +6683,25 @@ roleName:c
 g.withUser().then(function(a) {
 d.user = a;
 }), i.list("projects", {}).then(function(a) {
-var b = _.map(a.by("metadata.name"), function(a) {
-return a.metadata.name;
-});
+var b = _.keys(a.by("metadata.name")).sort();
 angular.extend(d, {
 projects:b,
+selectProject:function(a) {
+d.newBinding.name = "", w({
+namespace:a
+});
+},
 refreshProjects:function(a) {
 a && !_.includes(d.projects, a) ? d.projects = [ a ].concat(b) :d.projects = b;
 }
 });
 }), j.get(c.project).then(_.spread(function(c, e) {
-n = e, w(), angular.extend(d, {
+n = e, x(), w(n), angular.extend(d, {
 project:c,
-subjectKinds:A,
+subjectKinds:B,
 canUpdateRolebindings:r("rolebindings", "update", o),
 confirmRemove:function(c, e, g) {
-var i = null, j = B(c, e, g, d.user.metadata.name);
+var i = null, j = C(c, e, g, d.user.metadata.name);
 _.isEqual(c, d.user.metadata.name) && k.isLastRole(d.user.metadata.name, d.roleBindings) && (i = !0), f.open({
 animation:!0,
 templateUrl:"views/modals/confirm.html",
@@ -6701,7 +6714,7 @@ return j;
 }).result.then(function() {
 l.removeSubject(c, g, d.roleBindings, n).then(function(a) {
 i ? b.url("./") :(h.getProjectRules(o, !0).then(function() {
-w(a[0]);
+x(a[0]);
 var b = r("rolebindings", "update", o);
 angular.extend(d, {
 canUpdateRolebindings:b,
@@ -6738,7 +6751,7 @@ name:a
 }) ? u("rolebindingUpdate", "info", t.update.subject.exists({
 roleName:c.metadata.name,
 subjectName:a
-})) :g ? y(g, f, e) :x(c, f, e);
+})) :g ? z(g, f, e) :y(c, f, e);
 }
 }), m.listAllRoles(n, {
 errorNotification:!1
@@ -6751,7 +6764,7 @@ name:a
 }
 });
 };
-w(), angular.extend(d, {
+x(), angular.extend(d, {
 toggle:{
 roles:!1
 },
@@ -26781,35 +26794,38 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
     "</div>\n" +
     "<ng-form class=\"new-binding\" novalidate name=\"forms.newBindingForm\" ng-if=\"newBinding\">\n" +
     "<div ng-if=\"mode.edit\" class=\"item-row form-new-role\" row mobile=\"column\">\n" +
-    "<div class=\"col-name\" column>\n" +
+    "<div class=\"col-name pad-bottom-none\" row mobile=\"column\" tablet=\"column\">\n" +
     "<label ng-attr-for=\"newBindingName\" class=\"sr-only\">\n" +
     "Name\n" +
     "</label>\n" +
-    "<input type=\"text\" class=\"form-control input-name\" placeholder=\"Name\" ng-model=\"newBinding.name\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
-    "<div ng-if=\"newBinding.kind === 'ServiceAccount'\" class=\"service-account-namespace hidden-sm hidden-md hidden-lg\" aria-hidden=\"true\">\n" +
-    "<ui-select ng-model=\"newBinding.namespace\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a project\" class=\"select-role\">\n" +
+    "\n" +
+    "<input ng-if=\"newBinding.kind !== 'ServiceAccount'\" type=\"text\" class=\"form-control input-name\" placeholder=\"Name\" ng-model=\"newBinding.name\" autocorrect=\"off\" autocapitalize=\"off\" spellcheck=\"false\">\n" +
+    "\n" +
+    "<div ng-if=\"newBinding.kind === 'ServiceAccount'\" class=\"service-account-namespace\" aria-hidden=\"true\">\n" +
+    "<ui-select ng-model=\"newBinding.namespace\" on-select=\"selectProject($item, $model)\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a project\" class=\"select-role pad-bottom-sm\">\n" +
     "<ui-select-match placeholder=\"Select a project\">\n" +
-    "<span ng-bind=\"newBinding.namespace\"></span>\n" +
+    "<span>{{newBinding.namespace}}</span>\n" +
     "</ui-select-match>\n" +
     "<ui-select-choices repeat=\"projectName in projects | filter: $select.search\" refresh=\"refreshProjects($select.search)\" refresh-delay=\"200\">\n" +
-    "<div>{{projectName}}</div>\n" +
+    "<div ng-bind-html=\"projectName | highlight : $select.search\"></div>\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
     "</div>\n" +
-    "</div>\n" +
-    "<div class=\"action-set\" flex row tablet=\"column\" mobile=\"column\">\n" +
-    "<div class=\"col-roles\" row tablet=\"column\" flex wrap axis=\"start\">\n" +
-    "<div ng-if=\"newBinding.kind === 'ServiceAccount'\" class=\"service-account-namespace hidden-xs\">\n" +
-    "<ui-select ng-model=\"newBinding.namespace\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a project\" class=\"select-project\">\n" +
-    "<ui-select-match placeholder=\"Select a project\">\n" +
-    "<span ng-bind=\"newBinding.namespace\"></span>\n" +
+    "<span ng-if=\"newBinding.kind === 'ServiceAccount'\" class=\"mar-left-md mar-right-md hidden-xs\">/</span>\n" +
+    "\n" +
+    "<div ng-if=\"newBinding.kind === 'ServiceAccount'\" class=\"service-account-name\">\n" +
+    "<ui-select ng-model=\"newBinding.name\" theme=\"bootstrap\" search-enabled=\"true\" title=\"Select a service account\" class=\"select-role\">\n" +
+    "<ui-select-match placeholder=\"Service account\">\n" +
+    "<span>{{newBinding.name}}</span>\n" +
     "</ui-select-match>\n" +
-    "<ui-select-choices repeat=\"projectName in projects | filter: $select.search\" refresh=\"refreshProjects($select.search)\" refresh-delay=\"200\">\n" +
-    "<div>{{projectName}}</div>\n" +
+    "<ui-select-choices repeat=\"saName in serviceAccounts | filter: $select.search\" refresh=\"refreshServiceAccounts($select.search)\" refresh-delay=\"200\">\n" +
+    "<div ng-bind-html=\"saName | highlight : $select.search\"></div>\n" +
     "</ui-select-choices>\n" +
     "</ui-select>\n" +
     "</div>\n" +
     "</div>\n" +
+    "<div class=\"action-set\" flex row tablet=\"column\" mobile=\"column\">\n" +
+    "<div class=\"col-roles\" flex row tablet=\"column\">&nbsp;</div>\n" +
     "<div class=\"col-add-role\">\n" +
     "<div ng-show=\"mode.edit\" row>\n" +
     "<ui-select ng-if=\"filteredRoles.length\" ng-model=\"newBinding.newRole\" theme=\"bootstrap\" search-enabled=\"true\" title=\"new {{subjectKind.name}} role\" class=\"select-role\" flex>\n" +
@@ -116260,13 +116276,13 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
 .membership .content-pane .col-heading h3,.membership .content-pane .item-row h3{margin:0}
 .membership .content-pane .item-row{padding:5px 10px 5px 5px;margin-bottom:20px}
 .membership .content-pane .col-heading{margin-bottom:20px}
-.membership .content-pane .col-name{word-break:break-all;word-break:break-word;overflow-wrap:break-word;min-width:225px;max-width:30%;padding:0 5px 10px 0}
+.membership .content-pane .col-name{word-break:break-all;word-break:break-word;overflow-wrap:break-word;width:100%;padding:0 0px 10px 0}
 .membership .content-pane .col-name.half-width{min-width:50%}
 .membership .content-pane .col-name input{max-width:150px}
 .membership .content-pane .col-name .new-project{margin-top:2px}
 .membership .content-pane .content-serviceaccount .form-new-role .col-roles{display:block}
 .membership .content-pane .input-name{width:150px;margin-bottom:5px}
-.membership .content-pane .select-project,.membership .content-pane .select-role{width:150px}
+.membership .content-pane .select-project{width:150px}
 .membership .content-pane .select-role small{color:#999}
 .membership .content-pane .select-role .active small{color:#c0e0f0}
 .membership .content-pane .col-add-role,.membership .content-pane .col-heading,.membership .content-pane .col-name,.membership .content-pane .col-roles,.membership .content-pane .item-row,.membership .content-pane [flex-collapse-fix],.membership .content-pane [flex]{flex-shrink:0;flex-basis:auto}
@@ -116275,8 +116291,9 @@ a.subtle-link:active,a.subtle-link:focus,a.subtle-link:hover{color:#00659c;borde
 .membership .content-pane .col-heading,.membership .content-pane .item-row{border-bottom:none;margin-bottom:none}
 .membership .content-pane .item-row.highlight-hover:hover{background-color:#fafafa}
 .membership .content-pane .col-heading .col-add-role a{display:block;padding-left:10px}
-.membership .content-pane .col-name{width:30%}
+.membership .content-pane .col-name{min-width:225px;max-width:30%;padding:0 5px 10px 0}
 .membership .content-pane .col-name input{max-width:175px}
+.membership .content-pane .select-role{width:150px}
 }
 .action-chip{margin:0 5px 2px 0;font-size:12px;display:flex;flex-direction:row}
 .action-chip .item{padding:.2em .6em .3em}