From a47d36f5e530f21db79413688ff365cfd8e036ba Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Fri, 19 Apr 2024 10:04:10 -0700
Subject: [PATCH] Enhancement: speed up merge document list retrieval

---
 .../merge-confirm-dialog.component.spec.ts    | 20 ++++++++++++++-----
 .../merge-confirm-dialog.component.ts         |  6 +++---
 .../bulk-editor/bulk-editor.component.spec.ts | 10 +++++++---
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts
index 8b9bf3898..c4da71817 100644
--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.spec.ts
@@ -36,14 +36,18 @@ describe('MergeConfirmDialogComponent', () => {
       { id: 2, name: 'Document 2' },
       { id: 3, name: 'Document 3' },
     ]
-    jest.spyOn(documentService, 'getCachedMany').mockReturnValue(of(documents))
+    jest.spyOn(documentService, 'getFew').mockReturnValue(
+      of({
+        all: documents.map((d) => d.id),
+        count: documents.length,
+        results: documents,
+      })
+    )
 
     component.ngOnInit()
 
     expect(component.documents).toEqual(documents)
-    expect(documentService.getCachedMany).toHaveBeenCalledWith(
-      component.documentIDs
-    )
+    expect(documentService.getFew).toHaveBeenCalledWith(component.documentIDs)
   })
 
   it('should move documentIDs on drop', () => {
@@ -64,7 +68,13 @@ describe('MergeConfirmDialogComponent', () => {
       { id: 2, name: 'Document 2' },
       { id: 3, name: 'Document 3' },
     ]
-    jest.spyOn(documentService, 'getCachedMany').mockReturnValue(of(documents))
+    jest.spyOn(documentService, 'getFew').mockReturnValue(
+      of({
+        all: documents.map((d) => d.id),
+        count: documents.length,
+        results: documents,
+      })
+    )
 
     component.ngOnInit()
 
diff --git a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts
index fd52459e0..7e64a4f84 100644
--- a/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts
+++ b/src-ui/src/app/components/common/confirm-dialog/merge-confirm-dialog/merge-confirm-dialog.component.ts
@@ -34,10 +34,10 @@ export class MergeConfirmDialogComponent
 
   ngOnInit() {
     this.documentService
-      .getCachedMany(this.documentIDs)
+      .getFew(this.documentIDs)
       .pipe(takeUntil(this.unsubscribeNotifier))
-      .subscribe((documents) => {
-        this._documents = documents
+      .subscribe((r) => {
+        this._documents = r.results
       })
   }
 
diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
index e38138df1..127d7ef2b 100644
--- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
+++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.spec.ts
@@ -866,9 +866,13 @@ describe('BulkEditorComponent', () => {
     jest
       .spyOn(documentListViewService, 'documents', 'get')
       .mockReturnValue([{ id: 3 }, { id: 4 }])
-    jest
-      .spyOn(documentService, 'getCachedMany')
-      .mockReturnValue(of([{ id: 3 }, { id: 4 }]))
+    jest.spyOn(documentService, 'getFew').mockReturnValue(
+      of({
+        all: [3, 4],
+        count: 2,
+        results: [{ id: 3 }, { id: 4 }],
+      })
+    )
     jest
       .spyOn(documentListViewService, 'selected', 'get')
       .mockReturnValue(new Set([3, 4]))