Skip to content

Commit

Permalink
Update group comparison
Browse files Browse the repository at this point in the history
  • Loading branch information
alisman committed Mar 22, 2023
1 parent fc00388 commit 5c6c1e1
Show file tree
Hide file tree
Showing 7 changed files with 37 additions and 35 deletions.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions end-to-end-test/local/specs/annotation-filter-menu.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,7 @@ describe('alteration filter menu', function() {
// -+=+ MUTATION STATUS +=+-
it('filters enrichment table when unchecking germline checkbox', () => {
clickCheckBoxResultsView('Germline');

assert.deepStrictEqual(enrichmentTableCounts(), {
DTNB: { alt: '1 (100.00%)', unalt: '0 (0.00%)' },
ADAMTS20: { alt: '1 (100.00%)', unalt: '0 (0.00%)' },
Expand Down
71 changes: 36 additions & 35 deletions src/pages/groupComparison/AlterationEnrichments.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,40 +51,28 @@ export default class AlterationEnrichments extends React.Component<
render: () => {
let headerName = GENOMIC_ALTERATIONS_TAB_NAME;
return (
<>
{getServerConfig().skin_show_settings_menu && (
<AlterationFilterMenuSection
store={this.props.store}
updateSelectedEnrichmentEventTypes={
this.props.store
.updateSelectedEnrichmentEventTypes
}
/>
)}
<div data-test="GroupComparisonAlterationEnrichments">
<AlterationEnrichmentContainer
data={
this.props.store.alterationsEnrichmentData
.result!
}
groups={
this.props.store
.alterationsEnrichmentAnalysisGroups.result
}
alteredVsUnalteredMode={false}
headerName={headerName}
patientLevelEnrichments={
this.props.store.usePatientLevelEnrichments
}
onSetPatientLevelEnrichments={
this.props.store.setUsePatientLevelEnrichments
}
store={this.props.resultsViewStore}
comparisonStore={this.props.store}
dashToRight={this.useInlineTypeSelectorMenu}
/>
</div>
</>
<div data-test="GroupComparisonAlterationEnrichments">
<AlterationEnrichmentContainer
data={
this.props.store.alterationsEnrichmentData.result!
}
groups={
this.props.store.alterationsEnrichmentAnalysisGroups
.result
}
alteredVsUnalteredMode={false}
headerName={headerName}
patientLevelEnrichments={
this.props.store.usePatientLevelEnrichments
}
onSetPatientLevelEnrichments={
this.props.store.setUsePatientLevelEnrichments
}
store={this.props.resultsViewStore}
comparisonStore={this.props.store}
dashToRight={this.useInlineTypeSelectorMenu}
/>
</div>
);
},
renderPending: () => (
Expand All @@ -94,6 +82,19 @@ export default class AlterationEnrichments extends React.Component<
});

render() {
return this.tabUI.component;
return (
<>
{getServerConfig().skin_show_settings_menu && (
<AlterationFilterMenuSection
store={this.props.store}
updateSelectedEnrichmentEventTypes={
this.props.store.updateSelectedEnrichmentEventTypes
}
/>
)}

{this.tabUI.component}
</>
);
}
}

0 comments on commit 5c6c1e1

Please sign in to comment.