fix(api): align frontend with project-scoped backend
Use project-scoped endpoints and run IDs for current project, SCADA metadata, historical time series, migrated DMA results, and sensor placement runs. The regressions recurred because tests mocked pre-interceptor and new-only payload shapes, while history queries relied on implicit global scheme state and unbounded request fan-out. Cover post-interceptor pages, migrated result_rows, explicit run_id routing, multi-element requests, request limits, and cancellation.
This commit is contained in:
@@ -1,12 +1,26 @@
|
||||
import dayjs from "dayjs";
|
||||
import { api } from "@/lib/api";
|
||||
import {
|
||||
buildBurstDetectionRequest,
|
||||
createBurstDetectionAnalysisParametersState,
|
||||
fetchPressureSamplingInterval,
|
||||
parseScadaFrequencyMinutes,
|
||||
resolvePressureSamplingInterval,
|
||||
} from "./AnalysisParameters";
|
||||
|
||||
jest.mock("@/lib/api", () => ({
|
||||
api: {
|
||||
get: jest.fn(),
|
||||
},
|
||||
}));
|
||||
|
||||
const get = api.get as jest.Mock;
|
||||
|
||||
describe("burst detection request", () => {
|
||||
beforeEach(() => {
|
||||
get.mockReset();
|
||||
});
|
||||
|
||||
it("requests the latest complete monitoring time by default", () => {
|
||||
const state = createBurstDetectionAnalysisParametersState();
|
||||
state.schemeName = " latest-case ";
|
||||
@@ -45,11 +59,27 @@ describe("burst detection request", () => {
|
||||
expect(parseScadaFrequencyMinutes("1:00:00")).toBe(60);
|
||||
expect(
|
||||
resolvePressureSamplingInterval([
|
||||
{ type: "pressure", transmission_frequency: "0:15:00" },
|
||||
{ type: "pressure", transmission_frequency: "0:15:00" },
|
||||
{ type: "pressure", transmission_frequency: "0:30:00" },
|
||||
{ type: "pipe_flow", transmission_frequency: "1:00:00" },
|
||||
{ device_type: "pressure", transmission_frequency: "0:15:00" },
|
||||
{ device_type: "pressure", transmission_frequency: "0:15:00" },
|
||||
{ device_type: "pressure", transmission_frequency: "0:30:00" },
|
||||
{ device_type: "pipe_flow", transmission_frequency: "1:00:00" },
|
||||
]),
|
||||
).toBe(15);
|
||||
});
|
||||
|
||||
it("loads the pressure frequency from the pooled SCADA metadata endpoint", async () => {
|
||||
get.mockResolvedValue({
|
||||
data: {
|
||||
success: true,
|
||||
count: 2,
|
||||
data: [
|
||||
{ device_type: "pressure", transmission_frequency: "0:30:00" },
|
||||
{ device_type: "pipe_flow", transmission_frequency: "0:15:00" },
|
||||
],
|
||||
},
|
||||
});
|
||||
|
||||
await expect(fetchPressureSamplingInterval()).resolves.toBe(30);
|
||||
expect(get).toHaveBeenCalledWith("/api/v1/scada-info/database-view");
|
||||
});
|
||||
});
|
||||
|
||||
@@ -46,10 +46,14 @@ export interface BurstDetectionAnalysisParametersState {
|
||||
}
|
||||
|
||||
interface ScadaInfoItem {
|
||||
type?: string;
|
||||
device_type?: string;
|
||||
transmission_frequency?: string | number | null;
|
||||
}
|
||||
|
||||
interface ScadaInfoResponse {
|
||||
data?: ScadaInfoItem[];
|
||||
}
|
||||
|
||||
const currentQuarterHour = () => {
|
||||
const now = dayjs().second(0).millisecond(0);
|
||||
return now.minute(Math.floor(now.minute() / 15) * 15);
|
||||
@@ -86,7 +90,7 @@ export const parseScadaFrequencyMinutes = (
|
||||
export const resolvePressureSamplingInterval = (items: ScadaInfoItem[]) => {
|
||||
const counts = new Map<number, number>();
|
||||
items
|
||||
.filter((item) => item.type?.toLowerCase() === "pressure")
|
||||
.filter((item) => item.device_type?.toLowerCase() === "pressure")
|
||||
.forEach((item) => {
|
||||
const minutes = parseScadaFrequencyMinutes(item.transmission_frequency);
|
||||
if (minutes && 1440 % minutes === 0) {
|
||||
@@ -99,6 +103,15 @@ export const resolvePressureSamplingInterval = (items: ScadaInfoItem[]) => {
|
||||
)[0]?.[0] ?? 15;
|
||||
};
|
||||
|
||||
export const fetchPressureSamplingInterval = async () => {
|
||||
const response = await api.get<ScadaInfoResponse>(
|
||||
"/api/v1/scada-info/database-view",
|
||||
);
|
||||
return resolvePressureSamplingInterval(
|
||||
Array.isArray(response.data.data) ? response.data.data : [],
|
||||
);
|
||||
};
|
||||
|
||||
export const buildBurstDetectionRequest = (
|
||||
parameters: BurstDetectionAnalysisParametersState,
|
||||
) => ({
|
||||
@@ -141,13 +154,9 @@ const AnalysisParameters: React.FC<Props> = ({
|
||||
if (samplingIntervalSource !== "metadata") return;
|
||||
let active = true;
|
||||
setFrequencyLoading(true);
|
||||
api
|
||||
.get("/api/v1/scada-info")
|
||||
.then((response) => {
|
||||
fetchPressureSamplingInterval()
|
||||
.then((interval) => {
|
||||
if (!active) return;
|
||||
const interval = resolvePressureSamplingInterval(
|
||||
response.data as ScadaInfoItem[],
|
||||
);
|
||||
setParametersState((previous) =>
|
||||
previous.samplingIntervalSource === "metadata"
|
||||
? { ...previous, samplingIntervalMinutes: interval }
|
||||
|
||||
@@ -21,6 +21,7 @@ import SchemeQuery, {
|
||||
createBurstDetectionSchemeQueryState,
|
||||
type BurstDetectionSchemeQueryState,
|
||||
} from "./SchemeQuery";
|
||||
import { useData } from "@components/olmap/core/MapComponent";
|
||||
import { BurstDetectionResult, BurstDetectionSchemeRecord } from "./types";
|
||||
|
||||
const TabPanel = ({
|
||||
@@ -38,6 +39,7 @@ const TabPanel = ({
|
||||
);
|
||||
|
||||
const BurstDetectionPanel: React.FC = () => {
|
||||
const setSchemeRunId = useData()?.setSchemeRunId;
|
||||
const [open, setOpen] = useState(true);
|
||||
const [tab, setTab] = useState(0);
|
||||
const [result, setResult] = useState<BurstDetectionResult | null>(null);
|
||||
@@ -58,10 +60,23 @@ const BurstDetectionPanel: React.FC = () => {
|
||||
const drawerWidth = 450;
|
||||
const panelTitle = "爆管侦测";
|
||||
|
||||
const handleResult = useCallback((payload: BurstDetectionResult) => {
|
||||
setResult(payload);
|
||||
setTab(2);
|
||||
}, []);
|
||||
const handleResult = useCallback(
|
||||
(payload: BurstDetectionResult) => {
|
||||
setSchemeRunId?.("");
|
||||
setResult(payload);
|
||||
setTab(2);
|
||||
},
|
||||
[setSchemeRunId],
|
||||
);
|
||||
|
||||
const handleViewResult = useCallback(
|
||||
(payload: BurstDetectionResult, runId: string) => {
|
||||
setSchemeRunId?.(runId);
|
||||
setResult(payload);
|
||||
setTab(2);
|
||||
},
|
||||
[setSchemeRunId],
|
||||
);
|
||||
|
||||
return (
|
||||
<>
|
||||
@@ -166,7 +181,7 @@ const BurstDetectionPanel: React.FC = () => {
|
||||
</TabPanel>
|
||||
<TabPanel value={tab} index={1}>
|
||||
<SchemeQuery
|
||||
onViewResult={handleResult}
|
||||
onViewResult={handleViewResult}
|
||||
schemes={schemes}
|
||||
onSchemesChange={setSchemes}
|
||||
state={queryState}
|
||||
|
||||
@@ -32,7 +32,7 @@ import {
|
||||
} from "./types";
|
||||
|
||||
interface Props {
|
||||
onViewResult: (result: BurstDetectionResult) => void;
|
||||
onViewResult: (result: BurstDetectionResult, runId: string) => void;
|
||||
schemes?: BurstDetectionSchemeRecord[];
|
||||
onSchemesChange?: (schemes: BurstDetectionSchemeRecord[]) => void;
|
||||
state?: BurstDetectionSchemeQueryState;
|
||||
@@ -174,7 +174,7 @@ const SchemeQuery: React.FC<Props> = ({
|
||||
throw new Error("方案详情缺少侦测结果数据");
|
||||
}
|
||||
|
||||
onViewResult(normalizedResult);
|
||||
onViewResult(normalizedResult, runId);
|
||||
open?.({
|
||||
type: "success",
|
||||
message: "方案加载成功",
|
||||
|
||||
Reference in New Issue
Block a user