WIP

Author: Fran McDade

spa/src/app/files/hca-project/hca-project.spec.ts

@@ -43,35 +43,35 @@ describe("HCAProjectComponent", () => {
     const PROJECT_DETAIL_PROJECT_MATRIX_URLS = new ProjectMatrixUrls("2cd14cf5-f8e0-4c97-91a2-9e8957f41ea8", "https://dev.data.humancellatlas.org/project-assets/project-matrices/537f5501-a964-4ade-91c8-7bd4a23b049d.csv.zip", "https://dev.data.humancellatlas.org/project-assets/project-matrices/537f5501-a964-4ade-91c8-7bd4a23b049d.loom", "https://dev.data.humancellatlas.org/project-assets/project-matrices/537f5501-a964-4ade-91c8-7bd4a23b049d.mtx.zip");
 
     // Project details
-    const PROJECT_LABEL_ANALYSIS_PROTOCOL = "Analysis Protocol";
-    const PROJECT_LABEL_CELL_COUNT_ESTIMATE = "Cell Count Estimate";
     const PROJECT_LABEL_DONOR_COUNT = "Donor Count";
     const PROJECT_LABEL_FILE_FORMAT = "File Format";
-    const PROJECT_LABEL_KNOWN_DISEASES = "Known Diseases (Specimen)";
-    const PROJECT_LABEL_LIBRARY_CONSTRUCTION_METHOD = "Library Construction Method";
+    const PROJECT_LABEL_DISEASE = "Disease Status";
+    const PROJECT_LABEL_GENUS_SPECIES = "Species";
+    const PROJECT_LABEL_LIBRARY_CONSTRUCTION_APPROACH = "Library Construction Method";
     const PROJECT_LABEL_ORGAN = "Organ";
     const PROJECT_LABEL_ORGAN_PART = "Organ Part";
     const PROJECT_LABEL_MODEL_ORGAN = "Model Organ";
     const PROJECT_LABEL_PAIRED_END = "Paired End";
-    const PROJECT_LABEL_PROJECT_LABEL = "Project Label";
-    const PROJECT_LABEL_SAMPLE_TYPE = "Sample Type";
-    const PROJECT_LABEL_SPECIES = "Species";
+    const PROJECT_LABEL_PROJECT_SHORTNAME = "Project Label";
+    const PROJECT_LABEL_SAMPLE_ENTITY_TYPE = "Sample Type";
+    const PROJECT_LABEL_TOTAL_CELLS = "Cell Count Estimate";
+    const PROJECT_LABEL_WORKFLOW = "Analysis Protocol";
 
     // Project detail display order
     // Model organ and analysis protocol display conditionally, controlled by sample type and workflow values respectively
     const PROJECT_DETAIL_DISPLAY_ORDER = [
-        PROJECT_LABEL_PROJECT_LABEL,
-        PROJECT_LABEL_SPECIES,
-        PROJECT_LABEL_SAMPLE_TYPE,
+        PROJECT_LABEL_PROJECT_SHORTNAME,
+        PROJECT_LABEL_GENUS_SPECIES,
+        PROJECT_LABEL_SAMPLE_ENTITY_TYPE,
         PROJECT_LABEL_ORGAN,
         PROJECT_LABEL_ORGAN_PART,
         PROJECT_LABEL_MODEL_ORGAN,
-        PROJECT_LABEL_KNOWN_DISEASES,
-        PROJECT_LABEL_LIBRARY_CONSTRUCTION_METHOD,
+        PROJECT_LABEL_DISEASE,
+        PROJECT_LABEL_LIBRARY_CONSTRUCTION_APPROACH,
         PROJECT_LABEL_PAIRED_END,
-        PROJECT_LABEL_ANALYSIS_PROTOCOL,
+        PROJECT_LABEL_WORKFLOW,
         PROJECT_LABEL_FILE_FORMAT,
-        PROJECT_LABEL_CELL_COUNT_ESTIMATE,
+        PROJECT_LABEL_TOTAL_CELLS,
         PROJECT_LABEL_DONOR_COUNT
     ];
 
@@ -153,7 +153,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm "Sample Type" is displayed
-        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_SAMPLE_TYPE)).toEqual(true);
+        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_SAMPLE_ENTITY_TYPE)).toEqual(true);
     });
 
     /**
@@ -171,7 +171,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm "Unspecified" is displayed
-        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_TYPE)).toEqual("Unspecified");
+        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_ENTITY_TYPE)).toEqual("Unspecified");
     });
 
     /**
@@ -189,7 +189,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm "Unspecified" is displayed
-        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_TYPE)).toEqual("Unspecified");
+        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_ENTITY_TYPE)).toEqual("Unspecified");
     });
 
     /**
@@ -207,7 +207,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm single value is displayed
-        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_TYPE)).toEqual(PROJECT_DETAIL_SINGLE_VALUES.sampleEntityType);
+        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_ENTITY_TYPE)).toEqual(PROJECT_DETAIL_SINGLE_VALUES.sampleEntityType);
     });
 
     /**
@@ -225,7 +225,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm single value is displayed
-        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_TYPE)).toEqual(PROJECT_DETAIL_MULTIPLE_VALUES.sampleEntityType);
+        expect(getProjectDetailValue(PROJECT_LABEL_SAMPLE_ENTITY_TYPE)).toEqual(PROJECT_DETAIL_MULTIPLE_VALUES.sampleEntityType);
     });
 
     /**
@@ -350,7 +350,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm "Analysis Protocol" is displayed
-        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_ANALYSIS_PROTOCOL)).toEqual(true);
+        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_WORKFLOW)).toEqual(true);
     });
 
     /**
@@ -368,7 +368,7 @@ describe("HCAProjectComponent", () => {
         fixture.detectChanges();
 
         // Confirm "Analysis Protocol" is not displayed
-        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_ANALYSIS_PROTOCOL)).toEqual(false);
+        expect(isProjectDetailLabelDisplayed(PROJECT_LABEL_WORKFLOW)).toEqual(false);
     });
 
     /**