Merge pull request #227 from jeff-phillips-18/filters

Add common filters for service instance values

dist/origin-web-common-ui.js

@@ -1816,6 +1816,45 @@ angular.module('openshiftCommonUI')
       return !!annotationFilter(deployment, 'deploymentConfig');
     };
   })
+  .filter('serviceClassDisplayName', function() {
+    return function(serviceClass) {
+      var serviceClassDisplayName = _.get(serviceClass, 'spec.externalMetadata.displayName');
+      if (serviceClassDisplayName) {
+        return serviceClassDisplayName;
+      }
+
+      var serviceClassExternalName = _.get(serviceClass, 'spec.externalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
+      }
+
+      return _.get(serviceClass, 'metadata.name');
+    };
+  })
+  .filter('serviceInstanceDisplayName', function(serviceClassDisplayNameFilter) {
+    return function(instance, serviceClass) {
+      if (serviceClass) {
+        return serviceClassDisplayNameFilter(serviceClass);
+      }
+
+      return _.get(instance, 'metadata.name');
+    };
+  })
+  .filter('serviceInstanceStatus', function(isServiceInstanceReadyFilter) {
+    return function(instance) {
+      var status = 'Pending';
+      var conditions = _.get(instance, 'status.conditions');
+      var instanceError = _.find(conditions, {type: 'Failed', status: 'True'});
+
+      if (instanceError) {
+        status = 'Failed';
+      } else if (isServiceInstanceReadyFilter(instance)) {
+        status = 'Ready';
+      }
+
+      return status;
+    };
+  })
 ;
 ;'use strict';
 angular.module('openshiftCommonUI')

dist/origin-web-common.js

@@ -2026,6 +2026,45 @@ angular.module('openshiftCommonUI')
       return !!annotationFilter(deployment, 'deploymentConfig');
     };
   }])
+  .filter('serviceClassDisplayName', function() {
+    return function(serviceClass) {
+      var serviceClassDisplayName = _.get(serviceClass, 'spec.externalMetadata.displayName');
+      if (serviceClassDisplayName) {
+        return serviceClassDisplayName;
+      }
+
+      var serviceClassExternalName = _.get(serviceClass, 'spec.externalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
+      }
+
+      return _.get(serviceClass, 'metadata.name');
+    };
+  })
+  .filter('serviceInstanceDisplayName', ["serviceClassDisplayNameFilter", function(serviceClassDisplayNameFilter) {
+    return function(instance, serviceClass) {
+      if (serviceClass) {
+        return serviceClassDisplayNameFilter(serviceClass);
+      }
+
+      return _.get(instance, 'metadata.name');
+    };
+  }])
+  .filter('serviceInstanceStatus', ["isServiceInstanceReadyFilter", function(isServiceInstanceReadyFilter) {
+    return function(instance) {
+      var status = 'Pending';
+      var conditions = _.get(instance, 'status.conditions');
+      var instanceError = _.find(conditions, {type: 'Failed', status: 'True'});
+
+      if (instanceError) {
+        status = 'Failed';
+      } else if (isServiceInstanceReadyFilter(instance)) {
+        status = 'Ready';
+      }
+
+      return status;
+    };
+  }])
 ;
 ;'use strict';
 angular.module('openshiftCommonUI')

dist/origin-web-common.min.js

@@ -913,6 +913,25 @@ return !!annotationFilter(object, "deployment.kubernetes.io/revision");
 return function(deployment) {
 return !!annotationFilter(deployment, "deploymentConfig");
 };
+} ]).filter("serviceClassDisplayName", function() {
+return function(serviceClass) {
+var serviceClassDisplayName = _.get(serviceClass, "spec.externalMetadata.displayName");
+if (serviceClassDisplayName) return serviceClassDisplayName;
+var serviceClassExternalName = _.get(serviceClass, "spec.externalName");
+return serviceClassExternalName ? serviceClassExternalName :_.get(serviceClass, "metadata.name");
+};
+}).filter("serviceInstanceDisplayName", [ "serviceClassDisplayNameFilter", function(serviceClassDisplayNameFilter) {
+return function(instance, serviceClass) {
+return serviceClass ? serviceClassDisplayNameFilter(serviceClass) :_.get(instance, "metadata.name");
+};
+} ]).filter("serviceInstanceStatus", [ "isServiceInstanceReadyFilter", function(isServiceInstanceReadyFilter) {
+return function(instance) {
+var status = "Pending", conditions = _.get(instance, "status.conditions"), instanceError = _.find(conditions, {
+type:"Failed",
+status:"True"
+});
+return instanceError ? status = "Failed" :isServiceInstanceReadyFilter(instance) && (status = "Ready"), status;
+};
 } ]), angular.module("openshiftCommonUI").filter("camelToLower", function() {
 return function(str) {
 return str ? _.startCase(str).toLowerCase() :str;

src/filters/resources.js

@@ -174,4 +174,43 @@ angular.module('openshiftCommonUI')
       return !!annotationFilter(deployment, 'deploymentConfig');
     };
   })
+  .filter('serviceClassDisplayName', function() {
+    return function(serviceClass) {
+      var serviceClassDisplayName = _.get(serviceClass, 'spec.externalMetadata.displayName');
+      if (serviceClassDisplayName) {
+        return serviceClassDisplayName;
+      }
+
+      var serviceClassExternalName = _.get(serviceClass, 'spec.externalName');
+      if (serviceClassExternalName) {
+        return serviceClassExternalName;
+      }
+
+      return _.get(serviceClass, 'metadata.name');
+    };
+  })
+  .filter('serviceInstanceDisplayName', function(serviceClassDisplayNameFilter) {
+    return function(instance, serviceClass) {
+      if (serviceClass) {
+        return serviceClassDisplayNameFilter(serviceClass);
+      }
+
+      return _.get(instance, 'metadata.name');
+    };
+  })
+  .filter('serviceInstanceStatus', function(isServiceInstanceReadyFilter) {
+    return function(instance) {
+      var status = 'Pending';
+      var conditions = _.get(instance, 'status.conditions');
+      var instanceError = _.find(conditions, {type: 'Failed', status: 'True'});
+
+      if (instanceError) {
+        status = 'Failed';
+      } else if (isServiceInstanceReadyFilter(instance)) {
+        status = 'Ready';
+      }
+
+      return status;
+    };
+  })
 ;