From b6266ad18f31f2cde1f5862e7506f76d7cc44e8b Mon Sep 17 00:00:00 2001
From: shamoon <4887959+shamoon@users.noreply.github.com>
Date: Sat, 18 Feb 2023 15:44:54 -0800
Subject: [PATCH] Live document counts for document filtering
---
.../document-list.component.html | 2 +-
.../filter-editor.component.html | 10 +++++---
.../filter-editor/filter-editor.component.ts | 24 ++++++++++++++++++-
.../services/document-list-view.service.ts | 21 +++++++++++++++-
4 files changed, 51 insertions(+), 6 deletions(-)
diff --git a/src-ui/src/app/components/document-list/document-list.component.html b/src-ui/src/app/components/document-list/document-list.component.html
index aa8685da9..081c013bb 100644
--- a/src-ui/src/app/components/document-list/document-list.component.html
+++ b/src-ui/src/app/components/document-list/document-list.component.html
@@ -82,7 +82,7 @@
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
index 3b78d8445..f6f4a6b32 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.html
@@ -27,10 +27,11 @@
diff --git a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
index 44f524149..fa5e57e8e 100644
--- a/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
+++ b/src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
@@ -40,7 +40,11 @@ import {
} from 'src/app/data/filter-rule-type'
import { FilterableDropdownSelectionModel } from '../../common/filterable-dropdown/filterable-dropdown.component'
import { ToggleableItemState } from '../../common/filterable-dropdown/toggleable-dropdown-button/toggleable-dropdown-button.component'
-import { DocumentService } from 'src/app/services/rest/document.service'
+import {
+ DocumentService,
+ SelectionData,
+ SelectionDataItem,
+} from 'src/app/services/rest/document.service'
import { PaperlessDocument } from 'src/app/data/paperless-document'
import { PaperlessStoragePath } from 'src/app/data/paperless-storage-path'
import { StoragePathService } from 'src/app/services/rest/storage-path.service'
@@ -144,6 +148,11 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
documentTypes: PaperlessDocumentType[] = []
storagePaths: PaperlessStoragePath[] = []
+ tagDocumentCounts: SelectionDataItem[]
+ correspondentDocumentCounts: SelectionDataItem[]
+ documentTypeDocumentCounts: SelectionDataItem[]
+ storagePathDocumentCounts: SelectionDataItem[]
+
_textFilter = ''
_moreLikeId: number
_moreLikeDoc: PaperlessDocument
@@ -617,6 +626,17 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
@Output()
filterRulesChange = new EventEmitter()
+ @Input()
+ set selectionData(selectionData: SelectionData) {
+ this.tagDocumentCounts = selectionData?.selected_tags ?? null
+ this.documentTypeDocumentCounts =
+ selectionData?.selected_document_types ?? null
+ this.correspondentDocumentCounts =
+ selectionData?.selected_correspondents ?? null
+ this.storagePathDocumentCounts =
+ selectionData?.selected_storage_paths ?? null
+ }
+
rulesModified: boolean = false
updateRules() {
@@ -692,6 +712,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
}
onCorrespondentDropdownOpen() {
+ console.log(this.correspondentSelectionModel)
+
this.correspondentSelectionModel.apply()
}
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 3c5dbca21..298267fca 100644
--- a/src-ui/src/app/services/document-list-view.service.ts
+++ b/src-ui/src/app/services/document-list-view.service.ts
@@ -12,7 +12,11 @@ import { PaperlessSavedView } from '../data/paperless-saved-view'
import { SETTINGS_KEYS } from '../data/paperless-uisettings'
import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys'
import { paramsFromViewState, paramsToViewState } from '../utils/query-params'
-import { DocumentService, DOCUMENT_SORT_FIELDS } from './rest/document.service'
+import {
+ DocumentService,
+ DOCUMENT_SORT_FIELDS,
+ SelectionData,
+} from './rest/document.service'
import { SettingsService } from './settings.service'
/**
@@ -74,6 +78,8 @@ export class DocumentListViewService {
rangeSelectionAnchorIndex: number
lastRangeSelectionToIndex: number
+ selectionData?: SelectionData
+
currentPageSize: number = this.settings.get(SETTINGS_KEYS.DOCUMENT_LIST_SIZE)
private listViewStates: Map = new Map()
@@ -222,6 +228,18 @@ export class DocumentListViewService {
this.isReloading = false
activeListViewState.collectionSize = result.count
activeListViewState.documents = result.results
+
+ this.documentService
+ .getSelectionData(result.results.map((d) => d.id))
+ .subscribe({
+ next: (selectionData) => {
+ this.selectionData = selectionData
+ },
+ error: () => {
+ this.selectionData = null
+ },
+ })
+
if (updateQueryParams && !this._activeSavedViewId) {
let base = ['/documents']
this.router.navigate(base, {
@@ -247,6 +265,7 @@ export class DocumentListViewService {
activeListViewState.currentPage = 1
this.reload()
} else {
+ this.selectionData = null
let errorMessage
if (
typeof error.error !== 'string' &&