From 2278a1761bf598e5207408d40fbe4d53e80c90cc Mon Sep 17 00:00:00 2001 From: Misiu Date: Fri, 2 Oct 2020 13:01:35 +0200 Subject: [PATCH 1/4] sort notifications ascending --- src/dialogs/notifications/notification-drawer.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js index 927af2f3a927..d0f05715db0b 100644 --- a/src/dialogs/notifications/notification-drawer.js +++ b/src/dialogs/notifications/notification-drawer.js @@ -139,7 +139,15 @@ export class HuiNotificationDrawer extends EventsMixin( .filter((entityId) => computeDomain(entityId) === "configurator") .map((entityId) => hass.states[entityId]); - return notificationsBackend.concat(configuratorEntities); + const notifications = notificationsBackend.concat(configuratorEntities); + + notifications.sort(function (n1, n2) { + if (n1.created_at > n2.created_at) return -1; + if (n1.created_at < n2.created_at) return 1; + return 0; + }); + + return notifications; } showDialog({ narrow }) { From e01bb28b7a3ccde4e395dd61e10ae6f14bfc5d5e Mon Sep 17 00:00:00 2001 From: Tomasz Date: Fri, 2 Oct 2020 14:32:49 +0200 Subject: [PATCH 2/4] Update src/dialogs/notifications/notification-drawer.js Co-authored-by: Bram Kragten --- src/dialogs/notifications/notification-drawer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js index d0f05715db0b..a1c270efc370 100644 --- a/src/dialogs/notifications/notification-drawer.js +++ b/src/dialogs/notifications/notification-drawer.js @@ -142,8 +142,8 @@ export class HuiNotificationDrawer extends EventsMixin( const notifications = notificationsBackend.concat(configuratorEntities); notifications.sort(function (n1, n2) { - if (n1.created_at > n2.created_at) return -1; - if (n1.created_at < n2.created_at) return 1; + if (n1.created_at > n2.created_at) { return -1; } + if (n1.created_at < n2.created_at) { return 1; } return 0; }); From 588a0290e6e1f8d5b3508db9c6e83bc90078733d Mon Sep 17 00:00:00 2001 From: Misiu Date: Fri, 2 Oct 2020 14:37:53 +0200 Subject: [PATCH 3/4] parse created_at as date --- src/dialogs/notifications/notification-drawer.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js index a1c270efc370..856779ca0551 100644 --- a/src/dialogs/notifications/notification-drawer.js +++ b/src/dialogs/notifications/notification-drawer.js @@ -142,8 +142,12 @@ export class HuiNotificationDrawer extends EventsMixin( const notifications = notificationsBackend.concat(configuratorEntities); notifications.sort(function (n1, n2) { - if (n1.created_at > n2.created_at) { return -1; } - if (n1.created_at < n2.created_at) { return 1; } + if (new Date(n1.created_at) > new Date(n2.created_at)) { + return -1; + } + if (new Date(n1.created_at) < new Date(n2.created_at)) { + return 1; + } return 0; }); From 182383f17d5d9e624d29fd3eb7052c958ef37d87 Mon Sep 17 00:00:00 2001 From: Misiu Date: Fri, 2 Oct 2020 15:36:59 +0200 Subject: [PATCH 4/4] parse date once --- src/dialogs/notifications/notification-drawer.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/dialogs/notifications/notification-drawer.js b/src/dialogs/notifications/notification-drawer.js index 856779ca0551..f92b8109ab59 100644 --- a/src/dialogs/notifications/notification-drawer.js +++ b/src/dialogs/notifications/notification-drawer.js @@ -142,12 +142,15 @@ export class HuiNotificationDrawer extends EventsMixin( const notifications = notificationsBackend.concat(configuratorEntities); notifications.sort(function (n1, n2) { - if (new Date(n1.created_at) > new Date(n2.created_at)) { - return -1; - } - if (new Date(n1.created_at) < new Date(n2.created_at)) { + const d1 = new Date(n1.created_at); + const d2 = new Date(n2.created_at); + + if (d1 < d2) { return 1; } + if (d1 > d2) { + return -1; + } return 0; });