Added release files modal. Resolves #1047. (#1079)

Author: MillenniumFalconMechanic

spa/src/app/files/_ngrx/release/clear-release-files-referrer.action.ts

@@ -0,0 +1,16 @@
+/**
+ * Human Cell Atlas
+ * https://www.humancellatlas.org/
+ *
+ * Action triggered when release files modal referrer indicator should be cleared.
+ */
+
+// Core dependencies
+import { Action } from "@ngrx/store";
+
+export class ClearReleaseFilesReferrerAction implements Action {
+    public static ACTION_TYPE = "RELEASES.CLEAR_RELEASE_FILES_REFERRER";
+    public readonly type = ClearReleaseFilesReferrerAction.ACTION_TYPE;
+    constructor() {}
+}
+

spa/src/app/files/_ngrx/release/clear-release-referrer.action.ts

@@ -2,7 +2,7 @@
  * Human Cell Atlas
  * https://www.humancellatlas.org/
  *
- * Action triggered when release referrer indicator should be cleared.
+ * Action triggered when release list page referrer indicator should be cleared.
  */
 
 // Core dependencies

spa/src/app/files/_ngrx/release/fetch-releases-success.action.ts

@@ -9,7 +9,7 @@
 import { Action } from "@ngrx/store";
 
 // App dependencies
-import { Release } from "../../releases/2020-march/release.model";
+import { Release } from "../../releases/release.model";
 
 export class FetchReleasesSuccessAction implements Action {
     public static ACTION_TYPE = "RELEASES.RELEASES_SUCCESS";

spa/src/app/files/_ngrx/release/release.reducer.ts

@@ -14,11 +14,16 @@ import { FetchReleasesRequestAction } from "./fetch-releases-request.action";
 import { FetchReleasesSuccessAction } from "./fetch-releases-success.action";
 import { ReleaseState } from "./release.state";
 import { SetReleaseReferrerAction } from "./set-release-referrer.action";
+import { ClearReleaseFilesReferrerAction } from "./clear-release-files-referrer.action";
+import { SetReleaseFilesReferrerAction } from "./set-release-files-referrer.action";
 
 export function reducer(state: ReleaseState = ReleaseState.getDefaultState(), action: Action): ReleaseState {
 
     switch (action.type) {
 
+        case ClearReleaseFilesReferrerAction.ACTION_TYPE:
+            return state.clearReleaseFilesReferrer();
+            
         case ClearReleaseReferrerAction.ACTION_TYPE:
             return state.clearReleaseReferrer();
 
@@ -27,6 +32,9 @@ export function reducer(state: ReleaseState = ReleaseState.getDefaultState(), ac
 
         case FetchReleasesSuccessAction.ACTION_TYPE:
             return state.fetchReleasesSuccess(action as FetchReleasesSuccessAction);
+
+        case SetReleaseFilesReferrerAction.ACTION_TYPE:
+            return state.setReleaseFilesReferrer();
 
         case SetReleaseReferrerAction.ACTION_TYPE:
             return state.setReleaseReferrer();

spa/src/app/files/_ngrx/release/release.selectors.ts

@@ -31,9 +31,12 @@ export const selectReleaseByName =
 /**
  * Returns the release with only the specified project, if project is a part of the release.
  */
-export const selectReleaseByNameAndProjectId =
+export const selectReleaseByProjectId =
     createSelector(selectReleases, (state, props) => {
+        
         const release = state.releasesByName.get(props.name);
+        
+        // Filter down the set of projects in this release to just the project we are looking for
         const project = release.projects.find(project => project.entryId === props.projectId);
         return Object.assign({}, release, {
             projects: project ? [project] : []
@@ -46,3 +49,37 @@ export const selectReleaseByNameAndProjectId =
 export const selectReleaseReferrer =
     createSelector(selectReleases, (state) => state.releaseReferrer);
 
+/**
+ * Return the release files referrer.
+ */
+export const selectReleaseFilesReferrer =
+    createSelector(selectReleases, (state) => state.releaseFilesReferrer);
+
+/**
+ * Return the dataset with the specified ID, for the specified project and release.
+ */
+export const selectReleaseByDataset =
+    createSelector(selectReleases, (state, props) => {
+        
+        const release = state.releasesByName.get(props.name);
+        const project = release.projects.find(project => project.entryId === props.projectId);
+        
+        // If project is not part of the release, return release with an empty array of projects
+        if ( !project ) {
+            return Object.assign({}, release, {
+                projects: []
+            });
+        }
+
+        // Filter the datasets down the one we are looking for and modify the project to contain just that single dataset.
+        const dataset = project.datasets.find(dataset => dataset.datasetId === props.datasetId);
+        const projectWithFilteredDatasets = Object.assign({}, project, {
+            datasets: dataset ? [dataset] : []
+        });
+        
+        // Return release containing just the project and dataset we're looking for
+        return Object.assign({}, release, {
+            projects: [projectWithFilteredDatasets]
+        });
+    });
+

spa/src/app/files/_ngrx/release/release.state.ts

@@ -6,18 +6,20 @@
  */
 
 // App dependencies
-import { Release } from "../../releases/2020-march/release.model";
+import { Release } from "../../releases/release.model";
 import { FetchReleasesSuccessAction } from "./fetch-releases-success.action";
 import { Releases } from "./releases.model";
 
 const DEFAULT_RELEASE_STATE = {
     releasesByName: new Map(),
+    releaseFilesReferrer: false,
     releaseReferrer: false
 };
 
 export class ReleaseState implements Releases {
 
     releasesByName: Map<string, Release>;
+    releaseFilesReferrer: boolean;
     releaseReferrer: boolean;
 
     /**
@@ -27,6 +29,17 @@ export class ReleaseState implements Releases {
         Object.assign(this, state);
     }
 
+    /**
+     * Set release files referrer to false.
+     */
+    public clearReleaseFilesReferrer(): ReleaseState {
+
+        return new ReleaseState({
+            releasesByName: this.releasesByName,
+            releaseFilesReferrer: false,
+            releaseReferrer: this.releaseReferrer
+        });
+    }
 
     /**
      * Set release referrer to false.
@@ -35,6 +48,7 @@ export class ReleaseState implements Releases {
 
         return new ReleaseState({
             releasesByName: this.releasesByName,
+            releaseFilesReferrer: this.releaseFilesReferrer,
             releaseReferrer: false
         });
     }
@@ -59,18 +73,32 @@ export class ReleaseState implements Releases {
 
         return new ReleaseState({
             releasesByName,
+            releaseFilesReferrer: this.releaseFilesReferrer,
             releaseReferrer: this.releaseReferrer
         });
     }
 
+    /**
+     * Set release files referrer to true.
+     */
+    public setReleaseFilesReferrer(): ReleaseState {
+
+        return new ReleaseState({
+            releasesByName: this.releasesByName,
+            releaseReferrer: this.releaseReferrer,
+            releaseFilesReferrer: true
+        });
+    }
+
     /**
      * Set release referrer to true.
      */
     public setReleaseReferrer(): ReleaseState {
 
         return new ReleaseState({
             releasesByName: this.releasesByName,
-            releaseReferrer: true
+            releaseReferrer: true,
+            releaseFilesReferrer: this.releaseFilesReferrer
         });
     }
 

spa/src/app/files/_ngrx/release/releases.model.ts

@@ -6,9 +6,10 @@
  */
 
 // App dependencies
-import { Release } from "../../releases/2020-march/release.model";
+import { Release } from "../../releases/release.model";
 
 export interface Releases {
     releasesByName: Map<string, Release>;
+    releaseFilesReferrer: boolean;
     releaseReferrer: boolean;
 }

spa/src/app/files/_ngrx/release/set-release-files-referrer.action.ts

@@ -0,0 +1,17 @@
+/**
+ * Human Cell Atlas
+ * https://www.humancellatlas.org/
+ *
+ * Action triggered when release files modal should return to the release list page on close, and not the project
+ * release tab.
+ */
+
+// Core dependencies
+import { Action } from "@ngrx/store";
+
+export class SetReleaseFilesReferrerAction implements Action {
+    public static ACTION_TYPE = "RELEASES.SET_RELEASE_FILES_REFERRER";
+    public readonly type = SetReleaseFilesReferrerAction.ACTION_TYPE;
+    constructor() {}
+}
+

spa/src/app/files/_ngrx/release/set-release-referrer.action.ts

@@ -2,11 +2,8 @@
  * Human Cell Atlas
  * https://www.humancellatlas.org/
  *
- * Action triggered when project-specific pages should return to the release page, and not the natural app page.
- * Specifically:
- *
- * 1. Project detail back button returns to release page and not to projects tab
- * 2. Release files modal close button returns to release page and not to project detail release tab
+ * Action triggered when project-specific pages should return to the release list page, and not the natural app page.
+ * Specifically, project detail back button returns to release list page and not to projects tab.
  */
 
 // Core dependencies

spa/src/app/files/files.module.ts

@@ -100,6 +100,10 @@ import { ProjectReleaseComponent } from "./project-release/project-release.compo
 import { ProjectSummaryStatsComponent } from "./project-summary-stats-component/project-summary-stats.component";
 import { ProjectViewFactory } from "./project-view/project-view.factory";
 import { ReleaseComponent } from "./releases/release.component";
+import { ReleaseFileComponent } from "./releases/release-file/release-file.component";
+import { ReleaseFileDownloadComponent } from "./releases/release-file-download/release-file-download.component";
+import { ReleaseFilesModalComponent } from "./releases/release-files-modal/release-files-modal.component";
+import { ReleaseFilesModalContainerComponent } from "./releases/release-files-modal-container/release-files-modal-container.component";
 import { ReleaseTableComponent } from "./releases/release-table/release-table.component";
 import { ReleaseTitleOverlineComponent } from "./releases/release-title-overline/release-title-overline.component";
 import { SearchTermService } from "./shared/search-term.service";
@@ -212,13 +216,18 @@ import { ReleaseService } from "./shared/release.service";
         ProjectSummaryStatsComponent,
         ProjectSupplementaryLinksComponent,
         ReleaseComponent,
+        ReleaseFileComponent,
+        ReleaseFileDownloadComponent,
+        ReleaseFilesModalComponent,
+        ReleaseFilesModalContainerComponent,
         ReleaseTableComponent,
         ReleaseTitleOverlineComponent,
         TableScroll
     ],
     entryComponents: [
         ProjectDownloadManifestModalComponent,
-        ProjectDownloadMatrixModalComponent
+        ProjectDownloadMatrixModalComponent,
+        ReleaseFilesModalComponent
     ],
     providers: [
         ConfigService,