@switchbot/homebridge-switchbot 5.0.0-beta.110 → 5.0.0-beta.112

package/dist/homebridge-ui/public/js/app.js

@@ -137,10 +137,20 @@ async function discoverDevices() {
     throw e;
   }
 }
-async function addDevice(deviceId, name, type) {
+async function addDevice(deviceId, name, type, options) {
   try {
-    uiLog.info("Adding device to config:", { deviceId, name, type });
-    const resp = await homebridge.request("/add-device", { deviceId, name, type });
+    const payload = { deviceId, name, type };
+    if (options?.address) {
+      payload.address = options.address;
+    }
+    if (options?.model) {
+      payload.model = options.model;
+    }
+    if (options?.rssi !== void 0 && options?.rssi !== null && options?.rssi !== 0) {
+      payload.rssi = options.rssi;
+    }
+    uiLog.info("Adding device to config:", payload);
+    const resp = await homebridge.request("/add-device", payload);
     uiLog.info("Add device response:", resp);
     if (!resp || resp.success === false) {
       throw new Error(resp?.data?.message || "Failed to add device");
@@ -284,6 +294,9 @@ __export(discovery_exports, {
   addDeviceToConfig: () => addDeviceToConfig,
   discoverDevices: () => discoverDevices2
 });
+function normalizeId(value) {
+  return String(value ?? "").trim().toLowerCase();
+}
 async function discoverDevices2() {
   const btn = document.getElementById("discoverBtn");
   const status = document.getElementById("discoverStatus");
@@ -379,6 +392,7 @@ async function discoverDevices2() {
       btn2.style.cursor = "pointer";
       btn2.style.border = preferences.connectionType === option.value ? "2px solid #007AFF" : "1px solid #ccc";
       btn2.style.backgroundColor = preferences.connectionType === option.value ? "#f0f7ff" : "#fff";
+      btn2.style.color = preferences.connectionType === option.value ? "#1d4ed8" : "#374151";
       btn2.onclick = () => {
         preferences.connectionType = option.value;
         setDiscoveryPreferences(preferences);
@@ -387,9 +401,11 @@ async function discoverDevices2() {
           ;
           b.style.border = "1px solid #ccc";
           b.style.backgroundColor = "#fff";
+          b.style.color = "#374151";
         }
         btn2.style.border = "2px solid #007AFF";
         btn2.style.backgroundColor = "#f0f7ff";
+        btn2.style.color = "#1d4ed8";
       };
       filterGroup.appendChild(btn2);
     }
@@ -447,6 +463,17 @@ async function discoverDevices2() {
     controlsDiv.appendChild(searchInput);
     list.innerHTML = "";
     list.appendChild(controlsDiv);
+    let deviceListContainer = document.getElementById("discoveredDevices");
+    if (!deviceListContainer) {
+      deviceListContainer = document.createElement("ul");
+      deviceListContainer.id = "discoveredDevices";
+      deviceListContainer.style.maxHeight = "400px";
+      deviceListContainer.style.overflowY = "auto";
+      deviceListContainer.style.marginTop = "12px";
+      deviceListContainer.style.padding = "0";
+      deviceListContainer.style.listStyle = "none";
+      list.appendChild(deviceListContainer);
+    }
     list.style.display = "block";
     await updateDiscoveryView(devices, preferences);
   } catch (e) {
@@ -464,8 +491,20 @@ async function discoverDevices2() {
 async function updateDiscoveryView(allDevices, preferences) {
   const filtered = filterDevices(allDevices, preferences.connectionType, preferences.searchQuery);
   const sorted = sortDevices(filtered, preferences.sortBy);
-  const ul = await renderDiscoveredDevices(sorted);
-  document.getElementById("discoveredDevices")?.replaceWith(ul);
+  const configured = await fetchDevices();
+  const configuredIds = new Set((configured || []).map((d) => normalizeId(d?.id || d?.deviceId)));
+  const ul = await renderDiscoveredDevices(sorted, {
+    configuredIds
+  });
+  const existingList = document.getElementById("discoveredDevices");
+  if (existingList && existingList.parentNode) {
+    existingList.replaceWith(ul);
+  } else {
+    const listContainer = document.getElementById("discoveredList");
+    if (listContainer) {
+      listContainer.appendChild(ul);
+    }
+  }
   ul.id = "discoveredDevices";
   const status = document.getElementById("discoverStatus");
   if (status) {
@@ -604,8 +643,155 @@ var init_constants = __esm({
 // src/homebridge-ui/public/js/modals.ts
 var modals_exports = {};
 __export(modals_exports, {
-  editDevice: () => editDevice
+  editDevice: () => editDevice,
+  importDiscoveredDevice: () => importDiscoveredDevice
 });
+async function importDiscoveredDevice(device) {
+  return new Promise((resolve) => {
+    const div = document.createElement("div");
+    div.style.position = "fixed";
+    div.style.top = "0";
+    div.style.left = "0";
+    div.style.width = "100%";
+    div.style.height = "100%";
+    div.style.background = "rgba(0,0,0,0.7)";
+    div.style.display = "flex";
+    div.style.alignItems = "center";
+    div.style.justifyContent = "center";
+    div.style.zIndex = "9999";
+    const modal = document.createElement("div");
+    modal.style.background = getComputedStyle(document.body).backgroundColor;
+    modal.style.color = getComputedStyle(document.body).color;
+    modal.style.padding = "0";
+    modal.style.borderRadius = "10px";
+    modal.style.minWidth = "440px";
+    modal.style.maxWidth = "90vw";
+    modal.style.boxShadow = "0 8px 32px rgba(0,0,0,0.35)";
+    modal.style.overflow = "hidden";
+    modal.style.borderTop = "3px solid var(--switchbot-red, #ef4444)";
+    const title = document.createElement("h3");
+    title.textContent = "Import Discovered Device";
+    title.style.marginTop = "0";
+    title.style.marginBottom = "16px";
+    title.style.padding = "20px 20px 0";
+    title.style.fontSize = "18px";
+    title.style.fontWeight = "600";
+    title.style.color = "var(--switchbot-red, #ef4444)";
+    title.style.letterSpacing = "-0.02em";
+    const contentDiv = document.createElement("div");
+    contentDiv.style.padding = "0 20px 20px";
+    const nameLabel = document.createElement("label");
+    nameLabel.textContent = "Device Name";
+    nameLabel.style.display = "block";
+    nameLabel.style.marginBottom = "6px";
+    nameLabel.style.fontWeight = "500";
+    nameLabel.style.fontSize = "12px";
+    nameLabel.style.color = "#6b7280";
+    const nameInput = document.createElement("input");
+    nameInput.type = "text";
+    nameInput.value = device.name || device.id || "";
+    nameInput.style.width = "100%";
+    nameInput.style.marginBottom = "12px";
+    nameInput.style.padding = "8px 10px";
+    nameInput.style.borderRadius = "6px";
+    nameInput.style.fontSize = "14px";
+    nameInput.style.boxSizing = "border-box";
+    const typeLabel = document.createElement("label");
+    typeLabel.textContent = "Config Device Type";
+    typeLabel.style.display = "block";
+    typeLabel.style.marginBottom = "6px";
+    typeLabel.style.fontWeight = "500";
+    typeLabel.style.fontSize = "12px";
+    typeLabel.style.color = "#6b7280";
+    const typeSelect = document.createElement("select");
+    typeSelect.style.width = "100%";
+    typeSelect.style.padding = "8px 10px";
+    typeSelect.style.marginBottom = "12px";
+    typeSelect.style.borderRadius = "6px";
+    typeSelect.style.fontSize = "14px";
+    typeSelect.style.background = getComputedStyle(nameInput).background;
+    typeSelect.style.color = getComputedStyle(nameInput).color;
+    typeSelect.style.border = getComputedStyle(nameInput).border;
+    typeSelect.style.boxSizing = "border-box";
+    Object.keys(DEVICE_TYPES).forEach((categoryName) => {
+      const optgroup = document.createElement("optgroup");
+      optgroup.label = categoryName;
+      DEVICE_TYPES[categoryName].forEach((deviceType) => {
+        const opt = document.createElement("option");
+        opt.value = deviceType;
+        opt.text = deviceType;
+        const detectedType = (device.type || "").toLowerCase();
+        opt.selected = deviceType.toLowerCase() === detectedType;
+        optgroup.appendChild(opt);
+      });
+      typeSelect.appendChild(optgroup);
+    });
+    const macLabel = document.createElement("label");
+    macLabel.textContent = "BLE MAC Address (optional)";
+    macLabel.style.display = "block";
+    macLabel.style.marginBottom = "6px";
+    macLabel.style.fontWeight = "500";
+    macLabel.style.fontSize = "12px";
+    macLabel.style.color = "#6b7280";
+    const macInput = document.createElement("input");
+    macInput.type = "text";
+    macInput.value = device.address || "";
+    macInput.placeholder = "AA:BB:CC:DD:EE:FF";
+    macInput.style.width = "100%";
+    macInput.style.marginBottom = "12px";
+    macInput.style.padding = "8px 10px";
+    macInput.style.borderRadius = "6px";
+    macInput.style.fontSize = "14px";
+    macInput.style.boxSizing = "border-box";
+    const buttons = document.createElement("div");
+    buttons.style.display = "flex";
+    buttons.style.gap = "10px";
+    buttons.style.justifyContent = "flex-end";
+    buttons.style.marginTop = "18px";
+    buttons.style.paddingTop = "18px";
+    buttons.style.borderTop = "1px solid rgba(0, 0, 0, 0.08)";
+    const cancelBtn = document.createElement("button");
+    cancelBtn.textContent = "Cancel";
+    cancelBtn.className = "secondary";
+    cancelBtn.style.background = "#6b7280";
+    cancelBtn.style.padding = "8px 16px";
+    cancelBtn.style.fontSize = "13px";
+    const importBtn = document.createElement("button");
+    importBtn.textContent = "Add to Config";
+    importBtn.style.background = "var(--switchbot-red, #ef4444)";
+    importBtn.style.padding = "8px 20px";
+    importBtn.style.fontSize = "13px";
+    const cleanup = (result) => {
+      div.remove();
+      resolve(result);
+    };
+    cancelBtn.onclick = () => cleanup(null);
+    importBtn.onclick = () => cleanup({
+      configDeviceName: nameInput.value || device.name || device.id,
+      configDeviceType: typeSelect.value || device.type,
+      address: macInput.value || void 0
+    });
+    div.addEventListener("click", (event) => {
+      if (event.target === div) {
+        cleanup(null);
+      }
+    });
+    buttons.appendChild(cancelBtn);
+    buttons.appendChild(importBtn);
+    contentDiv.appendChild(nameLabel);
+    contentDiv.appendChild(nameInput);
+    contentDiv.appendChild(typeLabel);
+    contentDiv.appendChild(typeSelect);
+    contentDiv.appendChild(macLabel);
+    contentDiv.appendChild(macInput);
+    contentDiv.appendChild(buttons);
+    modal.appendChild(title);
+    modal.appendChild(contentDiv);
+    div.appendChild(modal);
+    document.body.appendChild(div);
+    nameInput.focus();
+  });
+}
 async function editDevice(device) {
   const div = document.createElement("div");
   div.style.position = "fixed";
@@ -738,7 +924,7 @@ async function editDevice(device) {
   saveBtn.style.fontSize = "13px";
   saveBtn.onclick = async () => {
     try {
-      const { updateDevice: updateDevice2, syncParentPluginConfigFromDisk: syncParentPluginConfigFromDisk2, fetchDevices: fetchDevices3 } = await Promise.resolve().then(() => (init_api(), api_exports));
+      const { updateDevice: updateDevice2, syncParentPluginConfigFromDisk: syncParentPluginConfigFromDisk2, fetchDevices: fetchDevices2 } = await Promise.resolve().then(() => (init_api(), api_exports));
       const { renderDeviceList: renderDeviceList2 } = await Promise.resolve().then(() => (init_render(), render_exports));
       const params = {
         deviceId: device.id,
@@ -748,7 +934,7 @@ async function editDevice(device) {
       await updateDevice2(params.deviceId, params.configDeviceName, params.configDeviceType);
       await syncParentPluginConfigFromDisk2();
       uiLog.info("[Edit Device] Refreshing device list after update");
-      const list = await fetchDevices3();
+      const list = await fetchDevices2();
       renderDeviceList2(list);
       div.remove();
     } catch (e) {
@@ -1119,37 +1305,68 @@ function renderIRBadge() {
     "background: #ff6b35; color: white; padding: 2px 6px; border-radius: 3px; font-size: 10px; font-weight: 600; margin-left: 8px;"
   );
 }
-async function renderDiscoveredDevices(devices) {
+function normalizeId2(value) {
+  return String(value ?? "").trim().toLowerCase();
+}
+function scrollToConfiguredDevice(deviceId) {
+  const normalizedId = normalizeId2(deviceId);
+  const target = document.querySelector(`[data-device-id="${normalizedId}"]`);
+  if (!target) {
+    return;
+  }
+  target.scrollIntoView({ behavior: "smooth", block: "center" });
+  const originalOutline = target.style.outline;
+  const originalBackground = target.style.background;
+  target.style.outline = "2px solid var(--switchbot-red, #ef4444)";
+  target.style.background = "rgba(239, 68, 68, 0.08)";
+  setTimeout(() => {
+    target.style.outline = originalOutline;
+    target.style.background = originalBackground;
+  }, 1800);
+}
+async function renderDiscoveredDevices(devices, options = {}) {
   const ul = document.createElement("ul");
+  ul.className = "device-grid";
   ul.style.maxHeight = "400px";
   ul.style.overflowY = "auto";
   ul.style.marginTop = "12px";
   ul.style.padding = "0";
   ul.style.listStyle = "none";
   const { addDeviceToConfig: addDeviceToConfig3 } = await Promise.resolve().then(() => (init_discovery(), discovery_exports));
+  const { loadConfiguredDevices: loadConfiguredDevices2 } = await Promise.resolve().then(() => (init_devices(), devices_exports));
+  const configuredIds = options.configuredIds ?? /* @__PURE__ */ new Set();
   for (const d of devices) {
+    const deviceId = normalizeId2(d.id);
+    const alreadyAdded = configuredIds.has(deviceId);
     const li = document.createElement("li");
     li.className = "device-item";
     li.style.display = "flex";
-    li.style.alignItems = "center";
-    li.style.justifyContent = "space-between";
-    li.style.padding = "10px 12px";
-    li.style.marginBottom = "6px";
-    li.style.borderRadius = "6px";
+    li.style.flexDirection = "column";
+    li.style.alignItems = "stretch";
+    li.style.justifyContent = "flex-start";
+    li.style.padding = "5px 8px";
+    li.style.marginBottom = "0";
+    li.style.borderRadius = "5px";
     li.style.transition = "all 0.2s ease";
     const info = document.createElement("div");
-    info.style.flex = "1";
+    info.style.flex = "1 1 auto";
+    info.style.width = "100%";
+    info.style.minWidth = "0";
     const nameContainer = document.createElement("div");
     nameContainer.style.display = "flex";
     nameContainer.style.alignItems = "center";
-    nameContainer.style.marginBottom = "4px";
+    nameContainer.style.marginBottom = "0";
     nameContainer.style.flexWrap = "wrap";
-    nameContainer.style.gap = "6px";
+    nameContainer.style.gap = "4px";
     const name = document.createElement("div");
     name.style.fontWeight = "500";
-    name.style.fontSize = "14px";
+    name.style.fontSize = "13px";
     name.textContent = d.name || d.id;
     nameContainer.appendChild(name);
+    const duplicateBadge = document.createElement("span");
+    duplicateBadge.textContent = alreadyAdded ? "\u2713 Already Added" : "\u2795 New Device";
+    duplicateBadge.style.cssText = alreadyAdded ? "background: #16a34a; color: white; padding: 1px 5px; border-radius: 3px; font-size: 9px; font-weight: 600;" : "background: #2563eb; color: white; padding: 1px 5px; border-radius: 3px; font-size: 9px; font-weight: 600;";
+    nameContainer.appendChild(duplicateBadge);
     if (d.connectionType) {
       const badge = renderConnectionBadge(d.connectionType);
       if (badge) {
@@ -1164,10 +1381,13 @@ async function renderDiscoveredDevices(devices) {
       nameContainer.appendChild(renderSignalQualityBadge(d.rssi));
     }
     const details = document.createElement("div");
-    details.style.fontSize = "11px";
+    details.style.fontSize = "10px";
     details.style.opacity = "0.7";
-    details.style.marginTop = "4px";
+    details.style.marginTop = "0";
     details.style.fontFamily = "monospace";
+    details.style.whiteSpace = "normal";
+    details.style.overflowWrap = "anywhere";
+    details.style.wordBreak = "break-word";
     let detailsText = `ID: ${d.id} | Type: ${d.type} | Model: ${d.model || "N/A"}`;
     if (d.hubDeviceId) {
       detailsText += ` | Hub: ${d.hubDeviceId}`;
@@ -1179,17 +1399,65 @@ async function renderDiscoveredDevices(devices) {
     info.appendChild(nameContainer);
     info.appendChild(details);
     const addBtn = document.createElement("button");
-    addBtn.textContent = "+ Add";
-    addBtn.style.marginLeft = "8px";
-    addBtn.style.padding = "6px 14px";
-    addBtn.style.fontSize = "12px";
+    addBtn.textContent = alreadyAdded ? "Already Added" : "Add to Config";
+    addBtn.style.marginLeft = "0";
+    addBtn.style.marginTop = "2px";
+    addBtn.style.padding = "4px 9px";
+    addBtn.style.fontSize = "11px";
     addBtn.style.whiteSpace = "nowrap";
     addBtn.style.flexShrink = "0";
+    addBtn.disabled = alreadyAdded;
+    if (alreadyAdded) {
+      addBtn.style.opacity = "0.65";
+      addBtn.style.cursor = "not-allowed";
+      addBtn.style.background = "#6b7280";
+    }
     addBtn.onclick = async () => {
+      if (alreadyAdded) {
+        return;
+      }
       await addDeviceToConfig3(d);
     };
+    if (alreadyAdded) {
+      const viewBtn = document.createElement("button");
+      viewBtn.textContent = "View in Config";
+      viewBtn.className = "secondary";
+      viewBtn.style.marginLeft = "0";
+      viewBtn.style.padding = "4px 9px";
+      viewBtn.style.fontSize = "11px";
+      viewBtn.onclick = async () => {
+        await loadConfiguredDevices2();
+        scrollToConfiguredDevice(d.id);
+      };
+      li.appendChild(info);
+      const actions2 = document.createElement("div");
+      actions2.className = "device-actions";
+      actions2.style.display = "flex";
+      actions2.style.alignItems = "center";
+      actions2.style.flexWrap = "wrap";
+      actions2.style.justifyContent = "flex-start";
+      actions2.style.marginLeft = "0";
+      actions2.style.width = "100%";
+      actions2.style.marginTop = "2px";
+      actions2.style.gap = "5px";
+      actions2.appendChild(viewBtn);
+      actions2.appendChild(addBtn);
+      li.appendChild(actions2);
+      ul.appendChild(li);
+      continue;
+    }
+    const actions = document.createElement("div");
+    actions.className = "device-actions";
+    actions.style.display = "flex";
+    actions.style.flexWrap = "wrap";
+    actions.style.justifyContent = "flex-start";
+    actions.style.marginLeft = "0";
+    actions.style.width = "100%";
+    actions.style.marginTop = "2px";
+    actions.style.gap = "5px";
+    actions.appendChild(addBtn);
     li.appendChild(info);
-    li.appendChild(addBtn);
+    li.appendChild(actions);
     ul.appendChild(li);
   }
   return ul;
@@ -1302,6 +1570,7 @@ function renderDeviceList(list) {
     return;
   }
   status.textContent = `Found ${list.length} device(s)`;
+  ul.classList.add("device-grid");
   ul.innerHTML = "";
   if (removeAllContainer) {
     removeAllContainer.style.display = "block";
@@ -1309,21 +1578,33 @@ function renderDeviceList(list) {
   for (const d of list) {
     const li = document.createElement("li");
     li.className = "device-item";
+    li.setAttribute("data-device-id", normalizeId2(d.id));
+    li.style.display = "flex";
+    li.style.flexDirection = "column";
+    li.style.alignItems = "stretch";
+    li.style.marginBottom = "0";
     const info = document.createElement("div");
-    info.style.flex = "1";
+    info.style.flex = "1 1 auto";
+    info.style.width = "100%";
+    info.style.minWidth = "0";
     const nameContainer = document.createElement("div");
     nameContainer.style.display = "flex";
-    nameContainer.style.alignItems = "center";
-    nameContainer.style.flexWrap = "wrap";
-    nameContainer.style.gap = "6px";
+    nameContainer.style.flexDirection = "column";
+    nameContainer.style.alignItems = "flex-start";
+    nameContainer.style.gap = "0";
     const name = document.createElement("div");
     name.style.fontWeight = "500";
+    name.style.fontSize = "13px";
     name.textContent = d.name || d.id;
     const code = document.createElement("code");
     code.textContent = d.id;
-    code.style.fontSize = "12px";
+    code.style.fontSize = "10px";
     code.style.opacity = "0.75";
-    code.style.marginLeft = "8px";
+    code.style.marginLeft = "0";
+    code.style.whiteSpace = "normal";
+    code.style.overflowWrap = "anywhere";
+    code.style.wordBreak = "break-word";
+    code.style.maxWidth = "100%";
     nameContainer.appendChild(name);
     nameContainer.appendChild(code);
     if (d.rssi !== void 0 && d.rssi !== null && d.rssi !== 0) {
@@ -1332,8 +1613,8 @@ function renderDeviceList(list) {
     }
     const meta = document.createElement("div");
     meta.style.opacity = "0.75";
-    meta.style.marginTop = "4px";
-    meta.style.fontSize = "12px";
+    meta.style.marginTop = "0";
+    meta.style.fontSize = "11px";
     const typeText = d.type ? `type: ${d.type}` : "";
     const connText = d.connectionPreference ? `conn: ${d.connectionPreference}` : "";
     const roomText = d.room ? `room: ${d.room}` : "";
@@ -1341,20 +1622,26 @@ function renderDeviceList(list) {
     info.appendChild(nameContainer);
     info.appendChild(meta);
     const buttons = document.createElement("div");
+    buttons.className = "device-actions";
     buttons.style.display = "flex";
-    buttons.style.gap = "8px";
+    buttons.style.flexWrap = "wrap";
+    buttons.style.justifyContent = "flex-start";
+    buttons.style.marginLeft = "0";
+    buttons.style.width = "100%";
+    buttons.style.marginTop = "2px";
+    buttons.style.gap = "5px";
     const editBtn = document.createElement("button");
     editBtn.textContent = "\u270F\uFE0F Edit";
-    editBtn.style.padding = "6px 12px";
-    editBtn.style.fontSize = "12px";
+    editBtn.style.padding = "4px 9px";
+    editBtn.style.fontSize = "11px";
     editBtn.onclick = async () => {
       const { editDevice: editDevice2 } = await Promise.resolve().then(() => (init_modals(), modals_exports));
       await editDevice2(d);
     };
     const copyBtn = document.createElement("button");
     copyBtn.textContent = "Copy ID";
-    copyBtn.style.padding = "6px 12px";
-    copyBtn.style.fontSize = "12px";
+    copyBtn.style.padding = "4px 9px";
+    copyBtn.style.fontSize = "11px";
     copyBtn.addEventListener("click", async () => {
       try {
         await navigator.clipboard.writeText(d.id);
@@ -1370,8 +1657,8 @@ function renderDeviceList(list) {
     });
     const deleteBtn = document.createElement("button");
     deleteBtn.textContent = "\u{1F5D1}\uFE0F Delete";
-    deleteBtn.style.padding = "6px 12px";
-    deleteBtn.style.fontSize = "12px";
+    deleteBtn.style.padding = "4px 9px";
+    deleteBtn.style.fontSize = "11px";
     deleteBtn.style.background = "#ef4444";
     deleteBtn.onclick = async () => {
       const { deleteDeviceFromConfig: deleteDeviceFromConfig2 } = await Promise.resolve().then(() => (init_devices_delete(), devices_delete_exports));
@@ -1401,15 +1688,24 @@ __export(devices_exports, {
 async function addDeviceToConfig2(device, options = {}) {
   const { refresh = true, showStatus = true } = options;
   try {
+    const { importDiscoveredDevice: importDiscoveredDevice2 } = await Promise.resolve().then(() => (init_modals(), modals_exports));
+    const importValues = await importDiscoveredDevice2(device);
+    if (!importValues) {
+      return { added: false };
+    }
     showBusyUi();
     uiLog.info("Adding device to config:", device);
-    const resp = await addDevice(device.id, device.name, device.type);
+    const resp = await addDevice(device.id, importValues.configDeviceName, importValues.configDeviceType, {
+      address: importValues.address,
+      model: device.model,
+      rssi: device.rssi
+    });
     uiLog.info("Add device response:", resp);
     if (!resp || resp.success === false) {
       throw new Error(resp?.data?.message || "Failed to add device");
     }
     const alreadyExists = !!resp?.alreadyExists;
-    const message = resp?.message || (alreadyExists ? `Device "${device.name}" already in config` : `Device "${device.name}" added successfully!`);
+    const message = resp?.message || (alreadyExists ? `Device "${importValues.configDeviceName}" already in config` : `Device "${importValues.configDeviceName}" added successfully!`);
     if (alreadyExists) {
       toastInfo(message);
     } else {