@genspectrum/dashboard-components 0.10.3 → 0.11.0

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

@@ -6,7 +6,7 @@ import { LAPIS_URL } from '../../constants';
 import referenceGenome from '../../lapisApi/__mockData__/referenceGenome.json';
 import { LapisUrlContext } from '../LapisUrlContext';
 import { ReferenceGenomeContext } from '../ReferenceGenomeContext';
-import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectInvalidAttributesErrorMessage';
+import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectErrorMessage';
 
 const meta: Meta<MutationsOverTimeProps> = {
     title: 'Visualization/Mutation over time',

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

@@ -6,7 +6,7 @@ import oneVariantEG from '../../preact/numberSequencesOverTime/__mockData__/oneV
 import twoVariantsEG from '../../preact/numberSequencesOverTime/__mockData__/twoVariantsEG.json';
 import twoVariantsJN1 from '../../preact/numberSequencesOverTime/__mockData__/twoVariantsJN1.json';
 import { LapisUrlContext } from '../LapisUrlContext';
-import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectInvalidAttributesErrorMessage';
+import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectErrorMessage';
 
 export default {
     title: 'Visualization/NumberSequencesOverTime',
@@ -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

@@ -10,7 +10,7 @@ import numeratorFilterNoData from './__mockData__/numeratorFilterNoData.json';
 import numeratorOneDataset from './__mockData__/numeratorFilterOneDataset.json';
 import { PrevalenceOverTime, type PrevalenceOverTimeProps } from './prevalence-over-time';
 import { AGGREGATED_ENDPOINT, LAPIS_URL } from '../../constants';
-import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectInvalidAttributesErrorMessage';
+import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectErrorMessage';
 
 export default {
     title: 'Visualization/PrevalenceOverTime',
@@ -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

@@ -6,7 +6,7 @@ import numerator from './__mockData__/numeratorFilter.json';
 import { RelativeGrowthAdvantage, type RelativeGrowthAdvantageProps } from './relative-growth-advantage';
 import { AGGREGATED_ENDPOINT, LAPIS_URL } from '../../constants';
 import { LapisUrlContext } from '../LapisUrlContext';
-import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectInvalidAttributesErrorMessage';
+import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectErrorMessage';
 
 export default {
     title: 'Visualization/RelativeGrowthAdvantage',
@@ -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/preact/shared/stories/expectErrorMessage.ts

@@ -0,0 +1,21 @@
+import { expect, waitFor, within } from '@storybook/test';
+
+export function playThatExpectsErrorMessage(errorTitle: string, errorMessage: string) {
+    return async ({ canvasElement }: { canvasElement: HTMLElement }) => {
+        await expectErrorMessage(canvasElement, errorTitle, errorMessage);
+    };
+}
+
+export async function expectErrorMessage(canvasElement: HTMLElement, errorTitle: string, errorMessage: string) {
+    const canvas = within(canvasElement);
+
+    await waitFor(() => expect(canvas.getByText(errorTitle, { exact: false })).toBeInTheDocument());
+
+    canvas.getByRole('button', { name: 'Show details.' }).click();
+
+    await waitFor(() => expect(canvas.getByText(errorMessage, { exact: false })).toBeVisible());
+}
+
+export async function expectInvalidAttributesErrorMessage(canvasElement: HTMLElement, errorMessage: string) {
+    await expectErrorMessage(canvasElement, 'Error - Invalid component attributes', errorMessage);
+}

package/src/preact/textInput/text-input.stories.tsx

@@ -6,7 +6,7 @@ import { TextInput, type TextInputProps } from './text-input';
 import { previewHandles } from '../../../.storybook/preview';
 import { AGGREGATED_ENDPOINT, LAPIS_URL } from '../../constants';
 import { LapisUrlContext } from '../LapisUrlContext';
-import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectInvalidAttributesErrorMessage';
+import { expectInvalidAttributesErrorMessage } from '../shared/stories/expectErrorMessage';
 
 const meta: Meta<TextInputProps> = {
     title: 'Input/TextInput',

package/src/preact/useQuery.ts

@@ -23,5 +23,13 @@ export function useQuery<Data>(fetchDataCallback: () => Promise<Data>, dependenc
         // eslint-disable-next-line react-hooks/exhaustive-deps
     }, [JSON.stringify(dependencies)]);
 
-    return { data, error, isLoading };
+    if (isLoading) {
+        return { isLoading: true } as const;
+    }
+
+    if (error !== null) {
+        return { error, isLoading: false as const };
+    }
+
+    return { data: data!, error: null, isLoading: false as const };
 }

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,

package/src/styles/tailwind.css

@@ -1,3 +1,3 @@
 @tailwind base;
 @tailwind components;
-@tailwind utilities;
+@tailwind utilities;

package/src/types.ts

@@ -9,7 +9,17 @@ import {
     type SubstitutionClass,
 } from './utils/mutations';
 
-export const lapisFilterSchema = z.record(z.union([z.string(), z.number(), z.null(), z.boolean()]));
+export const mutationsFilterSchema = z.object({
+    nucleotideMutations: z.array(z.string()),
+    aminoAcidMutations: z.array(z.string()),
+    nucleotideInsertions: z.array(z.string()),
+    aminoAcidInsertions: z.array(z.string()),
+});
+export type MutationsFilter = z.infer<typeof mutationsFilterSchema>;
+
+export const lapisFilterSchema = z
+    .record(z.union([z.string(), z.array(z.string()), z.number(), z.null(), z.boolean(), z.undefined()]))
+    .and(mutationsFilterSchema.partial());
 export type LapisFilter = z.infer<typeof lapisFilterSchema>;
 
 export const namedLapisFilterSchema = z.object({
@@ -64,7 +74,5 @@ export const views = {
     bar: 'bar',
     line: 'line',
     bubble: 'bubble',
+    map: 'map',
 } as const;
-
-export const mutationComparisonViewSchema = z.union([z.literal(views.table), z.literal(views.venn)]);
-export type MutationComparisonView = z.infer<typeof mutationComparisonViewSchema>;

package/src/utilEntrypoint.ts

@@ -10,12 +10,24 @@ export {
     type LapisFilter,
     type SequenceType,
     views,
-    type MutationComparisonView,
     type TemporalGranularity,
+    type MutationsFilter,
 } from './types';
 
-export { type SelectedMutationFilterStrings } from './preact/mutationFilter/mutation-filter';
+export type { MutationComparisonView, MutationComparisonProps } from './preact/mutationComparison/mutation-comparison';
+export type { MutationsView, MutationsProps } from './preact/mutations/mutations';
+export type { AggregateView, AggregateProps } from './preact/aggregatedData/aggregate';
+export type {
+    NumberSequencesOverTimeView,
+    NumberSequencesOverTimeProps,
+} from './preact/numberSequencesOverTime/number-sequences-over-time';
+export type { PrevalenceOverTimeView, PrevalenceOverTimeProps } from './preact/prevalenceOverTime/prevalence-over-time';
+export type {
+    RelativeGrowthAdvantageView,
+    RelativeGrowthAdvantageProps,
+} from './preact/relativeGrowthAdvantage/relative-growth-advantage';
+export type { StatisticsProps } from './preact/statistic/statistics';
 
-export { type ConfidenceIntervalMethod } from './preact/shared/charts/confideceInterval';
+export type { ConfidenceIntervalMethod } from './preact/shared/charts/confideceInterval';
 
-export { type AxisMax, type YAxisMaxConfig } from './preact/shared/charts/getYAxisMax';
+export type { AxisMax, YAxisMaxConfig } from './preact/shared/charts/getYAxisMax';

package/src/utils/utils.ts

@@ -1,5 +1,3 @@
-import { type LapisFilter } from '../types';
-
 export function getMinMaxNumber(values: Iterable<number>): [number, number] | null {
     let min = null;
     let max = null;
@@ -16,30 +14,3 @@ export function getMinMaxNumber(values: Iterable<number>): [number, number] | nu
     }
     return [min, max];
 }
-
-export function mapLapisFilterToUrlParams(filter: LapisFilter): URLSearchParams {
-    const params = Object.entries(filter).map(([key, value]) => [key, stringifyLapisFilterValue(value)]);
-
-    return new URLSearchParams(params);
-}
-
-function stringifyLapisFilterValue(value: LapisFilter[string]) {
-    if (value === null) {
-        return 'null';
-    }
-    switch (typeof value) {
-        case 'boolean':
-            return value ? 'true' : 'false';
-        case 'number':
-            return value.toString();
-        case 'string':
-            return value;
-    }
-}
-
-export function makeArray<T>(arrayOrSingleItem: T | T[]) {
-    if (Array.isArray(arrayOrSingleItem)) {
-        return arrayOrSingleItem;
-    }
-    return [arrayOrSingleItem];
-}

package/src/web-components/app.ts

@@ -2,7 +2,7 @@ import { provide } from '@lit/context';
 import { Task } from '@lit/task';
 import { html, LitElement } from 'lit';
 import { customElement, property } from 'lit/decorators.js';
-import { type DetailedHTMLProps, type HTMLAttributes } from 'react';
+import type { DetailedHTMLProps, HTMLAttributes } from 'react';
 import z from 'zod';
 
 import { lapisContext } from './lapis-context';

package/src/web-components/input/gs-date-range-selector.stories.ts

@@ -20,7 +20,7 @@ const codeExample = String.raw`
     initialDateFrom="2020-01-01"
     initialDateTo="2021-01-01"
     width="100%"
-    dateColumn="myDateColumn"
+    lapisDateField="myDateColumn"
 ></gs-date-range-selector>`;
 
 const customDateRange = { label: 'CustomDateRange', dateFrom: '2021-01-01', dateTo: '2021-12-31' };
@@ -46,7 +46,7 @@ const meta: Meta<Required<DateRangeSelectorProps>> = {
             },
             options: [dateRangeOptionPresets.lastMonth.label, dateRangeOptionPresets.allTimes.label, 'CustomDateRange'],
         },
-        dateColumn: { control: { type: 'text' } },
+        lapisDateField: { control: { type: 'text' } },
         dateRangeOptions: {
             control: {
                 type: 'object',
@@ -72,7 +72,7 @@ const meta: Meta<Required<DateRangeSelectorProps>> = {
         ],
         earliestDate: '1970-01-01',
         initialValue: dateRangeOptionPresets.lastMonth.label,
-        dateColumn: 'aDateColumn',
+        lapisDateField: 'aDateColumn',
         width: '100%',
         initialDateFrom: undefined,
         initialDateTo: undefined,
@@ -93,7 +93,7 @@ export const Default: StoryObj<Required<DateRangeSelectorProps>> = {
                     .initialDateFrom=${args.initialDateFrom}
                     .initialDateTo=${args.initialDateTo}
                     .width=${args.width}
-                    .dateColumn=${args.dateColumn}
+                    .lapisDateField=${args.lapisDateField}
                 ></gs-date-range-selector>
             </div>
         </gs-app>`,