Removed project release overline for non-release envs. Resolves #1204. (#1207)

* Added tracking of project tab view. Resolves #1163. Resolves #1161.

* Updated GTM readme.

* Removed project release overline depending for non-release envs. Resolves #1204.

Author: MillenniumFalconMechanic

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

@@ -108,7 +108,7 @@ describe("AppComponent:", () => {
                 useValue: jasmine.createSpyObj("LocalStorageService", ["get", "set"])
             }, {
                 provide: ReleaseService,
-                useValue: jasmine.createSpyObj("ReleaseService", ["buildReleaseView", "createReleaseDatasetView", "fetch2020MarchRelease", "isReleaseVisible"])
+                useValue: jasmine.createSpyObj("ReleaseService", ["buildReleaseView", "createReleaseDatasetView", "fetch2020MarchRelease", "isReleaseFeatureEnabled"])
             }, {
                 provide: SearchTermUrlService,
                 useValue: searchTermUrlService

spa/src/app/app.component.ts

@@ -113,7 +113,7 @@ export class AppComponent implements OnInit, OnDestroy {
      */
     public showRelease() {
 
-        if ( !this.releaseService.isReleaseVisible() ) {
+        if ( !this.releaseService.isReleaseFeatureEnabled() ) {
             return false;
         }
 

spa/src/app/files/project-detail/project-detail.component.html

@@ -1,9 +1,12 @@
 <pop-layout [tabs]="getProjectDetailTabs()" *ngIf="state$ | async as state">
     <ng-container title>Explore Project</ng-container>
-    <project-nav nav [externalResourcesExist]="state.externalResourcesExist" [projectInRelease]="state.projectInRelease"></project-nav>
+    <project-nav nav
+                 [externalResourcesExist]="state.externalResourcesExist"
+                 [projectInRelease]="state.projectInRelease"
+                 [releaseFeatureEnabled]="isReleaseFeatureEnabled()"></project-nav>
     <div content>
         <status-panel class="project-title">
-            <release-title-overline *ngIf="state.projectInRelease"></release-title-overline>
+            <release-title-overline *ngIf="isReleaseFeatureEnabled() && state.projectInRelease"></release-title-overline>
             <h2 class="fontsize-xl">{{state.project.projectTitle}}</h2>
             <div class="select-project"
                  (click)="onProjectSelected(state.projectSelected, state.project.entryId, state.project.projectShortname)">

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

@@ -31,6 +31,7 @@ import { SearchTerm } from "../search/search-term.model";
 import { EntityName } from "../shared/entity-name.model";
 import EntitySpec from "../shared/entity-spec";
 import { ProjectDetailState } from "./project-detail.state";
+import { ReleaseService } from "../shared/release.service";
 
 @Component({
     selector: "project-detail",
@@ -45,12 +46,15 @@ export class ProjectDetailComponent {
     private state$: Observable<ProjectDetailState>;
 
     /**
-     *
+     * @param {ReleaseService} releaseService
+     * @param {Store<AppState>} store
      * @param {ActivatedRoute} activatedRoute
      * @param {Router} router
-     * @param {Store<AppState>} store
      */
-    public constructor(private activatedRoute: ActivatedRoute, private router: Router, private store: Store<AppState>) {}
+    public constructor(private releaseService: ReleaseService,
+                       private store: Store<AppState>,
+                       private activatedRoute: ActivatedRoute,
+                       private router: Router) {}
 
     /**
      * Returns the class for the select box.
@@ -81,6 +85,16 @@ export class ProjectDetailComponent {
         return [{key: EntityName.PROJECTS, displayName: "Back"}];
     }
 
+    /**
+     * Returns true if release feature is enabled.
+     * 
+     * @returns {boolean}
+     */
+    private isReleaseFeatureEnabled(): boolean {
+
+        return this.releaseService.isReleaseFeatureEnabled();
+    }
+
     /**
      * Handle click on term in list of terms - update store with selected / unselected project and returns user back to project table.
      *

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

@@ -16,7 +16,6 @@ import { takeUntil } from "rxjs/operators";
 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",
@@ -28,6 +27,7 @@ export class ProjectNavComponent {
     // Inputs
     @Input() externalResourcesExist: boolean;
     @Input() projectInRelease: boolean;
+    @Input() releaseFeatureEnabled: boolean;
 
     // Locals
     private dataCitation: NavItem;
@@ -43,11 +43,9 @@ export class ProjectNavComponent {
     /**
      * @param {ActivatedRoute} route
      * @param {DeviceDetectorService} deviceService
-     * @param {ReleaseService} releaseService
      */
     constructor(private route: ActivatedRoute,
-                private deviceService: DeviceDetectorService,
-                private releaseService: ReleaseService) {
+                private deviceService: DeviceDetectorService) {
     }
 
     /**
@@ -77,7 +75,7 @@ export class ProjectNavComponent {
             ];
 
             // Check if project is a part of the release and add "releases" to the nav accordingly
-            if ( this.releaseService.isReleaseVisible() && this.projectInRelease ) {
+            if ( this.releaseFeatureEnabled && this.projectInRelease ) {
 
                 navItemList.push(this.projectReleases);
             }
@@ -178,7 +176,7 @@ export class ProjectNavComponent {
                 routerLink: this.buildRouterLinkForSection(projectId, ProjectNav.DATA_CITATION)
             };
 
-            if ( this.releaseService.isReleaseVisible() ) {
+            if ( this.releaseFeatureEnabled ) {
                 this.projectReleases = {
                     disabled: false,
                     display: "Releases",

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

@@ -130,7 +130,7 @@ export class ReleaseService {
      * 
      * @returns {boolean}
      */
-    public isReleaseVisible(): boolean {
+    public isReleaseFeatureEnabled(): boolean {
 
         return this.configService.isEnvLocal() || this.configService.isEnvUxDev();
     }

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

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

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

@@ -103,9 +103,9 @@ export class HCAToolbarComponent implements OnDestroy, OnInit {
      * 
      * @returns {boolean}
      */
-    public isReleaseVisible(): boolean {
+    public isReleaseFeatureEnabled(): boolean {
 
-        return this.releaseService.isReleaseVisible();
+        return this.releaseService.isReleaseFeatureEnabled();
     }
 
     /**