From ee7504c57b062347132de1a44e5f1e19ff60fce5 Mon Sep 17 00:00:00 2001 From: Nikolay Akhmetov Date: Thu, 30 Jan 2025 11:05:54 -0500 Subject: [PATCH 1/3] cat-1116 fix cellpop section title --- CHANGELOG-cellpop-fixes.md | 1 + context/app/static/js/pages/Organ/Organ.tsx | 2 +- context/app/static/js/shared-styles/icons/sectionIconMap.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 CHANGELOG-cellpop-fixes.md diff --git a/CHANGELOG-cellpop-fixes.md b/CHANGELOG-cellpop-fixes.md new file mode 100644 index 0000000000..1070acaf2b --- /dev/null +++ b/CHANGELOG-cellpop-fixes.md @@ -0,0 +1 @@ +- Fix cell population plot table of contents title. diff --git a/context/app/static/js/pages/Organ/Organ.tsx b/context/app/static/js/pages/Organ/Organ.tsx index ee365b8bac..7df8e5e196 100644 --- a/context/app/static/js/pages/Organ/Organ.tsx +++ b/context/app/static/js/pages/Organ/Organ.tsx @@ -20,7 +20,7 @@ const hraId = 'human-reference-atlas'; const referenceId = 'reference-based-analysis'; const assaysId = 'assays'; const samplesId = 'samples'; -const cellpopId = 'cell-population'; +const cellpopId = 'cell-population-plot'; function Organ({ organ }: OrganProps) { const searchItems = useMemo( diff --git a/context/app/static/js/shared-styles/icons/sectionIconMap.ts b/context/app/static/js/shared-styles/icons/sectionIconMap.ts index ccfa6491e4..13d4f8bf2a 100644 --- a/context/app/static/js/shared-styles/icons/sectionIconMap.ts +++ b/context/app/static/js/shared-styles/icons/sectionIconMap.ts @@ -45,7 +45,7 @@ export const sectionIconMap: Record = { 'reference-based-analysis': VisualizationIcon, assays: DatasetIcon, samples: SampleIcon, - 'cell-population': CellTypeIcon, + 'cell-population-plot': CellTypeIcon, } as const; export const sectionImageIconMap: Record = { From d8bc98d0852e34bfe01d57b070e7218b54deb59e Mon Sep 17 00:00:00 2001 From: Nikolay Akhmetov Date: Thu, 30 Jan 2025 14:00:28 -0500 Subject: [PATCH 2/3] add azimuth link to description --- .../static/js/components/organ/CellPop/CellPopDescription.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/context/app/static/js/components/organ/CellPop/CellPopDescription.tsx b/context/app/static/js/components/organ/CellPop/CellPopDescription.tsx index 55d1e896d6..7bec1d9212 100644 --- a/context/app/static/js/components/organ/CellPop/CellPopDescription.tsx +++ b/context/app/static/js/components/organ/CellPop/CellPopDescription.tsx @@ -1,6 +1,7 @@ import React from 'react'; import { SectionDescription } from 'js/shared-styles/sections/SectionDescription'; import LabelledSectionText from 'js/shared-styles/sections/LabelledSectionText'; +import OutboundIconLink from 'js/shared-styles/Links/iconLinks/OutboundIconLink'; // TODO: Once there is a cellpop tutorial to link to, // uncomment the below code and add RelevantPages to the SectionDescription addendum @@ -39,7 +40,8 @@ export default function CellPopDescription() { ]} > This interactive heatmap visualizes cell populations in datasets from this organ. Cell type annotations are from - Azimuth. Key features are highlighted below and a tutorial is available. + Azimuth. Key features are + highlighted below and a tutorial is available. ); } From bec7702d00c034b96bb6015fff2185a1109bafbd Mon Sep 17 00:00:00 2001 From: Nikolay Akhmetov Date: Thu, 30 Jan 2025 14:05:28 -0500 Subject: [PATCH 3/3] update `cellpop` --- CHANGELOG-cellpop-fixes.md | 4 +++- context/package-lock.json | 8 ++++---- context/package.json | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CHANGELOG-cellpop-fixes.md b/CHANGELOG-cellpop-fixes.md index 1070acaf2b..92cb0a8913 100644 --- a/CHANGELOG-cellpop-fixes.md +++ b/CHANGELOG-cellpop-fixes.md @@ -1 +1,3 @@ -- Fix cell population plot table of contents title. +- Fix Cell Population Plot table of contents title. +- Improve Cell Population Plot padding. +- Fix Cell Population Plot violin graph behavior. diff --git a/context/package-lock.json b/context/package-lock.json index 7d8e2407d5..fd61eb8314 100644 --- a/context/package-lock.json +++ b/context/package-lock.json @@ -40,7 +40,7 @@ "@visx/text": "^3.3.0", "@visx/tooltip": "^3.3.0", "@xyflow/react": "^12.0.3", - "cellpop": "^0.0.6", + "cellpop": "^0.0.7", "chart.js": "^4.4.2", "d3": "^7.9.0", "d3-array": "^3.2.4", @@ -14924,9 +14924,9 @@ } }, "node_modules/cellpop": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/cellpop/-/cellpop-0.0.6.tgz", - "integrity": "sha512-Ca3jGB9DfQFno80Qe4vN28cTVx5efSKyoLLSVI0CoV2uEIJQIpa47XWi/DRPvBTlGB3E+OkIEc1UCntBU0CVmA==", + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/cellpop/-/cellpop-0.0.7.tgz", + "integrity": "sha512-fNsf0D+/8TSYeMASw0sic2E6yWs1+XbzkETSrkOxXevmJSE8WFvLhaITGLWctSW/r4J5RbDsEIRHL3pV1VhXdA==", "dependencies": { "@dnd-kit/core": "^6.3.1", "@dnd-kit/modifiers": "^9.0.0", diff --git a/context/package.json b/context/package.json index 2dcef1144f..803836264a 100644 --- a/context/package.json +++ b/context/package.json @@ -33,7 +33,7 @@ "@visx/text": "^3.3.0", "@visx/tooltip": "^3.3.0", "@xyflow/react": "^12.0.3", - "cellpop": "^0.0.6", + "cellpop": "^0.0.7", "chart.js": "^4.4.2", "d3": "^7.9.0", "d3-array": "^3.2.4",