Skip to content

Commit 05903e4

Browse files
Updated disease to use specimen not sample. Resolves #1026. (#1083)
1 parent 7df0562 commit 05903e4

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

spa/src/app/files/hca-table-projects/project-row-mapper.mock.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,10 @@ export const PROJECT_ROW_VALUES_ACROSS_MULTIPLE_OBJECTS =
531531
"brain"
532532
],
533533
"organPart": [],
534-
"disease": [],
534+
"disease": [
535+
"x",
536+
"y"
537+
],
535538
"preservationMethod": [
536539
"fresh"
537540
],

spa/src/app/files/table/entity-row-mapper.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ describe("EntityRowMapper:", () => {
218218
dataSource.connect().subscribe((rows) => {
219219

220220
const mappedProject = rows[0];
221-
expect(mappedProject.disease).toEqual(projectToMap.samples[0].disease[0]);
221+
expect(mappedProject.disease).toEqual(projectToMap.specimens[0].disease[0]);
222222
done();
223223
})
224224
});
@@ -233,13 +233,13 @@ describe("EntityRowMapper:", () => {
233233
dataSource.connect().subscribe((rows) => {
234234

235235
const mappedProject = rows[0];
236-
expect(mappedProject.disease).toEqual(projectToMap.samples[0].disease.join(", "));
236+
expect(mappedProject.disease).toEqual(projectToMap.specimens[0].disease.join(", "));
237237
done();
238238
})
239239
});
240240

241241
/**
242-
* Multiple disease values across multiple objects should be rolled up and mapped. TODO ************************************************************
242+
* Multiple disease values across multiple objects should be rolled up and mapped.
243243
*/
244244
it("should map multiple disease values across multiple objects", (done: DoneFn) => {
245245

@@ -248,7 +248,7 @@ describe("EntityRowMapper:", () => {
248248
dataSource.connect().subscribe((rows) => {
249249

250250
const mappedProject = rows[0];
251-
const expectedValue = mapMultipleValues(projectToMap.samples, "disease");
251+
const expectedValue = mapMultipleValues(projectToMap.specimens, "disease");
252252
expect(mappedProject.disease).toEqual(expectedValue);
253253
done();
254254
})

spa/src/app/files/table/entity-row-mapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export class EntityRowMapper {
6969
return {
7070
ageUnit: getUnspecifiedIfNullValue(this.donorOrganisms.organismAgeUnit),
7171
biologicalSex: getUnspecifiedIfNullValue(this.donorOrganisms.biologicalSex),
72-
disease: getUnspecifiedIfNullValue(this.samples.disease),
72+
disease: getUnspecifiedIfNullValue(this.specimens.disease),
7373
donorCount: getUnspecifiedIfNullValue(this.donorOrganisms.donorCount),
7474
genusSpecies: getUnspecifiedIfNullValue(this.donorOrganisms.genusSpecies),
7575
libraryConstructionApproach: mappedLibraryConstructionApproach,

0 commit comments

Comments
 (0)