Merge pull request #2369 from jeff-phillips-18/parameters

Automatic merge from submit-queue. Do not allow updating to plans that have been removed Fixes #2316
openshift · Oct 25, 2017 · bae09d0 · bae09d0
2 parents 812a86b + 230d98d
commit bae09d0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/app/scripts/controllers/serviceInstance.js b/app/scripts/controllers/serviceInstance.js
@@ -141,13 +141,14 @@ angular.module('openshiftConsole')
         updateBreadcrumbs();
         serviceClassPromise = null;
 
-        Catalog.getServicePlans().then(function (plans) {
+        Catalog.getServicePlansForServiceClass($scope.serviceClass).then(function (plans) {
           plans = plans.by('metadata.name');
 
-          var plansByServiceClassName = Catalog.groupPlansByServiceClassName(plans);
-          $scope.servicePlans = plansByServiceClassName[$scope.serviceClass.metadata.name];
-
           var servicePlanName = _.get($scope.serviceInstance, 'spec.clusterServicePlanRef.name');
+          $scope.servicePlans = _.reject(plans, function(plan) {
+            return _.get(plan, 'status.removedFromBrokerCatalog') && (plan.metadata.name !== servicePlanName);
+          });
+
           $scope.plan = plans[servicePlanName];
 
           updateParameterSchema();

diff --git a/dist/scripts/scripts.js b/dist/scripts/scripts.js
@@ -6387,12 +6387,12 @@ e.editAvailable = n && v(e.serviceInstance) && !_.get(e.serviceInstance, "metada
 e.parameterFormDefinition = angular.copy(_.get(e.plan, "spec.externalMetadata.schemas.service_instance.update.openshift_form_definition")), e.parameterSchema = _.get(e.plan, "spec.instanceCreateParameterSchema"), b();
 }, w = function() {
 !e.serviceInstance || e.serviceClass || m || (m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
-e.serviceClass = t, e.displayName = g(e.serviceInstance, e.serviceClass), y(), m = null, i.getServicePlans().then(function(t) {
+e.serviceClass = t, e.displayName = g(e.serviceInstance, e.serviceClass), y(), m = null, i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
 t = t.by("metadata.name");
-var n = i.groupPlansByServiceClassName(t);
-e.servicePlans = n[e.serviceClass.metadata.name];
-var a = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
-e.plan = t[a], C(), S();
+var n = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
+e.servicePlans = _.reject(t, function(e) {
+return _.get(e, "status.removedFromBrokerCatalog") && e.metadata.name !== n;
+}), e.plan = t[n], C(), S();
 });
 }));
 }, k = function(t, n) {