Skip to content

O
origin-web-common
Unverified Commit 1ed9e04a by benjaminapetersen
Options

Update applicationsService to use getPreferredVersion

parent 623cb787
Showing with 50 additions and 32 deletions
dist/origin-web-common-services.js
...@@ -579,13 +579,22 @@ angular.module('openshiftCommonServices') ...@@ -579,13 +579,22 @@ angular.module('openshiftCommonServices')
;'use strict'; ;'use strict';
angular.module("openshiftCommonServices"). angular.module("openshiftCommonServices").
service("ApplicationsService", function($q, DataService) { service("ApplicationsService", function(
$q,
APIService,
DataService) {
var deploymentsVersion = APIService.getPreferredVersion('deployments');
var deploymentConfigsVersion = APIService.getPreferredVersion('deploymentconfigs');
var replicationControllersVersion = APIService.getPreferredVersion('replicationcontrollers');
var replicaSetsVersion = APIService.getPreferredVersion('replicasets');
var statefulSetsVersion = APIService.getPreferredVersion('statefulsets');
// List replication controllers in a namespace that are NOT managed by a // List replication controllers in a namespace that are NOT managed by a
// deployment config. Note: This will not return replication controllers that // deployment config. Note: This will not return replication controllers that
// have been orphaned by `oc delete dc/foo --cascade=false`. // have been orphaned by `oc delete dc/foo --cascade=false`.
var listStandaloneReplicationControllers = function(context) { var listStandaloneReplicationControllers = function(context) {
return DataService.list('replicationcontrollers', context, null, { return DataService.list(replicationControllersVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `openshift.io/deployment-config-name` // If the replica set has a `openshift.io/deployment-config-name`
...@@ -600,7 +609,7 @@ service("ApplicationsService", function($q, DataService) { ...@@ -600,7 +609,7 @@ service("ApplicationsService", function($q, DataService) {
// Note: This will not return replica sets that have been orphaned by // Note: This will not return replica sets that have been orphaned by
// `oc delete deployment/foo --cascade=false`. // `oc delete deployment/foo --cascade=false`.
var listStandaloneReplicaSets = function(context) { var listStandaloneReplicaSets = function(context) {
return DataService.list({group: 'extensions', resource: 'replicasets'}, context, null, { return DataService.list(replicaSetsVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `pod-template-hash` label, it's managed // If the replica set has a `pod-template-hash` label, it's managed
...@@ -616,11 +625,11 @@ service("ApplicationsService", function($q, DataService) { ...@@ -616,11 +625,11 @@ service("ApplicationsService", function($q, DataService) {
var promises = []; var promises = [];
// Load all the "application" types // Load all the "application" types
promises.push(DataService.list('deploymentconfigs', context)); promises.push(DataService.list(deploymentConfigsVersion, context));
promises.push(listStandaloneReplicationControllers(context)); promises.push(listStandaloneReplicationControllers(context));
promises.push(DataService.list({group: 'apps', resource: 'deployments'}, context)); promises.push(DataService.list(deploymentsVersion, context));
promises.push(listStandaloneReplicaSets(context)); promises.push(listStandaloneReplicaSets(context));
promises.push(DataService.list({group: 'apps', resource: 'statefulsets'}, context)); promises.push(DataService.list(statefulSetsVersion, context));
$q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) { $q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) {
var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name')); var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name'));
......
dist/origin-web-common.js
...@@ -2614,13 +2614,22 @@ angular.module('openshiftCommonServices') ...@@ -2614,13 +2614,22 @@ angular.module('openshiftCommonServices')
;'use strict'; ;'use strict';
angular.module("openshiftCommonServices"). angular.module("openshiftCommonServices").
service("ApplicationsService", ["$q", "DataService", function($q, DataService) { service("ApplicationsService", ["$q", "APIService", "DataService", function(
$q,
APIService,
DataService) {
var deploymentsVersion = APIService.getPreferredVersion('deployments');
var deploymentConfigsVersion = APIService.getPreferredVersion('deploymentconfigs');
var replicationControllersVersion = APIService.getPreferredVersion('replicationcontrollers');
var replicaSetsVersion = APIService.getPreferredVersion('replicasets');
var statefulSetsVersion = APIService.getPreferredVersion('statefulsets');
// List replication controllers in a namespace that are NOT managed by a // List replication controllers in a namespace that are NOT managed by a
// deployment config. Note: This will not return replication controllers that // deployment config. Note: This will not return replication controllers that
// have been orphaned by `oc delete dc/foo --cascade=false`. // have been orphaned by `oc delete dc/foo --cascade=false`.
var listStandaloneReplicationControllers = function(context) { var listStandaloneReplicationControllers = function(context) {
return DataService.list('replicationcontrollers', context, null, { return DataService.list(replicationControllersVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `openshift.io/deployment-config-name` // If the replica set has a `openshift.io/deployment-config-name`
...@@ -2635,7 +2644,7 @@ service("ApplicationsService", ["$q", "DataService", function($q, DataService) { ...@@ -2635,7 +2644,7 @@ service("ApplicationsService", ["$q", "DataService", function($q, DataService) {
// Note: This will not return replica sets that have been orphaned by // Note: This will not return replica sets that have been orphaned by
// `oc delete deployment/foo --cascade=false`. // `oc delete deployment/foo --cascade=false`.
var listStandaloneReplicaSets = function(context) { var listStandaloneReplicaSets = function(context) {
return DataService.list({group: 'extensions', resource: 'replicasets'}, context, null, { return DataService.list(replicaSetsVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `pod-template-hash` label, it's managed // If the replica set has a `pod-template-hash` label, it's managed
...@@ -2651,11 +2660,11 @@ service("ApplicationsService", ["$q", "DataService", function($q, DataService) { ...@@ -2651,11 +2660,11 @@ service("ApplicationsService", ["$q", "DataService", function($q, DataService) {
var promises = []; var promises = [];
// Load all the "application" types // Load all the "application" types
promises.push(DataService.list('deploymentconfigs', context)); promises.push(DataService.list(deploymentConfigsVersion, context));
promises.push(listStandaloneReplicationControllers(context)); promises.push(listStandaloneReplicationControllers(context));
promises.push(DataService.list({group: 'apps', resource: 'deployments'}, context)); promises.push(DataService.list(deploymentsVersion, context));
promises.push(listStandaloneReplicaSets(context)); promises.push(listStandaloneReplicaSets(context));
promises.push(DataService.list({group: 'apps', resource: 'statefulsets'}, context)); promises.push(DataService.list(statefulSetsVersion, context));
$q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) { $q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) {
var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name')); var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name'));
......
dist/origin-web-common.min.js
...@@ -1213,9 +1213,9 @@ unsupportedObjectKindOrVersion:unsupportedObjectKindOrVersion, ...@@ -1213,9 +1213,9 @@ unsupportedObjectKindOrVersion:unsupportedObjectKindOrVersion,
availableKinds:availableKinds, availableKinds:availableKinds,
getPreferredVersion:getPreferredVersion getPreferredVersion:getPreferredVersion
}; };
} ]), angular.module("openshiftCommonServices").service("ApplicationsService", [ "$q", "DataService", function($q, DataService) { } ]), angular.module("openshiftCommonServices").service("ApplicationsService", [ "$q", "APIService", "DataService", function($q, APIService, DataService) {
var listStandaloneReplicationControllers = function(context) { var deploymentsVersion = APIService.getPreferredVersion("deployments"), deploymentConfigsVersion = APIService.getPreferredVersion("deploymentconfigs"), replicationControllersVersion = APIService.getPreferredVersion("replicationcontrollers"), replicaSetsVersion = APIService.getPreferredVersion("replicasets"), statefulSetsVersion = APIService.getPreferredVersion("statefulsets"), listStandaloneReplicationControllers = function(context) {
return DataService.list("replicationcontrollers", context, null, { return DataService.list(replicationControllersVersion, context, null, {
http:{ http:{
params:{ params:{
labelSelector:"!openshift.io/deployment-config.name" labelSelector:"!openshift.io/deployment-config.name"
...@@ -1223,10 +1223,7 @@ labelSelector:"!openshift.io/deployment-config.name" ...@@ -1223,10 +1223,7 @@ labelSelector:"!openshift.io/deployment-config.name"
} }
}); });
}, listStandaloneReplicaSets = function(context) { }, listStandaloneReplicaSets = function(context) {
return DataService.list({ return DataService.list(replicaSetsVersion, context, null, {
group:"extensions",
resource:"replicasets"
}, context, null, {
http:{ http:{
params:{ params:{
labelSelector:"!pod-template-hash" labelSelector:"!pod-template-hash"
...@@ -1235,13 +1232,7 @@ labelSelector:"!pod-template-hash" ...@@ -1235,13 +1232,7 @@ labelSelector:"!pod-template-hash"
}); });
}, getApplications = function(context) { }, getApplications = function(context) {
var deferred = $q.defer(), promises = []; var deferred = $q.defer(), promises = [];
return promises.push(DataService.list("deploymentconfigs", context)), promises.push(listStandaloneReplicationControllers(context)), promises.push(DataService.list({ return promises.push(DataService.list(deploymentConfigsVersion, context)), promises.push(listStandaloneReplicationControllers(context)), promises.push(DataService.list(deploymentsVersion, context)), promises.push(listStandaloneReplicaSets(context)), promises.push(DataService.list(statefulSetsVersion, context)), $q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) {
group:"apps",
resource:"deployments"
}, context)), promises.push(listStandaloneReplicaSets(context)), promises.push(DataService.list({
group:"apps",
resource:"statefulsets"
}, context)), $q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) {
var deploymentConfigs = _.toArray(deploymentConfigData.by("metadata.name")), replicationControllers = _.toArray(replicationControllerData.by("metadata.name")), deployments = _.toArray(deploymentData.by("metadata.name")), replicaSets = _.toArray(replicaSetData.by("metadata.name")), statefulSets = _.toArray(statefulSetData.by("metadata.name")), apiObjects = deploymentConfigs.concat(deployments).concat(replicationControllers).concat(replicaSets).concat(statefulSets); var deploymentConfigs = _.toArray(deploymentConfigData.by("metadata.name")), replicationControllers = _.toArray(replicationControllerData.by("metadata.name")), deployments = _.toArray(deploymentData.by("metadata.name")), replicaSets = _.toArray(replicaSetData.by("metadata.name")), statefulSets = _.toArray(statefulSetData.by("metadata.name")), apiObjects = deploymentConfigs.concat(deployments).concat(replicationControllers).concat(replicaSets).concat(statefulSets);
deferred.resolve(_.sortBy(apiObjects, [ "metadata.name", "kind" ])); deferred.resolve(_.sortBy(apiObjects, [ "metadata.name", "kind" ]));
}), function(e) { }), function(e) {
......
src/services/applicationsService.js
'use strict'; 'use strict';
angular.module("openshiftCommonServices"). angular.module("openshiftCommonServices").
service("ApplicationsService", function($q, DataService) { service("ApplicationsService", function(
$q,
APIService,
DataService) {
var deploymentsVersion = APIService.getPreferredVersion('deployments');
var deploymentConfigsVersion = APIService.getPreferredVersion('deploymentconfigs');
var replicationControllersVersion = APIService.getPreferredVersion('replicationcontrollers');
var replicaSetsVersion = APIService.getPreferredVersion('replicasets');
var statefulSetsVersion = APIService.getPreferredVersion('statefulsets');
// List replication controllers in a namespace that are NOT managed by a // List replication controllers in a namespace that are NOT managed by a
// deployment config. Note: This will not return replication controllers that // deployment config. Note: This will not return replication controllers that
// have been orphaned by `oc delete dc/foo --cascade=false`. // have been orphaned by `oc delete dc/foo --cascade=false`.
var listStandaloneReplicationControllers = function(context) { var listStandaloneReplicationControllers = function(context) {
return DataService.list('replicationcontrollers', context, null, { return DataService.list(replicationControllersVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `openshift.io/deployment-config-name` // If the replica set has a `openshift.io/deployment-config-name`
...@@ -22,7 +31,7 @@ service("ApplicationsService", function($q, DataService) { ...@@ -22,7 +31,7 @@ service("ApplicationsService", function($q, DataService) {
// Note: This will not return replica sets that have been orphaned by // Note: This will not return replica sets that have been orphaned by
// `oc delete deployment/foo --cascade=false`. // `oc delete deployment/foo --cascade=false`.
var listStandaloneReplicaSets = function(context) { var listStandaloneReplicaSets = function(context) {
return DataService.list({group: 'extensions', resource: 'replicasets'}, context, null, { return DataService.list(replicaSetsVersion, context, null, {
http: { http: {
params: { params: {
// If the replica set has a `pod-template-hash` label, it's managed // If the replica set has a `pod-template-hash` label, it's managed
...@@ -38,11 +47,11 @@ service("ApplicationsService", function($q, DataService) { ...@@ -38,11 +47,11 @@ service("ApplicationsService", function($q, DataService) {
var promises = []; var promises = [];
// Load all the "application" types // Load all the "application" types
promises.push(DataService.list('deploymentconfigs', context)); promises.push(DataService.list(deploymentConfigsVersion, context));
promises.push(listStandaloneReplicationControllers(context)); promises.push(listStandaloneReplicationControllers(context));
promises.push(DataService.list({group: 'apps', resource: 'deployments'}, context)); promises.push(DataService.list(deploymentsVersion, context));
promises.push(listStandaloneReplicaSets(context)); promises.push(listStandaloneReplicaSets(context));
promises.push(DataService.list({group: 'apps', resource: 'statefulsets'}, context)); promises.push(DataService.list(statefulSetsVersion, context));
$q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) { $q.all(promises).then(_.spread(function(deploymentConfigData, replicationControllerData, deploymentData, replicaSetData, statefulSetData) {
var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name')); var deploymentConfigs = _.toArray(deploymentConfigData.by('metadata.name'));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment