Skip to content

Commit

Permalink
bump(github.com/openshift/origin-web-console): 26d468aab574f66a99496c…
Browse files Browse the repository at this point in the history 
…35c21edc6e45d55dba
  • Loading branch information
OpenShift Bot committed Jun 26, 2017
1 parent 818c357 commit d007fa3
Showing 1 changed file with 89 additions and 46 deletions.
135 changes: 89 additions & 46 deletions pkg/assets/bindata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14210,26 +14210,26 @@ templateUrl:"views/overview/_builds.html"
function a(a, b, c, d, e, f, g, h) {
var i = this;
_.extend(i, f.ui);
var j = a("canI"), k = a("deploymentIsInProgress"), l = a("isBinaryBuild"), m = function(a) {
var j = a("canI"), k = a("deploymentIsInProgress"), l = a("isBinaryBuild"), m = a("enableTechPreviewFeature"), n = function(a) {
var b = _.get(a, "spec.triggers");
_.isEmpty(b) || (i.imageChangeTriggers = _.filter(b, function(a) {
return "ImageChange" === a.type && _.get(a, "imageChangeParams.automatic");
}));
}, n = function(a) {
a && !i.current && "DeploymentConfig" !== a.kind && "Deployment" !== a.kind && (i.current = a);
}, o = function(a) {
i.rgv = c.objectToResourceGroupVersion(a), n(a), m(a);
a && !i.current && "DeploymentConfig" !== a.kind && "Deployment" !== a.kind && (i.current = a);
}, p = function(a) {
i.rgv = c.objectToResourceGroupVersion(a), o(a), n(a);
};
i.$onChanges = function(a) {
a.apiObject && o(a.apiObject.currentValue);
a.apiObject && p(a.apiObject.currentValue);
};
var p = [], q = function(a) {
var q = [], r = function(a) {
if (!i.state.hpaByResource) return null;
var b = _.get(a, "kind"), c = _.get(a, "metadata.name");
return _.get(i.state.hpaByResource, [ b, c ], p);
return _.get(i.state.hpaByResource, [ b, c ], q);
};
i.$doCheck = function() {
i.notifications = f.getNotifications(i.apiObject, i.state), i.hpa = q(i.apiObject), i.current && _.isEmpty(i.hpa) && (i.hpa = q(i.current));
i.notifications = f.getNotifications(i.apiObject, i.state), i.hpa = r(i.apiObject), i.current && _.isEmpty(i.hpa) && (i.hpa = r(i.current));
var a = _.get(i, "apiObject.metadata.uid");
a && (i.services = _.get(i, [ "state", "servicesByObjectUID", a ]), i.buildConfigs = _.get(i, [ "state", "buildConfigsByObjectUID", a ]), i.bindings = _.get(i, [ "state", "bindingsByApplicationUID", a ]));
var b, c = _.get(i, "apiObject.kind");
Expand All @@ -14245,16 +14245,28 @@ return !!_.isEmpty(i.hpa) && !i.isDeploymentInProgress();
}, i.isDeploymentInProgress = function() {
return !(!i.current || !i.previous) || k(i.current);
}, i.canIDoAny = function() {
var a = _.get(i, "apiObject.kind");
var a = _.get(i, "apiObject.kind"), b = _.get(i, "apiObject.metadata.uid"), c = _.get(i.state.deleteableBindingsByApplicationUID, b);
switch (a) {
case "DeploymentConfig":
return !!j("deploymentconfigs/instantiate", "create") || (!!j("deploymentconfigs", "update") || (!(!i.current || !j("deploymentconfigs/log", "get")) || (i.showStartPipelineAction() || i.showStartBuildAction())));
return !!j("deploymentconfigs/instantiate", "create") || (!!j("deploymentconfigs", "update") || (!(!i.current || !j("deploymentconfigs/log", "get")) || (!(!m("pod_presets") || _.isEmpty(i.state.bindableServiceInstances) || !j({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "create")) || (!(!m("pod_presets") || _.isEmpty(c) || !j({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "delete")) || (i.showStartPipelineAction() || i.showStartBuildAction())))));

case "Pod":
return !!j("pods/log", "get") || !!j("pods", "update");

default:
return !(!i.firstPod(i.current) || !j("pods/log", "get")) || !!j(i.rgv, "update");
return !(!i.firstPod(i.current) || !j("pods/log", "get")) || (!!j(i.rgv, "update") || (!(!m("pod_presets") || _.isEmpty(i.state.bindableServiceInstances) || !j({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "create")) || !(!m("pod_presets") || _.isEmpty(c) || !j({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "delete"))));
}
}, i.showStartBuildAction = function() {
if (!_.isEmpty(i.pipelines)) return !1;
Expand Down Expand Up @@ -14330,29 +14342,40 @@ hidePipelines:"<"
templateUrl:"views/overview/_list-row.html"
});
}(), function() {
function a(a, b, c, d, e, f) {
var g = this;
_.extend(g, e.ui);
var h = a("getErrorDetails"), i = a("serviceInstanceDisplayName"), j = function() {
var a = g.apiObject.spec.serviceClassName;
return _.get(g, [ "state", "serviceClasses", a, "description" ]);
};
g.$doCheck = function() {
g.notifications = e.getNotifications(g.apiObject, g.state), g.displayName = i(g.apiObject, g.serviceClasses), g.description = j();
}, g.$onChanges = function(a) {
a.bindings && (g.deleteableBindings = _.reject(g.bindings, "metadata.deletionTimestamp"));
}, g.getSecretForBinding = function(a) {
return a && _.get(g, [ "state", "secrets", a.spec.secretName ]);
}, g.isBindable = d.isServiceBindable(g.apiObject, g.state.serviceClasses), g.closeOverlayPanel = function() {
_.set(g, "overlay.panelVisible", !1);
}, g.showOverlayPanel = function(a, b) {
_.set(g, "overlay.panelVisible", !0), _.set(g, "overlay.panelName", a), _.set(g, "overlay.state", b);
}, g.deprovision = function() {
function a(a, b, c, d, e, f, g) {
var h = this;
_.extend(h, e.ui);
var i = a("getErrorDetails"), j = a("serviceInstanceDisplayName"), k = function() {
var a = h.apiObject.spec.serviceClassName;
return _.get(h, [ "state", "serviceClasses", a, "description" ]);
};
h.$doCheck = function() {
h.notifications = e.getNotifications(h.apiObject, h.state), h.displayName = j(h.apiObject, h.serviceClasses), h.description = k();
}, h.$onChanges = function(a) {
a.bindings && (h.deleteableBindings = _.reject(h.bindings, "metadata.deletionTimestamp"));
}, h.getSecretForBinding = function(a) {
return a && _.get(h, [ "state", "secrets", a.spec.secretName ]);
}, h.isBindable = d.isServiceBindable(h.apiObject, h.state.serviceClasses), h.actionsDropdownVisible = function() {
return !(!h.isBindable || !g.canI({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "create")) || (!(_.isEmpty(h.deleteableBindings) || !g.canI({
resource:"bindings",
group:"servicecatalog.k8s.io"
}, "delete")) || !!g.canI({
resource:"instances",
group:"servicecatalog.k8s.io"
}, "delete"));
}, h.closeOverlayPanel = function() {
_.set(h, "overlay.panelVisible", !1);
}, h.showOverlayPanel = function(a, b) {
_.set(h, "overlay.panelVisible", !0), _.set(h, "overlay.panelName", a), _.set(h, "overlay.state", b);
}, h.deprovision = function() {
var a = {
alerts:{
deprovision:{
type:"error",
message:"Service '" + g.apiObject.spec.serviceClassName + "' will be deleted and no longer available."
message:"Service '" + h.apiObject.spec.serviceClassName + "' will be deleted and no longer available."
}
},
detailsMarkup:"Delete Service?",
Expand All @@ -14373,28 +14396,28 @@ return a;
f.hideNotification("deprovision-service-error"), c["delete"]({
group:"servicecatalog.k8s.io",
resource:"instances"
}, g.apiObject.metadata.name, {
namespace:g.apiObject.metadata.namespace
}, h.apiObject.metadata.name, {
namespace:h.apiObject.metadata.namespace
}, {
propagationPolicy:null
}).then(function() {
f.addNotification({
type:"success",
message:"Successfully deleted " + g.apiObject.metadata.name + "."
message:"Successfully deleted " + h.apiObject.metadata.name + "."
});
}, function(a) {
f.addNotification({
id:"deprovision-service-error",
type:"error",
message:"An error occurred while deleting " + g.apiObject.metadata.name + ".",
details:h(a)
message:"An error occurred while deleting " + h.apiObject.metadata.name + ".",
details:i(a)
});
});
});
};
}
angular.module("openshiftConsole").component("serviceInstanceRow", {
controller:[ "$filter", "$uibModal", "DataService", "BindingService", "ListRowUtils", "NotificationsService", a ],
controller:[ "$filter", "$uibModal", "DataService", "BindingService", "ListRowUtils", "NotificationsService", "AuthorizationService", a ],
controllerAs:"row",
bindings:{
apiObject:"<",
Expand Down Expand Up @@ -27869,11 +27892,14 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<li ng-if=\"'deploymentconfigs' | canI : 'update'\" role=\"menuitem\">\n" +
"<a ng-href=\"{{row.apiObject | editResourceURL}}\">Edit</a>\n" +
"</li>\n" +
"\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature) && row.state.bindableServiceInstances.length\" role=\"menuitem\">\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.bindableServiceInstances.length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature) && row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length\" role=\"menuitem\">\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"row.current && ('deploymentconfigs/log' | canI : 'get')\" role=\"menuitem\">\n" +
Expand Down Expand Up @@ -27902,6 +27928,16 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<li role=\"menuitem\" ng-if=\"row.rgv | canI : 'update'\">\n" +
"<a ng-href=\"{{row.apiObject | editYamlURL}}\">Edit YAML</a>\n" +
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.bindableServiceInstances.length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"('pod_presets' | enableTechPreviewFeature)\n" +
" && row.state.deleteableBindingsByApplicationUID[row.apiObject.metadata.uid].length\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\" role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li ng-if=\"(pod = row.firstPod(row.current)) && ('pods/log' | canI : 'get')\" role=\"menuitem\">\n" +
"<a ng-href=\"{{pod | navigateResourceURL}}?tab=logs\">View Logs</a>\n" +
"</li>\n" +
Expand Down Expand Up @@ -28389,7 +28425,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<div class=\"section-title hidden-xs\">Service Bindings</div>\n" +
"<overview-service-binding ng-repeat=\"binding in $ctrl.bindings track by (binding | uid)\" binding=\"binding\" service-classes=\"$ctrl.serviceClasses\" service-instances=\"$ctrl.serviceInstances\" secrets=\"$ctrl.secrets\">\n" +
"</overview-service-binding>\n" +
"<div ng-if=\"$ctrl.bindableServiceInstances | size\">\n" +
"<div ng-if=\"($ctrl.bindableServiceInstances | size) && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"$ctrl.createBinding()\" role=\"button\">Create Binding</a>\n" +
"</div>\n" +
"</div>"
Expand Down Expand Up @@ -28437,7 +28473,9 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<div class=\"list-pf-details\">\n" +
"<div ng-if=\"!row.expanded\">\n" +
"<div class=\"hidden-xs hidden-sm\">\n" +
"<span ng-if=\"!row.bindings.length && row.isBindable\">\n" +
"<span ng-if=\"!row.bindings.length\n" +
" && row.isBindable\n" +
" && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</span>\n" +
"<span ng-if=\"row.bindings.length\" class=\"component-label\">Bindings</span>\n" +
Expand All @@ -28463,18 +28501,18 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</div>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"list-pf-actions\">\n" +
"<div class=\"list-pf-actions\" ng-if=\"row.actionsDropdownVisible()\">\n" +
"<div uib-dropdown>\n" +
"<a href=\"\" uib-dropdown-toggle class=\"actions-dropdown-kebab\"><i class=\"fa fa-ellipsis-v\"></i><span class=\"sr-only\">Actions</span></a>\n" +
"<ul class=\"dropdown-menu dropdown-menu-right\" uib-dropdown-menu role=\"menu\">\n" +
"<li role=\"menuitem\" ng-if=\"('pod_presets' | enableTechPreviewFeature) && row.isBindable\">\n" +
"<li role=\"menuitem\" ng-if=\"row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li role=\"menuitem\" ng-if=\"('pod_presets' | enableTechPreviewFeature) && row.deleteableBindings.length\">\n" +
"<li role=\"menuitem\" ng-if=\"row.deleteableBindings.length && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'delete')\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('unbindService', {target: row.apiObject})\">Delete Binding</a>\n" +
"</li>\n" +
"<li role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\">Delete</a>\n" +
"<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\" ng-if=\"{resource: 'instances', group: 'servicecatalog.k8s.io'} | canI : 'delete'\">Delete</a>\n" +
"</li>\n" +
"</ul>\n" +
"</div>\n" +
Expand Down Expand Up @@ -28531,11 +28569,16 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</a>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"row\" ng-if=\"row.isBindable\">\n" +
"<div class=\"row\" ng-if=\"row.isBindable && ({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create')\">\n" +
"<div class=\"col-sm-12\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</div>\n" +
"</div>\n" +
"<div class=\"row\" ng-if=\"!row.bindings.length && (!row.isBindable || !({resource: 'bindings', group: 'servicecatalog.k8s.io'} | canI : 'create'))\">\n" +
"<div class=\"col-sm-12\">\n" +
"<em>No bindings</em>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
"</div>\n" +
Expand Down

0 comments on commit d007fa3

Please sign in to comment.