gsadmin/ActiveDirectoryManager
1
0
Fork 0
mirror of https://github.com/freedbygrace/ActiveDirectoryManager.git synced 2026-08-09 02:11:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve dashboard data handling and visualization. Updated data fetching and chart configurations for better data display.

Browse Source 
Replit-Commit-Author: Agent
Replit-Commit-Session-Id: 705f2157-ef97-4fbd-89e4-8c7f2ecaea90
Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/7ed01c5f-a82d-405a-b728-b2e3d127c60c/0ab49ba3-2a0b-4884-9cf6-dbdb4748e98c.jpg
This commit is contained in:
alphaeusmote
2025-04-10 00:26:14 +00:00
parent b7bfcf9fd2
commit b979cbe6b0
4 changed files with 41 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/dashboard/dashboard-layout.tsx
+6 -4
View File
@@ -84,10 +84,12 @@ export function DashboardLayout({
type: widget.type,
dataSource: widget.data[0]?.dataSource || "",
config: {
xAxis: widget.config.xAxis,
yAxis: Array.isArray(widget.config.yAxis) ? widget.config.yAxis : [widget.config.yAxis].filter(Boolean),
dimensions: widget.config.dimensions || [],
metrics: widget.config.metrics || [],
xAxis: widget.config.xAxis || "",
yAxis: Array.isArray(widget.config.yAxis)
? widget.config.yAxis.filter(Boolean) as string[]
: (widget.config.yAxis ? [widget.config.yAxis as string] : []),
dimensions: (widget.config.dimensions || []).filter(Boolean) as string[],
metrics: (widget.config.metrics || []).filter(Boolean) as string[],
showLegend: widget.config.showLegend ?? true,
stacked: widget.config.stacked ?? false,
precision: widget.config.precision ?? 2,
client/src/components/dashboard/dashboard-widget.tsx
+12 -11
View File
@@ -125,6 +125,7 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
if (!data || data.length === 0) return <p className="text-muted-foreground text-center py-4">No data available</p>;
const { xAxis, yAxis, dimensions, metrics, colors = COLORS, showLegend = true, stacked = false } = config;
const xAxisKey = xAxis as string;
switch (type) {
case 'bar':
@@ -132,7 +133,7 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
<ResponsiveContainer width="100%" height={300}>
<BarChart data={data} margin={{ top: 20, right: 30, left: 20, bottom: 30 }}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey={xAxis} />
<XAxis dataKey={xAxisKey} />
<YAxis />
<Tooltip />
{showLegend && <Legend />}
@@ -140,12 +141,12 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
? yAxis.map((axis, index) => (
<Bar
key={axis}
dataKey={axis}
dataKey={axis as string}
stackId={stacked ? "a" : undefined}
fill={colors[index % colors.length]}
/>
))
: yAxis ? <Bar dataKey={yAxis} fill={colors[0]} /> : null
: yAxis ? <Bar dataKey={yAxis as string} fill={colors[0]} /> : null
}
</BarChart>
</ResponsiveContainer>
@@ -156,7 +157,7 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
<ResponsiveContainer width="100%" height={300}>
<LineChart data={data} margin={{ top: 20, right: 30, left: 20, bottom: 30 }}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey={xAxis} />
<XAxis dataKey={xAxisKey} />
<YAxis />
<Tooltip />
{showLegend && <Legend />}
@@ -165,12 +166,12 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
<Line
key={axis}
type="monotone"
dataKey={axis}
dataKey={axis as string}
stroke={colors[index % colors.length]}
activeDot={{ r: 8 }}
/>
))
: yAxis ? <Line type="monotone" dataKey={yAxis} stroke={colors[0]} activeDot={{ r: 8 }} /> : null
: yAxis ? <Line type="monotone" dataKey={yAxis as string} stroke={colors[0]} activeDot={{ r: 8 }} /> : null
}
</LineChart>
</ResponsiveContainer>
@@ -181,7 +182,7 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
<ResponsiveContainer width="100%" height={300}>
<AreaChart data={data} margin={{ top: 20, right: 30, left: 20, bottom: 30 }}>
<CartesianGrid strokeDasharray="3 3" />
<XAxis dataKey={xAxis} />
<XAxis dataKey={xAxisKey} />
<YAxis />
<Tooltip />
{showLegend && <Legend />}
@@ -190,13 +191,13 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
<Area
key={axis}
type="monotone"
dataKey={axis}
dataKey={axis as string}
stackId={stacked ? "a" : `${index}`}
fill={colors[index % colors.length]}
stroke={colors[index % colors.length]}
/>
))
: yAxis ? <Area type="monotone" dataKey={yAxis} fill={colors[0]} stroke={colors[0]} /> : null
: yAxis ? <Area type="monotone" dataKey={yAxis as string} fill={colors[0]} stroke={colors[0]} /> : null
}
</AreaChart>
</ResponsiveContainer>
@@ -210,8 +211,8 @@ export function DashboardWidget({ id, title, type, data, config, onEdit, onDelet
(Array.isArray(yAxis) && yAxis.length > 0 ? yAxis[0] :
(typeof yAxis === 'string' ? yAxis : "value"));
const name = item[dimensionField];
const value = item[metricField];
const name = item[dimensionField as string];
const value = item[metricField as string];
return { name, value: Number(value) };
}).filter(item => !isNaN(item.value));