-
+
@if (hint) {
}
diff --git a/src-ui/src/app/components/common/input/text/text.component.ts b/src-ui/src/app/components/common/input/text/text.component.ts
index a546e2e39..594f5f1d6 100644
--- a/src-ui/src/app/components/common/input/text/text.component.ts
+++ b/src-ui/src/app/components/common/input/text/text.component.ts
@@ -18,6 +18,9 @@ export class TextComponent extends AbstractInputComponent
{
@Input()
autocomplete: string
+ @Input()
+ placeholder: string = ''
+
constructor() {
super()
}
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
index 93a8c1e0f..f4536d3f2 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.spec.ts
@@ -71,6 +71,13 @@ describe('StatisticsWidgetComponent', () => {
expect(reloadSpy).toHaveBeenCalled()
})
+ it('should not call statistics endpoint on reload if already loading', () => {
+ httpTestingController.expectOne(`${environment.apiBaseUrl}statistics/`)
+ component.loading = true
+ component.reload()
+ httpTestingController.expectNone(`${environment.apiBaseUrl}statistics/`)
+ })
+
it('should display inbox link with count', () => {
const mockStats = {
documents_total: 200,
diff --git a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
index 1e309aa1a..c2d5d7cb7 100644
--- a/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
+++ b/src-ui/src/app/components/dashboard/widgets/statistics-widget/statistics-widget.component.ts
@@ -1,6 +1,6 @@
import { HttpClient } from '@angular/common/http'
import { Component, OnDestroy, OnInit } from '@angular/core'
-import { Observable, Subscription } from 'rxjs'
+import { first, Observable, Subject, Subscription, takeUntil } from 'rxjs'
import { FILTER_HAS_TAGS_ANY } from 'src/app/data/filter-rule-type'
import { ConsumerStatusService } from 'src/app/services/consumer-status.service'
import { DocumentListViewService } from 'src/app/services/document-list-view.service'
@@ -35,7 +35,7 @@ export class StatisticsWidgetComponent
extends ComponentWithPermissions
implements OnInit, OnDestroy
{
- loading: boolean = true
+ loading: boolean = false
constructor(
private http: HttpClient,
@@ -48,31 +48,32 @@ export class StatisticsWidgetComponent
statistics: Statistics = {}
subscription: Subscription
-
- private getStatistics(): Observable {
- return this.http.get(`${environment.apiBaseUrl}statistics/`)
- }
+ private unsubscribeNotifer: Subject = new Subject()
reload() {
+ if (this.loading) return
this.loading = true
- this.getStatistics().subscribe((statistics) => {
- this.loading = false
- const fileTypeMax = 5
- if (statistics.document_file_type_counts?.length > fileTypeMax) {
- const others = statistics.document_file_type_counts.slice(fileTypeMax)
- statistics.document_file_type_counts =
- statistics.document_file_type_counts.slice(0, fileTypeMax)
- statistics.document_file_type_counts.push({
- mime_type: $localize`Other`,
- mime_type_count: others.reduce(
- (currentValue, documentFileType) =>
- documentFileType.mime_type_count + currentValue,
- 0
- ),
- })
- }
- this.statistics = statistics
- })
+ this.http
+ .get(`${environment.apiBaseUrl}statistics/`)
+ .pipe(takeUntil(this.unsubscribeNotifer), first())
+ .subscribe((statistics) => {
+ this.loading = false
+ const fileTypeMax = 5
+ if (statistics.document_file_type_counts?.length > fileTypeMax) {
+ const others = statistics.document_file_type_counts.slice(fileTypeMax)
+ statistics.document_file_type_counts =
+ statistics.document_file_type_counts.slice(0, fileTypeMax)
+ statistics.document_file_type_counts.push({
+ mime_type: $localize`Other`,
+ mime_type_count: others.reduce(
+ (currentValue, documentFileType) =>
+ documentFileType.mime_type_count + currentValue,
+ 0
+ ),
+ })
+ }
+ this.statistics = statistics
+ })
}
getFileTypeExtension(filetype: DocumentFileType): string {
@@ -105,6 +106,8 @@ export class StatisticsWidgetComponent
ngOnDestroy(): void {
this.subscription.unsubscribe()
+ this.unsubscribeNotifer.next(true)
+ this.unsubscribeNotifer.complete()
}
goToInbox() {
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index d970d93b3..124f4811d 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -110,12 +110,12 @@
+ (createNew)="createCorrespondent($event)" [hideAddButton]="createDisabled(DataType.Correspondent)" [suggestions]="suggestions?.correspondents" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.Correspondent }">
+ (createNew)="createDocumentType($event)" [hideAddButton]="createDisabled(DataType.DocumentType)" [suggestions]="suggestions?.document_types" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.DocumentType }">
-
+ (createNew)="createStoragePath($event)" [hideAddButton]="createDisabled(DataType.StoragePath)" [suggestions]="suggestions?.storage_paths" i18n-placeholder placeholder="Default" *pngxIfPermissions="{ action: PermissionAction.View, type: PermissionType.StoragePath }">
+
@for (fieldInstance of document?.custom_fields; track fieldInstance.field; let i = $index) {
@switch (getCustomFieldFromInstance(fieldInstance)?.data_type) {
@@ -157,6 +157,7 @@
@case (CustomFieldDataType.Monetary) {
{
)
fixture.detectChanges()
}
+
+ it('createDisabled should return true if the user does not have permission to add the specified data type', () => {
+ currentUserCan = false
+ expect(component.createDisabled(DataType.Correspondent)).toBeTruthy()
+ expect(component.createDisabled(DataType.DocumentType)).toBeTruthy()
+ expect(component.createDisabled(DataType.StoragePath)).toBeTruthy()
+ expect(component.createDisabled(DataType.Tag)).toBeTruthy()
+ })
+
+ it('createDisabled should return false if the user has permission to add the specified data type', () => {
+ currentUserCan = true
+ expect(component.createDisabled(DataType.Correspondent)).toBeFalsy()
+ expect(component.createDisabled(DataType.DocumentType)).toBeFalsy()
+ expect(component.createDisabled(DataType.StoragePath)).toBeFalsy()
+ expect(component.createDisabled(DataType.Tag)).toBeFalsy()
+ })
})
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index d6cbdd57e..c971870da 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -651,6 +651,31 @@ export class DocumentDetailComponent
})
}
+ createDisabled(dataType: DataType) {
+ switch (dataType) {
+ case DataType.Correspondent:
+ return !this.permissionsService.currentUserCan(
+ PermissionAction.Add,
+ PermissionType.Correspondent
+ )
+ case DataType.DocumentType:
+ return !this.permissionsService.currentUserCan(
+ PermissionAction.Add,
+ PermissionType.DocumentType
+ )
+ case DataType.StoragePath:
+ return !this.permissionsService.currentUserCan(
+ PermissionAction.Add,
+ PermissionType.StoragePath
+ )
+ case DataType.Tag:
+ return !this.permissionsService.currentUserCan(
+ PermissionAction.Add,
+ PermissionType.Tag
+ )
+ }
+ }
+
discard() {
this.documentsService
.get(this.documentId)
diff --git a/src-ui/src/app/components/file-drop/file-drop.component.ts b/src-ui/src/app/components/file-drop/file-drop.component.ts
index e45d816b0..7e5096130 100644
--- a/src-ui/src/app/components/file-drop/file-drop.component.ts
+++ b/src-ui/src/app/components/file-drop/file-drop.component.ts
@@ -38,7 +38,7 @@ export class FileDropComponent {
@ViewChild('ngxFileDrop') ngxFileDrop: NgxFileDropComponent
- @HostListener('dragover', ['$event']) onDragOver(event: DragEvent) {
+ @HostListener('document:dragover', ['$event']) onDragOver(event: DragEvent) {
if (!this.dragDropEnabled || !event.dataTransfer?.types?.includes('Files'))
return
event.preventDefault()
@@ -53,7 +53,7 @@ export class FileDropComponent {
clearTimeout(this.fileLeaveTimeoutID)
}
- @HostListener('dragleave', ['$event']) public onDragLeave(
+ @HostListener('document:dragleave', ['$event']) public onDragLeave(
event: DragEvent,
immediate: boolean = false
) {
@@ -73,7 +73,7 @@ export class FileDropComponent {
}, ms)
}
- @HostListener('drop', ['$event']) public onDrop(event: DragEvent) {
+ @HostListener('document:drop', ['$event']) public onDrop(event: DragEvent) {
if (!this.dragDropEnabled) return
event.preventDefault()
event.stopImmediatePropagation()
diff --git a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
index c0053353b..9b2d9f3b9 100644
--- a/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
+++ b/src-ui/src/app/components/manage/correspondent-list/correspondent-list.component.ts
@@ -66,6 +66,7 @@ export class CorrespondentListComponent extends ManagementListComponent
reloadData() {
this.isLoading = true
+ this.clearSelection()
this.service
.listFiltered(
this.page,
diff --git a/src-ui/src/app/data/custom-field.ts b/src-ui/src/app/data/custom-field.ts
index a60c5ac2a..7e52d0785 100644
--- a/src-ui/src/app/data/custom-field.ts
+++ b/src-ui/src/app/data/custom-field.ts
@@ -57,5 +57,6 @@ export interface CustomField extends ObjectWithId {
created?: Date
extra_data?: {
select_options?: string[]
+ default_currency?: string
}
}
diff --git a/src-ui/src/app/services/consumer-status.service.ts b/src-ui/src/app/services/consumer-status.service.ts
index d8e8ffe28..40641ff81 100644
--- a/src-ui/src/app/services/consumer-status.service.ts
+++ b/src-ui/src/app/services/consumer-status.service.ts
@@ -15,7 +15,9 @@ export enum FileStatusPhase {
export const FILE_STATUS_MESSAGES = {
document_already_exists: $localize`Document already exists.`,
+ document_already_exists_in_trash: $localize`Document already exists. Note: existing document is in the trash.`,
asn_already_exists: $localize`Document with ASN already exists.`,
+ asn_already_exists_in_trash: $localize`Document with ASN already exists. Note: existing document is in the trash.`,
file_not_found: $localize`File not found.`,
pre_consume_script_not_found: $localize`:Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Pre-consume script does not exist.`,
pre_consume_script_error: $localize`:Pre-Consume is a term that appears like that in the documentation as well and does not need a specific translation:Error while executing pre-consume script.`,
diff --git a/src-ui/src/app/services/tasks.service.spec.ts b/src-ui/src/app/services/tasks.service.spec.ts
index 76a07c34e..41a374831 100644
--- a/src-ui/src/app/services/tasks.service.spec.ts
+++ b/src-ui/src/app/services/tasks.service.spec.ts
@@ -39,6 +39,12 @@ describe('TasksService', () => {
expect(req.request.method).toEqual('GET')
})
+ it('does not call tasks api endpoint on reload if already loading', () => {
+ tasksService.loading = true
+ tasksService.reload()
+ httpTestingController.expectNone(`${environment.apiBaseUrl}tasks/`)
+ })
+
it('calls acknowledge_tasks api endpoint on dismiss and reloads', () => {
tasksService.dismissTasks(new Set([1, 2, 3]))
const req = httpTestingController.expectOne(
diff --git a/src-ui/src/app/services/tasks.service.ts b/src-ui/src/app/services/tasks.service.ts
index 662dd1015..ed14c8071 100644
--- a/src-ui/src/app/services/tasks.service.ts
+++ b/src-ui/src/app/services/tasks.service.ts
@@ -50,6 +50,7 @@ export class TasksService {
constructor(private http: HttpClient) {}
public reload() {
+ if (this.loading) return
this.loading = true
this.http
diff --git a/src/documents/consumer.py b/src/documents/consumer.py
index b6d0ea455..d90b88f5a 100644
--- a/src/documents/consumer.py
+++ b/src/documents/consumer.py
@@ -231,7 +231,9 @@ class ConsumerError(Exception):
class ConsumerStatusShortMessage(str, Enum):
DOCUMENT_ALREADY_EXISTS = "document_already_exists"
+ DOCUMENT_ALREADY_EXISTS_IN_TRASH = "document_already_exists_in_trash"
ASN_ALREADY_EXISTS = "asn_already_exists"
+ ASN_ALREADY_EXISTS_IN_TRASH = "asn_already_exists_in_trash"
ASN_RANGE = "asn_value_out_of_range"
FILE_NOT_FOUND = "file_not_found"
PRE_CONSUME_SCRIPT_NOT_FOUND = "pre_consume_script_not_found"
@@ -321,12 +323,18 @@ class ConsumerPlugin(
Q(checksum=checksum) | Q(archive_checksum=checksum),
)
if existing_doc.exists():
+ msg = ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS
+ log_msg = f"Not consuming {self.filename}: It is a duplicate of {existing_doc.get().title} (#{existing_doc.get().pk})."
+
+ if existing_doc.first().deleted_at is not None:
+ msg = ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS_IN_TRASH
+ log_msg += " Note: existing document is in the trash."
+
if settings.CONSUMER_DELETE_DUPLICATES:
os.unlink(self.input_doc.original_file)
self._fail(
- ConsumerStatusShortMessage.DOCUMENT_ALREADY_EXISTS,
- f"Not consuming {self.filename}: It is a duplicate of"
- f" {existing_doc.get().title} (#{existing_doc.get().pk})",
+ msg,
+ log_msg,
)
def pre_check_directories(self):
@@ -358,12 +366,20 @@ class ConsumerPlugin(
f"[{Document.ARCHIVE_SERIAL_NUMBER_MIN:,}, "
f"{Document.ARCHIVE_SERIAL_NUMBER_MAX:,}]",
)
- if Document.global_objects.filter(
+ existing_asn_doc = Document.global_objects.filter(
archive_serial_number=self.metadata.asn,
- ).exists():
+ )
+ if existing_asn_doc.exists():
+ msg = ConsumerStatusShortMessage.ASN_ALREADY_EXISTS
+ log_msg = f"Not consuming {self.filename}: Given ASN {self.metadata.asn} already exists!"
+
+ if existing_asn_doc.first().deleted_at is not None:
+ msg = ConsumerStatusShortMessage.ASN_ALREADY_EXISTS_IN_TRASH
+ log_msg += " Note: existing document is in the trash."
+
self._fail(
- ConsumerStatusShortMessage.ASN_ALREADY_EXISTS,
- f"Not consuming {self.filename}: Given ASN {self.metadata.asn} already exists!",
+ msg,
+ log_msg,
)
def run_pre_consume_script(self):
diff --git a/src/documents/serialisers.py b/src/documents/serialisers.py
index 38f6cc4f9..0c0813aa4 100644
--- a/src/documents/serialisers.py
+++ b/src/documents/serialisers.py
@@ -507,6 +507,23 @@ class CustomFieldSerializer(serializers.ModelSerializer):
raise serializers.ValidationError(
{"error": "extra_data.select_options must be a valid list"},
)
+ elif (
+ "data_type" in attrs
+ and attrs["data_type"] == CustomField.FieldDataType.MONETARY
+ and "extra_data" in attrs
+ and "default_currency" in attrs["extra_data"]
+ and attrs["extra_data"]["default_currency"] is not None
+ and (
+ not isinstance(attrs["extra_data"]["default_currency"], str)
+ or (
+ len(attrs["extra_data"]["default_currency"]) > 0
+ and len(attrs["extra_data"]["default_currency"]) != 3
+ )
+ )
+ ):
+ raise serializers.ValidationError(
+ {"error": "extra_data.default_currency must be a 3-character string"},
+ )
return super().validate(attrs)
diff --git a/src/documents/tests/test_api_custom_fields.py b/src/documents/tests/test_api_custom_fields.py
index edebf7f3c..6ffe14681 100644
--- a/src/documents/tests/test_api_custom_fields.py
+++ b/src/documents/tests/test_api_custom_fields.py
@@ -137,6 +137,66 @@ class TestCustomFieldsAPI(DirectoriesMixin, APITestCase):
)
self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
+ def test_create_custom_field_monetary_validation(self):
+ """
+ GIVEN:
+ - Custom field does not exist
+ WHEN:
+ - API request to create custom field with invalid default currency option
+ - API request to create custom field with valid default currency option
+ THEN:
+ - HTTP 400 is returned
+ - HTTP 201 is returned
+ """
+
+ # not a string
+ resp = self.client.post(
+ self.ENDPOINT,
+ json.dumps(
+ {
+ "data_type": "monetary",
+ "name": "Monetary Field",
+ "extra_data": {
+ "default_currency": 123,
+ },
+ },
+ ),
+ content_type="application/json",
+ )
+ self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
+
+ # not a 3-letter currency code
+ resp = self.client.post(
+ self.ENDPOINT,
+ json.dumps(
+ {
+ "data_type": "monetary",
+ "name": "Monetary Field",
+ "extra_data": {
+ "default_currency": "EU",
+ },
+ },
+ ),
+ content_type="application/json",
+ )
+ self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
+
+ # valid currency code
+ resp = self.client.post(
+ self.ENDPOINT,
+ json.dumps(
+ {
+ "data_type": "monetary",
+ "name": "Monetary Field",
+ "extra_data": {
+ "default_currency": "EUR",
+ },
+ },
+ ),
+ content_type="application/json",
+ )
+ self.assertEqual(resp.status_code, status.HTTP_201_CREATED)
+
def test_create_custom_field_instance(self):
"""
GIVEN:
diff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.py
index b585d70c5..5b56e2cca 100644
--- a/src/documents/tests/test_consumer.py
+++ b/src/documents/tests/test_consumer.py
@@ -322,6 +322,18 @@ class TestConsumer(
shutil.copy(src, dst)
return dst
+ def get_test_file2(self):
+ src = (
+ Path(__file__).parent
+ / "samples"
+ / "documents"
+ / "originals"
+ / "0000002.pdf"
+ )
+ dst = self.dirs.scratch_dir / "sample2.pdf"
+ shutil.copy(src, dst)
+ return dst
+
def get_test_archive_file(self):
src = (
Path(__file__).parent / "samples" / "documents" / "archive" / "0000001.pdf"
@@ -642,6 +654,47 @@ class TestConsumer(
with self.get_consumer(self.get_test_file()) as consumer:
consumer.run()
+ def testDuplicateInTrash(self):
+ with self.get_consumer(self.get_test_file()) as consumer:
+ consumer.run()
+
+ Document.objects.all().delete()
+
+ with self.get_consumer(self.get_test_file()) as consumer:
+ with self.assertRaisesMessage(ConsumerError, "document is in the trash"):
+ consumer.run()
+
+ def testAsnExists(self):
+ with self.get_consumer(
+ self.get_test_file(),
+ DocumentMetadataOverrides(asn=123),
+ ) as consumer:
+ consumer.run()
+
+ with self.get_consumer(
+ self.get_test_file2(),
+ DocumentMetadataOverrides(asn=123),
+ ) as consumer:
+ with self.assertRaisesMessage(ConsumerError, "ASN 123 already exists"):
+ consumer.run()
+
+ def testAsnExistsInTrash(self):
+ with self.get_consumer(
+ self.get_test_file(),
+ DocumentMetadataOverrides(asn=123),
+ ) as consumer:
+ consumer.run()
+
+ document = Document.objects.first()
+ document.delete()
+
+ with self.get_consumer(
+ self.get_test_file2(),
+ DocumentMetadataOverrides(asn=123),
+ ) as consumer:
+ with self.assertRaisesMessage(ConsumerError, "document is in the trash"):
+ consumer.run()
+
@mock.patch("documents.parsers.document_consumer_declaration.send")
def testNoParsers(self, m):
m.return_value = []
