From cec58a9cbc8ea25909d90dab102d3ccdd9a99876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Czy=C5=BC?= Date: Wed, 13 Dec 2023 16:57:22 +0100 Subject: [PATCH] IDs passed to bulkDownload are sorted in the same order as documents in the view --- .../document-list/bulk-editor/bulk-editor.component.ts | 2 +- src-ui/src/app/services/document-list-view.service.ts | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts index 9463b04ea..d9a1973d5 100644 --- a/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts +++ b/src-ui/src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -511,7 +511,7 @@ export class BulkEditorComponent : 'originals' this.documentService .bulkDownload( - Array.from(this.list.selected), + this.list.getSelectedInOrder(), downloadFileType, this.downloadForm.get('downloadAsSingleFile').value, this.downloadForm.get('downloadUseFormatting').value diff --git a/src-ui/src/app/services/document-list-view.service.ts b/src-ui/src/app/services/document-list-view.service.ts index 4fb2cda02..13bbac197 100644 --- a/src-ui/src/app/services/document-list-view.service.ts +++ b/src-ui/src/app/services/document-list-view.service.ts @@ -358,6 +358,12 @@ export class DocumentListViewService { return this.activeListViewState.selected } + getSelectedInOrder(): number[] { + return this.activeListViewState.documents + .filter((item) => this.activeListViewState.selected.has(item.id)) + .map((item) => item.id) + } + setSort(field: string, reverse: boolean) { this.activeListViewState.sortField = field this.activeListViewState.sortReverse = reverse