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>
71 lines
1.8 KiB
TypeScript
71 lines
1.8 KiB
TypeScript
import { api } from './client';
|
|
|
|
export interface DeviceWithSite {
|
|
id: string;
|
|
name: string;
|
|
externalId: string;
|
|
isActive: boolean;
|
|
siteId: string;
|
|
siteName: string;
|
|
}
|
|
|
|
export interface RawMeasurementRow {
|
|
time: string;
|
|
deviceName: string;
|
|
siteName: string | null;
|
|
activePowerKw: number;
|
|
reactivePowerKvar: number | null;
|
|
apparentPowerKva: number | null;
|
|
powerFactor: number | null;
|
|
voltageV: number | null;
|
|
frequencyHz: number | null;
|
|
energyImportedKwh: number | null;
|
|
energyExportedKwh: number | null;
|
|
}
|
|
|
|
export interface RawMeasurementsPage {
|
|
totalCount: number;
|
|
limit: number;
|
|
offset: number;
|
|
rows: RawMeasurementRow[];
|
|
}
|
|
|
|
export async function listAllDevices(): Promise<DeviceWithSite[]> {
|
|
const { data } = await api.get<DeviceWithSite[]>('/sites/devices');
|
|
return data;
|
|
}
|
|
|
|
export async function fetchRawMeasurements(params: {
|
|
fromUtc: string;
|
|
toUtc: string;
|
|
deviceIds?: string[];
|
|
limit?: number;
|
|
offset?: number;
|
|
}): Promise<RawMeasurementsPage> {
|
|
const { data } = await api.get<RawMeasurementsPage>('/measurements/raw', {
|
|
params: {
|
|
from: params.fromUtc,
|
|
to: params.toUtc,
|
|
deviceIds: params.deviceIds && params.deviceIds.length > 0 ? params.deviceIds.join(',') : undefined,
|
|
limit: params.limit,
|
|
offset: params.offset,
|
|
},
|
|
});
|
|
return data;
|
|
}
|
|
|
|
export function downloadRawMeasurementsExport(params: {
|
|
fromUtc: string;
|
|
toUtc: string;
|
|
deviceIds?: string[];
|
|
rowCap?: number;
|
|
}) {
|
|
const q = new URLSearchParams({
|
|
from: params.fromUtc,
|
|
to: params.toUtc,
|
|
});
|
|
if (params.deviceIds && params.deviceIds.length > 0) q.set('deviceIds', params.deviceIds.join(','));
|
|
if (params.rowCap) q.set('rowCap', String(params.rowCap));
|
|
window.location.href = `/api/measurements/raw/export.xlsx?${q.toString()}`;
|
|
}
|