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

Jump to bottom

Adds safety checks on AlignmentsDisplay properties to avoid undefined rendering #3758

Merged
merged 4 commits into from Jun 29, 2023
Merged

Adds safety checks on AlignmentsDisplay properties to avoid undefined rendering #3758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c46039
adds checks to various properties to avoid undefined rendering
carolinebridge Jun 14, 2023
1aa2aa2
lint
carolinebridge Jun 14, 2023
0c289b4
Merge branch 'main' into add-safety-checks-on-alignments-display
carolinebridge Jun 14, 2023
50a5de6
revert check on menu item for pileupdisplay type
carolinebridge Jun 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion plugins/alignments/src/LinearAlignmentsDisplay/components/AlignmentsDisplay.tsx
View file
Open in desktop
Expand Up @@ -18,7 +18,10 @@ const useStyles = makeStyles()({
function AlignmentsDisplay({ model }: { model: AlignmentsDisplayModel }) {
const { PileupDisplay, SNPCoverageDisplay } = model
const { classes } = useStyles()
const top = SNPCoverageDisplay.height
if (!SNPCoverageDisplay) {
return null
}
const top = SNPCoverageDisplay.height ?? 100
return (
<div
data-testid={`display-${getConf(model, 'displayId')}`}
Expand Down
3 changes: 3 additions & 0 deletions plugins/alignments/src/LinearAlignmentsDisplay/models/model.tsx
View file
Open in desktop
Expand Up @@ -361,6 +361,9 @@ function stateModelFactory(
* #method
*/
trackMenuItems(): MenuItem[] {
if (!self.PileupDisplay) {
return []
}
const extra = getLowerPanelDisplays(pluginManager).map(d => ({
type: 'radio',
label: d.displayName,
Expand Down
2 changes: 1 addition & 1 deletion plugins/linear-genome-view/src/LinearGenomeView/components/TrackLabel.tsx
View file
Open in desktop
Expand Up @@ -73,7 +73,7 @@ const TrackLabel = React.forwardRef<HTMLDivElement, Props>(function (
},
...(session.getTrackActionMenuItems?.(trackConf) || []),
...track.trackMenuItems(),
].sort((a, b) => (b.priority || 0) - (a.priority || 0))
].sort((a, b) => (b?.priority || 0) - (a?.priority || 0))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nitpick but is it true that this needs a nullish check?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

might be able to remove

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was failing on that in testing -- again i wasn't able to explain why exactly it was happening (might have something to do w nextjs and alignments) but yeah.


return (
<Paper ref={ref} className={cx(className, classes.root)}>
Expand Down