Preview
Loading...
diff --git a/src-ui/src/app/components/split-merge/split-merge.component.ts b/src-ui/src/app/components/split-merge/split-merge.component.ts
index cc0a59ca..268b0bd9 100644
--- a/src-ui/src/app/components/split-merge/split-merge.component.ts
+++ b/src-ui/src/app/components/split-merge/split-merge.component.ts
@@ -31,6 +31,8 @@ export class SplitMergeComponent implements OnInit, OnDestroy {
private previewSub: Subscription
+ public error: string
+
constructor(
public splitMergeService: SplitMergeService,
private documentService: DocumentService,
@@ -47,6 +49,7 @@ export class SplitMergeComponent implements OnInit, OnDestroy {
this.save(true)
} else {
this.previewUrls = []
+ this.error = undefined
}
})
this.previewDebounce$.next()
@@ -103,14 +106,18 @@ export class SplitMergeComponent implements OnInit, OnDestroy {
this.previewUrls = []
this.splitMergeService.executeSplitMerge(preview, this.delete_source_documents, this.metadata_setting).subscribe(
result => {
- console.log('API split_merge result:', result)
this.loading = false
+ this.error = undefined
if (preview) {
this.previewUrls = result.map(r => this.splitMergeService.getPreviewUrl(r))
} else {
this.splitMergeService.clear()
this.router.navigate([""])
}
+ },
+ error => {
+ this.error = error
+ this.loading = false
}
)
}
diff --git a/src-ui/src/app/services/split-merge.service.ts b/src-ui/src/app/services/split-merge.service.ts
index 705af848..4b20b041 100644
--- a/src-ui/src/app/services/split-merge.service.ts
+++ b/src-ui/src/app/services/split-merge.service.ts
@@ -1,6 +1,7 @@
-import { HttpClient } from '@angular/common/http';
+import { HttpClient, HttpErrorResponse } from '@angular/common/http';
import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable, throwError } from 'rxjs';
+import { catchError } from 'rxjs/operators';
import { environment } from 'src/environments/environment';
import { PaperlessDocument, PaperlessDocumentPart, PaperlessDocumentSeparator } from '../data/paperless-document';
import { SplitMergeMetadata, SplitMergeRequest } from '../data/split-merge-request';
@@ -79,7 +80,14 @@ export class SplitMergeService {
metadata: metadata,
split_merge_plan: split_merge_plan
}
- return this.http.post(`${environment.apiBaseUrl}split_merge/`, request)
+ return this.http.post(`${environment.apiBaseUrl}split_merge/`, request).pipe(
+ catchError(this.handleError)
+ )
+ }
+
+ handleError(error: HttpErrorResponse) {
+ console.log('API split_merge result error:', error)
+ return throwError(error.message)
}
getPreviewUrl(previewKey: string) {
diff --git a/src-ui/src/theme.scss b/src-ui/src/theme.scss
index df2aea00..4d360baf 100644
--- a/src-ui/src/theme.scss
+++ b/src-ui/src/theme.scss
@@ -4,4 +4,9 @@ $primaryFaded: #d1ddd2;
$theme-colors: (
"primary": $primary
-);
\ No newline at end of file
+);
+
+.alert-heading {
+ font-size: 80%;
+ font-weight: bold;
+}