Skip to content

Commit 751085f

Browse files
author
OpenShift Bot
committed
bump(github.com/openshift/origin-web-console): 2701326256a43fda48739b211b1e88df570a8f88
1 parent 7835eee commit 751085f

File tree

1 file changed

+137
-132
lines changed

1 file changed

+137
-132
lines changed

Diff for: pkg/assets/bindata.go

+137-132
Original file line numberDiff line numberDiff line change
@@ -10653,25 +10653,30 @@ alerts:"="
1065310653
templateUrl:"views/_overview-deployment.html"
1065410654
};
1065510655
}), angular.module("openshiftConsole").directive("sidebar", [ "$location", "$filter", "Constants", function(a, b, c) {
10656-
var d = function(a, b) {
10656+
var d = b("canI"), e = function(a, b) {
1065710657
return a.href === b || _.some(a.prefixes, function(a) {
1065810658
return _.startsWith(b, a);
1065910659
});
1066010660
};
1066110661
return {
1066210662
restrict:"E",
1066310663
templateUrl:"views/_sidebar.html",
10664-
controller:[ "$scope", function(e) {
10665-
var f = a.path().replace("/project/" + e.projectName, "");
10666-
e.activeSecondary, e.navItems = c.PROJECT_NAVIGATION, e.activePrimary = _.find(e.navItems, function(a) {
10667-
return d(a, f) ? (e.activeSecondary = null, !0) :_.some(a.secondaryNavSections, function(a) {
10664+
controller:[ "$scope", function(f) {
10665+
var g = a.path().replace("/project/" + f.projectName, "");
10666+
f.activeSecondary, f.navItems = c.PROJECT_NAVIGATION, f.activePrimary = _.find(f.navItems, function(a) {
10667+
return e(a, g) ? (f.activeSecondary = null, !0) :_.some(a.secondaryNavSections, function(a) {
1066810668
var b = _.find(a.items, function(a) {
10669-
return d(a, f);
10669+
return e(a, g);
1067010670
});
10671-
return !!b && (e.activeSecondary = b, !0);
10671+
return !!b && (f.activeSecondary = b, !0);
1067210672
});
10673-
}), e.navURL = function(a) {
10674-
return a ? b("isAbsoluteURL")(a) ? a :"project/" + e.projectName + a :"";
10673+
}), f.navURL = function(a) {
10674+
return a ? b("isAbsoluteURL")(a) ? a :"project/" + f.projectName + a :"";
10675+
}, f.show = function(a) {
10676+
var b = !a.isValid || a.isValid();
10677+
if (!b) return !1;
10678+
var c = !a.canI || d(a.canI.resource, a.canI.verb, a.canI.group);
10679+
return c;
1067510680
};
1067610681
} ]
1067710682
};
@@ -13592,126 +13597,6 @@ return function(c, d) {
1359213597
var e = a(c), f = c.metadata.name;
1359313598
return e !== f && b(d)[e] > 1 ? e + " (" + f + ")" :e;
1359413599
};
13595-
} ]).filter("canI", [ "AuthorizationService", function(a) {
13596-
return function(b, c, d) {
13597-
return a.canI(b, c, d);
13598-
};
13599-
} ]).filter("canIAddToProject", [ "AuthorizationService", function(a) {
13600-
return function(b) {
13601-
return a.canIAddToProject(b);
13602-
};
13603-
} ]).filter("canIDoAny", [ "canIFilter", function(a) {
13604-
var b = {
13605-
buildConfigs:[ {
13606-
group:"",
13607-
resource:"buildconfigs",
13608-
verbs:[ "delete", "update" ]
13609-
}, {
13610-
group:"",
13611-
resource:"buildconfigs/instantiate",
13612-
verbs:[ "create" ]
13613-
} ],
13614-
builds:[ {
13615-
group:"",
13616-
resource:"builds/clone",
13617-
verbs:[ "create" ]
13618-
}, {
13619-
group:"",
13620-
resource:"builds",
13621-
verbs:[ "delete", "update" ]
13622-
} ],
13623-
deployments:[ {
13624-
group:"extensions",
13625-
resource:"horizontalpodautoscalers",
13626-
verbs:[ "create", "update" ]
13627-
}, {
13628-
group:"extensions",
13629-
resource:"deployments",
13630-
verbs:[ "create", "update" ]
13631-
} ],
13632-
deploymentConfigs:[ {
13633-
group:"extensions",
13634-
resource:"horizontalpodautoscalers",
13635-
verbs:[ "create", "update" ]
13636-
}, {
13637-
group:"",
13638-
resource:"deploymentconfigs",
13639-
verbs:[ "create", "update" ]
13640-
} ],
13641-
horizontalPodAutoscalers:[ {
13642-
group:"extensions",
13643-
resource:"horizontalpodautoscalers",
13644-
verbs:[ "update", "delete" ]
13645-
} ],
13646-
imageStreams:[ {
13647-
group:"",
13648-
resource:"imagestreams",
13649-
verbs:[ "update", "delete" ]
13650-
} ],
13651-
persistentVolumeClaims:[ {
13652-
group:"",
13653-
resource:"persistentvolumeclaims",
13654-
verbs:[ "update", "delete" ]
13655-
} ],
13656-
pods:[ {
13657-
group:"",
13658-
resource:"pods",
13659-
verbs:[ "update", "delete" ]
13660-
}, {
13661-
group:"",
13662-
resource:"deploymentconfigs",
13663-
verbs:[ "update" ]
13664-
} ],
13665-
replicaSets:[ {
13666-
group:"extensions",
13667-
resource:"horizontalpodautoscalers",
13668-
verbs:[ "create", "update" ]
13669-
}, {
13670-
group:"extensions",
13671-
resource:"replicasets",
13672-
verbs:[ "update", "delete" ]
13673-
} ],
13674-
replicationControllers:[ {
13675-
group:"",
13676-
resource:"replicationcontrollers",
13677-
verbs:[ "update", "delete" ]
13678-
} ],
13679-
routes:[ {
13680-
group:"",
13681-
resource:"routes",
13682-
verbs:[ "update", "delete" ]
13683-
} ],
13684-
services:[ {
13685-
group:"",
13686-
resource:"services",
13687-
verbs:[ "update", "create", "delete" ]
13688-
} ],
13689-
secrets:[ {
13690-
group:"",
13691-
resource:"secrets",
13692-
verbs:[ "update", "delete" ]
13693-
} ],
13694-
projects:[ {
13695-
group:"",
13696-
resource:"projects",
13697-
verbs:[ "delete", "update" ]
13698-
} ]
13699-
};
13700-
return function(c) {
13701-
return _.some(b[c], function(b) {
13702-
return _.some(b.verbs, function(c) {
13703-
return a({
13704-
resource:b.resource,
13705-
group:b.group
13706-
}, c);
13707-
});
13708-
});
13709-
};
13710-
} ]).filter("canIScale", [ "canIFilter", "hasDeploymentConfigFilter", "DeploymentsService", function(a, b, c) {
13711-
return function(b) {
13712-
var d = c.getScaleResource(b);
13713-
return a(d, "update");
13714-
};
1371513600
} ]).filter("tags", [ "annotationFilter", function(a) {
1371613601
return function(b, c) {
1371713602
c = c || "tags";
@@ -14357,6 +14242,126 @@ if (!b) return "";
1435714242
var c = a(b, "deployment.kubernetes.io/revision");
1435814243
return c ? "#" + c :"Unknown";
1435914244
};
14245+
} ]), angular.module("openshiftConsole").filter("canI", [ "AuthorizationService", function(a) {
14246+
return function(b, c, d) {
14247+
return a.canI(b, c, d);
14248+
};
14249+
} ]).filter("canIAddToProject", [ "AuthorizationService", function(a) {
14250+
return function(b) {
14251+
return a.canIAddToProject(b);
14252+
};
14253+
} ]).filter("canIDoAny", [ "canIFilter", function(a) {
14254+
var b = {
14255+
buildConfigs:[ {
14256+
group:"",
14257+
resource:"buildconfigs",
14258+
verbs:[ "delete", "update" ]
14259+
}, {
14260+
group:"",
14261+
resource:"buildconfigs/instantiate",
14262+
verbs:[ "create" ]
14263+
} ],
14264+
builds:[ {
14265+
group:"",
14266+
resource:"builds/clone",
14267+
verbs:[ "create" ]
14268+
}, {
14269+
group:"",
14270+
resource:"builds",
14271+
verbs:[ "delete", "update" ]
14272+
} ],
14273+
deployments:[ {
14274+
group:"extensions",
14275+
resource:"horizontalpodautoscalers",
14276+
verbs:[ "create", "update" ]
14277+
}, {
14278+
group:"extensions",
14279+
resource:"deployments",
14280+
verbs:[ "create", "update" ]
14281+
} ],
14282+
deploymentConfigs:[ {
14283+
group:"extensions",
14284+
resource:"horizontalpodautoscalers",
14285+
verbs:[ "create", "update" ]
14286+
}, {
14287+
group:"",
14288+
resource:"deploymentconfigs",
14289+
verbs:[ "create", "update" ]
14290+
} ],
14291+
horizontalPodAutoscalers:[ {
14292+
group:"extensions",
14293+
resource:"horizontalpodautoscalers",
14294+
verbs:[ "update", "delete" ]
14295+
} ],
14296+
imageStreams:[ {
14297+
group:"",
14298+
resource:"imagestreams",
14299+
verbs:[ "update", "delete" ]
14300+
} ],
14301+
persistentVolumeClaims:[ {
14302+
group:"",
14303+
resource:"persistentvolumeclaims",
14304+
verbs:[ "update", "delete" ]
14305+
} ],
14306+
pods:[ {
14307+
group:"",
14308+
resource:"pods",
14309+
verbs:[ "update", "delete" ]
14310+
}, {
14311+
group:"",
14312+
resource:"deploymentconfigs",
14313+
verbs:[ "update" ]
14314+
} ],
14315+
replicaSets:[ {
14316+
group:"extensions",
14317+
resource:"horizontalpodautoscalers",
14318+
verbs:[ "create", "update" ]
14319+
}, {
14320+
group:"extensions",
14321+
resource:"replicasets",
14322+
verbs:[ "update", "delete" ]
14323+
} ],
14324+
replicationControllers:[ {
14325+
group:"",
14326+
resource:"replicationcontrollers",
14327+
verbs:[ "update", "delete" ]
14328+
} ],
14329+
routes:[ {
14330+
group:"",
14331+
resource:"routes",
14332+
verbs:[ "update", "delete" ]
14333+
} ],
14334+
services:[ {
14335+
group:"",
14336+
resource:"services",
14337+
verbs:[ "update", "create", "delete" ]
14338+
} ],
14339+
secrets:[ {
14340+
group:"",
14341+
resource:"secrets",
14342+
verbs:[ "update", "delete" ]
14343+
} ],
14344+
projects:[ {
14345+
group:"",
14346+
resource:"projects",
14347+
verbs:[ "delete", "update" ]
14348+
} ]
14349+
};
14350+
return function(c) {
14351+
return _.some(b[c], function(b) {
14352+
return _.some(b.verbs, function(c) {
14353+
return a({
14354+
resource:b.resource,
14355+
group:b.group
14356+
}, c);
14357+
});
14358+
});
14359+
};
14360+
} ]).filter("canIScale", [ "canIFilter", "hasDeploymentConfigFilter", "DeploymentsService", function(a, b, c) {
14361+
return function(b) {
14362+
var d = c.getScaleResource(b);
14363+
return a(d, "update");
14364+
};
1436014365
} ]), angular.module("openshiftConsole").filter("underscore", function() {
1436114366
return function(a) {
1436214367
return a.replace(/\./g, "_");
@@ -15461,7 +15466,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
1546115466
$templateCache.put('views/_sidebar.html',
1546215467
"<nav class=\"navbar navbar-sidebar\">\n" +
1546315468
"<ul class=\"nav nav-sidenav-primary\">\n" +
15464-
"<li ng-repeat=\"primaryItem in navItems\" ng-class=\"{ active: primaryItem === activePrimary }\" ng-if=\"!primaryItem.isValid || primaryItem.isValid()\">\n" +
15469+
"<li ng-repeat=\"primaryItem in navItems\" ng-class=\"{ active: primaryItem === activePrimary }\" ng-if=\"show(primaryItem)\">\n" +
1546515470
"<a ng-if=\"primaryItem.href\" ng-href=\"{{navURL(primaryItem.href)}}\">\n" +
1546615471
"<span class=\"{{primaryItem.iconClass}}\"></span> {{primaryItem.label}}\n" +
1546715472
"</a>\n" +
@@ -15473,7 +15478,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
1547315478
"<li ng-repeat-start=\"secondarySection in primaryItem.secondaryNavSections\" ng-if=\"secondarySection.header\" class=\"dropdown-header\">\n" +
1547415479
"{{secondarySection.header}}\n" +
1547515480
"</li>\n" +
15476-
"<li ng-repeat=\"secondaryItem in secondarySection.items\" ng-class=\"{ active: secondaryItem === activeSecondary }\" ng-if=\"!secondaryItem.isValid || secondaryItem.isValid()\">\n" +
15481+
"<li ng-repeat=\"secondaryItem in secondarySection.items\" ng-class=\"{ active: secondaryItem === activeSecondary }\" ng-if=\"show(secondaryItem)\">\n" +
1547715482
"<a ng-href=\"{{navURL(secondaryItem.href)}}\">{{secondaryItem.label}}</a>\n" +
1547815483
"</li>\n" +
1547915484
"<li ng-repeat-end style=\"display:none\"></li>\n" +
@@ -15484,7 +15489,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
1548415489
"<li ng-repeat-start=\"secondarySection in primaryItem.secondaryNavSections\" ng-if=\"secondarySection.header\" class=\"dropdown-header\">\n" +
1548515490
"{{secondarySection.header}}\n" +
1548615491
"</li>\n" +
15487-
"<li ng-repeat=\"secondaryItem in secondarySection.items\" ng-class=\"{ active: secondaryItem === activeSecondary }\" ng-if=\"!secondaryItem.isValid || secondaryItem.isValid()\">\n" +
15492+
"<li ng-repeat=\"secondaryItem in secondarySection.items\" ng-class=\"{ active: secondaryItem === activeSecondary }\" ng-if=\"show(secondaryItem)\">\n" +
1548815493
"<a ng-href=\"{{navURL(secondaryItem.href)}}\">{{secondaryItem.label}}</a>\n" +
1548915494
"</li>\n" +
1549015495
"<li ng-repeat-end style=\"display:none\"></li>\n" +

0 commit comments

Comments
 (0)