From dc242a0a3e1e663548e10cf3355233e8e5349275 Mon Sep 17 00:00:00 2001 From: "k.triantafyllou" Date: Wed, 25 May 2022 12:44:13 +0300 Subject: [PATCH 1/3] Fix quickselections view in medium screens --- searchPages/searchUtils/quick-selections.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/searchPages/searchUtils/quick-selections.component.ts b/searchPages/searchUtils/quick-selections.component.ts index ef1ed181..dbe91093 100644 --- a/searchPages/searchUtils/quick-selections.component.ts +++ b/searchPages/searchUtils/quick-selections.component.ts @@ -16,7 +16,7 @@ import {OpenaireEntities} from "../../utils/properties/searchFields"; {{quickFilter.value}} -
+
Include:
From 0e8c5832bb886f6fbedfe2dcb9065849f20a9a5f Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Wed, 25 May 2022 12:52:00 +0300 Subject: [PATCH 2/3] [Aggregator & Library| new-theme]: Use common component in transferData.component.ts instead of uk-modal. 1. transferData.module.ts: Imported AlertModalModule. 2. transferData.component.ts: Use common component instead of uk-modal | Comment logs. 3 alert.ts: a. Added "@Input() public emitHidden: boolean = false;" and " @Output() public alertHidden: EventEmitter = new EventEmitter();" b. On ngAfterViewInit, if emitHidden is true, check when modal is hidden and emit alertHidden (currently used only in transferData.component.ts to reinitialize local fields and route). --- utils/dataTransfer/transferData.component.ts | 147 +++++++++---------- utils/dataTransfer/transferData.module.ts | 3 +- utils/modal/alert.ts | 19 +++ 3 files changed, 92 insertions(+), 77 deletions(-) diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index d2fca269..daed9c23 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -1,4 +1,4 @@ -import {Component, Input} from '@angular/core'; +import {Component, Input, ViewChild} from '@angular/core'; import {Subscriber} from "rxjs"; import {HttpClient, HttpHeaders} from "@angular/common/http"; import {AbstractControl, ValidatorFn, Validators} from "@angular/forms"; @@ -23,83 +23,70 @@ declare var UIkit; -
-
- -
-
-
-

EOSC data transfer service

-
-
- In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in. -
-
- -
-
-
-
-

EOSC data transfer service

-
-
- You have requested to send the data corresponding to the DOI {{selectedSourceUrl.split(doiPrefix)[1]}} to a cloud storage using the EOSC Data Transfer service -
-
-
-

Available Zenodo DOI URLs:

-
-
-
Files to be transferred:
-
-
    -
  • {{ element.name}} -
    • -
-
-
-
-
-
-
-

Please select the Destination Storage type and provide the corresponding storage destination path.

-
-
- -
-
-
-
+ +
+
+ In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in. +
+
+ +
+
+
+
+ You have requested to send the data corresponding to the DOI {{selectedSourceUrl.split(doiPrefix)[1]}} to a cloud storage using the EOSC Data Transfer service +
+
+
+

Available Zenodo DOI URLs:

+
+
+
Files to be transferred:
+
+
    +
  • {{ element.name}} +
    • +
+
+
-
+
+
+
+

Please select the Destination Storage type and provide the corresponding storage destination path.

+
+
+ +
+
+
+
-
-
-
-
- -
- -
-
-
- +
+
+
-
+
+ +
+
+ ` }) @@ -116,6 +103,7 @@ export class EGIDataTransferComponent { downloadElements = null; @Input() isOpen = false; + @ViewChild('egiTransferModal') egiTransferModal; APIURL = "https://eosc-data-transfer.vm.fedcloud.eu" // APIURL = "https://virtserver.swaggerhub.com/thebe14/eosc-future-data-transfer/1.0.0"; status: "loading" | "success" | "errorParser" | "errorUser" | "errorTransfer" | "init" = "init"; @@ -126,7 +114,7 @@ export class EGIDataTransferComponent { } - ngOnInit() { + ngAfterViewInit() { if(this.isOpen){ this.open(); } @@ -159,9 +147,16 @@ export class EGIDataTransferComponent { this.parse(); } this.isOpen = true; + this.egiTransferModal.cancelButton = false; + this.egiTransferModal.okButton = false; + this.egiTransferModal.alertTitle = "EOSC data transfer service"; + this.egiTransferModal.open(); } close(){ - this.isOpen = false; + if(this.isOpen) { + this.isOpen = false; + this.egiTransferModal.cancel(); + } // this.downloadElements = []; this.destinationPath = ""; this.selectedDestination = this.destinationOptions[0].value; @@ -201,7 +196,7 @@ export class EGIDataTransferComponent { } transfer() { - console.log(this.selectedDestination) + // console.log(this.selectedDestination) this.status = "loading"; let headers = new HttpHeaders({'Authorization': 'Bearer '+this.accessToken}); this.subscriptions.push(this.http.get(this.APIURL + "/user/info", {headers: headers}).subscribe( @@ -287,7 +282,7 @@ export class EGIDataTransferComponent { pathValidator( ): ValidatorFn { return (control: AbstractControl): { [key: string]: string } | null => { let exp1 = /^\/([A-z0-9-_+]+\/)*$/g; -console.log(this.destinationPath, (this.destinationPath.length > 0 && this.destinationPath.match(exp1) == null)) +// console.log(this.destinationPath, (this.destinationPath.length > 0 && this.destinationPath.match(exp1) == null)) if (this.destinationPath.length > 0 && this.destinationPath.match(exp1) == null) { return {'error': 'Path should start and end with "/" e.g /path/'}; } diff --git a/utils/dataTransfer/transferData.module.ts b/utils/dataTransfer/transferData.module.ts index 64aa6695..d78dd6d2 100644 --- a/utils/dataTransfer/transferData.module.ts +++ b/utils/dataTransfer/transferData.module.ts @@ -3,10 +3,11 @@ import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {EGIDataTransferComponent} from "./transferData.component"; import {InputModule} from "../../sharedComponents/input/input.module"; +import {AlertModalModule} from "../modal/alertModal.module"; @NgModule({ imports: [ - CommonModule, FormsModule, InputModule + CommonModule, FormsModule, InputModule, AlertModalModule ], declarations: [ diff --git a/utils/modal/alert.ts b/utils/modal/alert.ts index c1ddcff6..e67bbb1e 100644 --- a/utils/modal/alert.ts +++ b/utils/modal/alert.ts @@ -115,6 +115,12 @@ export class AlertModal { @Input() public choice: boolean = false; + /** + * If the value is true, on the hidden event the alertHidden Output is emitted + */ + @Input() + public emitHidden: boolean = false; + /** * if the value is true then on ok clicked, modal will stay open. */ @@ -130,11 +136,24 @@ export class AlertModal { */ @Output() public alertOutput: EventEmitter = new EventEmitter(); + /** + * If emitHidden is true, this output is emitted when modal is hidden. + */ + @Output() public alertHidden: EventEmitter = new EventEmitter(); + @ViewChild('element') element: ElementRef; constructor() { } + ngAfterViewInit() { + if(this.emitHidden) { + UIkit.util.on('#' + this.id, 'hidden', () => { + this.alertHidden.emit(true); + }); + } + } + /** * Opens a alert window creating backdrop. */ From e71e493aa28c0b365aeb22ac6e765e4728f5974b Mon Sep 17 00:00:00 2001 From: argirok Date: Wed, 25 May 2022 17:56:00 +0300 Subject: [PATCH 3/3] update Transfer data: enhance list of files, disable Transfer button when path is not valid, add [demo] in the title --- utils/dataTransfer/transferData.component.ts | 26 +++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index daed9c23..6e80b0a0 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -3,7 +3,6 @@ import {Subscriber} from "rxjs"; import {HttpClient, HttpHeaders} from "@angular/common/http"; import {AbstractControl, ValidatorFn, Validators} from "@angular/forms"; import {Location} from '@angular/common'; -import {StringUtils} from "../string-utils.class"; import {COOKIE} from "../../login/utils/helper.class"; import {Router} from "@angular/router"; import {properties} from "../../../../environments/environment"; @@ -13,7 +12,7 @@ declare var UIkit; selector: 'egi-transfer-data', template: ` @@ -42,9 +41,9 @@ declare var UIkit;

Available Zenodo DOI URLs:

-
-
Files to be transferred:
-
+
+
{{this.downloadElements.length}} files to be transferred:
+
  • {{ element.name}}
    • @@ -61,7 +60,7 @@ declare var UIkit; [validators]="validators" class="uk-margin-top">
@@ -149,7 +148,7 @@ export class EGIDataTransferComponent { this.isOpen = true; this.egiTransferModal.cancelButton = false; this.egiTransferModal.okButton = false; - this.egiTransferModal.alertTitle = "EOSC data transfer service"; + this.egiTransferModal.alertTitle = "EOSC data transfer service [demo]"; this.egiTransferModal.open(); } close(){ @@ -238,7 +237,7 @@ export class EGIDataTransferComponent { this.message = `
Data transfer has began!
Transfering ` + this.downloadElements.length + ` files to EGI Storage: -
+
    `; // TODO LATER we can call status for each file and see if the transfer has been complete @@ -279,14 +278,17 @@ export class EGIDataTransferComponent { let filename = url.split("/")[url.split("/").length - 1]; return filename.split("?")[0]; } - pathValidator( ): ValidatorFn { + pathValidator(): ValidatorFn { return (control: AbstractControl): { [key: string]: string } | null => { - let exp1 = /^\/([A-z0-9-_+]+\/)*$/g; -// console.log(this.destinationPath, (this.destinationPath.length > 0 && this.destinationPath.match(exp1) == null)) - if (this.destinationPath.length > 0 && this.destinationPath.match(exp1) == null) { + if (!this.validatePath()) { return {'error': 'Path should start and end with "/" e.g /path/'}; } return null; } } + validatePath():boolean { + let exp1 = /^\/([A-z0-9-_+]+\/)*$/g; + return (this.destinationPath.length > 0 && this.destinationPath.match(exp1) != null) + + } }