@genspectrum/dashboard-components 0.10.4 → 0.11.1

package/dist/util.js

@@ -1,4 +1,4 @@
-import { D, d, v } from "./dateRangeOption-Doo6WHKu.js";
+import { D, d, v } from "./dateRangeOption-Bh2p78z0.js";
 export {
   D as DateRangeOptionChangedEvent,
   d as dateRangeOptionPresets,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@genspectrum/dashboard-components",
-    "version": "0.10.4",
+    "version": "0.11.1",
     "description": "GenSpectrum web components for building dashboards",
     "type": "module",
     "license": "AGPL-3.0-only",
@@ -28,14 +28,14 @@
     },
     "exports": {
         "./components": {
+            "types": "./dist/components.d.ts",
             "import": "./dist/components.js",
-            "require": "./dist/components.js",
-            "types": "./dist/components.d.ts"
+            "require": "./dist/components.js"
         },
         "./util": {
+            "types": "./dist/util.d.ts",
             "import": "./dist/util.js",
-            "require": "./dist/util.js",
-            "types": "./dist/util.d.ts"
+            "require": "./dist/util.js"
         },
         "./custom-elements.json": "./custom-elements.json",
         "./package.json": "./package.json",

package/src/preact/aggregatedData/aggregate.stories.tsx

@@ -51,7 +51,7 @@ export const Default: StoryObj<AggregateProps> = {
     args: {
         fields: ['division', 'host'],
         views: ['table'],
-        filter: {
+        lapisFilter: {
             country: 'USA',
         },
         width: '100%',

package/src/preact/aggregatedData/aggregate.tsx

@@ -16,13 +16,13 @@ import { ResizeContainer } from '../components/resize-container';
 import Tabs from '../components/tabs';
 import { useQuery } from '../useQuery';
 
-const viewSchema = z.literal(views.table);
-export type View = z.infer<typeof viewSchema>;
+const aggregateViewSchema = z.literal(views.table);
+export type AggregateView = z.infer<typeof aggregateViewSchema>;
 
 const aggregatePropsSchema = z.object({
-    filter: lapisFilterSchema,
+    lapisFilter: lapisFilterSchema,
     fields: z.array(z.string().min(1)),
-    views: z.array(viewSchema),
+    views: z.array(aggregateViewSchema),
     initialSortField: z.string(),
     initialSortDirection: z.union([z.literal('ascending'), z.literal('descending')]),
     pageSize: z.union([z.boolean(), z.number()]),
@@ -45,12 +45,15 @@ export const Aggregate: FunctionComponent<AggregateProps> = (componentProps) =>
 };
 
 export const AggregateInner: FunctionComponent<AggregateProps> = (componentProps) => {
-    const { fields, filter, initialSortField, initialSortDirection } = componentProps;
+    const { fields, lapisFilter, initialSortField, initialSortDirection } = componentProps;
     const lapis = useContext(LapisUrlContext);
 
     const { data, error, isLoading } = useQuery(async () => {
-        return queryAggregateData(filter, fields, lapis, { field: initialSortField, direction: initialSortDirection });
-    }, [filter, fields, lapis]);
+        return queryAggregateData(lapisFilter, fields, lapis, {
+            field: initialSortField,
+            direction: initialSortDirection,
+        });
+    }, [lapisFilter, fields, lapis]);
 
     if (isLoading) {
         return <LoadingDisplay />;
@@ -73,7 +76,7 @@ type AggregatedDataTabsProps = {
 };
 
 const AggregatedDataTabs: FunctionComponent<AggregatedDataTabsProps> = ({ data, originalComponentProps }) => {
-    const getTab = (view: View) => {
+    const getTab = (view: AggregateView) => {
         switch (view) {
             case 'table':
                 return {

package/src/preact/dateRangeSelector/date-range-selector.stories.tsx

@@ -54,7 +54,7 @@ const meta: Meta<DateRangeSelectorProps> = {
         dateRangeOptions: [dateRangeOptionPresets.lastMonth, dateRangeOptionPresets.allTimes, customDateRange],
         earliestDate,
         initialValue: dateRangeOptionPresets.lastMonth.label,
-        dateColumn: 'aDateColumn',
+        lapisDateField: 'aDateColumn',
         width: '100%',
         initialDateFrom: undefined,
         initialDateTo: undefined,
@@ -66,15 +66,7 @@ export default meta;
 export const Primary: StoryObj<DateRangeSelectorProps> = {
     render: (args) => (
         <LapisUrlContext.Provider value={LAPIS_URL}>
-            <DateRangeSelector
-                dateRangeOptions={args.dateRangeOptions}
-                earliestDate={args.earliestDate}
-                initialValue={args.initialValue}
-                initialDateFrom={args.initialDateFrom}
-                initialDateTo={args.initialDateTo}
-                width={args.width}
-                dateColumn={args.dateColumn}
-            />
+            <DateRangeSelector {...args} />
         </LapisUrlContext.Provider>
     ),
 };
@@ -226,7 +218,7 @@ export const WithNoDateColumn: StoryObj<DateRangeSelectorProps> = {
     ...Primary,
     args: {
         ...Primary.args,
-        dateColumn: '',
+        lapisDateField: '',
     },
     play: async ({ canvasElement, step }) => {
         step('expect error message', async () => {

package/src/preact/dateRangeSelector/date-range-selector.tsx

@@ -19,7 +19,7 @@ const dateRangeSelectorInnerPropsSchema = z.object({
     initialValue: z.string().optional(),
     initialDateFrom: z.string().date().optional(),
     initialDateTo: z.string().date().optional(),
-    dateColumn: z.string().min(1),
+    lapisDateField: z.string().min(1),
 });
 
 const dateRangeSelectorPropsSchema = dateRangeSelectorInnerPropsSchema.extend({
@@ -46,7 +46,7 @@ export const DateRangeSelectorInner = ({
     dateRangeOptions,
     earliestDate = '1900-01-01',
     initialValue,
-    dateColumn,
+    lapisDateField,
     initialDateFrom,
     initialDateTo,
 }: DateRangeSelectorInnerProps) => {
@@ -171,8 +171,8 @@ export const DateRangeSelectorInner = ({
         const dateTo = dateToPicker?.selectedDates[0];
 
         const detail = {
-            ...(dateFrom !== undefined && { [`${dateColumn}From`]: toYYYYMMDD(dateFrom) }),
-            ...(dateTo !== undefined && { [`${dateColumn}To`]: toYYYYMMDD(dateTo) }),
+            ...(dateFrom !== undefined && { [`${lapisDateField}From`]: toYYYYMMDD(dateFrom) }),
+            ...(dateTo !== undefined && { [`${lapisDateField}To`]: toYYYYMMDD(dateTo) }),
         };
 
         divRef.current?.dispatchEvent(

package/src/preact/mutationComparison/mutation-comparison.tsx

@@ -6,12 +6,7 @@ import { getMutationComparisonTableData } from './getMutationComparisonTableData
 import { MutationComparisonTable } from './mutation-comparison-table';
 import { MutationComparisonVenn } from './mutation-comparison-venn';
 import { filterMutationData, type MutationData, queryMutationData } from './queryMutationData';
-import {
-    type MutationComparisonView,
-    mutationComparisonViewSchema,
-    namedLapisFilterSchema,
-    sequenceTypeSchema,
-} from '../../types';
+import { namedLapisFilterSchema, sequenceTypeSchema, views } from '../../types';
 import { LapisUrlContext } from '../LapisUrlContext';
 import { CsvDownloadButton } from '../components/csv-download-button';
 import { ErrorBoundary } from '../components/error-boundary';
@@ -27,6 +22,9 @@ import { type DisplayedSegment, SegmentSelector, useDisplayedSegments } from '..
 import Tabs from '../components/tabs';
 import { useQuery } from '../useQuery';
 
+export const mutationComparisonViewSchema = z.union([z.literal(views.table), z.literal(views.venn)]);
+export type MutationComparisonView = z.infer<typeof mutationComparisonViewSchema>;
+
 const mutationComparisonPropsSchema = z.object({
     width: z.string(),
     height: z.string(),

package/src/preact/mutationFilter/mutation-filter.tsx

@@ -5,20 +5,14 @@ import z from 'zod';
 import { MutationFilterInfo } from './mutation-filter-info';
 import { parseAndValidateMutation, type ParsedMutationFilter } from './parseAndValidateMutation';
 import { type ReferenceGenome } from '../../lapisApi/ReferenceGenome';
+import { type MutationsFilter, mutationsFilterSchema } from '../../types';
 import { type DeletionClass, type InsertionClass, type SubstitutionClass } from '../../utils/mutations';
 import { ReferenceGenomeContext } from '../ReferenceGenomeContext';
 import { ErrorBoundary } from '../components/error-boundary';
 import { singleGraphColorRGBByName } from '../shared/charts/colors';
 
-const selectedMutationFilterStringsSchema = z.object({
-    nucleotideMutations: z.array(z.string()),
-    aminoAcidMutations: z.array(z.string()),
-    nucleotideInsertions: z.array(z.string()),
-    aminoAcidInsertions: z.array(z.string()),
-});
-export type SelectedMutationFilterStrings = z.infer<typeof selectedMutationFilterStringsSchema>;
 const mutationFilterInnerPropsSchema = z.object({
-    initialValue: z.union([selectedMutationFilterStringsSchema.optional(), z.array(z.string()), z.undefined()]),
+    initialValue: z.union([mutationsFilterSchema.optional(), z.array(z.string()), z.undefined()]),
 });
 
 const mutationFilterPropsSchema = mutationFilterInnerPropsSchema.extend({
@@ -73,7 +67,7 @@ export const MutationFilterInner: FunctionComponent<MutationFilterInnerProps> =
         const detail = mapToMutationFilterStrings(selectedFilters);
 
         filterRef.current?.dispatchEvent(
-            new CustomEvent<SelectedMutationFilterStrings>('gs-mutation-filter-changed', {
+            new CustomEvent<MutationsFilter>('gs-mutation-filter-changed', {
                 detail,
                 bubbles: true,
                 composed: true,
@@ -105,10 +99,7 @@ export const MutationFilterInner: FunctionComponent<MutationFilterInnerProps> =
     );
 };
 
-function getInitialState(
-    initialValue: SelectedMutationFilterStrings | string[] | undefined,
-    referenceGenome: ReferenceGenome,
-) {
+function getInitialState(initialValue: MutationsFilter | string[] | undefined, referenceGenome: ReferenceGenome) {
     if (initialValue === undefined) {
         return {
             nucleotideMutations: [],

package/src/preact/mutations/mutations.tsx

@@ -30,13 +30,13 @@ import { type DisplayedSegment, SegmentSelector, useDisplayedSegments } from '..
 import Tabs from '../components/tabs';
 import { useQuery } from '../useQuery';
 
-const viewSchema = z.union([z.literal(views.table), z.literal(views.grid), z.literal(views.insertions)]);
-export type View = z.infer<typeof viewSchema>;
+const mutationsViewSchema = z.union([z.literal(views.table), z.literal(views.grid), z.literal(views.insertions)]);
+export type MutationsView = z.infer<typeof mutationsViewSchema>;
 
 const mutationsPropsSchema = z.object({
     lapisFilter: lapisFilterSchema,
     sequenceType: sequenceTypeSchema,
-    views: viewSchema.array(),
+    views: mutationsViewSchema.array(),
     pageSize: z.union([z.boolean(), z.number()]),
     width: z.string(),
     height: z.string(),
@@ -95,7 +95,7 @@ const MutationsTabs: FunctionComponent<MutationTabsProps> = ({ mutationsData, or
 
     const filteredData = filterMutationsData(mutationsData, displayedSegments, displayedMutationTypes);
 
-    const getTab = (view: View) => {
+    const getTab = (view: MutationsView) => {
         switch (view) {
             case 'table':
                 return {

package/src/preact/mutationsOverTime/mutations-over-time.tsx

@@ -35,13 +35,13 @@ import { type DisplayedSegment, SegmentSelector, useDisplayedSegments } from '..
 import Tabs from '../components/tabs';
 import { useWebWorker } from '../webWorkers/useWebWorker';
 
-const viewSchema = z.literal(views.grid);
-export type View = z.infer<typeof viewSchema>;
+const mutationsOverTimeViewSchema = z.literal(views.grid);
+export type MutationsOverTimeView = z.infer<typeof mutationsOverTimeViewSchema>;
 
 const mutationOverTimeSchema = z.object({
     lapisFilter: lapisFilterSchema,
     sequenceType: sequenceTypeSchema,
-    views: z.array(viewSchema),
+    views: z.array(mutationsOverTimeViewSchema),
     granularity: temporalGranularitySchema,
     lapisDateField: z.string().min(1),
     width: z.string(),
@@ -134,7 +134,7 @@ const MutationsOverTimeTabs: FunctionComponent<MutationOverTimeTabsProps> = ({
         );
     }, [mutationOverTimeData, overallMutationData, displayedSegments, displayedMutationTypes, proportionInterval]);
 
-    const getTab = (view: View) => {
+    const getTab = (view: MutationsOverTimeView) => {
         if (filteredData === undefined) {
             return {
                 title: 'Calculating',

package/src/preact/numberSequencesOverTime/number-sequences-over-time.stories.tsx

@@ -30,21 +30,12 @@ export default {
 const Template: StoryObj<NumberSequencesOverTimeProps> = {
     render: (args) => (
         <LapisUrlContext.Provider value={LAPIS_URL}>
-            <NumberSequencesOverTime
-                lapisFilter={args.lapisFilter}
-                lapisDateField={args.lapisDateField}
-                views={args.views}
-                width={args.width}
-                height={args.height}
-                granularity={args.granularity}
-                smoothingWindow={args.smoothingWindow}
-                pageSize={args.pageSize}
-            />
+            <NumberSequencesOverTime {...args} />
         </LapisUrlContext.Provider>
     ),
     args: {
         views: ['bar', 'line', 'table'],
-        lapisFilter: [
+        lapisFilters: [
             { displayName: 'EG', lapisFilter: { country: 'USA', pangoLineage: 'EG*', dateFrom: '2022-12-01' } },
         ],
         lapisDateField: 'date',
@@ -82,11 +73,11 @@ export const Table = {
     ...Template,
 };
 
-export const TwoVariants = {
+export const TwoVariants: StoryObj<NumberSequencesOverTimeProps> = {
     ...Template,
     args: {
         ...Template.args,
-        lapisFilter: [
+        lapisFilters: [
             { displayName: 'EG', lapisFilter: { country: 'USA', pangoLineage: 'EG*', dateTo: '2023-06-30' } },
             { displayName: 'JN.1', lapisFilter: { country: 'USA', pangoLineage: 'JN.1*', dateFrom: '2023-01-01' } },
         ],

package/src/preact/numberSequencesOverTime/number-sequences-over-time.tsx

@@ -34,7 +34,7 @@ export type NumberSequencesOverTimeView = z.infer<typeof numberSequencesOverTime
 const numberSequencesOverTimePropsSchema = z.object({
     width: z.string(),
     height: z.string(),
-    lapisFilter: z.union([namedLapisFilterSchema, z.array(namedLapisFilterSchema)]),
+    lapisFilters: z.array(namedLapisFilterSchema).min(1),
     lapisDateField: z.string().min(1),
     views: z.array(numberSequencesOverTimeViewSchema),
     granularity: temporalGranularitySchema,
@@ -58,12 +58,12 @@ export const NumberSequencesOverTime = (componentProps: NumberSequencesOverTimeP
 };
 
 const NumberSequencesOverTimeInner = (componentProps: NumberSequencesOverTimeProps) => {
-    const { lapisFilter, lapisDateField, granularity, smoothingWindow } = componentProps;
+    const { lapisFilters, lapisDateField, granularity, smoothingWindow } = componentProps;
     const lapis = useContext(LapisUrlContext);
 
     const { data, error, isLoading } = useQuery(
-        () => queryNumberOfSequencesOverTime(lapis, lapisFilter, lapisDateField, granularity, smoothingWindow),
-        [lapis, lapisFilter, lapisDateField, granularity, smoothingWindow],
+        () => queryNumberOfSequencesOverTime(lapis, lapisFilters, lapisDateField, granularity, smoothingWindow),
+        [lapis, lapisFilters, lapisDateField, granularity, smoothingWindow],
     );
 
     if (isLoading) {

package/src/preact/prevalenceOverTime/prevalence-over-time.stories.tsx

@@ -19,8 +19,6 @@ export default {
         fetchMock: {},
     },
     argTypes: {
-        numerator: { control: 'object' },
-        denominator: { control: 'object' },
         granularity: {
             options: ['day', 'week', 'month', 'year'],
             control: { type: 'radio' },
@@ -45,20 +43,7 @@ export default {
 const Template = {
     render: (args: PrevalenceOverTimeProps) => (
         <LapisUrlContext.Provider value={LAPIS_URL}>
-            <PrevalenceOverTime
-                numeratorFilter={args.numeratorFilter}
-                denominatorFilter={args.denominatorFilter}
-                granularity={args.granularity}
-                smoothingWindow={args.smoothingWindow}
-                views={args.views}
-                confidenceIntervalMethods={args.confidenceIntervalMethods}
-                width={args.width}
-                height={args.height}
-                lapisDateField={args.lapisDateField}
-                pageSize={args.pageSize}
-                yAxisMaxLinear={args.yAxisMaxLinear}
-                yAxisMaxLogarithmic={args.yAxisMaxLogarithmic}
-            />
+            <PrevalenceOverTime {...args} />
         </LapisUrlContext.Provider>
     ),
 };
@@ -66,7 +51,7 @@ const Template = {
 export const TwoVariants: StoryObj<PrevalenceOverTimeProps> = {
     ...Template,
     args: {
-        numeratorFilter: [
+        numeratorFilters: [
             { displayName: 'EG', lapisFilter: { country: 'USA', pangoLineage: 'EG*', dateFrom: '2023-01-01' } },
             { displayName: 'JN.1', lapisFilter: { country: 'USA', pangoLineage: 'JN.1*', dateFrom: '2023-01-01' } },
         ],
@@ -140,10 +125,12 @@ export const TwoVariants: StoryObj<PrevalenceOverTimeProps> = {
 export const OneVariant: StoryObj<PrevalenceOverTimeProps> = {
     ...Template,
     args: {
-        numeratorFilter: {
-            displayName: 'EG',
-            lapisFilter: { country: 'USA', pangoLineage: 'BA.2.86*', dateFrom: '2023-10-01' },
-        },
+        numeratorFilters: [
+            {
+                displayName: 'EG',
+                lapisFilter: { country: 'USA', pangoLineage: 'BA.2.86*', dateFrom: '2023-10-01' },
+            },
+        ],
         denominatorFilter: { country: 'USA', dateFrom: '2023-10-01' },
         granularity: 'day',
         smoothingWindow: 7,
@@ -198,10 +185,12 @@ export const OneVariant: StoryObj<PrevalenceOverTimeProps> = {
 export const ShowsNoDataBanner: StoryObj<PrevalenceOverTimeProps> = {
     ...Template,
     args: {
-        numeratorFilter: {
-            displayName: 'EG',
-            lapisFilter: { country: 'USA', pangoLineage: 'BA.2.86*', dateFrom: '2023-10-01' },
-        },
+        numeratorFilters: [
+            {
+                displayName: 'EG',
+                lapisFilter: { country: 'USA', pangoLineage: 'BA.2.86*', dateFrom: '2023-10-01' },
+            },
+        ],
         denominatorFilter: { country: 'USA', dateFrom: '2023-10-01' },
         granularity: 'day',
         smoothingWindow: 7,

package/src/preact/prevalenceOverTime/prevalence-over-time.tsx

@@ -25,22 +25,22 @@ import { axisMaxSchema } from '../shared/charts/getYAxisMax';
 import { type ScaleType } from '../shared/charts/getYAxisScale';
 import { useQuery } from '../useQuery';
 
-const viewSchema = z.union([
+const prevalenceOverTimeViewSchema = z.union([
     z.literal(views.table),
     z.literal(views.bar),
     z.literal(views.line),
     z.literal(views.bubble),
 ]);
-export type View = z.infer<typeof viewSchema>;
+export type PrevalenceOverTimeView = z.infer<typeof prevalenceOverTimeViewSchema>;
 
 const prevalenceOverTimePropsSchema = z.object({
     width: z.string(),
     height: z.string(),
-    numeratorFilter: z.union([namedLapisFilterSchema, z.array(namedLapisFilterSchema)]),
+    numeratorFilters: z.array(namedLapisFilterSchema).min(1),
     denominatorFilter: lapisFilterSchema,
     granularity: temporalGranularitySchema,
     smoothingWindow: z.number(),
-    views: z.array(viewSchema),
+    views: z.array(prevalenceOverTimeViewSchema),
     confidenceIntervalMethods: z.array(confidenceIntervalMethodSchema),
     lapisDateField: z.string().min(1),
     pageSize: z.union([z.boolean(), z.number()]),
@@ -64,20 +64,20 @@ export const PrevalenceOverTime: FunctionComponent<PrevalenceOverTimeProps> = (c
 };
 
 export const PrevalenceOverTimeInner: FunctionComponent<PrevalenceOverTimeProps> = (componentProps) => {
-    const { numeratorFilter, denominatorFilter, granularity, smoothingWindow, lapisDateField } = componentProps;
+    const { numeratorFilters, denominatorFilter, granularity, smoothingWindow, lapisDateField } = componentProps;
     const lapis = useContext(LapisUrlContext);
 
     const { data, error, isLoading } = useQuery(
         () =>
             queryPrevalenceOverTime(
-                numeratorFilter,
+                numeratorFilters,
                 denominatorFilter,
                 granularity,
                 smoothingWindow,
                 lapis,
                 lapisDateField,
             ),
-        [lapis, numeratorFilter, denominatorFilter, granularity, smoothingWindow, lapisDateField],
+        [lapis, numeratorFilters, denominatorFilter, granularity, smoothingWindow, lapisDateField],
     );
 
     if (isLoading) {
@@ -118,7 +118,7 @@ const PrevalenceOverTimeTabs: FunctionComponent<PrevalenceOverTimeTabsProps> = (
 
     const yAxisMaxConfig = { linear: yAxisMaxLinear, logarithmic: yAxisMaxLogarithmic };
 
-    const getTab = (view: View) => {
+    const getTab = (view: PrevalenceOverTimeView) => {
         switch (view) {
             case 'bar':
                 return {

package/src/preact/relativeGrowthAdvantage/relative-growth-advantage.stories.tsx

@@ -31,16 +31,7 @@ export default {
 export const Primary: StoryObj<RelativeGrowthAdvantageProps> = {
     render: (args: RelativeGrowthAdvantageProps) => (
         <LapisUrlContext.Provider value={LAPIS_URL}>
-            <RelativeGrowthAdvantage
-                numeratorFilter={args.numeratorFilter}
-                denominatorFilter={args.denominatorFilter}
-                generationTime={args.generationTime}
-                views={args.views}
-                width={args.width}
-                height={args.height}
-                lapisDateField={args.lapisDateField}
-                yAxisMaxConfig={args.yAxisMaxConfig}
-            />
+            <RelativeGrowthAdvantage {...args} />
         </LapisUrlContext.Provider>
     ),
     args: {
@@ -56,10 +47,8 @@ export const Primary: StoryObj<RelativeGrowthAdvantageProps> = {
         width: '100%',
         height: '700px',
         lapisDateField: 'date',
-        yAxisMaxConfig: {
-            linear: 1,
-            logarithmic: 1,
-        },
+        yAxisMaxLinear: 1,
+        yAxisMaxLogarithmic: 1,
     },
     parameters: {
         fetchMock: {

package/src/preact/relativeGrowthAdvantage/relative-growth-advantage.tsx

@@ -18,12 +18,12 @@ import { NoDataDisplay } from '../components/no-data-display';
 import { ResizeContainer } from '../components/resize-container';
 import { ScalingSelector } from '../components/scaling-selector';
 import Tabs from '../components/tabs';
-import { yAxisMaxConfigSchema } from '../shared/charts/getYAxisMax';
+import { axisMaxSchema } from '../shared/charts/getYAxisMax';
 import { type ScaleType } from '../shared/charts/getYAxisScale';
 import { useQuery } from '../useQuery';
 
-const viewSchema = z.literal(views.line);
-export type View = z.infer<typeof viewSchema>;
+const relativeGrowthAdvantageViewSchema = z.literal(views.line);
+export type RelativeGrowthAdvantageView = z.infer<typeof relativeGrowthAdvantageViewSchema>;
 
 export const relativeGrowthAdvantagePropsSchema = z.object({
     width: z.string(),
@@ -31,9 +31,10 @@ export const relativeGrowthAdvantagePropsSchema = z.object({
     numeratorFilter: lapisFilterSchema,
     denominatorFilter: lapisFilterSchema,
     generationTime: z.number(),
-    views: z.array(viewSchema),
+    views: z.array(relativeGrowthAdvantageViewSchema),
     lapisDateField: z.string().min(1),
-    yAxisMaxConfig: yAxisMaxConfigSchema,
+    yAxisMaxLinear: axisMaxSchema,
+    yAxisMaxLogarithmic: axisMaxSchema,
 });
 export type RelativeGrowthAdvantageProps = z.infer<typeof relativeGrowthAdvantagePropsSchema>;
 
@@ -101,7 +102,7 @@ const RelativeGrowthAdvantageTabs: FunctionComponent<RelativeGrowthAdvantageTabs
     setYAxisScaleType,
     originalComponentProps,
 }) => {
-    const getTab = (view: View) => {
+    const getTab = (view: RelativeGrowthAdvantageView) => {
         switch (view) {
             case 'line':
                 return {
@@ -114,7 +115,10 @@ const RelativeGrowthAdvantageTabs: FunctionComponent<RelativeGrowthAdvantageTabs
                                 params: data.params,
                             }}
                             yAxisScaleType={yAxisScaleType}
-                            yAxisMaxConfig={originalComponentProps.yAxisMaxConfig}
+                            yAxisMaxConfig={{
+                                linear: originalComponentProps.yAxisMaxLinear,
+                                logarithmic: originalComponentProps.yAxisMaxLogarithmic,
+                            }}
                         />
                     ),
                 };

package/src/query/queryNumberOfSequencesOverTime.spec.ts

@@ -21,7 +21,7 @@ describe('queryNumberOfSequencesOverTime', () => {
 
         const result = await queryNumberOfSequencesOverTime(
             DUMMY_LAPIS_URL,
-            { displayName: 'displayName', lapisFilter },
+            [{ displayName: 'displayName', lapisFilter }],
             lapisDateField,
             'day',
             0,
@@ -51,7 +51,7 @@ describe('queryNumberOfSequencesOverTime', () => {
 
         const result = await queryNumberOfSequencesOverTime(
             DUMMY_LAPIS_URL,
-            { displayName: 'displayName', lapisFilter },
+            [{ displayName: 'displayName', lapisFilter }],
             lapisDateField,
             'day',
             0,
@@ -87,7 +87,7 @@ describe('queryNumberOfSequencesOverTime', () => {
 
         const result = await queryNumberOfSequencesOverTime(
             DUMMY_LAPIS_URL,
-            { displayName: 'displayName', lapisFilter },
+            [{ displayName: 'displayName', lapisFilter }],
             lapisDateField,
             'day',
             3,
@@ -122,7 +122,7 @@ describe('queryNumberOfSequencesOverTime', () => {
 
         const result = await queryNumberOfSequencesOverTime(
             DUMMY_LAPIS_URL,
-            { displayName: 'displayName', lapisFilter },
+            [{ displayName: 'displayName', lapisFilter }],
             lapisDateField,
             'month',
             0,

package/src/query/queryNumberOfSequencesOverTime.ts

@@ -1,19 +1,16 @@
 import { queryAggregatedDataOverTime } from './queryAggregatedDataOverTime';
 import { type NamedLapisFilter, type TemporalGranularity } from '../types';
 import { sortNullToBeginningThenByDate } from '../utils/sort';
-import { makeArray } from '../utils/utils';
 
 export type NumberOfSequencesDatasets = Awaited<ReturnType<typeof queryNumberOfSequencesOverTime>>;
 
 export async function queryNumberOfSequencesOverTime(
     lapis: string,
-    lapisFilter: NamedLapisFilter | NamedLapisFilter[],
+    lapisFilters: NamedLapisFilter[],
     lapisDateField: string,
     granularity: TemporalGranularity,
     smoothingWindow: number,
 ) {
-    const lapisFilters = makeArray(lapisFilter);
-
     const queries = lapisFilters.map(async ({ displayName, lapisFilter }) => {
         const { content } = await queryAggregatedDataOverTime(
             lapisFilter,

package/src/query/queryPrevalenceOverTime.ts

@@ -2,7 +2,6 @@ import { queryAggregatedDataOverTime } from './queryAggregatedDataOverTime';
 import { DivisionOperator } from '../operator/DivisionOperator';
 import { type LapisFilter, type NamedLapisFilter, type TemporalGranularity } from '../types';
 import { type TemporalClass } from '../utils/temporalClass';
-import { makeArray } from '../utils/utils';
 
 export type PrevalenceOverTimeData = PrevalenceOverTimeVariantData[];
 
@@ -19,7 +18,7 @@ export type PrevalenceOverTimeVariantDataPoint = {
 };
 
 export function queryPrevalenceOverTime(
-    numeratorFilter: NamedLapisFilter | NamedLapisFilter[],
+    numeratorFilters: NamedLapisFilter[],
     denominatorFilter: LapisFilter,
     granularity: TemporalGranularity,
     smoothingWindow: number,
@@ -27,8 +26,6 @@ export function queryPrevalenceOverTime(
     lapisDateField: string,
     signal?: AbortSignal,
 ): Promise<PrevalenceOverTimeData> {
-    const numeratorFilters = makeArray(numeratorFilter);
-
     const denominatorData = queryAggregatedDataOverTime(
         denominatorFilter,
         granularity,