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

fix documents list without query params

Browse Source
This commit is contained in:
Michael Shamoon 2022-05-20 22:14:39 -07:00
parent e60a7df9a2
commit f6d78a0044
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
import { Injectable } from '@angular/core'
import { ActivatedRoute, Params, Router } from '@angular/router'
import { ParamMap, Router } from '@angular/router'
import { Observable } from 'rxjs'
import {
cloneFilterRules,
@ -10,7 +10,7 @@ import { PaperlessDocument } from '../data/paperless-document'
import { PaperlessSavedView } from '../data/paperless-saved-view'
import { SETTINGS_KEYS } from '../data/paperless-uisettings'
import { DOCUMENT_LIST_SERVICE } from '../data/storage-keys'
import { generateParams, parseQueryParams } from '../utils/query-params'
import { generateParams, getStateFromQueryParams } from '../utils/query-params'
import { DocumentService, DOCUMENT_SORT_FIELDS } from './rest/document.service'
import { SettingsService } from './settings.service'
@ -166,13 +166,17 @@ export class DocumentListViewService {
}
}
loadFromQueryParams(queryParams) {
let newState: ListViewState = parseQueryParams(queryParams)
loadFromQueryParams(queryParams: ParamMap) {
const paramsEmpty: boolean = queryParams.keys.length == 0
let newState: ListViewState = this.listViewStates.get(null)
if (!paramsEmpty) newState = getStateFromQueryParams(queryParams)
if (newState == undefined) newState = this.defaultListViewState() // if nothing in local storage
this.activeListViewState.filterRules = newState.filterRules
this.activeListViewState.sortField = newState.sortField
this.activeListViewState.sortReverse = newState.sortReverse
this.activeListViewState.currentPage = newState.currentPage
this.reload(null, false)
this.reload(null, paramsEmpty) // update the params if there arent any
}
reload(onFinish?, updateQueryParams: boolean = true) {
@ -280,13 +284,6 @@ export class DocumentListViewService {
return this.activeListViewState.sortReverse
}
get sortParams(): Params {
return {
sortField: this.sortField,
sortReverse: this.sortReverse,
}
}
get collectionSize(): number {
return this.activeListViewState.collectionSize
}

2
src-ui/src/app/utils/query-params.ts
View File

@ -23,7 +23,7 @@ export function generateParams(
}
}
export function parseQueryParams(queryParams: ParamMap): ListViewState {
export function getStateFromQueryParams(queryParams: ParamMap): ListViewState {
let filterRules = filterRulesFromQueryParams(queryParams)
let sortField = queryParams.get(SORT_FIELD_PARAMETER)
let sortReverse =