Bug 1449038 - Add a simple weighted search to KeywordService

https://trello.com/c/2fFSJMX1
https://bugzilla.redhat.com/show_bug.cgi?id=1449038

Author: spadgett

dist/origin-web-common-services.js

@@ -2932,7 +2932,9 @@ angular.module('openshiftCommonServices')
 ;'use strict';
 
 angular.module("openshiftCommonServices")
-  .service("KeywordService", function(){
+  .service("KeywordService", function($filter) {
+
+    var displayName = $filter('displayName');
 
     var generateKeywords = function(filterText) {
       if (!filterText) {
@@ -2977,8 +2979,52 @@ angular.module("openshiftCommonServices")
       return filteredObjects;
     };
 
+    // Perform a simple weighted search.
+    // weightedSearch is like filterForKeywords, except each field has a weight
+    // and the result is a sorted array of matches. filterFields is an array of
+    // objects with keys `path` and `weight`.
+    var weightedSearch = function(objects, filterFields, keywords) {
+      if (_.isEmpty(keywords)) {
+        return [];
+      }
+
+      var results = [];
+      _.each(objects, function(object) {
+        // Keep a score for matches, weighted by field.
+        var score = 0;
+        // Track whether we've matched all keywords.
+        var matchesKeyword = _.fill(Array(keywords.length), false);
+        _.each(filterFields, function(field) {
+          var value = _.get(object, field.path);
+          if (!value) {
+            return;
+          }
+
+          // For each matching keyword, add the field weight to the score.
+          _.each(keywords, function(regex, i) {
+            if (regex.test(value)) {
+              score += field.weight;
+              matchesKeyword[i] = true;
+            }
+          });
+        });
+
+        if (score > 0 && _.every(matchesKeyword)) {
+          results.push({
+            object: object,
+            score: score
+          });
+        }
+      });
+
+      // Sort first by score, then by display name for items that have the same score.
+      var orderedResult = _.orderBy(results, ['score', displayName], ['desc', 'asc']);
+      return _.map(orderedResult, 'object');
+    };
+
     return {
       filterForKeywords: filterForKeywords,
+      weightedSearch: weightedSearch,
       generateKeywords: generateKeywords
     };
   });

dist/origin-web-common.js

@@ -5000,7 +5000,9 @@ angular.module('openshiftCommonServices')
 ;'use strict';
 
 angular.module("openshiftCommonServices")
-  .service("KeywordService", function(){
+  .service("KeywordService", ["$filter", function($filter) {
+
+    var displayName = $filter('displayName');
 
     var generateKeywords = function(filterText) {
       if (!filterText) {
@@ -5045,11 +5047,55 @@ angular.module("openshiftCommonServices")
       return filteredObjects;
     };
 
+    // Perform a simple weighted search.
+    // weightedSearch is like filterForKeywords, except each field has a weight
+    // and the result is a sorted array of matches. filterFields is an array of
+    // objects with keys `path` and `weight`.
+    var weightedSearch = function(objects, filterFields, keywords) {
+      if (_.isEmpty(keywords)) {
+        return [];
+      }
+
+      var results = [];
+      _.each(objects, function(object) {
+        // Keep a score for matches, weighted by field.
+        var score = 0;
+        // Track whether we've matched all keywords.
+        var matchesKeyword = _.fill(Array(keywords.length), false);
+        _.each(filterFields, function(field) {
+          var value = _.get(object, field.path);
+          if (!value) {
+            return;
+          }
+
+          // For each matching keyword, add the field weight to the score.
+          _.each(keywords, function(regex, i) {
+            if (regex.test(value)) {
+              score += field.weight;
+              matchesKeyword[i] = true;
+            }
+          });
+        });
+
+        if (score > 0 && _.every(matchesKeyword)) {
+          results.push({
+            object: object,
+            score: score
+          });
+        }
+      });
+
+      // Sort first by score, then by display name for items that have the same score.
+      var orderedResult = _.orderBy(results, ['score', displayName], ['desc', 'asc']);
+      return _.map(orderedResult, 'object');
+    };
+
     return {
       filterForKeywords: filterForKeywords,
+      weightedSearch: weightedSearch,
       generateKeywords: generateKeywords
     };
-  });
+  }]);
 ;'use strict';
 
 angular.module('openshiftCommonServices')