Skip to content

Commit

Permalink
Merge pull request #2409 from jeff-phillips-18/parameters
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Oct 31, 2017
2 parents 0cfcbb8 + dce18fd commit a3423f8
Show file tree
Hide file tree
Showing 2 changed files with 63 additions and 37 deletions.
54 changes: 36 additions & 18 deletions app/scripts/controllers/serviceInstance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ angular.module('openshiftConsole')
var watches = [];
var secretWatchers = [];
var serviceClassPromise;
var servicePlansPromise;

var serviceInstanceDisplayName = $filter('serviceInstanceDisplayName');
var serviceInstanceReady = $filter('isServiceInstanceReady');
Expand Down Expand Up @@ -128,33 +129,50 @@ angular.module('openshiftConsole')
updateParameterData();
};

var updateServiceClass = function() {
// If we've previously loaded the service class or a request is in flight, don't do anything.
if (!$scope.serviceInstance || $scope.serviceClass || serviceClassPromise) {
var updateServicePlan = function() {
var servicePlanName = _.get($scope.serviceInstance, 'spec.clusterServicePlanRef.name');
$scope.plan = _.find($scope.servicePlans, { metadata: { name: servicePlanName } });
updateParameterSchema();
updateEditable();
};

var updateServicePlans = function() {
if (!$scope.serviceClass || servicePlansPromise) {
return;
}

serviceClassPromise = ServiceInstancesService.fetchServiceClassForInstance($scope.serviceInstance).then(function (serviceClass) {
$scope.serviceClass = serviceClass;
$scope.displayName = serviceInstanceDisplayName($scope.serviceInstance, $scope.serviceClass);

updateBreadcrumbs();
serviceClassPromise = null;

Catalog.getServicePlansForServiceClass($scope.serviceClass).then(function (plans) {
plans = plans.by('metadata.name');

if (!$scope.servicePlans) {
servicePlansPromise = Catalog.getServicePlansForServiceClass($scope.serviceClass).then(function (plans) {
var servicePlanName = _.get($scope.serviceInstance, 'spec.clusterServicePlanRef.name');
$scope.servicePlans = _.reject(plans, function(plan) {
$scope.servicePlans = _.reject(plans.by('metadata.name'), function(plan) {
return _.get(plan, 'status.removedFromBrokerCatalog') && (plan.metadata.name !== servicePlanName);
});

$scope.plan = plans[servicePlanName];
updateServicePlan();
servicePlansPromise = null;
});
} else {
updateServicePlan();
}
};

var updateServiceClass = function() {
if (!$scope.serviceInstance || serviceClassPromise) {
return;
}

if ($scope.serviceClass) {
updateServicePlans();
} else {
serviceClassPromise = ServiceInstancesService.fetchServiceClassForInstance($scope.serviceInstance).then(function (serviceClass) {
$scope.serviceClass = serviceClass;
$scope.displayName = serviceInstanceDisplayName($scope.serviceInstance, $scope.serviceClass);

updateParameterSchema();
updateEditable();
updateBreadcrumbs();
serviceClassPromise = null;
updateServicePlans();
});
});
}
};

var serviceResolved = function(serviceInstance, action) {
Expand Down
46 changes: 27 additions & 19 deletions dist/scripts/scripts.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6358,15 +6358,15 @@ e.showParameterValues = !e.showParameterValues;
}, e.closeEditDialog = function() {
e.editDialogShown = !1;
};
var m, p = [], f = [], g = t("serviceInstanceDisplayName"), v = t("isServiceInstanceReady"), h = a.getPreferredVersion("servicebindings");
var m, p, f = [], g = [], v = t("serviceInstanceDisplayName"), h = t("isServiceInstanceReady"), y = a.getPreferredVersion("servicebindings");
e.serviceInstancesVersion = a.getPreferredVersion("serviceinstances");
var y = function() {
var b = function() {
e.breadcrumbs.push({
title: e.displayName
});
}, b = function() {
}, C = function() {
if (e.serviceInstance && e.parameterSchema) {
s.unwatchAll(f), f = [], e.allowParametersReveal = o.canI("secrets", "get", e.projectName), e.parameterData = {}, e.opaqueParameterKeys = [];
s.unwatchAll(g), g = [], e.allowParametersReveal = o.canI("secrets", "get", e.projectName), e.parameterData = {}, e.opaqueParameterKeys = [];
var t = e.allowParametersReveal ? "" : "*****";
_.each(_.keys(_.get(e.parameterSchema, "properties")), function(n) {
e.parameterData[n] = t;
Expand All @@ -6375,7 +6375,7 @@ var n = _.get(e.serviceInstance, "status.externalProperties.parameters", {});
_.each(_.keys(n), function(t) {
"<redacted>" === n[t] ? e.parameterData[t] = "*****" : (e.parameterData[t] = n[t], e.opaqueParameterKeys.push(t));
}), e.allowParametersReveal && _.each(_.get(e.serviceInstance, "spec.parametersFrom"), function(t) {
f.push(s.watchObject("secrets", _.get(t, "secretKeyRef.name"), e.projectContext, function(n) {
g.push(s.watchObject("secrets", _.get(t, "secretKeyRef.name"), e.projectContext, function(n) {
try {
var a = JSON.parse(u.decodeSecretData(n.data)[t.secretKeyRef.key]);
_.extend(e.parameterData, a);
Expand All @@ -6385,34 +6385,42 @@ c.warn("Unable to load parameters from secret " + _.get(t, "secretKeyRef.name"),
}));
});
}
}, C = function() {
}, S = function() {
if (e.plan && e.serviceClass && e.serviceInstance) {
var t = _.get(e.plan, "spec.instanceUpdateParameterSchema"), n = _.size(_.get(t, "properties")) > 0 || _.get(e.serviceClass, "spec.planUpdatable") && _.size(e.servicePlans) > 1;
e.editAvailable = n && v(e.serviceInstance) && !_.get(e.serviceInstance, "metadata.deletionTimestamp");
e.editAvailable = n && h(e.serviceInstance) && !_.get(e.serviceInstance, "metadata.deletionTimestamp");
}
}, S = function() {
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.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
t = t.by("metadata.name");
e.parameterFormDefinition = angular.copy(_.get(e.plan, "spec.externalMetadata.schemas.service_instance.update.openshift_form_definition")), e.parameterSchema = _.get(e.plan, "spec.instanceCreateParameterSchema"), C();
}, k = function() {
var t = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
e.plan = _.find(e.servicePlans, {
metadata: {
name: t
}
}), w(), S();
}, P = function() {
e.serviceClass && !p && (e.servicePlans ? k() : p = i.getServicePlansForServiceClass(e.serviceClass).then(function(t) {
var n = _.get(e.serviceInstance, "spec.clusterServicePlanRef.name");
e.servicePlans = _.reject(t, function(e) {
e.servicePlans = _.reject(t.by("metadata.name"), function(e) {
return _.get(e, "status.removedFromBrokerCatalog") && e.metadata.name !== n;
}), e.plan = t[n], S(), C();
});
}), k(), p = null;
}));
}, j = function() {
e.serviceInstance && !m && (e.serviceClass ? P() : m = d.fetchServiceClassForInstance(e.serviceInstance).then(function(t) {
e.serviceClass = t, e.displayName = v(e.serviceInstance, e.serviceClass), b(), m = null, P();
}));
}, k = function(t, n) {
}, R = function(t, n) {
e.loaded = !0, e.serviceInstance = t, "DELETED" === n && (e.alerts.deleted = {
type: "warning",
message: "This provisioned service has been deleted."
}), w(), b(), C();
}), j(), C(), S();
};
l.get(n.project).then(_.spread(function(a, o) {
e.project = a, e.projectContext = o, s.get(e.serviceInstancesVersion, n.instance, o, {
errorNotification: !1
}).then(function(t) {
k(t), p.push(s.watchObject(e.serviceInstancesVersion, n.instance, o, k)), p.push(s.watch(h, o, function(n) {
R(t), f.push(s.watchObject(e.serviceInstancesVersion, n.instance, o, R)), f.push(s.watch(y, o, function(n) {
var a = n.by("metadata.name");
e.bindings = r.getBindingsForResource(a, t);
}));
Expand All @@ -6430,7 +6438,7 @@ message: "The service details could not be loaded.",
details: t("getErrorDetails")(n)
};
})), e.$on("$destroy", function() {
s.unwatchAll(p), s.unwatchAll(f);
s.unwatchAll(f), s.unwatchAll(g);
});
} ]), angular.module("openshiftConsole").controller("SecretsController", [ "$routeParams", "$scope", "DataService", "ProjectsService", function(e, t, n, a) {
t.projectName = e.project, t.secretsByType = {}, a.get(e.project).then(_.spread(function(e, a) {
Expand Down

0 comments on commit a3423f8

Please sign in to comment.