paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Retain saved view filters when changing a saved view

Browse Source
This commit is contained in:
Michael Shamoon 2022-10-26 10:39:09 -07:00
parent 3357fa19f3
commit dc1da7cb24
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src-ui/src/app/services/document-list-view.service.ts
View File

@ -171,15 +171,15 @@ export class DocumentListViewService {
this.reduceSelectionToFilter() this.reduceSelectionToFilter()
if (!this.router.routerState.snapshot.url.includes('/view/')) { if (!this.router.routerState.snapshot.url.includes('/view/')) {
this.router.navigate([], { this.router.navigate(['view', view.id])
queryParams: { view: view.id },
})
} }
} }
loadFromQueryParams(queryParams: ParamMap) { loadFromQueryParams(queryParams: ParamMap) {
const paramsEmpty: boolean = queryParams.keys.length == 0 const paramsEmpty: boolean = queryParams.keys.length == 0
let newState: ListViewState = this.listViewStates.get(null) let newState: ListViewState = this.listViewStates.get(
this._activeSavedViewId
)
if (!paramsEmpty) newState = paramsToViewState(queryParams) if (!paramsEmpty) newState = paramsToViewState(queryParams)
if (newState == undefined) newState = this.defaultListViewState() // if nothing in local storage if (newState == undefined) newState = this.defaultListViewState() // if nothing in local storage
@ -225,7 +225,10 @@ export class DocumentListViewService {
let base = ['/documents'] let base = ['/documents']
this.router.navigate(base, { this.router.navigate(base, {
queryParams: paramsFromViewState(activeListViewState), queryParams: paramsFromViewState(activeListViewState),
replaceUrl: !this.router.routerState.snapshot.url.includes('?'), // in case navigating from params-less /documents replaceUrl: !(
this.router.routerState.snapshot.url.includes('?') ||
this.router.routerState.snapshot.url.includes('/view/')
), // in case navigating from params-less /documents or /view
}) })
} else if (this._activeSavedViewId) { } else if (this._activeSavedViewId) {
this.router.navigate([], { this.router.navigate([], {
@ -288,9 +291,9 @@ export class DocumentListViewService {
} }
set sortField(field: string) { set sortField(field: string) {
this._activeSavedViewId = null
this.activeListViewState.sortField = field this.activeListViewState.sortField = field
this.reload() this.reload()
this._activeSavedViewId = null
this.saveDocumentListView() this.saveDocumentListView()
} }
@ -299,9 +302,9 @@ export class DocumentListViewService {
} }
set sortReverse(reverse: boolean) { set sortReverse(reverse: boolean) {
this._activeSavedViewId = null
this.activeListViewState.sortReverse = reverse this.activeListViewState.sortReverse = reverse
this.reload() this.reload()
this._activeSavedViewId = null
this.saveDocumentListView() this.saveDocumentListView()
} }