Merge pull request #13 from metrico/main

Update dev branch with last metrico repo changes Refs: - [metrico#455](metrico#455) - [metrico#456](metrico#456)
gigapipehq · Jul 22, 2024 · 76a0a89 · 76a0a89
2 parents 56c8090 + 31093d0
commit 76a0a89
Show file tree

Hide file tree

Showing 30 changed files with 803 additions and 427 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "qryn-view",
-  "version": "3.2.11",
+  "version": "3.3.0",
   "description": "Data Explorer UI for qryn",
   "repository": {
     "type": "git",

diff --git a/packages/main/package.json b/packages/main/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@ui/main",
   "private": true,
-  "version": "3.2.11",
+  "version": "3.3.0",
   "type": "module",
   "scripts": {
     "dev": "VITE_APP_VERSION=$npm_package_version vite",

diff --git a/packages/main/qrynui/Table/models/tableModels.tsx b/packages/main/qrynui/Table/models/tableModels.tsx
@@ -12,7 +12,6 @@ import {
     RankingInfo,
 } from "@tanstack/match-sorter-utils";
 
-
 export const fuzzyFilter: FilterFn<any> = (row, columnId, value, addMeta) => {
     // Rank the item
     const itemRank = rankItem(row.getValue(columnId), value);
@@ -49,24 +48,22 @@ export const defaultColumn: Partial<ColumnDef<any>> = {
     cell: (info: any) => info.getValue(),
 };
 
-
 export const getTableMeta = (
     setData: React.Dispatch<React.SetStateAction<any[]>>,
     skipAutoResetPageIndex: () => void
-) =>
-    ({
-        updateData: (rowIndex, columnId, value) => {
-            // Skip age index reset until after next rerender
-            skipAutoResetPageIndex();
-            setData((old) =>
-                old.map((row, index) => {
-                    if (index !== rowIndex) return row;
+): TableMeta => ({
+    updateData: (rowIndex, columnId, value) => {
+        // Skip age index reset until after next rerender
+        skipAutoResetPageIndex();
+        setData((old) =>
+            old.map((row, index) => {
+                if (index !== rowIndex) return row;
 
-                    return {
-                        ...old[rowIndex]!,
-                        [columnId]: value,
-                    };
-                })
-            );
-        },
-    } as TableMeta);
+                return {
+                    ...old[rowIndex]!,
+                    [columnId]: value,
+                };
+            })
+        );
+    },
+});
diff --git a/...nts/DataViews/components/Charts/index.tsx → ...DataViews/components/Charts/QrynChart.tsx b/...nts/DataViews/components/Charts/index.tsx → ...DataViews/components/Charts/QrynChart.tsx
@@ -9,7 +9,7 @@ import "react-flot/flot-override/jquery.flot.resize";
 import "react-flot/flot/jquery.flot.stack.min.js";
 //React
 import { useState, useEffect, useRef, useMemo } from "react";
-import { useDispatch} from "react-redux";
+import { useDispatch } from "react-redux";
 //Packages
 import moment from "moment";
 import { format } from "date-fns";
@@ -37,14 +37,43 @@ import UseTooltip from "./UseTooltip";
 import { useChartOptions, useMatrixData } from "./hooks";
 import { FlotChart } from "./FlotChart";
 import useTheme from "@ui/theme/useTheme";
-
-
-export default function QrynChart(props: any): any {
+import { type QueryType } from "@ui/store/actions/types";
+
+export type ActualQuery = {
+    id: string;
+    expr: string;
+    dataSourceType: string;
+    queryType: QueryType;
+    limit: number;
+    panel: any;
+    isLogsVolume: boolean;
+    start: any;
+    stop: any;
+};
+
+export type QrynChartProps = {
+    matrixData?: any;
+    actualQuery?: ActualQuery;
+    type?: string;
+    tWidth?: any;
+    vHeight?: any;
+};
+
+export default function QrynChart(props: QrynChartProps) {
     const { matrixData, actualQuery, type } = props;
     const { tWidth } = props;
 
-    const { expr, dataSourceType, queryType, limit, panel, id, isLogsVolume } =
-        actualQuery;
+    const {
+        expr,
+        dataSourceType,
+        queryType,
+        limit,
+        panel,
+        id,
+        isLogsVolume,
+        start,
+        stop,
+    } = actualQuery;
 
     const chartRef = useRef(null);
 
@@ -59,6 +88,7 @@ export default function QrynChart(props: any): any {
         matrixData,
         isLogsVolume && type === "stream"
     );
+
     const dispatch: any = useDispatch();
 
     const [isSpliced, setIsSpliced] = useState(true);
@@ -78,17 +108,9 @@ export default function QrynChart(props: any): any {
     const [chartOptions, setChartOptions] = useState(chartOpts);
 
     const getInitialChartType = useMemo(() => {
+        if (isLogsVolume && type === "stream") return "bar";
         let localType = getTypeFromLocal();
-        if (isLogsVolume && type === "stream") {
-            return "bar";
-        } else {
-            if (localType !== "") {
-                return localType;
-            } else {
-                return "line";
-            }
-        }
-
+        return localType ?? "line"
     }, [isLogsVolume]);
 
     const [chartType, setChartType] = useState(getInitialChartType);
@@ -100,7 +122,17 @@ export default function QrynChart(props: any): any {
         }
 
         const chartSeries = setChartTypeSeries(type, barWidth);
-        const { timeformat, min, max } = formatDateRange(data);
+
+        const startDate = new Date(start).getTime() * 1000;
+
+        const stopDate = new Date(stop).getTime() * 1000;
+
+        const { timeformat, min, max } = formatDateRange(
+            data,
+            startDate,
+            stopDate
+        );
+
         return $q.plot(
             element,
             data,
@@ -113,7 +145,9 @@ export default function QrynChart(props: any): any {
 
     function onSetChartType(type: any) {
         const element = $q(chartRef.current);
+
         const data = isSpliced ? chartData : allData;
+
         const newData = getNewData(data, type);
 
         try {
@@ -134,9 +168,10 @@ export default function QrynChart(props: any): any {
         event.preventDefault();
 
         let newData = [];
-        const lSelected =
+        const labels_selected =
             JSON.parse(localStorage.getItem("labelsSelected") || "null") || [];
-        if (lSelected?.length > 0) {
+        // if there are labels already selected
+        if (labels_selected?.length > 0) {
             let barWidth = 0;
             if (isLogsVolume && type === "stream") {
                 barWidth = getBarWidth(getTimeSpan(data), tWidth);
@@ -147,7 +182,7 @@ export default function QrynChart(props: any): any {
                 barWidth,
                 isLogsVolume && type === "stream"
             );
-            const ids = lSelected?.map((m: any) => m.id);
+            const ids = labels_selected?.map((m: any) => m.id);
             const dataMapped = data?.map((series: any) => {
                 if (!ids.includes(series.id)) {
                     return {
@@ -170,20 +205,32 @@ export default function QrynChart(props: any): any {
                     };
                 }
             });
+
             newData = dataMapped;
+            setChartData(() => dataMapped);
         } else {
+
+            setChartData(() => data);
             newData = data;
         }
 
         try {
+            //
+            // const startDate = (new Date(start).getTime()) * 1000
+
+            // const stopDate = ( new Date(stop).getTime() ) * 1000
+
+            const { first, last } = getTimeSpan(newData);
+
             let plot = $q.plot(
                 element,
                 newData,
                 $q.extend(true, {}, chartOptions, {
                     xaxis: {
-                        min: ranges.xaxis.from - 100000,
-                        max: ranges.xaxis.to + 100000,
-                        timeformat: formatDateRange(newData).timeformat,
+                        min: Math.round(ranges.xaxis.from) - 100000,
+                        max: Math.round(ranges.xaxis.to) + 100000,
+                        timeformat: formatDateRange(newData, first, last)
+                            .timeformat,
                     },
                 })
             );
@@ -222,28 +269,42 @@ export default function QrynChart(props: any): any {
         }
     }
 
-    function onLabelClick(e: any, v: any) {
+    function onLabelClick(event: any, value: any) {
+        // actions on label click
         let newList = [];
-        const lSelected =
+        //  1- check for labels selected
+        const labels_selected =
             JSON.parse(localStorage.getItem("labelsSelected") || "null") || [];
 
-        if (lSelected.some(({ id }: any) => id === v.id)) {
-            const filtered = lSelected.filter((f: any) => f.id !== v.id);
+        // check if same label value whas selected
+
+        if (labels_selected.some(({ id }: any) => id === value.id)) {
+            const filtered = labels_selected.filter(
+                (filtered: any) => filtered.id !== value.id
+            );
+            // if selected, store on localstorage
             localStorage.setItem("labelsSelected", JSON.stringify(filtered));
+            // set the newList of labels as the filtered
             newList = filtered;
+
         } else {
-            newList = lSelected.concat(v);
+            // if no labels selected, just concat new value and save in localstorage
+
+            newList = labels_selected.concat(value);
             localStorage.setItem("labelsSelected", JSON.stringify(newList));
         }
 
+
+
         if (newList.length > 0) {
             const ids = newList?.map((m: any) => m.id);
 
             const { lines, bars, points } = getSeriesFromChartType(
                 chartType,
                 0
             );
-            let dataSelected = e?.map((series: any) => {
+
+            let dataSelected = event?.map((series: any) => {
                 if (!ids.includes(series.id)) {
                     return {
                         ...series,
@@ -262,7 +323,15 @@ export default function QrynChart(props: any): any {
                 }
             });
 
-            const { timeformat, min, max } = formatDateRange(dataSelected);
+            const startDate = new Date(start).getTime() * 1000;
+
+            const stopDate = new Date(stop).getTime() * 1000;
+
+            const { timeformat, min, max } = formatDateRange(
+                dataSelected,
+                startDate,
+                stopDate
+            );
             let barWidth = 0;
             if (isLogsVolume && type === "stream") {
                 barWidth = getBarWidth(getTimeSpan(dataSelected), tWidth);
@@ -303,7 +372,15 @@ export default function QrynChart(props: any): any {
                     shadowSize: 0,
                 };
             });
-            const { timeformat, min, max } = formatDateRange(newData);
+            const startDate = new Date(start).getTime() * 1000;
+
+            const stopDate = new Date(stop).getTime() * 1000;
+
+            const { timeformat, min, max } = formatDateRange(
+                newData,
+                startDate,
+                stopDate
+            );
 
             let plot = $q.plot(
                 element,
@@ -331,14 +408,12 @@ export default function QrynChart(props: any): any {
         //setChartData(getDataParsed(isSpliced));
         setChartData(matrix);
         localStorage.setItem("labelsSelected", JSON.stringify([]));
-
     }, []);
 
     useEffect(() => {
         setChartOptions(chartOptions);
         setElement(chartRef.current);
         drawChartFromData();
-
     }, [matrixData, isSpliced]);
 
     function drawChartFromData() {
@@ -352,7 +427,15 @@ export default function QrynChart(props: any): any {
                 barWidth = getBarWidth(getTimeSpan(newData), tWidth);
             }
 
-            const { timeformat, min, max } = formatDateRange(newData);
+            const startDate = new Date(start).getTime() * 1000;
+
+            const stopDate = new Date(stop).getTime() * 1000;
+
+            const { timeformat, min, max } = formatDateRange(
+                newData,
+                startDate,
+                stopDate
+            );
 
             let { bars, lines, points, stack } = getSeriesFromChartType(
                 chartType,
@@ -409,7 +492,6 @@ export default function QrynChart(props: any): any {
         if (pointSet.size === 1 && chartType !== "bar") {
             onSetChartType("bar");
         }
-
         return <FlotChart {...flotChartProps} />;
     }
 

diff --git a/packages/main/src/components/DataViews/components/Charts/consts.ts b/packages/main/src/components/DataViews/components/Charts/consts.ts
@@ -65,7 +65,7 @@ export const CHART_OPTIONS = (isLogsVolume = false) => ({
 // pass the bar width
 // calculate here the span width
 
-export const CHART_BAR_SERIES = (barWidth=0, isLogsVolume = false) => ({
+export const CHART_BAR_SERIES = (barWidth = 0, isLogsVolume = false) => ({
     stack: isLogsVolume,
     lines: {
         show: false,

diff --git a/packages/main/src/components/DataViews/components/Charts/consts/index.ts b/packages/main/src/components/DataViews/components/Charts/consts/index.ts
@@ -51,7 +51,7 @@ export const CHART_OPTIONS = (isLogsVolume=false)=>({
             shadowSize: 0,
             zero: false,
         },
-        points: { show: true, radius: 1, shadowSize: 0, zero: false },
+        points: { show: true, radius: 1, shadowSize: 0, zero: true},
     },
     markings: {
         clickable: false,