hansjone/netx
1
0
Fork 0
mirror of https://github.com/hansjone/netx.git synced 2026-10-11 15:30:45 +08:00
Code Issues Projects Releases 1 Packages Wiki Activity Actions

Default discover auto-placeholder and canvas neighbor project on.

Browse source 
Sync the canvas auto-add toggle with the shared LLDP collect policy so topology collect and canvas discover stay consistent.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-08-05 19:09:09 +08:00
parent af91c09d80
commit 51f061032a
4 changed files with 43 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

37
web/src/pages/TopologyPage.tsx
View file

@ -40,6 +40,7 @@ import {
createTopologyView,
deleteTopologyFolder,
deleteTopologyMap,
fetchLldpCollectDashboard,
fetchLldpDiscoverJob,
fetchManagedNe,
fetchManagedNeById,
@ -52,6 +53,7 @@ import {
removeTopologyViewNodes,
searchFabricNodes,
startLldpDiscover,
updateLldpCollectPolicy,
updateTopologyFolder,
updateTopologyMap,
} from "../services/api";
@ -458,8 +460,8 @@ type EdgeDefaults = Record<EdgeSourceKind, EdgeDefaultStyle>;
const EDGE_DEFAULTS_KEY = "netx.topology.edgeDefaults";
const AUTO_LAYOUT_DISCOVER_KEY = "netx.topology.autoLayoutAfterDiscover";
const DISCOVER_AUTO_ADD_KEY = "netx.topology.discoverAutoAddUnmatched";
const DISCOVER_PROJECT_NEIGHBORS_KEY = "netx.topology.discoverProjectNeighbors";
const DISCOVER_AUTO_ADD_KEY = "netx.topology.discoverAutoAddUnmatched.v2";
const DISCOVER_PROJECT_NEIGHBORS_KEY = "netx.topology.discoverProjectNeighbors.v2";
const SCALE_BUNDLE_WIDTH_KEY = "netx.topology.scaleBundleWidth";
const CANVAS_BG_KEY = "netx.topology.canvasBg";
const DEFAULT_CANVAS_BG = "#0f172a";
@ -845,10 +847,10 @@ export function TopologyPage() {
const [snapToGrid, setSnapToGrid] = useState(true);
const [autoLayoutAfterDiscover, setAutoLayoutAfterDiscover] = useState(loadAutoLayoutAfterDiscover);
const [discoverAutoAddUnmatched, setDiscoverAutoAddUnmatched] = useState(() =>
loadBoolFlag(DISCOVER_AUTO_ADD_KEY, false),
loadBoolFlag(DISCOVER_AUTO_ADD_KEY, true),
);
const [discoverProjectNeighbors, setDiscoverProjectNeighbors] = useState(() =>
loadBoolFlag(DISCOVER_PROJECT_NEIGHBORS_KEY, false),
loadBoolFlag(DISCOVER_PROJECT_NEIGHBORS_KEY, true),
);
const [sidebarCollapsed, setSidebarCollapsed] = useState(false);
const [addNeOpen, setAddNeOpen] = useState(false);
@ -1049,6 +1051,24 @@ export function TopologyPage() {
}
}, [mapId]);
// Keep canvas "auto placeholder" in sync with topology LLDP collect policy (shared strategy).
useEffect(() => {
let alive = true;
void fetchLldpCollectDashboard()
.then((dash) => {
if (!alive || !dash?.policy) return;
const next = Boolean(dash.policy.auto_add_unmatched);
setDiscoverAutoAddUnmatched(next);
persistBoolFlag(DISCOVER_AUTO_ADD_KEY, next);
})
.catch(() => {
/* keep local default */
});
return () => {
alive = false;
};
}, []);
const neQuery = useQuery({
queryKey: [...queryKeys.managedNeAll, "topology-add-ne", debouncedKeyword],
queryFn: () =>
@ -3097,6 +3117,15 @@ export function TopologyPage() {
const next = e.target.checked;
setDiscoverAutoAddUnmatched(next);
persistBoolFlag(DISCOVER_AUTO_ADD_KEY, next);
void updateLldpCollectPolicy({ auto_add_unmatched: next })
.then(() => {
void queryClient.invalidateQueries({
queryKey: queryKeys.lldpCollectDashboard,
});
})
.catch(() => {
/* local toggle still applies to this canvas discover */
});
}}
/>
{t("topology.discoverAutoAddUnmatched")}

3
web/src/pages/network/LldpLinksPage.tsx
View file

@ -338,6 +338,9 @@ export function LldpLinksPage() {
<input type="checkbox" checked={autoAdd} onChange={(e) => setAutoAdd(e.target.checked)} />
<span>{t("lldpLinks.autoAddUnmatched")}</span>
</label>
<p className="muted" style={{ margin: "0 0 8px", gridColumn: "1 / -1" }}>
{t("lldpLinks.autoAddUnmatchedHint")}
</p>
<label className="config-sync-policy-field">
<span>{t("lldpLinks.interval")}</span>
<input