Hid release functionality for env other than local/ux-dev. Resolves #1153. (#1154)

Author: MillenniumFalconMechanic

spa/src/app/app.component.spec.ts

@@ -38,6 +38,7 @@ import { ActivatedRouteStub } from "./test/activated-route.stub";
 import { CCToolbarNavSubMenuComponent } from "./shared/cc-toolbar-nav-sub-menu/cc-toolbar-nav-sub-menu.component";
 import { CCToolbarNavSubMenuItemComponent } from "./shared/cc-toolbar-nav-sub-menu-item/cc-toolbar-nav-sub-menu-item.component";
 import { CCToolbarNavDropDownComponent } from "./shared/cc-toolbar-nav-drop-down/cc-toolbar-nav-drop-down.component";
+import { ReleaseService } from "./files/shared/release.service";
 
 
 describe("AppComponent:", () => {
@@ -101,6 +102,9 @@ describe("AppComponent:", () => {
             }, {
                 provide: LocalStorageService,
                 useValue: jasmine.createSpyObj("LocalStorageService", ["get", "set"])
+            }, {
+                provide: ReleaseService,
+                useValue: jasmine.createSpyObj("ReleaseService", ["buildReleaseView", "createReleaseDatasetView", "fetch2020MarchRelease", "isReleaseVisible"])
             }]
         });
 

spa/src/app/app.component.ts

@@ -19,6 +19,7 @@ import { selectConfigConfig } from "./config/_ngrx/config.selectors";
 import { SetViewStateAction } from "./files/_ngrx/file-facet-list/set-view-state.action";
 import { ClearReleaseReferrerAction } from "./files/_ngrx/release/clear-release-referrer.action";
 import { FetchProjectEditsRequestAction } from "./files/_ngrx/project-edits/fetch-project-edits-request.action";
+import { ReleaseService } from "./files/shared/release.service";
 import { EntityName } from "./files/shared/entity-name.model";
 import { FileFacetName } from "./files/shared/file-facet-name.model";
 import { QueryStringFacet } from "./files/shared/query-string-facet.model";
@@ -49,13 +50,15 @@ export class AppComponent implements OnInit, OnDestroy {
 
     /**
      * @param {DeviceDetectorService} deviceService
+     * @param {ReleaseService} releaseService
      * @param {Store<AppState>} store
      * @param {ActivatedRoute} activatedRoute
      * @param {Location} location
      * @param {Router} router
      * @param {Renderer2} renderer
      */
     constructor(private deviceService: DeviceDetectorService,
+                private releaseService: ReleaseService,
                 private store: Store<AppState>,
                 private activatedRoute: ActivatedRoute,
                 private location: Location,
@@ -106,11 +109,16 @@ export class AppComponent implements OnInit, OnDestroy {
     }
 
     /**
-     * Returns true when the url path is not the releases or project detail pages.
+     * Returns true when the url path is not the releases or project detail pages, and if we're currently on an
+     * environment where release is visible.
      *
      * @returns {boolean}
      */
     public showRelease() {
+        
+        if ( !this.releaseService.isReleaseVisible() ) {
+            return false;
+        }
 
         return !( this.router.url.includes("/releases/") || this.router.url.includes("/projects/") );
     }

spa/src/app/config/config.service.ts

@@ -151,6 +151,26 @@ export class ConfigService {
         return "";
     }
 
+    /**
+     * Returns true if the current environment is local.
+     *
+     * @returns {boolean}
+     */
+    public isEnvLocal(): boolean {
+
+        return this.deployment === "local";
+    }
+
+    /**
+     * Returns true if the current environment is ux-dev.
+     *
+     * @returns {boolean}
+     */
+    public isEnvUxDev(): boolean {
+
+        return this.deployment === "ux-dev";
+    }
+
     /**
      * Save the data URL as a local variable ogetAPIURLn this instance, and update the corresponding config value in the store.
      *

spa/src/app/files/project-nav/project-nav.component.ts

@@ -13,9 +13,10 @@ import { Subject } from "rxjs";
 import { takeUntil } from "rxjs/operators";
 
 // App dependencies
-import { NavItem } from "../../shared/nav/nav-item.model";
-import { EntityName } from "../shared/entity-name.model";
 import { ProjectNav } from "./project-nav.model";
+import { EntityName } from "../shared/entity-name.model";
+import { NavItem } from "../../shared/nav/nav-item.model";
+import { ReleaseService } from "../shared/release.service";
 
 @Component({
     selector: "project-nav",
@@ -42,8 +43,11 @@ export class ProjectNavComponent {
     /**
      * @param {ActivatedRoute} route
      * @param {DeviceDetectorService} deviceService
+     * @param {ReleaseService} releaseService
      */
-    constructor(private route: ActivatedRoute, private deviceService: DeviceDetectorService) {
+    constructor(private route: ActivatedRoute,
+                private deviceService: DeviceDetectorService,
+                private releaseService: ReleaseService) {
     }
 
     /**
@@ -73,7 +77,7 @@ export class ProjectNavComponent {
             ];
 
             // Check if project is a part of the release and add "releases" to the nav accordingly
-            if ( this.projectInRelease ) {
+            if ( this.releaseService.isReleaseVisible() && this.projectInRelease ) {
 
                 navItemList.push(this.projectReleases);
             }
@@ -174,14 +178,16 @@ export class ProjectNavComponent {
                 routerLink: this.buildRouterLinkForSection(projectId, ProjectNav.DATA_CITATION)
             };
 
-            this.projectReleases = {
-                disabled: false,
-                display: "Releases",
-                subNavItems: [{
+            if ( this.releaseService.isReleaseVisible() ) {
+                this.projectReleases = {
                     disabled: false,
-                    display: "2020 March Data Release",
-                    routerLink: this.buildRouterLinkForSection(projectId, ProjectNav.DATA_RELEASE_2020_MAR)
-                }]
+                    display: "Releases",
+                    subNavItems: [{
+                        disabled: false,
+                        display: "2020 March Data Release",
+                        routerLink: this.buildRouterLinkForSection(projectId, ProjectNav.DATA_RELEASE_2020_MAR)
+                    }]
+                }
             }
         });
     }

spa/src/app/files/shared/release.service.ts

@@ -19,6 +19,7 @@ import { ReleaseDatasetView } from "../releases/release-dataset-view.model";
 import { ReleaseFileView } from "../releases/release-file-view.model";
 import { ReleaseFileType } from "../releases/release-file-type.model";
 import { ReleaseVisualizationView } from "../releases/release-visualization-view.model";
+import { ConfigService } from "../../config/config.service";
 
 @Injectable()
 export class ReleaseService {
@@ -38,6 +39,11 @@ export class ReleaseService {
         [`${ReleaseFileType.PIPELINE_INPUT}loom`, "Gene matrix file generated with DCP standardized pipelines (Optimus and Smart-seq2) and used as Cumulus input."]
     ]);
 
+    /**
+     * @param {ConfigService} configService
+     */
+    constructor(private configService: ConfigService) {}
+
     /**
      * Build view model of release. That is, project datasets grouped by organ.
      *
@@ -118,6 +124,17 @@ export class ReleaseService {
         return of(release2020March as Release);
     }
 
+    /**
+     * Returns true if release functionality is visible for the current environment - currently only visible on local
+     * and ux-dev.
+     * 
+     * @returns {boolean}
+     */
+    public isReleaseVisible(): boolean {
+
+        return this.configService.isEnvLocal() || this.configService.isEnvUxDev();
+    }
+
     /**
      * Create view models for each release file in the specified dataset.
      *

spa/src/app/site/hca-toolbar/hca-toolbar.component.html

@@ -51,7 +51,8 @@
                     <span class="fontsize-xxs">APIs</span>
                 </a>
             </cc-toolbar-nav-item>
-            <cc-toolbar-nav-item [ngClass]="{'active': isReleasesActiveUrl(), 'drop-down-menu': true}">
+            <cc-toolbar-nav-item *ngIf="isReleaseVisible()"
+                                 [ngClass]="{'active': isReleasesActiveUrl(), 'drop-down-menu': true}">
                 <button class="link" (click)="toggleDropDownMenu($event)">
                     <span class="fontsize-xs">March 2020 Release</span>
                     <span class="fontsize-xxs">Explore, visualize, and interact with 24 annotated datasets</span>

spa/src/app/site/hca-toolbar/hca-toolbar.component.ts

@@ -14,6 +14,7 @@ import { filter, takeUntil } from "rxjs/operators";
 
 // App dependencies
 import { ConfigService } from "../../config/config.service";
+import { ReleaseService } from "../../files/shared/release.service";
 import { HCAToolbarState } from "./hca-toolbar.state";
 import { selectModalOpen } from "../../modal/_ngrx/modal.selectors";
 import { AppState } from "../../_ngrx/app.state";
@@ -42,10 +43,12 @@ export class HCAToolbarComponent implements OnDestroy, OnInit {
     /**
      * @param {Store<AppState>} store
      * @param {ConfigService} configService
+     * @param {ReleaseService} releaseService
      * @param {Router} router
      */
     constructor(private store: Store<AppState>,
                 private configService: ConfigService,
+                private releaseService: ReleaseService,
                 private router: Router) {
         this.portalUrl = this.configService.getPortalURL();
     }
@@ -95,6 +98,16 @@ export class HCAToolbarComponent implements OnDestroy, OnInit {
         return this.currentUrl && this.currentUrl.includes("releases");
     }
 
+    /**
+     * Returns true if release functionality is available on the current environment.
+     * 
+     * @returns {boolean}
+     */
+    public isReleaseVisible(): boolean {
+        
+        return this.releaseService.isReleaseVisible();
+    }
+
     /**
      * Event registering the opening or closing of the toolbar nav drop down menu.
      *