@genspectrum/dashboard-components 0.6.3 → 0.6.4

package/dist/genspectrum-components.d.ts

@@ -501,6 +501,11 @@ export declare class MutationsComponent extends PreactLitAdapterWithGridJsStyles
  *
  * The grid view shows the proportion for each mutation over date ranges.
  *
+ * The grid will show at max 100 rows and 200 columns for browser performance reasons.
+ * More data might make the browser unresponsive.
+ * If the numbers are exceeded, an error message will be shown.
+ * In both cases, the `lapisFilter` should be narrowed down to reduce the number of mutations or date ranges.
+ * The number of date ranges can also be reduced by selecting a larger granularity (months instead of weeks).
  */
 export declare class MutationsOverTimeComponent extends PreactLitAdapterWithGridJsStyles {
     /**
@@ -958,14 +963,14 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutations-component': MutationsComponent;
+        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
     }
 }
 
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
+        'gs-mutations-component': MutationsComponent;
     }
 }
 

package/dist/style.css

@@ -3150,6 +3150,9 @@ input.tab:checked + .tab-content,
   --tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
   --tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(0px + var(--tw-ring-offset-width)) var(--tw-ring-color);
   box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
+}
+.peer:hover ~ .peer-hover\:block {
+  display: block;
 }.flatpickr-calendar{background:transparent;opacity:0;display:none;text-align:center;visibility:hidden;padding:0;-webkit-animation:none;animation:none;direction:ltr;border:0;font-size:14px;line-height:24px;border-radius:5px;position:absolute;width:307.875px;-webkit-box-sizing:border-box;box-sizing:border-box;-ms-touch-action:manipulation;touch-action:manipulation;background:#fff;-webkit-box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08);box-shadow:1px 0 0 #e6e6e6,-1px 0 0 #e6e6e6,0 1px 0 #e6e6e6,0 -1px 0 #e6e6e6,0 3px 13px rgba(0,0,0,0.08)}.flatpickr-calendar.open,.flatpickr-calendar.inline{opacity:1;max-height:640px;visibility:visible}.flatpickr-calendar.open{display:inline-block;z-index:99999}.flatpickr-calendar.animate.open{-webkit-animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1);animation:fpFadeInDown 300ms cubic-bezier(.23,1,.32,1)}.flatpickr-calendar.inline{display:block;position:relative;top:2px}.flatpickr-calendar.static{position:absolute;top:calc(100% + 2px)}.flatpickr-calendar.static.open{z-index:999;display:block}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7){-webkit-box-shadow:none !important;box-shadow:none !important}.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1){-webkit-box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6;box-shadow:-2px 0 0 #e6e6e6,5px 0 0 #e6e6e6}.flatpickr-calendar .hasWeeks .dayContainer,.flatpickr-calendar .hasTime .dayContainer{border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}.flatpickr-calendar .hasWeeks .dayContainer{border-left:0}.flatpickr-calendar.hasTime .flatpickr-time{height:40px;border-top:1px solid #e6e6e6}.flatpickr-calendar.noCalendar.hasTime .flatpickr-time{height:auto}.flatpickr-calendar:before,.flatpickr-calendar:after{position:absolute;display:block;pointer-events:none;border:solid transparent;content:'';height:0;width:0;left:22px}.flatpickr-calendar.rightMost:before,.flatpickr-calendar.arrowRight:before,.flatpickr-calendar.rightMost:after,.flatpickr-calendar.arrowRight:after{left:auto;right:22px}.flatpickr-calendar.arrowCenter:before,.flatpickr-calendar.arrowCenter:after{left:50%;right:50%}.flatpickr-calendar:before{border-width:5px;margin:0 -5px}.flatpickr-calendar:after{border-width:4px;margin:0 -4px}.flatpickr-calendar.arrowTop:before,.flatpickr-calendar.arrowTop:after{bottom:100%}.flatpickr-calendar.arrowTop:before{border-bottom-color:#e6e6e6}.flatpickr-calendar.arrowTop:after{border-bottom-color:#fff}.flatpickr-calendar.arrowBottom:before,.flatpickr-calendar.arrowBottom:after{top:100%}.flatpickr-calendar.arrowBottom:before{border-top-color:#e6e6e6}.flatpickr-calendar.arrowBottom:after{border-top-color:#fff}.flatpickr-calendar:focus{outline:0}.flatpickr-wrapper{position:relative;display:inline-block}.flatpickr-months{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex}.flatpickr-months .flatpickr-month{background:transparent;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9);height:34px;line-height:1;text-align:center;position:relative;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;overflow:hidden;-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.flatpickr-months .flatpickr-prev-month,.flatpickr-months .flatpickr-next-month{-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;text-decoration:none;cursor:pointer;position:absolute;top:0;height:34px;padding:10px;z-index:3;color:rgba(0,0,0,0.9);fill:rgba(0,0,0,0.9)}.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,.flatpickr-months .flatpickr-next-month.flatpickr-disabled{display:none}.flatpickr-months .flatpickr-prev-month i,.flatpickr-months .flatpickr-next-month i{position:relative}.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,.flatpickr-months .flatpickr-next-month.flatpickr-prev-month{/*
       /*rtl:begin:ignore*/left:0/*
       /*rtl:end:ignore*/}/*

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@genspectrum/dashboard-components",
-    "version": "0.6.3",
+    "version": "0.6.4",
     "description": "GenSpectrum web components for building dashboards",
     "type": "module",
     "license": "AGPL-3.0-only",

package/src/preact/components/tooltip.stories.tsx

@@ -0,0 +1,54 @@
+import { type Meta, type StoryObj } from '@storybook/preact';
+import { expect, waitFor, within } from '@storybook/test';
+
+import Tooltip, { type TooltipProps } from './tooltip';
+
+const meta: Meta<TooltipProps> = {
+    title: 'Component/Tooltip',
+    component: Tooltip,
+    parameters: { fetchMock: {} },
+};
+
+export default meta;
+
+const tooltipContent = 'This is some content.';
+
+export const TooltipStory: StoryObj<TooltipProps> = {
+    render: (args) => (
+        <div class='flex justify-center px-4 py-16'>
+            <Tooltip {...args}>
+                <div>Hover me</div>
+            </Tooltip>
+        </div>
+    ),
+    args: {
+        content: tooltipContent,
+    },
+};
+
+export const RendersStringContent: StoryObj<TooltipProps> = {
+    ...TooltipStory,
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const tooltipBase = canvas.getByText('Hover me');
+
+        await waitFor(() => expect(tooltipBase).toBeInTheDocument());
+
+        await waitFor(() => expect(canvas.queryByText(tooltipContent, { exact: false })).toBeInTheDocument());
+    },
+};
+
+export const RendersComponentConent: StoryObj<TooltipProps> = {
+    ...TooltipStory,
+    args: {
+        content: <div>{tooltipContent}</div>,
+    },
+    play: async ({ canvasElement }) => {
+        const canvas = within(canvasElement);
+        const tooltipBase = canvas.getByText('Hover me');
+
+        await waitFor(() => expect(tooltipBase).toBeInTheDocument());
+
+        await waitFor(() => expect(canvas.queryByText(tooltipContent, { exact: false })).toBeInTheDocument());
+    },
+};

package/src/preact/components/tooltip.tsx

@@ -0,0 +1,31 @@
+import { flip, offset, shift } from '@floating-ui/dom';
+import { type FunctionComponent } from 'preact';
+import { useRef } from 'preact/hooks';
+import { type JSXInternal } from 'preact/src/jsx';
+
+import { dropdownClass } from './dropdown';
+import { useFloatingUi } from '../shared/floating-ui/hooks';
+
+export type TooltipProps = {
+    content: string | JSXInternal.Element;
+};
+
+const Tooltip: FunctionComponent<TooltipProps> = ({ children, content }) => {
+    const referenceRef = useRef<HTMLDivElement>(null);
+    const floatingRef = useRef<HTMLDivElement>(null);
+
+    useFloatingUi(referenceRef, floatingRef, [offset(5), shift(), flip()]);
+
+    return (
+        <div className='relative'>
+            <div className='peer' ref={referenceRef}>
+                {children}
+            </div>
+            <div ref={floatingRef} className={`${dropdownClass} hidden peer-hover:block`}>
+                {content}
+            </div>
+        </div>
+    );
+};
+
+export default Tooltip;

package/src/preact/mutationsOverTime/getFilteredMutationsOverTime.spec.ts

@@ -12,8 +12,14 @@ describe('getFilteredMutationOverTimeData', () => {
         it('should filter by displayed segments', () => {
             const data = new Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>();
 
-            data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), 1);
-            data.set(new Substitution('someOtherSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), 2);
+            data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
+                count: 1,
+                proportion: 0.1,
+            });
+            data.set(new Substitution('someOtherSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
+                count: 2,
+                proportion: 0.2,
+            });
 
             filterDisplayedSegments(
                 [
@@ -32,8 +38,14 @@ describe('getFilteredMutationOverTimeData', () => {
         it('should filter by mutation types', () => {
             const data = new Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>();
 
-            data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), 1);
-            data.set(new Deletion('someOtherSegment', 'A', 123), yearMonthDay('2021-01-01'), 2);
+            data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
+                count: 1,
+                proportion: 0.1,
+            });
+            data.set(new Deletion('someOtherSegment', 'A', 123), yearMonthDay('2021-01-01'), {
+                count: 2,
+                proportion: 0.2,
+            });
 
             filterMutationTypes(
                 [
@@ -52,8 +64,8 @@ describe('getFilteredMutationOverTimeData', () => {
         it('should filter by proportion', () => {
             const data = new Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>();
 
-            const belowFilter = 0.1;
-            const aboveFilter = 0.99;
+            const belowFilter = { count: 1, proportion: 0.1 };
+            const aboveFilter = { count: 99, proportion: 0.99 };
             const proportionInterval = { min: 0.2, max: 0.9 };
 
             const someSubstitution = new Substitution('someSegment', 'A', 'T', 123);
@@ -62,15 +74,15 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, proportionInterval);
 
-            expect(data.getAsArray(0).length).to.equal(0);
+            expect(data.getAsArray({ count: 0, proportion: 0 }).length).to.equal(0);
         });
 
         it('should not filter if one proportion is within the interval', () => {
             const data = new Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>();
 
-            const belowFilter = 0.1;
-            const aboveFilter = 0.99;
-            const inFilter = 0.5;
+            const belowFilter = { count: 1, proportion: 0.1 };
+            const aboveFilter = { count: 99, proportion: 0.99 };
+            const inFilter = { count: 5, proportion: 0.5 };
             const proportionInterval = { min: 0.2, max: 0.9 };
 
             const someSubstitution = new Substitution('someSegment', 'A', 'T', 123);
@@ -80,7 +92,7 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, proportionInterval);
 
-            expect(data.getRow(someSubstitution, 0).length).to.equal(3);
+            expect(data.getRow(someSubstitution, { count: 0, proportion: 0 }).length).to.equal(3);
         });
     });
 });

package/src/preact/mutationsOverTime/getFilteredMutationsOverTimeData.ts

@@ -54,8 +54,12 @@ export function filterProportion(
     },
 ) {
     data.getFirstAxisKeys().forEach((mutation) => {
-        const row = data.getRow(mutation, 0);
-        if (!row.some((value) => value >= proportionInterval.min && value <= proportionInterval.max)) {
+        const row = data.getRow(mutation, { count: 0, proportion: 0 });
+        if (
+            !row.some(
+                (value) => value.proportion >= proportionInterval.min && value.proportion <= proportionInterval.max,
+            )
+        ) {
             data.deleteRow(mutation);
         }
     });

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

@@ -5,7 +5,9 @@ import {
     type MutationOverTimeMutationValue,
 } from '../../query/queryMutationsOverTime';
 import { type Deletion, type Substitution } from '../../utils/mutations';
-import { compareTemporal, type Temporal } from '../../utils/temporal';
+import { compareTemporal, type Temporal, YearMonthDay } from '../../utils/temporal';
+import { UserFacingError } from '../components/error-display';
+import Tooltip from '../components/tooltip';
 import { singleGraphColorRGBByName } from '../shared/charts/colors';
 import { formatProportion } from '../shared/table/formatProportion';
 
@@ -13,8 +15,18 @@ export interface MutationsOverTimeGridProps {
     data: MutationOverTimeDataGroupedByMutation;
 }
 
+const MAX_NUMBER_OF_GRID_ROWS = 100;
+
 const MutationsOverTimeGrid: FunctionComponent<MutationsOverTimeGridProps> = ({ data }) => {
     const mutations = data.getFirstAxisKeys();
+    if (mutations.length > MAX_NUMBER_OF_GRID_ROWS) {
+        throw new UserFacingError(
+            'Too many mutations',
+            `The dataset contains ${mutations.length} mutations. ` +
+                `Please adapt the filters to reduce the number to below ${MAX_NUMBER_OF_GRID_ROWS}.`,
+        );
+    }
+
     const dates = data.getSecondAxisKeys().sort((a, b) => compareTemporal(a, b));
 
     return (
@@ -35,7 +47,7 @@ const MutationsOverTimeGrid: FunctionComponent<MutationsOverTimeGridProps> = ({
                             <MutationCell mutation={mutation} />
                         </div>
                         {dates.map((date, j) => {
-                            const value = data.get(mutation, date) ?? 0;
+                            const value = data.get(mutation, date) ?? { proportion: 0, count: 0 };
                             return (
                                 <div
                                     style={{ gridRowStart: i + 1, gridColumnStart: j + 2 }}
@@ -56,22 +68,45 @@ const ProportionCell: FunctionComponent<{
     value: MutationOverTimeMutationValue;
     date: Temporal;
     mutation: Substitution | Deletion;
-}> = ({ value }) => {
-    // TODO(#353): Add tooltip with date, mutation and proportion
+}> = ({ value, mutation, date }) => {
+    const tooltipContent = (
+        <div>
+            <p>
+                <span className='font-bold'>{date.englishName()}</span> ({timeIntervalDisplay(date)})
+            </p>
+            <p>{mutation.code}</p>
+            <p>Proportion: {formatProportion(value.proportion)}</p>
+            <p>Count: {value.count}</p>
+        </div>
+    );
+
     return (
         <>
             <div className={'py-1'}>
-                <div
-                    style={{ backgroundColor: backgroundColor(value), color: textColor(value) }}
-                    className='text-center hover:font-bold text-xs'
-                >
-                    {formatProportion(value, 0)}
-                </div>
+                <Tooltip content={tooltipContent}>
+                    <div
+                        style={{
+                            backgroundColor: backgroundColor(value.proportion),
+                            color: textColor(value.proportion),
+                        }}
+                        className='text-center hover:font-bold text-xs'
+                    >
+                        {formatProportion(value.proportion, 0)}
+                    </div>
+                </Tooltip>
             </div>
         </>
     );
 };
 
+const timeIntervalDisplay = (date: Temporal) => {
+    if (date instanceof YearMonthDay) {
+        return date.toString();
+    }
+
+    return `${date.firstDay.toString()} - ${date.lastDay.toString()}`;
+};
+
 const backgroundColor = (proportion: number) => {
     // TODO(#353): Make minAlpha and maxAlpha configurable
     const minAlpha = 0.0;

package/src/query/queryMutationsOverTime.spec.ts

@@ -27,7 +27,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-01',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.1), getSomeOtherTestMutation(0.4)] },
+                    response: { data: [getSomeTestMutation(0.1, 1), getSomeOtherTestMutation(0.4, 4)] },
                 },
                 {
                     body: {
@@ -36,7 +36,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-02',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.2)] },
+                    response: { data: [getSomeTestMutation(0.2, 2)] },
                 },
                 {
                     body: {
@@ -45,7 +45,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-03',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.3)] },
+                    response: { data: [getSomeTestMutation(0.3, 3)] },
                 },
             ],
             'nucleotide',
@@ -53,9 +53,17 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([
-            [0.1, 0.2, 0.3],
-            [0.4, 0, 0],
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([
+            [
+                { proportion: 0.1, count: 1 },
+                { proportion: 0.2, count: 2 },
+                { proportion: 0.3, count: 3 },
+            ],
+            [
+                { proportion: 0.4, count: 4 },
+                { proportion: 0, count: 0 },
+                { proportion: 0, count: 0 },
+            ],
         ]);
 
         const sequences = result.getFirstAxisKeys();
@@ -91,7 +99,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-01',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.1), getSomeOtherTestMutation(0.4)] },
+                    response: { data: [getSomeTestMutation(0.1, 1), getSomeOtherTestMutation(0.4, 4)] },
                 },
                 {
                     body: {
@@ -109,7 +117,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-03',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.3)] },
+                    response: { data: [getSomeTestMutation(0.3, 3)] },
                 },
             ],
             'nucleotide',
@@ -117,9 +125,17 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([
-            [0.1, 0.3, 0],
-            [0.4, 0, 0],
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([
+            [
+                { proportion: 0.1, count: 1 },
+                { proportion: 0.3, count: 3 },
+                { proportion: 0, count: 0 },
+            ],
+            [
+                { proportion: 0.4, count: 4 },
+                { proportion: 0, count: 0 },
+                { proportion: 0, count: 0 },
+            ],
         ]);
 
         const sequences = result.getFirstAxisKeys();
@@ -181,7 +197,7 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([]);
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([]);
         expect(result.getFirstAxisKeys()).to.deep.equal([]);
         expect(result.getSecondAxisKeys()).to.deep.equal([]);
     });
@@ -209,7 +225,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-02',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.2)] },
+                    response: { data: [getSomeTestMutation(0.2, 2)] },
                 },
                 {
                     body: {
@@ -218,7 +234,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-03',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.3)] },
+                    response: { data: [getSomeTestMutation(0.3, 3)] },
                 },
             ],
             'nucleotide',
@@ -226,7 +242,12 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([[0.2, 0.3]]);
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([
+            [
+                { proportion: 0.2, count: 2 },
+                { proportion: 0.3, count: 3 },
+            ],
+        ]);
 
         const sequences = result.getFirstAxisKeys();
         expect(sequences[0].code).toBe('sequenceName:A123T');
@@ -259,7 +280,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-01',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.1)] },
+                    response: { data: [getSomeTestMutation(0.1, 1)] },
                 },
                 {
                     body: {
@@ -268,7 +289,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-02',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.2)] },
+                    response: { data: [getSomeTestMutation(0.2, 2)] },
                 },
             ],
             'nucleotide',
@@ -276,7 +297,12 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([[0.1, 0.2]]);
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([
+            [
+                { proportion: 0.1, count: 1 },
+                { proportion: 0.2, count: 2 },
+            ],
+        ]);
 
         const sequences = result.getFirstAxisKeys();
         expect(sequences[0].code).toBe('sequenceName:A123T');
@@ -309,7 +335,7 @@ describe('queryMutationsOverTime', () => {
                         dateFieldTo: '2023-01-02',
                         minProportion: 0.001,
                     },
-                    response: { data: [getSomeTestMutation(0.2)] },
+                    response: { data: [getSomeTestMutation(0.2, 2)] },
                 },
             ],
             'nucleotide',
@@ -317,7 +343,7 @@ describe('queryMutationsOverTime', () => {
 
         const result = await queryMutationsOverTimeData(lapisFilter, 'nucleotide', DUMMY_LAPIS_URL, dateField, 'day');
 
-        expect(result.getAsArray(0)).to.deep.equal([[0.2]]);
+        expect(result.getAsArray({ count: 0, proportion: 0 })).to.deep.equal([[{ proportion: 0.2, count: 2 }]]);
 
         const sequences = result.getFirstAxisKeys();
         expect(sequences[0].code).toBe('sequenceName:A123T');
@@ -326,11 +352,11 @@ describe('queryMutationsOverTime', () => {
         expect(dates[0].toString()).toBe('2023-01-02');
     });
 
-    function getSomeTestMutation(proportion: number) {
+    function getSomeTestMutation(proportion: number, count: number) {
         return {
             mutation: 'sequenceName:A123T',
             proportion,
-            count: 1,
+            count,
             sequenceName: 'sequenceName',
             mutationFrom: 'A',
             mutationTo: 'T',
@@ -338,11 +364,11 @@ describe('queryMutationsOverTime', () => {
         };
     }
 
-    function getSomeOtherTestMutation(proportion: number) {
+    function getSomeOtherTestMutation(proportion: number, count: number) {
         return {
             mutation: 'otherSequenceName:A123T',
             proportion,
-            count: 1,
+            count,
             sequenceName: 'otherSequenceName',
             mutationFrom: 'G',
             mutationTo: 'C',

package/src/query/queryMutationsOverTime.ts

@@ -5,6 +5,7 @@ import { GroupByAndSumOperator } from '../operator/GroupByAndSumOperator';
 import { MapOperator } from '../operator/MapOperator';
 import { RenameFieldOperator } from '../operator/RenameFieldOperator';
 import { SortOperator } from '../operator/SortOperator';
+import { UserFacingError } from '../preact/components/error-display';
 import {
     type LapisFilter,
     type SequenceType,
@@ -26,13 +27,15 @@ export type MutationOverTimeData = {
     mutations: SubstitutionOrDeletionEntry[];
 };
 
-export type MutationOverTimeMutationValue = number;
+export type MutationOverTimeMutationValue = { proportion: number; count: number };
 export type MutationOverTimeDataGroupedByMutation = Map2d<
     Substitution | Deletion,
     Temporal,
     MutationOverTimeMutationValue
 >;
 
+const MAX_NUMBER_OF_GRID_COLUMNS = 200;
+
 export async function queryMutationsOverTimeData(
     lapisFilter: LapisFilter,
     sequenceType: 'nucleotide' | 'amino acid',
@@ -43,6 +46,15 @@ export async function queryMutationsOverTimeData(
 ) {
     const allDates = await getDatesInDataset(lapisFilter, lapis, granularity, lapisDateField, signal);
 
+    if (allDates.length > MAX_NUMBER_OF_GRID_COLUMNS) {
+        throw new UserFacingError(
+            'Too many dates',
+            `The dataset would contain ${allDates.length} date intervals. ` +
+                `Please reduce the number to below ${MAX_NUMBER_OF_GRID_COLUMNS} to display the data. ` +
+                'You can achieve this by either narrowing the date range in the provided LAPIS filter or by selecting a larger granularity.',
+        );
+    }
+
     const subQueries = allDates.map(async (date) => {
         const dateFrom = date.firstDay.toString();
         const dateTo = date.lastDay.toString();
@@ -133,14 +145,17 @@ function fetchAndPrepareSubstitutionsOrDeletions(filter: LapisFilter, sequenceTy
 }
 
 export function groupByMutation(data: MutationOverTimeData[]) {
-    const dataArray = new Map2d<Substitution | Deletion, Temporal, number>(
+    const dataArray = new Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>(
         (mutation) => mutation.code,
         (date) => date.toString(),
     );
 
     data.forEach((mutationData) => {
         mutationData.mutations.forEach((mutationEntry) => {
-            dataArray.set(mutationEntry.mutation, mutationData.date, mutationEntry.proportion);
+            dataArray.set(mutationEntry.mutation, mutationData.date, {
+                count: mutationEntry.count,
+                proportion: mutationEntry.proportion,
+            });
         });
     });
 
@@ -150,14 +165,14 @@ export function groupByMutation(data: MutationOverTimeData[]) {
 }
 
 function addZeroValuesForDatesWithNoMutationData(
-    dataArray: Map2d<Substitution | Deletion, Temporal, number>,
+    dataArray: Map2d<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>,
     data: MutationOverTimeData[],
 ) {
     if (dataArray.getFirstAxisKeys().length !== 0) {
         const someMutation = dataArray.getFirstAxisKeys()[0];
         data.forEach((mutationData) => {
             if (mutationData.mutations.length === 0) {
-                dataArray.set(someMutation, mutationData.date, 0);
+                dataArray.set(someMutation, mutationData.date, { count: 0, proportion: 0 });
             }
         });
     }

package/src/utils/temporal.spec.ts

@@ -60,6 +60,8 @@ describe('YearMonthDay', () => {
         // seems to be a bug in dayjs: https://github.com/iamkun/dayjs/issues/2620
         expect(underTest.week.text).equal('2019-01');
         expect(underTest.text).equal('2020-01-01');
+        expect(underTest.firstDay.text).equal('2020-01-01');
+        expect(underTest.lastDay.text).equal('2020-01-01');
     });
 });
 
@@ -71,6 +73,7 @@ describe('YearWeek', () => {
         expect(underTest.isoWeekNumber).equal(2);
         expect(underTest.firstDay.text).equal('2020-01-06');
         expect(underTest.text).equal('2020-02');
+        expect(underTest.lastDay.text).equal('2020-01-12');
     });
 });
 
@@ -82,6 +85,7 @@ describe('YearMonth', () => {
         expect(underTest.monthNumber).equal(1);
         expect(underTest.text).equal('2020-01');
         expect(underTest.firstDay.text).equal('2020-01-01');
+        expect(underTest.lastDay.text).equal('2020-01-31');
     });
 });
 
@@ -93,5 +97,6 @@ describe('Year', () => {
         expect(underTest.text).equal('2020');
         expect(underTest.firstDay.text).equal('2020-01-01');
         expect(underTest.firstMonth.text).equal('2020-01');
+        expect(underTest.lastDay.text).equal('2020-12-31');
     });
 });