A bundle of related portal work — picked up while ensuring per-customer
isolation actually works end-to-end and replacing the placeholder Client
landing page. Build green, full test suite 66/66.
Frontend — Client surface
- DashboardPage: replace placeholder with 4 KPI cards (kWh, current kW,
active devices, estimated cost), 24h active-power ECharts mini-chart,
per-device "today/range" table, and a date-range picker with shortcuts
(Today / 7d / 30d / This month / Custom). 30s auto-refresh.
- New Measurements page (/measurements, Client mode, any authenticated
user) with multi-select device filter, full date range incl. an
"All time" shortcut, server-paginated preview, and Excel export.
- "Export to Excel" buttons on: Client Dashboard summary, Client Dashboard
raw measurements, Admin fleet dashboard, Admin customer-detail Cost tab.
- DashboardsPage sidebar items: let the menu item grow and reset
line-height so the two-line title+description doesn't crush.
Frontend — Admin / user mgmt
- RestrictedAdmin role: admin who only sees their assigned customers.
New UserFormDrawer choice + CustomerAccessModal for granting/revoking
per-customer access; surfaced from the Users page.
Backend
- ClosedXML 0.104.2 + ExcelExportService (pure formatter; frozen header,
currency/kWh/kW/date number formats, AdjustToContents).
- DashboardSummaryService computes per-device totals + estimated cost
(hourly bucketing × site's municipality's active tariff, mirroring
FleetCostService for the Admin side).
- New endpoints:
GET /api/dashboard/summary[+/export.xlsx]
GET /api/measurements/raw[+/export.xlsx] (deviceIds, paginated)
GET /api/sites/devices (flat list w/ site name)
GET /api/fleet/dashboard/export.xlsx
GET /api/fleet/customers/{id}/cost/export.xlsx
GET /api/auth/check (cookie-only liveness)
- AdminCustomerAccess: per-user customer scoping for RestrictedAdmin via
Postgres-row-level filter — RlsContext (per-DI-scope state) +
CustomerFilterMiddleware (populates from claims after auth) +
fleet.* DbSets gain HasQueryFilter expressions. Bootstrappers
Elevate() to bypass the filter for trusted system code.
- Migration: 20260518095759_AddAdminCustomerAccess (mapping table,
composite PK on UserId+CustomerId).
Infra / templating (the "spin it up via the template" piece)
- docker-compose.prod.yml + docker-compose.yml: pass WhiteLabel__*,
Application__RunMode, FleetIngest__* through to the container as
${VAR:-default} substitutions. Previously these were silently dropped
in prod — a customer's .env settings for branding/fleet-push never
reached the running process. Latent bug, fixed.
- docker-compose.prod.yml: forwardAuth middleware labels on the
Grafana router pointing at /api/auth/check. Option (a) from the
README's three prod-auth modes — every Grafana request now gates on
a valid portal cookie. Anonymous stays off.
- .env.example rewritten with a Client section, optional FleetIngest
block, and an Admin variant block — annotated on what's required vs.
optional and where the seed-only-on-first-boot caveat applies.
- README "Grafana embedding" table: option (a) now marked active with
an inline note on how to switch modes later.
- OPERATIONS.md step 3 includes the white-label pre-brand .env snippet;
step 4 (formerly "decide Grafana auth mode") updated to reflect
that auth is wired by default.
Tests
- New BrandingSeedFromOptionsTests (5 tests) pins the env-var → IOptions
→ DB seed contract: first read seeds from options; subsequent reads
return the DB row (UI edits survive restarts); EnsureSeededAsync is
idempotent; UpdateAsync falls back to options for blanked fields.
- CustomerTokenGraceTests helper: pass the new RlsContext to
AdminDbContext (SetAll() so existing semantics hold).
Verified end-to-end
- Real Docker spin-up with WhiteLabel__* in a throwaway .env →
/api/branding returned all six fields verbatim (ApplicationName,
LogoUrl, three colors, FooterText).
- curl login → /api/dashboard/summary returned valid JSON →
/api/dashboard/summary/export.xlsx returned a 6.9 KB file the
`file` command identifies as "Microsoft Excel 2007+".
- /api/measurements/raw with and without deviceIds filter returned
correct paginated rows; /export.xlsx with filter produced a valid
7.1 KB xlsx with the meter count in the filename.
- Frontend tsc -b clean; backend dotnet build 0/0; xunit 66/66.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
131 lines
4.6 KiB
C#
131 lines
4.6 KiB
C#
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.Options;
|
|
using Tau.Acuvim.Portal.Configuration;
|
|
using Tau.Acuvim.Portal.Data;
|
|
using Tau.Acuvim.Portal.DTOs;
|
|
using Tau.Acuvim.Portal.Services;
|
|
|
|
namespace Tau.Acuvim.Portal.Tests;
|
|
|
|
// Proves the "pre-brand at spin-up" flow end-to-end at the C# level:
|
|
// docker-compose WhiteLabel__* env var → IOptions<WhiteLabelOptions>
|
|
// → BrandingService.SeedAsync → WhiteLabelSettings row on first read.
|
|
//
|
|
// The Docker passthrough that bridges env-var → container is pure YAML and
|
|
// covered by the integration spin-up; this test pins the C# half so we'd
|
|
// catch a regression in BrandingService that broke the contract (e.g. someone
|
|
// changing SeedAsync to use a constructor literal instead of IOptions).
|
|
public class BrandingSeedFromOptionsTests
|
|
{
|
|
private static AppDbContext NewDb() =>
|
|
new(new DbContextOptionsBuilder<AppDbContext>()
|
|
.UseInMemoryDatabase("brand-" + Guid.NewGuid())
|
|
.Options);
|
|
|
|
private static BrandingService NewService(AppDbContext db, WhiteLabelOptions opts) =>
|
|
new(db, Options.Create(opts));
|
|
|
|
private static WhiteLabelOptions AcmeBrand() => new()
|
|
{
|
|
ApplicationName = "Acme Power Monitoring",
|
|
LogoUrl = "https://cdn.acme.example/logo.png",
|
|
PrimaryColor = "#0c4a6e",
|
|
SecondaryColor = "#0e7490",
|
|
AccentColor = "#06b6d4",
|
|
FooterText = "© Acme Corp",
|
|
};
|
|
|
|
[Fact]
|
|
public async Task FirstGet_SeedsRowFromOptions()
|
|
{
|
|
using var db = NewDb();
|
|
var svc = NewService(db, AcmeBrand());
|
|
|
|
var result = await svc.GetAsync();
|
|
|
|
Assert.Equal("Acme Power Monitoring", result.ApplicationName);
|
|
Assert.Equal("https://cdn.acme.example/logo.png", result.LogoUrl);
|
|
Assert.Equal("#0c4a6e", result.PrimaryColor);
|
|
Assert.Equal("#0e7490", result.SecondaryColor);
|
|
Assert.Equal("#06b6d4", result.AccentColor);
|
|
Assert.Equal("© Acme Corp", result.FooterText);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task SecondGet_DoesNotReseed_EvenIfOptionsChange()
|
|
{
|
|
using var db = NewDb();
|
|
var first = NewService(db, AcmeBrand());
|
|
await first.GetAsync();
|
|
|
|
// Operator "changes the template defaults" — but the row already exists
|
|
// in the DB, so the UI-authoritative value must win on subsequent gets.
|
|
// This is the contract that makes Settings → Branding actually durable.
|
|
var changedDefaults = new WhiteLabelOptions
|
|
{
|
|
ApplicationName = "Different Defaults",
|
|
PrimaryColor = "#ff0000",
|
|
SecondaryColor = "#00ff00",
|
|
AccentColor = "#0000ff",
|
|
FooterText = "different",
|
|
};
|
|
var second = NewService(db, changedDefaults);
|
|
|
|
var result = await second.GetAsync();
|
|
|
|
Assert.Equal("Acme Power Monitoring", result.ApplicationName);
|
|
Assert.Equal("#0c4a6e", result.PrimaryColor);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task EnsureSeededAsync_WritesRowImmediately_NoGetNeeded()
|
|
{
|
|
using var db = NewDb();
|
|
var svc = NewService(db, AcmeBrand());
|
|
|
|
await svc.EnsureSeededAsync();
|
|
|
|
var row = await db.WhiteLabelSettings.AsNoTracking().SingleAsync();
|
|
Assert.Equal("Acme Power Monitoring", row.ApplicationName);
|
|
Assert.Equal("#06b6d4", row.AccentColor);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task EnsureSeededAsync_IsIdempotent()
|
|
{
|
|
using var db = NewDb();
|
|
var svc = NewService(db, AcmeBrand());
|
|
|
|
await svc.EnsureSeededAsync();
|
|
await svc.EnsureSeededAsync();
|
|
await svc.EnsureSeededAsync();
|
|
|
|
var rowCount = await db.WhiteLabelSettings.CountAsync();
|
|
Assert.Equal(1, rowCount);
|
|
}
|
|
|
|
[Fact]
|
|
public async Task UpdateAsync_BlankFields_FallBackToOptionsDefaults()
|
|
{
|
|
using var db = NewDb();
|
|
var svc = NewService(db, AcmeBrand());
|
|
await svc.GetAsync(); // seed
|
|
|
|
// Operator clears the application name in the UI — service should
|
|
// fall back to the IOptions default rather than persist empty string.
|
|
var updated = await svc.UpdateAsync(new UpdateBrandingRequest(
|
|
ApplicationName: "",
|
|
PrimaryColor: "#abc123",
|
|
SecondaryColor: "",
|
|
AccentColor: "",
|
|
FooterText: "kept",
|
|
LogoUrl: null));
|
|
|
|
Assert.Equal("Acme Power Monitoring", updated.ApplicationName);
|
|
Assert.Equal("#abc123", updated.PrimaryColor);
|
|
Assert.Equal("#0e7490", updated.SecondaryColor);
|
|
Assert.Equal("#06b6d4", updated.AccentColor);
|
|
Assert.Equal("kept", updated.FooterText);
|
|
}
|
|
}
|