diff --git a/website/src/components/views/compareSideBySide/GenericCompareSideBySideDataDisplay.tsx b/website/src/components/views/compareSideBySide/GenericCompareSideBySideDataDisplay.tsx index 4b84d3b4..53921b47 100644 --- a/website/src/components/views/compareSideBySide/GenericCompareSideBySideDataDisplay.tsx +++ b/website/src/components/views/compareSideBySide/GenericCompareSideBySideDataDisplay.tsx @@ -1,6 +1,7 @@ import { type FC, useMemo } from 'react'; import type { OrganismsConfig } from '../../../config.ts'; +import { Organisms } from '../../../types/Organism.ts'; import { chooseGranularityBasedOnDateRange } from '../../../util/chooseGranularityBasedOnDateRange.ts'; import { ComponentHeight } from '../../../views/OrganismConstants.ts'; import type { DatasetAndVariantData } from '../../../views/View.ts'; @@ -10,6 +11,7 @@ import { compareSideBySideViewKey } from '../../../views/viewKeys.ts'; import { GsAggregate } from '../../genspectrum/GsAggregate.tsx'; import { GsMutations } from '../../genspectrum/GsMutations.tsx'; import { GsPrevalenceOverTime } from '../../genspectrum/GsPrevalenceOverTime.tsx'; +import { GsRelativeGrowthAdvantage } from '../../genspectrum/GsRelativeGrowthAdvantage.tsx'; export type GenericCompareSideBySideDataDisplayProps = { organismViewKey: `${OrganismWithViewKey}.${typeof compareSideBySideViewKey}`; @@ -53,6 +55,14 @@ export const GenericCompareSideBySideDataDisplay: FC + {view.organismConstants.organism === Organisms.covid && ( + + )} {hideMutationComponents !== true && ( <> - -
- { - Array.from(pageState.filters).map(([id, { variantFilter, datasetFilter }]) => { - const baselineLapisFilter = toLapisFilterWithoutVariant( - datasetFilter, - view.organismConstants.additionalFilters, - ); - const timeGranularity = chooseGranularityBasedOnDateRange({ - earliestDate: new Date(view.organismConstants.earliestDate), - dateRange: datasetFilter.dateFilters[view.organismConstants.mainDateField], - }); - const numeratorFilter = { - ...variantFilter.lineages, - ...variantFilter.mutations, - variantQuery: variantFilter.variantQuery, - ...baselineLapisFilter, - }; - - return ( -
-
- {pageState.filters.size > 1 && ( - - Remove column - - )} - - - -
- - - - - - {view.organismConstants.aggregatedVisualizations.compareSideBySide.map( - ({ label, fields, views }) => ( - - ), - )} -
- ); - }) - } - - Add column - -
-
- +