diff --git a/src-ui/messages.xlf b/src-ui/messages.xlf index bd8b89095..33e9aacb8 100644 --- a/src-ui/messages.xlf +++ b/src-ui/messages.xlf @@ -2300,7 +2300,7 @@ src/app/components/document-detail/document-detail.component.ts - 846 + 847 @@ -2577,19 +2577,19 @@ src/app/components/document-detail/document-detail.component.ts - 870 + 871 src/app/components/document-detail/document-detail.component.ts - 1169 + 1170 src/app/components/document-detail/document-detail.component.ts - 1207 + 1208 src/app/components/document-detail/document-detail.component.ts - 1248 + 1249 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -3172,7 +3172,7 @@ src/app/components/document-detail/document-detail.component.ts - 823 + 824 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -4901,7 +4901,7 @@ Create src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 50 + 58 src/app/components/common/share-links-dropdown/share-links-dropdown.component.html @@ -4928,21 +4928,21 @@ Apply src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 56 + 64 Click again to exclude items. src/app/components/common/filterable-dropdown/filterable-dropdown.component.html - 63 + 71 Not assigned src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 351 + 370 Filter drop down element to filter for documents with no correspondent/type/tag assigned @@ -4950,7 +4950,7 @@ Open filter src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts - 463 + 486 @@ -6209,7 +6209,7 @@ src/app/components/document-detail/document-detail.component.ts - 1225 + 1226 src/app/guards/dirty-saved-view.guard.ts @@ -6573,36 +6573,36 @@ Document saved successfully. src/app/components/document-detail/document-detail.component.ts - 737 + 738 src/app/components/document-detail/document-detail.component.ts - 751 + 752 Error saving document src/app/components/document-detail/document-detail.component.ts - 755 + 756 src/app/components/document-detail/document-detail.component.ts - 796 + 797 Do you really want to move the document "" to the trash? src/app/components/document-detail/document-detail.component.ts - 824 + 825 Documents can be restored prior to permanent deletion. src/app/components/document-detail/document-detail.component.ts - 825 + 826 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6613,7 +6613,7 @@ Move to trash src/app/components/document-detail/document-detail.component.ts - 827 + 828 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6624,7 +6624,7 @@ Reprocess confirm src/app/components/document-detail/document-detail.component.ts - 866 + 867 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6635,70 +6635,70 @@ This operation will permanently recreate the archive file for this document. src/app/components/document-detail/document-detail.component.ts - 867 + 868 The archive file will be re-generated with the current settings. src/app/components/document-detail/document-detail.component.ts - 868 + 869 Reprocess operation will begin in the background. Close and re-open or reload this document after the operation has completed to see new content. src/app/components/document-detail/document-detail.component.ts - 878 + 879 Error executing operation src/app/components/document-detail/document-detail.component.ts - 889 + 890 Page Fit src/app/components/document-detail/document-detail.component.ts - 962 + 963 Split confirm src/app/components/document-detail/document-detail.component.ts - 1167 + 1168 This operation will split the selected document(s) into new documents. src/app/components/document-detail/document-detail.component.ts - 1168 + 1169 Split operation will begin in the background. src/app/components/document-detail/document-detail.component.ts - 1184 + 1185 Error executing split operation src/app/components/document-detail/document-detail.component.ts - 1193 + 1194 Rotate confirm src/app/components/document-detail/document-detail.component.ts - 1205 + 1206 src/app/components/document-list/bulk-editor/bulk-editor.component.ts @@ -6709,49 +6709,49 @@ This operation will permanently rotate the original version of the current document. src/app/components/document-detail/document-detail.component.ts - 1206 + 1207 Rotation will begin in the background. Close and re-open the document after the operation has completed to see the changes. src/app/components/document-detail/document-detail.component.ts - 1222 + 1223 Error executing rotate operation src/app/components/document-detail/document-detail.component.ts - 1234 + 1235 Delete pages confirm src/app/components/document-detail/document-detail.component.ts - 1246 + 1247 This operation will permanently delete the selected pages from the original document. src/app/components/document-detail/document-detail.component.ts - 1247 + 1248 Delete pages operation will begin in the background. Close and re-open or reload this document after the operation has completed to see the changes. src/app/components/document-detail/document-detail.component.ts - 1262 + 1263 Error executing delete pages operation src/app/components/document-detail/document-detail.component.ts - 1271 + 1272 diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html index a3b49cf62..28ce03ad6 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.html @@ -38,7 +38,15 @@ @for (item of selectionModel.items | filter: filterText:'name'; track item; let i = $index) { @if (allowSelectNone || item.id) { + [item]="item" + [hideCount]="hideCount(item)" + [opacifyCount]="!editing" + [state]="selectionModel.get(item.id)" + [count]="getUpdatedDocumentCount(item.id)" + (toggled)="selectionModel.toggle(item.id)" + (exclude)="excludeClicked(item.id)" + (click)="setButtonItemIndex(i - 1)" + [disabled]="disabled"> } } diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts index 0e2999742..78af75607 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.spec.ts @@ -509,6 +509,37 @@ describe('FilterableDropdownComponent & FilterableDropdownSelectionModel', () => ]) }) + it('selection model should sort items by state and document counts, if set', () => { + component.items = items.concat([{ id: 4, name: 'Item D' }]) + component.selectionModel = selectionModel + component.documentCounts = [ + { id: 1, document_count: 0 }, // Tag1 + { id: 2, document_count: 1 }, // Tag2 + { id: 4, document_count: 2 }, + ] + component.selectionModel.apply() + expect(selectionModel.items).toEqual([ + nullItem, + { id: 4, name: 'Item D' }, + items[1], // Tag2 + items[0], // Tag1 + ]) + + selectionModel.toggle(items[1].id) + component.documentCounts = [ + { id: 1, document_count: 0 }, + { id: 2, document_count: 1 }, + { id: 4, document_count: 0 }, + ] + selectionModel.apply() + expect(selectionModel.items).toEqual([ + nullItem, + items[1], // Tag2 + { id: 4, name: 'Item D' }, + items[0], // Tag1 + ]) + }) + it('should set support create, keep open model and call createRef method', fakeAsync(() => { component.items = items component.icon = 'tag-fill' diff --git a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts index a23d413d7..2351dc0da 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/filterable-dropdown.component.ts @@ -43,6 +43,11 @@ export class FilterableDropdownSelectionModel { private _intersection: Intersection = Intersection.Include temporaryIntersection: Intersection = this._intersection + private _documentCounts: SelectionDataItem[] = [] + public set documentCounts(counts: SelectionDataItem[]) { + this._documentCounts = counts + } + private _items: MatchingModel[] = [] get items(): MatchingModel[] { return this._items @@ -69,6 +74,16 @@ export class FilterableDropdownSelectionModel { this.getNonTemporary(b.id) == ToggleableItemState.NotSelected ) { return -1 + } else if ( + this._documentCounts.length && + this.getDocumentCount(a.id) > this.getDocumentCount(b.id) + ) { + return -1 + } else if ( + this._documentCounts.length && + this.getDocumentCount(a.id) < this.getDocumentCount(b.id) + ) { + return 1 } else { return a.name.localeCompare(b.name) } @@ -286,6 +301,10 @@ export class FilterableDropdownSelectionModel { ) } + getDocumentCount(id: number) { + return this._documentCounts.find((c) => c.id === id)?.document_count + } + init(map: Map) { this.temporarySelectionStates = map this.apply() @@ -431,7 +450,11 @@ export class FilterableDropdownComponent implements OnDestroy, OnInit { } @Input() - documentCounts: SelectionDataItem[] + set documentCounts(counts: SelectionDataItem[]) { + if (counts) { + this.selectionModel.documentCounts = counts + } + } @Input() shortcutKey: string @@ -544,9 +567,7 @@ export class FilterableDropdownComponent implements OnDestroy, OnInit { } getUpdatedDocumentCount(id: number) { - if (this.documentCounts) { - return this.documentCounts.find((c) => c.id === id)?.document_count - } + return this.selectionModel.getDocumentCount(id) } listKeyDown(event: KeyboardEvent) { diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html index 348393ced..1c7dad499 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.html @@ -1,4 +1,9 @@ - diff --git a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts index b3e18cf50..a5b3f4e31 100644 --- a/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts +++ b/src-ui/src/app/components/common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component.ts @@ -29,6 +29,9 @@ export class ToggleableDropdownButtonComponent { @Input() hideCount: boolean = false + @Input() + opacifyCount: boolean = true + @Output() toggled = new EventEmitter() @@ -39,6 +42,10 @@ export class ToggleableDropdownButtonComponent { return 'is_inbox_tag' in this.item } + get currentCount(): number { + return this.count ?? this.item.document_count + } + toggleItem(event: MouseEvent): void { if (this.state == ToggleableItemState.Selected) { this.exclude.emit()