fix(tests): use native element clicks in layout dropdown spec

CDP-based Playwright clicks (locator.click()) do not reliably trigger Svelte 5 onclick handlers — documented in commit 0c765d81 which fixed 13 other specs. The layout dropdown tests were missed in that pass. Applies the same pattern: ((await locator.element()) as HTMLElement).click() for button interactions, and native KeyboardEvent dispatch for the Escape test (dispatched on the button so it bubbles to the parent div's onkeydown). Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-05-14 11:02:12 +02:00
40 changed files with 156 additions and 1159 deletions
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -2,7 +2,6 @@ name: CI

 on:
  push:
-    branches: [main]
  pull_request:

 jobs:
@@ -33,10 +32,6 @@ jobs:
        run: npx @inlang/paraglide-js compile --project ./project.inlang --outdir ./src/lib/paraglide
        working-directory: frontend

-      - name: Sync SvelteKit
-        run: npx svelte-kit sync
-        working-directory: frontend
-
      - name: Lint
        run: npm run lint
        working-directory: frontend
@@ -197,14 +192,6 @@ jobs:
          ./mvnw clean test
        working-directory: backend

-      - name: Upload surefire reports
-        if: always()
-        # Gitea Actions (act_runner) does not implement upload-artifact v4 protocol — pinned per ADR-014. Do NOT upgrade. See #557.
-        uses: actions/upload-artifact@v3
-        with:
-          name: surefire-reports
-          path: backend/target/surefire-reports/
-
  # ─── fail2ban Regex Regression ────────────────────────────────────────────────
  # The filter parses Caddy's JSON access log; a Caddy upgrade that reorders
  # the JSON keys would silently break it (fail2ban-regex would return
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -159,7 +159,7 @@ Input DTOs live flat in the domain package. Response types are the model entitie

 → See [CONTRIBUTING.md §Error handling](./CONTRIBUTING.md#error-handling)

-**LLM reminder:** use `DomainException.notFound/forbidden/conflict/internal()` from service methods — never throw raw exceptions. When adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) add to `ErrorCode` type in `frontend/src/lib/shared/errors.ts`, (3) add a `case` in `getErrorMessage()`, (4) add i18n keys in `messages/{de,en,es}.json`.
+**LLM reminder:** use `DomainException.notFound/forbidden/conflict/internal()` from service methods — never throw raw exceptions. When adding a new `ErrorCode`: (1) add to `ErrorCode.java`, (2) mirror in `frontend/src/lib/shared/errors.ts`, (3) add i18n keys in `messages/{de,en,es}.json`.

 ### Security / Permissions

--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -273,16 +273,6 @@
 					</profiles>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
-					<systemPropertyVariables>
-						<junit.jupiter.execution.timeout.default>90 s</junit.jupiter.execution.timeout.default>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>

--- a/backend/src/main/java/org/raddatz/familienarchiv/exception/ErrorCode.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/exception/ErrorCode.java
@@ -30,8 +30,6 @@ public enum ErrorCode {
    // --- Users ---
    /** A user with the given ID or username does not exist. 404 */
    USER_NOT_FOUND,
-    /** A group with the given ID does not exist. 404 */
-    GROUP_NOT_FOUND,
    /** The supplied email address is already used by another account. 409 */
    EMAIL_ALREADY_IN_USE,
    /** The supplied current password does not match the stored hash. 400 */
@@ -54,8 +52,6 @@ public enum ErrorCode {
    INVITE_REVOKED,
    /** The invite has passed its expiry date. 410 */
    INVITE_EXPIRED,
-    /** A group cannot be deleted because one or more active invites reference it. 409 */
-    GROUP_HAS_ACTIVE_INVITES,

    // --- Auth ---
    /** The request is not authenticated. 401 */
--- a/backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/importing/MassImportService.java
@@ -1,6 +1,5 @@
 package org.raddatz.familienarchiv.importing;

-import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.*;
@@ -53,9 +52,9 @@ public class MassImportService {

    public enum State { IDLE, RUNNING, DONE, FAILED }

-    public record ImportStatus(State state, String statusCode, @JsonIgnore String message, int processed, LocalDateTime startedAt) {}
+    public record ImportStatus(State state, String message, int processed, LocalDateTime startedAt) {}

-    private volatile ImportStatus currentStatus = new ImportStatus(State.IDLE, "IMPORT_IDLE", "Kein Import gestartet.", 0, null);
+    private volatile ImportStatus currentStatus = new ImportStatus(State.IDLE, "Kein Import gestartet.", 0, null);

    public ImportStatus getStatus() {
        return currentStatus;
@@ -117,29 +116,20 @@ public class MassImportService {
        if (currentStatus.state() == State.RUNNING) {
            throw DomainException.conflict(ErrorCode.IMPORT_ALREADY_RUNNING, "A mass import is already in progress");
        }
-        currentStatus = new ImportStatus(State.RUNNING, "IMPORT_RUNNING", "Import läuft...", 0, LocalDateTime.now());
+        currentStatus = new ImportStatus(State.RUNNING, "Import läuft...", 0, LocalDateTime.now());
        try {
            File spreadsheet = findSpreadsheetFile();
            log.info("Starte Massenimport aus: {}", spreadsheet.getAbsolutePath());
            int processed = processRows(readSpreadsheet(spreadsheet));
-            currentStatus = new ImportStatus(State.DONE, "IMPORT_DONE",
+            currentStatus = new ImportStatus(State.DONE,
                    "Import abgeschlossen. " + processed + " Dokumente verarbeitet.",
                    processed, currentStatus.startedAt());
-        } catch (NoSpreadsheetException e) {
-            log.error("Massenimport fehlgeschlagen: keine Tabellendatei", e);
-            currentStatus = new ImportStatus(State.FAILED, "IMPORT_FAILED_NO_SPREADSHEET",
-                    "Fehler: " + e.getMessage(), 0, currentStatus.startedAt());
        } catch (Exception e) {
            log.error("Massenimport fehlgeschlagen", e);
-            currentStatus = new ImportStatus(State.FAILED, "IMPORT_FAILED_INTERNAL",
-                    "Fehler: " + e.getMessage(), 0, currentStatus.startedAt());
+            currentStatus = new ImportStatus(State.FAILED, "Fehler: " + e.getMessage(), 0, currentStatus.startedAt());
        }
    }

-    private static class NoSpreadsheetException extends RuntimeException {
-        NoSpreadsheetException(String message) { super(message); }
-    }
-
    private File findSpreadsheetFile() throws IOException {
        try (Stream<Path> files = Files.list(Paths.get(importDir))) {
            return files
@@ -148,7 +138,7 @@ public class MassImportService {
                        return name.endsWith(".ods") || name.endsWith(".xlsx") || name.endsWith(".xls");
                    })
                    .findFirst()
-                    .orElseThrow(() -> new NoSpreadsheetException(
+                    .orElseThrow(() -> new RuntimeException(
                            "Keine Tabellendatei (.ods/.xlsx/.xls) in " + importDir + " gefunden!"))
                    .toFile();
        }
--- a/backend/src/main/java/org/raddatz/familienarchiv/user/InviteService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteService.java
@@ -52,11 +52,7 @@ public class InviteService {
    public InviteToken createInvite(CreateInviteRequest dto, AppUser creator) {
        Set<UUID> groupIds = new HashSet<>();
        if (dto.getGroupIds() != null && !dto.getGroupIds().isEmpty()) {
-            Set<UUID> uniqueIds = new HashSet<>(dto.getGroupIds());
-            List<UserGroup> groups = userService.findGroupsByIds(new ArrayList<>(uniqueIds));
-            if (groups.size() != uniqueIds.size()) {
-                throw DomainException.notFound(ErrorCode.GROUP_NOT_FOUND, "One or more group IDs do not exist");
-            }
+            List<UserGroup> groups = userService.findGroupsByIds(dto.getGroupIds());
            groups.forEach(g -> groupIds.add(g.getId()));
        }

--- a/backend/src/main/java/org/raddatz/familienarchiv/user/InviteTokenRepository.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/InviteTokenRepository.java
@@ -24,7 +24,4 @@ public interface InviteTokenRepository extends JpaRepository<InviteToken, UUID>

    @Query("SELECT t FROM InviteToken t ORDER BY t.createdAt DESC")
    List<InviteToken> findAllOrderedByCreatedAt();
-
-    @Query("SELECT CASE WHEN COUNT(t) > 0 THEN true ELSE false END FROM InviteToken t JOIN t.groupIds g WHERE g = :groupId AND t.revoked = false AND (t.expiresAt IS NULL OR t.expiresAt > CURRENT_TIMESTAMP) AND (t.maxUses IS NULL OR t.useCount < t.maxUses)")
-    boolean existsActiveWithGroupId(@Param("groupId") UUID groupId);
 }
--- a/backend/src/main/java/org/raddatz/familienarchiv/user/UserService.java
+++ b/backend/src/main/java/org/raddatz/familienarchiv/user/UserService.java
@@ -37,9 +37,6 @@ public class UserService {

    private final AppUserRepository userRepository;
    private final UserGroupRepository groupRepository;
-    // Injected directly (not via InviteService) to avoid a constructor injection cycle:
-    // InviteService → UserService → InviteService. Spring Framework 7 forbids such cycles.
-    private final InviteTokenRepository inviteTokenRepository;
    private final PasswordEncoder passwordEncoder;
    private final AuditService auditService;

@@ -291,10 +288,6 @@ public class UserService {

    @Transactional
    public void deleteGroup(UUID id) {
-        if (inviteTokenRepository.existsActiveWithGroupId(id)) {
-            throw DomainException.conflict(ErrorCode.GROUP_HAS_ACTIVE_INVITES,
-                    "Cannot delete group " + id + " — referenced by one or more active invites");
-        }
        groupRepository.deleteById(id);
    }
 }
--- a/backend/src/main/resources/db/migration/V66__add_invite_token_group_id_index.sql
+++ b/backend/src/main/resources/db/migration/V66__add_invite_token_group_id_index.sql
@@ -1,3 +0,0 @@
-- The composite PK (invite_token_id, group_id) does not support efficient lookups by group_id alone.
-- Add a dedicated index to support existsActiveWithGroupId queries.
-CREATE INDEX idx_itg_group_id ON invite_token_group_ids (group_id);
--- a/backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/importing/MassImportServiceTest.java
@@ -20,10 +20,7 @@ import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
 import software.amazon.awssdk.services.s3.model.PutObjectRequest;

-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-
 import java.io.File;
-import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.time.LocalDate;
@@ -73,20 +70,14 @@ class MassImportServiceTest {
        assertThat(service.getStatus().state()).isEqualTo(MassImportService.State.IDLE);
    }

-    @Test
-    void getStatus_hasStatusCode_IMPORT_IDLE_byDefault() {
-        assertThat(service.getStatus().statusCode()).isEqualTo("IMPORT_IDLE");
-    }
-
    // ─── runImportAsync ───────────────────────────────────────────────────────

    @Test
    void runImportAsync_setsFailedStatus_whenImportDirectoryDoesNotExist() {
-        // /import directory doesn't exist in test environment → IOException → IMPORT_FAILED_INTERNAL
+        // /import directory doesn't exist in test environment → findSpreadsheetFile throws
        service.runImportAsync();

        assertThat(service.getStatus().state()).isEqualTo(MassImportService.State.FAILED);
-        assertThat(service.getStatus().statusCode()).isEqualTo("IMPORT_FAILED_INTERNAL");
    }

    @Test
@@ -102,35 +93,10 @@ class MassImportServiceTest {
        assertThat(service.getStatus().message()).contains(tempDir.toString());
    }

-    @Test
-    void runImportAsync_setsStatusCode_IMPORT_FAILED_NO_SPREADSHEET_whenDirIsEmpty(@TempDir Path tempDir) {
-        ReflectionTestUtils.setField(service, "importDir", tempDir.toString());
-
-        service.runImportAsync();
-
-        assertThat(service.getStatus().statusCode()).isEqualTo("IMPORT_FAILED_NO_SPREADSHEET");
-    }
-
-    @Test
-    void runImportAsync_setsStatusCode_IMPORT_DONE_whenSpreadsheetHasNoDataRows(@TempDir Path tempDir) throws Exception {
-        Path xlsx = tempDir.resolve("import.xlsx");
-        try (XSSFWorkbook wb = new XSSFWorkbook()) {
-            wb.createSheet("Sheet1");
-            try (OutputStream out = Files.newOutputStream(xlsx)) {
-                wb.write(out);
-            }
-        }
-        ReflectionTestUtils.setField(service, "importDir", tempDir.toString());
-
-        service.runImportAsync();
-
-        assertThat(service.getStatus().statusCode()).isEqualTo("IMPORT_DONE");
-    }
-
    @Test
    void runImportAsync_throwsConflict_whenAlreadyRunning() {
        MassImportService.ImportStatus running = new MassImportService.ImportStatus(
-                MassImportService.State.RUNNING, "IMPORT_RUNNING", "Running...", 0, LocalDateTime.now());
+                MassImportService.State.RUNNING, "Running...", 0, LocalDateTime.now());
        ReflectionTestUtils.setField(service, "currentStatus", running);

        assertThatThrownBy(() -> service.runImportAsync())
--- a/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/AdminControllerTest.java
@@ -40,47 +40,6 @@ class AdminControllerTest {
    @MockitoBean ThumbnailBackfillService thumbnailBackfillService;
    @MockitoBean CustomUserDetailsService customUserDetailsService;

-    // ─── GET /api/admin/import-status ─────────────────────────────────────────
-
-    @Test
-    @WithMockUser(authorities = "ADMIN")
-    void importStatus_returns200_withStatusCode_whenAdmin() throws Exception {
-        MassImportService.ImportStatus status = new MassImportService.ImportStatus(
-                MassImportService.State.IDLE, "IMPORT_IDLE", "Kein Import gestartet.", 0, null);
-        when(massImportService.getStatus()).thenReturn(status);
-
-        mockMvc.perform(get("/api/admin/import-status"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.state").value("IDLE"))
-                .andExpect(jsonPath("$.statusCode").value("IMPORT_IDLE"))
-                .andExpect(jsonPath("$.processed").value(0));
-    }
-
-    @Test
-    @WithMockUser(authorities = "ADMIN")
-    void importStatus_messageField_notPresentInApiResponse() throws Exception {
-        MassImportService.ImportStatus status = new MassImportService.ImportStatus(
-                MassImportService.State.IDLE, "IMPORT_IDLE", "Kein Import gestartet.", 0, null);
-        when(massImportService.getStatus()).thenReturn(status);
-
-        mockMvc.perform(get("/api/admin/import-status"))
-                .andExpect(status().isOk())
-                .andExpect(jsonPath("$.message").doesNotExist());
-    }
-
-    @Test
-    void importStatus_returns401_whenUnauthenticated() throws Exception {
-        mockMvc.perform(get("/api/admin/import-status"))
-                .andExpect(status().isUnauthorized());
-    }
-
-    @Test
-    @WithMockUser(authorities = "READ_ALL")
-    void importStatus_returns403_whenUserLacksAdminPermission() throws Exception {
-        mockMvc.perform(get("/api/admin/import-status"))
-                .andExpect(status().isForbidden());
-    }
-
    @Test
    void backfillVersions_returns401_whenUnauthenticated() throws Exception {
        mockMvc.perform(post("/api/admin/backfill-versions"))
--- a/backend/src/test/java/org/raddatz/familienarchiv/user/InviteControllerTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteControllerTest.java
@@ -20,13 +20,10 @@ import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.bean.override.mockito.MockitoBean;
 import org.springframework.test.web.servlet.MockMvc;

-import org.mockito.ArgumentCaptor;
-
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.UUID;

-import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -150,30 +147,6 @@ class InviteControllerTest {
                .andExpect(jsonPath("$.label").value("Für Familie"));
    }

-    @Test
-    @WithMockUser(username = "admin@test.com", authorities = {"ADMIN_USER"})
-    void createInvite_forwardsGroupIdsToService() throws Exception {
-        UUID groupId = UUID.randomUUID();
-        AppUser admin = AppUser.builder().id(UUID.randomUUID()).email("admin@test.com").build();
-        when(userService.findByEmail("admin@test.com")).thenReturn(admin);
-
-        InviteToken savedToken = InviteToken.builder()
-                .id(UUID.randomUUID()).code("ABCDE12345").useCount(0).build();
-        when(inviteService.createInvite(any(), eq(admin))).thenReturn(savedToken);
-        when(inviteService.toListItemDTO(any(), anyString()))
-                .thenReturn(makeInviteDTO(savedToken.getId(), "ABCDE12345"));
-
-        String body = "{\"groupIds\":[\"" + groupId + "\"]}";
-        mockMvc.perform(post("/api/invites")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content(body))
-                .andExpect(status().isCreated());
-
-        ArgumentCaptor<CreateInviteRequest> captor = ArgumentCaptor.forClass(CreateInviteRequest.class);
-        verify(inviteService).createInvite(captor.capture(), eq(admin));
-        assertThat(captor.getValue().getGroupIds()).containsExactly(groupId);
-    }
-
    // ─── DELETE /api/invites/{id} ─────────────────────────────────────────────

    @Test
--- a/backend/src/test/java/org/raddatz/familienarchiv/user/InviteServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteServiceTest.java
@@ -156,35 +156,6 @@ class InviteServiceTest {
        assertThat(result.getGroupIds()).contains(g.getId());
    }

-    @Test
-    void createInvite_throwsGroupNotFound_whenSubmittedGroupIdDoesNotExist() {
-        UUID unknownGroupId = UUID.randomUUID();
-        when(userService.findGroupsByIds(anyList())).thenReturn(List.of());
-
-        CreateInviteRequest req = new CreateInviteRequest();
-        req.setGroupIds(List.of(unknownGroupId));
-
-        assertThatThrownBy(() -> inviteService.createInvite(req, admin))
-                .isInstanceOf(DomainException.class)
-                .extracting(e -> ((DomainException) e).getCode())
-                .isEqualTo(ErrorCode.GROUP_NOT_FOUND);
-    }
-
-    @Test
-    void createInvite_doesNotThrowGroupNotFound_whenDuplicateGroupIdsSubmitted() {
-        UUID groupId = UUID.randomUUID();
-        UserGroup group = UserGroup.builder().id(groupId).name("Familie").build();
-        when(inviteTokenRepository.findByCode(anyString())).thenReturn(Optional.empty());
-        when(userService.findGroupsByIds(anyList())).thenReturn(List.of(group));
-        when(inviteTokenRepository.save(any())).thenAnswer(inv -> inv.getArgument(0));
-
-        CreateInviteRequest req = new CreateInviteRequest();
-        req.setGroupIds(List.of(groupId, groupId)); // same UUID submitted twice
-
-        // before deduplication: size(groups)==1 != size(submitted)==2 → false GROUP_NOT_FOUND
-        assertThatCode(() -> inviteService.createInvite(req, admin)).doesNotThrowAnyException();
-    }
-
    // ─── redeemInvite ─────────────────────────────────────────────────────────

    @Test
--- a/backend/src/test/java/org/raddatz/familienarchiv/user/InviteTokenRepositoryIntegrationTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/InviteTokenRepositoryIntegrationTest.java
@@ -1,78 +0,0 @@
-package org.raddatz.familienarchiv.user;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.raddatz.familienarchiv.PostgresContainerConfig;
-import org.raddatz.familienarchiv.config.FlywayConfig;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.jdbc.test.autoconfigure.AutoConfigureTestDatabase;
-import org.springframework.boot.data.jpa.test.autoconfigure.DataJpaTest;
-import org.springframework.context.annotation.Import;
-
-import java.time.LocalDateTime;
-import java.util.Set;
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-@DataJpaTest
-@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE)
-@Import({PostgresContainerConfig.class, FlywayConfig.class})
-class InviteTokenRepositoryIntegrationTest {
-
-    @Autowired InviteTokenRepository inviteTokenRepository;
-    @Autowired UserGroupRepository userGroupRepository;
-    @Autowired AppUserRepository appUserRepository;
-
-    private UserGroup group;
-    private AppUser admin;
-
-    @BeforeEach
-    void setUp() {
-        inviteTokenRepository.deleteAll();
-        userGroupRepository.deleteAll();
-        appUserRepository.deleteAll();
-        admin = appUserRepository.save(AppUser.builder().email("admin@test.com").password("pw").build());
-        group = userGroupRepository.save(UserGroup.builder().name("Familie").build());
-    }
-
-    // ─── existsActiveWithGroupId ──────────────────────────────────────────────
-
-    @Test
-    void existsActiveWithGroupId_returnsTrueForActiveInviteLinkedToGroup() {
-        inviteTokenRepository.save(token(t -> t));
-
-        assertThat(inviteTokenRepository.existsActiveWithGroupId(group.getId())).isTrue();
-    }
-
-    @Test
-    void existsActiveWithGroupId_returnsFalseWhenInviteIsRevoked() {
-        inviteTokenRepository.save(token(t -> t.revoked(true)));
-
-        assertThat(inviteTokenRepository.existsActiveWithGroupId(group.getId())).isFalse();
-    }
-
-    @Test
-    void existsActiveWithGroupId_returnsFalseWhenInviteIsExpired() {
-        inviteTokenRepository.save(token(t -> t.expiresAt(LocalDateTime.now().minusDays(1))));
-
-        assertThat(inviteTokenRepository.existsActiveWithGroupId(group.getId())).isFalse();
-    }
-
-    @Test
-    void existsActiveWithGroupId_returnsFalseWhenInviteIsExhausted() {
-        inviteTokenRepository.save(token(t -> t.maxUses(1).useCount(1)));
-
-        assertThat(inviteTokenRepository.existsActiveWithGroupId(group.getId())).isFalse();
-    }
-
-    // ─── helpers ─────────────────────────────────────────────────────────────
-
-    private InviteToken token(java.util.function.UnaryOperator<InviteToken.InviteTokenBuilder> customizer) {
-        InviteToken.InviteTokenBuilder builder = InviteToken.builder()
-                .code(UUID.randomUUID().toString().replace("-", "").substring(0, 10))
-                .groupIds(new java.util.HashSet<>(Set.of(group.getId())))
-                .createdBy(admin);
-        return customizer.apply(builder).build();
-    }
-}
--- a/backend/src/test/java/org/raddatz/familienarchiv/user/UserServiceTest.java
+++ b/backend/src/test/java/org/raddatz/familienarchiv/user/UserServiceTest.java
@@ -36,7 +36,6 @@ class UserServiceTest {

    @Mock AppUserRepository userRepository;
    @Mock UserGroupRepository groupRepository;
-    @Mock InviteTokenRepository inviteTokenRepository;
    @Mock PasswordEncoder passwordEncoder;
    @Mock AuditService auditService;
    @InjectMocks UserService userService;
@@ -904,29 +903,6 @@ class UserServiceTest {
        assertThat(result.getPermissions()).containsExactlyInAnyOrder("READ_ALL", "WRITE_ALL");
    }

-    // ─── deleteGroup ──────────────────────────────────────────────────────────
-
-    @Test
-    void deleteGroup_throwsConflict_whenActiveInviteReferencesGroup() {
-        UUID groupId = UUID.randomUUID();
-        when(inviteTokenRepository.existsActiveWithGroupId(groupId)).thenReturn(true);
-
-        assertThatThrownBy(() -> userService.deleteGroup(groupId))
-                .isInstanceOf(DomainException.class)
-                .extracting(e -> ((DomainException) e).getCode())
-                .isEqualTo(ErrorCode.GROUP_HAS_ACTIVE_INVITES);
-    }
-
-    @Test
-    void deleteGroup_deletesGroup_whenNoActiveInviteReferencesGroup() {
-        UUID groupId = UUID.randomUUID();
-        when(inviteTokenRepository.existsActiveWithGroupId(groupId)).thenReturn(false);
-
-        userService.deleteGroup(groupId);
-
-        verify(groupRepository).deleteById(groupId);
-    }
-
    @Test
    void createGroup_withNullPermissions_savesGroupWithEmptyPermissionSet() {
        org.raddatz.familienarchiv.user.GroupDTO dto = new org.raddatz.familienarchiv.user.GroupDTO();
--- a/backend/src/test/resources/application.properties
+++ b/backend/src/test/resources/application.properties
@@ -1,2 +0,0 @@
-logging.level.root=WARN
-logging.level.org.raddatz=INFO
--- a/docs/ARCHITECTURE.md
+++ b/docs/ARCHITECTURE.md
@@ -63,7 +63,7 @@ Members of the cross-cutting layer have no entity of their own, no user-facing C
 | `audit` | Append-only event store (`audit_log`) for all domain mutations. Feeds the activity feed and Family Pulse dashboard. | Consumed by 5+ domains; no user-facing CRUD of its own |
 | `config` | Infrastructure bean definitions: `MinioConfig`, `AsyncConfig`, `WebConfig` | Framework infra; no business logic |
 | `dashboard` | Stats aggregation for the admin dashboard and Family Pulse widget | Aggregates from 3+ domains; no owned entities |
-| `exception` | `DomainException`, `ErrorCode` enum, `GlobalExceptionHandler` | Framework infra; consumed by every controller and service. Adding a new `ErrorCode` requires matching updates in `frontend/src/lib/shared/errors.ts` and all three `messages/*.json` locale files. |
+| `exception` | `DomainException`, `ErrorCode` enum, `GlobalExceptionHandler` | Framework infra; consumed by every controller and service |
 | `filestorage` | `FileService` — MinIO/S3 upload, download, presigned-URL generation | Generic service; consumed by `document` and `ocr` |
 | `importing` | `MassImportService` — async ODS/Excel batch import | Orchestrates across `person`, `tag`, `document` |
 | `security` | `SecurityConfig`, `Permission` enum, `@RequirePermission` annotation, `PermissionAspect` (AOP) | Framework infra; enforced globally across all controllers |
--- a/frontend/CLAUDE.md
+++ b/frontend/CLAUDE.md
@@ -165,7 +165,7 @@ npm run check       # svelte-check (type checking)

 ```bash
 npm run test              # Vitest unit + server tests (headless)
-npm run test:coverage     # Coverage report (server + client)
+npm run test:coverage     # Coverage report (server project only)
 npm run test:e2e          # Playwright E2E tests
 npm run test:e2e:headed   # Playwright E2E with visible browser
 npm run test:e2e:ui       # Playwright UI mode
--- a/frontend/Dockerfile
+++ b/frontend/Dockerfile
@@ -29,6 +29,6 @@ ENV NODE_ENV=production
 COPY --from=build /app/build ./build
 COPY --from=build /app/package.json ./package.json
 COPY --from=build /app/package-lock.json ./package-lock.json
-RUN npm ci --omit=dev --ignore-scripts
+RUN npm ci --omit=dev
 EXPOSE 3000
 CMD ["node", "build"]
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -345,11 +345,8 @@
 	"admin_system_import_btn_retry": "Erneut starten",
 	"admin_system_import_status_idle": "Kein Import gestartet.",
 	"admin_system_import_status_running": "Import läuft…",
-	"admin_system_import_status_done": "Import abgeschlossen",
-	"admin_system_import_status_done_label": "Dokumente verarbeitet",
-	"admin_system_import_status_failed": "Import fehlgeschlagen",
-	"admin_system_import_failed_no_spreadsheet": "Keine Tabellendatei gefunden.",
-	"admin_system_import_failed_internal": "Interner Fehler beim Import.",
+	"admin_system_import_status_done": "Import abgeschlossen – {count} Dokumente verarbeitet.",
+	"admin_system_import_status_failed": "Fehler: {message}",
 	"admin_system_thumbnails_heading": "Thumbnails erzeugen",
 	"admin_system_thumbnails_description": "Erzeugt Vorschaubilder für Dokumente ohne Thumbnail (z. B. nach dem Massenimport).",
 	"admin_system_thumbnails_btn_start": "Thumbnails erzeugen",
@@ -706,8 +703,6 @@
 	"error_invite_exhausted": "Dieser Einladungslink wurde bereits vollständig verwendet.",
 	"error_invite_revoked": "Dieser Einladungslink wurde deaktiviert.",
 	"error_invite_expired": "Dieser Einladungslink ist abgelaufen.",
-	"error_group_has_active_invites": "Diese Gruppe kann nicht gelöscht werden, da sie in einer aktiven Einladung verwendet wird.",
-	"error_group_not_found": "Die angegebene Gruppe existiert nicht.",
 	"register_heading": "Konto erstellen",
 	"register_subtext": "Du wurdest eingeladen, dem Familienarchiv beizutreten.",
 	"register_label_first_name": "Vorname",
@@ -767,9 +762,6 @@
 	"admin_new_invite_prefill_last": "Nachname vorausfüllen (optional)",
 	"admin_new_invite_prefill_email": "E-Mail vorausfüllen (optional)",
 	"admin_new_invite_expires": "Ablaufdatum (optional)",
-	"admin_new_invite_groups": "Gruppen (optional)",
-	"admin_new_invite_no_groups": "Keine Gruppen vorhanden.",
-	"admin_invite_groups_load_error": "Gruppen konnten nicht geladen werden. Die Einladung kann ohne Gruppenauswahl erstellt werden.",
 	"admin_invite_created_title": "Einladung erstellt",
 	"admin_invite_created_desc": "Teile diesen Link mit der einzuladenden Person:",
 	"admin_invite_revoke_confirm": "Einladung wirklich widerrufen?",
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -345,11 +345,8 @@
 	"admin_system_import_btn_retry": "Start again",
 	"admin_system_import_status_idle": "No import started.",
 	"admin_system_import_status_running": "Import running…",
-	"admin_system_import_status_done": "Import complete",
-	"admin_system_import_status_done_label": "Documents processed",
-	"admin_system_import_status_failed": "Import failed",
-	"admin_system_import_failed_no_spreadsheet": "No spreadsheet file found.",
-	"admin_system_import_failed_internal": "Import failed due to an internal error.",
+	"admin_system_import_status_done": "Import complete – {count} documents processed.",
+	"admin_system_import_status_failed": "Error: {message}",
 	"admin_system_thumbnails_heading": "Generate thumbnails",
 	"admin_system_thumbnails_description": "Generates preview images for documents without a thumbnail (e.g. after the mass import).",
 	"admin_system_thumbnails_btn_start": "Generate thumbnails",
@@ -706,8 +703,6 @@
 	"error_invite_exhausted": "This invite link has already been fully used.",
 	"error_invite_revoked": "This invite link has been deactivated.",
 	"error_invite_expired": "This invite link has expired.",
-	"error_group_has_active_invites": "This group cannot be deleted because it is referenced by one or more active invite links.",
-	"error_group_not_found": "The specified group does not exist.",
 	"register_heading": "Create account",
 	"register_subtext": "You've been invited to join Familienarchiv.",
 	"register_label_first_name": "First name",
@@ -767,9 +762,6 @@
 	"admin_new_invite_prefill_last": "Pre-fill last name (optional)",
 	"admin_new_invite_prefill_email": "Pre-fill email (optional)",
 	"admin_new_invite_expires": "Expiry date (optional)",
-	"admin_new_invite_groups": "Groups (optional)",
-	"admin_new_invite_no_groups": "No groups exist.",
-	"admin_invite_groups_load_error": "Groups could not be loaded. The invite can still be created without group assignment.",
 	"admin_invite_created_title": "Invite created",
 	"admin_invite_created_desc": "Share this link with the person you are inviting:",
 	"admin_invite_revoke_confirm": "Really revoke this invite?",
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -345,11 +345,8 @@
 	"admin_system_import_btn_retry": "Iniciar de nuevo",
 	"admin_system_import_status_idle": "No hay importación iniciada.",
 	"admin_system_import_status_running": "Importación en curso…",
-	"admin_system_import_status_done": "Importación completada",
-	"admin_system_import_status_done_label": "Documentos procesados",
-	"admin_system_import_status_failed": "Importación fallida",
-	"admin_system_import_failed_no_spreadsheet": "No se encontró ninguna hoja de cálculo.",
-	"admin_system_import_failed_internal": "Error interno durante la importación.",
+	"admin_system_import_status_done": "Importación completada – {count} documentos procesados.",
+	"admin_system_import_status_failed": "Error: {message}",
 	"admin_system_thumbnails_heading": "Generar miniaturas",
 	"admin_system_thumbnails_description": "Genera imágenes de vista previa para documentos sin miniatura (p. ej. tras la importación masiva).",
 	"admin_system_thumbnails_btn_start": "Generar miniaturas",
@@ -706,8 +703,6 @@
 	"error_invite_exhausted": "Este enlace de invitación ya ha sido completamente utilizado.",
 	"error_invite_revoked": "Este enlace de invitación ha sido desactivado.",
 	"error_invite_expired": "Este enlace de invitación ha expirado.",
-	"error_group_has_active_invites": "Este grupo no puede eliminarse porque está referenciado por uno o más enlaces de invitación activos.",
-	"error_group_not_found": "El grupo especificado no existe.",
 	"register_heading": "Crear cuenta",
 	"register_subtext": "Has sido invitado a unirte al Familienarchiv.",
 	"register_label_first_name": "Nombre",
@@ -767,9 +762,6 @@
 	"admin_new_invite_prefill_last": "Prellenar apellido (opcional)",
 	"admin_new_invite_prefill_email": "Prellenar correo (opcional)",
 	"admin_new_invite_expires": "Fecha de vencimiento (opcional)",
-	"admin_new_invite_groups": "Grupos (opcional)",
-	"admin_new_invite_no_groups": "No hay grupos disponibles.",
-	"admin_invite_groups_load_error": "No se pudieron cargar los grupos. La invitación puede crearse sin asignar grupos.",
 	"admin_invite_created_title": "Invitación creada",
 	"admin_invite_created_desc": "Comparte este enlace con la persona invitada:",
 	"admin_invite_revoke_confirm": "¿Realmente revocar esta invitación?",
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
 		"lint:boundary-demo": "eslint src/lib/tag/__fixtures__/",
 		"test:unit": "vitest",
 		"test": "npm run test:unit -- --run",
-		"test:coverage": "vitest run --coverage --project=server; vitest run -c vitest.client-coverage.config.ts --coverage",
+		"test:coverage": "vitest run --coverage --project=server && vitest run -c vitest.client-coverage.config.ts --coverage",
 		"test:e2e": "playwright test",
 		"test:e2e:headed": "playwright test --headed",
 		"test:e2e:ui": "playwright test --ui",
--- a/frontend/src/lib/shared/errors.ts
+++ b/frontend/src/lib/shared/errors.ts
@@ -22,8 +22,6 @@ export type ErrorCode =
 	| 'INVITE_EXHAUSTED'
 	| 'INVITE_REVOKED'
 	| 'INVITE_EXPIRED'
-	| 'GROUP_HAS_ACTIVE_INVITES'
-	| 'GROUP_NOT_FOUND'
 	| 'ANNOTATION_NOT_FOUND'
 	| 'ANNOTATION_UPDATE_FAILED'
 	| 'TRANSCRIPTION_BLOCK_NOT_FOUND'
@@ -110,10 +108,6 @@ export function getErrorMessage(code: ErrorCode | string | undefined): string {
 			return m.error_invite_revoked();
 		case 'INVITE_EXPIRED':
 			return m.error_invite_expired();
-		case 'GROUP_HAS_ACTIVE_INVITES':
-			return m.error_group_has_active_invites();
-		case 'GROUP_NOT_FOUND':
-			return m.error_group_not_found();
 		case 'ANNOTATION_NOT_FOUND':
 			return m.error_annotation_not_found();
 		case 'ANNOTATION_UPDATE_FAILED':
--- a/frontend/src/lib/user/UserGroupsSection.svelte
+++ b/frontend/src/lib/user/UserGroupsSection.svelte
@@ -1,7 +1,4 @@
 <script lang="ts">
-import { untrack } from 'svelte';
-import { m } from '$lib/paraglide/messages.js';
-
 let {
 	groups,
 	selectedGroupIds = []
@@ -10,13 +7,12 @@ let {
 	selectedGroupIds?: string[];
 } = $props();

-let selected = $state<string[]>(untrack(() => [...selectedGroupIds]));
+let selected = $derived([...selectedGroupIds]);
 </script>

-<fieldset class="flex flex-wrap gap-3 border-none p-0">
-	<legend class="sr-only">{m.admin_new_invite_groups()}</legend>
+<div class="flex flex-wrap gap-3">
 	{#each groups as group (group.id)}
-		<label class="inline-flex min-h-[44px] items-center gap-2 text-sm text-ink-2">
+		<label class="inline-flex items-center gap-2 text-sm text-ink-2">
 			<input
 				type="checkbox"
 				name="groupIds"
@@ -27,4 +23,4 @@ let selected = $state<string[]>(untrack(() => [...selectedGroupIds]));
 			{group.name}
 		</label>
 	{/each}
-</fieldset>
+</div>
--- a/frontend/src/routes/admin/groups/new/+page.svelte
+++ b/frontend/src/routes/admin/groups/new/+page.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
+import { beforeNavigate, goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
-import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';

 const availableStandard = $derived([
 	{ value: 'READ_ALL', label: m.admin_perm_read_all() },
@@ -19,7 +18,17 @@ const availableAdmin = $derived([

 let { form } = $props();

-const unsaved = createUnsavedWarning();
+let isDirty = $state(false);
+let showUnsavedWarning = $state(false);
+let discardTarget: string | null = $state(null);
+
+beforeNavigate(({ cancel, to }) => {
+	if (isDirty) {
+		cancel();
+		showUnsavedWarning = true;
+		discardTarget = to?.url.href ?? null;
+	}
+});
 </script>

 <div class="flex flex-1 flex-col overflow-hidden">
@@ -49,8 +58,23 @@ const unsaved = createUnsavedWarning();

 	<!-- Scrollable body -->
 	<div class="flex-1 overflow-y-auto px-5 py-5">
-		{#if unsaved.showUnsavedWarning}
-			<UnsavedWarningBanner onDiscard={unsaved.discard} />
+		{#if showUnsavedWarning}
+			<div
+				class="mb-5 flex items-center justify-between rounded border border-amber-200 bg-amber-50 p-3 text-sm text-amber-800 dark:border-amber-800 dark:bg-amber-950/40 dark:text-amber-300"
+			>
+				<span>{m.admin_unsaved_warning()}</span>
+				<button
+					type="button"
+					onclick={() => {
+						isDirty = false;
+						showUnsavedWarning = false;
+						if (discardTarget) goto(discardTarget);
+					}}
+					class="ml-4 shrink-0 font-sans text-xs font-bold tracking-widest text-amber-800 uppercase hover:text-amber-900 dark:text-amber-300"
+				>
+					{m.person_discard_changes()}
+				</button>
+			</div>
 		{/if}
 		{#if form?.error}
 			<div class="mb-5 rounded border border-red-200 bg-red-50 p-3 text-sm text-red-700">
@@ -61,11 +85,11 @@ const unsaved = createUnsavedWarning();
 		<form
 			id="new-group-form"
 			method="POST"
-			use:enhance={() => async ({ result, update }) => {
-				if (result.type === 'redirect') unsaved.clearOnSuccess();
-				await update();
+			use:enhance
+			oninput={() => {
+				isDirty = true;
+				showUnsavedWarning = false;
 			}}
-			oninput={unsaved.markDirty}
 			class="space-y-5"
 		>
 			<!-- Name card -->
--- a/frontend/src/routes/admin/groups/new/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/groups/new/page.svelte.spec.ts
@@ -1,125 +0,0 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import { cleanup, render } from 'vitest-browser-svelte';
-import { page } from 'vitest/browser';
-import Page from './+page.svelte';
-
-const enhanceCaptureRef = vi.hoisted(() => ({ submitFn: undefined as unknown }));
-
-vi.mock('$app/forms', () => ({
-	enhance: (_el: HTMLFormElement, fn?: unknown) => {
-		enhanceCaptureRef.submitFn = fn;
-		return { destroy: vi.fn() };
-	}
-}));
-vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() }));
-
-import { beforeNavigate, goto } from '$app/navigation';
-
-afterEach(cleanup);
-
-type SubmitFn = () => Promise<
-	(opts: {
-		result: { type: string; [key: string]: unknown };
-		update: () => Promise<void>;
-	}) => Promise<void>
->;
-
-// ─── Unsaved-changes guard ────────────────────────────────────────────────────
-
-describe('Admin new group page – unsaved-changes guard', () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		enhanceCaptureRef.submitFn = undefined;
-	});
-
-	it('does not show unsaved warning initially', async () => {
-		render(Page, { props: { form: null } });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).not.toBeInTheDocument();
-	});
-
-	it('cancels navigation and shows banner when form is dirty', async () => {
-		render(Page, { props: { form: null } });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="name"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		const cancel = vi.fn();
-		callback({ cancel, to: { url: new URL('http://localhost/admin/groups') } });
-
-		expect(cancel).toHaveBeenCalled();
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-	});
-
-	it('does not cancel navigation when form is clean', async () => {
-		render(Page, { props: { form: null } });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		const cancel = vi.fn();
-		callback({ cancel, to: { url: new URL('http://localhost/admin/groups') } });
-
-		expect(cancel).not.toHaveBeenCalled();
-	});
-
-	it('discard button calls goto with the target URL', async () => {
-		render(Page, { props: { form: null } });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="name"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		callback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/groups') } });
-
-		await page.getByRole('button', { name: /verwerfen/i }).click();
-
-		expect(vi.mocked(goto)).toHaveBeenCalledWith('http://localhost/admin/groups');
-	});
-
-	it('clears banner when enhance callback receives a redirect result', async () => {
-		render(Page, { props: { form: null } });
-		const [navCallback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="name"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		navCallback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/groups') } });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-
-		const innerFn = await (enhanceCaptureRef.submitFn as SubmitFn)();
-		await innerFn({
-			result: { type: 'redirect', location: '/admin/groups', status: 303 },
-			update: vi.fn().mockResolvedValue(undefined)
-		});
-
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).not.toBeInTheDocument();
-
-		const cancel = vi.fn();
-		navCallback({ cancel, to: { url: new URL('http://localhost/admin/groups') } });
-		expect(cancel).not.toHaveBeenCalled();
-	});
-
-	it('keeps banner when enhance callback receives a failure result', async () => {
-		render(Page, { props: { form: null } });
-		const [navCallback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="name"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		navCallback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/groups') } });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-
-		const innerFn = await (enhanceCaptureRef.submitFn as SubmitFn)();
-		await innerFn({
-			result: { type: 'failure', status: 400, data: { error: 'Name bereits vergeben' } },
-			update: vi.fn().mockResolvedValue(undefined)
-		});
-
-		const cancel = vi.fn();
-		navCallback({ cancel, to: { url: new URL('http://localhost/admin/groups') } });
-		expect(cancel).toHaveBeenCalled();
-	});
-});
--- a/frontend/src/routes/admin/invites/+page.server.ts
+++ b/frontend/src/routes/admin/invites/+page.server.ts
@@ -2,7 +2,6 @@ import { fail } from '@sveltejs/kit';
 import { env } from '$env/dynamic/private';
 import { parseBackendError } from '$lib/shared/errors';
 import type { Actions, PageServerLoad } from './$types';
-import type { components } from '$lib/generated/api';

 export interface InviteListItem {
 	id: string;
@@ -18,37 +17,22 @@ export interface InviteListItem {
 	shareableUrl: string;
 }

-export type UserGroup = components['schemas']['UserGroup'];
-
 export const load: PageServerLoad = async ({ url, fetch }) => {
 	const status = url.searchParams.get('status') ?? 'active';
 	const apiUrl = env.API_INTERNAL_URL || 'http://localhost:8080';
+	const res = await fetch(`${apiUrl}/api/invites?status=${encodeURIComponent(status)}`);

-	const [invitesRes, groupsRes] = await Promise.all([
-		fetch(`${apiUrl}/api/invites?status=${encodeURIComponent(status)}`),
-		fetch(`${apiUrl}/api/groups`)
-	]);
-
-	let invites: InviteListItem[] = [];
-	let loadError: string | null = null;
-	if (!invitesRes.ok) {
-		const backendError = await parseBackendError(invitesRes);
-		loadError = backendError?.code ?? 'INTERNAL_ERROR';
-	} else {
-		invites = await invitesRes.json();
+	if (!res.ok) {
+		const backendError = await parseBackendError(res);
+		return {
+			invites: [] as InviteListItem[],
+			status,
+			loadError: backendError?.code ?? 'INTERNAL_ERROR'
+		};
 	}

-	let groups: UserGroup[] = [];
-	let groupsLoadError: string | null = null;
-	if (!groupsRes.ok) {
-		const backendError = await parseBackendError(groupsRes);
-		groupsLoadError = backendError?.code ?? 'INTERNAL_ERROR';
-	} else {
-		const raw: UserGroup[] = await groupsRes.json();
-		groups = [...raw].sort((a, b) => a.name.localeCompare(b.name));
-	}
-
-	return { invites, status, loadError, groups, groupsLoadError };
+	const invites: InviteListItem[] = await res.json();
+	return { invites, status, loadError: null };
 };

 export const actions = {
@@ -61,7 +45,6 @@ export const actions = {
 		const prefillLastName = (formData.get('prefillLastName') as string) || undefined;
 		const prefillEmail = (formData.get('prefillEmail') as string) || undefined;
 		const expiresAt = (formData.get('expiresAt') as string) || undefined;
-		const groupIds = formData.getAll('groupIds') as string[];

 		const apiUrl = env.API_INTERNAL_URL || 'http://localhost:8080';
 		const res = await fetch(`${apiUrl}/api/invites`, {
@@ -73,8 +56,7 @@ export const actions = {
 				prefillFirstName,
 				prefillLastName,
 				prefillEmail,
-				expiresAt,
-				groupIds
+				expiresAt
 			})
 		});

--- a/frontend/src/routes/admin/invites/+page.svelte
+++ b/frontend/src/routes/admin/invites/+page.svelte
@@ -2,8 +2,7 @@
 import { enhance } from '$app/forms';
 import { m } from '$lib/paraglide/messages.js';
 import { getErrorMessage } from '$lib/shared/errors';
-import UserGroupsSection from '$lib/user/UserGroupsSection.svelte';
-import type { InviteListItem, UserGroup } from './+page.server.ts';
+import type { InviteListItem } from './+page.server.ts';

 let {
 	data,
@@ -13,8 +12,6 @@ let {
 		invites: InviteListItem[];
 		status: string;
 		loadError: string | null;
-		groups: UserGroup[];
-		groupsLoadError: string | null;
 	};
 	form?: {
 		createError?: string;
@@ -256,23 +253,6 @@ function statusIcon(status: string) {
 							class="block w-full border border-line px-3 py-2 font-serif text-sm text-ink focus:outline-none focus-visible:ring-2 focus-visible:ring-focus-ring"
 						/>
 					</div>
-					<div class="sm:col-span-2">
-						<p class="mb-2 font-sans text-xs font-bold tracking-widest text-ink-3 uppercase">
-							{m.admin_new_invite_groups()}
-						</p>
-						{#if data.groupsLoadError}
-							<div
-								role="alert"
-								class="rounded-sm border border-amber-200 bg-amber-50 px-3 py-2 font-sans text-xs text-amber-700"
-							>
-								{m.admin_invite_groups_load_error()}
-							</div>
-						{:else if data.groups.length === 0}
-							<p class="font-sans text-xs text-ink-3 italic">{m.admin_new_invite_no_groups()}</p>
-						{:else}
-							<UserGroupsSection groups={data.groups} />
-						{/if}
-					</div>
 					{#if form?.createError}
 						<div class="font-sans text-xs font-medium text-red-600 sm:col-span-2">
 							{getErrorMessage(form.createError)}
--- a/frontend/src/routes/admin/invites/page.server.test.ts
+++ b/frontend/src/routes/admin/invites/page.server.test.ts
@@ -1,155 +0,0 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-
-vi.mock('$env/dynamic/private', () => ({
-	env: { API_INTERNAL_URL: 'http://localhost:8080' }
-}));
-
-import { load, actions } from './+page.server';
-import type { UserGroup } from './+page.server';
-
-// PageServerLoad annotates the return as `void | (...)`. This explicit shape avoids
-// the void and the Record<string, any> from the generic constraint.
-type LoadData = {
-	invites: unknown[];
-	status: string;
-	loadError: string | null;
-	groups: UserGroup[];
-	groupsLoadError: string | null;
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-type AnyFetch = (...args: any[]) => any;
-
-function mockResponse(ok: boolean, body: unknown, status = 200) {
-	return {
-		ok,
-		status,
-		json: async () => body,
-		text: async () => JSON.stringify(body),
-		headers: new Headers({ 'content-type': 'application/json' })
-	} as unknown as Response;
-}
-
-describe('admin/invites load()', () => {
-	const mockFetch = vi.fn<AnyFetch>();
-
-	beforeEach(() => mockFetch.mockReset());
-
-	function event(status = 'active') {
-		return {
-			url: new URL(`http://localhost/admin/invites?status=${status}`),
-			fetch: mockFetch as unknown as typeof fetch
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		} as any;
-	}
-
-	it('returns groups array alongside invites when both succeed', async () => {
-		mockFetch.mockResolvedValueOnce(mockResponse(true, [])).mockResolvedValueOnce(
-			mockResponse(true, [
-				{ id: 'g-1', name: 'Familie', permissions: ['READ_ALL'] },
-				{ id: 'g-2', name: 'Administratoren', permissions: ['ADMIN'] }
-			])
-		);
-
-		const result = (await load(event())) as LoadData;
-
-		expect(result.groups).toHaveLength(2);
-		expect(result.groupsLoadError).toBeNull();
-	});
-
-	it('returns groups sorted alphabetically by name', async () => {
-		mockFetch.mockResolvedValueOnce(mockResponse(true, [])).mockResolvedValueOnce(
-			mockResponse(true, [
-				{ id: 'g-1', name: 'Zebra', permissions: [] },
-				{ id: 'g-2', name: 'Alfa', permissions: [] },
-				{ id: 'g-3', name: 'Mitte', permissions: [] }
-			])
-		);
-
-		const result = (await load(event())) as LoadData;
-
-		expect(result.groups.map((g) => g.name)).toEqual(['Alfa', 'Mitte', 'Zebra']);
-	});
-
-	it('returns groups: [] and non-null groupsLoadError when groups fetch is non-OK', async () => {
-		mockFetch
-			.mockResolvedValueOnce(mockResponse(true, []))
-			.mockResolvedValueOnce(mockResponse(false, { code: 'FORBIDDEN' }, 403));
-
-		const result = (await load(event())) as LoadData;
-
-		expect(result.groups).toEqual([]);
-		expect(result.groupsLoadError).toBe('FORBIDDEN');
-	});
-
-	it('falls back to INTERNAL_ERROR when groups error body has no code', async () => {
-		mockFetch
-			.mockResolvedValueOnce(mockResponse(true, []))
-			.mockResolvedValueOnce(mockResponse(false, null, 500));
-
-		const result = (await load(event())) as LoadData;
-
-		expect(result.groupsLoadError).toBe('INTERNAL_ERROR');
-	});
-
-	it('fetches invites and groups in parallel (both URLs called)', async () => {
-		mockFetch
-			.mockResolvedValueOnce(mockResponse(true, []))
-			.mockResolvedValueOnce(mockResponse(true, []));
-
-		await load(event());
-
-		expect(mockFetch).toHaveBeenCalledTimes(2);
-		expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('/api/invites'));
-		expect(mockFetch).toHaveBeenCalledWith(expect.stringContaining('/api/groups'));
-	});
-});
-
-describe('admin/invites create action', () => {
-	const mockFetch = vi.fn<AnyFetch>();
-
-	beforeEach(() => mockFetch.mockReset());
-
-	const successBody = {
-		id: 'inv-1',
-		code: 'ABCDE12345',
-		displayCode: 'ABCDE-12345',
-		status: 'active',
-		revoked: false,
-		useCount: 0,
-		createdAt: '2026-01-01T00:00:00Z',
-		shareableUrl: 'http://localhost/register?code=ABCDE12345'
-	};
-
-	it('includes groupIds array in POST body when checkboxes are checked', async () => {
-		const fd = new FormData();
-		fd.append('groupIds', 'g-1');
-		fd.append('groupIds', 'g-2');
-		mockFetch.mockResolvedValueOnce(mockResponse(true, successBody, 201));
-
-		await actions.create({
-			request: new Request('http://localhost', { method: 'POST', body: fd }),
-			fetch: mockFetch as unknown as typeof fetch
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		} as any);
-
-		const [, init] = mockFetch.mock.calls[0] as [string, RequestInit];
-		const sent = JSON.parse(init.body as string);
-		expect(sent.groupIds).toEqual(['g-1', 'g-2']);
-	});
-
-	it('sends groupIds: [] when no checkboxes are checked', async () => {
-		const fd = new FormData();
-		mockFetch.mockResolvedValueOnce(mockResponse(true, successBody, 201));
-
-		await actions.create({
-			request: new Request('http://localhost', { method: 'POST', body: fd }),
-			fetch: mockFetch as unknown as typeof fetch
-			// eslint-disable-next-line @typescript-eslint/no-explicit-any
-		} as any);
-
-		const [, init] = mockFetch.mock.calls[0] as [string, RequestInit];
-		const sent = JSON.parse(init.body as string);
-		expect(sent.groupIds).toEqual([]);
-	});
-});
--- a/frontend/src/routes/admin/invites/page.svelte.test.ts
+++ b/frontend/src/routes/admin/invites/page.svelte.test.ts
@@ -7,15 +7,12 @@ afterEach(cleanup);

 const makeInvite = (overrides: Record<string, unknown> = {}) => ({
 	id: 'i-1',
-	code: 'XYZ1234567',
 	displayCode: 'XYZ-1234',
 	label: 'Familie',
 	useCount: 0,
 	maxUses: 5,
 	expiresAt: '2027-01-01T00:00:00Z',
-	revoked: false,
 	status: 'active' as string,
-	createdAt: '2025-01-01T00:00:00Z',
 	shareableUrl: 'http://example.com/i/i-1',
 	...overrides
 });
@@ -25,15 +22,11 @@ const baseData = (
 		invites: ReturnType<typeof makeInvite>[];
 		status: string;
 		loadError: string | null;
-		groups: { id: string; name: string; permissions: string[] }[];
-		groupsLoadError: string | null;
 	}> = {}
 ) => ({
 	invites: [],
 	status: 'active',
 	loadError: null,
-	groups: [],
-	groupsLoadError: null,
 	...overrides
 });

@@ -260,115 +253,4 @@ describe('admin/invites page', () => {
 		const banner = document.querySelector('.bg-red-50');
 		expect(banner).not.toBeNull();
 	});
-
-	// ─── groups section ───────────────────────────────────────────────────────
-
-	it('shows a groups-load warning banner when data.groupsLoadError is set', async () => {
-		render(AdminInvitesPage, {
-			props: { data: { ...baseData(), groups: [], groupsLoadError: 'INTERNAL_ERROR' } }
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		const banner = document.querySelector('.bg-amber-50');
-		expect(banner).not.toBeNull();
-	});
-
-	it('renders group checkboxes inside the new-invite form when groups are provided', async () => {
-		render(AdminInvitesPage, {
-			props: {
-				data: {
-					...baseData(),
-					groups: [
-						{ id: 'g-1', name: 'Administratoren', permissions: ['ADMIN'] },
-						{ id: 'g-2', name: 'Familie', permissions: ['READ_ALL'] }
-					],
-					groupsLoadError: null
-				}
-			}
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		await expect.element(page.getByRole('checkbox', { name: 'Administratoren' })).toBeVisible();
-		await expect.element(page.getByRole('checkbox', { name: 'Familie' })).toBeVisible();
-	});
-
-	it('group checkbox stays checked after being clicked', async () => {
-		render(AdminInvitesPage, {
-			props: {
-				data: {
-					...baseData(),
-					groups: [{ id: 'g-1', name: 'Familie', permissions: ['READ_ALL'] }],
-					groupsLoadError: null
-				}
-			}
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		const checkbox = page.getByRole('checkbox', { name: 'Familie' });
-		await checkbox.click();
-		await expect.element(checkbox).toBeChecked();
-	});
-
-	it('amber warning banner has role="alert"', async () => {
-		render(AdminInvitesPage, {
-			props: { data: { ...baseData(), groups: [], groupsLoadError: 'INTERNAL_ERROR' } }
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		const alert = document.querySelector('[role="alert"]');
-		expect(alert).not.toBeNull();
-	});
-
-	it('checkbox group fieldset has accessible name from i18n key (not hardcoded German)', async () => {
-		render(AdminInvitesPage, {
-			props: {
-				data: {
-					...baseData(),
-					groups: [{ id: 'g-1', name: 'Familie', permissions: ['READ_ALL'] }],
-					groupsLoadError: null
-				}
-			}
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		// m.admin_new_invite_groups() returns "Gruppen (optional)" in de locale
-		// The hardcoded legend "Gruppen" would not match this accessible name
-		await expect.element(page.getByRole('group', { name: 'Gruppen (optional)' })).toBeVisible();
-	});
-
-	it('shows no checkboxes and no warning when groups list is empty and no error', async () => {
-		render(AdminInvitesPage, {
-			props: { data: { ...baseData(), groups: [], groupsLoadError: null } }
-		});
-
-		await page
-			.getByRole('button', { name: /neue einladung/i })
-			.first()
-			.click();
-
-		expect(document.querySelectorAll('input[name="groupIds"]')).toHaveLength(0);
-		expect(document.querySelector('.bg-amber-50')).toBeNull();
-		// empty-state message visible — "Keine Gruppen vorhanden." in de locale
-		await expect.element(page.getByText(/keine gruppen/i)).toBeVisible();
-	});
 });
--- a/frontend/src/routes/admin/system/+page.svelte
+++ b/frontend/src/routes/admin/system/+page.svelte
@@ -1,14 +1,19 @@
 <script lang="ts">
 import { onDestroy } from 'svelte';
 import { m } from '$lib/paraglide/messages.js';
-import ImportStatusCard from './ImportStatusCard.svelte';
-import type { ImportStatus } from './types.js';

 let backfillResult: number | null = $state(null);
 let backfillLoading = $state(false);
 let backfillHashesResult: number | null = $state(null);
 let backfillHashesLoading = $state(false);

+type ImportStatus = {
+	state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED';
+	message: string;
+	processed: number;
+	startedAt: string | null;
+};
+
 type ThumbnailStatus = {
 	state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED';
 	message: string;
@@ -172,7 +177,47 @@ async function backfillFileHashes() {
 		</div>

 		<!-- Mass import -->
-		<ImportStatusCard importStatus={importStatus} ontrigger={triggerImport} />
+		<div class="rounded-sm border border-line bg-surface p-6 shadow-sm">
+			<h2 class="mb-1 font-sans text-sm font-bold text-ink">{m.admin_system_import_heading()}</h2>
+			<p class="mb-4 text-sm text-ink-2">{m.admin_system_import_description()}</p>
+
+			{#if importStatus?.state === 'RUNNING'}
+				<p class="text-sm text-ink-2">{m.admin_system_import_status_running()}</p>
+			{:else if importStatus?.state === 'DONE'}
+				<p class="mb-4 rounded-sm border border-green-200 bg-green-50 p-3 text-sm text-green-700">
+					{m.admin_system_import_status_done({ count: importStatus.processed })}
+				</p>
+				<button
+					data-import-trigger
+					onclick={triggerImport}
+					class="rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
+				>
+					{m.admin_system_import_btn_retry()}
+				</button>
+			{:else if importStatus?.state === 'FAILED'}
+				<p class="mb-4 rounded-sm border border-red-200 bg-red-50 p-3 text-sm text-red-700">
+					{m.admin_system_import_status_failed({ message: importStatus.message })}
+				</p>
+				<button
+					data-import-trigger
+					onclick={triggerImport}
+					class="rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
+				>
+					{m.admin_system_import_btn_retry()}
+				</button>
+			{:else}
+				{#if importStatus !== null}
+					<p class="mb-4 text-sm text-ink-2">{m.admin_system_import_status_idle()}</p>
+				{/if}
+				<button
+					data-import-trigger
+					onclick={triggerImport}
+					class="rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
+				>
+					{m.admin_system_import_btn_start()}
+				</button>
+			{/if}
+		</div>

 		<!-- Thumbnail backfill -->
 		<div class="rounded-sm border border-line bg-surface p-6 shadow-sm">
--- a/frontend/src/routes/admin/system/ImportStatusCard.svelte
+++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte
@@ -1,81 +0,0 @@
-<script lang="ts">
-import { m } from '$lib/paraglide/messages.js';
-import type { ImportStatus } from './types.js';
-
-let {
-	importStatus,
-	ontrigger
-}: {
-	importStatus: ImportStatus | null;
-	ontrigger: () => void;
-} = $props();
-
-const failureMessage = $derived(
-	importStatus?.statusCode === 'IMPORT_FAILED_NO_SPREADSHEET'
-		? m.admin_system_import_failed_no_spreadsheet()
-		: m.admin_system_import_failed_internal()
-);
-</script>
-
-<div class="rounded-sm border border-line bg-surface p-6 shadow-sm">
-	<h2 class="mb-5 font-sans text-xs font-bold tracking-widest text-ink-3 uppercase">
-		{m.admin_system_import_heading()}
-	</h2>
-	<p class="mb-4 text-sm text-ink-2">{m.admin_system_import_description()}</p>
-
-	{#if importStatus?.state === 'RUNNING'}
-		<div class="mb-4 flex items-center gap-3">
-			<span
-				data-testid="spinner"
-				role="status"
-				aria-label={m.admin_system_import_status_running()}
-				class="inline-block h-5 w-5 animate-spin rounded-full border-2 border-ink-3 border-t-brand-mint motion-reduce:animate-none"
-			></span>
-			<div>
-				<p data-testid="processed-count" class="text-base font-bold text-ink">
-					{importStatus.processed}
-				</p>
-				<p class="font-sans text-xs font-bold tracking-widest text-ink-3 uppercase">
-					{m.admin_system_import_status_running()}
-				</p>
-			</div>
-		</div>
-	{:else if importStatus?.state === 'DONE'}
-		<div class="mb-4 rounded-sm border border-green-200 bg-green-50 p-4 text-green-700">
-			<p data-testid="processed-count" class="text-base font-bold">{importStatus.processed}</p>
-			<p class="font-sans text-xs font-bold tracking-widest text-green-800 uppercase">
-				{m.admin_system_import_status_done_label()}
-			</p>
-			<p class="mt-1 text-xs text-green-800">{m.admin_system_import_status_done()}</p>
-		</div>
-		<button
-			data-import-trigger
-			onclick={ontrigger}
-			class="min-h-[44px] rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
-		>
-			{m.admin_system_import_btn_retry()}
-		</button>
-	{:else if importStatus?.state === 'FAILED'}
-		<p class="mb-4 rounded-sm border border-red-200 bg-red-50 p-3 text-sm text-red-700">
-			{failureMessage}
-		</p>
-		<button
-			data-import-trigger
-			onclick={ontrigger}
-			class="min-h-[44px] rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
-		>
-			{m.admin_system_import_btn_retry()}
-		</button>
-	{:else}
-		{#if importStatus !== null}
-			<p class="mb-4 text-sm text-ink-2">{m.admin_system_import_status_idle()}</p>
-		{/if}
-		<button
-			data-import-trigger
-			onclick={ontrigger}
-			class="min-h-[44px] rounded-sm bg-primary px-5 py-2 font-sans text-xs font-bold tracking-widest text-primary-fg uppercase transition-opacity hover:opacity-80"
-		>
-			{m.admin_system_import_btn_start()}
-		</button>
-	{/if}
-</div>
--- a/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts
+++ b/frontend/src/routes/admin/system/ImportStatusCard.svelte.test.ts
@@ -1,131 +0,0 @@
-import { describe, expect, it, vi } from 'vitest';
-import { render } from 'vitest-browser-svelte';
-import { m } from '$lib/paraglide/messages.js';
-import ImportStatusCard from './ImportStatusCard.svelte';
-import type { ImportStatus } from './types.js';
-
-const makeStatus = (overrides: Partial<ImportStatus> = {}): ImportStatus => ({
-	state: 'IDLE',
-	statusCode: 'IMPORT_IDLE',
-	processed: 0,
-	startedAt: null,
-	...overrides
-});
-
-describe('ImportStatusCard', () => {
-	it('shows spinner while state is RUNNING', async () => {
-		const { getByTestId } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'RUNNING', statusCode: 'IMPORT_RUNNING', processed: 3 }),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByTestId('spinner')).toBeInTheDocument();
-	});
-
-	it('shows processed count at text-base while RUNNING', async () => {
-		const { getByTestId } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'RUNNING', statusCode: 'IMPORT_RUNNING', processed: 7 }),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByTestId('processed-count')).toHaveTextContent('7');
-	});
-
-	it('shows processed count while DONE', async () => {
-		const { getByText } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'DONE', statusCode: 'IMPORT_DONE', processed: 42 }),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByText('42')).toBeVisible();
-	});
-
-	it('shows no-spreadsheet message when statusCode is IMPORT_FAILED_NO_SPREADSHEET', async () => {
-		const { getByText } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({
-					state: 'FAILED',
-					statusCode: 'IMPORT_FAILED_NO_SPREADSHEET'
-				}),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByText(m.admin_system_import_failed_no_spreadsheet())).toBeVisible();
-	});
-
-	it('shows internal error message when statusCode is IMPORT_FAILED_INTERNAL', async () => {
-		const { getByText } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'FAILED', statusCode: 'IMPORT_FAILED_INTERNAL' }),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByText(m.admin_system_import_failed_internal())).toBeVisible();
-	});
-
-	it('shows idle text when importStatus is non-null and state is IDLE', async () => {
-		const { getByText } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'IDLE', statusCode: 'IMPORT_IDLE' }),
-				ontrigger: () => {}
-			}
-		});
-
-		await expect.element(getByText(m.admin_system_import_status_idle())).toBeVisible();
-	});
-
-	it('shows no spinner when importStatus is null', async () => {
-		const { getByTestId } = render(ImportStatusCard, {
-			props: { importStatus: null, ontrigger: () => {} }
-		});
-
-		await expect.element(getByTestId('spinner')).not.toBeInTheDocument();
-	});
-
-	it('calls ontrigger when retry button is clicked in DONE state', async () => {
-		const ontrigger = vi.fn();
-		const { getByRole } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'DONE', statusCode: 'IMPORT_DONE', processed: 5 }),
-				ontrigger
-			}
-		});
-
-		await getByRole('button').click();
-		expect(ontrigger).toHaveBeenCalledOnce();
-	});
-
-	it('calls ontrigger when retry button is clicked in FAILED state', async () => {
-		const ontrigger = vi.fn();
-		const { getByRole } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'FAILED', statusCode: 'IMPORT_FAILED_INTERNAL' }),
-				ontrigger
-			}
-		});
-
-		await getByRole('button').click();
-		expect(ontrigger).toHaveBeenCalledOnce();
-	});
-
-	it('calls ontrigger when start button is clicked in IDLE state', async () => {
-		const ontrigger = vi.fn();
-		const { getByRole } = render(ImportStatusCard, {
-			props: {
-				importStatus: makeStatus({ state: 'IDLE', statusCode: 'IMPORT_IDLE' }),
-				ontrigger
-			}
-		});
-
-		await getByRole('button').click();
-		expect(ontrigger).toHaveBeenCalledOnce();
-	});
-});
--- a/frontend/src/routes/admin/system/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/system/page.svelte.spec.ts
@@ -163,7 +163,7 @@ describe('Admin system page — mass import card', () => {
 					ok: true,
 					json: async () => ({
 						state: 'FAILED',
-						statusCode: 'IMPORT_FAILED_NO_SPREADSHEET',
+						message: 'Datei nicht gefunden.',
 						processed: 0,
 						startedAt: '2026-01-01T10:00:00'
 					})
@@ -182,7 +182,7 @@ describe('Admin system page — mass import card', () => {
 				})
 		);
 		render(Page, {});
-		await expect.element(page.getByText(/Keine Tabellendatei gefunden/i)).toBeInTheDocument();
+		await expect.element(page.getByText(/Datei nicht gefunden/i)).toBeInTheDocument();
 		await expect.element(page.getByRole('button', { name: /Erneut starten/i })).toBeInTheDocument();
 	});
 });
--- a/frontend/src/routes/admin/system/page.svelte.test.ts
+++ b/frontend/src/routes/admin/system/page.svelte.test.ts
@@ -246,7 +246,7 @@ describe('admin/system page', () => {
 				return new Response(
 					JSON.stringify({
 						state: 'FAILED',
-						statusCode: 'IMPORT_FAILED_INTERNAL',
+						message: 'database error',
 						processed: 0,
 						startedAt: null
 					}),
@@ -262,7 +262,7 @@ describe('admin/system page', () => {
 		render(AdminSystemPage, { props: {} });

 		await vi.waitFor(() => {
-			expect(document.body.textContent).toContain('Interner Fehler beim Import');
+			expect(document.body.textContent).toContain('database error');
 		});
 	});

--- a/frontend/src/routes/admin/system/types.ts
+++ b/frontend/src/routes/admin/system/types.ts
@@ -1,6 +0,0 @@
-export type ImportStatus = {
-	state: 'IDLE' | 'RUNNING' | 'DONE' | 'FAILED';
-	statusCode: string;
-	processed: number;
-	startedAt: string | null;
-};
--- a/frontend/src/routes/admin/users/new/+page.svelte
+++ b/frontend/src/routes/admin/users/new/+page.svelte
@@ -1,15 +1,24 @@
 <script lang="ts">
 import { enhance } from '$app/forms';
+import { beforeNavigate, goto } from '$app/navigation';
 import { m } from '$lib/paraglide/messages.js';
 import UserProfileSection from '$lib/user/UserProfileSection.svelte';
 import UserGroupsSection from '$lib/user/UserGroupsSection.svelte';
 import AccountSection from './AccountSection.svelte';
-import { createUnsavedWarning } from '$lib/shared/hooks/useUnsavedWarning.svelte';
-import UnsavedWarningBanner from '$lib/shared/primitives/UnsavedWarningBanner.svelte';

 let { data, form } = $props();

-const unsaved = createUnsavedWarning();
+let isDirty = $state(false);
+let showUnsavedWarning = $state(false);
+let discardTarget: string | null = $state(null);
+
+beforeNavigate(({ cancel, to }) => {
+	if (isDirty) {
+		cancel();
+		showUnsavedWarning = true;
+		discardTarget = to?.url.href ?? null;
+	}
+});
 </script>

 <div class="flex flex-1 flex-col overflow-hidden">
@@ -35,8 +44,23 @@ const unsaved = createUnsavedWarning();

 	<!-- Scrollable body -->
 	<div class="flex-1 overflow-y-auto px-5 py-5">
-		{#if unsaved.showUnsavedWarning}
-			<UnsavedWarningBanner onDiscard={unsaved.discard} />
+		{#if showUnsavedWarning}
+			<div
+				class="mb-5 flex items-center justify-between rounded border border-amber-200 bg-amber-50 p-3 text-sm text-amber-800 dark:border-amber-800 dark:bg-amber-950/40 dark:text-amber-300"
+			>
+				<span>{m.admin_unsaved_warning()}</span>
+				<button
+					type="button"
+					onclick={() => {
+						isDirty = false;
+						showUnsavedWarning = false;
+						if (discardTarget) goto(discardTarget);
+					}}
+					class="ml-4 shrink-0 font-sans text-xs font-bold tracking-widest text-amber-800 uppercase hover:text-amber-900 dark:text-amber-300"
+				>
+					{m.person_discard_changes()}
+				</button>
+			</div>
 		{/if}
 		{#if form?.error}
 			<div class="mb-5 rounded border border-red-200 bg-red-50 p-3 text-sm text-red-700">
@@ -47,11 +71,11 @@ const unsaved = createUnsavedWarning();
 		<form
 			id="new-user-form"
 			method="POST"
-			use:enhance={() => async ({ result, update }) => {
-				if (result.type === 'redirect') unsaved.clearOnSuccess();
-				await update();
+			use:enhance
+			oninput={() => {
+				isDirty = true;
+				showUnsavedWarning = false;
 			}}
-			oninput={unsaved.markDirty}
 			class="space-y-5"
 		>
 			<div class="rounded-sm border border-line bg-surface p-5 shadow-sm">
--- a/frontend/src/routes/admin/users/new/page.svelte.spec.ts
+++ b/frontend/src/routes/admin/users/new/page.svelte.spec.ts
@@ -1,19 +1,9 @@
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+import { afterEach, describe, expect, it, vi } from 'vitest';
 import { cleanup, render } from 'vitest-browser-svelte';
 import { page } from 'vitest/browser';
 import Page from './+page.svelte';

-const enhanceCaptureRef = vi.hoisted(() => ({ submitFn: undefined as unknown }));
-
-vi.mock('$app/forms', () => ({
-	enhance: (_el: HTMLFormElement, fn?: unknown) => {
-		enhanceCaptureRef.submitFn = fn;
-		return { destroy: vi.fn() };
-	}
-}));
-vi.mock('$app/navigation', () => ({ beforeNavigate: vi.fn(), goto: vi.fn() }));
-
-import { beforeNavigate, goto } from '$app/navigation';
+vi.mock('$app/forms', () => ({ enhance: () => () => {} }));

 const groups = [
 	{ id: 'g1', name: 'Editoren', permissions: ['WRITE_ALL'] },
@@ -30,13 +20,6 @@ const baseData = {

 afterEach(cleanup);

-type SubmitFn = () => Promise<
-	(opts: {
-		result: { type: string; [key: string]: unknown };
-		update: () => Promise<void>;
-	}) => Promise<void>
->;
-
 // ─── Rendering ────────────────────────────────────────────────────────────────

 describe('Admin new user page – rendering', () => {
@@ -83,103 +66,3 @@ describe('Admin new user page – error display', () => {
 		await expect.element(page.getByText('Ein Fehler ist aufgetreten.')).not.toBeInTheDocument();
 	});
 });
-
-// ─── Unsaved-changes guard ────────────────────────────────────────────────────
-
-describe('Admin new user page – unsaved-changes guard', () => {
-	beforeEach(() => {
-		vi.clearAllMocks();
-		enhanceCaptureRef.submitFn = undefined;
-	});
-
-	it('does not show unsaved warning initially', async () => {
-		render(Page, { data: baseData, form: null });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).not.toBeInTheDocument();
-	});
-
-	it('cancels navigation and shows banner when form is dirty', async () => {
-		render(Page, { data: baseData, form: null });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="email"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		const cancel = vi.fn();
-		callback({ cancel, to: { url: new URL('http://localhost/admin/users') } });
-
-		expect(cancel).toHaveBeenCalled();
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-	});
-
-	it('does not cancel navigation when form is clean', async () => {
-		render(Page, { data: baseData, form: null });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		const cancel = vi.fn();
-		callback({ cancel, to: { url: new URL('http://localhost/admin/users') } });
-
-		expect(cancel).not.toHaveBeenCalled();
-	});
-
-	it('discard button calls goto with the target URL', async () => {
-		render(Page, { data: baseData, form: null });
-		const [callback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="email"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		callback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/users') } });
-
-		await page.getByRole('button', { name: /verwerfen/i }).click();
-
-		expect(vi.mocked(goto)).toHaveBeenCalledWith('http://localhost/admin/users');
-	});
-
-	it('clears banner when enhance callback receives a redirect result', async () => {
-		render(Page, { data: baseData, form: null });
-		const [navCallback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="email"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		navCallback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/users') } });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-
-		const innerFn = await (enhanceCaptureRef.submitFn as SubmitFn)();
-		await innerFn({
-			result: { type: 'redirect', location: '/admin/users', status: 303 },
-			update: vi.fn().mockResolvedValue(undefined)
-		});
-
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).not.toBeInTheDocument();
-
-		const cancel = vi.fn();
-		navCallback({ cancel, to: { url: new URL('http://localhost/admin/users') } });
-		expect(cancel).not.toHaveBeenCalled();
-	});
-
-	it('keeps banner when enhance callback receives a failure result', async () => {
-		render(Page, { data: baseData, form: null });
-		const [navCallback] = vi.mocked(beforeNavigate).mock.calls[0];
-
-		document
-			.querySelector<HTMLInputElement>('input[name="email"]')!
-			.dispatchEvent(new InputEvent('input', { bubbles: true }));
-
-		navCallback({ cancel: vi.fn(), to: { url: new URL('http://localhost/admin/users') } });
-		await expect.element(page.getByText(/ungespeicherte Änderungen/i)).toBeInTheDocument();
-
-		const innerFn = await (enhanceCaptureRef.submitFn as SubmitFn)();
-		await innerFn({
-			result: { type: 'failure', status: 400, data: { error: 'E-Mail bereits vergeben' } },
-			update: vi.fn().mockResolvedValue(undefined)
-		});
-
-		const cancel = vi.fn();
-		navCallback({ cancel, to: { url: new URL('http://localhost/admin/users') } });
-		expect(cancel).toHaveBeenCalled();
-	});
-});
--- a/frontend/vitest.client-coverage.config.ts
+++ b/frontend/vitest.client-coverage.config.ts
@@ -24,8 +24,6 @@ export default defineConfig({
 		})
 	],
 	test: {
-		testTimeout: 30_000,
-		hookTimeout: 15_000,
 		expect: { requireAssertions: true },
 		browser: {
 			enabled: true,