v0.1.32 — Bulk-Offboarding aus dem Geraete-Tab, Geraete-Ladefehler behoben
Build & Release MSI / build-msi (push) Canceled after 0s
Build & Release MSI / build-msi (push) Canceled after 0s
- Bulk-Offboarding aus dem Geraete-Tab (Checkboxen + Alle, POST /api/offboard/resolve) - Fix "Geraete konnten nicht geladen werden" (400): managementState raus dem $select, $orderby entfernt, Namensfilter-Fallback auf deviceName, beta-Endpoint - Bessere Graph-Fehler-Diagnose (Graph-Body an die Meldung anhaengen) - Offboard: Grund fuer nicht gefundene Autopilot-Zuordnung sichtbar (autopilotNote) Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 4.8
+68
-7
@@ -5776,7 +5776,8 @@ const DevState = {
|
||||
sortAsc: true,
|
||||
loaded: false,
|
||||
groupId: null, // aktiver Gruppen-Filter (null = alle Geraete)
|
||||
groupName: ''
|
||||
groupName: '',
|
||||
checked: new Set() // per Checkbox ausgewaehlte Geraete-Ids (fuer Bulk-Offboarding)
|
||||
};
|
||||
|
||||
async function devLoadAll() {
|
||||
@@ -5789,6 +5790,7 @@ function devShowLoading(on) {
|
||||
}
|
||||
|
||||
async function devFetch() {
|
||||
DevState.checked.clear(); // neue Datenladung -> Auswahl zuruecksetzen
|
||||
devShowLoading(true);
|
||||
try {
|
||||
if (DevState.groupId) {
|
||||
@@ -5914,7 +5916,9 @@ function devRender() {
|
||||
const cmpCls = d.ComplianceState === 'compliant' ? 'dev-badge-ok'
|
||||
: d.ComplianceState === 'noncompliant' ? 'dev-badge-err' : 'dev-badge-unk';
|
||||
const sel = DevState.selected && DevState.selected.Id === d.Id ? ' class="dev-row-selected"' : '';
|
||||
const chk = DevState.checked.has(d.Id) ? 'checked' : '';
|
||||
html += `<tr data-id="${escapeHtml(d.Id)}"${sel}>
|
||||
<td class="dev-col-check"><input type="checkbox" class="dev-row-check" data-id="${escapeHtml(d.Id)}" ${chk}></td>
|
||||
<td>${escapeHtml(d.DeviceName || '—')}</td>
|
||||
<td>${escapeHtml(d.UserDisplayName || '—')}</td>
|
||||
<td>${escapeHtml(d.OS || '—')}</td>
|
||||
@@ -5924,13 +5928,41 @@ function devRender() {
|
||||
}
|
||||
tbody.innerHTML = html;
|
||||
|
||||
tbody.querySelectorAll('.dev-row-check').forEach(cb => {
|
||||
cb.addEventListener('click', e => e.stopPropagation());
|
||||
cb.addEventListener('change', () => {
|
||||
if (cb.checked) DevState.checked.add(cb.dataset.id);
|
||||
else DevState.checked.delete(cb.dataset.id);
|
||||
devUpdateCheckSel();
|
||||
});
|
||||
});
|
||||
tbody.querySelectorAll('tr').forEach(tr => {
|
||||
tr.addEventListener('click', () => {
|
||||
tr.addEventListener('click', e => {
|
||||
if (e.target.classList.contains('dev-row-check')) return;
|
||||
const id = tr.dataset.id;
|
||||
const device = DevState.filtered.find(d => d.Id === id);
|
||||
if (device) devSelectDevice(device);
|
||||
});
|
||||
});
|
||||
devUpdateCheckSel();
|
||||
}
|
||||
|
||||
// Checkbox-Auswahl -> Offboard-Button + Zähler + Header-Checkbox synchronisieren.
|
||||
function devUpdateCheckSel() {
|
||||
// Nur sichtbare (gefilterte) Geraete zaehlen.
|
||||
const visibleIds = DevState.filtered.map(d => d.Id);
|
||||
const n = visibleIds.filter(id => DevState.checked.has(id)).length;
|
||||
const btn = document.getElementById('btnDevOffboard');
|
||||
if (btn) {
|
||||
btn.disabled = n === 0;
|
||||
const c = document.getElementById('devOffboardCount');
|
||||
if (c) c.textContent = n;
|
||||
}
|
||||
const all = document.getElementById('devCheckAll');
|
||||
if (all) {
|
||||
all.checked = n > 0 && n === visibleIds.length;
|
||||
all.indeterminate = n > 0 && n < visibleIds.length;
|
||||
}
|
||||
}
|
||||
|
||||
async function devSelectDevice(device) {
|
||||
@@ -6193,6 +6225,34 @@ function devExportCsv() {
|
||||
|
||||
document.getElementById('btnDevExport')?.addEventListener('click', devExportCsv);
|
||||
|
||||
// Alle sichtbaren Geraete an-/abwaehlen
|
||||
document.getElementById('devCheckAll')?.addEventListener('change', e => {
|
||||
const on = e.target.checked;
|
||||
DevState.filtered.forEach(d => { if (on) DevState.checked.add(d.Id); else DevState.checked.delete(d.Id); });
|
||||
// Checkboxen in der Tabelle spiegeln, ohne komplett neu zu rendern
|
||||
document.querySelectorAll('#devTableBody .dev-row-check').forEach(cb => { cb.checked = on; });
|
||||
devUpdateCheckSel();
|
||||
});
|
||||
|
||||
// Ausgewaehlte Geraete offboarden -> IDs aufloesen (Entra/Autopilot) und Dialog oeffnen
|
||||
async function devOffboardSelected() {
|
||||
const ids = DevState.filtered.filter(d => DevState.checked.has(d.Id)).map(d => d.Id);
|
||||
if (ids.length === 0) { toast('Keine Geräte ausgewählt.', 'warn'); return; }
|
||||
setLoading(`Löse ${ids.length} Gerät(e) für Offboarding auf…`);
|
||||
try {
|
||||
const res = await api('/api/offboard/resolve', { method: 'POST', body: { ids }, timeoutMs: 120000 });
|
||||
const items = res.items || [];
|
||||
if (items.length === 0) { toast('Geräte konnten nicht aufgelöst werden.', 'err'); return; }
|
||||
// Offboard-Dialog mit genau diesen Geräten öffnen (unabhängig vom Offboard-Tab).
|
||||
openOffboardModal(items);
|
||||
} catch (e) {
|
||||
toast('Offboarding-Auflösung fehlgeschlagen: ' + e.message, 'err');
|
||||
} finally {
|
||||
clearLoading();
|
||||
}
|
||||
}
|
||||
document.getElementById('btnDevOffboard')?.addEventListener('click', devOffboardSelected);
|
||||
|
||||
// Sortierung
|
||||
document.querySelectorAll('#devTable th.sortable').forEach(th => {
|
||||
th.addEventListener('click', () => {
|
||||
@@ -6816,7 +6876,7 @@ document.querySelectorAll('#polTable th.sortable').forEach(th => {
|
||||
// =============================================================
|
||||
// OFFBOARDING: Geräte aus Intune / Autopilot / Entra entfernen
|
||||
// =============================================================
|
||||
const OffState = { items: [], selected: new Set() };
|
||||
const OffState = { items: [], selected: new Set(), pending: [] };
|
||||
function offKey(d) { return d.intuneDeviceId; }
|
||||
function offSelectedDevices() { return OffState.items.filter(d => OffState.selected.has(offKey(d))); }
|
||||
|
||||
@@ -6889,12 +6949,13 @@ function offUpdateSel() {
|
||||
document.getElementById('offBtn').disabled = n === 0;
|
||||
}
|
||||
|
||||
function openOffboardModal() {
|
||||
const devs = offSelectedDevices();
|
||||
function openOffboardModal(devsArg) {
|
||||
const devs = Array.isArray(devsArg) ? devsArg : offSelectedDevices();
|
||||
if (!devs.length) return;
|
||||
OffState.pending = devs;
|
||||
document.getElementById('offConfirmList').innerHTML = devs.map(d => `
|
||||
<div class="off-confirm-row"><b>${escapeHtml(d.deviceName || '—')}</b>
|
||||
— Intune: ${d.intuneDeviceId ? '✓' : '–'}, Entra: ${d.entraObjectId ? '✓' : '–'}, Autopilot: ${d.autopilotId ? '✓' : '–'}</div>
|
||||
— Intune: ${d.intuneDeviceId ? '✓' : '–'}, Entra: ${d.entraObjectId ? '✓' : '–'}, Autopilot: ${d.autopilotId ? '✓' : '–'}${(!d.autopilotId && d.autopilotNote) ? ` <span class="off-note" style="color:var(--warning,#e0a030);">(${escapeHtml(d.autopilotNote)})</span>` : ''}</div>
|
||||
`).join('');
|
||||
document.getElementById('offModalInfo').textContent = `${devs.length} Gerät(e)`;
|
||||
document.getElementById('offConfirmChk').checked = false;
|
||||
@@ -6931,7 +6992,7 @@ async function offLoadKeys(devs) {
|
||||
}
|
||||
|
||||
async function offExecute() {
|
||||
const devs = offSelectedDevices();
|
||||
const devs = (OffState.pending && OffState.pending.length) ? OffState.pending : offSelectedDevices();
|
||||
if (!devs.length) return;
|
||||
const services = {
|
||||
entra: document.querySelector('input[name="offEntra"]:checked').value,
|
||||
|
||||
@@ -507,6 +507,10 @@
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
|
||||
CSV
|
||||
</button>
|
||||
<button id="btnDevOffboard" class="btn btn-danger btn-sm dev-offboard-btn" disabled title="Ausgewählte Geräte offboarden (Intune / Autopilot / Entra)">
|
||||
<svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4"/><polyline points="16 17 21 12 16 7"/><line x1="21" y1="12" x2="9" y2="12"/></svg>
|
||||
Offboarden (<span id="devOffboardCount">0</span>)
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="dev-layout">
|
||||
@@ -515,6 +519,7 @@
|
||||
<table class="dev-table" id="devTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="dev-col-check"><input type="checkbox" id="devCheckAll" title="Alle sichtbaren auswählen"></th>
|
||||
<th class="sortable" data-col="deviceName">Gerät <span class="sort-ico"></span></th>
|
||||
<th class="sortable" data-col="userDisplayName">Benutzer <span class="sort-ico"></span></th>
|
||||
<th class="sortable" data-col="operatingSystem">OS <span class="sort-ico"></span></th>
|
||||
|
||||
@@ -4969,6 +4969,7 @@ body.read-only .gex-add-pane,
|
||||
body.read-only .gex-tab[data-tab="add"],
|
||||
body.read-only .gex-tab[data-tab="import"],
|
||||
body.read-only #gexPaneImport,
|
||||
body.read-only .dev-offboard-btn,
|
||||
body.read-only .pol-write {
|
||||
display: none !important;
|
||||
}
|
||||
@@ -5373,6 +5374,8 @@ body.read-only .app-row {
|
||||
}
|
||||
.dev-table thead th.sortable { cursor: pointer; }
|
||||
.dev-table thead th.sortable:hover { color: var(--text); }
|
||||
.dev-col-check { width: 34px; text-align: center; padding-left: 6px; padding-right: 6px; }
|
||||
.dev-col-check input { cursor: pointer; }
|
||||
.dev-table tbody tr {
|
||||
cursor: pointer;
|
||||
border-bottom: 1px solid var(--hairline-soft);
|
||||
|
||||
Reference in New Issue
Block a user