Merge remote-tracking branch 'refs/remotes/origin/feature/ESCKAN-20-new'

Conflicts: src/components/Connections.tsx src/components/SummaryFiltersDropdown.tsx src/services/summaryHeatmapService.ts
MetaCell · May 27, 2024 · 04bfa25 · 04bfa25
2 parents 494137f + e5f2241
commit 04bfa25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/components/Connections.tsx b/src/components/Connections.tsx
@@ -183,7 +183,7 @@ function Connections() {
                 Summary map shows the connections of the selected connection origin and end organ with phenotypes. Select individual squares to view the details of each connections.
               </Typography>
             </Box>
-              <SummaryFiltersDropdown nerves={nerves} phenotypes={phenotypes} />
+            <SummaryFiltersDropdown nerves={nerves} phenotypes={phenotypes} />
             <HeatmapGrid
               yAxis={yAxis}
               setYAxis={setYAxis}
@@ -196,7 +196,7 @@ function Connections() {
             />
           </Box>
 
-            <PhenotypeLegend phenotypes={phenotypes} />
+          <PhenotypeLegend phenotypes={phenotypes} />
         </>
       )
       }

diff --git a/src/services/summaryHeatmapService.ts b/src/services/summaryHeatmapService.ts
@@ -169,7 +169,7 @@ export function calculateSecondaryConnections(
 						const ksPhenotypes = knowledgeStatementIds.map(ksId => knowledgeStatements[ksId].phenotype).filter(phenotype => phenotype !== '');
 						const phenotypeColorsSet = new Set<string>();
 
-						const unknownFilter = phenotypes.find(p => p.label === OTHER_PHENOTYPE_LABEL);
+						const unknownFilter = phenotypes.find(p => p.label === 'other');
 						ksPhenotypes.length === 0 ? phenotypeColorsSet.add(unknownFilter?.color || '') :
 							ksPhenotypes.map(phenotype => {
 								const phn = phenotypes.find(p => p.label === phenotype);

diff --git a/src/settings.ts b/src/settings.ts
@@ -8,6 +8,7 @@ export const OTHER_X_AXIS_ID = 'OTHER_X'
 export const OTHER_X_AXIS_LABEL = 'Other'
 export const OTHER_PHENOTYPE_LABEL = 'other'
 export const SYNONYMS_TITLE = "synonyms"
+export const OTHER_LABEL = 'other'
 
 export const FIXED_FOUR_PHENOTYPE_COLORS_ARRAY = [
 	'rgba(155, 24, 216, 1)',