v0.1.30 — Policy-Bulk-Import gehaertet, macOS-Apps, Gruppen-Suche & Direkt-Zuweisung

- Bulk-Import von Policies (Batches + Fortschritt, Fehler-Isolierung)
- Export/Import-Treue via Raw-JSON (-OutputType Json), null-Collections-Strip,
  Settings-Catalog-Reparatur + Korruptions-Erkennung, Git-Resolver
- macOS-Apps in Liste/Suche + Plattform-Filter
- "Gruppe"-Tab durchsucht alle Gruppen (Live-Suche) statt nur Praefix-Gruppen
- Bestehende Gruppe(n) direkt an Apps zuweisen inkl. Mehrfachauswahl
- Fix: Add-GraphAppAssignment merged bestehende Zuweisungen (/assign ersetzt sonst
  die komplette Liste) -> kein Ueberschreiben mehr, ein Request fuer alle Ziele

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

www/app.js

@@ -11,7 +11,7 @@ const State = {
   targets: [],
   selectedTargetIds: new Set(),
   apps: [],
-  appFilter: { search: '', preset: 'all', category: '', onlyMember: false, hideNative: false, modFrom: '', modTo: '' },
+  appFilter: { search: '', preset: 'all', platform: 'all', category: '', onlyMember: false, hideNative: false, modFrom: '', modTo: '' },
   session: [],
   membershipCache: new Map(),
   loadedModes: new Set(),
@@ -432,6 +432,13 @@ document.querySelectorAll('.seg').forEach(seg => {
       search.value = '';
       search.focus();
       try { search.setSelectionRange(0, 0); } catch {}
+    } else if (newMode === 'dept') {
+      // Gruppen-Modus: Live-Suche ueber ALLE Gruppen (min. 2 Zeichen), kein Praefix-Filter
+      search.placeholder = 'Gruppe suchen...';
+      hint.classList.remove('hidden');
+      search.value = '';
+      search.focus();
+      try { search.setSelectionRange(0, 0); } catch {}
     } else {
       search.placeholder = 'Filtern...';
       hint.classList.add('hidden');
@@ -441,8 +448,9 @@ document.querySelectorAll('.seg').forEach(seg => {
     renderTargets();
     onTargetSelectionChange();
 
-    // Auto-Load nur wenn fuer diesen Mode noch nichts geladen wurde UND es kein User-Mode ist
-    if (State.connected && newMode !== 'user' && !State.loadedModes.has(newMode) && State.targets.length === 0) {
+    // Auto-Load nur fuer Listen-Modi (RPA). 'dept' (Gruppensuche) und 'user'
+    // laden erst bei Sucheingabe.
+    if (State.connected && newMode === 'rpa' && !State.loadedModes.has(newMode) && State.targets.length === 0) {
       loadTargets({ silent: false });
     }
   });
@@ -461,6 +469,14 @@ document.getElementById('btnReloadTargets').addEventListener('click', () => {
       return;
     }
     runUserSearch(term);
+  } else if (State.mode === 'dept') {
+    const term = document.getElementById('targetSearch').value;
+    if (!term || term.length < 2) {
+      document.getElementById('targetSearch').focus();
+      toast('Tippe mind. 2 Zeichen für die Gruppensuche', 'warn');
+      return;
+    }
+    runGroupSearch(term);
   } else {
     State.loadedModes.delete(State.mode);
     loadTargets({ silent: false });
@@ -470,16 +486,20 @@ document.getElementById('btnReloadTargets').addEventListener('click', () => {
 document.getElementById('targetSearch').addEventListener('input', e => {
   if (State.mode === 'user') {
     debouncedUserSearch(e.target.value);
+  } else if (State.mode === 'dept') {
+    debouncedGroupSearch(e.target.value);
   } else {
     renderTargets();
   }
 });
 
-// Enter key triggers explicit user search
+// Enter loest die Server-Suche sofort aus (Benutzer- und Gruppen-Modus)
 document.getElementById('targetSearch').addEventListener('keydown', e => {
-  if (e.key === 'Enter' && State.mode === 'user') {
-    const term = e.target.value;
-    if (term && term.length >= 2) runUserSearch(term);
+  if (e.key !== 'Enter') return;
+  const term = e.target.value;
+  if (term && term.length >= 2) {
+    if (State.mode === 'user') runUserSearch(term);
+    else if (State.mode === 'dept') runGroupSearch(term);
   }
 });
 
@@ -576,6 +596,77 @@ async function runUserSearch(term) {
   }
 }
 
+// ── Gruppen-Live-Suche: durchsucht ALLE Gruppen (nicht nur Praefix-Gruppen) ──
+let groupSearchTimer = null;
+let groupSearchAbort = null;
+let groupSearchCache = { query: '', results: [] };
+
+// Bereits ausgewaehlte Gruppen in ein neues Ergebnis mergen, damit die Auswahl
+// (und die Namen in der Pinned-Leiste) ueber mehrere Suchen hinweg bestehen bleibt.
+function mergeSelectedGroups(results) {
+  const ids = new Set(results.map(r => r.Id));
+  const keep = State.targets.filter(t => State.selectedTargetIds.has(t.Id) && !ids.has(t.Id));
+  return keep.length ? results.concat(keep) : results;
+}
+
+function debouncedGroupSearch(term) {
+  clearTimeout(groupSearchTimer);
+  const t = (term || '').trim();
+  if (t.length < 2) {
+    // Unter 2 Zeichen: nur die ausgewaehlten Gruppen stehen lassen (Auswahl behalten)
+    State.targets = State.targets.filter(x => State.selectedTargetIds.has(x.Id));
+    groupSearchCache = { query: '', results: [] };
+    renderTargets();
+    return;
+  }
+  // Optimistisch lokal verfeinern, wenn die neue Anfrage die vorige praezisiert
+  const lower = t.toLowerCase();
+  const cachedLower = groupSearchCache.query.toLowerCase();
+  if (cachedLower && lower.startsWith(cachedLower) && groupSearchCache.results.length > 0) {
+    const filtered = groupSearchCache.results.filter(g => (g.DisplayName || '').toLowerCase().includes(lower));
+    State.targets = mergeSelectedGroups(filtered);
+    renderTargets();
+    return;
+  }
+  groupSearchTimer = setTimeout(() => runGroupSearch(t), 220);
+}
+
+async function runGroupSearch(term) {
+  if (!State.connected) { toast('Bitte zuerst verbinden', 'warn'); return; }
+
+  if (groupSearchAbort) { try { groupSearchAbort.abort(); } catch {} }
+  groupSearchAbort = new AbortController();
+  const signal = groupSearchAbort.signal;
+
+  document.getElementById('targetList').innerHTML = `
+    <div class="skeleton">
+      <div class="sk-line med"></div>
+      <div class="sk-line short"></div>
+      <div class="sk-line med"></div>
+    </div>`;
+  try {
+    const resp = await fetch('/api/groups/search?q=' + encodeURIComponent(term), {
+      headers: { 'Content-Type': 'application/json' },
+      signal,
+    });
+    let data = {};
+    try { data = await resp.json(); } catch {}
+    if (signal.aborted) return;
+    if (!resp.ok) throw new Error(data.error || `HTTP ${resp.status}`);
+
+    const results = data.items || [];
+    groupSearchCache = { query: term, results: results.slice() };
+    State.targets = mergeSelectedGroups(results);
+    renderTargets();
+    onTargetSelectionChange();
+    if (results.length === 0) toast(`Keine Gruppen für "${term}" gefunden`, 'warn');
+  } catch (e) {
+    if (e.name === 'AbortError') return;  // neue Suche laeuft schon
+    toast(e.message, 'err', 'Gruppensuche fehlgeschlagen');
+    renderTargets();
+  }
+}
+
 let loadTargetsInFlight = null;   // welcher Mode laeuft gerade
 
 async function loadTargets(opts = {}) {
@@ -589,12 +680,19 @@ async function loadTargets(opts = {}) {
     }
     return runUserSearch(term);
   }
+  // 'dept' (Gruppen) ist suchbasiert — kein Listen-Load. Bei vorhandener Eingabe
+  // die Suche ausloesen, sonst nichts tun (auch beim Auto-Load nach Connect).
+  if (State.mode === 'dept') {
+    const term = document.getElementById('targetSearch').value;
+    if (term && term.length >= 2) return runGroupSearch(term);
+    return;
+  }
 
   const requestedMode = State.mode;
   if (loadTargetsInFlight === requestedMode) return; // gleiche Anfrage laeuft bereits
   loadTargetsInFlight = requestedMode;
 
-  if (!opts.silent) setLoading('Lade ' + (requestedMode === 'rpa' ? 'RPA-Gruppen' : 'Abteilungen') + '...');
+  if (!opts.silent) setLoading('Lade ' + (requestedMode === 'rpa' ? 'RPA-Gruppen' : 'Gruppen') + '...');
   document.getElementById('targetList').innerHTML = `
     <div class="skeleton">
       <div class="sk-line med"></div>
@@ -619,7 +717,7 @@ async function loadTargets(opts = {}) {
     });
     renderTargets();
     onTargetSelectionChange();
-    if (!opts.silent) toast(`${res.count} ${requestedMode === 'rpa' ? 'RPA-Gruppen' : 'Abteilungen'} geladen`, 'ok');
+    if (!opts.silent) toast(`${res.count} ${requestedMode === 'rpa' ? 'RPA-Gruppen' : 'Gruppen'} geladen`, 'ok');
   } catch (e) {
     if (State.mode === requestedMode) {
       toast(e.message, 'err', 'Laden fehlgeschlagen');
@@ -633,7 +731,8 @@ async function loadTargets(opts = {}) {
 
 function getFilteredTargets() {
   const q = document.getElementById('targetSearch').value.toLowerCase().trim();
-  if (!q || State.mode === 'user') return State.targets;
+  // 'user' und 'dept' werden serverseitig gesucht -> State.targets ist bereits das Ergebnis.
+  if (!q || State.mode === 'user' || State.mode === 'dept') return State.targets;
   return State.targets.filter(t =>
     (t.DisplayName || '').toLowerCase().includes(q) ||
     (t.UserPrincipalName || '').toLowerCase().includes(q)
@@ -656,13 +755,17 @@ function renderTargets() {
   }
 
   if (filtered.length === 0) {
-    if (State.mode === 'user') {
+    if (State.mode === 'user' || State.mode === 'dept') {
       const term = document.getElementById('targetSearch').value;
+      const isUser = State.mode === 'user';
+      const has2 = term && term.length >= 2;
       list.innerHTML = emptyState({
-        title: term && term.length >= 2 ? 'Keine Treffer' : 'Benutzer suchen',
-        text: term && term.length >= 2
-          ? `Keine Benutzer für "${escapeHtml(term)}" gefunden.`
-          : 'Tippe mind. 2 Zeichen — Name, UPN oder E-Mail.',
+        title: has2 ? 'Keine Treffer' : (isUser ? 'Benutzer suchen' : 'Gruppe suchen'),
+        text: has2
+          ? `Keine ${isUser ? 'Benutzer' : 'Gruppen'} für "${escapeHtml(term)}" gefunden.`
+          : (isUser
+              ? 'Tippe mind. 2 Zeichen — Name, UPN oder E-Mail.'
+              : 'Tippe mind. 2 Zeichen — durchsucht alle Gruppen im Tenant.'),
       });
     } else {
       list.innerHTML = emptyState({
@@ -776,7 +879,7 @@ function renderPinnedTargets() {
   }
   wrap.classList.remove('hidden');
 
-  const modeLabels = { dept: 'Abt', rpa: 'RPA', user: 'User' };
+  const modeLabels = { dept: 'Grp', rpa: 'RPA', user: 'User' };
   const chips = items.map(it => {
     const isEmpty = it.hasMembers === false ? 'pin-empty' : '';
     const title = `${it.name}${it.meta ? ' · ' + it.meta : ''} (${modeLabels[it.mode] || it.mode}) — Klick: zur Zeile springen, X: entfernen`;
@@ -865,6 +968,10 @@ document.getElementById('appFilter').addEventListener('change', e => {
   State.appFilter.preset = e.target.value;
   renderApps();
 });
+document.getElementById('appPlatformFilter')?.addEventListener('change', e => {
+  State.appFilter.platform = e.target.value;
+  renderApps();
+});
 document.getElementById('appCategoryFilter').addEventListener('change', e => {
   State.appFilter.category = e.target.value;
   renderApps();
@@ -1008,6 +1115,13 @@ function getFilteredApps() {
   let list = State.apps.slice();
   const f = State.appFilter;
   if (f.search) list = list.filter(a => (a.AppName || '').toLowerCase().includes(f.search));
+  // Plattform-Filter ueber den rohen @odata.type: macOS-Typen enthalten "macos"
+  // (z.B. macOSDmgApp, macOsVppApp), alles uebrige ist Windows (iOS/Android sind
+  // bereits serverseitig ausgeschlossen).
+  if (f.platform && f.platform !== 'all') {
+    const isMac = a => (a.AppTypeRaw || '').toLowerCase().includes('macos');
+    list = f.platform === 'macos' ? list.filter(isMac) : list.filter(a => !isMac(a));
+  }
   switch (f.preset) {
     case 'none':         list = list.filter(a => a.AvailableCount === 0 && a.RequiredCount === 0); break;
     case 'available':    list = list.filter(a => a.AvailableCount > 0 && a.RequiredCount === 0); break;
@@ -1694,6 +1808,12 @@ async function jumpToAppById(appId) {
   // Suchfeld leeren damit die App garantiert sichtbar ist
   const search = document.getElementById('appSearch');
   if (search && search.value) { search.value = ''; State.appFilter.search = ''; }
+  // Plattform-Filter zuruecksetzen, sonst koennte die Ziel-App ausgeblendet sein
+  if (State.appFilter.platform !== 'all') {
+    State.appFilter.platform = 'all';
+    const pf = document.getElementById('appPlatformFilter');
+    if (pf) pf.value = 'all';
+  }
 
   // WICHTIG: Wenn die App noch nicht expanded ist, muessen wir den DETAILS-
   // FETCH triggern. Frueher haben wir nur expandedApps.add() gemacht — ohne
@@ -2156,7 +2276,7 @@ function toggleSession({ appId, groupId, groupName, type }) {
     return;
   }
   if (allSel.length === 0) {
-    toast('Wähle erst Abteilungen oder Benutzer aus', 'warn');
+    toast('Wähle erst Gruppen oder Benutzer aus', 'warn');
     return;
   }
 
@@ -2441,7 +2561,7 @@ async function applyAssignments() {
   document.getElementById('confirmText').innerHTML = `
     <strong>${total}</strong> Vorgang${total === 1 ? '' : 'e'} wird ausgeführt:
     <ul style="margin: 8px 0 0 18px; line-height: 1.6;">
-      ${deptOps > 0 ? `<li><strong>${deptOps}</strong> auf Abteilungsgruppen</li>` : ''}
+      ${deptOps > 0 ? `<li><strong>${deptOps}</strong> auf Gruppen</li>` : ''}
       ${userOps > 0 ? `<li><strong>${userOps}</strong> auf Einzelbenutzer</li>` : ''}
     </ul>`;
   openModal('modalConfirm');
@@ -2662,17 +2782,19 @@ function getCurrentCgMode() {
   return el ? el.value : 'req-group';
 }
 
-// Modus -> { intent, isGroup, target } — single source of truth
+// Modus -> { intent, isGroup, isExisting, target } — single source of truth
 function cgModeMeta(mode) {
   switch (mode) {
-    case 'req-group':       return { intent: 'required',  isGroup: true,  target: null };
-    case 'req-allusers':    return { intent: 'required',  isGroup: false, target: 'ALL_USERS' };
-    case 'req-alldevices':  return { intent: 'required',  isGroup: false, target: 'ALL_DEVICES' };
-    case 'avail-group':     return { intent: 'available', isGroup: true,  target: null };
-    case 'avail-allusers':  return { intent: 'available', isGroup: false, target: 'ALL_USERS' };
-    case 'avail-alldevices':return { intent: 'available', isGroup: false, target: 'ALL_DEVICES' };
+    case 'req-group':       return { intent: 'required',  isGroup: true,  isExisting: false, target: null };
+    case 'req-existing':    return { intent: 'required',  isGroup: false, isExisting: true,  target: null };
+    case 'req-allusers':    return { intent: 'required',  isGroup: false, isExisting: false, target: 'ALL_USERS' };
+    case 'req-alldevices':  return { intent: 'required',  isGroup: false, isExisting: false, target: 'ALL_DEVICES' };
+    case 'avail-group':     return { intent: 'available', isGroup: true,  isExisting: false, target: null };
+    case 'avail-existing':  return { intent: 'available', isGroup: false, isExisting: true,  target: null };
+    case 'avail-allusers':  return { intent: 'available', isGroup: false, isExisting: false, target: 'ALL_USERS' };
+    case 'avail-alldevices':return { intent: 'available', isGroup: false, isExisting: false, target: 'ALL_DEVICES' };
   }
-  return { intent: 'required', isGroup: true, target: null };
+  return { intent: 'required', isGroup: true, isExisting: false, target: null };
 }
 
 function openCreateGroupModal(appId, appName) {
@@ -2720,6 +2842,7 @@ function openCreateGroupModal(appId, appName) {
     }
   }
   document.getElementById('cgAssignToApp').checked = true;
+  resetCgExisting();
   applyCgModeUi();
   openModal('modalCreateGroup');
 }
@@ -2731,12 +2854,20 @@ function applyCgModeUi() {
   const meta = cgModeMeta(mode);
   const nameGroup = document.getElementById('cgGroupNameGroup');
   const assignWrap = document.getElementById('cgAssignToAppWrap');
+  const existingGroup = document.getElementById('cgExistingGroup');
   const createBtn = document.getElementById('cgCreate');
 
   const intentLabel = meta.intent === 'available' ? 'Available' : 'Required';
-  if (meta.isGroup) {
+  if (meta.isExisting) {
+    // Bestehende Gruppe(n) suchen + zuweisen (Mehrfachauswahl)
+    nameGroup.hidden = true;
+    assignWrap.hidden = true;
+    if (existingGroup) existingGroup.hidden = false;
+    renderCgSelected();   // setzt Button-Label + disabled anhand der Auswahl
+  } else if (meta.isGroup) {
     nameGroup.hidden = false;
     assignWrap.hidden = false;
+    if (existingGroup) existingGroup.hidden = true;
     document.getElementById('cgGroupName').value = suggestedGroupName(createGroupContext.appName, meta.intent);
     document.querySelector('#cgAssignToAppWrap span').textContent =
       `Gruppe direkt der App als ${intentLabel} zuweisen`;
@@ -2745,6 +2876,7 @@ function applyCgModeUi() {
   } else {
     nameGroup.hidden = true;
     assignWrap.hidden = true;
+    if (existingGroup) existingGroup.hidden = true;
     createBtn.disabled = false;
     const tgtLbl = meta.target === 'ALL_USERS' ? 'All Users' : 'All Devices';
     createBtn.textContent = `Als ${intentLabel} für ${tgtLbl} zuweisen`;
@@ -2755,6 +2887,110 @@ document.querySelectorAll('input[name="cgMode"]').forEach(r => {
   r.addEventListener('change', applyCgModeUi);
 });
 
+// ── "Bestehende Gruppe" — Mehrfach-Suche + -Auswahl im Zuweisungs-Dialog ──
+let cgExistingTimer = null;
+let cgExistingAbort = null;
+
+function cgSelectedGroups() {
+  if (!createGroupContext) return [];
+  if (!Array.isArray(createGroupContext.selectedGroups)) createGroupContext.selectedGroups = [];
+  return createGroupContext.selectedGroups;
+}
+
+function resetCgExisting() {
+  if (createGroupContext) createGroupContext.selectedGroups = [];
+  const s = document.getElementById('cgExistingSearch');
+  const r = document.getElementById('cgExistingResults');
+  if (s) s.value = '';
+  if (r) r.innerHTML = '';
+  renderCgSelected();
+}
+
+// Ausgewaehlte Gruppen als entfernbare Chips zeigen + Button-Status/Label setzen.
+function renderCgSelected() {
+  const sel = document.getElementById('cgExistingSelected');
+  const groups = cgSelectedGroups();
+  if (sel) {
+    sel.className = 'cg-existing-chips';
+    sel.innerHTML = groups.length === 0
+      ? '<span class="form-hint">Noch keine Gruppe ausgewählt.</span>'
+      : groups.map(g =>
+          `<span class="cg-chip" title="${escapeHtml(g.name)}">
+            <span class="cg-chip-name">${escapeHtml(g.name)}</span>
+            <button type="button" class="cg-chip-x" data-remove-id="${escapeHtml(g.id)}" aria-label="Entfernen">×</button>
+          </span>`).join('');
+  }
+  // Nur im "Bestehende Gruppe"-Modus den Erstellen/Zuweisen-Button steuern.
+  const meta = cgModeMeta(getCurrentCgMode());
+  if (meta.isExisting) {
+    const btn = document.getElementById('cgCreate');
+    const intentLabel = meta.intent === 'available' ? 'Available' : 'Required';
+    btn.disabled = groups.length === 0;
+    btn.textContent = groups.length > 1
+      ? `${groups.length} Gruppen als ${intentLabel} zuweisen`
+      : `Als ${intentLabel} zuweisen`;
+  }
+}
+
+document.getElementById('cgExistingSearch')?.addEventListener('input', e => {
+  clearTimeout(cgExistingTimer);
+  const term = e.target.value.trim();
+  const results = document.getElementById('cgExistingResults');
+  if (term.length < 2) { if (results) results.innerHTML = ''; return; }
+  cgExistingTimer = setTimeout(() => runCgExistingSearch(term), 250);
+});
+
+async function runCgExistingSearch(term) {
+  const results = document.getElementById('cgExistingResults');
+  if (!results) return;
+  if (cgExistingAbort) { try { cgExistingAbort.abort(); } catch {} }
+  cgExistingAbort = new AbortController();
+  results.innerHTML = '<div class="cg-existing-empty">Suche…</div>';
+  try {
+    const resp = await fetch('/api/groups/search?q=' + encodeURIComponent(term), { signal: cgExistingAbort.signal });
+    let data = {}; try { data = await resp.json(); } catch {}
+    if (cgExistingAbort.signal.aborted) return;
+    if (!resp.ok) throw new Error(data.error || `HTTP ${resp.status}`);
+    const items = data.items || [];
+    if (items.length === 0) { results.innerHTML = '<div class="cg-existing-empty">Keine Treffer</div>'; return; }
+    const selIds = new Set(cgSelectedGroups().map(g => g.id));
+    results.innerHTML = items.map(g =>
+      `<button type="button" class="cg-existing-item${selIds.has(String(g.Id)) ? ' is-selected' : ''}" data-id="${escapeHtml(g.Id)}" data-name="${escapeHtml(g.DisplayName)}">
+        <span class="cg-existing-name">${escapeHtml(g.DisplayName)}</span>
+        ${g.Description ? `<span class="cg-existing-desc">${escapeHtml(g.Description)}</span>` : ''}
+      </button>`).join('');
+  } catch (e) {
+    if (e.name === 'AbortError') return;
+    results.innerHTML = `<div class="cg-existing-empty">Fehler: ${escapeHtml(e.message)}</div>`;
+  }
+}
+
+// Ergebnis anklicken -> Auswahl togglen (Mehrfachauswahl)
+document.getElementById('cgExistingResults')?.addEventListener('click', e => {
+  const btn = e.target.closest('.cg-existing-item');
+  if (!btn) return;
+  const id = btn.dataset.id, name = btn.dataset.name;
+  const groups = cgSelectedGroups();
+  const idx = groups.findIndex(g => g.id === id);
+  if (idx >= 0) { groups.splice(idx, 1); btn.classList.remove('is-selected'); }
+  else { groups.push({ id, name }); btn.classList.add('is-selected'); }
+  renderCgSelected();
+});
+
+// Chip entfernen -> Auswahl abwaehlen (und ggf. Ergebnis-Item entmarkieren)
+document.getElementById('cgExistingSelected')?.addEventListener('click', e => {
+  const x = e.target.closest('[data-remove-id]');
+  if (!x) return;
+  const id = x.dataset.removeId;
+  const groups = cgSelectedGroups();
+  const idx = groups.findIndex(g => g.id === id);
+  if (idx >= 0) groups.splice(idx, 1);
+  document.querySelectorAll('.cg-existing-item').forEach(it => {
+    if (it.dataset.id === id) it.classList.remove('is-selected');
+  });
+  renderCgSelected();
+});
+
 document.getElementById('cgGroupName').addEventListener('input', () => {
   clearTimeout(cgCheckTimer);
   cgCheckTimer = setTimeout(checkGroupName, 400);
@@ -2793,6 +3029,30 @@ document.getElementById('cgCreate').addEventListener('click', async () => {
   if (!createGroupContext) return;
   const meta = cgModeMeta(getCurrentCgMode());
 
+  if (meta.isExisting) {
+    // Bestehende Gruppe(n) zuweisen — EIN Request mit allen Zielen. Das Backend
+    // mergt die neuen Gruppen mit den bestehenden Zuweisungen (die /assign-Action
+    // ersetzt sonst die komplette Liste -> nur die letzte Gruppe bliebe uebrig).
+    const groups = cgSelectedGroups();
+    if (groups.length === 0) { toast('Bitte zuerst mind. eine Gruppe auswählen', 'warn'); return; }
+    const intentLabel = meta.intent === 'available' ? 'Available' : 'Required';
+    setLoading(`Weise ${groups.length} Gruppe(n) als ${intentLabel} zu...`);
+    try {
+      await api(`/api/apps/${encodeURIComponent(createGroupContext.appId)}/assignments`, {
+        method: 'POST',
+        body: { intent: meta.intent, targets: groups.map(g => g.id) },
+      });
+      toast(`${groups.length} ${intentLabel}-Zuweisung(en) hinzugefügt`, 'ok');
+      closeModal('modalCreateGroup');
+      await loadApps(true);
+    } catch (e) {
+      toast(e.message, 'err', 'Zuweisung fehlgeschlagen');
+    } finally {
+      clearLoading();
+    }
+    return;
+  }
+
   if (meta.isGroup) {
     // Gruppe erstellen + zuweisen
     const { prefix, suffix } = getNamingFor(meta.intent);
@@ -3303,7 +3563,7 @@ function applyExpandedSelection(groupId) {
 
   renderTargets();
   onTargetSelectionChange();
-  toast(`${picked.length} Benutzer aus "${entry.name}" übernommen — Abteilungs-Auswahl bleibt erhalten`, 'ok');
+  toast(`${picked.length} Benutzer aus "${entry.name}" übernommen — Gruppen-Auswahl bleibt erhalten`, 'ok');
 }
 
 // (Alte Modal-Logik — unbenutzt, aber harmlos:)
@@ -5968,10 +6228,30 @@ async function polDoImport() {
     if (nn && nn !== polEnvName(env)) env.newName = nn; else delete env.newName;
   });
   closeModal('modalPolImport');
+  const envelopes = _polImportEnvelopes.slice();
+  const total = envelopes.length;
   setLoading('Importiere Policies…');
   try {
-    const res = await api('/api/policies/import', { method: 'POST', body: { policies: _polImportEnvelopes }, timeoutMs: 180000 });
-    const results = res.results || [];
+    // Sequenzieller Server-Import in kleinen Batches: umgeht die 180-s-Timeout-Wand
+    // eines einzelnen Requests bei vielen Policies und erlaubt Fortschrittsanzeige.
+    const BATCH = 5;
+    const loadingText = document.getElementById('loadingText');
+    const results = [];
+    for (let start = 0; start < total; start += BATCH) {
+      const chunk = envelopes.slice(start, start + BATCH);
+      if (loadingText && total > BATCH) {
+        loadingText.textContent = `Importiere Policies… (${start + 1}–${Math.min(start + chunk.length, total)} von ${total})`;
+      }
+      // Timeout pro Batch nach Batch-Größe skaliert (Anlegen + Retry je Policy).
+      try {
+        const res = await api('/api/policies/import', { method: 'POST', body: { policies: chunk }, timeoutMs: 30000 + chunk.length * 30000 });
+        if (res && res.results) results.push(...res.results);
+      } catch (be) {
+        // Batch-Fehler nicht den Gesamtimport abbrechen lassen — als fehlgeschlagen
+        // vermerken und mit dem nächsten Batch weitermachen.
+        chunk.forEach(env => results.push({ policyName: polEnvName(env), success: false, error: be.message }));
+      }
+    }
     const ok = results.filter(r => r.success);
     const fail = results.filter(r => !r.success);
     if (fail.length) {

www/index.html

@@ -126,7 +126,7 @@
   <section class="panel panel-targets">
     <div class="panel-head">
       <div class="panel-title">
-        <h2>Abteilungen &amp; Benutzer</h2>
+        <h2>Gruppen &amp; Benutzer</h2>
         <span id="targetCount" class="count-badge">0</span>
       </div>
       <button id="btnReloadTargets" class="icon-btn" title="Neu laden" aria-label="Neu laden">
@@ -135,7 +135,7 @@
     </div>
 
     <div class="mode-segment" role="tablist">
-      <button class="seg active" data-mode="dept" role="tab">Abteilung</button>
+      <button class="seg active" data-mode="dept" role="tab">Gruppe</button>
       <button class="seg" data-mode="user" role="tab">Benutzer</button>
     </div>
 
@@ -193,6 +193,11 @@
         <option value="srcIntune">Nur Intune-Apps</option>
         <!-- Vendor-Optionen werden dynamisch von rebuildVendorFilterOptions() ergaenzt -->
       </select>
+      <select id="appPlatformFilter" class="select" title="Nach Plattform filtern">
+        <option value="all">Alle Plattformen</option>
+        <option value="windows">Windows</option>
+        <option value="macos">macOS</option>
+      </select>
       <select id="appCategoryFilter" class="select" title="Nach App-Kategorie filtern">
         <option value="">Alle Kategorien</option>
         <!-- Kategorie-Optionen werden dynamisch von rebuildCategoryFilterOptions() befuellt -->
@@ -244,7 +249,7 @@
         <div class="summary-section">
           <div class="summary-section-title">Ausgewählte Empfänger</div>
           <div class="summary-row sub">
-            <span class="muted">Abteilungsgruppen</span>
+            <span class="muted">Gruppen</span>
             <span id="sumGroupsSel">0</span>
           </div>
           <div class="summary-row sub">
@@ -255,7 +260,7 @@
         <div class="summary-section">
           <div class="summary-section-title">Zuweisungen erhalten</div>
           <div class="summary-row sub">
-            <span class="muted">Abteilungsgruppen</span>
+            <span class="muted">Gruppen</span>
             <span id="sumGroupsOps">0</span>
           </div>
           <div class="summary-row sub">
@@ -711,6 +716,13 @@
                 <span class="cg-mode-desc">Neue Required-Gruppe nach Naming-Schema erstellen und zuweisen.</span>
               </span>
             </label>
+            <label class="cg-mode">
+              <input type="radio" name="cgMode" value="req-existing">
+              <span class="cg-mode-body">
+                <span class="cg-mode-title">Bestehende Gruppe</span>
+                <span class="cg-mode-desc">Eine vorhandene Entra-Gruppe als Required zuweisen.</span>
+              </span>
+            </label>
             <label class="cg-mode">
               <input type="radio" name="cgMode" value="req-allusers">
               <span class="cg-mode-body">
@@ -739,6 +751,13 @@
                 <span class="cg-mode-desc">Neue Available-Gruppe nach Naming-Schema erstellen und zuweisen.</span>
               </span>
             </label>
+            <label class="cg-mode">
+              <input type="radio" name="cgMode" value="avail-existing">
+              <span class="cg-mode-body">
+                <span class="cg-mode-title">Bestehende Gruppe</span>
+                <span class="cg-mode-desc">Eine vorhandene Entra-Gruppe als Available zuweisen.</span>
+              </span>
+            </label>
             <label class="cg-mode">
               <input type="radio" name="cgMode" value="avail-allusers">
               <span class="cg-mode-body">
@@ -762,6 +781,12 @@
         <input type="text" id="cgGroupName" class="input">
         <div id="cgStatus" class="form-hint"></div>
       </div>
+      <div class="form-group" id="cgExistingGroup" hidden>
+        <label class="lbl" for="cgExistingSearch">Bestehende Gruppe suchen</label>
+        <input type="search" id="cgExistingSearch" class="input" placeholder="Gruppenname… (min. 2 Zeichen)" autocomplete="off">
+        <div id="cgExistingResults" class="cg-existing-results"></div>
+        <div id="cgExistingSelected" class="form-hint"></div>
+      </div>
       <label class="check-chip" id="cgAssignToAppWrap">
         <input type="checkbox" id="cgAssignToApp" checked>
         <span>Gruppe direkt der App zuweisen</span>

www/styles.css

@@ -4020,6 +4020,67 @@ body.members-page {
   color: var(--muted);
 }
 
+/* "Bestehende Gruppe" — Suchergebnis-Liste im Zuweisungs-Dialog */
+.cg-existing-results {
+  margin-top: 8px;
+  max-height: 220px;
+  overflow-y: auto;
+  border: 1px solid var(--hairline-soft);
+  border-radius: var(--r-xs);
+}
+.cg-existing-results:empty { display: none; }
+.cg-existing-item {
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  width: 100%;
+  text-align: left;
+  padding: 8px 12px;
+  background: transparent;
+  border: none;
+  border-bottom: 1px solid var(--hairline-soft);
+  cursor: pointer;
+  color: inherit;
+}
+.cg-existing-item:last-child { border-bottom: none; }
+.cg-existing-item:hover { background: var(--hover, rgba(127,127,127,0.08)); }
+.cg-existing-item.is-selected { background: var(--accent-soft); }
+.cg-existing-name { font-size: 13px; font-weight: 600; }
+.cg-existing-desc { font-size: 11px; color: var(--muted); }
+.cg-existing-empty { padding: 10px 12px; font-size: 12px; color: var(--muted); }
+
+/* Ausgewaehlte Gruppen als Chips (Mehrfachauswahl) */
+.cg-existing-chips {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 6px;
+  margin-top: 8px;
+}
+.cg-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 3px 6px 3px 10px;
+  background: var(--accent-soft);
+  color: var(--brand-accent);
+  border-radius: 999px;
+  font-size: 12px;
+  font-weight: 600;
+  max-width: 100%;
+}
+.cg-chip-name { overflow: hidden; text-overflow: ellipsis; white-space: nowrap; max-width: 220px; }
+.cg-chip-x {
+  border: none;
+  background: transparent;
+  color: inherit;
+  cursor: pointer;
+  font-size: 15px;
+  line-height: 1;
+  padding: 0 2px;
+  opacity: 0.75;
+}
+.cg-chip-x:hover { opacity: 1; }
+
 .cg-mode {
   display: flex;
   align-items: flex-start;