Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: new metric widgets #2261

Merged
merged 18 commits into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from 14 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion keep-ui/app/dashboard/EditGridItemModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const EditGridItemModal: React.FC<EditGridItemModalProps> = ({ isOpen, onClose,
const [thresholds, setThresholds] = useState<Threshold[]>([]);

useEffect(() => {
if (item) {
if (item?.thresholds) {
setThresholds(item.thresholds);
}
}, [item]);
Expand Down
60 changes: 44 additions & 16 deletions keep-ui/app/dashboard/GridItem.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useState } from "react";
import { Card } from "@tremor/react";
import { AreaChart, Card } from "@tremor/react";
import MenuButton from "./MenuButton";
import { WidgetData } from "./types";
import {WidgetData, WidgetType} from "./types";
import AlertQuality from "@/app/alerts/alert-quality-table";
import { useSearchParams } from "next/navigation";

Expand Down Expand Up @@ -55,12 +55,14 @@ const GridItem: React.FC<GridItemProps> = ({
}
const getColor = () => {
let color = "#000000";
if (item.widgetType === WidgetType.PRESET && item.thresholds && item.preset) {
for (let i = item.thresholds.length - 1; i >= 0; i--) {
if (item.preset && item.preset.alerts_count >= item.thresholds[i].value) {
color = item.thresholds[i].color;
break;
}
}
}
return color;
};

Expand All @@ -80,11 +82,13 @@ const GridItem: React.FC<GridItemProps> = ({
};

return (
<Card className="relative w-full h-full p-4">
<Card className={`relative w-full h-full ${
!item.metric ? '!p-4' : '!pt-0.5'
}`}>
<div className="flex flex-col h-full">
<div
className={`flex-none flex items-center justify-between p-2 ${
item.preset ? "h-1/5" : "h-[10%]"
item.preset ? "h-1/5" : item.metric ? "h-1/5 mb-3" : "h-[10%]"
}`}
>
{/* For table view we need intract with table filter and pagination.so we aare dragging the widget here */}
Expand All @@ -111,16 +115,40 @@ const GridItem: React.FC<GridItemProps> = ({
</div>
</div>
)}
<div className="w-full h-[90%]">
<GenericMetrics
item={item}
filters={filters}
setFilters={setFilters}
/>
</div>
</div>
</Card>
);
};
{ item.metric && (
<div
className={'h-56 w-full "flex-1 flex items-center justify-center grid-item__widget'}>
<div className={"w-[100%]"}>
<AreaChart
className="h-56"
data={item.metric?.data}
index="timestamp"
categories={[item.metric?.id === "mttr" ? "mttr" : "number"]}
valueFormatter={(number: number) =>
`${Intl.NumberFormat().format(number).toString()}`
}
startEndOnly
connectNulls
showLegend={false}
showTooltip={true}
xAxisLabel="Timestamp"
/>
</div>
</div>

)}


<div className="w-full h-[90%]">
<GenericMetrics
item={item}
filters={filters}
setFilters={setFilters}
/>
</div>
</div>
</Card>
);
};

export default GridItem;
export default GridItem;
11 changes: 9 additions & 2 deletions keep-ui/app/dashboard/GridLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import GridItemContainer from "./GridItemContainer";
import { LayoutItem, WidgetData } from "./types";
import "react-grid-layout/css/styles.css";
import { Preset } from "app/alerts/models";
import {MetricsWidget} from "@/utils/hooks/useDashboardMetricWidgets";

const ResponsiveGridLayout = WidthProvider(Responsive);

Expand All @@ -15,6 +16,7 @@ interface GridLayoutProps {
onDelete: (id: string) => void;
presets: Preset[];
onSave: (updateItem: WidgetData) => void;
metrics: MetricsWidget[];
}

const GridLayout: React.FC<GridLayoutProps> = ({
Expand All @@ -25,6 +27,7 @@ const GridLayout: React.FC<GridLayoutProps> = ({
onDelete,
onSave,
presets,
metrics
}) => {
const layouts = { lg: layout };

Expand Down Expand Up @@ -52,14 +55,18 @@ const GridLayout: React.FC<GridLayoutProps> = ({
draggableHandle=".grid-item__widget"
>
{data.map((item) => {
//Fixing the static hardcode db value.
//Updating the static hardcode db value.
if (item.preset) {
const preset = presets?.find((p) => p?.id === item?.preset?.id);
item.preset = {
...item.preset,
alerts_count: preset?.alerts_count ?? 0,
};

} else if (item.metric) {
const metric = metrics?.find(m => m?.id === item?.metric?.id);
if (metric) {
item.metric = {...metric}
}
}
return (
<div key={item.i} data-grid={item}>
Expand Down
Loading
Loading