From c3e8173e5e9912a8c42ab7a553cca77de7e1e6aa Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 29 Feb 2024 16:34:55 +0800 Subject: [PATCH 1/2] fix search results for archived items which state is not archived --- packages/api/src/services/library_item.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 7609b3d3f..2a3d65649 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -274,12 +274,12 @@ export const buildQueryString = ( case InFilter.ALL: return null case InFilter.ARCHIVE: - return "library_item.state = 'ARCHIVED'" + return "(library_item.state = 'ARCHIVED' or (library_item.state != 'DELETED' and library_item.archived_at is not null))" case InFilter.TRASH: // return only deleted pages within 14 days return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')" default: { - let sql = "library_item.state <> 'ARCHIVED'" + let sql = 'library_item.archived_at is not null' if (useFolders) { const param = `folder_${parameters.length}` const folderSql = escapeQueryWithParameters( From 2636524642b08e7e83633f4120aeff8d40ad7fbc Mon Sep 17 00:00:00 2001 From: Hongbo Wu Date: Thu, 29 Feb 2024 16:35:52 +0800 Subject: [PATCH 2/2] fix typo --- packages/api/src/services/library_item.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/api/src/services/library_item.ts b/packages/api/src/services/library_item.ts index 2a3d65649..4a16c7c18 100644 --- a/packages/api/src/services/library_item.ts +++ b/packages/api/src/services/library_item.ts @@ -279,7 +279,7 @@ export const buildQueryString = ( // return only deleted pages within 14 days return "(library_item.state = 'DELETED' AND library_item.deleted_at >= now() - interval '14 days')" default: { - let sql = 'library_item.archived_at is not null' + let sql = 'library_item.archived_at is null' if (useFolders) { const param = `folder_${parameters.length}` const folderSql = escapeQueryWithParameters(