Merge b564fa0 into 407e35f

Author: nguyenlinhlinh

src/app/app-config.module.spec.ts

@@ -13,15 +13,15 @@ describe("AppConfigModule", () =>{
       imports: [AppConfigModule],
     });
   });
-  
+
   it("initializes", () => {
     const module = TestBed.inject(AppConfigModule);
     expect(module).toBeTruthy();
   });
 
-  
+
   describe("initial environment", () =>{
-    
+
     it("initialized", () => {
       expect(environment.loginFormEnabled).toBeTruthy();
       expect(environment.oAuth2Endpoints.length).toEqual(0);
@@ -40,6 +40,7 @@ describe("AppConfigModule", () =>{
     it ("constructs", () => {
       const appConfig: AppConfig = {
         lbBaseURL: "lbBaseURL",
+        fileserverButtonLabel: "Download",
         externalAuthEndpoint: "externalAuthEndpoint",
         fileserverBaseURL: "fileserverBaseURL",
         synapseBaseUrl:  "synapseBaseUrl",
@@ -97,10 +98,10 @@ describe("AppConfigModule", () =>{
       expect(appConfig.disabledDatasetColumns[0]).toEqual("disabledDatasetColumns");
     });
   });
-  
+
   describe("OAuth2Endpoint", () => {
 
-  
+
 
     it("has initial values", () => {
       const endpoint2: OAuth2Endpoint = new OAuth2Endpoint();
@@ -114,7 +115,7 @@ describe("AppConfigModule", () =>{
         displayText: "test",
         authURL: "foo/bar"
       };
-  
+
       expect(endpoint.displayText).toEqual("test");
       expect(endpoint.authURL).toEqual("foo/bar");
       expect(endpoint.displayImage).toBeUndefined();

src/app/app-config.module.ts

@@ -19,6 +19,7 @@ export class AppConfig {
   lbBaseURL = "";
   externalAuthEndpoint: string | null = null;
   fileserverBaseURL: string | null = null;
+  fileserverButtonLabel: string | null = null;
   synapseBaseUrl: string | null = null;
   riotBaseUrl: string | null = null;
   jupyterHubUrl: string | null = null;
@@ -69,6 +70,7 @@ export const APP_DI_CONFIG: AppConfig = {
   lbBaseURL: environment.lbBaseURL ?? "http://localhost:3000",
   externalAuthEndpoint: environment.externalAuthEndpoint ?? null,
   fileserverBaseURL: environment.fileserverBaseURL ?? null,
+  fileserverButtonLabel: environment.fileserverButtonLabel ?? "Download",
   synapseBaseUrl: environment.synapseBaseUrl ?? null,
   riotBaseUrl: environment.riotBaseUrl ?? null,
   jupyterHubUrl: environment.jupyterHubUrl ?? null,
@@ -126,7 +128,7 @@ export const APP_DI_CONFIG: AppConfig = {
   landingPage: environment.landingPage ?? null,
   editPublishedData: (environment.editPublishedData === undefined) ? true: environment.editPublishedData,
   oAuth2Endpoints: environment.oAuth2Endpoints ?? [],
-  loginFormEnabled: (environment.loginFormEnabled == undefined) ? true: environment.loginFormEnabled
+  loginFormEnabled: (environment.loginFormEnabled == undefined) ? true: environment.loginFormEnabled,
 };
 
 @NgModule({

src/app/datasets/datafiles/datafiles.component.html

@@ -21,7 +21,7 @@
   </div>
 </ng-template>
 
-<ng-template [ngIf]="tableData && maxFileSize">
+<ng-template [ngIf]="tableData">
   <div class="selected" fxLayout="row" fxLayoutAlign="space-evenly end">
     <div fxFlex="auto" style="margin-bottom: 0.5em;">
       Selected: {{ selectedFileSize | filesize
@@ -58,7 +58,8 @@ <h3>No datafiles linked to this dataset</h3>
       [name]="'files[' + i + ']'"
       [value]="file"
     />
-    <button
+    <ng-template [ngIf]="multipleDownloadAction">
+      <button
       mat-raised-button
       class="download-button"
       type="submit"
@@ -67,6 +68,8 @@ <h3>No datafiles linked to this dataset</h3>
     >
       Download All
     </button>
+    </ng-template>
+
   </form>
 
   <form
@@ -84,7 +87,8 @@ <h3>No datafiles linked to this dataset</h3>
       [name]="'files[' + i + ']'"
       [value]="file"
     />
-    <button
+    <ng-template [ngIf]="multipleDownloadAction">
+      <button
       mat-raised-button
       class="download-button"
       type="submit"
@@ -95,10 +99,35 @@ <h3>No datafiles linked to this dataset</h3>
     >
       Download Selected
     </button>
+    </ng-template>
   </form>
+
+  <ng-template [ngIf]="(isLoggedIn$ | async) === false && fileserverBaseURL">
+    <button
+    mat-raised-button
+    class="download-button"
+    type="submit"
+    color="accent"
+    [disabled]="isNoneSelected"
+    (click)="openDialog()"
+  >
+    {{ fileserverButtonLabel}}
+  </button>
+  </ng-template>
+  <ng-template [ngIf]="(isLoggedIn$ | async) && fileserverBaseURL">
+    <a
+      mat-raised-button
+      class="download-button"
+      color="accent"
+      [href]="getFileTransferLink()" target="_blank"
+    >
+    {{ fileserverButtonLabel}}
+    </a>
+  </ng-template>
+
+
   <div style="clear: both;"></div>
 </div>
-
 <app-table
   [data]="tableData"
   [columns]="tableColumns"

src/app/datasets/datafiles/datafiles.component.spec.ts

@@ -9,10 +9,11 @@ import { PipesModule } from "shared/pipes/pipes.module";
 import { RouterModule } from "@angular/router";
 import { StoreModule } from "@ngrx/store";
 import { CheckboxEvent } from "shared/modules/table/table.component";
-import { MockUserApi } from "shared/MockStubs";
+import { MockMatDialogRef, MockUserApi } from "shared/MockStubs";
 import { MatCheckboxChange } from "@angular/material/checkbox";
 import { MatIconModule } from "@angular/material/icon";
 import { MatButtonModule } from "@angular/material/button";
+import { MatDialogModule, MatDialogRef } from "@angular/material/dialog";
 
 describe("DatafilesComponent", () => {
   let component: DatafilesComponent;
@@ -29,6 +30,7 @@ describe("DatafilesComponent", () => {
           MatTableModule,
           PipesModule,
           ReactiveFormsModule,
+          MatDialogModule,
           RouterModule,
           RouterModule.forRoot([], { relativeLinkResolution: "legacy" }),
           StoreModule.forRoot({}),
@@ -37,7 +39,9 @@ describe("DatafilesComponent", () => {
       });
       TestBed.overrideComponent(DatafilesComponent, {
         set: {
-          providers: [{ provide: UserApi, useClass: MockUserApi }],
+          providers: [
+            { provide: UserApi, useClass: MockUserApi },
+            { provide: MatDialogRef, useClass: MockMatDialogRef }]
         },
       });
       TestBed.compileComponents();

src/app/datasets/datafiles/datafiles.component.ts

@@ -1,5 +1,4 @@
 import { APP_CONFIG, AppConfig } from "app-config.module";
-import { Dataset } from "shared/sdk/models";
 import {
   Component,
   OnInit,
@@ -20,10 +19,13 @@ import {
   PageChangeEvent,
   CheckboxEvent,
 } from "shared/modules/table/table.component";
-import { selectIsLoading } from "state-management/selectors/user.selectors";
-import { Datablock, UserApi } from "shared/sdk";
+import { selectIsLoading, selectIsLoggedIn } from "state-management/selectors/user.selectors";
+import { Dataset, Job, UserApi } from "shared/sdk";
 import { FileSizePipe } from "shared/pipes/filesize.pipe";
 import { MatCheckboxChange } from "@angular/material/checkbox";
+import { MatDialog } from "@angular/material/dialog";
+import { PublicDownloadDialogComponent } from "datasets/public-download-dialog/public-download-dialog.component";
+import { submitJobAction } from "state-management/actions/jobs.actions";
 
 export interface File {
   path: string;
@@ -46,7 +48,7 @@ export class DatafilesComponent
   datablocks$ = this.store.select(selectCurrentOrigDatablocks);
   dataset$ = this.store.select(selectCurrentDataset);
   loading$ = this.store.select(selectIsLoading);
-
+  isLoggedIn$ = this.store.select(selectIsLoggedIn);
   tooLargeFile = false;
   totalFileSize = 0;
   selectedFileSize = 0;
@@ -58,14 +60,18 @@ export class DatafilesComponent
 
   files: Array<any> = [];
   sourcefolder = "";
+  datasetPid = "";
 
   count = 0;
   pageSize = 25;
   currentPage = 0;
 
   fileDownloadEnabled: boolean = this.appConfig.fileDownloadEnabled;
   multipleDownloadEnabled: boolean = this.appConfig.multipleDownloadEnabled;
-  multipleDownloadAction: string | null = this.appConfig.multipleDownloadAction;
+  fileserverBaseURL: string | null = this.appConfig.fileserverBaseURL;
+  fileserverButtonLabel: string | null = this.appConfig.fileserverButtonLabel;
+  multipleDownloadAction: string | null = this.appConfig
+    .multipleDownloadAction;
   maxFileSize: number | null = this.appConfig.maxDirectDownloadSize;
   sftpHost: string | null = this.appConfig.sftpHost;
   jwt: any;
@@ -99,6 +105,7 @@ export class DatafilesComponent
     private store: Store<Dataset>,
     private cdRef: ChangeDetectorRef,
     private userApi: UserApi,
+    private dialog: MatDialog,
     @Inject(APP_CONFIG) public appConfig: AppConfig
   ) {}
 
@@ -193,6 +200,7 @@ export class DatafilesComponent
       this.dataset$.subscribe((dataset) => {
         if (dataset) {
           this.sourcefolder = dataset.sourceFolder;
+          this.datasetPid = dataset.pid;
         }
       })
     );
@@ -223,4 +231,29 @@ export class DatafilesComponent
   ngOnDestroy() {
     this.subscriptions.forEach((subscription) => subscription.unsubscribe());
   }
+  openDialog(): void {
+    const dialogRef = this.dialog.open(PublicDownloadDialogComponent, {
+      width: "500px",
+      data: {email: ""}
+    });
+    dialogRef.afterClosed().subscribe((email) => {
+      if (email) {
+        this.getSelectedFiles();
+        const data = {
+          emailJobInitiator: email,
+          creationTime: new Date(),
+          type: "public",
+          datasetList: [{
+            pid: this.datasetPid,
+            files: this.getSelectedFiles()
+          }]
+        };
+        const job = new Job(data);
+         this.store.dispatch(submitJobAction({ job }));
+      }
+    });
+  }
+  getFileTransferLink() {
+    return this.fileserverBaseURL + "&origin_path=" + encodeURIComponent(this.sourcefolder);
+  }
 }

src/app/datasets/datasets.module.ts

@@ -75,6 +75,7 @@ import { BatchCardModule } from "./batch-card/batch-card.module";
 import { JobEffects } from "state-management/effects/jobs.effects";
 import { LogbookEffects } from "state-management/effects/logbooks.effects";
 import { logbooksReducer } from "state-management/reducers/logbooks.reducer";
+import { PublicDownloadDialogComponent } from "./public-download-dialog/public-download-dialog.component";
 import { DatasetFileUploaderComponent } from "./dataset-file-uploader/dataset-file-uploader.component";
 import { AdminTabComponent } from "./admin-tab/admin-tab.component";
 
@@ -141,6 +142,7 @@ import { AdminTabComponent } from "./admin-tab/admin-tab.component";
     DatasetTableActionsComponent,
     DatasetLifecycleComponent,
     SampleEditComponent,
+    PublicDownloadDialogComponent,
     ShareDialogComponent,
     DatasetFileUploaderComponent,
     AdminTabComponent,

src/app/datasets/public-download-dialog/public-download-dialog.component.html

@@ -0,0 +1,15 @@
+<h1 mat-dialog-title>Request to download dataset</h1>
+<div mat-dialog-content>
+  <p>Please enter your email so we can contact you once the dataset is ready to be downloaded.</p>
+  <mat-form-field wid appearance="fill">
+    <mat-label>Email</mat-label>
+    <input matInput [formControl]="emailFormControl" type="email" [(ngModel)] ="data.email">
+    <mat-error *ngIf="emailFormControl.errors">
+      {{getErrorMessage()}}
+    </mat-error>
+  </mat-form-field>
+</div>
+<div mat-dialog-actions>
+  <button mat-button (click)="onCancel()">Cancel</button>
+  <button mat-button [mat-dialog-close]="data.email" [disabled]="hasError()">Submit</button>
+</div>

src/app/datasets/public-download-dialog/public-download-dialog.component.scss

@@ -0,0 +1,3 @@
+mat-form-field {
+  width: 100%;
+}

src/app/datasets/public-download-dialog/public-download-dialog.component.spec.ts

@@ -0,0 +1,39 @@
+import { ComponentFixture, TestBed, waitForAsync } from "@angular/core/testing";
+import { MatDialogModule, MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+import { MockMatDialogRef } from "shared/MockStubs";
+
+import { PublicDownloadDialogComponent } from "./public-download-dialog.component";
+
+describe("PublicDownloadDialogComponent", () => {
+  let component: PublicDownloadDialogComponent;
+  let fixture: ComponentFixture<PublicDownloadDialogComponent>;
+
+  beforeEach(
+    waitForAsync(() =>{
+      TestBed.configureTestingModule({
+        declarations: [ PublicDownloadDialogComponent ],
+        imports:[
+          MatDialogModule
+        ]
+      });
+      TestBed.overrideComponent(PublicDownloadDialogComponent, {
+        set: {
+          providers: [
+            { provide: MatDialogRef, useClass: MockMatDialogRef },
+            { provide: MAT_DIALOG_DATA, useClass: MockMatDialogRef },],
+        },
+      });
+      TestBed.compileComponents();
+    })
+  );
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PublicDownloadDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it("should create", () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/datasets/public-download-dialog/public-download-dialog.component.ts

@@ -0,0 +1,32 @@
+import { Component, Inject } from "@angular/core";
+import { FormControl, Validators } from "@angular/forms";
+import { MatDialogRef, MAT_DIALOG_DATA } from "@angular/material/dialog";
+
+@Component({
+  selector: "app-public-download-dialog",
+  templateUrl: "./public-download-dialog.component.html",
+  styleUrls: ["./public-download-dialog.component.scss"]
+})
+export class PublicDownloadDialogComponent {
+  emailFormControl = new FormControl("", [Validators.required, Validators.email]);
+  constructor(
+    public dialogRef: MatDialogRef<PublicDownloadDialogComponent>,
+    @Inject(MAT_DIALOG_DATA) public data: {email: string}
+  ) { }
+  hasError(): boolean {
+    return this.emailFormControl.hasError("required") || this.emailFormControl.hasError("email");
+  }
+  getErrorMessage():string {
+    if (this.emailFormControl.hasError("required")) {
+      return "Email is required";
+    }
+    if( this.emailFormControl.hasError("email")) {
+      return "Please enter valid email address";
+    }
+    return "";
+  }
+  onCancel(): void {
+    this.dialogRef.close();
+    this.emailFormControl.errors;
+  }
+}