fix(browser): allow viewing single source grp freqs on variant page

broadinstitute · Nov 1, 2024 · 504450c · 504450c
1 parent f89a77b
commit 504450c
Show file tree

Hide file tree

Showing 3 changed files with 322 additions and 1,373 deletions.
diff --git a/browser/src/VariantPage/GnomadPopulationsTable.spec.tsx b/browser/src/VariantPage/GnomadPopulationsTable.spec.tsx
@@ -3,7 +3,7 @@ import { describe, expect, test } from '@jest/globals'
 import renderer from 'react-test-renderer'
 
 import { GnomadPopulationsTable } from './GnomadPopulationsTable'
-import { allDatasetIds } from '@gnomad/dataset-metadata/metadata'
+import { allDatasetIds, getTopLevelDataset } from '@gnomad/dataset-metadata/metadata'
 import { createAncestryGroupObjects } from '../__factories__/Variant'
 
 describe('GnomadPopulationsTable', () => {
@@ -44,16 +44,19 @@ describe('GnomadPopulationsTable', () => {
       expect(tree).toMatchSnapshot()
     })
     test('has no unexpected changes when missing genetic ancestry groups are filled in', () => {
-      const jointGeneticAncestryGroupObjects = createAncestryGroupObjects(
-        [
-          { id: 'afr', value: 1 },
-          { id: 'remaining', value: 2 },
-          { id: 'eur', value: 4 },
-          { id: 'XX', value: 8 },
-          { id: 'XY', value: 16 },
-        ],
-        true
-      )
+      const jointGeneticAncestryGroupObjects =
+        getTopLevelDataset(dataset) === 'v4'
+          ? createAncestryGroupObjects(
+              [
+                { id: 'afr', value: 1 },
+                { id: 'remaining', value: 2 },
+                { id: 'eur', value: 4 },
+                { id: 'XX', value: 8 },
+                { id: 'XY', value: 16 },
+              ],
+              true
+            )
+          : null
 
       const tree = renderer.create(
         <GnomadPopulationsTable

diff --git a/browser/src/VariantPage/GnomadPopulationsTable.tsx b/browser/src/VariantPage/GnomadPopulationsTable.tsx
@@ -97,8 +97,8 @@ export class GnomadPopulationsTable extends Component<
     super(props)
 
     this.state = {
-      includeExomes: props.exomePopulations.length !== 0,
-      includeGenomes: props.genomePopulations.length !== 0,
+      includeExomes: props.exomePopulations.length !== 0 || !!props.jointPopulations,
+      includeGenomes: props.genomePopulations.length !== 0 || !!props.jointPopulations,
     }
   }
 
@@ -118,13 +118,7 @@ export class GnomadPopulationsTable extends Component<
       exomePopulations: includeExomes ? exomePopulations : [],
       genomePopulations: includeGenomes ? genomePopulations : [],
       jointPopulations:
-        // if theres joint data, but no variant present in genomes, still use joint
-        (includeExomes || exomePopulations.length === 0) &&
-        // if theres joint data, but no variant present in exomes, still use joint
-        (includeGenomes || genomePopulations.length === 0) &&
-        jointPopulations
-          ? jointPopulations
-          : null,
+        includeExomes && includeGenomes && jointPopulations ? jointPopulations : null,
     }).filter((mergedAncestry) => (mergedAncestry.id as string) !== '')
 
     const mergedPopulationsWithNames = addPopulationNames(mergedPopulations)
@@ -159,6 +153,14 @@ export class GnomadPopulationsTable extends Component<
       })
     }
 
+    const disableExomesCheckbox =
+      (jointPopulations && exomePopulations.length !== 0 && genomePopulations.length === 0) ||
+      (!jointPopulations && (exomePopulations.length === 0 || (includeExomes && !includeGenomes)))
+
+    const disableGenomesCheckbox =
+      (jointPopulations && exomePopulations.length === 0 && genomePopulations.length !== 0) ||
+      (!jointPopulations && (genomePopulations.length === 0 || (!includeExomes && includeGenomes)))
+
     return (
       <>
         <PopulationsTable
@@ -177,7 +179,7 @@ export class GnomadPopulationsTable extends Component<
           Include:
           <Checkbox
             checked={includeExomes}
-            disabled={exomePopulations.length === 0 || (includeExomes && !includeGenomes)}
+            disabled={disableExomesCheckbox}
             id="includeExomePopulations"
             label="Exomes"
             onChange={(value) => {
@@ -186,7 +188,7 @@ export class GnomadPopulationsTable extends Component<
           />
           <Checkbox
             checked={includeGenomes}
-            disabled={genomePopulations.length === 0 || (!includeExomes && includeGenomes)}
+            disabled={disableGenomesCheckbox}
             id="includeGenomePopulations"
             label="Genomes"
             onChange={(value) => {