diff --git a/src-ui/package-lock.json b/src-ui/package-lock.json index 874659922..993d5c5cf 100644 --- a/src-ui/package-lock.json +++ b/src-ui/package-lock.json @@ -10794,6 +10794,12 @@ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", "dev": true + }, + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true } } }, @@ -11725,6 +11731,14 @@ "faye-websocket": "^0.10.0", "uuid": "^3.4.0", "websocket-driver": "0.6.5" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "sockjs-client": { @@ -12800,6 +12814,14 @@ "debug": "^4.1.1", "request": "^2.88.2", "uuid": "^3.0.0" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "universalify": { @@ -12987,10 +13009,9 @@ "dev": true }, "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", + "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==" }, "validate-npm-package-license": { "version": "3.0.4", @@ -13920,6 +13941,14 @@ "requires": { "ansi-colors": "^3.0.0", "uuid": "^3.3.2" + }, + "dependencies": { + "uuid": { + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", + "dev": true + } } }, "webpack-merge": { diff --git a/src-ui/package.json b/src-ui/package.json index a2aed3d09..08fe6d33b 100644 --- a/src-ui/package.json +++ b/src-ui/package.json @@ -26,6 +26,7 @@ "ngx-file-drop": "^10.0.0", "rxjs": "~6.6.0", "tslib": "^2.0.0", + "uuid": "^8.3.1", "zone.js": "~0.10.2" }, "devDependencies": { diff --git a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts index 6c83bb800..190302394 100644 --- a/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts +++ b/src-ui/src/app/components/common/edit-dialog/edit-dialog.component.ts @@ -2,6 +2,7 @@ import { Directive, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Form, FormGroup } from '@angular/forms'; import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap'; import { Observable } from 'rxjs'; +import { MatchingModel } from 'src/app/data/matching-model'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; import { Toast, ToastService } from 'src/app/services/toast.service'; @@ -45,6 +46,10 @@ export abstract class EditDialogComponent implements OnI } } + getMatchingAlgorithms() { + return MatchingModel.MATCHING_ALGORITHMS + } + save() { var newObject = Object.assign(Object.assign({}, this.object), this.objectForm.value) var serverResponse: Observable diff --git a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html index c7ac24f17..167cf0247 100644 --- a/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html +++ b/src-ui/src/app/components/document-list/document-card-large/document-card-large.component.html @@ -6,7 +6,7 @@
-
{{document.title}}
+
{{document.correspondent ? document.correspondent.name + ': ' : ''}}{{document.title}}

{{getDetailsAsString()}} diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html index 68a27d561..307c78c3c 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.html @@ -6,15 +6,12 @@

-
- - -
-
- - -
+ + + + + +
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts index 8e110f089..f3f768044 100644 --- a/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-edit-dialog/correspondent-edit-dialog.component.ts @@ -20,7 +20,9 @@ export class CorrespondentEditDialogComponent extends EditDialogComponent Name - Automatic Classification + Matching Document count Last correspondence Actions @@ -19,7 +19,7 @@ {{ correspondent.name }} - {{ correspondent.automatic_classification }} + {{ getMatching(correspondent) }} {{ correspondent.document_count }} {{ correspondent.last_correspondence | date }} diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html index 008f1ac65..013c5a947 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.html @@ -6,15 +6,12 @@
-
- - -
-
- - -
+ + + + + +
diff --git a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts index 5239972a9..88b7d6da5 100644 --- a/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/document-type-list/document-type-edit-dialog/document-type-edit-dialog.component.ts @@ -20,7 +20,9 @@ export class DocumentTypeEditDialogComponent extends EditDialogComponent Name - Automatic Classification + Matching Document count Actions - - {{ correspondent.name }} - {{ correspondent.automatic_classification }} - {{ correspondent.document_count }} + + {{ document_type.name }} + {{ getMatching(document_type) }} + {{ document_type.document_count }}
- - + +
diff --git a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts index 5997f0ae9..6b0a0f33e 100644 --- a/src-ui/src/app/components/manage/generic-list/generic-list.component.ts +++ b/src-ui/src/app/components/manage/generic-list/generic-list.component.ts @@ -1,5 +1,6 @@ import { Directive, OnInit } from '@angular/core'; import { NgbModal } from '@ng-bootstrap/ng-bootstrap'; +import { MatchingModel } from 'src/app/data/matching-model'; import { ObjectWithId } from 'src/app/data/object-with-id'; import { AbstractPaperlessService } from 'src/app/services/rest/abstract-paperless-service'; import { DeleteDialogComponent } from '../../common/delete-dialog/delete-dialog.component'; @@ -19,6 +20,16 @@ export abstract class GenericListComponent implements On public collectionSize = 0 + getMatching(o: MatchingModel) { + if (o.matching_algorithm == MatchingModel.MATCH_AUTO) { + return "Automatic" + } else if (o.match && o.match.length > 0) { + return `${o.match} (${MatchingModel.MATCHING_ALGORITHMS.find(a => a.id == o.matching_algorithm).name})` + } else { + return "-" + } + } + ngOnInit(): void { this.reloadData() } diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html index c8cab162e..8048b0c80 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.html @@ -6,26 +6,12 @@
-
- - -
-
- - -
-
- - -
-
- - -
+ + + + + +
diff --git a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts index f0e53c31d..d8f8b2510 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts +++ b/src-ui/src/app/components/manage/tag-list/tag-edit-dialog/tag-edit-dialog.component.ts @@ -22,7 +22,9 @@ export class TagEditDialogComponent extends EditDialogComponent { name: new FormControl(''), colour: new FormControl(1), is_inbox_tag: new FormControl(false), - automatic_classification: new FormControl(true) + matching_algorithm: new FormControl(1), + match: new FormControl(""), + is_insensitive: new FormControl(true) }) } diff --git a/src-ui/src/app/components/manage/tag-list/tag-list.component.html b/src-ui/src/app/components/manage/tag-list/tag-list.component.html index 2b644dd62..76ae9fb93 100644 --- a/src-ui/src/app/components/manage/tag-list/tag-list.component.html +++ b/src-ui/src/app/components/manage/tag-list/tag-list.component.html @@ -11,7 +11,7 @@ Name Colour - Automatic Classification + Matching Document count Actions @@ -20,7 +20,7 @@ {{ tag.name }} {{ getColor(tag.colour).name }} - {{ tag.automatic_classification }} + {{ getMatching(tag) }} {{ tag.document_count }}
diff --git a/src-ui/src/app/data/matching-model.ts b/src-ui/src/app/data/matching-model.ts index 975d502fb..8a15fc1f5 100644 --- a/src-ui/src/app/data/matching-model.ts +++ b/src-ui/src/app/data/matching-model.ts @@ -2,10 +2,30 @@ import { ObjectWithId } from './object-with-id'; export class MatchingModel extends ObjectWithId { + static MATCH_ANY = 1 + static MATCH_ALL = 2 + static MATCH_LITERAL = 3 + static MATCH_REGEX = 4 + static MATCH_FUZZY = 5 + static MATCH_AUTO = 6 + + static MATCHING_ALGORITHMS = [ + {id: MatchingModel.MATCH_ANY, name: "Any"}, + {id: MatchingModel.MATCH_ALL, name: "All"}, + {id: MatchingModel.MATCH_LITERAL, name: "Literal"}, + {id: MatchingModel.MATCH_REGEX, name: "Regular Expression"}, + {id: MatchingModel.MATCH_FUZZY, name: "Fuzzy Match"}, + {id: MatchingModel.MATCH_AUTO, name: "Auto"}, + ] + name?: string slug?: string - - automatic_classification?: boolean + + match?: string + + matching_algorithm?: number + + is_insensitive?: boolean }