0) {
- this.resultLandingInfo.contexts = contexts.filter(context => this.publicCommunities.includes(context.idContext));
+ this.resultLandingInfo.contexts = contexts.filter(context => {
+ if(context.idContext == "eosc") {
+ this.belongsInEOSC = true;
+ }
+ return this.publicCommunities.includes(context.idContext)
+ });
this.cdr.detectChanges();
}
}
diff --git a/utils/dataTransfer/transferData.component.html b/utils/dataTransfer/transferData.component.html
index 2bc7dc11..687a06a1 100644
--- a/utils/dataTransfer/transferData.component.html
+++ b/utils/dataTransfer/transferData.component.html
@@ -15,10 +15,11 @@
+
+
+
0)
- || !validatePath() || !validateDestinationUrl() || (!this.downloadElements || this.downloadElements.length == 0)"
- (okEmitter)="transfer()" (cancelEmitter)="init()">
+ (cancelEmitter)="init()">
@@ -85,7 +86,7 @@
Destination path (e.g. /folder1/folder2):
-
or
diff --git a/utils/dataTransfer/transferData.component.ts b/utils/dataTransfer/transferData.component.ts
index 6b281846..0c250dfe 100644
--- a/utils/dataTransfer/transferData.component.ts
+++ b/utils/dataTransfer/transferData.component.ts
@@ -164,7 +164,7 @@ export class EGIDataTransferComponent {
this.egiTransferFsModal.back = false;
this.egiTransferFsModal.cancelButton = true;
this.egiTransferFsModal.okButton = false;
- this.egiTransferFsModal.okButtonText = ">> Transfer";
+ // this.egiTransferFsModal.okButtonText = ">> Transfer";
this.egiTransferFsModal.title = "EOSC Data Transfer";
if(typeof document !== 'undefined') {
this.egiTransferFsModal.open();
@@ -254,7 +254,7 @@ export class EGIDataTransferComponent {
"files": [],
"params": {
"priority": 0,
- "overwrite": true,
+ "overwrite": false,
"retry": 3
}
};
@@ -560,8 +560,9 @@ export class EGIDataTransferComponent {
}
}
validatePath():boolean {
- let exp1 = /^\/([A-z0-9-_+]+\/?)*$/g;
- return (this.destinationPath.length > 0 && this.destinationPath.match(exp1) != null)
+ // let exp1 = /^\/([A-z0-9-_+]+\/?)*$/g;
+ // let exp1 = /^\/([A-z0-9-_]+[+\/]?)*$/;
+ return (this.destinationPath.length > 0 && this.destinationPath.startsWith("/"))
}