Merge pull request #268 from benjaminapetersen/trello/api-groups/apiService/groupVersion

Add toAPIVersion method to APIService

dist/origin-web-common-services.js

@@ -260,6 +260,14 @@ angular.module('openshiftCommonServices')
     return new ResourceGroupVersion(resource, group, version);
   };
 
+
+  var toAPIVersion = function(resourceGroupVersion) {
+    if (resourceGroupVersion.group) {
+      return resourceGroupVersion.group + '/' + resourceGroupVersion.version;
+    }
+    return resourceGroupVersion.version;
+  };
+
   // normalizeResource lowercases the first segment of the given resource. subresources can be case-sensitive.
   function normalizeResource(resource) {
     if (!resource) {
@@ -556,6 +564,8 @@ angular.module('openshiftCommonServices')
   };
 
   return {
+    toAPIVersion: toAPIVersion,
+
     toResourceGroupVersion: toResourceGroupVersion,
 
     parseGroupVersion: parseGroupVersion,

dist/origin-web-common.js

@@ -2295,6 +2295,14 @@ angular.module('openshiftCommonServices')
     return new ResourceGroupVersion(resource, group, version);
   };
 
+
+  var toAPIVersion = function(resourceGroupVersion) {
+    if (resourceGroupVersion.group) {
+      return resourceGroupVersion.group + '/' + resourceGroupVersion.version;
+    }
+    return resourceGroupVersion.version;
+  };
+
   // normalizeResource lowercases the first segment of the given resource. subresources can be case-sensitive.
   function normalizeResource(resource) {
     if (!resource) {
@@ -2591,6 +2599,8 @@ angular.module('openshiftCommonServices')
   };
 
   return {
+    toAPIVersion: toAPIVersion,
+
     toResourceGroupVersion: toResourceGroupVersion,
 
     parseGroupVersion: parseGroupVersion,

dist/origin-web-common.min.js

@@ -1077,6 +1077,8 @@ extensions:"v1beta1"
 if (r instanceof ResourceGroupVersion) return r;
 var resource, group, version;
 return angular.isString(r) ? (resource = normalizeResource(r), group = "", version = defaultVersion[group]) :r && r.resource && (resource = normalizeResource(r.resource), group = r.group || "", version = r.version || defaultVersion[group] || _.get(APIS_CFG, [ "groups", group, "preferredVersion" ])), new ResourceGroupVersion(resource, group, version);
+}, toAPIVersion = function(resourceGroupVersion) {
+return resourceGroupVersion.group ? resourceGroupVersion.group + "/" + resourceGroupVersion.version :resourceGroupVersion.version;
 }, parseGroupVersion = function(apiVersion) {
 if (!apiVersion) return void 0;
 var parts = apiVersion.split("/");
@@ -1201,6 +1203,7 @@ var preferred = API_PREFERRED_VERSIONS[resource];
 return preferred || Logger.log("No preferred version for ", resource), preferred;
 };
 return {
+toAPIVersion:toAPIVersion,
 toResourceGroupVersion:toResourceGroupVersion,
 parseGroupVersion:parseGroupVersion,
 objectToResourceGroupVersion:objectToResourceGroupVersion,

src/services/apiService.js

@@ -82,6 +82,14 @@ angular.module('openshiftCommonServices')
     return new ResourceGroupVersion(resource, group, version);
   };
 
+
+  var toAPIVersion = function(resourceGroupVersion) {
+    if (resourceGroupVersion.group) {
+      return resourceGroupVersion.group + '/' + resourceGroupVersion.version;
+    }
+    return resourceGroupVersion.version;
+  };
+
   // normalizeResource lowercases the first segment of the given resource. subresources can be case-sensitive.
   function normalizeResource(resource) {
     if (!resource) {
@@ -378,6 +386,8 @@ angular.module('openshiftCommonServices')
   };
 
   return {
+    toAPIVersion: toAPIVersion,
+
     toResourceGroupVersion: toResourceGroupVersion,
 
     parseGroupVersion: parseGroupVersion,