WIP

Author: Fran McDade

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)" *ngIf="matrixShow">
+<hca-get-data-panel [loading]="isMatrixSupportedLoading(matrixEnabled)" *ngIf="!disableFeature">
     <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

@@ -25,8 +25,8 @@ export class HCAGetDataDownloadsComponent {
     public portalURL: string;
 
     // Inputs
+    @Input() disableFeature: boolean;
     @Input() matrixEnabled: boolean;
-    @Input() matrixShow: boolean;
     @Input() matrixSpeciesSelectionRequired: boolean;
 
     // Outputs

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

@@ -10,8 +10,8 @@
                 <ng-container [ngSwitch]="viewState">
                     <ng-container *ngSwitchDefault>
                         <div *ngIf="state.matrixSupportedLoaded" [@fadeIn]>
-                            <hca-get-data-downloads [matrixEnabled]="state.matrixSupported"
-                                                    [matrixShow]="state.matrixShow"
+                            <hca-get-data-downloads [disableFeature]="state.disableFeature"
+                                                    [matrixEnabled]="state.matrixSupported"
                                                     [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

@@ -304,13 +304,13 @@ export class HCAGetDataComponent implements OnInit {
             .pipe(
                 map(([selectedEntity, fileFacets, matrixSupported, selectedSearchTerms]) => {
 
-                    const matrixShow = !this.configService.isV2();
+                    const disableFeature = this.configService.isV2();
                     const matrixSpeciesSelectionRequired = this.isMatrixSpeciesSelectionRequired(fileFacets);
 
                     return {
                         selectedEntity,
+                        disableFeature,
                         fileFacets,
-                        matrixShow,
                         matrixSpeciesSelectionRequired,
                         matrixSupported,
                         matrixSupportedLoaded: this.isMatrixSupportedLoaded(matrixSupported),

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

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