Skip to content

Fix wrong mci selection in mouse right-click menu #228

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
cb-github-robot merged 1 commit into from
Jan 9, 2026
Merged

Fix wrong mci selection in mouse right-click menu #228

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
48 changes: 34 additions & 14 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,8 +679,23 @@ function findNearestMci(clickCoord) {
return (minDistance < 100) ? nearestMci : null;
}

// Store the MCI selected via right-click context menu
let contextMenuSelectedMci = null;

// Helper function to get the currently selected MCI ID
// Prioritizes context menu selection over dropdown selection
function getSelectedMciId() {
if (contextMenuSelectedMci) {
return contextMenuSelectedMci;
}
return mciidElement ? mciidElement.value : null;
}

// Function to show MCI context menu
function showMciContextMenu(pixel, mciInfo) {
// Store the selected MCI for use in control actions
contextMenuSelectedMci = mciInfo.name;

// Sync namespace from Provision tab to Control tab
const provisionNamespace = document.getElementById('namespace');
const controlNamespace = document.getElementById('namespace-control');
Expand All @@ -699,8 +714,8 @@ function showMciContextMenu(pixel, mciInfo) {
newOption.text = provisionNamespace.value;
controlNamespace.add(newOption);
}
// Set value without triggering change event (avoid updateMciList race condition)
controlNamespace.value = provisionNamespace.value;
controlNamespace.dispatchEvent(new Event('change'));
}

// Set the selected MCI in the control panel
Expand All @@ -711,7 +726,6 @@ function showMciContextMenu(pixel, mciInfo) {
for (let option of mciSelect.options) {
if (option.value === mciInfo.name) {
optionExists = true;
mciSelect.value = mciInfo.name;
break;
}
}
Expand All @@ -721,10 +735,9 @@ function showMciContextMenu(pixel, mciInfo) {
newOption.value = mciInfo.name;
newOption.text = mciInfo.name;
mciSelect.add(newOption);
mciSelect.value = mciInfo.name;
}
// Trigger change event to update dependent fields
mciSelect.dispatchEvent(new Event('change'));
// Set value without triggering change event
mciSelect.value = mciInfo.name;
}

// Show context menu using SweetAlert
Expand Down Expand Up @@ -760,6 +773,13 @@ function showMciContextMenu(pixel, mciInfo) {
width: '700px',
customClass: {
popup: 'swal2-mci-context'
},
willClose: () => {
// Clear context menu selection when popup closes
// This allows normal dropdown selection to work again
setTimeout(() => {
contextMenuSelectedMci = null;
}, 100);
}
});
}
Expand Down Expand Up @@ -8322,7 +8342,7 @@ function controlMCI(action) {
var username = config.username;
var password = config.password;
var namespace = namespaceElement.value;
var mciid = mciidElement.value;
var mciid = getSelectedMciId();

if (!namespace) {
errorAlert("Please select a namespace first");
Expand Down Expand Up @@ -8524,7 +8544,7 @@ function statusMCI() {
var username = config.username;
var password = config.password;
var namespace = namespaceElement.value;
var mciid = mciidElement.value;
var mciid = getSelectedMciId();

// Validate required parameters
if (!namespace || namespace === "") {
Expand Down Expand Up @@ -8585,7 +8605,7 @@ function deleteMCI() {
var username = config.username;
var password = config.password;
var namespace = namespaceElement.value;
var mciid = mciidElement.value;
var mciid = getSelectedMciId();

var url = `http://${hostname}:${port}/tumblebug/ns/${namespace}/mci/${mciid}?option=terminate`;

Expand Down Expand Up @@ -10573,7 +10593,7 @@ function executeRemoteCmd() {
var username = config.username;
var password = config.password;
var namespace = namespaceElement.value;
var mciid = mciidElement.value;
var mciid = getSelectedMciId();
var subgroupid = getSubGroupIdFromVmSelection();
var vmid = document.getElementById("vmid").value;

Expand Down Expand Up @@ -10972,7 +10992,7 @@ function getAccessInfo() {
var username = config.username;
var password = config.password;
var namespace = namespaceElement.value;
var mciid = mciidElement.value;
var mciid = getSelectedMciId();

if (!namespace) {
errorAlert("Please select a namespace first");
Expand Down Expand Up @@ -12723,7 +12743,7 @@ function executeScaleOut(namespace, mciid, subgroupid, numVMsToAdd, hostname, po
// Function to show MCI Actions menu in SweetAlert
function showActionsMenu() {
var namespace = namespaceElement.value;
var mciid = document.getElementById("mciid").value;
var mciid = getSelectedMciId();

if (!namespace) {
errorAlert("Please select a namespace first");
Expand Down Expand Up @@ -12796,7 +12816,7 @@ function executeAction(action) {

// Add confirmation for dangerous actions
if (action === 'terminate') {
var mciid = document.getElementById("mciid").value;
var mciid = getSelectedMciId();
Swal.fire({
title: "⚠️ Confirm Termination",
html: `
Expand All @@ -12820,7 +12840,7 @@ function executeAction(action) {
}
});
} else if (action === 'withdraw') {
var mciid = document.getElementById("mciid").value;
var mciid = getSelectedMciId();
Swal.fire({
title: "⚠️ Confirm Withdraw",
html: `
Expand All @@ -12843,7 +12863,7 @@ function executeAction(action) {
}
});
} else if (action === 'delete') {
var mciid = document.getElementById("mciid").value;
var mciid = getSelectedMciId();
Swal.fire({
title: "⚠️ Confirm Delete",
html: `
Expand Down