From 8f8613db99c26f639f011e672fc11e23257375e5 Mon Sep 17 00:00:00 2001
From: Vladyslav_Prykhodko <vprykhodko@thingsboard.io>
Date: Tue, 16 Mar 2021 14:55:56 +0200
Subject: [PATCH] UI: Refactoring; Add current hour

---
 .../time/quick-time-interval.component.ts     |  2 +-
 .../src/app/shared/models/time/time.models.ts | 38 ++++++++++++-------
 .../assets/locale/locale.constant-en_US.json  |  5 ++-
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts
index c6e0808d6a..3eab8c428d 100644
--- a/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts
+++ b/ui-ngx/src/app/shared/components/time/quick-time-interval.component.ts
@@ -50,7 +50,7 @@ export class QuickTimeIntervalComponent implements OnInit, ControlValueAccessor
 
   get intervals() {
     if (this.onlyCurrentInterval) {
-      return this.allIntervals.filter(interval => interval.startsWith('TODAY') || interval.startsWith('CURRENT_'));
+      return this.allIntervals.filter(interval => interval.startsWith('CURRENT_'));
     }
     return this.allIntervals;
   }
diff --git a/ui-ngx/src/app/shared/models/time/time.models.ts b/ui-ngx/src/app/shared/models/time/time.models.ts
index bed6d6238d..dd057eba03 100644
--- a/ui-ngx/src/app/shared/models/time/time.models.ts
+++ b/ui-ngx/src/app/shared/models/time/time.models.ts
@@ -131,8 +131,9 @@ export enum QuickTimeInterval {
   PREVIOUS_WEEK = 'PREVIOUS_WEEK',
   PREVIOUS_MONTH = 'PREVIOUS_MONTH',
   PREVIOUS_YEAR = 'PREVIOUS_YEAR',
-  TODAY = 'TODAY',
-  TODAY_SO_FAR = 'TODAY_SO_FAR',
+  CURRENT_HOUR = 'CURRENT_HOUR',
+  CURRENT_DAY = 'CURRENT_DAY',
+  CURRENT_DAY_SO_FAR = 'CURRENT_DAY_SO_FAR',
   CURRENT_WEEK = 'CURRENT_WEEK',
   CURRENT_WEEK_SO_FAR = 'CURRENT_WEEK_SO_WAR',
   CURRENT_MONTH = 'CURRENT_MONTH',
@@ -148,8 +149,9 @@ export const QuickTimeIntervalTranslationMap = new Map<QuickTimeInterval, string
   [QuickTimeInterval.PREVIOUS_WEEK, 'timeinterval.predefined.previous-week'],
   [QuickTimeInterval.PREVIOUS_MONTH, 'timeinterval.predefined.previous-month'],
   [QuickTimeInterval.PREVIOUS_YEAR, 'timeinterval.predefined.previous-year'],
-  [QuickTimeInterval.TODAY, 'timeinterval.predefined.today'],
-  [QuickTimeInterval.TODAY_SO_FAR, 'timeinterval.predefined.today-so-far'],
+  [QuickTimeInterval.CURRENT_HOUR, 'timeinterval.predefined.current-hour'],
+  [QuickTimeInterval.CURRENT_DAY, 'timeinterval.predefined.current-day'],
+  [QuickTimeInterval.CURRENT_DAY_SO_FAR, 'timeinterval.predefined.current-day-so-far'],
   [QuickTimeInterval.CURRENT_WEEK, 'timeinterval.predefined.current-week'],
   [QuickTimeInterval.CURRENT_WEEK_SO_FAR, 'timeinterval.predefined.current-week-so-far'],
   [QuickTimeInterval.CURRENT_MONTH, 'timeinterval.predefined.current-month'],
@@ -181,7 +183,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow {
       realtimeType: RealtimeWindowType.LAST_INTERVAL,
       interval: SECOND,
       timewindowMs: MINUTE,
-      quickInterval: QuickTimeInterval.TODAY
+      quickInterval: QuickTimeInterval.CURRENT_DAY
     },
     history: {
       historyType: HistoryWindowType.LAST_INTERVAL,
@@ -191,7 +193,7 @@ export function defaultTimewindow(timeService: TimeService): Timewindow {
         startTimeMs: currentTime - DAY,
         endTimeMs: currentTime
       },
-      quickInterval: QuickTimeInterval.TODAY
+      quickInterval: QuickTimeInterval.CURRENT_DAY
     },
     aggregation: {
       type: AggregationType.AVG,
@@ -405,8 +407,10 @@ export function createSubscriptionTimewindow(timewindow: Timewindow, stDiff: num
 function getSubscriptionRealtimeWindowFromTimeInterval(interval: QuickTimeInterval): number {
   const currentDate = moment();
   switch (interval) {
-    case QuickTimeInterval.TODAY:
-    case QuickTimeInterval.TODAY_SO_FAR:
+    case QuickTimeInterval.CURRENT_HOUR:
+      return currentDate.diff(currentDate.clone().startOf('hour'))
+    case QuickTimeInterval.CURRENT_DAY:
+    case QuickTimeInterval.CURRENT_DAY_SO_FAR:
       return currentDate.diff(currentDate.clone().startOf('day'));
     case QuickTimeInterval.CURRENT_WEEK:
     case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
@@ -441,7 +445,9 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0,
     case QuickTimeInterval.PREVIOUS_YEAR:
       currentDate.subtract(1, 'years');
       return currentDate.endOf('year').valueOf();
-    case QuickTimeInterval.TODAY:
+    case QuickTimeInterval.CURRENT_HOUR:
+      return currentDate.endOf('hour').valueOf();
+    case QuickTimeInterval.CURRENT_DAY:
       return currentDate.endOf('day').valueOf();
     case QuickTimeInterval.CURRENT_WEEK:
       return currentDate.endOf('week').valueOf();
@@ -449,7 +455,7 @@ export function calculateIntervalEndTime(interval: QuickTimeInterval, endTs = 0,
       return currentDate.endOf('month').valueOf();
     case QuickTimeInterval.CURRENT_YEAR:
       return currentDate.endOf('year').valueOf();
-    case QuickTimeInterval.TODAY_SO_FAR:
+    case QuickTimeInterval.CURRENT_DAY_SO_FAR:
     case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
     case QuickTimeInterval.CURRENT_MONTH_SO_FAR:
     case QuickTimeInterval.CURRENT_YEAR_SO_FAR:
@@ -480,8 +486,10 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS
     case QuickTimeInterval.PREVIOUS_YEAR:
       currentDate.subtract(1, 'years');
       return  currentDate.startOf('year').valueOf();
-    case QuickTimeInterval.TODAY:
-    case QuickTimeInterval.TODAY_SO_FAR:
+    case QuickTimeInterval.CURRENT_HOUR:
+      return currentDate.startOf('hour').valueOf();
+    case QuickTimeInterval.CURRENT_DAY:
+    case QuickTimeInterval.CURRENT_DAY_SO_FAR:
       return currentDate.startOf('day').valueOf();
     case QuickTimeInterval.CURRENT_WEEK:
     case QuickTimeInterval.CURRENT_WEEK_SO_FAR:
@@ -499,11 +507,13 @@ export function calculateIntervalStartTime(interval: QuickTimeInterval, startTS
 
 export function quickTimeIntervalPeriod(interval: QuickTimeInterval): number {
   switch (interval) {
+    case QuickTimeInterval.CURRENT_HOUR:
+      return HOUR;
     case QuickTimeInterval.YESTERDAY:
     case QuickTimeInterval.DAY_BEFORE_YESTERDAY:
     case QuickTimeInterval.THIS_DAY_LAST_WEEK:
-    case QuickTimeInterval.TODAY:
-    case QuickTimeInterval.TODAY_SO_FAR:
+    case QuickTimeInterval.CURRENT_DAY:
+    case QuickTimeInterval.CURRENT_DAY_SO_FAR:
       return DAY;
     case QuickTimeInterval.PREVIOUS_WEEK:
     case QuickTimeInterval.CURRENT_WEEK:
diff --git a/ui-ngx/src/assets/locale/locale.constant-en_US.json b/ui-ngx/src/assets/locale/locale.constant-en_US.json
index 7508dac060..342c17b21e 100644
--- a/ui-ngx/src/assets/locale/locale.constant-en_US.json
+++ b/ui-ngx/src/assets/locale/locale.constant-en_US.json
@@ -2119,8 +2119,9 @@
           "previous-week": "Previous week",
           "previous-month": "Previous month",
           "previous-year": "Previous year",
-          "today": "Today",
-          "today-so-far": "Today so far",
+          "current-hour": "Current hour",
+          "current-day": "Current day",
+          "current-day-so-far": "Current day so far",
           "current-week": "Current week",
           "current-week-so-far": "Current week so far",
           "current-month": "Current month",