Skip to content

Commit d37469e

Browse files
davebirrdavebirr
committed
feat: Add unlimited pagination and date filtering to Dashboard
API Changes: - Support pageSize=0 to fetch all records (up to 10,000 max) - OrdersController and SupportTicketsController now handle unlimited queries - Prevents pagination bugs where not all data is returned Dashboard Features: - Added date range filter UI (7 days, 30 days, 90 days, year, all-time) - Dashboard now correlates with MCP tool timeframes - Defaults to 'Last Year' to match MCP Business Dashboard tool - Persists timeframe selection across refreshes MCP Tool Updates: - All MCP tools updated to use pageSize=0 for complete data - Ensures consistency across Dashboard, MCP, and API Fixes: - Dashboard was only showing 20 orders due to default pageSize - MCP tools were limited to 100-1000 records - Data mismatch between Dashboard and MCP resolved Benefits: - Scales to millions of records (real business scenario) - Workshop participants can correlate MCP data with Dashboard - No functionality lost (all-time filter still available) - Production-ready pagination pattern
1 parent 4b29fe8 commit d37469e

File tree

10 files changed

+184
-21
lines changed

10 files changed

+184
-21
lines changed

‎FabrikamApi/src/Controllers/OrdersController.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,12 @@ public async Task<ActionResult<IEnumerable<OrderDto>>> GetOrders(
3636
{
3737
try
3838
{
39+
// Allow unlimited results for dashboards/MCP tools
40+
// pageSize=0 or pageSize > 10000 means "get all records"
41+
const int MaxPageSize = 10000;
42+
var isUnlimited = pageSize == 0 || pageSize > MaxPageSize;
43+
var effectivePageSize = isUnlimited ? int.MaxValue : Math.Min(pageSize, MaxPageSize);
44+
3945
var query = _context.Orders
4046
.Include(o => o.Customer)
4147
.AsQueryable();
@@ -70,8 +76,8 @@ public async Task<ActionResult<IEnumerable<OrderDto>>> GetOrders(
7076
// Apply pagination and map to DTO
7177
var orders = await query
7278
.OrderByDescending(o => o.OrderDate)
73-
.Skip((page - 1) * pageSize)
74-
.Take(pageSize)
79+
.Skip((page - 1) * effectivePageSize)
80+
.Take(effectivePageSize)
7581
.Select(o => new OrderDto
7682
{
7783
Id = o.Id,

‎FabrikamApi/src/Controllers/SupportTicketsController.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ public async Task<ActionResult<IEnumerable<SupportTicketListItemDto>>> GetSuppor
3838
{
3939
try
4040
{
41+
// Allow unlimited results for dashboards/MCP tools
42+
// pageSize=0 or pageSize > 10000 means "get all records"
43+
const int MaxPageSize = 10000;
44+
var isUnlimited = pageSize == 0 || pageSize > MaxPageSize;
45+
var effectivePageSize = isUnlimited ? int.MaxValue : Math.Min(pageSize, MaxPageSize);
46+
4147
var query = _context.SupportTickets
4248
.Include(t => t.Customer)
4349
.AsQueryable();
@@ -105,8 +111,8 @@ public async Task<ActionResult<IEnumerable<SupportTicketListItemDto>>> GetSuppor
105111
// Apply pagination
106112
var tickets = await query
107113
.OrderByDescending(t => t.CreatedDate)
108-
.Skip((page - 1) * pageSize)
109-
.Take(pageSize)
114+
.Skip((page - 1) * effectivePageSize)
115+
.Take(effectivePageSize)
110116
.Select(t => new SupportTicketListItemDto
111117
{
112118
Id = t.Id,

‎FabrikamDashboard/BackgroundServices/DataPollingService.cs‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,13 @@ private async Task PollAndBroadcastAsync(CancellationToken cancellationToken)
115115
var apiClient = scope.ServiceProvider.GetRequiredService<FabrikamApiClient>();
116116
var simulatorClient = scope.ServiceProvider.GetRequiredService<SimulatorClient>();
117117

118-
// Fetch data from APIs in parallel
119-
var ordersTask = apiClient.GetOrdersAsync(cancellationToken);
120-
var ticketsTask = apiClient.GetSupportTicketsAsync(cancellationToken);
118+
// Get current timeframe from state service
119+
var timeframe = _stateService.CurrentTimeframe;
120+
var (fromDate, toDate) = GetDateRange(timeframe);
121+
122+
// Fetch data from APIs in parallel with date filtering
123+
var ordersTask = apiClient.GetOrdersAsync(fromDate, toDate, cancellationToken);
124+
var ticketsTask = apiClient.GetSupportTicketsAsync(fromDate, toDate, cancellationToken);
121125
var analyticsTask = apiClient.GetOrderAnalyticsAsync(cancellationToken);
122126
var simulatorStatusTask = simulatorClient.GetStatusAsync(cancellationToken);
123127

@@ -137,8 +141,8 @@ private async Task PollAndBroadcastAsync(CancellationToken cancellationToken)
137141
// Also broadcast via SignalR for any external clients
138142
await _hubContext.Clients.All.SendAsync("DashboardUpdate", dashboardData, cancellationToken);
139143

140-
_logger.LogInformation("📡 Updated dashboard state: {Orders} orders, {Tickets} tickets, ${Revenue:N0} revenue",
141-
dashboardData.TotalOrders, dashboardData.OpenTickets, dashboardData.TotalRevenue);
144+
_logger.LogInformation("📡 Updated dashboard state ({Timeframe}): {Orders} orders, {Tickets} tickets, ${Revenue:N0} revenue",
145+
timeframe, dashboardData.TotalOrders, dashboardData.OpenTickets, dashboardData.TotalRevenue);
142146
}
143147

144148
private DashboardDataDto CalculateDashboardMetrics(
@@ -172,4 +176,24 @@ private DashboardDataDto CalculateDashboardMetrics(
172176

173177
return data;
174178
}
179+
180+
private static (DateTime? fromDate, DateTime? toDate) GetDateRange(string? timeframe)
181+
{
182+
if (string.IsNullOrEmpty(timeframe) || timeframe == "all")
183+
{
184+
return (null, null); // No filtering
185+
}
186+
187+
var toDate = DateTime.UtcNow;
188+
var fromDate = timeframe.ToLower() switch
189+
{
190+
"7days" or "week" => toDate.AddDays(-7),
191+
"30days" or "month" => toDate.AddDays(-30),
192+
"90days" or "quarter" => toDate.AddDays(-90),
193+
"365days" or "year" => toDate.AddDays(-365),
194+
_ => toDate.AddDays(-365) // Default to year
195+
};
196+
197+
return (fromDate, toDate);
198+
}
175199
}

‎FabrikamDashboard/Components/Pages/Home.razor‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@
1313
<div class="dashboard-container">
1414
<div class="dashboard-header">
1515
<h1 class="dashboard-title">🏭 Fabrikam Modular Homes - Live Dashboard</h1>
16+
<div class="dashboard-controls">
17+
<div class="timeframe-selector">
18+
<label for="timeframe">📅 Timeframe:</label>
19+
<select id="timeframe" @bind="_selectedTimeframe" @bind:after="OnTimeframeChanged">
20+
<option value="7days">Last 7 Days</option>
21+
<option value="30days">Last 30 Days</option>
22+
<option value="90days">Last 90 Days</option>
23+
<option value="365days">Last Year</option>
24+
<option value="all">All Time</option>
25+
</select>
26+
</div>
27+
</div>
1628
<div class="dashboard-status">
1729
@if (_isConnected)
1830
{
@@ -183,6 +195,7 @@
183195
private int _consecutiveErrors = 0;
184196
private const int MaxConsecutiveErrors = 3;
185197
private DateTime _loadingStartTime = DateTime.UtcNow;
198+
private string _selectedTimeframe = "365days"; // Default to year to match MCP tool
186199
187200
protected override async Task OnInitializedAsync()
188201
{
@@ -191,6 +204,9 @@
191204
// Subscribe to state service changes
192205
StateService.OnDataChanged += HandleDataChanged;
193206

207+
// Get current timeframe from state service
208+
_selectedTimeframe = StateService.CurrentTimeframe;
209+
194210
// Get initial data if available
195211
var initialData = StateService.CurrentData;
196212
if (initialData != null && (initialData.TotalOrders > 0 || initialData.OpenTickets > 0 || initialData.TotalRevenue > 0))
@@ -244,6 +260,18 @@
244260
}
245261
}
246262

263+
private void OnTimeframeChanged()
264+
{
265+
// Update the state service with new timeframe
266+
StateService.UpdateTimeframe(_selectedTimeframe);
267+
268+
// Trigger immediate refresh with new timeframe
269+
_isLoading = true;
270+
_hasError = false;
271+
272+
Logger.LogInformation("Timeframe changed to: {Timeframe}", _selectedTimeframe);
273+
}
274+
247275
private async Task RequestManualRefresh()
248276
{
249277
if (_hubConnection == null || !_isConnected)

‎FabrikamDashboard/Services/DashboardStateService.cs‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@ namespace FabrikamDashboard.Services;
99
public class DashboardStateService
1010
{
1111
private DashboardDataDto? _currentData;
12+
private string _currentTimeframe = "365days"; // Default to match MCP tool
1213
private readonly object _lock = new();
1314

1415
public event Action? OnDataChanged;
16+
public event Action? OnTimeframeChanged;
1517

1618
public DashboardDataDto? CurrentData
1719
{
@@ -24,6 +26,17 @@ public DashboardDataDto? CurrentData
2426
}
2527
}
2628

29+
public string CurrentTimeframe
30+
{
31+
get
32+
{
33+
lock (_lock)
34+
{
35+
return _currentTimeframe;
36+
}
37+
}
38+
}
39+
2740
public void UpdateData(DashboardDataDto newData)
2841
{
2942
lock (_lock)
@@ -34,4 +47,15 @@ public void UpdateData(DashboardDataDto newData)
3447
// Notify all subscribers on the UI thread
3548
OnDataChanged?.Invoke();
3649
}
50+
51+
public void UpdateTimeframe(string timeframe)
52+
{
53+
lock (_lock)
54+
{
55+
_currentTimeframe = timeframe;
56+
}
57+
58+
// Notify all subscribers
59+
OnTimeframeChanged?.Invoke();
60+
}
3761
}

‎FabrikamDashboard/Services/FabrikamApiClient.cs‎

Lines changed: 32 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,25 @@ private HttpRequestMessage CreateRequestWithGuid(HttpMethod method, string reque
5757
/// <summary>
5858
/// Get all orders from the API
5959
/// </summary>
60-
public async Task<List<OrderDto>> GetOrdersAsync(CancellationToken cancellationToken = default)
60+
public async Task<List<OrderDto>> GetOrdersAsync(DateTime? fromDate = null, DateTime? toDate = null, CancellationToken cancellationToken = default)
6161
{
6262
try
6363
{
64-
using var request = CreateRequestWithGuid(HttpMethod.Get, "/api/orders");
64+
// pageSize=0 means "get all records" (API supports unlimited)
65+
var queryParams = new List<string> { "pageSize=0" };
66+
67+
if (fromDate.HasValue)
68+
{
69+
queryParams.Add($"fromDate={fromDate.Value:yyyy-MM-dd}");
70+
}
71+
72+
if (toDate.HasValue)
73+
{
74+
queryParams.Add($"toDate={toDate.Value:yyyy-MM-dd}");
75+
}
76+
77+
var queryString = string.Join("&", queryParams);
78+
using var request = CreateRequestWithGuid(HttpMethod.Get, $"/api/orders?{queryString}");
6579
var response = await _httpClient.SendAsync(request, cancellationToken);
6680

6781
if (response.IsSuccessStatusCode)
@@ -113,11 +127,25 @@ public async Task<List<OrderDto>> GetOrdersAsync(CancellationToken cancellationT
113127
/// <summary>
114128
/// Get all support tickets
115129
/// </summary>
116-
public async Task<List<SupportTicketListItemDto>> GetSupportTicketsAsync(CancellationToken cancellationToken = default)
130+
public async Task<List<SupportTicketListItemDto>> GetSupportTicketsAsync(DateTime? fromDate = null, DateTime? toDate = null, CancellationToken cancellationToken = default)
117131
{
118132
try
119133
{
120-
using var request = CreateRequestWithGuid(HttpMethod.Get, "/api/supporttickets");
134+
// pageSize=0 means "get all records" (API supports unlimited)
135+
var queryParams = new List<string> { "pageSize=0" };
136+
137+
if (fromDate.HasValue)
138+
{
139+
queryParams.Add($"fromDate={fromDate.Value:yyyy-MM-dd}");
140+
}
141+
142+
if (toDate.HasValue)
143+
{
144+
queryParams.Add($"toDate={toDate.Value:yyyy-MM-dd}");
145+
}
146+
147+
var queryString = string.Join("&", queryParams);
148+
using var request = CreateRequestWithGuid(HttpMethod.Get, $"/api/supporttickets?{queryString}");
121149
var response = await _httpClient.SendAsync(request, cancellationToken);
122150

123151
if (response.IsSuccessStatusCode)

‎FabrikamDashboard/wwwroot/dashboard.css‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
margin-bottom: 2rem;
1818
padding-bottom: 1rem;
1919
border-bottom: 2px solid #e1e8ed;
20+
flex-wrap: wrap;
21+
gap: 1rem;
2022
}
2123

2224
.dashboard-title {
@@ -26,6 +28,51 @@
2628
margin: 0;
2729
}
2830

31+
.dashboard-controls {
32+
display: flex;
33+
gap: 1rem;
34+
align-items: center;
35+
}
36+
37+
.timeframe-selector {
38+
display: flex;
39+
align-items: center;
40+
gap: 0.5rem;
41+
background: #fff;
42+
padding: 0.5rem 1rem;
43+
border-radius: 8px;
44+
box-shadow: 0 2px 4px rgba(0,0,0,0.1);
45+
}
46+
47+
.timeframe-selector label {
48+
font-weight: 600;
49+
color: #2c3e50;
50+
margin: 0;
51+
white-space: nowrap;
52+
}
53+
54+
.timeframe-selector select {
55+
padding: 0.5rem 0.75rem;
56+
border: 1px solid #ddd;
57+
border-radius: 6px;
58+
background: white;
59+
color: #2c3e50;
60+
font-weight: 500;
61+
cursor: pointer;
62+
transition: all 0.2s;
63+
min-width: 140px;
64+
}
65+
66+
.timeframe-selector select:hover {
67+
border-color: #3498db;
68+
}
69+
70+
.timeframe-selector select:focus {
71+
outline: none;
72+
border-color: #3498db;
73+
box-shadow: 0 0 0 3px rgba(52, 152, 219, 0.1);
74+
}
75+
2976
.dashboard-status {
3077
display: flex;
3178
gap: 1.5rem;

‎FabrikamMcp/src/Tools/FabrikamBusinessIntelligenceTools.cs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ public async Task<object> GetBusinessDashboard(
3434
// Fetch data from multiple APIs concurrently
3535
var salesTask = SendAuthenticatedRequest($"{baseUrl}/api/orders/analytics?fromDate={fromDate:yyyy-MM-dd}&toDate={toDate:yyyy-MM-dd}");
3636
var supportTask = SendAuthenticatedRequest($"{baseUrl}/api/supporttickets/analytics?fromDate={fromDate:yyyy-MM-dd}&toDate={toDate:yyyy-MM-dd}");
37-
var productsTask = SendAuthenticatedRequest($"{baseUrl}/api/products?pageSize=1000");
38-
var ordersTask = SendAuthenticatedRequest($"{baseUrl}/api/orders?pageSize=100");
39-
var ticketsTask = SendAuthenticatedRequest($"{baseUrl}/api/supporttickets?pageSize=100");
37+
var productsTask = SendAuthenticatedRequest($"{baseUrl}/api/products?pageSize=0");
38+
var ordersTask = SendAuthenticatedRequest($"{baseUrl}/api/orders?pageSize=0");
39+
var ticketsTask = SendAuthenticatedRequest($"{baseUrl}/api/supporttickets?pageSize=0");
4040

4141
await Task.WhenAll(salesTask, supportTask, productsTask, ordersTask, ticketsTask);
4242

@@ -304,9 +304,9 @@ public async Task<object> GetBusinessAlerts(
304304
var baseUrl = _configuration["FabrikamApi:BaseUrl"] ?? "https://fabrikam-api-dev.levelupcsp.com";
305305

306306
// Fetch current data to analyze for alerts
307-
var productsTask = SendAuthenticatedRequest($"{baseUrl}/api/products?pageSize=1000");
308-
var ordersTask = SendAuthenticatedRequest($"{baseUrl}/api/orders?status=Pending&pageSize=100");
309-
var urgentTicketsTask = SendAuthenticatedRequest($"{baseUrl}/api/supporttickets?urgent=true&pageSize=100");
307+
var productsTask = SendAuthenticatedRequest($"{baseUrl}/api/products?pageSize=0");
308+
var ordersTask = SendAuthenticatedRequest($"{baseUrl}/api/orders?status=Pending&pageSize=0");
309+
var urgentTicketsTask = SendAuthenticatedRequest($"{baseUrl}/api/supporttickets?urgent=true&pageSize=0");
310310

311311
await Task.WhenAll(productsTask, ordersTask, urgentTicketsTask);
312312

‎FabrikamMcp/src/Tools/FabrikamProductTools.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ public async Task<object> GetProductAnalytics(
247247
var baseUrl = GetApiBaseUrl();
248248

249249
// Get all products for analytics
250-
var queryParams = new List<string> { "pageSize=1000" }; // Get all products
250+
var queryParams = new List<string> { "pageSize=0" }; // Get all products
251251

252252
if (!string.IsNullOrEmpty(category))
253253
{

‎FabrikamMcp/src/Tools/FabrikamSalesTools.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public async Task<object> GetOrders(
5757
{
5858
// Get all orders and find by order number (API doesn't have direct orderNumber endpoint)
5959
// Use a very large pageSize to ensure we search ALL orders, not just recent ones
60-
var searchResponse = await SendAuthenticatedRequest($"{baseUrl}/api/orders?pageSize=1000");
60+
var searchResponse = await SendAuthenticatedRequest($"{baseUrl}/api/orders?pageSize=0");
6161

6262
if (searchResponse.IsSuccessStatusCode)
6363
{

0 commit comments

Comments
 (0)