-
+
Score:
-
+
diff --git a/src-ui/src/app/components/document-list/document-list.component.ts b/src-ui/src/app/components/document-list/document-list.component.ts
index cf7afb845..c0ad354ba 100644
--- a/src-ui/src/app/components/document-list/document-list.component.ts
+++ b/src-ui/src/app/components/document-list/document-list.component.ts
@@ -207,6 +207,13 @@ export class DocumentListComponent implements OnInit, OnDestroy {
})
}
+ clickMoreLike(documentID: number) {
+ this.list.selectNone()
+ setTimeout(() => {
+ //this.filterEditor.moreLikeThis(doc)
+ })
+ }
+
trackByDocumentId(index, item: PaperlessDocument) {
return item.id
}
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 7290354eb..490eed95d 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
@@ -1,7 +1,6 @@
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 43387c08f..3b645ec97 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
@@ -8,13 +8,17 @@ import { DocumentTypeService } from 'src/app/services/rest/document-type.service
import { TagService } from 'src/app/services/rest/tag.service';
import { CorrespondentService } from 'src/app/services/rest/correspondent.service';
import { FilterRule } from 'src/app/data/filter-rule';
-import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } from 'src/app/data/filter-rule-type';
+import { FILTER_ADDED_AFTER, FILTER_ADDED_BEFORE, FILTER_ASN, FILTER_CORRESPONDENT, FILTER_CREATED_AFTER, FILTER_CREATED_BEFORE, FILTER_DOCUMENT_TYPE, FILTER_FULLTEXT_MORELIKE, FILTER_FULLTEXT_QUERY, FILTER_HAS_ANY_TAG, FILTER_HAS_TAG, FILTER_TITLE, FILTER_TITLE_CONTENT } 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 { PaperlessDocument } from 'src/app/data/paperless-document';
const TEXT_FILTER_TARGET_TITLE = "title"
const TEXT_FILTER_TARGET_TITLE_CONTENT = "title-content"
const TEXT_FILTER_TARGET_ASN = "asn"
+const TEXT_FILTER_TARGET_FULLTEXT_QUERY = "fulltext-query"
+const TEXT_FILTER_TARGET_FULLTEXT_MORELIKE = "fulltext-morelike"
@Component({
selector: 'app-filter-editor',
@@ -64,7 +68,8 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
constructor(
private documentTypeService: DocumentTypeService,
private tagService: TagService,
- private correspondentService: CorrespondentService
+ private correspondentService: CorrespondentService,
+ private documentService: DocumentService
) { }
tags: PaperlessTag[] = []
@@ -72,12 +77,21 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
documentTypes: PaperlessDocumentType[] = []
_textFilter = ""
+ _moreLikeId: number
+ _moreLikeDoc: PaperlessDocument
- textFilterTargets = [
- {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
- {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
- {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`}
- ]
+ get textFilterTargets() {
+ let targets = [
+ {id: TEXT_FILTER_TARGET_TITLE, name: $localize`Title`},
+ {id: TEXT_FILTER_TARGET_TITLE_CONTENT, name: $localize`Title & content`},
+ {id: TEXT_FILTER_TARGET_ASN, name: $localize`ASN`},
+ {id: TEXT_FILTER_TARGET_FULLTEXT_QUERY, name: $localize`Fulltext search`}
+ ]
+ if (this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+ targets.push({id: TEXT_FILTER_TARGET_FULLTEXT_MORELIKE, name: $localize`More like`})
+ }
+ return targets
+ }
textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
@@ -101,6 +115,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this.tagSelectionModel.clear(false)
this.correspondentSelectionModel.clear(false)
this._textFilter = null
+ this._moreLikeId = null
this.dateAddedBefore = null
this.dateAddedAfter = null
this.dateCreatedBefore = null
@@ -120,6 +135,17 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
this._textFilter = rule.value
this.textFilterTarget = TEXT_FILTER_TARGET_ASN
break
+ case FILTER_FULLTEXT_QUERY:
+ this._textFilter = rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_QUERY
+ break
+ case FILTER_FULLTEXT_MORELIKE:
+ this._moreLikeId = +rule.value
+ this.textFilterTarget = TEXT_FILTER_TARGET_FULLTEXT_MORELIKE
+ this.documentService.get(this._moreLikeId).subscribe(result => {
+ this._moreLikeDoc = result
+ })
+ break
case FILTER_CREATED_AFTER:
this.dateCreatedAfter = rule.value
break
@@ -159,6 +185,12 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_ASN) {
filterRules.push({rule_type: FILTER_ASN, value: this._textFilter})
}
+ if (this._textFilter && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_QUERY) {
+ filterRules.push({rule_type: FILTER_FULLTEXT_QUERY, value: this._textFilter})
+ }
+ if (this._moreLikeId && this.textFilterTarget == TEXT_FILTER_TARGET_FULLTEXT_MORELIKE) {
+ filterRules.push({rule_type: FILTER_FULLTEXT_MORELIKE, value: this._moreLikeId?.toString()})
+ }
if (this.tagSelectionModel.isNoneSelected()) {
filterRules.push({rule_type: FILTER_HAS_ANY_TAG, value: "false"})
} else {
@@ -232,6 +264,7 @@ export class FilterEditorComponent implements OnInit, OnDestroy {
}
resetSelected() {
+ this.textFilterTarget = TEXT_FILTER_TARGET_TITLE_CONTENT
this.reset.next()
}
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html b/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
deleted file mode 100644
index 5dc5baa94..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-...
- {{token.text}} ...
-
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss b/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
deleted file mode 100644
index e04dd13b2..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.match {
- color: black;
- background-color: rgb(255, 211, 66);
-}
\ No newline at end of file
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts b/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts
deleted file mode 100644
index 8e00a9d0b..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.spec.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
-import { ResultHighlightComponent } from './result-highlight.component';
-
-describe('ResultHighlightComponent', () => {
- let component: ResultHighlightComponent;
- let fixture: ComponentFixture
;
-
- beforeEach(async () => {
- await TestBed.configureTestingModule({
- declarations: [ ResultHighlightComponent ]
- })
- .compileComponents();
- });
-
- beforeEach(() => {
- fixture = TestBed.createComponent(ResultHighlightComponent);
- component = fixture.componentInstance;
- fixture.detectChanges();
- });
-
- it('should create', () => {
- expect(component).toBeTruthy();
- });
-});
diff --git a/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts b/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts
deleted file mode 100644
index d9a1a50b1..000000000
--- a/src-ui/src/app/components/search/result-highlight/result-highlight.component.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Component, Input, OnInit } from '@angular/core';
-import { SearchHitHighlight } from 'src/app/data/search-result';
-
-@Component({
- selector: 'app-result-highlight',
- templateUrl: './result-highlight.component.html',
- styleUrls: ['./result-highlight.component.scss']
-})
-export class ResultHighlightComponent implements OnInit {
-
- constructor() { }
-
- @Input()
- highlights: SearchHitHighlight[][]
-
- ngOnInit(): void {
- }
-
-}
diff --git a/src-ui/src/app/components/search/search.component.html b/src-ui/src/app/components/search/search.component.html
deleted file mode 100644
index f794a0feb..000000000
--- a/src-ui/src/app/components/search/search.component.html
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-Invalid search query: {{errorMessage}}
-
-Showing documents similar to {{more_like_doc?.original_file_name}}
-
-
- Search query: {{query}}
-
- - Did you mean "{{correctedQuery}}"?
-
-
-
-
-
{resultCount, plural, =0 {No results} =1 {One result} other {{{resultCount}} results}}
-
-
-
-
-
-