Chore: number the editor page image URL from 1 like zone pages

This commit is contained in:
stumpylog committed 2026-11-20 10:05:14 -08:00
1 parent e81bdff6c2
commit a54141058d
4 files changed
+34 -13

No files matched your search

@@ -225,7 +225,7 @@ describe('OcrTemplateEditorComponent', () => {
component.previewPageDisplay = 2
expect(component.previewPage).toBe(1)
expect(component.previewPageDisplay).toBe(2)
expect(component.pageImageUrl).toContain('/5/1/')
expect(component.pageImageUrl).toContain('/5/2/')
component.pageLoaded.set(true)
component.goToPage(1)
expect(component.pageLoaded()).toBe(true)
@@ -523,7 +523,7 @@ describe('OcrTemplateEditorComponent', () => {
expect(component.dialogTitle).toEqual('Edit OCR Template')
expect(component.previewDocId).toEqual(5)
expect(component.previewPageCount()).toEqual(3)
expect(component.pageImageUrl).toContain('document-page-image/5/0/')
expect(component.pageImageUrl).toContain('document-page-image/5/1/')
expect(component.template.match).toEqual('Northwind')
expect(component.isDirty).toBeFalsy()
@@ -241,7 +241,7 @@ export class OcrTemplateEditorComponent implements OnInit, OnDestroy {
return this.previewDocId
? this.templateService.getPageImageUrl(
this.previewDocId,
this.previewPage
this.previewPage + 1
)
: null
}
+23 -4
View File
@@ -170,7 +170,7 @@ def detail_url(pk: int) -> str:
return f"{ENDPOINT}{pk}/"
def preview_url(document: Document, page: int = 0) -> str:
def preview_url(document: Document, page: int = 1) -> str:
return f"{ENDPOINT}document-page-image/{document.pk}/{page}/"
@@ -2397,13 +2397,32 @@ class TestDocumentPageImage:
THEN:
- 404 is returned for both
"""
response = preview_client.get(f"{ENDPOINT}document-page-image/99999/0/")
response = preview_client.get(f"{ENDPOINT}document-page-image/99999/1/")
assert response.status_code == status.HTTP_404_NOT_FOUND
assert (
preview_client.get(preview_url(preview_document, 3)).status_code
preview_client.get(preview_url(preview_document, 4)).status_code
== status.HTTP_404_NOT_FOUND
)
def test_page_zero_is_not_found(
self,
preview_client: APIClient,
preview_document: Document,
mock_render: MagicMock,
) -> None:
"""
GIVEN:
- A 3 page PDF document
WHEN:
- Page 0 is requested, which is not a valid 1-based page
THEN:
- 404 is returned and no page is rendered
"""
response = preview_client.get(preview_url(preview_document, 0))
assert response.status_code == status.HTTP_404_NOT_FOUND
mock_render.assert_not_called()
def test_serves_image_documents_without_running_poppler(
self,
preview_client: APIClient,
@@ -2481,7 +2500,7 @@ class TestDocumentPageImage:
mock_render.side_effect = render_page
response = preview_client.get(preview_url(preview_document, 1))
response = preview_client.get(preview_url(preview_document, 2))
assert response.status_code == status.HTTP_200_OK
assert response["Content-Type"] == "image/png"
+8 -6
View File
@@ -5897,7 +5897,7 @@ class OcrTemplateViewSet(BulkPermissionMixin, PassUserMixin, ModelViewSet[OcrTem
) -> HttpResponse:
"""
Render a page for the template editor's zone overlay. The page in the URL is
0-based, unlike a zone's page, which is 1-based.
1-based, like a zone's page.
"""
from documents.zone_ocr import resolve_zone_source
@@ -5911,11 +5911,13 @@ class OcrTemplateViewSet(BulkPermissionMixin, PassUserMixin, ModelViewSet[OcrTem
file_doc = self._resolve_file_document(document, request)
page_num = int(page)
page_number = int(page)
if page_number < 1:
raise Http404("Page numbers start at 1")
if file_doc.page_count and page_num >= file_doc.page_count:
if file_doc.page_count and page_number > file_doc.page_count:
raise Http404(
f"Page {page_num} out of range (document has {file_doc.page_count} pages)",
f"Page {page_number} out of range (document has {file_doc.page_count} pages)",
)
source = resolve_zone_source(file_doc)
@@ -5937,13 +5939,13 @@ class OcrTemplateViewSet(BulkPermissionMixin, PassUserMixin, ModelViewSet[OcrTem
doc_path,
rendered,
dpi=150,
page=page_num + 1,
page=page_number,
timeout=30,
)
except ParseError as error:
logger.warning(
"Failed to render page %s of document %s: %s",
page_num,
page_number,
file_doc.pk,
error,
)