Remove 'May be 1' text from sample and project tab hovers for the cell count estimate column. Resolves #997. (#1021)

Author: frano-m

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

@@ -278,7 +278,7 @@ <h4 class="fontsize-m semi-bold">Project Details</h4>
                         <div>
                             <p class="fontsize-xs semi-bold lhs">
                                 <hca-tooltip [tooltipClass]="'hca-tooltip narrow'"
-                                             [tooltipContent]="getColumnDescription('totalCells')"
+                                             [tooltipContent]="getColumnDescription('totalCells','Projects')"
                                              [tooltipDisabled]="false"
                                              [tooltipPosition]="'above'">{{getColumnDisplayName('totalCells')}}
                                 </hca-tooltip>

spa/src/app/files/hca-table-column-header-title/hca-table-column-header-title.component.html

@@ -17,7 +17,7 @@
 </ng-template>
 <ng-template #headerTitle>
     <hca-tooltip
-            [tooltipContent]="getColumnDescription(columnName)"
+            [tooltipContent]="getColumnDescription(columnName, entityName)"
             [tooltipDisabled]="getColumnDescription(columnName) === null"
             [tooltipPosition]="'above'"
             [tooltipClass]="'hca-tooltip narrow'"

spa/src/app/files/hca-table-column-header-title/hca-table-column-header-title.component.ts

@@ -21,6 +21,7 @@ export class HCATableColumnHeaderTitleComponent {
 
     // Inputs
     @Input() columnName: string;
+    @Input() entityName: string;
 
     // Template variables
     public getColumnDescription = getColumnDescription;

spa/src/app/files/hca-table-files/hca-table-files.component.html

@@ -272,7 +272,7 @@
                 <ng-container matColumnDef="totalCells">
                     <mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('totalCells')" [ngStyle]="getColumnStyle('totalCells')">
                         <hca-table-column-header>
-                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'">{{getColumnDisplayName('totalCells')}}
+                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'" [entityName]="'Files'">{{getColumnDisplayName('totalCells')}}
                             </hca-table-column-header-title>
                             <hca-table-column-header-count columnSubTitle [columnName]="'totalCells'" [domainCountsByColumnName]="domainCountsByColumnName$ | async" [summaryCount]="(selectFileSummary$ | async).totalCellCount | countSize"></hca-table-column-header-count>
                         </hca-table-column-header>

spa/src/app/files/hca-table-projects/hca-table-projects.component.html

@@ -236,7 +236,7 @@
                     <mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('totalCells')"
                                      [ngStyle]="getColumnStyle('totalCells')">
                         <hca-table-column-header>
-                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'">
+                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'" [entityName]="'Projects'">
                                 {{getColumnDisplayName('totalCells')}}
                             </hca-table-column-header-title>
                             <hca-table-column-header-count columnSubTitle [columnName]="'totalCells'"

spa/src/app/files/hca-table-samples/hca-table-samples.component.html

@@ -223,7 +223,7 @@
                 <ng-container matColumnDef="totalCells">
                     <mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('totalCells')" [ngStyle]="getColumnStyle('totalCells')">
                         <hca-table-column-header>
-                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'">{{getColumnDisplayName('totalCells')}}
+                            <hca-table-column-header-title columnTitle [columnName]="'totalCells'" [entityName]="'Samples'">{{getColumnDisplayName('totalCells')}}
                             </hca-table-column-header-title>
                             <hca-table-column-header-count columnSubTitle [columnName]="'totalCells'" [domainCountsByColumnName]="domainCountsByColumnName$ | async" [summaryCount]="(selectFileSummary$ | async).totalCellCount | countSize"></hca-table-column-header-count>
                         </hca-table-column-header>

spa/src/app/files/table/table-column.model.ts

@@ -19,6 +19,9 @@ export interface TableColumn {
     columnTitleWidth?: number;
     countType: CountType;
     description?: string;
+    descriptionFiles?: string;
+    descriptionProjects?: string;
+    descriptionSamples?: string;
     userFriendly: string;
 }
 

spa/src/app/files/table/table-methods.ts

@@ -225,6 +225,9 @@ let tableColumns: TableColumn[] = [
         key: "totalCells",
         userFriendly: "Cell Count Estimate",
         description: "Total estimated number of cells in biomaterial. May be 1 for well-based assays.",
+        descriptionFiles: "Total estimated number of cells in biomaterial. May be 1 for well-based assays.",
+        descriptionProjects: "Total estimated number of cells in biomaterial.",
+        descriptionSamples: "Total estimated number of cells in biomaterial.",
         alignment: ColumnAlignment.RIGHT,
         columnSort: true,
         columnSortKey: "cellCount",
@@ -307,14 +310,18 @@ export function getColumnCountType(column: string): string {
 /**
  * Returns the column description.
  * Used by table header tooltip.
+ * EntityName used to distinguish different descriptions between table views (project, sample, file).
  *
  * @param {string} column
+ * @param {string} entityName
  * @returns {string}
  */
-export function getColumnDescription(column: string): string {
+export function getColumnDescription(column: string, entityName: string = ""): string {
 
-    return tableColumn.get(column).description ?
-        `${tableColumn.get(column).userFriendly}: ${tableColumn.get(column).description}` : `${tableColumn.get(column).userFriendly}.`;
+    const description = `description${entityName}`;
+
+    return tableColumn.get(column)[description] ?
+        `${tableColumn.get(column).userFriendly}: ${tableColumn.get(column)[description]}` : `${tableColumn.get(column).userFriendly}.`;
 }
 
 /**