Skip to content

Commit

Permalink
bump(github.com/openshift/origin-web-console): a230883459f8e19525d96f…
Browse files Browse the repository at this point in the history 
…1105e11dc222c17a5f
  • Loading branch information
OpenShift Bot committed Apr 12, 2017
1 parent 1c16529 commit 46942ad
Showing 1 changed file with 140 additions and 51 deletions.
191 changes: 140 additions & 51 deletions pkg/assets/bindata.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1748,52 +1748,95 @@ return b.weight / c * 100 + "%";
}

function BindService(a, b, c) {
var d = this;
d.steps = [ {
var d, e, f, g, h, i = this, j = a("statusCondition"), k = function() {
var a, b;
_.each(i.serviceInstances, function(c) {
var d = "True" === _.get(j(c, "Ready"), "status");
d && (!a || c.metadata.creationTimestamp > a.metadata.creationTimestamp) && (a = c), d || b && !(c.metadata.creationTimestamp > b.metadata.creationTimestamp) || (b = c);
}), i.serviceToBind = _.get(a, "metadata.name") || _.get(b, "metadata.name");
}, l = function() {
if (i.serviceClasses && i.serviceInstances) {
var a = _.toArray(i.serviceInstances);
a.sort(function(a, b) {
var c = _.get(i.serviceClasses, [ a.spec.serviceClassName, "osbMetadata", "displayName" ]) || a.spec.serviceClassName, d = _.get(i.serviceClasses, [ a.spec.serviceClassName, "osbMetadata", "displayName" ]) || b.spec.serviceClassName;
return c === d && (c = _.get(a, "metadata.name", ""), d = _.get(b, "metadata.name", "")), c.localeCompare(d);
}), i.orderedServiceInstances = a;
}
}, m = function() {
if (d && e && f && g && h) {
var a = d.concat(e).concat(f).concat(g).concat(h);
i.applications = _.sortByAll(a, [ "metadata.name", "kind" ]);
}
};
i.$onInit = function() {
i.steps = [], "Instance" === i.target.kind ? i.steps.push({
id:"applications",
label:"Applications",
view:"views/directives/bind-service/select-application.html"
}) :i.steps.push({
id:"services",
label:"Services",
view:"views/directives/bind-service/select-service.html"
}, {
}), i.steps.push({
label:"Results",
id:"results",
view:"views/directives/bind-service/results.html"
} ], d.$onInit = function() {
d.gotoStep(d.steps[0]);
});
var c = {
namespace:_.get(i.target, "metadata.namespace")
};
var e = a("statusCondition");
d.$onChanges = function(a) {
if (a.serviceInstances && !d.serviceToBind) {
var b, c;
_.each(d.serviceInstances, function(a) {
var d = "True" === _.get(e(a, "Ready"), "status");
d && (!b || a.metadata.creationTimestamp > b.metadata.creationTimestamp) && (b = a), d || c && !(a.metadata.creationTimestamp > c.metadata.creationTimestamp) || (c = a);
}), d.serviceToBind = _.get(b, "metadata.name") || _.get(c, "metadata.name");
}
if ((a.serviceInstances || a.serviceClasses) && d.serviceClasses && d.serviceInstances) {
var f = _.toArray(d.serviceInstances);
f.sort(function(a, b) {
var c = _.get(d.serviceClasses, [ a.spec.serviceClassName, "osbMetadata", "displayName" ]) || a.spec.serviceClassName, e = _.get(d.serviceClasses, [ a.spec.serviceClassName, "osbMetadata", "displayName" ]) || b.spec.serviceClassName;
return c === e && (c = _.get(a, "metadata.name", ""), e = _.get(b, "metadata.name", "")), c.localeCompare(e);
}), d.orderedServiceInstances = f;
}
b.list({
group:"servicecatalog.k8s.io",
resource:"serviceclasses"
}, {}).then(function(a) {
i.serviceClasses = a.by("metadata.name"), l();
}), "Instance" === i.target.kind ? (i.shouldBindToApp = "true", i.serviceToBind = i.target.metadata.name, b.list("deploymentconfigs", c).then(function(a) {
d = _.toArray(a.by("metadata.name")), m();
}), b.list("replicationcontrollers", c).then(function(b) {
f = _.reject(b.by("metadata.name"), a("hasDeploymentConfig")), m();
}), b.list({
group:"extensions",
resource:"deployments"
}, c).then(function(a) {
e = _.toArray(a.by("metadata.name")), m();
}), b.list({
group:"extensions",
resource:"replicasets"
}, c).then(function(b) {
g = _.reject(b.by("metadata.name"), a("hasDeployment")), m();
}), b.list({
group:"apps",
resource:"statefulsets"
}, c).then(function(a) {
h = _.toArray(a.by("metadata.name")), m();
})) :b.list({
group:"servicecatalog.k8s.io",
resource:"instances"
}, c).then(function(a) {
i.serviceInstances = a.by("metadata.name"), i.serviceToBind || k(), l();
}), i.gotoStep(i.steps[0]);
};
var f = function(a) {
var b = _.find(d.steps, {
var n = a("humanizeKind");
i.groupByKind = function(a) {
return n(a.kind);
};
var o = function(a) {
var b = _.find(i.steps, {
id:a
});
d.gotoStep(b);
i.gotoStep(b);
};
d.gotoStep = function(a) {
_.each(d.steps, function(a) {
i.gotoStep = function(a) {
_.each(i.steps, function(a) {
a.selected = !1;
}), d.currentStep && (d.currentStep.visited = !0), d.currentStep = a, d.currentStep.selected = !0;
}, d.stepClick = function(a) {
d.wizardComplete || a.visited && d.gotoStep(a);
}), i.currentStep && (i.currentStep.visited = !0), i.currentStep = a, i.currentStep.selected = !0;
}, i.stepClick = function(a) {
i.wizardComplete || a.visited && i.gotoStep(a);
};
var g = a("generateName"), h = function() {
var a = _.get(d.serviceInstances[d.serviceToBind], "metadata.name"), b = _.trunc(a, c.maxlength - 6);
d.generatedSecretName = g(b + "-");
var e = {
var p = a("generateName"), q = function() {
var a = i.serviceToBind, b = _.trunc(a, c.maxlength - 6);
i.generatedSecretName = p(b + "-");
var d = {
kind:"Binding",
apiVersion:"servicecatalog.k8s.io/v1alpha1",
metadata:{
Expand All @@ -1803,30 +1846,30 @@ spec:{
instanceRef:{
name:a
},
secretName:d.generatedSecretName
secretName:i.generatedSecretName
}
};
return e;
return d;
};
d.bindService = function() {
var a = {
namespace:_.get(d.serviceInstances[d.serviceToBind], "metadata.namespace")
i.bindService = function() {
var a = "Instance" === i.target.kind ? i.target :i.serviceInstances[i.serviceToBind], c = {
namespace:_.get(a, "metadata.namespace")
};
b.create({
group:"servicecatalog.k8s.io",
resource:"bindings"
}, null, h(), a).then(function(c) {
d.binding = c, b.watchObject({
}, null, q(), c).then(function(a) {
i.binding = a, b.watchObject({
group:"servicecatalog.k8s.io",
resource:"bindings"
}, _.get(d.binding, "metadata.name"), a, function(a) {
d.binding = a;
}), d.wizardComplete = !0, d.error = null, f("results");
}, _.get(i.binding, "metadata.name"), c, function(a) {
i.binding = a;
}), i.wizardComplete = !0, i.error = null, o("results");
}, function(a) {
d.error = a;
i.error = a;
});
}, d.closeWizard = function() {
_.isFunction(d.onClose) && d.onClose();
}, i.closeWizard = function() {
_.isFunction(i.onClose) && i.onClose();
};
}

Expand Down Expand Up @@ -2158,6 +2201,10 @@ e.$onChanges = function() {
e.notifications = c.getNotifications(e.apiObject, e.state), e.displayName = g(), e.description = h(), e.instanceBindings = i();
}, e.getSecretForBinding = function(a) {
return a && _.get(e, [ "state", "secrets", a.spec.secretName ]);
}, e.closeOverlayPanel = function() {
_.set(e, "overlay.panelVisible", !1);
}, e.showOverlayPanel = function(a, b) {
_.set(e, "overlay.panelVisible", !0), _.set(e, "overlay.panelName", a), _.set(e, "overlay.state", b);
}, e.deprovision = function() {
var a = {
alerts:{
Expand Down Expand Up @@ -14493,8 +14540,6 @@ controller:[ "$filter", "DataService", "DNS1123_SUBDOMAIN_VALIDATION", BindServi
controllerAs:"ctrl",
bindings:{
target:"<",
serviceInstances:"<",
serviceClasses:"<",
onClose:"<"
},
templateUrl:"views/directives/bind-service.html"
Expand Down Expand Up @@ -22713,7 +22758,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<button type=\"button\" class=\"btn btn-default wizard-pf-cancel wizard-pf-dismiss\" ng-class=\"{'btn-cancel': ctrl.steps.length > 2}\" ng-disabled=\"ctrl.currentStep.id === 'results'\" ng-click=\"ctrl.closeWizard()\">\n" +
"Cancel\n" +
"</button>\n" +
"<button type=\"button\" class=\"btn btn-primary wizard-pf-next\" ng-if=\"ctrl.currentStep.id !== 'results'\" ng-click=\"ctrl.bindService()\">\n" +
"<button type=\"button\" class=\"btn btn-primary wizard-pf-next\" ng-if=\"ctrl.currentStep.id !== 'results'\" ng-disabled=\"ctrl.serviceSelection.$invalid\" ng-click=\"ctrl.bindService()\">\n" +
"Bind\n" +
"</button>\n" +
"<button type=\"button\" class=\"btn btn-primary wizard-pf-close wizard-pf-dismiss\" ng-if=\"ctrl.currentStep.id === 'results'\" ng-click=\"ctrl.closeWizard()\">\n" +
Expand Down Expand Up @@ -22768,6 +22813,42 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
);


$templateCache.put('views/directives/bind-service/select-application.html',
"<h3 class=\"mar-top-none\">Select an application to bind to service <strong>{{ctrl.serviceClasses[ctrl.target.spec.serviceClassName].osbMetadata.displayName || ctrl.target.spec.serviceClassName}}</strong></h3>\n" +
"Binding to a provisioned service will create a secret containing the information necessary for your application to use the service.\n" +
"<form name=\"ctrl.serviceSelection\" class=\"mar-bottom-lg\">\n" +
"<fieldset ng-disabled=\"ctrl.isDisabled\">\n" +
"<div class=\"radio\">\n" +
"<label>\n" +
"<input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"true\">\n" +
"Bind to an application\n" +
"</label>\n" +
"<div class=\"pad-left-xl mar-bottom-md mar-top-sm\">\n" +
"<ui-select ng-model=\"ctrl.appToBind\" ng-disabled=\"ctrl.shouldBindToApp !== 'true'\" ng-required=\"ctrl.shouldBindToApp === 'true'\">\n" +
"<ui-select-match placeholder=\"Select an application\">\n" +
"<span>\n" +
"{{$select.selected.metadata.name}}\n" +
"<small class=\"text-muted\">&ndash; {{$select.selected.kind | humanizeKind : true}}</small>\n" +
"</span>\n" +
"</ui-select-match>\n" +
"<ui-select-choices repeat=\"application in (ctrl.applications) | filter : { metadata: { name: $select.search } } track by (application | uid)\" group-by=\"ctrl.groupByKind\">\n" +
"<span ng-bind-html=\"application.metadata.name | highlight : $select.search\"></span>\n" +
"</ui-select-choices>\n" +
"</ui-select>\n" +
"</div>\n" +
"<label>\n" +
"<input type=\"radio\" ng-model=\"ctrl.shouldBindToApp\" value=\"false\">\n" +
"Create a secret in my project\n" +
"<div class=\"help-block\">\n" +
"You can reference this secret later from any application either as environment variables or configuration files mounted as volumes.\n" +
"</div>\n" +
"</label>\n" +
"</div>\n" +
"</fieldset>\n" +
"</form>"
);


$templateCache.put('views/directives/bind-service/select-service.html',
" <h3 class=\"mar-top-none\">Select a service to bind to <strong>{{ctrl.target.metadata.name}}</strong></h3>\n" +
"Binding to a provisioned service will create a secret containing the information necessary for your application to use the service.\n" +
Expand Down Expand Up @@ -29088,7 +29169,7 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"</div>\n" +
"<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
"<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
"<bind-service target=\"row.overlay.state.target\" service-instances=\"row.state.serviceInstances\" service-classes=\"row.state.serviceClasses\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
"<bind-service target=\"row.overlay.state.target\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
"</div>\n" +
"</overlay-panel>"
);
Expand Down Expand Up @@ -29394,6 +29475,9 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"<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\">\n" +
"<a href=\"\" ng-click=\"row.showOverlayPanel('bindService', {target: row.apiObject})\">Create Binding</a>\n" +
"</li>\n" +
"<li role=\"menuitem\">\n" +
"<a href=\"\" ng-click=\"row.deprovision()\" role=\"button\">Deprovision</a>\n" +
"</li>\n" +
"</ul>\n" +
Expand Down Expand Up @@ -29426,7 +29510,12 @@ var _scriptsTemplatesJs = []byte(`angular.module('openshiftConsoleTemplates', []
"\n" +
"</div>\n" +
"</div>\n" +
"</div>"
"</div>\n" +
"<overlay-panel single-column=\"true\" show-panel=\"row.overlay.panelVisible\" show-close=\"true\" handle-close=\"row.closeOverlayPanel\">\n" +
"<div ng-if=\"row.overlay.panelName === 'bindService'\">\n" +
"<bind-service target=\"row.overlay.state.target\" on-close=\"row.closeOverlayPanel\"></bind-service>\n" +
"</div>\n" +
"</overlay-panel>"
);


Expand Down

0 comments on commit 46942ad

Please sign in to comment.