From e85e8e15aa12576b8903d94fee9adf8ea33532c1 Mon Sep 17 00:00:00 2001
From: Leo Torres <leo@leotrs.com>
Date: Sat, 28 Mar 2026 20:17:52 +0100
Subject: [PATCH 1/2] Add Upload New Version button to dashboard and revision
 upload form variant

Dashboard shows an "Upload New Version" button for each published scroll,
linking to /upload?revises={url_hash}. The upload form detects the revises
parameter and shows a revision context box with current version info,
pre-fills metadata, and changes header/button text accordingly.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 app/templates/dashboard.html            |  69 +++++++++--
 app/templates/partials/upload_form.html |  15 ++-
 static/css/main.css                     |  37 ++++++
 tests/test_upload_new_version.py        | 156 ++++++++++++++++++++++++
 4 files changed, 263 insertions(+), 14 deletions(-)
 create mode 100644 tests/test_upload_new_version.py

diff --git a/app/templates/dashboard.html b/app/templates/dashboard.html
index 034a87e..0e3f8d5 100644
--- a/app/templates/dashboard.html
+++ b/app/templates/dashboard.html
@@ -57,19 +57,27 @@ <h2>Your Scrolls ({{ papers|length }})</h2>
         {% for paper_row in papers %}
         {% set paper = paper_row[0] %}
         {% set subject_name = paper_row[1] %}
-        {{ scroll_card(
-            paper.title,
-            paper.authors,
-            paper.abstract,
-            paper.keywords,
-            subject_name,
-            "recently",
-            "v" + paper.version|string,
-            paper.url_hash,
-            doi=paper.doi,
-            doi_status=paper.doi_status,
-            canonical_url=paper.canonical_url
-        ) }}
+        <div class="scroll-card-wrapper">
+          {{ scroll_card(
+              paper.title,
+              paper.authors,
+              paper.abstract,
+              paper.keywords,
+              subject_name,
+              "recently",
+              "v" + paper.version|string,
+              paper.url_hash,
+              doi=paper.doi,
+              doi_status=paper.doi_status,
+              canonical_url=paper.canonical_url
+          ) }}
+          <div class="scroll-card-actions">
+            <a href="/upload?revises={{ paper.url_hash }}" class="btn btn-secondary btn-sm">
+              <svg xmlns="http://www.w3.org/2000/svg" width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" x2="12" y1="3" y2="15"/></svg>
+              Upload New Version
+            </a>
+          </div>
+        </div>
         {% endfor %}
       </div>
     {% else %}
@@ -555,6 +563,41 @@ <h3>Delete Account</h3>
   padding: var(--space-sm) var(--space-md);
   font-size: var(--text-sm);
 }
+
+.scroll-card-wrapper {
+  border: 1px solid var(--gray-lightest);
+  border-radius: var(--border-radius);
+  overflow: hidden;
+}
+
+.scroll-card-wrapper .scroll.preview {
+  border: none;
+  border-radius: 0;
+}
+
+.scroll-card-actions {
+  padding: 0.5rem 1rem;
+  border-top: 1px solid var(--gray-lightest);
+  background: var(--gray-bg);
+  display: flex;
+  justify-content: flex-end;
+}
+
+.scroll-card-actions .btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 0.375rem;
+}
+
+@media (max-width: 768px) {
+  .scroll-card-actions {
+    justify-content: center;
+  }
+  .scroll-card-actions .btn {
+    width: 100%;
+    justify-content: center;
+  }
+}
 </style>
 
 <script>
diff --git a/app/templates/partials/upload_form.html b/app/templates/partials/upload_form.html
index 471dd5e..bfb5c06 100644
--- a/app/templates/partials/upload_form.html
+++ b/app/templates/partials/upload_form.html
@@ -3,10 +3,23 @@
 {% from "components/button.html" import button %}
 
 <div class="upload-header" id="upload-header">
+    {% if revising_scroll %}
+    <h1>Upload New Version</h1>
+    {% else %}
     <h1>Upload New Scroll</h1>
     <p>Share your interactive, web-native research with the world</p>
+    {% endif %}
 </div>
 
+{% if revising_scroll %}
+<div class="revision-context">
+    <div class="revision-context-label">Updating:</div>
+    <div class="revision-context-title">{{ revising_scroll.title }}</div>
+    <div class="revision-context-meta">Currently at v{{ revising_scroll.version }}{% if revising_scroll.published_at %} &middot; Published {{ revising_scroll.published_at.strftime('%B %-d, %Y') }}{% endif %}</div>
+    <div class="revision-context-next">This will become v{{ revising_scroll.version + 1 }}.</div>
+</div>
+{% endif %}
+
 {% if current_drafts and not form_data and not session.get('dismissed_draft_banner') %}
 <div class="drafts-banner">
   <div class="drafts-banner-content">
@@ -130,7 +143,7 @@ <h1>Upload New Scroll</h1>
     {{ form_checkbox("confirm_rights", "I confirm that I have the right to publish this content and that it does not violate any policies or third-party rights", required=true, checked=form_data.confirm_rights if form_data else false) }}
 
     <div class="form-actions">
-        {{ button("Preview Scroll", type="submit", variant="primary", name="action", value="publish", loading_text="Uploading...") }}
+        {{ button("Preview New Version" if revising_scroll else "Preview Scroll", type="submit", variant="primary", name="action", value="publish", loading_text="Uploading...") }}
     </div>
 </form>
 
diff --git a/static/css/main.css b/static/css/main.css
index c591b32..b016eab 100644
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -1948,6 +1948,43 @@ mark {
     font-family: var(--font-serif);
 }
 
+.revision-context {
+    background: var(--gray-bg);
+    border: 1px solid var(--gray-lightest);
+    border-left: 3px solid var(--red);
+    border-radius: var(--border-radius);
+    padding: var(--space-lg);
+    margin-top: var(--space-md);
+    margin-bottom: var(--space-lg);
+}
+
+.revision-context-label {
+    font-size: var(--text-sm);
+    color: var(--gray);
+    font-weight: 500;
+    margin-bottom: var(--space-xs);
+}
+
+.revision-context-title {
+    font-family: var(--font-serif);
+    font-size: var(--text-lg);
+    font-weight: 600;
+    color: var(--black);
+    margin-bottom: var(--space-sm);
+}
+
+.revision-context-meta {
+    font-size: var(--text-sm);
+    color: var(--gray);
+}
+
+.revision-context-next {
+    font-size: var(--text-sm);
+    color: var(--gray-dark);
+    font-weight: 500;
+    margin-top: var(--space-sm);
+}
+
 .form-group {
     margin-bottom: 2rem;
 }
diff --git a/tests/test_upload_new_version.py b/tests/test_upload_new_version.py
new file mode 100644
index 0000000..3c469e1
--- /dev/null
+++ b/tests/test_upload_new_version.py
@@ -0,0 +1,156 @@
+"""Tests for Upload New Version button on dashboard and upload form revision variant."""
+
+import pytest
+from httpx import AsyncClient
+
+from app.models.scroll import Scroll, Subject
+from tests.conftest import create_content_addressable_scroll
+
+
+@pytest.mark.asyncio
+async def test_dashboard_shows_upload_new_version_for_published_scrolls(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Published Scroll"
+    )
+
+    response = await authenticated_client.get("/dashboard")
+    assert response.status_code == 200
+    assert f"/upload?revises={scroll.url_hash}" in response.text
+    assert "Upload New Version" in response.text
+
+
+@pytest.mark.asyncio
+async def test_dashboard_does_not_show_upload_button_for_preview_scrolls(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Draft Scroll"
+    )
+    scroll.status = "preview"
+    await test_db.commit()
+
+    response = await authenticated_client.get("/dashboard")
+    assert response.status_code == 200
+    # The draft should appear in drafts section, not with an Upload New Version button
+    assert "Upload New Version" not in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_form_prefills_metadata_when_revising(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db,
+        test_user,
+        test_subject,
+        title="Original Title",
+        authors="Jane Doe, John Smith",
+        abstract="Original abstract text",
+        keywords=["quantum", "physics"],
+    )
+
+    response = await authenticated_client.get(f"/upload?revises={scroll.url_hash}")
+    assert response.status_code == 200
+    assert "Original Title" in response.text
+    assert "Jane Doe, John Smith" in response.text
+    assert "Original abstract text" in response.text
+    assert "quantum, physics" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_form_header_changes_when_revising(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="My Great Paper"
+    )
+
+    response = await authenticated_client.get(f"/upload?revises={scroll.url_hash}")
+    assert response.status_code == 200
+    assert "Upload New Version" in response.text
+    # The revision context box should show the scroll title and version info
+    assert "My Great Paper" in response.text
+    assert "v1" in response.text or "v 1" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_form_shows_revision_context_box(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Spectral Properties"
+    )
+
+    response = await authenticated_client.get(f"/upload?revises={scroll.url_hash}")
+    assert response.status_code == 200
+    assert "revision-context" in response.text
+    assert "Updating:" in response.text
+    assert "This will become v2" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_form_submit_button_changes_when_revising(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    scroll = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Test Paper"
+    )
+
+    response = await authenticated_client.get(f"/upload?revises={scroll.url_hash}")
+    assert response.status_code == 200
+    assert "Preview New Version" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_revises_invalid_hash_ignored(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    """An invalid hash should just show the normal upload form."""
+    response = await authenticated_client.get("/upload?revises=nonexistenthash")
+    assert response.status_code == 200
+    assert "revision-context" not in response.text
+    assert "Upload New Scroll" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_revises_other_users_scroll_rejected(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    """Cannot revise a scroll owned by a different user."""
+    from app.auth.utils import get_password_hash
+    from app.models.user import User
+
+    other_user = User(
+        email="other@example.com",
+        password_hash=get_password_hash("password123"),
+        display_name="Other User",
+        email_verified=True,
+    )
+    test_db.add(other_user)
+    await test_db.commit()
+    await test_db.refresh(other_user)
+
+    scroll = await create_content_addressable_scroll(
+        test_db, other_user, test_subject, title="Other User Scroll"
+    )
+
+    response = await authenticated_client.get(f"/upload?revises={scroll.url_hash}")
+    assert response.status_code == 200
+    # Should show normal upload form, not revision mode
+    assert "revision-context" not in response.text
+    assert "Upload New Scroll" in response.text
+
+
+@pytest.mark.asyncio
+async def test_upload_form_normal_mode_unchanged(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    """Normal upload form (no revises param) should be unchanged."""
+    response = await authenticated_client.get("/upload")
+    assert response.status_code == 200
+    assert "Upload New Scroll" in response.text
+    assert "Share your interactive" in response.text
+    assert "revision-context" not in response.text
+    assert "Preview Scroll" in response.text

From 93f3843826c4b3158803e955129989b6effa6652 Mon Sep 17 00:00:00 2001
From: Leo Torres <leo@leotrs.com>
Date: Sat, 28 Mar 2026 21:01:03 +0100
Subject: [PATCH 2/2] Fix dashboard showing one card per version instead of one
 per scroll

Apply _latest_version_filter() to the dashboard query so only the latest
version of each scroll series is displayed. Also load scroll_series_id
in the query options so the correlated subquery can work.

Added two tests: one verifying only the latest version appears, another
verifying distinct scroll series each get their own card.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 app/routes/main.py               |  8 +++-
 tests/test_upload_new_version.py | 68 ++++++++++++++++++++++++++++++++
 2 files changed, 75 insertions(+), 1 deletion(-)

diff --git a/app/routes/main.py b/app/routes/main.py
index 9739820..dced326 100644
--- a/app/routes/main.py
+++ b/app/routes/main.py
@@ -537,10 +537,15 @@ async def dashboard(request: Request, db: AsyncSession = Depends(get_db)):
         session.pop("current_preview_url_hash", None)
 
     # Get user's published papers with subject names (exclude html_content for performance)
+    # Only show the latest version of each scroll series
     published_papers = await db.execute(
         select(Scroll, Subject.name.label("subject_name"))
         .join(Subject)
-        .where(Scroll.user_id == current_user.id, Scroll.status == "published")
+        .where(
+            Scroll.user_id == current_user.id,
+            Scroll.status == "published",
+            _latest_version_filter(),
+        )
         .options(
             load_only(
                 Scroll.title,
@@ -553,6 +558,7 @@ async def dashboard(request: Request, db: AsyncSession = Depends(get_db)):
                 Scroll.doi_status,
                 Scroll.slug,
                 Scroll.publication_year,
+                Scroll.scroll_series_id,
             )
         )
         .order_by(Scroll.created_at.desc())
diff --git a/tests/test_upload_new_version.py b/tests/test_upload_new_version.py
index 3c469e1..a3c5af3 100644
--- a/tests/test_upload_new_version.py
+++ b/tests/test_upload_new_version.py
@@ -143,6 +143,74 @@ async def test_upload_revises_other_users_scroll_rejected(
     assert "Upload New Scroll" in response.text
 
 
+@pytest.mark.asyncio
+async def test_dashboard_shows_only_latest_version_per_scroll(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    """When a scroll has multiple versions, dashboard should show only the latest."""
+    import uuid
+
+    series_id = uuid.uuid4()
+
+    # Create v1 of a scroll
+    v1 = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="My Paper v1", html_content="<h1>v1</h1>"
+    )
+    v1.version = 1
+    v1.scroll_series_id = series_id
+    v1.slug = "my-paper"
+    v1.publication_year = 2026
+
+    # Create v2 of the same scroll
+    v2 = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="My Paper v2", html_content="<h1>v2</h1>"
+    )
+    v2.version = 2
+    v2.scroll_series_id = series_id
+    v2.slug = "my-paper"
+    v2.publication_year = 2026
+
+    await test_db.commit()
+
+    response = await authenticated_client.get("/dashboard")
+    assert response.status_code == 200
+    # v2 (latest) should be shown, v1 should not
+    assert "My Paper v2" in response.text
+    assert "My Paper v1" not in response.text
+    # Only one Upload New Version button
+    assert response.text.count("Upload New Version") == 1
+
+
+@pytest.mark.asyncio
+async def test_dashboard_shows_separate_cards_for_different_scrolls(
+    authenticated_client: AsyncClient, test_db, test_user, test_subject
+):
+    """Different scroll series should each get their own card."""
+    import uuid
+
+    scroll_a = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Paper Alpha", html_content="<h1>Alpha</h1>"
+    )
+    scroll_a.scroll_series_id = uuid.uuid4()
+    scroll_a.slug = "paper-alpha"
+    scroll_a.publication_year = 2026
+
+    scroll_b = await create_content_addressable_scroll(
+        test_db, test_user, test_subject, title="Paper Beta", html_content="<h1>Beta</h1>"
+    )
+    scroll_b.scroll_series_id = uuid.uuid4()
+    scroll_b.slug = "paper-beta"
+    scroll_b.publication_year = 2026
+
+    await test_db.commit()
+
+    response = await authenticated_client.get("/dashboard")
+    assert response.status_code == 200
+    assert "Paper Alpha" in response.text
+    assert "Paper Beta" in response.text
+    assert response.text.count("Upload New Version") == 2
+
+
 @pytest.mark.asyncio
 async def test_upload_form_normal_mode_unchanged(
     authenticated_client: AsyncClient, test_db, test_user, test_subject