Hide matrix service export in 'Export Selected Data Section' if 2.0. Resolves #1186.

Author: Fran McDade

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

@@ -178,7 +178,7 @@ export class ConfigService {
      * @returns {boolean}
      */
     public isV2(): boolean {
-        
+
         return this.version === "2.0";
     }
 

spa/src/app/files/hca-get-data/hca-get-data-downloads/hca-get-data-downloads.component.html

@@ -1,4 +1,4 @@
-<hca-get-data-panel [loading]="isMatrixSupportedLoading(matrixEnabled)">
+<hca-get-data-panel [loading]="isMatrixSupportedLoading(matrixEnabled)" *ngIf="matrixShow">
     <h4 class="fontsize-m semi-bold">Create Concatenated Expression Matrix</h4>
     <ng-container *ngIf="!isMatrixSupportedLoading(matrixEnabled)">
         <ng-container [ngSwitch]="matrixEnabled">

spa/src/app/files/hca-get-data/hca-get-data-downloads/hca-get-data-downloads.component.ts

@@ -26,6 +26,7 @@ export class HCAGetDataDownloadsComponent {
 
     // Inputs
     @Input() matrixEnabled: boolean;
+    @Input() matrixShow: boolean;
     @Input() matrixSpeciesSelectionRequired: boolean;
 
     // Outputs

spa/src/app/files/hca-get-data/hca-get-data.component.html

@@ -11,6 +11,7 @@
                     <ng-container *ngSwitchDefault>
                         <div *ngIf="state.matrixSupportedLoaded" [@fadeIn]>
                             <hca-get-data-downloads [matrixEnabled]="state.matrixSupported"
+                                                    [matrixShow]="state.matrixShow"
                                                     [matrixSpeciesSelectionRequired]="state.matrixSpeciesSelectionRequired"
                                                     (downloadSelected)="onDownloadSelected($event, state.fileFacets)"></hca-get-data-downloads>
                         </div>

spa/src/app/files/hca-get-data/hca-get-data.component.ts

@@ -14,21 +14,20 @@ import { combineLatest, Observable, Subject } from "rxjs";
 import { map } from "rxjs/operators";
 
 // App dependencies
+import { ConfigService } from "../../config/config.service";
+import { DownloadViewState } from "./download-view-state.model";
+import { FileFacet } from "../facet/file-facet/file-facet.model";
+import { FileFacetName } from "../facet/file-facet/file-facet-name.model";
+import { HCAGetDataState } from "./hca-get-data.state";
 import { AppState } from "../../_ngrx/app.state";
-import {
-    selectSelectedEntity
-} from "../_ngrx/file.selectors";
 import { ClearIsMatrixSupportedAction } from "../_ngrx/facet/clear-is-matrix-supported.action";
+import { selectFacetFileFacets, selectMatrixSupported } from "../_ngrx/facet/facet.selectors";
 import { FetchIsMatrixSupportedRequestAction } from "../_ngrx/facet/fetch-is-matrix-supported-request.action";
+import { selectSelectedEntity } from "../_ngrx/file.selectors";
+import { selectSelectedSearchTerms } from "../_ngrx/search/search.selectors";
 import { EntitySelectAction } from "../_ngrx/table/table.actions";
 import EntitySpec from "../shared/entity-spec";
-import { FileFacet } from "../facet/file-facet/file-facet.model";
-import { DownloadViewState } from "./download-view-state.model";
-import { FileFacetName } from "../facet/file-facet/file-facet-name.model";
 import { Term } from "../shared/term.model";
-import { HCAGetDataState } from "./hca-get-data.state";
-import { selectFacetFileFacets, selectMatrixSupported } from "../_ngrx/facet/facet.selectors";
-import { selectSelectedSearchTerms } from "../_ngrx/search/search.selectors";
 
 @Component({
     selector: "hca-get-data",
@@ -55,10 +54,12 @@ export class HCAGetDataComponent implements OnInit {
     private viewState = DownloadViewState.NONE;
 
     /**
+     * @param {ConfigService} configService
      * @param {Router} router
      * @param {Store<AppState>} store
      */
-    public constructor(private router: Router,
+    public constructor(private configService: ConfigService,
+                       private router: Router,
                        private store: Store<AppState>) {
     }
 
@@ -302,12 +303,14 @@ export class HCAGetDataComponent implements OnInit {
         )
             .pipe(
                 map(([selectedEntity, fileFacets, matrixSupported, selectedSearchTerms]) => {
-                    
+
+                    const matrixShow = !this.configService.isV2();
                     const matrixSpeciesSelectionRequired = this.isMatrixSpeciesSelectionRequired(fileFacets);
 
                     return {
                         selectedEntity,
                         fileFacets,
+                        matrixShow,
                         matrixSpeciesSelectionRequired,
                         matrixSupported,
                         matrixSupportedLoaded: this.isMatrixSupportedLoaded(matrixSupported),

spa/src/app/files/hca-get-data/hca-get-data.state.ts

@@ -13,6 +13,7 @@ import EntitySpec from "../shared/entity-spec";
 export interface HCAGetDataState {
 
     fileFacets: FileFacet[];
+    matrixShow: boolean,
     matrixSpeciesSelectionRequired: boolean;
     matrixSupported: boolean;
     matrixSupportedLoaded: boolean;