From 1cb92713ce3e2c75903bd06c9fbe7b1876fabbfc Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 21 Nov 2019 20:19:18 +0100
Subject: [PATCH] start-up visualizer: last month clustered chart - show only
 last 4 weeks

GitOrigin-RevId: eb4536867c663d1069077440415b39c49c499103
---
 .../aggregatedStats/ClusteredChartComponent.vue  | 16 ++++++++++------
 .../src/aggregatedStats/model.ts                 |  5 +++--
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/platform/built-in-server/start-up-visualizer/src/aggregatedStats/ClusteredChartComponent.vue b/platform/built-in-server/start-up-visualizer/src/aggregatedStats/ClusteredChartComponent.vue
index de4e4c2a3497..649061029711 100644
--- a/platform/built-in-server/start-up-visualizer/src/aggregatedStats/ClusteredChartComponent.vue
+++ b/platform/built-in-server/start-up-visualizer/src/aggregatedStats/ClusteredChartComponent.vue
@@ -6,7 +6,7 @@
 <script lang="ts">
   import {Component, Prop, Watch} from "vue-property-decorator"
   import {loadJson} from "@/httpUtil"
-  import {DataQuery, DataRequest, expandMachineAsFilterValue} from "@/aggregatedStats/model"
+  import {DataQuery, DataRequest, expandMachineAsFilterValue, GroupedMetricResponse} from "@/aggregatedStats/model"
   import {ClusteredChartManager} from "@/aggregatedStats/ClusteredChartManager"
   import {BaseStatChartComponent} from "@/aggregatedStats/BaseStatChartComponent"
   import {DEFAULT_AGGREGATION_OPERATOR} from "@/aggregatedStats/ChartSettings"
@@ -36,11 +36,12 @@
         aggregator = `quantileTDigest(${chartSettings.quantile / 100})`
       }
 
+      // server will cache request, so, `now` here can lead to cached response, but it is ok because data collected each several hours, so, cache cleared in any case
       const dataQuery: DataQuery = {
         fields: this.metrics,
         aggregator,
         dimensions: [
-          {name: "t", sql: this.timeRange === "lastMonth" ? "toStartOfWeek(generated_time, 1)" : "toStartOfMonth(generated_time)"}
+          {name: "t", sql: `toStartOfInterval(generated_time, interval 1 ${this.timeRange === "lastMonth" ? "week" : "month"}, '${Intl.DateTimeFormat().resolvedOptions().timeZone}')`}
         ],
         // do not use "Jan 06" because not clear - 06 here it is month or year
         timeDimensionFormat: this.timeRange === "lastMonth" ? "02 Jan" : "Jan",
@@ -55,9 +56,7 @@
       }
 
       if (this.timeRange === "lastMonth") {
-        const startDate = new Date()
-        startDate.setMonth(startDate.getMonth() - 1)
-        dataQuery.filters!!.push({field: "generated_time", value: Math.round(startDate.getTime() / 1000), operator: ">"})
+        dataQuery.filters!!.push({field: "generated_time", sql: "> subtractMonths(now(), 1)"})
       }
 
       const url = `${chartSettings.serverUrl}/api/v1/groupedMetrics/` + encodeURIComponent(JSON.stringify(dataQuery))
@@ -71,11 +70,16 @@
       const dataRequestCounter = this.dataRequestCounter
       this.queue.add(() => {
         loadJson(url, null, this.$notify)
-          .then(data => {
+          .then((data: GroupedMetricResponse | null) => {
             if (data == null || dataRequestCounter !== this.dataRequestCounter) {
               return
             }
 
+            // we want to show only last 4 weeks, but due to rounding, db can return to us 5 (since we round to start of week)
+            if (this.timeRange === "lastMonth" && data.groupNames.length > 4) {
+              data.groupNames = data.groupNames.slice(data.groupNames.length - 4)
+            }
+
             const chartManager = this.getOrCreateChartManager()
             chartManager.render(data)
           })
diff --git a/platform/built-in-server/start-up-visualizer/src/aggregatedStats/model.ts b/platform/built-in-server/start-up-visualizer/src/aggregatedStats/model.ts
index 7210ace5ad78..7f94147d4c76 100644
--- a/platform/built-in-server/start-up-visualizer/src/aggregatedStats/model.ts
+++ b/platform/built-in-server/start-up-visualizer/src/aggregatedStats/model.ts
@@ -19,7 +19,7 @@ export interface Machine {
 }
 
 export interface GroupedMetricResponse {
-  readonly groupNames: Array<string>
+  groupNames: Array<string>
   readonly data: Array<{ [key: string]: Array<string | number>; }>
 }
 
@@ -40,7 +40,8 @@ export interface DataQuery {
 
 export interface DataQueryFilter {
   field: string
-  value: number | string | Array<string>
+  value?: number | string | Array<string>
+  sql?: string
   operator?: ">"
 }