Merge pull request #13 from celenium-io/CLS-207-change-histogram-queries

CLS-207 Change histogram queries

Author: xdeq

components/widgets/BlobsWidget.vue

@@ -9,7 +9,7 @@ import Tooltip from "@/components/ui/Tooltip.vue"
 import { formatBytes } from "@/services/utils"
 
 /** API */
-import { fetchHistogram } from "@/services/api/stats"
+import { fetchSeries } from "@/services/api/stats"
 
 const days = ref([])
 const weeks = ref([])
@@ -18,11 +18,9 @@ const totalSize = ref(0)
 const maxSize = ref(0)
 
 onMounted(async () => {
-	const data = await fetchHistogram({
-		table: "block_stats",
-		func: "sum",
+	const data = await fetchSeries({
+		table: "blobs_size",
 		period: "day",
-		column: "blobs_size",
 		from: parseInt(DateTime.now().minus({ days: 120 }).ts / 1_000),
 	})
 

components/widgets/TransactionsWidget.vue

@@ -9,7 +9,7 @@ import Tooltip from "@/components/ui/Tooltip.vue"
 import { comma, abbreviate } from "@/services/utils"
 
 /** API */
-import { fetchHistogram } from "@/services/api/stats"
+import { fetchSeries } from "@/services/api/stats"
 
 const histogram = ref([])
 
@@ -26,9 +26,8 @@ const max = ref(0)
 const roundedMax = ref(0)
 
 const getHistogram = async (sectorOffset) => {
-	const data = await fetchHistogram({
-		table: "tx",
-		func: "count",
+	const data = await fetchSeries({
+		table: "tx_count",
 		period: "hour",
 		from: parseInt(DateTime.now().minus({ hours: 24 - sectorOffset }).ts / 1_000),
 	})
@@ -45,7 +44,7 @@ const buildHistogram = async () => {
 	const currentHour = DateTime.now().hour
 	const currentSector = hoursMap.find((m) => m.includes(currentHour))
 	const currentHourIdx = currentSector.indexOf(currentHour)
-	const sectorOffset = 6 - currentHourIdx
+	const sectorOffset = 5 - currentHourIdx
 
 	await getHistogram(sectorOffset)
 
@@ -54,7 +53,6 @@ const buildHistogram = async () => {
 	let target = 0
 	while (items.length) {
 		if (sectors.value[target].length === 6) target += 1
-
 		sectors.value[target].push(items[0])
 
 		items.shift()
@@ -88,7 +86,7 @@ const getPercentageRatio = (v) => {
 }
 
 const getSectorName = (item) => {
-	return DateTime.fromISO(item.time).hour
+	return item.time ? DateTime.fromISO(item.time).hour : DateTime.now().hour
 }
 </script>
 

services/api/stats.js

@@ -1,14 +1,13 @@
 /** Services */
 import { useServerURL } from "@/services/config"
 
-export const fetchHistogram = async ({ table, func, period, column, from, to }) => {
+export const fetchSeries = async ({ table, period, column, from, to }) => {
 	try {
-		const url = new URL(`${useServerURL()}/stats/histogram/${table}/${func}/${period}`)
+		const url = new URL(`${useServerURL()}/stats/series/${table}/${period}`)
 
 		if (column) url.searchParams.append("column", column)
 		if (from) url.searchParams.append("from", from)
 		if (to) url.searchParams.append("to", to)
-
 		const data = await $fetch(url.href)
 		return data
 	} catch (error) {