From b18cfcf533541c26d71ec540e941d3c9d85228a3 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Thu, 20 Jul 2023 17:06:46 +0300 Subject: [PATCH] [Library | develop]: resultLanding.component.html & resultLanding.component.ts & transferData.component.html & transferData.component.ts: In desktop view, reverted data transfer modal to normal instead of full screen & small fixes for action icon and modal view | aligned "Go to search" back button with the rest of the page contents. --- .../result/resultLanding.component.html | 24 +- .../result/resultLanding.component.ts | 1 + .../dataTransfer/transferData.component.html | 272 +++++++++--------- utils/dataTransfer/transferData.component.ts | 37 ++- 4 files changed, 192 insertions(+), 142 deletions(-) diff --git a/landingPages/result/resultLanding.component.html b/landingPages/result/resultLanding.component.html index 0abe1f56..df125f35 100644 --- a/landingPages/result/resultLanding.component.html +++ b/landingPages/result/resultLanding.component.html @@ -3,7 +3,7 @@
-
+
@@ -489,6 +489,16 @@
+
+
+
+ + + Go to Search + +
+
+
- + +
+ +
+
+
- + diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index ecbaeca2..0aa95a05 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -239,6 +239,7 @@ export class ResultLandingComponent { this.initMetaAndLinks(this.type); } if(data["egiTransfer"] && data["egiTransfer"] == 't'){ + this.mobileContent = 'actions'; this.egiTransferModalOpen = true; } this.updateDescription(""); diff --git a/utils/dataTransfer/transferData.component.html b/utils/dataTransfer/transferData.component.html index f6b84902..56e3e392 100644 --- a/utils/dataTransfer/transferData.component.html +++ b/utils/dataTransfer/transferData.component.html @@ -1,143 +1,155 @@ - - Transfer - - + [title]="'Send data to cloud storage'" + [attr.uk-tooltip]="'pos: bottom; cls: uk-active uk-text-small uk-padding-small'" + class="uk-flex uk-flex-middle uk-flex-center uk-button-link" + [class.uk-text-bolder]="!isMobile"> + + Transfer + - -
-
- In order to send data to a Cloud Storage, you would need to be authenticated, please login via EGI check-in. + + + + + + + + + +
+
+ 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 DOI URLs:

+
+
+
{{this.downloadElements.length}} files found:
+
+
    +
  • {{ element.name}} +
    • +
+
+
-
+
-
- + +
+ + + + + + + +

Destination storage type:

+
+ +

Destination system (e.g. hostname:8080):

+
+ + +

Authentication:

+
+
+
+
+ + + +

Destination path (e.g. /folder1/folder2):

+
+ +

or browse to + select a folder.

+
+ +
+ + + +

Comming soon!

+ + +
+ + + *I have read and accepted the data protection policy here. +
+ +
+ +
+
-
-
- 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 DOI URLs:

-
-
-
{{this.downloadElements.length}} files found:
-
-
    -
  • {{ element.name}} -
    • -
-
-
-
-
-
- -
- - - - - - - -

Destination storage type:

-
- -

Destination system (e.g. hostname:8080):

-
- - -

Authentication:

-
-
-
-
- - - -

Destination path (e.g. /folder1/folder2):

-
- -

or browse to - select a folder.

-
- -
- - - -

Comming soon!

- - -
- - - *I have read and accepted the data protection policy here. -
- -
- -
- -
-
- - -
-
- - - -
-
+ + +
+
+ + + +
+
-
-
- - - - - - - + +
+ + + + + + + - -
- + +
+ diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts index 647d6a3c..6b281846 100644 --- a/utils/dataTransfer/transferData.component.ts +++ b/utils/dataTransfer/transferData.component.ts @@ -10,6 +10,7 @@ import {delay, repeat, startWith, switchMap} from "rxjs/operators"; import {StringUtils} from "../string-utils.class"; import {HelperFunctions} from "../HelperFunctions.class"; import {FullScreenModalComponent} from "../modal/full-screen-modal/full-screen-modal.component"; +import {AlertModal} from "../modal/alert"; declare var UIkit; @Component({ @@ -35,6 +36,7 @@ declare var UIkit; `] }) export class EGIDataTransferComponent { + @Input() isMobile: boolean = false; subscriptions = []; statusSub: Subscription[] = []; accessToken = null; @@ -55,7 +57,8 @@ export class EGIDataTransferComponent { downloadElements = null; @Input() isOpen = false; // @Input() selectedDestinationId = "dcache"; - @ViewChild('egiTransferModal') egiTransferModal: FullScreenModalComponent; + @ViewChild('egiTransferModal') egiTransferModal: AlertModal; + @ViewChild('egiTransferFsModal') egiTransferFsModal: FullScreenModalComponent; APIURL = properties.eoscDataTransferAPI; // status: "loading" | "success" | "errorParser" | "errorUser" | "errorTransfer" | "init" | "canceled" = "init"; status: "unused" | "staging" | "submitted" | "active" | "succeeded" | "partial" | "failed" | "canceled" | "errorParser" | "errorUser" | "init" = "init"; @@ -146,20 +149,36 @@ export class EGIDataTransferComponent { this.parse(); } this.isOpen = true; - this.egiTransferModal.back = true; - this.egiTransferModal.cancelButton = false; - this.egiTransferModal.okButton = false; - this.egiTransferModal.okButtonText = ">> Transfer"; - this.egiTransferModal.title = "EOSC Data Transfer"; this.init(); - if(typeof document !== 'undefined') { - this.egiTransferModal.open(); + + if(!this.isMobile) { + // this.egiTransferModal.back = true; + this.egiTransferModal.cancelButton = false; + this.egiTransferModal.okButton = true; + this.egiTransferModal.okButtonText = ">> Transfer"; + this.egiTransferModal.alertTitle = "EOSC Data Transfer"; + if(typeof document !== 'undefined') { + this.egiTransferModal.open(); + } + } else { + this.egiTransferFsModal.back = false; + this.egiTransferFsModal.cancelButton = true; + this.egiTransferFsModal.okButton = false; + this.egiTransferFsModal.okButtonText = ">> Transfer"; + this.egiTransferFsModal.title = "EOSC Data Transfer"; + if(typeof document !== 'undefined') { + this.egiTransferFsModal.open(); + } } } close(){ if(this.isOpen) { this.isOpen = false; - this.egiTransferModal.cancel(); + if(!this.isMobile) { + this.egiTransferModal.cancel(); + } else { + this.egiTransferFsModal.cancel(); + } } // this.downloadElements = []; this.init();