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

Updated to work with new unified search interface

Browse Source
This commit is contained in:
Michael Shamoon 2021-04-05 16:35:15 -07:00
parent 8226a8793e
commit 3d0891c73b
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src-ui/src/app/components/document-list/filter-editor/filter-editor.component.ts
View File

@ -290,9 +290,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
distinctUntilChanged() distinctUntilChanged()
).subscribe(text => { ).subscribe(text => {
this._textFilter = text this._textFilter = text
this.documentService.setSearchQuery(text) this.documentService.searchQuery = text
this.updateRules() this.updateRules()
}) })
if (this._textFilter) this.documentService.searchQuery = this._textFilter
} }
ngOnDestroy() { ngOnDestroy() {

15
src-ui/src/app/services/rest/document.service.ts
View File

@ -12,7 +12,6 @@ import { DocumentTypeService } from './document-type.service';
import { TagService } from './tag.service'; import { TagService } from './tag.service';
import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type'; import { FILTER_RULE_TYPES } from 'src/app/data/filter-rule-type';
import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions'; import { PaperlessDocumentSuggestions } from 'src/app/data/paperless-document-suggestions';
import { ActivatedRoute } from '@angular/router';
export const DOCUMENT_SORT_FIELDS = [ export const DOCUMENT_SORT_FIELDS = [
{ field: 'archive_serial_number', name: $localize`ASN` }, { field: 'archive_serial_number', name: $localize`ASN` },
@ -40,14 +39,10 @@ export interface SelectionData {
}) })
export class DocumentService extends AbstractPaperlessService<PaperlessDocument> { export class DocumentService extends AbstractPaperlessService<PaperlessDocument> {
private searchQuery: string private _searchQuery: string
constructor(http: HttpClient, private correspondentService: CorrespondentService, private documentTypeService: DocumentTypeService, private tagService: TagService, private route: ActivatedRoute) { constructor(http: HttpClient, private correspondentService: CorrespondentService, private documentTypeService: DocumentTypeService, private tagService: TagService) {
super(http, 'documents') super(http, 'documents')
this.route.queryParamMap.subscribe(paramMap => {
this.searchQuery = paramMap.get('query')
})
} }
private filterRulesToQueryParams(filterRules: FilterRule[]) { private filterRulesToQueryParams(filterRules: FilterRule[]) {
@ -99,7 +94,7 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
getPreviewUrl(id: number, original: boolean = false): string { getPreviewUrl(id: number, original: boolean = false): string {
let url = this.getResourceUrl(id, 'preview') let url = this.getResourceUrl(id, 'preview')
if (this.searchQuery) url += `#search="${this.searchQuery}"` if (this._searchQuery) url += `#search="${this._searchQuery}"`
if (original) { if (original) {
url += "?original=true" url += "?original=true"
} }
@ -146,8 +141,8 @@ export class DocumentService extends AbstractPaperlessService<PaperlessDocument>
return this.http.post(this.getResourceUrl(null, 'bulk_download'), {"documents": ids, "content": content}, { responseType: 'blob' }) return this.http.post(this.getResourceUrl(null, 'bulk_download'), {"documents": ids, "content": content}, { responseType: 'blob' })
} }
public setSearchQuery(query: string) { public set searchQuery(query: string) {
this.searchQuery = query this._searchQuery = query
} }
} }