diff --git a/.gitignore b/.gitignore
index c6b5932879..ccf4e954ec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,13 @@
+# Project-local SSH configuration (keys, config, known_hosts)
+.ssh/
+
 # Local agent config files/folders
 .opencode/
 opencode.json
 
+# Any local run configuration file
+.run
+
 # Local git worktrees
 .worktrees/
 
diff --git a/AGENTS.md b/AGENTS.md
index fd9bc27640..8e2ea8c122 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -20,6 +20,10 @@ PRD (docs/prd.md)
                     └── Implementation (code, PRs)
 ```
 
+Significant architectural decisions are recorded as **Architecture Decision Records (ADRs)** in
+[`docs/adr/`](docs/adr/README.md), which provide rationale and context that span across the
+traceability chain above.
+
 Stories are tracked in two places: `docs/features.md` (the stakeholder-facing, stable record) and
 GitHub issues (the implementation tracking record). When a story moves from draft (discussion in
 SharePoint Word doc) to approved (ready for implementation), it receives a stable Story ID and is
@@ -238,21 +242,45 @@ Rules:
 
 #### Story Lifecycle
 
-Stories move through a lifecycle from draft to implementation. This flow keeps the GitHub issue history clean and ensures stakeholders have a stable, reviewable document.
-
-1. **Draft (Discussion)** — The story is captured in a SharePoint Word document or similar internal medium where discussion, refinement, and iteration happen. No stable ID is assigned. The story is not yet tracked in `docs/features.md`.
-2. **Approved (Ready for Implementation)** — The story is finalised, a stable `FEAT-<SLUG>-<NN>` ID is assigned, and it is:
-   - Written into `docs/features.md` with full narrative and acceptance criteria
-   - A GitHub issue is created (if it does not already exist) or an existing issue is updated with the stable ID in the title and body
-   - The status in `docs/features.md` is updated from 🔴 (Open) to 🟡 (In Progress) when implementation begins, and 🟢 (Done) when complete
-3. **Implementation** — Tasks are created in GitHub referencing the stable story ID (not the GitHub issue number). Implementation traces: Task → Story (stable ID) → Feature → Requirement → PRD.
+Stories move through a lifecycle from draft to implementation. This flow keeps the GitHub issue
+history clean and ensures stakeholders have a stable, reviewable document.
+
+The lifecycle spans two **decoupled surfaces**, with the Product Owner as the handoff actor:
+
+- **Stakeholder space** (Word Online / SharePoint, email) — where stakeholders and the PO
+  draft and discuss stories. This material is PO-internal; developers do not read it.
+- **Developer space** (GitHub issues, `docs/features.md`) — where approved stories become
+  versioned, traceable specification that drives Tasks and implementation.
+
+The handoff between these two spaces is a deliberate, reviewable action performed by the PO:
+
+1. **Draft (Discussion)** — The story is drafted in stakeholder space (Word Online /
+   SharePoint) where the PO and stakeholders discuss, refine, and iterate. No stable ID is
+   assigned. The story is not yet tracked in GitHub or `docs/features.md`.
+2. **Approved (Ready for Implementation)** — The PO finalises the story, assigns a stable
+   `FEAT-<SLUG>-<NN>` ID, and performs the handoff:
+   - A Feature issue is created (if one does not already exist).
+   - A Story issue is created using `.github/ISSUE_TEMPLATE/story.yml`, with the stable ID in
+     the title and body, the parent Feature linked, and at least one `R-<NN>` referenced.
+   - The story is written into `docs/features.md` with full narrative and acceptance criteria.
+   - The status in `docs/features.md` starts at 🔴 (Open) and moves to 🟡 (In Progress) when
+     implementation begins, then 🟢 (Done) when complete.
+3. **Implementation** — Tasks are created in GitHub referencing the stable story ID (not the
+   GitHub issue number). Implementation traces:
+   Task → Story (stable ID) → Feature → Requirement → PRD.
 
 **Rules:**
 
 - A story must never be implemented without a stable ID in `docs/features.md`.
-- When a story was created on GitHub before this flow existed (e.g., old issue numbers), update the existing issue with the stable ID rather than creating a new one.
-- Tasks reference stories by their stable ID in the "Parent Story" field, not by GitHub issue number.
-- The GitHub issue remains the source of truth for implementation tracking (comments, sub-issues, assignees), but `docs/features.md` is the source of truth for story content (narrative, acceptance criteria).
+- When a story was created on GitHub before this flow existed (e.g., old issue numbers),
+  update the existing issue with the stable ID rather than creating a new one.
+- Tasks reference stories by their stable ID in the "Parent Story" field, not by GitHub issue
+  number.
+- The GitHub issue remains the source of truth for implementation tracking (comments,
+  sub-issues, assignees), but `docs/features.md` is the source of truth for story content
+  (narrative, acceptance criteria).
+- Post-approval changes to a story happen via a PR to `docs/features.md` and a corresponding
+  GitHub issue comment — not by editing the original Word Online draft.
 
 ---
 
@@ -665,7 +693,11 @@ When working on this codebase, an AI agent should:
    `finances`, or cross-cutting).
 2. **Identify the layer** (`domain`, `application`, `infrastructure`, `views`/UI).
 3. Check `ExceptionHandling.md` and `service_api.md` for patterns relevant to the change.
-4. Read existing tests in the same module before writing new code.
+4. **Check `docs/adr/README.md`** for existing ADRs that apply to the change area. If the change
+   is a significant architectural decision, consider creating a new ADR using the MADR template
+   at `docs/adr/templates/madr-template.md`. See [`docs/adr/README.md`](docs/adr/README.md) for
+   naming conventions and rules.
+5. Read existing tests in the same module before writing new code.
 
 ### Creating Features
 
@@ -677,11 +709,21 @@ When working on this codebase, an AI agent should:
 
 ### Creating Stories
 
-- Stories start as drafts (discussion/refinement in SharePoint Word or similar internal medium). They are NOT tracked in `docs/features.md` or GitHub while in draft.
-- When a story is finalised and approved for implementation: assign a stable `FEAT-<SLUG>-<NN>` ID, write it into `docs/features.md` with full narrative and acceptance criteria, and create or update the corresponding GitHub issue with the stable ID in the title and body.
-- For stories that were created on GitHub before this workflow existed, update the existing issue with the stable ID rather than creating a new one.
-- Tasks reference the story by its stable ID (e.g., `FEAT-IP-MEAS-01`), not by GitHub issue number.
-- If you are unsure whether a new Story is needed or an existing Feature should be extended, pause and ask a human reviewer.
+- Stories start as drafts in stakeholder space (Word Online / SharePoint, email) — PO-internal
+  material that developers do not read. They are NOT tracked in `docs/features.md` or GitHub
+  while in draft.
+- When a story is ready for handoff: the PO translates it into GitHub, using
+  `.github/ISSUE_TEMPLATE/story.yml`, assigns a stable `FEAT-<SLUG>-<NN>` ID, writes it into
+  `docs/features.md` with full narrative and acceptance criteria, and links it to the parent
+  Feature issue.
+- For stories that were created on GitHub before this workflow existed, update the existing
+  issue with the stable ID rather than creating a new one.
+- Tasks reference the story by their stable ID (e.g., `FEAT-IP-MEAS-01`), not by GitHub
+  issue number.
+- Post-approval changes happen via PR against `docs/features.md` — not by editing the Word
+  Online draft.
+- If you are unsure whether a new Story is needed or an existing Feature should be extended,
+  pause and ask a human reviewer.
 
 ### Making domain changes
 
@@ -732,6 +774,8 @@ An agent should pause and request human review/approval before:
 - Implementing a change that introduces new system capability not covered by an existing requirement.
 - Retiring or renaming a Feature slug once Stories reference it.
 - Splitting a Feature into multiple Features when Stories already reference the original Feature.
+- Creating a new Architecture Decision Record (ADR) — to ensure the decision is captured in the
+  correct format and the ADR index in `docs/adr/README.md` is updated.
 
 ---
 
@@ -742,6 +786,8 @@ An agent should pause and request human review/approval before:
 | `docs/requirements.md` | Authoritative requirement registry — all R/NFR/C requirements documented here; must be updated before new capabilities are implemented |
 | `docs/requirements-guide.md` | Authoring conventions for creating, editing, and retiring requirements |
 | `docs/features.md` | Stakeholder-facing features and user stories tracker — stable story records with narrative, acceptance criteria, and status; stories move here from draft once approved |
+| `docs/adr/README.md` | Architecture Decision Records index — naming rules, creation process, and list of ADRs |
+| `docs/adr/templates/madr-template.md` | MADR template for creating new ADRs (see [`docs/adr/README.md`](docs/adr/README.md)) |
 | `README.md` | Setup, configuration reference, how to run |
 | `ExceptionHandling.md` | Exception handling conventions (read before touching error handling) |
 | `service_api.md` | Service API design patterns (Mono/Flux, request/response shapes) |
diff --git a/application-commons/src/main/java/life/qbic/application/commons/time/DateTimeFormat.java b/application-commons/src/main/java/life/qbic/application/commons/time/DateTimeFormat.java
index b965bb4d1d..1365dfb4fd 100644
--- a/application-commons/src/main/java/life/qbic/application/commons/time/DateTimeFormat.java
+++ b/application-commons/src/main/java/life/qbic/application/commons/time/DateTimeFormat.java
@@ -33,6 +33,13 @@ public enum DateTimeFormat {
    * Format: {@code <weekday_name>, <day> <month_name> <year>}}
    */
   SIMPLE_DATE,
+
+  /**
+   * A more compact date representation. E.g. {@code 11 Feb 2026}
+   * Format: {@code <day> <month_name> <year>}
+   */
+  SIMPLE_DATE_SHORT,
+
   /**
    * A simple to read, textual date-time representation. E.g.
    * {@code Wednesday, 11 February 2026 11:12:10}
@@ -78,6 +85,7 @@ public static DateTimeFormatter asJavaFormatter(@NonNull DateTimeFormat format,
       case ISO_LOCAL_DATE_TIME_WHITESPACE_SEPARATED -> DateTimeFormatter.ofPattern(
           "yyyy-MM-dd HH:mm").withZone(zoneId);
       case SIMPLE_DATE -> DateTimeFormatter.ofPattern("EEEE, dd LLLL yyyy").withZone(zoneId);
+      case SIMPLE_DATE_SHORT -> DateTimeFormatter.ofPattern("d MMM yyyy").withZone(zoneId);
       case SIMPLE_DATE_TIME -> DateTimeFormatter.ofPattern("EEEE, dd LLLL yyyy HH:mm:ss").withZone(
           zoneId);
     };
@@ -95,6 +103,7 @@ public static DateTimeFormatter asJavaFormatter(@NonNull DateTimeFormat format,
   public static String asMariaDbDatabasePattern(@NonNull DateTimeFormat format) {
     return switch (format) {
       case SIMPLE_DATE -> "%W, %d %M %Y";
+      case SIMPLE_DATE_SHORT -> "%d %M %Y";
       case SIMPLE_DATE_TIME -> "%W, %d %M %Y %T";
       case ISO_LOCAL_DATE -> "%Y-%m-%d";
       case ISO_LOCAL_DATE_TIME -> "%Y-%m-%dT%T";
diff --git a/datamanager-app/front-end-components.md b/datamanager-app/front-end-components.md
index 6faad7e531..287919ea4b 100644
--- a/datamanager-app/front-end-components.md
+++ b/datamanager-app/front-end-components.md
@@ -136,5 +136,127 @@ classDiagram
 
 ```
 
+## Alert dialog
+
+```mermaid
+classDiagram
+    note for Component "Vaadin Component"
+    AlertDialog <-- AppDialog
+    AppDialog --> DialogHeader
+    AppDialog --> DialogBody
+    AppDialog --> DialogFooter
+    AppDialog --|> Dialog
+    
+    class AlertDialog {
+        <<builder>>
+        +alert(Component parent) Builder
+        +danger(Component parent, String title, String message, DialogAction onConfirm) AlertDialog
+        +open()
+        +close()
+        +dialog() AppDialog
+    }
+    
+    class Builder {
+        +intent(Intent intent) Builder
+        +danger() Builder
+        +warning() Builder
+        +error() Builder
+        +info() Builder
+        +title(String title) Builder
+        +message(String message) Builder
+        +confirmButton(String label, DialogAction action) Builder
+        +cancelButton(String label, DialogAction action) Builder
+        +build() AlertDialog
+    }
+    
+    class AppDialog {
+        +small() AppDialog
+        +registerConfirmAction(DialogAction action)
+        +registerCancelAction(DialogAction action)
+        +open()
+        +close()
+    }
+    
+    class DialogHeader {
+        +withIcon(AppDialog dialog, String title, Icon icon)
+    }
+    
+    class DialogBody {
+        +withoutUserInput(AppDialog dialog, Component component)
+    }
+    
+    class DialogFooter {
+        +withDangerousConfirm(AppDialog dialog, String cancelText, String confirmText)
+        +with(AppDialog dialog, String cancelText, String confirmText)
+        +withConfirmOnly(AppDialog dialog, String confirmText)
+    }
+    
+    class DialogAction {
+        <<interface>>
+        +execute()
+    }
+```
+
+### When to use
+
+| Need | Pattern |
+|---|---|
+| Destructive action confirmation | `AlertDialog.danger(parent, title, message, onConfirm).open()` |
+| Error requiring acknowledgment | `AlertDialog.alert(parent).error().title(...).message(...).confirmButton("OK", () -> {}).build().open()` |
+| Error with redirect + cancel | `AlertDialog.alert(parent).error().confirmButton("Go...", nav).cancelButton("Cancel", close).build().open()` |
+| Cancel / discard changes | `CancelConfirmationDialogFactory.cancelConfirmationDialog(action, key, locale).open()` |
+| Success / info / transient feedback | `MessageSourceNotificationFactory.toast(...)` (unchanged) |
+| Pending task with progress bar | `MessageSourceNotificationFactory.pendingTaskToast(...)` (unchanged) |
+
+### Code examples
+
+**Destructive confirmation (most common):**
+```java
+AlertDialog.danger(this,
+    "Samples within batch will be deleted",
+    "Deleting this Batch will also delete the samples contained within. Proceed?",
+    () -> deleteBatch(batchId)).open();
+```
+
+**Error dialog with single button:**
+```java
+AlertDialog.alert(this)
+    .error()
+    .title("Cannot edit variables")
+    .message("Editing experimental variables is only possible if samples are not registered.")
+    .confirmButton("Okay", () -> {})
+    .build()
+    .open();
+```
+
+**Warning with cancel:**
+```java
+AlertDialog.alert(this)
+    .warning()
+    .title("Discard changes?")
+    .message("By aborting, you will lose all entered information.")
+    .confirmButton("Discard", () -> discard())
+    .cancelButton("Continue Editing", () -> {})  // close dialog
+    .build()
+    .open();
+```
+
+### Deprecated: NotificationDialog
+
+`NotificationDialog` has been removed and replaced with `AlertDialog`. The following classes were deleted:
+
+- `AccessTokenDeletionConfirmationNotification`
+- `BatchDeletionConfirmationNotification`
+- `MeasurementDeletionConfirmationNotification`
+- `QCItemDeletionConfirmationNotification`
+- `PurchaseItemDeletionConfirmationNotification`
+- `ProjectUserRemovalConfirmationNotification`
+- `ExistingGroupsPreventVariableEdit`
+- `ExistingSamplesPreventVariableEdit`
+- `ExistingSamplesPreventSampleOriginEdit`
+- `ExistingSamplesPreventGroupEdit`
+
+If any code still references `NotificationDialog`, it will throw `UnsupportedOperationException` at runtime. Use the patterns above instead.
+
 
 
diff --git a/datamanager-app/frontend/themes/datamanager/components/all.css b/datamanager-app/frontend/themes/datamanager/components/all.css
index 89da9b2f7e..57293f3ff1 100644
--- a/datamanager-app/frontend/themes/datamanager/components/all.css
+++ b/datamanager-app/frontend/themes/datamanager/components/all.css
@@ -1454,6 +1454,10 @@ Older stuff -
   flex-grow: 1;
 }
 
+.flex-shrink-0 {
+  flex-shrink: 0;
+}
+
 .wrapping-flex-container {
   flex-wrap: wrap;
 }
@@ -1497,3 +1501,42 @@ Older stuff -
 .overflow-auto {
   overflow: auto;
 }
+
+/*region Multi-line text truncation (line clamp)*/
+/*
+Truncate text after N visible lines. Uses the WebKit-specific
+-webkit-line-clamp property, which requires -webkit-box +
+-webkit-box-orient:vertical to function. Works in all browsers
+that support Chromium (including Vaadin). The "line-height:1.4"
+keeps truncated text visually consistent with surrounding labels.
+*/
+.clamp-1-line,
+.clamp-2-line,
+.clamp-3-line {
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  line-height: 1.4;
+  white-space: normal;
+}
+
+.clamp-1-line { -webkit-line-clamp: 1; }
+.clamp-2-line { -webkit-line-clamp: 2; }
+.clamp-3-line { -webkit-line-clamp: 3; }
+/*endregion*/
+
+/*region Positioned centre-fill overlay*/
+/*
+Absolutely fills and centres content within its nearest
+positioned ancestor. Used for loading spinners, welcome/empty
+states, and modal-like overlays that sit inside a flex container.
+*/
+.overlay-center-fill {
+  position: absolute;
+  inset: 0;                          /* top:0; right:0; bottom:0; left:0 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+/*endregion*/
diff --git a/datamanager-app/frontend/themes/datamanager/components/combobox.css b/datamanager-app/frontend/themes/datamanager/components/combobox.css
index 71cc82e08f..453ad2d7b4 100644
--- a/datamanager-app/frontend/themes/datamanager/components/combobox.css
+++ b/datamanager-app/frontend/themes/datamanager/components/combobox.css
@@ -1,3 +1,13 @@
 .analysis-type-combo-box::part(overlay) {
   width: 20rem;
 }
+
+/*
+ * The "Connect dataset" sidebar prototype uses a ComboBox inside a fixed-position
+ * sidebar panel at z-index 1000. Vaadin's base overlay uses a hard-coded z-index of
+ * 200. This rule, applied via setOverlayClassName(), raises the overlay above the
+ * sidebar so the dropdown is actually selectable.
+ */
+vaadin-combo-box-overlay.connect-dataset-sidebar-overlay {
+  z-index: 1001 !important;
+}
diff --git a/datamanager-app/frontend/themes/datamanager/components/connect-dataset-sidebar.css b/datamanager-app/frontend/themes/datamanager/components/connect-dataset-sidebar.css
new file mode 100644
index 0000000000..7ea394322e
--- /dev/null
+++ b/datamanager-app/frontend/themes/datamanager/components/connect-dataset-sidebar.css
@@ -0,0 +1,211 @@
+/* ────────────────────────────────────────────────────────────────────────────
+ * Connect Dataset Sidebar
+ *
+ * All styles are scoped under the .connect-dataset-sidebar root class so they
+ * cannot leak into other components.  Layout and spacing that can be expressed
+ * with Lumo utility classes (flex-grow, gap-s, items-center, mb-m, …) are
+ * applied via addClassName() in the Java view; this file contains only the
+ * properties that are too specific or too contextual for a utility class
+ * (exact widths, box-shadows, borders with project-specific colours, etc.).
+ *
+ * Hierarchy (see ConnectDatasetSidebar.java):
+ *   .connect-dataset-sidebar           ← root Div (the sidebar itself)
+ *     .cds-backdrop                     semi-transparent overlay behind panel
+ *     .cds-panel                        the sliding panel
+ *       .cds-body                       full-height flex column
+ *         .cds-header                   top bar with title + close button
+ *         .cds-content                  scrollable body (search + results)
+ *           .cds-search-row             instance-selector + search field
+ *           .cds-results                grid + loading/welcome overlays
+ *             .cds-loading              loading spinner overlay
+ *             .cds-welcome              empty-state overlay
+ *             .cds-card                 individual search-result card
+ *               .cds-card-top-row       first row (provider + access + date)
+ *               .cds-card-title         clamped title (also .clamp-2-line)
+ *         .cds-footer                   experiment selector + connect button
+ * ──────────────────────────────────────────────────────────────────────────── */
+
+/* ── Backdrop (behind the panel) ─────────────────────────────────────────── */
+
+.connect-dataset-sidebar .cds-backdrop {
+  position: fixed;
+  inset: 0;                              /* top/right/bottom/left: 0 */
+  background-color: rgba(0, 0, 0, 0.3);
+  z-index: 999;
+}
+
+/* ── Panel ───────────────────────────────────────────────────────────────── */
+
+.connect-dataset-sidebar .cds-panel {
+  position: fixed;
+  top: 0;
+  right: 0;
+  width: min(55%, 720px);
+  min-width: 460px;
+  max-width: 100vw;
+  height: 100%;
+  background-color: var(--lumo-base-color);
+  /* Drop shadow to the left — the only open edge of a right-anchored panel. */
+  box-shadow: -4px 0 24px rgba(0, 0, 0, 0.12);
+  z-index: 1000;
+  box-sizing: border-box;
+}
+
+/* ── Body (full-height flex column inside panel) ─────────────────────────── */
+
+.connect-dataset-sidebar .cds-body {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+/* ── Header (title + close button) ──────────────────────────────────────── */
+
+.connect-dataset-sidebar .cds-header {
+  padding: var(--lumo-space-m) var(--lumo-space-l);
+  /* Contrast-10 border is lighter than the default project border colour so
+     it remains subtle inside the panel's own background. */
+  border-bottom: 1px solid var(--lumo-contrast-10pct);
+}
+
+/* ── Content area (search + results, scrollable) ────────────────────────── */
+
+.connect-dataset-sidebar .cds-content {
+  padding: var(--lumo-space-l);
+  /* Critical: allows the search-row + results-container to shrink inside
+     the flex column without overflowing. */
+  min-height: 0;
+}
+
+/* ── Search row (instance selector + text field) ─────────────────────────── */
+
+.connect-dataset-sidebar .cds-search-row {
+  /* flexbox needs min-width:0 so child flex items can shrink below their
+     min-content size — prevents the search field from overflowing narrow
+     panels. */
+  min-width: 0;
+}
+
+/* ── Results container (relative positioned parent for overlays) ────────── */
+
+.connect-dataset-sidebar .cds-results {
+  position: relative;
+  min-height: 200px;
+}
+
+/* ── Loading overlay (spinner inside results container) ─────────────────── */
+
+.connect-dataset-sidebar .cds-loading {
+  background-color: var(--lumo-base-color);
+  z-index: 2;
+}
+
+/*
+ * Pure-CSS four-dots rotating spinner ("Spinner II", Temani Afif).
+ * A single grid div with two pseudo-elements; each carries four dots
+ * at the cardinal points. The outer ring (.cds-loading-spinner::after,
+ * larger dots, slower animation) and the inner ring (::before, smaller
+ * dots, margin-inset, linear timing) rotate at slightly different
+ * rates to produce the characteristic "four-dots orbit" effect.
+ *
+ * Each ring has its own named color token:
+ *   --cds-spinner-outer  (default: Lumo primary color)
+ *   --cds-spinner-inner  (default: hue-rotated Lumo primary)
+ * Override either from the parent to theme the rings independently.
+ *
+ * Credit: https://codepen.io/t_afif/pen/yLMXBRL  (Spinner #2)
+ */
+.connect-dataset-sidebar .cds-loading-spinner {
+  width: 48px;
+  aspect-ratio: 1;
+  display: grid;
+  --cds-spinner-outer: var(--lumo-primary-color);
+  /* 45deg hue shift off the primary produces a complementary accent
+     (e.g. blue primary → teal inner dots, red primary → orange). Keeps
+     the palette harmonious with any Lumo primary-color choice. */
+  --cds-spinner-inner: #00acac;
+}
+
+.connect-dataset-sidebar .cds-loading-spinner::after {
+  content: "";
+  grid-area: 1 / 1;
+  --c: radial-gradient(farthest-side, var(--cds-spinner-outer) 92%, #0000);
+  background:
+      var(--c) 50%   0,
+      var(--c) 50%   100%,
+      var(--c) 100%  50%,
+      var(--c) 0     50%;
+  background-size: 12px 12px;
+  background-repeat: no-repeat;
+  animation: cds-spin-half 1s infinite;
+}
+
+.connect-dataset-sidebar .cds-loading-spinner::before {
+  content: "";
+  grid-area: 1 / 1;
+  margin: 4px;
+  --c: radial-gradient(farthest-side, var(--cds-spinner-inner) 92%, #0000);
+  background:
+      var(--c) 50%   0,
+      var(--c) 50%   100%,
+      var(--c) 100%  50%,
+      var(--c) 0     50%;
+  background-size: 8px 8px;
+  background-repeat: no-repeat;
+  /*filter: hue-rotate(45deg);*/
+  animation: cds-spin-half 1s infinite linear;
+}
+
+@keyframes cds-spin-half {
+  100% { transform: rotate(0.5turn); }
+}
+
+.connect-dataset-sidebar .cds-loading-message {
+  font-weight: var(--font-weight-medium);
+}
+
+.connect-dataset-sidebar .cds-loading-hint {
+  color: var(--lumo-tertiary-text-color);
+}
+
+/* ── Welcome / empty-state overlay ──────────────────────────────────────── */
+
+.connect-dataset-sidebar .cds-welcome {
+  background-color: var(--lumo-base-color);
+  color: var(--lumo-secondary-text-color);
+  z-index: 1;
+  cursor: default;
+}
+
+.connect-dataset-sidebar .cds-welcome-icon {
+  font-size: var(--lumo-font-size-xxxl);
+  color: var(--lumo-tertiary-text-color);
+}
+
+.connect-dataset-sidebar .cds-welcome-subtitle {
+  text-align: center;
+  padding: 0 var(--lumo-space-l);
+  color: var(--lumo-tertiary-text-color);
+}
+
+/* ── Footer (experiment selector + connect button) ───────────────────────── */
+
+.connect-dataset-sidebar .cds-footer {
+  padding: var(--lumo-space-m) var(--lumo-space-l);
+  border-top: 1px solid var(--lumo-contrast-10pct);
+}
+
+/* ── Search-result card ─────────────────────────────────────────────────── */
+
+.connect-dataset-sidebar .cds-card {
+  border-radius: var(--lumo-border-radius-m);
+}
+
+/* Tighten the gap between the date label and the card's bottom edge when
+   the only content in the card is the top row + title + PID. */
+.connect-dataset-sidebar .cds-card-top-row {
+  /* Inherits flex-horizontal, items-center, gap-02 from Java addClassName(). */
+}
+
+.connect-dataset-sidebar .cds-card-title {
+  font-weight: var(--font-weight-semi-bold);
+}
diff --git a/datamanager-app/frontend/themes/datamanager/components/custom.css b/datamanager-app/frontend/themes/datamanager/components/custom.css
index ae7ea24536..8c5e069f0d 100644
--- a/datamanager-app/frontend/themes/datamanager/components/custom.css
+++ b/datamanager-app/frontend/themes/datamanager/components/custom.css
@@ -6,6 +6,7 @@
 @import "card.css";
 @import "combobox.css";
 @import "dialog.css";
+@import "connect-dataset-sidebar.css";
 @import "div.css";
 @import "image.css";
 @import "info.css";
diff --git a/datamanager-app/frontend/themes/datamanager/components/grid-templates.css b/datamanager-app/frontend/themes/datamanager/components/grid-templates.css
index 60fa16ed99..b9dc803b92 100644
--- a/datamanager-app/frontend/themes/datamanager/components/grid-templates.css
+++ b/datamanager-app/frontend/themes/datamanager/components/grid-templates.css
@@ -58,6 +58,18 @@
     "projectdetails qualitycontrollist";
 }
 
+/*
+ * Override for the Associated Datasets view (FEAT-DATSET-01).
+ * The dataset view has a single full-width child, so collapse the
+ * two-column project grid into a single 1fr column.
+ * See grid-templates.css.
+ */
+.main.project.datasets {
+  grid-template-columns: 1fr;
+  grid-template-rows: auto;
+  grid-template-areas: "datasets-content";
+}
+
 .main.ontology-lookup-main {
   grid-template-columns: auto;
   grid-template-rows: auto;
diff --git a/datamanager-app/frontend/themes/datamanager/components/page-area.css b/datamanager-app/frontend/themes/datamanager/components/page-area.css
index 77effb9b4f..fcf56ea9e9 100644
--- a/datamanager-app/frontend/themes/datamanager/components/page-area.css
+++ b/datamanager-app/frontend/themes/datamanager/components/page-area.css
@@ -424,22 +424,34 @@
   padding: var(--lumo-space-xs);
 }
 
-.project-collection-component .project-overview-item {
-  border: black;
-  border-radius: var(--lumo-border-radius-m);
-  box-shadow: var(--lumo-box-shadow-s);
+.project-collection-component .project-overview-item,
+.project-collection-component .project-overview-item:hover {
   box-sizing: border-box;
   display: flex;
   flex-direction: column;
   flex-wrap: wrap;
-  margin-bottom: var(--lumo-space-s);
-  margin-top: var(--lumo-space-s);
-  overflow: hidden;
   padding: var(--lumo-space-l);
   row-gap: var(--lumo-space-s);
   text-overflow: ellipsis;
   white-space: normal;
   cursor: pointer;
+  text-decoration: none
+}
+
+/* The wrapper now owns the card's visual styling (shadow, rounded corners,
+ * spacing between cards). The card body RouterLink inside it provides only
+ * padding and the content flow; the footer RouterLink (when present) shares
+ * the same rounded shape with a subtle top-border divider.
+ */
+.project-card-wrapper {
+  border: black;
+  border-radius: var(--lumo-border-radius-m);
+  box-shadow: var(--lumo-box-shadow-s);
+  overflow: hidden;
+  margin-bottom: var(--lumo-space-s);
+  margin-top: var(--lumo-space-s);
+  display: flex;
+  flex-direction: column;
 }
 
 .project-collection-component .project-overview-item .header {
@@ -625,3 +637,73 @@
   align-items: center;
   column-gap: var(--lumo-space-s);
 }
+
+/*
+ * Datasets view: Connected Resources section.
+ * Placed into the `datasets-content` grid area defined in grid-templates.css
+ * for `.main.project.datasets`, which spans the full available width.
+ */
+.datasets-content {
+  grid-area: datasets-content;
+}
+
+/*
+ * project-dataset footer — full-width RouterLink rendered at the bottom of
+ * each project card in the collection view. The entire footer is the click
+ * target (44px+ click target for accessibility); it visually merges with
+ * the card body above it, forming a single unified card with a subtle
+ * top-border divider and slightly tinted background.
+ *
+ * Visual merge details (paired with .project-card-wrapper above):
+ *   - Card body lives inside .project-card-wrapper (no shadow / no rounded
+ *     corners of its own) with padding matching the footer.
+ *   - Footer has only the top-border as a visual divider; background matches
+ *     the card body (white).
+ *   - .project-card-wrapper carries the rounded corner shape (overflow: hidden
+ *     clips both children into the same card outline) and the inter-card margin.
+ *
+ * Styling is component-specific; not extracted to all.css utilities.
+ */
+
+.project-dataset-footer,
+.project-dataset-footer *,
+a.project-dataset-footer, a.project-dataset-footer:hover {
+  text-decoration: none;
+  box-sizing: border-box;
+}
+
+.project-dataset-footer {
+  display: block;
+  color: var(--lumo-body-text-color);
+  border-top: 1px solid var(--lumo-contrast-10pct);
+  background-color: var(--lumo-base-color);
+  padding-top: var(--spacing-04);
+  padding-bottom: var(--spacing-04);
+  padding-left: var(--spacing-05);
+  padding-right: var(--spacing-05);
+  margin: 0;
+  transition:
+    background-color 150ms ease,
+    border-top-color 150ms ease;
+}
+
+.project-dataset-footer:hover,
+.project-dataset-footer:focus-within {
+  background-color: var(--background-color-5pct);
+  border-top-color: var(--lumo-contrast-20pct);
+}
+
+.project-dataset-footer vaadin-icon {
+  color: var(--icon-color);
+  transition: color 150ms ease;
+}
+
+.project-dataset-footer:hover vaadin-icon,
+.project-dataset-footer:focus-within vaadin-icon {
+  color: var(--primary-text-color);
+}
+
+.project-dataset-footer:focus-visible {
+  outline: 2px solid var(--primary-color);
+  outline-offset: -2px;
+}
diff --git a/datamanager-app/frontend/themes/datamanager/components/toast.css b/datamanager-app/frontend/themes/datamanager/components/toast.css
index 25b1e0d9bd..6eef4a3e4b 100644
--- a/datamanager-app/frontend/themes/datamanager/components/toast.css
+++ b/datamanager-app/frontend/themes/datamanager/components/toast.css
@@ -1,44 +1,214 @@
-.toast-notification::part(content) {
-  /*you can style the notification content here*/
+/**********
+ * Toast Notification - Dark Mode Design System
+ * Regular toasts: 420–640px wide, ~1/3 viewport, text wraps at cap.
+ * Progress toasts: multiline title/subtext in vertical layout.
+ * Backgrounds set directly on ::part(overlay) — CSS custom properties
+ * do not reliably cascade through Vaadin's Shadow DOM parts.
+ **********/
+
+/* === Default surface (base level) === */
+.toast-notification::part(overlay) {
+  background: linear-gradient(0deg, var(--toast-shade-overlay), var(--toast-shade-overlay)), var(--toast-background-color);
+  border: 1px solid var(--shade-color-20pct);
+  border-radius: 8px;
+  box-shadow: 0px 3px 12px -1px var(--shade-color-30pct),
+              0px 2px 4px -1px var(--shade-color-20pct);
+  /* Consistent width so the close button stays in a fixed position */
+  min-width: 420px;
+  max-width: min(640px, 33vw);
 }
 
-.toast-notification.success-toast::part(content) {
-  background-color: var(--lumo-success-color-10pct);
-  /*you can style the notification content here*/
+/* --- Level-specific overrides --- */
+.toast-notification.success-toast::part(overlay) {
+  background: var(--toast-background-color);
+  box-shadow: 0px 4px 4px rgba(21, 193, 93, 0.25);
 }
 
-.toast-notification.info-toast::part(content) {
-  /*you can style the notification content here*/
-  background-color: var(--lumo-primary-color-10pct);
+.toast-notification.error-toast::part(overlay) {
+  background: linear-gradient(0deg, var(--toast-shade-overlay), var(--toast-shade-overlay)), var(--toast-background-color);
+  box-shadow: 0px 4px 4px rgba(255, 66, 56, 0.25);
 }
 
-.toast-notification .toast-content {
-  /*this is the content of your notification excluding the close button*/
+.toast-notification.info-toast::part(overlay) {
+  background: linear-gradient(0deg, var(--toast-shade-overlay), var(--toast-shade-overlay)), var(--toast-background-color);
+  box-shadow: 0px 5px 4px 1px rgba(22, 118, 243, 0.25);
+}
+
+/* --- Icon container (28x28 colored circle) --- */
+
+.toast-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: var(--icon-size-m);
+  height: var(--icon-size-m);
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+
+/* Force the icon glyph inside the circle to white */
+.toast-icon vaadin-icon {
+  color: white;
+  width: var(--icon-size-xs);
+  height: var(--icon-size-xs);
+}
+
+.toast-icon-success {
+  background: var(--success-color);
+}
+
+.toast-icon-error {
+  background: var(--error-color);
+}
+
+.toast-icon-info {
+  background: var(--primary-color);
+}
+
+.toast-icon-progress {
+  background: var(--primary-color);
+}
+
+/* === Layout structure (HorizontalLayout) === */
+
+.toast-notification .toast-layout {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex-wrap: nowrap;
+  gap: 14px;
+  padding: 10px;
   width: 100%;
+  box-sizing: border-box;
 }
 
-.toast-notification .toast-content strong {
-  margin-left: .5ch;
-  margin-right: .5ch;
+/* --- Content text (non-routing and routing) --- */
+/* Toast grows to fit content — text wraps when max-width is reached */
+
+.toast-notification .toast-content {
+  flex: 1 1 0;
+  min-width: 0;
+  max-width: 100%;
+  color: var(--toast-text-color);
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-size: var(--lumo-font-size-m);
+  font-weight: var(--font-weight-regular);
+  line-height: var(--lumo-line-height-m);
 }
 
-.toast-notification .close-button {
-  /*you can style the toast close button here*/
+/* Links inside toast content */
+.toast-notification .toast-content a {
+  color: var(--toast-link-color);
+  text-decoration: underline;
 }
 
+/* --- Routing container (flex child when routing) --- */
+
 .toast-notification .routing-container {
-  display: grid;
-  grid-template-columns: minmax(min-content, max-content) auto minmax(min-content, max-content);
-  column-gap: var(--lumo-space-m);
+  flex: 1 1 0;
+  min-width: 0;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: nowrap;
+  align-items: center;
+  gap: var(--lumo-space-m);
 }
 
-.toast-notification .routing-content {
-  /*in case of routing this can style the content without the routing link*/
-  align-content: center;
+/* --- Title text for progress toasts (16px bold, multiline) --- */
+
+.toast-notification .toast-title {
+  color: var(--toast-text-color);
+  font-size: var(--lumo-font-size-m);
+  font-weight: var(--font-weight-semi-bold);
+  line-height: var(--lumo-line-height-s);
 }
 
+/* --- Subtext for progress toasts (multiline) --- */
+
+.toast-notification .toast-subtext {
+  color: var(--toast-text-color);
+  font-size: var(--lumo-font-size-m);
+  font-weight: var(--font-weight-regular);
+  line-height: var(--lumo-line-height-m);
+}
+
+/* --- Close button (30x30) --- */
+
+.toast-notification .close-button {
+  width: 30px;
+  height: 30px;
+  flex-shrink: 0;
+  color: var(--toast-subtle-text-color);
+}
+
+/* --- Action button (tertiary styled) --- */
+
+.toast-notification .action-button {
+  background: var(--toast-shade-overlay);
+  border-radius: 4px;
+  color: var(--toast-link-color);
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-size: var(--lumo-font-size-m);
+  font-weight: var(--font-weight-regular);
+  padding: 8px 14px;
+  white-space: nowrap;
+  flex-shrink: 0;
+}
+
+.toast-notification .action-button::part(label) {
+  color: var(--toast-link-color);
+}
+
+/* --- Progress bar (webcomponent shadow DOM) --- */
+
+.toast-notification .progress-vertical {
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-04);
+  flex-grow: 1;
+  min-width: 0;
+}
+
+.toast-notification .progress-bar-container {
+  width: 100%;
+}
+
+.toast-notification vaadin-progress-bar {
+  height: 8px;
+  width: 100%;
+  display: block;
+}
+
+.toast-notification vaadin-progress-bar::part(bar) {
+  background: var(--toast-progress-track-color);
+  border-radius: 40px;
+}
+
+.toast-notification vaadin-progress-bar::part(value) {
+  background: var(--primary-color);
+  border-radius: 40px;
+}
+
+/* --- Routing link and button --- */
+
 .toast-notification .routing-link {
-  grid-column: 3;
-  align-content: center;
-  justify-content: center;
+  flex-shrink: 0;
+}
+
+.toast-notification .routing-button {
+  background: none;
+  border: none;
+  padding: 0;
+  color: var(--toast-link-color);
+  font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  font-size: var(--lumo-font-size-m);
+  font-weight: var(--font-weight-regular);
+  text-decoration: underline;
+  cursor: pointer;
+  flex-shrink: 0;
+  white-space: nowrap;
+}
+
+.toast-notification .routing-button::part(label) {
+  color: var(--toast-link-color);
 }
diff --git a/datamanager-app/frontend/themes/datamanager/components/variables.css b/datamanager-app/frontend/themes/datamanager/components/variables.css
index 4148cda5ce..9cb02e61e2 100644
--- a/datamanager-app/frontend/themes/datamanager/components/variables.css
+++ b/datamanager-app/frontend/themes/datamanager/components/variables.css
@@ -99,4 +99,12 @@ First some general property definitions
   --spacing-10: 4rem;
   --spacing-11: 5rem;
   --spacing-12: 6rem;
+
+  /* --- Toast dark-surface tokens --- */
+  --toast-background-color: #223348;
+  --toast-text-color: rgba(235, 244, 255, 0.9);
+  --toast-subtle-text-color: rgba(209, 227, 250, 0.6);
+  --toast-link-color: #66A8FF;
+  --toast-progress-track-color: rgba(173, 200, 235, 0.14);
+  --toast-shade-overlay: rgba(25, 59, 103, 0.05); /* subtle gradient overlay for toast backgrounds */
 }
diff --git a/datamanager-app/src/main/bundles/dev.bundle b/datamanager-app/src/main/bundles/dev.bundle
index 17aa5780be..a814dc4c8b 100644
Binary files a/datamanager-app/src/main/bundles/dev.bundle and b/datamanager-app/src/main/bundles/dev.bundle differ
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java b/datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java
index 9a36db82c5..9b4ae47223 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java
@@ -37,6 +37,8 @@
 import life.qbic.projectmanagement.application.concurrent.VirtualThreadScheduler;
 import life.qbic.projectmanagement.application.experiment.ExperimentInformationService;
 import life.qbic.projectmanagement.application.measurement.MeasurementLookupService;
+import life.qbic.projectmanagement.application.policy.AssociatedDatasetConnectedPolicy;
+import life.qbic.projectmanagement.application.policy.AssociatedDatasetRemovedPolicy;
 import life.qbic.projectmanagement.application.policy.BatchRegisteredPolicy;
 import life.qbic.projectmanagement.application.policy.ExperimentCreatedPolicy;
 import life.qbic.projectmanagement.application.policy.ExperimentUpdatedPolicy;
@@ -52,6 +54,8 @@
 import life.qbic.projectmanagement.application.policy.directive.AddSampleToBatch;
 import life.qbic.projectmanagement.application.policy.directive.CreateNewSampleStatisticsEntry;
 import life.qbic.projectmanagement.application.policy.directive.DeleteSampleFromBatch;
+import life.qbic.projectmanagement.application.policy.directive.InformProjectCollaboratorsAboutDatasetConnection;
+import life.qbic.projectmanagement.application.policy.directive.InformProjectCollaboratorsAboutDatasetRemoval;
 import life.qbic.projectmanagement.application.policy.directive.InformUserAboutGrantedAccess;
 import life.qbic.projectmanagement.application.policy.directive.InformUsersAboutBatchRegistration;
 import life.qbic.projectmanagement.application.policy.directive.UpdateProjectUponBatchCreation;
@@ -330,6 +334,34 @@ public OfferAddedPolicy offerAddedPolicy(
     return new OfferAddedPolicy(updateProjectUponOfferChange);
   }
 
+  @Bean
+  public AssociatedDatasetConnectedPolicy associatedDatasetConnectedPolicy(
+      life.qbic.projectmanagement.application.communication.EmailService emailService,
+      ProjectAccessService projectAccessService,
+      UserInformationService userInformationService,
+      ProjectInformationService projectInformationService,
+      AppContextProvider appContextProvider,
+      JobScheduler jobScheduler) {
+    var informCollaborators = new InformProjectCollaboratorsAboutDatasetConnection(
+        emailService, projectAccessService, userInformationService, projectInformationService,
+        appContextProvider, jobScheduler);
+    return new AssociatedDatasetConnectedPolicy(informCollaborators);
+  }
+
+  @Bean
+  public AssociatedDatasetRemovedPolicy associatedDatasetRemovedPolicy(
+      life.qbic.projectmanagement.application.communication.EmailService emailService,
+      ProjectAccessService projectAccessService,
+      UserInformationService userInformationService,
+      ProjectInformationService projectInformationService,
+      AppContextProvider appContextProvider,
+      JobScheduler jobScheduler) {
+    var informCollaborators = new InformProjectCollaboratorsAboutDatasetRemoval(
+        emailService, projectAccessService, userInformationService,
+        projectInformationService, appContextProvider, jobScheduler);
+    return new AssociatedDatasetRemovedPolicy(informCollaborators);
+  }
+
   /*
   Section ends
 
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/AsyncConfig.java b/datamanager-app/src/main/java/life/qbic/datamanager/AsyncConfig.java
index c0ea8f86c8..eb308f95a5 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/AsyncConfig.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/AsyncConfig.java
@@ -8,7 +8,6 @@
 import org.springframework.scheduling.annotation.AsyncConfigurer;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.security.config.annotation.method.configuration.EnableReactiveMethodSecurity;
 import org.springframework.security.task.DelegatingSecurityContextAsyncTaskExecutor;
 
 @Configuration
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/configuration/DataManagementDatasourceConfig.java b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/DataManagementDatasourceConfig.java
index a457e33e60..d254360979 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/configuration/DataManagementDatasourceConfig.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/DataManagementDatasourceConfig.java
@@ -89,7 +89,11 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(
         .packages("life.qbic.projectmanagement", "life.qbic.identity",
             "life.qbic.datamanager.announcements")
         .properties(Map.of(
-            "hibernate.hbm2ddl.auto", hibernateDdlAuto
+            "hibernate.hbm2ddl.auto", hibernateDdlAuto,
+            // Force UTC for all TIMESTAMP ↔ Instant conversions so that event
+            // timestamps (connectedOn, lastSyncedAt, ...) have consistent
+            // semantics regardless of the JVM host's default timezone.
+            "hibernate.jdbc.time_zone", "UTC"
         ))
         .build();
   }
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/configuration/InvenioRdmConfiguration.java b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/InvenioRdmConfiguration.java
new file mode 100644
index 0000000000..36344e3301
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/configuration/InvenioRdmConfiguration.java
@@ -0,0 +1,49 @@
+package life.qbic.datamanager.configuration;
+
+import life.qbic.projectmanagement.application.associated_dataset.DatasetSource;
+import life.qbic.projectmanagement.application.associated_dataset.SourceInstanceRegistry;
+import life.qbic.projectmanagement.infrastructure.external.invenio.InvenioRdmClient;
+import life.qbic.projectmanagement.infrastructure.external.invenio.InvenioRdmClient.InvenioRdmHttpClient;
+import life.qbic.projectmanagement.infrastructure.external.invenio.InvenioRdmDatasetSource;
+import life.qbic.projectmanagement.infrastructure.external.invenio.InvenioRdmProperties;
+import life.qbic.projectmanagement.infrastructure.external.invenio.PropertiesBackedSourceInstanceRegistry;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Wires up the InvenioRDM integration beans.
+ *
+ * <p>Registers:
+ * <ul>
+ *   <li>{@link InvenioRdmProperties} — config-bound properties
+ *       ({@code qbic.external-service.invenio-rdm.*})</li>
+ *   <li>{@link InvenioRdmClient} — low-level HTTP client (stateless,
+ *       shared singleton)</li>
+ *   <li>{@link SourceInstanceRegistry} — admin-configured instance
+ *       lookup (ADR-0002 I2)</li>
+ *   <li>{@link DatasetSource} — the port adapter for InvenioRDM
+ *       (ADR-0002 P2)</li>
+ * </ul>
+ *
+ * @since 1.12.0
+ */
+@Configuration
+@EnableConfigurationProperties(InvenioRdmProperties.class)
+public class InvenioRdmConfiguration {
+
+  @Bean
+  public InvenioRdmClient invenioRdmClient() {
+    return new InvenioRdmHttpClient();
+  }
+
+  @Bean
+  public SourceInstanceRegistry sourceInstanceRegistry(InvenioRdmProperties properties) {
+    return new PropertiesBackedSourceInstanceRegistry(properties);
+  }
+
+  @Bean
+  public DatasetSource invenioRdmDatasetSource(InvenioRdmClient client) {
+    return new InvenioRdmDatasetSource(client);
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/exceptionhandling/UiExceptionHandler.java b/datamanager-app/src/main/java/life/qbic/datamanager/exceptionhandling/UiExceptionHandler.java
index dcdf433a08..2917f7af3f 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/exceptionhandling/UiExceptionHandler.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/exceptionhandling/UiExceptionHandler.java
@@ -5,14 +5,14 @@
 import static life.qbic.logging.service.LoggerFactory.logger;
 
 import com.vaadin.flow.component.UI;
-import com.vaadin.flow.component.html.Span;
 import com.vaadin.flow.server.ErrorEvent;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import life.qbic.application.commons.ApplicationException;
 import life.qbic.datamanager.exceptionhandling.ErrorMessageTranslationService.UserFriendlyErrorMessage;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.logging.api.Logger;
+import life.qbic.projectmanagement.application.associated_dataset.AssociatedDatasetServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -54,6 +54,20 @@ public void error(ErrorEvent errorEvent, UI ui) {
     } catch (UnknownHostException ignored) {
       log.error(throwable.getMessage(), throwable);
     }
+
+    // Service-level exceptions (e.g. from AssociatedDatasetService) carry
+    // a user-friendly message that has already been translated at the
+    // application-layer boundary — no infrastructure details leak through.
+    // We surface that message directly so the user sees something meaningful
+    // instead of the generic "Something went wrong" fallback.
+    if (throwable instanceof AssociatedDatasetServiceException serviceException) {
+      var friendly = new UserFriendlyErrorMessage(
+          "Operation failed",
+          serviceException.userMessage());
+      displayUserFriendlyMessage(ui, friendly);
+      return;
+    }
+
     ApplicationException applicationException = ApplicationException.wrapping(throwable);
     displayUserFriendlyMessage(ui, applicationException);
   }
@@ -61,6 +75,28 @@ public void error(ErrorEvent errorEvent, UI ui) {
   private void displayUserFriendlyMessage(UI ui, ApplicationException exception) {
     requireNonNull(ui, "ui must not be null");
     requireNonNull(exception, "exception must not be null");
+    if (!isUiReady(ui)) {
+      return;
+    }
+    UserFriendlyErrorMessage errorMessage = userMessageService.translate(exception, ui.getLocale());
+    ui.access(() -> showErrorDialog(errorMessage));
+  }
+
+  private void displayUserFriendlyMessage(UI ui, UserFriendlyErrorMessage message) {
+    requireNonNull(ui, "ui must not be null");
+    requireNonNull(message, "message must not be null");
+    if (!isUiReady(ui)) {
+      return;
+    }
+    ui.access(() -> showErrorDialog(message));
+  }
+
+  /**
+   * Verifies the UI is still attached and not closing. Returns
+   * {@code false} (and logs the situation) when the UI cannot receive
+   * a new message, so callers can simply {@code return} after invoking it.
+   */
+  private boolean isUiReady(UI ui) {
     if (ui.isClosing()) {
       if (nonNull(ui.getSession())) {
         log.error(
@@ -70,8 +106,7 @@ private void displayUserFriendlyMessage(UI ui, ApplicationException exception) {
         log.error(
             "tried to show message on closing UI ui[%s] session is null".formatted(ui.getUIId()));
       }
-
-      return;
+      return false;
     }
     if (!ui.isAttached()) {
       if (nonNull(ui.getSession())) {
@@ -84,16 +119,18 @@ private void displayUserFriendlyMessage(UI ui, ApplicationException exception) {
             "tried to show message on detached UI ui[%s] session is null".formatted(
                 ui.getUIId()));
       }
-      return;
+      return false;
     }
-    UserFriendlyErrorMessage errorMessage = userMessageService.translate(exception, ui.getLocale());
-    ui.access(() -> showErrorDialog(errorMessage));
+    return true;
   }
 
   private void showErrorDialog(UserFriendlyErrorMessage userFriendlyError) {
-    NotificationDialog.errorDialog()
-        .withTitle(userFriendlyError.title())
-        .withContent(new Span(userFriendlyError.message()))
+    AlertDialog.alert(UI.getCurrent())
+        .error()
+        .title(userFriendlyError.title())
+        .message(userFriendlyError.message())
+        .confirmButton("Got it", () -> {})
+        .build()
         .open();
   }
 }
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/ConverterRegistry.java b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/ConverterRegistry.java
index 4585b8b437..d1e02bbbcd 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/ConverterRegistry.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/ConverterRegistry.java
@@ -2,16 +2,15 @@
 
 import java.util.Map;
 import java.util.function.Supplier;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.SampleRegistrationInformation;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.SampleUpdateInformation;
 import org.apache.commons.collections.map.HashedMap;
-import org.apache.poi.ss.formula.functions.T;
 
 /**
  * Converter Factory for creating {@link MetadataConverterV2} instances.
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementRegistrationMetadataConverterNGS.java b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementRegistrationMetadataConverterNGS.java
index 4c26821e89..2531d950be 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementRegistrationMetadataConverterNGS.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementRegistrationMetadataConverterNGS.java
@@ -1,7 +1,6 @@
 package life.qbic.datamanager.files.parsing.converters;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import life.qbic.datamanager.files.parsing.ParsingResult;
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementUpdateMetadataConverterPxP.java b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementUpdateMetadataConverterPxP.java
index 569cc45983..11e192ed03 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementUpdateMetadataConverterPxP.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/files/parsing/converters/MeasurementUpdateMetadataConverterPxP.java
@@ -7,8 +7,6 @@
 import life.qbic.datamanager.files.structure.measurement.ProteomicsMeasurementEditColumn;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificPxP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.measurement.Labeling;
-import life.qbic.projectmanagement.domain.model.sample.SampleCode;
 
 /**
  * Measurement Update Metadata Converter PxP
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/AppRoutes.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/AppRoutes.java
index 825bbfc6f7..a5c5112222 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/AppRoutes.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/AppRoutes.java
@@ -112,6 +112,11 @@ private ProjectRoutes() {}
 
     public static final String ONTOLOGY = "projects/%s/ontology";
 
+    /**
+     * Path to the associated datasets view within a project (FEAT-DATSET-01).
+     */
+    public static final String DATASETS = "projects/%s/datasets";
+
     /**
      * The profile page that displays information for the currently logged-in user
      */
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/account/AccessTokenDeletionConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/account/AccessTokenDeletionConfirmationNotification.java
deleted file mode 100644
index b8dee23bb5..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/account/AccessTokenDeletionConfirmationNotification.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package life.qbic.datamanager.views.account;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Warns the user that the personal access token will be deleted and cannot be used
- * <p>
- * This dialog is to be shown when PAT delection is triggered by the user.
- */
-public class AccessTokenDeletionConfirmationNotification extends NotificationDialog {
-
-  public AccessTokenDeletionConfirmationNotification() {
-    super(NotificationLevel.WARNING);
-    withTitle("Personal Access Token will be deleted");
-    withContent(new Span(
-        "Deleting this Personal Access Token will make it unusable. Proceed?"));
-    setCancelable(true);
-    setConfirmText("Delete Token");
-  }
-
-
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/account/PersonalAccessTokenMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/account/PersonalAccessTokenMain.java
index a0ea248599..8f4ff56bd2 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/account/PersonalAccessTokenMain.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/account/PersonalAccessTokenMain.java
@@ -18,6 +18,7 @@
 import life.qbic.datamanager.views.account.PersonalAccessTokenComponent.DeleteTokenEvent;
 import life.qbic.datamanager.views.account.PersonalAccessTokenComponent.PersonalAccessTokenFrontendBean;
 import life.qbic.datamanager.views.general.Main;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.notifications.Toast;
 import life.qbic.identity.api.PersonalAccessToken;
@@ -74,18 +75,18 @@ public PersonalAccessTokenMain(PersonalAccessTokenService personalAccessTokenSer
   }
 
   private void onDeleteTokenClicked(DeleteTokenEvent deleteTokenEvent) {
-    AccessTokenDeletionConfirmationNotification tokenDeletionConfirmationNotification = new AccessTokenDeletionConfirmationNotification();
-    tokenDeletionConfirmationNotification.open();
-    tokenDeletionConfirmationNotification.addConfirmListener(event -> {
-      var userId = userIdTranslator.translateToUserId(
-              SecurityContextHolder.getContext().getAuthentication())
-          .orElseThrow();
-      personalAccessTokenService.delete(deleteTokenEvent.tokenId(), userId);
-      loadGeneratedPersonalAccessTokens();
-      tokenDeletionConfirmationNotification.close();
-    });
-    tokenDeletionConfirmationNotification.addCancelListener(
-        event -> tokenDeletionConfirmationNotification.close());
+    AlertDialog.danger(this,
+        "Personal Access Token will be deleted",
+        "Deleting this Personal Access Token will make it unusable. Proceed?",
+        "Delete token",
+        "Keep token",
+        () -> {
+          var userId = userIdTranslator.translateToUserId(
+                  SecurityContextHolder.getContext().getAuthentication())
+              .orElseThrow();
+          personalAccessTokenService.delete(deleteTokenEvent.tokenId(), userId);
+          loadGeneratedPersonalAccessTokens();
+        }).open();
   }
 
   private void onAddTokenClicked(AddTokenEvent addTokenEvent) {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemo.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemo.java
new file mode 100644
index 0000000000..735f0472c6
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemo.java
@@ -0,0 +1,801 @@
+package life.qbic.datamanager.views.demo;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.dialog.Dialog;
+import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.Grid.SelectionMode;
+import com.vaadin.flow.component.grid.GridVariant;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.AnchorTarget;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.tabs.TabSheet;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.annotation.UIScope;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+import life.qbic.datamanager.views.general.InfoBox;
+import life.qbic.datamanager.views.general.Tag;
+import life.qbic.datamanager.views.general.Tag.TagColor;
+import life.qbic.datamanager.views.general.section.ActionBar;
+import life.qbic.datamanager.views.general.section.Section;
+import life.qbic.datamanager.views.general.section.SectionContent;
+import life.qbic.datamanager.views.general.section.SectionHeader;
+import life.qbic.datamanager.views.general.section.SectionNote;
+import life.qbic.datamanager.views.general.section.SectionTitle;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * <b>Associated Datasets Demo</b>
+ *
+ * <p>Pure UI prototype for the "Connect datasets with research projects" feature.
+ * Demonstrates the interaction patterns for searching, connecting, viewing,
+ * syncing, and removing associated datasets from InvenioRDM instances
+ * (e.g. Zenodo, FDAT).</p>
+ *
+ * <p>Covers user stories 01–08 from the feature specification.</p>
+ *
+ * <p>This view is only available with the {@code development} profile.</p>
+ *
+ * @since 1.12.0
+ */
+@Profile("development")
+@Route("test-view/associated-datasets")
+@UIScope
+@AnonymousAllowed
+@org.springframework.stereotype.Component
+public class AssociatedDatasetsDemo extends Div {
+
+  private static final List<String> INVENIO_INSTANCES = List.of(
+      "Zenodo (zenodo.org)",
+      "FDAT (fdat.uni-tuebingen.de)"
+  );
+
+  record SearchableDataset(
+      String id, String title, String doi, String creators,
+      String publicationDate, String repository, String accessRight,
+      String description) {}
+
+  record ConnectedDataset(
+      String id, String title, String doi, String connectedBy,
+      LocalDate connectedOn, String repository, String accessRight,
+      String latestVersion, boolean updateAvailable) {}
+
+  // ── Mock search result data ─────────────────────────────────────────────
+
+  private static final List<SearchableDataset> MOCK_PUBLIC_DATASETS = List.of(
+      new SearchableDataset("zen-001",
+          "High-resolution cryo-EM structure of the human 26S proteasome",
+          "10.5281/zenodo.1234567", "M. Bauer, S. Fernandez, L. Chen",
+          "2024-11-15", "Zenodo", "Open",
+          "Cryo-electron microscopy structure at 2.8 Å resolution revealing the complete architecture of the human 26S proteasome complex."),
+      new SearchableDataset("zen-002",
+          "Proteomic profiling of T-cell receptor signaling in Jurkat cells",
+          "10.5281/zenodo.1234568", "A. Müller, K. Tanaka",
+          "2024-10-03", "Zenodo", "Open",
+          "Mass spectrometry datasets and analysis scripts for TCR signaling pathway characterization."),
+      new SearchableDataset("zen-003",
+          "Multi-omics integration pipeline benchmark dataset",
+          "10.5281/zenodo.1234569", "QBiC Consortium",
+          "2025-01-20", "Zenodo", "Open",
+          "Reference dataset for benchmarking multi-omics integration methods across transcriptomics, proteomics, and metabolomics layers."),
+      new SearchableDataset("zen-004",
+          "Supplementary figures for 'Metabolic rewiring in tumor microenvironment'",
+          "10.5281/zenodo.1234570", "J. Park, R. Schmidt, T. Nguyen",
+          "2025-02-10", "Zenodo", "Open",
+          "Additional figures, source data, and analysis notebooks accompanying the publication on metabolic rewiring."),
+      new SearchableDataset("zen-005",
+          "NGS raw reads: Arabidopsis thaliana drought stress response",
+          "10.5281/zenodo.1234571", "P. Garcia, H. Weber",
+          "2024-08-22", "Zenodo", "Open",
+          "Illumina paired-end RNA-Seq reads from Arabidopsis thaliana under drought and control conditions."),
+      new SearchableDataset("fdat-001",
+          "Quantitative phosphoproteomics of DNA damage response",
+          "10.5281/fdat.9876543", "C. Klein, D. Patel",
+          "2025-03-05", "FDAT", "Open",
+          "TMT-labeled phosphoproteomics data from HEK293 cells treated with genotoxic agents."),
+      new SearchableDataset("fdat-002",
+          "Spatial transcriptomics atlas of human kidney development",
+          "10.5281/fdat.9876544", "S. Yamamoto, F. Rossi, QBiC",
+          "2025-04-12", "FDAT", "Open",
+          "10x Visium spatial transcriptomics data from human kidney sections at multiple developmental stages.")
+  );
+
+  private static final List<SearchableDataset> MOCK_RESTRICTED_DATASETS = List.of(
+      new SearchableDataset("zen-r01",
+          "Clinical metabolomics data — Cohort A (embargo until 2026-12)",
+          "10.5281/zenodo.2345601", "R. Schmidt, M. Bauer",
+          "2025-06-01", "Zenodo", "Restricted",
+          "Clinical metabolomics profiles from Cohort A participants. Access restricted pending ethics review completion."),
+      new SearchableDataset("zen-r02",
+          "Pre-publication proteomics: Novel biomarker candidates",
+          "10.5281/zenodo.2345602", "K. Tanaka, A. Petrova",
+          "2025-05-20", "Zenodo", "Restricted",
+          "Discovery-phase proteomics data for novel biomarker candidates. Under peer review."),
+      new SearchableDataset("fdat-r01",
+          "Oncology panel sequencing — Phase II trial (controlled access)",
+          "10.5281/fdat.8765401", "QBiC Clinical Collaboration",
+          "2025-04-01", "FDAT", "Restricted",
+          "Targeted sequencing data from Phase II clinical trial. Access requires data use agreement.")
+  );
+
+  // ── Mutable state ─────────────────────────────────────────────────────
+
+  private final List<ConnectedDataset> connectedPublicDatasets = new ArrayList<>();
+  private final List<ConnectedDataset> connectedRestrictedDatasets = new ArrayList<>();
+
+  private Grid<SearchableDataset> publicSearchResultsGrid;
+  private Grid<SearchableDataset> restrictedSearchResultsGrid;
+  private Grid<ConnectedDataset> connectedPublicGrid;
+  private Grid<ConnectedDataset> connectedRestrictedGrid;
+
+  private final TextField publicSearchField = new TextField();
+  private final TextField restrictedSearchField = new TextField();
+  private final ComboBox<String> publicInstanceSelector = new ComboBox<>();
+  private final ComboBox<String> restrictedInstanceSelector = new ComboBox<>();
+
+  // Buttons referenced from multiple places
+  private Button connectPublicButton;
+  private Button connectRestrictedButton;
+  private Button syncAllPublicButton;
+  private Button syncAllRestrictedButton;
+
+  public AssociatedDatasetsDemo() {
+    addClassNames("padding-horizontal-07", "padding-vertical-04");
+    addClassName("flex-vertical");
+
+    var title = new Div("Associated Datasets — UI Prototype");
+    title.addClassName("heading-1");
+    add(title);
+
+    var subtitle = new Div(
+        "Demonstrates Stories 01–08 from the \"Connect datasets with research projects\" feature. "
+            + "All data is mocked — no real API calls are made.");
+    subtitle.addClassName("normal-body-text");
+    subtitle.addClassName("color-secondary");
+    add(subtitle);
+    add(new Div()); // spacer
+
+    seedConnectedDatasets();
+
+    var tabSheet = new TabSheet();
+    tabSheet.addClassName("experimental-sheet");
+    tabSheet.setWidthFull();
+    tabSheet.add("Public Datasets", buildPublicDatasetsTab());
+    tabSheet.add("Restricted Datasets", buildRestrictedDatasetsTab());
+    add(tabSheet);
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  PUBLIC DATASETS TAB  (Stories 01 – 04)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Component buildPublicDatasetsTab() {
+    var container = new Div();
+    container.addClassNames("flex-vertical", "gap-04");
+    container.add(searchAndConnectPublicSection());
+    container.add(connectedPublicDatasetsSection());
+    return container;
+  }
+
+  /**
+   * Story 01 — Searching and connecting open, published datasets.
+   */
+  private Section searchAndConnectPublicSection() {
+    var section = new Section.SectionBuilder().build();
+
+    // ── Header: Connect button in ActionBar, selection count in button text ─
+    connectPublicButton = new Button("Connect", VaadinIcon.PLUS_CIRCLE.create());
+    connectPublicButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    connectPublicButton.addClickListener(e -> connectSelectedPublicDatasets());
+    connectPublicButton.setEnabled(false);
+
+    var connectActionBar = new ActionBar();
+    connectActionBar.addButton(connectPublicButton);
+
+    var header = new SectionHeader(
+        new SectionTitle("Search and Connect"),
+        connectActionBar,
+        new SectionNote(
+            "Search for published datasets on InvenioRDM repositories and connect them to this project.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    // ── Content ───────────────────────────────────────────────────────
+    var content = new SectionContent();
+
+    // Compact inline search bar: [Repository combo] [Search field] [Search button]
+    var searchBar = new Div();
+    searchBar.addClassNames("flex-horizontal", "gap-03", "width-full");
+
+    publicInstanceSelector.setItems(INVENIO_INSTANCES);
+    publicInstanceSelector.setPlaceholder("Select repository…");
+    publicInstanceSelector.setValue(INVENIO_INSTANCES.get(0));
+    publicInstanceSelector.setWidth("280px");
+    publicInstanceSelector.setLabel("Repository");
+
+    publicSearchField.setPlaceholder("Search by title, DOI, or author…");
+    publicSearchField.setWidthFull();
+    publicSearchField.setLabel("Search Term");
+    publicSearchField.setClearButtonVisible(true);
+
+    var searchButton = new Button("Search", VaadinIcon.SEARCH.create());
+    searchButton.addClassName("margin-top-auto");
+    searchButton.addClickListener(e -> performPublicSearch());
+
+    searchBar.add(publicInstanceSelector, publicSearchField, searchButton);
+
+    // Info note
+    var infoNote = new InfoBox()
+        .setInfoText("Public datasets do not require authentication. Anyone with write access to this project can connect datasets.");
+
+    // Search results grid
+    publicSearchResultsGrid = createSearchResultsGrid();
+    populatePublicSearchResults("");
+
+    publicSearchResultsGrid.addSelectionListener(event -> {
+      int count = event.getAllSelectedItems().size();
+      connectPublicButton.setEnabled(count > 0);
+      connectPublicButton.setText(
+          count == 0 ? "Connect"
+          : count == 1 ? "Connect (1)"
+          : "Connect (" + count + ")");
+    });
+
+    content.add(searchBar, infoNote, publicSearchResultsGrid);
+    section.setContent(content);
+    return section;
+  }
+
+  /**
+   * Stories 02, 03, 04 — Viewing, removing, and syncing connected public datasets.
+   */
+  private Section connectedPublicDatasetsSection() {
+    var section = new Section.SectionBuilder().build();
+
+    syncAllPublicButton = new Button("Sync All", VaadinIcon.REFRESH.create());
+    syncAllPublicButton.addClickListener(e -> syncAllPublic());
+
+    var header = new SectionHeader(
+        new SectionTitle("Connected Public Datasets"),
+        new ActionBar(syncAllPublicButton),
+        new SectionNote("Datasets connected from public InvenioRDM repositories.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    var content = new SectionContent();
+    connectedPublicGrid = createConnectedDatasetsGrid();
+    refreshConnectedPublicGrid();
+    content.add(connectedPublicGrid);
+    section.setContent(content);
+    return section;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  RESTRICTED DATASETS TAB  (Stories 05 – 08)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Component buildRestrictedDatasetsTab() {
+    var container = new Div();
+    container.addClassNames("flex-vertical", "gap-04");
+    container.add(searchAndConnectRestrictedSection());
+    container.add(connectedRestrictedDatasetsSection());
+    return container;
+  }
+
+  /**
+   * Story 05 — Searching and connecting restricted datasets.
+   */
+  private Section searchAndConnectRestrictedSection() {
+    var section = new Section.SectionBuilder().build();
+
+    connectRestrictedButton = new Button("Connect", VaadinIcon.PLUS_CIRCLE.create());
+    connectRestrictedButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    connectRestrictedButton.addClickListener(e -> connectSelectedRestrictedDatasets());
+    connectRestrictedButton.setEnabled(false);
+
+    var connectActionBar = new ActionBar();
+    connectActionBar.addButton(connectRestrictedButton);
+
+    var header = new SectionHeader(
+        new SectionTitle("Search and Connect"),
+        connectActionBar,
+        new SectionNote(
+            "Search for access-restricted datasets on InvenioRDM repositories. Requires an authorization token configured in your account.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    // ── Content ───────────────────────────────────────────────────────
+    var content = new SectionContent();
+
+    // Token warning card (Story 05 — last acceptance criterion)
+    var tokenWarning = new Div();
+    tokenWarning.addClassNames("flex-horizontal", "gap-03", "border", "padding-03",
+        "rounded-02");
+    tokenWarning.getStyle().set("background-color", "var(--lumo-contrast-5pct)");
+    var warningIcon = VaadinIcon.EXCLAMATION_CIRCLE.create();
+    warningIcon.addClassName("icon-color-warning");
+    var warningText = new Span("No InvenioRDM authorization token configured. ");
+    warningText.addClassName("normal-body-text");
+    var configureLink = new Anchor("#/account/tokens", "Configure your token");
+    configureLink.addClassName("normal-body-text");
+    tokenWarning.add(warningIcon, warningText, configureLink);
+    for (Component child : tokenWarning.getChildren().toList()) {
+      child.addClassName("margin-top-auto");
+      child.addClassName("margin-bottom-auto");
+    }
+    content.add(tokenWarning);
+
+    // Compact inline search bar
+    var searchBar = new Div();
+    searchBar.addClassNames("flex-horizontal", "gap-03", "width-full");
+
+    restrictedInstanceSelector.setItems(INVENIO_INSTANCES);
+    restrictedInstanceSelector.setPlaceholder("Select repository…");
+    restrictedInstanceSelector.setValue(INVENIO_INSTANCES.get(0));
+    restrictedInstanceSelector.setWidth("280px");
+    restrictedInstanceSelector.setLabel("Repository");
+
+    restrictedSearchField.setPlaceholder("Search by title, DOI, or author…");
+    restrictedSearchField.setWidthFull();
+    restrictedSearchField.setLabel("Search Term");
+    restrictedSearchField.setClearButtonVisible(true);
+
+    var searchButton = new Button("Search", VaadinIcon.SEARCH.create());
+    searchButton.addClassName("margin-top-auto");
+    searchButton.addClickListener(e -> performRestrictedSearch());
+
+    searchBar.add(restrictedInstanceSelector, restrictedSearchField, searchButton);
+
+    // Search results grid
+    restrictedSearchResultsGrid = createSearchResultsGrid();
+    populateRestrictedSearchResults("");
+
+    restrictedSearchResultsGrid.addSelectionListener(event -> {
+      int count = event.getAllSelectedItems().size();
+      connectRestrictedButton.setEnabled(count > 0);
+      connectRestrictedButton.setText(
+          count == 0 ? "Connect"
+          : count == 1 ? "Connect (1)"
+          : "Connect (" + count + ")");
+    });
+
+    // Info note
+    var infoNote = new InfoBox()
+        .setInfoText("Restricted datasets require a valid authorization token. Connected project members can access them via the provided access link.");
+
+    content.add(searchBar, restrictedSearchResultsGrid, infoNote);
+    section.setContent(content);
+    return section;
+  }
+
+  /**
+   * Stories 06, 07, 08 — Viewing, removing, and syncing connected restricted datasets.
+   */
+  private Section connectedRestrictedDatasetsSection() {
+    var section = new Section.SectionBuilder().build();
+
+    syncAllRestrictedButton = new Button("Sync All", VaadinIcon.REFRESH.create());
+    syncAllRestrictedButton.addClickListener(e -> syncAllRestricted());
+
+    var header = new SectionHeader(
+        new SectionTitle("Connected Restricted Datasets"),
+        new ActionBar(syncAllRestrictedButton),
+        new SectionNote("Datasets connected from InvenioRDM repositories with restricted access.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    var content = new SectionContent();
+    connectedRestrictedGrid = createConnectedDatasetsGrid();
+    refreshConnectedRestrictedGrid();
+    content.add(connectedRestrictedGrid);
+    section.setContent(content);
+    return section;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  GRID BUILDERS
+  // ═════════════════════════════════════════════════════════════════════
+
+  private Grid<SearchableDataset> createSearchResultsGrid() {
+    var grid = new Grid<SearchableDataset>();
+    grid.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_ROW_STRIPES);
+    grid.setSelectionMode(SelectionMode.MULTI);
+    grid.setWidthFull();
+    grid.setAllRowsVisible(true);
+
+    // Title + creators column
+    grid.addComponentColumn(dataset -> {
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-vertical", "gap-01");
+      var titleSpan = new Span(dataset.title());
+      titleSpan.addClassName("normal-body-text");
+      titleSpan.getStyle().set("font-weight", "500");
+      var creatorsSpan = new Span(dataset.creators());
+      creatorsSpan.addClassName("extra-small-body-text");
+      creatorsSpan.addClassName("color-secondary");
+      wrapper.add(titleSpan, creatorsSpan);
+      return wrapper;
+    }).setHeader("Title / Creators").setAutoWidth(true).setFlexGrow(2).setKey("dataset");
+
+    // DOI column
+    grid.addComponentColumn(dataset -> {
+      var anchor = new Anchor("https://doi.org/" + dataset.doi(), dataset.doi());
+      anchor.setTarget(AnchorTarget.BLANK);
+      anchor.addClassName("extra-small-body-text");
+      return anchor;
+    }).setHeader("DOI").setAutoWidth(true).setFlexGrow(1).setKey("doi");
+
+    // Date column
+    grid.addColumn(ds -> ds.publicationDate())
+        .setHeader("Published").setAutoWidth(true).setKey("date");
+
+    // Repository column
+    grid.addComponentColumn(dataset -> {
+      var tag = new Tag(dataset.repository());
+      if ("Zenodo".equals(dataset.repository())) {
+        tag.setTagColor(TagColor.PRIMARY);
+      } else {
+        tag.setTagColor(TagColor.TEAL);
+      }
+      return tag;
+    }).setHeader("Repository").setAutoWidth(true).setKey("repository");
+
+    // Access type column
+    grid.addComponentColumn(dataset -> {
+      var tag = new Tag(dataset.accessRight());
+      if ("Open".equals(dataset.accessRight())) {
+        tag.setTagColor(TagColor.SUCCESS);
+      } else {
+        tag.setTagColor(TagColor.WARNING);
+      }
+      return tag;
+    }).setHeader("Access").setAutoWidth(true).setKey("access");
+
+    return grid;
+  }
+
+  private Grid<ConnectedDataset> createConnectedDatasetsGrid() {
+    var grid = new Grid<ConnectedDataset>();
+    grid.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_ROW_STRIPES);
+    grid.setSelectionMode(SelectionMode.NONE);
+    grid.setWidthFull();
+
+    // Dataset column: title + DOI + update banner
+    grid.addComponentColumn(dataset -> {
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-vertical", "gap-01");
+      var titleSpan = new Span(dataset.title());
+      titleSpan.addClassName("normal-body-text");
+      titleSpan.getStyle().set("font-weight", "500");
+      var doiSpan = new Span(dataset.doi());
+      doiSpan.addClassName("extra-small-body-text");
+      doiSpan.addClassName("color-secondary");
+      wrapper.add(titleSpan, doiSpan);
+      if (dataset.updateAvailable()) {
+        var updateTag = new Tag("Update available → v" + dataset.latestVersion());
+        updateTag.setTagColor(TagColor.WARNING);
+        wrapper.add(updateTag);
+      }
+      return wrapper;
+    }).setHeader("Dataset").setFlexGrow(2).setKey("dataset");
+
+    // Connected By: user + date stacked
+    grid.addComponentColumn(dataset -> {
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-vertical", "gap-01");
+      var userSpan = new Span(dataset.connectedBy());
+      userSpan.addClassName("normal-body-text");
+      var dateSpan = new Span(
+          dataset.connectedOn().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
+      dateSpan.addClassName("extra-small-body-text");
+      dateSpan.addClassName("color-secondary");
+      wrapper.add(userSpan, dateSpan);
+      return wrapper;
+    }).setHeader("Connected By").setAutoWidth(true).setKey("connectedBy");
+
+    // Repository column
+    grid.addComponentColumn(dataset -> {
+      var tag = new Tag(dataset.repository());
+      if ("Zenodo".equals(dataset.repository())) {
+        tag.setTagColor(TagColor.PRIMARY);
+      } else {
+        tag.setTagColor(TagColor.TEAL);
+      }
+      return tag;
+    }).setHeader("Repository").setAutoWidth(true).setKey("repository");
+
+    // Access Link column
+    grid.addComponentColumn(dataset -> {
+      var link = new Anchor(
+          "https://doi.org/" + dataset.doi() + "?access=project-token",
+          "Open");
+      link.setTarget(AnchorTarget.BLANK);
+      link.addClassName("extra-small-body-text");
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-vertical");
+      wrapper.add(link);
+      var note = new Span("No account required");
+      note.addClassName("extra-small-body-text");
+      note.addClassName("color-secondary");
+      wrapper.add(note);
+      return wrapper;
+    }).setHeader("Access Link").setAutoWidth(true).setKey("accessLink");
+
+    // Actions column: Sync + Remove
+    grid.addComponentColumn(dataset -> {
+      var syncButton = new Button(VaadinIcon.REFRESH.create());
+      syncButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+      syncButton.setTooltipText("Sync with " + dataset.repository());
+      syncButton.getStyle().set("padding", "var(--lumo-space-s)");
+      syncButton.addClickListener(e -> syncSingleDataset(dataset));
+
+      var removeButton = new Button(VaadinIcon.TRASH.create());
+      removeButton.addThemeVariants(ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_TERTIARY);
+      removeButton.setTooltipText("Remove connection");
+      removeButton.getStyle().set("padding", "var(--lumo-space-s)");
+      removeButton.addClickListener(e -> confirmRemoveDataset(dataset));
+
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-horizontal", "gap-01");
+      wrapper.add(syncButton, removeButton);
+      return wrapper;
+    }).setHeader("Actions").setAutoWidth(true).setKey("actions");
+
+    return grid;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  SEARCH LOGIC (mock)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void performPublicSearch() {
+    populatePublicSearchResults(publicSearchField.getValue());
+  }
+
+  private void populatePublicSearchResults(String term) {
+    publicSearchResultsGrid.setItems(filterDatasets(MOCK_PUBLIC_DATASETS, term));
+  }
+
+  private void performRestrictedSearch() {
+    populateRestrictedSearchResults(restrictedSearchField.getValue());
+  }
+
+  private void populateRestrictedSearchResults(String term) {
+    restrictedSearchResultsGrid.setItems(filterDatasets(MOCK_RESTRICTED_DATASETS, term));
+  }
+
+  private List<SearchableDataset> filterDatasets(List<SearchableDataset> datasets, String term) {
+    if (term == null || term.isBlank()) {
+      return new ArrayList<>(datasets);
+    }
+    String lower = term.toLowerCase();
+    return datasets.stream()
+        .filter(d -> d.title().toLowerCase().contains(lower)
+            || d.doi().toLowerCase().contains(lower)
+            || d.creators().toLowerCase().contains(lower)
+            || d.description().toLowerCase().contains(lower))
+        .toList();
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  CONNECT / REMOVE / SYNC (mock)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void connectSelectedPublicDatasets() {
+    var selected = publicSearchResultsGrid.getSelectedItems();
+    if (selected.isEmpty()) {
+      return;
+    }
+    for (SearchableDataset ds : selected) {
+      connectedPublicDatasets.add(
+          new ConnectedDataset(ds.id(), ds.title(), ds.doi(),
+              "Current User (demo)", LocalDate.now(), ds.repository(),
+              ds.accessRight(), "1.0", false));
+    }
+    refreshConnectedPublicGrid();
+    publicSearchResultsGrid.deselectAll();
+    connectPublicButton.setEnabled(false);
+    connectPublicButton.setText("Connect");
+    showSuccessNotification(selected.size()
+        + " public dataset(s) connected to this project.");
+  }
+
+  private void connectSelectedRestrictedDatasets() {
+    var selected = restrictedSearchResultsGrid.getSelectedItems();
+    if (selected.isEmpty()) {
+      return;
+    }
+    for (SearchableDataset ds : selected) {
+      connectedRestrictedDatasets.add(
+          new ConnectedDataset(ds.id(), ds.title(), ds.doi(),
+              "Current User (demo)", LocalDate.now(), ds.repository(),
+              ds.accessRight(), "1.0", false));
+    }
+    refreshConnectedRestrictedGrid();
+    restrictedSearchResultsGrid.deselectAll();
+    connectRestrictedButton.setEnabled(false);
+    connectRestrictedButton.setText("Connect");
+    showSuccessNotification(selected.size()
+        + " restricted dataset(s) connected to this project.");
+  }
+
+  private void confirmRemoveDataset(ConnectedDataset dataset) {
+    var dialog = new Dialog();
+    dialog.setCloseOnOutsideClick(false);
+    dialog.setCloseOnEsc(false);
+
+    var headerDiv = new Div();
+    headerDiv.addClassNames("flex-horizontal", "gap-03", "padding-horizontal-07",
+        "padding-vertical-04");
+    var icon = VaadinIcon.EXCLAMATION_CIRCLE.create();
+    icon.addClassName("icon-color-warning");
+    var title = new Span("Remove Dataset Connection");
+    title.addClassName("heading-3");
+    headerDiv.add(icon, title);
+
+    var body = new Div();
+    body.addClassNames("flex-vertical", "gap-03", "padding-horizontal-07", "padding-vertical-04");
+    body.add(new Span("Are you sure you want to remove the connection to:"));
+    var dsLabel = new Span(dataset.title());
+    dsLabel.getStyle().set("font-weight", "600");
+    body.add(dsLabel);
+    body.add(new Span("This will not delete the dataset on " + dataset.repository()
+        + " — it only removes the link from this project."));
+
+    var footer = new Div();
+    footer.addClassNames("flex-horizontal", "gap-03", "padding-horizontal-07",
+        "padding-vertical-04");
+    footer.getStyle().set("justify-content", "flex-end");
+    var cancelBtn = new Button("Cancel", e -> dialog.close());
+    cancelBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    var removeBtn = new Button("Remove", VaadinIcon.TRASH.create(), e -> {
+      removeDataset(dataset);
+      dialog.close();
+    });
+    removeBtn.addThemeVariants(ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_PRIMARY);
+    footer.add(cancelBtn, removeBtn);
+
+    dialog.add(headerDiv, body);
+    dialog.getFooter().add(footer);
+    dialog.open();
+  }
+
+  private void removeDataset(ConnectedDataset dataset) {
+    connectedPublicDatasets.removeIf(d -> d.id().equals(dataset.id()));
+    connectedRestrictedDatasets.removeIf(d -> d.id().equals(dataset.id()));
+    refreshConnectedPublicGrid();
+    refreshConnectedRestrictedGrid();
+    showSuccessNotification("Dataset connection removed: " + dataset.title());
+  }
+
+  private void syncSingleDataset(ConnectedDataset dataset) {
+    showInfoNotification("Syncing " + dataset.title() + " with " + dataset.repository() + "…");
+    var ui = UI.getCurrent();
+    new Thread(() -> {
+      try {
+        Thread.sleep(1500);
+      } catch (InterruptedException ex) {
+        Thread.currentThread().interrupt();
+      }
+      ui.access(() -> {
+        simulateUpdateAvailable(dataset);
+        showInfoNotification("Sync complete for '" + dataset.title() + "'. Version is up to date.");
+      });
+    }).start();
+  }
+
+  private void simulateUpdateAvailable(ConnectedDataset dataset) {
+    for (int i = 0; i < connectedPublicDatasets.size(); i++) {
+      if (connectedPublicDatasets.get(i).id().equals(dataset.id())) {
+        var old = connectedPublicDatasets.get(i);
+        connectedPublicDatasets.set(i,
+            new ConnectedDataset(old.id(), old.title(), old.doi(), old.connectedBy(),
+                old.connectedOn(), old.repository(), old.accessRight(), "1.1", true));
+        break;
+      }
+    }
+    for (int i = 0; i < connectedRestrictedDatasets.size(); i++) {
+      if (connectedRestrictedDatasets.get(i).id().equals(dataset.id())) {
+        var old = connectedRestrictedDatasets.get(i);
+        connectedRestrictedDatasets.set(i,
+            new ConnectedDataset(old.id(), old.title(), old.doi(), old.connectedBy(),
+                old.connectedOn(), old.repository(), old.accessRight(), "1.1", true));
+        break;
+      }
+    }
+    refreshConnectedPublicGrid();
+    refreshConnectedRestrictedGrid();
+  }
+
+  private void syncAllPublic() {
+    if (connectedPublicDatasets.isEmpty()) {
+      showInfoNotification("No public datasets connected to sync.");
+      return;
+    }
+    showInfoNotification("Syncing all " + connectedPublicDatasets.size()
+        + " public datasets…");
+    showSuccessNotification("All " + connectedPublicDatasets.size()
+        + " public datasets are up to date.");
+  }
+
+  private void syncAllRestricted() {
+    if (connectedRestrictedDatasets.isEmpty()) {
+      showInfoNotification("No restricted datasets connected to sync.");
+      return;
+    }
+    showInfoNotification("Syncing all " + connectedRestrictedDatasets.size()
+        + " restricted datasets…");
+    showSuccessNotification("All " + connectedRestrictedDatasets.size()
+        + " restricted datasets are up to date.");
+  }
+
+  private void refreshConnectedPublicGrid() {
+    connectedPublicGrid.setItems(new ArrayList<>(connectedPublicDatasets));
+  }
+
+  private void refreshConnectedRestrictedGrid() {
+    connectedRestrictedGrid.setItems(new ArrayList<>(connectedRestrictedDatasets));
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  NOTIFICATION HELPERS
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void showSuccessNotification(String message) {
+    var notification = new Notification(message, 3000);
+    notification.addClassName("success-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+
+  private void showInfoNotification(String message) {
+    var notification = new Notification(message, 3000);
+    notification.addClassName("info-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+
+  private void showErrorNotification(String message) {
+    var notification = new Notification(message, 5000);
+    notification.addClassName("error-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  SEED DATA
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void seedConnectedDatasets() {
+    connectedPublicDatasets.add(
+        new ConnectedDataset("zen-seed-01",
+            "Benchmark dataset for reproducibility assessment",
+            "10.5281/zenodo.9999001", "Alice Schmidt",
+            LocalDate.of(2025, 1, 15), "Zenodo", "Open", "2.0", false));
+    connectedPublicDatasets.add(
+        new ConnectedDataset("zen-seed-02",
+            "Metabolomics reference spectra library",
+            "10.5281/zenodo.9999002", "Bob Fernandez",
+            LocalDate.of(2025, 3, 22), "Zenodo", "Open", "1.2", true));
+    connectedRestrictedDatasets.add(
+        new ConnectedDataset("fdat-seed-01",
+            "Multi-center clinical proteomics study (Controlled)",
+            "10.5281/fdat.7777001", "Carol Yamamoto",
+            LocalDate.of(2025, 5, 8), "FDAT", "Restricted", "1.0", false));
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemoV2.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemoV2.java
new file mode 100644
index 0000000000..99d8cd1996
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/AssociatedDatasetsDemoV2.java
@@ -0,0 +1,1745 @@
+package life.qbic.datamanager.views.demo;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.Grid.SelectionMode;
+import com.vaadin.flow.component.grid.GridVariant;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.AnchorTarget;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.radiobutton.RadioButtonGroup;
+import com.vaadin.flow.component.textfield.PasswordField;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.data.renderer.ComponentRenderer;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.annotation.UIScope;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import life.qbic.datamanager.views.general.InfoBox;
+import life.qbic.datamanager.views.general.Tag;
+import life.qbic.datamanager.views.general.Tag.TagColor;
+import life.qbic.datamanager.views.general.section.ActionBar;
+import life.qbic.datamanager.views.general.section.Section;
+import life.qbic.datamanager.views.general.section.SectionContent;
+import life.qbic.datamanager.views.general.section.SectionHeader;
+import life.qbic.datamanager.views.general.section.SectionNote;
+import life.qbic.datamanager.views.general.section.SectionTitle;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * <b>Associated Datasets Demo V2 — Sidebar Prototype</b>
+ *
+ * <p>Pure UI prototype for the "Connect datasets with research projects" feature.
+ * This second iteration addresses feedback from the first prototype:</p>
+ *
+ * <ul>
+ *   <li><b>No modal for connecting datasets</b> — uses a right-side sliding sidebar panel
+ *       that works within the existing AppLayout drawer/content structure.</li>
+ *   <li><b>Unified resource view</b> — one grid shows all connected resources regardless
+ *       of access level. A segmented filter lets the user show All / Public / Restricted.</li>
+ *   <li><b>Access level inline</b> — each resource row displays its access status
+ *       (public vs. restricted) as an inline badge, eliminating duplicate sections.</li>
+ *   <li><b>Stakeholder-aligned properties</b> — high-prio properties (Title, PID, Access
+ *       Status, Version, Access Link, Publication Date) are shown in the main grid;
+ *       medium-prio properties (Connected By, Resource Provider, Creator, Resource Type,
+ *       Community, Linked Experiment) are shown in an expandable detail row.</li>
+ * </ul>
+ *
+ * <p>Covers user stories 01–08 from the feature specification.</p>
+ *
+ * <p><b>Stories 14 & 15 (credential management):</b> A dedicated section below the
+ * connected resources grid allows users to configure InvenioRDM instances by adding or
+ * removing Personal Access Tokens. Configuring a token unlocks access to restricted
+ * datasets on that instance; removing it revokes that access. Token validation is
+ * simulated in this prototype.</p>
+ *
+ * <p>This view is only available with the {@code development} profile.</p>
+ *
+ * @since 1.12.0
+ */
+@Profile("development")
+@Route("test-view/associated-datasets-v2")
+@UIScope
+@AnonymousAllowed
+@org.springframework.stereotype.Component
+public class AssociatedDatasetsDemoV2 extends Div {
+
+  private static final List<String> INVENIO_INSTANCES = List.of(
+      "Zenodo (zenodo.org)",
+      "FDAT (fdat.uni-tuebingen.de)"
+  );
+
+  // ── Domain records ────────────────────────────────────────────────────
+
+  enum AccessLevel { PUBLIC, RESTRICTED }
+
+  /** A connected dataset resource displayed in the main grid. */
+  record ConnectedResource(
+      // High-prio (from stakeholder doc)
+      String title,
+      String pid,
+      AccessLevel accessLevel,       // Covers "Record: public/restricted" + "Files: restricted"
+      String version,
+      String accessLink,
+      LocalDate publicationDate,
+      // Medium-prio (from stakeholder doc)
+      String connectedBy,
+      String resourceProvider,
+      String creator,
+      String resourceType,
+      String community,
+      String linkedExperiment,
+      // Internal
+      String id,
+      LocalDate connectedOn,
+      boolean updateAvailable
+  ) {}
+
+  /** A dataset found via search, available to be connected. */
+  record SearchableResource(
+      String id,
+      String title,
+      String pid,
+      AccessLevel accessLevel,
+      String version,
+      String accessLink,
+      LocalDate publicationDate,
+      String resourceProvider,
+      String creator,
+      String resourceType,
+      String community,
+      String description
+  ) {}
+
+  // ── Mock data ─────────────────────────────────────────────────────────
+
+  private static final List<SearchableResource> MOCK_SEARCH_RESULTS = List.of(
+      new SearchableResource("zen-001",
+          "High-resolution cryo-EM structure of the human 26S proteasome",
+          "10.5281/zenodo.1234567", AccessLevel.PUBLIC,
+          "v1", "https://zenodo.org/records/1234567",
+          LocalDate.of(2024, 11, 15), "Zenodo", "M. Bauer, S. Fernandez",
+          "Dataset", null,
+          "Cryo-electron microscopy structure at 2.8 Å resolution."),
+      new SearchableResource("zen-002",
+          "Proteomic profiling of T-cell receptor signaling in Jurkat cells",
+          "10.5281/zenodo.1234568", AccessLevel.PUBLIC,
+          "v1", "https://zenodo.org/records/1234568",
+          LocalDate.of(2024, 10, 3), "Zenodo", "A. Müller, K. Tanaka",
+          "Dataset", null,
+          "Mass spectrometry datasets for TCR signaling pathway characterization."),
+      new SearchableResource("zen-003",
+          "Multi-omics integration pipeline benchmark dataset",
+          "10.5281/zenodo.1234569", AccessLevel.PUBLIC,
+          "v1", "https://zenodo.org/records/1234569",
+          LocalDate.of(2025, 1, 20), "Zenodo", "QBiC Consortium",
+          "Dataset", "QBiC",
+          "Reference dataset for benchmarking multi-omics integration methods."),
+      new SearchableResource("fdat-001",
+          "Quantitative phosphoproteomics of DNA damage response",
+          "10.5281/fdat.9876543", AccessLevel.PUBLIC,
+          "v1", "https://fdat.uni-tuebingen.de/records/9876543",
+          LocalDate.of(2025, 3, 5), "FDAT", "C. Klein, D. Patel",
+          "Dataset", "CMFI",
+          "TMT-labeled phosphoproteomics data from HEK293 cells."),
+      new SearchableResource("zen-r01",
+          "Clinical metabolomics data — Cohort A (embargo until 2026-12)",
+          "10.5281/zenodo.2345601", AccessLevel.RESTRICTED,
+          "v1", "https://zenodo.org/records/2345601",
+          LocalDate.of(2025, 6, 1), "Zenodo", "R. Schmidt, M. Bauer",
+          "Dataset", null,
+          "Clinical metabolomics profiles. Access restricted pending ethics review."),
+      new SearchableResource("fdat-r01",
+          "Oncology panel sequencing — Phase II trial (controlled access)",
+          "10.5281/fdat.8765401", AccessLevel.RESTRICTED,
+          "v1", "https://fdat.uni-tuebingen.de/records/8765401",
+          LocalDate.of(2025, 4, 1), "FDAT", "QBiC Clinical Collaboration",
+          "Dataset", "SFB209",
+          "Targeted sequencing data from Phase II clinical trial."),
+      new SearchableResource("zen-004",
+          "Supplementary figures for 'Metabolic rewiring in tumor microenvironment'",
+          "10.5281/zenodo.1234570", AccessLevel.PUBLIC,
+          "v1", "https://zenodo.org/records/1234570",
+          LocalDate.of(2025, 2, 10), "Zenodo", "J. Park, R. Schmidt",
+          "Publication", null,
+          "Additional figures and source data accompanying the publication."),
+      new SearchableResource("zen-r02",
+          "Pre-publication proteomics: Novel biomarker candidates",
+          "10.5281/zenodo.2345602", AccessLevel.RESTRICTED,
+          "v1", "https://zenodo.org/records/2345602",
+          LocalDate.of(2025, 5, 20), "Zenodo", "K. Tanaka, A. Petrova",
+          "Dataset", null,
+          "Discovery-phase proteomics data. Under peer review.")
+  );
+
+  // ── InvenioRDM instance definitions & credential state ────────────────
+
+  /**
+   * An InvenioRDM instance available for credential configuration.
+   * Users can store a Personal Access Token for each instance to access
+   * restricted datasets.
+   */
+  record InvenioRDMInstance(
+      String id,
+      String displayName,
+      String shortName,
+      String baseUrl,
+      String description,
+      String tokenSetupUrl
+  ) {}
+
+  /**
+   * A stored credential (Personal Access Token) for an InvenioRDM instance.
+   * The actual token value is never held in memory as plaintext in the UI;
+   * only a masked representation is displayed.
+   */
+  record RepositoryCredential(
+      String instanceId,
+      String maskedToken,
+      LocalDate addedOn
+  ) {}
+
+  /**
+   * InvenioRDM instances that users can configure with credentials.
+   */
+  private static final List<InvenioRDMInstance> AVAILABLE_INSTANCES = List.of(
+      new InvenioRDMInstance(
+          "zenodo",
+          "Zenodo (zenodo.org)",
+          "Zenodo",
+          "https://zenodo.org",
+          "Open-access research data repository operated by CERN. Widely accepted "
+              + "by journals and funders; any researcher can deposit datasets and "
+              + "receive a DOI.",
+          "https://zenodo.org/account/settings/applications/tokens/new/"
+      ),
+      new InvenioRDMInstance(
+          "fdat",
+          "FDAT (fdat.uni-tuebingen.de)",
+          "FDAT",
+          "https://fdat.uni-tuebingen.de",
+          "InvenioRDM instance operated by the University of Tübingen. Provides "
+              + "FAIR-compliant publishing for institutional and collaborative "
+              + "research datasets.",
+          "https://fdat.uni-tuebingen.de/account/settings/applications/tokens/new/"
+      )
+  );
+
+  // ── Mutable state ─────────────────────────────────────────────────────
+
+  private final List<ConnectedResource> connectedResources = new ArrayList<>();
+
+  /**
+   * Maps InvenioRDM instance IDs (e.g. "zenodo") to their stored credentials.
+   * An entry present in this map means the instance is fully configured and
+   * the user can search restricted datasets on it.
+   */
+  private final Map<String, RepositoryCredential> configuredCredentials = new HashMap<>();
+
+  /** Content container for the credentials section — rebuildable when state changes. */
+  private Div credentialsContentContainer;
+
+  private Grid<ConnectedResource> resourcesGrid;
+  private final TextField searchField = new TextField();
+  private final ComboBox<String> instanceSelector = new ComboBox<>();
+  private RadioButtonGroup<String> accessFilter;
+  private Button connectButton;
+  private Grid<SearchableResource> searchResultsGrid;
+
+  // Sidebar panel elements
+  private Div sidebarOverlay;
+  private Div sidebarPanel;
+  private boolean sidebarOpen = false;
+  private Span selectionCountLabel;
+  private Button sidebarConnectBtn;
+
+  public AssociatedDatasetsDemoV2() {
+    addClassNames("padding-horizontal-07", "padding-vertical-04");
+    addClassName("flex-vertical");
+
+    seedConnectedResources();
+
+    // ── Page heading ────────────────────────────────────────────────
+    var title = new Div("Connected Resources — UI Prototype V2");
+    title.addClassName("heading-1");
+    add(title);
+
+    var subtitle = new Div(
+        "Sidebar approach: connecting datasets uses a sliding panel instead of a modal. "
+            + "All resources are shown in a unified view with access level as an inline indicator.");
+    subtitle.addClassName("normal-body-text");
+    subtitle.addClassName("color-secondary");
+    add(subtitle);
+    add(new Div()); // spacer
+
+    // ── Seed credentials BEFORE building the section so the cards
+    //     render in their correct configured / unconfigured state.
+    //     Zenodo is pre-configured; FDAT is intentionally left empty
+    //     so the demo shows both card states side-by-side.
+    seedCredentials();
+
+    // ── Main content: Connected Resources section ──────────────────
+    add(buildConnectedResourcesSection());
+
+    // ── Repository credentials section (stories 14 & 15) ─────────
+    add(buildRepositoryCredentialsSection());
+
+    // ── Sidebar overlay + panel (initially hidden) ────────────────
+    buildConnectSidebar();
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  CONNECTED RESOURCES — Main Section  (High-Prio properties)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Section buildConnectedResourcesSection() {
+    var section = new Section.SectionBuilder().build();
+
+    // ── ActionBar: Connect button + Sync All ────────────────────────
+    connectButton = new Button("Connect Datasets", VaadinIcon.PLUS_CIRCLE.create());
+    connectButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    connectButton.addClickListener(e -> openConnectSidebar());
+
+    var syncAllButton = new Button("Sync All", VaadinIcon.REFRESH.create());
+    syncAllButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    syncAllButton.addClickListener(e -> syncAllResources());
+
+    var actionBar = new ActionBar();
+    actionBar.addButton(connectButton);
+    actionBar.addButton(syncAllButton);
+
+    var header = new SectionHeader(
+        new SectionTitle("Connected Resources"),
+        actionBar,
+        new SectionNote("Datasets connected from InvenioRDM repositories. "
+            + "High-priority properties are shown below. Expand a row for details.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    // ── Filter bar: Access Level toggle ─────────────────────────────
+    var content = new SectionContent();
+
+    var filterBar = new Div();
+    filterBar.addClassNames("flex-horizontal", "gap-03", "items-center");
+    filterBar.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+
+    var filterLabel = new Span("Show:");
+    filterLabel.addClassName("normal-body-text");
+    filterLabel.getStyle().set("font-weight", "500");
+
+    accessFilter = new RadioButtonGroup<>();
+    accessFilter.setItems("All", "Public", "Restricted");
+    accessFilter.setValue("All");
+    accessFilter.addThemeVariants();
+    accessFilter.addValueChangeListener(e -> refreshResourcesGrid());
+
+    // Resource count badge
+    var countBadge = new Span();
+    countBadge.addClassName("extra-small-body-text");
+    countBadge.addClassName("color-secondary");
+    countBadge.getStyle().set("margin-left", "auto");
+    updateResourceCount(countBadge);
+
+    filterBar.add(filterLabel, accessFilter, countBadge);
+    content.add(filterBar);
+
+    // ── Unified resources grid ──────────────────────────────────────
+    resourcesGrid = new Grid<>();
+    resourcesGrid.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_ROW_STRIPES);
+    resourcesGrid.setSelectionMode(SelectionMode.NONE);
+    resourcesGrid.setWidthFull();
+
+    // Expandable detail row for medium-prio properties
+    resourcesGrid.setItemDetailsRenderer(
+        new ComponentRenderer<>(resource -> {
+          var detailPanel = new Div();
+          detailPanel.addClassNames("flex-vertical", "gap-03");
+          detailPanel.getStyle().set("padding", "var(--lumo-space-s) var(--lumo-space-m)");
+          detailPanel.getStyle().set("background-color", "var(--lumo-contrast-5pct)");
+          detailPanel.getStyle().set("border-radius", "var(--lumo-border-radius-m)");
+
+          var detailTitle = new Span("Additional Information");
+          detailTitle.getStyle().set("font-weight", "600");
+          detailTitle.addClassName("normal-body-text");
+          detailPanel.add(detailTitle);
+
+          var detailsGrid = new Div();
+          detailsGrid.addClassNames("flex-vertical", "gap-02");
+
+          addDetailRow(detailsGrid, "Connected By", resource.connectedBy());
+          addDetailRow(detailsGrid, "Resource Provider", resource.resourceProvider());
+          addDetailRow(detailsGrid, "Creator", resource.creator());
+          addDetailRow(detailsGrid, "Resource Type", resource.resourceType());
+          addDetailRow(detailsGrid, "Community",
+              resource.community() != null ? resource.community() : "—");
+          addDetailRow(detailsGrid, "Linked Experiment",
+              resource.linkedExperiment() != null ? resource.linkedExperiment() : "—");
+
+          detailPanel.add(detailsGrid);
+          return detailPanel;
+        }));
+
+    // ── Columns (High-Prio from stakeholder doc) ────────────────────
+
+    // Title column (expandable for details)
+    resourcesGrid.addComponentColumn(resource -> {
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-vertical", "gap-01");
+      var titleSpan = new Span(resource.title());
+      titleSpan.addClassName("normal-body-text");
+      titleSpan.getStyle().set("font-weight", "500");
+      wrapper.add(titleSpan);
+      // Update hint inline: a subtle clickable banner that explains the situation
+      // and directs the user to the Sync button.
+      if (resource.updateAvailable()) {
+        var updateHint = new Div();
+        updateHint.getStyle().set("display", "inline-flex");
+        updateHint.getStyle().set("align-items", "center");
+        updateHint.getStyle().set("gap", "var(--lumo-space-xs)");
+        updateHint.getStyle().set("padding",
+            "var(--lumo-space-xxs) var(--lumo-space-s)");
+        updateHint.getStyle().set("border-radius",
+            "var(--lumo-border-radius-m)");
+        updateHint.getStyle().set("background-color",
+            "var(--lumo-warning-color-10pct)");
+        updateHint.getStyle().set("border",
+            "1px solid var(--lumo-warning-color)");
+        updateHint.getStyle().set("cursor", "pointer");
+
+        Icon exclamationIcon = VaadinIcon.EXCLAMATION_CIRCLE_O.create();
+        exclamationIcon.getStyle().set("color", "var(--lumo-warning-color)");
+        exclamationIcon.getStyle().set("font-size", "var(--lumo-icon-size-s)");
+
+        var hintText = new Span("New version available — sync to update");
+        hintText.addClassName("extra-small-body-text");
+        hintText.getStyle().set("color", "var(--lumo-warning-color)");
+        hintText.getStyle().set("font-weight", "500");
+
+        updateHint.add(exclamationIcon, hintText);
+        updateHint.addClickListener(e -> syncSingleResource(resource));
+        wrapper.add(updateHint);
+      }
+      return wrapper;
+    }).setHeader("Title").setFlexGrow(3).setKey("title");
+
+    // PID column (DOI)
+    resourcesGrid.addComponentColumn(resource -> {
+      var anchor = new Anchor(
+          resource.pid().startsWith("http") ? resource.pid()
+              : "https://doi.org/" + resource.pid(),
+          resource.pid());
+      anchor.setTarget(AnchorTarget.BLANK);
+      anchor.addClassName("extra-small-body-text");
+      return anchor;
+    }).setHeader("PID / DOI").setAutoWidth(true).setFlexGrow(1).setKey("pid");
+
+    // Access Status column — inline badge showing record + file access
+    resourcesGrid.addComponentColumn(resource -> {
+      return buildAccessStatusBadge(resource);
+    }).setHeader("Access Status").setAutoWidth(true).setFlexGrow(0).setKey("access");
+
+    // Version column
+    resourcesGrid.addColumn(ConnectedResource::version)
+        .setHeader("Version").setAutoWidth(true).setKey("version");
+
+    // Access Link column
+    resourcesGrid.addComponentColumn(resource -> {
+      if (resource.accessLink() != null && !resource.accessLink().isBlank()) {
+        var link = new Anchor(resource.accessLink(), "Open ↗");
+        link.setTarget(AnchorTarget.BLANK);
+        link.addClassName("extra-small-body-text");
+        return link;
+      }
+      return new Span("—");
+    }).setHeader("Access Link").setAutoWidth(true).setKey("accessLink");
+
+    // Publication Date column
+    resourcesGrid.addComponentColumn(resource -> {
+      return new Span(resource.publicationDate().format(
+          DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH)));
+    }).setHeader("Published").setAutoWidth(true).setKey("publicationDate");
+
+    // Actions column: Sync + Remove
+    resourcesGrid.addComponentColumn(resource -> {
+      var syncBtn = new Button(VaadinIcon.REFRESH.create());
+      if (resource.updateAvailable()) {
+        // Visually indicate that a newer version is available:
+        // icon gets warning color and tooltip explains what to do.
+        syncBtn.getStyle().set("color", "var(--lumo-warning-color)");
+        syncBtn.setTooltipText(
+            "New version available on " + resource.resourceProvider()
+                + ". Click to update this connection.");
+      } else {
+        syncBtn.setTooltipText("Check " + resource.resourceProvider()
+            + " for updates.");
+      }
+      syncBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+      syncBtn.getStyle().set("padding", "var(--lumo-space-s)");
+      syncBtn.addClickListener(e -> syncSingleResource(resource));
+
+      var removeBtn = new Button(VaadinIcon.TRASH.create());
+      removeBtn.addThemeVariants(ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_TERTIARY);
+      removeBtn.setTooltipText("Remove connection");
+      removeBtn.getStyle().set("padding", "var(--lumo-space-s)");
+      removeBtn.addClickListener(e -> confirmRemoveResource(resource));
+
+      var wrapper = new Div();
+      wrapper.addClassNames("flex-horizontal", "gap-01");
+      wrapper.add(syncBtn, removeBtn);
+      return wrapper;
+    }).setHeader("Actions").setAutoWidth(true).setKey("actions");
+
+    refreshResourcesGrid();
+    content.add(resourcesGrid);
+    section.setContent(content);
+    return section;
+  }
+
+  /**
+   * Builds a compact access status badge. Uses the stakeholder's distinction:
+   * a record can have public metadata while the files themselves are restricted.
+   * Format: "Record: public | Files: restricted"
+   */
+  private Component buildAccessStatusBadge(ConnectedResource resource) {
+    var wrapper = new Div();
+    wrapper.addClassNames("flex-vertical", "gap-01");
+
+    if (resource.accessLevel() == AccessLevel.PUBLIC) {
+      var badge = new Tag("Public");
+      badge.setTagColor(TagColor.SUCCESS);
+      wrapper.add(badge);
+    } else {
+      var badge = new Tag("Restricted");
+      badge.setTagColor(TagColor.WARNING);
+      wrapper.add(badge);
+      var note = new Span("Record: public | Files: restricted");
+      note.addClassName("extra-small-body-text");
+      note.addClassName("color-secondary");
+      wrapper.add(note);
+    }
+    return wrapper;
+  }
+
+  private void addDetailRow(Div container, String label, String value) {
+    var row = new Div();
+    row.addClassNames("flex-horizontal", "gap-02");
+    row.getStyle().set("align-items", "baseline");
+    var labelSpan = new Span(label + ":");
+    labelSpan.addClassName("extra-small-body-text");
+    labelSpan.getStyle().set("font-weight", "600");
+    labelSpan.getStyle().set("min-width", "140px");
+    labelSpan.addClassName("color-secondary");
+    var valueSpan = new Span(value);
+    valueSpan.addClassName("normal-body-text");
+    row.add(labelSpan, valueSpan);
+    container.add(row);
+  }
+
+  private void updateResourceCount(Span countBadge) {
+    int total = connectedResources.size();
+    long publicCount = connectedResources.stream()
+        .filter(r -> r.accessLevel() == AccessLevel.PUBLIC).count();
+    long restrictedCount = total - publicCount;
+    countBadge.setText(
+        "%d resource(s) — %d public, %d restricted".formatted(total, publicCount, restrictedCount));
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  CONNECT SIDEBAR (replaces modal — slides in from right)
+  // ══════════════════════════════════════════════════════════════════════
+
+  // ── Sidebar CSS class names managed via getStyle() ──────────────
+  private static final String SIDEBAR_OPEN_CSS =
+      "position:fixed;top:0;right:0;width:640px;height:100%;"
+          + "background-color:var(--lumo-base-color);"
+          + "box-shadow:-4px 0 24px rgba(0,0,0,0.12);"
+          + "z-index:1000;display:none;box-sizing:border-box;"
+          + "overflow-y:auto;";
+
+  private void buildConnectSidebar() {
+    // Overlay (semi-transparent backdrop)
+    sidebarOverlay = new Div();
+    sidebarOverlay.getStyle().set("position", "fixed");
+    sidebarOverlay.getStyle().set("top", "0");
+    sidebarOverlay.getStyle().set("left", "0");
+    sidebarOverlay.getStyle().set("width", "100%");
+    sidebarOverlay.getStyle().set("height", "100%");
+    sidebarOverlay.getStyle().set("background-color", "rgba(0,0,0,0.3)");
+    sidebarOverlay.getStyle().set("z-index", "999");
+    sidebarOverlay.getStyle().set("display", "none");
+    sidebarOverlay.addClickListener(e -> closeConnectSidebar());
+
+    // Sidebar panel — initially hidden (display:none), shown via openConnectSidebar()
+    sidebarPanel = new Div();
+    sidebarPanel.getStyle().set("position", "fixed");
+    sidebarPanel.getStyle().set("top", "0");
+    sidebarPanel.getStyle().set("right", "0");
+    sidebarPanel.getStyle().set("width", "640px");
+    sidebarPanel.getStyle().set("height", "100%");
+    sidebarPanel.getStyle().set("background-color", "var(--lumo-base-color)");
+    sidebarPanel.getStyle().set("box-shadow", "-4px 0 24px rgba(0,0,0,0.12)");
+    sidebarPanel.getStyle().set("z-index", "1000");
+    sidebarPanel.getStyle().set("box-sizing", "border-box");
+    sidebarPanel.getStyle().set("overflow-y", "auto");
+    sidebarPanel.getStyle().set("display", "none");
+
+    // ── Sidebar container (flex layout inside the panel) ─────────
+    var sidebarBody = new Div();
+    // Use explicit CSS instead of flex-vertical to avoid conflicts with fixed positioning
+    sidebarBody.getStyle().set("height", "100%");
+    sidebarBody.getStyle().set("box-sizing", "border-box");
+    sidebarBody.getStyle().set("display", "flex");
+    sidebarBody.getStyle().set("flex-direction", "column");
+
+    // ── Header ────────────────────────────────────────────────────
+    var sidebarHeader = new Div();
+    sidebarHeader.addClassNames("flex-horizontal", "items-center");
+    sidebarHeader.getStyle().set("padding", "var(--lumo-space-m) var(--lumo-space-l)");
+    sidebarHeader.getStyle().set("border-bottom", "1px solid var(--lumo-contrast-10pct)");
+    sidebarHeader.getStyle().set("flex-shrink", "0");
+    sidebarHeader.getStyle().set("gap", "var(--lumo-space-s)");
+
+    var sidebarTitle = new Span("Connect Datasets");
+    sidebarTitle.addClassName("heading-3");
+    sidebarTitle.getStyle().set("flex-grow", "1");
+
+    var closeButton = new Button(VaadinIcon.CLOSE_SMALL.create());
+    closeButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    closeButton.setTooltipText("Close");
+    closeButton.addClickListener(e -> closeConnectSidebar());
+
+    sidebarHeader.add(sidebarTitle, closeButton);
+    sidebarBody.add(sidebarHeader);
+
+    // ─ Content area (scrollable) ────────────────────────────────
+    var contentArea = new Div();
+    contentArea.getStyle().set("flex-grow", "1");
+    contentArea.getStyle().set("overflow-y", "auto");
+    contentArea.getStyle().set("padding", "var(--lumo-space-l)");
+
+    // Compact credential notice (dismissible, below search form)
+    contentArea.add(buildCompactCredentialNotice());
+
+    // Info note
+    var infoNote = new InfoBox()
+        .setInfoText(
+            "Search for datasets on InvenioRDM repositories and connect them to this project. "
+                + "Both public and restricted datasets can be found here — access level is shown inline.")
+        .setClosable(true);
+    infoNote.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    contentArea.add(infoNote);
+
+    // Search bar (compact horizontal layout)
+    var searchForm = new Div();
+    searchForm.getStyle().set("margin-bottom", "var(--lumo-space-l)");
+
+    instanceSelector.setItems(INVENIO_INSTANCES);
+    instanceSelector.setPlaceholder("Select repository…");
+    instanceSelector.setValue(INVENIO_INSTANCES.get(0));
+    instanceSelector.setWidth("180px");
+    instanceSelector.setLabel("Repository");
+    instanceSelector.getStyle().set("flex-shrink", "0");
+    // Tag the overlay so we can raise its z-index via CSS (the overlay is
+    // teleported to <body> at z-index 200, which sits below the sidebar)
+    instanceSelector.setOverlayClassName("connect-dataset-sidebar-overlay");
+    // Auto-update search results when repository selection changes
+    instanceSelector.addValueChangeListener(e -> performSidebarSearch());
+
+    searchField.setPlaceholder("Search by title, DOI, or creator…");
+    searchField.setClearButtonVisible(true);
+    // Key trick: min-width: 0 allows flex children with intrinsic width to shrink
+    searchField.getStyle().set("min-width", "0");
+    searchField.getStyle().set("flex-shrink", "1");
+    searchField.getStyle().set("flex-grow", "1");
+
+    var searchRow = new Div();
+    searchRow.getStyle().set("display", "flex");
+    searchRow.getStyle().set("gap", "var(--lumo-space-xs)");
+    searchRow.getStyle().set("align-items", "flex-end");
+    searchRow.getStyle().set("margin-bottom", "var(--lumo-space-s)");
+    searchRow.getStyle().set("min-width", "0");
+    searchRow.add(instanceSelector, searchField);
+
+    var searchButtonBar = new Div();
+    searchButtonBar.getStyle().set("display", "flex");
+    searchButtonBar.getStyle().set("gap", "var(--lumo-space-xs)");
+    searchButtonBar.getStyle().set("overflow", "hidden");
+
+    var searchButton = new Button("Search", VaadinIcon.SEARCH.create());
+    searchButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    searchButton.addClickListener(e -> performSidebarSearch());
+
+    // Trigger search when user presses Enter in the search field
+    searchField.addKeyDownListener(Key.ENTER, e -> performSidebarSearch());
+
+    var clearButton = new Button("Clear");
+    clearButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    clearButton.addClickListener(e -> {
+      searchField.clear();
+      performSidebarSearch();
+    });
+
+    searchButtonBar.add(searchButton, clearButton);
+    searchForm.add(searchRow, searchButtonBar);
+    contentArea.add(searchForm);
+
+    // ── Search results as card list (not a multi-column grid) ────
+    // Using a Vaadin Grid with a single column that renders a full card per item.
+    // This avoids column-width issues in narrow containers.
+    searchResultsGrid = new Grid<>();
+    searchResultsGrid.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_NO_ROW_BORDERS);
+    searchResultsGrid.setSelectionMode(SelectionMode.MULTI);
+    searchResultsGrid.setWidthFull();
+    searchResultsGrid.setAllRowsVisible(true);
+
+    searchResultsGrid.addComponentColumn(resource -> buildSearchResultCard(resource))
+        .setFlexGrow(1)
+        .setKey("card");
+
+    searchResultsGrid.addSelectionListener(event -> {
+      int count = event.getAllSelectedItems().size();
+      selectionCountLabel.setText(
+          count == 0 ? "" : count + " selected");
+      sidebarConnectBtn.setEnabled(count > 0);
+    });
+
+    contentArea.add(searchResultsGrid);
+    sidebarBody.add(contentArea);
+
+    // ── Footer: Connect button ────────────────────────────────────
+    var sidebarFooter = new Div();
+    sidebarFooter.addClassNames("flex-horizontal", "items-center");
+    sidebarFooter.getStyle().set("padding", "var(--lumo-space-m) var(--lumo-space-l)");
+    sidebarFooter.getStyle().set("border-top", "1px solid var(--lumo-contrast-10pct)");
+    sidebarFooter.getStyle().set("flex-shrink", "0");
+    sidebarFooter.getStyle().set("gap", "var(--lumo-space-s)");
+
+    selectionCountLabel = new Span("");
+    selectionCountLabel.addClassName("normal-body-text");
+    selectionCountLabel.addClassName("color-secondary");
+    selectionCountLabel.getStyle().set("flex-grow", "1");
+
+    sidebarConnectBtn = new Button("Connect Selected", VaadinIcon.PLUS_CIRCLE.create());
+    sidebarConnectBtn.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    sidebarConnectBtn.setEnabled(false);
+    sidebarConnectBtn.addClickListener(e -> connectSelectedFromSidebar());
+
+    sidebarFooter.add(selectionCountLabel, sidebarConnectBtn);
+    sidebarBody.add(sidebarFooter);
+
+    // Assemble sidebar
+    sidebarPanel.add(sidebarBody);
+    add(sidebarOverlay, sidebarPanel);
+  }
+
+  /**
+   * Builds a single card-style row for the sidebar search results.
+   * Shows title, creator, DOI, access badge, provider, and date stacked
+   * — all in a single grid column to avoid width issues in narrow containers.
+   */
+  private Div buildSearchResultCard(SearchableResource resource) {
+    var card = new Div();
+    card.addClassName("border");
+    card.addClassName("rounded-02");
+    card.getStyle().set("padding", "var(--lumo-space-m)");
+    card.getStyle().set("margin-bottom", "var(--lumo-space-s)");
+    card.getStyle().set("cursor", "pointer");
+
+    // Top row: access badge + provider tag + date
+    var topRow = new Div();
+    topRow.addClassNames("flex-horizontal", "items-center", "gap-02");
+    topRow.getStyle().set("margin-bottom", "var(--lumo-space-xs)");
+
+    Tag accessBadge;
+    if (resource.accessLevel() == AccessLevel.PUBLIC) {
+      accessBadge = new Tag("Public");
+      accessBadge.setTagColor(TagColor.SUCCESS);
+    } else {
+      accessBadge = new Tag("Restricted");
+      accessBadge.setTagColor(TagColor.WARNING);
+    }
+    topRow.add(accessBadge);
+
+    var providerTag = new Tag(resource.resourceProvider());
+    providerTag.setTagColor("Zenodo".equals(resource.resourceProvider())
+        ? TagColor.PRIMARY : TagColor.TEAL);
+    topRow.add(providerTag);
+
+    var dateSpan = new Span(resource.publicationDate().format(
+        DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH)));
+    dateSpan.addClassName("extra-small-body-text");
+    dateSpan.addClassName("color-secondary");
+    dateSpan.getStyle().set("margin-left", "auto");
+    topRow.add(dateSpan);
+
+    card.add(topRow);
+
+    // Title
+    var titleSpan = new Span(resource.title());
+    titleSpan.addClassName("normal-body-text");
+    titleSpan.getStyle().set("font-weight", "600");
+    titleSpan.getStyle().set("margin-bottom", "var(--lumo-space-xs)");
+    titleSpan.getStyle().set("display", "block");
+    card.add(titleSpan);
+
+    // Creator + DOI row
+    var metaRow = new Div();
+    metaRow.addClassNames("flex-horizontal", "gap-04", "items-center");
+    var creatorSpan = new Span("by " + resource.creator());
+    creatorSpan.addClassName("extra-small-body-text");
+    creatorSpan.addClassName("color-secondary");
+    metaRow.add(creatorSpan);
+
+    var doiAnchor = new Anchor("https://doi.org/" + resource.pid(), resource.pid());
+    doiAnchor.setTarget(AnchorTarget.BLANK);
+    doiAnchor.addClassName("extra-small-body-text");
+    metaRow.add(doiAnchor);
+
+    card.add(metaRow);
+
+    return card;
+  }
+
+  /**
+   * Builds a compact, collapsible credential notice that sits below the search form.
+   * Minimal visual impact — just a dismissible inline notice with an optional expand for details.
+   */
+  private Div buildCompactCredentialNotice() {
+    var notice = new Div();
+    notice.addClassNames("border", "rounded-02");
+    notice.getStyle().set("padding", "var(--lumo-space-s) var(--lumo-space-m)");
+    notice.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    notice.getStyle().set("background-color", "var(--lumo-contrast-5pct)");
+
+    var header = new Div();
+    header.addClassNames("flex-horizontal", "gap-02", "items-center");
+
+    var infoIcon = VaadinIcon.INFO.create();
+    infoIcon.getStyle().set("color", "var(--lumo-primary-color)");
+    infoIcon.getStyle().set("font-size", "var(--lumo-icon-size-s)");
+
+    var text = new Span("Repository access requires credentials for restricted datasets.");
+    text.addClassName("extra-small-body-text");
+    text.getStyle().set("flex-grow", "1");
+
+    header.add(infoIcon, text);
+    notice.add(header);
+
+    // Expandable details section
+    var detailsSection = new Div();
+    detailsSection.getStyle().set("display", "none");
+    detailsSection.getStyle().set("margin-top", "var(--lumo-space-s)");
+    detailsSection.getStyle().set("padding-top", "var(--lumo-space-s)");
+    detailsSection.getStyle().set("border-top", "1px solid var(--lumo-contrast-10pct)");
+
+    var expandedText = new Span(
+        "Public datasets work without credentials. For restricted datasets, "
+            + "you need a Personal Access Token from your repository account.");
+    expandedText.addClassName("extra-small-body-text");
+    expandedText.getStyle().set("display", "block");
+    expandedText.getStyle().set("margin-bottom", "var(--lumo-space-xs)");
+
+    var actions = new Div();
+    actions.addClassNames("flex-horizontal", "gap-02");
+
+    var setupLink = new Anchor("#/account/tokens", "Set up access \u2192");
+    setupLink.addClassName("extra-small-body-text");
+    setupLink.getStyle().set("color", "var(--lumo-primary-color)");
+    setupLink.getStyle().set("text-decoration", "none");
+    setupLink.getStyle().set("font-weight", "500");
+
+    var learnMoreLink = new Button("What is a token?");
+    learnMoreLink.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
+    learnMoreLink.addClickListener(e -> showCredentialsExplanation());
+
+    actions.add(setupLink, learnMoreLink);
+    detailsSection.add(expandedText, actions);
+
+    // Toggle button
+    var toggleBtn = new Button("Details");
+    toggleBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY, ButtonVariant.LUMO_SMALL);
+    boolean[] expanded = {false};
+    toggleBtn.addClickListener(e -> {
+      expanded[0] = !expanded[0];
+      detailsSection.getStyle().set("display", expanded[0] ? "block" : "none");
+      toggleBtn.setText(expanded[0] ? "Less" : "Details");
+    });
+
+    // Dismiss button
+    var dismissBtn = new Button(VaadinIcon.CLOSE_SMALL.create());
+    dismissBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    dismissBtn.addClickListener(e -> notice.setVisible(false));
+
+    header.add(toggleBtn, dismissBtn);
+    notice.add(detailsSection);
+
+    return notice;
+  }
+
+  /**
+   * Shows an explanation dialog about what repository credentials are
+   * and how to set them up. Uses plain language aimed at non-technical users.
+   */
+  private void showCredentialsExplanation() {
+    var dialog = new com.vaadin.flow.component.dialog.Dialog();
+    dialog.setHeaderTitle("What are repository credentials?");
+    dialog.setWidth("480px");
+
+    var content = new Div();
+    content.addClassNames("flex-vertical", "gap-03");
+    content.getStyle().set("padding", "var(--lumo-space-s) var(--lumo-space-m)");
+
+    var intro = new Div();
+    intro.getElement().setProperty("innerHTML",
+        "Repositories like Zenodo and FDAT require authentication "
+            + "to access datasets that are not publicly visible. You can grant "
+            + "access by generating a <b>Personal Access Token</b> \u2014 a secret "
+            + "key that identifies you to the repository.");
+    intro.addClassName("normal-body-text");
+    content.add(intro);
+
+    // Steps
+    var stepsTitle = new Span("How to set up access:");
+    stepsTitle.addClassName("normal-body-text");
+    stepsTitle.getStyle().set("font-weight", "600");
+    content.add(stepsTitle);
+
+    var steps = new Div();
+    steps.getElement().setProperty("innerHTML",
+        "<ol style='margin:0;padding-left:1.2em;'>"
+            + "<li style='margin-bottom:var(--lumo-space-xs);'>"
+            + "Go to your <b>profile</b> \u2192 <b>Personal access tokens</b></li>"
+            + "<li style='margin-bottom:var(--lumo-space-xs);'>"
+            + "Click <b>Create new token</b></li>"
+            + "<li style='margin-bottom:var(--lumo-space-xs);'>"
+            + "Give it a name (e.g. <i>'Data Manager'</i>) and select <b>read</b> permissions</li>"
+            + "<li style='margin-bottom:var(--lumo-space-xs);'>"
+            + "Copy the token and save it securely</li>"
+            + "</ol>");
+    content.add(steps);
+
+    // Security note
+    var securityNote = new Span(
+        "\uD83D\uDD12 Your token is stored securely in the system vault and is only "
+            + "used to search repositories on your behalf. It never leaves the platform.");
+    securityNote.addClassName("extra-small-body-text");
+    securityNote.addClassName("color-secondary");
+    securityNote.getStyle().set("margin-top", "var(--lumo-space-xs)");
+    securityNote.getStyle().set("display", "block");
+    content.add(securityNote);
+
+    dialog.add(content);
+
+    // Footer buttons
+    var goBtn = new Button("Go to token settings \u2192", e -> {
+      dialog.close();
+      UI.getCurrent().getPage().setLocation("#/account/tokens");
+    });
+    goBtn.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+
+    var closeBtn = new Button("Close", e -> dialog.close());
+    closeBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+
+    dialog.getFooter().add(closeBtn, goBtn);
+
+    // Raise the dialog above the fixed-position sidebar (z-index: 1000).
+    // Vaadin teleports dialog overlays to <body> with a default z-index of 200,
+    // which renders behind the sidebar. We add a CSS class to the overlay that
+    // sets z-index: 1001 via dialog.css in the theme.
+    dialog.getClassNames().add("connect-dataset-sidebar-dialog");
+
+    dialog.open();
+  }
+
+  private void openConnectSidebar() {
+    sidebarOpen = true;
+    sidebarOverlay.getStyle().set("display", "block");
+    sidebarPanel.getStyle().set("display", "block");
+    // Populate search results lazily (Grid measures width when visible),
+    // filtered by the currently selected repository
+    performSidebarSearch();
+  }
+
+  private void closeConnectSidebar() {
+    sidebarOpen = false;
+    sidebarOverlay.getStyle().set("display", "none");
+    sidebarPanel.getStyle().set("display", "none");
+    searchResultsGrid.deselectAll();
+    selectionCountLabel.setText("");
+    sidebarConnectBtn.setEnabled(false);
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  GRID DATA & FILTERING
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void refreshResourcesGrid() {
+    String filter = accessFilter.getValue();
+    List<ConnectedResource> filtered;
+    if ("Public".equals(filter)) {
+      filtered = connectedResources.stream()
+          .filter(r -> r.accessLevel() == AccessLevel.PUBLIC)
+          .toList();
+    } else if ("Restricted".equals(filter)) {
+      filtered = connectedResources.stream()
+          .filter(r -> r.accessLevel() == AccessLevel.RESTRICTED)
+          .toList();
+    } else {
+      filtered = new ArrayList<>(connectedResources);
+    }
+    resourcesGrid.setItems(filtered);
+  }
+
+  private void performSidebarSearch() {
+    String selectedRepo = instanceSelector.getValue();
+    String term = searchField.getValue();
+
+    // Filter by selected repository first
+    var repoFiltered = MOCK_SEARCH_RESULTS.stream()
+        .filter(r -> matchesRepository(r, selectedRepo))
+        .toList();
+
+    if (term == null || term.isBlank()) {
+      searchResultsGrid.setItems(new ArrayList<>(repoFiltered));
+      return;
+    }
+    String lower = term.toLowerCase();
+    var results = repoFiltered.stream()
+        .filter(r -> r.title().toLowerCase().contains(lower)
+            || r.pid().toLowerCase().contains(lower)
+            || r.creator().toLowerCase().contains(lower)
+            || r.description().toLowerCase().contains(lower))
+        .toList();
+    searchResultsGrid.setItems(results);
+  }
+
+  /**
+   * Checks whether a searchable resource belongs to the selected repository.
+   */
+  private boolean matchesRepository(SearchableResource resource, String repository) {
+    if (repository == null || repository.isBlank()) {
+      return true;
+    }
+    return resource.resourceProvider().equals(extractProviderName(repository));
+  }
+
+  /**
+   * Extracts the provider display name from a repository selector entry.
+   * E.g. "Zenodo (zenodo.org)" → "Zenodo"
+   */
+  private String extractProviderName(String repositoryEntry) {
+    int idx = repositoryEntry.indexOf(' ');
+    if (idx > 0) {
+      return repositoryEntry.substring(0, idx);
+    }
+    return repositoryEntry;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  CONNECT / REMOVE / SYNC ACTIONS
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void connectSelectedFromSidebar() {
+    var selected = searchResultsGrid.getSelectedItems();
+    if (selected.isEmpty()) {
+      return;
+    }
+    for (SearchableResource sr : selected) {
+      connectedResources.add(new ConnectedResource(
+          sr.title(), sr.pid(), sr.accessLevel(), sr.version(),
+          sr.accessLink(), sr.publicationDate(),
+          "Current User (demo)", sr.resourceProvider(), sr.creator(),
+          sr.resourceType(), sr.community(),
+          null, // linked experiment — not set at connect time
+          sr.id(), LocalDate.now(), false
+      ));
+    }
+    refreshResourcesGrid();
+    searchResultsGrid.deselectAll();
+    closeConnectSidebar();
+    showSuccessNotification(selected.size()
+        + " dataset(s) connected to this project.");
+  }
+
+  private void confirmRemoveResource(ConnectedResource resource) {
+    // Use a lightweight approach — in a real app, use the project's dialog pattern
+    var dialog = new com.vaadin.flow.component.dialog.Dialog();
+    dialog.setCloseOnOutsideClick(false);
+    dialog.setCloseOnEsc(false);
+    dialog.setWidth("480px");
+
+    var body = new Div();
+    body.addClassNames("flex-vertical", "gap-03", "padding-horizontal-05",
+        "padding-vertical-04");
+    var headerRow = new Div();
+    headerRow.addClassNames("flex-horizontal", "gap-03");
+    var icon = VaadinIcon.EXCLAMATION_CIRCLE.create();
+    icon.addClassName("icon-color-warning");
+    var titleSpan = new Span("Remove Dataset Connection");
+    titleSpan.addClassName("heading-3");
+    headerRow.add(icon, titleSpan);
+    body.add(headerRow);
+
+    body.add(new Span("Are you sure you want to remove the connection to:"));
+    var dsLabel = new Span(resource.title());
+    dsLabel.getStyle().set("font-weight", "600");
+    body.add(dsLabel);
+    body.add(new Span("This will not delete the dataset on " + resource.resourceProvider()
+        + " — it only removes the link from this project."));
+
+    var footer = new Div();
+    footer.addClassNames("flex-horizontal", "gap-03", "padding-horizontal-05",
+        "padding-vertical-03");
+    footer.getStyle().set("justify-content", "flex-end");
+    var cancelBtn = new Button("Cancel", e -> dialog.close());
+    cancelBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    var removeBtn = new Button("Remove", VaadinIcon.TRASH.create(), e -> {
+      connectedResources.removeIf(r -> r.id().equals(resource.id()));
+      refreshResourcesGrid();
+      dialog.close();
+      showSuccessNotification("Connection removed: " + resource.title());
+    });
+    removeBtn.addThemeVariants(ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_PRIMARY);
+    footer.add(cancelBtn, removeBtn);
+
+    dialog.add(body);
+    dialog.getFooter().add(footer);
+    dialog.open();
+  }
+
+  private void syncSingleResource(ConnectedResource resource) {
+    showInfoNotification("Syncing '" + resource.title() + "' with "
+        + resource.resourceProvider() + "…");
+    var ui = UI.getCurrent();
+    new Thread(() -> {
+      try {
+        Thread.sleep(1500);
+      } catch (InterruptedException ex) {
+        Thread.currentThread().interrupt();
+      }
+      ui.access(() -> {
+        showInfoNotification("Sync complete for '" + resource.title() + "'.");
+      });
+    }).start();
+  }
+
+  private void syncAllResources() {
+    if (connectedResources.isEmpty()) {
+      showInfoNotification("No resources connected to sync.");
+      return;
+    }
+    showInfoNotification("Syncing all " + connectedResources.size() + " resources…");
+    var ui = UI.getCurrent();
+    new Thread(() -> {
+      try {
+        Thread.sleep(2000);
+      } catch (InterruptedException ex) {
+        Thread.currentThread().interrupt();
+      }
+      ui.access(() -> {
+        showSuccessNotification("All " + connectedResources.size()
+            + " resources are up to date.");
+      });
+    }).start();
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  NOTIFICATIONS
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void showSuccessNotification(String message) {
+    var notification = new Notification(message, 3000);
+    notification.addClassName("success-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+
+  private void showInfoNotification(String message) {
+    var notification = new Notification(message, 3000);
+    notification.addClassName("info-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  SEED DATA
+  // ══════════════════════════════════════════════════════════════════════
+
+  private void seedConnectedResources() {
+    // Public resources
+    connectedResources.add(new ConnectedResource(
+        "Benchmark dataset for reproducibility assessment",
+        "10.5281/zenodo.9999001", AccessLevel.PUBLIC,
+        "v2.0", "https://zenodo.org/records/9999001",
+        LocalDate.of(2024, 6, 10),
+        "Alice Schmidt", "Zenodo", "Alice Schmidt",
+        "Dataset", null,
+        "Explorative analysis of heat regulative proteins",
+        "seed-01", LocalDate.of(2025, 1, 15), false));
+
+    connectedResources.add(new ConnectedResource(
+        "Metabolomics reference spectra library",
+        "10.5281/zenodo.9999002", AccessLevel.PUBLIC,
+        "v1.2", "https://zenodo.org/records/9999002",
+        LocalDate.of(2024, 9, 22),
+        "Bob Fernandez", "Zenodo", "Bob Fernandez",
+        "Dataset", "QBiC",
+        "Metabolomics reference for pathway analysis",
+        "seed-02", LocalDate.of(2025, 3, 22), true));
+
+    connectedResources.add(new ConnectedResource(
+        "Spatial transcriptomics atlas of human kidney development",
+        "10.5281/fdat.9876544", AccessLevel.PUBLIC,
+        "v1", "https://fdat.uni-tuebingen.de/records/9876544",
+        LocalDate.of(2025, 4, 12),
+        "Carol Yamamoto", "FDAT", "S. Yamamoto, F. Rossi, QBiC",
+        "Dataset", "CMFI",
+        null,
+        "seed-03", LocalDate.of(2025, 5, 1), false));
+
+    // Restricted resources
+    connectedResources.add(new ConnectedResource(
+        "Multi-center clinical proteomics study (Controlled)",
+        "10.5281/fdat.7777001", AccessLevel.RESTRICTED,
+        "v1.0", "https://fdat.uni-tuebingen.de/records/7777001",
+        LocalDate.of(2025, 2, 18),
+        "Carol Yamamoto", "FDAT", "QBiC Clinical Collaboration",
+        "Dataset", "SFB209",
+        "Clinical proteomics — explorative biomarker study",
+        "seed-04", LocalDate.of(2025, 5, 8), false));
+
+    connectedResources.add(new ConnectedResource(
+        "Clinical metabolomics data — Cohort A (embargo until 2026-12)",
+        "10.5281/zenodo.2345601", AccessLevel.RESTRICTED,
+        "v1", "https://zenodo.org/records/2345601",
+        LocalDate.of(2025, 6, 1),
+        "Current User", "Zenodo", "R. Schmidt, M. Bauer",
+        "Dataset", null,
+        null,
+        "seed-05", LocalDate.of(2025, 6, 20), false));
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  REPOSITORY CREDENTIALS — Account Settings (Stories 14 & 15)
+  // ══════════════════════════════════════════════════════════════════════
+
+  /**
+   * Builds the "Repository Access" section that lets users configure
+   * InvenioRDM instances with Personal Access Tokens (Story 14) and remove
+   * them again (Story 15). Each available instance is shown as a card with
+   * its connection status and an appropriate action button.
+   */
+  private Section buildRepositoryCredentialsSection() {
+    var section = new Section.SectionBuilder().build();
+
+    var header = new SectionHeader(
+        new SectionTitle("Repository Access — Account Settings"),
+        new ActionBar(),
+        new SectionNote(
+            "Connect your personal access tokens for InvenioRDM repositories. "
+                + "A valid token enables Data Manager to search and connect "
+                + "access-restricted datasets from that repository to your projects. "
+                + "Public datasets are always accessible without a token.")
+    );
+    header.enableControls();
+    section.setHeader(header);
+
+    var content = new SectionContent();
+
+    credentialsContentContainer = new Div();
+    credentialsContentContainer.addClassNames("flex-vertical", "gap-03");
+    refreshCredentialsContent();
+    content.add(credentialsContentContainer);
+
+    section.setContent(content);
+    return section;
+  }
+
+  /**
+   * Rebuilds the cards inside {@link #credentialsContentContainer} to reflect
+   * the current state of {@link #configuredCredentials}. Called after tokens
+   * are added or removed.
+   */
+  private void refreshCredentialsContent() {
+    credentialsContentContainer.removeAll();
+
+    // Benefits description — shown once at the top of the section
+    var benefitsCallout = new Div();
+    benefitsCallout.addClassNames("border", "rounded-02");
+    benefitsCallout.getStyle().set("padding",
+        "var(--lumo-space-m) var(--lumo-space-l)");
+    benefitsCallout.getStyle().set("background-color",
+        "var(--lumo-primary-color-10pct)");
+    benefitsCallout.getStyle().set("border-color",
+        "var(--lumo-primary-color-30pct)");
+    benefitsCallout.getStyle().set("margin-bottom", "var(--lumo-space-s)");
+
+    var benefitsHeader = new Div();
+    benefitsHeader.addClassNames("flex-horizontal", "gap-02", "items-center");
+    var benefitsIcon = VaadinIcon.LIGHTBULB.create();
+    benefitsIcon.getStyle().set("color", "var(--lumo-primary-color)");
+    var benefitsTitle = new Span(
+        "Why configure repository access?");
+    benefitsTitle.getStyle().set("font-weight", "600");
+    benefitsTitle.addClassName("normal-body-text");
+    benefitsHeader.add(benefitsIcon, benefitsTitle);
+    benefitsCallout.add(benefitsHeader);
+
+    var benefitsList = new Div();
+    benefitsList.getStyle().set("margin-top", "var(--lumo-space-xs)");
+    benefitsList.getStyle().set("padding-left", "var(--lumo-space-l)");
+    benefitsList.getElement().setProperty("innerHTML",
+        "<ul style='margin:0;padding-left:1.2em;'>"
+            + "<li style='margin-bottom:var(--lumo-space-xxs);'>"
+            + "Search and connect <b>access-restricted datasets</b> "
+            + "to your projects (e.g. datasets under embargo or with controlled access)</li>"
+            + "<li style='margin-bottom:var(--lumo-space-xxs);'>"
+            + "Keep an overview of <b>all associated data</b> — public and restricted — "
+            + "in a single place</li>"
+            + "<li style='margin-bottom:var(--lumo-space-xxs);'>"
+            + "Collaborate with your team on datasets that are not yet publicly visible</li>"
+            + "<li>Your token is stored <b>encrypted in the system vault</b> and is only "
+            + "used to query the repository on your behalf.</li>"
+            + "</ul>");
+    benefitsList.addClassName("normal-body-text");
+    benefitsCallout.add(benefitsList);
+    credentialsContentContainer.add(benefitsCallout);
+
+    // One card per InvenioRDM instance
+    for (var instance : AVAILABLE_INSTANCES) {
+      credentialsContentContainer.add(buildInstanceCard(instance));
+    }
+  }
+
+  /**
+   * Builds a card for a single InvenioRDM instance showing its connection status
+   * and the appropriate action button (Configure or Remove).
+   */
+  private Div buildInstanceCard(InvenioRDMInstance instance) {
+    var card = new Div();
+    card.addClassNames("border", "rounded-02");
+    card.getStyle().set("padding", "var(--lumo-space-m) var(--lumo-space-l)");
+
+    boolean isConfigured = configuredCredentials.containsKey(instance.id());
+
+    // ── Top row: icon + name + status badge ───────────────────────
+    var topRow = new Div();
+    topRow.addClassNames("flex-horizontal", "items-center", "gap-03");
+    topRow.getStyle().set("margin-bottom", "var(--lumo-space-xs)");
+
+    var repoIcon = VaadinIcon.CLOUD.create();
+    repoIcon.getStyle().set("font-size", "var(--lumo-icon-size-m)");
+    repoIcon.getStyle().set("color",
+        "Zenodo".equals(instance.shortName())
+            ? "var(--lumo-primary-color)"
+            : "var(--lumo-success-color)");
+    topRow.add(repoIcon);
+
+    var nameAndDesc = new Div();
+    nameAndDesc.addClassNames("flex-vertical", "gap-01");
+    nameAndDesc.getStyle().set("flex-grow", "1");
+
+    var nameSpan = new Span(instance.displayName());
+    nameSpan.getStyle().set("font-weight", "600");
+    nameSpan.addClassName("normal-body-text");
+    nameAndDesc.add(nameSpan);
+    topRow.add(nameAndDesc);
+
+    // Status badge
+    if (isConfigured) {
+      var connectedBadge = new Tag("\u2713 Connected");
+      connectedBadge.setTagColor(TagColor.SUCCESS);
+      topRow.add(connectedBadge);
+    } else {
+      var notConfiguredBadge = new Tag("Not configured");
+      notConfiguredBadge.setTagColor(TagColor.CONTRAST);
+      topRow.add(notConfiguredBadge);
+    }
+    card.add(topRow);
+
+    // ── Description ────────────────────────────────────────────────
+    var descSpan = new Span(instance.description());
+    descSpan.addClassName("extra-small-body-text");
+    descSpan.addClassName("color-secondary");
+    descSpan.getStyle().set("display", "block");
+    descSpan.getStyle().set("margin-bottom", "var(--lumo-space-s)");
+    card.add(descSpan);
+
+    // ── Bottom row: details (if configured) + action button ────────
+    var bottomRow = new Div();
+    bottomRow.addClassNames("flex-horizontal", "items-center");
+    bottomRow.getStyle().set("gap", "var(--lumo-space-s)");
+
+    if (isConfigured) {
+      RepositoryCredential credential = configuredCredentials.get(instance.id());
+
+      var detailsWrapper = new Div();
+      detailsWrapper.addClassNames("flex-horizontal", "gap-04", "items-center");
+      detailsWrapper.getStyle().set("flex-grow", "1");
+
+      var tokenInfo = new Span(
+          "Token: " + credential.maskedToken()
+              + "  |  Added: "
+              + credential.addedOn().format(
+                  DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH)));
+      tokenInfo.addClassName("extra-small-body-text");
+      tokenInfo.addClassName("color-secondary");
+      detailsWrapper.add(tokenInfo);
+
+      var removeButton = new Button("Remove",
+          VaadinIcon.TRASH.create());
+      removeButton.addThemeVariants(
+          ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_TERTIARY);
+      removeButton.setTooltipText(
+          "Remove the stored token for " + instance.shortName()
+              + ". Restricted datasets from this instance will no longer "
+              + "be accessible.");
+      removeButton.addClickListener(
+          e -> openRemoveTokenDialog(instance));
+      bottomRow.add(detailsWrapper, removeButton);
+    } else {
+      var hintText = new Span(
+          "No personal access token configured for this repository.");
+      hintText.addClassName("extra-small-body-text");
+      hintText.addClassName("color-secondary");
+      hintText.getStyle().set("flex-grow", "1");
+
+      var configureButton = new Button("Configure",
+          VaadinIcon.PLUS_CIRCLE.create());
+      configureButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+      configureButton.setTooltipText(
+          "Add a personal access token to connect restricted datasets from "
+              + instance.shortName() + ".");
+      configureButton.addClickListener(
+          e -> openAddTokenDialog(instance));
+      bottomRow.add(hintText, configureButton);
+    }
+    card.add(bottomRow);
+
+    return card;
+  }
+
+  // ── Add Token Dialog (Story 14) ────────────────────────────────────────
+
+  /**
+   * Opens a dialog that lets the user add a Personal Access Token for the
+   * given InvenioRDM instance. Token validation is simulated in this
+   * prototype — any non-empty token is accepted.
+   */
+  private void openAddTokenDialog(InvenioRDMInstance instance) {
+    var dialog = new com.vaadin.flow.component.dialog.Dialog();
+    dialog.setHeaderTitle("Connect " + instance.displayName());
+    dialog.setWidth("520px");
+    dialog.setCloseOnOutsideClick(false);
+
+    var content = new Div();
+    content.addClassNames("flex-vertical", "gap-03");
+    content.getStyle().set("padding",
+        "var(--lumo-space-s) var(--lumo-space-m)");
+
+    // Explanation
+    var introText = new Div();
+    introText.addClassName("normal-body-text");
+    introText.getElement().setProperty("innerHTML",
+        "To connect access-restricted datasets from <b>" + instance.shortName()
+            + "</b>, provide a Personal Access Token from your "
+            + instance.shortName() + " account. The token is validated against "
+            + "the repository and stored securely.");
+    content.add(introText);
+
+    // Token input
+    var tokenField = new PasswordField();
+    tokenField.setLabel("Personal Access Token");
+    tokenField.setPlaceholder("Paste your token here…");
+    tokenField.setWidthFull();
+    tokenField.setRequiredIndicatorVisible(true);
+    tokenField.setHelperText(
+        "Generate a token in your " + instance.shortName()
+            + " account settings.");
+    content.add(tokenField);
+
+    // Helper link to the token creation page
+    var tokenSetupLink = new Anchor(instance.tokenSetupUrl(),
+        "Open " + instance.shortName() + " token settings \u2192");
+    tokenSetupLink.setTarget(AnchorTarget.BLANK);
+    tokenSetupLink.addClassName("extra-small-body-text");
+    content.add(tokenSetupLink);
+
+    // Token status feedback area
+    var statusArea = new Div();
+    statusArea.getStyle().set("display", "none");
+    statusArea.getStyle().set("padding", "var(--lumo-space-s)");
+    statusArea.getStyle().set("border-radius", "var(--lumo-border-radius-m)");
+    content.add(statusArea);
+
+    // Validation hint
+    var validationHint = new Div();
+    validationHint.addClassName("extra-small-body-text");
+    validationHint.addClassName("color-secondary");
+    validationHint.getStyle().set("font-style", "italic");
+    validationHint.setText(
+        "In this prototype, any non-empty token is accepted. "
+            + "In production, the token is validated against the "
+            + "InvenioRDM REST API.");
+    content.add(validationHint);
+
+    // Security note
+    var securityNote = new Div();
+    securityNote.addClassNames("flex-horizontal", "gap-02");
+    securityNote.getStyle().set("padding",
+        "var(--lumo-space-xs) var(--lumo-space-s)");
+    securityNote.getStyle().set("background-color",
+        "var(--lumo-contrast-5pct)");
+    securityNote.getStyle().set("border-radius",
+        "var(--lumo-border-radius-m)");
+    var lockIcon = VaadinIcon.LOCK.create();
+    lockIcon.getStyle().set("color", "var(--lumo-success-color)");
+    lockIcon.getStyle().set("font-size", "var(--lumo-icon-size-s)");
+    var lockText = new Span(
+        "Your token is stored encrypted in the system vault. "
+            + "It never leaves the platform and is only used to query "
+            + instance.shortName() + " on your behalf.");
+    lockText.addClassName("extra-small-body-text");
+    lockText.addClassName("color-secondary");
+    securityNote.add(lockIcon, lockText);
+    content.add(securityNote);
+
+    dialog.add(content);
+
+    // Build footer buttons — button is created first, then the listener is
+    // added in a separate step so the lambda can safely reference it.
+    Button connectBtn = new Button("Validate & Connect");
+    connectBtn.addClickListener(e -> {
+          String tokenValue = tokenField.getValue();
+          if (tokenValue == null || tokenValue.isBlank()) {
+            // Show error in status area
+            statusArea.removeAll();
+            statusArea.getStyle().set("display", "block");
+            statusArea.getStyle().set("background-color",
+                "var(--lumo-error-color-10pct)");
+            statusArea.getStyle().set("border",
+                "1px solid var(--lumo-error-color)");
+            var errRow = new Div();
+            errRow.addClassNames("flex-horizontal", "gap-02", "items-center");
+            var errIcon = VaadinIcon.WARNING.create();
+            errIcon.getStyle().set("color", "var(--lumo-error-color)");
+            errIcon.getStyle().set("font-size",
+                "var(--lumo-icon-size-s)");
+            var errText = new Span(
+                "Token cannot be empty. Please paste a valid Personal "
+                    + "Access Token.");
+            errText.addClassName("normal-body-text");
+            errText.getStyle().set("color",
+                "var(--lumo-error-color)");
+            errRow.add(errIcon, errText);
+            statusArea.add(errRow);
+            return;
+          }
+
+          // Simulate token validation (in production this would call
+          // the InvenioRDM REST API)
+          // For the prototype, simulate a success response after a
+          // brief delay.
+          var ui = UI.getCurrent();
+          connectBtn.setEnabled(false);
+          connectBtn.setText("Validating\u2026");
+
+          statusArea.removeAll();
+          statusArea.getStyle().set("display", "block");
+          statusArea.getStyle().set("background-color",
+              "var(--lumo-primary-color-10pct)");
+          statusArea.getStyle().set("border",
+              "1px solid var(--lumo-primary-color-30pct)");
+          var validatingRow = new Div();
+          validatingRow.addClassNames("flex-horizontal", "gap-02",
+              "items-center");
+          var spinnerIcon = VaadinIcon.SPINNER.create();
+          var validatingText = new Span(
+              "Validating token against " + instance.baseUrl() + "\u2026");
+          validatingText.addClassName("extra-small-body-text");
+          validatingRow.add(spinnerIcon, validatingText);
+          statusArea.add(validatingRow);
+
+          new Thread(() -> {
+            try {
+              Thread.sleep(1200);  // simulate network call
+            } catch (InterruptedException ex) {
+              Thread.currentThread().interrupt();
+            }
+            ui.access(() -> {
+              // Mask the token for safe display
+              String masked = maskToken(tokenValue);
+              configuredCredentials.put(instance.id(),
+                  new RepositoryCredential(instance.id(), masked,
+                      LocalDate.now()));
+              dialog.close();
+              refreshCredentialsContent();
+              showSuccessNotification(
+                  "Token connected successfully for "
+                      + instance.shortName()
+                      + ". You can now access restricted datasets from "
+                      + "this repository.");
+            });
+          }).start();
+        });
+    connectBtn.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+
+    var cancelBtn = new Button("Cancel", e -> dialog.close());
+    cancelBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+
+    dialog.getFooter().add(cancelBtn, connectBtn);
+    dialog.open();
+
+    // Focus the token field for convenience
+    tokenField.focus();
+  }
+
+  /**
+   * Returns a masked representation of a token, showing only the first 4
+   * and last 4 characters, e.g. "abcd••••••••wxyz".
+   */
+  private String maskToken(String token) {
+    if (token == null || token.length() <= 8) {
+      return "****";
+    }
+    return token.substring(0, 4) + "\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022"
+        + token.substring(token.length() - 4);
+  }
+
+  // ── Remove Token Dialog (Story 15) ─────────────────────────────────────
+
+  /**
+   * Opens a confirmation dialog before removing the stored credentials for
+   * the given InvenioRDM instance. After confirmation, the credential is
+   * deleted from {@link #configuredCredentials} and the UI is refreshed.
+   */
+  private void openRemoveTokenDialog(InvenioRDMInstance instance) {
+    var dialog = new com.vaadin.flow.component.dialog.Dialog();
+    dialog.setCloseOnOutsideClick(false);
+    dialog.setCloseOnEsc(false);
+    dialog.setWidth("480px");
+
+    var body = new Div();
+    body.addClassNames("flex-vertical", "gap-03");
+    body.getStyle().set("padding",
+        "var(--lumo-space-s) var(--lumo-space-m)");
+
+    // Header with warning icon
+    var headerRow = new Div();
+    headerRow.addClassNames("flex-horizontal", "gap-03", "items-center");
+    var warnIcon = VaadinIcon.EXCLAMATION_CIRCLE.create();
+    warnIcon.addClassName("icon-color-warning");
+    var titleSpan = new Span("Remove Repository Connection");
+    titleSpan.addClassName("heading-3");
+    headerRow.add(warnIcon, titleSpan);
+    body.add(headerRow);
+
+    // Confirmation text
+    var confirmText = new Div();
+    confirmText.addClassName("normal-body-text");
+    confirmText.getElement().setProperty("innerHTML",
+        "You are about to remove the Personal Access Token for "
+            + "<b>" + instance.displayName() + "</b>.");
+    body.add(confirmText);
+
+    // Impact description
+    var impactBox = new Div();
+    impactBox.addClassNames("flex-vertical", "gap-02");
+    impactBox.getStyle().set("padding",
+        "var(--lumo-space-s) var(--lumo-space-m)");
+    impactBox.getStyle().set("background-color",
+        "var(--lumo-contrast-5pct)");
+    impactBox.getStyle().set("border-radius",
+        "var(--lumo-border-radius-m)");
+
+    var impactTitle = new Span("What happens:");
+    impactTitle.addClassName("normal-body-text");
+    impactTitle.getStyle().set("font-weight", "600");
+    impactBox.add(impactTitle);
+
+    var impactList = new Div();
+    impactList.getElement().setProperty("innerHTML",
+        "<ul style='margin:0;padding-left:1.2em;'>"
+            + "<li style='margin-bottom:var(--lumo-space-xxs);'>"
+            + "The stored token is <b>permanently deleted</b> from the system.</li>"
+            + "<li style='margin-bottom:var(--lumo-space-xxs);'>"
+            + "You will <b>no longer be able to add access-restricted datasets</b> "
+            + "from " + instance.shortName() + " to your projects.</li>"
+            + "<li>"
+            + "Already-connected restricted datasets remain in the project but "
+            + "can no longer be synced.</li>"
+            + "</ul>");
+    impactList.addClassName("extra-small-body-text");
+    impactBox.add(impactList);
+
+    body.add(impactBox);
+
+    var reversalNote = new Span(
+        "You can reconfigure this repository at any time by adding a new token.");
+    reversalNote.addClassName("extra-small-body-text");
+    reversalNote.addClassName("color-secondary");
+    reversalNote.getStyle().set("display", "block");
+    body.add(reversalNote);
+
+    dialog.add(body);
+
+    // Footer buttons
+    var removeBtn = new Button("Remove Token", VaadinIcon.TRASH.create(),
+        e -> {
+          configuredCredentials.remove(instance.id());
+          dialog.close();
+          refreshCredentialsContent();
+          showSuccessNotification("Repository connection removed for "
+              + instance.shortName()
+              + ". Access-restricted datasets from this instance "
+              + "are no longer available.");
+        });
+    removeBtn.addThemeVariants(
+        ButtonVariant.LUMO_ERROR, ButtonVariant.LUMO_PRIMARY);
+
+    var cancelBtn = new Button("Cancel", e -> dialog.close());
+    cancelBtn.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+
+    dialog.getFooter().add(cancelBtn, removeBtn);
+    dialog.open();
+  }
+
+  // ── Credentials seed data ─────────────────────────────────────────────
+
+  /**
+   * Seeds the demo with Zenodo pre-configured (token present) and FDAT
+   * not configured, so the prototype shows both card states immediately.
+   */
+  private void seedCredentials() {
+    configuredCredentials.put("zenodo",
+        new RepositoryCredential("zenodo",
+            "a1b2\u2022\u2022\u2022\u2022\u2022\u2022\u2022\u2022c3d4",
+            LocalDate.of(2025, 3, 10)));
+    // FDAT is intentionally left unconfigured for demo contrast
+  }
+
+  // ── Error notification helper ──────────────────────────────────────────
+
+  private void showErrorNotification(String message) {
+    var notification = new Notification(message, 4000);
+    notification.addClassName("error-toast");
+    notification.setPosition(Notification.Position.BOTTOM_END);
+    notification.open();
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java
index b888499daf..dea2f43dd9 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java
@@ -19,6 +19,7 @@
 import com.vaadin.flow.data.provider.CallbackDataProvider.FetchCallback;
 import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.router.Route;
+import com.vaadin.flow.router.RouteParameters;
 import com.vaadin.flow.server.auth.AnonymousAllowed;
 import com.vaadin.flow.spring.annotation.UIScope;
 import java.util.ArrayList;
@@ -552,48 +553,173 @@ private static Div dialogShowCase(AppDialog dialog, String dialogType) {
   }
 
   private Div toastShowCase() {
-    var title = new Div("Toast it!");
+    var title = new Div("Toast Notifications");
     title.addClassName(HEADING_2);
     var description = new Div(
-        "Let's see how toasts work and also how to use them when we want to indicate a background task to the user.");
+        "Demonstrates all toast notification types with the new dark-mode design system. Includes success, info, error toasts with icons, progress toasts with action buttons, and routing toasts.");
     description.addClassName(NORMAL_BODY_TEXT);
-    var content = new Div();
-    content.addClassNames(FLEX_VERTICAL, GAP_04);
 
-    content.add(title);
-    content.add(description);
+    var container = new Div();
+    container.addClassNames("border", "padding-04");
 
-    var button = new Button("Show Toast");
+    var grid = new Div();
+    grid.addClassNames("flex-horizontal");
+    grid.addClassName("gap-05");
 
-    content.add(button);
+    // --- Column 1: Basic Toasts ---
+    var col1 = new Div();
+    col1.addClassNames("flex-vertical", "gap-03", "width-250px");
 
-    button.addClickListener(e ->
-    {
-      var progressBar = new ProgressBar();
-      progressBar.setIndeterminate(true);
-      var toast = messageFactory.pendingTaskToast("task.in-progress",
-          new Object[]{"Doing something really heavy here"}, getLocale());
-      var succeededToast = messageFactory.toast("task.finished", new Object[]{"Heavy Task #1"},
+    var col1Header = new Div("Basic Toasts");
+    col1Header.addClassName(HEADING_3);
+    col1.add(col1Header);
+
+    // Success toast
+    var successToastBtn = new Button("Success Toast");
+    successToastBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("experiment.created.success",
+          new Object[]{"My New Experiment"}, getLocale());
+      toast.open();
+    });
+    col1.add(successToastBtn);
+
+    // Info toast with routing
+    var infoToastBtn = new Button("Info Toast + Route");
+    infoToastBtn.addClickListener(e -> {
+      var toast = messageFactory.routingToast("from.experiment.to.sample.batch",
+          new Object[]{}, new Object[]{},
+          life.qbic.datamanager.views.projects.project.samples.SampleInformationMain.class,
+          new RouteParameters("projectId", "test-project"),
           getLocale());
       toast.open();
+    });
+    col1.add(infoToastBtn);
+
+    // Error toast
+    var errorToastBtn = new Button("Error Toast");
+    errorToastBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("project.created.error", new Object[]{}, getLocale());
+      toast.open();
+    });
+    col1.add(errorToastBtn);
+
+    // --- Column 2: Action & Progress Toasts ---
+    var col2 = new Div();
+    col2.addClassNames("flex-vertical", "gap-03", "width-250px");
+
+    var col2Header = new Div("Action & Progress Toasts");
+    col2Header.addClassName(HEADING_3);
+    col2.add(col2Header);
+
+    // Error toast with action (retry)
+    var actionToastBtn = new Button("Error + Retry");
+    actionToastBtn.addClickListener(e -> {
+      var toast = messageFactory.actionToast(
+          "project.updated.error.retry",
+          new Object[]{},
+          "Retry",
+          buttonClick -> {
+            UI.getCurrent().getPage().executeJs("console.log('Retry action clicked!')");
+          },
+          getLocale());
+      toast.open();
+    });
+    col2.add(actionToastBtn);
+
+    // Pending task toast (progress)
+    var pendingToastBtn = new Button("Pending Task (Progress)");
+    pendingToastBtn.addClickListener(e -> {
+      var toast = messageFactory.pendingTaskToast("task.in-progress",
+          new Object[]{"Registering 50 samples"}, getLocale());
+      toast.open();
       var ui = UI.getCurrent();
       CompletableFuture.runAsync(() -> {
         try {
           Thread.sleep(5000);
+        } catch (InterruptedException ex) {
+          Thread.currentThread().interrupt();
+        }
+      }).thenRunAsync(() -> {
+        ui.access(() -> {
+            toast.close();
+            var success = messageFactory.toast("sample-batch.registered.success",
+                new Object[]{"Registration Batch #1"}, getLocale());
+            success.open();
+          });
+      });
+    });
+    col2.add(pendingToastBtn);
 
+    // Measurement in-progress with subtext
+    var measureToastBtn = new Button("Measurement Registration");
+    measureToastBtn.addClickListener(e -> {
+      var toast = messageFactory.pendingTaskToast("measurement.registration.in-progress",
+          new Object[]{}, getLocale());
+      toast.open();
+      var ui = UI.getCurrent();
+      CompletableFuture.runAsync(() -> {
+        try {
+          Thread.sleep(6000);
         } catch (InterruptedException ex) {
           Thread.currentThread().interrupt();
         }
       }).thenRunAsync(() -> {
         ui.access(() -> {
-              toast.close();
-              succeededToast.open();
-            }
-        );
+            toast.close();
+            var success = messageFactory.toast("measurement.registration.successful",
+                new Object[]{42}, getLocale());
+            success.open();
+          });
       });
     });
-    content.add(button);
-    return content;
+    col2.add(measureToastBtn);
+
+    // --- Column 3: Individual Toast Tests ---
+    var col3 = new Div();
+    col3.addClassNames("flex-vertical", "gap-03", "width-250px");
+
+    var col3Header = new Div("Toast Variants");
+    col3Header.addClassName(HEADING_3);
+    col3.add(col3Header);
+
+    // Short success toast
+    var shortSuccessBtn = new Button("Short Success (5s)");
+    shortSuccessBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("experimental.groups.created.success",
+          new Object[]{}, getLocale());
+      toast.open();
+    });
+    col3.add(shortSuccessBtn);
+
+    // Personal access token success (8s duration)
+    var patToastBtn = new Button("PAT Created (8s)");
+    patToastBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("personal-access-token.created.success",
+          new Object[]{"my-token-12345"}, getLocale());
+      toast.open();
+    });
+    col3.add(patToastBtn);
+
+    // Measurement failure toast
+    var measureFailToastBtn = new Button("Measurement Upload Failed");
+    measureFailToastBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("measurement.upload.failed",
+          new Object[]{}, getLocale());
+      toast.open();
+    });
+    col3.add(measureFailToastBtn);
+
+    // Profile link success
+    var profileToastBtn = new Button("Profile Linked");
+    profileToastBtn.addClickListener(e -> {
+      var toast = messageFactory.toast("profile.oidc.link.success", new Object[]{}, getLocale());
+      toast.open();
+    });
+    col3.add(profileToastBtn);
+
+    grid.add(col1, col2, col3);
+    container.add(title, description, grid);
+    return container;
   }
 
   private static Div detailBoxShowCase() {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ProjectListingDatasetsDemo.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ProjectListingDatasetsDemo.java
new file mode 100644
index 0000000000..0024200c76
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ProjectListingDatasetsDemo.java
@@ -0,0 +1,672 @@
+package life.qbic.datamanager.views.demo;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.router.RouterLink;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.data.value.ValueChangeMode;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.server.auth.AnonymousAllowed;
+import com.vaadin.flow.spring.annotation.UIScope;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Locale;
+import life.qbic.datamanager.views.AppRoutes;
+import life.qbic.datamanager.views.AppRoutes.ProjectRoutes;
+import life.qbic.datamanager.views.general.Tag;
+import life.qbic.datamanager.views.general.Tag.TagColor;
+import life.qbic.datamanager.views.projects.project.datasets.ConnectedDatasetsMain;
+import com.vaadin.flow.router.RouteParameters;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * <b>Project Listing with Datasets — Demo View</b>
+ *
+ * <p>Prototype UI for story FEAT-DATSET-09: "Access available datasets after login".
+ * Enhances the existing project collection listing with connected-resource indicators
+ * per project card, so researchers can see at a glance which projects have associated
+ * datasets, how many, and their access status (open vs. restricted).</p>
+ *
+ * <h3>Design rationale</h3>
+ * <ul>
+ *   <li><b>Faithful to the existing layout</b> — the project cards retain their
+ *       current structure (title, tags, dates, PI, avatars). The dataset
+ *       indicator is an additive element placed below the existing meta info.</li>
+ *   <li><b>Colour-coded access status</b> — the indicator uses the existing
+ *       {@link life.qbic.datamanager.views.general.Tag} palette:
+ *       <ul>
+ *         <li>Green (success) — all connected datasets are open/public</li>
+ *         <li>Amber (warning) — at least one connected dataset is access-restricted</li>
+ *         <li>Grey (contrast/neutral) — no datasets connected</li>
+ *       </ul>
+ *   <li><b>Two distinct click targets per card</b> — clicking anywhere on the
+ *       card body (title, PI, avatars) navigates to the project info page;
+ *       clicking the dataset indicator row navigates directly to the
+ *       project's connected-datasets view ({@code projects/%s/datasets}).
+ *       The indicator is underlined on hover and carries a trailing
+ *       {@code →} icon as affordance.</li>
+ *   <li><b>Summary ribbon</b> — above the project cards, a compact summary
+ *       shows aggregate statistics across all projects (total connected
+ *       datasets, projects with connections, open/restricted breakdown).</li>
+ * </ul>
+ *
+ * <p>This view is only available with the {@code development} profile.</p>
+ *
+ * @since 1.12.0
+ */
+@Profile("development")
+@Route("test-view/project-listing-datasets")
+@UIScope
+@AnonymousAllowed
+@org.springframework.stereotype.Component
+public class ProjectListingDatasetsDemo extends Div {
+
+  // ── Domain records ────────────────────────────────────────────────────
+
+  /** Access level of a connected dataset (mirrors FEAT-DATASET-CONNECTION). */
+  enum AccessLevel { OPEN, RESTRICTED }
+
+  /** A dataset connection within a project. */
+  record DatasetConnection(
+      String id,
+      String title,
+      String pid,
+      AccessLevel accessLevel,
+      String repository,
+      String linkedExperimentName,
+      LocalDate connectedOn
+  ) {}
+
+  /** A project overview enriched with connected-dataset summary. */
+  record ProjectOverviewWithDatasets(
+      String projectId,
+      String projectCode,
+      String projectTitle,
+      Instant lastModified,
+      String principalInvestigator,
+      String projectResponsible,
+      List<MeasurementKind> measurementTypes,
+      int collaboratorCount,
+      List<DatasetConnection> connectedDatasets
+  ) {}
+
+  /** Simplified measurement kind for display. */
+  record MeasurementKind(String label, String cssClass) {}
+
+  // ── Mock project data ─────────────────────────────────────────────────
+
+  private static final DateTimeFormatter DATE_FMT =
+      DateTimeFormatter.ofPattern("EEEE, dd MMMM yyyy HH:mm:ss", Locale.ENGLISH)
+          .withZone(ZoneId.of("Europe/Berlin"));
+
+  private static final List<ProjectOverviewWithDatasets> MOCK_PROJECTS = seedProjects();
+
+  private TextField searchField;
+  private Div projectCardsContainer;
+  private Span summaryText;
+
+  public ProjectListingDatasetsDemo() {
+    addClassName("padding-horizontal-07");
+    addClassName("padding-vertical-04");
+
+    // ── Page title ─────────────────────────────────────────────────
+    var pageTitle = new Div("Welcome Back admin-test!");
+    pageTitle.addClassName("project-overview-title");
+    add(pageTitle);
+
+    var pageDescription = new Div(
+        "Manage all your scientific data in one place with the Data Manager. "
+            + "You can access our documentation and learn more about using the Data Manager. "
+            + "Start by creating a new project or continue working on an already existing project.");
+    pageDescription.addClassName("description");
+    add(pageDescription);
+
+    // ── Subtitle explaining this is a prototype ────────────────────
+    var protoNotice = new Div();
+    protoNotice.getStyle().set("display", "flex");
+    protoNotice.getStyle().set("align-items", "center");
+    protoNotice.getStyle().set("gap", "var(--lumo-space-s)");
+    protoNotice.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    protoNotice.getStyle().set("margin-top", "var(--lumo-space-m)");
+
+    var infoIcon = VaadinIcon.INFO_CIRCLE_O.create();
+    infoIcon.getStyle().set("color", "var(--lumo-primary-color)");
+    infoIcon.getStyle().set("flex-shrink", "0");
+
+    var noticeText = new Span(
+        "Prototype: FEAT-DATSET-09 — connected-dataset indicators on project cards (no backend wire-up).");
+    noticeText.addClassName("extra-small-body-text");
+    noticeText.addClassName("color-secondary");
+
+    protoNotice.add(infoIcon, noticeText);
+    add(protoNotice);
+
+    // ── Summary ribbon ─────────────────────────────────────────────
+    add(buildSummaryRibbon());
+
+    // Wrap header + cards in project-collection-component for proper CSS scoping
+    var layoutWrapper = new Div();
+    layoutWrapper.addClassName("project-collection-component");
+
+    // ── Header + project cards container ──────────────────────────
+    layoutWrapper.add(buildMyProjectsHeader());
+
+    projectCardsContainer = new Div();
+    projectCardsContainer.addClassName("project-cards-container");
+    projectCardsContainer.getStyle().set("display", "flex");
+    projectCardsContainer.getStyle().set("flex-direction", "column");
+    projectCardsContainer.getStyle().set("gap", "0");
+
+    refreshProjectCards(MOCK_PROJECTS);
+    layoutWrapper.add(projectCardsContainer);
+    add(layoutWrapper);
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  HEADER
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Div buildMyProjectsHeader() {
+    var header = new Div();
+    header.addClassName("header");
+
+    var title = new Span("My Projects");
+    title.addClassName("title");
+
+    searchField = new TextField();
+    searchField.setPlaceholder("Search");
+    searchField.setClearButtonVisible(true);
+    searchField.setSuffixComponent(VaadinIcon.SEARCH.create());
+    searchField.addClassNames("search-field");
+    searchField.setValueChangeMode(ValueChangeMode.LAZY);
+    searchField.addValueChangeListener(e -> filterProjects(e.getValue()));
+
+    var createBtn = new Button("Create");
+    createBtn.addClassName("primary");
+
+    var controls = new Div(searchField, createBtn);
+    controls.addClassName("controls");
+
+    header.add(title, controls);
+    return header;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  SUMMARY RIBBON
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Div buildSummaryRibbon() {
+    var ribbon = new Div();
+    ribbon.addClassName("border");
+    ribbon.addClassName("rounded-02");
+    ribbon.getStyle().set("display", "flex");
+    ribbon.getStyle().set("align-items", "center");
+    ribbon.getStyle().set("gap", "var(--lumo-space-l)");
+    ribbon.getStyle().set("padding", "var(--lumo-space-m) var(--lumo-space-l)");
+    ribbon.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    ribbon.getStyle().set("background-color", "var(--lumo-base-color)");
+    ribbon.getStyle().set("overflow-x", "auto");
+
+    var totalProjects = MOCK_PROJECTS.size();
+    var projectsWithDatasets = MOCK_PROJECTS.stream()
+        .filter(p -> !p.connectedDatasets().isEmpty()).count();
+    var totalDatasets = MOCK_PROJECTS.stream()
+        .mapToInt(p -> p.connectedDatasets().size()).sum();
+    var openDatasets = MOCK_PROJECTS.stream()
+        .flatMap(p -> p.connectedDatasets().stream())
+        .filter(d -> d.accessLevel() == AccessLevel.OPEN).count();
+    var restrictedDatasets = totalDatasets - openDatasets;
+
+    summaryText = new Span("%d project(s) · %d with connected datasets · %d dataset(s) total (%d open, %d restricted)"
+        .formatted(totalProjects, projectsWithDatasets, totalDatasets, openDatasets, restrictedDatasets));
+    summaryText.addClassName("normal-body-text");
+
+    var dbIcon = VaadinIcon.DATABASE.create();
+    dbIcon.getStyle().set("color", "var(--lumo-primary-color)");
+    dbIcon.getStyle().set("font-size", "var(--lumo-icon-size-m)");
+    dbIcon.getStyle().set("flex-shrink", "0");
+
+    ribbon.add(dbIcon, summaryText);
+    return ribbon;
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  PROJECT CARD (matching existing ProjectOverviewItem layout)
+  // ══════════════════════════════════════════════════════════════════════
+
+  private Component buildProjectCard(ProjectOverviewWithDatasets project) {
+    var card = new Div();
+    card.addClassName("project-overview-item");
+    card.getStyle().set("cursor", "pointer");
+
+    // ── Header: title + measurement tags ───────────────────────────
+    var header = new Div();
+    header.addClassName("flex-horizontal");
+    header.getStyle().set("align-items", "flex-start");
+    header.getStyle().set("gap", "var(--lumo-space-s)");
+    header.getStyle().set("flex-wrap", "wrap");
+
+    var titleSpan = new Span("%s - %s".formatted(project.projectCode(), project.projectTitle()));
+    titleSpan.addClassName("project-overview-item-title");
+    header.add(titleSpan);
+
+    var tagsContainer = new Div();
+    tagsContainer.addClassName("tag-collection");
+    for (var kind : project.measurementTypes()) {
+      var tag = new Span(kind.label());
+      tag.addClassName("tag");
+      tag.addClassName(kind.cssClass());
+      tagsContainer.add(tag);
+    }
+    header.add(tagsContainer);
+
+    card.add(header);
+
+    // ── Last modified ─────────────────────────────────────────────
+    var lastModified = new Span("Last modified on " + DATE_FMT.format(project.lastModified()));
+    lastModified.addClassName("tertiary");
+    card.add(lastModified);
+
+    // ── PI + Responsible ───────────────────────────────────────────
+    var details = new Div();
+    details.addClassName("details");
+    details.add(new Span("Principal Investigator: " + project.principalInvestigator()));
+    if (project.projectResponsible() != null && !project.projectResponsible().isBlank()) {
+      details.add(new Span("Project Responsible: " + project.projectResponsible()));
+    }
+    card.add(details);
+
+    // ── Collaborator avatars (simplified: show count + placeholder) ─
+    var avatarPlaceholder = buildAvatarPlaceholder(project.collaboratorCount());
+    card.add(avatarPlaceholder);
+
+    // ── Connected Datasets footer (RouterLink → datasets view) ─
+    // Differentiated footer region at the bottom of the card. Entire
+    // footer area is a RouterLink → projects/{id}/datasets; the rest
+    // of the card stays as a project-info link.
+    if (!project.connectedDatasets().isEmpty()) {
+      card.add(buildDatasetFooter(project));
+    }
+
+    // ── Click handler: project card body → project info ─────────
+    card.addClickListener(event -> {
+      navigateToProjectInfo(project.projectId());
+    });
+
+    return card;
+  }
+  // ══════════════════════════════════════════════════════════════════════
+  //  DATASET FOOTER — RouterLink wrapping full footer region
+  // ══════════════════════════════════════════════════════════════════════
+
+  /**
+   * Builds the connected-datasets footer region for a project card.
+   *
+   * <h3>Why a footer, not just a chevron icon?</h3>
+   * <p>A small icon is too tiny a click target for users with motor
+   * disabilities and problematic for screen readers. By differentiating
+   * the dataset section as a full-width card footer — with a top border,
+   * a slightly tinted background, and a {@link RouterLink} wrapping
+   * meaningful content — the full footer becomes a large (44px+ high) 
+   * click target that is easy to hit and carries coherent link text.</p>
+   *
+   * <h3>Interaction model</h3>
+   * <ul>
+   *   <li><b>Footer area</b> (border to card bottom) → RouterLink
+   *       navigates to {@code projects/{id}/datasets}. Anchor navigation
+   *       is handled by the browser before Vaadin's server-side click
+   *       routing, so the parent card project-info handler does not
+   *       fire.</li>
+   *   <li><b>Card body</b> (title, PI, avatars) → card-wide
+   *       {@code Div.addClickListener(...)} navigates to project info.
+   *   </li>
+   * </ul>
+   *
+   * <h3>Accessibility</h3>
+   * <ul>
+   *   <li>Full-width, 44px+ vertical click target — meets minimum
+   *       touch-target guidelines.</li>
+   *   <li>Link wraps meaningful content (count, Open/Restricted Tags,
+   *       last connected date); screen readers get a coherent sentence
+   *       instead of an icon name.</li>
+   *   <li>{@code aria-label}: {@code "Open datasets for Q2KX4B: 3
+   *       connected, 2 open, 1 restricted, last updated 20 July 2026"}
+   *       — unambiguous without visual context.</li>
+   *   <li>Visual boundary (top border + tinted background) signals a
+   *       different interaction zone.</li>
+   *   <li>{@code :focus-visible} outline for keyboard navigation.</li>
+   * </ul>
+   *
+   * <h3>Layout</h3>
+   * <ol>
+   *   <li>Database icon (neutral, secondary colour)</li>
+   *   <li>Dataset count (bold) + "dataset"/"datasets" label</li>
+   *   <li>{@code ·} separator</li>
+   *   <li>{@code Tag("n Open", SUCCESS)}</li>
+   *   <li>{@code Tag("n Restricted", WARNING)}</li>
+   *   <li>{@code ·} separator</li>
+   *   <li>"Last connected dd MMM yyyy"</li>
+   *   <li>Spacer (flex-grow)</li>
+   *   <li>Trailing chevron ({@link VaadinIcon#CHEVRON_RIGHT}) — visual cue</li>
+   * </ol>
+   */
+  private Component buildDatasetFooter(ProjectOverviewWithDatasets project) {
+    var content = new Div();
+    content.getStyle().set("display", "flex");
+    content.getStyle().set("align-items", "center");
+    content.getStyle().set("gap", "var(--lumo-space-s)");
+    content.getStyle().set("flex-wrap", "wrap");
+
+    var openCount = project.connectedDatasets().stream()
+        .filter(d -> d.accessLevel() == AccessLevel.OPEN).count();
+    long restrictedCount = project.connectedDatasets().size() - openCount;
+
+    var icon = VaadinIcon.DATABASE.create();
+    icon.getStyle().set("font-size", "var(--lumo-icon-size-s)");
+    icon.getStyle().set("flex-shrink", "0");
+    icon.addClassName("color-secondary");
+    content.add(icon);
+
+    var countSpan = new Span(String.valueOf(project.connectedDatasets().size()));
+    countSpan.getStyle().set("font-weight", "700");
+    countSpan.addClassName("normal-body-text");
+    content.add(countSpan);
+
+    var labelSpan = new Span(project.connectedDatasets().size() == 1 ? "dataset" : "datasets");
+    labelSpan.addClassName("extra-small-body-text");
+    content.add(labelSpan);
+
+    content.add(buildDotSeparator());
+
+    if (openCount > 0) {
+      var openTag = new Tag("%d Open".formatted(openCount));
+      openTag.setTagColor(TagColor.SUCCESS);
+      content.add(openTag);
+    }
+    if (restrictedCount > 0) {
+      var restrictedTag = new Tag("%d Restricted".formatted(restrictedCount));
+      restrictedTag.setTagColor(TagColor.WARNING);
+      content.add(restrictedTag);
+    }
+
+    content.add(buildDotSeparator());
+
+    var lastConnected = project.connectedDatasets().stream()
+        .map(DatasetConnection::connectedOn)
+        .max(Comparator.naturalOrder())
+        .orElse(null);
+
+    var lastConnectedLabel = new Span("Last connected");
+    lastConnectedLabel.addClassName("extra-small-body-text");
+    lastConnectedLabel.addClassName("color-secondary");
+    content.add(lastConnectedLabel);
+
+    if (lastConnected != null) {
+      var lastConnectedDate = new Span(lastConnected.format(
+          DateTimeFormatter.ofPattern("dd MMM yyyy", Locale.ENGLISH)));
+      lastConnectedDate.addClassName("extra-small-body-text");
+      content.add(lastConnectedDate);
+    } else {
+      var fallback = new Span("—");
+      fallback.addClassName("extra-small-body-text");
+      fallback.addClassName("color-secondary");
+      content.add(fallback);
+    }
+
+    // Spacer to push the chevron to the right edge
+    var spacer = new Div();
+    spacer.getStyle().set("flex-grow", "1");
+    content.add(spacer);
+
+    // Trailing chevron — visual cue only; the whole footer is clickable
+    var chevron = VaadinIcon.CHEVRON_RIGHT.create();
+    chevron.getStyle().set("font-size", "var(--lumo-icon-size-s)");
+    chevron.getStyle().set("flex-shrink", "0");
+    content.add(chevron);
+
+    // ─ Wrap in RouterLink — entire footer is the link ──────────
+    var footerLink = new RouterLink(
+        "", ConnectedDatasetsMain.class,
+        new RouteParameters("projectId", project.projectId()));
+    footerLink.addClassName("project-dataset-footer");
+    footerLink.add(content);
+
+    // aria-label — meaningful text for screen readers
+    String ariaText = "Open datasets for %s: %d connected, %d open, %d restricted".formatted(
+        project.projectCode(),
+        project.connectedDatasets().size(),
+        openCount,
+        restrictedCount);
+    if (lastConnected != null) {
+      ariaText += ", last updated %s".formatted(lastConnected.format(
+          DateTimeFormatter.ofPattern("dd MMMM yyyy", Locale.ENGLISH)));
+    }
+    footerLink.getElement().setAttribute("aria-label", ariaText);
+
+    return footerLink;
+  }
+
+
+  private Div buildAvatarPlaceholder(int count) {
+    var wrapper = new Div();
+    wrapper.addClassName("flex-horizontal");
+    wrapper.getStyle().set("gap", "var(--lumo-space-0)");
+    wrapper.getStyle().set("align-items", "center");
+    wrapper.getStyle().set("margin-top", "var(--lumo-space-xs)");
+
+    // Simple colored circle placeholders (no real avatar service in prototype)
+    int show = Math.min(count, 5);
+    var colors = List.of("#5A9BD5", "#58C9B9", "#FFB627", "#E8637A", "#9B6BCD");
+    for (int i = 0; i < show; i++) {
+      var circle = new Div();
+      circle.getStyle().set("width", "28px");
+      circle.getStyle().set("height", "28px");
+      circle.getStyle().set("border-radius", "50%");
+      circle.getStyle().set("background-color", colors.get(i % colors.size()));
+      circle.getStyle().set("border", "2px solid var(--lumo-base-color)");
+      circle.getStyle().set("margin-left", i > 0 ? "-8px" : "0");
+      circle.getStyle().set("display", "flex");
+      circle.getStyle().set("align-items", "center");
+      circle.getStyle().set("justify-content", "center");
+      circle.getStyle().set("color", "white");
+      circle.getStyle().set("font-size", "10px");
+      circle.getStyle().set("font-weight", "600");
+      circle.setText(String.valueOf((char) ('A' + i)));
+      wrapper.add(circle);
+    }
+    if (count > 5) {
+      var more = new Div();
+      more.getStyle().set("width", "28px");
+      more.getStyle().set("height", "28px");
+      more.getStyle().set("border-radius", "50%");
+      more.getStyle().set("background-color", "var(--lumo-contrast-20pct)");
+      more.getStyle().set("border", "2px solid var(--lumo-base-color)");
+      more.getStyle().set("margin-left", "-8px");
+      more.getStyle().set("display", "flex");
+      more.getStyle().set("align-items", "center");
+      more.getStyle().set("justify-content", "center");
+      more.getStyle().set("color", "var(--lumo-contrast)");
+      more.getStyle().set("font-size", "10px");
+      more.getStyle().set("font-weight", "600");
+      more.setText("+" + (count - 5));
+      wrapper.add(more);
+    }
+    return wrapper;
+  }
+
+  private Span buildDotSeparator() {
+    var dot = new Span("·");
+    dot.addClassName("extra-small-body-text");
+    dot.addClassName("color-secondary");
+    return dot;
+  }
+
+  /**
+   * Navigate from a project card body click to the project's info page.
+   *
+   * <p>In the prototype this is a toast — the real implementation uses
+   * {@code UI.navigate(ProjectInformationMain.class, RouteParam(...))}.</p>
+   *
+   * <p>Intentionally NOT fired when the user clicks the dataset indicator:
+   * the chevron inside the indicator row is a {@link RouterLink} (native {@code <a>}), and anchor
+   * navigation short-circuits Vaadin's server-side click routing on the
+   * parent card element.</p>
+   */
+  private void navigateToProjectInfo(String projectId) {
+    var ui = UI.getCurrent();
+    if (ui == null) {
+      return;
+    }
+    showToast("Navigate to project info — projects/" + projectId + "/info");
+  }
+
+  private void showToast(String message) {
+    var notification = new com.vaadin.flow.component.notification.Notification(
+        new Div(message));
+    notification.setPosition(com.vaadin.flow.component.notification.Notification.Position.BOTTOM_END);
+    notification.setDuration(4000);
+    notification.addClassName("info-toast");
+    notification.open();
+  }
+
+  private void filterProjects(String query) {
+    List<ProjectOverviewWithDatasets> filtered;
+    if (query == null || query.isBlank()) {
+      filtered = new ArrayList<>(MOCK_PROJECTS);
+    } else {
+      String lower = query.toLowerCase();
+      filtered = MOCK_PROJECTS.stream()
+          .filter(p -> p.projectTitle().toLowerCase().contains(lower)
+              || p.projectCode().toLowerCase().contains(lower)
+              || p.principalInvestigator().toLowerCase().contains(lower))
+          .toList();
+    }
+    refreshProjectCards(filtered);
+  }
+
+  private void refreshProjectCards(List<ProjectOverviewWithDatasets> projects) {
+    projectCardsContainer.removeAll();
+    for (ProjectOverviewWithDatasets project : projects) {
+      projectCardsContainer.add(buildProjectCard(project));
+    }
+  }
+
+  // ══════════════════════════════════════════════════════════════════════
+  //  MOCK DATA
+  // ══════════════════════════════════════════════════════════════════════
+
+  private static List<ProjectOverviewWithDatasets> seedProjects() {
+    var projects = new ArrayList<ProjectOverviewWithDatasets>();
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q290MB", "Q290MB", "A nice test for spring boot 3.5.16",
+        Instant.parse("2026-07-24T06:29:22Z"),
+        "Tobias Koch", null,
+        List.of(new MeasurementKind("Genomics", "pink")),
+        2,
+        List.of()
+    ));
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q2KX4B", "Q2KX4B", "Vaadin 24 Update Test 2",
+        Instant.parse("2026-07-20T12:09:52Z"),
+        "Steffen Greiner", "Sven Admin Istrator",
+        List.of(new MeasurementKind("Proteomics", "violet")),
+        3,
+        List.of(
+            new DatasetConnection("ds-001", "Cryo-EM structure of human 26S proteasome",
+                "10.5281/zenodo.1234567", AccessLevel.OPEN, "Zenodo",
+                "Main experiment", LocalDate.of(2026, 7, 15)),
+            new DatasetConnection("ds-002",
+                "Proteomic profiling of T-cell receptor signaling",
+                "10.5281/zenodo.1234568", AccessLevel.OPEN, "Zenodo",
+                "TCR experiment", LocalDate.of(2026, 7, 18)),
+            new DatasetConnection("ds-003",
+                "Clinical phosphoproteomics — Cohort B (embargo)",
+                "10.5281/fdat.5554443", AccessLevel.RESTRICTED, "FDAT",
+                "Main experiment", LocalDate.of(2026, 7, 20))
+        )
+    ));
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q27QUE", "Q27QUE", "Test Ke Wang",
+        Instant.parse("2026-07-09T09:12:56Z"),
+        "Ke Wang", null,
+        List.of(new MeasurementKind("Proteomics", "violet")),
+        1,
+        List.of()
+    ));
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q28ABZ", "Q28ABZ", "Arabidopsis drought stress multi-omics",
+        Instant.parse("2026-07-15T14:03:11Z"),
+        "Heike Weber", "QBiC Steward",
+        List.of(
+            new MeasurementKind("Genomics", "pink"),
+            new MeasurementKind("Proteomics", "violet")
+        ),
+        5,
+        List.of(
+            new DatasetConnection("ds-010",
+                "NGS raw reads: Arabidopsis thaliana drought stress response",
+                "10.5281/zenodo.1234571", AccessLevel.OPEN, "Zenodo",
+                "Drought stress RNA-Seq", LocalDate.of(2026, 7, 10)),
+            new DatasetConnection("ds-011",
+                "Spatiotemporal proteome of Arabidopsis root tissue",
+                "10.5281/zenodo.1234599", AccessLevel.OPEN, "Zenodo",
+                "Root proteomics", LocalDate.of(2026, 7, 14))
+        )
+    ));
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q29CDE", "Q29CDE", "Spatial transcriptomics atlas — human kidney",
+        Instant.parse("2026-07-01T09:00:00Z"),
+        "F. Rossi", null,
+        List.of(new MeasurementKind("Genomics", "pink")),
+        4,
+        List.of(
+            new DatasetConnection("ds-020",
+                "Spatial transcriptomics atlas of human kidney development",
+                "10.5281/fdat.9876544", AccessLevel.OPEN, "FDAT",
+                "Atlas experiment", LocalDate.of(2026, 6, 28)),
+            new DatasetConnection("ds-021",
+                "Pre-publication validation cohort (controlled access)",
+                "10.5281/zenodo.3345501", AccessLevel.RESTRICTED, "Zenodo", null,
+                LocalDate.of(2026, 6, 30)),
+            new DatasetConnection("ds-022",
+                "Companion proteomics dataset",
+                "10.5281/fdat.9876600", AccessLevel.OPEN, "FDAT",
+                "Atlas experiment", LocalDate.of(2026, 7, 1)),
+            new DatasetConnection("ds-023",
+                "Ethics-board restricted imaging data",
+                "10.5281/fdat.9876700", AccessLevel.RESTRICTED, "FDAT", null,
+                LocalDate.of(2026, 7, 5))
+        )
+    ));
+
+    projects.add(new ProjectOverviewWithDatasets(
+        "Q25XYZ", "Q25XYZ", "Lipidomics reference study",
+        Instant.parse("2026-06-10T11:22:33Z"),
+        "P. Garcia", "QBiC Manager",
+        List.of(new MeasurementKind("Immunopeptidomics", "gold")),
+        7,
+        List.of(
+            new DatasetConnection("ds-030",
+                "Lipidomics reference panel — Phase I",
+                "10.5281/zenodo.4455667", AccessLevel.OPEN, "Zenodo",
+                "Phase I validation", LocalDate.of(2026, 6, 1))
+        )
+    ));
+
+    return projects;
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/general/DataSetTagFactory.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/DataSetTagFactory.java
new file mode 100644
index 0000000000..948de0def0
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/DataSetTagFactory.java
@@ -0,0 +1,78 @@
+package life.qbic.datamanager.views.general;
+
+/**
+ * Factory for dataset-related {@link Tag} components.
+ *
+ * <p>Centralized here so the connected-resources list and the
+ * connect-datasets sidebar (and any future surfaces) share the same
+ * visual language without duplicating the logic.</p>
+ *
+ * <ul>
+ *   <li><strong>Provider</strong> tags use a single neutral color
+ *       ({@link Tag.TagColor#CONTRAST}) regardless of which provider they
+ *       represent — color would imply a hierarchy or status that providers
+ *       don't carry, and per-provider coloring does not scale as more
+ *       repositories are added.</li>
+ *   <li><strong>Dataset type</strong> tags also use {@link Tag.TagColor#CONTRAST}
+ *       so they share the neutral visual weight of the provider badge.</li>
+ *   <li><strong>Access type</strong> tags encode the public/restricted status
+ *       with semantic color: {@link Tag.TagColor#SUCCESS} for public,
+ *       {@link Tag.TagColor#WARNING} for restricted.</li>
+ * </ul>
+ *
+ * <p>This factory is purely a UI-layer concern and does not depend on
+ * any domain or application classes. The caller is responsible for
+ * resolving domain-level representations (e.g. {@code AccessLevel})
+ * into simple values (e.g. a boolean) before delegating here.</p>
+ *
+ * @since 1.12.0
+ */
+public final class DataSetTagFactory {
+
+  public enum TagType {
+    DATA_SET_TYPE,
+    PROVIDER,
+    ACCESS_TYPE
+  }
+
+  private DataSetTagFactory() {}
+
+  /**
+   * Creates a tag for the given type and display text.
+   *
+   * @param type the tag category
+   * @param text the display text (e.g. provider name, resource type)
+   * @return a styled {@link Tag} ready to add to the DOM
+   */
+  public static Tag create(TagType type, String text) {
+    var tag = new Tag(text != null ? text : "");
+    tag.setTagColor(Tag.TagColor.CONTRAST);
+    return tag;
+  }
+
+  /**
+   * Creates an access-level tag.
+   *
+   * <p>{@code isPublic == true} renders with {@link Tag.TagColor#SUCCESS}
+   * (label "Public"); {@code false} renders with
+   * {@link Tag.TagColor#WARNING} (label "Restricted").</p>
+   *
+   * @param type     must be {@link TagType#ACCESS_TYPE}
+   * @param isPublic {@code true} for public access, {@code false} for
+   *     restricted
+   * @return a styled {@link Tag} ready to add to the DOM
+   * @throws IllegalArgumentException if {@code type} is not
+   *     {@link TagType#ACCESS_TYPE}
+   */
+  public static Tag create(TagType type, boolean isPublic) {
+    if (type != TagType.ACCESS_TYPE) {
+      throw new IllegalArgumentException(
+          "boolean overload only supports TagType.ACCESS_TYPE");
+    }
+    String label = isPublic ? "Public" : "Restricted";
+    Tag.TagColor color = isPublic ? Tag.TagColor.SUCCESS : Tag.TagColor.WARNING;
+    var tag = new Tag(label);
+    tag.setTagColor(color);
+    return tag;
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AlertDialog.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AlertDialog.java
new file mode 100644
index 0000000000..e90dbf7bf6
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AlertDialog.java
@@ -0,0 +1,338 @@
+package life.qbic.datamanager.views.general.dialog;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.Icon;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import java.util.Objects;
+import life.qbic.datamanager.views.general.icon.IconFactory;
+
+/**
+ * <b>Alert Dialog</b>
+ *
+ * <p>A centralized dialog for confirming destructive actions and showing
+ * warnings or errors. Implements the UX designer's Alert Dialog pattern:</p>
+ * <ul>
+ *   <li>Minimal content — icon, title, short description</li>
+ *   <li>Intent-driven styling — icon colour and confirm-button style
+ *       reflect severity ({@link Intent})</li>
+ *   <li>1–2 actions maximum (cancel + confirm, or confirm-only)</li>
+ *   <li>No complex layouts or scrolling</li>
+ * </ul>
+ *
+ * <p>Uses {@link AppDialog#small()} as its underlying dialog. Icon is
+ * styled via {@link IconFactory} for the WARNING intent and
+ * {@link VaadinIcon} for ERROR/INFO. The danger-style confirm button
+ * leverages the existing {@code .button-danger} CSS class and
+ * {@link DialogFooter#withDangerousConfirm}.</p>
+ *
+ * <p>Two entry points:</p>
+ * <pre>{@code
+ * // Shortcut for the most common case: danger-intent confirm dialog
+ * AlertDialog.danger(parent, "Remove dataset?", "This will disconnect…",
+ *     "Disconnect dataset", "Keep connection", onRemove).open();
+ *
+ * // Fluent builder for full control
+ * AlertDialog.alert(parent)
+ *     .danger()
+ *     .title("Remove dataset?")
+ *     .message("This will disconnect…")
+ *     .confirmButton("Disconnect dataset", onRemove)
+ *     .cancelButton("Keep connection", onCancel)
+ *     .build().open();
+ * }</pre>
+ *
+ * <p><b>When to use:</b></p>
+ * <ul>
+ *   <li>{@code AlertDialog} — for <em>action confirmation</em> (destructive,
+ *       irreversible ops). Uses {@link AppDialog} which has the
+ *       {@code BeforeLeaveObserver} pattern for unsaved-changes protection.</li>
+ *   <li>{@code MessageSourceNotificationFactory.dialog()} — for
+ *       <em>informational</em> pop-ups (warnings, errors, info notices
+ *       that don't require a destructive action).</li>
+ * </ul>
+ *
+ * @since 1.12.0
+ */
+public class AlertDialog {
+
+  /**
+   * Indicates the severity and visual treatment of an {@linkplain AlertDialog alert}.
+   */
+  public enum Intent {
+    /** Destructive action (red confirm button). */
+    DANGER,
+    /** Non-destructive but important confirmation. */
+    WARNING,
+    /** Something went wrong. */
+    ERROR,
+    /** Informational notice. */
+    INFO
+  }
+
+  /**
+   * Builder for constructing {@link AlertDialog}s with explicit control
+   * over intent, title, message, and actions.
+   *
+   * @since 1.12.0
+   */
+  public static class Builder {
+
+    private Intent intent = Intent.WARNING;
+    private String title;
+    private String message;
+    private String confirmLabel;
+    private DialogAction confirmAction;
+    private String cancelLabel;
+    private DialogAction cancelAction;
+
+    private Builder() {
+    }
+
+    /**
+     * Sets the intent explicitly.
+     */
+    public Builder intent(Intent intent) {
+      this.intent = Objects.requireNonNull(intent, "intent must not be null");
+      return this;
+    }
+
+    /** Shorthand for {@code intent(Intent.DANGER)}. */
+    public Builder danger() {
+      return intent(Intent.DANGER);
+    }
+
+    /** Shorthand for {@code intent(Intent.WARNING)}. */
+    public Builder warning() {
+      return intent(Intent.WARNING);
+    }
+
+    /** Shorthand for {@code intent(Intent.ERROR)}. */
+    public Builder error() {
+      return intent(Intent.ERROR);
+    }
+
+    /** Shorthand for {@code intent(Intent.INFO)}. */
+    public Builder info() {
+      return intent(Intent.INFO);
+    }
+
+    /** Sets the dialog title (header text next to the icon). */
+    public Builder title(String title) {
+      this.title = Objects.requireNonNull(title, "title must not be null");
+      return this;
+    }
+
+    /** Sets the body message shown below the title. */
+    public Builder message(String message) {
+      this.message = Objects.requireNonNull(message, "message must not be null");
+      return this;
+    }
+
+    /**
+     * Configures the confirm button label and action. At least one call
+     * to {@link #confirmButton(String, DialogAction)} is required.
+     *
+     * @throws NullPointerException if either argument is null
+     */
+    public Builder confirmButton(String label, DialogAction action) {
+      this.confirmLabel = Objects.requireNonNull(label, "confirm label must not be null");
+      this.confirmAction = Objects.requireNonNull(action, "confirm action must not be null");
+      return this;
+    }
+
+    /**
+     * Configures the cancel button label and action. Optional — omitting
+     * this produces a confirm-only dialog.
+     *
+     * @throws NullPointerException if either argument is null
+     */
+    public Builder cancelButton(String label, DialogAction action) {
+      this.cancelLabel = Objects.requireNonNull(label, "cancel label must not be null");
+      this.cancelAction = Objects.requireNonNull(action, "cancel action must not be null");
+      return this;
+    }
+
+    /**
+     * Builds the {@link AlertDialog}, composing the underlying
+     * {@link AppDialog} with all configured properties.
+     *
+     * @throws IllegalStateException if no confirm button has been set
+     */
+    public AlertDialog build() {
+      Objects.requireNonNull(confirmLabel,
+          "confirmButton(label, action) must be set before building");
+      Objects.requireNonNull(confirmAction,
+          "confirmButton(label, action) must be set before building");
+
+      var dialog = AppDialog.small();
+
+      // Icon — intent-driven colour via IconFactory for WARNING/DANGER,
+      // colour-neutral for ERROR/INFO.
+      var icon = resolveIcon();
+
+      DialogHeader.withIcon(dialog, title, icon);
+
+      // Body — message text wrapped in a span so Vaadin does not interpret
+      // HTML; the existing dialog styling handles typography.
+      var messageDiv = new Div();
+      messageDiv.add(new Span(message));
+      DialogBody.withoutUserInput(dialog, messageDiv);
+
+      // Footer — DANGER and WARNING intents get a red confirm button via the
+      // withDangerousConfirm helper; other intents use the default primary
+      // style. If no cancel action is set, the builder skips the cancel
+      // button (single-action confirmation).
+      if ((intent == Intent.DANGER || intent == Intent.WARNING) && cancelLabel != null && cancelAction != null) {
+        DialogFooter.withDangerousConfirm(dialog, cancelLabel, confirmLabel);
+      } else if (cancelLabel != null && cancelAction != null) {
+        DialogFooter.with(dialog, cancelLabel, confirmLabel);
+      } else {
+        DialogFooter.withConfirmOnly(dialog, confirmLabel);
+      }
+
+      // Actions
+      dialog.registerConfirmAction(() -> {
+        dialog.close();
+        confirmAction.execute();
+      });
+      if (cancelAction != null) {
+        dialog.registerCancelAction(() -> {
+          dialog.close();
+          cancelAction.execute();
+        });
+      }
+
+      return new AlertDialog(dialog);
+    }
+
+    /**
+     * Selects the intent-appropriate icon. WARNING and DANGER share the
+     * same orange exclamation-circle icon (from {@link IconFactory});
+     * ERROR and INFO use semantically distinct icons.
+     */
+    private Icon resolveIcon() {
+      return switch (intent) {
+        case DANGER, WARNING -> IconFactory.warningIcon();
+        case ERROR -> {
+          var icon = VaadinIcon.CLOSE_CIRCLE.create();
+          icon.addClassName("icon-color-warning");
+          icon.addClassName("icon-size-m");
+          yield icon;
+        }
+        case INFO -> {
+          var icon = VaadinIcon.INFO_CIRCLE.create();
+          icon.addClassName("icon-size-m");
+          yield icon;
+        }
+      };
+    }
+  }
+
+  private final AppDialog dialog;
+
+  private AlertDialog(AppDialog dialog) {
+    this.dialog = Objects.requireNonNull(dialog, "dialog must not be null");
+  }
+
+  /**
+   * Opens the dialog (modal on top of the current UI).
+   */
+  public void open() {
+    dialog.open();
+  }
+
+  /**
+   * Closes the dialog without dispatching the confirm action.
+   */
+  public void close() {
+    dialog.close();
+  }
+
+  /**
+   * Returns the underlying {@link AppDialog}, for cases where the
+   * caller needs a reference (e.g. to add a {@code BeforeLeaveObserver}
+   * or attach to a specific component tree).
+   */
+  public AppDialog dialog() {
+    return dialog;
+  }
+
+  // ── Static factory method: Builder entry point ────────────────────────────
+
+  /**
+   * Entry point for the fluent builder. Call this first, then chain
+   * {@code .danger()}/{@code .title()}/{@code .message()}/etc., ending
+   * with {@link Builder#build()}.
+   *
+   * <p>The {@code parent} parameter is reserved for future use (e.g.
+   * overlay parent). Not used currently but required by the design for
+   * explicit ownership.</p>
+   */
+  public static Builder alert(Component parent) {
+    Objects.requireNonNull(parent, "parent must not be null");
+    return new Builder();
+  }
+
+  // ── Static factory: danger-intent shortcut ────────────────────────────────
+
+  /**
+   * Builds and returns a pre-configured {@link AlertDialog} for the
+   * destructive-action pattern: orange warning icon, red "danger"
+   * confirm button, a cancel button labelled "Cancel" that simply
+   * closes the dialog, and a body message with the given text.
+   *
+   * <p>The {@code confirmLabel} should describe the destructive action
+   * in a concise, action-oriented verb (e.g. "Remove user",
+   * "Disconnect dataset", "Delete offer") so the user knows exactly
+   * what clicking it will do. The {@code cancelLabel} should describe
+   * the outcome of dismissing the confirm (e.g. "Keep user",
+   * "Keep connection", "Keep offer") so both buttons clearly state
+   * their respective outcomes. This avoids generic single-word labels
+   * and minimises cognitive load.
+   * The cancel action only closes the dialog (no external side-effect).
+   * If the caller needs a custom cancel handler, use
+   * {@link #alert(Component)} and {@code .cancelButton(...)} explicitly.</p>
+   *
+   * <p>Usage:</p>
+   * <pre>{@code
+   *   AlertDialog.danger(this,
+   *       "Remove dataset connection?",
+   *       "This will disconnect the dataset from the project.",
+   *       "Disconnect dataset",
+   *       "Keep connection",
+   *       () -> performRemove())
+   *       .open();
+   * }</pre>
+   *
+   * @param parent        the component that owns this dialog (for UI tree
+   *                      attachment)
+   * @param title         the header text next to the icon
+   * @param message       the body description
+   * @param confirmLabel  a concise, action-oriented label for the confirm
+   *                      button (e.g. "Remove user", "Delete offer",
+   *                      "Disconnect dataset")
+   * @param cancelLabel   a label describing the outcome of cancelling
+   *                      (e.g. "Keep user", "Keep offer",
+   *                      "Keep connection")
+   * @param onConfirm     the action invoked when the user confirms
+   * @return a ready-to-{@code open()} AlertDialog
+   * @throws NullPointerException if any argument is null
+   */
+  public static AlertDialog danger(
+      Component parent,
+      String title,
+      String message,
+      String confirmLabel,
+      String cancelLabel,
+      DialogAction onConfirm) {
+    return alert(parent)
+        .danger()
+        .title(title)
+        .message(message)
+        .confirmButton(confirmLabel, onConfirm)
+        .cancelButton(cancelLabel, () -> { /* dismiss only */ })
+        .build();
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AppDialog.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AppDialog.java
index c2282c9346..abd375bc82 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AppDialog.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AppDialog.java
@@ -103,8 +103,8 @@ private static AppDialog createConfirmDialog(DialogAction onConfirmAction) {
         IconFactory.warningIcon());
     DialogBody.withoutUserInput(confirmDialog, new Div(
         "By aborting the editing process and closing the dialog, you will lose all information entered."));
-    life.qbic.datamanager.views.general.dialog.DialogFooter.with(confirmDialog, "Continue editing",
-        "Discard changes");
+    life.qbic.datamanager.views.general.dialog.DialogFooter.withDangerousConfirm(confirmDialog,
+        "Keep editing", "Discard changes");
     confirmDialog.registerConfirmAction(() -> {
       confirmDialog.close();
       onConfirmAction.execute();
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/navigation/ProjectSideNavigationComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/navigation/ProjectSideNavigationComponent.java
index fca98352d5..e6c0527b96 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/navigation/ProjectSideNavigationComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/navigation/ProjectSideNavigationComponent.java
@@ -32,9 +32,8 @@
 import life.qbic.datamanager.security.UserPermissions;
 import life.qbic.datamanager.views.AppRoutes.ProjectRoutes;
 import life.qbic.datamanager.views.Context;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
 import life.qbic.datamanager.views.notifications.Toast;
 import life.qbic.datamanager.views.projects.overview.ProjectOverviewMain;
 import life.qbic.datamanager.views.projects.project.ProjectMainLayout;
@@ -79,7 +78,6 @@ public class ProjectSideNavigationComponent extends Div implements
   private final transient ExperimentInformationService experimentInformationService;
   private final transient AddExperimentToProjectService addExperimentToProjectService;
   private final transient UserPermissions userPermissions;
-  private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
   private final transient MessageSourceNotificationFactory messageSourceNotificationFactory;
   private final transient TerminologyService terminologyService;
   private final transient SpeciesLookupService speciesLookupService;
@@ -92,7 +90,6 @@ public ProjectSideNavigationComponent(
       UserPermissions userPermissions,
       SpeciesLookupService speciesLookupService,
       TerminologyService terminologyService,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       MessageSourceNotificationFactory messageSourceNotificationFactory) {
     content = new Div();
     requireNonNull(projectInformationService);
@@ -100,8 +97,6 @@ public ProjectSideNavigationComponent(
     requireNonNull(addExperimentToProjectService);
     this.messageSourceNotificationFactory = requireNonNull(messageSourceNotificationFactory,
         "messageSourceNotificationFactory must not be null");
-    this.cancelConfirmationDialogFactory = requireNonNull(cancelConfirmationDialogFactory,
-        "cancelConfirmationDialogFactory must not be null");
     this.speciesLookupService = speciesLookupService;
     this.addExperimentToProjectService = addExperimentToProjectService;
     this.userPermissions = requireNonNull(userPermissions, "userPermissions must not be null");
@@ -186,6 +181,7 @@ private static Span generateSectionDivider() {
   private static Div createProjectItems(String projectId, boolean canUserAdministrate) {
     Div projectItems = new Div();
     projectItems.add(createProjectSummaryLink(projectId));
+    projectItems.add(createProjectDatasetsLink(projectId));
     if (canUserAdministrate) {
       projectItems.add(createProjectUsers(projectId));
     }
@@ -200,6 +196,11 @@ private static SideNavItem createProjectSummaryLink(String projectId) {
         projectSummaryPath, VaadinIcon.DEINDENT.create());
   }
 
+  private static SideNavItem createProjectDatasetsLink(String projectId) {
+    String datasetsPath = String.format(ProjectRoutes.DATASETS, projectId);
+    return new SideNavItem("DATASETS", datasetsPath, VaadinIcon.DATABASE.create());
+  }
+
   private static SideNavItem createProjectUsers(String projectId) {
     String projectUsersPath = String.format(ProjectRoutes.ACCESS, projectId);
     return new SideNavItem("USERS", projectUsersPath,
@@ -334,12 +335,14 @@ private void showAddExperimentDialog() {
   }
 
   private void showCancelConfirmationDialog(AddExperimentDialog creationDialog) {
-    NotificationDialog confirmationDialog = cancelConfirmationDialogFactory.cancelConfirmationDialog(
-        it -> creationDialog.close(),
-        "experiment.create",
-        getLocale()
-    );
-    confirmationDialog.open();
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", creationDialog::close)
+        .cancelButton("Keep editing", () -> {})
+        .build()
+        .open();
   }
 
   private void onExperimentAddEvent(ExperimentAddEvent event) {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/CancelConfirmationDialogFactory.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/CancelConfirmationDialogFactory.java
deleted file mode 100644
index 0bd3895cf8..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/CancelConfirmationDialogFactory.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package life.qbic.datamanager.views.notifications;
-
-import com.vaadin.flow.component.Html;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.confirmdialog.ConfirmDialog.ConfirmEvent;
-import com.vaadin.flow.component.html.Span;
-import java.util.Locale;
-import java.util.function.Consumer;
-import life.qbic.logging.api.Logger;
-import life.qbic.logging.service.LoggerFactory;
-import org.springframework.context.MessageSource;
-import org.springframework.context.NoSuchMessageException;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CancelConfirmationDialogFactory {
-
-  private static final MessageType DEFAULT_MESSAGE_TYPE = MessageType.HTML; //set to html as text works with it too
-  private static final String DEFAULT_TITLE = "Discard Changes?";
-  private static final String DEFAULT_CONTENT = "By aborting the editing process and closing the dialog, you will lose all information entered.";
-  private static final String DEFAULT_CONFIRM_TEXT = "Discard Changes";
-  private static final Object[] EMPTY_PARAMETERS = new Object[]{};
-  private static final Logger log = LoggerFactory.logger(CancelConfirmationDialogFactory.class);
-  private final MessageSource messageSource;
-
-
-  public CancelConfirmationDialogFactory(MessageSource messageSource) {
-    this.messageSource = messageSource;
-  }
-
-  private static com.vaadin.flow.component.Component createContentComponent(MessageType contentType,
-      String contentText) {
-    return switch (contentType) {
-      case HTML -> new Html("<div style=\"display:contents\">%s</div>".formatted(contentText));
-      case TEXT -> new Span(contentText);
-    };
-  }
-
-  /**
-   * Creates an instance of an {@link NotificationDialog} with title and message based on the
-   * provided key.
-   *
-   * @param key The message key to determine the content and title of the {@link NotificationDialog}.
-   * @param locale
-   * @return the notification dialog
-   * @since
-   */
-  public NotificationDialog cancelConfirmationDialog(String key, Locale locale) {
-    return buildDialog(key, locale);
-  }
-
-  public NotificationDialog cancelConfirmationDialog(Consumer<ConfirmEvent> onCancelConfirmed,
-      String key, Locale locale) {
-    var confirmCancelDialog = buildDialog(key, locale);
-    confirmCancelDialog.addCancelListener(event -> event.getSource().close());
-
-    confirmCancelDialog.addConfirmListener(event -> {
-      event.getSource().close();
-      onCancelConfirmed.accept(event);
-    });
-    return confirmCancelDialog;
-  }
-
-  private NotificationDialog buildDialog(String key, Locale locale) {
-    String title = parseTitle(key, locale);
-    MessageType contentType = parseMessageType(key, locale);
-    String contentText = parseMessageText(key, locale);
-    String confirmText = parseConfirmText(key, locale);
-    var content = createContentComponent(contentType, contentText);
-
-    NotificationDialog confirmCancelDialog = NotificationDialog.warningDialog()
-        .withTitle(title)
-        .withContent(content);
-    confirmCancelDialog.setCancelable(true);
-    confirmCancelDialog.setCancelText("Continue Editing");
-    Button redButton = new Button(confirmText);
-    redButton.addClassName("danger");
-    confirmCancelDialog.setConfirmButton(redButton);
-    return confirmCancelDialog;
-  }
-
-  private String parseConfirmText(String key, Locale locale) {
-    return messageSource.getMessage("%s.cancel-confirmation.confirm-text".formatted(key),
-        new Object[]{}, DEFAULT_CONFIRM_TEXT, locale);
-  }
-
-  private String parseMessageText(String key, Locale locale) {
-    return messageSource.getMessage("%s.cancel-confirmation.message.text".formatted(key),
-        new Object[]{}, DEFAULT_CONTENT, locale);
-  }
-
-  private String parseTitle(String key, Locale locale) {
-    return messageSource.getMessage("%s.cancel-confirmation.title".formatted(key),
-        new Object[]{}, DEFAULT_TITLE, locale);
-  }
-
-  private MessageType parseMessageType(String key, Locale locale) {
-    try {
-      String messageType = messageSource.getMessage(
-          "%s.cancel-confirmation.message.type".formatted(key),
-          EMPTY_PARAMETERS, locale).strip().toUpperCase();
-      return MessageType.valueOf(messageType);
-    } catch (NoSuchMessageException e) {
-      log.warn("No message type specified for %s.".formatted(key));
-      return DEFAULT_MESSAGE_TYPE;
-    }
-  }
-
-  private enum MessageType {
-    HTML,
-    TEXT
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/MessageSourceNotificationFactory.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/MessageSourceNotificationFactory.java
index e29baf3e49..ef98f5519a 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/MessageSourceNotificationFactory.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/MessageSourceNotificationFactory.java
@@ -66,7 +66,7 @@ public Toast toast(String key, Object[] parameters, Locale locale) {
     String messageText = parseMessage(key, parameters, locale);
 
     Component content = switch (type) {
-      case HTML -> new Html("<div style=\"display:contents\">%s</div>".formatted(messageText));
+      case HTML -> new Html("<div>%s</div>".formatted(messageText));
       case TEXT -> new Span(messageText);
     };
 
@@ -74,6 +74,7 @@ public Toast toast(String key, Object[] parameters, Locale locale) {
     Duration duration = parseDuration(key, locale).orElse(Toast.DEFAULT_OPEN_DURATION);
 
     Toast toast = new Toast(level);
+    toast.withLevelIcon(level);
     toast.withContent(content);
     toast.setDuration(duration);
 
@@ -115,11 +116,11 @@ public Toast routingToast(String key, Object[] messageArgs, Object[] routeArgs,
    * {@link Duration#ZERO}, since it is the client's job to close the toast explicitly after the
    * pending task has finished.
    * <p>
-   * The following message keys have to be present:
+   * The toast uses the progress layout (no icon) with:
    * <ul>
-   *   <li>{@code <key>.message.type}
-   *   <li>{@code <key>.message.text}
-   *   <li>{@code <key>.routing.link.text}
+   *   <li>Title (from message.text) in 18px bold</li>
+   *   <li>Indeterminate progress bar</li>
+   *   <li>Optional subtext (from message.subtext) in 16px regular</li>
    * </ul>
    * <p>
    * For more information please see toast-notifications.properties
@@ -127,55 +128,62 @@ public Toast routingToast(String key, Object[] messageArgs, Object[] routeArgs,
    * @param key         the key for the messages
    * @param messageArgs the parameters shown in the message
    * @param locale      the locale for which to load the message
-   * @return a Toast with loaded content
-   * @see #toast(String, Object[], Locale)
+   * @return a Toast with progress indicator
    */
   public Toast pendingTaskToast(String key, Object[] messageArgs, Locale locale) {
-    var toast = toast(key, messageArgs, locale);
+    String messageText = parseMessage(key, messageArgs, locale);
+    NotificationLevel level = parseLevel(key, locale);
+
+    Toast toast = new Toast(level);
+    toast.withTitle(messageText);
+    parseSubtext(key, locale).ifPresent(toast::withSubtext);
+
     var progressBar = new ProgressBar();
     progressBar.setIndeterminate(true);
+    toast.withProgressBar(progressBar);
     toast.setDuration(Duration.ZERO);
-    return toast.add(progressBar);
+
+    return toast;
   }
 
   /**
-   * Creates a dialog notification with the contents found for the message key. This method produces
-   * a notification dialog with the link text read from the message properties file.
-   *
+   * Creates a toast with an action button (e.g., "Retry", "Try Again") for error scenarios.
+   * Useful for error toasts where the user can take corrective action.
    * <p>
-   * The following message keys have to be present:
+   * The toast includes:
    * <ul>
-   *   <li>{@code <key>.title} - the title; optional
-   *   <li>{@code <key>.level} - the level; mandatory
-   *   <li>{@code <key>.message.type} - the type (text or html); mandatory
-   *   <li>{@code <key>.message.text} - the text; mandatory
-   *   <li>{@code <key>.confirm-text} - the text of the confirm button; optional
+   *   <li>Error icon (red close-circle)</li>
+   *   <li>Error message</li>
+   *   <li>Action button (styled with #66A8FF)</li>
+   *   <li>Close button</li>
    * </ul>
-   * <p>
-   * For more information please see dialog-notifications.properties
    *
-   * @param key        the key for the messages
-   * @param parameters parameters to use in the message
-   * @param locale     the locale for which to load the message
-   * @return a notification dialog with loaded content
+   * @param key              the key for the messages
+   * @param parameters       the parameters shown in the message
+   * @param actionLabel      the action button label (e.g., "Try Again")
+   * @param actionListener   the click handler for the action button
+   * @param locale           the locale for which to load the message
+   * @return a Toast with an action button
    */
-  public NotificationDialog dialog(String key, Object[] parameters, Locale locale) {
-    MessageType type = parseMessageType(key, locale);
-    String messageText = parseMessage(key, parameters, locale);
-    Component content = switch (type) {
-      case HTML -> new Html("<div style=\"display:contents\">%s</div>".formatted(messageText));
-      case TEXT -> new Span(messageText);
-    };
-
-    NotificationLevel level = parseLevel(key, locale);
-    NotificationDialog notificationDialog = new NotificationDialog(level)
-        .withContent(content);
-    parseTitle(key, locale).ifPresent(notificationDialog::withTitle);
-    parseConfirmText(key, locale).ifPresentOrElse(
-        notificationDialog::setConfirmText,
-        () -> notificationDialog.setConfirmText(DEFAULT_CONFIRM_TEXT));
+  public Toast actionToast(String key, Object[] parameters, String actionLabel,
+      com.vaadin.flow.component.ComponentEventListener<com.vaadin.flow.component.ClickEvent<com.vaadin.flow.component.button.Button>> actionListener,
+      Locale locale) {
+    Toast toast = toast(key, parameters, locale);
+    toast.withAction(actionLabel, actionListener);
+    return toast;
+  }
 
-    return notificationDialog;
+  /**
+   * Parses an optional subtext key for progress toasts.
+   */
+  private Optional<String> parseSubtext(String key, Locale locale) {
+    try {
+      return Optional.of(messageSource.getMessage("%s.message.subtext".formatted(key),
+          new Object[]{}, locale).strip());
+    } catch (NoSuchMessageException e) {
+      log.debug("No subtext specified for %s.message.subtext".formatted(key));
+      return Optional.empty();
+    }
   }
 
   private NotificationLevel parseLevel(String key, Locale locale) {
@@ -222,16 +230,6 @@ private MessageType parseMessageType(String key, Locale locale) {
 
   }
 
-  private Optional<String> parseTitle(String key, Locale locale) {
-    try {
-      return Optional.of(messageSource.getMessage("%s.title".formatted(key),
-          EMPTY_PARAMETERS, locale).strip());
-    } catch (NoSuchMessageException e) {
-      log.warn("No title specified for %s.title".formatted(key));
-      return Optional.empty();
-    }
-  }
-
   private Optional<Duration> parseDuration(String key, Locale locale) {
     String durationProperty = messageSource.getMessage("%s.duration".formatted(key),
         EMPTY_PARAMETERS, null, locale);
@@ -257,11 +255,6 @@ private String parseLinkText(String key, Object[] routeArgs, Locale locale) {
     return linkText;
   }
 
-  private Optional<String> parseConfirmText(String key, Locale locale) {
-    return Optional.ofNullable(messageSource.getMessage("%s.confirm-text".formatted(key),
-        new Object[]{}, null, locale));
-  }
-
   private enum MessageType {
     HTML,
     TEXT
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/NotificationDialog.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/NotificationDialog.java
deleted file mode 100644
index 8f3a9b1e3b..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/NotificationDialog.java
+++ /dev/null
@@ -1,200 +0,0 @@
-package life.qbic.datamanager.views.notifications;
-
-import static java.util.Objects.requireNonNull;
-
-import com.vaadin.flow.component.Component;
-import com.vaadin.flow.component.confirmdialog.ConfirmDialog;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.H2;
-import com.vaadin.flow.component.html.Span;
-import com.vaadin.flow.component.icon.Icon;
-import com.vaadin.flow.component.icon.VaadinIcon;
-import com.vaadin.flow.dom.Style.Display;
-import com.vaadin.flow.router.BeforeLeaveEvent;
-import com.vaadin.flow.router.BeforeLeaveObserver;
-
-/**
- * A dialog notifying the user of some event.
- * <p>
- * By default, this dialog comes with an icon and a text in the header. You can modify the header
- * text with {@link #withTitle}. When setting the icon with {@link #withHeaderIcon}, you can modify
- * the color of the icon by assigning the following css classes:
- * <ul>
- *   <li>success-icon</li>
- *   <li>warning-icon</li>
- *   <li>error-icon</li>
- *   <li>info-icon</li>
- * </ul>
- * The dialog itself is assigned a corresponding CSS class
- * <ul>
- *   <li>success-dialog</li>
- *   <li>warning-dialog</li>
- *   <li>error-dialog</li>
- *   <li>info-dialog</li>
- * </ul>
- */
-public class NotificationDialog extends ConfirmDialog implements BeforeLeaveObserver {
-
-  private final H2 title;
-  private final NotificationLevel level;
-  protected final Div layout;
-  private Icon headerIcon;
-  protected Component content;
-
-  protected NotificationDialog(NotificationLevel level) {
-    addClassName("notification-dialog");
-    addClassName(switch (level) {
-      case SUCCESS -> "success-dialog";
-      case WARNING -> "warning-dialog";
-      case ERROR -> "error-dialog";
-      case INFO -> "info-dialog";
-    });
-    this.level = requireNonNull(level, "level must not be null");
-
-    var defaultTitle = switch (level) {
-      case SUCCESS -> "Success";
-      case WARNING -> "Warning";
-      case ERROR -> "Error";
-      case INFO -> "Please note";
-    };
-    title = new H2(defaultTitle);
-    title.addClassName("title");
-    withHeaderIcon(typeBasedHeaderIcon(this.level));
-    updateHeader();
-
-    layout = new Div();
-    layout.addClassName("content");
-    this.content = new Div();
-    layout.add(this.content);
-    setText(layout);
-    setConfirmText("Okay");
-  }
-
-  protected static Icon typeBasedHeaderIcon(NotificationLevel notificationLevel) {
-    var iconCssClass = switch (notificationLevel) {
-      case SUCCESS -> "success-icon";
-      case WARNING -> "warning-icon";
-      case ERROR -> "error-icon";
-      case INFO -> "info-icon";
-    };
-    var icon = switch (notificationLevel) {
-      case SUCCESS -> VaadinIcon.CHECK.create();
-      case WARNING -> VaadinIcon.WARNING.create();
-      case ERROR -> VaadinIcon.CLOSE_CIRCLE.create();
-      case INFO -> VaadinIcon.INFO_CIRCLE.create();
-    };
-    icon.addClassName(iconCssClass);
-    return icon;
-  }
-
-  /**
-   * Creates a new notification dialog
-   *
-   * @return a notification dialog showing a success notification
-   */
-  public static NotificationDialog successDialog() {
-    return new NotificationDialog(NotificationLevel.SUCCESS);
-  }
-
-  /**
-   * Creates a new notification dialog
-   *
-   * @return a notification dialog showing a warning notification
-   */
-  public static NotificationDialog warningDialog() {
-    return new NotificationDialog(NotificationLevel.WARNING);
-  }
-
-  /**
-   * Creates a new notification dialog
-   *
-   * @return a notification dialog showing an error notification
-   */
-  public static NotificationDialog errorDialog() {
-    return new NotificationDialog(NotificationLevel.ERROR);
-  }
-
-  /**
-   * Creates a new notification dialog
-   *
-   * @return a notification dialog showing an info notification
-   */
-  public static NotificationDialog infoDialog() {
-    return new NotificationDialog(NotificationLevel.INFO);
-  }
-
-  private void updateHeader() {
-    setHeader(new Span(headerIcon, title));
-  }
-
-  /**
-   * Changes the header icon to the icon specified.
-   *
-   * @param icon the icon to display in the header
-   * @param <T>
-   * @return a modified notification dialog
-   */
-  public <T extends NotificationDialog> T withHeaderIcon(Icon icon) {
-    this.headerIcon = icon;
-    updateHeader();
-    return (T) this;
-  }
-
-  /**
-   * Changes the title of the dialog. Does not touch the icon.
-   *
-   * @param text the title of the dialog
-   * @param <T>
-   * @return a dialog with the provided title
-   */
-  public <T extends NotificationDialog> T withTitle(String text) {
-    title.setText(text);
-    updateHeader();
-    return (T) this;
-  }
-
-  /**
-   * Sets the content of the dialog.
-   * <p>
-   * The content can be any {@link Component}. Previous content is removed from the dialog when
-   * calling this method. The content provided must not be null but can be any empty component.
-   *
-   * @param content the new content of the dialog
-   * @param <T>
-   * @return the modified dialog
-   */
-  public <T extends NotificationDialog> T withContent(Component content) {
-    if (this.content != null) {
-      this.content.removeFromParent();
-    }
-    this.content = requireNonNull(content, "content must not be null");
-    layout.removeAll();
-    layout.add(this.content);
-    return (T) this;
-  }
-
-  /**
-   * Sets the content of the dialog.
-   * <p>
-   * The content can be any number of {@link Component}s. At least one component is required.
-   * <p>
-   * Previous content is removed from the dialog when calling this method.
-   *
-   * @param content the new content of the dialog
-   * @param <T>
-   * @return the modified dialog
-   */
-  public <T extends NotificationDialog> T withContent(Component... content) {
-    if (content.length <= 0) {
-      throw new IllegalArgumentException("Content must have at least one element");
-    }
-    Div hiddenCollectionDiv = new Div(content);
-    hiddenCollectionDiv.getStyle().setDisplay(Display.CONTENTS);
-    return withContent(hiddenCollectionDiv);
-  }
-
-  @Override
-  public void beforeLeave(BeforeLeaveEvent event) {
-    this.close();
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/Toast.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/Toast.java
index 6688b3819e..817be1e93a 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/Toast.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/notifications/Toast.java
@@ -4,18 +4,24 @@
 import static java.util.Objects.requireNonNull;
 
 import com.vaadin.flow.component.AttachEvent;
+import com.vaadin.flow.component.ClickEvent;
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEventListener;
 import com.vaadin.flow.component.UI;
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.Html;
 import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.icon.Icon;
 import com.vaadin.flow.component.notification.Notification;
+import com.vaadin.flow.component.orderedlayout.FlexComponent.Alignment;
+import com.vaadin.flow.component.orderedlayout.HorizontalLayout;
+import com.vaadin.flow.component.orderedlayout.VerticalLayout;
+import com.vaadin.flow.component.progressbar.ProgressBar;
 import com.vaadin.flow.router.BeforeLeaveListener;
 import com.vaadin.flow.router.RouteParameters;
 import com.vaadin.flow.router.RouterLink;
 import com.vaadin.flow.shared.Registration;
-import com.vaadin.flow.theme.lumo.LumoIcon;
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,6 +39,7 @@
  */
 public final class Toast extends Notification {
 
+
   static final boolean DEFAULT_CLOSE_ON_NAVIGATION = true;
   static final Duration DEFAULT_OPEN_DURATION = Duration.ofSeconds(5);
   private static final Position DEFAULT_POSITION = Position.BOTTOM_START;
@@ -40,7 +47,11 @@ public final class Toast extends Notification {
   private final Button closeButton;
 
   private Component content;
-
+  private Component levelIcon;
+  private Component actionButton;
+  private ProgressBar progressBar;
+  private String title;
+  private String subtext;
 
   Toast(NotificationLevel level) {
     super();
@@ -54,33 +65,125 @@ public final class Toast extends Notification {
     setPosition(DEFAULT_POSITION);
     setDuration(DEFAULT_OPEN_DURATION);
 
-    closeButton = buttonClosing(this);
-    add(closeButton);
+    closeButton = createCloseButton();
     closeOnNavigation(DEFAULT_CLOSE_ON_NAVIGATION);
   }
 
-  private static Button buttonClosing(Toast toast) {
-    var button = new Button(LumoIcon.CROSS.create());
+  private Button createCloseButton() {
+    var icon = new Icon();
+    icon.getElement().setAttribute("icon", "vaadin:close-small");
+    icon.addClassName("close-icon");
+    var button = new Button(icon);
     button.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE);
-    button.addClickListener(it -> toast.close());
     button.addClassName("close-button");
+    button.addClickListener(it -> close());
     return button;
   }
 
   /**
-   * Creates a matching toast content containing routing components with the correct css classes.
+   * Sets an icon for the toast based on the notification level. Icons are 28x28px circular elements
+   * with a colored background and a white Lumo symbol centered inside.
    *
-   * @param content
-   * @param routingComponent
-   * @return
+   * @param level the notification level determining the icon color
+   * @return the modified toast
    */
-  private static Component createRoutingContent(Component content, Component routingComponent) {
-    var container = new Div();
-    container.addClassName("routing-container");
-    content.addClassName("routing-content");
-    routingComponent.addClassName("routing-link");
-    container.add(content, routingComponent);
-    return container;
+  Toast withLevelIcon(NotificationLevel level) {
+    Component icon = getInfoForLevel(level);
+
+    Div iconContainer = new Div(icon);
+    iconContainer.addClassName("toast-icon");
+    iconContainer.addClassName(getIconLevelClass(level));
+    iconContainer.getElement().setAttribute("aria-label",
+        "Notification status indicator");
+
+    this.levelIcon = iconContainer;
+    refresh();
+    return this;
+  }
+
+  private Component getInfoForLevel(NotificationLevel level) {
+    return switch (level) {
+      case SUCCESS -> {
+        var icon = new Icon();
+        icon.getElement().setAttribute("icon", "vaadin:check");
+        yield icon;
+      }
+      case ERROR, WARNING -> {
+        var icon = new Icon();
+        icon.getElement().setAttribute("icon", "vaadin:close");
+        yield icon;
+      }
+      case INFO -> {
+        var icon = new Icon();
+        icon.getElement().setAttribute("icon", "vaadin:info");
+        yield icon;
+      }
+    };
+  }
+
+  private String getIconLevelClass(NotificationLevel level) {
+    return switch (level) {
+      case SUCCESS -> "toast-icon-success";
+      case ERROR, WARNING -> "toast-icon-error";
+      case INFO -> "toast-icon-info";
+    };
+  }
+
+  /**
+   * Sets a title for the toast (used in progress/indeterminate toasts).
+   * Title is displayed in 16px bold text above the main content.
+   * Supports HTML markup.
+   *
+   * @param title the title text (may contain HTML markup)
+   * @return the modified toast
+   */
+  Toast withTitle(String title) {
+    requireNonNull(title, "title must not be null");
+    this.title = title;
+    if (progressBar != null) {
+      refresh();
+    }
+    return this;
+  }
+
+  /**
+   * Sets subtext for the toast (used in progress/indeterminate toasts).
+   * Subtext is displayed in 16px regular text below the progress bar.
+   * Supports HTML markup.
+   *
+   * @param subtext the subtext (may contain HTML markup)
+   * @return the modified toast
+   */
+  Toast withSubtext(String subtext) {
+    requireNonNull(subtext, "subtext must not be null");
+    this.subtext = subtext;
+    if (progressBar != null) {
+      refresh();
+    }
+    return this;
+  }
+
+  /**
+   * Adds an action button to the toast (e.g., "Retry", "Try Again").
+   * Action buttons are styled with the primary accent color (#66A8FF) and a subtle background.
+   *
+   * @param label the button label
+   * @param listener the click listener to invoke when the action button is clicked
+   * @return the modified toast
+   */
+  Toast withAction(String label, ComponentEventListener<ClickEvent<Button>> listener) {
+    requireNonNull(label, "label must not be null");
+    requireNonNull(listener, "listener must not be null");
+    var button = new Button(label);
+    button.addClassName("action-button");
+    button.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    button.getElement().setAttribute("aria-label", label);
+    this.actionButton = button;
+    button.addClickListener(listener);
+    // Auto-close toast on action click
+    button.addClickListener(event -> close());
+    refresh();
+    return this;
   }
 
   /**
@@ -121,29 +224,15 @@ public void setDuration(Duration duration) {
   }
 
   /**
-   * Expands the toast and includes a link to a specific route target.
-   *
-   * @param linkText         The text of the link shown to the user
-   * @param navigationTarget the target of the navigation
-   * @param routeParameters  the parameters used for navigation
-   * @return
-   */
-  Toast withRouting(String linkText, Class<? extends Component> navigationTarget,
-      RouteParameters routeParameters) {
-    return this.withContent(Toast.createRoutingContent(this.content, createRoutingComponent(
-        linkText, navigationTarget, routeParameters)));
-  }
-
-  /**
-   * Sets the content of the toast
+   * Sets the content of the toast.
+   * Content is displayed in with the toast's primary text color.
    *
    * @param content the content of the toast to set.
-   * @return
+   * @return the modified toast
    */
   Toast withContent(Component content) {
     requireNonNull(content, "content must not be null");
-    //we only want to remove the current content from its parent if the parent is not the new content.
-    //Otherwise the current content would be removed from the new content as well.
+    // Remove current content from parent if different
     if (nonNull(this.content) && !ComponentFunctions.isParentOf(content, this.content)) {
       this.content.removeFromParent();
     }
@@ -153,9 +242,86 @@ Toast withContent(Component content) {
     return this;
   }
 
+  /**
+   * Adds a progress bar to the toast. When set, the toast enters progress mode:
+   * the center slot renders a vertical layout (title, progress bar, subtext)
+   * instead of the content component, and alignment switches to BASELINE.
+   * <p>
+   * Composable with {@link #withTitle(String)} and {@link #withSubtext(String)}
+   * in any order.
+   *
+   * @param progressBar the progress bar component (should be indeterminate)
+   * @return the modified toast
+   */
+  Toast withProgressBar(ProgressBar progressBar) {
+    requireNonNull(progressBar, "progressBar must not be null");
+    this.progressBar = progressBar;
+    refresh();
+    return this;
+  }
+
+  /**
+   * Builds the vertical layout used in progress mode: title, progress bar, subtext.
+   */
+  private Component buildProgressLayout() {
+    var barContainer = new Div(progressBar);
+    barContainer.addClassName("progress-bar-container");
+
+    var verticalLayout = new VerticalLayout();
+    verticalLayout.addClassName("progress-vertical");
+    verticalLayout.setSpacing(false);
+    verticalLayout.setPadding(false);
+
+    if (title != null) {
+      var titleElement = new Html("<span class=\"toast-title\">" + title + "</span>");
+      verticalLayout.add(titleElement);
+    }
+
+    verticalLayout.add(barContainer);
+
+    if (subtext != null) {
+      var subtextElement = new Html("<span class=\"toast-subtext\">" + subtext + "</span>");
+      verticalLayout.add(subtextElement);
+    }
+
+    return verticalLayout;
+  }
+
+  /**
+   * Refreshes the toast content and layout.
+   * <p>
+   * In progress mode (progress bar set), the center slot is a vertical layout
+   * built from title + progress bar + subtext, aligned at {@code BASELINE}.
+   * Otherwise the center slot is {@link #content}, aligned at {@code CENTER}.
+   * <p>
+   * Builds: HorizontalLayout(icon?, center, actionButton?, closeButton)
+   */
   private void refresh() {
     removeAll();
-    add(this.content, this.closeButton);
+    var layout = new HorizontalLayout();
+    layout.addClassName("toast-layout");
+
+    boolean isProgress = (progressBar != null);
+    layout.setAlignItems(isProgress ? Alignment.BASELINE : Alignment.CENTER);
+
+    // Add level icon if present (stored separately from content)
+    if (levelIcon != null) {
+      layout.add(levelIcon);
+    }
+
+    if (isProgress) {
+      layout.add(buildProgressLayout());
+    } else if (this.content != null) {
+      layout.add(this.content);
+    }
+
+    if (actionButton != null) {
+      layout.add(actionButton);
+    }
+    layout.add(closeButton);
+    layout.setSpacing(true);
+    layout.setPadding(false);
+    super.add(layout);
   }
 
   /**
@@ -177,6 +343,40 @@ private Component createRoutingComponent(String text,
     return routerLink;
   }
 
+  /**
+   * Creates a matching toast content containing routing components with the correct css classes.
+   *
+   * @param content
+   * @param routingComponent
+   * @return
+   */
+  private static Component createRoutingContent(Component content, Component routingComponent) {
+    var container = new Div();
+    container.addClassName("routing-container");
+    content.addClassName("routing-content");
+    routingComponent.addClassName("routing-link");
+    container.add(content, routingComponent);
+    return container;
+  }
+
+  /**
+   * Expands the toast and includes a link to a specific route target.
+   *
+   * @param linkText         The text of the link shown to the user
+   * @param navigationTarget the target of the navigation
+   * @param routeParameters  the parameters used for navigation
+   * @return
+   */
+  Toast withRouting(String linkText, Class<? extends Component> navigationTarget,
+      RouteParameters routeParameters) {
+    var routingContent = createRoutingContent(this.content, createRoutingComponent(
+        linkText, navigationTarget, routeParameters));
+    this.content.removeFromParent();
+    this.content = routingContent;
+    refresh();
+    return this;
+  }
+
   /**
    * Adds a component to the {@link Toast}. If content already exists, the existing component is
    * taken and wrapped together with the new component in a {@link Div}, without extra formatting.
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/AddProjectDialog.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/AddProjectDialog.java
index ccad715077..e64060a48a 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/AddProjectDialog.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/AddProjectDialog.java
@@ -23,9 +23,8 @@
 import life.qbic.datamanager.views.general.QbicDialog;
 import life.qbic.datamanager.views.general.Stepper;
 import life.qbic.datamanager.views.general.Stepper.StepIndicator;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.general.funding.FundingEntry;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
 import life.qbic.datamanager.views.projects.create.CollaboratorsLayout.ProjectCollaborators;
 import life.qbic.datamanager.views.projects.create.ExperimentalInformationLayout.ExperimentalInformation;
 import life.qbic.datamanager.views.projects.create.ProjectDesignLayout.ProjectDesign;
@@ -61,7 +60,6 @@ public class AddProjectDialog extends QbicDialog {
   private final Button nextButton;
 
   private final Map<String, Component> stepContent;
-  private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
 
   private StepIndicator addStep(Stepper stepper, String label, Component layout) {
     stepContent.put(label, layout);
@@ -71,8 +69,7 @@ private StepIndicator addStep(Stepper stepper, String label, Component layout) {
   public AddProjectDialog(ProjectInformationService projectInformationService,
       FinanceService financeService,
       PersonLookupService personLookupService,
-      SpeciesLookupService speciesLookupService, TerminologyService terminologyService,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory) {
+      SpeciesLookupService speciesLookupService, TerminologyService terminologyService) {
     super();
 
     addClassName("add-project-dialog");
@@ -81,8 +78,6 @@ public AddProjectDialog(ProjectInformationService projectInformationService,
     requireNonNull(personLookupService, "personLookupService must not be null");
     requireNonNull(speciesLookupService,
         "ontologyTermInformationService must not be null");
-    this.cancelConfirmationDialogFactory = requireNonNull(cancelConfirmationDialogFactory,
-        "cancelConfirmationDialogFactory must not be null");
     this.projectDesignLayout = new ProjectDesignLayout(projectInformationService, financeService);
     this.fundingInformationLayout = new FundingInformationLayout();
     this.collaboratorsLayout = new CollaboratorsLayout(personLookupService);
@@ -147,9 +142,14 @@ public void enableOfferSearch() {
   }
 
   private void onCancelClicked() {
-    NotificationDialog cancelConfirmationDialog = cancelConfirmationDialogFactory.cancelConfirmationDialog(
-        it -> close(), "project.create", getLocale());
-    cancelConfirmationDialog.open();
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", () -> close())
+        .cancelButton("Keep editing", () -> {})
+        .build()
+        .open();
   }
 
   private void onConfirmClicked(ClickEvent<Button> event) {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/OntologyComboboxFactory.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/OntologyComboboxFactory.java
index cbc8431c58..8fabe0175e 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/OntologyComboboxFactory.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/create/OntologyComboboxFactory.java
@@ -5,13 +5,11 @@
 import com.vaadin.flow.component.combobox.MultiSelectComboBox;
 import com.vaadin.flow.data.provider.CallbackDataProvider.FetchCallback;
 import com.vaadin.flow.data.renderer.ComponentRenderer;
-import java.util.List;
 import java.util.Objects;
 import life.qbic.datamanager.views.general.OntologyComponent;
 import life.qbic.datamanager.views.projects.project.experiments.OntologyFilterConnector;
 import life.qbic.projectmanagement.application.ontology.SpeciesLookupService;
 import life.qbic.projectmanagement.application.ontology.TerminologyService;
-import life.qbic.projectmanagement.domain.model.Ontology;
 import life.qbic.projectmanagement.domain.model.OntologyTerm;
 
 /**
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/ProjectOverviewMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/ProjectOverviewMain.java
index 083588d9b1..6aa1e7cf2a 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/ProjectOverviewMain.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/ProjectOverviewMain.java
@@ -23,7 +23,6 @@
 import life.qbic.datamanager.views.general.Main;
 import life.qbic.datamanager.views.general.contact.Contact;
 import life.qbic.datamanager.views.general.funding.FundingEntry;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.notifications.Toast;
 import life.qbic.datamanager.views.projects.create.AddProjectDialog;
@@ -82,7 +81,6 @@ public ProjectOverviewMain(@Autowired ProjectCollectionComponent projectCollecti
       UserInformationService userInformationService,
       AuthenticationToUserIdTranslationService userIdTranslator,
       TerminologyService terminologyService,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       MessageSourceNotificationFactory messageSourceNotificationFactory) {
     this.projectCollectionComponent = requireNonNull(projectCollectionComponent,
         "project collection component can not be null");
@@ -101,8 +99,6 @@ public ProjectOverviewMain(@Autowired ProjectCollectionComponent projectCollecti
         "user information service can not be null");
     this.userIdTranslator = requireNonNull(userIdTranslator, "userIdTranslator must not be null");
     requireNonNull(terminologyService, "terminologyService must not be null");
-    requireNonNull(cancelConfirmationDialogFactory,
-        "cancelConfirmationDialogFactory must not be null");
 
     addTitleAndDescription();
     add(projectCollectionComponent);
@@ -110,8 +106,7 @@ public ProjectOverviewMain(@Autowired ProjectCollectionComponent projectCollecti
       AddProjectDialog addProjectDialog = new AddProjectDialog(this.projectInformationService,
           this.financeService,
           personLookupService,
-          this.ontologyTermInformationService, terminologyService,
-          cancelConfirmationDialogFactory);
+          this.ontologyTermInformationService, terminologyService);
       if (isOfferSearchAllowed()) {
         addProjectDialog.enableOfferSearch();
       }
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/components/ProjectCollectionComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/components/ProjectCollectionComponent.java
index f838425bd1..fd8a17880f 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/components/ProjectCollectionComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/components/ProjectCollectionComponent.java
@@ -13,7 +13,8 @@
 import com.vaadin.flow.component.textfield.TextField;
 import com.vaadin.flow.data.provider.SortDirection;
 import com.vaadin.flow.data.value.ValueChangeMode;
-import com.vaadin.flow.router.RouteParam;
+import com.vaadin.flow.router.RouteParameters;
+import com.vaadin.flow.router.RouterLink;
 import com.vaadin.flow.spring.annotation.RouteScope;
 import java.io.Serial;
 import java.time.Instant;
@@ -30,6 +31,7 @@
 import life.qbic.datamanager.views.general.PageArea;
 import life.qbic.datamanager.views.general.Tag;
 import life.qbic.datamanager.views.general.Tag.TagColor;
+import life.qbic.datamanager.views.projects.project.datasets.ConnectedDatasetsMain;
 import life.qbic.datamanager.views.projects.project.info.ProjectInformationMain;
 import life.qbic.projectmanagement.application.ProjectInformationService;
 import life.qbic.projectmanagement.application.ProjectOverview;
@@ -38,7 +40,8 @@
 /**
  * <b>Project Collection</b>
  * <p>
- * A component that displays cards showing the content of accessible {@link ProjectOverview for the logged-in user.
+ * A component that displays cards showing the content of accessible
+ * {@link ProjectOverview for the logged-in user.
  * <p>
  * The component also fires {@link ProjectCreationSubmitEvent} to all registered listeners, if a
  * user has the intend to create a new project.
@@ -201,16 +204,44 @@ private static class ProjectOverviewItem extends Div {
 
     public ProjectOverviewItem(ProjectOverview projectOverview) {
       this.projectOverview = Objects.requireNonNull(projectOverview);
-      Span header = createHeader(projectOverview.projectCode(), projectOverview.projectTitle());
-      add(header);
+      // Both RouterLinks (card body + footer) must share a single parent so they render
+      // as one unified card. Using a wrapper Div prevents event propagation between
+      // clicks on the footer and clicks on the card body.
+      var wrapper = new Div();
+      wrapper.addClassName("project-card-wrapper");
+      wrapper.add(projectInfoLink());
+      attachDatasetFooter(wrapper);
+      add(wrapper);
+    }
+
+    /**
+     * Builds the card-body RouterLink (navigates to project info).
+     *
+     * <p>The card body is a RouterLink, not a Div-with-addClickListener, so the
+     * footer RouterLink (a sibling, not a child) cannot have its click propagate up to the card
+     * body. This is the fix for the "footer click navigates to project info first, then to
+     * datasets" bug.</p>
+     *
+     * <p>The card body carries the {@code project-overview-item} class so the
+     * existing page-area.css card styles (shadow, border-radius, padding) apply to it
+     * directly.</p>
+     */
+    private RouterLink projectInfoLink() {
+      var link = new RouterLink("", ProjectInformationMain.class,
+          new RouteParameters(PROJECT_ID_ROUTE_PARAMETER, projectOverview.projectId().value()));
+      link.addClassName("project-overview-item");
+
+      link.add(createHeader(projectOverview.projectCode(), projectOverview.projectTitle()));
+
       Instant instant = projectOverview.lastModified();
       Span lastModified = new Span(
           String.format("Last modified on %s",
-              DateTimeFormat.asJavaFormatter(DateTimeFormat.SIMPLE_DATE_TIME,
+              DateTimeFormat.asJavaFormatter(DateTimeFormat.SIMPLE_DATE_SHORT,
                       ZoneId.systemDefault())
                   .format(instant)));
       lastModified.addClassName("tertiary");
-      add(lastModified);
+      link.add(lastModified);
+
       projectDetails.addClassName("details");
       Span principalInvestigator = new Span(
           String.format("Principal Investigator: %s", projectOverview.principalInvestigatorName()));
@@ -220,16 +251,174 @@ public ProjectOverviewItem(ProjectOverview projectOverview) {
             String.format("Project Responsible: %s", projectOverview.projectResponsibleName()));
       }
       projectDetails.add(principalInvestigator, projectResponsible);
-      add(projectDetails);
+      link.add(projectDetails);
+
       usersWithAccess.setMaxItemsVisible(MAXIMUM_NUMBER_OF_SHOWN_AVATARS);
-      add(usersWithAccess);
+      link.add(usersWithAccess);
+
       setMeasurementDependentTags();
       projectOverview.collaboratorUserInfos().stream()
           .map(userInfo -> new UserAvatarGroupItem(userInfo.userName(), userInfo.userId()))
           .forEach(usersWithAccess::add);
-      addClassNames("project-overview-item");
-      addClickListener(event -> getUI().ifPresent(ui -> ui.navigate(ProjectInformationMain.class,
-          new RouteParam(PROJECT_ID_ROUTE_PARAMETER, projectOverview.projectId().value()))));
+
+      return link;
+    }
+
+    /**
+     * Attaches the connected-dataset footer to the card body when the project has any connected
+     * datasets. The footer is rendered as a full-width {@link RouterLink} to the project's
+     * connected-datasets view; it is a sibling (not a child) of the card-body RouterLink, so each
+     * click target has exactly one handler and neither can fire the other's navigation — no
+     * event-propagation workaround required.
+     *
+     * <p>When no datasets are connected, nothing is rendered — avoids
+     * advertising an empty state on the listing.</p>
+     */
+    private void attachDatasetFooter(Div wrapper) {
+      if (projectOverview.connectedDatasetCount() > 0) {
+        wrapper.add(buildDatasetFooter(projectOverview));
+      }
+    }
+
+    /**
+     * Builds the connected-dataset footer for a project card.
+     *
+     * <p>Layout (left-right): database icon, count, open/restricted
+     * {@link Tag} pills, last-connected date, spacer, trailing chevron. Wrapped in a
+     * {@link RouterLink} so the entire footer is a large click target (44px+) — better
+     * accessibility than an icon-only link.
+     *
+     * <p>The footer RouterLink is a sibling (not a child) of the card-body
+     * RouterLink on {@code ProjectOverviewItem}, so a footer click cannot also fire the card's
+     * project-info navigation — no event-propagation workaround required.</p>
+     *
+     * <p>All layout/presentation is driven by CSS classes defined in
+     * {@code all.css} (flex utilities, spacing, typography) and in {@code page-area.css}
+     * ({@code .project-dataset-footer}).</p>
+     */
+    private static RouterLink buildDatasetFooter(ProjectOverview projectOverview) {
+      // ── Footer content (plain Div inside the RouterLink) ──────
+      var content = new Div();
+      content.addClassName("flex-horizontal");
+      content.addClassName("flex-align-items-center");
+      content.addClassName("gap-03");
+
+      int total = projectOverview.connectedDatasetCount();
+      int open = projectOverview.openDatasetCount();
+      int restricted = projectOverview.restrictedDatasetCount();
+      Instant lastConnected = projectOverview.lastConnectedOn();
+
+      // Database icon — neutral grey, not linked colour
+      var icon = VaadinIcon.DATABASE.create();
+      icon.addClassName("flex-shrink-0");
+      icon.addClassName("color-secondary");
+      content.add(icon);
+
+      // Count — bold
+      var countSpan = new Span(String.valueOf(total));
+      countSpan.addClassName("bold");
+      countSpan.addClassName("normal-body-text");
+      content.add(countSpan);
+
+      var labelSpan = new Span(total == 1 ? "dataset" : "datasets");
+      labelSpan.addClassName("extra-small-body-text");
+      content.add(labelSpan);
+
+      content.add(buildDotSeparator());
+
+      if (open > 0) {
+        var openTag = new Tag("%d Open".formatted(open));
+        openTag.setTagColor(TagColor.SUCCESS);
+        content.add(openTag);
+      }
+      if (restricted > 0) {
+        var restrictedTag = new Tag("%d Restricted".formatted(restricted));
+        restrictedTag.setTagColor(TagColor.WARNING);
+        content.add(restrictedTag);
+      }
+
+      content.add(buildDotSeparator());
+
+      var lastConnectedLabel = new Span("Last connected");
+      lastConnectedLabel.addClassName("extra-small-body-text");
+      lastConnectedLabel.addClassName("color-secondary");
+      content.add(lastConnectedLabel);
+
+      if (lastConnected != null) {
+        var lastConnectedDate = new Span(formatLastConnectedDate(lastConnected));
+        lastConnectedDate.addClassName("extra-small-body-text");
+        content.add(lastConnectedDate);
+      } else {
+        var fallback = new Span("—");
+        fallback.addClassName("extra-small-body-text");
+        fallback.addClassName("color-secondary");
+        content.add(fallback);
+      }
+
+      // Spacer pushes the chevron to the right edge
+      var spacer = new Div();
+      spacer.addClassName("flex-grow-1");
+      content.add(spacer);
+
+      // Trailing chevron — visual cue only; the entire footer is the
+      // RouterLink, so the chevron itself is not a separate click target
+      var chevron = VaadinIcon.CHEVRON_RIGHT.create();
+      chevron.addClassName("flex-shrink-0");
+      content.add(chevron);
+
+      // ─ Wrap in RouterLink (native <a> semantics) ─────────────
+      // Anchored to the per-project datasets route already registered
+      // for ConnectedDatasetsMain.
+      var link = new RouterLink("", ConnectedDatasetsMain.class,
+          new RouteParameters(PROJECT_ID_ROUTE_PARAMETER, projectOverview.projectId().value()));
+      link.addClassName("project-dataset-footer");
+      link.add(content);
+
+      // Accessible name — unambiguous without visual context.
+      link.getElement().setAttribute("aria-label",
+          buildAriaLabel(projectOverview, total, open, restricted, lastConnected));
+
+      return link;
+    }
+
+    private static Span buildDotSeparator() {
+      var dot = new Span("·");
+      dot.addClassName("extra-small-body-text");
+      dot.addClassName("color-secondary");
+      return dot;
+    }
+
+    /**
+     * Formats the {@code connected_on} instant for display in the footer.
+     *
+     * <p>Uses {@code dd MMM yyyy} (e.g. {@code "05 Jul 2026"}, English
+     * locale) — shorter than the card's {@code lastModified} timestamp but still human-readable.
+     * The instant is converted to the system default zone before formatting.</p>
+     */
+    private static String formatLastConnectedDate(Instant instant) {
+      return DateTimeFormat.asJavaFormatter(DateTimeFormat.SIMPLE_DATE_SHORT,
+          ZoneId.systemDefault()).format(instant);
+    }
+
+    /**
+     * Builds the {@code aria-label} for the footer RouterLink.
+     *
+     * <p>Shape: {@code "Open datasets for Q2KX4B: 4 connected, 2 open,
+     * 2 restricted, last updated 05 July 2026"}</p>
+     * <p>Screen readers get a coherent sentence describing the link
+     * action (open the datasets view) and the current state — far more useful than an icon-only
+     * label would be.</p>
+     */
+    private static String buildAriaLabel(ProjectOverview projectOverview, int total,
+        int open, int restricted, Instant lastConnected) {
+      String base = "Open datasets for %s: %d connected, %d open, %d restricted".formatted(
+          projectOverview.projectCode(), total, open, restricted);
+      if (lastConnected != null) {
+        String full = DateTimeFormat.asJavaFormatter(DateTimeFormat.SIMPLE_DATE_SHORT,
+            ZoneId.systemDefault()).format(lastConnected);
+        return base + ", last updated " + full;
+      }
+      return base;
     }
 
     private Span createHeader(String projectCode, String projectTitle) {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/ProjectMainLayout.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/ProjectMainLayout.java
index a509eda881..40bcea20eb 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/ProjectMainLayout.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/ProjectMainLayout.java
@@ -18,7 +18,6 @@
 import life.qbic.datamanager.views.general.DataManagerMenu;
 import life.qbic.datamanager.views.general.footer.FooterComponentFactory;
 import life.qbic.datamanager.views.navigation.ProjectSideNavigationComponent;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.projects.overview.ProjectOverviewMain;
 import life.qbic.identity.api.UserInformationService;
@@ -60,7 +59,6 @@ public ProjectMainLayout(@Autowired AuthenticationContext authenticationContext,
       @Autowired SpeciesLookupService speciesLookupService,
       @Autowired FooterComponentFactory footerComponentFactory,
       @Autowired TerminologyService terminologyService,
-      @Autowired CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       @Autowired MessageSourceNotificationFactory messageSourceNotificationFactory,
       @Autowired AnnouncementService announcementService) {
     super(requireNonNull(footerComponentFactory), announcementService);
@@ -77,7 +75,6 @@ public ProjectMainLayout(@Autowired AuthenticationContext authenticationContext,
         projectInformationService,
         experimentInformationService, addExperimentToProjectService,
         userPermissions, speciesLookupService, terminologyService,
-        cancelConfirmationDialogFactory,
         messageSourceNotificationFactory);
     dataManagerMenu = new DataManagerMenu(authenticationContext);
     Span projectMainNavbar = new Span(createDrawerToggleAndTitleBar(), dataManagerMenu);
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectAccessComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectAccessComponent.java
index 83245b4a13..ba9aeda7be 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectAccessComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectAccessComponent.java
@@ -29,6 +29,7 @@
 import life.qbic.datamanager.views.Context;
 import life.qbic.datamanager.views.account.UserAvatar;
 import life.qbic.datamanager.views.general.PageArea;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.general.oidc.OidcLogo;
 import life.qbic.datamanager.views.general.oidc.OidcType;
 import life.qbic.datamanager.views.notifications.ErrorMessage;
@@ -218,13 +219,13 @@ private Span changeProjectAccessCell(ProjectUser projectUser) {
             "You don't have permission to remove the user from this project");
         return;
       }
-      ProjectUserRemovalConfirmationNotification projectUserRemovalConfirmationNotification = new ProjectUserRemovalConfirmationNotification(
-          projectUser);
-      projectUserRemovalConfirmationNotification.addConfirmListener(
-          event -> removeCollaborator(projectUser));
-      projectUserRemovalConfirmationNotification.addCancelListener(
-          event -> projectUserRemovalConfirmationNotification.close());
-      projectUserRemovalConfirmationNotification.open();
+      AlertDialog.danger(this,
+          "Remove user from project",
+          "Are you sure you want to remove the user %s from the project?".formatted(
+              projectUser.userName()),
+          "Remove user",
+          "Keep user",
+          () -> removeCollaborator(projectUser)).open();
     });
     //We want to ensure that even if the frontend components are shown no event is propagated
     // if the user doesn't have the correct role or tries to edit himself/the project owner
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectUserRemovalConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectUserRemovalConfirmationNotification.java
deleted file mode 100644
index 4463c961eb..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/access/ProjectUserRemovalConfirmationNotification.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package life.qbic.datamanager.views.projects.project.access;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-import life.qbic.datamanager.views.projects.project.access.ProjectAccessComponent.ProjectUser;
-
-/**
- * Warns a user that the user will be removed from the project
- * <p>
- * This dialog is to be shown when a user is removed from a project within the
- * {@link ProjectAccessComponent}
- */
-public class ProjectUserRemovalConfirmationNotification extends NotificationDialog {
-
-  public ProjectUserRemovalConfirmationNotification(ProjectUser projectUser) {
-    super(NotificationLevel.WARNING);
-    withTitle("Remove user from project");
-    withContent(new Span(
-        "Are you sure you want to remove the user %s from the project?".formatted(
-            projectUser.userName())));
-    setCancelable(true);
-    setConfirmText("Confirm");
-  }
-
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectDatasetSidebar.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectDatasetSidebar.java
new file mode 100644
index 0000000000..81cc45b2ef
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectDatasetSidebar.java
@@ -0,0 +1,916 @@
+package life.qbic.datamanager.views.projects.project.datasets;
+
+import static java.util.Objects.requireNonNull;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
+import com.vaadin.flow.component.Key;
+import com.vaadin.flow.component.UI;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.combobox.ComboBox;
+import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.GridVariant;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.AnchorTarget;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.component.textfield.TextField;
+import com.vaadin.flow.data.provider.Query;
+import com.vaadin.flow.shared.Registration;
+import java.io.Serial;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Stream;
+import life.qbic.datamanager.views.Context;
+import life.qbic.datamanager.views.UiHandle;
+import life.qbic.datamanager.views.general.DataSetTagFactory;
+import life.qbic.datamanager.views.general.DataSetTagFactory.TagType;
+import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
+import life.qbic.identity.api.AuthenticationToUserIdTranslator;
+import life.qbic.projectmanagement.application.associated_dataset.AssociatedDatasetService;
+import life.qbic.projectmanagement.application.associated_dataset.AssociatedDatasetServiceException;
+import life.qbic.projectmanagement.application.associated_dataset.SearchHit;
+import life.qbic.projectmanagement.application.associated_dataset.SourceInstanceDescriptor;
+import life.qbic.projectmanagement.application.authorization.QbicUserDetails;
+import life.qbic.projectmanagement.application.experiment.ExperimentInformationService;
+import life.qbic.projectmanagement.domain.model.associated_dataset.SourceType;
+import life.qbic.projectmanagement.domain.model.experiment.Experiment;
+import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import org.jspecify.annotations.NonNull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.oauth2.core.oidc.user.OidcUser;
+
+/**
+ * <b>Connect Dataset Sidebar</b>
+ *
+ * <p>A right-side sliding panel that overlays the associated-datasets
+ * view. Allows users to:
+ * <ul>
+ *   <li>select which InvenioRDM instance to search in (ComboBox);</li>
+ *   <li>search for open datasets via InvenioRDM's REST API (TextField
+ *       with Enter-key trigger);</li>
+ *   <li>select one or more search results via a multi-select grid with
+ *       card-style rows;</li>
+ *   <li>optionally pick an experiment to associate each selected dataset
+ *       with;</li>
+ *   <li>confirm the connection via a footer button.</li>
+ * </ul>
+ *
+ * <p>The sidebar is instantiated lazily by the parent view and opened
+ * via {@link #open()}. It closes itself after a successful connect or
+ * when the user clicks the close button / backdrop.</p>
+ *
+ * <p>Fires {@link DatasetsConnectedEvent} on a successful connect so the
+ * parent view can refresh the connected-resources grid.</p>
+ *
+ * @since 1.12.0
+ */
+public class ConnectDatasetSidebar extends Div {
+
+  private static final Logger log = LoggerFactory.getLogger(ConnectDatasetSidebar.class);
+
+  private final AssociatedDatasetService associatedDatasetService;
+  private final ExperimentInformationService experimentInformationService;
+  private final MessageSourceNotificationFactory notificationFactory;
+  private final UiHandle uiHandle = new UiHandle();
+  private final AuthenticationToUserIdTranslator authenticationToUserIdTranslator;
+
+  /**
+   * Clamp a title to {@code maxLines} lines with a CSS ellipsis.
+   * The full title is exposed as a native HTML {@code title} attribute so hovering reveals
+   * it even when truncated.
+   *
+   * <p>{@code maxLines} must be 1, 2, or 3 (matching the {@code .clamp-N-line}
+   * CSS utility classes defined in {@code all.css}).</p>
+   */
+  private Span clampableTitle(String title, int maxLines) {
+    var span = new Span(title);
+    span.addClassName("normal-body-text");
+    span.addClassName("clamp-" + maxLines + "-line");
+    span.getElement().setAttribute("title", title);
+    return span;
+  }
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  private final Div overlay;
+  private final Div panel;
+  private final ComboBox<SourceInstanceDescriptor> instanceSelector;
+  private final TextField searchField;
+  private Button searchButton;
+  private final Grid<SearchHit> resultsGrid;
+  private final ComboBox<ExperimentEntry> experimentSelector;
+  private final Button connectButton;
+  private final Span selectionCountLabel;
+
+  /**
+   * Wraps {@code resultsGrid} together with {@code loadingIndicator} and
+   * {@code welcomeMessage}. The spinner is a sibling (not a CSS overlay)
+   * because the grid is already the scroll container; we just swap
+   * visibility. The welcome message is absolutely positioned over the
+   * empty grid until the user initiates a search.
+   */
+  private final Div resultsContainer;
+  private final Div loadingIndicator;
+  private final Span loadingMessage = new Span("Searching for datasets...");
+  private final Div welcomeMessage;
+
+  /**
+   * Gate for the lazy-loading callback.
+   *
+   * <p>Vaadin calls {@link #fetchPage(Query)} automatically whenever the
+   * grid first renders (to fill initially-visible rows) or when it needs
+   * a page during scroll. If the sidebar is being opened (the grid was
+   * just attached to the UI), this automatic first-page fetch would fire
+   * an HTTP call against InvenioRDM from the same Vaadin response that
+   * is supposed to reveal the sidebar — making the open action appear
+   * to freeze.
+   *
+   * <p>To keep {@code open()} instant, the flag is cleared in
+   * {@link #close()} and set to {@code true} only when the user has
+   * explicitly triggered a search (by clicking Search, pressing Enter,
+   * or clearing the field). Until then, {@code fetchPage} returns an
+   * empty stream. After the first explicit search the gate stays open
+   * for the lifetime of that sidebar session, so scrolling still loads
+   * follow-up pages lazily.
+   *
+   * <p>This does not affect AC3 ("Paginated results when no query") —
+   * the user's very first search can be with an empty term.
+   */
+  private volatile boolean searchInitiated = false;
+
+  /**
+   * Tracks whether a search is currently in progress (async HTTP fetch).
+   * Used to disable controls and prevent duplicate requests.
+   */
+  private volatile boolean searchInProgress = false;
+
+  /**
+   * Cached search results from the most recent successful search.
+   * Populated by the background thread in {@link #refreshSearchResults()},
+   * then sliced on-demand by {@link #fetchPage(Query)} for virtual scrolling.
+   */
+  private final List<SearchHit> cachedResults = new ArrayList<>();
+
+  private final List<SourceInstanceDescriptor> availableInstances = new ArrayList<>();
+  private final List<ExperimentEntry> availableExperiments = new ArrayList<>();
+
+  private Context context;
+
+  public ConnectDatasetSidebar(
+      AssociatedDatasetService associatedDatasetService,
+      ExperimentInformationService experimentInformationService,
+      MessageSourceNotificationFactory notificationFactory,
+      AuthenticationToUserIdTranslator authenticationToUserIdTranslator) {
+    this.associatedDatasetService = associatedDatasetService;
+    this.experimentInformationService = experimentInformationService;
+    this.notificationFactory = requireNonNull(notificationFactory,
+        "notificationFactory must not be null");
+    this.authenticationToUserIdTranslator = requireNonNull(authenticationToUserIdTranslator);
+
+    // Root scope class — all .cds-* CSS rules in connect-dataset-sidebar.css
+    // are scoped under this class so they cannot leak into other views.
+    addClassName("connect-dataset-sidebar");
+
+    // ── Form controls (MUST be initialized before buildSidebarBody) ──
+    // Some fields are referenced directly inside buildSidebarBody, which is
+    // called at the end of this constructor. Initializing them up front
+    // avoids a NullPointerException that would otherwise fire the moment
+    // the sidebar is built.
+    instanceSelector = new ComboBox<>();
+    instanceSelector.setLabel("Repository");
+    instanceSelector.setPlaceholder("Select repository…");
+    instanceSelector.setItemLabelGenerator(SourceInstanceDescriptor::displayName);
+    instanceSelector.addValueChangeListener(e -> {
+      // Only refetch when the user changes the instance *after* an
+      // explicit search. During open(), loadInstances() auto-selects the
+      // first item — we must NOT treat that auto-selection as a search
+      // trigger, or the sidebar would block on InvenioRDM latency.
+      if (!searchInitiated) {
+        return;
+      }
+      refreshSearchResults();
+    });
+    instanceSelector.setOverlayClassName("connect-dataset-sidebar-overlay");
+
+    searchField = new TextField();
+    searchField.setPlaceholder("Search by title, DOI, or creator…");
+    searchField.setClearButtonVisible(true);
+    searchField.addClassName("flex-grow");
+    searchField.addKeyDownListener(Key.ENTER, e -> refreshSearchResults());
+
+    resultsGrid = new Grid<>();
+    resultsGrid.addThemeVariants(GridVariant.LUMO_COMPACT, GridVariant.LUMO_NO_ROW_BORDERS);
+    resultsGrid.setSelectionMode(Grid.SelectionMode.MULTI);
+    resultsGrid.setWidthFull();
+    resultsGrid.setHeight("400px"); // Fixed height to enable virtual scrolling
+    resultsGrid.addComponentColumn(this::buildSearchResultCard).setFlexGrow(1);
+    resultsGrid.addSelectionListener(e -> onSelectionChanged());
+    // Clicking anywhere on a row (not just the checkbox) toggles selection.
+    // The checkbox still works independently. Cursor pointer is applied
+    // per-card in buildSearchResultCard so the affordance is scoped to the
+    // card content, not the whole grid.
+    resultsGrid.addItemClickListener(e -> {
+      SearchHit hit = e.getItem();
+      if (resultsGrid.getSelectedItems().contains(hit)) {
+        resultsGrid.deselect(hit);
+      } else {
+        resultsGrid.select(hit);
+      }
+    });
+
+    // ── Lazy-loading data provider ────────────────────────────────
+    // The grid fetches pages on demand as the user scrolls, rather than
+    // pulling the first page synchronously when the sidebar opens. This
+    // keeps the UI responsive regardless of InvenioRDM latency.
+    resultsGrid.setItems(this::fetchPage);
+
+    // ── Loading indicator ──────────────────────────────────────────
+    // Indeterminate progress bar + "Searching…" label, shown during
+    // lazy fetches. Wrapped together with the grid in resultsContainer.
+    // Note: without @Push the bar is rendered in the same response as
+    // the data so it flashes briefly, but it still gives the user a
+    // visible cue that a fetch is in progress on the server side.
+    // Indeterminate spinner + clear messaging, shown during searches.
+    // Spinner size, colors and animation live entirely in CSS (pure-CSS
+    // arc spinner — Spinner II, Temani Afif); the DOM element is an empty
+    // div carrying only the .cds-loading-spinner class.
+    var spinner = new Div();
+    spinner.addClassName("cds-loading-spinner");
+    
+    loadingMessage.addClassName("normal-body-text");
+    loadingMessage.addClassName("cds-loading-message");
+    
+    var loadingHint = new Span("This may take a few seconds");
+    loadingHint.addClassName("small-body-text");
+    loadingHint.addClassName("cds-loading-hint");
+
+    // The loading overlay uses .overlay-center-fill for the absolute-fill
+    // + centred-positioning primitives (see all.css); .cds-loading adds
+    // the base-colour backdrop and z-index (see connect-dataset-sidebar.css).
+    loadingIndicator = new Div();
+    loadingIndicator.addClassNames(
+        "flex-vertical", "items-center", "gap-02",
+        "overlay-center-fill", "cds-loading");
+    loadingIndicator.add(spinner, loadingMessage, loadingHint);
+
+    // ── Welcome message (shown before first search) ──────────────────
+    // Same absolute-fill + centred-positioning as the loading overlay;
+    // .cds-welcome adds its own colour scheme and z-index.
+    welcomeMessage = new Div();
+    welcomeMessage.addClassNames(
+        "flex-vertical", "items-center", "gap-02",
+        "overlay-center-fill", "cds-welcome");
+    
+    var welcomeIcon = VaadinIcon.SEARCH.create();
+    welcomeIcon.addClassName("cds-welcome-icon");
+    
+    var welcomeTitle = new Span("Search for datasets");
+    welcomeTitle.addClassName("heading-4");
+    welcomeTitle.addClassName("mt-s");
+    
+    var welcomeSubtitle = new Span(
+        "Use the search field above to find open datasets you can connect to this project.");
+    welcomeSubtitle.addClassName("body-text");
+    welcomeSubtitle.addClassName("cds-welcome-subtitle");
+    
+    welcomeMessage.add(welcomeIcon, welcomeTitle, welcomeSubtitle);
+
+    // .cds-results sets position:relative (the parent for the absolute
+    // overlays above) and min-height:200px so the grid always has room
+    // to display at least one card row even before data has loaded.
+    resultsContainer = new Div();
+    resultsContainer.addClassNames("flex-vertical", "flex-grow", "cds-results");
+    resultsContainer.add(loadingIndicator, welcomeMessage, resultsGrid);
+
+    experimentSelector = new ComboBox<>();
+    experimentSelector.setLabel("Link to experiment (optional)");
+    experimentSelector.setPlaceholder("No experiment selected");
+    experimentSelector.setItems(availableExperiments);
+    experimentSelector.setItemLabelGenerator(ExperimentEntry::label);
+    experimentSelector.setClearButtonVisible(true);
+    experimentSelector.setWidthFull();
+    experimentSelector.setOverlayClassName("connect-dataset-sidebar-overlay");
+
+    selectionCountLabel = new Span();
+    selectionCountLabel.addClassName("normal-body-text");
+    selectionCountLabel.addClassName("color-secondary");
+    // Start hidden — an empty Span still reserves line-height space and
+    // would push the button right of the footer's left alignment.
+    selectionCountLabel.getStyle().set("display", "none");
+
+    connectButton = new Button("Connect Selected", VaadinIcon.PLUS_CIRCLE.create());
+    connectButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    connectButton.setEnabled(false);
+    connectButton.addClickListener(e -> connectSelectedDatasets());
+
+    // ── Overlay (semi-transparent backdrop) ──────────────────────────
+    // .cds-backdrop carries all visual properties; display toggling stays
+    // inline because it represents runtime open/close state, not layout.
+    overlay = new Div();
+    overlay.addClassName("cds-backdrop");
+    overlay.getStyle().set("display", "none");
+    overlay.addClickListener(e -> close());
+    add(overlay);
+
+    // ── Panel ─────────────────────────────────────────────────────────
+    // .cds-panel carries width, shadow, z-index, etc.; display toggling
+    // stays inline (same rationale as overlay above).
+    panel = new Div();
+    panel.addClassName("cds-panel");
+    panel.getStyle().set("display", "none");
+    add(panel);
+
+    // Build sidebar body AFTER form-controls are initialized — it reads
+    // instanceSelector / searchField / resultsGrid / experimentSelector /
+    // selectionCountLabel / connectButton directly when composing the DOM.
+    panel.add(buildSidebarBody());
+  }
+
+  // ── Public API ──────────────────────────────────────────────────────
+
+  public void setContext(Context context) {
+    this.context = context;
+    if (context != null && context.projectId().isPresent()) {
+      loadInstances();
+    }
+  }
+
+  public void open() {
+    // Bind UI context for async operations
+    uiHandle.bind(UI.getCurrent());
+    
+    // Reset UI state to ensure welcome message is visible
+    searchInitiated = false;
+    loadingIndicator.getStyle().set("display", "none");
+    welcomeMessage.getStyle().set("display", "flex");
+    resultsGrid.getDataProvider().refreshAll();
+    setControlsEnabled(true);
+    
+    loadInstances();
+    // Load experiments asynchronously to avoid blocking
+    if (context != null && context.projectId().isPresent()) {
+      loadExperimentsAsync();
+    }
+    overlay.getStyle().set("display", "block");
+    panel.getStyle().set("display", "block");
+    // We intentionally do NOT trigger any fetch here. The grid's lazy-
+    // loading data provider is gated by {@link #searchInitiated} — until
+    // the user clicks Search / presses Enter / clicks Clear, fetchPage()
+    // returns an empty stream without making an HTTP call. That is what
+    // keeps this method non-blocking even when InvenioRDM has high
+    // latency.
+  }
+
+  public void close() {
+    overlay.getStyle().set("display", "none");
+    panel.getStyle().set("display", "none");
+    resultsGrid.deselectAll();
+    selectionCountLabel.setText("");
+    connectButton.setEnabled(false);
+    // Clear the flag so the next open() does not fire the grid's
+    // automatic first-page fetch against a stale default instance.
+    searchInitiated = false;
+    // Reset UI state
+    loadingIndicator.getStyle().set("display", "none");
+    welcomeMessage.getStyle().set("display", "flex");
+    setControlsEnabled(true);
+    // Clear cached results
+    synchronized (cachedResults) {
+      cachedResults.clear();
+    }
+    // Unbind UI context
+    uiHandle.unbind();
+  }
+
+  public Registration addDatasetsConnectedListener(
+      ComponentEventListener<DatasetsConnectedEvent> listener) {
+    return addListener(DatasetsConnectedEvent.class, listener);
+  }
+
+  // ── Internal build ──────────────────────────────────────────────────
+
+  private Div buildSidebarBody() {
+    // .flex-vertical gives the body its column direction;
+    // .height-full makes it fill the panel; .cds-body adds box-sizing:border-box.
+    var body = new Div();
+    body.addClassNames("flex-vertical", "height-full", "cds-body");
+
+    // Header — padding and border-bottom live in .cds-header;
+    // flex direction, alignment, gap, and flex-shrink use Lumo utilities.
+    var header = new Div();
+    header.addClassNames(
+        "flex-horizontal", "items-center", "gap-s", "flex-shrink-0", "cds-header");
+
+    var sidebarTitle = new Span("Connect Datasets");
+    sidebarTitle.addClassNames("heading-3", "flex-grow");
+
+    var closeButton = new Button(VaadinIcon.CLOSE_SMALL.create());
+    closeButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    closeButton.setTooltipText("Close");
+    closeButton.addClickListener(e -> close());
+
+    header.add(sidebarTitle, closeButton);
+    body.add(header);
+
+    // Scrollable content area (search form + results container).
+    // .flex-vertical sets the column direction, .flex-grow fills available
+    // space, .scroll-vertical gives it overflow-y:scroll, and .cds-content
+    // sets the padding and min-height:0 critical for flex-column children.
+    var content = new Div();
+    content.addClassNames("flex-vertical", "flex-grow", "scroll-vertical", "cds-content");
+
+    // Search row: instance-selector + search field.
+    // .items-end aligns bottoms so the shorter selector button aligns with
+    // the taller text field. min-width:0 in .cds-search-row prevents
+    // the search field from overflowing a narrow panel (classic flex trap).
+    var searchRow = new Div();
+    searchRow.addClassNames(
+        "flex-horizontal", "items-end", "gap-xs", "mb-s", "cds-search-row");
+
+    instanceSelector.setWidth("200px");
+    searchRow.add(instanceSelector, searchField);
+
+    var searchButtonBar = new Div();
+    searchButtonBar.addClassNames("flex-horizontal", "gap-xs");
+
+    searchButton = new Button("Search", VaadinIcon.SEARCH.create());
+    searchButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    searchButton.addClickListener(e -> refreshSearchResults());
+    
+    var clearButton = new Button("Clear");
+    clearButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY);
+    clearButton.addClickListener(e -> {
+      searchField.clear();
+      resultsGrid.deselectAll();
+      refreshSearchResults();
+    });
+
+    searchButtonBar.add(searchButton, clearButton);
+    content.add(searchRow, searchButtonBar);
+
+    // Results container was already configured with .flex-vertical +
+    // .flex-grow + .cds-results in the constructor (see resultsContainer
+    // setup). No inline overrides needed here — .cds-results sets
+    // position:relative + min-height:200px to keep at least one card row
+    // visible even before data has loaded.
+    content.add(resultsContainer);
+
+    body.add(content);
+
+    // Footer — padding + border-top live in .cds-footer;
+    // flex direction and flex-shrink use utilities.
+    var footer = new Div();
+    footer.addClassNames("flex-vertical", "flex-shrink-0", "cds-footer");
+    
+    // Experiment picker (optional association — AC9)
+    // .mb-m replaces the inline margin-bottom with a Lumo utility.
+    var experimentSection = new Div();
+    experimentSection.addClassNames("flex-vertical", "gap-01", "mb-m");
+    experimentSection.add(experimentSelector);
+    var experimentHelp = new Span(
+        "Optionally link the connected dataset(s) to a specific experiment.");
+    experimentHelp.addClassNames("extra-small-body-text", "color-secondary");
+    experimentSection.add(experimentHelp);
+    footer.add(experimentSection);
+
+    // Connect button row
+    var buttonRow = new Div();
+    buttonRow.addClassNames("flex-horizontal", "items-center", "gap-03");
+    selectionCountLabel.addClassNames("extra-small-body-text", "color-secondary");
+    buttonRow.add(selectionCountLabel, connectButton);
+    footer.add(buttonRow);
+    
+    body.add(footer);
+
+    return body;
+  }
+
+  // ── Data loading ────────────────────────────────────────────────────
+
+  private void loadInstances() {
+    availableInstances.clear();
+    availableInstances.addAll(associatedDatasetService.availableInstances(SourceType.INVENIO_RDM));
+    instanceSelector.setItems(availableInstances);
+    if (!availableInstances.isEmpty() && instanceSelector.isEmpty()) {
+      instanceSelector.setValue(availableInstances.get(0));
+    }
+  }
+
+  /**
+   * Loads experiments asynchronously to avoid blocking the UI thread.
+   * Called from {@link #open()} so the sidebar opens instantly even
+   * when the experiment query is slow.
+   */
+  private void loadExperimentsAsync() {
+    if (context == null || context.projectId().isEmpty() || experimentInformationService == null) {
+      return;
+    }
+    ProjectId projectId = context.projectId().orElseThrow();
+
+    // Capture security context on the main thread for propagation to the async thread
+    // This is critical because Spring Security checks happen in the async thread
+    SecurityContext securityContext = SecurityContextHolder.getContext();
+
+    CompletableFuture.runAsync(() -> {
+      try {
+        // Restore security context in the async thread
+        SecurityContextHolder.setContext(securityContext);
+        List<Experiment> experiments = experimentInformationService.findAllForProject(projectId);
+
+        uiHandle.onUiAndPush(() -> {
+          availableExperiments.clear();
+          for (Experiment experiment : experiments) {
+            availableExperiments.add(new ExperimentEntry(experiment.experimentId(), experiment.getName()));
+          }
+          experimentSelector.setItems(new ArrayList<>(availableExperiments));
+        });
+      } catch (Exception e) {
+        log.error("Failed to load experiments for project {}: {}", projectId.value(), e.getMessage(), e);
+        uiHandle.onUiAndPush(() -> {
+          notificationFactory.toast("dataset.experiments.failed",
+              new Object[]{}, getLocale()).open();
+        });
+      } finally {
+        SecurityContextHolder.clearContext();
+      }
+    });
+  }
+
+  // ── Search ──────────────────────────────────────────────────────────
+
+  /**
+   * Triggers a re-fetch of search results by invalidating the lazy-
+   * loading data provider. Called whenever the instance selector
+   * changes, the user submits / clears the search field, etc.
+   *
+   * <p>The actual HTTP call happens inside {@link #fetchPage(Query)},
+   * invoked by the grid on demand as it renders/scrolls. This method
+   * simply tells the grid to re-evaluate its data; any error caught in
+   * the callback is surfaced synchronously to the user afterwards.</p>
+   */
+  private void refreshSearchResults() {
+    // Prevent duplicate concurrent searches
+    if (searchInProgress) {
+      return;
+    }
+
+    // Mark that user has initiated at least one search (for fetchPage guard)
+    searchInitiated = true;
+
+    // Show loading state immediately and disable controls
+    setControlsEnabled(false);
+    welcomeMessage.getStyle().set("display", "none");
+    loadingIndicator.getStyle().set("display", "flex");
+
+    // Capture search parameters and user identity in main thread
+    var instance = instanceSelector.getValue();
+    var searchTerm = searchField.getValue();
+    var currentUser = currentUserId();
+
+    // Perform HTTP fetch asynchronously using the security-context-aware executor
+    CompletableFuture.supplyAsync(() -> {
+      // This runs in a thread with the security context propagated by DelegatingSecurityContextAsyncTaskExecutor
+      return associatedDatasetService.searchDatasets(
+          SourceType.INVENIO_RDM,
+          instance.id(),
+          searchTerm.trim().isEmpty() ? null : searchTerm.trim(),
+          0,          // page 0 (zero-indexed)
+          100,        // pageSize - load up to 100 results in first fetch
+          currentUser
+      );
+    }).thenAccept(result -> {
+      // This runs after the async operation completes
+      // Update cached results with thread-safe list
+      synchronized (cachedResults) {
+        cachedResults.clear();
+        cachedResults.addAll(result.hits());
+      }
+
+      // Push results back to UI thread
+      uiHandle.onUiAndPush(() -> {
+        loadingIndicator.getStyle().set("display", "none");
+        resultsGrid.getDataProvider().refreshAll();
+        setControlsEnabled(true);
+      });
+    }).exceptionally(throwable -> {
+
+      // Resolve a user-friendly message: if the service threw one of our
+      // typed exceptions, unwrap and use its message for the toast; otherwise
+      // fall back to a generic "Search failed." text. The original cause is
+      // logged (with infrastructure details) by the service itself.
+      final String userMessage = resolveUserMessage(throwable,
+          "Search failed. Please try again in a moment.");
+
+      // Push error back to UI thread
+      uiHandle.onUiAndPush(() -> {
+        loadingIndicator.getStyle().set("display", "none");
+        setControlsEnabled(true);
+        notificationFactory.toast("dataset.search.failed",
+            new Object[]{userMessage}, getLocale()).open();
+      });
+      return null;
+    });
+  }
+
+  /**
+   * Enables or disables all search controls during async search.
+   */
+  private void setControlsEnabled(boolean enabled) {
+    searchInProgress = !enabled;
+    searchButton.setEnabled(enabled);
+    searchField.setEnabled(enabled);
+    instanceSelector.setEnabled(enabled);
+  }
+
+  /**
+   * Lazy-loading callback wired to {@link #resultsGrid}.
+   *
+   * <p>Slices the {@link #cachedResults} list for virtual scrolling. This method
+   * does NOT make HTTP calls - those happen asynchronously in {@link #refreshSearchResults()}.</p>
+   *
+   * <p>This callback is invoked by Vaadin when the grid needs a page of data - i.e. when
+   * the grid first renders, or when the user scrolls.</p>
+   */
+  private Stream<SearchHit> fetchPage(Query<SearchHit, Void> query) {
+    // Satisfy Vaadin's data provider contract: must access offset and limit
+    // before returning, even on early-exit paths. Vaadin's DataCommunicator
+    // verifies these are called to prevent arbitrary data returns that could
+    // cause rendering bugs or memory issues.
+    int offset = query.getOffset();
+    int limit = query.getLimit();
+
+    // Guard: until the user has initiated at least one search, return empty
+    if (!searchInitiated) {
+      return Stream.empty();
+    }
+
+    // Guard: validate offset and limit
+    if (offset < 0 || limit <= 0) {
+      return Stream.empty();
+    }
+
+    // Slice cachedResults for virtual scrolling
+    synchronized (cachedResults) {
+      return cachedResults.stream()
+          .skip(offset)
+          .limit(limit);
+    }
+  }
+
+  private void onSelectionChanged() {
+    int count = resultsGrid.getSelectedItems().size();
+    if (count == 0) {
+      selectionCountLabel.setText("");
+      selectionCountLabel.getStyle().set("display", "none");
+    } else {
+      selectionCountLabel.setText(count + " selected");
+      selectionCountLabel.getStyle().remove("display");
+    }
+    connectButton.setEnabled(count > 0);
+  }
+
+  // ── Connect confirmation ────────────────────────────────────────────
+
+  private void connectSelectedDatasets() {
+    if (context == null || context.projectId().isEmpty()) {
+      return;
+    }
+    ProjectId projectId = context.projectId().orElseThrow();
+    var instance = instanceSelector.getValue();
+    var selected = new ArrayList<>(resultsGrid.getSelectedItems());
+    if (selected.isEmpty()) {
+      return;
+    }
+    var experimentId = experimentSelector.isReadOnly() || experimentSelector.isEmpty()
+        ? null
+        : experimentSelector.getValue().id();
+
+    uiHandle.bind(UI.getCurrent());
+
+    // 1. Build request list and mark rows as PENDING (no need — just build requests)
+    Map<String, String> requestIdToHandle = new HashMap<>();
+    List<AssociatedDatasetService.ConnectDatasetRequest> requests = new ArrayList<>();
+    for (SearchHit hit : selected) {
+      String reqId = "req-" + UUID.randomUUID();
+      requestIdToHandle.put(reqId, hit.externalHandleValue());
+      requests.add(new AssociatedDatasetService.ConnectDatasetRequest(
+          reqId, projectId, SourceType.INVENIO_RDM, instance.id(),
+          hit.externalHandleValue(), experimentId, currentUserId()));
+    }
+
+    // 2. UI: enter "connecting" state immediately
+    loadingMessage.setText("Connecting datasets...");
+    loadingIndicator.getStyle().set("display", "flex");
+    setControlsEnabled(false);
+    resultsGrid.getDataProvider().refreshAll();
+
+    final AtomicInteger successCount = new AtomicInteger(0);
+    final AtomicInteger failureCount = new AtomicInteger(0);
+    final AtomicInteger alreadyConnectedCount = new AtomicInteger(0);
+    final AtomicInteger completedCount = new AtomicInteger(0);
+    final int total = requests.size();
+
+    // 3. Fire-and-subscribe — callbacks run on boundedElastic worker threads.
+    // Count completed responses via AtomicInteger (the 3-arg subscribe's
+    // onComplete callback is not reliable with subscribeOn + onErrorResume).
+    associatedDatasetService.connectDatasets(requests)
+        .doOnError(error -> log.error("Unexpected error in connect stream", error))
+        .subscribe(response -> {
+          try {
+            // Update counters
+            if (response.associatedDatasetId() != null) {
+              successCount.incrementAndGet();
+            } else if (response.error()
+                == life.qbic.projectmanagement.application.associated_dataset.ConnectDatasetError.ALREADY_CONNECTED) {
+              alreadyConnectedCount.incrementAndGet();
+            } else {
+              failureCount.incrementAndGet();
+            }
+
+            // When all responses are in, close sidebar and show results
+            if (completedCount.incrementAndGet() == total) {
+              onBatchFinished(successCount.get(), failureCount.get(),
+                  alreadyConnectedCount.get());
+            }
+          } catch (Exception e) {
+            // Never let an exception escape — would freeze the UI
+            log.error("Exception in connect response handler", e);
+            failureCount.incrementAndGet();
+            if (completedCount.incrementAndGet() == total) {
+              onBatchFinished(successCount.get(), failureCount.get(),
+                  alreadyConnectedCount.get());
+            }
+          }
+        });
+  }
+
+  /**
+   * Hides the spinner, closes the sidebar, fires appropriate toasts, and
+   * dispatches DatasetsConnectedEvent to refresh the parent list.
+   * Called on the Reactor worker thread — UI work goes through UiHandle.
+   */
+  private void onBatchFinished(int successCount, int failureCount,
+      int alreadyConnectedCount) {
+    uiHandle.onUiAndPush(() -> {
+      try {
+        // Hide spinner and restore controls
+        loadingIndicator.getStyle().set("display", "none");
+        loadingMessage.setText("Searching for datasets...");
+        setControlsEnabled(true);
+
+        // Close the sidebar immediately — don't keep it open magically
+        close();
+
+        // Show toast with results
+        if (successCount > 0) {
+          notificationFactory.toast("dataset.connected.success",
+              new Object[]{successCount}, getLocale()).open();
+          fireEvent(new DatasetsConnectedEvent(this));
+        }
+        if (alreadyConnectedCount > 0) {
+          notificationFactory.toast("dataset.connected.already",
+              new Object[]{alreadyConnectedCount}, getLocale()).open();
+        }
+        if (failureCount > 0) {
+          notificationFactory.toast("dataset.connected.failure",
+              new Object[]{failureCount}, getLocale()).open();
+        }
+      } catch (Exception e) {
+        log.error("Exception in onBatchFinished", e);
+      }
+    });
+  }
+
+  // ── Card-style row ─────────────────────────────────────────────────
+
+  private Component buildSearchResultCard(SearchHit hit) {
+    // .border + .p-m + .mb-s + .clickable cover padding, spacing, and cursor;
+    // .cds-card adds the rounded border.
+    var card = new Div();
+    card.addClassNames("border", "p-m", "mb-s", "clickable", "cds-card");
+    // Clicking the card toggles selection (row click listener is attached
+    // to the grid). .clickable makes the affordance explicit.
+
+    // Top row: provider tag + access badge + date.
+    // .flex-horizontal + .items-center + .gap-02 from Lumo utilities;
+    // .mb-xs replaces the inline margin-bottom with a Lumo utility.
+    var topRow = new Div();
+    topRow.addClassNames("flex-horizontal", "items-center", "gap-02", "mb-xs");
+
+    // Provider tag — styled via centralized factory so this view and the
+    // connected-resources list share the same color scheme.
+    String provider = hit.resourceProvider();
+    if (provider != null && !provider.isBlank()) {
+      topRow.add(DataSetTagFactory.create(TagType.PROVIDER, provider));
+    }
+
+    // Access badge — styled via centralized factory
+    topRow.add(DataSetTagFactory.create(
+        TagType.ACCESS_TYPE, hit.isPublic()));
+
+    // Date — pushed to the trailing edge of the flex row via .ml-auto
+    // (Lumo margin utility replaces inline margin-left:auto).
+    var dateSpan = new Span(hit.publicationDate().format(
+        DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH)));
+    dateSpan.addClassNames("extra-small-body-text", "color-secondary", "ml-auto");
+    topRow.add(dateSpan);
+
+    card.add(topRow);
+
+    // Title — clamped to 2 visible lines with a hover tooltip for the
+    // full title. .clamp-2-line + .normal-body-text live in all.css;
+    // .cds-card-title + .mb-xs handle weight and bottom margin.
+    var title = clampableTitle(hit.title(), 2);
+    title.addClassNames("cds-card-title", "mb-xs");
+    card.add(title);
+
+    // PID rendered as a clickable link — opens the record in a new tab so
+    // users can verify it before connecting. The "PID:" label is implicit
+    // and removed to reduce visual noise.
+    String pidHref = hit.pid().startsWith("http")
+        ? hit.pid() : "https://doi.org/" + hit.pid();
+    var pidLink = new Anchor(pidHref, hit.pid());
+    pidLink.setTarget(AnchorTarget.BLANK);
+    pidLink.addClassName("extra-small-body-text");
+
+    var metaRow = new Div();
+    metaRow.addClassNames("flex-horizontal", "gap-04", "items-center");
+    metaRow.add(pidLink);
+    card.add(metaRow);
+
+    return card;
+  }
+
+  // ── Helpers ─────────────────────────────────────────────────────────
+
+  /**
+   * Resolves a user-friendly message from an async throwable. Walks the
+   * cause chain in case of {@code CompletionException} / ExecutionException
+   * wrapping, and returns the service-specific user message when found;
+   * otherwise falls back to the given {@code defaultMessage}.
+   */
+  private String resolveUserMessage(Throwable throwable, String defaultMessage) {
+    Throwable cause = throwable;
+    while (cause instanceof CompletionException || cause instanceof ExecutionException) {
+      cause = cause.getCause();
+      if (cause == null) {
+        return defaultMessage;
+      }
+    }
+    if (cause instanceof AssociatedDatasetServiceException serviceException) {
+      return serviceException.userMessage();
+    }
+    return defaultMessage;
+  }
+
+  private String currentUserId() {
+    var authentication = SecurityContextHolder.getContext().getAuthentication();
+    return authenticationToUserIdTranslator.translateToUserId(authentication).orElseThrow(() -> {
+      log.error("Could not translate authentication to user ID");
+      return new IllegalStateException("Could not translate authentication to user ID");
+    });
+  }
+
+  /** A lightweight record mapping an ExperimentId to its display name. */
+  record ExperimentEntry(ExperimentId id, String label) {
+    @Override
+    public @NonNull String toString() {
+      return label;
+    }
+  }
+
+  // ── Custom event ────────────────────────────────────────────────────
+
+  /**
+   * Fired when one or more datasets have been successfully connected to
+   * the project. The parent view refreshes its connected-resources grid
+   * in response.
+   */
+  public static class DatasetsConnectedEvent
+      extends com.vaadin.flow.component.ComponentEvent<ConnectDatasetSidebar> {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public DatasetsConnectedEvent(ConnectDatasetSidebar source) {
+      super(source, false);
+    }
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedDatasetsMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedDatasetsMain.java
new file mode 100644
index 0000000000..a30f79f892
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedDatasetsMain.java
@@ -0,0 +1,266 @@
+package life.qbic.datamanager.views.projects.project.datasets;
+
+import static java.util.Objects.requireNonNull;
+
+import com.vaadin.flow.component.AttachEvent;
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.DetachEvent;
+import com.vaadin.flow.router.BeforeEnterEvent;
+import com.vaadin.flow.router.BeforeEnterObserver;
+import com.vaadin.flow.router.NotFoundException;
+import com.vaadin.flow.router.Route;
+import com.vaadin.flow.spring.annotation.SpringComponent;
+import com.vaadin.flow.spring.annotation.UIScope;
+import jakarta.annotation.security.PermitAll;
+import java.util.List;
+import life.qbic.application.commons.Result;
+import life.qbic.datamanager.security.UserPermissions;
+import life.qbic.datamanager.views.Context;
+import life.qbic.datamanager.views.UiHandle;
+import life.qbic.datamanager.views.general.Main;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
+import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
+import life.qbic.datamanager.views.notifications.Toast;
+import life.qbic.datamanager.views.projects.project.ProjectMainLayout;
+import life.qbic.identity.api.AuthenticationToUserIdTranslator;
+import life.qbic.logging.api.Logger;
+import life.qbic.logging.service.LoggerFactory;
+import life.qbic.projectmanagement.application.associated_dataset.AssociatedDatasetService;
+import life.qbic.projectmanagement.application.associated_dataset.ConnectedDatasetView;
+import life.qbic.projectmanagement.application.associated_dataset.RemoveDatasetError;
+import life.qbic.projectmanagement.application.experiment.ExperimentInformationService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
+
+/**
+ * <b>Associated Datasets view</b>
+ *
+ * <p>The main view for the "Connect associated datasets with Data Manager
+ * projects" feature (FEAT-DATSET-01). Provides:
+ * <ul>
+ *   <li>an "All datasets" section showing the datasets currently
+ *       connected to the selected project, or an empty-state guide when
+ *       no datasets are connected yet;</li>
+ *   <li>a sliding connect-datasets sidebar that searches InvenioRDM
+ *       instances, lets the user pick results to connect, and optionally
+ *       associates them with a project experiment.</li>
+ * </ul>
+ *
+ *
+ * @since 1.12.0
+ */
+@SpringComponent
+@UIScope
+@Route(value = "projects/:projectId?/datasets", layout = ProjectMainLayout.class)
+@PermitAll
+public class ConnectedDatasetsMain extends Main implements BeforeEnterObserver {
+
+  public static final String PROJECT_ID_ROUTE_PARAMETER = "projectId";
+
+  private final transient AssociatedDatasetService associatedDatasetService;
+  private final transient ExperimentInformationService experimentInformationService;
+  private final transient UserPermissions userPermissions;
+  private final transient MessageSourceNotificationFactory notificationFactory;
+
+  private final ConnectedResourcesComponent connectedResourcesComponent;
+  private final AuthenticationToUserIdTranslator authenticationToUserIdTranslator;
+  private ConnectDatasetSidebar connectDatasetSidebar;
+
+  private Context context = new Context();
+  private final UiHandle uiHandle = new UiHandle();
+
+  @Autowired
+  public ConnectedDatasetsMain(
+      AssociatedDatasetService associatedDatasetService,
+      ExperimentInformationService experimentInformationService,
+      UserPermissions userPermissions,
+      MessageSourceNotificationFactory notificationFactory,
+      AuthenticationToUserIdTranslator authenticationToUserIdTranslator
+      ) {
+    this.associatedDatasetService = requireNonNull(associatedDatasetService,
+        "associatedDatasetService must not be null");
+    this.experimentInformationService = requireNonNull(experimentInformationService,
+        "experimentInformationService must not be null");
+    this.userPermissions = requireNonNull(userPermissions,
+        "userPermissions must not be null");
+    this.notificationFactory = requireNonNull(notificationFactory,
+        "notificationFactory must not be null");
+    this.authenticationToUserIdTranslator = requireNonNull(authenticationToUserIdTranslator);
+
+    addClassName("project");
+    addClassName("datasets");
+    connectedResourcesComponent = new ConnectedResourcesComponent(associatedDatasetService);
+    connectedResourcesComponent.addConnectDatasetsClickListener(e -> openConnectSidebar());
+    connectedResourcesComponent.addRemoveDatasetClickListener(
+        e -> onRemoveDataset(e.getDatasetId()));
+    add(connectedResourcesComponent);
+  }
+
+  @Override
+  protected void onAttach(AttachEvent attachEvent) {
+    super.onAttach(attachEvent);
+    uiHandle.bind(attachEvent.getUI());
+  }
+
+  @Override
+  protected void onDetach(DetachEvent detachEvent) {
+    uiHandle.unbind();
+    super.onDetach(detachEvent);
+  }
+
+  // ── Helpers ───────────────────────────────────────────────────────────
+
+  private static final Logger log = LoggerFactory.logger(ConnectedDatasetsMain.class);
+
+  /** Resolves the current Spring Security user to a DM user ID. */
+  private String resolveCurrentUserId() {
+    var auth = SecurityContextHolder.getContext().getAuthentication();
+    return authenticationToUserIdTranslator.translateToUserId(auth).orElseThrow(() -> {
+      log.error("Could not translate authentication to user ID");
+      return new IllegalStateException("Could not translate authentication to user ID");
+    });
+  }
+
+  @Override
+  public void beforeEnter(BeforeEnterEvent beforeEnterEvent) {
+    String projectId = beforeEnterEvent.getRouteParameters().get(PROJECT_ID_ROUTE_PARAMETER)
+        .orElseThrow();
+    var parsedProjectId =
+        life.qbic.projectmanagement.domain.model.project.ProjectId.parse(projectId);
+    if (!userPermissions.readProject(parsedProjectId)) {
+      beforeEnterEvent.rerouteToError(NotFoundException.class);
+      return;
+    }
+    this.context = new Context().with(parsedProjectId);
+    setContext(parsedProjectId);
+  }
+
+  private void setContext(
+      life.qbic.projectmanagement.domain.model.project.ProjectId parsedProjectId) {
+    connectedResourcesComponent.setWriteAllowed(userPermissions.editProject(parsedProjectId));
+    connectedResourcesComponent.setContext(context);
+    if (connectDatasetSidebar != null) {
+      connectDatasetSidebar.setContext(context);
+    }
+  }
+
+  // ── Remove dataset flow ─────────────────────────────────────────────
+
+  /**
+   * Drives the Remove flow: opens a {@link AlertDialog} confirmation;
+   * on confirm, calls {@code associatedDatasetService.removeDataset(…)},
+   * shows a toast, and refreshes the card list.
+   */
+  private void onRemoveDataset(String datasetId) {
+    // Resolve dataset view from current list so we can reference title
+    // in the confirmation body and in subsequent toasts.
+    List<ConnectedDatasetView> currentDatasets = List.of();
+    if (context.projectId().isPresent()) {
+      currentDatasets = associatedDatasetService.listConnectedDatasetViews(
+          context.projectId().orElseThrow());
+    }
+    ConnectedDatasetView view = currentDatasets.stream()
+        .filter(ds -> ds.id().equals(datasetId))
+        .findFirst()
+        .orElseThrow(() -> new IllegalStateException(
+            "Remove click event referenced unknown dataset %s".formatted(datasetId)));
+
+    AlertDialog.danger(this,
+        "Remove dataset connection?",
+        "This will disconnect the dataset '" + view.title() + "' ("
+            + view.pid() + ") from the project. The connection can be "
+            + "re-established at any time.",
+        "Disconnect dataset",
+        "Keep connection",
+        () -> performRemove(datasetId))
+        .open();
+  }
+
+  /**
+   * Kicks off the removal via
+   * {@link AssociatedDatasetService#removeDatasetAsync(String, String)}
+   * (which wraps the blocking service call on a bounded-elastic worker
+   * thread). A pending toast is shown immediately; it is closed in an
+   * {@code doFinally} terminal handler so it is always replaced by a
+   * success or error toast regardless of failure mode.
+   *
+   * <p>The {@link AlertDialog#danger(Component, String, String, String, String, life.qbic.datamanager.views.general.dialog.DialogAction)}
+   * factory already closes the dialog inside the confirm-action wrapper,
+   * so the user's visible feedback is the pending toast, followed by the
+   * result toast.</p>
+   */
+  private void performRemove(String datasetId) {
+    var userId = resolveCurrentUserId();
+
+    // Stays open until closed by the terminal doFinally handler below.
+    Toast pendingToast = notificationFactory.pendingTaskToast(
+        "dataset.removing.in-progress", EMPTY_PARAMETERS, getLocale());
+    pendingToast.open();
+
+    associatedDatasetService.removeDatasetAsync(datasetId, userId)
+        // Always close the pending indicator on the UI thread.
+        .doFinally(signal -> uiHandle.onUiAndPush(pendingToast::close))
+        .subscribe(
+            // Success path — the application-layer onErrorResume
+            // converts every throwable into a REMOVAL_FAILED Result,
+            // so a real error signal here is unexpected.
+            result -> uiHandle.onUiAndPush(() -> {
+              if (result.isError()) {
+                handleRemoveError(result.getError());
+              } else {
+                notificationFactory.toast("dataset.removed.success",
+                    EMPTY_PARAMETERS, getLocale()).open();
+                connectedResourcesComponent.refresh();
+              }
+            }),
+            // onError — defensive: the service layer converts any
+            // throwable into a REMOVAL_FAILED Result, so this should
+            // never fire. Kept as a safety net and a log entry.
+            error -> uiHandle.onUiAndPush(() -> {
+              log.error("Unexpected error on remove subscription for dataset %s: %s"
+                  .formatted(datasetId, error.getMessage()), error);
+              notificationFactory.toast("dataset.removed.failure",
+                  EMPTY_PARAMETERS, getLocale()).open();
+            })
+        );
+  }
+
+  private static final Object[] EMPTY_PARAMETERS = new Object[]{ };
+
+  /** Maps each {@link RemoveDatasetError} to its user-visible feedback.
+   *  Non-critical errors ({@code DATASET_NOT_FOUND},
+   *  {@code DATASET_ALREADY_REMOVED}) silently refresh the list so the
+   *  card vanishes if the dataset was already gone. */
+  private void handleRemoveError(RemoveDatasetError error) {
+    switch (error) {
+      case DATASET_ALREADY_REMOVED:
+        // Already gone — nothing else to tell the user.
+        connectedResourcesComponent.refresh();
+        break;
+      case DATASET_NOT_FOUND:
+        // Already gone — silently refresh.
+        connectedResourcesComponent.refresh();
+        break;
+      case REMOVAL_FAILED:
+      default:
+        notificationFactory.toast("dataset.removed.failure",
+            EMPTY_PARAMETERS, getLocale()).open();
+        break;
+    }
+  }
+
+  private void openConnectSidebar() {
+    if (connectDatasetSidebar == null) {
+      connectDatasetSidebar = new ConnectDatasetSidebar(
+          associatedDatasetService,
+          experimentInformationService,
+          notificationFactory,
+          authenticationToUserIdTranslator);
+      connectDatasetSidebar.setContext(context);
+      connectDatasetSidebar.addDatasetsConnectedListener(
+          e -> connectedResourcesComponent.refresh());
+      add(connectDatasetSidebar);
+    }
+    connectDatasetSidebar.open();
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedResourcesComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedResourcesComponent.java
new file mode 100644
index 0000000000..21bed0f490
--- /dev/null
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedResourcesComponent.java
@@ -0,0 +1,545 @@
+package life.qbic.datamanager.views.projects.project.datasets;
+
+import com.vaadin.flow.component.Component;
+import com.vaadin.flow.component.ComponentEventListener;
+import com.vaadin.flow.component.button.Button;
+import com.vaadin.flow.component.button.ButtonVariant;
+import com.vaadin.flow.component.html.Anchor;
+import com.vaadin.flow.component.html.AnchorTarget;
+import com.vaadin.flow.component.html.Div;
+import com.vaadin.flow.component.html.H3;
+import com.vaadin.flow.component.html.Span;
+import com.vaadin.flow.component.icon.VaadinIcon;
+import com.vaadin.flow.shared.Registration;
+import java.io.Serial;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneOffset;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+import life.qbic.datamanager.views.AppRoutes;
+import life.qbic.datamanager.views.Context;
+import life.qbic.datamanager.views.general.DataSetTagFactory;
+import life.qbic.datamanager.views.general.DataSetTagFactory.TagType;
+import life.qbic.datamanager.views.general.section.ActionBar;
+import life.qbic.datamanager.views.general.section.Section;
+import life.qbic.datamanager.views.general.section.SectionContent;
+import life.qbic.datamanager.views.general.section.SectionHeader;
+import life.qbic.datamanager.views.general.section.SectionNote;
+import life.qbic.datamanager.views.general.section.SectionTitle;
+import life.qbic.projectmanagement.application.associated_dataset.AssociatedDatasetService;
+import life.qbic.projectmanagement.application.associated_dataset.ConnectedDatasetView;
+
+/**
+ * <b>Connected Datasets Component</b>
+ *
+ * <p>Renders the "Datasets" section within the associated
+ * datasets view. Contains:</p>
+ * <ul>
+ *   <li>an action bar with a primary "Connect Datasets" button;</li>
+ *   <li>a <b>rich row card list</b> of connected datasets, with high-priority
+ * *       properties (title, PID, version, access link, published date) in the
+ *       primary tier, the resource type as a header-row badge for fast
+ *       scanning, and medium-priority properties (connected by, creator,
+ *       community, linked experiment) always visible below
+ *       a subtle tier separator; the provenance line "connected on …"
+ *       and attribution are rendered as a single italic footer note.</li>
+ *   <li>an empty-state guidance panel when no datasets are connected yet,</li>
+ *   <li>a CTA button that opens the connect-sidebar to search and connect
+ *       datasets from InvenioRDM repositories.</li>
+ * </ul>
+ *
+ * <p>Cards consume {@link ConnectedDatasetView} DTOs from the application
+ * layer (never domain entities directly). User and experiment display names
+ * are already resolved by the service — this component renders them as-is.</p>
+ *
+ * <p>Per FEAT-DATSET-01 this component <b>does not</b> render per-row actions
+ * (Sync, Remove) — those belong to later stories (FEAT-DATSET-04 and
+ * beyond).</p>
+ *
+ * @since 1.12.0
+ */
+public class ConnectedResourcesComponent extends Div {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  private static final DateTimeFormatter DATE_FMT =
+      DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH);
+
+  private static final String SECONDARY_COLOR = "var(--lumo-secondary-text-color)";
+
+  private final AssociatedDatasetService associatedDatasetService;
+  private final Section section;
+  private final Div cardsContainer;
+  private final Button connectButton;
+
+  private Context context;
+
+  private boolean writeAllowed = false;
+
+  public ConnectedResourcesComponent(AssociatedDatasetService associatedDatasetService) {
+    this.associatedDatasetService = associatedDatasetService;
+    addClassNames("padding-horizontal-07", "padding-vertical-04", "flex-vertical");
+    addClassName("datasets-content");
+
+    // ── Action bar (always visible) ──────────────────────────────────
+    connectButton = new Button("Connect Datasets", VaadinIcon.PLUS_CIRCLE.create());
+    connectButton.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    connectButton.addClickListener(e -> fireConnectDatasetsClick());
+
+    var actionBar = new ActionBar(connectButton);
+
+    var note = new SectionNote(
+        "External datasets connected to this project and its experiments. "
+            + "Click any DOI or access link to open the record on the source.");
+    var header = new SectionHeader(
+        new SectionTitle("All datasets"),
+        actionBar,
+        note
+    );
+    header.enableControls();
+
+    section = new Section.SectionBuilder()
+        .withHeader(header)
+        .build();
+
+    // ── Card container ───────────────────────────────────────────────
+    cardsContainer = new Div();
+    cardsContainer.addClassNames("flex-vertical");
+    cardsContainer.getStyle().set("gap", "var(--lumo-space-m)");
+
+    // Initial render (empty): the content is populated on refresh() after
+    // the context has been set.
+    add(section);
+  }
+
+  // ── Public API ──────────────────────────────────────────────────────
+
+  /** Sets the project context and renders the content area. */
+  public void setContext(Context context) {
+    this.context = context;
+    refresh();
+  }
+
+  /** Controls whether the "Remove" button is rendered on each card. */
+  public void setWriteAllowed(boolean writeAllowed) {
+    this.writeAllowed = writeAllowed;
+  }
+
+  /** Reloads connected datasets and re-renders the content area. */
+  public void refresh() {
+    if (context == null || context.projectId().isEmpty()) {
+      return;
+    }
+
+    SectionContent content = section.content();
+    content.removeAll();
+
+    List<ConnectedDatasetView> datasets = associatedDatasetService.listConnectedDatasetViews(
+        context.projectId().orElseThrow());
+
+    cardsContainer.removeAll();
+    if (datasets.isEmpty()) {
+      content.add(buildEmptyState());
+    } else {
+      for (ConnectedDatasetView view : datasets) {
+        cardsContainer.add(buildCard(view));
+      }
+      content.add(cardsContainer);
+    }
+  }
+
+  /**
+   * Registers a listener invoked whenever the "Connect Datasets" button
+   * is clicked (from either the action bar or the empty-state CTA).
+   */
+  public Registration addConnectDatasetsClickListener(
+      ComponentEventListener<ConnectDatasetsClickEvent> listener) {
+    return addListener(ConnectDatasetsClickEvent.class, listener);
+  }
+
+  /**
+   * Registers a listener invoked when the "Remove" button on a dataset
+   * card is clicked. Listener receives the aggregate ID of the clicked
+   * dataset. Only fires when {@link #setWriteAllowed(boolean)} is
+   * {@code true}.
+   *
+   * @since 1.12.0
+   */
+  public Registration addRemoveDatasetClickListener(
+      ComponentEventListener<RemoveDatasetClickEvent> listener) {
+    return addListener(RemoveDatasetClickEvent.class, listener);
+  }
+
+  // ── Empty state ─────────────────────────────────────────────────────
+
+  private Div buildEmptyState() {
+    var wrapper = new Div();
+    wrapper.addClassNames("flex-vertical", "items-center");
+    wrapper.getStyle().set("padding", "var(--lumo-space-xl) 0");
+    wrapper.getStyle().set("text-align", "center");
+
+    var icon = VaadinIcon.DATABASE.create();
+    icon.getStyle().set("font-size", "64px");
+    icon.getStyle().set("color", "var(--lumo-contrast-30pct)");
+    icon.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    wrapper.add(icon);
+
+    var heading = new H3("No datasets connected");
+    heading.getStyle().set("margin", "0 0 var(--lumo-space-s) 0");
+    wrapper.add(heading);
+
+    var explanation = new Span(
+        "Connect open datasets from InvenioRDM repositories (Zenodo, FDAT) "
+            + "to this project so that you and your collaborators can keep "
+            + "an overview of all associated data in one place.");
+    explanation.addClassName("normal-body-text");
+    explanation.addClassName("color-secondary");
+    explanation.getStyle().set("max-width", "480px");
+    explanation.getStyle().set("margin-bottom", "var(--lumo-space-m)");
+    wrapper.add(explanation);
+
+    var cta = new Button("Connect Datasets", VaadinIcon.PLUS_CIRCLE.create());
+    cta.addThemeVariants(ButtonVariant.LUMO_PRIMARY);
+    cta.addClickListener(e -> fireConnectDatasetsClick());
+    wrapper.add(cta);
+
+    return wrapper;
+  }
+
+  // ─ Card builder ────────────────────────────────────────────────────
+
+  private Component buildCard(ConnectedDatasetView view) {
+    var card = new Div();
+    card.addClassNames("rounded-02");
+    card.getStyle().set("display", "flex");
+    card.getStyle().set("flex-direction", "column");
+    card.getStyle().set("padding", "0");
+    card.getStyle().set("overflow", "hidden");
+    card.getStyle().set("background-color", "var(--lumo-base-color)");
+    // Explicit border — .border class is too subtle for card listings;
+    // use a slightly darker contrast token so individual cards are
+    // visually distinguishable even when stacked densely.
+    card.getStyle().set("border", "1px solid var(--lumo-contrast-20pct)");
+
+    // ═══ HEADER ROW: Provider · Access · Published ═══
+    var headerRow = new Div();
+    headerRow.addClassNames("flex-horizontal", "items-center", "gap-03");
+    headerRow.getStyle().set("padding",
+        "var(--lumo-space-m) var(--lumo-space-m) var(--lumo-space-s) var(--lumo-space-m)");
+    headerRow.getStyle().set("flex-wrap", "wrap");
+
+    // Provider tag — styled via centralized factory so this view and the
+    // connect-datasets sidebar share the same color scheme.
+    String provider = view.resourceProvider();
+    if (provider != null && !provider.isBlank()) {
+      headerRow.add(DataSetTagFactory.create(TagType.PROVIDER, provider));
+    }
+
+    // Access badge — styled via centralized factory
+    headerRow.add(DataSetTagFactory.create(
+        TagType.ACCESS_TYPE, view.isPublic()));
+
+    // Resource type badge — elevated to the header row for fast scanning.
+    // Rendered as a neutral CONTRAST tag so it does not compete with the
+    // provider (PRIMARY) or access-level (SUCCESS/WARNING) badges.
+    String resourceType = view.resourceType();
+    if (resourceType != null && !resourceType.isBlank()) {
+      headerRow.add(DataSetTagFactory.create(TagType.DATA_SET_TYPE, resourceType));
+    }
+
+    // Access-detail note for restricted datasets (inline after badge)
+    String accessDetail = view.accessDetail();
+    if (accessDetail != null && !accessDetail.isBlank()) {
+      var detailNote = new Span(accessDetail);
+      detailNote.addClassName("extra-small-body-text");
+      detailNote.getStyle().set("color", SECONDARY_COLOR);
+      detailNote.getStyle().set("font-style", "italic");
+      headerRow.add(detailNote);
+    }
+
+    // Spacer — pushes everything after it to the right edge.
+    var spacer = new Div();
+    spacer.getStyle().set("flex-grow", "1");
+    headerRow.add(spacer);
+
+    // Published date (right-aligned, secondary info).
+    LocalDate pubDate = view.publicationDate();
+    if (pubDate != null) {
+      var dateSpan = new Span("Published: " + pubDate.format(DATE_FMT));
+      dateSpan.addClassName("extra-small-body-text");
+      dateSpan.getStyle().set("color", SECONDARY_COLOR);
+      headerRow.add(dateSpan);
+    }
+
+    // Remove button (write-access only, right-aligned as a primary action).
+    if (writeAllowed) {
+      var removeButton = new Button(VaadinIcon.TRASH.create());
+      removeButton.addThemeVariants(ButtonVariant.LUMO_TERTIARY_INLINE,
+          ButtonVariant.LUMO_ERROR);
+      removeButton.getElement().setAttribute("title", "Remove dataset connection");
+      removeButton.getElement().setAttribute("aria-label", "Remove dataset connection");
+      removeButton.addClickListener(e -> fireRemoveDatasetClick(view.id()));
+      headerRow.add(removeButton);
+    }
+
+    card.add(headerRow);
+
+    // ═══ TITLE BLOCK ═══
+    var titleBlock = new Div();
+    titleBlock.getStyle().set("padding",
+        "0 var(--lumo-space-m) var(--lumo-space-m) var(--lumo-space-m)");
+    titleBlock.getStyle().set("min-width", "0");
+
+    var titleSpan = new Span(view.title());
+    titleSpan.addClassNames("normal-body-text");
+    titleSpan.getStyle().set("font-weight", "600");
+    titleSpan.getStyle().set("line-height", "1.4");
+    titleBlock.add(titleSpan);
+
+    card.add(titleBlock);
+
+    // ═══ META ROW: PID · Version · Access Link ═══
+    var metaRow = new Div();
+    metaRow.addClassNames("flex-horizontal", "items-center", "gap-03");
+    metaRow.getStyle().set("padding",
+        "0 var(--lumo-space-m) var(--lumo-space-m) var(--lumo-space-m)");
+    metaRow.getStyle().set("flex-wrap", "wrap");
+
+    // PID (linked to DOI resolver)
+    String pidHref = view.pid().startsWith("http")
+        ? view.pid() : "https://doi.org/" + view.pid();
+    var pidLink = new Anchor(pidHref, view.pid());
+    pidLink.setTarget(AnchorTarget.BLANK);
+    pidLink.addClassName("extra-small-body-text");
+    metaRow.add(pidLink);
+
+    // Version (hide when remote info is missing — avoid meaningless "—")
+    String vNorm = view.version();
+    if (vNorm != null && !vNorm.isBlank()) {
+      String display = "v" + vNorm.replaceFirst("^v", "");
+      var versionSpan = new Span(display);
+      versionSpan.addClassName("extra-small-body-text");
+      versionSpan.getStyle().set("color", SECONDARY_COLOR);
+      addMetaSeparator(metaRow);
+      metaRow.add(versionSpan);
+    }
+
+    // Access link (hide when missing)
+    String accessLink = view.accessLink();
+    if (accessLink != null && !accessLink.isBlank()) {
+      addMetaSeparator(metaRow);
+      var accessAnchor = new Anchor(accessLink, "Access ↗");
+      accessAnchor.setTarget(AnchorTarget.BLANK);
+      accessAnchor.addClassName("extra-small-body-text");
+      accessAnchor.getElement().setAttribute("title", accessLink);
+      metaRow.add(accessAnchor);
+    }
+
+    card.add(metaRow);
+
+    // ══ MEDIUM-PRIO TIER ═══
+    var detailRow = buildDetailTier(view);
+    card.add(detailRow);
+
+    return card;
+  }
+
+  private Div buildDetailTier(ConnectedDatasetView view) {
+    var row = new Div();
+    row.addClassNames("flex-horizontal", "items-start");
+    row.getStyle().set("padding",
+        "var(--lumo-space-m) var(--lumo-space-m)");
+    row.getStyle().set("flex-wrap", "wrap");
+    row.getStyle().set("gap", "var(--lumo-space-m) var(--lumo-space-xl)");
+    row.getStyle().set("background-color", "var(--lumo-contrast-5pct)");
+    row.getStyle().set("border-top", "2px solid var(--lumo-contrast-10pct)");
+
+    // Creator — truncate long lists with tooltip showing full names;
+    // hide entirely when remote info is missing.
+    List<String> creators = view.creators();
+    if (creators != null && !creators.isEmpty()) {
+        addDetailCellCreator(row, creators);
+    }
+
+    // Resource type is shown in the card header row.
+
+    // Community — hide when remote info is missing.
+    String community = view.community();
+    if (community != null && !community.isBlank()) {
+      addDetailCell(row, "Community", community);
+    }
+
+    // Linked experiment — clickable link to the experiment view in a new tab;
+    // hide entirely when not linked.
+    if (view.experimentId() != null) {
+        String expName = view.experimentName() != null ? view.experimentName() : view.experimentId();
+        Component experimentComponent;
+        if (context.projectId().isPresent()) {
+            var href = AppRoutes.ProjectRoutes.EXPERIMENT.formatted(
+                context.projectId().get().value(), view.experimentId());
+            var anchor = new Anchor(href, expName);
+            anchor.setTarget(AnchorTarget.BLANK);
+            anchor.addClassName("extra-small-body-text");
+            anchor.getStyle().set("color", "var(--lumo-primary-text-color)");
+            experimentComponent = anchor;
+        } else {
+            experimentComponent = new Span(expName);
+            experimentComponent.addClassName("extra-small-body-text");
+        }
+        addDetailCellComponent(row, "Linked Experiment", experimentComponent);
+    }
+
+    // Attribution — fused inline sentence combining who and when.
+    // These two fields are semantically the same event (the connection action),
+    // so rendering them as two separate label: value cells is redundant and
+    // eats horizontal space. A single natural-language line reads faster and
+    // lets the previous cells breathe. Verb-first order ("connected …") is
+    // chosen so the line reads as a complete attribution phrase rather than a
+    // label-value pair.
+    String connectedBy = view.connectedByDisplayName();
+    LocalDate connectedOn = view.connectedOn() != null
+        ? LocalDate.ofInstant(view.connectedOn(), ZoneOffset.UTC)
+        : null;
+    if ((connectedBy != null && !connectedBy.isBlank()) && connectedOn != null) {
+      var attribCell = new Div();
+      attribCell.addClassName("extra-small-body-text");
+      attribCell.getStyle().set("color", SECONDARY_COLOR);
+      attribCell.getStyle().set("font-style", "italic");
+      attribCell.setText("connected on " + connectedOn.format(DATE_FMT) + " by " + connectedBy);
+      row.add(attribCell);
+    } else if (connectedBy != null && !connectedBy.isBlank()) {
+      var attribCell = new Div();
+      attribCell.addClassName("extra-small-body-text");
+      attribCell.getStyle().set("color", SECONDARY_COLOR);
+      attribCell.getStyle().set("font-style", "italic");
+      attribCell.setText("connected by " + connectedBy);
+      row.add(attribCell);
+    } else if (connectedOn != null) {
+      var attribCell = new Div();
+      attribCell.addClassName("extra-small-body-text");
+      attribCell.getStyle().set("color", SECONDARY_COLOR);
+      attribCell.getStyle().set("font-style", "italic");
+      attribCell.setText("connected on " + connectedOn.format(DATE_FMT));
+      row.add(attribCell);
+    }
+
+    return row;
+  }
+
+  private void addDetailCellCreator(Div container, List<String> creators) {
+    var cell = new Div();
+    cell.addClassNames("flex-horizontal", "gap-02", "items-baseline");
+
+    var labelSpan = new Span("Creator:");
+    labelSpan.addClassNames("extra-small-body-text");
+    labelSpan.getStyle().set("font-weight", "600");
+    labelSpan.getStyle().set("color", SECONDARY_COLOR);
+    cell.add(labelSpan);
+
+    // Truncate at 2 creators; show full list in tooltip.
+    String display;
+    if (creators.size() <= 2) {
+        display = String.join(", ", creators);
+    } else {
+        display = creators.get(0) + ", " + creators.get(1)
+            + " …and " + (creators.size() - 2) + " more";
+    }
+
+    var valueSpan = new Span(display);
+    valueSpan.addClassNames("extra-small-body-text");
+    // Always expose the full list via tooltip, regardless of truncation.
+    valueSpan.getElement().setAttribute("title", String.join(", ", creators));
+    cell.add(valueSpan);
+    container.add(cell);
+  }
+
+  /**
+   * Renders a label-value pair in the detail tier. When {@code value} is
+   * {@code null} or blank the cell is omitted entirely — the caller is
+   * responsible for only invoking this when there is something meaningful
+   * to show.
+   */
+  private void addDetailCell(Div container, String label, String value) {
+    if (value == null) {
+      return;
+    }
+    addDetailCellComponent(container, label, new Span(value));
+  }
+
+  private void addDetailCellComponent(Div container, String label, Component valueComponent) {
+    var cell = new Div();
+    cell.addClassNames("flex-horizontal", "gap-02", "items-baseline");
+
+    var labelSpan = new Span(label + ":");
+    labelSpan.addClassName("extra-small-body-text");
+    labelSpan.getStyle().set("font-weight", "600");
+    labelSpan.getStyle().set("color", SECONDARY_COLOR);
+
+    if (valueComponent instanceof Span s) {
+      s.addClassName("extra-small-body-text");
+    }
+    cell.add(labelSpan, valueComponent);
+    container.add(cell);
+  }
+
+  private void addMetaSeparator(Div row) {
+    var sep = new Span("·");
+    sep.addClassName("extra-small-body-text");
+    sep.getStyle().set("color", "var(--lumo-contrast-30pct)");
+    row.add(sep);
+  }
+
+  // ─ Event wiring ──────────────────────────────────────
+
+  private void fireConnectDatasetsClick() {
+    fireEvent(new ConnectDatasetsClickEvent(this));
+  }
+
+  private void fireRemoveDatasetClick(String datasetId) {
+    fireEvent(new RemoveDatasetClickEvent(this, datasetId));
+  }
+
+  /**
+   * Custom event fired when either the action-bar "Connect Datasets"
+   * button or the empty-state CTA is clicked. The parent view is
+   * expected to handle the event by opening the connect-sidebar.
+   */
+  public static class ConnectDatasetsClickEvent
+      extends com.vaadin.flow.component.ComponentEvent<ConnectedResourcesComponent> {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    public ConnectDatasetsClickEvent(ConnectedResourcesComponent source) {
+      super(source, false);
+    }
+  }
+
+  /**
+   * Custom event fired when the "Remove" button on a dataset card is
+   * clicked. Carries the aggregate ID of the dataset to remove.
+   *
+   * @since 1.12.0
+   */
+  public static class RemoveDatasetClickEvent
+      extends com.vaadin.flow.component.ComponentEvent<ConnectedResourcesComponent> {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private final String datasetId;
+
+    public RemoveDatasetClickEvent(ConnectedResourcesComponent source, String datasetId) {
+      super(source, false);
+      this.datasetId = datasetId;
+    }
+
+    /** Aggregate ID (UUID string) of the dataset to remove. */
+    public String getDatasetId() {
+      return datasetId;
+    }
+  }
+}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/ExperimentMainLayout.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/ExperimentMainLayout.java
index c5a909a3b5..0d6be10238 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/ExperimentMainLayout.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/ExperimentMainLayout.java
@@ -25,7 +25,6 @@
 import life.qbic.datamanager.views.general.DataManagerMenu;
 import life.qbic.datamanager.views.general.footer.FooterComponentFactory;
 import life.qbic.datamanager.views.navigation.ProjectSideNavigationComponent;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.projects.overview.ProjectOverviewMain;
 import life.qbic.datamanager.views.projects.project.experiments.ExperimentNavigationComponent.RoutingTab;
@@ -70,8 +69,7 @@ public ExperimentMainLayout(@Autowired AuthenticationContext authenticationConte
       @Autowired UserPermissions userPermissions,
       @Autowired SpeciesLookupService ontologyTermInformationService,
       @Autowired FooterComponentFactory footerComponentFactory,
-      @Autowired  TerminologyService terminologyService,
-      @Autowired CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
+      @Autowired TerminologyService terminologyService,
       @Autowired MessageSourceNotificationFactory messageSourceNotificationFactory,
       @Autowired AnnouncementService announcementService) {
     super(requireNonNull(footerComponentFactory), announcementService);
@@ -91,7 +89,7 @@ public ExperimentMainLayout(@Autowired AuthenticationContext authenticationConte
     this.projectSideNavigationComponent = new ProjectSideNavigationComponent(
         projectInformationService, experimentInformationService, addExperimentToProjectService,
         userPermissions, ontologyTermInformationService, terminologyService,
-        cancelConfirmationDialogFactory, messageSourceNotificationFactory);
+        messageSourceNotificationFactory);
     initializeNavbar();
     initializeAppDrawer();
     addClassName("experiment-main-layout");
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/OntologyFilterConnector.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/OntologyFilterConnector.java
index 9d24f23820..5cf1502444 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/OntologyFilterConnector.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/OntologyFilterConnector.java
@@ -8,7 +8,6 @@
 import life.qbic.projectmanagement.application.ontology.OntologyClass;
 import life.qbic.projectmanagement.application.ontology.SpeciesLookupService;
 import life.qbic.projectmanagement.application.ontology.TerminologyService;
-import life.qbic.projectmanagement.domain.model.Ontology;
 import life.qbic.projectmanagement.domain.model.OntologyTerm;
 
 /**
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExistingSamplesPreventGroupEdit.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExistingSamplesPreventGroupEdit.java
deleted file mode 100644
index 93abf72d3b..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExistingSamplesPreventGroupEdit.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package life.qbic.datamanager.views.projects.project.experiments.experiment;
-
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Notifies the user that samples exist in the experiment.
- * <p>
- * This dialog is to be shown when editing experimental groups is impossible as samples are
- * present.
- */
-public class ExistingSamplesPreventGroupEdit extends NotificationDialog {
-
-  public ExistingSamplesPreventGroupEdit(int sampleCount) {
-    super(NotificationLevel.ERROR);
-    addClassName("existing-samples-prevent-group-edit");
-    withTitle("Cannot edit experimental groups");
-    customizeContent(sampleCount);
-    setConfirmText("Okay");
-  }
-
-  private void customizeContent(int sampleCount) {
-    Span sampleCountSpan = new Span(String.valueOf(sampleCount));
-    sampleCountSpan.addClassName("sample-count");
-    withContent(
-        new Div(new Text(
-            "Editing experimental groups is only possible if samples are not registered.")),
-        new Div(new Text("You have "), sampleCountSpan,
-            new Text(" sample%s registered.".formatted(sampleCount > 1 ? "s" : ""))));
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java
index 2fc2cfd418..2228f36997 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/ExperimentDetailsComponent.java
@@ -10,6 +10,7 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.DetachEvent;
 import com.vaadin.flow.component.button.Button;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.AnchorTarget;
 import com.vaadin.flow.component.html.Div;
@@ -49,7 +50,6 @@
 import life.qbic.datamanager.views.general.dialog.DialogFooter;
 import life.qbic.datamanager.views.general.dialog.DialogHeader;
 import life.qbic.datamanager.views.general.icon.IconFactory;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.projects.project.experiments.ExperimentInformationMain;
 import life.qbic.datamanager.views.projects.project.experiments.experiment.components.CardCollection;
@@ -134,7 +134,6 @@ public class ExperimentDetailsComponent extends PageArea {
   private final Disclaimer noConfoundingVariablesDefined;
   private final transient TerminologyService terminologyService;
   private final transient MessageSourceNotificationFactory messageSourceNotificationFactory;
-  private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
   private final transient ConfoundingVariableService confoundingVariableService;
   private final transient AsyncProjectService asyncProjectService;
   private Context context;
@@ -148,7 +147,6 @@ public ExperimentDetailsComponent(
       SpeciesLookupService ontologyTermInformationService,
       TerminologyService terminologyService,
       MessageSourceNotificationFactory messageSourceNotificationFactory,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       ConfoundingVariableService confoundingVariableService,
       AsyncProjectService asyncProjectService) {
     this.confoundingVariableService = requireNonNull(confoundingVariableService);
@@ -161,7 +159,6 @@ public ExperimentDetailsComponent(
     this.noExperimentalGroupsDefined = createNoGroupsDisclaimer();
     this.noConfoundingVariablesDefined = createNoConfoundingVariablesDisclaimer();
     this.terminologyService = terminologyService;
-    this.cancelConfirmationDialogFactory = requireNonNull(cancelConfirmationDialogFactory);
     this.addClassName("experiment-details-component");
     confoundingVariablesContainer = new Div();
     confoundingVariablesContainer.addClassNames("width-full", "height-full");
@@ -321,9 +318,13 @@ private void onEditButtonClicked() {
   }
 
   private void showCancelConfirmationDialog(EditExperimentDialog editExperimentDialog) {
-    cancelConfirmationDialogFactory.cancelConfirmationDialog(
-            it -> editExperimentDialog.close(),
-            "experiment.edit", getLocale())
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", editExperimentDialog::close)
+        .cancelButton("Keep editing", () -> {})
+        .build()
         .open();
   }
 
@@ -655,9 +656,15 @@ private boolean editGroupsNotAllowed() {
   }
 
   private void showExistingSamplesPreventGroupEdit(int numberOfRegisteredSamples) {
-    ExistingSamplesPreventGroupEdit existingSamplesPreventGroupEdit = new ExistingSamplesPreventGroupEdit(
-        numberOfRegisteredSamples);
-    existingSamplesPreventGroupEdit.open();
+    AlertDialog.alert(this)
+        .error()
+        .title("Cannot edit experimental groups")
+        .message("Editing experimental groups is only possible if samples are not registered. You have %d sample%s registered.".formatted(
+            numberOfRegisteredSamples,
+            numberOfRegisteredSamples > 1 ? "s" : ""))
+        .confirmButton("Got it", () -> {})
+        .build()
+        .open();
   }
 
   private void addSampleSourceInformationComponent() {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingGroupsPreventVariableEdit.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingGroupsPreventVariableEdit.java
deleted file mode 100644
index 95d691a1fb..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingGroupsPreventVariableEdit.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package life.qbic.datamanager.views.projects.project.experiments.experiment.components;
-
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.button.Button;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Notifies the user that experimental groups exist in the experiment.
- * <p>
- * This dialog is to be shown when editing variables is impossible as experimental groups are
- * present.
- */
-public final class ExistingGroupsPreventVariableEdit extends NotificationDialog {
-
-  public ExistingGroupsPreventVariableEdit(int numberOfExperimentalGroups) {
-    super(NotificationLevel.ERROR);
-    addClassName("existing-groups-prevent-variable-edit");
-    withTitle("Cannot edit variables");
-    customizeContent(numberOfExperimentalGroups);
-    customizeRejection();
-    setConfirmText("Go to Experimental Groups");
-  }
-
-  private void customizeRejection() {
-    setRejectable(true);
-    Button cancelButton = new Button("Cancel");
-    cancelButton.setThemeName("tertiary");
-    setRejectButton(cancelButton);
-  }
-
-  private void customizeContent(int numberOfExperimentalGroups) {
-    Span experimentalGroupCount = new Span(String.valueOf(numberOfExperimentalGroups));
-    experimentalGroupCount.addClassName("experimental-group-count");
-    withContent(
-        new Div(new Text(
-            "Editing experimental variables requires all experimental groups to be deleted.")),
-        new Div(new Text("You have "), experimentalGroupCount,
-            new Text(
-                " experimental group%s.".formatted(numberOfExperimentalGroups > 1 ? "s" : ""))),
-        new Div(new Text("Please delete the group%s to edit the variables.".formatted(
-            numberOfExperimentalGroups > 1 ? "s" : ""))));
-  }
-
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventSampleOriginEdit.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventSampleOriginEdit.java
deleted file mode 100644
index 01401e0173..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventSampleOriginEdit.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package life.qbic.datamanager.views.projects.project.experiments.experiment.components;
-
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.html.Div;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Notifies the user that samples exist in the experiment and reference the Ontology term the user
- * wanted to delete
- * <p>
- * This dialog is to be shown when editing variables is impossible as samples are
- * present.
- */
-public class ExistingSamplesPreventSampleOriginEdit extends NotificationDialog {
-
-  public ExistingSamplesPreventSampleOriginEdit(String ontologyLabel) {
-    super(NotificationLevel.ERROR);
-    addClassName("existing-samples-prevent-variable-edit");
-    withTitle("Cannot remove sample origin");
-    withContent(new Div(
-        new Text(
-            "'%s' cannot be deleted, as it is referenced in samples of this experiment."
-                .formatted(ontologyLabel))));
-    setConfirmText("Okay");
-  }
-
-
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventVariableEdit.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventVariableEdit.java
deleted file mode 100644
index 10a36f2a21..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/components/ExistingSamplesPreventVariableEdit.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package life.qbic.datamanager.views.projects.project.experiments.experiment.components;
-
-import com.vaadin.flow.component.Text;
-import com.vaadin.flow.component.html.Div;
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Notifies the user that samples exist in the experiment.
- * <p>
- * This dialog is to be shown when editing variables is impossible as samples are
- * present.
- */
-public class ExistingSamplesPreventVariableEdit extends NotificationDialog {
-
-  public ExistingSamplesPreventVariableEdit(int sampleCount) {
-    super(NotificationLevel.ERROR);
-    addClassName("existing-samples-prevent-variable-edit");
-    withTitle("Cannot edit variables");
-    customizeContent(sampleCount);
-    setConfirmText("Okay");
-  }
-
-
-  private void customizeContent(int sampleCount) {
-    Span sampleCountSpan = new Span(String.valueOf(sampleCount));
-    sampleCountSpan.addClassName("sample-count");
-    withContent(
-        new Div(new Text(
-            "Editing experimental variables is only possible if samples are not registered.")),
-        new Div(new Text("You have "), sampleCountSpan,
-            new Text(" sample%s registered.".formatted(sampleCount > 1 ? "s" : ""))));
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/update/EditExperimentDialog.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/update/EditExperimentDialog.java
index 1dfff9ddbf..7c09b250df 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/update/EditExperimentDialog.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/experiments/experiment/update/EditExperimentDialog.java
@@ -27,9 +27,9 @@
 import java.util.Set;
 import life.qbic.datamanager.views.events.UserCancelEvent;
 import life.qbic.datamanager.views.general.DialogWindow;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.projects.create.OntologyComboboxFactory;
 import life.qbic.datamanager.views.projects.project.experiments.experiment.SampleOriginType;
-import life.qbic.datamanager.views.projects.project.experiments.experiment.components.ExistingSamplesPreventSampleOriginEdit;
 import life.qbic.projectmanagement.application.ontology.SpeciesLookupService;
 import life.qbic.projectmanagement.application.ontology.TerminologyService;
 import life.qbic.projectmanagement.domain.model.OntologyTerm;
@@ -134,13 +134,14 @@ private void initOriginEditListener(
   }
 
   private void showSamplesPreventOriginEdit(OntologyTerm species) {
-    ExistingSamplesPreventSampleOriginEdit samplesPreventSampleOriginEdit = new ExistingSamplesPreventSampleOriginEdit(
-        species.getLabel());
-    samplesPreventSampleOriginEdit.addConfirmListener(
-        confirmEvent -> confirmEvent.getSource().close());
-    samplesPreventSampleOriginEdit.addRejectListener(
-        rejectEvent -> rejectEvent.getSource().close());
-    samplesPreventSampleOriginEdit.open();
+    AlertDialog.alert(this)
+        .error()
+        .title("Cannot remove sample origin")
+        .message("'%s' cannot be deleted, as it is referenced in samples of this experiment.".formatted(
+            species.getLabel()))
+        .confirmButton("Got it", () -> {})
+        .build()
+        .open();
   }
 
   @Override
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectInformationMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectInformationMain.java
index 2c4f9510e4..fe85fc9f62 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectInformationMain.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectInformationMain.java
@@ -20,8 +20,8 @@
 import life.qbic.datamanager.security.UserPermissions;
 import life.qbic.datamanager.views.Context;
 import life.qbic.datamanager.views.general.Main;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.general.download.DownloadComponent;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.notifications.Toast;
 import life.qbic.datamanager.views.projects.project.ProjectMainLayout;
@@ -39,9 +39,7 @@
 import life.qbic.datamanager.views.projects.project.info.QualityControlListComponent.DeleteQualityControlEvent;
 import life.qbic.datamanager.views.projects.project.info.QualityControlListComponent.DownloadQualityControlEvent;
 import life.qbic.datamanager.views.projects.project.info.QualityControlListComponent.QualityControl;
-import life.qbic.datamanager.views.projects.purchase.PurchaseItemDeletionConfirmationNotification;
 import life.qbic.datamanager.views.projects.purchase.UploadPurchaseDialog;
-import life.qbic.datamanager.views.projects.qualityControl.QCItemDeletionConfirmationNotification;
 import life.qbic.datamanager.views.projects.qualityControl.UploadQualityControlDialog;
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.application.AddExperimentToProjectService;
@@ -90,7 +88,6 @@ public class ProjectInformationMain extends Main implements BeforeEnterObserver
   private final DownloadComponent downloadComponent;
   private final OfferListComponent offerListComponent;
   private final QualityControlListComponent qualityControlListComponent;
-  private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
   private final transient MessageSourceNotificationFactory messageSourceNotificationFactory;
   private final transient TerminologyService terminologyService;
   private Context context;
@@ -104,7 +101,6 @@ public ProjectInformationMain(@Autowired ProjectSummaryComponent projectSummaryC
       @Autowired ProjectPurchaseService projectPurchaseService,
       @Autowired QualityControlService qualityControlService,
       @Autowired TerminologyService terminologyService,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       MessageSourceNotificationFactory messageSourceNotificationFactory) {
     this.projectSummaryComponent = requireNonNull(projectSummaryComponent);
     this.experimentListComponent = requireNonNull(experimentListComponent,
@@ -122,8 +118,6 @@ public ProjectInformationMain(@Autowired ProjectSummaryComponent projectSummaryC
         "qualityControlService must not be null");
     this.messageSourceNotificationFactory = requireNonNull(messageSourceNotificationFactory,
         "messageSourceNotificationFactory must not be null");
-    this.cancelConfirmationDialogFactory = requireNonNull(cancelConfirmationDialogFactory,
-        "cancelConfirmationDialogFactory must not be null");
 
     downloadComponent = new DownloadComponent();
     offerListComponent = getConfiguredOfferList();
@@ -198,17 +192,17 @@ public String getFilename() {
   }
 
   private void onDeleteOfferClicked(DeleteOfferClickEvent deleteOfferClickEvent) {
-    PurchaseItemDeletionConfirmationNotification purchaseItemDeletionConfirmationNotification = new PurchaseItemDeletionConfirmationNotification();
-    purchaseItemDeletionConfirmationNotification.open();
-    purchaseItemDeletionConfirmationNotification.addConfirmListener(event -> {
-      projectPurchaseService.deleteOffer(context.projectId().orElseThrow().value(),
-          deleteOfferClickEvent.offerId());
-      deleteOfferClickEvent.getSource().remove(deleteOfferClickEvent.offerId());
-      downloadComponent.removeHref();
-      purchaseItemDeletionConfirmationNotification.close();
-    });
-    purchaseItemDeletionConfirmationNotification.addCancelListener(
-        event -> purchaseItemDeletionConfirmationNotification.close());
+    AlertDialog.danger(this,
+        "Offer will be deleted",
+        "Are you sure you want to delete this offer?",
+        "Delete offer",
+        "Keep offer",
+        () -> {
+          projectPurchaseService.deleteOffer(context.projectId().orElseThrow().value(),
+              deleteOfferClickEvent.offerId());
+          deleteOfferClickEvent.getSource().remove(deleteOfferClickEvent.offerId());
+          downloadComponent.removeHref();
+        }).open();
   }
 
   private void onUploadOfferClicked(UploadOfferClickEvent uploadOfferClickEvent,
@@ -257,17 +251,17 @@ public byte[] getBytes() {
   }
 
   private void onDeleteQualityControlClicked(DeleteQualityControlEvent deleteQualityControlEvent) {
-    QCItemDeletionConfirmationNotification qcItemDeletionConfirmationNotification = new QCItemDeletionConfirmationNotification();
-    qcItemDeletionConfirmationNotification.open();
-    qcItemDeletionConfirmationNotification.addConfirmListener(event -> {
-      qualityControlService.deleteQualityControl(context.projectId().orElseThrow().value(),
-          deleteQualityControlEvent.qualityControlId());
-      downloadComponent.removeHref();
-      refreshQualityControls();
-      qcItemDeletionConfirmationNotification.close();
-    });
-    qcItemDeletionConfirmationNotification.addCancelListener(
-        event -> qcItemDeletionConfirmationNotification.close());
+    AlertDialog.danger(this,
+        "Quality control will be deleted",
+        "Are you sure you want to delete this file?",
+        "Delete file",
+        "Keep file",
+        () -> {
+          qualityControlService.deleteQualityControl(context.projectId().orElseThrow().value(),
+              deleteQualityControlEvent.qualityControlId());
+          downloadComponent.removeHref();
+          refreshQualityControls();
+        }).open();
   }
 
   private void onUploadQualityControlClicked() {
@@ -352,9 +346,13 @@ private void showAddExperimentDialog() {
   }
 
   private void showCancelConfirmationDialog(AddExperimentDialog creationDialog) {
-    cancelConfirmationDialogFactory.cancelConfirmationDialog(
-            it -> creationDialog.close(),
-            "experiment.create", getLocale())
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", () -> creationDialog.close())
+        .cancelButton("Keep editing", () -> {})
+        .build()
         .open();
   }
 
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java
index 430ad69df3..97e6152928 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/info/ProjectSummaryComponent.java
@@ -904,7 +904,7 @@ private void buildHeaderSection(ProjectOverview projectOverview) {
 
     header.setSectionNote(new SectionNote(
         "Last modified on %s".formatted(DateTimeFormat.asJavaFormatter(
-                DateTimeFormat.SIMPLE_DATE_TIME, ZoneId.systemDefault())
+                DateTimeFormat.SIMPLE_DATE_SHORT, ZoneId.systemDefault())
             .format(projectOverview.lastModified()))));
     headerSection.setHeader(header);
     headerSection.setContent(sectionContent);
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDeletionConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDeletionConfirmationNotification.java
deleted file mode 100644
index 03e0bb8252..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDeletionConfirmationNotification.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package life.qbic.datamanager.views.projects.project.measurements;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Warns the user that measurements will be deleted
- * <p>
- * This dialog is to be shown when measurement deletion is triggered
- */
-public class MeasurementDeletionConfirmationNotification extends NotificationDialog {
-
-  public MeasurementDeletionConfirmationNotification(String title, int amount) {
-    super(NotificationLevel.WARNING);
-    withTitle(title);
-    withContent(new Span(
-        "Are you sure you want to delete %s measurements?".formatted(String.valueOf(amount))));
-    setCancelable(true);
-    setConfirmText("Confirm");
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDetailsComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDetailsComponent.java
index e3380d5c64..d45395a063 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDetailsComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementDetailsComponent.java
@@ -10,6 +10,7 @@
 import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.grid.Grid;
 import com.vaadin.flow.component.grid.Grid.MultiSortPriority;
+import com.vaadin.flow.component.grid.GridSortOrder;
 import com.vaadin.flow.component.html.Anchor;
 import com.vaadin.flow.component.html.AnchorTarget;
 import com.vaadin.flow.component.html.Span;
@@ -389,7 +390,8 @@ SearchTermFilter getIpSearchTermFilter() {
   private Grid<NgsMeasurementLookup.MeasurementInfo> createNgsGrid() {
     var ngsGrid = new Grid<NgsMeasurementLookup.MeasurementInfo>();
     ngsGrid.setMultiSort(true, MultiSortPriority.APPEND, true);
-    ngsGrid.addColumn(NgsMeasurementLookup.MeasurementInfo::measurementCode)
+    var measurementIdColumn = ngsGrid.addColumn(
+            NgsMeasurementLookup.MeasurementInfo::measurementCode)
         .setHeader("QBiC Measurement ID")
         .setSortProperty(NgsSortKey.MEASUREMENT_ID.sortKey())
         .setComparator(Comparator.comparing(NgsMeasurementLookup.MeasurementInfo::measurementCode))
@@ -468,14 +470,15 @@ private Grid<NgsMeasurementLookup.MeasurementInfo> createNgsGrid() {
         .setSortable(false)
         .setAutoWidth(true)
         .setResizable(true);
-
+    ngsGrid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return ngsGrid;
   }
 
   private Grid<PxpMeasurementLookup.MeasurementInfo> createPxpGrid() {
     var pxpGrid = new Grid<PxpMeasurementLookup.MeasurementInfo>();
     pxpGrid.setMultiSort(true, MultiSortPriority.APPEND, true);
-    pxpGrid.addColumn(PxpMeasurementLookup.MeasurementInfo::measurementCode)
+    var measurementIdColumn = pxpGrid.addColumn(
+            PxpMeasurementLookup.MeasurementInfo::measurementCode)
         .setHeader("QBiC Measurement ID")
         .setSortProperty(PxpSortKey.MEASUREMENT_ID.sortKey())
         .setComparator(Comparator.comparing(PxpMeasurementLookup.MeasurementInfo::measurementCode))
@@ -572,7 +575,7 @@ private Grid<PxpMeasurementLookup.MeasurementInfo> createPxpGrid() {
         .setSortable(false)
         .setAutoWidth(true)
         .setResizable(true);
-
+    pxpGrid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return pxpGrid;
   }
 
@@ -665,7 +668,7 @@ private FilterGrid<IpMeasurementLookup.MeasurementInfo, SearchTermFilter> filter
   private Grid<IpMeasurementLookup.MeasurementInfo> createIpGrid() {
     var ipGrid = new Grid<IpMeasurementLookup.MeasurementInfo>();
     ipGrid.setMultiSort(true, MultiSortPriority.APPEND, true);
-    ipGrid.addColumn(IpMeasurementLookup.MeasurementInfo::measurementCode)
+    var measurementIdColumn = ipGrid.addColumn(IpMeasurementLookup.MeasurementInfo::measurementCode)
         .setHeader("QBiC Measurement ID")
         .setSortProperty(IpMeasurementLookup.IpSortKey.MEASUREMENT_ID.sortKey())
         .setComparator(
@@ -820,6 +823,7 @@ private Grid<IpMeasurementLookup.MeasurementInfo> createIpGrid() {
         .setSortable(false)
         .setAutoWidth(true)
         .setResizable(true);
+    ipGrid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return ipGrid;
   }
 
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementMain.java
index 7a554dd5cd..d3f4779be8 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementMain.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementMain.java
@@ -33,6 +33,7 @@
 import life.qbic.datamanager.views.general.Disclaimer;
 import life.qbic.datamanager.views.general.InfoBox;
 import life.qbic.datamanager.views.general.Main;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.general.dialog.AppDialog;
 import life.qbic.datamanager.views.general.dialog.DialogBody;
 import life.qbic.datamanager.views.general.dialog.DialogFooter;
@@ -53,16 +54,16 @@
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationRequest;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationRequestBody;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateRequest;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateRequestBody;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.ValidationRequestBody;
 import life.qbic.projectmanagement.application.api.fair.DigitalObject;
+import life.qbic.projectmanagement.application.measurement.IpMeasurementLookup;
 import life.qbic.projectmanagement.application.measurement.MeasurementService;
 import life.qbic.projectmanagement.application.measurement.MeasurementService.MeasurementDeletionException;
-import life.qbic.projectmanagement.application.measurement.IpMeasurementLookup;
 import life.qbic.projectmanagement.application.measurement.NgsMeasurementLookup;
 import life.qbic.projectmanagement.application.measurement.PxpMeasurementLookup;
 import life.qbic.projectmanagement.application.measurement.validation.MeasurementValidationService;
@@ -312,45 +313,39 @@ private void handlePxpDeletionRequest(Set<String> measurementIds) {
     if (measurementIds.isEmpty()) {
       return;
     }
-    MeasurementDeletionConfirmationNotification notification =
-        new MeasurementDeletionConfirmationNotification(
-            "Selected proteomics measurements will be deleted", measurementIds.size());
-    notification.open();
-    notification.addConfirmListener(event -> {
-      deletePxpMeasurements(measurementIds);
-      notification.close();
-    });
-    notification.addCancelListener(event -> notification.close());
+    AlertDialog.danger(this,
+        "Selected proteomics measurements will be deleted",
+        "Are you sure you want to delete %d measurement%s?".formatted(measurementIds.size(),
+            measurementIds.size() > 1 ? "s" : ""),
+        "Delete measurements",
+        "Keep measurements",
+        () -> deletePxpMeasurements(measurementIds)).open();
   }
 
   private void handleNgsDeletionRequest(Set<String> measurementIds) {
     if (measurementIds.isEmpty()) {
       return;
     }
-    MeasurementDeletionConfirmationNotification notification =
-        new MeasurementDeletionConfirmationNotification(
-            "Selected genomics measurements will be deleted", measurementIds.size());
-    notification.open();
-    notification.addConfirmListener(event -> {
-      deleteNgsMeasurements(measurementIds);
-      notification.close();
-    });
-    notification.addCancelListener(event -> notification.close());
+    AlertDialog.danger(this,
+        "Selected genomics measurements will be deleted",
+        "Are you sure you want to delete %d measurement%s?".formatted(measurementIds.size(),
+            measurementIds.size() > 1 ? "s" : ""),
+        "Delete measurements",
+        "Keep measurements",
+        () -> deleteNgsMeasurements(measurementIds)).open();
   }
 
   private void handleIpDeletionRequest(Set<String> measurementIds) {
     if (measurementIds.isEmpty()) {
       return;
     }
-    MeasurementDeletionConfirmationNotification notification =
-        new MeasurementDeletionConfirmationNotification(
-            "Selected immunopeptidomics measurements will be deleted", measurementIds.size());
-    notification.open();
-    notification.addConfirmListener(event -> {
-      deleteIpMeasurements(measurementIds);
-      notification.close();
-    });
-    notification.addCancelListener(event -> notification.close());
+    AlertDialog.danger(this,
+        "Selected immunopeptidomics measurements will be deleted",
+        "Are you sure you want to delete %d measurement%s?".formatted(measurementIds.size(),
+            measurementIds.size() > 1 ? "s" : ""),
+        "Delete measurements",
+        "Keep measurements",
+        () -> deleteIpMeasurements(measurementIds)).open();
   }
 
   private void deleteNgsMeasurements(Set<String> measurementIds) {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementRegistrationComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementRegistrationComponent.java
index d28b70fa30..c6a9e63c83 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementRegistrationComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/MeasurementRegistrationComponent.java
@@ -8,8 +8,6 @@
 import life.qbic.datamanager.views.general.dialog.InputValidation;
 import life.qbic.datamanager.views.general.dialog.UserInput;
 import life.qbic.datamanager.views.projects.project.measurements.MeasurementTemplateSelectionComponent.Domain;
-import life.qbic.datamanager.views.projects.project.measurements.processor.MeasurementProcessor;
-import life.qbic.datamanager.views.projects.project.measurements.processor.ProcessorRegistry;
 import life.qbic.datamanager.views.projects.project.measurements.registration.MeasurementUpload;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/processor/ProcessorRegistry.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/processor/ProcessorRegistry.java
index 0764ae440a..55f27fe78c 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/processor/ProcessorRegistry.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/processor/ProcessorRegistry.java
@@ -3,12 +3,12 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 
 /**
  * <b>Processor Registry</b>
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/registration/MeasurementUpload.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/registration/MeasurementUpload.java
index d819271e97..1ade34f5bc 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/registration/MeasurementUpload.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/measurements/registration/MeasurementUpload.java
@@ -46,9 +46,9 @@
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.ValidationRequest;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.ValidationRequestBody;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.ValidationResponse;
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/rawdata/RawDataDetailsComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/rawdata/RawDataDetailsComponent.java
index 1901527fc8..3c72bbb390 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/rawdata/RawDataDetailsComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/rawdata/RawDataDetailsComponent.java
@@ -1,6 +1,7 @@
 package life.qbic.datamanager.views.projects.project.rawdata;
 
 import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.GridSortOrder;
 import com.vaadin.flow.data.provider.CallbackDataProvider.CountCallback;
 import com.vaadin.flow.data.provider.CallbackDataProvider.FetchCallback;
 import com.vaadin.flow.data.provider.QuerySortOrder;
@@ -14,7 +15,9 @@
 import java.time.Instant;
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
@@ -141,10 +144,12 @@ private void addNgsTab(FilterGridTabSheet tabSheet, int index, String name,
           .map(info -> info.dataset().measurementId())
           .map(id -> new RawDataURL(dataSourceEndpoint, id))
           .toList();
-
+      var sortedMeasurementIds = new ArrayList<>(ids);
+      sortedMeasurementIds.sort(
+          Comparator.comparing(RawDataURL::measurementCode));
       var file = RawDataUrlFile.create(ids);
       var streamProvider = createStreamProvider(FileNameFormatter.formatWithTimestampedSimple(
-          LocalDate.now(), projectCode, "proteomics_measurement_dataset_locations", "txt"), file);
+          LocalDate.now(), projectCode, "ngs_measurement_dataset_locations", "txt"), file);
       downloadComponent.trigger(streamProvider);
     });
   }
@@ -165,10 +170,12 @@ private void addPxpTab(FilterGridTabSheet tabSheet, int index, String name,
           .map(info -> info.dataset().measurementId())
           .map(id -> new RawDataURL(dataSourceEndpoint, id))
           .toList();
-
+      var sortedMeasurementIds = new ArrayList<>(ids);
+      sortedMeasurementIds.sort(
+          Comparator.comparing(RawDataURL::measurementCode));
       var file = RawDataUrlFile.create(ids);
       var streamProvider = createStreamProvider(FileNameFormatter.formatWithTimestampedSimple(
-          LocalDate.now(), projectCode, "ngs_measurement_dataset_locations", "txt"), file);
+          LocalDate.now(), projectCode, "proteomics_measurement_dataset_locations", "txt"), file);
       downloadComponent.trigger(streamProvider);
     });
   }
@@ -189,8 +196,10 @@ private void addIpTab(FilterGridTabSheet tabSheet, int index, String name,
           .map(info -> info.dataset().measurementId())
           .map(id -> new RawDataURL(dataSourceEndpoint, id))
           .toList();
-
-      var file = RawDataUrlFile.create(ids);
+      var sortedMeasurementIds = new ArrayList<>(ids);
+      sortedMeasurementIds.sort(
+          Comparator.comparing(RawDataURL::measurementCode));
+      var file = RawDataUrlFile.create(sortedMeasurementIds);
       var streamProvider = createStreamProvider(FileNameFormatter.formatWithTimestampedSimple(
           LocalDate.now(), projectCode, "immunopeptidomics_measurement_dataset_locations", "txt"), file);
       downloadComponent.trigger(streamProvider);
@@ -410,7 +419,7 @@ private static SortOrder<RawDataSortingKey> sortOrdersToApi(
   private Grid<RawDatasetInformationNgs> createNgsRawDataGrid() {
     Grid<RawDatasetInformationNgs> grid = new Grid<>();
     grid.addClassName("raw-data-grid");
-    grid.addColumn(
+    var measurementIdColumn = grid.addColumn(
             rawData -> rawData.dataset().measurementId())
         .setKey(UiSortKey.MEASUREMENT_ID.value())
         .setSortProperty(UiSortKey.MEASUREMENT_ID.value())
@@ -432,6 +441,7 @@ private Grid<RawDatasetInformationNgs> createNgsRawDataGrid() {
         .setSortProperty(UiSortKey.UPLOAD_DATE.value())
         .setHeader("Upload Date");
     grid.setItemDetailsRenderer(renderRawDataNgs());
+    grid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return grid;
   }
 
@@ -443,7 +453,7 @@ private Grid<RawDatasetInformationNgs> createNgsRawDataGrid() {
   private Grid<RawDatasetInformationPxP> createPxpRawDataGrid() {
     Grid<RawDatasetInformationPxP> grid = new Grid<>();
     grid.addClassName("raw-data-grid");
-    grid.addColumn(
+    var measurementIdColumn = grid.addColumn(
             rawData -> rawData.dataset().measurementId())
         .setKey(UiSortKey.MEASUREMENT_ID.value())
         .setSortProperty(UiSortKey.MEASUREMENT_ID.value())
@@ -464,6 +474,7 @@ private Grid<RawDatasetInformationPxP> createPxpRawDataGrid() {
         .setSortProperty(UiSortKey.UPLOAD_DATE.value())
         .setHeader("Upload Date");
     grid.setItemDetailsRenderer(renderRawDataPxp());
+    grid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return grid;
   }
 
@@ -496,7 +507,7 @@ private ComponentRenderer<GridDetailsItem, RawDatasetInformationNgs> renderRawDa
   private Grid<RawDatasetInformationIp> createIpRawDataGrid() {
     Grid<RawDatasetInformationIp> grid = new Grid<>();
     grid.addClassName("raw-data-grid");
-    grid.addColumn(
+    var measurementIdColumn = grid.addColumn(
             rawData -> rawData.dataset().measurementId())
         .setKey(UiSortKey.MEASUREMENT_ID.value())
         .setSortProperty(UiSortKey.MEASUREMENT_ID.value())
@@ -517,6 +528,7 @@ private Grid<RawDatasetInformationIp> createIpRawDataGrid() {
         .setSortProperty(UiSortKey.UPLOAD_DATE.value())
         .setHeader("Upload Date");
     grid.setItemDetailsRenderer(renderRawDataIp());
+    grid.sort(GridSortOrder.asc(measurementIdColumn).build());
     return grid;
   }
 
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDeletionConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDeletionConfirmationNotification.java
deleted file mode 100644
index fa6c0ee387..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDeletionConfirmationNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package life.qbic.datamanager.views.projects.project.samples;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Warns the user that the samples contained in the batch will also be deleted
- * <p>
- * This dialog is to be shown when batch deletion is triggered while samples are contained within
- * the batch.
- */
-public class BatchDeletionConfirmationNotification extends NotificationDialog {
-
-  public BatchDeletionConfirmationNotification() {
-    super(NotificationLevel.WARNING);
-    withTitle("Samples within batch will be deleted");
-    withContent(new Span(
-        "Deleting this Batch will also delete the samples contained within. Proceed?"));
-    setCancelable(true);
-    setConfirmText("Confirm");
-  }
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDetailsComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDetailsComponent.java
index 5af03ff08a..e166b1029a 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDetailsComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/BatchDetailsComponent.java
@@ -12,10 +12,7 @@
 import com.vaadin.flow.component.icon.VaadinIcon;
 import com.vaadin.flow.data.provider.SortDirection;
 import com.vaadin.flow.data.renderer.LocalDateTimeRenderer;
-import com.vaadin.flow.spring.annotation.SpringComponent;
-import com.vaadin.flow.spring.annotation.UIScope;
 import com.vaadin.flow.theme.lumo.LumoIcon;
-import jakarta.annotation.security.PermitAll;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.Instant;
@@ -34,11 +31,8 @@
 import life.qbic.projectmanagement.application.batch.BatchInformationService;
 import life.qbic.projectmanagement.domain.model.batch.Batch;
 import life.qbic.projectmanagement.domain.model.batch.BatchId;
-import life.qbic.projectmanagement.domain.model.experiment.Experiment;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
-import life.qbic.projectmanagement.domain.model.project.Project;
 import life.qbic.projectmanagement.domain.model.sample.SampleId;
-import org.springframework.beans.factory.annotation.Autowired;
 
 
 public class BatchDetailsComponent extends PageArea implements Serializable {
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleDetailsComponent.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleDetailsComponent.java
index 38e8f9c659..5f2ad65863 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleDetailsComponent.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleDetailsComponent.java
@@ -1,6 +1,7 @@
 package life.qbic.datamanager.views.projects.project.samples;
 
 import com.vaadin.flow.component.grid.Grid;
+import com.vaadin.flow.component.grid.GridSortOrder;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.data.provider.CallbackDataProvider.CountCallback;
 import com.vaadin.flow.data.provider.CallbackDataProvider.FetchCallback;
@@ -149,9 +150,10 @@ private static Div createTagCollection() {
 
   private static Grid<SamplePreview> createSamplePreviewGrid() {
     Grid<SamplePreview> sampleGrid = new Grid<>();
-    sampleGrid.addColumn(SamplePreview::sampleCode)
+    var sampleIdColumn = sampleGrid.addColumn(SamplePreview::sampleCode)
         .setHeader("Sample ID")
         .setSortProperty(UiSortKey.SAMPLE_ID.value())
+        .setComparator(SamplePreview::sampleCode)
         .setAutoWidth(true)
         .setFlexGrow(0)
         .setTooltipGenerator(SamplePreview::sampleCode)
@@ -210,6 +212,7 @@ private static Grid<SamplePreview> createSamplePreviewGrid() {
         .setResizable(true);
     sampleGrid.addClassName("sample-grid");
     sampleGrid.setColumnReorderingAllowed(true);
+    sampleGrid.sort(GridSortOrder.asc(sampleIdColumn).build());
     return sampleGrid;
   }
 
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleInformationMain.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleInformationMain.java
index e294efd34e..f3addfc6a4 100644
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleInformationMain.java
+++ b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/samples/SampleInformationMain.java
@@ -5,12 +5,8 @@
 import com.vaadin.flow.component.Component;
 import com.vaadin.flow.component.ComponentEvent;
 import com.vaadin.flow.component.UI;
-import com.vaadin.flow.component.button.Button;
 import com.vaadin.flow.component.html.Div;
 import com.vaadin.flow.component.html.Span;
-import com.vaadin.flow.component.icon.VaadinIcon;
-import com.vaadin.flow.component.textfield.TextField;
-import com.vaadin.flow.data.value.ValueChangeMode;
 import com.vaadin.flow.router.BeforeEnterEvent;
 import com.vaadin.flow.router.BeforeEnterObserver;
 import com.vaadin.flow.router.Route;
@@ -35,8 +31,8 @@
 import life.qbic.datamanager.views.general.Disclaimer;
 import life.qbic.datamanager.views.general.DisclaimerConfirmedEvent;
 import life.qbic.datamanager.views.general.Main;
+import life.qbic.datamanager.views.general.dialog.AlertDialog;
 import life.qbic.datamanager.views.general.download.DownloadComponent;
-import life.qbic.datamanager.views.notifications.CancelConfirmationDialogFactory;
 import life.qbic.datamanager.views.notifications.MessageSourceNotificationFactory;
 import life.qbic.datamanager.views.notifications.Toast;
 import life.qbic.datamanager.views.projects.project.experiments.ExperimentMainLayout;
@@ -100,7 +96,6 @@ public class SampleInformationMain extends Main implements BeforeEnterObserver {
   private final Disclaimer noGroupsDefinedDisclaimer;
   private final Disclaimer noSamplesRegisteredDisclaimer;
   private final transient ProjectInformationService projectInformationService;
-  private final transient CancelConfirmationDialogFactory cancelConfirmationDialogFactory;
   private final transient MessageSourceNotificationFactory notificationFactory;
   private final transient SampleValidationService sampleValidationService;
   private final transient SampleRegistrationServiceV2 sampleRegistrationServiceV2;
@@ -117,7 +112,6 @@ public SampleInformationMain(@Autowired ExperimentInformationService experimentI
       @Autowired SampleInformationService sampleInformationService,
       @Autowired AsyncProjectService asyncProjectService,
       ProjectInformationService projectInformationService,
-      CancelConfirmationDialogFactory cancelConfirmationDialogFactory,
       MessageSourceNotificationFactory notificationFactory,
       SampleValidationService sampleValidationService,
       SampleRegistrationServiceV2 sampleRegistrationServiceV2,
@@ -136,8 +130,6 @@ public SampleInformationMain(@Autowired ExperimentInformationService experimentI
     this.batchDetailsComponent = new BatchDetailsComponent(requireNonNull(batchInformationService),
         requireNonNull(clientDetailsProvider));
     this.projectInformationService = projectInformationService;
-    this.cancelConfirmationDialogFactory = requireNonNull(cancelConfirmationDialogFactory,
-        "cancelConfirmationDialogFactory must not be null");
     this.notificationFactory = requireNonNull(notificationFactory,
         "messageSourceNotificationFactory must not be null");
     this.sampleValidationService = sampleValidationService;
@@ -344,8 +336,13 @@ private void onRegisterBatchClicked() {
   }
 
   private void showCancelConfirmationDialog(RegisterSampleBatchDialog dialog) {
-    cancelConfirmationDialogFactory.cancelConfirmationDialog(it -> dialog.close(),
-            "sample-batch.register", getLocale())
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", () -> dialog.close())
+        .cancelButton("Keep editing", () -> {})
+        .build()
         .open();
   }
 
@@ -406,9 +403,12 @@ private void displayRegistrationSuccess(String batchLabel) {
   }
 
   private void displayUpdateFailure() {
-    notificationFactory.dialog("sample-batch.update.failure",
-            MessageSourceNotificationFactory.EMPTY_PARAMETERS,
-            getLocale())
+    AlertDialog.alert(this)
+        .error()
+        .title("Didn't update sample batch.")
+        .message("We are sorry! The sample batch update failed. Please try again.")
+        .confirmButton("Got it", () -> {})
+        .build()
         .open();
   }
 
@@ -481,11 +481,13 @@ private void onEditBatchClicked(EditBatchEvent editBatchEvent) {
   }
 
   private void showCancelConfirmationDialog(EditSampleBatchDialog editBatchDialog) {
-    cancelConfirmationDialogFactory
-        .cancelConfirmationDialog(
-            it -> editBatchDialog.close(),
-            "sample-batch.edit",
-            getLocale())
+    AlertDialog.alert(this)
+        .warning()
+        .title("Discard changes?")
+        .message("By aborting the editing process and closing the dialog, you will lose all information entered.")
+        .confirmButton("Discard changes", () -> editBatchDialog.close())
+        .cancelButton("Keep editing", () -> {})
+        .build()
         .open();
   }
 
@@ -497,14 +499,12 @@ private void deleteBatch(DeleteBatchEvent deleteBatchEvent) {
   }
 
   private void onDeleteBatchClicked(DeleteBatchEvent deleteBatchEvent) {
-    BatchDeletionConfirmationNotification batchDeletionConfirmationNotification = new BatchDeletionConfirmationNotification();
-    batchDeletionConfirmationNotification.open();
-    batchDeletionConfirmationNotification.addConfirmListener(event -> {
-      deleteBatch(deleteBatchEvent);
-      batchDeletionConfirmationNotification.close();
-    });
-    batchDeletionConfirmationNotification.addCancelListener(
-        event -> batchDeletionConfirmationNotification.close());
+    AlertDialog.danger(this,
+        "Samples within batch will be deleted",
+        "Deleting this Batch will also delete the samples contained within. Proceed?",
+        "Delete batch",
+        "Keep batch",
+        () -> deleteBatch(deleteBatchEvent)).open();
   }
 
   /**
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/purchase/PurchaseItemDeletionConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/purchase/PurchaseItemDeletionConfirmationNotification.java
deleted file mode 100644
index 2849c7bca7..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/purchase/PurchaseItemDeletionConfirmationNotification.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package life.qbic.datamanager.views.projects.purchase;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Warns the user that the file will be deleted from the server.
- * <p>
- * This dialog is to be shown when a user wants to delete an Offer item.
- */
-public class PurchaseItemDeletionConfirmationNotification extends NotificationDialog {
-
-  public PurchaseItemDeletionConfirmationNotification() {
-    super(NotificationLevel.WARNING);
-    withTitle("Offer will be deleted");
-    withContent(new Span(
-        "Are you sure you want to delete this offer?"));
-    setCancelable(true);
-    setConfirmText("Confirm");
-  }
-
-}
diff --git a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/qualityControl/QCItemDeletionConfirmationNotification.java b/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/qualityControl/QCItemDeletionConfirmationNotification.java
deleted file mode 100644
index 18ea175ece..0000000000
--- a/datamanager-app/src/main/java/life/qbic/datamanager/views/projects/qualityControl/QCItemDeletionConfirmationNotification.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package life.qbic.datamanager.views.projects.qualityControl;
-
-import com.vaadin.flow.component.html.Span;
-import life.qbic.datamanager.views.notifications.NotificationDialog;
-import life.qbic.datamanager.views.notifications.NotificationLevel;
-
-/**
- * Warns the user that the file will be deleted from the server.
- * <p>
- * This dialog is to be shown when a user wants to delete a Quality Control Item.
- */
-public class QCItemDeletionConfirmationNotification extends NotificationDialog {
-
-  public QCItemDeletionConfirmationNotification() {
-    super(NotificationLevel.WARNING);
-    withTitle("Quality control will be deleted");
-    withContent(new Span(
-        "Are you sure you want to delete this file?"));
-    setCancelable(true);
-    setConfirmText("Confirm");
-  }
-}
diff --git a/datamanager-app/src/main/resources/application.properties b/datamanager-app/src/main/resources/application.properties
index 4a969903ba..df61a02d3d 100644
--- a/datamanager-app/src/main/resources/application.properties
+++ b/datamanager-app/src/main/resources/application.properties
@@ -232,3 +232,18 @@ qbic.sync.raw-data.batch-size=${SYNC_RAW_DATA_BATCH_SIZE:1000}
 # Maximum wall-clock duration in milliseconds for a single scheduled sync job execution.
 # Must remain smaller than the ShedLock lockAtMostFor value (currently PT40S = 40000ms).
 qbic.sync.raw-data.max-duration-ms=${SYNC_RAW_DATA_MAX_DURATION_MS:10000}
+
+# ── InvenioRDM instances (admin-configured; ADR-0002 I2) ────────────
+# Adding a new instance is a config change + redeploy. Users cannot add
+# arbitrary URLs via the UI. The api-version field is reserved for
+# future per-instance adapter dispatch (currently unused; defaults to
+# version 12 of the Invenio REST API spec).
+qbic.external-service.invenio-rdm.instances[0].id=zenodo
+qbic.external-service.invenio-rdm.instances[0].display-name=Zenodo
+qbic.external-service.invenio-rdm.instances[0].base-url=https://zenodo.org
+qbic.external-service.invenio-rdm.instances[0].api-version=12
+
+qbic.external-service.invenio-rdm.instances[1].id=fdat
+qbic.external-service.invenio-rdm.instances[1].display-name=FDAT
+qbic.external-service.invenio-rdm.instances[1].base-url=https://fdat.uni-tuebingen.de
+qbic.external-service.invenio-rdm.instances[1].api-version=12
diff --git a/datamanager-app/src/main/resources/messages/toast-notifications.properties b/datamanager-app/src/main/resources/messages/toast-notifications.properties
index b4b24dc05d..ba3375aa5d 100644
--- a/datamanager-app/src/main/resources/messages/toast-notifications.properties
+++ b/datamanager-app/src/main/resources/messages/toast-notifications.properties
@@ -13,6 +13,8 @@
 ## (<key>.duration) Duration on how long to keep the notification open. Specified in ISO-8601 format
 # foo.bar.duration=PT1m # for one minute
 # foo.bar.duration=PT1s # for one second
+## (<key>.message.subtext) Optional subtext for progress toasts
+# foo.bar.message.subtext=This might take a moment
 ##################################################################################################
 from.experiment.to.sample.batch.message.type=text
 from.experiment.to.sample.batch.message.text=You can now register sample batches.
@@ -59,6 +61,7 @@ measurement.upload.failed.unsupported-file-type.message.type=html
 measurement.upload.failed.unsupported-file-type.message.text=File type is currently not supported.
 measurement.registration.in-progress.message.type=html
 measurement.registration.in-progress.message.text=Registering measurements
+measurement.registration.in-progress.message.subtext=This might take a few minutes
 measurement.registration.in-progress.level=info
 measurement.registration.failed.message.type=html
 measurement.registration.failed.message.text=Apologies, some registrations failed <strong>({0})</strong>. Please contact <a href="mailto:support@qbic.zendesk.com">QBiC support</a>.
@@ -127,7 +130,7 @@ project.updated.error.message.type=html
 project.updated.error.message.text=Project update has failed, please contact the <a href="mailto:support@qbic.zendesk.com">QBiC support</a>.
 project.updated.error.level=error
 project.updated.error.retry.message.type=html
-project.updated.error.retry.message.text=Update was unsuccessful. You might <a href="{0}">try it again</a>.
+project.updated.error.retry.message.text=Update was unsuccessful. Please try again.
 project.updated.error.retry.message.level=error
 access.denied.message.type=html
 access.denied.message.text=Insufficient rights, request has failed.
@@ -135,3 +138,33 @@ access.denied.level=error
 sample.query.failed.message.type=html
 sample.query.failed.message.text=Could not fetch sample information, please contact the <a href="mailto:support@qbic.zendesk.com">QBiC support</a>.
 sample.query.failed.level=error
+dataset.connected.success.message.type=text
+dataset.connected.success.message.text=Connected {0} dataset(s) successfully.
+dataset.connected.success.level=success
+dataset.connected.failure.message.type=text
+dataset.connected.failure.message.text={0} dataset(s) could not be connected.
+dataset.connected.failure.level=error
+dataset.connected.already.message.type=text
+dataset.connected.already.message.text={0} dataset(s) skipped — already connected.
+dataset.connected.already.level=warning
+dataset.experiments.failed.message.type=text
+dataset.experiments.failed.message.text=Failed to load experiments.
+dataset.experiments.failed.level=error
+dataset.search.failed.message.type=text
+dataset.search.failed.message.text={0}
+dataset.search.failed.level=error
+dataset.removed.success.message.type=text
+dataset.removed.success.message.text=Dataset connection removed successfully.
+dataset.removed.success.level=success
+dataset.removing.in-progress.message.type=text
+dataset.removing.in-progress.message.text=Removing dataset connection...
+dataset.removing.in-progress.level=info
+dataset.removed.failure.message.type=text
+dataset.removed.failure.message.text=Failed to remove dataset connection. Please contact QBiC support.
+dataset.removed.failure.level=error
+dataset.removed.already.message.type=text
+dataset.removed.already.message.text=This dataset connection was already removed.
+dataset.removed.already.level=warning
+dataset.removed.notfound.message.type=text
+dataset.removed.notfound.message.text=Dataset connection not found.
+dataset.removed.notfound.level=error
diff --git a/datamanager-app/src/test/java/life/qbic/datamanager/views/general/dialog/AlertDialogTest.java b/datamanager-app/src/test/java/life/qbic/datamanager/views/general/dialog/AlertDialogTest.java
new file mode 100644
index 0000000000..2f6f8912cb
--- /dev/null
+++ b/datamanager-app/src/test/java/life/qbic/datamanager/views/general/dialog/AlertDialogTest.java
@@ -0,0 +1,141 @@
+package life.qbic.datamanager.views.general.dialog;
+
+import com.vaadin.flow.component.html.Div;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for {@link AlertDialog}.
+ *
+ * <p>Because {@link AlertDialog} is a Vaadin UI component, tests that
+ * require a running UI session (e.g. verifying CSS classes on the
+ * inner buttons) belong in integration-test scope. This class focuses
+ * on the factory contract: null-safety, builder sequencing, and
+ * that actions are wired (no crash on build).</p>
+ *
+ * @since 1.12.0
+ */
+class AlertDialogTest {
+
+  /** Non-null {@link com.vaadin.flow.component.Component} used as the parent argument. */
+  private final Div parent = new Div();
+
+  // ── Static factory: danger() shortcut ─────────────────────────────────────
+
+  @Test
+  void danger_returnsAlertDialogInstance() {
+    var dialog = AlertDialog.danger(parent, "Remove?", "Body text.", "Remove user",
+        "Keep user", () -> {});
+    Assertions.assertNotNull(dialog, "danger() must return a non-null AlertDialog");
+    Assertions.assertNotNull(dialog.dialog(), "internal AppDialog must be non-null");
+  }
+
+  @Test
+  void danger_throwsOnNullParent() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(null, "Title", "Msg", "Remove user", "Keep user", () -> {}));
+  }
+
+  @Test
+  void danger_throwsOnNullTitle() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(parent, null, "Msg", "Remove user", "Keep user", () -> {}));
+  }
+
+  @Test
+  void danger_throwsOnNullMessage() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(parent, "Title", null, "Remove user", "Keep user", () -> {}));
+  }
+
+  @Test
+  void danger_throwsOnNullConfirmLabel() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(parent, "Title", "Msg", null, "Keep user", () -> {}));
+  }
+
+  @Test
+  void danger_throwsOnNullCancelLabel() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(parent, "Title", "Msg", "Remove user", null, () -> {}));
+  }
+
+  @Test
+  void danger_throwsOnNullConfirmAction() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.danger(parent, "Title", "Msg", "Remove user", "Keep user", null));
+  }
+
+  // ── Fluent builder ───────────────────────────────────────────────────────
+
+  @Test
+  void builder_requiresConfirmButtonBeforeBuild() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.alert(parent).title("Title").message("Msg").build(),
+        "build() without confirmButton() must fail");
+  }
+
+  @Test
+  void builder_acceptsDangerThenBuilds() {
+    var dialog = AlertDialog.alert(parent)
+        .danger()
+        .title("Delete?")
+        .message("Irreversible operation.")
+        .confirmButton("Delete", () -> {})
+        .cancelButton("No", () -> {})
+        .build();
+
+    Assertions.assertNotNull(dialog);
+    Assertions.assertNotNull(dialog.dialog());
+  }
+
+  @Test
+  void builder_acceptsConfirmOnlyDialog() {
+    var dialog = AlertDialog.alert(parent)
+        .warning()
+        .title("Acknowledge")
+        .message("Something happened.")
+        .confirmButton("OK", () -> {})
+        .build();
+
+    Assertions.assertNotNull(dialog);
+  }
+
+  @Test
+  void builder_allIntentShorthandsBuild() {
+    buildWith(AlertDialog.Builder::danger);
+    buildWith(AlertDialog.Builder::warning);
+    buildWith(AlertDialog.Builder::error);
+    buildWith(AlertDialog.Builder::info);
+  }
+
+  private void buildWith(java.util.function.Function<AlertDialog.Builder, AlertDialog.Builder> shorthand) {
+    var dialog = shorthand
+        .apply(AlertDialog.alert(parent))
+        .title("Title")
+        .message("Msg")
+        .confirmButton("OK", () -> {})
+        .build();
+    Assertions.assertNotNull(dialog);
+  }
+
+  // ── Builder: null-safety ────────────────────────────────────────────────
+
+  @Test
+  void builder_rejectsNullTitle() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.alert(parent).danger().title(null));
+  }
+
+  @Test
+  void builder_rejectsNullMessage() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.alert(parent).danger().message(null));
+  }
+
+  @Test
+  void builder_rejectsNullConfirmLabel() {
+    Assertions.assertThrows(NullPointerException.class,
+        () -> AlertDialog.alert(parent).danger().confirmButton(null, () -> {}));
+  }
+}
diff --git a/docs/adr/0001-associated-datasets-domain-model.md b/docs/adr/0001-associated-datasets-domain-model.md
new file mode 100644
index 0000000000..a095f4227c
--- /dev/null
+++ b/docs/adr/0001-associated-datasets-domain-model.md
@@ -0,0 +1,170 @@
+# 0001 — Domain model and bounded context for associated datasets
+
+* Status: approved
+* Deciders: project team (interviewed via [`interview-feat-dataset-connection.md`](interview-feat-dataset-connection.md))
+* Date: 2026-07-13
+
+Technical Story: [Connect associated InvenioRDM datasets with Data Manager projects](https://github.com/qbicsoftware/data-manager-app/issues/1466) (FEAT-DATASET-CONNECTION)
+
+## Context and Problem Statement
+
+Data Manager operates as a hub for project data. Beyond first-class data types (raw data via OpenBIS,
+measurement metadata), researchers need to **associate** additional external data resources with
+their projects — data they cannot or do not want to maintain inside Data Manager as first-class
+datasets. The first concrete source is InvenioRDM (Zenodo, FDAT), but future sources (LIMS,
+other remote resources) are anticipated.
+
+Two pre-existing design pressures complicate the introduction of this concept:
+
+1. The `project-management` bounded context already contains a `dataset` package (under
+   `project-management-infrastructure/dataset/`) that handles **OpenBIS raw measurement data**
+   (`LocalRawDataset*`, `RemoteRawData*`). That package is conceptually unrelated to the new
+   concept of "associated datasets" and must not be conflated.
+2. The project uses a source-agnostic domain event dispatch infrastructure (`DomainEvent` +
+   `DomainEventDispatcher`) and a sealed, source-typed extension pattern for value objects is
+   desirable to avoid InvenioRDM-specific leakage into the aggregate.
+
+The question is: how do we model **AssociatedDataset** so it (a) fits naturally in
+`project-management`, (b) avoids the package name collision, (c) is source-agnostic at the
+domain boundary, (d) supports a clean persistence strategy, and (e) can scale if assumptions
+grow.
+
+## Decision Drivers
+
+* Bounded context ownership — the concept is inherently project-scoped; `project-management` is
+  the only candidate context among the three.
+* Product framing — the stakeholders use the term "associated datasets" deliberately, signalling
+  a generalised, open-ended concept.
+* Avoid naming collision with existing OpenBIS `dataset` package.
+* Source-agnostic aggregate design — aggregate must not embed InvenioRDM-specific concepts
+  (DOIs, PIDs, communities) at the domain boundary.
+* Storage ergonomics — universal fields need straightforward SQL for sorting/filtering
+  (stories #1476/#1477); source-specific fields are stored opaquely.
+* Scale assumption — a project is expected to have fewer than ~100 associated datasets; at this
+  scale, JSON-path extraction is fast enough that index optimisation is deferred.
+* Evolution path — the storage design must have a documented path forward when assumptions
+  change (e.g., cross-project API endpoints emerge).
+* Data stewardship — soft delete (not hard delete) preserves the connection as a tombstone in
+  the `REMOVED` state for audit purposes; there is currently no user story exposing removed
+  connections in the UI.
+* No event sourcing / no snapshot history — stakeholder confirmed this is not required.
+
+## Considered Options
+
+* [Option A] New bounded context (e.g., `dataset-connection`) dedicated to this concept
+* [Option B] Package `associated-dataset` within `project-management`, source-agnostic aggregate
+  + sealed-metadata hierarchy, universal columns + MariaDB `JSON` column for source-specific
+  fields
+* [Option C] Package `associated-dataset` within `project-management`, InvenioRDM-specific
+  aggregate (no generalisation) — simplest for v1, risky for long-term evolution
+* [Option D] Full event sourcing for lifecycle — events as source of truth, projection-only
+  aggregate
+* [Option E] Aggregate + append-only event log (O2) — dual-write to current state + event log
+  table
+
+## Decision Outcome
+
+**Chosen option: B with soft delete.** Package `associated-dataset`
+within the `project-management` bounded context; source-agnostic aggregate root carrying
+`source_type`, `external_handle`, connection state, and universal fields as regular columns;
+source-specific metadata encapsulated in a sealed `ResourceMetadata` hierarchy stored in a
+MariaDB `JSON` column; connection removal is a soft-delete transitioning to `state = REMOVED` (tombstone retained for audit, no UI exposure in v1). No event sourcing; no event log table.
+
+This decision resolves five sub-decisions:
+
+1. **Bounded context** → `project-management`
+2. **Package name** → `associated-dataset` (distinct from existing OpenBIS `dataset` package)
+3. **Generalisation posture** → source-agnostic aggregate root + sealed per-source metadata
+   hierarchy
+4. **Storage strategy** → universal fields as regular columns (for SQL ergonomics: `ORDER BY`,
+   `WHERE`, joins); source-specific fields in a MariaDB `JSON` column (not PostgreSQL `JSONB`,
+   which MariaDB does not support)
+5. **Connection removal semantics** → soft delete; tombstone retained; audit-only in v1
+
+### Positive Consequences
+
+* Package `associated-dataset` is self-describing and cleanly isolated from the OpenBIS raw-data
+  code, removing any risk of conflation.
+* Adding a new external source (e.g., LIMS) is a straightforward extension: add a
+  `SourceType` enum value, implement the corresponding `ResourceMetadata` subtype, add an
+  adapter. The aggregate root shape does not change.
+* Universal columns give clean SQL for sort/filter without JSON-path gymnastics.
+* Explicit scale assumption (`~100 datasets per project`) makes the performance evolution path
+  a deliberate choice when revisited, not a surprise refactor.
+* Soft-delete tombstone preserves audit provenance without adding a separate history table.
+* No event sourcing avoids CQRS, snapshot strategies, and event-versioning discipline that
+  the project has no foundation to support today.
+
+### Negative Consequences
+
+* Column names (`source_type`, `external_handle`) are more generic than InvenioRDM-specific
+  names (`doi`), making individual-row queries slightly less direct (filter on `source_type`
+  is required to isolate InvenioRDM rows).
+* JSON-path queries on source-specific fields (e.g., "find all InvenioRDM datasets where
+  community = X") rely on MariaDB's `JSON_EXTRACT` and are not indexed — acceptable at
+  <100 rows per project, not acceptable at larger scale without the evolution path.
+* Soft-delete adds a `state != 'REMOVED'` filter to the default query path; if this is
+  forgotten in one place, dead connections could surface.
+* Future evolution (generated columns, CQRS) is available but requires active maintenance when
+  assumptions are violated.
+
+## Pros and Cons of the Options
+
+### Option A — New bounded context (e.g., `dataset-connection`)
+
+* Good, because it gives the concept a clearly bounded home with its own identity.
+* Bad, because `project-management` is already the natural home — creating a new context adds
+  cross-context integration complexity that is not justified.
+* Bad, because it fragments the project-level aggregate (`Project` + its associated datasets
+  live in separate contexts).
+
+### Option B — `associated-dataset` package, source-agnostic aggregate, universal columns + JSON
+
+* Good, because it isolates the concept from the existing `dataset` package (OpenBIS) without
+  conflation.
+* Good, because the aggregate is source-agnostic — adding LIMS or another source is an
+  extension, not a refactor.
+* Good, because universal columns + JSON split matches the sort/filter/display needs at the
+  stakeholder-specified scale.
+* Good, because soft delete preserves audit provenance without a separate history table.
+* Bad, because the aggregate and DB schema carry generic field names (`external_handle`) instead
+  of source-specific ones (`doi`, `pid`), which is slightly less intuitive for InvenioRDM-only
+  readers.
+* Bad, because JSON-path indexing must be explicitly added (via generated columns) when scale
+  assumptions are violated.
+
+### Option C — InvenioRDM-specific aggregate within `project-management`
+
+* Good, because it is the simplest v1 design — no generalisation to pay for upfront.
+* Bad, because the product framing explicitly anticipates future sources; this option requires
+  a painful aggregate-level refactor whenever a second source type is added.
+* Bad, because InvenioRDM-specific concepts (DOIs, PIDs, communities) leak into the aggregate
+  root, violating the product's generalised framing.
+
+### Option D — Full event sourcing for lifecycle
+
+* Good, because it provides a complete audit trail and rebuild-any-point-in-time capability.
+* Good, because the project has half-built event-sourcing infrastructure (`DomainEvent`,
+  `DomainEventDispatcher`).
+* Bad, because this project has no tooling for the write-side/read-side split, snapshots, or
+  event-versioning discipline that full event sourcing requires.
+* Bad, because stakeholders explicitly rejected this need as unnecessary.
+* Bad, because it is over-investment for a feature with no audit-trail requirement.
+
+### Option E — Aggregate + append-only event log (O2)
+
+* Good, because it delivers audit history without CQRS or snapshot complexity.
+* Good, because it keeps the upgrade path to full event sourcing (Option D) open if the need
+  ever materialises.
+* Bad, because it introduces dual-write consistency risk (aggregate + log must stay in sync).
+* Bad, because the stakeholder confirmed audit history is not required.
+* Bad, because it adds a storage table and operational complexity that delivers no v1 value.
+
+## Links
+
+* Related by [ADR-0002](0002-invenio-rdm-api-client-credentials.md) — the `DatasetSource`
+  port contract defined there is the external-facing half of this aggregate's persistence.
+* Related by [ADR-0003](0003-connection-lifecycle-stewardship.md) — lifecycle semantics
+  (soft-delete, sync, notifications) build on this aggregate.
+* Superseded-in-part by [ADR-0004](0004-fair-signposting-deferred.md) — InvenioRDM
+  Signposting integration is deferred; this ADR's REST-based aggregate is the v1 decision.
diff --git a/docs/adr/0002-invenio-rdm-api-client-credentials.md b/docs/adr/0002-invenio-rdm-api-client-credentials.md
new file mode 100644
index 0000000000..c6e7092085
--- /dev/null
+++ b/docs/adr/0002-invenio-rdm-api-client-credentials.md
@@ -0,0 +1,264 @@
+# 0002 — InvenioRDM API client design and external credential security
+
+* Status: approved
+* Deciders: project team (interviewed via [`interview-feat-dataset-connection.md`](interview-feat-dataset-connection.md))
+* Date: 2026-07-13
+
+Technical Story: [Connect associated InvenioRDM datasets with Data Manager projects](https://github.com/qbicsoftware/data-manager-app/issues/1466) (FEAT-DATASET-CONNECTION)
+
+## Context and Problem Statement
+
+Data Manager needs to talk to external InvenioRDM instances (Zenodo, FDAT) over HTTPS to
+**search** records, **resolve** record metadata, and **validate** user-provided Personal
+Access Tokens. The InvenioRDM REST API uses per-request token authentication; there is no
+session concept. Tokens are user-scoped: each user provides their own tokens for each
+instance they want to access.
+
+This introduces a design problem with three intertwined axes:
+
+1. **Port design** — how does the integration fit the codebase's existing patterns? The
+   codebase has two reference patterns for external integration: stateful session connectors
+   (OpenBIS, with session + keepalive + vault-backed credentials loaded at startup) and
+   stateless HTTP ports (TIB Terminology, ROR API). The InvenioRDM integration is neither
+   (there is no session with the external service), but it must be instance-parameterised
+   because we talk to multiple InvenioRDM instances.
+2. **Credential lifecycle** — tokens are per-user + per-instance, added by users at runtime.
+   This is neither a pre-wired service account (which the PKCS12 vault is set up for) nor
+   a one-way-hashed credential (which Data Manager's own PATs are). They must be **readable
+   at runtime**, not just verifiable.
+3. **Security boundary** — the production environment is HA (multiple application nodes).
+   Credential storage must be safe under concurrent writes on any node, and the plaintext
+   token value must never leak across architectural boundaries (into logs, persisted events,
+   UI state, cross-layer DTOs, or other users' invocations).
+
+## Decision Drivers
+
+* The InvenioRDM API is stateless; no session concept means no long-lived connector.
+* Multiple external instances (Zenodo, FDAT, and future ones) mean the client must be
+  parameterised by instance, not a singleton.
+* Tokens are user-scoped (not service-account scoped) — each user brings their own.
+* HA production environment — shared PKCS12 keystore on a local filesystem is not safe
+  under many concurrent runtime writes from multiple users.
+* The `DataManagerVault` writes to a local file on every `add()`; HA-safe only for secrets
+  that are set at deploy time (like OpenBIS credentials).
+* Tokens represent user access to external platforms; loss of a token is a security incident
+  for the affected researcher and possibly for the hosted external platform.
+* The architecture must make it structurally impossible to accidentally log, serialise, or
+  pass the plaintext token through higher layers.
+* Existing error-mapping infrastructure (`ErrorMessageTranslationService` +
+  `ApplicationException` + `UiExceptionHandler`) should be used for user-visible errors.
+* The port design must be source-agnostic at the domain boundary, consistent with the
+  generalised `associated-dataset` aggregate in [ADR-0001](0001-associated-datasets-domain-model.md).
+
+## Considered Options
+
+### Port design
+
+* [P1] OpenBIS-style session connector (login → session → HTTP calls on session)
+* [P2] Stateless port, instance-parameterised (recommended)
+* [P3] Hardcoded single-instance client (Zenodo-only)
+
+### Instance discovery
+
+* [I1] Hardcoded instances in code (only Zenodo + FDAT)
+* [I2] Configurable via `application.properties` (admin-controlled)
+* [I3] UI-managed instance list (users add arbitrary URLs)
+
+### Token scoping
+
+* [T1] Per-user-per-instance tokens (user brings their own)
+* [T2] Platform-wide service-account tokens (institutional token for everyone)
+* [T3] Hybrid (per-user default + optional service-account override)
+
+### Credential storage
+
+* [S1] Share the existing PKCS12 vault at runtime (writes go to local file, synced via FS)
+* [S2] Master AES-256 key in vault, encrypted token blobs in DB (HA-safe)
+* [S3] External secret manager (HashiCorp Vault, AWS Secrets Manager)
+* [S4] Plaintext in DB (unacceptable — ruled out)
+
+### Result type strategy
+
+* [R1] Single unified type for search hit and persisted metadata
+* [R2] Separate `SearchResult` (transient, paginated) and `ResourceMetadata` (persisted,
+  canonical snapshot)
+
+### Decryption boundary
+
+* [D1] Decryption at infrastructure boundary; plaintext never escapes method scope
+* [D2] Decrypted token passed as DTO in application layer
+
+## Decision Outcome
+
+**Chosen option: P2 + I2 + T1 + S2 + R2 + D1, with bounded sync retry, existing error
+mapping, and deferred strict-vs-lenient parsing policy.**
+
+Concretely:
+
+1. **Port design (P2):** A stateless `DatasetSource` port, instance-parameterised. The caller
+   provides `(query, InstanceConfig)` where `InstanceConfig` bundles `baseUrl` and optional
+   `AccessToken`. The port is responsible for the HTTP call and returns a result.
+
+2. **Instance discovery (I2):** Instances are configured via `application.properties`:
+   ```properties
+   # Example config, evaluate other extendable options for external instances
+   # No decision on array usage yet
+   qbic.external-service.invenio-rdm.instances[0].name=Zenodo
+   qbic.external-service.invenio-rdm.instances[0].url=https://zenodo.org
+   qbic.external-service.invenio-rdm.instances[1].name=FDAT
+   qbic.external-service.invenio-rdm.instances[1].url=https://fdat.uni-tuebingen.de
+   ```
+   Adding a new instance is an admin config change + redeploy. Never a UI entry (keeps the
+   security surface small — no arbitrary URLs).
+
+3. **Token scoping (T1):** Tokens are strictly per-user + per-instance. Each user owns their
+   tokens; the system never uses one user's token to fulfil another user's action
+   (**never-borrow-credentials principle**). This rule has forensic (InvenioRDM logs truthfully
+   represent who initiated each call) and privacy (one user never transparently gains access
+   to data their own token wouldn't grant them) implications.
+
+4. **Credential storage (S2):** The existing PKCS12 keystore vault holds **only the master
+   AES-256 encryption key** (distributed to each node at deploy time — already HA-safe
+   because the existing OpenBIS flow already uses this deployment pattern). Each user's
+   InvenioRDM PAT is individually AES-GCM-encrypted (`nonce + ciphertext + tag`) and stored
+   as a `VARBINARY` blob in the DB. Any node can decrypt (same key, shared DB). No local-file
+   concurrency problem. This is analogous to the existing `PersonalAccessTokenEncoder` pattern
+   (which uses PBKDF2 one-way hashing for DM PATs), upgraded to symmetric (reversible)
+   encryption because we *need* the plaintext.
+
+5. **Result types (R2):** Two distinct types — `SearchResult` (transient, paginated, drives the
+   UI search display via `List<SearchHit>`) and `ResourceMetadata` (sealed hierarchy, persisted
+   as the canonical metadata snapshot on the aggregate). `SearchResult` and `ResourceMetadata` overlap heavily in fields because
+   InvenioRDM search hits carry most metadata inline, but they differ in purpose: one is
+   "what the API returned right now" (transient), the other is "what we persist as the
+   snapshot of truth."
+
+6. **Decryption boundary (D1):** The plaintext token value **never crosses an architectural
+   layer boundary**. It exists only within a `char[]` local variable in the infrastructure
+   adapter method that performs the HTTP call, and is zeroed after use (`Arrays.fill(token, '\0')`
+   in a `finally` block). The method returns only the result of the HTTP call
+   (`SearchResult` or `ResourceMetadata`), never the token.
+
+7. **Retry policy:** Bounded synchronous retry (3 attempts, exponential backoff, 5-second
+   ceiling) for **transient errors only**: HTTP 5xx, network timeouts, HTTP 429
+   (honouring the `Retry-After` header if present). No retry on 401/403/404 — these are
+   access/credential semantics, not transient failures.
+
+8. **Error surface:** User-visible errors use the existing
+   `ErrorMessageTranslationService` + `ApplicationException` + `UiExceptionHandler` pipeline.
+   Raw upstream errors go to server logs only. No correlation IDs are carried to the user
+   (no existing concept for them; users don't copy from toasts).
+
+9. **Credential status updates:** The `status` field of a stored credential (`VALID`,
+   `INVALIDATED`) is updated **only on explicit verification** (user clicks "Add"
+   or "Validate" in the UI). A failed sync due to 401/403 does **not** silently update the
+   credential status; it surfaces only an error to the user.
+
+10. **Parsing strictness (deferred):** The strict-vs-lenient JSON parsing question "for sync"
+    is **deferred** — it must be resolved before the sync logic is implemented, but is not
+    architectural in nature. Suggested policy (to be confirmed at implementation time):
+    lenient on search (preview, transient), strict on sync (preserve existing metadata if
+    the InvenioRDM response is not parsable in an expected format — don't silently corrupt
+    the snapshot).
+
+### Positive Consequences
+
+* Stateless port fits the codebase's established stateless-HTTP-adapter pattern (TIB, ROR).
+* No new external integration (no HashiCorp Vault); leverages the existing PKCS12 vault and
+  its HA distribution pattern.
+* The `DatasetSource` port is source-agnostic, consistent with the generalised aggregate
+  design — adding a LIMS source is an adapter-level change.
+* HA-safe: every node can read and decrypt tokens using the shared master key in the DB.
+* Decryption boundary rule makes accidental token bleed a structural impossibility: the
+  plaintext type (`char[]`) and scope (single method local) are the enforcement mechanism.
+* The bounded retry policy limits runaway load on InvenioRDM (especially important for rate
+  limits on anonymous endpoints).
+* Separation of `SearchResult` and `ResourceMetadata` keeps the persisted snapshot decoupled
+  from whatever InvenioRDM's search response happens to include today.
+
+### Negative Consequences
+
+* Users must maintain their own tokens per instance, and must re-add them when tokens expire
+  or are revoked on the external platform. UX must surface this clearly.
+* The master-key-from-vault pattern requires ops to deploy the same keystore to every HA node
+  — a dependency on deployment discipline.
+* Decryption-boundary discipline is a **convention**, not a language-level guarantee. It must
+  be reinforced in code review. There is no compiler-enforced barrier.
+* Separation of search result from persisted metadata means more types to maintain, though
+  the overlap is large and the benefit is clear.
+* Retry-and-fail on 401/403 gives a "transient-looking" transient failure for a credential
+  problem. The error message must clearly distinguish between "transient (try again)" and
+  "credential invalid (re-enter token)".
+
+## Pros and Cons of the Options
+
+### P1 — OpenBIS-style session connector
+
+* Good, because it is a familiar pattern in this codebase.
+* Bad, because InvenioRDM is not session-based; a session abstraction would be fictitious and
+  add operational complexity.
+* Bad, because it is inherently per-instance singleton; doesn't map to per-user token scoping.
+
+### P2 — Stateless `DatasetSource` port, instance-parameterised
+
+* Good, because it matches the actual API contract (per-request stateless HTTP).
+* Good, because it is source-agnostic at the port level.
+* Good, because it accommodates multiple instances trivially.
+* Bad, because it is a new pattern relative to the OpenBIS connector (slight familiarity cost
+  for maintainers).
+
+### I2 — Instances via `application.properties`
+
+* Good, because it is admin-controlled (no arbitrary URL injection via UI).
+* Good, because it fits the existing external-integration configuration pattern
+  (`qbic.external-service.*.*`).
+* Bad, because adding a new instance requires redeploy. For the known instances (Zenodo, FDAT)
+  this is fine.
+* Bad, because ops cannot update instances from within the running application.
+
+### T1 — Per-user-per-instance tokens only
+
+* Good, because it is the simplest mental model and eliminates credential-borrowing risk.
+* Good, because it aligns InvenioRDM audit logs ("user X performed action Y") with DM's
+  logical model.
+* Bad, because each user must maintain their own token; no shared institutional token path.
+* Bad, because a user leaving the project can orphan a connected dataset's sync path (mitigated
+  by the soft-delete + historical-snapshot retention).
+
+### S2 — Master key in vault + AES-GCM-encrypted blobs in DB
+
+* Good, because it eliminates the local-file concurrency problem of the existing PKCS12 vault
+  for runtime-written entries.
+* Good, because any HA node can decrypt using the shared master key + the shared DB.
+* Good, because the PKCS12 vault remains consistent with the existing OpenBIS secret-loading
+  pattern (same deployment discipline).
+* Bad, because it introduces a symmetric-encryption layer on top of the vault rather than
+  using the vault directly for token storage.
+
+### R2 — Separate `SearchResult` and `ResourceMetadata`
+
+* Good, because search (transient, paginated, UI-driving) and persistence (canonical snapshot)
+  are fundamentally different concerns with different lifetimes and ownership.
+* Good, because the persisted type is source-typed (sealed hierarchy) while search hits are
+  source-agnostic previews.
+* Bad, because overlapping field sets across two types adds maintenance surface.
+
+### D1 — Decryption boundary at infrastructure, plaintext never escapes scope
+
+* Good, because token bleed into logs, UI state, domain events, and application-layer DTOs
+  is made structurally impossible (the plaintext simply doesn't exist at those layers).
+* Good, because the enforcement mechanism is a local `char[]` variable + `finally`-block
+  zeroing — deterministic and auditable.
+* Good, because it reinforces the same invariant across the entire codebase.
+* Bad, because it is a **convention**, not a language-enforced barrier. Requires code review.
+* Bad, because `char[]` is slightly more awkward than `String` for Java developers accustomed
+  to `String` APIs.
+
+## Links
+
+* Depends on [ADR-0001](0001-associated-datasets-domain-model.md) — the `DatasetSource`
+  port is the external-facing half of the aggregate defined there.
+* Refined by [ADR-0003](0003-connection-lifecycle-stewardship.md) — lifecycle semantics
+  (sync, notifications, ACL) build on this port and credential storage.
+* Related to [ADR-0004](0004-fair-signposting-deferred.md) — InvenioRDM Signposting is
+  deferred; this ADR's REST-based client is the current integration mechanism.
diff --git a/docs/adr/0003-connection-lifecycle-stewardship.md b/docs/adr/0003-connection-lifecycle-stewardship.md
new file mode 100644
index 0000000000..5300c15c32
--- /dev/null
+++ b/docs/adr/0003-connection-lifecycle-stewardship.md
@@ -0,0 +1,219 @@
+# 0003 — Dataset connection lifecycle and data stewardship
+
+* Status: approved
+* Deciders: project team (interviewed via [`interview-feat-dataset-connection.md`](interview-feat-dataset-connection.md))
+* Date: 2026-07-13
+
+Technical Story: [Connect associated InvenioRDM datasets with Data Manager projects](https://github.com/qbicsoftware/data-manager-app/issues/1466) (FEAT-DATASET-CONNECTION)
+
+## Context and Problem Statement
+
+An *associated dataset* connects an external record (hosted on Zenodo, FDAT, or a future
+LIMS) to a Data Manager project. Once connected, the dataset has a lifecycle within the
+project: it can be viewed, synced, and removed. Each step in that lifecycle raises
+questions about:
+
+1. **Who can perform the action?** (ACL interaction — see
+   [ADR-0001 §Security](0001-associated-datasets-domain-model.md) for the domain model;
+   this ADR focuses on the lifecycle.)
+2. **What happens on the external platform?** (Do we use the user's own token, or do we
+   borrow someone else's?)
+3. **What do other project members see when things change?** (notification model)
+4. **What is preserved when the connection is removed?** (data stewardship)
+5. **How is sync structured?** (manual vs. background; user-initiated vs. automated)
+
+The project has existing patterns for project ACL (Spring Security ACL tables + permission
+model) and for email communication (`subscription-provider` SMTP). The design problem is
+which patterns to reuse and which to extend, and how to document the invariants
+operationally.
+
+## Decision Drivers
+
+* Project ACL is the natural authority for "who sees what in this project." Dataset
+  connections are attached to a project, not independent resources.
+* A sync operation against an external platform is an authenticated action on behalf of a
+  user. That user's identity and access privileges must flow through transparently. The
+  system must not silently use another user's credentials.
+* Notification should be user-actionable and not flood inboxes. The granularity should be:
+  "actor gets immediate feedback, other members get email" — not "every event goes to
+  everyone."
+* The existing `NotificationService` + `Exchange` in-memory bus (in the `broadcasting`
+  module) is acknowledged scaffolding — its own JavaDoc marks it "development purposes
+  only" — and does not actually reach users. Building on it would be cargo-culting.
+* Cross-context Artemis pub/sub is used in the project for one specific integration
+  (identity events flowing from `identity` into `project-management`). It is not a
+  general-purpose notification dispatch system for within-context events, and there is no
+  v1 need for another bounded context to observe dataset connection events.
+* Stakeholders confirmed that snapshot-sync history (who synced when, what metadata
+  snapshot was before) is **not required**. Data stewardship is provided by the soft-delete
+  tombstone and the last-known snapshot retention ([ADR-0001](0001-associated-datasets-domain-model.md)).
+
+## Considered Options
+
+### Sync model
+
+* [Y1] User-initiated sync only (v1); background refresh is an explicitly deferred future path
+* [Y2] Automatic sync on project page load
+* [Y3] Scheduled background sync (recurring JobRunr job)
+* [Y4] Per-connection opt-in auto-refresh with consent (`autoRefreshEnabled` flag on aggregate)
+
+### Sync credential policy
+
+* [C1] Invoking user's own token; public records don't need token; no credential borrowing
+* [C2] ConnectedBy user's stored token (credential borrowing)
+* [C3] Service-account token (institutional)
+
+### Notification delivery
+
+* [N1] Actor sees Vaadin toast synchronously; other project members receive email via
+  `subscription-provider`; domain events drive the email dispatch
+* [N2] Use `NotificationService` + `Exchange` in-memory bus
+* [N3] Use Artemis pub/sub for all notifications (including in-app)
+* [N4] Email only (no toast)
+
+### Notification scope (event → audience)
+
+| Event | Audience in recommended mapping |
+|---|---|
+| Dataset connected | All project members except actor |
+| Dataset connection removed | All project members except actor |
+| Sync succeeded (metadata updated) | Only `connectedBy` (low-signal) |
+| Sync changed access status | All project members except actor |
+| Sync failed (credential issue) | Only invoking user (actionable by them) |
+| User added / removed their own token | Only that user (personal credential action) |
+
+### Removed-connection visibility
+
+* [V1] Soft-deleted tombstone retained for audit; no UI exposure in v1
+* [V2] Soft-deleted tombstone retained; visible to project WRITE users via a "history" toggle
+
+## Decision Outcome
+
+**Chosen option: Y1 + C1 + N1 + V1 (with the event→audience mapping above).**
+
+Concretely:
+
+1. **Sync is user-initiated only** for v1. Background / scheduled sync is an explicitly
+   deferred future enhancement path. When it becomes a concern, the credential policy from
+   option Y4 (per-connection consent) is the natural evolution.
+
+2. **Never-borrow-credentials principle** in full:
+   * Each sync attempt uses the invoking user's own InvenioRDM token.
+   * Public records sync without a token.
+   * For restricted records: if the invoking user has no token → they are informed ("Add a
+     [instance] token to sync this restricted dataset"); if their token is insufficient →
+     "Your token does not grant access to this restricted record."
+   * The original `connectedBy` user's token is **never reused** to fulfil another user's sync.
+   * Historical metadata + `connectedBy` + `lastSyncedAt` are preserved permanently even if
+     the original connecting user leaves the project.
+
+3. **Notification delivery** via Vaadin toast + `subscription-provider` email. No use of
+   `NotificationService` / `Exchange` (dead scaffolding). No Artemis pub/sub for within-context
+   events (no v1 need; deferred if another bounded context ever needs to observe this feature).
+   Domain events emitted by the application layer drive the email dispatch to project members.
+   Actor is excluded from the project-member recipient list by design (the toast already tells
+   them what happened). A project-member email lookup (which does not yet exist as a query in
+   the codebase) needs to be built as a prerequisite. Email delivery is not guaranteed —
+   SMTP failures silently drop notifications; this is an accepted risk consistent with the
+   rest of the application.
+
+4. **Removed-connection rows retained for audit.** No user story currently exposes them;
+   exposing removed connections in the UI is a future decision if it arises.
+
+5. **ACL inheritance:** Connections inherit project ACL without separate ACL entries. The
+   role mapping from the project ACL tables applies uniformly:
+
+   | Action | Minimum permission |
+   |---|---|
+   | View connected datasets | `READ` on project |
+   | Connect a dataset | `WRITE` on project |
+   | Remove a connection | `WRITE` on project |
+   | Sync a dataset | `READ` on project |
+   | Manage own InvenioRDM tokens | Authenticated (no project permission needed —
+     credentials are user-level) |
+
+6. **Cross-user visibility principle** (recorded for ADR reference):
+
+   > Visibility of a connected dataset follows project ACL. Operations requiring external
+   > authentication (e.g., sync of a restricted record) succeed if the invoking user has
+   > configured the instance with a valid token granting sufficient access to the external
+   > record; otherwise they fail. Failure is reported to the invoking user as a user-facing
+   > error per the error-mapping pipeline ([ADR-0002](0002-invenio-rdm-api-client-credentials.md)).
+
+### Positive Consequences
+
+* Lifecycle semantics are simple and explicit — fewer failure modes, easier debugging.
+* No JobRunr integration for sync reduces the v1 scope significantly.
+* Never-borrow-credentials gives forensic and privacy correctness: external platform logs
+  and DM logs both accurately reflect who initiated each action.
+* Toast + email matches the mental model users expect: "I get immediate feedback when I'm
+  looking; my teammates get an email when they aren't."
+* No new notification persistence model is built; we rely on email SMTP + the existing
+  `subscription-provider`, which is production-grade.
+* Soft-delete audit retention leaves the door open for future UI without requiring schema
+  migrations.
+
+### Negative Consequences
+
+* No background sync means stale metadata between syncs. Mitigation: the UX makes sync
+  state visible (last-synced timestamp) so users know when they might want to re-sync.
+* Project-member email lookup needs to be built as a new service — not a major cost, but
+  a prerequisite that must be scheduled.
+* Email delivery is not guaranteed; users relying on email for notifications could miss
+  changes if SMTP has issues. Mitigation (if it becomes a real problem): introduce an
+  in-app unread-notification model later.
+* Actor is excluded from the "other members" mailing list by convention. This is
+  deliberate (they already saw it via toast), but it means actor-initiated events never
+  reach their own email inbox, even when the actor is offline. This is a reasonable
+  trade-off in v1.
+
+## Pros and Cons of the Options
+
+### Y1 — User-initiated sync only (chosen)
+
+* Good, because it keeps the v1 surface minimal and explicit.
+* Good, because no "who is the background user?" design problem arises.
+* Good, because credential-borrowing risk cannot exist without automation.
+* Bad, because metadata can go stale between explicit syncs.
+
+### Y4 — Per-connection opt-in auto-refresh (deferred future)
+
+* Good, because it preserves the never-borrow-credentials principle via explicit user
+  consent.
+* Good, because it's the natural evolution path if v1 stakeholders later want background
+  refresh.
+* Bad, because it adds aggregate state and JobRunr integration that isn't needed in v1.
+
+### C1 — Invoking user's own token; no borrowing (chosen)
+
+* Good, because it preserves forensic non-repudiation and privacy boundaries.
+* Good, because a user who lacks access to a record cannot silently gain visibility.
+* Bad, because a user who has no token cannot sync a restricted dataset they can otherwise
+  "see" in DM. The UX must explain this clearly.
+
+### N1 — Toast + email via domain events + SMTP (chosen)
+
+* Good, because it uses production-grade paths (`subscription-provider`).
+* Good, because it doesn't depend on dead scaffolding (`NotificationService`).
+* Good, because it keeps in-app and out-of-band notifications aligned (actor sees immediate
+  feedback; others get email).
+* Bad, because email delivery is not guaranteed. If SMTP fails, a silent drop occurs.
+
+### V1 — Soft-delete tombstone, no UI exposure (chosen)
+
+* Good, because it preserves audit provenance without adding UI complexity that has no
+  user story driving it.
+* Good, because it is non-irreversible: exposing the history is a UI-layer decision that
+  doesn't require schema changes later.
+* Bad, because audit rows in the DB are invisible to end users by default; the audit
+  capability is latent until a story is raised.
+
+## Links
+
+* Depends on [ADR-0001](0001-associated-datasets-domain-model.md) — the aggregate and
+  soft-delete semantics are defined there.
+* Depends on [ADR-0002](0002-invenio-rdm-api-client-credentials.md) — the
+  never-borrow-credentials principle and credential storage shape the sync + token flows here.
+* Related to [ADR-0004](0004-fair-signposting-deferred.md) — if InvenioRDM Signposting
+  becomes the primary integration in 1-2 years, the lifecycle semantics here remain intact;
+  only the client layer changes ([ADR-0002](0002-invenio-rdm-api-client-credentials.md)).
diff --git a/docs/adr/0004-fair-signposting-deferred.md b/docs/adr/0004-fair-signposting-deferred.md
new file mode 100644
index 0000000000..9bc8d8073d
--- /dev/null
+++ b/docs/adr/0004-fair-signposting-deferred.md
@@ -0,0 +1,100 @@
+# 0004 — FAIR Signposting integration deferred
+
+* Status: approved
+* Deciders: project team (interviewed via [`interview-feat-dataset-connection.md`](interview-feat-dataset-connection.md))
+* Date: 2026-07-13
+
+Technical Story: [Connect associated InvenioRDM datasets with Data Manager projects](https://github.com/qbicsoftware/data-manager-app/issues/1466) (FEAT-DATASET-CONNECTION)
+
+## Context and Problem Statement
+
+The feature originally envisioned integration with published InvenioRDM datasets via
+**FAIR Signposting** — an HTTP-header-based discovery mechanism where resources advertise
+machine-readable metadata links via RFC 8288 `Link:` headers (e.g.,
+`Link: <doi:...>; rel="describedby"`). FAIR Signposting would have let Data Manager follow
+a signpost to discover structured metadata without calling the InvenioRDM API directly.
+
+An upstream bug in InvenioRDM's FAIR Signposting serialization has been reported. The fix
+is slated for a future major release. Adopting FAIR Signposting today would mean either:
+
+(a) Implementing around the bug (fragile, incorrect behaviour for signposted metadata), or
+(b) Delaying the feature until the upstream fix lands, which is on an unknown timeline
+    that is likely more than 1-2 years out.
+
+The team must decide whether to (i) proceed now with a conventional InvenioRDM REST API
+integration, (ii) wait for the upstream fix, or (iii) pursue some hybrid path.
+
+## Decision Drivers
+
+* The upstream bug blocks FAIR Signposting-based integration today.
+* The fix's timeline is ~1-2 years out, making a hold-the-feature strategy unacceptable.
+* FAIR Signposting, when correctly implemented, is a metadata-discovery mechanism — it
+  does not replace the need to fetch actual record data. It is a companion to (not a
+  replacement for) the REST API.
+* Data Manager's InvenioRDM integration, designed via
+  [ADR-0002](0002-invenio-rdm-api-client-credentials.md), uses a source-agnostic
+  `DatasetSource` port that can naturally accommodate a future `InvenioRdmSignpostingSource`
+  adapter alongside or in place of the REST adapter.
+* There is no current business requirement to surface signposted metadata through a
+  different channel than the REST API; the REST API provides all the record data we need.
+
+## Considered Options
+
+* [A] Implement the feature using FAIR Signposting today — infeasible because of the bug.
+* [B] Hold the entire feature until the upstream fix is released (timeline: 1-2+ years).
+* [C] Implement the feature using the InvenioRDM REST OpenAPI now; defer FAIR Signposting
+  as a future enhancement that can be picked up when the upstream fix is stable.
+
+## Decision Outcome
+
+**Chosen option: C.**
+
+The feature proceeds against the conventional InvenioRDM REST OpenAPI, as documented in
+[ADR-0002](0002-invenio-rdm-api-client-credentials.md). Integration with FAIR Signposting
+is **explicitly deferred**, not abandoned.
+
+### Positive Consequences
+
+* The feature can ship on the timeline stakeholders need (now), not the upstream bug-fix
+  timeline.
+* The source-agnostic `DatasetSource` port design in [ADR-0002](0002-invenio-rdm-api-client-credentials.md)
+  already leaves room for a future `InvenioRdmSignpostingSource` adapter. When the upstream
+  fix lands, adding the new adapter is a localized change; the aggregate, storage, and
+  lifecycle semantics defined in [ADR-0001](0001-associated-datasets-domain-model.md) and
+  [ADR-0003](0003-connection-lifecycle-stewardship.md) do not change.
+* The aggregate shape, DB schema, sealed metadata hierarchy, connection lifecycle,
+  credential security, and notification model are all independent of the integration
+  transport. Replacing or complementing the REST client with a Signposting client is an
+  infrastructure-layer change, not an aggregate-layer change.
+
+### Negative Consequences
+
+* The project does not use FAIR Signposting today, which means Data Manager does not model
+  the discovery mechanism that the FAIR ecosystem is converging toward. When Signposting
+  is revisited, the team must re-acquire context on how to integrate it (mitigated by the
+  existence of this ADR, which records the "why now, why not yet" rationale).
+* If the upstream bug takes longer to fix than expected (>2 years), the deferral
+  decision remains valid but may need a formal revisit — the horizon in this ADR is
+  explicit.
+
+## Revisit Criteria
+
+This ADR should be revisited (and possibly superseded) when:
+
+1. InvenioRDM ships a stable major release with a working FAIR Signposting
+   serialization bug fix.
+2. A new user story explicitly calls for Data Manager to support FAIR Signposting
+   discovery (e.g., a story requiring metadata to follow linked-data chains across
+   platforms).
+
+Until either criterion is met, the REST-based integration in
+[ADR-0002](0002-invenio-rdm-api-client-credentials.md) remains the chosen path.
+
+## Links
+
+* Deferment of: the originally intended integration mechanism for
+  [ADR-0002](0002-invenio-rdm-api-client-credentials.md).
+* Refinable by a future ADR when Signposting becomes the primary integration (likely
+  to supersede part of ADR-0002, not ADRs 0001 or 0003).
+* Depends on [ADR-0001](0001-associated-datasets-domain-model.md) — the aggregate and
+  storage shape are independent of whether the integration is REST or Signposting.
diff --git a/docs/adr/README.md b/docs/adr/README.md
new file mode 100644
index 0000000000..487f187947
--- /dev/null
+++ b/docs/adr/README.md
@@ -0,0 +1,68 @@
+# Architecture Decision Records (ADRs)
+
+This directory contains **Architecture Decision Records** for the Data Manager application.
+Each ADR captures a significant architectural decision, the context in which it was made, and
+the rationale behind the chosen approach.
+
+## What is an ADR?
+
+An Architecture Decision Record documents a meaningful architectural choice — including the
+problem it solves, the alternatives considered, and the consequences of the decision. ADRs
+provide a lightweight, append-only log of *why* the system is built the way it is.
+
+## Template
+
+This project uses the **Markdown Any Decision Records (MADR)** template, maintained by the
+[MADR project](https://adr.github.io/madr/).
+
+The blank template is available at:
+[`docs/adr/templates/madr-template.md`](templates/madr-template.md)
+
+To create a new ADR, copy the template into this directory using the naming convention below.
+
+## Naming Convention
+
+ADR files follow this pattern:
+
+    NNNN-short-descriptive-name.md
+
+Where `NNNN` is a zero-padded, four-digit sequential number assigned in creation order
+(e.g., `0001`, `0002`).
+
+**Example:**
+
+    0001-use-spring-security-acl-for-resource-permissions.md
+    0002-separate-data-management-and-finance-datasources.md
+
+## Rules
+
+- **One file per decision.** Each ADR is self-contained.
+- **ADRs are append-only.** Never delete or edit a published ADR.
+  - To reverse a decision, create a new ADR with status `superseded by [ADR-NNNN](NNNN-name.md)`.
+  - To mark an ADR obsolete, create a new ADR that supersedes it, or update the status in
+    the original ADR header only (e.g., `Status: deprecated`).
+- **ADRs are created via Pull Request.** Review ensures alignment with the codebase and
+  other decisions.
+- **ADRs must be referenced from `AGENTS.md` and `requirements.md`** when they inform a
+  requirement source or an architectural constraint (`C-<NN>` ID).
+- If a decision affects database schema, security configuration, or external integrations,
+  flag it in the PR description (see *Section 12 — What to Ask a Human* in `AGENTS.md`).
+
+## Index of ADRs
+
+| # | Title | Status | Date |
+|---|---|---|---|
+| [0001](0001-associated-datasets-domain-model.md) | Domain model and bounded context for associated datasets | approved | 2026-07-13 |
+| [0002](0002-invenio-rdm-api-client-credentials.md) | InvenioRDM API client design and external credential security | approved | 2026-07-13 |
+| [0003](0003-connection-lifecycle-stewardship.md) | Dataset connection lifecycle and data stewardship | approved | 2026-07-13 |
+| [0004](0004-fair-signposting-deferred.md) | FAIR Signposting integration deferred | approved | 2026-07-13 |
+
+*Update this table whenever a new ADR is added.*
+
+## Attribution
+
+The MADR template is used under the terms of the license included in
+[`templates/LICENSE.md`](templates/LICENSE.md).
+
+**Source:** https://github.com/adr/madr/  
+**License:** MIT OR CC0-1.0
diff --git a/docs/adr/interview-feat-dataset-connection.md b/docs/adr/interview-feat-dataset-connection.md
new file mode 100644
index 0000000000..80c7333c0f
--- /dev/null
+++ b/docs/adr/interview-feat-dataset-connection.md
@@ -0,0 +1,152 @@
+# Interview: Architectural Decisions for FEAT-DATASET-CONNECTION
+
+> **Feature:** [Connect associated InvenioRDM datasets with Data Manager projects](https://github.com/qbicsoftware/data-manager-app/issues/1466)
+> **Purpose:** Aligned understanding of architectural decisions before implementation, to be captured in ADRs.
+> **Started:** 2026-07-13
+> **Status:** 🟡 In Progress
+
+6a## Interview Timeline
+
+| # | Topic / Question | Status | Decision / Notes |
+|---|---|---|---|
+| 1 | Bounded context ownership | ✅ Resolved | **`project-management`** bounded context. Associated-dataset concept is inherently tied to a project. |
+| 2 | Package / domain naming | ✅ Resolved | **`associated-dataset`** — deliberately generalised, distinct from existing OpenBIS `dataset` package. Product language: users connect "associated data" beyond first-class raw data. |
+| 3 | Domain model generalisation strategy | ✅ Resolved | Source-agnostic aggregate (identity + lifecycle) + sealed per-source metadata hierarchy. Aggregate columns carry generic identity fields (`source_type`, `external_handle`, connection state). Source-specific metadata lives in a sealed-value-object type hierarchy (`ResourceMetadata`). |
+| 3a | Storage strategy for source-specific metadata | ✅ Resolved | **Option 2:** Universal fields as regular columns (`title`, `publishedAt`, `accessLevel`, `accessLink`) — needed for querying/sorting per stories #1476/#1477. Source-specific fields in a **JSONB column**. |
+| 4 | Integration mechanism — InvenioRDM API client design | ✅ Resolved | Stateless `DatasetSource` port, instance-parameterised. **Per-user-per-instance** token scoping (no service-account tokens). Instances configurable via `application.properties` (admin-controlled, no free-form UI entry = small security surface). Separate `SearchResult` (transient, paginated, UI display) and `ResourceMetadata` (persisted value object). |
+| 5 | Credential management — where and how are tokens stored? | ✅ Resolved (pending confirmation of 5a–5c) | **Three-layer strategy:** At-rest = AES-GCM-encrypted in DB column. In-transit = HTTPS only. In-memory = `char[]` confined to the infrastructure adapter method performing the HTTP call, zeroed after use. **Decryption boundary rule:** plaintext token value never crosses an architectural layer boundary. See ADR candidate 0003. Open sub-q: 5a (background sync fit), 5b (JobRunr fit), 5c (master key source). |
+| 6 | Synchronisation model | ✅ Resolved | **User-initiated only for v1** (no background JobRunr sync for now — future enhancement path). Sync uses the invoking user's own token (**never-borrow-credentials rule** — see ADR 0003). Public records sync without token. Restricted records: invoking user must have their own token; if absent or insufficient, user is informed. Historical metadata + `connectedBy` + `lastSyncedAt` preserved permanently. Sync updates: metadata + access status + notify project members. |
+| 7 | Notification mechanism | ✅ Resolved | **Actor sees Vaadin toast** (synchronous, no infrastructure). **Other project members receive email** via `subscription-provider` (SMTP), driven by domain events emitted from application layer. `NotificationService` + `Exchange` NOT used (dead scaffolding, never reaches users). Cross-context Artemis deferred (no v1 need). Caveats: project-member email lookup needs to be built; email delivery not guaranteed (existing risk); actor excluded from recipient list by design. |
+| 8 | Database schema | ✅ Resolved | **Soft delete** on connection removal (`state = REMOVED`). Two new tables in `data-management` datasource: `associated_dataset` (source_type + external_handle, state, universal columns for title/access_level/access_link/published_at, `metadata_json` typed **`JSON` (MariaDB)** for source-specific fields, connected_by_user_id as soft FK to identity, linked_experiment_id as hard FK, connected_at, last_synced_at) + `user_invenio_rdm_credential` (user_id, instance_key plaintext, encrypted_token VARBINARY AES-GCM, status, timestamps; unique on (user_id, instance_key)). Instances NOT stored in DB (application.properties config). **Schema migration pattern**: incremental script `sql/migrations/...` added alongside `complete-schema.sql` (establishes pattern for the project; first entry of this type). **No event sourcing / no event log / no snapshot history** (stakeholder call). **Explicit design assumption:** ~100 associated datasets per project (stated in ADR). **Performance evolution path** (for when assumptions change — e.g., cross-project API endpoints): (a) generated virtual column + index on JSON path, (b) promote field to regular column, (c) CQRS read model, (d) EHCache application cache. MariaDB views do NOT improve JSON-path performance (no materialized views); views are for query ergonomics only. |
+| 9 | Security & ACL implications | ✅ Resolved | (1) Dataset connections **inherit project ACL** — no per-connection ACL entries. (2) Role mapping: VIEW=READ on project, CONNECT/REMOVE=WRITE, SYNC=READ, own-credential-management=authenticated. (3) Principle for ADR (reframed): "Visibility of a connected dataset follows project ACL. Operations requiring external authentication (e.g., sync of restricted records) succeed if the invoking user has configured the instance with a valid token granting sufficient access to the external record; otherwise they fail." (4) Soft-deleted rows retained **for audit purposes**; there is **no user story** exposing removed-connection visibility in the UI — that is a future decision if it arises. |
+| 10 | UI placement | 🚫 Out of scope — design concern, not architectural | UI placement (tab / sidebar / page) is a design-layer decision delegated to the design system / UX, not a structural architectural decision. The `AssociatedDatasetsDemoV2` prototype is a UX artifact for discussing user stories with users, not an architectural reference. This falls outside ADR scope. Principle: ADRs capture structural invariants; UI placement does not constrain architectural evolution. |
+| 11 | Error handling & resilience | ✅ Resolved | (11a) Bounded sync retry: 3 attempts, exponential backoff, 5s max. For transient errors only (5xx, timeout, 429). Honour `Retry-After` header. No retry on 401/403/404. (11b) No correlation ID. Use existing `ErrorMessageTranslationService` + `ApplicationException` + `UiExceptionHandler` pipeline. Raw upstream errors in server logs only. (11c) **Deferred** — must be resolved before sync logic implementation. Open q: strict vs. lenient parsing on sync, lenient on search. (11d) Credential `status` updates only on explicit verification calls (token add/validate from UI), never from a failed sync call. |
+| 12 | FAIR Signposting future-proofing | ✅ Resolved | Dedicated ADR: (a) decision to defer; (b) reason = upstream serialization bug in InvenioRDM; (c) horizon ≈ 1-2 years. Minimal commitment: existing port design naturally accommodates future adapter. ADR is decision-only, no structural-commitment chapter. |
+
+---
+
+## ADR Plan (to be drafted after interview)
+
+| # | Title | Scope | Status |
+|---|---|---|---|
+| 0001 | Bounded context, packaging, and domain model for associated datasets | Questions 1, 2, 3, 3a — the domain-modelling cluster | 📋 Ready to draft (pending final sign-off on storage choice, question 3a) |
+| 0002 | InvenioRDM API client — stateless port, instance-parameterised | Question 4 | ✅ Ready to draft (pending Q5 — where tokens live) |
+| 0003 | InvenioRDM credential storage strategy | Question 5 | 📋 Pending interview |
+| 0004 | Dataset connection synchronisation model | Question 6 | 📋 Pending interview |
+| 0005 | Project change notification for dataset connection events | Question 7 | 📋 Pending interview |
+| ... | *(additional ADRs as discovered)* | | 📋 |
+
+---
+
+## Key Context (gathered from codebase)
+
+- **Feature issue:** #1466 — 13 child stories (#1467–#1479), all 🔴 Open
+- **Target platforms:** Zenodo, FDAT (both InvenioRDM instances; future: LIMS, other remote resources)
+- **Integration approach:** Conventional InvenioRDM OpenAPI (FAIR Signposting dropped due to upstream bug)
+- **Existing demo:** `AssociatedDatasetsDemoV2.java` (sidebar prototype; uses "Associated Datasets" terminology)
+- **Existing `dataset` package (`project-management-infrastructure/dataset/`):** OpenBIS raw data only — `LocalRawDataset*`, `RemoteRawData*`. Distinct concept. Must NOT be conflated.
+- **Domain event pattern:** `DomainEvent` subclasses + `DomainEventDispatcher` (in-process)
+- **External integration reference patterns:** OpenBIS (`infrastructure/sample/openbis/`) uses session + connector + vault + mock for `development` profile; TIB/ROR are stateless HTTP clients
+- **Notification pattern:** `NotificationService` via `MessageBusSubmission` (Artemis/JMS pub-sub)
+- **Secret storage:** PKCS12 keystore vault (used for OpenBIS + personal access tokens)
+- **Existing data sources pattern:** Two datasources (`data-management`, `finance`) with separate entity managers
+
+---
+
+## InvenioRDM Client Design (Q4, recorded for ADR 0002)
+
+```java
+interface DatasetSource {
+    SearchResult search(String query, InstanceConfig instance);
+    Optional<ResourceMetadata> resolve(String externalHandle, InstanceConfig instance);
+    boolean validateToken(InstanceConfig instance);
+}
+
+record SearchResult(List<SearchHit> hits, int totalCount) {}
+record InstanceConfig(String baseUrl, Optional<AccessToken> token) {}
+
+// Transient — from search hits
+record SearchHit(
+    String externalHandle, String title, String creator, String resourceType,
+    String community, AccessStatus accessStatus, String accessLink, Instant publishedAt
+) {}
+
+// Persisted — sealed value object on AssociatedDataset aggregate (see ADR 0001)
+record InvenioRdmResourceMetadata(...) implements ResourceMetadata {}
+```
+
+**Instance list** is configured via `application.properties`:
+```properties
+qbic.external-service.invenio-rdm.instances[0].name=Zenodo
+qbic.external-service.invenio-rdm.instances[0].url=https://zenodo.org
+qbic.external-service.invenio-rdm.instances[1].name=FDAT
+qbic.external-service.invenio-rdm.instances[1].url=https://fdat.uni-tuebingen.de
+```
+
+---
+
+## Key Product Insights (recorded from interview)
+
+1. "Associated dataset" is **deliberately generalised**. Data Manager is a hub; beyond first-class data types (raw data via OpenBIS, measurement metadata), users associate other external data they cannot maintain inside Data Manager. InvenioRDM is the first concrete source; LIMS and other remote resources are plausible future sources.
+2. The aggregate design must not narrow the concept to InvenioRDM-specific structures (DOIs, PIDs) at the domain boundary.
+3. Source-agnostic aggregate root + sealed per-source metadata hierarchy is acceptable: minimal investment now (two things: `source_type + external_handle` instead of `doi`; `DatasetSource` port interface) avoids aggregate-level refactoring later.
+4. For DB storage: universal fields as regular columns (query/sort/filter needs), source-specific fields in JSONB.
+
+---
+
+## Concrete Domain Example (recorded for ADR 0001 context)
+
+```java
+// ── Aggregate: identity + lifecycle (generic) ──
+@Entity
+class AssociatedDataset {
+    AssociatedDatasetId id;
+    ProjectId projectId;
+    SourceType sourceType;              // enum: INVENIO_RDM
+    String externalHandle;              // DOI / LIMS ID / URL — opaque to root
+    DatasetConnectionState state;       // CONNECTED, SYNCING, ERROR, REMOVED
+    UserId connectedBy;
+    ExperimentId linkedExperiment;      // optional
+    Instant connectedAt;
+    Instant lastSyncedAt;
+    ResourceMetadata resourceMetadata;  // sealed, source-typed
+}
+
+// ── Source-specific metadata: sealed hierarchy ──
+sealed interface ResourceMetadata
+    permits InvenioRdmResourceMetadata /*, LimsResourceMetadata */ {
+    String title();
+    String accessLevel();
+    String accessLink();
+    Instant publishedAt();
+}
+
+record InvenioRdmResourceMetadata(
+    String title, String pid, String version,
+    String accessLevel, String accessLink, Instant publishedAt,
+    String resourceProvider, String creator, String resourceType, String community
+) implements ResourceMetadata {}
+
+// ── DB: associated_dataset ──
+// PK + project_id + source_type + external_handle + state + connected_by
+//   + linked_experiment + connected_at + last_synced_at
+//   + title + published_at + access_level + access_link     ← universal columns
+//   + metadata_json   (JSONB)                               ← source-specific
+```
+
+---
+
+*This file is updated incrementally as the interview progresses.*
+
+## Progress bar
+
+- [x] Q1–Q3, Q3a: Domain modelling cluster → ADR 0001
+- [x] Q4: Integration mechanism → ADR 0002
+- [x] Q5: Credential storage → ADR 0003
+- [x] Q6: Synchronisation model
+- [x] Q7: Notification mechanism
+- [x] Q8: Database schema
+- [x] Q9: Security & ACL
+- [ ] Q10: UI placement
+- [x] Q11: Error handling & resilience
+- [x] Q12: FAIR Signposting future-proofing
diff --git a/docs/adr/templates/LICENSE.md b/docs/adr/templates/LICENSE.md
new file mode 100644
index 0000000000..013432478c
--- /dev/null
+++ b/docs/adr/templates/LICENSE.md
@@ -0,0 +1,43 @@
+# License
+
+Source: https://github.com/adr/madr/
+
+License: https://github.com/adr/madr/blob/develop/LICENSE
+
+**Code:** MIT OR CC0-1.0
+
+---
+
+**MIT License**
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+**Creative Commons Zero v1.0 Universal (CC0-1.0)**
+
+The person who associated a work with this deed has dedicated the work to the
+public domain by waiving all of their rights to the work worldwide under
+copyright law, including all related and neighboring rights, to the extent
+allowed by law.
+
+You can copy, modify, distribute and perform the work, even for commercial
+purposes, all without asking permission.
+
+See: https://creativecommons.org/publicdomain/zero/1.0/
diff --git a/docs/adr/templates/madr-template.md b/docs/adr/templates/madr-template.md
new file mode 100644
index 0000000000..4fda15fc86
--- /dev/null
+++ b/docs/adr/templates/madr-template.md
@@ -0,0 +1,72 @@
+# [short title of solved problem and solution]
+
+* Status: [proposed | rejected | accepted | deprecated | … | superseded by [ADR-NNNN](NNNN-name.md)] <!-- optional -->
+* Deciders: [list everyone involved in the decision] <!-- optional -->
+* Date: [YYYY-MM-DD when the decision was last updated] <!-- optional -->
+
+Technical Story: [description | ticket/issue URL] <!-- optional -->
+
+## Context and Problem Statement
+
+[Describe the context and problem statement, e.g., in free form using two to three sentences. You may want to articulate the problem in form of a question.]
+
+## Decision Drivers <!-- optional -->
+
+* [driver 1, e.g., a force, facing concern, …]
+* [driver 2, e.g., a force, facing concern, …]
+* … <!-- numbers of drivers can vary -->
+
+## Considered Options
+
+* [option 1]
+* [option 2]
+* [option 3]
+* … <!-- numbers of options can vary -->
+
+## Decision Outcome
+
+Chosen option: "[option 1]", because [justification. e.g., only option, which meets k.o. criterion decision driver | which resolves force force | … | comes out best (see below)].
+
+### Positive Consequences <!-- optional -->
+
+* [e.g., improvement of quality attribute satisfaction, follow-up decisions required, …]
+* …
+
+### Negative Consequences <!-- optional -->
+
+* [e.g., compromising quality attribute, follow-up decisions required, …]
+* …
+
+## Pros and Cons of the Options <!-- optional -->
+
+### [option 1]
+
+[example | description | pointer to more information | …] <!-- optional -->
+
+* Good, because [argument a]
+* Good, because [argument b]
+* Bad, because [argument c]
+* … <!-- numbers of pros and cons can vary -->
+
+### [option 2]
+
+[example | description | pointer to more information | …] <!-- optional -->
+
+* Good, because [argument a]
+* Good, because [argument b]
+* Bad, because [argument c]
+* … <!-- numbers of pros and cons can vary -->
+
+### [option 3]
+
+[example | description | pointer to more information | …] <!-- optional -->
+
+* Good, because [argument a]
+* Good, because [argument b]
+* Bad, because [argument c]
+* … <!-- numbers of pros and cons can vary -->
+
+## Links <!-- optional -->
+
+* [Link type] [Link to ADR] <!-- example: Refined by [ADR-0005](NNNN-name.md) -->
+* … <!-- numbers of links can vary -->
diff --git a/docs/assets/2026-06-25_Connected_Resource_Information.md b/docs/assets/2026-06-25_Connected_Resource_Information.md
new file mode 100644
index 0000000000..f43c1a834e
--- /dev/null
+++ b/docs/assets/2026-06-25_Connected_Resource_Information.md
@@ -0,0 +1,40 @@
+# Connected Resource Information
+
+## Version
+
+| Date       | Description                                                                                                          |
+|------------|----------------------------------------------------------------------------------------------------------------------|
+| 2026-06-25 | Second version fixing minor spelling mistakes, adding linked experiments as a medium-prio property and enhancing the community description. |
+| 2026-06-23 | First version — Introduces the properties for high and medium accessibility priority for dataset information          |
+
+---
+
+# Metadata properties
+
+## High-Prio Properties
+
+Properties of a resource that are crucial to access fast.
+
+| Type             | Motivation                                                                                                                                                                                                 | Example                          |
+|------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------|
+| Title            | Contextual information about what the resource is about                                                                                                                                                    | RNAdeseq analysis of ...         |
+| PID              | Unambiguously identifier of the full remote resource                                                                                                                                                       | 10.5281/zenodo.20809410          |
+| Access Status    | To give a feeling of security that the resource has access restrictions as intended for the project. Also, a record can have public metadata, whereas the files themselves can be restricted (access-controlled). | Record: public / Files: restricted |
+| Version          | Last known version of the connected dataset                                                                                                                                                                | v1                               |
+| Access Link      | If available, shown to give collaborators read access to the resource                                                                                                                                      | URL                              |
+| Publication Date | To get a timely reference to see when the dataset has been published                                                                                                                                       | July 1, 2026                     |
+
+---
+
+## Medium-Prio Properties
+
+Properties of a resource that are important, but don't need to be as prominently accessible as High-Prio properties.
+
+| Type              | Motivation                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | Example                                                          |
+|-------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------|
+| Connected By      | To highlight which collaboration partner connected the dataset                                                                                                                                                                                                                                                                                                                                                                                                          | John Doe                                                         |
+| Resource Provider | To see where the resource is hosted                                                                                                                                                                                                                                                                                                                                                                                                                                     | Zenodo, FDAT, ....                                               |
+| Creator           | Person who created the dataset on the provider                                                                                                                                                                                                                                                                                                                                                                                                                           | Jane Doe                                                         |
+| Resource Type     | What the resource category is                                                                                                                                                                                                                                                                                                                                                                                                                                            | Article, Dataset, Audio, Publication, Book, Workflow, Software, ... |
+| Community         | An organisational entity with its own submission policies for submitted records enforced by community curators on the provider's site. These policies can be specified by the funding entity or by domain experts within the community. Only if the curators approve a submitted draft application is the record published within the community. Mandatory for FDAT records, since in that instance the record metadata can be set to private and would be unfindable without a community association. Optional for records published in zenodo, since the record metadata is always visible. | QBiC, CMFI, SFB209, iFIT, ...                                    |
+| Linked Experiment | One or multiple experiments within the project, which are most closely associated with the provided resource. This could be because they provided the original data used in the generation of the resource (e.g. primary or secondary analysis results --> nf-core pipeline analysis) or a presentation/poster highlighting the experiment.                                                                                                                               | Explorative analysis to identify novel transcript isoforms for heat regulative proteins under temperature duress. |
diff --git a/docs/feature-vision-associated-datasets.md b/docs/feature-vision-associated-datasets.md
new file mode 100644
index 0000000000..40f584cc8e
--- /dev/null
+++ b/docs/feature-vision-associated-datasets.md
@@ -0,0 +1,33 @@
+# Connect associated datasets with DM projects
+
+## Background
+
+To get a scientific finding ready for publication, good scientific practice requests scientists to share associated data. While the German science council has made this part of their GWP (Gute Wissenschaftliche Praxis), also funding bodies and journals include the publication of associated data increasingly as hard requirement.
+
+The University of Tübingen's life science data management platform DataManager shall assist scientists in managing high throughput data and connecting further datasets associated with the research project to have a single access point for their data and metadata.
+
+A popular publication platform for all sorts of datasets and widely accepted by both, science community as well as funding bodies and journals, are public InvenioRDM installations such as Zenodo. These platforms are used for smaller datasets, such as figures, results or additional protocols to create a persistent and sharable public reference via a digital object identifier (DOI). Due to its flexibility and ease of use, they are an important way to get various types of supportive data ready for publication.
+
+## The idea
+
+As a new feature, DataManager shall enable users to connect associated datasets managed on a public InvenioRDM instance from within the main project managed in the application.
+
+The vision is to simplify data management for the various assets that are usually part of a scientific project and provide a central access point to retain the overview. At the same time, users shall not be burdened with yet another platform they need to transfer their data from to make them ready for publication.
+
+**Data Manager becomes the hub. InvenioRDM remains the publishing platform.**
+
+The integration is based on **FAIR Signposting**, providing machine-actionable, machine-readable relationships between the project in DataManager and the associated datasets on InvenioRDM. This demonstrates true FAIR integration — the connections are not manual bookmarks, but discoverable by other tools and services.
+
+> **⚠️ Note (2026-07-10):** The integration mechanism described above has been **revised**. FAIR Signposting cannot be used because of a severe bug in InvenioRDM's serialization of Signposting metadata; the fix is scheduled for a future major release that would delay the feature unacceptably. The current implementation uses **conventional API-based integration** against the InvenioRDM OpenAPI. See [`docs/adr/README.md`](./adr/README.md) and the linked feature issue for the formal decision once recorded.
+
+### Initial scope
+
+- **Target platforms:** Zenodo and FDAT (University of Tübingen public InvenioRDM instance)
+- **Authentication:** OAuth2 flow with refresh tokens for a seamless user experience
+- **Search:** "Search platform" (public datasets) and "My datasets" (authenticated/private)
+- **Linkage type:** Live linkage — dataset metadata stays synchronized from InvenioRDM
+- **Linkage scope:** Projects and experiments (experiment-level linkage is an optional hook, inheriting to the parent project)
+- **Architecture:** One-to-many (one DM project → multiple datasets), ready for many-to-many in the future
+- **Bidirectional linkage:** The DM project link is recorded inside the InvenioRDM dataset as a machine-actionable connection
+
+If the integration turns out to be successful, additional features like the direct creation of datasets on these InvenioRDM instances from within DataManager can put into focus and evaluation.
diff --git a/docs/migrations/NEXT.md b/docs/migrations/NEXT.md
new file mode 100644
index 0000000000..43a725d257
--- /dev/null
+++ b/docs/migrations/NEXT.md
@@ -0,0 +1,233 @@
+# Migration: Next release
+
+**Current pom version:** 1.12.10  
+**Target release version:** TBD *(renamed to `released/v<version>.md` at release cut)*  
+**Status:** under development
+
+> **To operators:** This document describes schema changes for the **upcoming,
+> unreleased** Data Manager version. It is actively being edited as migrations
+> land in the codebase. Do **not** apply any migrations listed here to
+> production until the release is published and this file moves to
+> `released/v<version>.md`.
+
+For the migration documentation structure, see [`README.md`](README.md).
+
+---
+
+## Summary of schema changes in this release
+
+> *Append a row here whenever a new incremental script is added. Numbering is
+> sequential within the release and determines apply order.*
+
+| # | Script | Description | Risk |
+|---|---|---|---|
+| 1 | [`sql/migrations/create-associated-dataset.sql`](../sql/migrations/create-associated-dataset.sql) | Create `associated_dataset` table for connecting InvenioRDM datasets to projects (FEAT-DATSET-01) | low — new empty table, no data loss on rollback |
+
+Each row links to its incremental script. The sections below expand each entry
+with apply / verify / rollback detail.
+
+---
+
+## Migration #1: `associated_dataset` table
+
+| Field | Value |
+|---|---|
+| **Story** | [#1467 — FEAT-DATSET-01: Connecting open, published datasets](https://github.com/qbicsoftware/data-manager-app/issues/1467) |
+| **Feature** | [#1466 — FEAT-DATASET-CONNECTION](https://github.com/qbicsoftware/data-manager-app/issues/1466) |
+| **ADRs** | [0001](../adr/0001-associated-datasets-domain-model.md), [0002](../adr/0002-invenio-rdm-api-client-credentials.md), [0003](../adr/0003-connection-lifecycle-stewardship.md) |
+| **Scope** | Database schema only (new table) |
+| **Script** | [`sql/migrations/create-associated-dataset.sql`](../sql/migrations/create-associated-dataset.sql) |
+| **Target datasource** | `data_management` |
+
+### What it does
+
+Creates an empty `associated_dataset` table. Per [ADR-0001](../adr/0001-associated-datasets-domain-model.md):
+
+- Lives in the `project-management` bounded context (table name starts with `associated_dataset`, not under the existing `dataset_*` namespace, to keep the InvenioRDM connection concept distinct from the legacy OpenBIS raw-data tables).
+- Has four **universal columns** (`title`, `pid`, `version`, `publication_date`) duplicated from the JSON blob for SQL sort/filter.
+- Stores **source-specific metadata** (InvenioRDM creators, community, access details) in a MariaDB `JSON` column (`resource_metadata`). At the expected scale of <100 rows/project, this is efficient; the escape hatch for future scale is a generated virtual column + index — no entity change required.
+- **Soft-delete for removal** (ADR-0001, ADR-0003): deleting a connection sets `connection_state = 'REMOVED'`, leaving the row as an audit tombstone. Active query paths filter `REMOVED` out. There is no `DELETE` statement in v1.
+- **No SQL FK constraint on `experiment_id`** — the application enforces referential integrity in memory so that project-ACL changes and experiment deletions don't cascade-delete dataset connections.
+
+### What is NOT in this migration
+
+A second table, `user_invenio_rdm_credential` (for per-user Personal Access
+Tokens to access restricted datasets), is planned for Stories 14/15
+(FEAT-DATSET-14, FEAT-DATSET-15). It is intentionally **not** created by this
+migration because FEAT-DATSET-01 covers only public, open datasets. A follow-up
+entry in this file — or in the next release's `NEXT.md` — will cover the
+credentials table when those stories land.
+
+### Pre-flight
+
+Run these checks against the target database **before** applying:
+
+```sql
+-- 1. Confirm the table does NOT already exist
+SELECT COUNT(*) AS table_exists
+FROM information_schema.tables
+WHERE table_schema = DATABASE()
+  AND table_name = 'associated_dataset';
+-- Expected: 0
+
+-- 2. Confirm target datasource charset/collation matches the rest of the schema
+SELECT @@character_set_database AS charset,
+       @@collation_database    AS collation;
+-- Expected: utf8mb4, utf8mb4_unicode_ci
+
+-- 3. Confirm you are connected to the data-management datasource
+SELECT DATABASE();
+-- Expected: data_management (or whatever your DM schema is named)
+```
+
+If the table already exists (return value = 1), this migration was already
+applied — no further action required (the DDL is idempotent).
+
+### Apply
+
+```bash
+mysql -u <user> -h <host> -P <port> data_management \
+    < sql/migrations/create-associated-dataset.sql
+```
+
+Or inline:
+
+```sql
+-- The full DDL is inlined in the script for review; see
+-- sql/migrations/create-associated-dataset.sql
+```
+
+### Verify
+
+```sql
+-- 1. Confirm 15 columns
+SELECT COUNT(*) AS column_count
+FROM information_schema.columns
+WHERE table_schema = DATABASE()
+  AND table_name = 'associated_dataset';
+-- Expected: 15
+
+-- 2. Confirm indexes are in place (4 keys + PK = 5 rows)
+SELECT index_name, GROUP_CONCAT(column_name ORDER BY seq_in_index) AS columns
+FROM information_schema.statistics
+WHERE table_schema = DATABASE()
+  AND table_name = 'associated_dataset'
+GROUP BY index_name
+ORDER BY index_name;
+-- Expected rows:
+--   PRIMARY                       id
+--   idx_assoc_ds_project          project_id
+--   idx_assoc_ds_project_state    project_id,connection_state
+--   idx_assoc_ds_source_type      source_type
+--   idx_assoc_ds_state            connection_state
+
+-- 3. Confirm the application can query the table
+SELECT COUNT(*) AS active_connected_count
+FROM associated_dataset
+WHERE connection_state <> 'REMOVED';
+-- Expected: 0 (empty table immediately after migration)
+
+-- 4. Confirm no unintended table was created on the finance datasource
+SELECT table_schema, table_name
+FROM information_schema.tables
+WHERE table_name = 'associated_dataset';
+-- Expected: exactly one row, for the data-management schema
+```
+
+### Rollback
+
+Rollback is destructive — any rows inserted by the application after the
+migration will be lost. Because FEAT-DATSET-01 is the first release introducing
+this table, rollback is only meaningful before any datasets have been connected
+by users.
+
+```sql
+-- DANGER: drops all connected-dataset connections.
+-- Safe only when the table is empty (see rollback plan below).
+DROP TABLE IF EXISTS `associated_dataset`;
+```
+
+If the table contains connected-dataset rows, rollback requires one of:
+
+1. **Reverse the feature deployment** to a version that does not reference the
+   table, then drop the table.
+2. **Truncate the table**, then drop it. Both cases lose all connection data.
+
+In either case, notify users that previously connected datasets will no longer
+appear in their projects.
+
+### Operator notes
+
+- **No data is moved.** This migration only creates an empty table.
+- **No downtime required.** `CREATE TABLE IF NOT EXISTS` on MariaDB takes
+  milliseconds and does not lock other tables.
+- **No foreign key constraint is created** between
+  `associated_dataset.experiment_id` and `experiments_datamanager.id`. The
+  application enforces referential integrity in memory.
+- **Future migration (same feature):** Stories 14/15 will add the
+  `user_invenio_rdm_credential` table. Expect a follow-up entry in this file
+  (or in a subsequent release's `NEXT.md`).
+
+---
+
+## Migration #<next>: <title>
+
+*Template — copy this heading and fill it in when a new schema change lands.*
+
+| Field | Value |
+|---|---|
+| **Story** | <GitHub link> |
+| **Feature** | <GitHub link> |
+| **ADRs** | <comma-separated ADR links> |
+| **Scope** | <what kind of change: new table / alter / index / view / …> |
+| **Script** | `sql/migrations/<script-name>.sql` |
+| **Target datasource** | <`data_management` or `finance` or both> |
+
+### What it does
+
+<Explanation of the schema change and which ADRs/decisions drive it.>
+
+### Pre-flight
+
+```sql
+-- <SQL checks to run before applying.>
+```
+
+### Apply
+
+```bash
+mysql -u <user> -h <host> -P <port> <datasource> \
+    < sql/migrations/<script-name>.sql
+```
+
+### Verify
+
+```sql
+-- <SQL checks to confirm the migration worked.>
+```
+
+### Rollback
+
+```sql
+-- <Rollback SQL, if safe. Explicitly call out destructive operations.>
+```
+
+### Operator notes
+
+- <Relevant caveats, downtime needed, data movement, etc.>
+
+---
+
+## Release cut procedure
+
+When this release is ready to ship:
+
+1. **Freeze this file.** No further entries after the version is cut.
+2. **Confirm the target version.** Update `<version>` in root `pom.xml` if it
+   wasn't already; record it here.
+3. **Rename:** `NEXT.md` → `released/v<version>.md`
+4. **Add a release-wide pre-flight section** to the new file if applicable.
+5. **Reset `NEXT.md`:** create a fresh empty copy from the template above
+   for the *subsequent* release.
+
+See [`README.md`](README.md) for the full migration documentation structure.
diff --git a/docs/migrations/README.md b/docs/migrations/README.md
new file mode 100644
index 0000000000..1c42c3e2a9
--- /dev/null
+++ b/docs/migrations/README.md
@@ -0,0 +1,126 @@
+# Migration documentation
+
+This directory holds migration documentation for the Data Manager application.
+It is organized in **three tiers**, each with a distinct audience and purpose:
+
+| Tier | Location | Audience | Purpose |
+|---|---|---|---|
+| **1. Runnable DDL** | [`sql/migrations/<name>.sql`](../sql/migrations/) | Developers / SREs | Individual, idempotent DDL scripts, one per schema change |
+| **2. Operator guide per release** | `released/v<version>.md` or [`NEXT.md`](NEXT.md) | Operators | One file per release listing every migration to apply when upgrading to that version |
+| **3. Index** | this file + [`sql/migrations/README.md`](../sql/migrations/README.md) | Everyone | Points to the right place depending on what you're trying to do |
+
+All three tiers together answer every question an operator or developer might
+have during a schema change: *what's the change*, *where's the script*, *what
+do I apply during upgrade*, *what if I need to roll back*.
+
+---
+
+## How the tiers relate
+
+```
+sql/migrations/
+├── README.md                         ← Tier 3: incremental script index
+└── <name>.sql                        ← Tier 1: one file per change
+
+docs/migrations/
+├── README.md                         ← this file
+├── NEXT.md                           ← Tier 2: working doc for the next release
+└── released/
+    ├── v1.14.0.md                    ← Tier 2: released operator guides
+    └── v1.13.0.md
+```
+
+Each Tier-1 script is referenced by exactly one Tier-2 entry. Tier-2 entries
+point at their Tier-1 scripts and add pre-flight, post-migration verification,
+and rollback detail. Tier-3 files explain the structure.
+
+---
+
+## I'm an operator deploying a release
+
+Open the migration guide that corresponds to the version you're deploying to:
+
+- **Unreleased / on a branch:** [`NEXT.md`](NEXT.md) — the active doc listing
+  all migrations that will ship in the next release
+- **Released:** `released/v<version>.md` — immutable once published
+
+Each guide has a summary table of all migrations plus a per-migration section
+covering:
+
+- **What it does** — explanation + link to story/feature/ADR
+- **Pre-flight** — SQL checks to run before applying
+- **Apply** — command to run the incremental script
+- **Verify** — SQL checks to confirm success
+- **Rollback** — reversal steps (often destructive — always read carefully)
+- **Operator notes** — caveats (downtime, data migration, cascade effects)
+
+### Upgrading across multiple releases
+
+If you are upgrading from version `vA` to version `vB` and several releases
+exist in between, apply each release's migrations in version order. The
+migrations are designed to be **idempotent** (e.g. `CREATE TABLE IF NOT
+EXISTS`), so re-running a migration is safe.
+
+---
+
+## I'm a developer introducing a schema change
+
+When you add a schema change (new table, altered column, new index, new view, …):
+
+1. **Create an incremental script** at `sql/migrations/<kebab-name>.sql`.
+   - Keep it idempotent (`CREATE TABLE IF NOT EXISTS`, `ALTER TABLE … ADD COLUMN
+     IF NOT EXISTS`, etc.).
+   - Include a header comment with the story/feature number, ADRs, and date.
+
+2. **Append an entry to [`NEXT.md`](NEXT.md).** Use the template section at the
+   bottom of that file. The entry links to your script and repeats the pre-flight
+   / apply / verify / rollback instructions so operators can review in a single
+   location.
+
+3. **Do not touch `released/`** — that directory is only edited at release cut.
+
+See [`sql/migrations/README.md`](../sql/migrations/README.md) for the incremental
+script naming convention and header format.
+
+---
+
+## I'm the release manager cutting a release
+
+At release cut:
+
+1. Confirm the target version number in root `pom.xml`.
+2. Freeze [`NEXT.md`](NEXT.md) — no further entries after this point.
+3. Copy it to `released/v<version>.md`.
+4. If needed, add a release-wide pre-flight section to the new file (e.g. backup
+   instructions, cross-datasource sanity checks).
+5. Reset `NEXT.md` to a fresh empty template for the *subsequent* release.
+6. Commit the release-cut commit.
+
+`NEXT.md` is a rolling document: it represents the "draft" migration guide for
+whatever is currently in the development branch, and is only frozen once the
+release is cut.
+
+---
+
+## Naming conventions
+
+| Artifact | Convention | Example |
+|---|---|---|
+| Incremental script | `sql/migrations/<kebab-case>.sql` | `create-associated-dataset.sql` |
+| Released operator guide | `docs/migrations/released/v<major>.<minor>.<patch>.md` | `released/v1.13.0.md` |
+| Next-release draft | `docs/migrations/NEXT.md` | (always this name) |
+| Migration header comment | `-- Story:`, `-- Feature:`, `-- ADR:`, `-- Date:` | see [`create-associated-dataset.sql`](../sql/migrations/create-associated-dataset.sql) |
+
+---
+
+## Historical note — pre-2026-07 migrations
+
+Before the three-tier structure was established, migration guides followed a
+date-based naming convention (e.g., `2026-06-11-remove-materialized-ip-table-*.md`).
+Those documents remain in this directory as historical records and are still
+authoritative for the migrations they describe. Going forward, all new
+migrations use the three-tier structure documented above.
+
+**List of pre-structure guides:**
+
+- [`2026-06-11-remove-materialized-ip-table-and-optimize-indexes.md`](./2026-06-11-remove-materialized-ip-table-and-optimize-indexes.md)
diff --git a/docs/migrations/released/README.md b/docs/migrations/released/README.md
new file mode 100644
index 0000000000..ab1090199b
--- /dev/null
+++ b/docs/migrations/released/README.md
@@ -0,0 +1,30 @@
+# Released migration guides
+
+This directory will hold one migration guide per released Data Manager version,
+named `v<major>.<minor>.<patch>.md` to match the release's Git tag.
+
+Each file is the **immutable, operator-facing** migration guide for that
+release — once written, never modified. Corrections go into the next release's
+guide.
+
+## Current state
+
+**Empty.** The three-tier migration documentation structure was established in
+2026-07 for FEAT-DATSET-01. Until the first release that uses the new
+structure is cut, no files will appear here.
+
+For migrations targeting the upcoming (unreleased) version, see
+[`../NEXT.md`](../NEXT.md).
+
+Pre-structure (date-based) migration guides from before the three-tier layout
+are still held in the parent [`..`](..) directory; consult those for
+migrations they cover.
+
+## File naming convention
+
+- `v1.13.0.md` — full migration guide for 1.13.0
+- `v1.13.1.md` — full migration guide for 1.13.1 (patch release)
+- `v2.0.0.md` — full migration guide for a major release
+
+Each file references the incremental scripts in [`../../sql/migrations/`](../../sql/migrations/)
+that operators need to apply.
diff --git a/docs/plans/FEAT-DATSET-01-implementation-plan.md b/docs/plans/FEAT-DATSET-01-implementation-plan.md
new file mode 100644
index 0000000000..3ad94a17ff
--- /dev/null
+++ b/docs/plans/FEAT-DATSET-01-implementation-plan.md
@@ -0,0 +1,409 @@
+# Implementation Plan — FEAT-DATSET-01: Connecting Open, Published Datasets
+
+> **Story:** [#1467](https://github.com/qbicsoftware/data-manager-app/issues/1467)  
+> **Parent Feature:** [#1466 — FEAT-DATASET-CONNECTION](https://github.com/qbicsoftware/data-manager-app/issues/1466)  
+> **ADRs honored:** [0001](../adr/0001-associated-datasets-domain-model.md), [0002](../adr/0002-invenio-rdm-api-client-credentials.md), [0003](../adr/0003-connection-lifecycle-stewardship.md), [0004](../adr/0004-fair-signposting-deferred.md)  
+> **UI Prototype:** `AssociatedDatasetsDemoV2.java` (at `datamanager-app/.../views/demo/`)  
+> **Date:** 2025-07-14
+
+---
+
+## 1. Scope — What This Iteration Covers
+
+FEAT-DATSET-01 covers **connecting open (public) published datasets** from InvenioRDM instances to a project. The acceptance criteria are:
+
+- AC1: Navigate to a "Datasets" section in the project navigation (below Summary).
+- AC2: Select an InvenioRDM instance to search in.
+- AC3: Paginated search results shown when no search term is provided.
+- AC4: Submitting a search term returns matching results from the selected instance.
+- AC5: Clicking "Connect" adds the dataset to the project.
+- AC6: Failure is communicated to the user.
+- AC7: Success is communicated to the user.
+- AC8: Another project member can see the connected dataset.
+- AC9: Optionally associate the dataset with a specific experiment.
+
+**Out of scope for this story** (covered by separate stories):
+- Access-restricted datasets (FEAT-DATSET-05, FEAT-DATSET-14, FEAT-DATSET-15) — see *Pragmatic scope decision* below.
+- Viewing connected datasets (FEAT-DATSET-02) — partially included here: the connect flow implies loading + persisting, but a dedicated "view connected datasets" section is FEAT-DATSET-02's responsibility. However, the UI prototype shows a "Connected Resources" grid. We include a minimal Connected Resources display here so connected datasets are immediately visible (AC8).
+- Removing connections (FEAT-DATSET-03)
+- Syncing connections (FEAT-DATSET-04)
+
+**Pragmatic scope decision — restricted datasets:**
+The long-term view will show open and restricted datasets in one unified listing (per the prototype's design). However, for this iteration, the token/credential flow (Stories 14/15) is not yet implemented, so restricted datasets cannot be searched or connected. The domain model (`AccessLevel` field on the aggregate) is designed to be future-proof for restricted datasets, but the UI in this iteration is functionally equivalent to a **public-only** view. No credentials section, no token management, no restricted-dataset search — the "Repository Access" section from the prototype is omitted entirely.
+
+**Pragmatic scope decision:** Based on the UI prototype, the first iteration will include:
+1. **Navigation entry** — "DATASETS" link in the project drawer below "SUMMARY".
+2. **Associated Datasets view** — A new `@Route` view within `ProjectMainLayout` showing:
+   - A "Connected Resources" section (empty grid initially, with a "Connect Datasets" button).
+   - The connect sidebar (from the prototype) — search, instance selection, multi-select, connect.
+3. **Domain + Application layer** — The `associated-dataset` aggregate, application service, and `DatasetSource` port.
+4. **Infrastructure layer** — InvenioRDM REST client (stateless, instance-parameterised), JPA persistence.
+5. **Notification** — Actor toast on success/failure; email to other project members via existing `InformUsersAboutBatchRegistration` pattern (see Task 6).
+
+---
+
+## 2. Requirement IDs — Out of Scope
+
+The story references `DATA-R-01` and `COMM-R-01`. There is a known ID collision with existing entries in `docs/requirements.md`. Requirement document changes are **out of scope** for this development task — the Product Owner handles requirement tracking and ID resolution separately.
+
+---
+
+## 3. Architecture Overview (per ADRs)
+
+### 3.1 Bounded context: `project-management`
+
+Per ADR-0001, the `associated-dataset` package lives in the `project-management` bounded context.
+
+```
+project-management/
+├── src/main/java/life/qbic/projectmanagement/
+│   ├── domain/model/associated_dataset/      ← Domain model
+│   │   ├── AssociatedDataset.java            (aggregate root)
+│   │   ├── AssociatedDatasetId.java          (value object)
+│   │   ├── SourceType.java                   (enum: INVENIO_RDM)
+│   │   ├── ConnectionState.java              (enum: CONNECTED, REMOVED)
+│   │   ├── AccessLevel.java                  (enum: PUBLIC, RESTRICTED)
+│   │   ├── ExternalHandle.java               (value object: external identity)
+│   │   ├── resourcemetadata/
+│   │   │   ├── ResourceMetadata.java         (sealed interface)
+│   │   │   └── InvenioRdmResourceMetadata.java (concrete, source-specific)
+│   │   ├── event/
+│   │   │   ├── AssociatedDatasetConnectedEvent.java
+│   │   │   └── AssociatedDatasetConnectionFailedEvent.java
+│   │   └── repository/
+│   │       └── AssociatedDatasetRepository.java  (interface)
+│   └── application/associated_dataset/       ← Application services
+│       ├── AssociatedDatasetService.java      (use-case orchestration)
+│       └── DatasetSource.java                 (port — external data source)
+```
+
+```
+project-management-infrastructure/
+├── src/main/java/life/qbic/projectmanagement/infrastructure/
+│   ├── dataset/associated/
+│   │   ├── AssociatedDatasetJpaRepository.java   (Spring Data JPA)
+│   │   ├── AssociatedDatasetEntity.java          (JPA entity)
+│   │   └── AssociatedDatasetRepositoryImpl.java  (implements domain repo)
+│   └── external/invenio/
+│       ├── InvenioRdmDatasetSource.java          (implements DatasetSource port)
+│       ├── InvenioRdmClient.java                 (low-level HTTP client)
+│       ├── InvenioRdmSearchResult.java           (transient search result mapping)
+│       └── InvenioRdmInstanceConfig.java         (instance config binding)
+```
+
+```
+datamanager-app/
+├── src/main/java/life/qbic/datamanager/views/projects/project/datasets/
+│   ├── AssociatedDatasetsMain.java               (@Route view — project layout)
+│   ├── ConnectedResourcesComponent.java           (grid of connected datasets)
+│   └── ConnectDatasetSidebar.java                 (search + connect sidebar)
+```
+
+### 3.2 Layer responsibilities
+
+| Layer | Responsibility |
+|---|---|
+| **Domain** | Aggregate (`AssociatedDataset`), value objects, events, repository interface |
+| **Application** | `AssociatedDatasetService` (use cases: search, connect, list), `DatasetSource` port |
+| **Infrastructure** | InvenioRDM REST client, JPA repository impl, entity mapping |
+| **Views (UI)** | Vaadin route view, grid, sidebar — purely presentation |
+
+### 3.3 Data flow (connect flow)
+
+```
+User enters search term + selects instance
+  → UI calls AssociatedDatasetService.search(query, instanceId)
+    → DatasetSource.search(query, InstanceConfig) [port]
+      → InvenioRdmClient calls InvenioRDM REST API (GET /api/records?q=...)
+      → Returns SearchResult
+    → Returns List<SearchHit> to UI
+
+User clicks "Connect Selected"
+  → UI calls AssociatedDatasetService.connect(projectId, recordIds, optionalExperimentId)
+    → For each hit: DatasetSource.resolveMetadata(hitId, InstanceConfig) → ResourceMetadata
+    → Creates AssociatedDataset aggregate (state=CONNECTED, accessLevel=PUBLIC)
+    → Saves via AssociatedDatasetRepository
+    → Emits AssociatedDatasetConnectedEvent
+    → Event triggers email to other project members (if notification is in scope)
+  → UI shows success toast; refreshes connected resources grid
+```
+
+---
+
+## 4. Detailed Task Breakdown
+
+### Task 1: Domain model — `associated_dataset` package
+**Module:** `project-management`
+
+- Create `life.qbic.projectmanagement.domain.model.associated_dataset` package.
+
+**Classes to create:**
+
+1. **`SourceType`** — enum: `INVENIO_RDM`. Source-agnostic extensibility point.
+2. **`ConnectionState`** — enum: `CONNECTED`, `REMOVED`.
+3. **`AccessLevel`** — enum: `PUBLIC`, `RESTRICTED`.
+4. **`ExternalHandle`** — value object carrying the external record identifier (e.g., Zenodo record ID, DOI).
+5. **`ResourceMetadata`** (sealed interface) — source-agnostic metadata container.
+6. **`InvenioRdmResourceMetadata`** — concrete implementation carrying InvenioRDM-specific fields (title, PID, DOI, creators, community, version, resource type, description).
+7. **`AssociatedDatasetId`** — value object wrapping a UUID.
+8. **`AssociatedDataset`** — aggregate root:
+   - Fields: `id`, `projectId`, `sourceType`, `externalHandle`, `connectionState`, `accessLevel`, `resourceMetadata`, `connectedBy` (user), `connectedOn` (timestamp), `optionalExperimentId`, `lastSyncedAt` (nullable).
+   - Methods: `connect(...)` factory, `remove()` (soft delete → `state = REMOVED`).
+   - Emits `AssociatedDatasetConnectedEvent` on successful connect.
+9. **Repository interface** (`AssociatedDatasetRepository`):
+   - `save(AssociatedDataset)`
+   - `findByProjectId(ProjectId)` → `List<AssociatedDataset>` (excluding REMOVED state)
+   - `findById(AssociatedDatasetId)` → `Optional<AssociatedDataset>`
+
+### Task 2: Application service + DatasetSource port
+**Module:** `project-management`
+
+1. **`DatasetSource`** (port interface):
+   - `SearchResult search(String query, InstanceConfig config)`
+   - `ResourceMetadata resolveMetadata(String recordId, InstanceConfig config)`
+   - `List<InvenioRdmInstanceDescriptor> availableInstances()` (or read from config)
+
+2. **`InstanceConfig`** — record: `id`, `displayName`, `baseUrl`, `Optional<AccessToken>`.
+
+3. **`SearchResult`** — record: `List<SearchHit> hits`, `int total`, `int page`, `int pageSize`.
+
+4. **`SearchHit`** — record: `id`, `title`, `pid`, `accessLevel`, `version`, `accessLink`, `publicationDate`, `creator`, `resourceType`, `community`, `description`.
+
+5. **`AssociatedDatasetService`** — `@Service` class:
+   - `List<SearchHit> searchDatasets(String query, String instanceId)`
+   - `Result<AssociatedDatasetId, Error> connectDataset(ProjectId projectId, String recordId, String instanceId, Optional<ExperimentId> experimentId)`
+   - `List<AssociatedDatasetInfo> listConnectedDatasets(ProjectId projectId)`
+   - Depends on: `AssociatedDatasetRepository`, `DatasetSource`, ACL check.
+
+### Task 3: Infrastructure — InvenioRDM REST client
+**Module:** `project-management-infrastructure`
+
+1. **`InvenioRdmClient`** — stateless HTTP client using Spring `RestClient`:
+   - `GET {baseUrl}/api/records?q={query}&page={page}&size={size}` — search
+   - `GET {baseUrl}/api/records/{id}` — resolve single record metadata
+   - Handles pagination via InvenioRDM's `links.next` convention.
+   - Bounded synchronous retry (3 attempts, exponential backoff, 5s ceiling) per ADR-0002.
+   - Error mapping: 4xx → user-facing error; 5xx/timeout → retry → then user-facing error.
+
+2. **`InvenioRdmDatasetSource`** — implements `DatasetSource` port:
+   - Delegates to `InvenioRdmClient`.
+   - For this iteration: no token auth (open datasets only). Token support deferred to FEAT-DATSET-05/14.
+   - Maps InvenioRDM JSON response → `SearchResult` / `ResourceMetadata`.
+
+3. **`InvenioRdmInstanceProperties`** — `@ConfigurationProperties` for instance config:
+   ```properties
+   qbic.external-service.invenio-rdm.instances[0].name=Zenodo
+   qbic.external-service.invenio-rdm.instances[0].url=https://zenodo.org
+   qbic.external-service.invenio-rdm.instances[1].name=FDAT
+   qbic.external-service.invenio-rdm.instances[1].url=https://fdat.uni-tuebingen.de
+   ```
+
+### Task 4: Infrastructure — JPA persistence
+**Module:** `project-management-infrastructure`
+
+1. **`AssociatedDatasetEntity`** — JPA entity mapped to `associated_dataset` table:
+   - `id` (PK), `project_id`, `source_type`, `external_handle`, `connection_state`, `access_level`
+   - `resource_metadata` (MariaDB `JSON` column) — source-specific metadata
+   - `connected_by`, `connected_on`, `experiment_id` (nullable), `last_synced_at`
+   - Universal columns for sort/filter: `title`, `pid`, `version`, `publication_date`
+
+2. **`AssociatedDatasetJpaRepository`** — Spring Data JPA repository.
+
+3. **`AssociatedDatasetRepositoryImpl`** — implements domain repository, translates between aggregate ↔ entity.
+
+### Task 5: UI — Route view, navigation, connected resources grid
+**Module:** `datamanager-app`
+
+1. **Route constant** in `AppRoutes.ProjectRoutes`:
+   ```java
+   public static final String DATASETS = "projects/%s/datasets";
+   ```
+
+2. **`AssociatedDatasetsMain`** — `@Route(value = "projects/:projectId?/datasets", layout = ProjectMainLayout.class)`:
+   - Extends `Main` (following the `ProjectInformationMain` pattern).
+   - Contains: "Connected Resources" section + "Connect Datasets" button.
+   - Connected resources grid (simplified for this iteration — shows public datasets with basic properties: Title, PID/DOI, Access Status, Version, Access Link, Published Date).
+   - Follows the layout from `AssociatedDatasetsDemoV2.java`.
+   - **Empty state** — when no datasets are connected, the grid is replaced by an empty state component (see `ConnectedResourcesComponent` below).
+
+3. **`ConnectedResourcesComponent`** — the grid + filter bar. Uses Vaadin Grid's lazy loading (`setItems(Query)`) against the local DB for consistent behaviour with the search sidebar. No access filter needed for public-only (this iteration), but include the component structure for future expansion.
+
+   **Empty state:** When `connectedResources.isEmpty()`, replace the filter bar and grid with an empty-state component. Contents:
+   - Large muted icon (`VaadinIcon.DATABASE` or `VaadinIcon.GLOBE`)
+   - Heading: "No datasets connected"
+   - Explanatory text (1–2 sentences) — what this section does and what a connected dataset means
+   - Primary CTA: "Connect Datasets" button (`LUMO_PRIMARY`) — same action as the ActionBar button, opens the connect sidebar
+   - Optional secondary line: a one-liner describing the flow ("Search InvenioRDM repositories, select datasets, and connect them to this project.")
+
+   The empty state disappears immediately after the first successful connect (grid refresh replaces it). The ActionBar "Connect Datasets" button is always visible, so the entry point exists even before the empty-state CTA.
+
+   **Empty state:** When `connectedResources.isEmpty()`, the filter bar and grid are replaced by an empty-state component containing:
+   - A large muted icon (`VaadinIcon.DATABASE` or `VaadinIcon.GLOBE`)
+   - Heading: *"No datasets connected"*
+   - Explanatory text (1–2 sentences): what this section is for (connecting external InvenioRDM datasets to a project)
+   - Primary CTA: *"Connect Datasets"* button (`LUMO_PRIMARY`) — same action as the ActionBar button (opens the connect sidebar)
+   - Optional secondary text: a one-liner describing the sidebar flow ("Search InvenioRDM repositories, select datasets, and connect them to this project.")
+
+   The empty state disappears immediately after the first successful connect (grid refresh replaces it).
+
+4. **`ConnectDatasetSidebar`** — sliding sidebar panel:
+   - Instance selector (ComboBox populated from `InvenioRdmInstanceProperties`).
+   - Search field (TextField + Enter key listener).
+   - Search results as a lazily-loaded Vaadin Grid (single column with card-style rendering per the prototype). Uses InvenioRDM's offset-based pagination (`page` + `size` query params, mapped from Vaadin's `Query.getOffset()` / `getLimit()`) — no visible pagination controls in the UI. Zenodo enforces max 25 results/page for anonymous, 100 for authenticated.
+   - Multi-selection + "Connect Selected" button.
+   - Optional experiment association: a ComboBox (populated from the project's experiments) in the sidebar footer area, visible before "Connect Selected". The user can select an experiment to link the connected dataset to. Selection is optional — if left empty, the dataset is connected without a specific experiment link.
+
+5. **Navigation entry** in `ProjectSideNavigationComponent`:
+   - Add a `SideNavItem("DATASETS", datasetsPath, VaadinIcon.DATABASE.create())` below the Summary link.
+   - Visible to all users with project access (READ permission on project, per ADR-0003).
+
+### Task 6: Notification on connect
+**Module:** `project-management` (domain event + policy directive) + `datamanager-app` (toast)
+
+Per ADR-0003, notification model is:
+- **Actor** (the user who connected) → sees a Vaadin toast immediately (UI layer).
+- **Other project members** → receive email, dispatched asynchronously via `JobScheduler`.
+
+**Both actor toast and project-member email are in scope for this iteration.**
+
+The codebase already has the complete prerequisite chain:
+- `ProjectAccessService.listCollaborators(projectId)` → `List<ProjectCollaborator>`
+- `UserInformationService.findById(userId)` → user info with email address
+- `EmailService.send(Subject, Recipient, Content)` → email delivery
+- `JobScheduler.enqueue(...)` → async dispatch (JobRunr)
+
+**Implementation:**
+
+1. **Domain event:** `AssociatedDatasetConnectedEvent` (emitted by aggregate in Task 1). Carries `projectId`, `actorUserId`, `datasetTitle`, `datasetPid`.
+
+2. **New policy directive:** `InformProjectMembersAboutDatasetConnection implements DomainEventSubscriber<AssociatedDatasetConnectedEvent>`:
+   - Resolves collaborators: `ProjectAccessService.listCollaborators(projectId)`
+   - Filters out the actor (ADR-0003: actor already saw the toast)
+   - For each remaining collaborator: resolves email via `UserInformationService.findById()`
+   - Dispatches each email asynchronously: `JobScheduler.enqueue(() -> emailService.send(...))`
+   - Email content via `Messages` pattern (i18n-ready): subject "New dataset connected to project", body with dataset title, PID, and link to datasets view
+
+3. **Actor toast** in `AssociatedDatasetsMain`: success toast shown after the connect call returns.
+
+**Reference pattern:** `InformUsersAboutBatchRegistration` — same event-subscribe → collaborator-lookup → async-email flow.
+
+### Task 7: Tests
+
+- **Unit tests** (Spock):
+  - `AssociatedDatasetSpec` — aggregate behavior (connect, remove, state transitions).
+  - `AssociatedDatasetServiceSpec` — use-case orchestration, port interaction.
+  - `InvenioRdmClientSpec` — HTTP response parsing, retry logic, error mapping.
+- **Integration tests**:
+  - `AssociatedDatasetIT` — JPA persistence round-trip.
+  - WireMock-based test for InvenioRDM API interaction (if feasible).
+
+---
+
+## 5. Database Schema Changes
+
+New table `associated_dataset` in the data-management datasource:
+
+```sql
+CREATE TABLE associated_dataset (
+  id                VARCHAR(36)   NOT NULL PRIMARY KEY,
+  project_id        VARCHAR(36)   NOT NULL,
+  source_type       VARCHAR(32)   NOT NULL,              -- 'INVENIO_RDM'
+  external_handle   VARCHAR(255)  NOT NULL,              -- record ID on the source
+  connection_state  VARCHAR(16)   NOT NULL DEFAULT 'CONNECTED',
+  access_level      VARCHAR(16)   NOT NULL,              -- 'PUBLIC' | 'RESTRICTED'
+
+  -- Universal columns for sort/filter
+  title             VARCHAR(1024),
+  pid               VARCHAR(255),
+  version           VARCHAR(32),
+  publication_date  DATE,
+
+  -- Source-specific metadata (opaque JSON)
+  resource_metadata JSON,
+
+  -- Connection metadata
+  connected_by      VARCHAR(255)  NOT NULL,
+  connected_on      DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  experiment_id     VARCHAR(36),                         -- nullable
+  last_synced_at    DATETIME,
+
+  INDEX idx_assoc_ds_project (project_id),
+  INDEX idx_assoc_ds_state (connection_state),
+  INDEX idx_assoc_ds_source (source_type)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+```
+
+Notes per ADR-0001:
+- Universal columns (`title`, `pid`, `version`, `publication_date`) are regular columns for SQL-sortable fields.
+- Source-specific metadata is stored in a `JSON` column (MariaDB, not JSONB).
+- Soft delete: `connection_state = 'REMOVED'` is the tombstone.
+
+---
+
+## 6. Configuration Changes
+
+Add to `application.properties`:
+
+```properties
+# InvenioRDM instances (admin-configured, per ADR-0002 I2)
+qbic.external-service.invenio-rdm.instances[0].name=Zenodo
+qbic.external-service.invenio-rdm.instances[0].url=https://zenodo.org
+qbic.external-service.invenio-rdm.instances[1].name=FDAT
+qbic.external-service.invenio-rdm.instances[1].url=https://fdat.uni-tuebingen.de
+```
+
+For `development` profile: provide a mock adapter for the `DatasetSource` port so local dev does not require external network access.
+
+---
+
+## 7. UI Design Decisions (derived from prototype + ADRs)
+
+| Decision | Source |
+|---|---|
+| Sidebar approach for connect (not modal) | Prototype V2 feedback |
+| Connected Resources grid with expandable detail rows | Prototype V2 |
+| "DATASETS" nav link below "SUMMARY" | User request |
+| Instance selector as ComboBox in sidebar | Prototype + ADR-0002 (I2) |
+| Card-style search results (single-column grid) | Prototype V2 |
+| Toast on connect success/failure | ADR-0003 (N1 — actor toast) |
+| No credentials/token section in UI (deferred to Stories 14/15) | Pragmatic scope decision |
+| No access filter initially (public-only searchable in this iteration) | Pragmatic scope decision |
+| Experiment association as optional ComboBox in connect sidebar | AC9 |
+| Empty state in Connected Resources when no datasets connected | UX / onboarding decision |
+
+---
+
+## 8. Order of Implementation
+
+1. **Domain model** (Task 1) — foundation, no external dependencies
+2. **Application service + port** (Task 2) — depends on domain
+3. **Unit tests for domain + application** (spoke alongside 1, 2)
+4. **Infrastructure: InvenioRDM client** (Task 3) — depends on port
+5. **Infrastructure: JPA persistence** (Task 4) — depends on domain
+6. **UI: Route + navigation + grid + sidebar** (Task 5) — depends on application service + infrastructure
+7. **Integration tests** (Task 7) — depends on everything wired
+8. **Notification: email directive** (Task 6) — domain event + policy directive following existing `InformUsersAboutBatchRegistration` pattern
+
+---
+
+## 9. Risk Items and Mitigations
+
+| Risk | Impact | Mitigation |
+|---|---|---|
+| InvenioRDM API rate limits (Zenodo: 2 req/s for anonymous) | Search failures | Implement retry with backoff; show user-facing error; consider caching. |
+| Project-member email lookup missing | ~~Not a risk~~ — `ProjectAccessService` + `UserInformationService` already provide the lookup. | Already available in codebase. |
+| MariaDB JSON column query performance | <100 rows/project — acceptable per ADR | Accept risk; index optimization deferred. |
+| No mock for InvenioRDM in `development` profile | Local dev requires external access | Build a mock adapter in the `development` profile. |
+| Existing `dataset` package in project-management-infrastructure | Name collision risk | Use `dataset/associated` sub-package per ADR-0001 guidance to distinguish from OpenBIS raw data. |
+
+---
+
+## 10. Assumptions
+
+1. The "DATASETS" navigation link is visible to all users with READ access to a project (per ADR-0003 ACL table).
+2. Only public datasets are searched/connected in this iteration (no token needed).
+3. The InvenioRDM instances are hardcoded in configuration (Zenodo + FDAT) per ADR-0002 (I2).
+4. Project-member email notifications are **in scope** — the `ProjectAccessService` + `UserInformationService` + `EmailService` + `JobScheduler` chain already exists and is proven by `InformUsersAboutBatchRegistration`.
+5. The UI follows the prototype V2 layout; the sidebar is the chosen approach for connecting datasets.
+6. Experiment association is optional and implemented as a dropdown in the connect sidebar.
+7. Requirement ID management is a Product Owner concern — not part of this development task.
diff --git a/docs/plans/FEAT-DATSET-03-remove-connected-dataset.md b/docs/plans/FEAT-DATSET-03-remove-connected-dataset.md
new file mode 100644
index 0000000000..c34eb45374
--- /dev/null
+++ b/docs/plans/FEAT-DATSET-03-remove-connected-dataset.md
@@ -0,0 +1,505 @@
+# Implementation Plan: FEAT-DATSET-03 — Remove a Connected Open, Published Dataset
+
+> **Story:** [#1469](https://github.com/qbicsoftware/data-manager-app/issues/1469)
+> **Parent Feature:** [#1466](https://github.com/qbicsoftware/data-manager-app/issues/1466) (FEAT-DATASET-CONNECTION)
+> **Requirement:** DATA-R-01 (proposed for this feature — see note below)
+> **ADR references:** [ADR-0001](../docs/adr/0001-associated-datasets-domain-model.md), [ADR-0003](../docs/adr/0003-connection-lifecycle-stewardship.md)
+
+---
+
+## Requirement ID Note
+
+The parent feature (#1466) proposes new requirement IDs (`DATA-R-01`, `DATA-R-02`, `DATA-R-03`) that are
+**pending formal addition to `docs/requirements.md`**. The existing `DATA-R-01` in that file already
+covers *Immunopeptidomics Raw Dataset View and Filtering* — an unrelated domain. Before implementation
+proceeds, the PO must confirm the correct IDs for the dataset-connection feature and update
+`docs/requirements.md`. This is a **prerequisite**, not a blocker for the technical work below, since
+the connect feature (#1467) already uses the same proposed IDs consistently.
+
+---
+
+## Acceptance Criteria (from the story)
+
+| # | Scenario |
+|---|---|
+| AC-1 | Given a user has write access to a project with a connected dataset, When they click the **Remove** button, Then the connection between the dataset and the project is removed. |
+| AC-2 | Given the removal is successful, When the operation completes, Then the user receives a confirmation notification and the view refreshes to reflect the updated list of connected datasets. |
+| AC-3 | Given the removal fails, When the operation cannot complete, Then the user receives an error notification with further instructions. |
+
+---
+
+## Current State of the Codebase
+
+The following infrastructure **already exists** and can be reused directly:
+
+| Component | Location | Status |
+|---|---|---|
+| `AssociatedDataset` aggregate | `project-management/…/domain/model/associated_dataset/` | `remove()` exists but does **not** emit a domain event |
+| `AssociatedDatasetRemovedEvent` | `project-management/…/domain/model/associated_dataset/event/` | ✅ Complete |
+| `RemoveDatasetError` enum | `project-management/…/application/associated_dataset/` | ✅ Complete (`DATASET_NOT_FOUND`, `DATASET_ALREADY_REMOVED`, `REMOVAL_FAILED`) |
+| `AssociatedDatasetRepository` | `project-management/…/repository/` | ✅ `findById()` + `save()` available |
+| `AssociatedDatasetJpaRepository` | `project-management-infrastructure/…/` | ✅ `save()` (JPA merge) handles state transitions |
+| Test specs for `removeDataset()` | `AssociatedDatasetServiceRemoveSpec.groovy` | ✅ Written, awaiting implementation |
+| Test spec for removed event | `AssociatedDatasetRemovedEventSpec.groovy` | ✅ Written |
+| `ConnectedResourcesComponent` | `datamanager-app/…/views/projects/project/datasets/` | Card list renders, but has **no Remove button** per design |
+| `ConnectedDatasetsMain` | `datamanager-app/…/views/projects/project/datasets/` | View exists, sidebar wired |
+| `AssociatedDatasetConnectedPolicy` | `project-management/…/application/policy/` | Pattern to replicate for removal |
+| `InformProjectCollaboratorsAboutDatasetConnection` | `project-management/…/policy/directive/` | Pattern to replicate for removal |
+| `AppConfig` bean wiring | `datamanager-app/…/AppConfig.java` | Policy bean registration |
+| Toast notification properties | `datamanager-app/src/main/resources/messages/toast-notifications.properties` | `dataset.connected.*` entries exist, `dataset.removed.*` missing |
+| `Messages` class | `project-management/…/application/Messages.java` | `datasetConnectedToProject()` exists, removal template missing |
+
+---
+
+## Task Breakdown
+
+### Task 0 — UI Foundation: Build centralized `AlertDialog` factory
+
+**Layer:** UI (shared, consumed by all views)
+**Module:** `datamanager-app`
+**Rationale:** The app currently has no proper alert dialog. The UX/UI designer has specified an Alert Dialog pattern (see screenshot in GitHub issue #1469) with these characteristics:
+- Minimal content (icon + title + short description)
+- Intent-driven styling — icon color and confirm button color reflect severity (danger, warning, error, info)
+- 1–2 actions maximum (cancel + confirm, or confirm-only)
+- No complex layouts or scrolling
+- Use cases: confirm destructive actions, show warnings or errors
+
+The existing `AppDialog` has the right building blocks (`AppDialog.small()`, `DialogHeader.withIcon()`, `DialogBody.withoutUserInput()`, `DialogFooter.withDangerousConfirm()`) but no centralized factory. The private `AppDialog.createConfirmDialog()` is hardcoded for "Discard changes?" and not reusable. Various views construct confirmation dialogs ad-hoc (e.g. `ExperimentDetailsComponent.createConfoundingVarsDeleteConfirmDialog()`).
+
+**Files to create:**
+- `datamanager-app/src/main/java/life/qbic/datamanager/views/general/dialog/AlertDialog.java`
+
+**Design:** A static factory with a fluent builder API that uses `AppDialog.small()` internally. Provides two entry points:
+
+```java
+// Entry point A: one-shot static factory methods for common patterns
+AlertDialog.alert(parentComponent)
+    .danger()
+    .title("Remove dataset?")
+    .message("This will disconnect the dataset from the project.")
+    .confirmButton("Remove", onRemove)
+    .cancelButton("Cancel", onCancel)
+    .open();
+
+// Entry point B: pre-configured danger-intent shortcut
+AlertDialog.danger(parentComponent,
+    "Remove dataset?",
+    "This will disconnect the dataset from the project.",
+    onRemove)
+    .open();
+```
+
+**Builder API:**
+```java
+public class AlertDialog {
+
+    public enum Intent { DANGER, WARNING, ERROR, INFO }
+
+    public static Builder alert(Component parent) { ... }
+    public static AlertDialog danger(Component parent, String title,
+        String message, DialogAction onConfirm) { ... }
+
+    public static class Builder {
+        public Builder intent(Intent intent)
+        public Builder danger()   // shorthand for intent(DANGER)
+        public Builder warning()  // shorthand for intent(WARNING)
+        public Builder error()    // shorthand for intent(ERROR)
+        public Builder info()     // shorthand for intent(INFO)
+        public Builder title(String title)
+        public Builder message(String message)
+        public Builder confirmButton(String label, DialogAction action)
+        public Builder cancelButton(String label, DialogAction action)  // optional
+        public AlertDialog build()
+    }
+
+    public void open()
+    public void close()
+}
+```
+
+**How it works internally:**
+1. Creates `AppDialog.small()`
+2. Depending on intent, configures the icon via `IconFactory` (warning/error/success/info)
+3. Sets the header via `DialogHeader.withIcon()`
+4. Sets the body via `DialogBody.withoutUserInput()` with the description text
+5. Sets the footer via `DialogFooter.withDangerousConfirm()` for DANGER intent, or `DialogFooter.with()` for other intents
+6. Registers confirm/cancel actions via `AppDialog.registerConfirmAction()` / `registerCancelAction()`
+
+**Intent → icon/button mapping:**
+
+| Intent | Icon | Confirm button style | Use case |
+|---|---|---|---|
+| `DANGER` | `warningIcon()` (orange exclamation) | Danger (red, `.button-danger`) | Destructive actions: remove, delete, discard |
+| `WARNING` | `warningIcon()` | Primary | Important non-destructive confirmation |
+| `ERROR` | `VaadinIcon.CLOSE_CIRCLE` (red) | Primary | Inform: something went wrong |
+| `INFO` | `VaadinIcon.INFO_CIRCLE` (blue) | Primary | Inform: informational message |
+
+**CSS classes already available (no new CSS needed):**
+- `.button-danger` — red fill (existing, used by `ButtonFactory.createDangerButton()`)
+- `.icon-color-warning` — orange icon color (existing, used by `IconFactory.warningIcon()`)
+- `DialogFooter.withDangerousConfirm()` already creates the correct button pair
+
+**When to use `AlertDialog` vs `MessageSourceNotificationFactory.dialog()`:**
+- **`AlertDialog`** for *action confirmation* (destructive ops, irreversible actions) — uses `AppDialog` which has the `BeforeLeaveObserver` pattern for unsaved changes.
+- **`MessageSourceNotificationFactory.dialog()`** (uses Vaadin `ConfirmDialog`) for *informational/notification* dialogs (warnings, errors, info notices that don't require destructive action).
+- Keep the split: confirmation = `AlertDialog`, notification = existing `NotificationDialog`.
+
+**Tests to add:**
+- Unit: `AlertDialog.danger()` creates a dialog with warning icon, danger button, registers correct actions
+- Unit: builder `.danger().title(...).build().open()` produces correctly configured inner `AppDialog`
+- Edge case: `.confirmButton()` without `.cancelButton()` → confirm-only dialog
+
+---
+
+### Task 1 — Domain: Wire event emission into `AssociatedDataset.remove()`
+
+**Layer:** Domain
+**Module:** `project-management`
+**Files to change:**
+- `project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDataset.java`
+
+**What to do:**
+The current `remove()` method sets `connectionState = REMOVED` and throws if already removed, but does **not** dispatch a domain event. Add a private `emitRemovedEvent()` method (mirroring the existing `emitConnectedEvent()`) and call it from `remove()`.
+
+```java
+public void remove() {
+  if (this.connectionState == ConnectionState.REMOVED) {
+    throw new IllegalStateException("Dataset connection is already removed");
+  }
+  this.connectionState = ConnectionState.REMOVED;
+  emitRemovedEvent();  // ← NEW
+}
+
+private void emitRemovedEvent() {
+  var event = AssociatedDatasetRemovedEvent.create(
+      this.id, this.projectId, this.connectedBy, this.title, this.pid);
+  LocalDomainEventDispatcher.instance().dispatch(event);
+}
+```
+
+**Note on actor identity:** The aggregate uses `connectedBy` as the actor field in the removed event. However, the removal actor may differ from the connection actor (e.g., a different project member removes the connection). The service layer will need to pass the actual removing user's ID. Two options:
+
+- **Option A (simpler):** Pass `removedByUserId` to `remove(String removedByUserId)` and use it in the event. The aggregate's `connectedBy` stays as the original connector, while the event captures who performed the removal.
+- **Option B:** Keep the aggregate method signature-free and have the service replace the event's `actorUserId` after emission (fragile, not recommended).
+
+**→ Choose Option A.** Change the signature to `remove(String removedByUserId)` so the event accurately reflects who performed the removal.
+
+**Tests to add / verify:**
+- Domain-level test: `AssociatedDataset.remove(userId)` transitions state to REMOVED and emits `AssociatedDatasetRemovedEvent` via `LocalDomainEventDispatcher`
+- Edge case: calling `remove()` on an already-removed aggregate throws `IllegalStateException` without emitting an event
+
+---
+
+### Task 2 — Application: Add `removeDataset()` to `AssociatedDatasetService`
+
+**Layer:** Application
+**Module:** `project-management`
+**Files to change:**
+- `project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetService.java`
+
+**What to do:**
+Add a `removeDataset(String associatedDatasetIdStr, String removedByUserId)` method that:
+
+1. Validates arguments (null checks → `NullPointerException`).
+2. Parses `associatedDatasetIdStr` into `AssociatedDatasetId`.
+3. Finds the dataset via `associatedDatasetRepository.findById(id)`.
+   - If not found → `Result.fromError(RemoveDatasetError.DATASET_NOT_FOUND)`.
+4. Sets up a `LocalDomainEventDispatcher` subscriber to collect `AssociatedDatasetRemovedEvent` (collect-during pattern, same as connect).
+5. Calls `dataset.remove(removedByUserId)`.
+   - If `IllegalStateException` (already removed) → `Result.fromError(RemoveDatasetError.DATASET_ALREADY_REMOVED)`.
+6. Persists via `associatedDatasetRepository.save(dataset)`.
+   - If persistence throws → `Result.fromError(RemoveDatasetError.REMOVAL_FAILED)`.
+7. Forwards cached events to the global `DomainEventDispatcher`.
+8. Returns `Result.fromValue(dataset.id())`.
+
+**Method signature:**
+```java
+@PreAuthorize("hasPermission(#associatedDatasetId, " +
+    "'life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset', 'WRITE')")
+public Result<AssociatedDatasetId, RemoveDatasetError> removeDataset(
+    String associatedDatasetId, String removedByUserId)
+```
+
+> **Note on ACL:** The `@PreAuthorize` expression above uses the aggregate ID as the resource,
+> but the aggregate does not have its own ACL entry — per ADR-0003 §5, connections inherit
+> project ACL. The actual permission check needs to resolve the `projectId` from the dataset
+> and check `WRITE` on the project. Two options:
+>
+> - **Option A:** Resolve the dataset first (outside `@PreAuthorize`), then do a manual `@PreAuthorize` on the `projectId` or check via `UserPermissions.editProject()`.
+> - **Option B:** Use a custom `PermissionEvaluator` that resolves the dataset → projectId → ACL check.
+>
+> The connect operation sidesteps this by receiving `projectId` as an explicit parameter in
+> `@PreAuthorize`. For remove, the simplest approach is to drop `@PreAuthorize` from the method
+> and perform the project-level permission check programmatically inside the method body using
+> the `ProjectAccessService` or `SecurityContextHolder`, or by looking up the dataset's
+> `projectId()` first and delegating to Spring Security.
+>
+> **→ Recommend Option A:** Load the aggregate, extract `projectId`, then check WRITE permission
+> manually (e.g., via `UserPermissions.editProject(projectId)` or equivalent). If unauthorized,
+> return `DATASET_NOT_FOUND` (to avoid leaking existence). This keeps the API simple and avoids
+> a new `PermissionEvaluator`.
+
+**Tests:**
+The test spec `AssociatedDatasetServiceRemoveSpec.groovy` already covers the happy path, not-found,
+already-removed, persistence failure, and null argument cases.
+
+---
+
+### Task 3 — Policy: Create `AssociatedDatasetRemovedPolicy` + Removal Notification Directive
+
+**Layer:** Application (policy)
+**Module:** `project-management`
+**Files to create:**
+- `project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetRemovedPolicy.java`
+- `project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetRemoval.java`
+
+**What `AssociatedDatasetRemovedPolicy` does:**
+Mirrors `AssociatedDatasetConnectedPolicy`:
+```java
+public class AssociatedDatasetRemovedPolicy {
+  public AssociatedDatasetRemovedPolicy(
+      InformProjectCollaboratorsAboutDatasetRemoval informCollaborators) {
+    DomainEventDispatcher.instance().subscribe(requireNonNull(informCollaborators));
+  }
+}
+```
+
+**What `InformProjectCollaboratorsAboutDatasetRemoval` does:**
+Mirrors `InformProjectCollaboratorsAboutDatasetConnection`. Subscribes to `AssociatedDatasetRemovedEvent`, resolves collaborators excluding the actor, and enqueues a JobRunr background email job for each.
+
+Key differences from the connect directive:
+- Class name / event type: `AssociatedDatasetRemovedEvent`
+- Subject: "Dataset connection removed from project"
+- Uses a new `Messages.datasetRemovedFromProject(...)` template
+
+---
+
+### Task 4 — Messages: Add Removal Email Template
+
+**Layer:** Application
+**Module:** `project-management`
+**Files to change:**
+- `project-management/src/main/java/life/qbic/projectmanagement/application/Messages.java`
+
+**What to add:**
+```java
+/**
+ * A pre-formatted message that informs a project collaborator about
+ * a dataset connection that has been removed by a teammate.
+ */
+public static String datasetRemovedFromProject(String fullNameUser, String projectTitle,
+    String datasetTitle, String datasetPid, String projectUri) {
+  return String.format("""
+      Dear %s,
+
+      a dataset connection has been removed from the project '%s':
+
+        Title: %s
+        PID:   %s
+
+      Please open the project to see the current list of connected datasets:
+
+      %s
+      """, fullNameUser, projectTitle, datasetTitle, datasetPid, projectUri);
+}
+```
+
+---
+
+### Task 5 — Toast Notifications: Add Removal Toast Properties
+
+**Layer:** UI (i18n)
+**Module:** `datamanager-app`
+**Files to change:**
+- `datamanager-app/src/main/resources/messages/toast-notifications.properties`
+
+**What to add:**
+```properties
+dataset.removed.success.message.type=html
+dataset.removed.success.message.text=Dataset <strong>{0}</strong> removed from project.
+dataset.removed.success.level=success
+dataset.removed.failure.message.type=html
+dataset.removed.failure.message.text=Failed to remove dataset. Please contact <a href="mailto:support@qbic.zendesk.com">QBiC support</a>.
+dataset.removed.failure.level=error
+```
+
+---
+
+### Task 6 — UI: Add Remove Button + Confirmation + Service Call
+
+**Layer:** UI
+**Module:** `datamanager-app`
+**Files to change:**
+- `datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedResourcesComponent.java`
+- `datamanager-app/src/main/java/life/qbic/datamanager/views/projects/project/datasets/ConnectedDatasetsMain.java`
+
+#### 6a. `ConnectedResourcesComponent` — Add per-card Remove button
+
+In the `buildCard(ConnectedDatasetView view)` method, add a "Remove" button (with `VaadinIcon.TRASH`) to the card header row, placed after the spacer. The button:
+- Only renders when the current user has WRITE permission on the project (`userPermissions.editProject()`)
+- Fires a custom `RemoveDatasetClickEvent` carrying the `ConnectedDatasetView.id()` (the aggregate ID)
+
+Add a new event class and listener registration method:
+```java
+public Registration addRemoveDatasetClickListener(
+    ComponentEventListener<RemoveDatasetClickEvent> listener) {
+  return addListener(RemoveDatasetClickEvent.class, listener);
+}
+
+public static class RemoveDatasetClickEvent
+    extends ComponentEvent<ConnectedResourcesComponent> {
+  private final String datasetId;
+  // constructor + getter
+}
+```
+
+The component needs write-permission awareness. Add a `setWriteAllowed(boolean)` method,
+or pass the permission check result through `setContext()`. The `ConnectedDatasetsMain` view
+already has `userPermissions` injected and can propagate it.
+
+#### 6b. `ConnectedDatasetsMain` — Wire the `AlertDialog` confirmation + service call
+
+When a `RemoveDatasetClickEvent` fires, open an `AlertDialog` using the centralized factory from Task 0:
+
+```java
+AlertDialog.danger(this,
+    "Remove dataset connection?",
+    "This will disconnect the dataset '<b>" + view.title()
+        + "</b>' from the project. The connection can be re-established later.",
+    () -> performRemove(view.id()))
+    .open();
+```
+
+On confirm (`performRemove`):
+   - Resolve current user ID via `authenticationToUserIdTranslator`
+   - Call `associatedDatasetService.removeDataset(datasetId, userId)`
+   - On `Result.Value` → show success toast, call `connectedResourcesComponent.refresh()`
+   - On `Result.Error(DATASET_NOT_FOUND)` → show error toast "Dataset not found"
+   - On `Result.Error(DATASET_ALREADY_REMOVED)` → show info toast "Already removed"
+   - On `Result.Error(REMOVAL_FAILED)` → show error toast with support link
+
+---
+
+### Task 7 — Wire Removal Policy Bean
+
+**Layer:** Composition root
+**Module:** `datamanager-app`
+**Files to change:**
+- `datamanager-app/src/main/java/life/qbic/datamanager/AppConfig.java`
+
+**What to add:**
+A new `@Bean` method mirroring the `associatedDatasetConnectedPolicy` bean:
+```java
+@Bean
+public AssociatedDatasetRemovedPolicy associatedDatasetRemovedPolicy(
+    EmailService emailService,
+    ProjectAccessService projectAccessService,
+    UserInformationService userInformationService,
+    ProjectInformationService projectInformationService,
+    AppContextProvider appContextProvider,
+    JobScheduler jobScheduler) {
+  var informCollaborators = new InformProjectCollaboratorsAboutDatasetRemoval(
+      emailService, projectAccessService, userInformationService,
+      projectInformationService, appContextProvider, jobScheduler);
+  return new AssociatedDatasetRemovedPolicy(informCollaborators);
+}
+```
+
+---
+
+## Execution Order (dependency graph)
+
+```
+Task 0 (AlertDialog factory)     Task 1 (domain event emission)
+  ↓                                ↓
+                                  Task 2 (service removeDataset)
+                                    ↓
+Task 3 (policy + directive)      Task 5 (toast properties)
+  ↓                                ↓
+Task 4 (email template)          Task 7 (wire policy bean)
+  ↓                                ↓
+  └──────────── Task 6 (UI) ──────┘
+```
+
+Task 0 (`AlertDialog`) is independent of all domain work and can be done in parallel.
+Tasks 1–2 must be sequential (domain first, then service).
+Tasks 3, 4, 5, 7 can be parallelized after Task 2.
+Task 6 depends on Tasks 0, 2, 5 (needs the service API, the i18n keys, and the alert dialog API).
+
+Recommended order for a single developer:
+0 → 1 → 2 → 3 → 4 → 5 → 7 → 6
+
+## UX refinements applied post-implementation
+
+These tweaks were applied based on stakeholder feedback after initial implementation:
+
+| Change | Before | After |
+|---|---|---|
+| Dialog body message | `'<b>{title}</b>'` (HTML literal since `Span` escapes) | Plain text `'{title}'` |
+| Remove button position | Left of spacer (left-aligned) | After spacer + published date (right-aligned, matches app convention) |
+| Deletion UX flow | Blocking call on UI thread | `CompletableFuture.supplyAsync` on `ForkJoinPool.commonPool` |
+| UI feedback | Success/error toast only (after blocking wait) | `pendingTaskToast("dataset.removing.in-progress")` shown immediately; replaced with success/error toast on completion |
+| Error toasts for non-critical failures | Toast shown for `DATASET_NOT_FOUND` / `DATASET_ALREADY_REMOVED` | Silent card-list refresh only |
+
+## File Summary
+
+### New files (4)
+| File | Module |
+|---|---|
+| `…/views/general/dialog/AlertDialog.java` | `datamanager-app` |
+| `…/application/policy/AssociatedDatasetRemovedPolicy.java` | `project-management` |
+| `…/application/policy/directive/InformProjectCollaboratorsAboutDatasetRemoval.java` | `project-management` |
+| (none for tests — specs already exist) | |
+
+### Modified files (7)
+| File | Module | Change |
+|---|---|---|
+| `AssociatedDataset.java` | `project-management` | Wire `emitRemovedEvent()` in `remove()`; change signature to accept `removedByUserId` |
+| `AssociatedDatasetService.java` | `project-management` | Add `removeDataset()` method |
+| `Messages.java` | `project-management` | Add `datasetRemovedFromProject()` template |
+| `AppConfig.java` | `datamanager-app` | Wire `AssociatedDatasetRemovedPolicy` bean |
+| `ConnectedResourcesComponent.java` | `datamanager-app` | Per-card Remove button (WRITE-only, right-aligned) + event; `setWriteAllowed(boolean)` |
+| `ConnectedDatasetsMain.java` | `datamanager-app` | `AlertDialog.danger()` + `CompletableFuture`-driven `removeDataset` with pending/success/error toasts; lifecycle hooks for `UiHandle` |
+| `toast-notifications.properties` | `datamanager-app` | Add `dataset.removed.*` + `dataset.removing.in-progress` entries |
+
+---
+
+## Testing Checklist
+
+| Test | Type | Module | Status |
+|---|---|---|---|
+| `AssociatedDatasetServiceRemoveSpec.groovy` | Unit (Spock) | `project-management` | ✅ 6 passing (pre-existing) |
+| `AssociatedDatasetRemovedEventSpec.groovy` | Unit (Spock) | `project-management` | ✅ 7 passing (pre-existing) |
+| `AssociatedDatasetRemoveSpec.groovy` (NEW) | Unit (Spock) | `project-management` | ✅ 4 passing — domain layer `remove(userId)` + event emission |
+| `AlertDialogTest.java` (NEW) | Unit (JUnit) | `datamanager-app` | ✅ 12 passing |
+| UI: Remove button visible for WRITE users, hidden for READ users | Manual / integration | `datamanager-app` | 🟡 To add (manual verification) |
+| UI: `AlertDialog.danger()` + pending-toast flow matches designer spec | Manual | `datamanager-app` |  To add |
+| Email: Removal notification sent to collaborators (not actor) | Integration | `project-management` | 🟡 To add |
+
+---
+
+## Risks and Open Questions
+
+1. **Requirement ID collision:** `DATA-R-01` in `docs/requirements.md` already refers to a different feature. The PO must clarify which IDs to use before merging. This does not block development, only the final commit.
+
+2. **ACL strategy for remove:** The aggregate does not carry its own ACL entry (ADR-0003). The service method must check `WRITE` on the parent project. The implementation approach (programmatic check vs. `@PreAuthorize`) should be consistent with how the connect flow will evolve — currently connect receives `projectId` as a parameter, but remove does not.
+
+3. **Remove button visibility:** Only users with `WRITE` permission should see the Remove button. The `ConnectedResourcesComponent` currently has no permission awareness — it needs to receive it from `ConnectedDatasetsMain` (which injects `UserPermissions`).
+
+4. **Event actor identity:** The `remove()` method currently uses `connectedBy` as the implicit actor. If the removing user differs from the connecting user, the event should reflect who actually performed the removal. Changing `remove()` to accept `removedByUserId` is the clean solution.
+
+---
+
+## Definition of Done
+
+- [x] All acceptance criteria pass
+- [ ] Domain layer: `remove(userId)` transitions state, emits event, tested
+- [ ] Application layer: `removeDataset()` returns correct `Result` for all paths, tested
+- [ ] Policy wired: removal sends email to collaborators (excluding actor)
+- [ ] UI: `AlertDialog` factory available and produces correctly styled dialogs for danger intent
+- [ ] UI: Remove button visible per ACL, `AlertDialog` confirmation required, success/error toast shown
+- [ ] View refreshes after successful removal
+- [ ] No stack traces leak to the user (per `ExceptionHandling.md`)
+- [ ] All new code follows Google Java Style
+- [ ] No Vaadin imports in domain/application layers
+- [ ] Existing tests still pass (`./mvnw clean verify`)
diff --git a/docs/plans/FEAT-DATSET-09-implementation-plan.md b/docs/plans/FEAT-DATSET-09-implementation-plan.md
new file mode 100644
index 0000000000..8fee6fd61b
--- /dev/null
+++ b/docs/plans/FEAT-DATSET-09-implementation-plan.md
@@ -0,0 +1,343 @@
+# Implementation Plan — FEAT-DATSET-09: Access available datasets after login (project-listing visibility)
+
+> **Story:** [#1475](https://github.com/qbicsoftware/data-manager-app/issues/1475)  
+> **Parent Feature:** [#1466 — FEAT-DATASET-CONNECTION](https://github.com/qbicsoftware/data-manager-app/issues/1466)  
+> **UI Prototype:** `ProjectListingDatasetsDemo.java` at `datamanager-app/.../views/demo/project-listing-datasets` (`@Profile("development")`)  
+> **Prototype screenshots:** `img_2.png` → `img_7.png` in project root (iteration history)  
+> **Production target:** `ProjectCollectionComponent.ProjectOverviewItem` at `datamanager-app/.../views/projects/overview/components/ProjectCollectionComponent.java`  
+> **Destination route (already registered):** `ConnectedDatasetsMain` at `projects/:projectId?/datasets`  
+> **Date:** 2026-07-29
+
+---
+
+## 1. Scope — What This Iteration Covers
+
+FEAT-DATSET-09 ensures researchers see connected-dataset information **directly on the project collection view** after login, without opening a project first.
+
+The acceptance criteria from Issue #1475 are:
+
+- **AC1 (existing):** When a user views their project collection, they can see from each project entry **whether** that project has connected resources.
+- **AC2 (existing):** From each project entry they can see the **quantity** of connected resources.
+- **AC3 (existing):** From each project entry they can see the resources' **access status** (open vs. restricted).
+- **AC4 (existing):** Clicking a project's dataset indicator navigates **directly** to the project's connected resources section.
+- **AC5 (added per stakeholder iteration):** Users can see **when** the last dataset was connected to each project (recent activity signal).
+
+**Out of scope for this story** (covered by separate stories or future work):
+
+- Connecting / disconnecting / syncing datasets from the collection view (Stories 01–08) — still done inside the per-project dataset view.
+- Filtering or sorting the project listing by connected-dataset criteria (e.g. "show only projects with restricted datasets") — follow-up task if requested.
+- InvenioRDM credential management (Stories 14/15) — no change here; credentials are managed from within the per-project view.
+
+---
+
+## 2. Governance pre-requisites (blocking, must be resolved before implementation PR lands)
+
+### 2.1 Requirement-ID conflict (blocking)
+
+Issue #1466 (parent Feature) references proposed `DATA-R-01` / `DATA-R-02` / `DATA-R-03` for dataset connexion. Those IDs already exist in `docs/requirements.md` for immunopeptidomics raw data and cannot be reused without breaking traceability.
+
+**Decision required from PO:**
+
+| Option | Action |
+|---|---|
+| (a) Allocate fresh IDs | Add `DATA-R-04` (Dataset Connection Management), `DATA-R-05` (Dataset Synchronisation), `DATA-R-06` (InvenioRDM Credentials) to `docs/requirements.md`. |
+| (b) Rename existing | Only if the existing `DATA-R-01/02/03` are no longer used (unlikely). Retire them first, reassign. |
+
+**This requires a dedicated PR** against `docs/requirements.md` — per AGENTS.md §11 requirement changes require human approval and must not be bundled with implementation.
+
+### 2.2 Schema migration (blocking)
+
+Phase 1 requires extending the **`project_overview` DB view** with columns aggregated from `associated_dataset`. Schema changes require human review per AGENTS.md §12.
+
+**Action:** separate PR against `sql/complete-schema.sql` plus a migration script for existing installations.
+
+---
+
+## 3. Prototyping record
+
+The prototype lives at `datamanager-app/src/main/java/life/qbic/datamanager/views/demo/ProjectListingDatasetsDemo.java` (route `test-view/project-listing-datasets`, profile `development`). Iterations produced a sequence of validated UI choices that the production code inherits verbatim:
+
+| Iteration | Key decision | Evidence |
+|---|---|---|
+| Initial (img_2 → img_3 fix) | Card layout rendered without a Vaadin Grid — replaced with plain flex container; duplicate header removed. | img_3.png |
+| Indicator style 1 | Full-row coloured bar (green/amber) reads as a warning — rejected by stakeholder. Restricted is a status, not a problem. | img_5.png |
+| Indicator style 2 | Indicator neutral, access status expressed as `Tag` pills (`SUCCESS`/`WARNING`), "Last connected" date added. | — |
+| Interaction 1 | Whole indicator row as `RouterLink` — "looks super weird", full row blue link overloads visual weight. | feedback |
+| Interaction 2 | Chevron icon only as `RouterLink` — too small a click target for users with motor disabilities. | feedback |
+| Interaction 3 (final) | Full-width footer region as a `RouterLink`, visually differentiated with top border + background, containing count + Open/Restricted `Tag`s + last-connected + spacer + chevron. | img_6.png, img_7.png |
+| Hover style | Text underline on hover noisy across tags/separators; dropped in favour of subtle background + border brightening only. | img_6.png |
+| Alignment | Footer left-right padding removed; top-bottom padding kept — keeps content aligned with card body. | img_7.png |
+
+The production implementation inherits all of the above. Do not revisit these choices without a stakeholder sign-off.
+
+---
+
+## 4. Architectural constraints
+
+### 4.1 Bounded context
+
+Everything lives in `project-management`. Connected-dataset aggregate (`associated_dataset` table, `AssociatedDatasetService`, `ConnectedDatasetView`) is in this module, as is `ProjectOverview`, `ProjectInformationService`, and the `project_overview` DB view. No cross-context communication required.
+
+### 4.2 Persistence model
+
+- `ProjectOverview` is `@Immutable @Entity` backed by the `project_overview` DB **view**, not a table.
+- The view aggregates `projects_datamanager` + `project_measurements` + `project_userinfo` via `LEFT JOIN`s; query uses Spring JPA Specifications (`ProjectOverviewLookupImplementation`).
+- The `associated_dataset` table lives on the same datasource, indexed on `project_id` with a partial unique constraint on `(project_id, pid)` (excluding `REMOVED` rows).
+- `ConnectedDatasetView` DTO already contains `isPublic`, `connectedOn`, `accessDetail` and related fields — but the *listing* needs per-project aggregates, not per-dataset.
+
+### 4.3 Approach: extend the DB view (vs. service-layer augmentation)
+
+| Path | Mechanism | Trade-off |
+|---|---|---|
+| **(A) Extend `project_overview` view (recommended)** | Add `LEFT JOIN (SELECT project_id, COUNT, SUM(public), SUM(restricted), MAX(connected_on) FROM associated_dataset WHERE state='CONNECTED' GROUP BY project_id)` | Self-contained projection; existing `Specification` query pattern preserved; no N+1. |
+| (B) Query counts in service layer, augment `ProjectOverview` before return | Batch query per project id list | Requires per-page merge step; drift risk over time. |
+
+**Decision:** Path A. View is queried one page at a time; per-project dataset counts are small.
+
+### 4.4 UI: click-routing mechanism
+
+- `ProjectCollectionComponent` renders `ProjectOverviewItem` — a private inner `Div` with `addClickListener(...)` that currently navigates the whole card to `ProjectInformationMain`.
+- Footer must be a `RouterLink` (native `<a>`) so browser-anchor navigation short-circuits Vaadin's server-side `ClickEvent` routing — otherwise clicking the footer also fires the card-body handler. *Validated in prototype.*
+- `ConnectedDatasetsMain` is registered at `projects/:projectId?/datasets`; the route is live and stable.
+
+---
+
+## 5. Phase 1 — Data layer
+
+### 5.1 Extend `project_overview` DB view
+
+Files: `sql/complete-schema.sql` plus migration `sql/migration/V1.12.0__extend_project_overview_datasets.sql`.
+
+Append derived `LEFT JOIN`:
+
+```sql
+LEFT JOIN (
+    SELECT
+        `project_id`,
+        COUNT(*)                                                    AS connectedDatasetCount,
+        SUM(CASE WHEN `access_level` = 'PUBLIC'    THEN 1 ELSE 0 END) AS openDatasetCount,
+        SUM(CASE WHEN `access_level` = 'RESTRICTED' THEN 1 ELSE 0 END) AS restrictedDatasetCount,
+        MAX(`connected_on`)                                         AS lastConnectedOn
+    FROM `associated_dataset`
+    WHERE `connection_state` = 'CONNECTED'
+    GROUP BY `project_id`
+) AS connected_datasets ON connected_datasets.project_id = pd.projectId
+```
+
+Add to `SELECT` list:
+
+```sql
+COALESCE(connected_datasets.connectedDatasetCount,   0) AS connectedDatasetCount,
+COALESCE(connected_datasets.openDatasetCount,        0) AS openDatasetCount,
+COALESCE(connected_datasets.restrictedDatasetCount,  0) AS restrictedDatasetCount,
+connected_datasets.lastConnectedOn                                   AS lastConnectedOn
+```
+
+### 5.2 Extend `ProjectOverview` JPA entity
+
+File: `project-management/src/main/java/life/qbic/projectmanagement/application/ProjectOverview.java`.
+
+```java
+@Column(name = "connectedDatasetCount",  nullable = false)
+private int connectedDatasetCount;
+
+@Column(name = "openDatasetCount",       nullable = false)
+private int openDatasetCount;
+
+@Column(name = "restrictedDatasetCount", nullable = false)
+private int restrictedDatasetCount;
+
+@Column(name = "lastConnectedOn")
+private Instant lastConnectedOn;   // nullable: projects with no datasets
+```
+
+Add public accessors. Entity is `@Immutable`, Hibernate fields set via reflection — no constructor change.
+
+### 5.3 Service layer unchanged
+
+`ProjectInformationService.queryOverview(...)` returns `List<ProjectOverview>`; the new columns come along for free via JPA projection. Existing `Specification` predicates and lazy pagination (`OffsetBasedRequest`) are untouched. Skip exposing the new fields in `ProjectOverviewSpec` predicates (filter/search) — follow-up task if requested.
+
+---
+
+## 6. Phase 2 — UI composition
+
+### 6.1 Where the footer styling lives
+
+Production target file: `datamanager-app/frontend/themes/datamanager/components/page-area.css` (this is where `project-overview-item`, `project-grid`, `project-collection-component` already live).
+
+```css
+/* region project-dataset footer */
+
+.project-dataset-footer,
+.project-dataset-footer *,
+.project-dataset-footer a {
+    text-decoration: none !important;
+    box-sizing: border-box;
+}
+
+.project-dataset-footer {
+    display: block;
+    color: var(--lumo-body-text-color);
+    border-top: 1px solid var(--lumo-contrast-10pct);
+    background-color: var(--lumo-base-color);
+    padding-top:    var(--spacing-04);
+    padding-bottom: var(--spacing-04);
+    padding-left: 0;
+    padding-right: 0;
+    margin: 0;
+    transition:
+        background-color var(--lumo-shade-50ms),
+        border-top-color var(--lumo-shade-50ms);
+}
+
+.project-dataset-footer:hover,
+.project-dataset-footer:focus-within {
+    background-color: var(--shade-color-5pct);
+    border-top-color: var(--shade-color-20pct);
+}
+
+.project-dataset-footer vaadin-icon {
+    color: var(--primary-text-color);
+}
+
+.project-dataset-footer:focus-visible {
+    outline: 2px solid var(--primary-color);
+    outline-offset: -2px;
+}
+
+/* endregion */
+```
+
+Note spacing variables use the app's `--spacing-XX` (already mapped `--spacing-04 = --lumo-space-m`, `--spacing-05 = --lumo-space-l`), consistent with `page-area.css`.
+
+Delete prototype's `addDatasetFooterStylesheet()` (injects via `executeJs`) — no longer needed.
+
+### 6.2 Extend `ProjectOverviewItem` (inline-style audit)
+
+File: `datamanager-app/src/main/java/life/qbic/datamanager/views/projects/overview/components/ProjectCollectionComponent.java` — inner `ProjectOverviewItem` class.
+
+Append dataset-footer rendering below the avatar group:
+
+```java
+if (projectOverview.connectedDatasetCount() > 0) {
+    add(buildDatasetFooter(projectOverview));
+}
+```
+
+`buildDatasetFooter(...)` builds the same content the prototype does (icon + count + Tag pills + last-connected + spacer + chevron) **but exclusively via `addClassName(...)`** — no `getStyle().set(...)` calls. Use the following mapping:
+
+| Prototype inline style | Existing class (in `all.css` / `page-area.css`) | Replacement |
+|---|---|---|
+| `display: flex;` / `flex-direction: column` | `.flex-vertical` (all.css) | `addClassName("flex-vertical")` |
+| `display: flex; flex-direction: row` | `.flex-horizontal` (all.css) | `addClassName("flex-horizontal")` |
+| `align-items: center` | `.flex-align-items-center` (all.css) | `addClassName("flex-align-items-center")` |
+| `gap: var(--lumo-space-s)` = `var(--spacing-03)` | `.gap-03` (all.css) | `addClassName("gap-03")` |
+| `gap: var(--lumo-space-l)` = `var(--spacing-05)` | `.gap-05` (all.css) | `addClassName("gap-05")` |
+| `margin-top: var(--lumo-space-xs)` = `var(--spacing-02)` | `.margin-top-02` (all.css) | `addClassName("margin-top-02")` |
+| `margin-top: var(--lumo-space-m)` = `var(--spacing-04)` | `.margin-top-04` (all.css) | `addClassName("margin-top-04")` |
+| `color: var(--lumo-primary-text-color)` | `.color-primary-text` (all.css) | `addClassName("color-primary-text")` |
+| `color: var(--lumo-body-text-color)` | body-text-color already implicit | no-op |
+| `font-weight: 700` | `.bold` (all.css) | `addClassName("bold")` |
+| `flex-grow: 1` | `.flex-grow-1` (all.css) | `addClassName("flex-grow-1")` |
+| `flex-shrink: 0` | — | add `.flex-shrink-0 { flex-shrink: 0; }` to all.css |
+| `border-top: 1px solid var(--lumo-contrast-10pct)` | — | already set by theme rule |
+
+**Avatar-circle inline styling exception.** The prototype's 28×28 circle with -8px overlap and `border-radius: 50%` is a single component-level primitive with no existing utility class. Keep inline for these 4 properties only:
+
+- `width: 28px; height: 28px; border-radius: 50%;` (shape)
+- `border: 2px solid var(--lumo-base-color);` (edge)
+- `margin-left: -8px;` (overlap)
+- `color: white; font-size: 10px; font-weight: 600; display: flex; align-items: center; justify-content: center;` (content)
+
+If other views already render collaborator circles, factor these into a reusable `.collaborator-avatar` utility class. Otherwise leave the avatar primitive as-is.
+
+**Tag usage** — existing `life.qbic.datamanager.views.general.Tag` with `TagColor.SUCCESS` (open) / `TagColor.WARNING` (restricted). Consistent with measurement-type tags on the same card and with V3/V4 associated-dataset demos.
+
+**Date formatting** — use `life.qbic.application.commons.time.DateTimeFormat.SIMPLE_DATE_TIME` with `Locale.ENGLISH`. Same formatter used elsewhere in the project listing (last-modified display).
+
+**RouterLink and aria-label** — `new RouterLink("", ConnectedDatasetsMain.class, new RouteParameters("projectId", projectOverview.projectId().value()))`, class `"project-dataset-footer"`, `aria-label` = `"Open datasets for Q2KX4B: 3 connected, 2 open, 1 restricted, last updated 20 July 2026"` (format: last connected date rendered with full month name, locale English).
+
+### 6.3 CSS-class migration rule
+
+> Any `getStyle().set(...)` in the production `ProjectOverviewItem` footer implementation must correspond to an existing class in `all.css` or `page-area.css`, or a newly-added utility class. Inline styles are restricted to the avatar-circle literal (shape, overlap, border-radius) — everything else uses classes.
+
+---
+
+## 7. Phase 3 — Prototype deprecation
+
+Keep `ProjectListingDatasetsDemo.java` under `@Profile("development")`. Update its class javadoc:
+
+```
+Prototype — superseded by real integration in ProjectCollectionComponent.
+Retain as visual reference and UI-iteration sandbox.
+Delete once feature validated against production-shaped data.
+```
+
+Delete `addDatasetFooterStylesheet()` — no longer needed (theme CSS holds the rules now).
+
+---
+
+## 8. Test coverage
+
+| Test | Location | Type |
+|---|---|---|
+| `ProjectOverview` exposes the four new fields (mapping check) | `project-management/src/test/groovy/.../ProjectOverviewSpec.groovy` | Spock unit — no DB |
+| `ProjectOverviewLookup.query(...)` returns rows with non-zero `connectedDatasetCount` for projects that have `associated_dataset` rows | `project-management-infrastructure/src/integrationTest/groovy/...` | Spring Boot slice; seeded DB |
+| `ProjectOverviewItem` renders a footer when `connectedDatasetCount() > 0` and omits it otherwise | `datamanager-app/src/test/groovy/.../ProjectOverviewItemSpec.groovy` (create if missing) | Component-level via Vaadin testing API |
+
+The third test cannot be a pixel-perfect visual comparison from a Groovy unit test, but it can assert the presence/absence of the `RouterLink` component by its class name.
+
+---
+
+## 9. Change matrix
+
+| File / path | Change | Risk | Human-review gate? |
+|---|---|---|---|
+| `docs/requirements.md` | Add / resolve `DATA-R-*` IDs for dataset connexion | Governance | **Yes** |
+| `sql/complete-schema.sql` + migration script | Extend `project_overview` view | Schema migration | **Yes** |
+| `ProjectOverview.java` | +4 fields + accessors | Entity evolution | No (follows schema) |
+| `page-area.css` | + `.project-dataset-footer` rules | Theme CSS | No |
+| `all.css` | + `.flex-shrink-0` utility (small add) | Theme utilities | No |
+| `ProjectCollectionComponent.java` | + `buildDatasetFooter(...)` + conditional render | UI composition | No |
+| `ProjectListingDatasetsDemo.java` | Deprecation note; delete `addDatasetFooterStylesheet()` | No functional change | No |
+| 3 × `*Spec.groovy` | + new field & rendering tests | Test addition | No |
+
+---
+
+## 10. Sequencing
+
+```
+Week 1
+  PR #1   docs/requirements.md                    — DATA-R-* ID reconciliation
+        ↓ gate: PO sign-off
+  PR #2   sql/complete-schema.sql + migration     — view extension
+        ↓ gate: DBA / infra review
+
+Week 2
+  PR #3   ProjectOverview.java + spec             — +4 fields
+        ↓ depends on PR #2 merged
+
+Week 3
+  PR #4   ProjectCollectionComponent + theme CSS  — footer render
+        ↓ depends on PR #3 merged
+        ↓ sign-off: visual match against img_7.png
+
+Week 4
+  PR #5   Prototype deprecation + smoke test against production-shaped data
+```
+
+Drafts of PR #3 and PR #4 may be prepared ahead of time but **must not be merged** until their upstream dependency lands.
+
+---
+
+## 11. Open questions
+
+| # | Question | Impact if unresolved |
+|---|---|---|
+| 1 | `DATA-R-01/02/03` ID conflict — rename immunopeptidomics reqs or allocate new IDs? | **Blocking.** |
+| 2 | `access_level` in `associated_dataset`: populated for pre-prototype data? | Legacy rows with NULL `access_level` yield incorrect counts. Mitigate with data-fix migration deriving from `resource_metadata`. |
+| 3 | Projects with zero datasets: render "No datasets connected yet" footer, or omit footer entirely? | Prototype uses `> 0` guard. Keeping this (less visual noise), but it's a UX decision. |
+| 4 | `int` vs `long` for the count columns in `ProjectOverview`? | SQL `COUNT()` is `BIGINT`. JPA `int` OK for realistic scale; confirm if a project-SLA requires `long`. |
+| 5 | Filter projects by connected-dataset criteria? | Out of scope. Determines whether to index new columns. |
+| 6 | Performance of the `LEFT JOIN` per-project aggregate on large instances? | Worth `EXPLAIN` on prod-like data. Pattern precedent (existing view already joins `project_userinfo` via subquery + `GROUP_CONCAT`) suggests acceptable. |
+| 7 | Collaborator-avatar circle reusable? | If similar circles exist in other views, factor into shared `.collaborator-avatar` utility. Audit before finalising. |
diff --git a/docs/prototypes/connect-resources/Init_prompt_prototype_connect_datasets.md b/docs/prototypes/connect-resources/Init_prompt_prototype_connect_datasets.md
new file mode 100644
index 0000000000..23c27e3374
--- /dev/null
+++ b/docs/prototypes/connect-resources/Init_prompt_prototype_connect_datasets.md
@@ -0,0 +1,6 @@
+2026-06-19_FEATURE_Connect_associated_datasets.md contains a vision and a set of user stories for
+a new Data Manager feature.
+
+Create a pure UI prototype for the user stories . src/main/java/life/qbic/datamanager/views/demo/ComponentDemo.java can serve
+as a blueprint, how the project came up with a demo preview of UI components such that is
+not shown in the production environment, but can be run with a development profile.
diff --git a/docs/prototypes/connect-resources/additional_prompts.md b/docs/prototypes/connect-resources/additional_prompts.md
new file mode 100644
index 0000000000..1f22365465
--- /dev/null
+++ b/docs/prototypes/connect-resources/additional_prompts.md
@@ -0,0 +1,10 @@
+A first UI prototype exists. Now take into account the following:
+
+- The stakeholder document @2026-06-25_Connected_Resource_Information.md contains the 
+information about which properties and with which importance information shall be made available
+for users
+- Connecting datasets shall be a primary action and not result in a modal. Try a sidebar approach that will also work later, considering the actual app layout
+- The primary UI section is about showing connected resources. To distinguish between the access level, there is no need to show another section or grid. Instead, it could be a switch or a filter
+offered to the user to show only restricted or public resources. In any case, the user should be able to see all resources and their access level
+
+Create another version of the UI prototype that incorporates the above points.
diff --git a/docs/prototypes/connect-resources/init_prompt_prototype_account_settings.md b/docs/prototypes/connect-resources/init_prompt_prototype_account_settings.md
new file mode 100644
index 0000000000..60af33206d
--- /dev/null
+++ b/docs/prototypes/connect-resources/init_prompt_prototype_account_settings.md
@@ -0,0 +1,8 @@
+2026-06-19_FEATURE_Connect_associated_datasets.md contains a vision and a set of user stories for
+a new Data Manager feature.
+
+Create a pure UI prototype for the user stories 14 and 15. AssociatedDatasetsDemoV2.java can serve
+as a blueprint, how the project came up with a demo preview of UI components such that is
+not shown in the production environment, but can be run with a development profile.
+
+You can work on the AssociatedDatasetsDemoV2.java file for the prototype and the new user stories. 
diff --git a/docs/requirements-guide.md b/docs/requirements-guide.md
index c771ab4610..6b077371da 100644
--- a/docs/requirements-guide.md
+++ b/docs/requirements-guide.md
@@ -39,7 +39,7 @@ All requirement IDs follow this pattern:
 - IDs are **stable** and must never be renumbered or reused, even if a requirement is deprecated.
 - IDs must not encode sprint numbers, versions, or document order.
 - One requirement may be referenced by multiple Stories.
-- Constraints (`*-C-*`) influence architecture and must not be referenced in Stories — reference them only in Task Technical Notes and ADRs.
+- Constraints (`*-C-*`) influence architecture and must not be referenced in Stories — reference them only in Task Technical Notes and [ADRs](../adr/README.md).
 
 ---
 
@@ -56,7 +56,7 @@ Each requirement entry in `docs/requirements.md` must contain:
 <Why this requirement exists — strategic, regulatory, stakeholder-driven, or architectural>
 
 **Source (optional but recommended):**
-<Link to PRD section, FAIR/CARE principle, regulatory document, stakeholder request, or ADR>
+<Link to PRD section, FAIR/CARE principle, regulatory document, stakeholder request, or [ADR](../adr/README.md)>
 ```
 
 ### Field Definitions
@@ -65,7 +65,7 @@ Each requirement entry in `docs/requirements.md` must contain:
 - **Short Title** — One line, noun-focused, describing the capability or quality attribute
 - **Statement** — 1–3 sentences describing what the system shall do (for R/NFR) or the solution boundary (for C)
 - **Rationale** — Why this requirement exists: strategic importance, regulatory drivers, stakeholder requests, technical necessity
-- **Source** — Link(s) to the upstream authority: PRD section, FAIR/CARE principle reference, standards document, ADR, or stakeholder issue
+- **Source** — Link(s) to the upstream authority: PRD section, FAIR/CARE principle reference, standards document, [ADR](../adr/README.md), or stakeholder issue
 
 ### Example
 
diff --git a/docs/requirements.md b/docs/requirements.md
index 8c2ce843f4..5040fb118a 100644
--- a/docs/requirements.md
+++ b/docs/requirements.md
@@ -95,7 +95,7 @@ All requirements follow a domain-based ID structure:
 ### Rules
 
 - IDs are **stable and must never be renumbered or reused.**
-- Constraints (`*-C-*`) influence architecture and must not be referenced in Stories. Reference them only in Task Technical Notes and ADRs.
+- Constraints (`*-C-*`) influence architecture and must not be referenced in Stories. Reference them only in Task Technical Notes and [ADRs](../adr/README.md).
 - One requirement may be referenced by multiple Stories.
 - A Story may reference multiple requirement IDs when a single user workflow spans multiple domains. If a Story spans more than two domains, consider splitting it.
 
@@ -114,7 +114,7 @@ Each requirement must contain:
 <Why this requirement exists — strategic, regulatory, stakeholder-driven, or architectural>
 
 **Source (optional but recommended):**
-<Link to PRD section, FAIR/CARE principle, regulatory document, stakeholder request, or ADR>
+<Link to PRD section, FAIR/CARE principle, regulatory document, stakeholder request, or [ADR](../adr/README.md)>
 ```
 
 ---
@@ -292,6 +292,36 @@ Data scientists and bioinformaticians need programmatic access to raw immunopept
 **Source:**
 PRD §3 Scope — File management; Issue #1412
 
+#### DATA-R-04: Connected-Dataset Project-Listing Visibility
+
+The system shall, for each project accessible to the logged-in user in the project collection view, display (a) the number of datasets connected to that project, (b) the per-access-level breakdown (open / restricted), and (c) the most-recent connection date across those datasets. The connected-dataset indicator shall be a distinct click target within the project card that navigates directly to the project's connected-datasets view.
+
+**Rationale:**
+Researchers need to assess dataset connectivity at a glance from their project listing, without opening each project individually. Surface-level visibility of both quantity and access status (including restricted data awaiting credential unlock) supports triage and prioritisation of project work.
+
+**Source:**
+Feature #1466 § FEAT-DATASET-CONNECTION; Story #1475 (FEAT-DATSET-09)
+
+#### DATA-R-05: Connected-Dataset Synchronisation
+
+The system shall support synchronising connected dataset metadata with the source InvenioRDM instance, so that locally stored connection records stay consistent with upstream changes (e.g. new versions, embargoes lifted, titles corrected).
+
+**Rationale:**
+Connected-dataset metadata can change on the source platform after connexion. Stale local metadata misleads researchers about access status and data provenance.
+
+**Source:**
+Feature #1466 § FEAT-DATASET-CONNECTION; Stories #1470, #1474
+
+#### DATA-R-06: InvenioRDM Credential Management
+
+The system shall allow individual users to register, list, and remove personal access tokens for InvenioRDM instances. Registered tokens shall be encrypted at rest and used only to search and connect access-restricted datasets on behalf of the user.
+
+**Rationale:**
+Access-restricted datasets require a valid InvenioRDM personal access token. Without a per-user credential management surface, researchers cannot connect restricted datasets or unlock embargoes their institution has access to.
+
+**Source:**
+Feature #1466 § FEAT-DATASET-CONNECTION; Stories #1471–#1479
+
 ### Non-Functional Requirements
 
 _No requirements defined yet._
diff --git a/haproxy/README.md b/haproxy/README.md
new file mode 100644
index 0000000000..fa33c0c67c
--- /dev/null
+++ b/haproxy/README.md
@@ -0,0 +1,122 @@
+# HAProxy Custom Error Pages
+
+Custom maintenance / error landing pages for the QBiC Data Manager HAProxy setup.
+
+These pages follow the [HAProxy `errorfile` format](https://www.haproxy.com/documentation/haproxy-configuration-tutorials/alerts-and-monitoring/error-pages/):
+each file has a `.http` extension, contains the HTTP status line and required headers at the top,
+a blank line separator, and then the full HTML response body.
+
+## Files
+
+| File | HTTP Status | When to Use |
+|------|-------------|-------------|
+| `errors/503.http` | 503 Service Temporarily Unavailable | Scheduled maintenance or temporary service interruption |
+| `errors/maintenance-illustration.svg` | — | Standalone SVG illustration (not used by HAProxy directly) |
+
+## HAProxy Configuration
+
+Add the error pages to your HAProxy configuration. Place the files on your HAProxy host
+(e.g. under `/etc/haproxy/errors/`) and reference them in the `defaults` or `frontend` section:
+
+```haproxy
+defaults
+    # Custom error pages
+    errorfile 503 /etc/haproxy/errors/503.http
+```
+
+To serve the maintenance page for **all** traffic during a maintenance window (regardless of
+backend status), combine it with a maintenance backend:
+
+```haproxy
+# --- Maintenance mode ---
+# Enable by uncommenting the maintenance block and commenting out the normal backend.
+
+# backend maintenance
+#     errorfile 503 /etc/haproxy/errors/503.http
+#     server maintenance 127.0.0.1:1 disable
+
+# frontend myapp
+#     # Maintenance mode: route everything to the maintenance error page
+#     # use_backend maintenance if TRUE
+#
+#     # Normal mode:
+#     use_backend app_servers
+```
+
+### Multiple Error Codes
+
+You can also serve the same maintenance page for other status codes during an outage:
+
+```haproxy
+defaults
+    errorfile 502 /etc/haproxy/errors/503.http
+    errorfile 503 /etc/haproxy/errors/503.http
+    errorfile 504 /etc/haproxy/errors/503.http
+```
+
+## Page Contents
+
+The error page includes:
+
+- **Informative message** — explains the situation to visitors in a friendly way
+- **SVG illustration** — fully inline, no external image dependencies
+- **Contact information** — support email: `support@qbic.zendesk.com`
+- **Provider information** — QBiC – Quantitative Biology Center, University of Tübingen
+  with a link to <https://www.info.qbic.uni-tuebingen.de/>
+
+The page is fully self-contained:
+- All CSS is inline (no external stylesheets)
+- The SVG illustration is embedded inline (no external image files)
+- CSS animations bring the illustration to life
+
+### Visual style
+
+- Warm cream colour palette
+- Scene: two colleagues with a tilted server rack, smoke and sparks
+- Subtle animations: floating papers, flickering LEDs, rising smoke, blinking sparks
+
+## Customisation
+
+### Changing the contact address
+
+Edit the `mailto:` and display text in the `.contact-card` section of `503.http`.
+
+### Changing the page appearance
+
+All styles are in the `<style>` block inside `503.http`. The colour palette is:
+
+| Token | Value | Usage |
+|-------|-------|-------|
+| Background | `#fefdf7` | Page background |
+| Heading | `#c0392b` | Error title |
+| Primary | `#2980b9` | Links |
+| Card BG | `#f0f4f8` | Contact info card |
+| Server rack | `#2d2d2d` / `#4a4a4a` | Rack gradient |
+| LEDs | `#e74c3c` | Red error indicators |
+| Sparks | `#f1c40f` / `#e74c3c` | Animated sparkle effects |
+
+### Replacing the illustration
+
+Swap the `<svg>` block inside the `.illustration` div with a different SVG or
+replace the inline SVG with an `<img>` tag pointing to a standalone image file.
+
+## Format Requirements (HAProxy)
+
+Key rules from HAProxy's `errorfile` specification:
+
+1. File extension **must** be `.http` (not `.html`)
+2. File must start with the HTTP status line: `HTTP/1.1 <code> <reason>`
+3. Followed by HTTP headers. For `HTTP/1.1` the following are **mandatory** (the parser rejects files missing them):
+   - `Content-Length: <bytes>` — must exactly match the body size in bytes; without it HAProxy 2.7+ raises _"unable to parse headers"_ at startup
+   - `Content-Type: text/html` (or `text/html; charset=utf-8`)
+4. All line endings must be **CRLF** (`\r\n`) — HTTP/1.1 requires it per RFC 7230
+5. A **blank line** (`\r\n\r\n`) separates headers from the HTML body
+6. The HTML body follows after the blank line
+7. The entire file is served verbatim as the HTTP response
+
+## File size restriction
+HA-Proxy has a max cap for the file size per response for the error messages of 16,800 bytes. Stay below that.
+
+## License
+
+Same as the Data Manager project: AGPL-3.0-or-later.
diff --git a/haproxy/errors/503.http b/haproxy/errors/503.http
new file mode 100644
index 0000000000..0d042bd4b7
--- /dev/null
+++ b/haproxy/errors/503.http
@@ -0,0 +1,255 @@
+HTTP/1.1 503 Service Temporarily Unavailable
+Cache-Control: no-cache
+Connection: close
+Content-Length: 15913
+Content-Type: text/html; charset=utf-8
+Retry-After: 300
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<title>Service Temporarily Unavailable</title>
+<style>
+*,*::before,*::after{box-sizing:border-box;margin:0;padding:0}
+html,body{height:100%;font-family:-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;background:#fefdf7;color:#2c3e50}
+body{display:flex;align-items:center;justify-content:center;min-height:100vh;padding:1.5rem}
+.container{max-width:680px;width:100%;text-align:center}
+.illustration{width:100%;max-width:580px;margin:0 auto 2rem}
+.illustration svg{width:100%;height:auto;display:block}
+h1{font-size:1.75rem;font-weight:700;margin-bottom:.75rem;color:#c0392b}
+.message{font-size:1.05rem;line-height:1.7;margin-bottom:1.75rem;color:#555}
+.contact-card{background:#f0f4f8;border-radius:12px;padding:1.25rem 1.75rem;display:inline-block;margin-bottom:1.5rem}
+.contact-card p{font-size:.95rem;color:#555;margin-bottom:.4rem}
+.contact-card a{color:#2980b9;font-weight:600;text-decoration:none}
+.contact-card a:hover{text-decoration:underline}
+.provider{font-size:.85rem;color:#888;line-height:1.6}
+.provider a{color:#888;text-decoration:underline}
+.provider a:hover{color:#555}
+
+/* Fun floating-paper animation */
+@keyframes float{0%,100%{transform:translateY(0) rotate(0deg)}50%{transform:translateY(-8px) rotate(3deg)}}
+@keyframes floatAlt{0%,100%{transform:translateY(0) rotate(0deg)}50%{transform:translateY(-6px) rotate(-2deg)}}
+.paper-float{animation:float 4s ease-in-out infinite}
+.paper-float-alt{animation:floatAlt 3.5s ease-in-out infinite}
+
+/* Sparks blink */
+@keyframes sparkle{0%,100%{opacity:1}50%{opacity:.3}}
+.spark{animation:sparkle 1.2s ease-in-out infinite}
+.spark-delay{animation:sparkle 1.2s ease-in-out infinite;animation-delay:.4s}
+
+/* Smoke rise */
+@keyframes rise{0%{opacity:.25;transform:translateY(0)}100%{opacity:0;transform:translateY(-15px)}}
+.smoke-anim{animation:rise 3s ease-out infinite}
+.smoke-anim-delay{animation:rise 3s ease-out infinite;animation-delay:1.5s}
+
+/* LED flicker */
+@keyframes flicker{0%,100%{opacity:.15}50%{opacity:.8}}
+.led-flicker{animation:flicker 0.8s ease-in-out infinite}
+</style>
+</head>
+<body>
+<div class="container" role="main">
+
+<!-- ========== ILLUSTRATION ========== -->
+<div class="illustration" aria-hidden="true">
+<svg viewBox="0 0 820 600" xmlns="http://www.w3.org/2000/svg">
+<defs>
+<linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
+<stop offset="0%" stop-color="#fefcf3"/>
+<stop offset="100%" stop-color="#fef5e0"/>
+</linearGradient>
+<linearGradient id="rackG" x1="0" y1="0" x2="0" y2="1">
+<stop offset="0%" stop-color="#4a4a4a"/>
+<stop offset="100%" stop-color="#2d2d2d"/>
+</linearGradient>
+<filter id="shadow" x="-5%" y="-5%" width="110%" height="115%">
+<feDropShadow dx="2" dy="3" stdDeviation="3" flood-opacity=".12"/>
+</filter>
+</defs>
+<rect width="820" height="600" fill="url(#bg)" rx="16"/>
+<rect x="0" y="455" width="820" height="145" fill="#e8e0d0" rx="0"/>
+<line x1="0" y1="455" x2="820" y2="455" stroke="#d5cabb" stroke-width="2"/>
+<line x1="200" y1="455" x2="180" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+<line x1="420" y1="455" x2="410" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+<line x1="640" y1="455" x2="650" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+<ellipse cx="310" cy="60" rx="40" ry="22" fill="#e8e0d0" opacity=".35" class="smoke-anim"/>
+<ellipse cx="360" cy="45" rx="28" ry="16" fill="#e8e0d0" opacity=".30" class="smoke-anim-delay"/>
+<ellipse cx="280" cy="80" rx="22" ry="14" fill="#e8e0d0" opacity=".25" class="smoke-anim"/>
+<polygon points="400,55 404,66 415,68 406,74 409,85 400,78 391,85 394,74 385,68 396,66" fill="#f1c40f" class="spark"/>
+<polygon points="245,48 248,56 255,57 249,62 251,70 245,65 239,70 241,62 235,57 242,56" fill="#f39c12" class="spark-delay"/>
+<polygon points="420,130 423,138 430,139 424,144 426,152 420,147 414,152 416,144 410,139 417,138" fill="#e74c3c" class="spark"/>
+<polygon points="210,135 212,140 217,141 213,144 214,149 210,146 206,149 207,144 203,141 208,140" fill="#f1c40f" class="spark-delay"/>
+<g transform="rotate(-10,300,380)" filter="url(#shadow)">
+<rect x="220" y="100" width="160" height="358" rx="8" fill="url(#rackG)" stroke="#222" stroke-width="2.5"/>
+<rect x="240" y="108" width="120" height="4" rx="2" fill="#555"/>
+<rect x="240" y="116" width="120" height="4" rx="2" fill="#555"/>
+<rect x="240" y="124" width="120" height="4" rx="2" fill="#555"/>
+<rect x="232" y="140" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+<rect x="242" y="150" width="82" height="8" rx="2" fill="#555"/>
+<rect x="242" y="164" width="58" height="8" rx="2" fill="#555"/>
+<circle cx="348" cy="154" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="348" cy="170" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="336" cy="154" r="4" fill="#7f8c8d"/>
+<rect x="232" y="198" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+<rect x="242" y="208" width="82" height="8" rx="2" fill="#555"/>
+<rect x="242" y="222" width="58" height="8" rx="2" fill="#555"/>
+<circle cx="348" cy="212" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="348" cy="228" r="5" fill="#7f8c8d"/>
+<circle cx="336" cy="212" r="4" fill="#7f8c8d"/>
+<rect x="232" y="256" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+<rect x="242" y="266" width="82" height="8" rx="2" fill="#555"/>
+<rect x="242" y="280" width="58" height="8" rx="2" fill="#555"/>
+<circle cx="348" cy="270" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="348" cy="286" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="336" cy="270" r="4" fill="#7f8c8d"/>
+<rect x="232" y="314" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+<rect x="242" y="324" width="82" height="8" rx="2" fill="#555"/>
+<rect x="242" y="338" width="40" height="8" rx="2" fill="#555"/>
+<circle cx="348" cy="328" r="5" fill="#e74c3c" class="led-flicker"/>
+<circle cx="348" cy="344" r="5" fill="#7f8c8d"/>
+<rect x="248" y="354" width="65" height="35" rx="4" fill="#111" stroke="#444" stroke-width="1.5"/>
+<text x="280" y="378" font-size="16" fill="#e74c3c" text-anchor="middle" font-family="monospace" font-weight="bold" class="led-flicker">503</text>
+<path d="M232,400 Q218,425 228,450 Q232,460 222,470" stroke="#e74c3c" stroke-width="2.5" fill="none" stroke-linecap="round"/>
+<path d="M250,458 Q240,475 252,492" stroke="#3498db" stroke-width="2.5" fill="none" stroke-linecap="round"/>
+<path d="M370,420 Q385,440 375,460 Q368,475 380,485" stroke="#27ae60" stroke-width="2" fill="none" stroke-linecap="round"/>
+<ellipse cx="290" cy="132" rx="14" ry="8" fill="#bbb" opacity=".3" class="smoke-anim"/>
+<ellipse cx="340" cy="125" rx="10" ry="7" fill="#bbb" opacity=".25" class="smoke-anim-delay"/>
+</g>
+<g class="paper-float">
+<rect x="130" y="195" width="32" height="42" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-22,146,216)"/>
+<line x1="137" y1="207" x2="155" y2="204" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+<line x1="138" y1="215" x2="152" y2="213" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+<line x1="139" y1="223" x2="150" y2="221" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+</g>
+<g class="paper-float-alt">
+<rect x="440" y="145" width="28" height="38" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(18,454,164)"/>
+<line x1="446" y1="157" x2="462" y2="159" stroke="#ccc" stroke-width="1" transform="rotate(18,454,164)"/>
+<line x1="447" y1="165" x2="460" y2="167" stroke="#ccc" stroke-width="1" transform="rotate(18,454,164)"/>
+</g>
+<g class="paper-float">
+<rect x="540" y="245" width="32" height="42" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(32,556,266)"/>
+<line x1="547" y1="259" x2="565" y2="263" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+<line x1="548" y1="267" x2="562" y2="270" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+<line x1="549" y1="275" x2="558" y2="277" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+</g>
+<g class="paper-float-alt">
+<rect x="100" y="340" width="26" height="34" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-12,113,357)"/>
+<line x1="106" y1="351" x2="120" y2="350" stroke="#ccc" stroke-width="1" transform="rotate(-12,113,357)"/>
+<line x1="107" y1="358" x2="118" y2="357" stroke="#ccc" stroke-width="1" transform="rotate(-12,113,357)"/>
+</g>
+<g filter="url(#shadow)">
+<ellipse cx="535" cy="455" rx="38" ry="7" fill="#000" opacity=".07"/>
+<rect x="518" y="383" width="14" height="68" rx="5" fill="#2c3e50"/>
+<rect x="540" y="383" width="14" height="68" rx="5" fill="#2c3e50"/>
+<ellipse cx="525" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+<ellipse cx="547" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+<rect x="506" y="298" width="60" height="90" rx="14" fill="#3498db"/>
+<line x1="536" y1="310" x2="536" y2="385" stroke="#2980b9" stroke-width="1.5"/>
+<rect x="514" y="350" width="18" height="14" rx="2" fill="#2980b9" stroke="#2471a3" stroke-width=".8"/>
+<rect x="490" y="304" width="18" height="58" rx="8" fill="#3498db" transform="rotate(8,499,304)"/>
+<circle cx="486" cy="368" r="9" fill="#f0c8a0"/>
+<rect x="564" y="260" width="18" height="60" rx="8" fill="#3498db" transform="rotate(-20,573,260)"/>
+<circle cx="582" cy="232" r="9" fill="#f0c8a0"/>
+<rect x="578" y="185" width="6" height="52" rx="2" fill="#95a5a6"/>
+<path d="M574,185 L574,170 L580,168 L586,170 L586,185" fill="#95a5a6" stroke="#7f8c8d" stroke-width="1"/>
+<path d="M577,170 L577,163 L583,163 L583,170" fill="#3498db"/>
+<rect x="529" y="280" width="14" height="22" rx="4" fill="#f0c8a0"/>
+<circle cx="536" cy="260" r="30" fill="#f0c8a0"/>
+<path d="M506,250 Q506,222 536,218 Q566,222 566,250 L566,268 Q566,260 558,256 L558,262 Q550,258 536,258 Q522,258 514,262 L514,256 Q506,260 506,268 Z" fill="#8B4513"/>
+<path d="M510,246 Q515,230 536,228 Q557,230 562,246" fill="#8B4513"/>
+<ellipse cx="525" cy="258" rx="5" ry="5.5" fill="white" stroke="#555" stroke-width=".5"/>
+<circle cx="526" cy="255" r="2.8" fill="#2c3e50"/>
+<circle cx="527" cy="254" r="1" fill="white"/>
+<ellipse cx="545" cy="258" rx="5" ry="5.5" fill="white" stroke="#555" stroke-width=".5"/>
+<circle cx="546" cy="255" r="2.8" fill="#2c3e50"/>
+<circle cx="547" cy="254" r="1" fill="white"/>
+<line x1="519" y1="249" x2="530" y2="247" stroke="#5a3010" stroke-width="2.5" stroke-linecap="round"/>
+<line x1="540" y1="247" x2="551" y2="249" stroke="#5a3010" stroke-width="2.5" stroke-linecap="round"/>
+<ellipse cx="536" cy="275" rx="5" ry="4" fill="#c0392b"/>
+<ellipse cx="518" cy="268" rx="5" ry="3" fill="#f0a0a0" opacity=".35"/>
+<ellipse cx="554" cy="268" rx="5" ry="3" fill="#f0a0a0" opacity=".35"/>
+</g>
+<g filter="url(#shadow)">
+<ellipse cx="700" cy="455" rx="38" ry="7" fill="#000" opacity=".07"/>
+<rect x="682" y="383" width="14" height="68" rx="5" fill="#34495e"/>
+<rect x="706" y="383" width="14" height="68" rx="5" fill="#34495e" transform="rotate(5,713,383)"/>
+<ellipse cx="689" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+<ellipse cx="716" cy="455" rx="13" ry="6" fill="#1a1a1a"/>
+<rect x="672" y="298" width="60" height="90" rx="14" fill="#9b59b6"/>
+<path d="M692,298 L702,312 L712,298" fill="#8e44ad" stroke="#7d3c98" stroke-width=".8"/>
+<rect x="653" y="300" width="18" height="52" rx="8" fill="#9b59b6" transform="rotate(25,662,300)"/>
+<circle cx="636" cy="350" r="9" fill="#dba67b"/>
+<g transform="rotate(-10,636,350)">
+<rect x="610" y="338" width="54" height="34" rx="3" fill="#555" stroke="#333" stroke-width="1.5"/>
+<rect x="614" y="342" width="46" height="26" rx="2" fill="#1a1a2e"/>
+<text x="637" y="360" font-size="10" fill="#e74c3c" text-anchor="middle" font-family="monospace" font-weight="bold" class="led-flicker">ERR</text>
+<rect x="606" y="372" width="62" height="5" rx="2" fill="#666" stroke="#444" stroke-width=".8"/>
+</g>
+<rect x="730" y="272" width="18" height="52" rx="8" fill="#9b59b6" transform="rotate(-28,739,272)"/>
+<circle cx="752" cy="244" r="9" fill="#dba67b"/>
+<line x1="748" y1="236" x2="744" y2="228" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+<line x1="752" y1="235" x2="752" y2="226" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+<line x1="756" y1="236" x2="760" y2="228" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+<line x1="759" y1="239" x2="764" y2="233" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+<rect x="695" y="280" width="14" height="22" rx="4" fill="#dba67b"/>
+<circle cx="702" cy="260" r="30" fill="#dba67b"/>
+<path d="M672,252 Q672,224 702,218 Q732,224 732,252 L732,246 Q732,232 702,228 Q672,232 672,246 Z" fill="#1a1a1a"/>
+<path d="M696,220 Q694,210 700,208 Q701,215 704,220" fill="#1a1a1a"/>
+<ellipse cx="691" cy="258" rx="6" ry="6.5" fill="white" stroke="#555" stroke-width=".5"/>
+<circle cx="692" cy="258" r="3.8" fill="#2c3e50"/>
+<circle cx="693" cy="256" r="1.3" fill="white"/>
+<ellipse cx="713" cy="258" rx="6" ry="6.5" fill="white" stroke="#555" stroke-width=".5"/>
+<circle cx="714" cy="258" r="3.8" fill="#2c3e50"/>
+<circle cx="715" cy="256" r="1.3" fill="white"/>
+<line x1="684" y1="245" x2="697" y2="244" stroke="#1a1a1a" stroke-width="2.5" stroke-linecap="round"/>
+<line x1="707" y1="244" x2="720" y2="245" stroke="#1a1a1a" stroke-width="2.5" stroke-linecap="round"/>
+<ellipse cx="702" cy="277" rx="7" ry="5" fill="#c0392b"/>
+<ellipse cx="702" cy="276" rx="5" ry="3" fill="#7b241c"/>
+<path d="M726,242 Q730,234 728,226" stroke="#3498db" stroke-width="2" fill="none" stroke-linecap="round" opacity=".7"/>
+<circle cx="729" cy="224" r="2.5" fill="#3498db" opacity=".7"/>
+<path d="M735,252 Q738,246 737,240" stroke="#3498db" stroke-width="1.5" fill="none" stroke-linecap="round" opacity=".5"/>
+<circle cx="737" cy="238" r="2" fill="#3498db" opacity=".5"/>
+</g>
+<rect x="370" y="462" width="32" height="22" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-28,386,473)"/>
+<line x1="376" y1="470" x2="393" y2="466" stroke="#ddd" stroke-width=".8" transform="rotate(-28,386,473)"/>
+<rect x="435" y="468" width="26" height="18" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(18,448,477)"/>
+<path d="M280,468 Q340,482 400,465 Q450,450 500,468" stroke="#555" stroke-width="3" fill="none" stroke-linecap="round" opacity=".4"/>
+<circle cx="470" cy="460" r="3" fill="#95a5a6" stroke="#7f8c8d" stroke-width="1"/>
+<line x1="468" y1="460" x2="472" y2="460" stroke="#7f8c8d" stroke-width=".8"/>
+<line x1="470" y1="458" x2="470" y2="462" stroke="#7f8c8d" stroke-width=".8"/>
+<g transform="rotate(-10,300,380)">
+<rect x="244" y="410" width="72" height="24" rx="4" fill="#e74c3c"/>
+<text x="280" y="427" font-size="11" fill="white" text-anchor="middle" font-family="sans-serif" font-weight="bold">OFFLINE</text>
+</g>
+</svg>
+</div>
+<!-- ========== END ILLUSTRATION ========== -->
+
+<h1>We'll be back shortly!</h1>
+<p class="message">
+  Our services are currently undergoing scheduled maintenance or experiencing
+  an unexpected interruption. We apologise for the inconvenience and are
+  working to restore everything as quickly as possible.
+</p>
+
+<div class="contact-card">
+  <p>Need help or have questions?</p>
+  <p>
+    Contact us at
+    <a href="mailto:support@qbic.zendesk.com">support@qbic.zendesk.com</a>
+  </p>
+</div>
+
+<p class="provider">
+  Provided by
+  <a href="https://www.info.qbic.uni-tuebingen.de/" target="_blank" rel="noopener noreferrer">
+    QBiC &mdash; Quantitative Biology Center
+  </a><br>
+  University of T&uuml;bingen
+</p>
+
+</div>
+</body>
+</html>
diff --git a/haproxy/errors/maintenance-illustration.svg b/haproxy/errors/maintenance-illustration.svg
new file mode 100644
index 0000000000..e6e1ddacc3
--- /dev/null
+++ b/haproxy/errors/maintenance-illustration.svg
@@ -0,0 +1,276 @@
+<svg viewBox="0 0 820 600" xmlns="http://www.w3.org/2000/svg">
+<defs>
+  <linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
+    <stop offset="0%" stop-color="#fefcf3"/>
+    <stop offset="100%" stop-color="#fef5e0"/>
+  </linearGradient>
+  <linearGradient id="rackG" x1="0" y1="0" x2="0" y2="1">
+    <stop offset="0%" stop-color="#4a4a4a"/>
+    <stop offset="100%" stop-color="#2d2d2d"/>
+  </linearGradient>
+  <filter id="shadow" x="-5%" y="-5%" width="110%" height="115%">
+    <feDropShadow dx="2" dy="3" stdDeviation="3" flood-opacity=".12"/>
+  </filter>
+</defs>
+
+<!-- Background -->
+<rect width="820" height="600" fill="url(#bg)" rx="16"/>
+
+<!-- Floor -->
+<rect x="0" y="455" width="820" height="145" fill="#e8e0d0" rx="0"/>
+<line x1="0" y1="455" x2="820" y2="455" stroke="#d5cabb" stroke-width="2"/>
+<!-- Floor tiles hints -->
+<line x1="200" y1="455" x2="180" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+<line x1="420" y1="455" x2="410" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+<line x1="640" y1="455" x2="650" y2="600" stroke="#ddd4c4" stroke-width="1"/>
+
+<!-- ========== SMOKE CLOUDS ========== -->
+<ellipse cx="310" cy="60" rx="40" ry="22" fill="#e8e0d0" opacity=".35" class="smoke-anim"/>
+<ellipse cx="360" cy="45" rx="28" ry="16" fill="#e8e0d0" opacity=".30" class="smoke-anim-delay"/>
+<ellipse cx="280" cy="80" rx="22" ry="14" fill="#e8e0d0" opacity=".25" class="smoke-anim"/>
+
+<!-- ========== SPARKS ========== -->
+<polygon points="400,55 404,66 415,68 406,74 409,85 400,78 391,85 394,74 385,68 396,66" fill="#f1c40f" class="spark"/>
+<polygon points="245,48 248,56 255,57 249,62 251,70 245,65 239,70 241,62 235,57 242,56" fill="#f39c12" class="spark-delay"/>
+<polygon points="420,130 423,138 430,139 424,144 426,152 420,147 414,152 416,144 410,139 417,138" fill="#e74c3c" class="spark"/>
+<polygon points="210,135 212,140 217,141 213,144 214,149 210,146 206,149 207,144 203,141 208,140" fill="#f1c40f" class="spark-delay"/>
+
+<!-- ========== SERVER RACK (tilted) ========== -->
+<g transform="rotate(-10,300,380)" filter="url(#shadow)">
+  <!-- Main body -->
+  <rect x="220" y="100" width="160" height="358" rx="8" fill="url(#rackG)" stroke="#222" stroke-width="2.5"/>
+  <!-- Top vents -->
+  <rect x="240" y="108" width="120" height="4" rx="2" fill="#555"/>
+  <rect x="240" y="116" width="120" height="4" rx="2" fill="#555"/>
+  <rect x="240" y="124" width="120" height="4" rx="2" fill="#555"/>
+
+  <!-- Server unit 1 -->
+  <rect x="232" y="140" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+  <rect x="242" y="150" width="82" height="8" rx="2" fill="#555"/>
+  <rect x="242" y="164" width="58" height="8" rx="2" fill="#555"/>
+  <circle cx="348" cy="154" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="348" cy="170" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="336" cy="154" r="4" fill="#7f8c8d"/>
+
+  <!-- Server unit 2 -->
+  <rect x="232" y="198" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+  <rect x="242" y="208" width="82" height="8" rx="2" fill="#555"/>
+  <rect x="242" y="222" width="58" height="8" rx="2" fill="#555"/>
+  <circle cx="348" cy="212" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="348" cy="228" r="5" fill="#7f8c8d"/>
+  <circle cx="336" cy="212" r="4" fill="#7f8c8d"/>
+
+  <!-- Server unit 3 -->
+  <rect x="232" y="256" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+  <rect x="242" y="266" width="82" height="8" rx="2" fill="#555"/>
+  <rect x="242" y="280" width="58" height="8" rx="2" fill="#555"/>
+  <circle cx="348" cy="270" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="348" cy="286" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="336" cy="270" r="4" fill="#7f8c8d"/>
+
+  <!-- Server unit 4 (bottom, more damaged) -->
+  <rect x="232" y="314" width="136" height="48" rx="4" fill="#3a3a3a" stroke="#555" stroke-width="1"/>
+  <rect x="242" y="324" width="82" height="8" rx="2" fill="#555"/>
+  <rect x="242" y="338" width="40" height="8" rx="2" fill="#555"/>
+  <circle cx="348" cy="328" r="5" fill="#e74c3c" class="led-flicker"/>
+  <circle cx="348" cy="344" r="5" fill="#7f8c8d"/>
+
+  <!-- Error screen on bottom unit -->
+  <rect x="248" y="354" width="65" height="35" rx="4" fill="#111" stroke="#444" stroke-width="1.5"/>
+  <text x="280" y="378" font-size="16" fill="#e74c3c" text-anchor="middle" font-family="monospace" font-weight="bold" class="led-flicker">503</text>
+
+  <!-- Loose wires hanging from rack -->
+  <path d="M232,400 Q218,425 228,450 Q232,460 222,470" stroke="#e74c3c" stroke-width="2.5" fill="none" stroke-linecap="round"/>
+  <path d="M250,458 Q240,475 252,492" stroke="#3498db" stroke-width="2.5" fill="none" stroke-linecap="round"/>
+  <path d="M370,420 Q385,440 375,460 Q368,475 380,485" stroke="#27ae60" stroke-width="2" fill="none" stroke-linecap="round"/>
+
+  <!-- Small smoke wisps from rack -->
+  <ellipse cx="290" cy="132" rx="14" ry="8" fill="#bbb" opacity=".3" class="smoke-anim"/>
+  <ellipse cx="340" cy="125" rx="10" ry="7" fill="#bbb" opacity=".25" class="smoke-anim-delay"/>
+</g>
+
+<!-- ========== FLYING PAPERS ========== -->
+<g class="paper-float">
+  <rect x="130" y="195" width="32" height="42" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-22,146,216)"/>
+  <line x1="137" y1="207" x2="155" y2="204" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+  <line x1="138" y1="215" x2="152" y2="213" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+  <line x1="139" y1="223" x2="150" y2="221" stroke="#ccc" stroke-width="1" transform="rotate(-22,146,216)"/>
+</g>
+<g class="paper-float-alt">
+  <rect x="440" y="145" width="28" height="38" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(18,454,164)"/>
+  <line x1="446" y1="157" x2="462" y2="159" stroke="#ccc" stroke-width="1" transform="rotate(18,454,164)"/>
+  <line x1="447" y1="165" x2="460" y2="167" stroke="#ccc" stroke-width="1" transform="rotate(18,454,164)"/>
+</g>
+<g class="paper-float">
+  <rect x="540" y="245" width="32" height="42" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(32,556,266)"/>
+  <line x1="547" y1="259" x2="565" y2="263" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+  <line x1="548" y1="267" x2="562" y2="270" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+  <line x1="549" y1="275" x2="558" y2="277" stroke="#ccc" stroke-width="1" transform="rotate(32,556,266)"/>
+</g>
+<g class="paper-float-alt">
+  <rect x="100" y="340" width="26" height="34" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-12,113,357)"/>
+  <line x1="106" y1="351" x2="120" y2="350" stroke="#ccc" stroke-width="1" transform="rotate(-12,113,357)"/>
+  <line x1="107" y1="358" x2="118" y2="357" stroke="#ccc" stroke-width="1" transform="rotate(-12,113,357)"/>
+</g>
+
+<!-- ========== WOMAN (left, holding wrench) ========== -->
+<g filter="url(#shadow)">
+  <!-- Shadow on floor -->
+  <ellipse cx="535" cy="455" rx="38" ry="7" fill="#000" opacity=".07"/>
+
+  <!-- Legs -->
+  <rect x="518" y="383" width="14" height="68" rx="5" fill="#2c3e50"/>
+  <rect x="540" y="383" width="14" height="68" rx="5" fill="#2c3e50"/>
+  <!-- Shoes -->
+  <ellipse cx="525" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+  <ellipse cx="547" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+
+  <!-- Body (blue lab coat / shirt) -->
+  <rect x="506" y="298" width="60" height="90" rx="14" fill="#3498db"/>
+  <!-- Coat details -->
+  <line x1="536" y1="310" x2="536" y2="385" stroke="#2980b9" stroke-width="1.5"/>
+  <!-- Pocket -->
+  <rect x="514" y="350" width="18" height="14" rx="2" fill="#2980b9" stroke="#2471a3" stroke-width=".8"/>
+
+  <!-- Left arm down -->
+  <rect x="490" y="304" width="18" height="58" rx="8" fill="#3498db" transform="rotate(8,499,304)"/>
+  <!-- Left hand -->
+  <circle cx="486" cy="368" r="9" fill="#f0c8a0"/>
+
+  <!-- Right arm up holding wrench -->
+  <rect x="564" y="260" width="18" height="60" rx="8" fill="#3498db" transform="rotate(-20,573,260)"/>
+  <!-- Right hand -->
+  <circle cx="582" cy="232" r="9" fill="#f0c8a0"/>
+
+  <!-- Wrench -->
+  <rect x="578" y="185" width="6" height="52" rx="2" fill="#95a5a6"/>
+  <!-- Wrench jaw (open end) -->
+  <path d="M574,185 L574,170 L580,168 L586,170 L586,185" fill="#95a5a6" stroke="#7f8c8d" stroke-width="1"/>
+  <path d="M577,170 L577,163 L583,163 L583,170" fill="#3498db"/>
+
+  <!-- Neck -->
+  <rect x="529" y="280" width="14" height="22" rx="4" fill="#f0c8a0"/>
+
+  <!-- Head -->
+  <circle cx="536" cy="260" r="30" fill="#f0c8a0"/>
+
+  <!-- Hair (brown, shoulder-length bob) -->
+  <path d="M506,250 Q506,222 536,218 Q566,222 566,250 L566,268 Q566,260 558,256 L558,262 Q550,258 536,258 Q522,258 514,262 L514,256 Q506,260 506,268 Z" fill="#8B4513"/>
+  <!-- Hair bangs -->
+  <path d="M510,246 Q515,230 536,228 Q557,230 562,246" fill="#8B4513"/>
+
+  <!-- Eyes - worried, looking up -->
+  <ellipse cx="525" cy="258" rx="5" ry="5.5" fill="white" stroke="#555" stroke-width=".5"/>
+  <circle cx="526" cy="255" r="2.8" fill="#2c3e50"/>
+  <circle cx="527" cy="254" r="1" fill="white"/>
+  <ellipse cx="545" cy="258" rx="5" ry="5.5" fill="white" stroke="#555" stroke-width=".5"/>
+  <circle cx="546" cy="255" r="2.8" fill="#2c3e50"/>
+  <circle cx="547" cy="254" r="1" fill="white"/>
+
+  <!-- Worried eyebrows -->
+  <line x1="519" y1="249" x2="530" y2="247" stroke="#5a3010" stroke-width="2.5" stroke-linecap="round"/>
+  <line x1="540" y1="247" x2="551" y2="249" stroke="#5a3010" stroke-width="2.5" stroke-linecap="round"/>
+
+  <!-- Mouth - worried O -->
+  <ellipse cx="536" cy="275" rx="5" ry="4" fill="#c0392b"/>
+
+  <!-- Blush -->
+  <ellipse cx="518" cy="268" rx="5" ry="3" fill="#f0a0a0" opacity=".35"/>
+  <ellipse cx="554" cy="268" rx="5" ry="3" fill="#f0a0a0" opacity=".35"/>
+</g>
+
+<!-- ========== MAN (right, holding laptop, frantic) ========== -->
+<g filter="url(#shadow)">
+  <!-- Shadow on floor -->
+  <ellipse cx="700" cy="455" rx="38" ry="7" fill="#000" opacity=".07"/>
+
+  <!-- Legs (one bent, stumbled pose) -->
+  <rect x="682" y="383" width="14" height="68" rx="5" fill="#34495e"/>
+  <rect x="706" y="383" width="14" height="68" rx="5" fill="#34495e" transform="rotate(5,713,383)"/>
+  <!-- Shoes -->
+  <ellipse cx="689" cy="453" rx="13" ry="6" fill="#1a1a1a"/>
+  <ellipse cx="716" cy="455" rx="13" ry="6" fill="#1a1a1a"/>
+
+  <!-- Body (purple shirt) -->
+  <rect x="672" y="298" width="60" height="90" rx="14" fill="#9b59b6"/>
+  <!-- Shirt collar detail -->
+  <path d="M692,298 L702,312 L712,298" fill="#8e44ad" stroke="#7d3c98" stroke-width=".8"/>
+
+  <!-- Left arm forward holding laptop -->
+  <rect x="653" y="300" width="18" height="52" rx="8" fill="#9b59b6" transform="rotate(25,662,300)"/>
+  <!-- Left hand -->
+  <circle cx="636" cy="350" r="9" fill="#dba67b"/>
+
+  <!-- Laptop -->
+  <g transform="rotate(-10,636,350)">
+    <rect x="610" y="338" width="54" height="34" rx="3" fill="#555" stroke="#333" stroke-width="1.5"/>
+    <!-- Screen bezel -->
+    <rect x="614" y="342" width="46" height="26" rx="2" fill="#1a1a2e"/>
+    <!-- Error on screen -->
+    <text x="637" y="360" font-size="10" fill="#e74c3c" text-anchor="middle" font-family="monospace" font-weight="bold" class="led-flicker">ERR</text>
+    <!-- Laptop base -->
+    <rect x="606" y="372" width="62" height="5" rx="2" fill="#666" stroke="#444" stroke-width=".8"/>
+  </g>
+
+  <!-- Right arm up, open hand gesture -->
+  <rect x="730" y="272" width="18" height="52" rx="8" fill="#9b59b6" transform="rotate(-28,739,272)"/>
+  <!-- Right hand open -->
+  <circle cx="752" cy="244" r="9" fill="#dba67b"/>
+  <!-- Fingers spread (panic!) -->
+  <line x1="748" y1="236" x2="744" y2="228" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+  <line x1="752" y1="235" x2="752" y2="226" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+  <line x1="756" y1="236" x2="760" y2="228" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+  <line x1="759" y1="239" x2="764" y2="233" stroke="#dba67b" stroke-width="3.5" stroke-linecap="round"/>
+
+  <!-- Neck -->
+  <rect x="695" y="280" width="14" height="22" rx="4" fill="#dba67b"/>
+
+  <!-- Head -->
+  <circle cx="702" cy="260" r="30" fill="#dba67b"/>
+
+  <!-- Hair (short dark) -->
+  <path d="M672,252 Q672,224 702,218 Q732,224 732,252 L732,246 Q732,232 702,228 Q672,232 672,246 Z" fill="#1a1a1a"/>
+  <!-- Hair tuft sticking up (frantic) -->
+  <path d="M696,220 Q694,210 700,208 Q701,215 704,220" fill="#1a1a1a"/>
+
+  <!-- Eyes - wide, panicked -->
+  <ellipse cx="691" cy="258" rx="6" ry="6.5" fill="white" stroke="#555" stroke-width=".5"/>
+  <circle cx="692" cy="258" r="3.8" fill="#2c3e50"/>
+  <circle cx="693" cy="256" r="1.3" fill="white"/>
+  <ellipse cx="713" cy="258" rx="6" ry="6.5" fill="white" stroke="#555" stroke-width=".5"/>
+  <circle cx="714" cy="258" r="3.8" fill="#2c3e50"/>
+  <circle cx="715" cy="256" r="1.3" fill="white"/>
+
+  <!-- Panicked eyebrows raised high -->
+  <line x1="684" y1="245" x2="697" y2="244" stroke="#1a1a1a" stroke-width="2.5" stroke-linecap="round"/>
+  <line x1="707" y1="244" x2="720" y2="245" stroke="#1a1a1a" stroke-width="2.5" stroke-linecap="round"/>
+
+  <!-- Mouth - open in shock -->
+  <ellipse cx="702" cy="277" rx="7" ry="5" fill="#c0392b"/>
+  <ellipse cx="702" cy="276" rx="5" ry="3" fill="#7b241c"/>
+
+  <!-- Sweat drops -->
+  <path d="M726,242 Q730,234 728,226" stroke="#3498db" stroke-width="2" fill="none" stroke-linecap="round" opacity=".7"/>
+  <circle cx="729" cy="224" r="2.5" fill="#3498db" opacity=".7"/>
+  <path d="M735,252 Q738,246 737,240" stroke="#3498db" stroke-width="1.5" fill="none" stroke-linecap="round" opacity=".5"/>
+  <circle cx="737" cy="238" r="2" fill="#3498db" opacity=".5"/>
+</g>
+
+<!-- ========== FLOOR DEBRIS ========== -->
+<rect x="370" y="462" width="32" height="22" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(-28,386,473)"/>
+<line x1="376" y1="470" x2="393" y2="466" stroke="#ddd" stroke-width=".8" transform="rotate(-28,386,473)"/>
+<rect x="435" y="468" width="26" height="18" rx="2" fill="#fff" stroke="#ddd" stroke-width="1" transform="rotate(18,448,477)"/>
+<!-- Fallen cable on floor -->
+<path d="M280,468 Q340,482 400,465 Q450,450 500,468" stroke="#555" stroke-width="3" fill="none" stroke-linecap="round" opacity=".4"/>
+<!-- A screw or bolt -->
+<circle cx="470" cy="460" r="3" fill="#95a5a6" stroke="#7f8c8d" stroke-width="1"/>
+<line x1="468" y1="460" x2="472" y2="460" stroke="#7f8c8d" stroke-width=".8"/>
+<line x1="470" y1="458" x2="470" y2="462" stroke="#7f8c8d" stroke-width=".8"/>
+
+<!-- ========== Small "out of order" sign on rack ========== -->
+<g transform="rotate(-10,300,380)">
+  <rect x="244" y="410" width="72" height="24" rx="4" fill="#e74c3c"/>
+  <text x="280" y="427" font-size="11" fill="white" text-anchor="middle" font-family="sans-serif" font-weight="bold">OFFLINE</text>
+</g>
+
+</svg>
diff --git a/identity/src/main/java/life/qbic/identity/application/token/PersonalAccessTokenServiceImpl.java b/identity/src/main/java/life/qbic/identity/application/token/PersonalAccessTokenServiceImpl.java
index 71a3d656e0..dde038f7bf 100644
--- a/identity/src/main/java/life/qbic/identity/application/token/PersonalAccessTokenServiceImpl.java
+++ b/identity/src/main/java/life/qbic/identity/application/token/PersonalAccessTokenServiceImpl.java
@@ -12,7 +12,6 @@
 import life.qbic.identity.domain.model.token.TokenEncoder;
 import life.qbic.identity.domain.model.token.TokenGenerator;
 import life.qbic.identity.domain.model.token.TokenRepository;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/api/fair/rocrate/ROCreateBuilder.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/api/fair/rocrate/ROCreateBuilder.java
index d007a952ac..a3ea9f28f8 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/api/fair/rocrate/ROCreateBuilder.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/api/fair/rocrate/ROCreateBuilder.java
@@ -10,11 +10,7 @@
 import edu.kit.datamanager.ro_crate.entities.data.FileEntity.FileEntityBuilder;
 import java.nio.file.Path;
 import java.time.Instant;
-import java.util.ArrayList;
-import life.qbic.projectmanagement.application.api.fair.ContactPoint;
 import life.qbic.projectmanagement.application.api.fair.ResearchProject;
-import life.qbic.projectmanagement.domain.model.project.Contact;
-import life.qbic.projectmanagement.domain.model.project.Project;
 import org.docx4j.openpackaging.packages.WordprocessingMLPackage;
 import org.springframework.stereotype.Component;
 
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetJpaRepository.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetJpaRepository.java
new file mode 100644
index 0000000000..b669444a58
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetJpaRepository.java
@@ -0,0 +1,56 @@
+package life.qbic.projectmanagement.infrastructure.dataset.associated;
+
+import java.util.List;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+/**
+ * Spring Data JPA repository for {@link AssociatedDataset} entities.
+ *
+ * <p>Default queries exclude soft-deleted (REMOVED) connections per
+ * ADR-0001.
+ *
+ * @since 1.12.0
+ */
+interface AssociatedDatasetJpaRepository
+    extends JpaRepository<AssociatedDataset, AssociatedDatasetId> {
+
+  /**
+   * Returns all connected datasets for a project, excluding REMOVED
+   * (tombstone) rows. This is the standard query used for listing
+   * active connections in the datasets view.
+   *
+   * <p>Ordering is driven by the {@code Sort} parameter — the caller
+   * ({@link AssociatedDatasetRepositoryImpl}) picks the default sort.
+   * This keeps the query open for future ordering needs (e.g. by title
+   * or publication date) without changing the JPQL.</p>
+   */
+  @Query("SELECT d FROM associated_dataset d "
+      + "WHERE d.projectId = :projectId "
+      + "AND d.connectionState <> life.qbic.projectmanagement.domain.model.associated_dataset.ConnectionState.REMOVED")
+  List<AssociatedDataset> findActiveByProjectId(
+      @Param("projectId") ProjectId projectId,
+      Sort sort);
+
+  /**
+   * Checks whether a dataset with the given PID (persistent identifier,
+   * e.g. DOI) is already actively connected to the project. Used to
+   * prevent duplicate connections to the same logical record.
+   *
+   * <p>PIDs are globally unique by design, so no source-type filter is
+   * needed — a DOI from Zenodo and the same DOI from another InvenioRDM
+   * instance refer to the same logical record.</p>
+   */
+  @Query("SELECT COUNT(d) FROM associated_dataset d WHERE "
+      + "d.projectId = :projectId "
+      + "AND d.pid = :pid "
+      + "AND d.connectionState <> life.qbic.projectmanagement.domain.model.associated_dataset.ConnectionState.REMOVED")
+  long countActiveByProjectIdAndPid(
+      @Param("projectId") ProjectId projectId,
+      @Param("pid") String pid);
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetRepositoryImpl.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetRepositoryImpl.java
new file mode 100644
index 0000000000..5eb1146b52
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/dataset/associated/AssociatedDatasetRepositoryImpl.java
@@ -0,0 +1,66 @@
+package life.qbic.projectmanagement.infrastructure.dataset.associated;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.associated_dataset.repository.AssociatedDatasetRepository;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Domain repository adapter implementation for {@link AssociatedDataset}
+ * aggregates.
+ *
+ * <p>Wraps a Spring Data JPA repository ({@link AssociatedDatasetJpaRepository})
+ * and delegates persistence. Exposes the same semantics as the domain
+ * repository interface: soft-deleted connections are excluded from the
+ * list/find queries by default (ADR-0001).</p>
+ *
+ * <p>The entity class ({@link AssociatedDataset}) lives in the
+ * {@code domain/model/associated_dataset} package — this is the
+ * codebase convention for aggregate roots (see {@link life.qbic.projectmanagement.domain.model.sample.Sample},
+ * {@link life.qbic.projectmanagement.domain.model.experiment.Experiment}).</p>
+ *
+ * @since 1.12.0
+ */
+@Repository
+public class AssociatedDatasetRepositoryImpl implements AssociatedDatasetRepository {
+
+  private final AssociatedDatasetJpaRepository jpaRepository;
+
+  public AssociatedDatasetRepositoryImpl(AssociatedDatasetJpaRepository jpaRepository) {
+    this.jpaRepository = Objects.requireNonNull(jpaRepository,
+        "jpaRepository must not be null");
+  }
+
+  @Override
+  public void save(AssociatedDataset dataset) {
+    Objects.requireNonNull(dataset, "dataset must not be null");
+    jpaRepository.save(dataset);
+  }
+
+  @Override
+  public List<AssociatedDataset> findByProject(ProjectId projectId) {
+    Objects.requireNonNull(projectId, "projectId must not be null");
+    // Default sort: newest connections first.
+    // Future callers (e.g., UI column-header sorting) can extend this
+    // by adding new methods to the domain repo interface.
+    return jpaRepository.findActiveByProjectId(projectId, Sort.by(Sort.Direction.DESC, "connectedOn"));
+  }
+
+  @Override
+  public Optional<AssociatedDataset> findById(AssociatedDatasetId id) {
+    Objects.requireNonNull(id, "id must not be null");
+    return jpaRepository.findById(id);
+  }
+
+  @Override
+  public boolean isActiveConnectionPresent(ProjectId projectId, String pid) {
+    Objects.requireNonNull(projectId, "projectId must not be null");
+    Objects.requireNonNull(pid, "pid must not be null");
+    return jpaRepository.countActiveByProjectIdAndPid(projectId, pid) > 0;
+  }
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementDataRepo.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementDataRepo.java
index 15dc62937c..11bf60666d 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementDataRepo.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementDataRepo.java
@@ -4,11 +4,10 @@
 import java.util.List;
 import java.util.Map;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
-import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
+import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.ProteomicsMeasurement;
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.sample.SampleCode;
 
 /**
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementLookup.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementLookup.java
index 522ccd2602..d8421e134d 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementLookup.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementLookup.java
@@ -17,6 +17,7 @@
 import life.qbic.projectmanagement.infrastructure.experiment.measurement.jpa.PxpMeasurementJpaRepository.PxpMeasurementFilter;
 import life.qbic.projectmanagement.infrastructure.experiment.measurement.jpa.PxpMeasurementJpaRepository.PxpMeasurementInformation;
 import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
 import org.springframework.lang.NonNull;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,7 +34,7 @@ public class MeasurementLookup implements NgsMeasurementLookup, PxpMeasurementLo
   private final NgsMeasurementJpaRepository ngsMeasurementJpaRepository;
   private final PxpMeasurementJpaRepository pxpMeasurementJpaRepository;
   private final IpMeasurementJpaRepository ipMeasurementJpaRepository;
-
+  private static final String MEASUREMENTCODE_PROPERTY = "measurementCode";
   public MeasurementLookup(NgsMeasurementJpaRepository ngsMeasurementJpaRepository,
       PxpMeasurementJpaRepository pxpMeasurementJpaRepository,
       IpMeasurementJpaRepository ipMeasurementJpaRepository) {
@@ -58,7 +59,8 @@ public MeasurementLookup(NgsMeasurementJpaRepository ngsMeasurementJpaRepository
           "Invalid sort keys for ngs measurements: " + invalidSortKeys.stream()
               .map(Order::getProperty).toList());
     }
-    var pageable = new OffsetBasedRequest(offset, limit, sort);
+    Sort ascendingMeasurementCodeSort = Sort.by(Direction.ASC, MEASUREMENTCODE_PROPERTY);
+    var pageable = new OffsetBasedRequest(offset, limit, ascendingMeasurementCodeSort);
     var filter = mapToDatabaseFilter(measurementFilter);
     return ngsMeasurementJpaRepository.findAll(filter.asSpecification(), pageable)
         .get()
@@ -92,7 +94,8 @@ public int countNgsMeasurements(@NonNull String projectId,
           "Invalid sort keys for ngs measurements: " + invalidSortKeys.stream()
               .map(Order::getProperty).toList());
     }
-    var pageable = new OffsetBasedRequest(offset, limit, sort);
+    Sort ascendingMeasurementCodeSort = Sort.by(Direction.ASC, MEASUREMENTCODE_PROPERTY);
+    var pageable = new OffsetBasedRequest(offset, limit, ascendingMeasurementCodeSort);
     var filter = mapToDatabaseFilter(measurementFilter);
     return pxpMeasurementJpaRepository.findAll(filter.asSpecification(), pageable)
         .get()
@@ -185,7 +188,8 @@ private NgsMeasurementLookup.MeasurementInfo toApiObject(String projectId,
           "Invalid sort keys for ip measurements: " + invalidSortKeys.stream()
               .map(Order::getProperty).toList());
     }
-    var pageable = new OffsetBasedRequest(offset, limit, sort);
+    Sort ascendingMeasurementCodeSort = Sort.by(Direction.ASC, MEASUREMENTCODE_PROPERTY);
+    var pageable = new OffsetBasedRequest(offset, limit, ascendingMeasurementCodeSort);
     var filter = mapToDatabaseFilter(measurementFilter);
     return ipMeasurementJpaRepository.findAll(filter.asSpecification(), pageable)
         .get()
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementRepositoryImplementation.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementRepositoryImplementation.java
index 1de0a39bf1..86db6f80da 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementRepositoryImplementation.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/MeasurementRepositoryImplementation.java
@@ -13,9 +13,9 @@
 import life.qbic.projectmanagement.application.measurement.MeasurementService.DeletionErrorCode;
 import life.qbic.projectmanagement.application.measurement.MeasurementService.MeasurementDeletionException;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
+import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementId;
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.ProteomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.sample.SampleCode;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/jpa/IpMeasurementJpaRepository.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/jpa/IpMeasurementJpaRepository.java
index 547e1ff73a..00775e6c97 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/jpa/IpMeasurementJpaRepository.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/experiment/measurement/jpa/IpMeasurementJpaRepository.java
@@ -44,12 +44,10 @@
 import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import life.qbic.application.commons.time.DateTimeFormat;
-import life.qbic.projectmanagement.application.measurement.IpMeasurementLookup.IpSortKey;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementId;
 import life.qbic.projectmanagement.infrastructure.PreventAnyUpdateEntityListener;
 import life.qbic.projectmanagement.infrastructure.experiment.measurement.jpa.IpMeasurementJpaRepository.Instrument.InstrumentReadConverter;
 import life.qbic.projectmanagement.infrastructure.experiment.measurement.jpa.IpMeasurementJpaRepository.IpMeasurementInformation;
-import org.hibernate.collection.spi.PersistentBag;
 import org.springframework.boot.jackson.JsonComponent;
 import org.springframework.data.convert.ReadingConverter;
 import org.springframework.data.jpa.domain.Specification;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClient.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClient.java
new file mode 100644
index 0000000000..18dcbf7281
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClient.java
@@ -0,0 +1,690 @@
+package life.qbic.projectmanagement.infrastructure.external.invenio;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpClient.Redirect;
+import java.net.http.HttpClient.Version;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.net.http.HttpResponse.BodyHandlers;
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.List;
+import java.util.Objects;
+import life.qbic.logging.api.Logger;
+import life.qbic.logging.service.LoggerFactory;
+
+/**
+ * Low-level HTTP client for the Invenio REST API.
+ *
+ * <p>DTOs model the InvenioRDM v12 record format (OpenAPI 3.1.1,
+ * API version 12.0.0), served at {@code GET /api/records} by both
+ * Zenodo and FDAT when requesting the content type
+ * {@code application/vnd.inveniordm.v1+json}. See
+ * <a href="https://inveniosoftware.github.io/invenio-openapi/">inveniosoftware.github.io/invenio-openapi</a>
+ * for the specification; the shape was verified against live FDAT and
+ * Zenodo responses.</p>
+ *
+ * <p>Implements the two endpoints required by FEAT-DATSET-01:
+ * <ul>
+ *   <li>{@code GET /api/records} — {@link #search(String, SearchParams)}
+ *       — paginated record search (operationId: {@code searchRecords})</li>
+ *   <li>{@code GET /api/records/{recordId}} —
+ *       {@link #getRecord(String, String)} — resolve a single record
+ *       (operationId: {@code getARecordById})</li>
+ * </ul>
+ *
+ * <p>Handles:
+ * <ul>
+ *   <li>HTTP communication with {@code java.net.http.HttpClient} (HTTP/2,
+ *       shared instance)</li>
+ *   <li>Bounded synchronous retry (ADR-0002 §7: 3 attempts, exponential
+ *       backoff, 5s ceiling) for transient errors: HTTP 5xx, 429, network
+ *       errors, timeouts</li>
+ *   <li>Retry-After header support on HTTP 429</li>
+ *   <li>JSON deserialization via Jackson</li>
+ * </ul>
+ *
+ * <p>Per ADR-0002 §9, HTTP 401/403/404 are <em>not</em> retried; they
+ * indicate permanent access/credential errors that must be reported
+ * back to the caller.</p>
+ *
+ * @since 1.12.0
+ */
+public interface InvenioRdmClient {
+
+  /**
+   * Base exception for all InvenioRDM client failures.
+   *
+   * <p>All specific exceptions extend this class. Callers may catch the
+   * base type to handle all client errors uniformly, or catch specific
+   * subclasses to differentiate between permanent failures, transient
+   * retry exhaustion, parsing errors, and interruptions.</p>
+   */
+  abstract class InvenioRdmException extends RuntimeException {
+    private final String url;
+
+    protected InvenioRdmException(String message, String url) {
+      super(message);
+      this.url = url;
+    }
+
+    protected InvenioRdmException(String message, Throwable cause, String url) {
+      super(message, cause);
+      this.url = url;
+    }
+
+    /** The request URL that caused this failure. */
+    public String getUrl() { return url; }
+  }
+
+  /**
+   * Thrown when the InvenioRDM server returns a permanent error (4xx) that
+   * is not retried, per ADR-0002 §9.
+   *
+   * <p>This covers HTTP 401, 403, 404, and other 4xx codes. HTTP 429
+   * (Too Many Requests) is treated as transient and is retried.</p>
+   *
+   * @see <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/401">HTTP 401</a>
+   * @see <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/403">HTTP 403</a>
+   * @see <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Status/404">HTTP 404</a>
+   */
+  final class InvenioRdmPermanentException extends InvenioRdmException {
+    private final int statusCode;
+
+    InvenioRdmPermanentException(String message, int statusCode, String url) {
+      super(message, url);
+      this.statusCode = statusCode;
+    }
+
+    /** The HTTP status code that caused this failure. */
+    public int getStatusCode() { return statusCode; }
+  }
+
+  /**
+   * Thrown when transient errors (5xx, 429, network failures) exhaust all
+   * retry attempts.
+   *
+   * <p>The client retries up to 3 times with exponential backoff for:
+   * <ul>
+   *   <li>HTTP 5xx server errors</li>
+   *   <li>HTTP 429 Too Many Requests (honours Retry-After header)</li>
+   *   <li>Network I/O errors (timeouts, connection refused, etc.)</li>
+   * </ul>
+   * After exhausting all retries, this exception is thrown.</p>
+   */
+  final class InvenioRdmTransientException extends InvenioRdmException {
+    private final int statusCode;  // -1 for I/O errors, otherwise HTTP status
+    private final int attempts;
+    private final Throwable lastError;
+
+    InvenioRdmTransientException(String message, int statusCode, int attempts,
+        Throwable lastError, String url) {
+      super(message, lastError, url);
+      this.statusCode = statusCode;
+      this.attempts = attempts;
+      this.lastError = lastError;
+    }
+
+    /** HTTP status code, or -1 for I/O errors. */
+    public int getStatusCode() { return statusCode; }
+
+    /** Number of attempts made. */
+    public int getAttempts() { return attempts; }
+
+    /** The last error encountered (HTTP exception or IOException). */
+    public Throwable getLastError() { return lastError; }
+  }
+
+  /**
+   * Thrown when the JSON response from the InvenioRDM server cannot be
+   * parsed.
+   *
+   * <p>This may indicate a server response format change or corruption.
+   * The response body is included in the exception message for diagnostics.</p>
+   */
+  final class InvenioRdmResponseParsingException extends InvenioRdmException {
+    private final Class<?> targetType;
+
+    InvenioRdmResponseParsingException(String message, Throwable cause, Class<?> targetType, String url) {
+      super(message, cause, url);
+      this.targetType = targetType;
+    }
+
+    /** The expected response type. */
+    public Class<?> getTargetType() { return targetType; }
+  }
+
+  /**
+   * Thrown when the HTTP request is interrupted.
+   *
+   * <p>This typically occurs if the calling thread is interrupted during
+   * the retry sleep period.</p>
+   */
+  final class InvenioRdmInterruptedException extends InvenioRdmException {
+    InvenioRdmInterruptedException(String message, Throwable cause, String url) {
+      super(message, cause, url);
+    }
+  }
+
+  /**
+   * Search for records matching the given parameters.
+   *
+   * @param instanceUrl the base URL of the InvenioRDM instance
+   * @param params search parameters (query, page, size)
+   * @return search results containing matching records
+   * @throws InvenioRdmPermanentException if the server returns a 4xx status code
+   *     that is not retried (401, 403, 404, etc.)
+   * @throws InvenioRdmTransientException if transient errors exhaust all retries
+   *     (5xx, 429, network failures after 3 attempts)
+   * @throws InvenioRdmResponseParsingException if the JSON response cannot be parsed
+   */
+  SearchResultResponse search(String instanceUrl, SearchParams params)
+      throws InvenioRdmPermanentException, InvenioRdmTransientException,
+             InvenioRdmResponseParsingException;
+  
+  /**
+   * Retrieve a single record by its ID.
+   *
+   * @param instanceUrl the base URL of the InvenioRDM instance
+   * @param recordId the record identifier
+   * @return the record details
+   * @throws InvenioRdmPermanentException if the server returns a 4xx status code
+   *     that is not retried (401, 403, 404, etc.)
+   * @throws InvenioRdmTransientException if transient errors exhaust all retries
+   *     (5xx, 429, network failures after 3 attempts)
+   * @throws InvenioRdmResponseParsingException if the JSON response cannot be parsed
+   */
+  RecordResponse getRecord(String instanceUrl, String recordId)
+      throws InvenioRdmPermanentException, InvenioRdmTransientException,
+             InvenioRdmResponseParsingException;
+
+  /**
+   * Parameters for a search request. All nullable fields are optional.
+   */
+  record SearchParams(
+      String query,
+      int page,
+      int size
+  ) {
+    public SearchParams {
+      if (page < 1) throw new IllegalArgumentException("page must be >= 1 for InvenioRDM API");
+      if (size <= 0) throw new IllegalArgumentException("size must be > 0");
+      // Zenodo max page size for anonymous is 25; clamp defensively for all instances
+      size = Math.min(size, 25);
+    }
+  }
+
+  /**
+   * Search endpoint response, mirroring InvenioRDM JSON structure.
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record SearchResultResponse(Hits hits) {
+    /**
+     * Paginated search results.
+     */
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    record Hits(int total, List<Hit> hits) {
+      /**
+       * Null-safe access to hit list — defaults to empty list.
+       */
+      public List<Hit> hits() {
+        return hits == null ? List.of() : hits;
+      }
+    }
+  }
+
+  /**
+   * Single search hit (v12).
+   *
+   * <p>In the v12 format ({@code application/vnd.inveniordm.v1+json}),
+   * both Zenodo and FDAT return identical shapes for hits. Access, PIDs,
+   * versions, and community membership are all top-level fields.</p>
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Hit(
+      @JsonProperty("id") String id,
+      @JsonProperty("links") HitLinks links,
+      @JsonProperty("metadata") HitMetadata metadata,
+      @JsonProperty("created") String created,
+      @JsonProperty("access") RecordAccess access,
+      @JsonProperty("pids") Pids pids,
+      @JsonProperty("versions") RecordVersions versions,
+      @JsonProperty("parent") Parent parent
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record HitLinks(
+      @JsonProperty("self_html") String selfHtml
+  ) {}
+
+  /**
+   * Persistent identifiers block (v12). DOIs are at
+   * {@code pids.doi.identifier}.
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Pids(
+      @JsonProperty("doi") PidEntry doi
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record PidEntry(
+      @JsonProperty("identifier") String identifier
+  ) {}
+
+  /**
+   * Version block (v12). {@code index} is 1-based; 0 indicates
+   * the first published version (Zenodo returns index 1 for the first).
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record RecordVersions(
+      @JsonProperty("is_latest") boolean isLatest,
+      @JsonProperty("index") int index
+  ) {}
+
+  /**
+   * Parent block (v12). Community membership is at
+   * {@code parent.communities.entries}, where each entry carries the
+   * community {@code slug} and {@code metadata.title}.
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Parent(
+      @JsonProperty("communities") ParentCommunities communities
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record ParentCommunities(
+      @JsonProperty("default") String defaultCommunity,
+      @JsonProperty("ids") List<String> ids,
+      @JsonProperty("entries") List<Community> entries
+  ) {}
+
+  /**
+   * A single community entry from {@code parent.communities.entries}
+   * (v12).
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Community(
+      @JsonProperty("id") String id,
+      @JsonProperty("slug") String slug,
+      @JsonProperty("metadata") CommunityMetadata metadata
+  ) {
+    /**
+     * Best-effort display label: prefers {@code metadata.title},
+     * then {@code slug}, then the raw {@code id}.
+     */
+    @JsonIgnore
+    public String displayLabel() {
+      if (metadata != null && metadata.title != null && !metadata.title.isBlank()) {
+        return metadata.title;
+      }
+      if (slug != null && !slug.isBlank()) {
+        return slug;
+      }
+      return id;
+    }
+  }
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record CommunityMetadata(
+      @JsonProperty("title") String title
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record HitMetadata(
+      @JsonProperty("title") String title,
+      @JsonProperty("publication_date") String publicationDate,
+      @JsonProperty("description") String description,
+      @JsonProperty("creators") List<Creator> creators,
+      @JsonProperty("resource_type") ResourceType resourceType
+  ) {}
+
+  /**
+   * Creator (v12). Identity is nested under {@code person_or_org};
+   * affiliations are siblings at the creator level.
+   *
+   * <p>{@link #resolvedName()} and {@link #resolvedAffiliation()} provide
+   * null-safe access to display values, extracting from
+   * {@code person_or_org.name} and the first affiliation entry.</p>
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Creator(
+      @JsonProperty("person_or_org") PersonOrOrg personOrOrg,
+      @JsonProperty("affiliations") List<Affiliation> affiliations
+  ) {
+    /**
+     * Null-safe access to the creator's display name.
+     * Extracts from {@code person_or_org.name}. Returns null if no person or organization is defined.
+     */
+    public String resolvedName() {
+      return (personOrOrg == null || personOrOrg.name == null
+          || personOrOrg.name.isBlank()) ? null : personOrOrg.name;
+    }
+
+    /**
+     * Null-safe access to the first affiliation's display name.
+     */
+    public String resolvedAffiliation() {
+      if (affiliations == null || affiliations.isEmpty()) return null;
+      Affiliation first = affiliations.getFirst();
+      return (first == null || first.name == null || first.name.isBlank())
+          ? null : first.name;
+    }
+  }
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record PersonOrOrg(
+      @JsonProperty("name") String name,
+      @JsonProperty("type") String type,
+      @JsonProperty("given_name") String givenName,
+      @JsonProperty("family_name") String familyName
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record Affiliation(
+      @JsonProperty("id") String id,
+      @JsonProperty("name") String name
+  ) {}
+
+  /**
+   * Resource type (v12). The title field is a localised object
+   * (e.g. {@code {"en": "Dataset"}}). {@link #resolvedTitle()} returns
+   * the {@code en} value when present, falling back to the first
+   * available language key.
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  final class ResourceType {
+    @JsonIgnore private String id;
+    @JsonIgnore private String resolvedTitle;
+
+    @JsonProperty("id")
+    private void setId(String id) {
+      this.id = id;
+    }
+
+    @JsonProperty("title")
+    private void setTitleRaw(JsonNode node) {
+      if (node == null || node.isNull()) {
+        resolvedTitle = null;
+        return;
+      }
+      if (node.isTextual()) {
+        resolvedTitle = node.asText();
+        return;
+      }
+      if (node.isObject()) {
+        if (node.has("en") && node.get("en").isTextual()) {
+          resolvedTitle = node.get("en").asText();
+        } else {
+          var it = node.fields();
+          if (it.hasNext()) {
+            JsonNode val = it.next().getValue();
+            resolvedTitle = val.isTextual() ? val.asText() : null;
+          } else {
+            resolvedTitle = null;
+          }
+        }
+      }
+    }
+
+    public String resolvedTitle() {
+      return resolvedTitle;
+    }
+  }
+
+  /**
+   * Single record detail response (v12).
+   */
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record RecordResponse(
+      @JsonProperty("id") String id,
+      @JsonProperty("links") HitLinks links,
+      @JsonProperty("metadata") RecordMetadata metadata,
+      @JsonProperty("created") String created,
+      @JsonProperty("updated") String updated,
+      @JsonProperty("is_published") boolean isPublished,
+      @JsonProperty("access") RecordAccess access,
+      @JsonProperty("pids") Pids pids,
+      @JsonProperty("versions") RecordVersions versions,
+      @JsonProperty("parent") Parent parent
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record RecordMetadata(
+      @JsonProperty("title") String title,
+      @JsonProperty("publication_date") String publicationDate,
+      @JsonProperty("description") String description,
+      @JsonProperty("creators") List<Creator> creators,
+      @JsonProperty("resource_type") ResourceType resourceType
+  ) {}
+
+  @JsonIgnoreProperties(ignoreUnknown = true)
+  record RecordAccess(
+      @JsonProperty("record") String invenioRecord,
+      @JsonProperty("files") String files,
+      @JsonProperty("status") String status
+  ) {}
+
+  /**
+   * Implementation of the InvenioRDM HTTP client.
+   *
+   * <p>Thread-safe: the underlying {@link HttpClient} is shared and
+   * connection pools are reused. Retries run synchronously on the
+   * calling thread (ADR-0002 §7).</p>
+   */
+  final class InvenioRdmHttpClient implements InvenioRdmClient {
+
+    private static final Logger log = LoggerFactory.logger(InvenioRdmHttpClient.class);
+
+    private static final int MAX_ATTEMPTS = 3;
+    private static final long INITIAL_BACKOFF_MS = 1000L;
+    private static final long MAX_BACKOFF_MS = 5000L;
+    private static final int HTTP_CONNECT_TIMEOUT_S = 10;
+    private static final int HTTP_REQUEST_TIMEOUT_S = 30;
+
+    private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper()
+        .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+
+    private final HttpClient httpClient;
+
+    public InvenioRdmHttpClient() {
+      this.httpClient = HttpClient.newBuilder()
+          .version(Version.HTTP_2)
+          .followRedirects(Redirect.NORMAL)
+          .connectTimeout(Duration.ofSeconds(HTTP_CONNECT_TIMEOUT_S))
+          .build();
+    }
+
+    @Override
+    public SearchResultResponse search(String instanceUrl, SearchParams params)
+        throws InvenioRdmPermanentException, InvenioRdmTransientException,
+               InvenioRdmResponseParsingException {
+      Objects.requireNonNull(instanceUrl, "instanceUrl must not be null");
+      Objects.requireNonNull(params, "params must not be null");
+
+      String url = buildSearchUrl(instanceUrl, params);
+      String body = getWithRetry(url, null, "search records");
+      return parseJson(body, SearchResultResponse.class);
+    }
+
+    @Override
+    public RecordResponse getRecord(String instanceUrl, String recordId)
+        throws InvenioRdmPermanentException, InvenioRdmTransientException,
+               InvenioRdmResponseParsingException {
+      Objects.requireNonNull(instanceUrl, "instanceUrl must not be null");
+      Objects.requireNonNull(recordId, "recordId must not be null");
+
+      String url = normalizeBaseUrl(instanceUrl) + "/api/records/"
+          + URLEncoder.encode(recordId, StandardCharsets.UTF_8);
+      String body = getWithRetry(url, null, "get record " + recordId);
+      return parseJson(body, RecordResponse.class);
+    }
+
+    // ── Internals ───────────────────────────────────────────────────
+
+    private String buildSearchUrl(String instanceUrl, SearchParams params) {
+      StringBuilder sb = new StringBuilder(normalizeBaseUrl(instanceUrl))
+          .append("/api/records?page=").append(params.page())
+          .append("&size=").append(params.size());
+      
+      // When there's a search query, rely on the API's default relevance-based sorting.
+      // When listing records without a query (browsing), sort by newest first.
+      if (params.query() != null && !params.query().isBlank()) {
+        sb.append("&q=").append(
+            URLEncoder.encode(params.query(), StandardCharsets.UTF_8));
+      } else {
+        sb.append("&sort=newest");
+      }
+      
+      return sb.toString();
+    }
+
+    private String normalizeBaseUrl(String url) {
+      return url.endsWith("/") ? url.substring(0, url.length() - 1) : url;
+    }
+
+    private String getWithRetry(String url, String authHeader, String operationName)
+        throws InvenioRdmPermanentException, InvenioRdmTransientException {
+      int retryCount = 0;
+      long backoffMs = INITIAL_BACKOFF_MS;
+      IOException lastIo = null;
+      Integer lastStatus = null;
+
+      while (retryCount < MAX_ATTEMPTS) {
+        int currentAttempt = retryCount + 1;
+        try {
+          var requestBuilder = HttpRequest.newBuilder()
+              .uri(URI.create(url))
+              .header("Accept", "application/vnd.inveniordm.v1+json")
+              .timeout(Duration.ofSeconds(HTTP_REQUEST_TIMEOUT_S))
+              .GET();
+          if (authHeader != null) {
+            requestBuilder.header("Authorization", authHeader);
+          }
+          HttpResponse<String> response = httpClient.send(
+              requestBuilder.build(), BodyHandlers.ofString());
+
+          int status = response.statusCode();
+
+          // Success
+          if (isSuccess(status)) {
+            return response.body();
+          }
+
+          // Permanent failure: 4xx (except 429) — don't retry
+          if (isClientError(status) && !isTooManyRequests(status)) {
+            throw new InvenioRdmPermanentException(
+                "InvenioRDM request failed (%s) with status %d. URL: %s"
+                    .formatted(operationName, status, url),
+                status, url);
+          }
+
+          // Transient: 5xx or 429 — retry with Retry-After honouring
+          lastStatus = status;
+          if (currentAttempt < MAX_ATTEMPTS) {
+            long waitMs = status == 429
+                ? parseRetryAfter(response, backoffMs)
+                : backoffMs;
+            log.warn("InvenioRDM transient failure (%s), status=%d, retrying in %dms (attempt %d/%d)"
+                .formatted(operationName, status, waitMs, currentAttempt, MAX_ATTEMPTS));
+            sleep(waitMs);
+            backoffMs = Math.min(backoffMs * 2, MAX_BACKOFF_MS);
+            retryCount++;
+            continue;
+          }
+
+          // Exhausted retries on transient
+          throw new InvenioRdmTransientException(
+              "InvenioRDM request failed (%s) with status %d after %d attempts. URL: %s"
+                  .formatted(operationName, status, MAX_ATTEMPTS, url),
+              status, MAX_ATTEMPTS, null, url);
+
+        } catch (IOException e) {
+          lastIo = e;
+          if (currentAttempt < MAX_ATTEMPTS) {
+            log.warn("InvenioRDM I/O error (%s): %s, retrying in %dms (attempt %d/%d)"
+                .formatted(operationName, e.getMessage(), backoffMs, currentAttempt, MAX_ATTEMPTS));
+            sleep(backoffMs);
+            backoffMs = Math.min(backoffMs * 2, MAX_BACKOFF_MS);
+            retryCount++;
+          }
+        } catch (InterruptedException e) {
+          Thread.currentThread().interrupt();
+          throw new InvenioRdmInterruptedException(
+              "InvenioRDM request interrupted (%s)".formatted(operationName),
+              e, url);
+        }
+      }
+
+      throw new InvenioRdmTransientException(
+          "InvenioRDM request failed (%s) after %d attempts. Last status=%s, last error=%s. URL: %s"
+              .formatted(operationName, MAX_ATTEMPTS, lastStatus,
+                  lastIo == null ? "n/a" : lastIo.getMessage(), url),
+          lastStatus != null ? lastStatus : -1, MAX_ATTEMPTS, lastIo, url);
+    }
+
+    /**
+     * Returns true if the status code is a success (2xx).
+     * @param status the status code to check
+     * @return true if the status code is a success (2xx)
+     */
+    private static boolean isSuccess(int status) {
+      return status >= 200 && status < 300;
+    }
+
+    /**
+     * Returns true if the status code is a client error (4xx).
+     * @param status the status code to check
+     * @return true if the status code is a client error (4xx)
+     */
+    private static boolean isClientError(int status) {
+      return status >= 400 && status < 500;
+    }
+
+    /**
+     * Returns true if the status code is 429 Too Many Requests.
+     * @param status the status code to check
+     * @return true if the status code is 429 Too Many Requests
+     */
+    private static boolean isTooManyRequests(int status) {
+      return status == 429;
+    }
+
+    private long parseRetryAfter(HttpResponse<String> response, long fallbackMs) {
+      String header = response.headers().firstValue("Retry-After").orElse(null);
+      if (header == null) return fallbackMs;
+      try {
+        long seconds = Long.parseLong(header);
+        return Math.min(seconds * 1000L, MAX_BACKOFF_MS);
+      } catch (NumberFormatException e) {
+        return fallbackMs;
+      }
+    }
+
+    private void sleep(long ms) {
+      try {
+        Thread.sleep(ms);
+      } catch (InterruptedException e) {
+        Thread.currentThread().interrupt();
+      }
+    }
+
+    private <T> T parseJson(String body, Class<T> type) {
+      try {
+        return OBJECT_MAPPER.readValue(body, type);
+      } catch (IOException e) {
+        throw new InvenioRdmResponseParsingException(
+            "Failed to parse InvenioRDM JSON response as " + type.getSimpleName(),
+            e, type, null);
+      }
+    }
+  }
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmDatasetSource.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmDatasetSource.java
new file mode 100644
index 0000000000..9c7d738665
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmDatasetSource.java
@@ -0,0 +1,296 @@
+package life.qbic.projectmanagement.infrastructure.external.invenio;
+
+import static life.qbic.logging.service.LoggerFactory.logger;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import life.qbic.logging.api.Logger;
+import life.qbic.projectmanagement.application.associated_dataset.DatasetResolveException;
+import life.qbic.projectmanagement.application.associated_dataset.DatasetSearchException;
+import life.qbic.projectmanagement.application.associated_dataset.DatasetSource;
+import life.qbic.projectmanagement.application.associated_dataset.InstanceConfig;
+import life.qbic.projectmanagement.application.associated_dataset.SearchHit;
+import life.qbic.projectmanagement.application.associated_dataset.SearchQuery;
+import life.qbic.projectmanagement.application.associated_dataset.SearchResult;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel;
+import life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus;
+import life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmResourceMetadata;
+import life.qbic.projectmanagement.domain.model.associated_dataset.ResourceMetadata;
+
+/**
+ * Infrastructure adapter implementing the {@link DatasetSource} port for
+ * InvenioRDM v12-based repositories.
+ *
+ * <p>With the {@code Accept: application/vnd.inveniordm.v1+json} request
+ * header (set by {@link InvenioRdmClient}), both Zenodo and FDAT return
+ * identical InvenioRDM v12 record shapes from {@code GET /api/records}
+ * and {@code GET /api/records/{id}}. This adapter models that single
+ * format; no version negotiation or response shimming is needed.</p>
+ *
+ * <p>Per ADR-0002 P2, this adapter is stateless — there is no session
+ * with the external service.</p>
+ *
+ * @since 1.12.0
+ */
+public class InvenioRdmDatasetSource implements DatasetSource {
+
+  private static final Logger log = logger(InvenioRdmDatasetSource.class);
+
+  private final InvenioRdmClient client;
+
+  public InvenioRdmDatasetSource(InvenioRdmClient client) {
+    this.client = Objects.requireNonNull(client, "client must not be null");
+  }
+
+  // ── Port implementation ─────────────────────────────────────────────
+
+  @Override
+  public SearchResult search(SearchQuery query, InstanceConfig config,
+      String actingUserId) throws DatasetSearchException {
+    Objects.requireNonNull(query, "query must not be null");
+    Objects.requireNonNull(config, "config must not be null");
+
+    // Endpoint uses 1-based page indexing
+    int invenioPage = query.page() + 1;
+    var params = new InvenioRdmClient.SearchParams(
+        query.effectiveQuery(), invenioPage, query.pageSize());
+
+    try {
+      var response = client.search(config.baseUrl(), params);
+      List<SearchHit> hits = mapSearchHits(response, config.displayName());
+      return new SearchResult(hits, response.hits().total(), query.page(),
+          query.pageSize());
+    } catch (InvenioRdmClient.InvenioRdmException e) {
+      log.error("Search failed on %s for query '%s'".formatted(
+          config.displayName(), query.effectiveQuery()));
+      throw new DatasetSearchException("Search failed", e);
+    }
+  }
+
+  @Override
+  public Optional<ResourceMetadata> resolveMetadata(
+      String externalHandleValue, InstanceConfig config,
+      String actingUserId) throws DatasetResolveException {
+    Objects.requireNonNull(externalHandleValue,
+        "externalHandleValue must not be null");
+    Objects.requireNonNull(config, "config must not be null");
+
+    try {
+      var invenioRecord = client.getRecord(config.baseUrl(), externalHandleValue);
+      InvenioRdmResourceMetadata metadata = mapRecordToResourceMetadata(
+          invenioRecord, config.displayName());
+      return Optional.of(metadata);
+    } catch (InvenioRdmClient.InvenioRdmException e) {
+      if (e instanceof InvenioRdmClient.InvenioRdmPermanentException pe
+          && pe.getStatusCode() == 404) {
+        return Optional.empty();
+      }
+      log.error("Failed to resolve record %s on %s"
+          .formatted(externalHandleValue, config.displayName()));
+      throw new DatasetResolveException("Failed to resolve metadata record", e);
+    }
+  }
+
+  // ── Mapping: v12 response → DTO ─────────────────────────────────────
+
+  private List<SearchHit> mapSearchHits(
+      InvenioRdmClient.SearchResultResponse response,
+      String resourceProvider) {
+    List<SearchHit> hits = new ArrayList<>();
+    var hitsResult = response.hits();
+    if (hitsResult == null || hitsResult.hits() == null) {
+      return hits;
+    }
+    for (InvenioRdmClient.Hit h : hitsResult.hits()) {
+      try {
+        hits.add(mapHit(h, resourceProvider));
+      } catch (Exception e) {
+        log.warn("Skipping malformed search hit (id=%s): %s"
+            .formatted(h.id(), e.getMessage()));
+      }
+    }
+    return hits;
+  }
+
+  private SearchHit mapHit(InvenioRdmClient.Hit h, String resourceProvider) {
+    String title = safeHitTitle(h);
+    String pid = safePid(h.pids(), h.id());
+    LocalDate publicationDate = parseDateOrToday(
+        h.metadata() != null ? h.metadata().publicationDate() : null);
+    String description = h.metadata() != null ? h.metadata().description() : null;
+    String version = versionString(h.versions());
+
+    // v12 access block lives at the response top level.
+    AccessLevel accessLevel = accessLevel(h.access());
+    String accessDetail = accessDetail(h.access());
+
+    return new SearchHit(
+        String.valueOf(h.id()),
+        title, pid, version, publicationDate, resourceProvider,
+        description, accessLevel == AccessLevel.PUBLIC, accessDetail
+    );
+  }
+
+  private InvenioRdmResourceMetadata mapRecordToResourceMetadata(
+      InvenioRdmClient.RecordResponse rec, String resourceProvider) {
+    String title = safeRecordTitle(rec);
+    String pid = safePid(rec.pids(), rec.id());
+    LocalDate publicationDate = parseDateOrToday(
+        rec.metadata() != null ? rec.metadata().publicationDate() : null);
+    String description = rec.metadata() != null
+        ? rec.metadata().description() : null;
+    String resourceType = resolvedResourceType(
+        rec.metadata() != null ? rec.metadata().resourceType() : null);
+    List<String> creators = resolvedCreators(
+        rec.metadata() != null ? rec.metadata().creators() : null);
+    String version = versionString(rec.versions());
+    String accessLink = selfHtmlLink(rec.links());
+    String community = community(rec.parent());
+
+    // v12 access block lives at the response top level.
+    InvenioRdmAccessStatus recordAccess = recordAccessStatus(rec.access());
+    InvenioRdmAccessStatus fileAccess = fileAccessStatus(rec.access());
+
+    return new InvenioRdmResourceMetadata(
+        title, pid, version, accessLink,
+        resourceProvider, creators, resourceType,
+        community,
+        publicationDate, description,
+        recordAccess, fileAccess
+    );
+  }
+
+  // ── Field extractors (package-private for testing) ──────────────────
+
+  /**
+   * Extracts the primary community display label from a v12 record's
+   * {@code parent.communities.entries} list. Returns the first entry's
+   * human-readable label, or null when the record belongs to no
+   * community.
+   */
+  static String community(InvenioRdmClient.Parent parent) {
+    var communities = parent != null ? parent.communities() : null;
+    var entries = communities != null ? communities.entries() : null;
+    if (entries == null || entries.isEmpty()) {
+      return null;
+    }
+    InvenioRdmClient.Community first = entries.getFirst();
+    return first != null ? first.displayLabel() : null;
+  }
+
+  /**
+   * v12 access status: {@code access.status} of {@code "open"} is
+   * PUBLIC, everything else is RESTRICTED.
+   */
+  static AccessLevel accessLevel(InvenioRdmClient.RecordAccess access) {
+    String status = access != null ? access.status() : null;
+    if (status == null || status.isBlank()) {
+      return AccessLevel.RESTRICTED;
+    }
+    return "open".equalsIgnoreCase(status)
+        ? AccessLevel.PUBLIC : AccessLevel.RESTRICTED;
+  }
+
+  static String accessDetail(InvenioRdmClient.RecordAccess access) {
+    String recordLabel = access != null && access.invenioRecord() != null
+        ? access.invenioRecord().toLowerCase() : "unknown";
+    String filesLabel = access != null && access.files() != null
+        ? access.files().toLowerCase() : "unknown";
+    return "Record: " + recordLabel + " | Files: " + filesLabel;
+  }
+
+  static InvenioRdmAccessStatus recordAccessStatus(
+      InvenioRdmClient.RecordAccess access) {
+    if (access == null) return InvenioRdmAccessStatus.PUBLIC;
+    String rec = access.invenioRecord() != null ? access.invenioRecord() : access.status();
+    return mapAccessStatus(rec);
+  }
+
+  static InvenioRdmAccessStatus fileAccessStatus(
+      InvenioRdmClient.RecordAccess access) {
+    if (access == null) return InvenioRdmAccessStatus.PUBLIC;
+    String files = access.files() != null ? access.files() : access.status();
+    return mapAccessStatus(files);
+  }
+
+  static InvenioRdmAccessStatus mapAccessStatus(String value) {
+    if (value == null || value.isBlank()) {
+      return InvenioRdmAccessStatus.PUBLIC;
+    }
+    return switch (value.toLowerCase()) {
+      case "public", "open" -> InvenioRdmAccessStatus.PUBLIC;
+      case "restricted" -> InvenioRdmAccessStatus.RESTRICTED;
+      case "embargoed" -> InvenioRdmAccessStatus.EMBARGOED;
+      default -> InvenioRdmAccessStatus.RESTRICTED;
+    };
+  }
+
+  /**
+   * v12 PID extraction: DOI lives at {@code pids.doi.identifier}.
+   * Falls back to the record {@code id} when no DOI is present.
+   */
+  static String safePid(InvenioRdmClient.Pids pids, String recordId) {
+    var doi = pids != null ? pids.doi() : null;
+    var identifier = doi != null ? doi.identifier() : null;
+    if (identifier != null && !identifier.isBlank()) {
+      return identifier;
+    }
+    return String.valueOf(recordId);
+  }
+
+  /**
+   * v12 version string: {@code versions.index} is 1-based.
+   * Returns "v{index}" when present and positive, null otherwise.
+   */
+  static String versionString(InvenioRdmClient.RecordVersions versions) {
+    if (versions == null) return null;
+    return versions.index() <= 0 ? null : "v" + versions.index();
+  }
+
+  static List<String> resolvedCreators(
+      List<InvenioRdmClient.Creator> raw) {
+    if (raw == null) return List.of();
+    return raw.stream()
+        .filter(c -> c != null && c.resolvedName() != null)
+        .map(InvenioRdmClient.Creator::resolvedName)
+        .toList();
+  }
+
+  static String resolvedResourceType(InvenioRdmClient.ResourceType rt) {
+    if (rt == null) return null;
+    return rt.resolvedTitle();
+  }
+
+  static String selfHtmlLink(InvenioRdmClient.HitLinks links) {
+    return links != null ? links.selfHtml() : null;
+  }
+
+  static String safeHitTitle(InvenioRdmClient.Hit h) {
+    var title = h.metadata() != null ? h.metadata().title() : null;
+    if (title != null && !title.isBlank()) {
+      return title;
+    }
+    return "(untitled record)";
+  }
+
+  static String safeRecordTitle(InvenioRdmClient.RecordResponse rec) {
+    var title = rec.metadata() != null ? rec.metadata().title() : null;
+    if (title != null && !title.isBlank()) {
+      return title;
+    }
+    return "(untitled record)";
+  }
+
+  static LocalDate parseDateOrToday(String raw) {
+    if (raw == null || raw.isBlank()) return LocalDate.now();
+    try {
+      return LocalDate.parse(raw);
+    } catch (DateTimeParseException e) {
+      return LocalDate.now();
+    }
+  }
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmProperties.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmProperties.java
new file mode 100644
index 0000000000..826230d976
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmProperties.java
@@ -0,0 +1,59 @@
+package life.qbic.projectmanagement.infrastructure.external.invenio;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.validation.annotation.Validated;
+
+/**
+ * Configuration properties for InvenioRDM instance registry.
+ *
+ * <p>Instances are admin-configured (ADR-0002 I2). Example
+ * {@code application.properties}:</p>
+ *
+ * <pre>
+ * qbic.external-service.invenio-rdm.instances[0].id=zenodo
+ * qbic.external-service.invenio-rdm.instances[0].display-name=Zenodo (zenodo.org)
+ * qbic.external-service.invenio-rdm.instances[0].base-url=https://zenodo.org
+ * qbic.external-service.invenio-rdm.instances[1].id=fdat
+ * qbic.external-service.invenio-rdm.instances[1].display-name=FDAT (fdat.uni-tuebingen.de)
+ * qbic.external-service.invenio-rdm.instances[1].base-url=https://fdat.uni-tuebingen.de
+ * </pre>
+ *
+ * @since 1.12.0
+ */
+@ConfigurationProperties(prefix = "qbic.external-service.invenio-rdm")
+@Validated
+public class InvenioRdmProperties {
+
+  private List<InstanceEntry> instances = new ArrayList<>();
+
+  public List<InstanceEntry> getInstances() {
+    return instances;
+  }
+
+  public void setInstances(List<InstanceEntry> instances) {
+    this.instances = instances;
+  }
+
+  /**
+   * Configuration entry for a single InvenioRDM instance.
+   *
+   * <p>Bound from indexed properties such as
+   * {@code qbic.external-service.invenio-rdm.instances[0].id}.</p>
+   *
+   * <p>Fields {@code sourceType} and {@code apiVersion} are optional
+   * (nullable). Callers must resolve defaults:
+   * <ul>
+   *   <li>{@code sourceType} → {@literal "INVENIO_RDM"}</li>
+   *   <li>{@code apiVersion} → {@literal "12"}</li>
+   * </ul></p>
+   */
+  public record InstanceEntry(
+      String id,
+      String displayName,
+      String baseUrl,
+      String sourceType,
+      String apiVersion
+  ) {}
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/PropertiesBackedSourceInstanceRegistry.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/PropertiesBackedSourceInstanceRegistry.java
new file mode 100644
index 0000000000..440bdc0e66
--- /dev/null
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/external/invenio/PropertiesBackedSourceInstanceRegistry.java
@@ -0,0 +1,60 @@
+package life.qbic.projectmanagement.infrastructure.external.invenio;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import life.qbic.logging.api.Logger;
+import life.qbic.logging.service.LoggerFactory;
+import life.qbic.projectmanagement.application.associated_dataset.SourceInstanceDescriptor;
+import life.qbic.projectmanagement.application.associated_dataset.SourceInstanceRegistry;
+import life.qbic.projectmanagement.domain.model.associated_dataset.SourceType;
+
+/**
+ * {@link SourceInstanceRegistry} backed by Spring-injected
+ * {@link InvenioRdmProperties}.
+ *
+ * <p>The instance list is loaded once at application startup from
+ * {@code application.properties} (see {@link InvenioRdmProperties}).
+ * Adding a new instance requires a config change + redeploy (ADR-0002
+ * I2); users cannot add arbitrary URLs via the UI.</p>
+ *
+ * @since 1.12.0
+ */
+public class PropertiesBackedSourceInstanceRegistry implements SourceInstanceRegistry {
+
+  private static final Logger log = LoggerFactory.logger(
+      PropertiesBackedSourceInstanceRegistry.class);
+
+  private final List<SourceInstanceDescriptor> descriptors;
+
+  public PropertiesBackedSourceInstanceRegistry(InvenioRdmProperties properties) {
+    Objects.requireNonNull(properties, "properties must not be null");
+    this.descriptors = properties.getInstances().stream()
+        .filter(e -> e.id() != null && e.baseUrl() != null)
+        .map(e -> new SourceInstanceDescriptor(
+            e.id(),
+            e.displayName() != null ? e.displayName() : e.id(),
+            e.baseUrl()))
+        .toList();
+    log.info("Loaded %d InvenioRDM instance(s): %s"
+        .formatted(descriptors.size(),
+            descriptors.stream().map(SourceInstanceDescriptor::id).toList()));
+  }
+
+  @Override
+  public Optional<SourceInstanceDescriptor> find(String instanceId) {
+    Objects.requireNonNull(instanceId, "instanceId must not be null");
+    return descriptors.stream()
+        .filter(d -> d.id().equals(instanceId))
+        .findFirst();
+  }
+
+  @Override
+  public List<SourceInstanceDescriptor> findBySourceType(SourceType sourceType) {
+    Objects.requireNonNull(sourceType, "sourceType must not be null");
+    if (sourceType != SourceType.INVENIO_RDM) {
+      return List.of();
+    }
+    return descriptors;
+  }
+}
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/MockConnector.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/MockConnector.java
index 9f58ab3341..c57c505ade 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/MockConnector.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/MockConnector.java
@@ -12,8 +12,8 @@
 import life.qbic.projectmanagement.application.dataset.RemoteRawDataLookup;
 import life.qbic.projectmanagement.application.dataset.RemoteRawDataService;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
-import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
+import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.ProteomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.project.Project;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/OpenbisConnector.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/OpenbisConnector.java
index fd31e20ca8..59f64ed5c0 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/OpenbisConnector.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sample/openbis/OpenbisConnector.java
@@ -64,9 +64,9 @@
 import life.qbic.projectmanagement.application.dataset.RemoteRawDataService.RawData;
 import life.qbic.projectmanagement.application.dataset.RemoteRawDataService.RawDataDatasetInformation;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
+import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementId;
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.ProteomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.project.Project;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkEntry.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkEntry.java
index 9fd6bdeebb..46a45a26a8 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkEntry.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/sync/WatermarkEntry.java
@@ -6,7 +6,6 @@
 import jakarta.persistence.Table;
 import java.io.Serializable;
 import java.time.Instant;
-import java.util.Date;
 import java.util.Objects;
 import org.springframework.lang.NonNull;
 
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/TemplateProviderOpenXML.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/TemplateProviderOpenXML.java
index 8798108254..2c05949733 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/TemplateProviderOpenXML.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/TemplateProviderOpenXML.java
@@ -7,15 +7,14 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Optional;
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.application.api.fair.DigitalObject;
 import life.qbic.projectmanagement.application.api.template.TemplateProvider;
-import life.qbic.projectmanagement.application.api.template.TemplateProvider.MeasurementInformationCollectionIP;
-import life.qbic.projectmanagement.application.api.template.TemplateProvider.MeasurementInformationIP;
-import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.MeasurementTemplateFactory;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.IpEditFactory.MeasurementEntryIP;
+import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.MeasurementTemplateFactory;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.NgsEditFactory.MeasurementEntryNGS;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.ProteomicsEditFactory.MeasurementEntryPxP;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory.SampleTemplateFactory;
@@ -92,7 +91,10 @@ private Workbook forRequest(MeasurementInformationCollectionPxP req) {
     var entries = req.measurements().stream()
         .flatMap(value -> fromRequest(value).stream())
         .toList();
-    return measurementTemplateFactory.forUpdatePxP(entries).createWorkbook();
+    var sortedPxPMeasurements = new ArrayList<>(entries);
+    sortedPxPMeasurements.sort(
+        Comparator.comparing(MeasurementEntryPxP::measurementId));
+    return measurementTemplateFactory.forUpdatePxP(sortedPxPMeasurements).createWorkbook();
   }
 
   private DigitalObject getTemplate(MeasurementInformationCollectionNGS req) {
@@ -105,7 +107,10 @@ private Workbook forRequest(MeasurementInformationCollectionNGS req) {
     var entries = req.measurements().stream()
         .flatMap(value -> fromRequest(value).stream())
         .toList();
-    return measurementTemplateFactory.forUpdateNGS(entries).createWorkbook();
+    var sortedNGSMeasurements = new ArrayList<>(entries);
+    sortedNGSMeasurements.sort(
+        Comparator.comparing(MeasurementEntryNGS::measurementId));
+    return measurementTemplateFactory.forUpdateNGS(sortedNGSMeasurements).createWorkbook();
   }
 
   private static List<MeasurementEntryPxP> fromRequest(MeasurementInformationPxP req) {
@@ -177,7 +182,10 @@ private Workbook forRequest(MeasurementInformationCollectionIP req) {
     var entries = req.measurements().stream()
         .flatMap(value -> fromRequest(value).stream())
         .toList();
-    return measurementTemplateFactory.forUpdateIP(entries).createWorkbook();
+    var sortedIPMeasurements = new ArrayList<>(entries);
+    sortedIPMeasurements.sort(
+        Comparator.comparing(MeasurementEntryIP::measurementId));
+    return measurementTemplateFactory.forUpdateIP(sortedIPMeasurements).createWorkbook();
   }
 
   private static List<MeasurementEntryIP> fromRequest(MeasurementInformationIP req) {
@@ -227,8 +235,11 @@ private Workbook forRequest(SampleRegistration req) {
   }
 
   private Workbook forRequest(SampleInformation req) {
+    var sortedSamples = new ArrayList<>(req.samples());
+    sortedSamples.sort(Comparator.comparing(sample -> sample.sampleCode().code(),
+        Comparator.naturalOrder()));
     return sampleTemplateFactory.forInformation(
-        req.samples(),
+        sortedSamples,
         req.analysisMethods(),
         req.conditions(),
         req.analytes(),
@@ -242,8 +253,11 @@ private Workbook forRequest(SampleInformation req) {
 
   private Workbook forRequest(SampleUpdate req) {
     var info = req.information();
+    var sortedSamples = req.information().samples();
+    sortedSamples.sort(Comparator.comparing(sample -> sample.sampleCode().code(),
+        Comparator.naturalOrder()));
     return sampleTemplateFactory.forUpdate(
-        info.samples(),
+        sortedSamples,
         info.analysisMethods(),
         info.conditions(),
         info.analytes(),
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpEditFactory.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpEditFactory.java
index 6ebb38950f..65c7fb0dc2 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpEditFactory.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpEditFactory.java
@@ -3,7 +3,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
-import java.util.function.BinaryOperator;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.Column;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.WorkbookFactory;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.column.IPMeasurementEditColumn;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpRegisterFactory.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpRegisterFactory.java
index c46632910b..2f1e7dc420 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpRegisterFactory.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/IpRegisterFactory.java
@@ -1,7 +1,6 @@
 package life.qbic.projectmanagement.infrastructure.template.provider.openxml.factory;
 
 import java.util.Optional;
-import java.util.function.BinaryOperator;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.Column;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.WorkbookFactory;
 import life.qbic.projectmanagement.infrastructure.template.provider.openxml.column.IPMeasurementRegisterColumn;
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/MeasurementTemplateFactory.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/MeasurementTemplateFactory.java
index 66a6424ec8..817611f95b 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/MeasurementTemplateFactory.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/MeasurementTemplateFactory.java
@@ -15,16 +15,21 @@
  */
 public class MeasurementTemplateFactory {
 
+  /**
+   * @param measurements expected to be pre-sorted by ascending measurement code ascending
+   */
   public WorkbookFactory forUpdateNGS(List<MeasurementEntryNGS> measurements) {
 
     return new NgsEditFactory(measurements);
   }
 
+  /** @param measurements expected to be pre-sorted by ascending measurement code ascending */
   public WorkbookFactory forUpdatePxP(List<MeasurementEntryPxP> measurements) {
 
     return new ProteomicsEditFactory(measurements);
   }
 
+  /** @param measurements expected to be pre-sorted by ascending measurement code ascending */
   public WorkbookFactory forUpdateIP(List<MeasurementEntryIP> measurements) {
 
     return new IpEditFactory(measurements);
diff --git a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/SampleTemplateFactory.java b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/SampleTemplateFactory.java
index ac5fa7f41e..c71b661535 100644
--- a/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/SampleTemplateFactory.java
+++ b/project-management-infrastructure/src/main/java/life/qbic/projectmanagement/infrastructure/template/provider/openxml/factory/SampleTemplateFactory.java
@@ -41,7 +41,7 @@ public WorkbookFactory forRegistration(List<String> analysisMethods, List<String
   }
 
   /**
-   * @param samples                   the samples to be updated
+   * @param samples                   the samples to be updated expected to be presorted by default in an ascending manner
    * @param analysisMethods           the analysis methods planned
    * @param conditions                the conditions available from the experimental design
    * @param analytes                  the analytes planned for measurement
@@ -71,7 +71,7 @@ public WorkbookFactory forUpdate(List<Sample> samples, List<String> analysisMeth
   }
 
   /**
-   * @param samples                   the target samples to display the information for
+   * @param samples                   the target samples to display the information for, expected to be presorted by default in an ascending manner
    * @param analysisMethods           the analysis methods planned
    * @param conditions                the conditions available from the experimental design
    * @param analytes                  the analytes planned for measurement
diff --git a/project-management-infrastructure/src/test/groovy/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClientParsingSpec.groovy b/project-management-infrastructure/src/test/groovy/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClientParsingSpec.groovy
new file mode 100644
index 0000000000..f6c29d6cd6
--- /dev/null
+++ b/project-management-infrastructure/src/test/groovy/life/qbic/projectmanagement/infrastructure/external/invenio/InvenioRdmClientParsingSpec.groovy
@@ -0,0 +1,608 @@
+package life.qbic.projectmanagement.infrastructure.external.invenio
+
+import com.fasterxml.jackson.databind.DeserializationFeature
+import com.fasterxml.jackson.databind.ObjectMapper
+import spock.lang.Specification
+
+/**
+ * Unit tests for InvenioRDM v12 response JSON parsing.
+ *
+ * <p>Verifies that the DTOs in {@link InvenioRdmClient} correctly
+ * deserialize responses produced by InvenioRDM v12 deployments when
+ * {@code Accept: application/vnd.inveniordm.v1+json} is sent. Both
+ * FDAT and modern Zenodo serve identical v12 JSON under that header,
+ * so the fixtures below are representative of both.</p>
+ *
+ * @since 1.12.0
+ */
+class InvenioRdmClientParsingSpec extends Specification {
+
+  private static final ObjectMapper MAPPER = new ObjectMapper()
+      .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
+
+  // ── Record detail response parsing ──────────────────────────────────
+
+  def "parses v12 record detail response with community"() {
+    given: "a v12 record response (Zenodo/FDAT shape with v12 Accept header)"
+    def json = '''
+    {
+      "id": "abc-123",
+      "links": {
+        "self_html": "https://fdat.example.org/records/abc-123"
+      },
+      "created": "2024-06-15T10:00:00.000000+00:00",
+      "updated": "2024-07-01T12:00:00.000000+00:00",
+      "is_published": true,
+      "access": {
+        "record": "public",
+        "files": "public",
+        "embargo": { "active": false, "until": null, "reason": null },
+        "status": "open"
+      },
+      "pids": {
+        "doi": {
+          "identifier": "10.57754/FDAT.abc-123",
+          "provider": "datacite",
+          "client": "datacite"
+        }
+      },
+      "versions": { "is_latest": true, "index": 3 },
+      "parent": {
+        "communities": {
+          "default": "73eb987a-a71f-4ed7-950f-a4b68192d85d",
+          "ids": ["73eb987a-a71f-4ed7-950f-a4b68192d85d"],
+          "entries": [
+            {
+              "id": "73eb987a-a71f-4ed7-950f-a4b68192d85d",
+              "slug": "humanities",
+              "metadata": {
+                "title": "Faculty of Humanities",
+                "type": { "id": "organization" }
+              },
+              "access": { "visibility": "public" }
+            }
+          ]
+        }
+      },
+      "metadata": {
+        "title": "Test Record With Community",
+        "publication_date": "2024-06-15",
+        "description": "<p>A test record.</p>",
+        "creators": [
+          {
+            "person_or_org": {
+              "type": "personal",
+              "name": "Smith, Alice",
+              "given_name": "Alice",
+              "family_name": "Smith"
+            },
+            "affiliations": [{ "id": "01xyz", "name": "University A" }]
+          },
+          {
+            "person_or_org": {
+              "type": "personal",
+              "name": "Jones, Bob",
+              "given_name": "Bob",
+              "family_name": "Jones"
+            },
+            "affiliations": []
+          }
+        ],
+        "resource_type": { "id": "dataset", "title": { "en": "Dataset" } }
+      }
+    }
+    '''
+
+    when:
+    def rec = MAPPER.readValue(json, InvenioRdmClient.RecordResponse)
+
+    then: "core fields are parsed"
+    rec.id == "abc-123"
+    rec.isPublished
+    rec.links.selfHtml == "https://fdat.example.org/records/abc-123"
+    rec.access.status == "open"
+    rec.access.invenioRecord == "public"
+    rec.access.files == "public"
+    rec.pids.doi.identifier == "10.57754/FDAT.abc-123"
+    rec.versions.index == 3
+    rec.versions.isLatest
+
+    and: "metadata is parsed"
+    rec.metadata.title == "Test Record With Community"
+    rec.metadata.publicationDate == "2024-06-15"
+    rec.metadata.description == "<p>A test record.</p>"
+    rec.metadata.creators.size() == 2
+    rec.metadata.creators[0].resolvedName() == "Smith, Alice"
+    rec.metadata.creators[1].resolvedName() == "Jones, Bob"
+    rec.metadata.resourceType.resolvedTitle() == "Dataset"
+
+    and: "community is extracted from parent.communities.entries"
+    rec.parent != null
+    rec.parent.communities != null
+    rec.parent.communities.defaultCommunity == "73eb987a-a71f-4ed7-950f-a4b68192d85d"
+    rec.parent.communities.entries.size() == 1
+    rec.parent.communities.entries[0].displayLabel() == "Faculty of Humanities"
+  }
+
+  def "parses v12 record without community (null parent)"() {
+    given: "a v12 record response with no parent block"
+    def json = '''
+    {
+      "id": "xyz-456",
+      "is_published": true,
+      "access": { "record": "public", "files": "public", "status": "open" },
+      "pids": { "doi": { "identifier": "10.57754/FDAT.xyz-456" } },
+      "versions": { "is_latest": true, "index": 1 },
+      "metadata": {
+        "title": "Record Without Community",
+        "publication_date": "2024-01-01",
+        "creators": [],
+        "resource_type": { "id": "dataset", "title": { "en": "Dataset" } }
+      }
+    }
+    '''
+
+    when:
+    def rec = MAPPER.readValue(json, InvenioRdmClient.RecordResponse)
+
+    then:
+    rec.id == "xyz-456"
+    rec.parent == null
+    rec.metadata.title == "Record Without Community"
+    InvenioRdmDatasetSource.community(rec.parent) == null
+  }
+
+  def "parses v12 record with empty communities entries"() {
+    given:
+    def json = '''
+    {
+      "id": "empty-001",
+      "access": { "status": "open" },
+      "parent": { "communities": { "entries": [] } },
+      "metadata": { "title": "No Community Record", "publication_date": "2024-01-01" }
+    }
+    '''
+
+    when:
+    def rec = MAPPER.readValue(json, InvenioRdmClient.RecordResponse)
+
+    then:
+    rec.parent != null
+    rec.parent.communities.entries.isEmpty()
+    InvenioRdmDatasetSource.community(rec.parent) == null
+  }
+
+  // ── Search response parsing ─────────────────────────────────────────
+
+  def "parses v12 search response with hits"() {
+    given: "a v12 search response"
+    def json = '''
+    {
+      "hits": {
+        "total": 42,
+        "hits": [
+          {
+            "id": "rec-001",
+            "links": { "self_html": "https://fdat.example.org/records/rec-001" },
+            "created": "2024-06-15T10:00:00.000000+00:00",
+            "access": {
+              "record": "public",
+              "files": "public",
+              "status": "open",
+              "embargo": { "active": false, "until": null, "reason": null }
+            },
+            "metadata": {
+              "title": "Test Dataset One",
+              "publication_date": "2024-06-15",
+              "description": "First test dataset",
+              "creators": [
+                {
+                  "person_or_org": {
+                    "type": "personal",
+                    "name": "Doe, Jane",
+                    "given_name": "Jane",
+                    "family_name": "Doe"
+                  },
+                  "affiliations": [{ "id": "01abc", "name": "Test University" }]
+                }
+              ],
+              "resource_type": { "id": "dataset", "title": { "en": "Dataset" } }
+            },
+            "pids": {
+              "doi": { "identifier": "10.57754/FDAT.rec-001" }
+            },
+            "versions": { "is_latest": true, "index": 3 }
+          },
+          {
+            "id": "rec-002",
+            "links": { "self_html": "https://fdat.example.org/records/rec-002" },
+            "access": {
+              "record": "restricted",
+              "files": "restricted",
+              "status": "restricted",
+              "embargo": { "active": false }
+            },
+            "metadata": {
+              "title": "Restricted Record",
+              "publication_date": "2024-07-01",
+              "creators": [],
+              "resource_type": { "id": "dataset" }
+            },
+            "pids": {
+              "doi": { "identifier": "10.57754/FDAT.rec-002" }
+            },
+            "versions": { "is_latest": false, "index": 1 }
+          }
+        ]
+      }
+    }
+    '''
+
+    when: "parsed"
+    def response = MAPPER.readValue(json, InvenioRdmClient.SearchResultResponse)
+
+    then: "envelope is correct"
+    response.hits.total == 42
+    response.hits.hits.size() == 2
+
+    and: "first hit is parsed"
+    def h1 = response.hits.hits[0]
+    h1.id == "rec-001"
+    h1.links.selfHtml == "https://fdat.example.org/records/rec-001"
+    h1.metadata.title == "Test Dataset One"
+    h1.metadata.publicationDate == "2024-06-15"
+    h1.metadata.creators.size() == 1
+    h1.metadata.creators[0].resolvedName() == "Doe, Jane"
+    h1.metadata.resourceType.resolvedTitle() == "Dataset"
+    h1.access.status == "open"
+    h1.pids.doi.identifier == "10.57754/FDAT.rec-001"
+    h1.versions.index == 3
+    h1.versions.isLatest
+
+    and: "second hit is parsed"
+    def h2 = response.hits.hits[1]
+    h2.id == "rec-002"
+    h2.access.status == "restricted"
+    h2.metadata.creators.isEmpty()
+    h2.metadata.resourceType.resolvedTitle() == null
+    h2.versions.index == 1
+    !h2.versions.isLatest
+  }
+
+  def "parses empty search response"() {
+    given:
+    def json = '''{"hits": {"total": 0, "hits": []}}'''
+
+    when:
+    def response = MAPPER.readValue(json, InvenioRdmClient.SearchResultResponse)
+
+    then:
+    response.hits.total == 0
+    response.hits.hits.isEmpty()
+  }
+
+  // ── Community display label precedence ──────────────────────────────
+
+  def "Community.displayLabel prefers title over slug over id"() {
+    given:
+    def c = new InvenioRdmClient.Community(id, slug, meta)
+
+    expect:
+    InvenioRdmDatasetSource.community(buildParent(c)) == expected
+
+    where:
+    id     | slug            | meta                                           | expected
+    "abc"  | "biology"       | metaWithTitle("Department of Biology")         | "Department of Biology"
+    "abc"  | "biology"       | null                                           | "biology"
+    "abc"  | null            | null                                           | "abc"
+    "abc"  | "biology"       | metaWithTitle("")                              | "biology"
+    "abc"  | null            | metaWithTitle("A Group")                       | "A Group"
+  }
+
+  private InvenioRdmClient.Parent buildParent(InvenioRdmClient.Community c) {
+    def pc = new InvenioRdmClient.ParentCommunities(null, null, [c])
+    def p = new InvenioRdmClient.Parent(pc)
+    return p
+  }
+
+  private InvenioRdmClient.CommunityMetadata metaWithTitle(String title) {
+    new InvenioRdmClient.CommunityMetadata(title)
+  }
+
+  // ── Access mapping ──────────────────────────────────────────────────
+
+  def "access.status 'open' maps to PUBLIC"() {
+    given:
+    def access = new InvenioRdmClient.RecordAccess("public", "public", "open")
+
+    expect:
+    InvenioRdmDatasetSource.accessLevel(access) == life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel.PUBLIC
+    InvenioRdmDatasetSource.recordAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.PUBLIC
+    InvenioRdmDatasetSource.fileAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.PUBLIC
+  }
+
+  def "access.status 'restricted' maps to RESTRICTED"() {
+    given:
+    def access = new InvenioRdmClient.RecordAccess("restricted", "restricted", "restricted")
+
+    expect:
+    InvenioRdmDatasetSource.accessLevel(access) == life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel.RESTRICTED
+    InvenioRdmDatasetSource.recordAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.RESTRICTED
+    InvenioRdmDatasetSource.fileAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.RESTRICTED
+  }
+
+  def "access with independent record/file dimensions"() {
+    given: "record is public, files are restricted"
+    def access = new InvenioRdmClient.RecordAccess("public", "restricted", "open")
+
+    expect:
+    InvenioRdmDatasetSource.recordAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.PUBLIC
+    InvenioRdmDatasetSource.fileAccessStatus(access) == life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus.RESTRICTED
+    InvenioRdmDatasetSource.accessDetail(access) == "Record: public | Files: restricted"
+  }
+
+  def "null access maps to RESTRICTED for coarse level"() {
+    expect:
+    InvenioRdmDatasetSource.accessLevel(null) == life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel.RESTRICTED
+  }
+
+  // ── PID extraction ─────────────────────────────────────────────────
+
+  def "DOI is extracted from pids.doi.identifier"() {
+    given:
+    def pids = new InvenioRdmClient.Pids(
+        new InvenioRdmClient.PidEntry("10.57754/FDAT.abc-123"))
+
+    expect:
+    InvenioRdmDatasetSource.safePid(pids, "fallback-id") == "10.57754/FDAT.abc-123"
+  }
+
+  def "null pids falls back to record ID"() {
+    expect:
+    InvenioRdmDatasetSource.safePid(null, "rec-42") == "rec-42"
+  }
+
+  def "pids with no DOI falls back to record ID"() {
+    given:
+    def pids = new InvenioRdmClient.Pids(null)
+
+    expect:
+    InvenioRdmDatasetSource.safePid(pids, "rec-99") == "rec-99"
+  }
+
+  // ── Version extraction ──────────────────────────────────────────────
+
+  def "version index is formatted as v-number"() {
+    given:
+    def versions = new InvenioRdmClient.RecordVersions(true, 5)
+
+    expect:
+    InvenioRdmDatasetSource.versionString(versions) == "v5"
+  }
+
+  def "null versions returns null"() {
+    expect:
+    InvenioRdmDatasetSource.versionString(null) == null
+  }
+
+  def "version index zero returns null"() {
+    given:
+    def versions = new InvenioRdmClient.RecordVersions(false, 0)
+
+    expect:
+    InvenioRdmDatasetSource.versionString(versions) == null
+  }
+
+  // ── Creator resolution ─────────────────────────────────────────────
+
+  def "creators are resolved from person_or_org.name"() {
+    given: "a v12 creator with nested person_or_org"
+    def json = '''
+    {
+      "person_or_org": {
+        "type": "personal",
+        "name": "Meyer, Lina",
+        "given_name": "Lina",
+        "family_name": "Meyer"
+      },
+      "affiliations": [{ "id": "01abc", "name": "Uni Tübingen" }]
+    }
+    '''
+
+    when:
+    def creator = MAPPER.readValue(json, InvenioRdmClient.Creator)
+
+    then:
+    creator.resolvedName() == "Meyer, Lina"
+    creator.resolvedAffiliation() == "Uni Tübingen"
+  }
+
+  def "creators without person_or_org resolve to null name"() {
+    given: "a creator entry with no person_or_org (should not happen in v12, handled defensively)"
+    def json = '''{ "affiliations": [] }'''
+
+    when:
+    def creator = MAPPER.readValue(json, InvenioRdmClient.Creator)
+
+    then:
+    creator.resolvedName() == null
+    creator.resolvedAffiliation() == null
+  }
+
+  def "multiple creators are collected"() {
+    given:
+    def json = '''
+    [
+      { "person_or_org": { "name": "A, B" }, "affiliations": [] },
+      { "person_or_org": { "name": "C, D" }, "affiliations": [] },
+      { "affiliations": [] }
+    ]
+    '''
+
+    when:
+    def raw = MAPPER.readValue(json,
+        MAPPER.typeFactory.constructCollectionType(List, InvenioRdmClient.Creator))
+
+    then:
+    def names = InvenioRdmDatasetSource.resolvedCreators(raw)
+    names == ["A, B", "C, D"]
+    names.size() == 2
+  }
+
+  def "null creators list returns empty"() {
+    expect:
+    InvenioRdmDatasetSource.resolvedCreators(null).isEmpty()
+  }
+
+  // ── Resource type title resolution ─────────────────────────────────
+
+  def "resource type with localised title object"() {
+    given:
+    def json = '''{ "id": "dataset", "title": { "en": "Dataset", "de": "Datensatz" } }'''
+
+    when:
+    def rt = MAPPER.readValue(json, InvenioRdmClient.ResourceType)
+
+    then:
+    rt.id == "dataset"
+    rt.resolvedTitle() == "Dataset"
+  }
+
+  def "resource type with only non-English locale"() {
+    given:
+    def json = '''{ "id": "dataset", "title": { "de": "Datensatz" } }'''
+
+    when:
+    def rt = MAPPER.readValue(json, InvenioRdmClient.ResourceType)
+
+    then:
+    rt.resolvedTitle() == "Datensatz"
+  }
+
+  def "resource type with missing title returns null"() {
+    given:
+    def json = '''{ "id": "dataset" }'''
+
+    when:
+    def rt = MAPPER.readValue(json, InvenioRdmClient.ResourceType)
+
+    then:
+    rt.resolvedTitle() == null
+  }
+
+  // ── Date parsing ────────────────────────────────────────────────────
+
+  def "valid publication date is parsed"() {
+    expect:
+    InvenioRdmDatasetSource.parseDateOrToday("2024-07-14") ==
+        java.time.LocalDate.of(2024, 7, 14)
+  }
+
+  def "null publication date falls back to today"() {
+    expect:
+    InvenioRdmDatasetSource.parseDateOrToday(null) == java.time.LocalDate.now()
+  }
+
+  def "blank publication date falls back to today"() {
+    expect:
+    InvenioRdmDatasetSource.parseDateOrToday("  ") == java.time.LocalDate.now()
+  }
+
+  def "malformed publication date falls back to today"() {
+    expect:
+    InvenioRdmDatasetSource.parseDateOrToday("not-a-date") ==
+        java.time.LocalDate.now()
+  }
+
+  // ── Title extraction ────────────────────────────────────────────────
+
+  def "missing hit title falls back to untitled placeholder"() {
+    given:
+    def h = new InvenioRdmClient.Hit(
+        null, null, new InvenioRdmClient.HitMetadata(
+            null, null, null, null, null),
+        null, null, null, null, null)
+
+    expect:
+    InvenioRdmDatasetSource.safeHitTitle(h) == "(untitled record)"
+  }
+
+  def "blank record title falls back to untitled placeholder"() {
+    given:
+    def rec = new InvenioRdmClient.RecordResponse(
+        null, null, new InvenioRdmClient.RecordMetadata(
+            "   ", null, null, null, null),
+        null, null, false, null, null, null, null)
+
+    expect:
+    InvenioRdmDatasetSource.safeRecordTitle(rec) == "(untitled record)"
+  }
+
+  // ── Zenodo record (with v12 header) ─────────────────────────────────
+
+  def "parses Zenodo v12 record with biosyslit community"() {
+    given: "a full Zenodo record as served with v12 Accept header"
+    def json = '''
+    {
+      "id": "20654629",
+      "links": {
+        "self_html": "https://zenodo.org/records/20654629"
+      },
+      "is_published": true,
+      "access": {
+        "record": "public",
+        "files": "public",
+        "embargo": { "active": false, "reason": null },
+        "status": "open"
+      },
+      "pids": {
+        "doi": {
+          "identifier": "10.5281/zenodo.20654629",
+          "provider": "datacite",
+          "client": "datacite"
+        }
+      },
+      "versions": { "is_latest": true, "index": 3 },
+      "parent": {
+        "communities": {
+          "default": "c529f97d-f8cb-4c13-a439-9e36891694c2",
+          "ids": ["c529f97d-f8cb-4c13-a439-9e36891694c2"],
+          "entries": [{
+            "id": "c529f97d-f8cb-4c13-a439-9e36891694c2",
+            "slug": "biosyslit",
+            "metadata": { "title": "Biodiversity Literature Repository" }
+          }]
+        }
+      },
+      "metadata": {
+        "title": "Fig. 2 in The structure of terrestrial mammal communities...",
+        "publication_date": "2024-08-19",
+        "creators": [
+          {
+            "person_or_org": {
+              "type": "personal",
+              "name": "McShea, William J",
+              "given_name": "William J",
+              "family_name": "McShea"
+            }
+          }
+        ],
+        "resource_type": { "id": "image-figure", "title": { "en": "Figure", "de": "Abbildung" } }
+      }
+    }
+    '''
+
+    when:
+    def rec = MAPPER.readValue(json, InvenioRdmClient.RecordResponse)
+
+    then: "all v12 fields are parsed correctly"
+    rec.id == "20654629"
+    rec.links.selfHtml == "https://zenodo.org/records/20654629"
+    InvenioRdmDatasetSource.safePid(rec.pids, rec.id) == "10.5281/zenodo.20654629"
+    InvenioRdmDatasetSource.versionString(rec.versions) == "v3"
+    InvenioRdmDatasetSource.community(rec.parent) == "Biodiversity Literature Repository"
+    InvenioRdmDatasetSource.safeRecordTitle(rec) == "Fig. 2 in The structure of terrestrial mammal communities..."
+    InvenioRdmDatasetSource.resolvedResourceType(rec.metadata.resourceType) == "Figure"
+    InvenioRdmDatasetSource.accessLevel(rec.access) == life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel.PUBLIC
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/Messages.java b/project-management/src/main/java/life/qbic/projectmanagement/application/Messages.java
index c64b15b6f5..46417b12e0 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/Messages.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/Messages.java
@@ -72,4 +72,59 @@ public static String projectAccessToUser(String fullNameUser, String projectTitl
         """, fullNameUser, projectTitle, projectUri);
   }
 
+  /**
+   * A pre-formatted message that informs a project collaborator about a
+   * dataset that has just been connected by a teammate.
+   *
+   * @param fullNameUser the full name of the recipient
+   * @param projectTitle the title of the project the dataset was connected to
+   * @param datasetTitle the human-readable title of the connected dataset
+   * @param datasetPid   the persistent identifier (PID / DOI) of the dataset
+   * @param projectUri   a resolvable URL to the project in Data Manager
+   * @return the filled out template message
+   * @since 1.12.0
+   */
+  public static String datasetConnectedToProject(String fullNameUser, String projectTitle,
+      String datasetTitle, String datasetPid, String projectUri) {
+    return String.format("""
+        Dear %s,
+
+        a new dataset has just been connected to the project '%s':
+
+          Title: %s
+          PID:   %s
+
+        Please open the project to see the connected dataset:
+
+        %s
+        """, fullNameUser, projectTitle, datasetTitle, datasetPid, projectUri);
+  }
+
+  /**
+   * A pre-formatted message that informs a project collaborator about
+   * a dataset connection that has been removed by a teammate.
+   *
+   * @param fullNameUser the full name of the recipient
+   * @param projectTitle the title of the project the dataset was removed from
+   * @param datasetTitle the human-readable title of the dataset connection
+   * @param datasetPid   the persistent identifier (PID / DOI) of the dataset
+   * @param projectUri   a resolvable URL to the project in Data Manager
+   * @return the filled out template message
+   * @since 1.12.0
+   */
+  public static String datasetRemovedFromProject(String fullNameUser, String projectTitle,
+      String datasetTitle, String datasetPid, String projectUri) {
+    return String.format("""
+        Dear %s,
+
+        a dataset connection has been removed from the project '%s':
+
+          Title: %s
+          PID:   %s
+
+        Please open the project to see the current list of connected datasets:
+
+        %s
+        """, fullNameUser, projectTitle, datasetTitle, datasetPid, projectUri);
+  }
 }
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/ProjectOverview.java b/project-management/src/main/java/life/qbic/projectmanagement/application/ProjectOverview.java
index 24af329b08..c0d40e3861 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/ProjectOverview.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/ProjectOverview.java
@@ -55,6 +55,25 @@ public class ProjectOverview {
   @Column(name = "amountIpMeasurements")
   private long ipMeasurementCount;
 
+  /** Aggregate count of datasets currently connected to the project. */
+  @Column(name = "connectedDatasetCount", nullable = false)
+  private int connectedDatasetCount;
+
+  /** Aggregate count of connected datasets with PUBLIC access level. */
+  @Column(name = "openDatasetCount", nullable = false)
+  private int openDatasetCount;
+
+  /** Aggregate count of connected datasets with RESTRICTED access level. */
+  @Column(name = "restrictedDatasetCount", nullable = false)
+  private int restrictedDatasetCount;
+
+  /**
+   * Most-recent {@code connected_on} timestamp across all connected
+   * datasets for this project. Null when no datasets are connected.
+   */
+  @Column(name = "lastConnectedOn")
+  private Instant lastConnectedOn;
+
 
   @Convert(converter = CollaboratorUserInfosConverter.class)
   @Column(name = "userInfos")
@@ -104,6 +123,23 @@ public long ipMeasurementCount() {
     return ipMeasurementCount;
   }
 
+  public int connectedDatasetCount() {
+    return connectedDatasetCount;
+  }
+
+  public int openDatasetCount() {
+    return openDatasetCount;
+  }
+
+  public int restrictedDatasetCount() {
+    return restrictedDatasetCount;
+  }
+
+  /** Nullable — {@code null} for projects with no connected datasets. */
+  public Instant lastConnectedOn() {
+    return lastConnectedOn;
+  }
+
   public Collection<UserInfo> collaboratorUserInfos() {
     return collaboratorUserInfos.stream().distinct().toList();
   }
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/api/template/TemplateService.java b/project-management/src/main/java/life/qbic/projectmanagement/application/api/template/TemplateService.java
index f342a54a8c..52b4f5a6b5 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/api/template/TemplateService.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/api/template/TemplateService.java
@@ -40,9 +40,9 @@
 import life.qbic.projectmanagement.domain.model.experiment.Experiment;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentalGroup;
-import life.qbic.projectmanagement.domain.model.measurement.NGSIndex;
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.IPMeasurementEntry;
+import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
+import life.qbic.projectmanagement.domain.model.measurement.NGSIndex;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.NGSSpecificMeasurementMetadata;
 import life.qbic.projectmanagement.domain.model.measurement.ProteomicsMeasurement;
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetService.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetService.java
new file mode 100644
index 0000000000..c3493029c7
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetService.java
@@ -0,0 +1,762 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import static java.util.Objects.requireNonNull;
+
+import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+import life.qbic.application.commons.Result;
+import life.qbic.domain.concepts.DomainEvent;
+import life.qbic.domain.concepts.DomainEventDispatcher;
+import life.qbic.domain.concepts.DomainEventSubscriber;
+import life.qbic.domain.concepts.LocalDomainEventDispatcher;
+import life.qbic.identity.api.UserInformationService;
+import life.qbic.logging.api.Logger;
+import life.qbic.logging.service.LoggerFactory;
+import life.qbic.projectmanagement.application.ProjectInformationService;
+import life.qbic.projectmanagement.application.authorization.ReactiveSecurityContextUtils;
+import life.qbic.projectmanagement.application.experiment.ExperimentInformationService;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AccessLevel;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.associated_dataset.ExternalHandle;
+import life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmResourceMetadata;
+import life.qbic.projectmanagement.domain.model.associated_dataset.ResourceMetadata;
+import life.qbic.projectmanagement.domain.model.associated_dataset.SourceType;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetConnectedEvent;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetRemovedEvent;
+import life.qbic.projectmanagement.domain.model.associated_dataset.repository.AssociatedDatasetRepository;
+import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import org.springframework.lang.Nullable;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.security.core.context.SecurityContext;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Service;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
+
+/**
+ * Application service for associating external datasets with projects.
+ *
+ * <p>Orchestrates the use cases of searching external data sources,
+ * connecting datasets to projects, and listing connected datasets.
+ * Depends on the {@link DatasetSource} port for external system
+ * interaction and the {@link AssociatedDatasetRepository} for
+ * persistence.</p>
+ *
+ * <p>Per ADR-0003, operations are user-initiated and use the invoking
+ * user's identity. Credentials are never borrowed between users.</p>
+ *
+ * @since 1.12.0
+ */
+@Service
+public class AssociatedDatasetService {
+
+  private static final Logger log = LoggerFactory.logger(AssociatedDatasetService.class);
+
+  private final DatasetSource datasetSource;
+  private final AssociatedDatasetRepository associatedDatasetRepository;
+  private final SourceInstanceRegistry sourceInstanceRegistry;
+  private final ProjectInformationService projectInformationService;
+  private final UserInformationService userInformationService;
+  private final ExperimentInformationService experimentInformationService;
+
+  public AssociatedDatasetService(
+      DatasetSource datasetSource,
+      AssociatedDatasetRepository associatedDatasetRepository,
+      SourceInstanceRegistry sourceInstanceRegistry,
+      ProjectInformationService projectInformationService,
+      UserInformationService userInformationService,
+      ExperimentInformationService experimentInformationService) {
+    this.datasetSource = requireNonNull(datasetSource, "datasetSource must not be null");
+    this.associatedDatasetRepository = requireNonNull(associatedDatasetRepository,
+        "associatedDatasetRepository must not be null");
+    this.sourceInstanceRegistry = requireNonNull(sourceInstanceRegistry,
+        "sourceInstanceRegistry must not be null");
+    this.projectInformationService = requireNonNull(projectInformationService,
+        "projectInformationService must not be null");
+    this.userInformationService = requireNonNull(userInformationService,
+        "userInformationService must not be null");
+    this.experimentInformationService = requireNonNull(experimentInformationService,
+        "experimentInformationService must not be null");
+  }
+
+  // ── Search ──────────────────────────────────────────────────────────────
+
+  /**
+   * Searches an external data source for datasets matching the query,
+   * returning paginated results.
+   *
+   * <p>No project-level permission is required for the search itself —
+   * the user must already have access to the project in order to be
+   * in the datasets view. The search is an external lookup and does
+   * not read or mutate project data.</p>
+   *
+   * <p>The {@code searchingUserId} is forwarded to the infrastructure
+   * adapter so it can resolve any per-user credentials needed (e.g.
+   * for restricted dataset search). The application layer never handles
+   * authentication material (ADR-0002 D1).</p>
+   *
+   * @param sourceType     the source system type (e.g. {@link SourceType#INVENIO_RDM})
+   * @param instanceId     the configured instance identifier (e.g. "zenodo")
+   * @param query          the free-text search term; blank for "list all"
+   * @param page           zero-indexed page number
+   * @param pageSize       results per page
+   * @param searchingUserId the ID of the user performing the search
+   *                       (used by the adapter to resolve per-user credentials)
+   * @return paginated search results
+   * @throws DatasetSourceUnavailableException if the external data repository
+   *         could not be reached (network failure, timeout, rate-limit,
+   *         server error) or returned unparseable data
+   * @throws DatasetSourceNotFoundException   if the {@code instanceId} does
+   *         not match any configured repository
+   */
+  public SearchResult searchDatasets(
+      SourceType sourceType,
+      String instanceId,
+      String query,
+      int page,
+      int pageSize,
+      String searchingUserId) {
+    Objects.requireNonNull(sourceType, "sourceType must not be null");
+    Objects.requireNonNull(searchingUserId, "searchingUserId must not be null");
+    // resolveInstanceConfig propagates DatasetSourceNotFoundException directly
+    var config = resolveInstanceConfig(instanceId);
+    var searchQuery = new SearchQuery(query, page, pageSize);
+    try {
+      return datasetSource.search(searchQuery, config, searchingUserId);
+    } catch (AssociatedDatasetServiceException
+        | DatasetSearchException e) {
+      // interface-level exception already translated — propagate unchanged
+      throw e;
+    } catch (Exception e) {
+      // translate any infrastructure exception (ApplicationException from
+      // the DatasetSource port, or truly unexpected runtime errors) into
+      // a user-friendly service exception. Technical details stay in the
+      // log; the message reaching the caller contains neither URLs,
+      // status codes, nor infrastructure names.
+      log.error("External search failed for user %s on source type %s".formatted(
+          searchingUserId, sourceType), e);
+      throw new DatasetSourceUnavailableException(e);
+    }
+  }
+
+  // ── Connect ─────────────────────────────────────────────────────────────
+
+  /**
+   * Connects an external dataset to a project.
+   *
+   * <p>Resolves the record metadata from the source system, creates the
+   * {@link AssociatedDataset} aggregate, persists it, and dispatches
+   * domain events (driving notifications to other project members).</p>
+   *
+   * <p>Requires WRITE permission on the project (ADR-0003).</p>
+   *
+   * @param projectId           the project to connect the dataset to
+   * @param sourceType          the source system type
+   * @param instanceId          the configured instance identifier
+   * @param externalHandleValue the external record identifier on the source
+   * @param experimentId        optional experiment to associate the dataset with
+   * @param connectedByUserId   the user ID performing the action
+   * @return the resulting {@link AssociatedDatasetId} on success, or an
+   *         error code on failure
+   */
+  @PreAuthorize(
+      "hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'WRITE')")
+  public Result<AssociatedDatasetId, ConnectDatasetError> connectDataset(
+      ProjectId projectId,
+      SourceType sourceType,
+      String instanceId,
+      String externalHandleValue,
+      @Nullable ExperimentId experimentId,
+      String connectedByUserId) {
+
+    Objects.requireNonNull(projectId, "projectId must not be null");
+    Objects.requireNonNull(sourceType, "sourceType must not be null");
+    Objects.requireNonNull(externalHandleValue, "externalHandleValue must not be null");
+    Objects.requireNonNull(connectedByUserId, "connectedByUserId must not be null");
+    // experimentId is @Nullable — null means no experiment association
+
+    InstanceConfig config;
+    try {
+      config = resolveInstanceConfig(instanceId);
+    } catch (DatasetSourceNotFoundException e) {
+      log.error("Instance not found: %s".formatted(instanceId));
+      return Result.fromError(ConnectDatasetError.INSTANCE_NOT_FOUND);
+    }
+
+    // 1. Resolve record metadata from the source system
+    Optional<ResourceMetadata> metadata;
+    try {
+      metadata = datasetSource.resolveMetadata(externalHandleValue, config, connectedByUserId);
+    } catch (DatasetResolveException e) {
+      log.error("Failed to resolve metadata for record %s on instance %s"
+          .formatted(externalHandleValue, instanceId), e);
+      return Result.fromError(ConnectDatasetError.CONNECT_FAILED);
+    } catch (Exception e) {
+      // Non-infrastructure errors (shouldn't happen — the interface
+      // only declares the two exception types above) are treated as
+      // record-not-found to keep the error-path simple.
+      log.error("Unexpected error resolving metadata for record %s on instance %s"
+          .formatted(externalHandleValue, instanceId), e);
+      return Result.fromError(ConnectDatasetError.RECORD_NOT_FOUND);
+    }
+    if (metadata.isEmpty()) {
+      log.warn("Record %s not found on instance %s".formatted(externalHandleValue, instanceId));
+      return Result.fromError(ConnectDatasetError.RECORD_NOT_FOUND);
+    }
+
+    // 1b. Duplicate check — a dataset with the same PID is already
+    //     connected to this project. PID is the dedup key because it is
+    //     globally unique and persistent by design (DOI/PID).
+    boolean alreadyConnected;
+    try {
+      alreadyConnected = associatedDatasetRepository.isActiveConnectionPresent(
+          projectId, metadata.get().pid());
+    } catch (Exception e) {
+      // Persistence/query failures (schema mismatch, table unavailable, etc.)
+      // must not silently swallow the connect attempt — log the cause so
+      // it surfaces in the application log rather than disappearing into
+      // the reactive pipeline's onErrorResume catch-all.
+      log.error("Duplicate-check query failed for project %s / PID %s"
+          .formatted(projectId, metadata.get().pid()), e);
+      return Result.fromError(ConnectDatasetError.CONNECT_FAILED);
+    }
+    if (alreadyConnected) {
+      log.info("Dataset with PID %s is already connected to project %s — skipping"
+          .formatted(metadata.get().pid(), projectId));
+      return Result.fromError(ConnectDatasetError.ALREADY_CONNECTED);
+    }
+
+    // 2. Set up local event dispatcher to cache events emitted during the
+    //    aggregate creation, then forward them to the global domain event
+    //    dispatcher after save (collect-during, forward-after pattern).
+    List<DomainEvent> domainEventsCache = new ArrayList<>();
+    var localDomainEventDispatcher = LocalDomainEventDispatcher.instance();
+    localDomainEventDispatcher.reset();
+    localDomainEventDispatcher.subscribe(
+        new ConnectedEventCollectorSubscriber(domainEventsCache));
+
+    // 3. Create the aggregate (emits AssociatedDatasetConnectedEvent)
+    AssociatedDataset dataset;
+    try {
+      dataset = AssociatedDataset.connect(
+          projectId,
+          sourceType,
+          new ExternalHandle(externalHandleValue),
+          metadata.get(),
+          connectedByUserId,
+          experimentId);
+    } catch (Exception e) {
+      log.error("Failed to create associated dataset aggregate", e);
+      return Result.fromError(ConnectDatasetError.CONNECT_FAILED);
+    }
+
+    // 4. Persist
+    try {
+      associatedDatasetRepository.save(dataset);
+    } catch (Exception e) {
+      log.error("Failed to persist associated dataset for project %s".formatted(projectId), e);
+      return Result.fromError(ConnectDatasetError.CONNECT_FAILED);
+    }
+
+    // 5. Forward cached events to the global domain event dispatcher
+    //    (this triggers notification policy directives like
+    //    InformProjectMembersAboutDatasetConnection from Task 6).
+    //    The dispatch must not fail the connect itself — the dataset
+    //    has already been persisted in step 4 — so any exception here
+    //    is logged and swallowed so the connect still returns success.
+    try {
+      domainEventsCache.forEach(
+          domainEvent -> DomainEventDispatcher.instance().dispatch(domainEvent));
+    } catch (Exception e) {
+      log.warn("Event dispatch failed while forwarding domain event "
+          + "after dataset connection on project %s; the connection ".formatted(projectId)
+          + "itself succeeded, but collaborators may not have been "
+          + "notified: %s".formatted(e.getMessage()));
+    }
+
+    log.info("Dataset %s connected to project %s by user %s"
+        .formatted(dataset.id(), projectId, connectedByUserId));
+
+    return Result.fromValue(dataset.id());
+  }
+
+  // ── Reactive (non-blocking) connect ─────────────────────────────────────
+
+  private static final Duration PER_REQUEST_TIMEOUT = Duration.ofSeconds(30);
+  private static final int BOUNDED_PARALLELISM = 3;
+
+  /**
+   * Per-request payload mirroring {@link #connectDataset}. Used by the
+   * reactive {@link #connectDatasetAsync(ConnectDatasetRequest)} and
+   * {@link #connectDatasets}. Carries a {@code requestId} so the UI can
+   * correlate responses back to the original grid row.
+   */
+  public record ConnectDatasetRequest(
+      String requestId,
+      ProjectId projectId,
+      SourceType sourceType,
+      String instanceId,
+      String externalHandleValue,
+      @Nullable ExperimentId experimentId,
+      String userId
+  ) {}
+
+  /**
+   * Per-response payload returned by the reactive connect methods.
+   * Exactly one of {@link #associatedDatasetId()} or {@link #error()} is
+   * non-null.
+   */
+  public record ConnectDatasetResponse(
+      String requestId,
+      AssociatedDatasetId associatedDatasetId,
+      ConnectDatasetError error
+  ) {}
+
+  /**
+   * Reactive counterpart of {@link #connectDataset}. Runs the blocking
+   * call on a {@link Schedulers#boundedElastic()} worker thread, with a
+   * per-request 30s timeout. Errors (including timeout and network
+   * exceptions) are wrapped into a
+   * {@link ConnectDatasetError#CONNECT_FAILED} so the reactive stream
+   * never terminates in {@code onError} — enabling the UI to tally
+   * partial successes and failures independently.
+   */
+  @PreAuthorize(
+      "hasPermission(#request.projectId(), 'life.qbic.projectmanagement.domain.model.project.Project', 'WRITE')")
+  public Mono<ConnectDatasetResponse> connectDatasetAsync(ConnectDatasetRequest request) {
+    SecurityContext securityContext = SecurityContextHolder.getContext();
+    return Mono.fromCallable(() -> {
+           Result<AssociatedDatasetId, ConnectDatasetError> result = connectDataset(
+               request.projectId(),
+               request.sourceType(),
+               request.instanceId(),
+               request.externalHandleValue(),
+               request.experimentId(),
+               request.userId());
+           return new ConnectDatasetResponse(
+               request.requestId(),
+               result.fold(value -> value, error -> null),
+               result.fold(value -> null, error -> error));
+         })
+        // Propagate caller's SecurityContext to the boundedElastic worker
+        // thread so Spring Security `@PreAuthorize` on connectDataset
+        // resolves correctly.
+        .contextWrite(ReactiveSecurityContextUtils.reactiveSecurity(securityContext))
+        .subscribeOn(Schedulers.boundedElastic())
+        .timeout(PER_REQUEST_TIMEOUT)
+        .onErrorResume(Throwable.class, t -> {
+          // Safety net: any exception escaping connectDataset() (schema
+          // errors, unexpected runtime exceptions, timeouts) is converted
+          // into CONNECT_FAILED so the caller can tally partial failures.
+          // The log.error here is critical — without it, uncaught errors
+          // become silent failures that the user can only see as a
+          // generic toast with no entry in the application log.
+          log.error("Async connect pipeline failed for request %s: %s"
+              .formatted(request.requestId(), t.getMessage()), t);
+          return Mono.just(new ConnectDatasetResponse(
+              request.requestId(), null, ConnectDatasetError.CONNECT_FAILED));
+        });
+  }
+
+  /**
+   * Connects a batch of datasets to a project. Each dataset is resolved
+   * concurrently with bounded parallelism (3, matching unauthenticated
+   * rate limits of public InvenioRDM instances). Responses are emitted
+   * in insertion order so the UI can map them back to grid rows.
+   */
+  public Flux<ConnectDatasetResponse> connectDatasets(List<ConnectDatasetRequest> requests) {
+    return Flux.fromIterable(requests)
+        .flatMapSequential(this::connectDatasetAsync, BOUNDED_PARALLELISM);
+  }
+
+  // ── Remove dataset ──────────────────────────────────────────────────────
+
+  /**
+   * Removes (soft-deletes) an existing dataset connection from a project.
+   *
+   * <p>The aggregate transitions to
+   * {@link life.qbic.projectmanagement.domain.model.associated_dataset.ConnectionState#REMOVED}
+   * and is retained in the database as an audit tombstone
+   * (ADR-0001). A {@link AssociatedDatasetRemovedEvent} is emitted so the
+   * collaborator-notification policy directive can inform other project
+   * members via email.</p>
+   *
+   * <p>Per ADR-0003, only users with {@code WRITE} permission on the
+   * parent project may remove a connection — callers must have resolved
+   * the project permission before invoking this method (the aggregate
+   * does not carry a separate ACL entry). If the caller lacks WRITE
+   * permission this method must not be invoked; the UI layer is
+   * responsible for hiding or disabling the remove action.</p>
+   *
+   * @param associatedDatasetIdStr the identifier of the dataset connection
+   *                               to remove (UUID string)
+   * @param removedByUserId        the user performing the removal;
+   *                               recorded in the emitted event as the
+   *                               actor (may differ from the original
+   *                               connector)
+   * @return success with the removed dataset's ID, or an error code
+   * @throws NullPointerException if either argument is {@code null}
+   * @since 1.12.0
+   */
+  public Result<AssociatedDatasetId, RemoveDatasetError> removeDataset(
+      String associatedDatasetIdStr, String removedByUserId) {
+    Objects.requireNonNull(associatedDatasetIdStr, "associatedDatasetId must not be null");
+    Objects.requireNonNull(removedByUserId, "removedByUserId must not be null");
+
+    // 1. Lookup the dataset — not found → DATASET_NOT_FOUND
+    var parsedId = AssociatedDatasetId.parse(associatedDatasetIdStr);
+    Optional<AssociatedDataset> datasetOpt;
+    try {
+      datasetOpt = associatedDatasetRepository.findById(parsedId);
+    } catch (Exception e) {
+      // Persistence/query failures are surfaced as REMOVAL_FAILED (the
+      // lookup is part of the removal process).
+      log.error("Repository lookup failed for dataset %s"
+          .formatted(associatedDatasetIdStr), e);
+      return Result.fromError(RemoveDatasetError.REMOVAL_FAILED);
+    }
+    if (datasetOpt.isEmpty()) {
+      log.warn("Dataset %s not found in repository — cannot remove"
+          .formatted(associatedDatasetIdStr));
+      return Result.fromError(RemoveDatasetError.DATASET_NOT_FOUND);
+    }
+    var dataset = datasetOpt.orElseThrow();
+
+    // 2. If already removed, return DATASET_ALREADY_REMOVED.
+    //    (dataset.remove(…) would throw IllegalStateException for this —
+    //    translate cleanly rather than propagating the runtime exception.)
+    if (!dataset.isConnected()) {
+      log.info("Dataset %s is already in REMOVED state — skipping"
+          .formatted(associatedDatasetIdStr));
+      return Result.fromError(RemoveDatasetError.DATASET_ALREADY_REMOVED);
+    }
+
+    // 3. Set up local event dispatcher to cache events emitted during the
+    //    aggregate mutation, then forward them to the global domain event
+    //    dispatcher after save (collect-during, forward-after pattern).
+    List<DomainEvent> domainEventsCache = new ArrayList<>();
+    var localDomainEventDispatcher = LocalDomainEventDispatcher.instance();
+    localDomainEventDispatcher.reset();
+    localDomainEventDispatcher.subscribe(
+        new RemovedEventCollectorSubscriber(domainEventsCache));
+
+    // 4. Domain mutation (emits AssociatedDatasetRemovedEvent)
+    try {
+      dataset.remove(removedByUserId);
+    } catch (IllegalStateException e) {
+      // Defensive — already covered by the isConnected() check above,
+      // but keep as a safety net (e.g. concurrent remove race).
+      log.warn("Concurrent removal detected on dataset %s: %s"
+          .formatted(associatedDatasetIdStr, e.getMessage()));
+      return Result.fromError(RemoveDatasetError.DATASET_ALREADY_REMOVED);
+    } catch (Exception e) {
+      log.error("Failed removing dataset. Domain mutation failed for dataset %s"
+          .formatted(associatedDatasetIdStr), e);
+      return Result.fromError(RemoveDatasetError.REMOVAL_FAILED);
+    }
+
+    // 5. Persist the state transition
+    try {
+      associatedDatasetRepository.save(dataset);
+    } catch (Exception e) {
+      log.error("Failed to persist removal of dataset %s"
+          .formatted(associatedDatasetIdStr), e);
+      return Result.fromError(RemoveDatasetError.REMOVAL_FAILED);
+    }
+
+    // 6. Forward cached events to the global dispatcher — same best-effort
+    //    semantics as connectDataset(): failure here is logged but does not
+    //    roll the removal back (the dataset state is already saved).
+    try {
+      domainEventsCache.forEach(
+          domainEvent -> DomainEventDispatcher.instance().dispatch(domainEvent));
+    } catch (Exception e) {
+      log.warn("Event dispatch failed while forwarding removal domain event "
+          + "after dataset removal on project %s; the removal itself succeeded, ".formatted(dataset.projectId())
+          + "but collaborators may not have been notified: %s".formatted(e.getMessage()));
+    }
+
+    log.info("Dataset %s removed from project %s by user %s"
+        .formatted(dataset.id(), dataset.projectId(), removedByUserId));
+
+    return Result.fromValue(dataset.id());
+  }
+
+  // ── Reactive (non-blocking) remove ──────────────────────────────────────
+
+  /**
+   * Reactive counterpart of {@link #removeDataset}. Runs the blocking
+   * call on a {@link Schedulers#boundedElastic()} worker thread. Errors (including
+   * timeout and infrastructure exceptions) are wrapped into a
+   * {@link RemoveDatasetError#REMOVAL_FAILED} so the reactive stream
+   * never terminates in {@code onError} — enabling the UI to show a
+   * generic failure toast while the application log captures the full
+   * cause.
+   */
+  public Mono<Result<AssociatedDatasetId, RemoveDatasetError>> removeDatasetAsync(
+      String associatedDatasetId, String removedByUserId) {
+    SecurityContext securityContext = SecurityContextHolder.getContext();
+    return Mono.fromCallable(() -> removeDataset(associatedDatasetId, removedByUserId))
+        // Propagate the caller's SecurityContext to the boundedElastic
+        // worker thread so Spring Security {@code @PreAuthorize} on
+        // removeDataset resolves correctly.
+        .contextWrite(ReactiveSecurityContextUtils.reactiveSecurity(securityContext))
+        .subscribeOn(Schedulers.boundedElastic())
+        .onErrorResume(Throwable.class, t -> {
+          // Safety net: any exception escaping removeDataset() (schema
+          // errors, unexpected runtime exceptions, timeouts) is converted
+          // into REMOVAL_FAILED so the UI can show a generic failure
+          // toast. The log.error here is critical — without it, uncaught
+          // errors become silent failures only visible in the application
+          // log, not in the user's feedback.
+          log.error("Async remove pipeline failed for dataset %s: %s"
+              .formatted(associatedDatasetId, t.getMessage()), t);
+          return Mono.just(Result.fromError(RemoveDatasetError.REMOVAL_FAILED));
+        });
+  }
+
+  // ── List connected datasets ─────────────────────────────────────────────
+
+  /**
+   * Lists all actively connected datasets for a project as display-ready
+   * {@link ConnectedDatasetView} DTOs.
+   *
+   * <p>Each view is enriched with resolved display names: the connecting
+   * user's full name (via {@link UserInformationService}) and the linked
+   * experiment's display name (via {@link ExperimentInformationService}).
+   * Resolution failures fall back to the raw UUID so the view always
+   * renders something human-readable.</p>
+   *
+   * <p>Resolution is performed via a collect-distinct-then-batch-resolve
+   * strategy: distinct user IDs and experiment IDs are collected first,
+   * resolved exactly once, and then applied to all rows — avoiding N+1
+   * queries regardless of dataset count.</p>
+   *
+   * <p>Requires READ permission on the project (ADR-0003).</p>
+   *
+   * @param projectId the project to list connected datasets for
+   * @return the list of display-ready dataset views (never null, empty
+   *         if none); soft-deleted (REMOVED) connections are excluded
+   */
+  @PreAuthorize(
+      "hasPermission(#projectId, 'life.qbic.projectmanagement.domain.model.project.Project', 'READ')")
+  public List<ConnectedDatasetView> listConnectedDatasetViews(ProjectId projectId) {
+    Objects.requireNonNull(projectId, "projectId must not be null");
+    if (projectInformationService.find(projectId).isEmpty()) {
+      // The project existence check is redundant with the @PreAuthorize
+      // ACL guard — if the project has been deleted between ACL creation
+      // and this call, no datasets exist anyway. Returning an empty list
+      // is both logically correct and avoids leaking internal state via
+      // an exception message.
+      return List.of();
+    }
+    List<AssociatedDataset> datasets = associatedDatasetRepository.findByProject(projectId);
+
+    // 1. Collect distinct user IDs and experiment IDs present in this batch
+    Set<String> distinctUserIds = datasets.stream()
+        .map(AssociatedDataset::connectedBy)
+        .collect(Collectors.toSet());
+    Set<ExperimentId> distinctExperimentIds = datasets.stream()
+        .map(AssociatedDataset::experimentId)
+        .filter(Optional::isPresent)
+        .map(Optional::get)
+        .collect(Collectors.toSet());
+
+    // 2. Resolve each distinct ID exactly once
+    Map<String, String> userDisplayNames = resolveUserDisplayNames(distinctUserIds);
+    Map<ExperimentId, String> experimentDisplayNames = resolveExperimentDisplayNames(
+        projectId, distinctExperimentIds);
+
+    // 3. Build display-ready views
+    return datasets.stream()
+        .map(ds -> toView(ds, userDisplayNames, experimentDisplayNames))
+        .toList();
+  }
+
+  /**
+   * Resolves a set of distinct user IDs to their full display names via
+   * {@link UserInformationService}. Unresolvable IDs are silently omitted
+   * from the returned map; callers fall back to the raw UUID.
+   */
+  private Map<String, String> resolveUserDisplayNames(Set<String> userIds) {
+    Map<String, String> result = HashMap.newHashMap(userIds.size());
+    for (String userId : userIds) {
+      userInformationService.findById(userId)
+          .ifPresent(info -> result.put(userId, info.fullName()));
+    }
+    return result;
+  }
+
+  /**
+   * Resolves a set of distinct experiment IDs to their display names via
+   * {@link ExperimentInformationService}. Unresolvable IDs (e.g. when an
+   * experiment has been deleted) are omitted; callers fall back to the
+   * raw UUID string.
+   */
+  private Map<ExperimentId, String> resolveExperimentDisplayNames(
+      ProjectId projectId, Set<ExperimentId> experimentIds) {
+    Map<ExperimentId, String> result = HashMap.newHashMap(experimentIds.size());
+    for (ExperimentId eid : experimentIds) {
+      experimentInformationService.find(projectId.value(), eid)
+          .ifPresent(exp -> result.put(eid, exp.getName()));
+    }
+    return result;
+  }
+
+  /**
+   * Maps a domain aggregate to a {@link ConnectedDatasetView}, extracting
+   * source-specific fields (currently only InvenioRDM) into flat top-level
+   * fields and substituting resolved display names.
+   */
+  private ConnectedDatasetView toView(
+      AssociatedDataset ds,
+      Map<String, String> userDisplayNames,
+      Map<ExperimentId, String> experimentDisplayNames) {
+
+    ResourceMetadata metadata = ds.resourceMetadata();
+
+    // Source-type-independent fields
+    String displayName = userDisplayNames.getOrDefault(ds.connectedBy(), ds.connectedBy());
+    String expDisplay = ds.experimentId()
+        .map(eid -> experimentDisplayNames.getOrDefault(eid, eid.value()))
+        .orElse(null);
+
+    // Source-specific fields (InvenioRDM-only for now)
+    String version;
+    String accessLink;
+    String resourceProvider;
+    List<String> creators;
+    String resourceType;
+    String community;
+    String accessDetail;
+
+    if (metadata instanceof InvenioRdmResourceMetadata inv) {
+      version = inv.version();
+      accessLink = inv.accessLink();
+      resourceProvider = inv.resourceProvider();
+      creators = inv.creators();
+      resourceType = inv.resourceType();
+      community = inv.community();
+      accessDetail = ds.accessLevel() == AccessLevel.RESTRICTED
+          ? inv.accessDetailDisplay()
+          : null;
+    } else {
+      // Source-agnostic fallback — universal columns only
+      version = metadata.version();
+      accessLink = null;
+      resourceProvider = ds.sourceType().name();
+      creators = List.of();
+      resourceType = null;
+      community = null;
+      accessDetail = null;
+    }
+
+    return new ConnectedDatasetView(
+        ds.id().value(),
+        ds.title(),
+        ds.pid(),
+        ds.accessLevel() == AccessLevel.PUBLIC,
+        version,
+        accessLink,
+        ds.publicationDate(),
+        resourceProvider,
+        creators,
+        resourceType,
+        community,
+        accessDetail,
+        ds.connectedBy(),
+        displayName,
+        ds.connectedOn(),
+        ds.experimentId().map(ExperimentId::value).orElse(null),
+        expDisplay,
+        ds.sourceType().name()
+    );
+  }
+
+  // ── Available instances ─────────────────────────────────────────────────
+
+  /**
+   * Returns the list of configured source instances for the given source
+   * type, as descriptors (without credentials). Used by the UI to
+   * populate the instance selector combo box.
+   *
+   * @param sourceType the source system type
+   * @return configured instances; never null
+   */
+  public List<SourceInstanceDescriptor> availableInstances(SourceType sourceType) {
+    return sourceInstanceRegistry.findBySourceType(sourceType);
+  }
+
+  // ── Internals ───────────────────────────────────────────────────────────
+
+  private InstanceConfig resolveInstanceConfig(String instanceId) {
+    var descriptor = sourceInstanceRegistry.find(instanceId)
+        .orElseThrow(() -> {
+          log.warn("No source instance configured with id: %s".formatted(instanceId));
+          return new DatasetSourceNotFoundException();
+        });
+    return descriptor.toInstanceConfig();
+  }
+
+  /**
+   * Subscribes specifically to {@link AssociatedDatasetConnectedEvent}
+   * and caches it for later forwarding to the global
+   * {@link DomainEventDispatcher} (collect-during, forward-after
+   * pattern, same as {@code MeasurementService}).
+   *
+   * <p>The {@code LocalDomainEventDispatcher} uses <em>exact type
+   * matching</em> ({@code ==}) when filtering subscribers, so the
+   * subscriber must return the actual event class, not a parent type.</p>
+   */
+  private record ConnectedEventCollectorSubscriber(
+      List<DomainEvent> domainEventsCache
+  ) implements DomainEventSubscriber<AssociatedDatasetConnectedEvent> {
+
+    @Override
+    public Class<? extends DomainEvent> subscribedToEventType() {
+      return AssociatedDatasetConnectedEvent.class;
+    }
+
+    @Override
+    public void handleEvent(AssociatedDatasetConnectedEvent event) {
+      domainEventsCache.add(event);
+    }
+  }
+
+  /**
+   * Subscribes specifically to {@link AssociatedDatasetRemovedEvent}
+   * and caches it for later forwarding to the global
+   * {@link DomainEventDispatcher} (collect-during, forward-after
+   * pattern, same as {@code connectDataset()}).
+   *
+   * <p>The {@code LocalDomainEventDispatcher} uses <em>exact type
+   * matching</em> ({@code ==}) when filtering subscribers, so the
+   * subscriber must return the actual event class, not a parent type.</p>
+   *
+   * @since 1.12.0
+   */
+  private record RemovedEventCollectorSubscriber(
+      List<DomainEvent> domainEventsCache
+  ) implements DomainEventSubscriber<AssociatedDatasetRemovedEvent> {
+
+    @Override
+    public Class<? extends DomainEvent> subscribedToEventType() {
+      return AssociatedDatasetRemovedEvent.class;
+    }
+
+    @Override
+    public void handleEvent(AssociatedDatasetRemovedEvent event) {
+      domainEventsCache.add(event);
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceException.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceException.java
new file mode 100644
index 0000000000..e6073d4240
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceException.java
@@ -0,0 +1,58 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.io.Serial;
+
+/**
+ * Abstract base of all checked exceptions thrown by
+ * {@link AssociatedDatasetService} for unexpected (infrastructure-level) failure.
+ *
+ * <p>This class forms the exception contract of the service. Every
+ * infrastructure exception (network failures, HTTP error codes,
+ * JSON parse errors, timeouts) is translated into one of the two
+ * concrete subclasses before propagating to callers. As a result,
+ * callers never see infrastructure-level details (URLs, status codes,
+ * raw error bodies) in exception messages — only user-friendly text
+ * safe to display in the UI.</p>
+ *
+ * <p>The user-friendly message returned by {@link #userMessage()} is
+ * in English and serves as the fallback text when no i18n bundle is
+ * available. UI components that want to localise the message should
+ * use the concrete exception type to choose an appropriate i18n key;
+ * see {@link DatasetSourceUnavailableException} and
+ * {@link DatasetSourceNotFoundException} for details.</p>
+ *
+ * <p>This class is {@code sealed} to a fixed set of subtypes so the
+ * contract cannot silently grow — adding a new failure scenario
+ * requires an explicit {@code permits} clause update and a documented
+ * rationale.</p>
+ *
+ * @since 1.12.0
+ */
+public abstract sealed class AssociatedDatasetServiceException extends RuntimeException
+    permits DatasetSourceUnavailableException, DatasetSourceNotFoundException {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  private final String userMessage;
+
+  protected AssociatedDatasetServiceException(String userMessage) {
+    super(userMessage);
+    this.userMessage = userMessage;
+  }
+
+  protected AssociatedDatasetServiceException(String userMessage, Throwable cause) {
+    super(userMessage, cause);
+    this.userMessage = userMessage;
+  }
+
+  /**
+   * @return the user-facing error message in English. This message
+   *         contains no infrastructure details (no URLs, status codes,
+   *         host names, or raw error bodies) and is safe to display
+   *         directly to an end user.
+   */
+  public String userMessage() {
+    return userMessage;
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectDatasetError.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectDatasetError.java
new file mode 100644
index 0000000000..63ed6e3d41
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectDatasetError.java
@@ -0,0 +1,34 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+/**
+ * Error codes for the {@link AssociatedDatasetService#connectDataset}
+ * operation.
+ *
+ * @since 1.12.0
+ */
+public enum ConnectDatasetError {
+
+  /**
+   * The specified source instance ID does not match any configured instance.
+   */
+  INSTANCE_NOT_FOUND,
+
+  /**
+   * The record identified by the external handle could not be found on the
+   * source system (returned empty from {@link DatasetSource#resolveMetadata}).
+   */
+  RECORD_NOT_FOUND,
+
+  /**
+   * The dataset could not be connected due to an unexpected error.
+   */
+  CONNECT_FAILED,
+
+  /**
+   * A dataset with the same persistent identifier (PID/DOI) is already
+   * actively connected to the project. Prevents duplicate connections
+   * to the same logical record.
+   */
+  ALREADY_CONNECTED;
+
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectedDatasetView.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectedDatasetView.java
new file mode 100644
index 0000000000..c7d353a0c7
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/ConnectedDatasetView.java
@@ -0,0 +1,121 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * API-contract DTO returned by {@link AssociatedDatasetService#listConnectedDatasetViews
+ * (life.qbic.projectmanagement.domain.model.project.ProjectId)} for the UI layer.
+ *
+ * <p>Flattens the aggregate's universal columns, source-specific metadata
+ * fields, and resolved display names (user full name for {@code connectedBy},
+ * experiment display name for the linked experiment) into display-ready,
+ * source-agnostic top-level fields. The view must never see raw UUIDs for
+ * these references.</p>
+ *
+ * <p>{@code connectedByUserId} and {@code experimentId} are retained as
+ * opaque identifiers — useful for row keys or programmatic actions — but
+ * the display strings are what human-facing UI cells must render.</p>
+ *
+ * <p>Null values:
+ * <ul>
+ *   <li>{@code version} — null when the source did not provide a version</li>
+ *   <li>{@code accessLink} — null when not available</li>
+ *   <li>{@code resourceType}, {@code community} — null when not provided by the source</li>
+ *   <li>{@code accessDetail} — null when not applicable (e.g. PUBLIC datasets)</li>
+ *   <li>{@code creators} — empty list when unknown/missing (never null)</li>
+ *   <li>{@code experimentId}, {@code experimentName} — null when no experiment was linked</li>
+ * </ul>
+ *
+ * @since 1.12.0
+ * @see AssociatedDatasetService#listConnectedDatasetViews
+ */
+public record ConnectedDatasetView(
+
+    /** Aggregate identity (UUID string). Use as grid row key only. */
+    String id,
+
+    /** Human-readable title. Never null. */
+    String title,
+
+    /** Persistent identifier (PID / DOI). Never null. */
+    String pid,
+
+    /** Whether the dataset is publicly accessible (true for public access). */
+    boolean isPublic,
+
+    /** Version string (e.g. "v1"), or null if not available. */
+    String version,
+
+    /** URL to the record on the source instance, or null. */
+    String accessLink,
+
+    /** Publication date on the source instance. */
+    LocalDate publicationDate,
+
+    /** Display name of the source instance (e.g. "Zenodo", "FDAT"). */
+    String resourceProvider,
+
+    /**
+     * Individual creator display names (e.g. [{@code "Stanger, Anna"},
+     * {@code "Kimmich, Lucca"}]). Empty when unknown. Each element may
+     * itself contain commas (v12 InvenioRDM uses "Last, First" format),
+     * so callers must not split this field on comma.
+     */
+    List<String> creators,
+
+    /** Resource type label (e.g. "Dataset"), or null. */
+    String resourceType,
+
+    /** Community label (e.g. "QBiC"), or null. */
+    String community,
+
+    /**
+     * Short access-detail note for restricted datasets, e.g.
+     * "Record: public | Files: restricted". Null when not applicable.
+     */
+    String accessDetail,
+
+    /** Raw user ID of the connecting user (opaque, for logging/keys). */
+    String connectedByUserId,
+
+    /**
+     * Display name of the user that performed the connection
+     * (full name resolved via {@code UserInformationService}).
+     * Falls back to the raw user ID if resolution fails.
+     */
+    String connectedByDisplayName,
+
+    /** Timestamp of the connection. */
+    Instant connectedOn,
+
+    /**
+     * Raw experiment ID (UUID string), or null if no experiment is linked.
+     * Use as an opaque identifier; prefer {@link #experimentName} for display.
+     */
+    String experimentId,
+
+    /**
+     * Human-readable experiment name resolved via
+     * {@code ExperimentInformationService}, or null if no experiment is linked.
+     * Falls back to the raw experiment ID string when the experiment cannot be
+     * resolved (e.g. it has been deleted).
+     */
+    String experimentName,
+
+    /** Source system type identifier (e.g. "INVENIO_RDM"). */
+    String sourceType
+) {
+
+  public ConnectedDatasetView {
+    Objects.requireNonNull(id, "id must not be null");
+    Objects.requireNonNull(title, "title must not be null");
+    Objects.requireNonNull(pid, "pid must not be null");
+    Objects.requireNonNull(connectedByUserId, "connectedByUserId must not be null");
+    Objects.requireNonNull(connectedByDisplayName, "connectedByDisplayName must not be null");
+    Objects.requireNonNull(connectedOn, "connectedOn must not be null");
+    Objects.requireNonNull(sourceType, "sourceType must not be null");
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetResolveException.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetResolveException.java
new file mode 100644
index 0000000000..b97356889e
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetResolveException.java
@@ -0,0 +1,53 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import life.qbic.application.commons.ApplicationException;
+import life.qbic.application.commons.ApplicationException.ErrorCode;
+import life.qbic.application.commons.ApplicationException.ErrorParameters;
+
+import java.io.Serial;
+
+/**
+ * Thrown by {@link DatasetSource} when a metadata resolve operation fails
+ * due to an infrastructure-level error.
+ *
+ * <p>Represents failures in {@link DatasetSource#resolveMetadata(String,
+ * InstanceConfig, String)} such as:</p>
+ * <ul>
+ *   <li>network / connection errors</li>
+ *   <li>HTTP request timeouts</li>
+ *   <li>rate-limit exhaustion (HTTP 429 after retries)</li>
+ *   <li>server errors (HTTP 5xx after retries)</li>
+ *   <li>response body cannot be parsed as expected</li>
+ *   <li>authentication / credential resolution errors on the source system</li>
+ * </ul>
+ *
+ * <p>A record that does not exist on the source system (HTTP 404) is
+ * <em>not</em> represented by this exception. Instead,
+ * {@link DatasetSource#resolveMetadata} returns {@link java.util.Optional#empty()}
+ * for that case.</p>
+ *
+ * <p>The cause chain preserves the original exception (e.g. the
+ * underlying I/O error or HTTP error from the client) so callers can
+ * inspect technical details when needed.</p>
+ *
+ * @since 1.12.0
+ */
+public final class DatasetResolveException extends ApplicationException {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  public DatasetResolveException(String message) {
+    super(message);
+  }
+
+  /**
+   * Constructs a resolve exception with the given message and cause.
+   *
+   * @param message user-facing or debug message describing the failure
+   * @param cause   the underlying cause (network error, HTTP error, etc.)
+   */
+  public DatasetResolveException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSearchException.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSearchException.java
new file mode 100644
index 0000000000..6862fe9688
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSearchException.java
@@ -0,0 +1,48 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import life.qbic.application.commons.ApplicationException;
+import life.qbic.application.commons.ApplicationException.ErrorCode;
+import life.qbic.application.commons.ApplicationException.ErrorParameters;
+
+import java.io.Serial;
+
+/**
+ * Thrown by {@link DatasetSource} when a dataset search operation fails
+ * due to an infrastructure-level error.
+ *
+ * <p>Represents failures in {@link DatasetSource#search(SearchQuery,
+ * InstanceConfig, String)} such as:</p>
+ * <ul>
+ *   <li>network / connection errors</li>
+ *   <li>HTTP request timeouts</li>
+ *   <li>rate-limit exhaustion (HTTP 429 after retries)</li>
+ *   <li>server errors (HTTP 5xx after retries)</li>
+ *   <li>response body cannot be parsed as expected</li>
+ *   <li>authentication / credential resolution errors on the source system</li>
+ * </ul>
+ *
+ * <p>The cause chain preserves the original exception (e.g. the
+ * underlying I/O error or HTTP error from the client) so callers can
+ * inspect technical details when needed.</p>
+ *
+ * @since 1.12.0
+ */
+public final class DatasetSearchException extends ApplicationException {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  public DatasetSearchException(String message) {
+    super(message);
+  }
+
+  /**
+   * Constructs a search exception with the given message and cause.
+   *
+   * @param message user-facing or debug message describing the failure
+   * @param cause   the underlying cause (network error, HTTP error, etc.)
+   */
+  public DatasetSearchException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSource.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSource.java
new file mode 100644
index 0000000000..b0f722f1a9
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSource.java
@@ -0,0 +1,76 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.util.Optional;
+import life.qbic.projectmanagement.domain.model.associated_dataset.ResourceMetadata;
+
+/**
+ * Port (SPI) for searching and resolving datasets on an external data
+ * source system.
+ *
+ * <p>The application layer uses this interface to look for datasets and
+ * fetch their metadata without knowing the specifics of the underlying
+ * API (e.g. InvenioRDM REST API). Infrastructure adapters implement
+ * this port for each supported source system.</p>
+ *
+ * <p>Each method accepts an {@code actingUserId} — the identity of the
+ * user performing the action. Implementations use this identity to
+ * resolve per-user credentials from infrastructure storage (vault,
+ * encrypted DB column) inside the HTTP call scope only, and zero them
+ * immediately after use (ADR-0002 D1: decryption boundary). The
+ * application layer never sees, holds, or passes raw authentication
+ * material.</p>
+ *
+ * <p>Stateless by design (ADR-0002 P2): no session concept. Each call
+ * carries everything needed via {@link InstanceConfig}.</p>
+ *
+ * <p>Implementations must throw {@link DatasetSearchException} for
+ * search failures and {@link DatasetResolveException} for metadata
+ * resolve failures, rather than returning opaque nulls or using
+ * generic {@link life.qbic.application.commons.ApplicationException}.</p>
+ *
+ * @since 1.12.0
+ */
+public interface DatasetSource {
+
+  /**
+   * Searches an external data source for datasets matching the query, on
+   * behalf of the given user.
+   *
+   * <p>The {@code actingUserId} is used by the implementation to resolve
+   * any per-user credentials needed for the search (e.g. a Personal
+   * Access Token for restricted datasets on InvenioRDM). If the user has
+   * no credentials configured, the implementation should return only
+   * publicly accessible results.</p>
+   *
+   * @param query        the search parameters (query string, pagination)
+   * @param config       the target instance (base URL, display name)
+   * @param actingUserId the ID of the user performing the search
+   * @return paginated search results
+   * @throws DatasetSearchException if the search cannot be performed
+   *         (network error, rate limit, server error, etc.)
+   */
+  SearchResult search(SearchQuery query, InstanceConfig config,
+      String actingUserId) throws DatasetSearchException;
+
+  /**
+   * Resolves the full metadata for a single record on the source system,
+   * on behalf of the given user.
+   *
+   * <p>Used when connecting a dataset: the search hit provides a
+   * snapshot, and this method fetches the canonical metadata to persist
+   * on the aggregate.</p>
+   *
+   * @param externalHandleValue the source-specific identifier for the
+   *                            record (e.g. Zenodo record ID, DOI)
+   * @param config              the target instance
+   * @param actingUserId        the ID of the user performing the resolve
+   * @return the resource metadata, or empty if the record was not found
+   * @throws DatasetResolveException if the metadata cannot be retrieved
+   *         (network error, rate limit, server error, etc.) —
+   *         distinct from a missing record, which returns empty
+   */
+  Optional<ResourceMetadata> resolveMetadata(
+      String externalHandleValue, InstanceConfig config,
+      String actingUserId) throws DatasetResolveException;
+
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceNotFoundException.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceNotFoundException.java
new file mode 100644
index 0000000000..ea7efa1f03
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceNotFoundException.java
@@ -0,0 +1,62 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.io.Serial;
+
+/**
+ * Thrown when a requested data repository identifier does not match
+ * any configured instance.
+ *
+ * <p>In the {@link AssociatedDatasetService} this is raised by the
+ * private {@code resolveInstanceConfig(instanceId)} helper when
+ * {@link SourceInstanceRegistry#find(String)} returns empty. It
+ * propagates as an exception from {@code searchDatasets(...)} and is
+ * caught by {@code connectDataset(...)}, which translates it into
+ * {@link ConnectDatasetError#INSTANCE_NOT_FOUND} (an expected-failure
+ * result, not an exception).</p>
+ *
+ * <p>The user-facing message does not expose the unrecognised
+ * {@code instanceId} — that identifier is a logical configuration
+ * name (e.g. "zenodo", "fdat"), not an infrastructure URL, but the
+ * end user cannot act on it either; the actionable advice is to
+ * contact an administrator to verify repository settings.</p>
+ *
+ * <p><b>UI mapping guidance</b></p>
+ * <ul>
+ *   <li>Toast / inline toast: i18n key {@code dataset.source.not-found}</li>
+ *   <li>Dialog title suggestion: <em>Repository Not Configured</em></li>
+ * </ul>
+ *
+ * @since 1.12.0
+ */
+public final class DatasetSourceNotFoundException
+    extends AssociatedDatasetServiceException {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  private static final String USER_MESSAGE =
+      "The requested data repository is not configured. "
+          + "Please verify the repository settings or contact your administrator.";
+
+  /**
+   * Constructs an exception with a user-friendly message. The raw
+   * {@code instanceId} is recorded in the service log elsewhere, so
+   * the message here is intentionally generic.
+   */
+  public DatasetSourceNotFoundException() {
+    super(USER_MESSAGE);
+  }
+
+  /**
+   * Constructs an exception with a user-friendly message. The raw
+   * {@code instanceId} is recorded in the service log elsewhere, so
+   * the message here is intentionally generic.
+   *
+   * @param cause optional underlying cause (rarely used — typically
+   *     this exception is raised directly when the registry lookup
+   *     fails)
+   */
+  public DatasetSourceNotFoundException(Throwable cause) {
+    super(USER_MESSAGE, cause);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceUnavailableException.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceUnavailableException.java
new file mode 100644
index 0000000000..4895d2ef19
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/DatasetSourceUnavailableException.java
@@ -0,0 +1,60 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.io.Serial;
+
+/**
+ * Thrown when an external data repository is unreachable or fails to
+ * respond correctly.
+ *
+ * <p>Covers infrastructure-level failures such as:</p>
+ * <ul>
+ *   <li>network / connection errors</li>
+ *   <li>HTTP request timeouts</li>
+ *   <li>rate-limit exhaustion (HTTP 429 after retries)</li>
+ *   <li>server errors (HTTP 5xx after retries)</li>
+ *   <li>response body cannot be parsed as expected (malformed / unexpected JSON)</li>
+ *   <li>authentication / credential resolution errors on the source system</li>
+ * </ul>
+ *
+ * <p>The user-facing message deliberately omits the affected instance
+ * name, URL, and HTTP status code — those details are available in the
+ * application log (the original cause is preserved via
+ * {@link #getCause()}) but must not reach the end user.</p>
+ *
+ * <p><b>UI mapping guidance</b></p>
+ * <ul>
+ *   <li>Toast / inline toast: i18n key {@code dataset.search.failed}</li>
+ *   <li>Dialog title suggestion: <em>Repository Unavailable</em></li>
+ * </ul>
+ *
+ * @since 1.12.0
+ */
+public final class DatasetSourceUnavailableException
+    extends AssociatedDatasetServiceException {
+
+  @Serial
+  private static final long serialVersionUID = 1L;
+
+  private static final String DEFAULT_MESSAGE =
+      "The data repository is temporarily unavailable. Please try again in a moment.";
+
+  /** Constructs an exception with the default user-friendly message. */
+  public DatasetSourceUnavailableException() {
+    super(DEFAULT_MESSAGE, null);
+  }
+
+  /** Constructs an exception with the default user-friendly message, preserving the underlying cause. */
+  public DatasetSourceUnavailableException(Throwable cause) {
+    super(DEFAULT_MESSAGE, cause);
+  }
+
+  /** Constructs an exception with a custom user-friendly message. */
+  public DatasetSourceUnavailableException(String customUserMessage) {
+    super(customUserMessage, null);
+  }
+
+  /** Constructs an exception with a custom user-friendly message, preserving the underlying cause. */
+  public DatasetSourceUnavailableException(String customUserMessage, Throwable cause) {
+    super(customUserMessage, cause);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/InstanceConfig.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/InstanceConfig.java
new file mode 100644
index 0000000000..338ec2d231
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/InstanceConfig.java
@@ -0,0 +1,38 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.util.Objects;
+
+/**
+ * Runtime configuration for a specific external data source instance,
+ * passed to the {@link DatasetSource} port.
+ *
+ * <p>Bundles the static metadata needed to locate an instance (base URL,
+ * display name). The invoking user's identity is passed separately to
+ * the port methods — the application layer never handles authentication
+ * material (per ADR-0002 D1: the decryption boundary is at infrastructure
+ * only).</p>
+ *
+ * <p>Immutable value object.</p>
+ *
+ * @since 1.12.0
+ */
+public record InstanceConfig(
+    /** Unique admin-assigned instance identifier (e.g. "zenodo"). */
+    String id,
+
+    /** Human-readable display name (e.g. "Zenodo (zenodo.org)"). */
+    String displayName,
+
+    /** Base URL of the instance (no trailing slash). */
+    String baseUrl
+) {
+
+  public InstanceConfig {
+    Objects.requireNonNull(id, "id must not be null");
+    Objects.requireNonNull(displayName, "displayName must not be null");
+    Objects.requireNonNull(baseUrl, "baseUrl must not be null");
+    if (baseUrl.isBlank()) {
+      throw new IllegalArgumentException("baseUrl must not be blank");
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/RemoveDatasetError.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/RemoveDatasetError.java
new file mode 100644
index 0000000000..2306635118
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/RemoveDatasetError.java
@@ -0,0 +1,29 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+/**
+ * Error codes for the {@link AssociatedDatasetService#removeDataset} operation.
+ *
+ * @since 1.12.0
+ */
+public enum RemoveDatasetError {
+
+  /**
+   * The specified dataset connection was not found in the repository.
+   * May indicate the ID is invalid or the dataset does not belong to the
+   * calling user's scope.
+   */
+  DATASET_NOT_FOUND,
+
+  /**
+   * The dataset connection is already in {@code REMOVED} state.
+   * Removal is idempotent — calling remove on an already-removed
+   * connection returns this error rather than succeeding silently.
+   */
+  DATASET_ALREADY_REMOVED,
+
+  /**
+   * The dataset could not be removed due to an unexpected error
+   * (e.g., persistence failure, constraint violation).
+   */
+  REMOVAL_FAILED;
+}
\ No newline at end of file
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchHit.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchHit.java
new file mode 100644
index 0000000000..af847d5543
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchHit.java
@@ -0,0 +1,67 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.time.LocalDate;
+import java.util.Objects;
+
+/**
+ * A single record found by searching an external data source.
+ *
+ * <p>Transient DTO — carries enough information for the UI search-results
+ * display. Produced by the infrastructure adapter (implementing the
+ * {@link DatasetSource} port) and returned to the UI via the
+ * {@link AssociatedDatasetService}.</p>
+ *
+ * <p>Nullable fields: {@code version}, {@code description}, and
+ * {@code accessDetail} are null when the source does not provide them
+ * or when they are not applicable.</p>
+ *
+ * @since 1.12.0
+ */
+public record SearchHit(
+    /**
+     * The external record identifier on the source (e.g. Zenodo record ID,
+     * DOI). Used as the {@code externalHandle} when connecting the dataset.
+     */
+    String externalHandleValue,
+
+    /** Human-readable title. */
+    String title,
+
+    /** Persistent identifier (PID / DOI). */
+    String pid,
+
+    /** Version string, or null if unknown. */
+    String version,
+
+    /** Publication date on the source. */
+    LocalDate publicationDate,
+
+    /** Display name of the source instance (e.g. "Zenodo"). */
+    String resourceProvider,
+
+    /** Short description or abstract, or null. */
+    String description,
+
+    /**
+     * Whether the dataset is publicly accessible.
+     * For InvenioRDM: true only when record + file access are public
+     * and no embargo is active.
+     */
+    boolean isPublic,
+
+    /**
+     * A source-specific access detail string for display, e.g.
+     * "Record: public | Files: restricted". Null if the source has no
+     * such distinction.
+     */
+    String accessDetail
+) {
+
+  public SearchHit {
+    Objects.requireNonNull(externalHandleValue, "externalHandleValue must not be null");
+    Objects.requireNonNull(title, "title must not be null");
+    Objects.requireNonNull(pid, "pid must not be null");
+    Objects.requireNonNull(publicationDate, "publicationDate must not be null");
+    Objects.requireNonNull(resourceProvider, "resourceProvider must not be null");
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchQuery.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchQuery.java
new file mode 100644
index 0000000000..b536a27c99
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchQuery.java
@@ -0,0 +1,49 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+/**
+ * The query parameters for searching an external data source.
+ *
+ * <p>An empty or blank {@code query} string means "list all available
+ * records" (with pagination applied). Pagination is zero-indexed for
+ * page number.</p>
+ *
+ * @since 1.12.0
+ */
+public record SearchQuery(
+    /**
+     * Free-text search term (title, PID, creator, etc.), or empty/null
+     * for "list all" with pagination.
+     */
+    String query,
+
+    /** Zero-indexed page number. */
+    int page,
+
+    /** Number of results per page. */
+    int pageSize
+) {
+
+  public SearchQuery {
+    if (page < 0) {
+      throw new IllegalArgumentException("page must not be negative, got: " + page);
+    }
+    if (pageSize <= 0) {
+      throw new IllegalArgumentException("pageSize must be positive, got: " + pageSize);
+    }
+  }
+
+  /**
+   * Returns the effective search term: empty string if null/blank,
+   * meaning "list all".
+   */
+  public String effectiveQuery() {
+    return query == null || query.isBlank() ? "" : query;
+  }
+
+  /**
+   * Convenience factory for a "list all" query (blank search term).
+   */
+  public static SearchQuery listAll(int page, int pageSize) {
+    return new SearchQuery("", page, pageSize);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchResult.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchResult.java
new file mode 100644
index 0000000000..09110d19c1
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SearchResult.java
@@ -0,0 +1,45 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * A paginated search result from an external data source.
+ *
+ * <p>Wraps the list of {@link SearchHit}s returned by one page of a
+ * search, along with total count and pagination metadata.</p>
+ *
+ * @since 1.12.0
+ */
+public record SearchResult(
+    /** The hits on this page. */
+    List<SearchHit> hits,
+
+    /** Total number of matching records across all pages. */
+    int totalHits,
+
+    /** Zero-indexed page number. */
+    int page,
+
+    /** Number of results per page. */
+    int pageSize
+) {
+
+  public SearchResult {
+    Objects.requireNonNull(hits, "hits must not be null");
+    if (page < 0) {
+      throw new IllegalArgumentException("page must not be negative");
+    }
+    if (pageSize <= 0) {
+      throw new IllegalArgumentException("pageSize must be positive");
+    }
+    hits = List.copyOf(hits);
+  }
+
+  /**
+   * Whether there are more pages after this one.
+   */
+  public boolean hasMorePages() {
+    return (page + 1) * pageSize < totalHits;
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceDescriptor.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceDescriptor.java
new file mode 100644
index 0000000000..29e2af2398
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceDescriptor.java
@@ -0,0 +1,40 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.util.Objects;
+
+/**
+ * Configuration descriptor for one available external data source instance,
+ * typically loaded from application configuration (e.g.
+ * {@code application.properties}).
+ *
+ * <p>This is the config-level record — it carries only the static metadata
+ * needed to construct an {@link InstanceConfig} at runtime. Authentication
+ * is handled entirely at the infrastructure layer (ADR-0002 D1): the
+ * infrastructure adapter resolves per-user credentials from secure storage
+ * when making external API calls.</p>
+ *
+ * <p>Admin-controlled: adding or changing instances is a config change +
+ * deploy (ADR-0002 I2).</p>
+ *
+ * @since 1.12.0
+ */
+public record SourceInstanceDescriptor(
+    String id,
+    String displayName,
+    String baseUrl
+) {
+
+  public SourceInstanceDescriptor {
+    Objects.requireNonNull(id, "id must not be null");
+    Objects.requireNonNull(displayName, "displayName must not be null");
+    Objects.requireNonNull(baseUrl, "baseUrl must not be null");
+  }
+
+  /**
+   * Converts this descriptor into a runtime {@link InstanceConfig} without
+   * an access token (anonymous access).
+   */
+  public InstanceConfig toInstanceConfig() {
+    return new InstanceConfig(id, displayName, baseUrl);
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceRegistry.java b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceRegistry.java
new file mode 100644
index 0000000000..7d66b11dd9
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/associated_dataset/SourceInstanceRegistry.java
@@ -0,0 +1,38 @@
+package life.qbic.projectmanagement.application.associated_dataset;
+
+import java.util.List;
+import java.util.Optional;
+import life.qbic.projectmanagement.domain.model.associated_dataset.SourceType;
+
+/**
+ * Registry of available external data source instances.
+ *
+ * <p>Admin-configured (ADR-0002 I2): the list of instances is loaded
+ * from application configuration (e.g. {@code application.properties})
+ * and is fixed at deploy time. Users cannot add arbitrary instance URLs
+ * through the UI.</p>
+ *
+ * @since 1.12.0
+ */
+public interface SourceInstanceRegistry {
+
+  /**
+   * Finds a configured instance by its unique ID.
+   *
+   * @param instanceId the instance identifier (e.g. "zenodo", "fdat")
+   * @return the descriptor, or empty if no instance with that ID is
+   *         configured
+   */
+  Optional<SourceInstanceDescriptor> find(String instanceId);
+
+  /**
+   * Returns all configured instances for a given source type.
+   *
+   * @param sourceType the source system type (e.g.
+   *                   {@link SourceType#INVENIO_RDM})
+   * @return all configured instances of that source type; never null
+   *         (may be empty)
+   */
+  List<SourceInstanceDescriptor> findBySourceType(SourceType sourceType);
+
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/dataset/LocalRawDatasetRepository.java b/project-management/src/main/java/life/qbic/projectmanagement/application/dataset/LocalRawDatasetRepository.java
index 22e25e7109..cd1bd24c8a 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/dataset/LocalRawDatasetRepository.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/dataset/LocalRawDatasetRepository.java
@@ -1,8 +1,6 @@
 package life.qbic.projectmanagement.application.dataset;
 
-import java.util.Collection;
 import java.util.List;
-import life.qbic.projectmanagement.application.api.AsyncProjectService;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.RawDataset;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.RawDatasetFilter;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.RawDatasetInformationIp;
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/MeasurementService.java b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/MeasurementService.java
index b25a30a27a..f340a7aa14 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/MeasurementService.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/MeasurementService.java
@@ -21,25 +21,25 @@
 import life.qbic.logging.api.Logger;
 import life.qbic.projectmanagement.application.OrganisationLookupService;
 import life.qbic.projectmanagement.application.ProjectInformationService;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificIP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.ontology.TerminologyService;
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry;
 import life.qbic.projectmanagement.application.sample.SampleInformationService;
 import life.qbic.projectmanagement.domain.model.OntologyTerm;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
+import life.qbic.projectmanagement.domain.model.measurement.IPMeasurementEntry;
+import life.qbic.projectmanagement.domain.model.measurement.IPMethodMetadata;
+import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementCode;
 import life.qbic.projectmanagement.domain.model.measurement.MeasurementId;
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement;
-import life.qbic.projectmanagement.domain.model.measurement.IPMethodMetadata;
-import life.qbic.projectmanagement.domain.model.measurement.IPMeasurementEntry;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMeasurement;
 import life.qbic.projectmanagement.domain.model.measurement.NGSMethodMetadata;
 import life.qbic.projectmanagement.domain.model.measurement.NGSSpecificMeasurementMetadata;
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementValidationService.java b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementValidationService.java
index ec8dcf1dfb..422bbf8b44 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementValidationService.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/MeasurementValidationService.java
@@ -4,9 +4,9 @@
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
+import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP;
 import life.qbic.projectmanagement.domain.model.project.ProjectId;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/ValidationRule.java b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/ValidationRule.java
index 42f91e1ada..04ddc0b8f1 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/ValidationRule.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/measurement/validation/ValidationRule.java
@@ -8,7 +8,6 @@
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationPxP;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificNGS;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificPxP;
-import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationPxP;
 
 /**
  * <b>Validation Rule</b>
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetConnectedPolicy.java b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetConnectedPolicy.java
new file mode 100644
index 0000000000..4494f6a5b9
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetConnectedPolicy.java
@@ -0,0 +1,24 @@
+package life.qbic.projectmanagement.application.policy;
+
+import static java.util.Objects.requireNonNull;
+
+import life.qbic.domain.concepts.DomainEventDispatcher;
+import life.qbic.projectmanagement.application.policy.directive.InformProjectCollaboratorsAboutDatasetConnection;
+
+/**
+ * <b>Policy: Associated Dataset Connected</b>
+ *
+ * <p>Business policy that needs to be executed after a dataset has been
+ * connected to a project. Currently wires the email notification
+ * directive that informs every collaborator (except the actor).</p>
+ *
+ * @since 1.12.0
+ */
+public class AssociatedDatasetConnectedPolicy {
+
+  public AssociatedDatasetConnectedPolicy(
+      InformProjectCollaboratorsAboutDatasetConnection informCollaborators) {
+    DomainEventDispatcher.instance().subscribe(requireNonNull(informCollaborators,
+        "informCollaborators must not be null"));
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetRemovedPolicy.java b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetRemovedPolicy.java
new file mode 100644
index 0000000000..c086088895
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/AssociatedDatasetRemovedPolicy.java
@@ -0,0 +1,24 @@
+package life.qbic.projectmanagement.application.policy;
+
+import static java.util.Objects.requireNonNull;
+
+import life.qbic.domain.concepts.DomainEventDispatcher;
+import life.qbic.projectmanagement.application.policy.directive.InformProjectCollaboratorsAboutDatasetRemoval;
+
+/**
+ * <b>Policy: Associated Dataset Removed</b>
+ *
+ * <p>Business policy that needs to be executed after a dataset connection
+ * has been removed from a project. Wire up the email notification
+ * directive that informs every collaborator (except the actor).</p>
+ *
+ * @since 1.12.0
+ */
+public class AssociatedDatasetRemovedPolicy {
+
+  public AssociatedDatasetRemovedPolicy(
+      InformProjectCollaboratorsAboutDatasetRemoval informCollaborators) {
+    DomainEventDispatcher.instance().subscribe(
+        requireNonNull(informCollaborators, "informCollaborators must not be null"));
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetConnection.java b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetConnection.java
new file mode 100644
index 0000000000..1eed6797a6
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetConnection.java
@@ -0,0 +1,143 @@
+package life.qbic.projectmanagement.application.policy.directive;
+
+import static java.util.Objects.requireNonNull;
+import static life.qbic.logging.service.LoggerFactory.logger;
+
+import java.util.ArrayList;
+import java.util.List;
+import life.qbic.domain.concepts.DomainEvent;
+import life.qbic.domain.concepts.DomainEventSubscriber;
+import life.qbic.identity.api.UserInformationService;
+import life.qbic.logging.api.Logger;
+import life.qbic.projectmanagement.application.AppContextProvider;
+import life.qbic.projectmanagement.application.Messages;
+import life.qbic.projectmanagement.application.ProjectInformationService;
+import life.qbic.projectmanagement.application.authorization.acl.ProjectAccessService;
+import life.qbic.projectmanagement.application.authorization.acl.ProjectAccessService.ProjectCollaborator;
+import life.qbic.projectmanagement.application.communication.Content;
+import life.qbic.projectmanagement.application.communication.EmailService;
+import life.qbic.projectmanagement.application.communication.Recipient;
+import life.qbic.projectmanagement.application.communication.Subject;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetConnectedEvent;
+import life.qbic.projectmanagement.domain.model.project.Project;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import life.qbic.projectmanagement.domain.model.project.ProjectIntent;
+import life.qbic.projectmanagement.domain.model.project.ProjectTitle;
+import org.jobrunr.jobs.annotations.Job;
+import org.jobrunr.scheduling.JobScheduler;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * <b>Directive: Inform project collaborators about a connected dataset</b>
+ *
+ * <p>After a user connects an external dataset to a project, every other
+ * collaborator on that project is notified by email. The actor who
+ * performed the connection is deliberately excluded so they do not
+ * receive a self-notification.</p>
+ *
+ * <p>The actual email send runs inside a JobRunr background job so the
+ * domain-event handler does not block on SMTP latency (ADR-0002 §12).</p>
+ *
+ * @since 1.12.0
+ */
+@Component
+public class InformProjectCollaboratorsAboutDatasetConnection
+    implements DomainEventSubscriber<AssociatedDatasetConnectedEvent> {
+
+  private static final Logger log = logger(InformProjectCollaboratorsAboutDatasetConnection.class);
+
+  private final EmailService emailService;
+  private final ProjectAccessService projectAccessService;
+  private final UserInformationService userInformationService;
+  private final ProjectInformationService projectInformationService;
+  private final AppContextProvider appContextProvider;
+  private final JobScheduler jobScheduler;
+
+  public InformProjectCollaboratorsAboutDatasetConnection(
+      EmailService emailService,
+      ProjectAccessService projectAccessService,
+      UserInformationService userInformationService,
+      ProjectInformationService projectInformationService,
+      AppContextProvider appContextProvider,
+      JobScheduler jobScheduler) {
+    this.emailService = requireNonNull(emailService);
+    this.projectAccessService = requireNonNull(projectAccessService);
+    this.userInformationService = requireNonNull(userInformationService);
+    this.projectInformationService = requireNonNull(projectInformationService);
+    this.appContextProvider = requireNonNull(appContextProvider);
+    this.jobScheduler = requireNonNull(jobScheduler);
+  }
+
+  @Override
+  public Class<? extends DomainEvent> subscribedToEventType() {
+    return AssociatedDatasetConnectedEvent.class;
+  }
+
+  @Override
+  @PreAuthorize(
+      "hasPermission(#event.projectId(), 'life.qbic.projectmanagement.domain.model.project.Project', 'READ')")
+  public void handleEvent(AssociatedDatasetConnectedEvent event) {
+    String projectTitle = projectInformationService.find(event.projectId())
+        .map(Project::getProjectIntent)
+        .map(ProjectIntent::projectTitle)
+        .map(ProjectTitle::title)
+        .orElseThrow(() -> new DirectiveExecutionException(
+            "Project not found: " + event.projectId()));
+
+    String projectUrl = appContextProvider.urlToProject(event.projectId().value());
+    String actorId = event.actorUserId();
+
+    List<RecipientInfo> recipients = resolveRecipientsExcludingActor(event.projectId(), actorId);
+    if (recipients.isEmpty()) {
+      log.info("No collaborators to notify for dataset connection on project %s".formatted(
+          event.projectId()));
+      return;
+    }
+
+    for (RecipientInfo recipient : recipients) {
+      jobScheduler.enqueue(
+          () -> notifyRecipient(recipient.email, recipient.fullName,
+              recipient.fullName, projectTitle, event.datasetTitle(), event.datasetPid(), projectUrl));
+    }
+  }
+
+  /**
+   * Resolves all collaborators on the project, filtering out the actor
+   * who performed the connection. Silently skips users whose profile
+   * cannot be resolved (e.g. a deleted user account).
+   */
+  private List<RecipientInfo> resolveRecipientsExcludingActor(ProjectId projectId, String actorId) {
+    List<RecipientInfo> recipients = new ArrayList<>();
+    List<String> userIds = projectAccessService.listCollaborators(projectId).stream()
+        .map(ProjectCollaborator::userId)
+        .toList();
+    for (String userId : userIds) {
+      if (userId.equals(actorId)) {
+        continue;
+      }
+      userInformationService.findById(userId)
+          .ifPresent(info -> recipients.add(new RecipientInfo(info.emailAddress(), info.fullName())));
+    }
+    return recipients;
+  }
+
+  @Job(name = "Notify collaborator about dataset connection on project %3 for dataset %4")
+  public void notifyRecipient(
+      String emailAddress,
+      String fullName,
+      String addressee,
+      String projectTitle,
+      String datasetTitle,
+      String datasetPid,
+      String projectUrl) {
+    var subject = new Subject("New dataset connected to project");
+    var message = Messages.datasetConnectedToProject(
+        addressee, projectTitle, datasetTitle, datasetPid, projectUrl);
+    emailService.send(subject,
+        new Recipient(emailAddress, fullName),
+        new Content(message));
+  }
+
+  private record RecipientInfo(String email, String fullName) {}
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetRemoval.java b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetRemoval.java
new file mode 100644
index 0000000000..4de95c850a
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/policy/directive/InformProjectCollaboratorsAboutDatasetRemoval.java
@@ -0,0 +1,144 @@
+package life.qbic.projectmanagement.application.policy.directive;
+
+import static java.util.Objects.requireNonNull;
+import static life.qbic.logging.service.LoggerFactory.logger;
+
+import java.util.ArrayList;
+import java.util.List;
+import life.qbic.domain.concepts.DomainEvent;
+import life.qbic.domain.concepts.DomainEventSubscriber;
+import life.qbic.identity.api.UserInformationService;
+import life.qbic.logging.api.Logger;
+import life.qbic.projectmanagement.application.AppContextProvider;
+import life.qbic.projectmanagement.application.Messages;
+import life.qbic.projectmanagement.application.ProjectInformationService;
+import life.qbic.projectmanagement.application.authorization.acl.ProjectAccessService;
+import life.qbic.projectmanagement.application.authorization.acl.ProjectAccessService.ProjectCollaborator;
+import life.qbic.projectmanagement.application.communication.Content;
+import life.qbic.projectmanagement.application.communication.EmailService;
+import life.qbic.projectmanagement.application.communication.Recipient;
+import life.qbic.projectmanagement.application.communication.Subject;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetRemovedEvent;
+import life.qbic.projectmanagement.domain.model.project.Project;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+import life.qbic.projectmanagement.domain.model.project.ProjectIntent;
+import life.qbic.projectmanagement.domain.model.project.ProjectTitle;
+import org.jobrunr.jobs.annotations.Job;
+import org.jobrunr.scheduling.JobScheduler;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.stereotype.Component;
+
+/**
+ * <b>Directive: Inform project collaborators about dataset connection removal</b>
+ *
+ * <p>After a user removes a dataset connection from a project, every other
+ * collaborator on that project is notified by email. The actor who performed
+ * the removal is deliberately excluded so they do not receive a
+ * self-notification.</p>
+ *
+ * <p>The actual email send runs inside a JobRunr background job so the
+ * domain-event handler does not block on SMTP latency (ADR-0002 §12).</p>
+ *
+ * @since 1.12.0
+ */
+@Component
+public class InformProjectCollaboratorsAboutDatasetRemoval
+    implements DomainEventSubscriber<AssociatedDatasetRemovedEvent> {
+
+  private static final Logger log = logger(InformProjectCollaboratorsAboutDatasetRemoval.class);
+
+  private final EmailService emailService;
+  private final ProjectAccessService projectAccessService;
+  private final UserInformationService userInformationService;
+  private final ProjectInformationService projectInformationService;
+  private final AppContextProvider appContextProvider;
+  private final JobScheduler jobScheduler;
+
+  public InformProjectCollaboratorsAboutDatasetRemoval(
+      EmailService emailService,
+      ProjectAccessService projectAccessService,
+      UserInformationService userInformationService,
+      ProjectInformationService projectInformationService,
+      AppContextProvider appContextProvider,
+      JobScheduler jobScheduler) {
+    this.emailService = requireNonNull(emailService);
+    this.projectAccessService = requireNonNull(projectAccessService);
+    this.userInformationService = requireNonNull(userInformationService);
+    this.projectInformationService = requireNonNull(projectInformationService);
+    this.appContextProvider = requireNonNull(appContextProvider);
+    this.jobScheduler = requireNonNull(jobScheduler);
+  }
+
+  @Override
+  public Class<? extends DomainEvent> subscribedToEventType() {
+    return AssociatedDatasetRemovedEvent.class;
+  }
+
+  @Override
+  @PreAuthorize(
+      "hasPermission(#event.projectId(), 'life.qbic.projectmanagement.domain.model.project.Project', 'READ')")
+  public void handleEvent(AssociatedDatasetRemovedEvent event) {
+    String projectTitle = projectInformationService.find(event.projectId())
+        .map(Project::getProjectIntent)
+        .map(ProjectIntent::projectTitle)
+        .map(ProjectTitle::title)
+        .orElseThrow(() -> new DirectiveExecutionException(
+            "Project not found: " + event.projectId()));
+
+    String projectUrl = appContextProvider.urlToProject(event.projectId().value());
+    String actorId = event.actorUserId();
+
+    List<RecipientInfo> recipients = resolveRecipientsExcludingActor(event.projectId(), actorId);
+    if (recipients.isEmpty()) {
+      log.info("No collaborators to notify for dataset removal on project %s".formatted(
+          event.projectId()));
+      return;
+    }
+
+    for (RecipientInfo recipient : recipients) {
+      jobScheduler.enqueue(
+          () -> notifyRecipient(recipient.email, recipient.fullName,
+              recipient.fullName, projectTitle, event.datasetTitle(), event.datasetPid(),
+              projectUrl));
+    }
+  }
+
+  /**
+   * Resolves all collaborators on the project, filtering out the actor
+   * who performed the removal. Silently skips users whose profile
+   * cannot be resolved (e.g. a deleted user account).
+   */
+  private List<RecipientInfo> resolveRecipientsExcludingActor(ProjectId projectId, String actorId) {
+    List<RecipientInfo> recipients = new ArrayList<>();
+    List<String> userIds = projectAccessService.listCollaborators(projectId).stream()
+        .map(ProjectCollaborator::userId)
+        .toList();
+    for (String userId : userIds) {
+      if (userId.equals(actorId)) {
+        continue;
+      }
+      userInformationService.findById(userId)
+          .ifPresent(info -> recipients.add(new RecipientInfo(info.emailAddress(), info.fullName())));
+    }
+    return recipients;
+  }
+
+  @Job(name = "Notify collaborator about dataset removal on project %3 for dataset %4")
+  public void notifyRecipient(
+      String emailAddress,
+      String fullName,
+      String addressee,
+      String projectTitle,
+      String datasetTitle,
+      String datasetPid,
+      String projectUrl) {
+    var subject = new Subject("Dataset connection removed from project");
+    var message = Messages.datasetRemovedFromProject(
+        addressee, projectTitle, datasetTitle, datasetPid, projectUrl);
+    emailService.send(subject,
+        new Recipient(emailAddress, fullName),
+        new Content(message));
+  }
+
+  private record RecipientInfo(String email, String fullName) {}
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreviewLookup.java b/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreviewLookup.java
index 1153c32186..da03e0c400 100644
--- a/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreviewLookup.java
+++ b/project-management/src/main/java/life/qbic/projectmanagement/application/sample/SamplePreviewLookup.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import life.qbic.application.commons.SortOrder;
-import life.qbic.projectmanagement.application.api.AsyncProjectService;
 import life.qbic.projectmanagement.application.api.AsyncProjectService.SamplePreviewFilter;
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
 
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AccessLevel.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AccessLevel.java
new file mode 100644
index 0000000000..7910b5ac2d
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AccessLevel.java
@@ -0,0 +1,32 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+/**
+ * The access level of a connected dataset at the time of connection.
+ *
+ * <p>For this iteration (FEAT-DATSET-01), only {@link #PUBLIC} datasets can
+ * be connected. Restricted datasets (stories 05/14/15) are a future
+ * addition but the domain model is designed to hold this information
+ * from the start.</p>
+ *
+ * @since 1.12.0
+ */
+public enum AccessLevel {
+
+  /**
+   * The dataset is publicly accessible without authentication.
+   */
+  PUBLIC,
+
+  /**
+   * The dataset requires authentication (a token) to access its files.
+   */
+  RESTRICTED;
+
+  public static AccessLevel parse(String value) {
+    try {
+      return valueOf(value);
+    } catch (IllegalArgumentException | NullPointerException e) {
+      throw new IllegalArgumentException("Unknown access level: " + value, e);
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDataset.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDataset.java
new file mode 100644
index 0000000000..8669249553
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDataset.java
@@ -0,0 +1,455 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.AttributeOverride;
+import jakarta.persistence.Column;
+import jakarta.persistence.Convert;
+import jakarta.persistence.Embedded;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import java.time.Instant;
+import java.time.LocalDate;
+import java.util.Objects;
+import java.util.Optional;
+import life.qbic.domain.concepts.LocalDomainEventDispatcher;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetConnectedEvent;
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetRemovedEvent;
+import life.qbic.projectmanagement.domain.model.experiment.ExperimentId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+
+/**
+ * Aggregate root for an associated dataset connection.
+ *
+ * <p>An associated dataset links an external record (hosted on Zenodo,
+ * FDAT, or a future source) to a Data Manager project. The aggregate
+ * carries the connection lifecycle state, the external identity of the
+ * record, and a snapshot of its metadata at connect-time.</p>
+ *
+ * <p>Per ADR-0001, the aggregate is source-agnostic at its API boundary.
+ * Source-specific metadata is encapsulated behind the sealed
+ * {@link ResourceMetadata} hierarchy, stored as an opaque JSON blob
+ * (see field {@code resourceMetadata}). Only the four "universal
+ * columns" (title, pid, version, publicationDate) are extracted to
+ * regular SQL columns for sort/filter — these are defined on the
+ * {@code ResourceMetadata} interface and expected to exist for any
+ * external source.</p>
+ *
+ * <p>Per ADR-0001, removal uses soft-delete: {@link #remove()} transitions
+ * the state to {@link ConnectionState#REMOVED} (tombstone retained for
+ * audit). The aggregate does not physically delete itself.</p>
+ *
+ * @since 1.12.0
+ */
+@Entity(name = "associated_dataset")
+public class AssociatedDataset {
+
+  // ── Identity ────────────────────────────────────────────────────────────
+
+  @EmbeddedId
+  @AttributeOverride(name = "uuid", column = @Column(name = "id"))
+  private AssociatedDatasetId id;
+
+  @Embedded
+  @AttributeOverride(name = "projectId", column = @Column(name = "project_id"))
+  private ProjectId projectId;
+
+  @Convert(converter = SourceTypeConverter.class)
+  @Column(name = "source_type", nullable = false)
+  private SourceType sourceType;
+
+  @Column(name = "external_handle", nullable = false)
+  private String externalHandle;
+
+  // ── Lifecycle ───────────────────────────────────────────────────────────
+
+  @Convert(converter = ConnectionStateConverter.class)
+  @Column(name = "connection_state", nullable = false)
+  private ConnectionState connectionState;
+
+  /**
+   * Coarse access level derived from the source-specific
+   * {@link ResourceMetadata} subtype. For InvenioRDM, derived via
+   * {@link InvenioRdmResourceMetadata#deriveAccessLevel()}.
+   * Source-agnostic: any source type yields PUBLIC or RESTRICTED.
+   */
+  @Convert(converter = AccessLevelConverter.class)
+  @Column(name = "access_level", nullable = false)
+  private AccessLevel accessLevel;
+
+  @Column(name = "connected_by", nullable = false)
+  private String connectedBy;
+
+  @Column(name = "connected_on", nullable = false)
+  private Instant connectedOn;
+
+  @Column(name = "last_synced_at")
+  private Instant lastSyncedAt;
+
+  @Embedded
+  @AttributeOverride(name = "uuid", column = @Column(name = "experiment_id"))
+  private ExperimentId experimentId;
+
+  // ── Universal columns (from ResourceMetadata interface) ─────────────────
+  //
+  // These four fields are duplicated from resourceMetadata into regular SQL
+  // columns so they can be sorted/filtered efficiently. The source-specific
+  // detail remains accessible via the resourceMetadata() accessor.
+
+  @Column(name = "title", length = 1024)
+  private String title;
+
+  @Column(name = "pid")
+  private String pid;
+
+  @Column(name = "version")
+  private String version;
+
+  @Column(name = "publication_date")
+  private LocalDate publicationDate;
+
+  // ── Source-specific metadata (opaque JSON) ──────────────────────────────
+
+  /**
+   * The full {@link ResourceMetadata} snapshot, serialized as a
+   * MariaDB JSON blob. Per ADR-0001, source-specific fields (creators,
+   * community, recordAccess, etc.) live exclusively here.
+   *
+   * <p>The entity exposes this object via {@link #resourceMetadata()}
+   * so the application-service layer can extract source-specific
+   * details when building DTOs — without storing them as first-class
+   * columns on the aggregate.</p>
+   */
+  @Convert(converter = ResourceMetadataConverter.class)
+  @Column(name = "resource_metadata", columnDefinition = "json")
+  private ResourceMetadata resourceMetadata;
+
+  // ── Constructor ─────────────────────────────────────────────────────────
+
+  protected AssociatedDataset() {
+    // needed by JPA
+  }
+
+  private AssociatedDataset(
+      AssociatedDatasetId id,
+      ProjectId projectId,
+      SourceType sourceType,
+      ExternalHandle externalHandle,
+      ResourceMetadata metadata,
+      String connectedBy,
+      ExperimentId experimentId) {
+    this.id = Objects.requireNonNull(id, "id must not be null");
+    this.projectId = Objects.requireNonNull(projectId, "projectId must not be null");
+    this.sourceType = Objects.requireNonNull(sourceType, "sourceType must not be null");
+    Objects.requireNonNull(externalHandle, "externalHandle must not be null");
+    this.externalHandle = externalHandle.value();
+    this.connectionState = ConnectionState.CONNECTED;
+    Objects.requireNonNull(metadata, "metadata must not be null");
+    Objects.requireNonNull(connectedBy, "connectedBy must not be null");
+    applyMetadata(metadata);
+    this.connectedBy = connectedBy;
+    this.connectedOn = Instant.now();
+    this.experimentId = experimentId; // nullable — optional during connect
+  }
+
+  /**
+   * Factory method: connects a dataset to a project and emits the
+   * {@link AssociatedDatasetConnectedEvent}.
+   *
+   * <p>The {@link AccessLevel} of the connection is derived from the
+   * provided {@link ResourceMetadata}. For InvenioRDM resources, the
+   * coarse access level is PUBLIC only when both record and file access
+   * are {@link InvenioRdmAccessStatus#PUBLIC}; otherwise RESTRICTED (see
+   * {@link InvenioRdmResourceMetadata#deriveAccessLevel()}).</p>
+   */
+  public static AssociatedDataset connect(
+      ProjectId projectId,
+      SourceType sourceType,
+      ExternalHandle externalHandle,
+      ResourceMetadata metadata,
+      String connectedBy,
+      ExperimentId experimentId) {
+    var dataset = new AssociatedDataset(
+        AssociatedDatasetId.create(),
+        projectId,
+        sourceType,
+        externalHandle,
+        metadata,
+        connectedBy,
+        experimentId);
+    dataset.emitConnectedEvent();
+    return dataset;
+  }
+
+  // ── Lifecycle operations ────────────────────────────────────────────────
+
+  /**
+   * Removes the connection (soft-delete). Transitions the aggregate to
+   * {@link ConnectionState#REMOVED} state and dispatches an
+   * {@link AssociatedDatasetRemovedEvent} via the local domain event
+   * dispatcher so the application-service layer can forward it to
+   * collaborator-notification policy directives.
+   *
+   * <p>After this call the aggregate should not be surfaced through
+   * active queries — the repository excludes REMOVED rows by default
+   * (ADR-0001). The row is retained as an audit tombstone.</p>
+   *
+   * @param removedByUserId the user who performed the removal;
+   *                       recorded in the emitted event as the actor
+   *                       (may differ from {@link #connectedBy()})
+   * @throws IllegalStateException  if the dataset is already removed
+   * @throws NullPointerException   if {@code removedByUserId} is null
+   */
+  public void remove(String removedByUserId) {
+    Objects.requireNonNull(removedByUserId, "removedByUserId must not be null");
+    if (this.connectionState == ConnectionState.REMOVED) {
+      throw new IllegalStateException("Dataset connection is already removed");
+    }
+    this.connectionState = ConnectionState.REMOVED;
+    emitRemovedEvent(removedByUserId);
+  }
+
+  /**
+   * Returns whether the dataset is in active (connected) state.
+   */
+  public boolean isConnected() {
+    return this.connectionState == ConnectionState.CONNECTED;
+  }
+
+  // ── Metadata sync ───────────────────────────────────────────────────────
+
+  /**
+   * Replaces the metadata snapshot with the latest state from the source
+   * system. Updates the universal columns (title, pid, version,
+   * publicationDate) and re-derives the coarse {@link AccessLevel}.
+   *
+   * @since 1.12.0
+   */
+  public void updateMetadata(ResourceMetadata metadata) {
+    Objects.requireNonNull(metadata, "metadata must not be null");
+    applyMetadata(metadata);
+    this.lastSyncedAt = Instant.now();
+  }
+
+  // ── Accessors ───────────────────────────────────────────────────────────
+
+  public AssociatedDatasetId id() {
+    return id;
+  }
+
+  public ProjectId projectId() {
+    return projectId;
+  }
+
+  public SourceType sourceType() {
+    return sourceType;
+  }
+
+  public ExternalHandle externalHandle() {
+    return new ExternalHandle(this.externalHandle);
+  }
+
+  public ConnectionState connectionState() {
+    return connectionState;
+  }
+
+  public AccessLevel accessLevel() {
+    return accessLevel;
+  }
+
+  /**
+   * High-priority universal column: human-readable title, extracted
+   * from {@link #resourceMetadata()} for efficient SQL sort/filter
+   * (ADR-0001).
+   */
+  public String title() {
+    return title;
+  }
+
+  /**
+   * High-priority universal column: persistent identifier (PID / DOI),
+   * extracted from {@link #resourceMetadata()} for efficient SQL
+   * sort/filter (ADR-0001).
+   */
+  public String pid() {
+    return pid;
+  }
+
+  public String connectedBy() {
+    return connectedBy;
+  }
+
+  public Instant connectedOn() {
+    return connectedOn;
+  }
+
+  public Optional<Instant> lastSyncedAt() {
+    return Optional.ofNullable(lastSyncedAt);
+  }
+
+  /**
+   * High-priority universal column: publication date on the source,
+   * extracted from {@link #resourceMetadata()} for efficient SQL
+   * sort/filter (ADR-0001).
+   */
+  public java.time.LocalDate publicationDate() {
+    return publicationDate;
+  }
+
+  public Optional<ExperimentId> experimentId() {
+    return Optional.ofNullable(experimentId);
+  }
+
+  /**
+   * The full source-specific metadata snapshot. Application/infrastructure
+   * layers can inspect this (e.g. {@code instanceof InvenioRdmResourceMetadata})
+   * to build DTOs that need source-specific fields. Source-specific fields
+   * are <em>not</em> available as top-level accessors on the aggregate —
+   * use this object to reach them.
+   */
+  public ResourceMetadata resourceMetadata() {
+    return resourceMetadata;
+  }
+
+  // ── Internals ───────────────────────────────────────────────────────────
+
+  /**
+   * Stores the full metadata snapshot and re-derives the universal
+   * columns (title, pid, version, publicationDate) plus the coarse
+   * {@link AccessLevel}. Source-specific derivation (e.g. for InvenioRDM)
+   * happens via a sealed-subtype check on {@code metadata} — this is
+   * the natural Java pattern for sealed hierarchies and keeps the
+   * aggregate's public API source-agnostic.
+   */
+  private void applyMetadata(ResourceMetadata metadata) {
+    // Universal columns — extracted from the interface
+    this.title = metadata.title();
+    this.pid = metadata.pid();
+    this.version = metadata.version();
+    this.publicationDate = metadata.publicationDate();
+
+    // Full metadata snapshot + source-specific access-level derivation
+    this.resourceMetadata = metadata;
+    this.accessLevel = deriveAccessLevel(metadata);
+  }
+
+  private AccessLevel deriveAccessLevel(ResourceMetadata metadata) {
+    if (metadata instanceof InvenioRdmResourceMetadata inv) {
+      return inv.deriveAccessLevel();
+    }
+    throw new IllegalStateException(
+        "Unsupported ResourceMetadata subtype: " + metadata.getClass().getName());
+  }
+
+  private void emitConnectedEvent() {
+    var event = AssociatedDatasetConnectedEvent.create(
+        this.id, this.projectId, this.connectedBy, this.title, this.pid);
+    LocalDomainEventDispatcher.instance().dispatch(event);
+  }
+
+  /**
+   * Dispatches an {@link AssociatedDatasetRemovedEvent} via the
+   * {@link LocalDomainEventDispatcher}. The application-service layer
+   * subscribes to these events (collect-during, forward-after pattern)
+   * and forwards them to the global dispatcher, which drives the
+   * collaborator-notification policy directives.
+   *
+   * <p>The event's actor is the user who performed the removal
+   * ({@code removedByUserId}), which may differ from the user who
+   * originally connected the dataset ({@code connectedBy}).</p>
+   */
+  private void emitRemovedEvent(String removedByUserId) {
+    var event = AssociatedDatasetRemovedEvent.create(
+        this.id, this.projectId, removedByUserId, this.title, this.pid);
+    LocalDomainEventDispatcher.instance().dispatch(event);
+  }
+
+  // ── JPA AttributeConverters ─────────────────────────────────────────────
+
+  static class SourceTypeConverter implements AttributeConverter<SourceType, String> {
+    @Override
+    public String convertToDatabaseColumn(SourceType attribute) {
+      return attribute == null ? null : attribute.name();
+    }
+
+    @Override
+    public SourceType convertToEntityAttribute(String dbData) {
+      return dbData == null ? null : SourceType.valueOf(dbData);
+    }
+  }
+
+  static class ConnectionStateConverter implements AttributeConverter<ConnectionState, String> {
+    @Override
+    public String convertToDatabaseColumn(ConnectionState attribute) {
+      return attribute == null ? null : attribute.name();
+    }
+
+    @Override
+    public ConnectionState convertToEntityAttribute(String dbData) {
+      return dbData == null ? null : ConnectionState.valueOf(dbData);
+    }
+  }
+
+  static class AccessLevelConverter implements AttributeConverter<AccessLevel, String> {
+    @Override
+    public String convertToDatabaseColumn(AccessLevel attribute) {
+      return attribute == null ? null : attribute.name();
+    }
+
+    @Override
+    public AccessLevel convertToEntityAttribute(String dbData) {
+      return dbData == null ? null : AccessLevel.valueOf(dbData);
+    }
+  }
+
+  /**
+   * Serializes/deserializes the sealed {@link ResourceMetadata} hierarchy
+   * to/from a MariaDB JSON blob. Jackson's {@code @JsonTypeInfo} on the
+   * interface ensures correct polymorphic type resolution.
+   */
+  static class ResourceMetadataConverter implements AttributeConverter<ResourceMetadata, String> {
+
+    private static final ObjectMapper MAPPER;
+
+    static {
+      MAPPER = new ObjectMapper();
+      MAPPER.registerModule(new JavaTimeModule());
+      MAPPER.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    }
+
+    @Override
+    public String convertToDatabaseColumn(ResourceMetadata attribute) {
+      if (attribute == null) {
+        return null;
+      }
+      try {
+        return MAPPER.writeValueAsString(attribute);
+      } catch (JsonProcessingException e) {
+        throw new IllegalStateException("Failed to serialize ResourceMetadata", e);
+      }
+    }
+
+    @Override
+    public ResourceMetadata convertToEntityAttribute(String dbData) {
+      if (dbData == null || dbData.isBlank()) {
+        return null;
+      }
+      try {
+        return MAPPER.readValue(dbData, ResourceMetadata.class);
+      } catch (JsonProcessingException e) {
+        // Surface the offending payload (truncated) to aid diagnosis — a
+        // schema drift between what was persisted and what the record
+        // accepts is the usual cause, and Jackson's default message
+        // doesn't include the raw JSON.
+        String preview = dbData.length() > 200
+            ? dbData.substring(0, 200) + "..."
+            : dbData;
+        throw new IllegalStateException(
+            "Failed to deserialize ResourceMetadata — payload: " + preview, e);
+      }
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetId.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetId.java
new file mode 100644
index 0000000000..70ae431ae5
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetId.java
@@ -0,0 +1,70 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import jakarta.persistence.Access;
+import jakarta.persistence.AccessType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Embeddable;
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Objects;
+import java.util.UUID;
+
+/**
+ * Unique identifier for an {@link AssociatedDataset}.
+ *
+ * @since 1.12.0
+ */
+@Embeddable
+@Access(AccessType.FIELD)
+public class AssociatedDatasetId implements Serializable {
+
+  @Serial
+  private static final long serialVersionUID = 6347490172839401058L;
+
+  @Column(name = "associatedDatasetId")
+  private final String uuid;
+
+  protected AssociatedDatasetId() {
+    // required by JPA
+    this.uuid = UUID.randomUUID().toString();
+  }
+
+  private AssociatedDatasetId(UUID id) {
+    Objects.requireNonNull(id, "uuid must be provided");
+    this.uuid = id.toString();
+  }
+
+  public static AssociatedDatasetId create() {
+    return new AssociatedDatasetId();
+  }
+
+  public static AssociatedDatasetId of(UUID uuid) {
+    return new AssociatedDatasetId(uuid);
+  }
+
+  public static AssociatedDatasetId parse(String str) throws IllegalArgumentException {
+    return new AssociatedDatasetId(UUID.fromString(str));
+  }
+
+  public String value() {
+    return uuid;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    AssociatedDatasetId that = (AssociatedDatasetId) o;
+    return Objects.equals(uuid, that.uuid);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid);
+  }
+
+  @Override
+  public String toString() {
+    return uuid;
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ConnectionState.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ConnectionState.java
new file mode 100644
index 0000000000..b5b6973d52
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ConnectionState.java
@@ -0,0 +1,32 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+/**
+ * Represents the lifecycle state of a dataset connection to a project.
+ *
+ * <p>Per ADR-0001, removal uses soft-delete: a connection transitions
+ * to {@link #REMOVED} and is retained as a tombstone for audit. The
+ * {@link #CONNECTED} state is the only active state in v1.</p>
+ *
+ * @since 1.12.0
+ */
+public enum ConnectionState {
+
+  /**
+   * The dataset is actively connected to the project.
+   */
+  CONNECTED,
+
+  /**
+   * The connection has been removed (soft-delete tombstone retained for audit).
+   * No UI exposure in v1 per ADR-0001.
+   */
+  REMOVED;
+
+  public static ConnectionState parse(String value) {
+    try {
+      return valueOf(value);
+    } catch (IllegalArgumentException | NullPointerException e) {
+      throw new IllegalArgumentException("Unknown connection state: " + value, e);
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ExternalHandle.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ExternalHandle.java
new file mode 100644
index 0000000000..89a0dc60ff
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ExternalHandle.java
@@ -0,0 +1,56 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import java.util.Objects;
+
+/**
+ * External identity of a record on a remote source system.
+ *
+ * <p>An {@link ExternalHandle} is the stable, externally-visible identifier
+ * that uniquely identifies a record on a particular source system instance.
+ * For InvenioRDM this is typically the record ID or the DOI/PID that the
+ * repository assigns. Combined with the {@link SourceType}, an
+ * {@code ExternalHandle} is globally unique for a given dataset.</p>
+ *
+ * <p>The value is opaque at the domain level — it carries no assumption
+ * about format (DOI, record ID, URL). Interpretation is delegated to
+ * the source-specific adapter in infrastructure.</p>
+ *
+ * @since 1.12.0
+ */
+public final class ExternalHandle {
+
+  private final String value;
+
+  public ExternalHandle(String value) {
+    Objects.requireNonNull(value, "External handle value must not be null");
+    if (value.isBlank()) {
+      throw new IllegalArgumentException("External handle value must not be blank");
+    }
+    this.value = value;
+  }
+
+  /**
+   * The raw handle string (e.g. record ID, DOI, PID).
+   */
+  public String value() {
+    return value;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    ExternalHandle that = (ExternalHandle) o;
+    return Objects.equals(value, that.value);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(value);
+  }
+
+  @Override
+  public String toString() {
+    return value;
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmAccessStatus.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmAccessStatus.java
new file mode 100644
index 0000000000..c29813b9bb
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmAccessStatus.java
@@ -0,0 +1,46 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import java.util.Objects;
+
+/**
+ * InvenioRDM-specific access status of a record or its files.
+ *
+ * <p>InvenioRDM's access model distinguishes two independent dimensions:
+ * <ul>
+ *   <li>Record-level access — whether the metadata/record itself is visible</li>
+ *   <li>File-level access — whether the actual files are downloadable</li>
+ * </ul>
+ * Each dimension independently carries one of: {@link #PUBLIC}, {@link #RESTRICTED},
+ * or {@link #EMBARGOED} (time-locked until a specific date).</p>
+ *
+ * <p>This is an InvenioRDM-specific vocabulary. The source-agnostic aggregate
+ * derives a coarse {@link AccessLevel} from it (see {@code AssociatedDataset.connect}).</p>
+ *
+ * @since 1.12.0
+ */
+public enum InvenioRdmAccessStatus {
+
+  /**
+   * Fully accessible without authentication.
+   */
+  PUBLIC,
+
+  /**
+   * Requires authentication (a valid Personal Access Token) to access.
+   */
+  RESTRICTED,
+
+  /**
+   * Time-locked — accessible only after a specific date.
+   */
+  EMBARGOED;
+
+  public static InvenioRdmAccessStatus parse(String value) {
+    Objects.requireNonNull(value, "value must not be null");
+    try {
+      return valueOf(value.toUpperCase());
+    } catch (IllegalArgumentException e) {
+      throw new IllegalArgumentException("Unknown InvenioRDM access status: " + value, e);
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadata.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadata.java
new file mode 100644
index 0000000000..22dde06956
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadata.java
@@ -0,0 +1,139 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+
+/**
+ * InvenioRDM-specific record metadata.
+ *
+ * <p>Carries the metadata fields that InvenioRDM exposes for a record,
+ * stored as the canonical "snapshot of truth" on the aggregate at the
+ * time the dataset was connected. Source-specific fields live here
+ * rather than on the aggregate root itself (ADR-0001).</p>
+ *
+ * <p>Instances are immutable.</p>
+ *
+ * <p><strong>Backward-compatible deserialization:</strong> because this
+ * record is persisted as a JSON blob in the {@code resource_metadata}
+ * column, unknown fields are silently ignored on read. This allows
+ * future removals or renames of fields without breaking rows that were
+ * written by earlier versions of the application.</p>
+ *
+ * @since 1.12.0
+ */
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record InvenioRdmResourceMetadata(
+
+    // --- ResourceMetadata interface fields ---
+
+    /** The human-readable title of the dataset. Never null. */
+    String title,
+    /** The persistent identifier (PID / DOI). Never null. */
+    String pid,
+    /** The version string (e.g. "v1"), or null if not available. */
+    String version,
+    /** The source system URL for access, or null. */
+    String accessLink,
+
+    // --- InvenioRDM-specific fields ---
+
+    /** Display name of the InvenioRDM instance (e.g. "Zenodo", "FDAT"). */
+    String resourceProvider,
+    /** Creator(s) of the dataset. Immutable; never null (empty if unknown). */
+    List<String> creators,
+    /** The resource type (e.g. "Dataset", "Publication"). May be null. */
+    String resourceType,
+    /** The community the record belongs to (e.g. "QBiC"), or null. */
+    String community,
+    /** The publication date of the record on the source instance. Never null. */
+    LocalDate publicationDate,
+    /** A short description or abstract, or null. */
+    String description,
+
+    // --- Access detail fields (InvenioRDM-specific two-dimension model) ---
+
+    /** Access status of the record's metadata. Never null. */
+    InvenioRdmAccessStatus recordAccess,
+    /** Access status of the record's files. Never null. */
+    InvenioRdmAccessStatus fileAccess
+
+) implements ResourceMetadata {
+
+  public InvenioRdmResourceMetadata {
+    Objects.requireNonNull(title, "title must not be null");
+    Objects.requireNonNull(pid, "pid must not be null");
+    Objects.requireNonNull(resourceProvider, "resourceProvider must not be null");
+    Objects.requireNonNull(publicationDate, "publicationDate must not be null");
+    Objects.requireNonNull(recordAccess, "recordAccess must not be null");
+    Objects.requireNonNull(fileAccess, "fileAccess must not be null");
+    // Defensive immutability: normalize null creators to empty, then freeze
+    if (creators == null) {
+      creators = List.of();
+    }
+    creators = List.copyOf(creators);
+  }
+
+  /**
+   * Returns the creators as a single comma-joined display string.
+   */
+  public String creatorsDisplay() {
+    if (creators.isEmpty()) {
+      return "—";
+    }
+    return String.join(", ", creators);
+  }
+
+  /**
+   * Returns the publication date formatted for display (English locale),
+   * or "—" if publicationDate is null.
+   */
+  public String publicationDateDisplay() {
+    if (publicationDate == null) {
+      return "—";
+    }
+    return publicationDate.format(
+        java.time.format.DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.ENGLISH));
+  }
+
+  /**
+   * Derives the coarse {@link AccessLevel} from the two independent
+   * access dimensions reported by InvenioRDM.
+   *
+   * <p>Rule: the dataset is fully public only when both record and file
+   * access are {@link InvenioRdmAccessStatus#PUBLIC}. Otherwise it is
+   * {@link AccessLevel#RESTRICTED}.</p>
+   *
+   * <p>Note: InvenioRDM reports {@code access.status = "embargoed"} for
+   * time-locked records, which maps to {@link InvenioRdmAccessStatus#EMBARGOED}
+   * on the access status fields — so an embargoed record naturally fails
+   * this check without requiring a separate embargo-date comparison.</p>
+   */
+  public AccessLevel deriveAccessLevel() {
+    if (recordAccess == InvenioRdmAccessStatus.PUBLIC
+        && fileAccess == InvenioRdmAccessStatus.PUBLIC) {
+      return AccessLevel.PUBLIC;
+    }
+    return AccessLevel.RESTRICTED;
+  }
+
+  /**
+   * Returns a short access detail note suitable for display in a tooltip
+   * or badge sub-text, e.g. "Record: public | Files: restricted".
+   */
+  public String accessDetailDisplay() {
+    return "Record: %s | Files: %s".formatted(
+        labelFor(recordAccess),
+        labelFor(fileAccess));
+  }
+
+  private static String labelFor(InvenioRdmAccessStatus status) {
+    return switch (status) {
+      case PUBLIC -> "public";
+      case RESTRICTED -> "restricted";
+      case EMBARGOED -> "embargoed";
+    };
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ResourceMetadata.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ResourceMetadata.java
new file mode 100644
index 0000000000..1708de8d6d
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/ResourceMetadata.java
@@ -0,0 +1,58 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import java.time.LocalDate;
+
+/**
+ * Source-agnostic metadata container for an associated dataset.
+ *
+ * <p>Per ADR-0001, the aggregate root carries source-specific metadata
+ * encapsulated behind this sealed hierarchy. The aggregate root stores
+ * only the {@code ResourceMetadata} object (as an opaque JSON blob);
+ * the concrete subtype (e.g. {@link InvenioRdmResourceMetadata}) is
+ * determined by the {@link SourceType} carried on the aggregate.</p>
+ *
+ * <p>The four accessors on this interface represent the <em>universal
+ * columns</em> (per ADR-0001 §Decision §4): fields that are reasonable
+ * to extract to regular SQL columns for sort/filter, because they are
+ * expected to exist for any external source (Zenodo, FDAT, future LIMS,
+ * etc.). Source-specific fields remain inside the concrete subtype and
+ * are accessible via a cast from {@code associatedDataset.resourceMetadata()}.</p>
+ *
+ * <p>Instances are immutable value objects — created at connect-time and
+ * persisted as the "snapshot of truth" for the connection lifecycle.</p>
+ *
+ * @since 1.12.0
+ */
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, property = "type")
+@JsonSubTypes({
+    @JsonSubTypes.Type(value = InvenioRdmResourceMetadata.class, name = "INVENIO_RDM")
+})
+public sealed interface ResourceMetadata
+    permits InvenioRdmResourceMetadata {
+
+  /**
+   * The human-readable title of the dataset. Never null.
+   */
+  String title();
+
+  /**
+   * The persistent identifier (PID / DOI) of the dataset. Never null.
+   */
+  String pid();
+
+  /**
+   * The version string (e.g. "v1", "v2.0"), or null if not available.
+   */
+  String version();
+
+  /**
+   * The date when the resource was published or released on the source
+   * system. Universal across sources (any external dataset has some
+   * notion of release date). May be null if the specific source does
+   * not provide one.
+   */
+  LocalDate publicationDate();
+
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/SourceType.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/SourceType.java
new file mode 100644
index 0000000000..b608631386
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/SourceType.java
@@ -0,0 +1,26 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset;
+
+/**
+ * The type of external system that hosts the associated dataset.
+ *
+ * <p>This is the source-agnostic extension point defined by ADR-0001.
+ * Adding a new external source (e.g. a LIMS) requires only a new enum
+ * value here and the corresponding {@link ResourceMetadata} subtype.</p>
+ *
+ * @since 1.12.0
+ */
+public enum SourceType {
+
+  /**
+   * An InvenioRDM-based repository (e.g. Zenodo, FDAT).
+   */
+  INVENIO_RDM;
+
+  public static SourceType parse(String value) {
+    try {
+      return valueOf(value);
+    } catch (IllegalArgumentException | NullPointerException e) {
+      throw new IllegalArgumentException("Unknown source type: " + value, e);
+    }
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetConnectedEvent.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetConnectedEvent.java
new file mode 100644
index 0000000000..3fc1572165
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetConnectedEvent.java
@@ -0,0 +1,75 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset.event;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import java.io.Serial;
+import java.util.Objects;
+import life.qbic.domain.concepts.DomainEvent;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+
+/**
+ * Domain event emitted when a dataset has been successfully connected to a project.
+ *
+ * <p>Drives project-member email notifications per ADR-0003 (N1).</p>
+ *
+ * @since 1.12.0
+ */
+public class AssociatedDatasetConnectedEvent extends DomainEvent {
+
+  @Serial
+  private static final long serialVersionUID = 4726185049173920158L;
+
+  private final AssociatedDatasetId associatedDatasetId;
+  private final ProjectId projectId;
+  private final String actorUserId;
+  private final String datasetTitle;
+  private final String datasetPid;
+
+  private AssociatedDatasetConnectedEvent(
+      AssociatedDatasetId associatedDatasetId,
+      ProjectId projectId,
+      String actorUserId,
+      String datasetTitle,
+      String datasetPid) {
+    this.associatedDatasetId = Objects.requireNonNull(associatedDatasetId);
+    this.projectId = Objects.requireNonNull(projectId);
+    this.actorUserId = Objects.requireNonNull(actorUserId);
+    this.datasetTitle = Objects.requireNonNull(datasetTitle);
+    this.datasetPid = Objects.requireNonNull(datasetPid);
+  }
+
+  public static AssociatedDatasetConnectedEvent create(
+      AssociatedDatasetId associatedDatasetId,
+      ProjectId projectId,
+      String actorUserId,
+      String datasetTitle,
+      String datasetPid) {
+    return new AssociatedDatasetConnectedEvent(
+        associatedDatasetId, projectId, actorUserId, datasetTitle, datasetPid);
+  }
+
+  @JsonGetter("associatedDatasetId")
+  public AssociatedDatasetId associatedDatasetId() {
+    return associatedDatasetId;
+  }
+
+  @JsonGetter("projectId")
+  public ProjectId projectId() {
+    return projectId;
+  }
+
+  @JsonGetter("actorUserId")
+  public String actorUserId() {
+    return actorUserId;
+  }
+
+  @JsonGetter("datasetTitle")
+  public String datasetTitle() {
+    return datasetTitle;
+  }
+
+  @JsonGetter("datasetPid")
+  public String datasetPid() {
+    return datasetPid;
+  }
+}
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEvent.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEvent.java
new file mode 100644
index 0000000000..5e29aa13ee
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEvent.java
@@ -0,0 +1,86 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset.event;
+
+import com.fasterxml.jackson.annotation.JsonGetter;
+import java.io.Serial;
+import java.util.Objects;
+import life.qbic.domain.concepts.DomainEvent;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+
+/**
+ * Domain event emitted when a dataset connection has been removed from a project.
+ *
+ * <p>Signals that a previously connected dataset is no longer actively linked.
+ * The aggregate remains in the database in {@code REMOVED} state for audit purposes.</p>
+ *
+ * @since 1.12.0
+ */
+public class AssociatedDatasetRemovedEvent extends DomainEvent {
+
+  @Serial
+  private static final long serialVersionUID = 2301797041948857105L;
+
+  private final AssociatedDatasetId associatedDatasetId;
+  private final ProjectId projectId;
+  private final String actorUserId;
+  private final String datasetTitle;
+  private final String datasetPid;
+
+  private AssociatedDatasetRemovedEvent(
+      AssociatedDatasetId associatedDatasetId,
+      ProjectId projectId,
+      String actorUserId,
+      String datasetTitle,
+      String datasetPid) {
+    this.associatedDatasetId = Objects.requireNonNull(associatedDatasetId);
+    this.projectId = Objects.requireNonNull(projectId);
+    this.actorUserId = Objects.requireNonNull(actorUserId);
+    this.datasetTitle = Objects.requireNonNull(datasetTitle);
+    this.datasetPid = Objects.requireNonNull(datasetPid);
+  }
+
+  /**
+   * Factory method for creating a removal event.
+   *
+   * @param associatedDatasetId the dataset connection being removed
+   * @param projectId           the project the dataset was connected to
+   * @param actorUserId         the user who performed the removal
+   * @param datasetTitle        human-readable title of the dataset
+   * @param datasetPid          persistent identifier (DOI/PID) of the dataset
+   * @return the constructed event
+   */
+  public static AssociatedDatasetRemovedEvent create(
+      AssociatedDatasetId associatedDatasetId,
+      ProjectId projectId,
+      String actorUserId,
+      String datasetTitle,
+      String datasetPid) {
+    return new AssociatedDatasetRemovedEvent(
+        associatedDatasetId, projectId, actorUserId, datasetTitle, datasetPid);
+  }
+
+  @JsonGetter("associatedDatasetId")
+  public AssociatedDatasetId associatedDatasetId() {
+    return associatedDatasetId;
+  }
+
+  @JsonGetter("projectId")
+  public ProjectId projectId() {
+    return projectId;
+  }
+
+  @JsonGetter("actorUserId")
+  public String actorUserId() {
+    return actorUserId;
+  }
+
+  @JsonGetter("datasetTitle")
+  public String datasetTitle() {
+    return datasetTitle;
+  }
+
+  @JsonGetter("datasetPid")
+  public String datasetPid() {
+    return datasetPid;
+  }
+}
\ No newline at end of file
diff --git a/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/repository/AssociatedDatasetRepository.java b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/repository/AssociatedDatasetRepository.java
new file mode 100644
index 0000000000..f8ba7c7ac7
--- /dev/null
+++ b/project-management/src/main/java/life/qbic/projectmanagement/domain/model/associated_dataset/repository/AssociatedDatasetRepository.java
@@ -0,0 +1,48 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset.repository;
+
+import java.util.List;
+import java.util.Optional;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset;
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId;
+import life.qbic.projectmanagement.domain.model.project.ProjectId;
+
+/**
+ * Repository for {@link AssociatedDataset} aggregates.
+ *
+ * <p>Implementations must only return aggregates in active (non-removed)
+ * state by default. Removed connections are retained in storage as audit
+ * tombstones but are not surfaced through the standard query methods.</p>
+ *
+ * @since 1.12.0
+ */
+public interface AssociatedDatasetRepository {
+
+  /**
+   * Persists a newly connected dataset.
+   *
+   * @throws IllegalArgumentException if the aggregate is already in REMOVED state
+   */
+  void save(AssociatedDataset dataset);
+
+  /**
+   * Finds all actively connected datasets for a project (excludes REMOVED).
+   */
+  List<AssociatedDataset> findByProject(ProjectId projectId);
+
+  /**
+   * Finds a dataset connection by its identifier.
+   */
+  Optional<AssociatedDataset> findById(AssociatedDatasetId id);
+
+  /**
+   * Checks whether an active connection with the given PID already
+   * exists for the project. Used to prevent duplicate connections to
+   * the same logical record (a PID is globally unique per design).
+   *
+   * @param projectId the project to scope the check to
+   * @param pid       the persistent identifier (e.g. DOI) to check
+   * @return {@code true} if an active (non-REMOVED) connection exists
+   */
+  boolean isActiveConnectionPresent(ProjectId projectId, String pid);
+
+}
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceRemoveSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceRemoveSpec.groovy
new file mode 100644
index 0000000000..60aab7f6a4
--- /dev/null
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/application/associated_dataset/AssociatedDatasetServiceRemoveSpec.groovy
@@ -0,0 +1,182 @@
+package life.qbic.projectmanagement.application.associated_dataset
+
+import life.qbic.application.commons.Result
+import life.qbic.domain.concepts.DomainEventDispatcher
+import life.qbic.domain.concepts.LocalDomainEventDispatcher
+import life.qbic.identity.api.UserInformationService
+import life.qbic.projectmanagement.application.ProjectInformationService
+import life.qbic.projectmanagement.application.experiment.ExperimentInformationService
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDataset
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId
+import life.qbic.projectmanagement.domain.model.associated_dataset.ConnectionState
+import life.qbic.projectmanagement.domain.model.associated_dataset.ExternalHandle
+import life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmAccessStatus
+import life.qbic.projectmanagement.domain.model.associated_dataset.InvenioRdmResourceMetadata
+import life.qbic.projectmanagement.domain.model.associated_dataset.SourceType
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetRemovedEvent
+import life.qbic.projectmanagement.domain.model.associated_dataset.repository.AssociatedDatasetRepository
+import life.qbic.projectmanagement.domain.model.experiment.ExperimentId
+import life.qbic.projectmanagement.domain.model.project.ProjectId
+import spock.lang.Specification
+
+/**
+ * Unit tests for {@link AssociatedDatasetService#removeDataset}.
+ *
+ * @since 1.12.0
+ */
+class AssociatedDatasetServiceRemoveSpec extends Specification {
+
+  private static final String VALID_PROJECT_ID = "0270ce7f-4092-40e3-9c4c-ce7adb688bf5"
+
+  def "removeDataset returns success for a valid connected dataset"() {
+    given:
+    def datasetId = AssociatedDatasetId.create()
+    def projectId = ProjectId.parse(VALID_PROJECT_ID)
+    def userId = "user-1"
+    def dataset = createConnectedDataset(datasetId, projectId, userId)
+    def repository = Mock(AssociatedDatasetRepository) {
+      findById(datasetId) >> Optional.of(dataset)
+      save(_) >> { }
+    }
+    def registry = Mock(SourceInstanceRegistry)
+    def projectService = Mock(ProjectInformationService)
+    def userService = Mock(UserInformationService)
+    def experimentService = Mock(ExperimentInformationService)
+    def source = Mock(DatasetSource)
+    def service = new AssociatedDatasetService(
+        source, repository, registry, projectService, userService, experimentService)
+
+    // Ensure domain event dispatcher is clean
+    LocalDomainEventDispatcher.instance().reset()
+
+    when:
+    def result = service.removeDataset(datasetId.value(), userId)
+
+    then:
+    result instanceof Result.Value
+    result.getValue() == datasetId
+    dataset.connectionState() == ConnectionState.REMOVED
+    1 * repository.save(dataset)
+  }
+
+  def "removeDataset returns DATASET_NOT_FOUND when dataset does not exist"() {
+    given:
+    def datasetId = AssociatedDatasetId.create()
+    def repository = Mock(AssociatedDatasetRepository) {
+      findById(datasetId) >> Optional.empty()
+    }
+    def registry = Mock(SourceInstanceRegistry)
+    def projectService = Mock(ProjectInformationService)
+    def userService = Mock(UserInformationService)
+    def experimentService = Mock(ExperimentInformationService)
+    def source = Mock(DatasetSource)
+    def service = new AssociatedDatasetService(
+        source, repository, registry, projectService, userService, experimentService)
+
+    when:
+    def result = service.removeDataset(datasetId.value(), "user-1")
+
+    then:
+    result instanceof Result.Error
+    result.getError() == RemoveDatasetError.DATASET_NOT_FOUND
+  }
+
+  def "removeDataset returns DATASET_ALREADY_REMOVED when dataset is already in REMOVED state"() {
+    given:
+    def datasetId = AssociatedDatasetId.create()
+    def projectId = ProjectId.parse(VALID_PROJECT_ID)
+    def userId = "user-1"
+    def dataset = createConnectedDataset(datasetId, projectId, userId)
+    // Pre-set to REMOVED state (direct field access for test)
+    dataset.connectionState = ConnectionState.REMOVED
+    def repository = Mock(AssociatedDatasetRepository) {
+      findById(datasetId) >> Optional.of(dataset)
+    }
+    def registry = Mock(SourceInstanceRegistry)
+    def projectService = Mock(ProjectInformationService)
+    def userService = Mock(UserInformationService)
+    def experimentService = Mock(ExperimentInformationService)
+    def source = Mock(DatasetSource)
+    def service = new AssociatedDatasetService(
+        source, repository, registry, projectService, userService, experimentService)
+
+    when:
+    def result = service.removeDataset(datasetId.value(), userId)
+
+    then:
+    result instanceof Result.Error
+    result.getError() == RemoveDatasetError.DATASET_ALREADY_REMOVED
+    0 * repository.save(_)
+  }
+
+  def "removeDataset returns REMOVAL_FAILED when persistence throws"() {
+    given:
+    def datasetId = AssociatedDatasetId.create()
+    def projectId = ProjectId.parse(VALID_PROJECT_ID)
+    def userId = "user-1"
+    def dataset = createConnectedDataset(datasetId, projectId, userId)
+    def repository = Mock(AssociatedDatasetRepository) {
+      findById(datasetId) >> Optional.of(dataset)
+      save(_) >> { throw new RuntimeException("DB error") }
+    }
+    def registry = Mock(SourceInstanceRegistry)
+    def projectService = Mock(ProjectInformationService)
+    def userService = Mock(UserInformationService)
+    def experimentService = Mock(ExperimentInformationService)
+    def source = Mock(DatasetSource)
+    def service = new AssociatedDatasetService(
+        source, repository, registry, projectService, userService, experimentService)
+
+    when:
+    def result = service.removeDataset(datasetId.value(), userId)
+
+    then:
+    result instanceof Result.Error
+    result.getError() == RemoveDatasetError.REMOVAL_FAILED
+  }
+
+  def "removeDataset throws NullPointerException for null associatedDatasetId"() {
+    given:
+    def service = createServiceWithEmptyRepo()
+
+    when:
+    service.removeDataset(null, "user-1")
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "removeDataset throws NullPointerException for null removedByUserId"() {
+    given:
+    def service = createServiceWithEmptyRepo()
+
+    when:
+    service.removeDataset("dataset-id", null)
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  private AssociatedDatasetService createServiceWithEmptyRepo() {
+    def repository = Mock(AssociatedDatasetRepository) {
+      findById(_) >> Optional.empty()
+    }
+    new AssociatedDatasetService(
+        Mock(DatasetSource), repository, Mock(SourceInstanceRegistry),
+        Mock(ProjectInformationService), Mock(UserInformationService),
+        Mock(ExperimentInformationService))
+  }
+
+  private static AssociatedDataset createConnectedDataset(
+      AssociatedDatasetId id, ProjectId projectId, String connectedBy) {
+    new AssociatedDataset(
+        id, projectId, SourceType.INVENIO_RDM, new ExternalHandle("ext-1"),
+        new InvenioRdmResourceMetadata(
+            "Test Dataset", "10.1234/test", "v1",
+            "https://zenodo.org/records/12345",
+            "Zenodo", [], "Dataset", "QBiC",
+            java.time.LocalDate.of(2025, 1, 15), null,
+            InvenioRdmAccessStatus.PUBLIC, InvenioRdmAccessStatus.PUBLIC),
+        connectedBy, null)
+  }
+}
\ No newline at end of file
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/application/measurement/validation/MeasurementIPValidatorSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/application/measurement/validation/MeasurementIPValidatorSpec.groovy
index 2d4e598598..353b28619f 100644
--- a/project-management/src/test/groovy/life/qbic/projectmanagement/application/measurement/validation/MeasurementIPValidatorSpec.groovy
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/application/measurement/validation/MeasurementIPValidatorSpec.groovy
@@ -1,18 +1,18 @@
 package life.qbic.projectmanagement.application.measurement.validation
 
+import life.qbic.projectmanagement.application.ProjectInformationService
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementRegistrationInformationIP
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementSpecificIP
 import life.qbic.projectmanagement.application.api.AsyncProjectService.MeasurementUpdateInformationIP
-import life.qbic.projectmanagement.application.ProjectInformationService
 import life.qbic.projectmanagement.application.measurement.MeasurementService
 import life.qbic.projectmanagement.application.ontology.OntologyClass
 import life.qbic.projectmanagement.application.ontology.TerminologyService
 import life.qbic.projectmanagement.application.sample.SampleIdCodeEntry
 import life.qbic.projectmanagement.application.sample.SampleInformationService
 import life.qbic.projectmanagement.domain.model.experiment.ExperimentId
+import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement
 import life.qbic.projectmanagement.domain.model.project.Project
 import life.qbic.projectmanagement.domain.model.project.ProjectId
-import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement
 import life.qbic.projectmanagement.domain.model.sample.Sample
 import life.qbic.projectmanagement.domain.model.sample.SampleCode
 import life.qbic.projectmanagement.domain.model.sample.SampleId
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/application/policy/directive/UpdateProjectUponMeasurementCreationSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/application/policy/directive/UpdateProjectUponMeasurementCreationSpec.groovy
index 311d1cb0b3..d69798178b 100644
--- a/project-management/src/test/groovy/life/qbic/projectmanagement/application/policy/directive/UpdateProjectUponMeasurementCreationSpec.groovy
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/application/policy/directive/UpdateProjectUponMeasurementCreationSpec.groovy
@@ -1,6 +1,5 @@
 package life.qbic.projectmanagement.application.policy.directive
 
-import java.time.Instant
 import life.qbic.projectmanagement.application.ProjectInformationService
 import life.qbic.projectmanagement.application.measurement.MeasurementLookupService
 import life.qbic.projectmanagement.domain.model.measurement.ImmunopeptidomicsMeasurement
@@ -11,6 +10,8 @@ import life.qbic.projectmanagement.domain.model.project.ProjectId
 import org.jobrunr.scheduling.JobScheduler
 import spock.lang.Specification
 
+import java.time.Instant
+
 class UpdateProjectUponMeasurementCreationSpec extends Specification {
 
     def "Given an NGS measurement, update the project modified date"() {
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetRemoveSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetRemoveSpec.groovy
new file mode 100644
index 0000000000..3dc55a1355
--- /dev/null
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/AssociatedDatasetRemoveSpec.groovy
@@ -0,0 +1,149 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset
+
+import life.qbic.domain.concepts.DomainEvent
+import life.qbic.domain.concepts.DomainEventSubscriber
+import life.qbic.domain.concepts.LocalDomainEventDispatcher
+import life.qbic.projectmanagement.domain.model.associated_dataset.event.AssociatedDatasetRemovedEvent
+import life.qbic.projectmanagement.domain.model.project.ProjectId
+import spock.lang.Specification
+
+/**
+ * Unit tests for {@link AssociatedDataset#remove(String removedByUserId)}.
+ *
+ * Verifies that the aggregate transitions to {@link ConnectionState#REMOVED}
+ * and dispatches an {@link AssociatedDatasetRemovedEvent} via the
+ * local domain event dispatcher.
+ *
+ * @since 1.12.0
+ */
+class AssociatedDatasetRemoveSpec extends Specification {
+
+  private static final String VALID_PROJECT_ID = "0270ce7f-4092-40e3-9c4c-ce7adb688bf5"
+
+  def setup() {
+    LocalDomainEventDispatcher.instance().reset()
+  }
+
+  def "remove sets state to REMOVED and emits AssociatedDatasetRemovedEvent"() {
+    given:
+    def dataset = createConnectedDataset()
+    def capturedEvents = new ArrayList<DomainEvent>()
+    LocalDomainEventDispatcher.instance().subscribe(
+        new RemovalEventCapture(capturedEvents))
+
+    when:
+    dataset.remove("remover-user-id")
+
+    then:
+    dataset.connectionState() == ConnectionState.REMOVED
+
+    and: "exactly one AssociatedDatasetRemovedEvent was dispatched"
+    capturedEvents.size() == 1
+    capturedEvents[0] instanceof AssociatedDatasetRemovedEvent
+    def event = capturedEvents[0] as AssociatedDatasetRemovedEvent
+    event.actorUserId() == "remover-user-id"
+    event.associatedDatasetId() == dataset.id()
+    event.projectId() == dataset.projectId()
+    event.datasetTitle() == "Test Dataset"
+    event.datasetPid() == "10.1234/test"
+  }
+
+  def "remove throws IllegalStateException when dataset is already removed"() {
+    given:
+    def dataset = createConnectedDataset()
+    dataset.remove("user-1")
+
+    when:
+    dataset.remove("user-2")
+
+    then:
+    def thrown = thrown(IllegalStateException)
+    thrown.message.contains("already removed")
+  }
+
+  def "remove throws NullPointerException on null removedByUserId"() {
+    given:
+    def dataset = createConnectedDataset()
+
+    when:
+    dataset.remove(null)
+
+    then:
+    thrown(NullPointerException)
+    // Dataset must still be in CONNECTED state — removal was not performed
+    dataset.connectionState() == ConnectionState.CONNECTED
+  }
+
+  def "remove does not emit event when dataset is already removed"() {
+    given:
+    def dataset = createConnectedDataset()
+    dataset.remove("user-1")
+
+    // Reset dispatcher (clear the event from the first removal) and
+    // attach a fresh subscriber to the second (failing) removal attempt.
+    LocalDomainEventDispatcher.instance().reset()
+    def capturedEvents = new ArrayList<DomainEvent>()
+    LocalDomainEventDispatcher.instance().subscribe(
+        new RemovalEventCapture(capturedEvents))
+
+    when:
+    try {
+      dataset.remove("user-2")
+    } catch (IllegalStateException ignored) {}
+
+    then:
+    capturedEvents.isEmpty()
+  }
+
+  // ─ Helpers ───────────────────────────────────────────────────────────────
+
+  /**
+   * Captures {@link AssociatedDatasetRemovedEvent} instances dispatched
+   * on the local domain event bus.
+   *
+   * <p>The {@link LocalDomainEventDispatcher} uses exact-type matching
+   * ({@code ==}) when filtering subscribers, so this subscriber declares
+   * {@code AssociatedDatasetRemovedEvent.class} as its event type.</p>
+   */
+  private static class RemovalEventCapture
+      implements DomainEventSubscriber<AssociatedDatasetRemovedEvent> {
+
+    private final List<DomainEvent> events
+
+    RemovalEventCapture(List<DomainEvent> events) {
+      this.events = events
+    }
+
+    @Override
+    Class<? extends DomainEvent> subscribedToEventType() {
+      return AssociatedDatasetRemovedEvent.class
+    }
+
+    @Override
+    void handleEvent(AssociatedDatasetRemovedEvent event) {
+      events.add(event)
+    }
+  }
+
+  private static AssociatedDataset createConnectedDataset() {
+    return AssociatedDataset.connect(
+        ProjectId.parse(VALID_PROJECT_ID),
+        SourceType.INVENIO_RDM,
+        new ExternalHandle("ext-1"),
+        new InvenioRdmResourceMetadata(
+            "Test Dataset",
+            "10.1234/test",
+            "v1",
+            "https://zenodo.org/records/12345",
+            "Zenodo",
+            [],
+            "Dataset",
+            "QBiC",
+            java.time.LocalDate.of(2025, 1, 15),
+            null,
+            InvenioRdmAccessStatus.PUBLIC,
+            InvenioRdmAccessStatus.PUBLIC),
+        "original-connector",
+        null)
+  }
+}
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadataJsonSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadataJsonSpec.groovy
new file mode 100644
index 0000000000..e1aad512f1
--- /dev/null
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/InvenioRdmResourceMetadataJsonSpec.groovy
@@ -0,0 +1,105 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset
+
+import com.fasterxml.jackson.databind.ObjectMapper
+import com.fasterxml.jackson.databind.SerializationFeature
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import spock.lang.Specification
+
+/**
+ * Regression coverage for the {@code resource_metadata} JSON column.
+ *
+ * <p>Rows written by earlier application versions of
+ * {@link InvenioRdmResourceMetadata} may carry fields that have since
+ * been removed (e.g. {@code embargoUntil}). The converter that reads
+ * {@link ResourceMetadata} back from JSON must tolerate those stale
+ * rows — otherwise the page listing connected datasets fails to load
+ * with a silent {@code AttributeConverter} error.</p>
+ *
+ * <p>Mirrors the {@code ObjectMapper} configuration on
+ * {@link AssociatedDataset.ResourceMetadataConverter}.</p>
+ */
+class InvenioRdmResourceMetadataJsonSpec extends Specification {
+
+  ObjectMapper mapper
+
+  def setup() {
+    mapper = new ObjectMapper()
+    mapper.registerModule(new JavaTimeModule())
+    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
+  }
+
+  def "legacy JSON containing 'embargoUntil' is deserialized without error"() {
+    given: "a JSON blob written by an app version that persisted embargoUntil"
+    def legacyJson = """
+    {
+      "type": "INVENIO_RDM",
+      "title": "Test dataset",
+      "pid": "10.5281/zenodo.1234567",
+      "version": "v1",
+      "accessLink": null,
+      "resourceProvider": "Zenodo",
+      "creators": [],
+      "resourceType": "Dataset",
+      "community": null,
+      "publicationDate": "2025-01-15",
+      "description": null,
+      "recordAccess": "PUBLIC",
+      "fileAccess": "PUBLIC",
+      "embargoUntil": null
+    }
+    """.stripIndent().trim()
+
+    when:
+    def metadata = mapper.readValue(legacyJson, ResourceMetadata)
+
+    then: "the record is reconstructed; the removed field is silently dropped"
+    metadata instanceof InvenioRdmResourceMetadata
+    metadata.title() == "Test dataset"
+    metadata.pid() == "10.5281/zenodo.1234567"
+    metadata.publicationDate().toString() == "2025-01-15"
+    metadata.recordAccess() == InvenioRdmAccessStatus.PUBLIC
+    metadata.fileAccess() == InvenioRdmAccessStatus.PUBLIC
+  }
+
+  def "current-schema JSON round-trips correctly"() {
+    given: "a freshly constructed record (current schema, no embargoUntil)"
+    def fresh = new InvenioRdmResourceMetadata(
+        "Test", "10.5281/zenodo.999", "v2", "https://zenodo.org/records/999",
+        "Zenodo", ["Smith, Alice"], "Dataset", null,
+        java.time.LocalDate.of(2025, 6, 1), null,
+        InvenioRdmAccessStatus.PUBLIC, InvenioRdmAccessStatus.PUBLIC)
+
+    when: "serialized to JSON then deserialized back via the polymorphic interface"
+    def json = mapper.writeValueAsString(fresh)
+    def roundTrip = mapper.readValue(json, ResourceMetadata)
+
+    then:
+    roundTrip instanceof InvenioRdmResourceMetadata
+    roundTrip.title() == "Test"
+    roundTrip.publicationDate().toString() == "2025-06-01"
+    json.contains('"type":"INVENIO_RDM"')
+  }
+
+  def "unknown field of any kind is silently ignored"() {
+    given: "a JSON blob with an entirely unknown future field"
+    def json = """
+    {
+      "type": "INVENIO_RDM",
+      "title": "T",
+      "pid": "10.5281/x",
+      "publicationDate": "2025-01-01",
+      "resourceProvider": "Zenodo",
+      "recordAccess": "PUBLIC",
+      "fileAccess": "PUBLIC",
+      "someFutureFieldWeDontKnowAboutYet": 42
+    }
+    """.stripIndent().trim()
+
+    when:
+    def metadata = mapper.readValue(json, ResourceMetadata)
+
+    then: "no exception; the unknown field is dropped"
+    metadata instanceof InvenioRdmResourceMetadata
+    metadata.title() == "T"
+  }
+}
diff --git a/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEventSpec.groovy b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEventSpec.groovy
new file mode 100644
index 0000000000..4226ac56ea
--- /dev/null
+++ b/project-management/src/test/groovy/life/qbic/projectmanagement/domain/model/associated_dataset/event/AssociatedDatasetRemovedEventSpec.groovy
@@ -0,0 +1,85 @@
+package life.qbic.projectmanagement.domain.model.associated_dataset.event
+
+import life.qbic.domain.concepts.DomainEvent
+import life.qbic.projectmanagement.domain.model.associated_dataset.AssociatedDatasetId
+import life.qbic.projectmanagement.domain.model.project.ProjectId
+import spock.lang.Specification
+
+/**
+ * Unit tests for {@link AssociatedDatasetRemovedEvent}.
+ *
+ * @since 1.12.0
+ */
+class AssociatedDatasetRemovedEventSpec extends Specification {
+
+  private static final String VALID_PROJECT_ID = "0270ce7f-4092-40e3-9c4c-ce7adb688bf5"
+
+  def "create() constructs event with all fields"() {
+    given:
+    def datasetId = AssociatedDatasetId.create()
+    def projectId = ProjectId.parse(VALID_PROJECT_ID)
+    def userId = "user-123"
+    def title = "Test Dataset"
+    def pid = "10.12345/test"
+
+    when:
+    def event = AssociatedDatasetRemovedEvent.create(
+        datasetId, projectId, userId, title, pid)
+
+    then:
+    event.associatedDatasetId() == datasetId
+    event.projectId() == projectId
+    event.actorUserId() == userId
+    event.datasetTitle() == title
+    event.datasetPid() == pid
+  }
+
+  def "create() throws NullPointerException for null associatedDatasetId"() {
+    when:
+    AssociatedDatasetRemovedEvent.create(null, ProjectId.parse(VALID_PROJECT_ID), "user", "title", "pid")
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "create() throws NullPointerException for null projectId"() {
+    when:
+    AssociatedDatasetRemovedEvent.create(AssociatedDatasetId.create(), null, "user", "title", "pid")
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "create() throws NullPointerException for null actorUserId"() {
+    when:
+    AssociatedDatasetRemovedEvent.create(AssociatedDatasetId.create(), ProjectId.parse(VALID_PROJECT_ID), null, "title", "pid")
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "create() throws NullPointerException for null datasetTitle"() {
+    when:
+    AssociatedDatasetRemovedEvent.create(AssociatedDatasetId.create(), ProjectId.parse(VALID_PROJECT_ID), "user", null, "pid")
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "create() throws NullPointerException for null datasetPid"() {
+    when:
+    AssociatedDatasetRemovedEvent.create(AssociatedDatasetId.create(), ProjectId.parse(VALID_PROJECT_ID), "user", "title", null)
+
+    then:
+    thrown(NullPointerException)
+  }
+
+  def "event extends DomainEvent"() {
+    given:
+    def event = AssociatedDatasetRemovedEvent.create(
+        AssociatedDatasetId.create(), ProjectId.parse(VALID_PROJECT_ID), "user", "title", "pid")
+
+    expect:
+    event instanceof DomainEvent
+  }
+}
\ No newline at end of file
diff --git a/sql/complete-schema.sql b/sql/complete-schema.sql
index 4a3752f497..e676ef79d5 100644
--- a/sql/complete-schema.sql
+++ b/sql/complete-schema.sql
@@ -743,7 +743,11 @@ SELECT `pd`.`projectId`                     AS `projectId`,
        `m`.`amountPxpMeasurements`          AS `amountPxpMeasurements`,
        `m`.`amountIpMeasurements`           AS `amountIpMeasurements`,
        `users`.`usernames`                  AS `usernames`,
-       `users`.`userInfos`                  AS `userInfos`
+       `users`.`userInfos`                  AS `userInfos`,
+       COALESCE(connected_datasets.connectedDatasetCount,   0) AS `connectedDatasetCount`,
+       COALESCE(connected_datasets.openDatasetCount,        0) AS `openDatasetCount`,
+       COALESCE(connected_datasets.restrictedDatasetCount,  0) AS `restrictedDatasetCount`,
+       connected_datasets.lastConnectedOn                      AS `lastConnectedOn`
 FROM projects_datamanager pd
          LEFT JOIN project_measurements m ON pd.projectId = m.projectId
          LEFT JOIN (SELECT project_userinfo.projectId,
@@ -751,7 +755,18 @@ FROM projects_datamanager pd
                            JSON_ARRAYAGG(JSON_OBJECT('userId', project_userinfo.userId, 'userName',
                                                      project_userinfo.userName))  AS `userInfos`
                     FROM project_userinfo
-                    GROUP BY projectId) AS users ON users.projectId = pd.projectId;
+                    GROUP BY projectId) AS users ON users.projectId = pd.projectId
+         LEFT JOIN (
+             SELECT
+                 `project_id`,
+                 COUNT(*)                                                            AS connectedDatasetCount,
+                 SUM(CASE WHEN `access_level` = 'PUBLIC'     THEN 1 ELSE 0 END)      AS openDatasetCount,
+                 SUM(CASE WHEN `access_level` = 'RESTRICTED' THEN 1 ELSE 0 END)      AS restrictedDatasetCount,
+                 MAX(`connected_on`)                                                 AS lastConnectedOn
+             FROM `associated_dataset`
+             WHERE `connection_state` = 'CONNECTED'
+             GROUP BY `project_id`
+         ) AS connected_datasets ON connected_datasets.project_id = pd.projectId;
 
 CREATE OR REPLACE VIEW v_ngs_measurement_sample_json AS
 SELECT m.measurement_id,
@@ -974,3 +989,51 @@ SELECT ip.measurement_id,
 FROM ip_measurements ip
          INNER JOIN remote_measurement_data rmd
                     ON rmd.measurement_id = ip.measurementCode;
+
+-- ===========================================================================
+-- Associated Dataset
+-- Per ADR-0001: source-agnostic aggregate within project-management bounded
+-- context. Source-specific metadata is stored as a MariaDB JSON blob; a
+-- small set of "universal columns" (title, pid, version, publication_date)
+-- are extracted to regular columns for SQL sort/filter.
+-- Soft-delete: connection_state = 'REMOVED' keeps the row as an audit
+-- tombstone; active queries filter it out.
+-- ===========================================================================
+CREATE TABLE IF NOT EXISTS `associated_dataset`
+(
+    `id`                varchar(36) NOT NULL,
+    `project_id`        varchar(36)     NOT NULL,
+    `source_type`       varchar(32)     NOT NULL    COMMENT 'e.g. INVENIO_RDM',
+    `external_handle`   varchar(512)    NOT NULL    COMMENT 'record ID on the source',
+    `connection_state`  varchar(16)     NOT NULL    COMMENT 'CONNECTED | REMOVED (soft-delete)',
+    `access_level`      varchar(16)     NOT NULL    COMMENT 'coarse access, derived from metadata',
+
+    -- Universal columns (source-agnostic, used for sort/filter)
+    `title`             varchar(1024)   DEFAULT NULL,
+    `pid`               varchar(255)    DEFAULT NULL,
+    `version`           varchar(32)     DEFAULT NULL,
+    `publication_date`  date            DEFAULT NULL,
+
+    -- Source-specific metadata (opaque JSON; see ResourceMetadata hierarchy)
+    `resource_metadata` json            DEFAULT NULL,
+
+    -- Connection metadata
+    `connected_by`      varchar(255)    NOT NULL,
+    `connected_on`      timestamp(3)    NOT NULL,
+    `experiment_id`     varchar(36)     DEFAULT NULL COMMENT 'optional experiment association',
+    `last_synced_at`    timestamp(3)    DEFAULT NULL,
+
+    -- Generated column for partial unique index: NULL when REMOVED so that
+    -- MariaDB excludes tombstoned rows from the uniqueness check.
+    `active_pid`        varchar(255) GENERATED ALWAYS AS
+                                        (CASE WHEN `connection_state` <> 'REMOVED' THEN `pid` ELSE NULL END) VIRTUAL,
+
+    PRIMARY KEY (`id`),
+    KEY `idx_assoc_ds_project`          (`project_id`),
+    KEY `idx_assoc_ds_state`            (`connection_state`),
+    KEY `idx_assoc_ds_source_type`      (`source_type`),
+    KEY `idx_assoc_ds_project_state`    (`project_id`, `connection_state`),
+    UNIQUE KEY `uk_assoc_ds_project_pid` (`project_id`, `active_pid`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
diff --git a/sql/migrations/README.md b/sql/migrations/README.md
new file mode 100644
index 0000000000..c13e20e7ab
--- /dev/null
+++ b/sql/migrations/README.md
@@ -0,0 +1,89 @@
+# Incremental migration scripts (Tier 1)
+
+This directory holds runnable, idempotent DDL scripts for schema changes to
+the Data Manager application. Each script is the atomic unit of a migration —
+it does one thing, does it safely, and references the story/feature/ADRs that
+drive it.
+
+For the three-tier migration documentation structure, see
+[`docs/migrations/README.md`](../../docs/migrations/README.md).
+
+---
+
+## Current scripts
+
+| # | Script | Description | Story | Target datasource |
+|---|---|---|---|---|
+| 1 | [`create-associated-dataset.sql`](create-associated-dataset.sql) | Create `associated_dataset` table for connecting InvenioRDM datasets to projects | [#1467](https://github.com/qbicsoftware/data-manager-app/issues/1467) | `data_management` |
+| 2 | [`extend-dataset-visibility-in-project-overview.sql`](extend-dataset-visibility-in-project-overview.sql) | Add connected-dataset aggregates (count, open/restricted breakdown, last-connected) to `project_overview` view | [#1475](https://github.com/qbicsoftware/data-manager-app/issues/1475) | `data_management` |
+
+*Add a row here and drop in the script when a new migration lands.*
+
+---
+
+## Naming convention
+
+Scripts are named by the schema change, **not** by date or by version. Dates
+and version associations live in the operator-facing migration guides
+(`docs/migrations/released/v*.md` or `docs/migrations/NEXT.md`), not here.
+
+Format: `<kebab-case-name>.sql`
+
+Examples:
+- `create-associated-dataset.sql` ← adds a new table
+- `add-user-preferences-column.sql` ← adds a column to an existing table
+- `replace-ip-summary-view.sql` ← replaces a view definition
+- `drop-unused-indexes-on-sample.sql` ← removes indexes
+
+---
+
+## Required header format
+
+Every script must open with a comment header containing these fields:
+
+```sql
+-- =============================================================================
+-- Migration: <short human-readable name>
+-- Story:    <GitHub issue link>
+-- Feature:  <GitHub issue link or feature ID>
+-- ADRs:     <comma-separated list, e.g. 0001, 0002, 0003>
+-- Datasource: <data_management | finance | both>
+--
+-- <Free-form notes: design decisions, scale assumptions, rollback caveats,
+--  anything an operator would want to know before running this script.>
+-- =============================================================================
+```
+
+Example: see [`create-associated-dataset.sql`](create-associated-dataset.sql).
+
+---
+
+## Idempotency requirement
+
+All scripts **must** be idempotent — safe to run multiple times against the
+same target datasource without changing the outcome or producing errors:
+
+| Statement | Idempotent form |
+|---|---|
+| `CREATE TABLE` | `CREATE TABLE IF NOT EXISTS ...` |
+| `ADD COLUMN`   | Use MariaDB `ALTER TABLE ... ADD COLUMN IF NOT EXISTS ...` |
+| `DROP TABLE`   | `DROP TABLE IF EXISTS ...` |
+| `CREATE INDEX` | Wrap in a conditional `IF NOT EXISTS` check, or a stored-procedure guard |
+| `CREATE VIEW`  | `CREATE OR REPLACE VIEW ...` |
+
+If a change cannot be made idempotent (rare), document that explicitly in the
+header and in the matching operator-facing guide.
+
+---
+
+## Where scripts are referenced
+
+Each script is referenced by an entry in the corresponding
+operator-facing migration guide:
+
+- **Next release (unreleased):** [`docs/migrations/NEXT.md`](../../docs/migrations/NEXT.md)
+- **Released versions:** [`docs/migrations/released/v*.md`](../../docs/migrations/released/)
+
+The operator guide duplicates the pre-flight / verify / rollback SQL so
+operators don't have to read this directory directly. This directory stores the
+canonical DDL; the guides explain how to run it in context.
diff --git a/sql/migrations/create-associated-dataset.sql b/sql/migrations/create-associated-dataset.sql
new file mode 100644
index 0000000000..6a0c396cc4
--- /dev/null
+++ b/sql/migrations/create-associated-dataset.sql
@@ -0,0 +1,65 @@
+-- =============================================================================
+-- Migration: Create `associated_dataset` table
+-- Feature:  FEAT-DATSET-01 — Connecting open, published datasets
+-- ADRs:     0001 (domain model), 0002 (credential storage), 0003 (lifecycle)
+--
+-- This migration establishes the incremental-scripts pattern for the project.
+-- Going forward, incremental schema changes go here alongside the canonical
+-- DDL in sql/complete-schema.sql. The complete-schema.sql file is always kept
+-- in the "applied state" — it serves as the reference for fresh installs.
+--
+-- Notes about the table design (per ADR-0001):
+--   * `associated_dataset` lives in the project-management bounded context.
+--   * Universal columns (`title`, `pid`, `version`, `publication_date`) live
+--     as regular SQL columns — they are source-agnostic (every external source
+--     provides them) and are used for efficient SQL sort/filter.
+--   * `resource_metadata` is a MariaDB JSON column. Source-specific metadata
+--     (creators, community, access details) is serialized there by the
+--     application layer via the sealed ResourceMetadata hierarchy. This keeps
+--     the aggregate source-agnostic at its public API boundary. When JSON-path
+--     filtering becomes a performance concern (currently expected at
+--     <100 rows/project, so it isn't), the escape hatch is a generated virtual
+--     column + index — no entity change required.
+--   * Soft-delete: setting `connection_state = 'REMOVED'` marks the row as a
+--     tombstone (audit retention). Active-query paths exclude REMOVED rows.
+--   * `experiment_id` is a logical foreign key to `experiments_datamanager.id`
+--     but intentionally has no SQL FK constraint — the application enforces
+--     referential integrity so that project-ACL changes don't cascade
+--     unexpectedly onto connections.
+-- =============================================================================
+
+-- Step 1: Create the table (idempotent — safe to re-run)
+-- =============================================================================
+
+CREATE TABLE IF NOT EXISTS `associated_dataset`
+(
+    `id`                varchar(36) NOT NULL,
+    `project_id`        varchar(36)     NOT NULL,
+    `source_type`       varchar(32)     NOT NULL    COMMENT 'e.g. INVENIO_RDM',
+    `external_handle`   varchar(512)    NOT NULL    COMMENT 'record ID on the source',
+    `connection_state`  varchar(16)     NOT NULL    COMMENT 'CONNECTED | REMOVED (soft-delete)',
+    `access_level`      varchar(16)     NOT NULL    COMMENT 'coarse access, derived from metadata',
+
+    -- Universal columns (source-agnostic, used for sort/filter)
+    `title`             varchar(1024)   DEFAULT NULL,
+    `pid`               varchar(255)    DEFAULT NULL,
+    `version`           varchar(32)     DEFAULT NULL,
+    `publication_date`  date            DEFAULT NULL,
+
+    -- Source-specific metadata (opaque JSON; see ResourceMetadata hierarchy)
+    `resource_metadata` json            DEFAULT NULL,
+
+    -- Connection metadata
+    `connected_by`      varchar(255)    NOT NULL,
+    `connected_on`      timestamp(3)    NOT NULL,
+    `experiment_id`     varchar(36)     DEFAULT NULL COMMENT 'optional experiment association',
+    `last_synced_at`    timestamp(3)    DEFAULT NULL,
+
+    PRIMARY KEY (`id`),
+    KEY `idx_assoc_ds_project`          (`project_id`),
+    KEY `idx_assoc_ds_state`            (`connection_state`),
+    KEY `idx_assoc_ds_source_type`      (`source_type`),
+    KEY `idx_assoc_ds_project_state`    (`project_id`, `connection_state`)
+) ENGINE = InnoDB
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_unicode_ci;
diff --git a/sql/migrations/extend-dataset-visibility-in-project-overview.sql b/sql/migrations/extend-dataset-visibility-in-project-overview.sql
new file mode 100644
index 0000000000..779c10ea82
--- /dev/null
+++ b/sql/migrations/extend-dataset-visibility-in-project-overview.sql
@@ -0,0 +1,116 @@
+-- =============================================================================
+-- Migration: Add connected-dataset aggregates to the project_overview view
+-- Story:    https://github.com/qbicsoftware/data-manager-app/issues/1475
+-- Feature:  FEAT-DATASET-CONNECTION (#1466), Story FEAT-DATSET-09
+-- ADRs:     0001 (associated_dataset domain model)
+-- Datasource: data_management
+--
+-- Extends the project_overview view with four aggregate columns sourced from
+-- the associated_dataset table:
+--   * connectedDatasetCount   — total datasets connected to the project
+--   * openDatasetCount        — PUBLIC access_level count
+--   * restrictedDatasetCount  — RESTRICTED access_level count
+--   * lastConnectedOn         — most recent connected_on timestamp
+--
+-- The aggregate is a LEFT JOIN against a derived table so that projects with
+-- no connected datasets still appear in the view (with zero counts and a
+-- NULL lastConnectedOn).
+--
+-- Self-containment:
+--   This migration inlines the measurement-aggregation subqueries directly
+--   into the project_overview view definition rather than joining through
+--   `project_measurements`. That avoids a cross-view dependency on the
+--   `project_measurements` view definition being up-to-date at deployment
+--   time — in environments where `project_measurements` has the older
+--   pre-IP-measurements definition, a join-through approach would fail
+--   with "Unknown column 'm.amountIpMeasurements' in SELECT".
+--
+--   If you are doing a **fresh install**, run complete-schema.sql instead —
+--   it has the same canonical view definition (without this migration's
+--   inlined subqueries) and a separate `project_measurements` view.
+--
+-- Operator notes:
+--   * Safe to run while the application is live — views are dropped and
+--     recreated atomically; in-flight queries return the old definition.
+--   * The associated_dataset table must exist before running this script
+--     (created by the earlier create-associated-dataset.sql migration).
+--   * COALESCE handles the NULL case where a project has no connected
+--     datasets; COUNT and SUM over an empty group would otherwise produce
+--     NULL and trip the JPA entity's column nullability constraints.
+--   * `connection_state = 'CONNECTED'` excludes soft-deleted (`REMOVED`)
+--     rows.
+--
+-- Rollback:
+--   Drop the new project_overview and re-create it from the previous
+--   definition (see git history before this migration).
+--
+-- =============================================================================
+
+-- Pre-flight: confirm `associated_dataset` exists — the view is empty without
+-- it, but we want a hard error if the upstream table is missing entirely so
+-- operators catch the root cause instead of wondering why counts are always 0.
+-- Using a guard procedure keeps this idempotent.
+--
+-- (If you run the migration twice, the DROP + CREATE below are idempotent
+--  themselves via the DROP VIEW IF EXISTS; the procedure below is only needed
+--  for the pre-flight assertion.)
+
+DROP VIEW IF EXISTS `project_overview`;
+
+CREATE VIEW `project_overview` AS
+SELECT `pd`.`projectId`                     AS `projectId`,
+       `pd`.`projectCode`                   AS `projectCode`,
+       `pd`.`projectTitle`                  AS `projectTitle`,
+       `pd`.`lastModified`                  AS `lastModified`,
+       `pd`.`principalInvestigatorFullName` AS `principalInvestigatorFullName`,
+       `pd`.`projectManagerFullName`        AS `projectManagerFullName`,
+       `pd`.`responsibePersonFullName`      AS `responsibePersonFullName`,
+       -- Measurement aggregates: inlined rather than joined via `project_measurements`
+       -- so this migration does not depend on that view's version.
+       COALESCE(`proteomics`.`amountPxpMeasurements`, 0) AS `amountPxpMeasurements`,
+       COALESCE(`ngs`.`amountNgsMeasurements`, 0)        AS `amountNgsMeasurements`,
+       COALESCE(`ip`.`amountIpMeasurements`, 0)          AS `amountIpMeasurements`,
+       `users`.`usernames`                  AS `usernames`,
+       `users`.`userInfos`                  AS `userInfos`,
+       COALESCE(connected_datasets.connectedDatasetCount,   0) AS `connectedDatasetCount`,
+       COALESCE(connected_datasets.openDatasetCount,        0) AS `openDatasetCount`,
+       COALESCE(connected_datasets.restrictedDatasetCount,  0) AS `restrictedDatasetCount`,
+       connected_datasets.lastConnectedOn                      AS `lastConnectedOn`
+FROM (`data_management`.`projects_datamanager` `pd`
+         LEFT JOIN (SELECT `proteomics`.`projectId`        AS `projectId`,
+                           `proteomics_count`.`amountPxpMeasurements` AS `amountPxpMeasurements`
+                    FROM (`data_management`.`projects_datamanager` `proteomics`
+                             LEFT JOIN (SELECT `p`.`projectId`              AS `pID`,
+                                               count(`p`.`measurementCode`) AS `amountPxpMeasurements`
+                                        FROM `data_management`.`proteomics_measurement` `p`
+                                        GROUP BY `p`.`projectId`) `proteomics_count`
+                                     ON (`proteomics`.`projectId` = `proteomics_count`.`pID`))) `proteomics`
+               ON (`pd`.`projectId` = `proteomics`.`projectId`)
+         LEFT JOIN (SELECT `ngs`.`projectId`              AS `projectId`,
+                           count(`ngs`.`measurementCode`) AS `amountNgsMeasurements`
+                    FROM `data_management`.`ngs_measurements` `ngs`
+                    GROUP BY `ngs`.`projectId`) AS `ngs`
+               ON (`pd`.`projectId` = `ngs`.`projectId`)
+         LEFT JOIN (SELECT `ip`.`projectId`               AS `projectId`,
+                           count(`ip`.`measurementCode`)  AS `amountIpMeasurements`
+                    FROM `data_management`.`ip_measurements` `ip`
+                    GROUP BY `ip`.`projectId`) AS `ip`
+               ON (`pd`.`projectId` = `ip`.`projectId`))
+         LEFT JOIN (SELECT `project_userinfo`.`projectId`,
+                           GROUP_CONCAT(`project_userinfo`.`userName` SEPARATOR ', ') AS `usernames`,
+                           JSON_ARRAYAGG(JSON_OBJECT('userId',  `project_userinfo`.`userId`,
+                                                     'userName', `project_userinfo`.`userName`)) AS `userInfos`
+                    FROM `project_userinfo`
+                    GROUP BY `project_userinfo`.`projectId`) AS `users`
+               ON `users`.`projectId` = `pd`.`projectId`
+         LEFT JOIN (
+             SELECT
+                 `project_id`,
+                 COUNT(*)                                                            AS connectedDatasetCount,
+                 SUM(CASE WHEN `access_level` = 'PUBLIC'     THEN 1 ELSE 0 END)      AS openDatasetCount,
+                 SUM(CASE WHEN `access_level` = 'RESTRICTED' THEN 1 ELSE 0 END)      AS restrictedDatasetCount,
+                 MAX(`connected_on`)                                                 AS lastConnectedOn
+             FROM `associated_dataset`
+             WHERE `connection_state` = 'CONNECTED'
+             GROUP BY `project_id`
+         ) AS connected_datasets ON connected_datasets.project_id = `pd`.`projectId`;