Skip to content

armgit / papra

Public Imported from GitHub
0

The minimalistic document archiving platform.

fix(documents): add creation date as sort fallback (#1292)

Corentin Thomasset923e27ae6cec
diff --git a/.changeset/shiny-turkeys-kiss.md b/.changeset/shiny-turkeys-kiss.md
new file mode 100644
index 00000000..ca5db4c5
--- /dev/null
+++ b/.changeset/shiny-turkeys-kiss.md
@@ -0,0 +1,5 @@
+---
+'@papra/app': patch
+---
+
+Document sort order fallback to the importation date when the sort order is set to other sort orders.
diff --git a/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.test.ts b/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.test.ts
index 20424287..e16e4eaf 100644
--- a/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.test.ts
+++ b/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.test.ts
@@ -63,38 +63,48 @@ describe('database-fts5 repository models', () => {
).to.eql('"documents"."created_at" desc, "documents"."id" desc');
});
- test('sort by name, the name is sorted case-insensitively', () => {
+ test('sort by name, the name is sorted case-insensitively, with createdAt as fallback', () => {
expect(
toOrderByClause(makeSearchOrderByClauses({ sort: { field: 'name', order: 'desc' } })),
- ).to.eql('"documents"."name" COLLATE NOCASE desc, "documents"."id" desc');
+ ).to.eql(
+ '"documents"."name" COLLATE NOCASE desc, "documents"."created_at" desc, "documents"."id" desc',
+ );
expect(
toOrderByClause(makeSearchOrderByClauses({ sort: { field: 'name', order: 'asc' } })),
- ).to.eql('"documents"."name" COLLATE NOCASE asc, "documents"."id" asc');
+ ).to.eql(
+ '"documents"."name" COLLATE NOCASE asc, "documents"."created_at" asc, "documents"."id" asc',
+ );
});
- test('sort by documentDate asc', () => {
+ test('sort by documentDate asc, with createdAt as fallback', () => {
expect(
toOrderByClause(
makeSearchOrderByClauses({ sort: { field: 'documentDate', order: 'asc' } }),
),
- ).to.eql('"documents"."document_date" asc, "documents"."id" asc');
+ ).to.eql(
+ '"documents"."document_date" asc, "documents"."created_at" asc, "documents"."id" asc',
+ );
expect(
toOrderByClause(
makeSearchOrderByClauses({ sort: { field: 'documentDate', order: 'desc' } }),
),
- ).to.eql('"documents"."document_date" desc, "documents"."id" desc');
+ ).to.eql(
+ '"documents"."document_date" desc, "documents"."created_at" desc, "documents"."id" desc',
+ );
});
- test('sort by updatedAt desc', () => {
+ test('sort by updatedAt desc, with createdAt as fallback', () => {
expect(
toOrderByClause(makeSearchOrderByClauses({ sort: { field: 'updatedAt', order: 'desc' } })),
- ).to.eql('"documents"."updated_at" desc, "documents"."id" desc');
+ ).to.eql(
+ '"documents"."updated_at" desc, "documents"."created_at" desc, "documents"."id" desc',
+ );
expect(
toOrderByClause(makeSearchOrderByClauses({ sort: { field: 'updatedAt', order: 'asc' } })),
- ).to.eql('"documents"."updated_at" asc, "documents"."id" asc');
+ ).to.eql('"documents"."updated_at" asc, "documents"."created_at" asc, "documents"."id" asc');
});
});
});
diff --git a/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.ts b/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.ts
index 6a65d653..38d1fe3b 100644
--- a/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.ts
+++ b/apps/papra-server/src/modules/documents/document-search/database-fts5/database-fts5.repository.models.ts
@@ -58,6 +58,7 @@ export function makeSearchOrderByClauses({ sort }: { sort: DocumentSearchSort })
const orderByClauses = [
orderDirection(sortColumn),
+ ...(sort.field !== 'createdAt' ? [orderDirection(documentsTable.createdAt)] : []),
orderDirection(documentsTable.id), // tie-breaker to ensure deterministic order
];