Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nickakhmetov/cat-1116-cat-1117-cellpop-fixes #3675

Merged
merged 3 commits into from
Jan 30, 2025
Merged

Nickakhmetov/cat-1116-cat-1117-cellpop-fixes #3675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee7504c
cat-1116 fix cellpop section title
NickAkhmetov Jan 30, 2025
d8bc98d
add azimuth link to description
NickAkhmetov Jan 30, 2025
bec7702
update `cellpop`
NickAkhmetov Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG-cellpop-fixes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- Fix Cell Population Plot table of contents title.
- Improve Cell Population Plot padding.
- Fix Cell Population Plot violin graph behavior.
4 changes: 3 additions & 1 deletion context/app/static/js/components/organ/CellPop/CellPopDescription.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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.
<OutboundIconLink href="https://azimuth.hubmapconsortium.org/">Azimuth.</OutboundIconLink> Key features are
highlighted below and a tutorial is available.
</SectionDescription>
);
}
2 changes: 1 addition & 1 deletion context/app/static/js/pages/Organ/Organ.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion context/app/static/js/shared-styles/icons/sectionIconMap.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const sectionIconMap: Record<string, typeof SvgIcon> = {
'reference-based-analysis': VisualizationIcon,
assays: DatasetIcon,
samples: SampleIcon,
'cell-population': CellTypeIcon,
'cell-population-plot': CellTypeIcon,
} as const;

export const sectionImageIconMap: Record<string, keyof typeof externalIconMap> = {
Expand Down
8 changes: 4 additions & 4 deletions context/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion context/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading