Compare commits

...

2 Commits

Author SHA1 Message Date
JIANG
66f2390078 暂存 2026-02-11 18:58:10 +08:00
JIANG
9d06226cb4 Implemented a Zustand-based project_id store, expanded project selection/switching to persist project_id,
and centralized backend requests via api/apiFetch (including data provider updates) to inject X-Project-ID.
2026-02-11 16:29:18 +08:00
30 changed files with 477 additions and 102 deletions

32
package-lock.json generated
View File

@@ -41,7 +41,8 @@
"react-draggable": "^4.5.0", "react-draggable": "^4.5.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-window": "^1.8.10", "react-window": "^1.8.10",
"tailwindcss": "^4.1.13" "tailwindcss": "^4.1.13",
"zustand": "^5.0.11"
}, },
"devDependencies": { "devDependencies": {
"@svgr/webpack": "^8.1.0", "@svgr/webpack": "^8.1.0",
@@ -22904,6 +22905,35 @@
"integrity": "sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==", "integrity": "sha512-w2NTI8+3l3eeltKAdK8QpiLo/flRAr2p8AGeakfMZOXBxOg9HIu4LVDxBi81sYgVhFhdJjv1OrB5ssI8uFPoLg==",
"license": "MIT AND BSD-3-Clause" "license": "MIT AND BSD-3-Clause"
}, },
"node_modules/zustand": {
"version": "5.0.11",
"resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.11.tgz",
"integrity": "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg==",
"license": "MIT",
"engines": {
"node": ">=12.20.0"
},
"peerDependencies": {
"@types/react": ">=18.0.0",
"immer": ">=9.0.6",
"react": ">=18.0.0",
"use-sync-external-store": ">=1.2.0"
},
"peerDependenciesMeta": {
"@types/react": {
"optional": true
},
"immer": {
"optional": true
},
"react": {
"optional": true
},
"use-sync-external-store": {
"optional": true
}
}
},
"node_modules/zwitch": { "node_modules/zwitch": {
"version": "1.0.5", "version": "1.0.5",
"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz", "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",

View File

@@ -49,7 +49,8 @@
"react-draggable": "^4.5.0", "react-draggable": "^4.5.0",
"react-icons": "^5.5.0", "react-icons": "^5.5.0",
"react-window": "^1.8.10", "react-window": "^1.8.10",
"tailwindcss": "^4.1.13" "tailwindcss": "^4.1.13",
"zustand": "^5.0.11"
}, },
"overrides": { "overrides": {
"fast-xml-parser": "5.3.4" "fast-xml-parser": "5.3.4"

View File

@@ -34,6 +34,7 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers"; import { DateTimePicker, LocalizationProvider } from "@mui/x-date-pickers";
import { zhCN as pickerZhCN } from "@mui/x-date-pickers/locales"; import { zhCN as pickerZhCN } from "@mui/x-date-pickers/locales";
import config from "@/config/config"; import config from "@/config/config";
import { apiFetch } from "@/lib/apiFetch";
dayjs.extend(utc); dayjs.extend(utc);
dayjs.extend(timezone); dayjs.extend(timezone);
@@ -103,10 +104,10 @@ const fetchFromBackend = async (
if (type === "none") { if (type === "none") {
// 查询清洗值和监测值 // 查询清洗值和监测值
const [cleanedRes, rawRes] = await Promise.all([ const [cleanedRes, rawRes] = await Promise.all([
fetch(cleanedDataUrl) apiFetch(cleanedDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(rawDataUrl) apiFetch(rawDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
]); ]);
@@ -126,13 +127,13 @@ const fetchFromBackend = async (
} else if (type === "scheme") { } else if (type === "scheme") {
// 查询策略模拟值、清洗值和监测值 // 查询策略模拟值、清洗值和监测值
const [cleanedRes, rawRes, schemeSimRes] = await Promise.all([ const [cleanedRes, rawRes, schemeSimRes] = await Promise.all([
fetch(cleanedDataUrl) apiFetch(cleanedDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(rawDataUrl) apiFetch(rawDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(schemeSimulationDataUrl) apiFetch(schemeSimulationDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
]); ]);
@@ -178,13 +179,13 @@ const fetchFromBackend = async (
} else { } else {
// realtime: 查询模拟值、清洗值和监测值 // realtime: 查询模拟值、清洗值和监测值
const [cleanedRes, rawRes, simulationRes] = await Promise.all([ const [cleanedRes, rawRes, simulationRes] = await Promise.all([
fetch(cleanedDataUrl) apiFetch(cleanedDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(rawDataUrl) apiFetch(rawDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(simulationDataUrl) apiFetch(simulationDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
]); ]);

View File

@@ -28,6 +28,7 @@ import { TbRewindBackward15, TbRewindForward15 } from "react-icons/tb";
import { FiSkipBack, FiSkipForward } from "react-icons/fi"; import { FiSkipBack, FiSkipForward } from "react-icons/fi";
import { useData } from "../MapComponent"; import { useData } from "../MapComponent";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
import { apiFetch } from "@/lib/apiFetch";
import { useMap } from "../MapComponent"; import { useMap } from "../MapComponent";
interface TimelineProps { interface TimelineProps {
@@ -117,11 +118,11 @@ const Timeline: React.FC<TimelineProps> = ({
nodeRecords = nodeCacheRef.current.get(nodeCacheKey)!; nodeRecords = nodeCacheRef.current.get(nodeCacheKey)!;
} else { } else {
disableDateSelection && schemeName disableDateSelection && schemeName
? (nodePromise = fetch( ? (nodePromise = apiFetch(
// `${config.BACKEND_URL}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}&schemename=${schemeName}` // `${config.BACKEND_URL}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}&schemename=${schemeName}`
`${config.BACKEND_URL}/api/v1/scheme/query/by-scheme-time-property?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=node&property=${junctionProperties}`, `${config.BACKEND_URL}/api/v1/scheme/query/by-scheme-time-property?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=node&property=${junctionProperties}`,
)) ))
: (nodePromise = fetch( : (nodePromise = apiFetch(
// `${config.BACKEND_URL}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}` // `${config.BACKEND_URL}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=node&property=${junctionProperties}`
`${config.BACKEND_URL}/api/v1/realtime/query/by-time-property?query_time=${query_time}&type=node&property=${junctionProperties}`, `${config.BACKEND_URL}/api/v1/realtime/query/by-time-property?query_time=${query_time}&type=node&property=${junctionProperties}`,
)); ));
@@ -138,11 +139,11 @@ const Timeline: React.FC<TimelineProps> = ({
linkRecords = linkCacheRef.current.get(linkCacheKey)!; linkRecords = linkCacheRef.current.get(linkCacheKey)!;
} else { } else {
disableDateSelection && schemeName disableDateSelection && schemeName
? (linkPromise = fetch( ? (linkPromise = apiFetch(
// `${config.BACKEND_URL}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}&schemename=${schemeName}` // `${config.BACKEND_URL}/queryallschemerecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}&schemename=${schemeName}`
`${config.BACKEND_URL}/api/v1/scheme/query/by-scheme-time-property?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=link&property=${pipeProperties}`, `${config.BACKEND_URL}/api/v1/scheme/query/by-scheme-time-property?scheme_type=${schemeType}&scheme_name=${schemeName}&query_time=${query_time}&type=link&property=${pipeProperties}`,
)) ))
: (linkPromise = fetch( : (linkPromise = apiFetch(
// `${config.BACKEND_URL}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}` // `${config.BACKEND_URL}/queryallrecordsbytimeproperty/?querytime=${query_time}&type=link&property=${pipeProperties}`
`${config.BACKEND_URL}/api/v1/realtime/query/by-time-property?query_time=${query_time}&type=link&property=${pipeProperties}`, `${config.BACKEND_URL}/api/v1/realtime/query/by-time-property?query_time=${query_time}&type=link&property=${pipeProperties}`,
)); ));
@@ -513,7 +514,7 @@ const Timeline: React.FC<TimelineProps> = ({
duration: calculatedInterval, duration: calculatedInterval,
}; };
const response = await fetch( const response = await apiFetch(
`${config.BACKEND_URL}/api/v1/runsimulationmanuallybydate/`, `${config.BACKEND_URL}/api/v1/runsimulationmanuallybydate/`,
{ {
method: "POST", method: "POST",

View File

@@ -20,6 +20,7 @@ import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import { config } from "@/config/config"; import { config } from "@/config/config";
import { apiFetch } from "@/lib/apiFetch";
// 添加接口定义隐藏按钮的props // 添加接口定义隐藏按钮的props
interface ToolbarProps { interface ToolbarProps {
@@ -388,12 +389,12 @@ const Toolbar: React.FC<ToolbarProps> = ({
const querytime = dateObj.toISOString(); // 例如 "2025-09-16T16:30:00.000Z" const querytime = dateObj.toISOString(); // 例如 "2025-09-16T16:30:00.000Z"
let response; let response;
if (queryType === "scheme") { if (queryType === "scheme") {
response = await fetch( response = await apiFetch(
// `${config.BACKEND_URL}/queryschemesimulationrecordsbyidtime/?scheme_name=${schemeName}&id=${id}&querytime=${querytime}&type=${type}` // `${config.BACKEND_URL}/queryschemesimulationrecordsbyidtime/?scheme_name=${schemeName}&id=${id}&querytime=${querytime}&type=${type}`
`${config.BACKEND_URL}/api/v1/scheme/query/by-id-time?scheme_type=${schemeType}&scheme_name=${schemeName}&id=${id}&type=${type}&query_time=${querytime}`, `${config.BACKEND_URL}/api/v1/scheme/query/by-id-time?scheme_type=${schemeType}&scheme_name=${schemeName}&id=${id}&type=${type}&query_time=${querytime}`,
); );
} else { } else {
response = await fetch( response = await apiFetch(
// `${config.BACKEND_URL}/querysimulationrecordsbyidtime/?id=${id}&querytime=${querytime}&type=${type}` // `${config.BACKEND_URL}/querysimulationrecordsbyidtime/?id=${id}&querytime=${querytime}&type=${type}`
`${config.BACKEND_URL}/api/v1/realtime/query/by-id-time?id=${id}&type=${type}&query_time=${querytime}`, `${config.BACKEND_URL}/api/v1/realtime/query/by-id-time?id=${id}&type=${type}&query_time=${querytime}`,
); );

View File

@@ -8,13 +8,14 @@ import {
} from "@refinedev/mui"; } from "@refinedev/mui";
import { SessionProvider, signIn, signOut, useSession } from "next-auth/react"; import { SessionProvider, signIn, signOut, useSession } from "next-auth/react";
import { usePathname } from "next/navigation"; import { usePathname } from "next/navigation";
import React from "react"; import React, { useEffect } from "react";
import routerProvider from "@refinedev/nextjs-router"; import routerProvider from "@refinedev/nextjs-router";
import { ColorModeContextProvider } from "@contexts/color-mode"; import { ColorModeContextProvider } from "@contexts/color-mode";
import { dataProvider } from "@providers/data-provider"; import { dataProvider } from "@providers/data-provider";
import { ProjectProvider } from "@/contexts/ProjectContext"; import { ProjectProvider } from "@/contexts/ProjectContext";
import { useAuthStore } from "@/store/authStore";
import { LiaNetworkWiredSolid } from "react-icons/lia"; import { LiaNetworkWiredSolid } from "react-icons/lia";
import { TbDatabaseEdit } from "react-icons/tb"; import { TbDatabaseEdit } from "react-icons/tb";
@@ -47,6 +48,11 @@ type AppProps = {
const App = (props: React.PropsWithChildren<AppProps>) => { const App = (props: React.PropsWithChildren<AppProps>) => {
const { data, status } = useSession(); const { data, status } = useSession();
const to = usePathname(); const to = usePathname();
const setAccessToken = useAuthStore((state) => state.setAccessToken);
useEffect(() => {
setAccessToken(typeof data?.accessToken === "string" ? data.accessToken : null);
}, [data?.accessToken, setAccessToken]);
if (status === "loading") { if (status === "loading") {
return <span>loading...</span>; return <span>loading...</span>;
@@ -103,6 +109,7 @@ const App = (props: React.PropsWithChildren<AppProps>) => {
if (data?.user) { if (data?.user) {
const { user } = data; const { user } = data;
return { return {
id: user.id,
name: user.name, name: user.name,
avatar: user.image, avatar: user.image,
}; };

View File

@@ -1,7 +1,8 @@
import { NextAuthOptions } from "next-auth";
import KeycloakProvider from "next-auth/providers/keycloak"; import KeycloakProvider from "next-auth/providers/keycloak";
import Avatar from "@assets/avatar/avatar-small.jpeg"; import Avatar from "@assets/avatar/avatar-small.jpeg";
const authOptions = { const authOptions: NextAuthOptions = {
// Configure one or more authentication providers // Configure one or more authentication providers
providers: [ providers: [
KeycloakProvider({ KeycloakProvider({
@@ -19,6 +20,26 @@ const authOptions = {
}), }),
], ],
secret: process.env.NEXTAUTH_SECRET, secret: process.env.NEXTAUTH_SECRET,
callbacks: {
jwt: async ({ token, profile, account }) => {
if (profile?.sub) {
token.sub = profile.sub;
}
if (account?.access_token) {
token.accessToken = account.access_token;
}
return token;
},
session: async ({ session, token }) => {
if (session.user && token.sub) {
session.user.id = token.sub;
}
if (token.accessToken) {
session.accessToken = token.accessToken;
}
return session;
},
},
}; };
export default authOptions; export default authOptions;

View File

@@ -22,11 +22,12 @@ import { HamburgerMenu, RefineThemedLayoutHeaderProps } from "@refinedev/mui";
import React, { useContext, useState } from "react"; import React, { useContext, useState } from "react";
import { ProjectSelector } from "@components/project/ProjectSelector"; import { ProjectSelector } from "@components/project/ProjectSelector";
import { setMapExtent, setMapWorkspace, setNetworkName } from "@config/config"; import { setMapExtent, setMapWorkspace, setNetworkName } from "@config/config";
import { useProjectStore } from "@/store/projectStore";
type IUser = { type IUser = {
id: number; id?: string;
name: string; name?: string;
avatar: string; avatar?: string;
}; };
export const Header: React.FC<RefineThemedLayoutHeaderProps> = ({ export const Header: React.FC<RefineThemedLayoutHeaderProps> = ({
@@ -37,6 +38,9 @@ export const Header: React.FC<RefineThemedLayoutHeaderProps> = ({
const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null); const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
const [showProjectSelector, setShowProjectSelector] = useState(false); const [showProjectSelector, setShowProjectSelector] = useState(false);
const open = Boolean(anchorEl); const open = Boolean(anchorEl);
const setCurrentProjectId = useProjectStore(
(state) => state.setCurrentProjectId,
);
const { data: user } = useGetIdentity<IUser>(); const { data: user } = useGetIdentity<IUser>();
@@ -54,6 +58,7 @@ export const Header: React.FC<RefineThemedLayoutHeaderProps> = ({
}; };
const handleProjectSelect = ( const handleProjectSelect = (
projectId: string,
workspace: string, workspace: string,
networkName: string, networkName: string,
extent: number[], extent: number[],
@@ -65,6 +70,7 @@ export const Header: React.FC<RefineThemedLayoutHeaderProps> = ({
localStorage.setItem("NEXT_PUBLIC_NETWORK_NAME", networkName); localStorage.setItem("NEXT_PUBLIC_NETWORK_NAME", networkName);
localStorage.setItem("NEXT_PUBLIC_MAP_EXTENT", extent.join(",")); localStorage.setItem("NEXT_PUBLIC_MAP_EXTENT", extent.join(","));
localStorage.removeItem(`${workspace}_map_view`); localStorage.removeItem(`${workspace}_map_view`);
setCurrentProjectId(projectId || networkName || workspace);
setShowProjectSelector(false); setShowProjectSelector(false);
window.location.reload(); window.location.reload();
}; };

View File

@@ -23,7 +23,7 @@ import { Style, Stroke, Icon } from "ol/style";
import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/mapQueryService"; import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/mapQueryService";
import Feature, { FeatureLike } from "ol/Feature"; import Feature, { FeatureLike } from "ol/Feature";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
import { along, lineString, length, toMercator } from "@turf/turf"; import { along, lineString, length, toMercator } from "@turf/turf";
import { Point } from "ol/geom"; import { Point } from "ol/geom";
@@ -283,7 +283,7 @@ const AnalysisParameters: React.FC = () => {
}; };
try { try {
await axios.get(`${config.BACKEND_URL}/api/v1/burst_analysis/`, { await api.get(`${config.BACKEND_URL}/api/v1/burst_analysis/`, {
params, params,
paramsSerializer: { paramsSerializer: {
indexes: null, // 移除数组索引,即由 burst_ID[] 变为 burst_ID indexes: null, // 移除数组索引,即由 burst_ID[] 变为 burst_ID

View File

@@ -22,7 +22,7 @@ import AnalysisParameters from "./AnalysisParameters";
import SchemeQuery from "./SchemeQuery"; import SchemeQuery from "./SchemeQuery";
import LocationResults from "./LocationResults"; import LocationResults from "./LocationResults";
import ValveIsolation from "./ValveIsolation"; import ValveIsolation from "./ValveIsolation";
import axios from "axios"; import { api } from "@/lib/api";
import { config } from "@config/config"; import { config } from "@config/config";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import { LocationResult, SchemeRecord, ValveIsolationResult } from "./types"; import { LocationResult, SchemeRecord, ValveIsolationResult } from "./types";
@@ -85,7 +85,7 @@ const BurstPipeAnalysisPanel: React.FC<BurstPipeAnalysisPanelProps> = ({
const handleLocateScheme = async (scheme: SchemeRecord) => { const handleLocateScheme = async (scheme: SchemeRecord) => {
try { try {
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/burst-locate-result/${scheme.schemeName}`, `${config.BACKEND_URL}/api/v1/burst-locate-result/${scheme.schemeName}`,
); );
setLocationResults(response.data); setLocationResults(response.data);

View File

@@ -26,7 +26,7 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import "dayjs/locale/zh-cn"; // 引入中文包 import "dayjs/locale/zh-cn"; // 引入中文包
import dayjs, { Dayjs } from "dayjs"; import dayjs, { Dayjs } from "dayjs";
import axios from "axios"; import { api } from "@/lib/api";
import moment from "moment"; import moment from "moment";
import { config, NETWORK_NAME } from "@config/config"; import { config, NETWORK_NAME } from "@config/config";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
@@ -109,7 +109,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true); setLoading(true);
try { try {
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`, `${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`,
); );
let filteredResults = response.data; let filteredResults = response.data;

View File

@@ -27,7 +27,7 @@ import {
CheckBox as CheckBoxIcon, CheckBox as CheckBoxIcon,
CheckBoxOutlineBlank as CheckBoxOutlineBlankIcon, CheckBoxOutlineBlank as CheckBoxOutlineBlankIcon,
} from "@mui/icons-material"; } from "@mui/icons-material";
import axios from "axios"; import { api } from "@/lib/api";
import { config, NETWORK_NAME } from "@config/config"; import { config, NETWORK_NAME } from "@config/config";
import { ValveIsolationResult } from "./types"; import { ValveIsolationResult } from "./types";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
@@ -270,7 +270,7 @@ const ValveIsolation: React.FC<ValveIsolationProps> = ({
if (disabled.length > 0) { if (disabled.length > 0) {
params.disabled_valves = disabled; params.disabled_valves = disabled;
} }
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/valve_isolation_analysis/`, `${config.BACKEND_URL}/api/v1/valve_isolation_analysis/`,
{ {
params, params,

View File

@@ -17,7 +17,7 @@ import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import dayjs, { Dayjs } from "dayjs"; import dayjs, { Dayjs } from "dayjs";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
import { useMap } from "@app/OlMap/MapComponent"; import { useMap } from "@app/OlMap/MapComponent";
import VectorLayer from "ol/layer/Vector"; import VectorLayer from "ol/layer/Vector";
@@ -189,7 +189,7 @@ const AnalysisParameters: React.FC = () => {
scheme_name: schemeName, scheme_name: schemeName,
}; };
await axios.get(`${config.BACKEND_URL}/api/v1/contaminant_simulation/`, { await api.get(`${config.BACKEND_URL}/api/v1/contaminant_simulation/`, {
params, params,
}); });

View File

@@ -25,7 +25,7 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import dayjs, { Dayjs } from "dayjs"; import dayjs, { Dayjs } from "dayjs";
import axios from "axios"; import { api } from "@/lib/api";
import moment from "moment"; import moment from "moment";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import { config, NETWORK_NAME } from "@config/config"; import { config, NETWORK_NAME } from "@config/config";
@@ -180,7 +180,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
if (!queryAll && !queryDate) return; if (!queryAll && !queryDate) return;
setLoading(true); setLoading(true);
try { try {
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`, `${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`,
); );
let filteredResults = response.data; let filteredResults = response.data;

View File

@@ -25,7 +25,7 @@ import { Style, Stroke, Fill, Circle as CircleStyle } from "ol/style";
import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/mapQueryService"; import { handleMapClickSelectFeatures as mapClickSelectFeatures } from "@/utils/mapQueryService";
import Feature, { FeatureLike } from "ol/Feature"; import Feature, { FeatureLike } from "ol/Feature";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
interface ValveItem { interface ValveItem {
@@ -242,7 +242,7 @@ const AnalysisParameters: React.FC = () => {
// but axios usually handles array as valves[]=1&valves[]=2 // but axios usually handles array as valves[]=1&valves[]=2
// FastAPI default expects repeated query params. // FastAPI default expects repeated query params.
const response = await axios.get(`${config.BACKEND_URL}/flushing_analysis/`, { const response = await api.get(`${config.BACKEND_URL}/flushing_analysis/`, {
params, params,
// Ensure arrays are sent as repeated keys: valves=1&valves=2 // Ensure arrays are sent as repeated keys: valves=1&valves=2
paramsSerializer: { paramsSerializer: {

View File

@@ -27,7 +27,7 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import "dayjs/locale/zh-cn"; import "dayjs/locale/zh-cn";
import dayjs, { Dayjs } from "dayjs"; import dayjs, { Dayjs } from "dayjs";
import axios from "axios"; import { api } from "@/lib/api";
import moment from "moment"; import moment from "moment";
import { config, NETWORK_NAME } from "@config/config"; import { config, NETWORK_NAME } from "@config/config";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
@@ -221,7 +221,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true); setLoading(true);
try { try {
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`, `${config.BACKEND_URL}/api/v1/getallschemes/?network=${network}`,
); );

View File

@@ -29,6 +29,7 @@ import { TbArrowBackUp, TbArrowForwardUp } from "react-icons/tb";
import { FiSkipBack, FiSkipForward } from "react-icons/fi"; import { FiSkipBack, FiSkipForward } from "react-icons/fi";
import { useData } from "../../../app/OlMap/MapComponent"; import { useData } from "../../../app/OlMap/MapComponent";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
import { apiFetch } from "@/lib/apiFetch";
import { useMap } from "../../../app/OlMap/MapComponent"; import { useMap } from "../../../app/OlMap/MapComponent";
import { useHealthRisk } from "./HealthRiskContext"; import { useHealthRisk } from "./HealthRiskContext";
import { import {
@@ -422,7 +423,7 @@ const Timeline: React.FC<TimelineProps> = ({
undoableTimeout: 3, undoableTimeout: 3,
}); });
try { try {
const response = await fetch( const response = await apiFetch(
`${config.BACKEND_URL}/api/v1/composite/pipeline-health-prediction?query_time=${query_time}&network_name=${NETWORK_NAME}`, `${config.BACKEND_URL}/api/v1/composite/pipeline-health-prediction?query_time=${query_time}&network_name=${NETWORK_NAME}`,
); );

View File

@@ -12,12 +12,12 @@ import {
import { PlayArrow as PlayArrowIcon } from "@mui/icons-material"; import { PlayArrow as PlayArrowIcon } from "@mui/icons-material";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import { useGetIdentity } from "@refinedev/core"; import { useGetIdentity } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { config, NETWORK_NAME } from "@/config/config"; import { config, NETWORK_NAME } from "@/config/config";
type IUser = { type IUser = {
id: number; id: string;
name: string; name?: string;
}; };
const OptimizationParameters: React.FC = () => { const OptimizationParameters: React.FC = () => {
@@ -83,7 +83,7 @@ const OptimizationParameters: React.FC = () => {
setAnalyzing(true); setAnalyzing(true);
if (!user || !user.name) { if (!user || !user.id) {
open?.({ open?.({
type: "error", type: "error",
message: "用户信息无效", message: "用户信息无效",
@@ -93,7 +93,7 @@ const OptimizationParameters: React.FC = () => {
try { try {
// 发送优化请求 // 发送优化请求
const response = await axios.post( const response = await api.post(
`${config.BACKEND_URL}/api/v1/sensorplacementscheme/create`, `${config.BACKEND_URL}/api/v1/sensorplacementscheme/create`,
null, null,
{ {
@@ -104,6 +104,7 @@ const OptimizationParameters: React.FC = () => {
method: method, method: method,
sensor_count: sensorCount, sensor_count: sensorCount,
min_diameter: minDiameter, min_diameter: minDiameter,
user_id: user.id,
user_name: user.name, user_name: user.name,
}, },
} }

View File

@@ -24,7 +24,7 @@ import { LocalizationProvider } from "@mui/x-date-pickers/LocalizationProvider";
import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs"; import { AdapterDayjs } from "@mui/x-date-pickers/AdapterDayjs";
import "dayjs/locale/zh-cn"; // 引入中文包 import "dayjs/locale/zh-cn"; // 引入中文包
import dayjs, { Dayjs } from "dayjs"; import dayjs, { Dayjs } from "dayjs";
import axios from "axios"; import { api } from "@/lib/api";
import moment from "moment"; import moment from "moment";
import { config, NETWORK_NAME } from "@config/config"; import { config, NETWORK_NAME } from "@config/config";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
@@ -148,7 +148,7 @@ const SchemeQuery: React.FC<SchemeQueryProps> = ({
setLoading(true); setLoading(true);
try { try {
const response = await axios.get( const response = await api.get(
`${config.BACKEND_URL}/api/v1/getallsensorplacements/?network=${network}`, `${config.BACKEND_URL}/api/v1/getallsensorplacements/?network=${network}`,
); );

View File

@@ -37,14 +37,15 @@ import { zhCN as pickerZhCN } from "@mui/x-date-pickers/locales";
import config from "@/config/config"; import config from "@/config/config";
import { useGetIdentity } from "@refinedev/core"; import { useGetIdentity } from "@refinedev/core";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { apiFetch } from "@/lib/apiFetch";
dayjs.extend(utc); dayjs.extend(utc);
dayjs.extend(timezone); dayjs.extend(timezone);
type IUser = { type IUser = {
id: number; id: string;
name: string; name?: string;
}; };
export interface TimeSeriesPoint { export interface TimeSeriesPoint {
@@ -96,10 +97,10 @@ const fetchFromBackend = async (
try { try {
// 优先查询清洗数据和模拟数据 // 优先查询清洗数据和模拟数据
const [cleaningRes, simulationRes] = await Promise.all([ const [cleaningRes, simulationRes] = await Promise.all([
fetch(cleaningDataUrl) apiFetch(cleaningDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(simulationDataUrl) apiFetch(simulationDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
]); ]);
@@ -118,7 +119,7 @@ const fetchFromBackend = async (
); );
} else { } else {
// 如果清洗数据没有数据,查询原始数据,返回模拟和原始数据 // 如果清洗数据没有数据,查询原始数据,返回模拟和原始数据
const rawRes = await fetch(rawDataUrl) const rawRes = await apiFetch(rawDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null); .catch(() => null);
const rawData = transformBackendData(rawRes, deviceIds); const rawData = transformBackendData(rawRes, deviceIds);
@@ -338,13 +339,13 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
const simulationDataUrl = `${config.BACKEND_URL}/api/v1/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`; const simulationDataUrl = `${config.BACKEND_URL}/api/v1/composite/scada-simulation?device_ids=${device_ids}&start_time=${start_time}&end_time=${end_time}`;
try { try {
const [cleanRes, rawRes, simRes] = await Promise.all([ const [cleanRes, rawRes, simRes] = await Promise.all([
fetch(cleaningDataUrl) apiFetch(cleaningDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(rawDataUrl) apiFetch(rawDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
fetch(simulationDataUrl) apiFetch(simulationDataUrl)
.then((r) => (r.ok ? r.json() : null)) .then((r) => (r.ok ? r.json() : null))
.catch(() => null), .catch(() => null),
]); ]);
@@ -458,7 +459,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
return; return;
} }
if (!user || !user.name) { if (!user || !user.id) {
open?.({ open?.({
type: "error", type: "error",
message: "用户信息无效,请重新登录", message: "用户信息无效,请重新登录",
@@ -474,7 +475,7 @@ const SCADADataPanel: React.FC<SCADADataPanelProps> = ({
const endTime = dayjs(rangeTo).toISOString(); const endTime = dayjs(rangeTo).toISOString();
// 调用后端清洗接口 // 调用后端清洗接口
const response = await axios.post( const response = await api.post(
`${ `${
config.BACKEND_URL config.BACKEND_URL
}/api/v1/composite/clean-scada?device_ids=${deviceIds.join( }/api/v1/composite/clean-scada?device_ids=${deviceIds.join(

View File

@@ -48,7 +48,7 @@ import {
} from "@mui/icons-material"; } from "@mui/icons-material";
import { FixedSizeList } from "react-window"; import { FixedSizeList } from "react-window";
import { useNotification } from "@refinedev/core"; import { useNotification } from "@refinedev/core";
import axios from "axios"; import { api } from "@/lib/api";
import { useGetIdentity } from "@refinedev/core"; import { useGetIdentity } from "@refinedev/core";
import config from "@/config/config"; import config from "@/config/config";
@@ -104,8 +104,8 @@ interface SCADADeviceListProps {
} }
type IUser = { type IUser = {
id: number; id: string;
name: string; name?: string;
}; };
const SCADADeviceList: React.FC<SCADADeviceListProps> = ({ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
@@ -601,7 +601,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
return; return;
} }
if (!user || !user.name) { if (!user || !user.id) {
open?.({ open?.({
type: "error", type: "error",
message: "用户信息无效,请重新登录", message: "用户信息无效,请重新登录",
@@ -622,7 +622,7 @@ const SCADADeviceList: React.FC<SCADADeviceListProps> = ({
const endTime = dayjs(cleanEndTime).toISOString(); const endTime = dayjs(cleanEndTime).toISOString();
// 调用后端清洗接口 // 调用后端清洗接口
const response = await axios.post( const response = await api.post(
`${config.BACKEND_URL}/api/v1/composite/clean-scada?device_ids=all&start_time=${startTime}&end_time=${endTime}`, `${config.BACKEND_URL}/api/v1/composite/clean-scada?device_ids=all&start_time=${startTime}&end_time=${endTime}`,
); );

View File

@@ -15,49 +15,111 @@ import {
IconButton, IconButton,
} from "@mui/material"; } from "@mui/material";
import CloseIcon from "@mui/icons-material/Close"; import CloseIcon from "@mui/icons-material/Close";
import { useState } from "react"; import { useEffect, useState } from "react";
import { apiFetch } from "@/lib/apiFetch";
import { config, NETWORK_NAME } from "@/config/config";
interface ProjectSelectorProps { interface ProjectSelectorProps {
open: boolean; open: boolean;
onSelect: (workspace: string, networkName: string, extent: number[]) => void; onSelect: (
projectId: string,
workspace: string,
networkName: string,
extent: number[],
) => void;
onClose?: () => void; onClose?: () => void;
} }
const PROJECTS = [ type ProjectOption = {
{ id: string;
label: "默认", label: string;
workspace: "tjwater", workspace: string;
networkName: "tjwater", networkName: string;
extent: [13508802, 3608164, 13555651, 3633686], extent: number[];
}, description?: string | null;
{ status?: string | null;
label: "苏州河", projectRole?: string | null;
workspace: "szh", };
networkName: "szh",
extent: [13490131, 3630016, 13525879, 3666969],
},
{
label: "测试项目",
workspace: "test",
networkName: "test",
extent: [13508849, 3608036, 13555781, 3633813],
},
];
export const ProjectSelector: React.FC<ProjectSelectorProps> = ({ export const ProjectSelector: React.FC<ProjectSelectorProps> = ({
open, open,
onSelect, onSelect,
onClose, onClose,
}) => { }) => {
const [workspace, setWorkspace] = useState(PROJECTS[0].workspace); const [projects, setProjects] = useState<ProjectOption[]>([]);
const [networkName, setNetworkName] = useState(PROJECTS[0].networkName); const [isLoading, setIsLoading] = useState(false);
const [extent, setExtent] = useState<number[]>( const [loadError, setLoadError] = useState<string | null>(null);
PROJECTS[0].extent, const [projectId, setProjectId] = useState("");
); const [projectIdError, setProjectIdError] = useState<string | null>(null);
const [workspace, setWorkspace] = useState(config.MAP_WORKSPACE);
const [networkName, setNetworkName] = useState(NETWORK_NAME || "tjwater");
const [extent, setExtent] = useState<number[]>(config.MAP_EXTENT);
const [customMode, setCustomMode] = useState(false); const [customMode, setCustomMode] = useState(false);
useEffect(() => {
const fetchProjects = async () => {
setIsLoading(true);
setLoadError(null);
try {
const response = await apiFetch(
`${config.BACKEND_URL}/api/v1/meta/projects`,
);
if (!response.ok) {
throw new Error(`HTTP ${response.status}`);
}
const data = await response.json();
const mapped: ProjectOption[] = Array.isArray(data)
? data.map((item) => {
const bbox = Array.isArray(item.map_extent?.bbox)
? item.map_extent.bbox.map((value: number) => Number(value))
: null;
return {
id: item.project_id,
label: item.name || item.code || item.project_id,
workspace: item.gs_workspace || config.MAP_WORKSPACE,
networkName: item.code || NETWORK_NAME || config.MAP_WORKSPACE,
extent:
bbox && bbox.length === 4 ? bbox : config.MAP_EXTENT,
description: item.description,
status: item.status,
projectRole: item.project_role,
};
})
: [];
setProjects(mapped);
const savedProjectId = localStorage.getItem("active_project");
const initial =
(savedProjectId &&
mapped.find((project) => project.id === savedProjectId)) ||
mapped[0];
if (initial) {
setProjectId(initial.id);
setWorkspace(initial.workspace);
setNetworkName(initial.networkName);
setExtent(initial.extent);
setCustomMode(false);
} else {
setCustomMode(true);
}
} catch (error) {
console.error("Failed to load projects:", error);
setLoadError("项目列表加载失败,请使用自定义配置");
setCustomMode(true);
} finally {
setIsLoading(false);
}
};
fetchProjects();
}, []);
const handleConfirm = () => { const handleConfirm = () => {
onSelect(workspace, networkName, extent); if (!projectId.trim()) {
setProjectIdError("项目 ID 不能为空");
return;
}
setProjectIdError(null);
onSelect(projectId.trim(), workspace, networkName, extent);
}; };
return ( return (
@@ -117,29 +179,46 @@ export const ProjectSelector: React.FC<ProjectSelectorProps> = ({
<FormControl fullWidth variant="outlined"> <FormControl fullWidth variant="outlined">
<InputLabel></InputLabel> <InputLabel></InputLabel>
<Select <Select
value={workspace} value={projectId}
label="项目" label="项目"
onChange={(e) => { onChange={(e) => {
const val = e.target.value; const val = e.target.value;
if (val === "custom") { if (val === "custom") {
setCustomMode(true); setCustomMode(true);
setProjectIdError(null);
} else { } else {
const p = PROJECTS.find((p) => p.workspace === val); const p = projects.find((p) => p.id === val);
if (p) { if (p) {
setProjectId(p.id);
setWorkspace(p.workspace); setWorkspace(p.workspace);
setNetworkName(p.networkName); setNetworkName(p.networkName);
setExtent(p.extent); setExtent(p.extent);
setProjectIdError(null);
} }
} }
}} }}
> >
{PROJECTS.map((p) => ( {projects.length === 0 && (
<MenuItem key={p.workspace} value={p.workspace}> <MenuItem value="" disabled>
<Typography variant="body2" color="text.secondary">
{isLoading ? "正在加载项目..." : "暂无可用项目"}
</Typography>
</MenuItem>
)}
{projects.map((p) => (
<MenuItem key={p.id} value={p.id}>
<Box sx={{ display: "flex", flexDirection: "column" }}> <Box sx={{ display: "flex", flexDirection: "column" }}>
<Typography variant="body1">{p.label}</Typography> <Typography variant="body1">{p.label}</Typography>
<Typography variant="caption" color="text.secondary"> <Typography variant="caption" color="text.secondary">
: {p.workspace} | : {p.networkName} : {p.workspace} | : {p.networkName}
</Typography> </Typography>
{(p.status || p.projectRole) && (
<Typography variant="caption" color="text.secondary">
{p.status ? `状态: ${p.status}` : ""}
{p.status && p.projectRole ? " | " : ""}
{p.projectRole ? `角色: ${p.projectRole}` : ""}
</Typography>
)}
</Box> </Box>
</MenuItem> </MenuItem>
))} ))}
@@ -147,9 +226,27 @@ export const ProjectSelector: React.FC<ProjectSelectorProps> = ({
<Typography variant="body1">...</Typography> <Typography variant="body1">...</Typography>
</MenuItem> </MenuItem>
</Select> </Select>
{loadError && (
<Typography variant="caption" color="error">
{loadError}
</Typography>
)}
</FormControl> </FormControl>
) : ( ) : (
<Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}> <Box sx={{ display: "flex", flexDirection: "column", gap: 2 }}>
<TextField
label="项目 ID"
value={projectId}
onChange={(e) => {
setProjectId(e.target.value);
setProjectIdError(null);
}}
fullWidth
helperText={
projectIdError || "例如: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
}
error={Boolean(projectIdError)}
/>
<TextField <TextField
label="Geoserver 工作区" label="Geoserver 工作区"
value={workspace} value={workspace}

View File

@@ -3,6 +3,8 @@ import React, { createContext, useContext, useEffect, useState } from "react";
import { useSession } from "next-auth/react"; import { useSession } from "next-auth/react";
import { config, NETWORK_NAME, setMapWorkspace, setNetworkName, setMapExtent } from "@/config/config"; import { config, NETWORK_NAME, setMapWorkspace, setNetworkName, setMapExtent } from "@/config/config";
import { ProjectSelector } from "@/components/project/ProjectSelector"; import { ProjectSelector } from "@/components/project/ProjectSelector";
import { apiFetch } from "@/lib/apiFetch";
import { useProjectStore } from "@/store/projectStore";
interface ProjectContextType { interface ProjectContextType {
workspace: string; workspace: string;
@@ -17,6 +19,9 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
}) => { }) => {
const { status } = useSession(); const { status } = useSession();
const [isConfigured, setIsConfigured] = useState(false); const [isConfigured, setIsConfigured] = useState(false);
const setCurrentProjectId = useProjectStore(
(state) => state.setCurrentProjectId,
);
const [currentProject, setCurrentProject] = useState({ const [currentProject, setCurrentProject] = useState({
workspace: config.MAP_WORKSPACE, workspace: config.MAP_WORKSPACE,
networkName: NETWORK_NAME || "tjwater", networkName: NETWORK_NAME || "tjwater",
@@ -28,10 +33,12 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
const savedWorkspace = localStorage.getItem("NEXT_PUBLIC_MAP_WORKSPACE"); const savedWorkspace = localStorage.getItem("NEXT_PUBLIC_MAP_WORKSPACE");
const savedNetwork = localStorage.getItem("NEXT_PUBLIC_NETWORK_NAME"); const savedNetwork = localStorage.getItem("NEXT_PUBLIC_NETWORK_NAME");
const savedExtent = localStorage.getItem("NEXT_PUBLIC_MAP_EXTENT"); const savedExtent = localStorage.getItem("NEXT_PUBLIC_MAP_EXTENT");
const savedProjectId = localStorage.getItem("active_project");
// If we have saved config, use it. // If we have saved config, use it.
if (savedWorkspace && savedNetwork) { if (savedWorkspace && savedNetwork) {
applyConfig( applyConfig(
savedProjectId || savedNetwork || savedWorkspace,
savedWorkspace, savedWorkspace,
savedNetwork, savedNetwork,
savedExtent ? savedExtent.split(",").map(Number) : config.MAP_EXTENT, savedExtent ? savedExtent.split(",").map(Number) : config.MAP_EXTENT,
@@ -39,7 +46,13 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
} }
}, []); }, []);
const applyConfig = async (ws: string, net: string, extent: number[]) => { const applyConfig = async (
projectId: string,
ws: string,
net: string,
extent: number[],
) => {
const resolvedProjectId = projectId || net || ws;
setMapWorkspace(ws); setMapWorkspace(ws);
setNetworkName(net); setNetworkName(net);
setMapExtent(extent); setMapExtent(extent);
@@ -47,6 +60,7 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
// Reset extent cache // Reset extent cache
localStorage.removeItem(`${ws}_map_view`); localStorage.removeItem(`${ws}_map_view`);
setCurrentProject({ workspace: ws, networkName: net, extent: extent }); setCurrentProject({ workspace: ws, networkName: net, extent: extent });
setCurrentProjectId(resolvedProjectId);
// Save to localStorage // Save to localStorage
localStorage.setItem("NEXT_PUBLIC_MAP_WORKSPACE", ws); localStorage.setItem("NEXT_PUBLIC_MAP_WORKSPACE", ws);
@@ -55,9 +69,25 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
setIsConfigured(true); setIsConfigured(true);
try { try {
await fetch(`${config.BACKEND_URL}/openproject/?network=${net}`, { const response = await apiFetch(
method: "POST", `${config.BACKEND_URL}/openproject/?network=${net}`,
}); {
method: "POST",
},
);
if (!response.ok) {
throw new Error(`HTTP ${response.status}`);
}
const data = await response.json();
const bbox = Array.isArray(data?.map_extent?.bbox)
? data.map_extent.bbox.map((value: number) => Number(value))
: null;
if (bbox && bbox.length === 4) {
setMapExtent(bbox);
localStorage.setItem("NEXT_PUBLIC_MAP_EXTENT", bbox.join(","));
localStorage.removeItem(`${ws}_map_view`);
setCurrentProject((prev) => ({ ...prev, extent: bbox }));
}
} catch (error) { } catch (error) {
console.error("Failed to open project:", error); console.error("Failed to open project:", error);
} }
@@ -68,7 +98,9 @@ export const ProjectProvider: React.FC<{ children: React.ReactNode }> = ({
return ( return (
<ProjectSelector <ProjectSelector
open={true} open={true}
onSelect={(ws, net, extent) => applyConfig(ws, net, extent)} onSelect={(projectId, ws, net, extent) =>
applyConfig(projectId, ws, net, extent)
}
/> />
); );
} }

34
src/lib/api.ts Normal file
View File

@@ -0,0 +1,34 @@
import axios from "axios";
import { config } from "@config/config";
import { useProjectStore } from "@/store/projectStore";
import { getAccessToken } from "@/lib/authToken";
export const API_URL = process.env.NEXT_PUBLIC_API_URL || config.BACKEND_URL;
export const api = axios.create({
baseURL: API_URL,
});
const isMetaProjectsRequest = (request: {
baseURL?: string;
url?: string;
}) => {
const url = `${request.baseURL ?? ""}${request.url ?? ""}`;
return url.includes("/api/v1/meta/projects");
};
api.interceptors.request.use(async (request) => {
const accessToken = await getAccessToken();
if (accessToken) {
request.headers = request.headers ?? {};
request.headers.Authorization = `Bearer ${accessToken}`;
}
const projectId = useProjectStore.getState().currentProjectId;
if (projectId && !isMetaProjectsRequest(request)) {
request.headers = request.headers ?? {};
request.headers["X-Project-Id"] = projectId;
}
return request;
});

28
src/lib/apiFetch.ts Normal file
View File

@@ -0,0 +1,28 @@
import { useProjectStore } from "@/store/projectStore";
import { getAccessToken } from "@/lib/authToken";
const resolveUrl = (input: RequestInfo | URL) => {
if (typeof input === "string") return input;
if (input instanceof URL) return input.toString();
if (input instanceof Request) return input.url;
return "";
};
const isMetaProjectsRequest = (input: RequestInfo | URL) =>
resolveUrl(input).includes("/api/v1/meta/projects");
export const apiFetch = async (
input: RequestInfo | URL,
init: RequestInit = {},
) => {
const projectId = useProjectStore.getState().currentProjectId;
const headers = new Headers(init.headers ?? {});
const accessToken = await getAccessToken();
if (accessToken) {
headers.set("Authorization", `Bearer ${accessToken}`);
}
if (projectId && !isMetaProjectsRequest(input)) {
headers.set("X-Project-Id", projectId);
}
return fetch(input, { ...init, headers });
};

51
src/lib/authToken.ts Normal file
View File

@@ -0,0 +1,51 @@
import { getSession } from "next-auth/react";
import { useAuthStore } from "@/store/authStore";
const decodeJwtPayload = (token: string) => {
const parts = token.split(".");
if (parts.length < 2) {
console.warn("Invalid JWT format.");
return null;
}
const base64 = parts[1].replace(/-/g, "+").replace(/_/g, "/");
const padded = base64.padEnd(Math.ceil(base64.length / 4) * 4, "=");
try {
const json =
typeof window !== "undefined"
? window.atob(padded)
: Buffer.from(padded, "base64").toString("utf-8");
return JSON.parse(json);
} catch (error) {
console.warn("Failed to decode JWT payload.", error);
return null;
}
};
const isTokenExpired = (token: string) => {
const payload = decodeJwtPayload(token);
if (!payload) {
return true;
}
if (typeof payload.exp !== "number") {
return false;
}
const now = Date.now();
return now >= payload.exp * 1000 - 30_000;
};
export const getAccessToken = async () => {
const { accessToken, setAccessToken } = useAuthStore.getState();
if (accessToken && !isTokenExpired(accessToken)) {
return accessToken;
}
if (accessToken) {
setAccessToken(null);
}
const session = await getSession();
const token = typeof session?.accessToken === "string" ? session.accessToken : null;
if (token && !isTokenExpired(token)) {
setAccessToken(token);
return token;
}
return null;
};

View File

@@ -1,7 +1,6 @@
"use client"; "use client";
import dataProviderSimpleRest from "@refinedev/simple-rest"; import dataProviderSimpleRest from "@refinedev/simple-rest";
import { api, API_URL } from "@/lib/api";
const API_URL = "https://api.fake-rest.refine.dev"; export const dataProvider = dataProviderSimpleRest(API_URL, api);
export const dataProvider = dataProviderSimpleRest(API_URL);

11
src/store/authStore.ts Normal file
View File

@@ -0,0 +1,11 @@
import { create } from "zustand";
interface AuthState {
accessToken: string | null;
setAccessToken: (token: string | null) => void;
}
export const useAuthStore = create<AuthState>((set) => ({
accessToken: null,
setAccessToken: (token) => set({ accessToken: token }),
}));

27
src/store/projectStore.ts Normal file
View File

@@ -0,0 +1,27 @@
import { create } from "zustand";
interface ProjectState {
currentProjectId: string | null;
setCurrentProjectId: (id: string | null) => void;
}
const getInitialProjectId = () => {
if (typeof window === "undefined") {
return null;
}
return localStorage.getItem("active_project");
};
export const useProjectStore = create<ProjectState>((set) => ({
currentProjectId: getInitialProjectId(),
setCurrentProjectId: (id) => {
if (typeof window !== "undefined") {
if (id) {
localStorage.setItem("active_project", id);
} else {
localStorage.removeItem("active_project");
}
}
set({ currentProjectId: id });
},
}));

25
src/types/next-auth.d.ts vendored Normal file
View File

@@ -0,0 +1,25 @@
import "next-auth";
import "next-auth/jwt";
declare module "next-auth" {
interface Session {
accessToken?: string;
user?: {
id?: string;
name?: string | null;
email?: string | null;
image?: string | null;
};
}
interface User {
id?: string;
}
}
declare module "next-auth/jwt" {
interface JWT {
sub?: string;
accessToken?: string;
}
}