Skip to content

Commit 3e01802

Browse files
MillenniumFalconMechanicNoopDog
MillenniumFalconMechanic
authored and
NoopDog
committed
Added organ part to projects table. Resolves #1322.
1 parent cefa4e1 commit 3e01802

File tree

3 files changed

+51
-22
lines changed

3 files changed

+51
-22
lines changed

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

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -69,27 +69,43 @@
6969
</hca-table-cell>
7070
</mat-cell>
7171
</ng-container>
72-
<ng-container matColumnDef="modelOrgan">
73-
<mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('modelOrgan')"
74-
[ngStyle]="getColumnStyle('modelOrgan')">
75-
<hca-table-column-header>
76-
<hca-table-column-header-title columnTitle [columnName]="'modelOrgan'">
77-
{{getColumnDisplayName('modelOrgan')}}
78-
</hca-table-column-header-title>
79-
<hca-table-column-header-count columnSubTitle [columnName]="'modelOrgan'"
80-
[domainCountsByColumnName]="domainCountsByColumnName$ | async"></hca-table-column-header-count>
81-
</hca-table-column-header>
82-
</mat-header-cell>
83-
<mat-cell *matCellDef="let element" [ngClass]="getColumnClass('modelOrgan')"
84-
[ngStyle]="getColumnStyle('modelOrgan')">
85-
<hca-table-cell [ngSwitch]="isElementUnspecified(element.modelOrgan)">
86-
<hca-content-unspecified-dash *ngSwitchCase="true"></hca-content-unspecified-dash>
87-
<hca-content-ellipsis *ngSwitchDefault>
88-
<span class="fontsize-xxs">{{element.modelOrgan}}</span>
89-
</hca-content-ellipsis>
90-
</hca-table-cell>
91-
</mat-cell>
92-
</ng-container>
72+
<ng-container matColumnDef="organPart">
73+
<mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('organPart')" [ngStyle]="getColumnStyle('organPart')">
74+
<hca-table-column-header>
75+
<hca-table-column-header-title columnTitle [columnName]="'organPart'">{{getColumnDisplayName('organPart')}}
76+
</hca-table-column-header-title>
77+
<hca-table-column-header-count columnSubTitle [columnName]="'organPart'" [domainCountsByColumnName]="domainCountsByColumnName$ | async"></hca-table-column-header-count>
78+
</hca-table-column-header>
79+
</mat-header-cell>
80+
<mat-cell *matCellDef="let element" [ngClass]="getColumnClass('organPart')" [ngStyle]="getColumnStyle('organPart')">
81+
<hca-table-cell>
82+
<hca-content-ellipsis>
83+
<span class="fontsize-xxs">{{element.organPart}}</span>
84+
</hca-content-ellipsis>
85+
</hca-table-cell>
86+
</mat-cell>
87+
</ng-container>
88+
<ng-container matColumnDef="modelOrgan">
89+
<mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('modelOrgan')"
90+
[ngStyle]="getColumnStyle('modelOrgan')">
91+
<hca-table-column-header>
92+
<hca-table-column-header-title columnTitle [columnName]="'modelOrgan'">
93+
{{getColumnDisplayName('modelOrgan')}}
94+
</hca-table-column-header-title>
95+
<hca-table-column-header-count columnSubTitle [columnName]="'modelOrgan'"
96+
[domainCountsByColumnName]="domainCountsByColumnName$ | async"></hca-table-column-header-count>
97+
</hca-table-column-header>
98+
</mat-header-cell>
99+
<mat-cell *matCellDef="let element" [ngClass]="getColumnClass('modelOrgan')"
100+
[ngStyle]="getColumnStyle('modelOrgan')">
101+
<hca-table-cell [ngSwitch]="isElementUnspecified(element.modelOrgan)">
102+
<hca-content-unspecified-dash *ngSwitchCase="true"></hca-content-unspecified-dash>
103+
<hca-content-ellipsis *ngSwitchDefault>
104+
<span class="fontsize-xxs">{{element.modelOrgan}}</span>
105+
</hca-content-ellipsis>
106+
</hca-table-cell>
107+
</mat-cell>
108+
</ng-container>
93109
<ng-container matColumnDef="selectedCellType">
94110
<mat-header-cell *matHeaderCellDef [ngClass]="getColumnClass('selectedCellType')"
95111
[ngStyle]="getColumnStyle('selectedCellType')">

‎spa/src/app/files/hca-table-projects/hca-table-projects.component.spec.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ describe("HCATableProjectsComponent", () => {
9191
const COLUMN_TITLE_DONOR_COUNT = "Donor Count";
9292
const COLUMN_TITLE_DONOR_DISEASE = "Disease Status (Donor)";
9393
const COLUMN_TITLE_MODEL_ORGAN = "Model Organ";
94+
const COLUMN_TITLE_ORGAN_PART = "Organ Part";
9495
const COLUMN_TITLE_NUCLEIC_ACID_SOURCE = "Nucleic Acid Source";
9596
const COLUMN_TITLE_PROJECT_TITLE = "Project Title";
9697
const COLUMN_TITLE_SPECIMEN_DISEASE = "Disease Status (Specimen)";
@@ -102,6 +103,7 @@ describe("HCATableProjectsComponent", () => {
102103
const COLUMN_NAME_DONOR_COUNT = "donorCount";
103104
const COLUMN_NAME_DONOR_DISEASE = "donorDisease";
104105
const COLUMN_NAME_MODEL_ORGAN = "modelOrgan";
106+
const COLUMN_NAME_ORGAN_PART = "organPart";
105107
const COLUMN_NAME_NUCLEIC_ACID_SOURCE = "nucleicAcidSource";
106108
const COLUMN_NAME_PROJECT_TITLE = "projectTitle";
107109
const COLUMN_NAME_SPECIMEN_DISEASE = "disease";
@@ -361,6 +363,17 @@ describe("HCATableProjectsComponent", () => {
361363
expect(columnHeaderDE.nativeElement.innerText).toEqual(COLUMN_TITLE_DONOR_DISEASE);
362364
});
363365

366+
/**
367+
* Confirm organ part column labeled as "Organ Part" is displayed.
368+
*/
369+
it(`should display column "Organ Part"`, () => {
370+
371+
const columnHeaderDE = findHeaderTitle(COLUMN_NAME_ORGAN_PART);
372+
373+
// Confirm column title is displayed
374+
expect(columnHeaderDE.nativeElement.innerText).toEqual(COLUMN_TITLE_ORGAN_PART);
375+
});
376+
364377
/**
365378
* Confirm modelOrgan column labeled as "Model Organ" is displayed.
366379
*/

‎spa/src/app/files/hca-table-projects/hca-table-projects.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class HCATableProjectsComponent implements OnInit {
6464
order: "asc"
6565
};
6666
public displayedColumns = [
67-
"projectTitle", "getData", "genusSpecies", "sampleEntityType", "organ", "modelOrgan", "selectedCellType",
67+
"projectTitle", "getData", "genusSpecies", "sampleEntityType", "organ", "organPart", "modelOrgan", "selectedCellType",
6868
"libraryConstructionApproach", "nucleicAcidSource", "pairedEnd",
6969
"workflow", "disease", "donorDisease", "developmentStage", "donorCount", "totalCells"
7070
];

0 commit comments

Comments
 (0)