Merge branch 'develop' of https://github.com/hubmapconsortium/hra-ui

hubmapconsortium · Dec 1, 2023 · 557b952 · 557b952
2 parents f126c08 + 9501945
commit 557b952
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/libs/components/behavioral/src/assets/resources/legend-info.yml b/libs/components/behavioral/src/assets/resources/legend-info.yml
@@ -3,4 +3,4 @@ GradientLegendInfo:
   text: Expression is scaled linearly to the range [0,1]. Scaling is done by designating the minimum value in the current view to 0 and the max is assigned to 1.
 SizeLegendInfo:
   type: text
-  text: The percentage of cells in the FTU is calculated by dividing the total number of cells in all FTUs by the number of all cells in that tissue section.
+  text: The percentage of cells in the FTU is calculated by dividing the total number of cells in the FTU by the number of all cells in that tissue section.
diff --git a/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.ts b/libs/components/behavioral/src/lib/biomarker-details/biomarker-details.component.ts
@@ -155,7 +155,7 @@ export class BiomarkerDetailsComponent {
    * Highlights cells matching the label
    * @param event
    */
-  highlightCells(label: string) {
+  highlightCells(label?: string) {
     this.highlightCell(label);
   }
 }
diff --git a/libs/components/organisms/src/lib/biomarker-table/biomarker-table.component.html b/libs/components/organisms/src/lib/biomarker-table/biomarker-table.component.html
@@ -42,7 +42,12 @@
   </ng-container>
 
   <tr mat-header-row *matHeaderRowDef="columnsWithTypeAndCount; sticky: true"></tr>
-  <tr mat-row *matRowDef="let row; columns: columnsWithTypeAndCount" (mouseover)="rowHover.emit(row[0])"></tr>
+  <tr
+    mat-row
+    *matRowDef="let row; columns: columnsWithTypeAndCount"
+    (mouseover)="rowHover.emit(row[0])"
+    (mouseout)="rowHover.emit(undefined)"
+  ></tr>
 </table>
 
 <ng-template #columnHover let-columnName>

diff --git a/libs/state/src/lib/illustrator/illustrator.actions.ts b/libs/state/src/lib/illustrator/illustrator.actions.ts
@@ -39,7 +39,7 @@ export class SetClicked extends Action('Set Selection on Clicked') {
  */
 export class HighlightCellType extends Action('Highlight Cell Type Id') {
   /** Initializes the Mapping Item */
-  constructor(readonly hoverLabel: string) {
+  constructor(readonly hoverLabel?: string) {
     super();
   }
 }

diff --git a/libs/state/src/lib/illustrator/illustrator.state.ts b/libs/state/src/lib/illustrator/illustrator.state.ts
@@ -92,7 +92,7 @@ export class IllustratorState {
    */
   @Action(HighlightCellType)
   HighlightCellType({ patchState, getState }: Context, { hoverLabel }: HighlightCellType): void {
-    const match = getState().mapping.find((entry) => entry.label.toLowerCase() === hoverLabel.toLowerCase());
+    const match = getState().mapping.find((entry) => entry.label.toLowerCase() === hoverLabel?.toLowerCase());
     patchState({ hoveredCellTypeId: match ? match.ontologyId : undefined });
   }
 }