Skip to content

Commit a3423f8

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2409 from jeff-phillips-18/parameters
Automatic merge from submit-queue. Fix bugzilla 1507822 - Update plan info on service instance update Fixes bugzilla [1507822](https://bugzilla.redhat.com/show_bug.cgi?id=1507822) where the service plan information is not updated automatically when the service instance is edited.
2 parents 0cfcbb8 + dce18fd commit a3423f8

File tree

2 files changed

+63
-37
lines changed

2 files changed

+63
-37
lines changed

‎app/scripts/controllers/serviceInstance.js

+36-18
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ angular.module('openshiftConsole')
5151
var watches = [];
5252
var secretWatchers = [];
5353
var serviceClassPromise;
54+
var servicePlansPromise;
5455

5556
var serviceInstanceDisplayName = $filter('serviceInstanceDisplayName');
5657
var serviceInstanceReady = $filter('isServiceInstanceReady');
@@ -128,33 +129,50 @@ angular.module('openshiftConsole')
128129
updateParameterData();
129130
};
130131

131-
var updateServiceClass = function() {
132-
// If we've previously loaded the service class or a request is in flight, don't do anything.
133-
if (!$scope.serviceInstance || $scope.serviceClass || serviceClassPromise) {
132+
var updateServicePlan = function() {
133+
var servicePlanName = _.get($scope.serviceInstance, 'spec.clusterServicePlanRef.name');
134+
$scope.plan = _.find($scope.servicePlans, { metadata: { name: servicePlanName } });
135+
updateParameterSchema();
136+
updateEditable();
137+
};
138+
139+
var updateServicePlans = function() {
140+
if (!$scope.serviceClass || servicePlansPromise) {
134141
return;
135142
}
136143

137-
serviceClassPromise = ServiceInstancesService.fetchServiceClassForInstance($scope.serviceInstance).then(function (serviceClass) {
138-
$scope.serviceClass = serviceClass;
139-
$scope.displayName = serviceInstanceDisplayName($scope.serviceInstance, $scope.serviceClass);
140-
141-
updateBreadcrumbs();
142-
serviceClassPromise = null;
143-
144-
Catalog.getServicePlansForServiceClass($scope.serviceClass).then(function (plans) {
145-
plans = plans.by('metadata.name');
146-
144+
if (!$scope.servicePlans) {
145+
servicePlansPromise = Catalog.getServicePlansForServiceClass($scope.serviceClass).then(function (plans) {
147146
var servicePlanName = _.get($scope.serviceInstance, 'spec.clusterServicePlanRef.name');
148-
$scope.servicePlans = _.reject(plans, function(plan) {
147+
$scope.servicePlans = _.reject(plans.by('metadata.name'), function(plan) {
149148
return _.get(plan, 'status.removedFromBrokerCatalog') && (plan.metadata.name !== servicePlanName);
150149
});
151150

152-
$scope.plan = plans[servicePlanName];
151+
updateServicePlan();
152+
servicePlansPromise = null;
153+
});
154+
} else {
155+
updateServicePlan();
156+
}
157+
};
158+
159+
var updateServiceClass = function() {
160+
if (!$scope.serviceInstance || serviceClassPromise) {
161+
return;
162+
}
163+
164+
if ($scope.serviceClass) {
165+
updateServicePlans();
166+
} else {
167+
serviceClassPromise = ServiceInstancesService.fetchServiceClassForInstance($scope.serviceInstance).then(function (serviceClass) {
168+
$scope.serviceClass = serviceClass;
169+
$scope.displayName = serviceInstanceDisplayName($scope.serviceInstance, $scope.serviceClass);
153170

154-
updateParameterSchema();
155-
updateEditable();
171+
updateBreadcrumbs();
172+
serviceClassPromise = null;
173+
updateServicePlans();
156174
});
157-
});
175+
}
158176
};
159177

160178
var serviceResolved = function(serviceInstance, action) {

‎dist/scripts/scripts.js

+27-19
Original file line numberDiff line numberDiff line change
@@ -6358,15 +6358,15 @@ e.showParameterValues = !e.showParameterValues;
63586358
}, e.closeEditDialog = function() {
63596359
e.editDialogShown = !1;
63606360
};
6361-
var m, p = [], f = [], g = t("serviceInstanceDisplayName"), v = t("isServiceInstanceReady"), h = a.getPreferredVersion("servicebindings");
6361+
var m, p, f = [], g = [], v = t("serviceInstanceDisplayName"), h = t("isServiceInstanceReady"), y = a.getPreferredVersion("servicebindings");
63626362
e.serviceInstancesVersion = a.getPreferredVersion("serviceinstances");
6363-
var y = function() {
6363+
var b = function() {
63646364
e.breadcrumbs.push({
63656365
title: e.displayName
63666366
});
6367-
}, b = function() {
6367+
}, C = function() {
63686368
if (e.serviceInstance && e.parameterSchema) {
6369-
s.unwatchAll(f), f = [], e.allowParametersReveal = o.canI("secrets", "get", e.projectName), e.parameterData = {}, e.opaqueParameterKeys = [];
6369+
s.unwatchAll(g), g = [], e.allowParametersReveal = o.canI("secrets", "get", e.projectName), e.parameterData = {}, e.opaqueParameterKeys = [];
63706370
var t = e.allowParametersReveal ? "" : "*****";
63716371
_.each(_.keys(_.get(e.parameterSchema, "properties")), function(n) {
63726372
e.parameterData[n] = t;
@@ -6375,7 +6375,7 @@ var n = _.get(e.serviceInstance, "status.externalProperties.parameters", {});
63756375
_.each(_.keys(n), function(t) {
63766376
"<redacted>" === n[t] ? e.parameterData[t] = "*****" : (e.parameterData[t] = n[t], e.opaqueParameterKeys.push(t));
63776377
}), e.allowParametersReveal && _.each(_.get(e.serviceInstance, "spec.parametersFrom"), function(t) {
6378-
f.push(s.watchObject("secrets", _.get(t, "secretKeyRef.name"), e.projectContext, function(n) {
6378+
g.push(s.watchObject("secrets", _.get(t, "secretKeyRef.name"), e.projectContext, function(n) {
63796379
try {
63806380
var a = JSON.parse(u.decodeSecretData(n.data)[t.secretKeyRef.key]);
63816381
_.extend(e.parameterData, a);
@@ -6385,34 +6385,42 @@ c.warn("Unable to load parameters from secret " + _.get(t, "secretKeyRef.name"),
63856385
}));
63866386
});
63876387
}
6388-
}, C = function() {
6388+
}, S = function() {
63896389
if (e.plan && e.serviceClass && e.serviceInstance) {
63906390
var t = _.get(e.plan, "spec.instanceUpdateParameterSchema"), n = _.size(_.get(t, "properties")) > 0 || _.get(e.serviceClass, "spec.planUpdatable") && _.size(e.servicePlans) > 1;
6391-
e.editAvailable = n && v(e.serviceInstance) && !_.get(e.serviceInstance, "metadata.deletionTimestamp");
6391+
e.editAvailable = n && h(e.serviceInstance) && !_.get(e.serviceInstance, "metadata.deletionTimestamp");
63926392
}
6393-
}, S = function() {
6394-
e.parameterFormDefinition = angular.copy(_.get(e.plan, "spec.externalMetadata.schemas.service_instance.update.openshift_form_definition")), e.parameterSchema = _.get(e.plan, "spec.instanceCreateParameterSchema"), b();
63956393
}, w = function() {
6396-
!e.serviceInstance || e.serviceClass || m || (m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
6397-
e.serviceClass = t, e.displayName = g(e.serviceInstance, e.serviceClass), y(), m = null, i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
6398-
t = t.by("metadata.name");
6394+
e.parameterFormDefinition = angular.copy(_.get(e.plan, "spec.externalMetadata.schemas.service_instance.update.openshift_form_definition")), e.parameterSchema = _.get(e.plan, "spec.instanceCreateParameterSchema"), C();
6395+
}, k = function() {
6396+
var t = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
6397+
e.plan = _.find(e.servicePlans, {
6398+
metadata: {
6399+
name: t
6400+
}
6401+
}), w(), S();
6402+
}, P = function() {
6403+
e.serviceClass && !p && (e.servicePlans ? k() : p = i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
63996404
var n = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
6400-
e.servicePlans = _.reject(t, function(e) {
6405+
e.servicePlans = _.reject(t.by("metadata.name"), function(e) {
64016406
return _.get(e, "status.removedFromBrokerCatalog") && e.metadata.name !== n;
6402-
}), e.plan = t[n], S(), C();
6403-
});
6407+
}), k(), p = null;
6408+
}));
6409+
}, j = function() {
6410+
e.serviceInstance && !m && (e.serviceClass ? P() : m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
6411+
e.serviceClass = t, e.displayName = v(e.serviceInstance, e.serviceClass), b(), m = null, P();
64046412
}));
6405-
}, k = function(t, n) {
6413+
}, R = function(t, n) {
64066414
e.loaded = !0, e.serviceInstance = t, "DELETED" === n && (e.alerts.deleted = {
64076415
type: "warning",
64086416
message: "This provisioned service has been deleted."
6409-
}), w(), b(), C();
6417+
}), j(), C(), S();
64106418
};
64116419
l.get(n.project).then(_.spread(function(a, o) {
64126420
e.project = a, e.projectContext = o, s.get(e.serviceInstancesVersion, n.instance, o, {
64136421
errorNotification: !1
64146422
}).then(function(t) {
6415-
k(t), p.push(s.watchObject(e.serviceInstancesVersion, n.instance, o, k)), p.push(s.watch(h, o, function(n) {
6423+
R(t), f.push(s.watchObject(e.serviceInstancesVersion, n.instance, o, R)), f.push(s.watch(y, o, function(n) {
64166424
var a = n.by("metadata.name");
64176425
e.bindings = r.getBindingsForResource(a, t);
64186426
}));
@@ -6430,7 +6438,7 @@ message: "The service details could not be loaded.",
64306438
details: t("getErrorDetails")(n)
64316439
};
64326440
})), e.$on("$destroy", function() {
6433-
s.unwatchAll(p), s.unwatchAll(f);
6441+
s.unwatchAll(f), s.unwatchAll(g);
64346442
});
64356443
} ]), angular.module("openshiftConsole").controller("SecretsController", [ "$routeParams", "$scope", "DataService", "ProjectsService", function(e, t, n, a) {
64366444
t.projectName = e.project, t.secretsByType = {}, a.get(e.project).then(_.spread(function(e, a) {

0 commit comments

Comments
 (0)