commit ee78862d71b818cffb15b30086fdc707490293c4
author Yoshie Muranaka <yoshiemuranaka@gmail.com> Wed Oct 02 07:30:16 2019 -0700
committer Gunnar Mills <gmills@us.ibm.com> Tue Oct 08 16:01:51 2019 +0000
tree e52abba1f39ee4e381facd72e50d6fd9e2d2b3bb
parent bea45d53e945828151e4a9c5512c1b6617eea008

Add searchable properties to event log filter

The current event log search doesn't match inputs like
the event id, severity or priority.
This commit will add additional searchable log properties
to the search filter so users can enter search terms like
'High' or 'Error' or other visible keywords.

Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I569112468a9f97034449799f407137f1651cec16

app/common/services/api-utils.js

diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 2b3cac9..23355e1 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -886,18 +886,12 @@
                                   content.data[key].AdditionalData.join('\n'),
                               type: content.data[key].Message,
                               selected: false,
-                              search_text:
-                                  ('#' + content.data[key].Id + ' ' +
-                                   severityCode + ' ' +
-                                   content.data[key].Message + ' ' +
-                                   content.data[key].Severity + ' ' +
-                                   content.data[key].AdditionalData.join(' '))
-                                      .toLowerCase(),
                               meta: false,
                               confirm: false,
                               related_items: relatedItems,
                               eventID: eventID,
                               description: description,
+                              logId: '#' + content.data[key].Id,
                               data: {key: key, value: content.data[key]}
                             },
                             content.data[key]));

app/server-health/controllers/log-controller.js

diff --git a/app/server-health/controllers/log-controller.js b/app/server-health/controllers/log-controller.js
index ae873fb..f55f666 100644
--- a/app/server-health/controllers/log-controller.js
+++ b/app/server-health/controllers/log-controller.js
@@ -110,22 +110,34 @@
           };
 
           $scope.filterBySearchTerms = function(log) {
-            if (!$scope.searchItems.length) return true;
+            const searchableProperties = [
+              'eventID', 'severity_code', 'description', 'priority',
+              'additional_data', 'type', 'logId'
+            ];
+            let matched = false;
 
-            for (var i = 0, length = $scope.searchItems.length; i < length;
-                 i++) {
-              if (log.search_text.indexOf(
-                      $scope.searchItems[i].toLowerCase()) == -1)
-                return false;
+            if (!$scope.searchItems.length) return true;
+            for (const searchTerm of $scope.searchItems) {
+              if (matched) {
+                break;
+              }
+              for (const prop of searchableProperties) {
+                const propVal = log[prop];
+                if (propVal &&
+                    propVal.toLowerCase().indexOf(searchTerm) !== -1) {
+                  matched = true;
+                  break;
+                }
+              }
             }
-            return true;
+            return matched;
           };
 
           $scope.addSearchItem = function(searchTerms) {
             var terms = searchTerms.split(' ');
             terms.forEach(function(searchTerm) {
               if ($scope.searchItems.indexOf(searchTerm) == -1) {
-                $scope.searchItems.push(searchTerm);
+                $scope.searchItems.push(searchTerm.toLowerCase());
               }
             });
           };