Fix Log Sorting
Makes the severity of the log first priority and then logs are sorted
based on latest i.e. ID
Resolves openbmc/phosphor-webui#27
Change-Id: I7a9009957e3356e9a743ed0785e9462c944c5f56
Signed-off-by: Ryan Arnell <iffy.ryan@ibm.com>
diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js
index 759d12c..140e2fb 100644
--- a/app/common/services/api-utils.js
+++ b/app/common/services/api-utils.js
@@ -766,6 +766,12 @@
priority: priority,
severity_code: severityCode,
severity_flags: severityFlags,
+ // simple order value to make front-end sorting
+ // easier to implement with orderBy
+ severity_order:
+ ((severityFlags.high) ?
+ 3 :
+ ((severityFlags.medium) ? 2 : 1)),
additional_data:
content.data[key].AdditionalData.join('\n'),
type: content.data[key].Message,
diff --git a/app/server-health/controllers/log-controller.html b/app/server-health/controllers/log-controller.html
index 7aadc11..e017c67 100644
--- a/app/server-health/controllers/log-controller.html
+++ b/app/server-health/controllers/log-controller.html
@@ -60,7 +60,7 @@
</div>
</div>
<log-event
- dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms | orderBy:'-Id'))| itemsPerPage: itemsPerPage"
+ dir-paginate="event in (filteredLogs = (logs|filter:filterBySeverity|filter:filterByStatus|filter:filterByDate|filter:filterBySearchTerms | orderBy:['-severity_order', '-Id']))| itemsPerPage: itemsPerPage"
event="event"
tmz="tmz"
multi-selected="selectedEvents.length > 1"