From d40e9fadbfd66f06af867f036fb763ae0f024725 Mon Sep 17 00:00:00 2001
From: George Kalampokis <gkalampokis@cite.gr>
Date: Wed, 15 Jul 2020 12:35:22 +0300
Subject: [PATCH] Removed RDA JSON export from Datasets (it doesn't and it
 can't (cycling dependency))

---
 .../core/services/dataset/dataset.service.ts  |  7 ++++---
 .../overview/dataset-overview.component.html  |  5 +++--
 .../overview/dataset-overview.component.ts    | 19 ++++++++++---------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts
index e7306d139..b56e3b19c 100644
--- a/dmp-frontend/src/app/core/services/dataset/dataset.service.ts
+++ b/dmp-frontend/src/app/core/services/dataset/dataset.service.ts
@@ -90,7 +90,8 @@ export class DatasetService {
 		return this.httpClient.get(this.actionUrl + 'getPDF/' + id, { responseType: 'blob', observe: 'response', headers: headerPdf });
 	}
 
-	public downloadJson(id: string): Observable<HttpResponse<Blob>> {
-		return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' });
-	}
+	//GK: NO
+	// public downloadJson(id: string): Observable<HttpResponse<Blob>> {
+	// 	return this.httpClient.get(this.actionUrl + 'rda/' + id, { responseType: 'blob', observe: 'response' });
+	// }
 }
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index 26ed8b1a1..6bef1df73 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -122,10 +122,11 @@
 								<i class="fa fa-file-code-o pr-2"></i>
 								<span>{{'GENERAL.FILE-TYPES.XML' | translate}}</span>
 							</button>
-							<button mat-menu-item (click)="downloadJson(dataset.id)">
+							<!-- GK: NO-->
+							<!-- <button mat-menu-item (click)="downloadJson(dataset.id)">
 								<i class="fa fa-file-o pr-2"></i>
 								<span>{{'GENERAL.FILE-TYPES.JSON' | translate}}</span>
-							</button>
+							</button> -->
 						</mat-menu>
 					</div>
 					<div class="frame mb-3 pt-4 pl-3 pr-3 pb-1">
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
index 602fb0e0f..2443326d6 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.ts
@@ -342,15 +342,16 @@ export class DatasetOverviewComponent extends BaseComponent implements OnInit {
       });
   }
 
-  downloadJson(id: string) {
-    this.datasetService.downloadJson(id)
-      .pipe(takeUntil(this._destroyed))
-      .subscribe(response => {
-        const blob = new Blob([response.body], { type: 'application/json' });
-        const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
-        FileSaver.saveAs(blob, filename);
-      })
-  }
+  //GK: NO
+//   downloadJson(id: string) {
+//     this.datasetService.downloadJson(id)
+//       .pipe(takeUntil(this._destroyed))
+//       .subscribe(response => {
+//         const blob = new Blob([response.body], { type: 'application/json' });
+//         const filename = this.getFilenameFromContentDispositionHeader(response.headers.get('Content-Disposition'));
+//         FileSaver.saveAs(blob, filename);
+//       })
+//   }
 
   getFilenameFromContentDispositionHeader(header: string): string {
     const regex: RegExp = new RegExp(/filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/g);