From: Bastian Dehn <hhaalo@arcor.de>
Date: Thu, 9 Jun 2022 20:19:15 +0000 (+0200)
Subject: change: json export with observable
X-Git-Tag: v1.0^2~12
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=b9929dcfc9f1c07bef9e29798678257f9f600095;p=speisekarten-editor.git

change: json export with observable
---

diff --git a/src/app/app.component.html b/src/app/app.component.html
index fcf353f..b7e8c55 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -6,8 +6,8 @@
 		type="button"
 		id="exportJson"
 		(click)="exportJson()">Export</button>
-	<a [href]="downloadJsonHref"
-		id="exportLink"
+	<a id="exportLink"
+		[href]="downloadJsonHref"
 		[hidden]="downloadJsonHref === ''"
 		download="speisekarte.json">Download</a>
 	<button class="button"
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 386cba1..312aceb 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -21,8 +21,10 @@ export class AppComponent
 
 	public exportJson(): void
 	{
-		this.downloadJsonHref = this.jsonFileService.exportJson(
-			this.foodcard);
+		let observ = this.jsonFileService.exportJson(this.foodcard);
+		observ.subscribe((next) => {
+			this.downloadJsonHref = next;
+		});
 	}
 
 	public fileEvent(event: any): void
@@ -30,7 +32,6 @@ export class AppComponent
 		let importobserv = this.jsonFileService.importJson(event);
 		importobserv.subscribe((next) => {
 			this.foodcard = next;
-			console.log(next);
 		});
 	}
 
diff --git a/src/app/json-file.service.ts b/src/app/json-file.service.ts
index f6f3d65..5ed1bc4 100644
--- a/src/app/json-file.service.ts
+++ b/src/app/json-file.service.ts
@@ -11,11 +11,15 @@ export class JsonFileService
 {
 	constructor(private sanitizer: DomSanitizer) {}
 
-	public exportJson(foodcard: IFoodCard): SafeUrl
+	public exportJson(foodcard: IFoodCard): Observable<string>
 	{
-		let json = JSON.stringify(foodcard);
-		return this.sanitizer.bypassSecurityTrustUrl(
-			"data:text/json;charset=UTF-8," + json);
+		let observ = new Observable<string>((observ) => {
+			let json = JSON.stringify(foodcard);
+			let result = <string> this.sanitizer.bypassSecurityTrustUrl("data:text/json;charset=UTF-8," + json);
+			observ.next(result);
+		});
+
+		return observ
 	}
 
 	public importJson(event: any): Observable<IFoodCard>