From a7a9195dd18da34a39893e6f306a4857b5a696f0 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 19:51:15 +0200
Subject: [PATCH 01/15] Added tests for TDD

---
 tests/DraftControllerTest.php                 |  11 ++
 tests/js/autosaveService.test.js              |  75 +++++++++
 tests/js/descriptionTypes.test.js             |  33 ++++
 tests/js/freekeywordTags.test.js              |   4 +-
 tests/js/language.module.test.js              |  21 +++
 .../playwright/flows/stage-diagnosis.spec.ts  | 159 ++++++++++++++++++
 6 files changed, 301 insertions(+), 2 deletions(-)
 create mode 100644 tests/playwright/flows/stage-diagnosis.spec.ts

diff --git a/tests/DraftControllerTest.php b/tests/DraftControllerTest.php
index 91a129d55..f3024793f 100644
--- a/tests/DraftControllerTest.php
+++ b/tests/DraftControllerTest.php
@@ -274,4 +274,15 @@ public function testDifferentSessionCannotReadDraft(): void
 
         $this->assertSame(403, $forbiddenStatus);
     }
+
+    public function testGetNonExistentDraftReturns204(): void
+    {
+        $controller = new DraftController();
+        [$status, $data] = $this->captureResponse(function () use ($controller) {
+            $controller->get(['id' => 'aaaabbbbccccdddd1111222233334444']);
+        });
+
+        $this->assertSame(204, $status);
+        $this->assertNull($data);
+    }
 }
\ No newline at end of file
diff --git a/tests/js/autosaveService.test.js b/tests/js/autosaveService.test.js
index e1d42780b..7df2c4d45 100644
--- a/tests/js/autosaveService.test.js
+++ b/tests/js/autosaveService.test.js
@@ -429,4 +429,79 @@ describe('autosaveService', () => {
     expect(fetchMock.mock.calls[0][0]).toBe('/mde-msl/api/v2/drafts');
     expect(service.apiBaseUrl).toBe('/mde-msl/api/v2');
   });
+
+  test('clears stale draftId from localStorage when checkForExistingDraft gets 204', async () => {
+    window.localStorage.setItem('elmo.autosave.draftId', 'stale-draft-id');
+
+    const fetchMock = jest.fn().mockResolvedValue({
+      ok: true,
+      status: 204,
+      json: () => Promise.resolve(null)
+    });
+
+    const service = new AutosaveService('form-mde', {
+      fetch: fetchMock,
+      throttleMs: 0,
+      statusElementId: 'autosave-status',
+      statusTextId: 'autosave-status-text',
+      restoreModalId: 'modal-restore-draft'
+    });
+
+    service.start();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(window.localStorage.getItem('elmo.autosave.draftId')).toBeNull();
+    expect(service.draftId).toBeNull();
+  });
+
+  test('clears stale draftId from localStorage when checkForExistingDraft gets 404', async () => {
+    window.localStorage.setItem('elmo.autosave.draftId', 'old-draft-id');
+
+    const fetchMock = jest.fn().mockResolvedValue({
+      ok: false,
+      status: 404,
+      json: () => Promise.resolve({ error: 'Draft not found' })
+    });
+
+    const service = new AutosaveService('form-mde', {
+      fetch: fetchMock,
+      throttleMs: 0,
+      statusElementId: 'autosave-status',
+      statusTextId: 'autosave-status-text',
+      restoreModalId: 'modal-restore-draft'
+    });
+
+    service.start();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    expect(window.localStorage.getItem('elmo.autosave.draftId')).toBeNull();
+    expect(service.draftId).toBeNull();
+  });
+
+  test('does not clear draftId when 204 response is for session/latest (no stored draft)', async () => {
+    // No stored draftId => service queries session/latest
+    const fetchMock = jest.fn().mockResolvedValue({
+      ok: true,
+      status: 204,
+      json: () => Promise.resolve(null)
+    });
+
+    const service = new AutosaveService('form-mde', {
+      fetch: fetchMock,
+      throttleMs: 0,
+      statusElementId: 'autosave-status',
+      statusTextId: 'autosave-status-text',
+      restoreModalId: 'modal-restore-draft'
+    });
+
+    service.start();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    // draftId should remain null (was never set)
+    expect(service.draftId).toBeNull();
+    expect(fetchMock.mock.calls[0][0]).toBe('./api/v2/drafts/session/latest');
+  });
 });
\ No newline at end of file
diff --git a/tests/js/descriptionTypes.test.js b/tests/js/descriptionTypes.test.js
index 2a6ae33ce..5519af528 100644
--- a/tests/js/descriptionTypes.test.js
+++ b/tests/js/descriptionTypes.test.js
@@ -214,6 +214,39 @@ describe('descriptionTypes.js', () => {
             expect(slugs).toEqual([]);
         });
 
+        test('resolves even when applyTranslations throws', async () => {
+            window.applyTranslations = jest.fn(() => {
+                throw new TypeError("Cannot read properties of undefined (reading 'logoTitle')");
+            });
+
+            $.ajax.mockImplementation(function (options) {
+                options.success([
+                    { id: 1, name: 'Abstract', slug: 'Abstract' },
+                    { id: 2, name: 'Methods', slug: 'Methods' }
+                ]);
+            });
+
+            const slugs = await module.initDescriptionTypes();
+
+            expect(slugs).toEqual(['Methods']);
+            expect(window.ELMO_ACTIVE_DESCRIPTION_TYPES).toEqual(['Methods']);
+        });
+
+        test('resolves even when updateHelpStatus throws', async () => {
+            window.updateHelpStatus = undefined;
+            global.updateHelpStatus = jest.fn(() => {
+                throw new Error('updateHelpStatus explosion');
+            });
+
+            $.ajax.mockImplementation(function (options) {
+                options.success([{ id: 2, name: 'Methods', slug: 'Methods' }]);
+            });
+
+            const slugs = await module.initDescriptionTypes();
+
+            expect(slugs).toEqual(['Methods']);
+        });
+
         test('renders all 5 dynamic types correctly', async () => {
             $.ajax.mockImplementation(function (options) {
                 options.success([
diff --git a/tests/js/freekeywordTags.test.js b/tests/js/freekeywordTags.test.js
index d8492d5b6..bcc782e1d 100644
--- a/tests/js/freekeywordTags.test.js
+++ b/tests/js/freekeywordTags.test.js
@@ -81,13 +81,13 @@ describe('freekeywordTags.js', () => {
     errSpy.mockRestore();
   });
 
-  test('logs when no keywords returned', () => {
+  test('does not log when no keywords returned', () => {
     const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
     loadScript(() => ({
       done(cb) { cb([]); return { fail: jest.fn() }; },
       fail: jest.fn()
     }));
-    expect(logSpy).toHaveBeenCalledWith('ELMO currently has no curated keywords.');
+    expect(logSpy).not.toHaveBeenCalledWith('ELMO currently has no curated keywords.');
     const input = document.getElementById('input-freekeyword');
     expect(input._tagify.settings.whitelist).toEqual([]);
     logSpy.mockRestore();
diff --git a/tests/js/language.module.test.js b/tests/js/language.module.test.js
index ae94560e4..d2143ed07 100644
--- a/tests/js/language.module.test.js
+++ b/tests/js/language.module.test.js
@@ -207,6 +207,27 @@ describe('language module coverage', () => {
             // applyTranslations should work without throwing
             expect(() => languageModule.applyTranslations()).not.toThrow();
         });
+
+        test('returns early without errors when translations are empty object', () => {
+            window.setTranslations({});
+            const originalTitle = document.title;
+            expect(() => languageModule.applyTranslations()).not.toThrow();
+            expect(document.title).toBe(originalTitle);
+            expect(window.resizeTitle).not.toHaveBeenCalled();
+        });
+
+        test('returns early without errors when translations.general is undefined', () => {
+            window.setTranslations({ other: { key: 'value' } });
+            const originalTitle = document.title;
+            expect(() => languageModule.applyTranslations()).not.toThrow();
+            expect(document.title).toBe(originalTitle);
+            expect(window.adjustButtons).not.toHaveBeenCalled();
+        });
+
+        test('returns early without errors when translations are null', () => {
+            window.setTranslations(null);
+            expect(() => languageModule.applyTranslations()).not.toThrow();
+        });
     });
 
     describe('loadTranslations', () => {
diff --git a/tests/playwright/flows/stage-diagnosis.spec.ts b/tests/playwright/flows/stage-diagnosis.spec.ts
new file mode 100644
index 000000000..d59794a74
--- /dev/null
+++ b/tests/playwright/flows/stage-diagnosis.spec.ts
@@ -0,0 +1,159 @@
+/**
+ * Regression test for console errors and XML upload field population.
+ *
+ * Verifies that the following issues do not regress:
+ * - Race condition in applyTranslations() when descriptionTypes AJAX resolves first
+ * - Abstract and Funder fields not populated during XML upload
+ * - Duplicate modal IDs in HTML
+ *
+ * Run against Stage:
+ *   APP_BASE_URL=https://env.rz-vm182.gfz.de/elmo/ npx playwright test stage-diagnosis --project=chromium
+ * Run locally:
+ *   npx playwright test stage-diagnosis --project=chromium
+ */
+import { test, expect } from '@playwright/test';
+
+const SAMPLE_XML = `<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns="http://datacite.org/schema/kernel-4">
+  <identifier identifierType="DOI">10.1234/elmo.test</identifier>
+  <publicationYear>2024</publicationYear>
+  <language>en</language>
+  <titles>
+    <title xml:lang="en" titleType="MainTitle">Stage Diagnosis Test</title>
+  </titles>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Doe, Jane</creatorName>
+      <givenName>Jane</givenName>
+      <familyName>Doe</familyName>
+    </creator>
+  </creators>
+  <descriptions>
+    <description descriptionType="Abstract" xml:lang="en">This is a test abstract for diagnosis.</description>
+  </descriptions>
+  <resourceType resourceTypeGeneral="Dataset">Dataset</resourceType>
+  <rightsList>
+    <rights rightsURI="https://creativecommons.org/licenses/by/4.0/legalcode" rightsIdentifier="CC-BY-4.0">CC BY 4.0</rights>
+  </rightsList>
+  <fundingReferences>
+    <fundingReference>
+      <funderName>Deutsche Forschungsgemeinschaft</funderName>
+      <funderIdentifier funderIdentifierType="Crossref Funder ID">501100001659</funderIdentifier>
+      <awardNumber awardURI="https://example.org/grants/TEST123">TEST123</awardNumber>
+      <awardTitle>Test Grant Title</awardTitle>
+    </fundingReference>
+  </fundingReferences>
+</resource>`;
+
+test.describe('Console errors regression', () => {
+  test('no JavaScript errors on initial page load', async ({ page, baseURL }) => {
+    const jsErrors: string[] = [];
+
+    page.on('pageerror', (err) => {
+      jsErrors.push(err.message);
+    });
+
+    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
+
+    // Wait for async initialization (description types, translations, etc.)
+    await page.waitForTimeout(8000);
+
+    // Filter out known external/non-critical warnings
+    const criticalErrors = jsErrors.filter(
+      (e) => !e.includes('google.maps') && !e.includes('installHook')
+    );
+
+    expect(criticalErrors).toEqual([]);
+  });
+
+  test('descriptionTypesReady promise resolves', async ({ page, baseURL }) => {
+    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
+    await page.waitForTimeout(5000);
+
+    const promiseState = await page.evaluate(() => {
+      return new Promise<string>((resolve) => {
+        if (!(window as any).descriptionTypesReady) {
+          resolve('NOT_SET');
+          return;
+        }
+        let resolved = false;
+        (window as any).descriptionTypesReady.then(() => {
+          resolved = true;
+          resolve('RESOLVED');
+        });
+        setTimeout(() => {
+          if (!resolved) resolve('STUCK');
+        }, 5000);
+      });
+    });
+
+    expect(promiseState).toBe('RESOLVED');
+  });
+
+  test('no duplicate HTML IDs on upload modal', async ({ page, baseURL }) => {
+    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
+    await page.waitForTimeout(3000);
+
+    // Verify the upload modal ID is unique (was duplicated on both div and h5)
+    const uploadModalCount = await page.evaluate(() => {
+      return document.querySelectorAll('#modal-uploadxml').length;
+    });
+
+    expect(uploadModalCount).toBe(1);
+
+    // Verify the label element now has a distinct ID
+    const labelExists = await page.evaluate(() => {
+      return document.querySelector('#modal-uploadxml-label') !== null;
+    });
+
+    expect(labelExists).toBe(true);
+  });
+});
+
+test.describe('XML Upload field population regression', () => {
+  test('Abstract and Funder fields are populated after XML upload', async ({ page, baseURL }) => {
+    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
+    await page.waitForTimeout(5000);
+
+    // Click Load button
+    const loadButton = page.locator('#button-form-load');
+    await expect(loadButton).toBeVisible({ timeout: 10000 });
+    await loadButton.click();
+
+    // Wait for upload modal
+    const modal = page.locator('div#modal-uploadxml');
+    await expect(modal).toBeVisible({ timeout: 5000 });
+
+    // Upload XML file
+    await page.setInputFiles('#input-uploadxml-file', {
+      name: 'regression-test.xml',
+      mimeType: 'text/xml',
+      buffer: Buffer.from(SAMPLE_XML, 'utf-8'),
+    });
+
+    // Wait for title to be populated (indicates loadXmlToForm completed initial steps)
+    await expect(page.locator('#input-resourceinformation-title')).toHaveValue(
+      'Stage Diagnosis Test',
+      { timeout: 15000 }
+    );
+
+    // Wait for async processing (descriptionTypesReady + processFunders)
+    await page.waitForTimeout(3000);
+
+    // Assert Abstract was populated
+    await expect(page.locator('#input-abstract')).toHaveValue(
+      'This is a test abstract for diagnosis.'
+    );
+
+    // Assert Funder fields were populated
+    await expect(page.locator('input[name="funder[]"]').first()).toHaveValue(
+      'Deutsche Forschungsgemeinschaft'
+    );
+    await expect(page.locator('input[name="grantNummer[]"]').first()).toHaveValue(
+      'TEST123'
+    );
+    await expect(page.locator('input[name="grantName[]"]').first()).toHaveValue(
+      'Test Grant Title'
+    );
+  });
+});

From 8db9480248fce28eefa4755c7e4382f26f4b5b81 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 19:54:40 +0200
Subject: [PATCH 02/15] Several fixes aginst race conditions

---
 api/v2/controllers/DraftController.php |  2 +-
 js/descriptionTypes.js                 | 20 +++++++++++++++-----
 js/freekeywordTags.js                  |  1 -
 js/language.js                         |  6 ++++++
 js/services/autosaveService.js         |  5 +++++
 modals.html                            |  4 ++--
 6 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index e82be3fc4..3473669fc 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -126,7 +126,7 @@ public function get(array $vars = [], ?array $body = null): void
         }
 
         if (!$record) {
-            $this->respond(404, ['error' => 'Draft not found']);
+            $this->respond(204, null);
             return;
         }
 
diff --git a/js/descriptionTypes.js b/js/descriptionTypes.js
index 050b6c1fa..462ec99f7 100644
--- a/js/descriptionTypes.js
+++ b/js/descriptionTypes.js
@@ -77,14 +77,24 @@ function initDescriptionTypes() {
         // Store active slugs globally for the help system
         window.ELMO_ACTIVE_DESCRIPTION_TYPES = activeSlugs;
 
-        // Re-apply translations to newly added elements
-        if (typeof window.applyTranslations === 'function') {
-          window.applyTranslations();
+        // Re-apply translations to newly added elements.
+        // Wrapped in try/catch so the promise always resolves – translations
+        // will be re-applied when language.js finishes loading anyway.
+        try {
+          if (typeof window.applyTranslations === 'function') {
+            window.applyTranslations();
+          }
+        } catch (_ignored) {
+          // Non-critical: translations will be applied later
         }
 
         // Sync help icon visibility with current help status
-        if (typeof updateHelpStatus === 'function') {
-          updateHelpStatus();
+        try {
+          if (typeof updateHelpStatus === 'function') {
+            updateHelpStatus();
+          }
+        } catch (_ignored) {
+          // Non-critical
         }
 
         resolve(activeSlugs);
diff --git a/js/freekeywordTags.js b/js/freekeywordTags.js
index caef82584..53ff3bfdb 100644
--- a/js/freekeywordTags.js
+++ b/js/freekeywordTags.js
@@ -146,7 +146,6 @@ document.addEventListener('DOMContentLoaded', function () {
 
                     // Check if the array is empty
                     if (data.length === 0) {
-                        console.log("ELMO currently has no curated keywords.");
                         return;
                     }
 
diff --git a/js/language.js b/js/language.js
index a358becb0..ff869a076 100644
--- a/js/language.js
+++ b/js/language.js
@@ -69,6 +69,12 @@ function getNestedValue(obj, path) {
  * Applies the loaded translations to all UI elements
  */
 function applyTranslations() {
+    // Guard: skip if translations have not been loaded yet (race condition
+    // when descriptionTypes.js AJAX resolves before the language file).
+    if (!translations || !translations.general) {
+        return;
+    }
+
     // Set document title
     document.title = translations.general.logoTitle;
 
diff --git a/js/services/autosaveService.js b/js/services/autosaveService.js
index 9d3a0de70..c584efa0a 100644
--- a/js/services/autosaveService.js
+++ b/js/services/autosaveService.js
@@ -295,6 +295,11 @@ class AutosaveService {
       });
 
       if (response.status === 204 || response.status === 404) {
+        // Clear stale draft ID so the next save creates a fresh draft
+        if (this.draftId) {
+          this.draftId = null;
+          this.removeStoredDraftId();
+        }
         this.updateStatus('idle');
         return;
       }
diff --git a/modals.html b/modals.html
index 13dcef650..4271f1e9b 100644
--- a/modals.html
+++ b/modals.html
@@ -1,11 +1,11 @@
 </form>
 </main>
 <!-- Upload Modal -->
-<div class="modal fade" id="modal-uploadxml" tabindex="-1" aria-labelledby="modal-uploadxml" aria-hidden="true">
+<div class="modal fade" id="modal-uploadxml" tabindex="-1" aria-labelledby="modal-uploadxml-label" aria-hidden="true">
     <div class="modal-dialog modal-lg modal-dialog-centered">
         <div class="modal-content">
             <div class="modal-header">
-                <h5 class="modal-title" id="modal-uploadxml">XML hochladen</h5>
+                <h5 class="modal-title" id="modal-uploadxml-label">XML hochladen</h5>
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>            
             <div class="modal-body">

From 526316304e725e1395c59bdf6649678517e9110e Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 20:12:50 +0200
Subject: [PATCH 03/15] Added changelog entry

---
 doc/changelog.html | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/changelog.html b/doc/changelog.html
index 992e64595..c601e173d 100644
--- a/doc/changelog.html
+++ b/doc/changelog.html
@@ -19,6 +19,11 @@ <h2 class="accordion-header" id="heading-changelog-version13">
                             <li>ORCID checksum validation using ISO 7064 Mod 11-2 algorithm.</li>
                         </ul>
                     </li>
+                    <li><strong>Fixes:</strong>
+                        <ul>
+                            <li>Upload of XML files not working correctly.</li>
+                        </ul>
+                    </li>
                 </ul>
             </div>
         </div>

From a6f657cd37afe84c4876b79067828776b7599e2a Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 21:01:50 +0200
Subject: [PATCH 04/15] More Playwright tests to find other bugs

---
 .../flows/xml-upload-datacite47.spec.ts       | 234 ++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 tests/playwright/flows/xml-upload-datacite47.spec.ts

diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
new file mode 100644
index 000000000..ebc409fa8
--- /dev/null
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -0,0 +1,234 @@
+import { test, expect } from '@playwright/test';
+import { navigateToHome } from '../utils';
+
+/**
+ * Full DataCite 4.7 XML with nearly all properties that ELMO supports:
+ * - Personal + Organizational creator
+ * - Multiple title types
+ * - Description (Abstract, Methods, TechnicalInfo)
+ * - Funding reference
+ * - Related identifiers
+ * - Dates (Created)
+ * - Free keyword subjects
+ * - Rights / License
+ * - Contact Person contributor
+ */
+const DATACITE_47_XML = `<?xml version="1.0" encoding="UTF-8"?>
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xmlns="http://datacite.org/schema/kernel-4"
+          xsi:schemaLocation="http://datacite.org/schema/kernel-4 https://schema.datacite.org/meta/kernel-4.7/metadata.xsd">
+  <identifier identifierType="DOI">10.82433/B09Z-4K37</identifier>
+  <creators>
+    <creator>
+      <creatorName nameType="Personal">Müller, Erika</creatorName>
+      <givenName>Erika</givenName>
+      <familyName>Müller</familyName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="https://orcid.org">https://orcid.org/0000-0001-5727-2427</nameIdentifier>
+      <affiliation affiliationIdentifier="https://ror.org/04z8jg394" affiliationIdentifierScheme="ROR" schemeURI="https://ror.org">Helmholtz-Zentrum Potsdam Deutsches GeoForschungsZentrum GFZ</affiliation>
+    </creator>
+    <creator>
+      <creatorName xml:lang="en" nameType="Organizational">ACME Research Corporation</creatorName>
+    </creator>
+  </creators>
+  <titles>
+    <title xml:lang="en">Full DataCite 4.7 Upload Test</title>
+  </titles>
+  <publisher xml:lang="en">GFZ Data Services</publisher>
+  <publicationYear>2025</publicationYear>
+  <resourceType resourceTypeGeneral="Dataset">Dataset</resourceType>
+  <subjects>
+    <subject>geophysics</subject>
+    <subject>seismology</subject>
+  </subjects>
+  <contributors>
+    <contributor contributorType="ContactPerson">
+      <contributorName nameType="Personal">Müller, Erika</contributorName>
+      <givenName>Erika</givenName>
+      <familyName>Müller</familyName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="https://orcid.org">https://orcid.org/0000-0001-5727-2427</nameIdentifier>
+      <affiliation affiliationIdentifier="https://ror.org/04z8jg394" affiliationIdentifierScheme="ROR" schemeURI="https://ror.org">Helmholtz-Zentrum Potsdam Deutsches GeoForschungsZentrum GFZ</affiliation>
+    </contributor>
+    <contributor contributorType="DataCollector">
+      <contributorName nameType="Personal">Schmidt, Thomas</contributorName>
+      <givenName>Thomas</givenName>
+      <familyName>Schmidt</familyName>
+      <nameIdentifier nameIdentifierScheme="ORCID" schemeURI="https://orcid.org">https://orcid.org/0000-0002-9876-5432</nameIdentifier>
+    </contributor>
+  </contributors>
+  <dates>
+    <date dateType="Created">2025-03-15</date>
+  </dates>
+  <language>en</language>
+  <relatedIdentifiers>
+    <relatedIdentifier relatedIdentifierType="DOI" relationType="IsSupplementTo">10.5555/example-supplement</relatedIdentifier>
+  </relatedIdentifiers>
+  <rightsList>
+    <rights xml:lang="en" schemeURI="https://spdx.org/licenses/" rightsIdentifierScheme="SPDX" rightsIdentifier="CC-BY-4.0" rightsURI="https://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International</rights>
+  </rightsList>
+  <descriptions>
+    <description xml:lang="en" descriptionType="Abstract">This is a comprehensive test abstract for the DataCite 4.7 upload flow. It verifies that all major metadata fields are correctly mapped from XML to the ELMO form.</description>
+    <description xml:lang="en" descriptionType="Methods">Seismic data was collected using broadband stations deployed across the study area.</description>
+    <description xml:lang="en" descriptionType="TechnicalInfo">Data format: MiniSEED. Sampling rate: 100 Hz. Station network: GE.</description>
+  </descriptions>
+  <fundingReferences>
+    <fundingReference>
+      <funderName>Deutsche Forschungsgemeinschaft</funderName>
+      <funderIdentifier funderIdentifierType="Crossref Funder ID">https://doi.org/10.13039/501100001659</funderIdentifier>
+      <awardNumber awardURI="https://example.org/grants/DFG-12345">DFG-12345</awardNumber>
+      <awardTitle>Seismic Monitoring Network Expansion</awardTitle>
+    </fundingReference>
+  </fundingReferences>
+</resource>`;
+
+test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
+  test.beforeEach(async ({ page }) => {
+    await navigateToHome(page);
+
+    // Wait for the page to be fully loaded: dropdowns populated, description types loaded
+    await expect(page.locator('#input-resourceinformation-doi')).toBeVisible({ timeout: 15_000 });
+
+    // Wait for language dropdown to have meaningful options
+    await page.waitForFunction(() => {
+      const s = document.querySelector<HTMLSelectElement>('#input-resourceinformation-language');
+      return s != null && s.options.length > 2;
+    }, { timeout: 30_000 });
+
+    // Wait for resource type dropdown to have options
+    await page.waitForFunction(() => {
+      const s = document.querySelector<HTMLSelectElement>('#input-resourceinformation-resourcetype');
+      return s != null && s.options.length > 1;
+    }, { timeout: 15_000 });
+  });
+
+  test('uploads DataCite 4.7 XML and verifies all major fields are populated', async ({ page }) => {
+    // Collect console errors during the test
+    const consoleErrors: string[] = [];
+    page.on('console', msg => {
+      if (msg.type() === 'error') {
+        const text = msg.text();
+        // Ignore known harmless messages
+        if (!text.includes('Google Maps') && !text.includes('favicon')) {
+          consoleErrors.push(text);
+        }
+      }
+    });
+
+    // ── Step 1: Open upload modal and load XML ─────────────────────────
+    await page.getByRole('button', { name: /Load/i }).click();
+    const modal = page.locator('div#modal-uploadxml');
+    await expect(modal).toBeVisible({ timeout: 5_000 });
+
+    await page.setInputFiles('#input-uploadxml-file', {
+      name: 'datacite47-full.xml',
+      mimeType: 'text/xml',
+      buffer: Buffer.from(DATACITE_47_XML, 'utf-8'),
+    });
+
+    // Wait for title to be populated (indicates XML processing is done)
+    await expect(page.locator('#input-resourceinformation-title')).toHaveValue(
+      'Full DataCite 4.7 Upload Test',
+      { timeout: 20_000 },
+    );
+
+    // ── Step 2: Resource Information ───────────────────────────────────
+    await expect(page.locator('#input-resourceinformation-doi')).toHaveValue('10.82433/B09Z-4K37');
+    await expect(page.locator('#input-resourceinformation-publicationyear')).toHaveValue('2025');
+
+    // Language: expect "en" is selected
+    const langValue = await page.locator('#input-resourceinformation-language').inputValue();
+    expect(langValue).toBeTruthy();
+
+    // Resource type: expect "Dataset" is selected (value may be an ID)
+    const rtText = await page.locator('#input-resourceinformation-resourcetype option:checked').textContent();
+    expect(rtText?.trim().toLowerCase()).toContain('dataset');
+
+    // ── Step 3: Author (Personal) ──────────────────────────────────────
+    const authorRows = page.locator('div[data-creator-row]');
+    await expect(authorRows.first()).toBeVisible();
+
+    const firstAuthor = authorRows.first();
+    await expect(firstAuthor.locator('[id^="input-author-lastname"]')).toHaveValue('Müller');
+    await expect(firstAuthor.locator('[id^="input-author-firstname"]')).toHaveValue('Erika');
+
+    // ── Step 4: Author Institution (Organizational) ────────────────────
+    const instRows = page.locator('div[data-authorinstitution-row]');
+    await expect(instRows.first()).toBeVisible();
+    await expect(instRows.first().locator('[id^="input-authorinstitution-name"]')).toHaveValue(
+      'ACME Research Corporation',
+    );
+
+    // ── Step 5: Contributor Person (DataCollector) ──────────────────────
+    // Note: ContactPerson is mapped via ISO pointOfContact only, not from
+    // pure DataCite XML. We verify the DataCollector contributor instead.
+    const contributorPersonRows = page.locator('#group-contributorperson div[contributor-person-row]');
+    const cpLastName = contributorPersonRows.first().locator('[id^="input-contributor-lastname"]');
+    await expect(cpLastName).toHaveValue('Schmidt', { timeout: 10_000 });
+    const cpFirstName = contributorPersonRows.first().locator('[id^="input-contributor-firstname"]');
+    await expect(cpFirstName).toHaveValue('Thomas');
+
+    // ── Step 6: Abstract ───────────────────────────────────────────────
+    await expect(page.locator('#input-abstract')).toHaveValue(/comprehensive test abstract/);
+
+    // ── Step 7: Methods description (dynamically loaded accordion) ────
+    // Description types are loaded from ERNIE API; wait for them
+    await page.waitForFunction(
+      () => document.querySelectorAll('#accordion-description .accordion-item[data-description-slug]').length > 0,
+      { timeout: 15_000 },
+    );
+
+    const methodsInput = page.locator('#input-description-Methods');
+    if (await methodsInput.count() > 0) {
+      // Expand the Methods accordion if needed
+      const methodsCollapse = page.locator('#collapse-description-Methods');
+      if (!(await methodsCollapse.isVisible())) {
+        await page.locator('[data-bs-target="#collapse-description-Methods"]').click();
+        await methodsCollapse.waitFor({ state: 'visible' });
+      }
+      await expect(methodsInput).toHaveValue(/Seismic data was collected/);
+    }
+
+    // ── Step 8: TechnicalInfo description ──────────────────────────────
+    const techInput = page.locator('#input-description-TechnicalInfo');
+    if (await techInput.count() > 0) {
+      const techCollapse = page.locator('#collapse-description-TechnicalInfo');
+      if (!(await techCollapse.isVisible())) {
+        await page.locator('[data-bs-target="#collapse-description-TechnicalInfo"]').click();
+        await techCollapse.waitFor({ state: 'visible' });
+      }
+      await expect(techInput).toHaveValue(/MiniSEED/);
+    }
+
+    // ── Step 9: Date Created ───────────────────────────────────────────
+    await expect(page.locator('#input-date-created')).toHaveValue('2025-03-15');
+
+    // ── Step 10: Free Keywords ─────────────────────────────────────────
+    // Keywords are stored as Tagify tags; check the underlying input value
+    const keywordValue = await page.locator('#input-freekeyword').inputValue();
+    expect(keywordValue.toLowerCase()).toContain('geophysics');
+    expect(keywordValue.toLowerCase()).toContain('seismology');
+
+    // ── Step 11: Funding Reference ─────────────────────────────────────
+    await expect(page.locator('#input-funder').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
+    await expect(page.locator('#input-grantnumber').first()).toHaveValue('DFG-12345');
+    await expect(page.locator('#input-grantname').first()).toHaveValue('Seismic Monitoring Network Expansion');
+
+    // ── Step 12: Related Work ──────────────────────────────────────────
+    await expect(page.locator('#input-relatedwork-identifier').first()).toHaveValue('10.5555/example-supplement');
+
+    // ── Step 13: License ───────────────────────────────────────────────
+    const licenseText = await page.locator('#input-rights-license option:checked').textContent();
+    expect(licenseText?.toLowerCase()).toContain('cc');
+
+    // ── Step 14: No console errors ─────────────────────────────────────
+    // Filter out harmless warnings that may still appear
+    const realErrors = consoleErrors.filter(
+      e =>
+        !e.includes('net::ERR') &&
+        !e.includes('404') &&
+        !e.includes('curated keywords') &&
+        !e.includes('thesauri availability') && // Docker permission issue with DraftController mkdir
+        !e.includes('Permission denied'),
+    );
+    expect(realErrors, `Unexpected console errors: ${realErrors.join('\n')}`).toEqual([]);
+  });
+});

From ac7cd6bc0783ae2f3d2237ffcb477f58561ed0cf Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 21:02:37 +0200
Subject: [PATCH 05/15] Deleted error msg showing to json string

---
 api/v2/controllers/DraftController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index 3473669fc..164e93323 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -28,7 +28,7 @@ public function __construct()
         $this->retentionDays = (int) (getenv('ELMO_DRAFT_RETENTION_DAYS') ?: 30);
 
         if (!is_dir($this->storageRoot)) {
-            mkdir($this->storageRoot, 0775, true);
+            @mkdir($this->storageRoot, 0775, true);
         }
     }
 

From 696237dc9b79382896e13a5516b9319e7b907390 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 21:08:35 +0200
Subject: [PATCH 06/15] Updated API test to new http status code answer

---
 tests/ApiTest.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/ApiTest.php b/tests/ApiTest.php
index 7b6f14ae2..cd7d7f0b5 100644
--- a/tests/ApiTest.php
+++ b/tests/ApiTest.php
@@ -369,9 +369,9 @@ public function testDraftLifecycleEndpoints(): void
 
         $getDeletedResponse = $this->client->get($getUrl);
         $this->assertEquals(
-            404,
+            204,
             $getDeletedResponse->getStatusCode(),
-            'Expected deleted draft to return 404. Response: ' . $getDeletedResponse->getBody()
+            'Expected deleted draft to return 204. Response: ' . $getDeletedResponse->getBody()
         );
     }
 }

From 6e9d1b0c6f023c20b82725394be5e5d796856ab8 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 21:50:46 +0200
Subject: [PATCH 07/15] Fixed review issues and added envelope tests

---
 api/v2/controllers/DraftController.php        |  4 +-
 api/v2/docs/swagger.yaml                      |  8 +-
 js/services/autosaveService.js                | 16 +++-
 tests/js/autosaveService.test.js              | 29 +++++++
 tests/js/freekeywordTags.test.js              |  4 +-
 .../playwright/flows/stage-diagnosis.spec.ts  | 86 +++++++++++++------
 .../flows/xml-upload-datacite47.spec.ts       | 79 +++++++++++++----
 7 files changed, 171 insertions(+), 55 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index 164e93323..41aa377cf 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -28,7 +28,9 @@ public function __construct()
         $this->retentionDays = (int) (getenv('ELMO_DRAFT_RETENTION_DAYS') ?: 30);
 
         if (!is_dir($this->storageRoot)) {
-            @mkdir($this->storageRoot, 0775, true);
+            if (!mkdir($this->storageRoot, 0775, true) && !is_dir($this->storageRoot)) {
+                error_log('DraftController: failed to create storage directory: ' . $this->storageRoot);
+            }
         }
     }
 
diff --git a/api/v2/docs/swagger.yaml b/api/v2/docs/swagger.yaml
index ea9633b1b..9b81c5ea7 100644
--- a/api/v2/docs/swagger.yaml
+++ b/api/v2/docs/swagger.yaml
@@ -1189,12 +1189,8 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-        "404":
-          description: Draft not found for the current session
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
+        "204":
+          description: Draft not found for the current session (no body)
         "500":
           description: Internal server error
           content:
diff --git a/js/services/autosaveService.js b/js/services/autosaveService.js
index c584efa0a..7414200eb 100644
--- a/js/services/autosaveService.js
+++ b/js/services/autosaveService.js
@@ -294,7 +294,7 @@ class AutosaveService {
         credentials: 'include'
       });
 
-      if (response.status === 204 || response.status === 404) {
+      if (response.status === 204) {
         // Clear stale draft ID so the next save creates a fresh draft
         if (this.draftId) {
           this.draftId = null;
@@ -304,6 +304,20 @@ class AutosaveService {
         return;
       }
 
+      if (response.status === 404) {
+        // 404 for a known draftId means the draft was deleted server-side
+        if (this.draftId) {
+          this.draftId = null;
+          this.removeStoredDraftId();
+          this.updateStatus('idle');
+          return;
+        }
+        // 404 for session/latest is unexpected (likely misconfigured route)
+        const errorMessage = await this.extractErrorMessage(response);
+        this.updateStatus('error', errorMessage || 'Draft endpoint not found');
+        return;
+      }
+
       if (!response.ok) {
         const errorMessage = await this.extractErrorMessage(response);
         this.updateStatus('error', errorMessage || 'Unable to load autosaved draft');
diff --git a/tests/js/autosaveService.test.js b/tests/js/autosaveService.test.js
index 7df2c4d45..1a5bb3b75 100644
--- a/tests/js/autosaveService.test.js
+++ b/tests/js/autosaveService.test.js
@@ -504,4 +504,33 @@ describe('autosaveService', () => {
     expect(service.draftId).toBeNull();
     expect(fetchMock.mock.calls[0][0]).toBe('./api/v2/drafts/session/latest');
   });
+
+  test('surfaces error when 404 on session/latest (misconfigured route)', async () => {
+    // No stored draftId => service queries session/latest
+    const fetchMock = jest.fn().mockResolvedValue({
+      ok: false,
+      status: 404,
+      json: () => Promise.resolve({ error: 'Route not found' }),
+      text: () => Promise.resolve('Route not found')
+    });
+
+    const service = new AutosaveService('form-mde', {
+      fetch: fetchMock,
+      throttleMs: 0,
+      statusElementId: 'autosave-status',
+      statusTextId: 'autosave-status-text',
+      restoreModalId: 'modal-restore-draft'
+    });
+
+    service.start();
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
+
+    // Should surface as error, not silently ignored
+    expect(fetchMock.mock.calls[0][0]).toBe('./api/v2/drafts/session/latest');
+    const statusEl = document.getElementById('autosave-status');
+    expect(statusEl.dataset.state).toBe('error');
+  });
 });
\ No newline at end of file
diff --git a/tests/js/freekeywordTags.test.js b/tests/js/freekeywordTags.test.js
index bcc782e1d..d6f1170a4 100644
--- a/tests/js/freekeywordTags.test.js
+++ b/tests/js/freekeywordTags.test.js
@@ -81,13 +81,13 @@ describe('freekeywordTags.js', () => {
     errSpy.mockRestore();
   });
 
-  test('does not log when no keywords returned', () => {
+  test('does not log curated keywords message when empty array returned', () => {
     const logSpy = jest.spyOn(console, 'log').mockImplementation(() => {});
     loadScript(() => ({
       done(cb) { cb([]); return { fail: jest.fn() }; },
       fail: jest.fn()
     }));
-    expect(logSpy).not.toHaveBeenCalledWith('ELMO currently has no curated keywords.');
+    expect(logSpy).not.toHaveBeenCalled();
     const input = document.getElementById('input-freekeyword');
     expect(input._tagify.settings.whitelist).toEqual([]);
     logSpy.mockRestore();
diff --git a/tests/playwright/flows/stage-diagnosis.spec.ts b/tests/playwright/flows/stage-diagnosis.spec.ts
index d59794a74..57c791b92 100644
--- a/tests/playwright/flows/stage-diagnosis.spec.ts
+++ b/tests/playwright/flows/stage-diagnosis.spec.ts
@@ -6,12 +6,12 @@
  * - Abstract and Funder fields not populated during XML upload
  * - Duplicate modal IDs in HTML
  *
- * Run against Stage:
- *   APP_BASE_URL=https://env.rz-vm182.gfz.de/elmo/ npx playwright test stage-diagnosis --project=chromium
- * Run locally:
+ * Uses the Playwright baseURL fixture (from playwright.config.ts or --base-url).
+ * Override via Playwright config, e.g.:
  *   npx playwright test stage-diagnosis --project=chromium
  */
 import { test, expect } from '@playwright/test';
+import { navigateToHome } from '../utils';
 
 const SAMPLE_XML = `<?xml version="1.0" encoding="UTF-8"?>
 <resource xmlns="http://datacite.org/schema/kernel-4">
@@ -46,29 +46,45 @@ const SAMPLE_XML = `<?xml version="1.0" encoding="UTF-8"?>
 </resource>`;
 
 test.describe('Console errors regression', () => {
-  test('no JavaScript errors on initial page load', async ({ page, baseURL }) => {
+  test('no JavaScript errors on initial page load', async ({ page }) => {
     const jsErrors: string[] = [];
+    const consoleErrors: string[] = [];
 
+    // Register listeners BEFORE navigation to capture initialization-time errors
     page.on('pageerror', (err) => {
       jsErrors.push(err.message);
     });
+    page.on('console', (msg) => {
+      if (msg.type() === 'error') {
+        consoleErrors.push(msg.text());
+      }
+    });
 
-    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
+    await navigateToHome(page);
 
-    // Wait for async initialization (description types, translations, etc.)
-    await page.waitForTimeout(8000);
+    // Wait for async initialization via concrete conditions, not fixed sleeps
+    await page.waitForFunction(
+      () => (window as any).descriptionTypesReady instanceof Promise,
+      { timeout: 10_000 },
+    );
+    await page.evaluate(() => (window as any).descriptionTypesReady);
 
     // Filter out known external/non-critical warnings
     const criticalErrors = jsErrors.filter(
-      (e) => !e.includes('google.maps') && !e.includes('installHook')
+      (e) => !e.includes('google.maps') && !e.includes('installHook'),
     );
 
     expect(criticalErrors).toEqual([]);
   });
 
-  test('descriptionTypesReady promise resolves', async ({ page, baseURL }) => {
-    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
-    await page.waitForTimeout(5000);
+  test('descriptionTypesReady promise resolves', async ({ page }) => {
+    await navigateToHome(page);
+
+    // Wait for the promise to exist on window
+    await page.waitForFunction(
+      () => (window as any).descriptionTypesReady instanceof Promise,
+      { timeout: 10_000 },
+    );
 
     const promiseState = await page.evaluate(() => {
       return new Promise<string>((resolve) => {
@@ -83,16 +99,18 @@ test.describe('Console errors regression', () => {
         });
         setTimeout(() => {
           if (!resolved) resolve('STUCK');
-        }, 5000);
+        }, 10000);
       });
     });
 
     expect(promiseState).toBe('RESOLVED');
   });
 
-  test('no duplicate HTML IDs on upload modal', async ({ page, baseURL }) => {
-    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
-    await page.waitForTimeout(3000);
+  test('no duplicate HTML IDs on upload modal', async ({ page }) => {
+    await navigateToHome(page);
+
+    // Wait for the upload modal element to be in the DOM
+    await page.waitForSelector('#modal-uploadxml', { timeout: 10_000 });
 
     // Verify the upload modal ID is unique (was duplicated on both div and h5)
     const uploadModalCount = await page.evaluate(() => {
@@ -111,18 +129,30 @@ test.describe('Console errors regression', () => {
 });
 
 test.describe('XML Upload field population regression', () => {
-  test('Abstract and Funder fields are populated after XML upload', async ({ page, baseURL }) => {
-    await page.goto(baseURL!, { waitUntil: 'domcontentloaded' });
-    await page.waitForTimeout(5000);
+  test('Abstract and Funder fields are populated after XML upload', async ({ page }) => {
+    const jsErrors: string[] = [];
+
+    // Register pageerror listener BEFORE navigation
+    page.on('pageerror', (err) => {
+      jsErrors.push(err.message);
+    });
+
+    await navigateToHome(page);
+
+    // Wait for async initialization via concrete condition
+    await page.waitForFunction(
+      () => (window as any).descriptionTypesReady instanceof Promise,
+      { timeout: 10_000 },
+    );
 
     // Click Load button
     const loadButton = page.locator('#button-form-load');
-    await expect(loadButton).toBeVisible({ timeout: 10000 });
+    await expect(loadButton).toBeVisible({ timeout: 10_000 });
     await loadButton.click();
 
     // Wait for upload modal
     const modal = page.locator('div#modal-uploadxml');
-    await expect(modal).toBeVisible({ timeout: 5000 });
+    await expect(modal).toBeVisible({ timeout: 5_000 });
 
     // Upload XML file
     await page.setInputFiles('#input-uploadxml-file', {
@@ -134,26 +164,28 @@ test.describe('XML Upload field population regression', () => {
     // Wait for title to be populated (indicates loadXmlToForm completed initial steps)
     await expect(page.locator('#input-resourceinformation-title')).toHaveValue(
       'Stage Diagnosis Test',
-      { timeout: 15000 }
+      { timeout: 15_000 },
     );
 
-    // Wait for async processing (descriptionTypesReady + processFunders)
-    await page.waitForTimeout(3000);
+    // Wait for descriptionTypesReady to resolve (gates Funder/Abstract population)
+    await page.evaluate(() => (window as any).descriptionTypesReady);
 
     // Assert Abstract was populated
     await expect(page.locator('#input-abstract')).toHaveValue(
-      'This is a test abstract for diagnosis.'
+      'This is a test abstract for diagnosis.',
+      { timeout: 10_000 },
     );
 
     // Assert Funder fields were populated
     await expect(page.locator('input[name="funder[]"]').first()).toHaveValue(
-      'Deutsche Forschungsgemeinschaft'
+      'Deutsche Forschungsgemeinschaft',
+      { timeout: 10_000 },
     );
     await expect(page.locator('input[name="grantNummer[]"]').first()).toHaveValue(
-      'TEST123'
+      'TEST123',
     );
     await expect(page.locator('input[name="grantName[]"]').first()).toHaveValue(
-      'Test Grant Title'
+      'Test Grant Title',
     );
   });
 });
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index ebc409fa8..4e6471e06 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -81,7 +81,24 @@ const DATACITE_47_XML = `<?xml version="1.0" encoding="UTF-8"?>
 </resource>`;
 
 test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
+  /** Console errors and JS exceptions collected across the test. */
+  let consoleErrors: string[];
+  let jsErrors: string[];
+
   test.beforeEach(async ({ page }) => {
+    consoleErrors = [];
+    jsErrors = [];
+
+    // Register listeners BEFORE navigation to capture initialization-time errors
+    page.on('pageerror', (err) => {
+      jsErrors.push(err.message);
+    });
+    page.on('console', (msg) => {
+      if (msg.type() === 'error') {
+        consoleErrors.push(msg.text());
+      }
+    });
+
     await navigateToHome(page);
 
     // Wait for the page to be fully loaded: dropdowns populated, description types loaded
@@ -101,17 +118,6 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
   });
 
   test('uploads DataCite 4.7 XML and verifies all major fields are populated', async ({ page }) => {
-    // Collect console errors during the test
-    const consoleErrors: string[] = [];
-    page.on('console', msg => {
-      if (msg.type() === 'error') {
-        const text = msg.text();
-        // Ignore known harmless messages
-        if (!text.includes('Google Maps') && !text.includes('favicon')) {
-          consoleErrors.push(text);
-        }
-      }
-    });
 
     // ── Step 1: Open upload modal and load XML ─────────────────────────
     await page.getByRole('button', { name: /Load/i }).click();
@@ -220,15 +226,52 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     expect(licenseText?.toLowerCase()).toContain('cc');
 
     // ── Step 14: No console errors ─────────────────────────────────────
-    // Filter out harmless warnings that may still appear
+    // Filter out known harmless warnings
     const realErrors = consoleErrors.filter(
-      e =>
-        !e.includes('net::ERR') &&
-        !e.includes('404') &&
-        !e.includes('curated keywords') &&
-        !e.includes('thesauri availability') && // Docker permission issue with DraftController mkdir
-        !e.includes('Permission denied'),
+      (e) =>
+        !e.includes('favicon.ico') &&
+        !e.includes('api/v2/drafts') &&
+        !e.includes('google.maps') &&
+        !e.includes('installHook'),
     );
     expect(realErrors, `Unexpected console errors: ${realErrors.join('\n')}`).toEqual([]);
+
+    // No uncaught JS exceptions (pageerror)
+    const criticalJsErrors = jsErrors.filter(
+      (e) => !e.includes('google.maps') && !e.includes('installHook'),
+    );
+    expect(criticalJsErrors, `Unexpected JS errors: ${criticalJsErrors.join('\n')}`).toEqual([]);
+  });
+
+  test('uploads envelope-wrapped XML and populates fields correctly', async ({ page }) => {
+    // Wrap the DataCite XML inside an <envelope> element (the format produced by
+    // the ELMO API when exporting multiple schemas in a single file).
+    const envelopeXml = `<?xml version="1.0" encoding="UTF-8"?>\n<envelope>\n${
+      DATACITE_47_XML.replace(/^<\?xml[^?]*\?>\s*/, '')
+    }\n</envelope>`;
+
+    await page.getByRole('button', { name: /Load/i }).click();
+    const modal = page.locator('div#modal-uploadxml');
+    await expect(modal).toBeVisible({ timeout: 5_000 });
+
+    await page.setInputFiles('#input-uploadxml-file', {
+      name: 'datacite47-envelope.xml',
+      mimeType: 'text/xml',
+      buffer: Buffer.from(envelopeXml, 'utf-8'),
+    });
+
+    // Title proves that loadXmlToForm found <resource> inside <envelope>
+    await expect(page.locator('#input-resourceinformation-title')).toHaveValue(
+      'Full DataCite 4.7 Upload Test',
+      { timeout: 20_000 },
+    );
+
+    // Wait for async processing to finish
+    await page.evaluate(() => (window as any).descriptionTypesReady);
+
+    // Spot-check a few fields to verify full mapping succeeded
+    await expect(page.locator('#input-abstract')).toHaveValue(/comprehensive test abstract/);
+    await expect(page.locator('#input-funder').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
+    await expect(page.locator('#input-grantnumber').first()).toHaveValue('DFG-12345');
   });
 });

From 599d3687f487ea5514cac75917a909a26a17b929 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 22:12:02 +0200
Subject: [PATCH 08/15] Fixed issues from review

---
 .../playwright/flows/stage-diagnosis.spec.ts  | 25 +++++++++++++++----
 .../flows/xml-upload-datacite47.spec.ts       |  8 +++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/tests/playwright/flows/stage-diagnosis.spec.ts b/tests/playwright/flows/stage-diagnosis.spec.ts
index 57c791b92..6fb2831aa 100644
--- a/tests/playwright/flows/stage-diagnosis.spec.ts
+++ b/tests/playwright/flows/stage-diagnosis.spec.ts
@@ -70,11 +70,20 @@ test.describe('Console errors regression', () => {
     await page.evaluate(() => (window as any).descriptionTypesReady);
 
     // Filter out known external/non-critical warnings
-    const criticalErrors = jsErrors.filter(
+    const criticalJsErrors = jsErrors.filter(
       (e) => !e.includes('google.maps') && !e.includes('installHook'),
     );
-
-    expect(criticalErrors).toEqual([]);
+    expect(criticalJsErrors).toEqual([]);
+
+    // Assert no unexpected console.error messages
+    const realConsoleErrors = consoleErrors.filter(
+      (e) =>
+        !e.includes('favicon.ico') &&
+        !e.includes('API key not found') &&
+        !e.includes('503') &&
+        !e.includes('thesauri availability'),
+    );
+    expect(realConsoleErrors).toEqual([]);
   });
 
   test('descriptionTypesReady promise resolves', async ({ page }) => {
@@ -109,8 +118,8 @@ test.describe('Console errors regression', () => {
   test('no duplicate HTML IDs on upload modal', async ({ page }) => {
     await navigateToHome(page);
 
-    // Wait for the upload modal element to be in the DOM
-    await page.waitForSelector('#modal-uploadxml', { timeout: 10_000 });
+    // Wait for the upload modal element to exist in the DOM (it is hidden until opened)
+    await page.locator('#modal-uploadxml').waitFor({ state: 'attached', timeout: 10_000 });
 
     // Verify the upload modal ID is unique (was duplicated on both div and h5)
     const uploadModalCount = await page.evaluate(() => {
@@ -187,5 +196,11 @@ test.describe('XML Upload field population regression', () => {
     await expect(page.locator('input[name="grantName[]"]').first()).toHaveValue(
       'Test Grant Title',
     );
+
+    // No uncaught JS exceptions during upload
+    const criticalJsErrors = jsErrors.filter(
+      (e) => !e.includes('google.maps') && !e.includes('installHook'),
+    );
+    expect(criticalJsErrors).toEqual([]);
   });
 });
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index 4e6471e06..ca25ad760 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -226,13 +226,15 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     expect(licenseText?.toLowerCase()).toContain('cc');
 
     // ── Step 14: No console errors ─────────────────────────────────────
-    // Filter out known harmless warnings
+    // Filter known CI-environment messages (no ERNIE API key / external services)
     const realErrors = consoleErrors.filter(
       (e) =>
         !e.includes('favicon.ico') &&
-        !e.includes('api/v2/drafts') &&
         !e.includes('google.maps') &&
-        !e.includes('installHook'),
+        !e.includes('installHook') &&
+        !e.includes('API key not found') &&
+        !e.includes('503') &&
+        !e.includes('thesauri availability'),
     );
     expect(realErrors, `Unexpected console errors: ${realErrors.join('\n')}`).toEqual([]);
 

From 2318f8c966e0170bcb7b6e46f3c4597d9dfba633 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 22:32:12 +0200
Subject: [PATCH 09/15] Added waiting time for description accordeon changes

---
 api/v2/controllers/DraftController.php               | 3 ++-
 tests/playwright/flows/xml-upload-datacite47.spec.ts | 7 ++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index 41aa377cf..0365abe5c 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -28,7 +28,8 @@ public function __construct()
         $this->retentionDays = (int) (getenv('ELMO_DRAFT_RETENTION_DAYS') ?: 30);
 
         if (!is_dir($this->storageRoot)) {
-            if (!mkdir($this->storageRoot, 0775, true) && !is_dir($this->storageRoot)) {
+            // Suppress warning from race when another process creates the dir concurrently
+            if (!@mkdir($this->storageRoot, 0775, true) && !is_dir($this->storageRoot)) {
                 error_log('DraftController: failed to create storage directory: ' . $this->storageRoot);
             }
         }
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index ca25ad760..e1483236b 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -176,11 +176,8 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     await expect(page.locator('#input-abstract')).toHaveValue(/comprehensive test abstract/);
 
     // ── Step 7: Methods description (dynamically loaded accordion) ────
-    // Description types are loaded from ERNIE API; wait for them
-    await page.waitForFunction(
-      () => document.querySelectorAll('#accordion-description .accordion-item[data-description-slug]').length > 0,
-      { timeout: 15_000 },
-    );
+    // Wait for the description-types promise (resolves with [] on API error)
+    await page.evaluate(() => (window as any).descriptionTypesReady);
 
     const methodsInput = page.locator('#input-description-Methods');
     if (await methodsInput.count() > 0) {

From 69942ae12065099cab4202f377eb038a1f49109d Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 23:01:29 +0200
Subject: [PATCH 10/15] Uodated test with more stable selector

---
 tests/playwright/flows/xml-upload-datacite47.spec.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index e1483236b..2b86ba77c 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -120,7 +120,7 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
   test('uploads DataCite 4.7 XML and verifies all major fields are populated', async ({ page }) => {
 
     // ── Step 1: Open upload modal and load XML ─────────────────────────
-    await page.getByRole('button', { name: /Load/i }).click();
+    await page.locator('#button-form-load').click();
     const modal = page.locator('div#modal-uploadxml');
     await expect(modal).toBeVisible({ timeout: 5_000 });
 
@@ -249,7 +249,7 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
       DATACITE_47_XML.replace(/^<\?xml[^?]*\?>\s*/, '')
     }\n</envelope>`;
 
-    await page.getByRole('button', { name: /Load/i }).click();
+    await page.locator('#button-form-load').click();
     const modal = page.locator('div#modal-uploadxml');
     await expect(modal).toBeVisible({ timeout: 5_000 });
 

From 0e9c4fa898be9268783c432782a4fd65b175a1fe Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 23:27:05 +0200
Subject: [PATCH 11/15] Fixed various issues from review

---
 js/services/autosaveService.js                    | 10 ++--------
 tests/js/autosaveService.test.js                  | 14 ++++++++++----
 .../flows/xml-upload-datacite47.spec.ts           | 15 +++++++++++----
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/js/services/autosaveService.js b/js/services/autosaveService.js
index 7414200eb..50fb8c1b5 100644
--- a/js/services/autosaveService.js
+++ b/js/services/autosaveService.js
@@ -305,14 +305,8 @@ class AutosaveService {
       }
 
       if (response.status === 404) {
-        // 404 for a known draftId means the draft was deleted server-side
-        if (this.draftId) {
-          this.draftId = null;
-          this.removeStoredDraftId();
-          this.updateStatus('idle');
-          return;
-        }
-        // 404 for session/latest is unexpected (likely misconfigured route)
+        // Since the API now returns 204 for "not found", a 404 always
+        // indicates a misconfigured route or unavailable endpoint.
         const errorMessage = await this.extractErrorMessage(response);
         this.updateStatus('error', errorMessage || 'Draft endpoint not found');
         return;
diff --git a/tests/js/autosaveService.test.js b/tests/js/autosaveService.test.js
index 1a5bb3b75..f7cea9331 100644
--- a/tests/js/autosaveService.test.js
+++ b/tests/js/autosaveService.test.js
@@ -455,13 +455,14 @@ describe('autosaveService', () => {
     expect(service.draftId).toBeNull();
   });
 
-  test('clears stale draftId from localStorage when checkForExistingDraft gets 404', async () => {
+  test('surfaces error when checkForExistingDraft gets 404 with stored draftId', async () => {
     window.localStorage.setItem('elmo.autosave.draftId', 'old-draft-id');
 
     const fetchMock = jest.fn().mockResolvedValue({
       ok: false,
       status: 404,
-      json: () => Promise.resolve({ error: 'Draft not found' })
+      json: () => Promise.resolve({ error: 'Draft not found' }),
+      text: () => Promise.resolve('{"error":"Draft not found"}')
     });
 
     const service = new AutosaveService('form-mde', {
@@ -475,9 +476,14 @@ describe('autosaveService', () => {
     service.start();
     await Promise.resolve();
     await Promise.resolve();
+    await Promise.resolve();
+    await Promise.resolve();
 
-    expect(window.localStorage.getItem('elmo.autosave.draftId')).toBeNull();
-    expect(service.draftId).toBeNull();
+    // 404 should surface as error (API returns 204 for missing drafts)
+    const statusEl = document.getElementById('autosave-status');
+    expect(statusEl.dataset.state).toBe('error');
+    // draftId should NOT be silently cleared
+    expect(window.localStorage.getItem('elmo.autosave.draftId')).toBe('old-draft-id');
   });
 
   test('does not clear draftId when 204 response is for session/latest (no stored draft)', async () => {
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index 2b86ba77c..a5e71a545 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -140,9 +140,8 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     await expect(page.locator('#input-resourceinformation-doi')).toHaveValue('10.82433/B09Z-4K37');
     await expect(page.locator('#input-resourceinformation-publicationyear')).toHaveValue('2025');
 
-    // Language: expect "en" is selected
-    const langValue = await page.locator('#input-resourceinformation-language').inputValue();
-    expect(langValue).toBeTruthy();
+    // Language: the uploaded XML specifies <language>en</language>
+    await expect(page.locator('#input-resourceinformation-language')).toHaveValue('en');
 
     // Resource type: expect "Dataset" is selected (value may be an ID)
     const rtText = await page.locator('#input-resourceinformation-resourcetype option:checked').textContent();
@@ -176,7 +175,11 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     await expect(page.locator('#input-abstract')).toHaveValue(/comprehensive test abstract/);
 
     // ── Step 7: Methods description (dynamically loaded accordion) ────
-    // Wait for the description-types promise (resolves with [] on API error)
+    // Guard: ensure the promise exists before awaiting (avoids no-op on script failure)
+    await page.waitForFunction(
+      () => (window as any).descriptionTypesReady instanceof Promise,
+      { timeout: 10_000 },
+    );
     await page.evaluate(() => (window as any).descriptionTypesReady);
 
     const methodsInput = page.locator('#input-description-Methods');
@@ -266,6 +269,10 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     );
 
     // Wait for async processing to finish
+    await page.waitForFunction(
+      () => (window as any).descriptionTypesReady instanceof Promise,
+      { timeout: 10_000 },
+    );
     await page.evaluate(() => (window as any).descriptionTypesReady);
 
     // Spot-check a few fields to verify full mapping succeeded

From 7ffc2c6f9b8c3d52bf3a66051e991e591104826d Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Thu, 2 Apr 2026 23:47:31 +0200
Subject: [PATCH 12/15] Fixed review issues

---
 api/v2/controllers/DraftController.php        | 22 ++++++++++++++++---
 .../flows/xml-upload-datacite47.spec.ts       |  6 +++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index 0365abe5c..c153a8ec2 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -26,11 +26,19 @@ public function __construct()
     {
         $this->storageRoot = rtrim(getenv('ELMO_DRAFT_STORAGE') ?: (__DIR__ . '/../../../storage/drafts'), DIRECTORY_SEPARATOR);
         $this->retentionDays = (int) (getenv('ELMO_DRAFT_RETENTION_DAYS') ?: 30);
+    }
 
+    /**
+     * Ensures the storage root directory exists and is writable.
+     *
+     * @throws \RuntimeException When the directory cannot be created.
+     */
+    private function ensureStorageRoot(): void
+    {
         if (!is_dir($this->storageRoot)) {
             // Suppress warning from race when another process creates the dir concurrently
             if (!@mkdir($this->storageRoot, 0775, true) && !is_dir($this->storageRoot)) {
-                error_log('DraftController: failed to create storage directory: ' . $this->storageRoot);
+                throw new \RuntimeException('DraftController: cannot create storage directory: ' . $this->storageRoot);
             }
         }
     }
@@ -290,12 +298,20 @@ private function createRecord(string $draftId, string $sessionId, array $payload
      */
     private function persistRecord(array $record): void
     {
+        $this->ensureStorageRoot();
+
         $dir = $this->sessionDirectory($record['sessionId']);
         if (!is_dir($dir)) {
-            mkdir($dir, 0775, true);
+            if (!@mkdir($dir, 0775, true) && !is_dir($dir)) {
+                throw new \RuntimeException('DraftController: cannot create session directory: ' . $dir);
+            }
         }
 
-        file_put_contents($this->recordPath($record['sessionId'], $record['id']), json_encode($record, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        $path = $this->recordPath($record['sessionId'], $record['id']);
+        $bytes = file_put_contents($path, json_encode($record, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+        if ($bytes === false) {
+            throw new \RuntimeException('DraftController: failed to write draft file: ' . $path);
+        }
     }
 
     /**
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index a5e71a545..0792fbd70 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -140,8 +140,10 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     await expect(page.locator('#input-resourceinformation-doi')).toHaveValue('10.82433/B09Z-4K37');
     await expect(page.locator('#input-resourceinformation-publicationyear')).toHaveValue('2025');
 
-    // Language: the uploaded XML specifies <language>en</language>
-    await expect(page.locator('#input-resourceinformation-language')).toHaveValue('en');
+    // Language: the uploaded XML specifies <language>en</language>;
+    // dropdown values are numeric IDs, so check the selected option's visible text
+    const langText = await page.locator('#input-resourceinformation-language option:checked').textContent();
+    expect(langText?.trim().toLowerCase()).toContain('english');
 
     // Resource type: expect "Dataset" is selected (value may be an ID)
     const rtText = await page.locator('#input-resourceinformation-resourcetype option:checked').textContent();

From a48c1255f702f5381e023bbd1663398ea02f153a Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Fri, 3 Apr 2026 00:22:07 +0200
Subject: [PATCH 13/15] Fixed review issues

---
 api/v2/controllers/DraftController.php        | 23 ++++++++++++++++---
 .../flows/xml-upload-datacite47.spec.ts       |  3 ++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index c153a8ec2..67793241a 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -31,7 +31,7 @@ public function __construct()
     /**
      * Ensures the storage root directory exists and is writable.
      *
-     * @throws \RuntimeException When the directory cannot be created.
+     * @throws \RuntimeException When the directory cannot be created or is not writable.
      */
     private function ensureStorageRoot(): void
     {
@@ -41,6 +41,9 @@ private function ensureStorageRoot(): void
                 throw new \RuntimeException('DraftController: cannot create storage directory: ' . $this->storageRoot);
             }
         }
+        if (!is_writable($this->storageRoot)) {
+            throw new \RuntimeException('DraftController: storage directory is not writable: ' . $this->storageRoot);
+        }
     }
 
     /**
@@ -63,7 +66,14 @@ public function create(array $vars = [], ?array $body = null): void
 
         $draftId = bin2hex(random_bytes(16));
         $record = $this->createRecord($draftId, $sessionId, $payload['payload']);
-        $this->persistRecord($record);
+
+        try {
+            $this->persistRecord($record);
+        } catch (\RuntimeException $e) {
+            error_log($e->getMessage());
+            $this->respond(500, ['error' => 'Failed to persist draft']);
+            return;
+        }
 
         $this->respond(201, $this->responseMetadata($record));
     }
@@ -108,7 +118,14 @@ public function update(array $vars = [], ?array $body = null): void
         $record['updatedAt'] = $this->now();
         $record['checksum'] = $this->checksum($record['payload']);
 
-        $this->persistRecord($record);
+        try {
+            $this->persistRecord($record);
+        } catch (\RuntimeException $e) {
+            error_log($e->getMessage());
+            $this->respond(500, ['error' => 'Failed to persist draft']);
+            return;
+        }
+
         $this->respond(200, $this->responseMetadata($record));
     }
 
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index 0792fbd70..317571dc1 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -167,7 +167,8 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     // ── Step 5: Contributor Person (DataCollector) ──────────────────────
     // Note: ContactPerson is mapped via ISO pointOfContact only, not from
     // pure DataCite XML. We verify the DataCollector contributor instead.
-    const contributorPersonRows = page.locator('#group-contributorperson div[contributor-person-row]');
+    // Scope by attribute (not #group-contributorperson which is a duplicate ID in the DOM).
+    const contributorPersonRows = page.locator('div[contributor-person-row]');
     const cpLastName = contributorPersonRows.first().locator('[id^="input-contributor-lastname"]');
     await expect(cpLastName).toHaveValue('Schmidt', { timeout: 10_000 });
     const cpFirstName = contributorPersonRows.first().locator('[id^="input-contributor-firstname"]');

From 23b0c82b81ca9d0b13af9b7a0ebfecaf69567e82 Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Fri, 3 Apr 2026 00:35:55 +0200
Subject: [PATCH 14/15] Deduplicate funders

---
 api/v2/controllers/DraftController.php               |  9 ++++++++-
 tests/playwright/flows/xml-upload-datacite47.spec.ts | 10 +++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index 67793241a..ddb988551 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -325,7 +325,14 @@ private function persistRecord(array $record): void
         }
 
         $path = $this->recordPath($record['sessionId'], $record['id']);
-        $bytes = file_put_contents($path, json_encode($record, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+
+        try {
+            $json = json_encode($record, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_THROW_ON_ERROR);
+        } catch (\JsonException $e) {
+            throw new \RuntimeException('DraftController: failed to encode draft as JSON: ' . $e->getMessage());
+        }
+
+        $bytes = file_put_contents($path, $json);
         if ($bytes === false) {
             throw new \RuntimeException('DraftController: failed to write draft file: ' . $path);
         }
diff --git a/tests/playwright/flows/xml-upload-datacite47.spec.ts b/tests/playwright/flows/xml-upload-datacite47.spec.ts
index 317571dc1..f20ba2525 100644
--- a/tests/playwright/flows/xml-upload-datacite47.spec.ts
+++ b/tests/playwright/flows/xml-upload-datacite47.spec.ts
@@ -217,9 +217,9 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
     expect(keywordValue.toLowerCase()).toContain('seismology');
 
     // ── Step 11: Funding Reference ─────────────────────────────────────
-    await expect(page.locator('#input-funder').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
-    await expect(page.locator('#input-grantnumber').first()).toHaveValue('DFG-12345');
-    await expect(page.locator('#input-grantname').first()).toHaveValue('Seismic Monitoring Network Expansion');
+    await expect(page.locator('input[name="funder[]"]').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
+    await expect(page.locator('input[name="grantNummer[]"]').first()).toHaveValue('DFG-12345');
+    await expect(page.locator('input[name="grantName[]"]').first()).toHaveValue('Seismic Monitoring Network Expansion');
 
     // ── Step 12: Related Work ──────────────────────────────────────────
     await expect(page.locator('#input-relatedwork-identifier').first()).toHaveValue('10.5555/example-supplement');
@@ -280,7 +280,7 @@ test.describe('DataCite 4.7 Full XML Upload (Docker E2E)', () => {
 
     // Spot-check a few fields to verify full mapping succeeded
     await expect(page.locator('#input-abstract')).toHaveValue(/comprehensive test abstract/);
-    await expect(page.locator('#input-funder').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
-    await expect(page.locator('#input-grantnumber').first()).toHaveValue('DFG-12345');
+    await expect(page.locator('input[name="funder[]"]').first()).toHaveValue('Deutsche Forschungsgemeinschaft');
+    await expect(page.locator('input[name="grantNummer[]"]').first()).toHaveValue('DFG-12345');
   });
 });

From fd68a81780ef40ceb5a905f6d075d31ed657c63f Mon Sep 17 00:00:00 2001
From: Holger Ehrmann <holgerehrmann@gmail.com>
Date: Fri, 3 Apr 2026 00:52:43 +0200
Subject: [PATCH 15/15] Fixed PHPDoc block

---
 api/v2/controllers/DraftController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/v2/controllers/DraftController.php b/api/v2/controllers/DraftController.php
index ddb988551..c63b386f5 100644
--- a/api/v2/controllers/DraftController.php
+++ b/api/v2/controllers/DraftController.php
@@ -20,7 +20,7 @@ class DraftController
     private int $retentionDays;
 
     /**
-     * Creates the controller instance and ensures the storage directory exists.
+     * Creates the controller instance and resolves storage configuration.
      */
     public function __construct()
     {