Skip to content

Update replicaSets to use new DataService.list #1362

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 17, 2017
Merged

Update replicaSets to use new DataService.list #1362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions app/scripts/controllers/replicaSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ angular.module('openshiftConsole')
$scope.projectContext = context;


DataService.list("configmaps", context, null, { errorNotification: false }).then(function(configMapData) {
configMapDataOrdered = orderByDisplayName(configMapData.by("metadata.name"));
DataService.list("configmaps", context, null, { errorNotification: false }).then(function(resp) {
configMapDataOrdered = orderByDisplayName(resp.by("metadata.name"));
$scope.valueFromObjects = configMapDataOrdered.concat(secretDataOrdered);
}, function(e) {
if (e.code === 403) {
Expand All @@ -190,8 +190,8 @@ angular.module('openshiftConsole')
displayError('Could not load config maps', getErrorDetails(e));
});

DataService.list("secrets", context, null, { errorNotification: false }).then(function(secretData) {
secretDataOrdered = orderByDisplayName(secretData.by("metadata.name"));
DataService.list("secrets", context, null, { errorNotification: false }).then(function(resp) {
secretDataOrdered = orderByDisplayName(resp.by("metadata.name"));
$scope.valueFromObjects = secretDataOrdered.concat(configMapDataOrdered);
}, function(e) {
if (e.code === 403) {
Expand Down Expand Up @@ -306,8 +306,8 @@ angular.module('openshiftConsole')
DataService.list({
group: 'extensions',
resource: 'deployments'
}, context, function(deploymentData) {
var deployments = deploymentData.by('metadata.name');
}, context).then(function(resp) {
var deployments = resp.by('metadata.name');
var replicaSetSelector = new LabelSelector($scope.replicaSet.spec.selector);
$scope.deployment = _.find(deployments, function(deployment) {
var deploymentSelector = new LabelSelector(deployment.spec.selector);
Expand Down Expand Up @@ -542,8 +542,8 @@ angular.module('openshiftConsole')

// List limit ranges in this project to determine if there is a default
// CPU request for autoscaling.
DataService.list("limitranges", context, function(response) {
limitRanges = response.by("metadata.name");
DataService.list("limitranges", context).then(function(resp) {
limitRanges = resp.by("metadata.name");
updateHPAWarnings();
});

Expand Down
4 changes: 2 additions & 2 deletions dist/scripts/scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6491,7 +6491,7 @@ a.isActive = h.isActiveReplicaSet(a.replicaSet, a.deployment);
P(a.replicaSet) && g.list({
group:"extensions",
resource:"deployments"
}, i, function(b) {
}, i).then(function(b) {
var d = b.by("metadata.name"), e = new LabelSelector(a.replicaSet.spec.selector);
return a.deployment = _.find(d, function(a) {
var b = new LabelSelector(a.spec.selector);
Expand Down Expand Up @@ -6584,7 +6584,7 @@ r = a.by("metadata.name"), J(), M();
}, {
poll:D,
pollInterval:6e4
})), g.list("limitranges", i, function(a) {
})), g.list("limitranges", i).then(function(a) {
B = a.by("metadata.name"), M();
});
var T = b("deploymentIsLatest");
Expand Down