Skip to content

Enhance context menu and link creation modal #82

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
breyr merged 1 commit into from
Mar 31, 2025
Merged

Enhance context menu and link creation modal #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions frontend/src/components/reactflow/overlayui/ContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,17 @@ export default function ContextMenu({
onClick(); // close the context menu
setDisableDelete(true);
// Check if the device has any edges
const edgesForDevice = edges.filter(e => e.source === node?.data.deviceData?.name || e.target === node?.data.deviceData?.name);
console.log(edgesForDevice);
const edgesForDevice = edges.filter(e => e.source === node?.data.deviceData?.name || e.target === node?.data.deviceData?.name).map(e => ({
value: e.id,
label: `(${e.source}) ${e.data?.sourcePort ?? ''} -> (${e.target}) ${e.data?.targetPort ?? ''}`,
firstLabDevice: e.source,
firstLabDevicePort: e.data?.sourcePort ?? '',
secondLabDevice: e.target,
secondLabDevicePort: e.data?.targetPort ?? '',
}));
if (edgesForDevice.length > 0) {
// attempt to delete all links
const numFailures = await deleteLinkBulk(new Set(currentEdges));
const numFailures = await deleteLinkBulk(new Set(edgesForDevice));

// only remove the node if all links were successfully deleted
if (numFailures === 0) {
Expand Down
30 changes: 20 additions & 10 deletions frontend/src/components/reactflow/overlayui/CreateLinkModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,16 @@ export default function CreateLinkModal({ deviceData, currentDevicePorts, labDev
disabled={!!deviceData?.name}
>
<option value="">Select a Device</option>
{labDevices.filter((device) => device.userId == null || device.userId == user?.id).map((device) => (
<option key={device.id} value={device.name} disabled={device.name === selectedSecondDevice}>
{device.name}
</option>
))}
{labDevices.filter((device) => device.userId == null || device.userId == user?.id).map((device) => {
const portsArray = device.ports.split(',');
const generatedPorts = portsArray.flatMap(portDef => generatePorts(portDef));
const hasAvailablePorts = generatedPorts.some(port => !firstDeviceOccupiedPorts.includes(port));
return (
<option key={device.id} value={device.name} disabled={!hasAvailablePorts || device.name === selectedSecondDevice}>
{device.name} {!hasAvailablePorts ? '(no available ports)' : ''}
</option>
);
})}
</select>
</div>
<div className="pb-2 border-b">
Expand All @@ -139,11 +144,16 @@ export default function CreateLinkModal({ deviceData, currentDevicePorts, labDev
className="block w-full mt-1 rounded-md bg-[#ffffff] focus:outline-none"
>
<option value="">Select a Device</option>
{filteredLabDevices.filter((device) => (device.userId == null || device.userId == user?.id) && currentNodesInTopology.has(device.name)).map((device) => (
<option key={device.id} value={device.name} disabled={device.name === selectedFirstDevice}>
{device.name}
</option>
))}
{filteredLabDevices.filter((device) => (device.userId == null || device.userId == user?.id) && currentNodesInTopology.has(device.name)).map((device) => {
const portsArray = device.ports.split(',');
const generatedPorts = portsArray.flatMap(portDef => generatePorts(portDef));
const hasAvailablePorts = generatedPorts.some(port => !secondDeviceOccupiedPorts.includes(port));
return (
<option key={device.id} value={device.name} disabled={!hasAvailablePorts || device.name === selectedFirstDevice}>
{device.name} {!hasAvailablePorts ? '(no available ports)' : ''}
</option>
);
})}
</select>
</div>
<div className="pb-2 border-b">
Expand Down