@genspectrum/dashboard-components 0.6.12 → 0.6.14

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

@@ -15,10 +15,12 @@ describe('getFilteredMutationOverTimeData', () => {
             data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
                 count: 1,
                 proportion: 0.1,
+                totalCount: 10,
             });
             data.set(new Substitution('someOtherSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
                 count: 2,
                 proportion: 0.2,
+                totalCount: 10,
             });
 
             filterDisplayedSegments(
@@ -41,10 +43,12 @@ describe('getFilteredMutationOverTimeData', () => {
             data.set(new Substitution('someSegment', 'A', 'T', 123), yearMonthDay('2021-01-01'), {
                 count: 1,
                 proportion: 0.1,
+                totalCount: 10,
             });
             data.set(new Deletion('someOtherSegment', 'A', 123), yearMonthDay('2021-01-01'), {
                 count: 2,
                 proportion: 0.2,
+                totalCount: 10,
             });
 
             filterMutationTypes(
@@ -76,7 +80,13 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(belowFilter), proportionInterval);
 
-            expect(data.getAsArray({ count: 0, proportion: 0 })).to.toHaveLength(0);
+            expect(
+                data.getAsArray({
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(0);
         });
 
         it('should remove mutations where overall proportion is above filter', () => {
@@ -84,7 +94,13 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(aboveFilter), proportionInterval);
 
-            expect(data.getAsArray({ count: 0, proportion: 0 })).to.toHaveLength(0);
+            expect(
+                data.getAsArray({
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(0);
         });
 
         it('should remove mutations where overall proportion is missing', () => {
@@ -92,7 +108,13 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(aboveFilter, someOtherMutation), proportionInterval);
 
-            expect(data.getAsArray({ count: 0, proportion: 0 })).to.toHaveLength(0);
+            expect(
+                data.getAsArray({
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(0);
         });
 
         it('should not remove mutation where overall proportion is at lower border of filter', () => {
@@ -100,7 +122,13 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(inFilter), proportionInterval);
 
-            expect(data.getRow(someSubstitution, { count: 0, proportion: 0 })).to.toHaveLength(2);
+            expect(
+                data.getRow(someSubstitution, {
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(2);
         });
 
         it('should not remove mutation where overall proportion is within filter', () => {
@@ -108,7 +136,13 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(inFilter), proportionInterval);
 
-            expect(data.getRow(someSubstitution, { count: 0, proportion: 0 })).to.toHaveLength(2);
+            expect(
+                data.getRow(someSubstitution, {
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(2);
         });
 
         it('should not remove mutation where overall proportion is at upper border of filter', () => {
@@ -116,13 +150,27 @@ describe('getFilteredMutationOverTimeData', () => {
 
             filterProportion(data, getOverallMutationData(inFilter), proportionInterval);
 
-            expect(data.getRow(someSubstitution, { count: 0, proportion: 0 })).to.toHaveLength(2);
+            expect(
+                data.getRow(someSubstitution, {
+                    count: 0,
+                    proportion: 0,
+                    totalCount: 10,
+                }),
+            ).to.toHaveLength(2);
         });
 
         function getMutationOverTimeData() {
             const data = new Map2dBase<Substitution | Deletion, Temporal, MutationOverTimeMutationValue>();
-            data.set(someSubstitution, yearMonthDay('2021-01-01'), { count: 1, proportion: 0.1 });
-            data.set(someSubstitution, yearMonthDay('2021-02-02'), { count: 99, proportion: 0.99 });
+            data.set(someSubstitution, yearMonthDay('2021-01-01'), {
+                count: 1,
+                proportion: 0.1,
+                totalCount: 10,
+            });
+            data.set(someSubstitution, yearMonthDay('2021-02-02'), {
+                count: 99,
+                proportion: 0.99,
+                totalCount: 10,
+            });
             return data;
         }
 

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

@@ -56,7 +56,7 @@ const MutationsOverTimeGrid: FunctionComponent<MutationsOverTimeGridProps> = ({
                                 <MutationCell mutation={mutation} />
                             </div>
                             {dates.map((date, columnIndex) => {
-                                const value = data.get(mutation, date) ?? { proportion: 0, count: 0 };
+                                const value = data.get(mutation, date) ?? { proportion: 0, count: 0, totalCount: 0 };
                                 const tooltipPosition = getTooltipPosition(
                                     rowIndex,
                                     shownMutations.length,
@@ -136,7 +136,9 @@ const ProportionCell: FunctionComponent<{
             <p>({timeIntervalDisplay(date)})</p>
             <p>{mutation.code}</p>
             <p>Proportion: {formatProportion(value.proportion)}</p>
-            <p>Count: {value.count}</p>
+            <p>
+                Count: {value.count} / {value.totalCount} total
+            </p>
         </div>
     );
 

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

@@ -1,8 +1,16 @@
 import { type Meta, type StoryObj } from '@storybook/preact';
 import { expect, waitFor } from '@storybook/test';
 
+import aggregated_01 from './__mockData__/aggregated_2024_01.json';
+import aggregated_02 from './__mockData__/aggregated_2024_02.json';
+import aggregated_03 from './__mockData__/aggregated_2024_03.json';
+import aggregated_04 from './__mockData__/aggregated_2024_04.json';
+import aggregated_05 from './__mockData__/aggregated_2024_05.json';
+import aggregated_06 from './__mockData__/aggregated_2024_06.json';
+import aggregated_07 from './__mockData__/aggregated_2024_07.json';
 import aggregated_date from './__mockData__/aggregated_date.json';
 import aggregated_tooManyMutations from './__mockData__/aggregated_tooManyMutations.json';
+import aggregated_tooManyMutations_total from './__mockData__/aggregated_tooManyMutations_total.json';
 import nucleotideMutation_01 from './__mockData__/nucleotideMutations_2024_01.json';
 import nucleotideMutation_02 from './__mockData__/nucleotideMutations_2024_02.json';
 import nucleotideMutation_03 from './__mockData__/nucleotideMutations_2024_03.json';
@@ -91,6 +99,118 @@ export const Default: StoryObj<MutationsOverTimeProps> = {
                         body: aggregated_date,
                     },
                 },
+                {
+                    matcher: {
+                        name: 'aggregated_01',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-01-01',
+                            dateTo: '2024-01-31',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_01,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_02',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-02-01',
+                            dateTo: '2024-02-29',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_02,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_03',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-03-01',
+                            dateTo: '2024-03-31',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_03,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_04',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-04-01',
+                            dateTo: '2024-04-30',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_04,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_05',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-05-01',
+                            dateTo: '2024-05-31',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_05,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_06',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-06-01',
+                            dateTo: '2024-06-30',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_06,
+                    },
+                },
+                {
+                    matcher: {
+                        name: 'aggregated_07',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2024-07-01',
+                            dateTo: '2024-07-31',
+                            fields: [],
+                            pangoLineage: 'JN.1*',
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_07,
+                    },
+                },
                 {
                     matcher: {
                         name: 'nucleotideMutations_overall',
@@ -253,6 +373,21 @@ export const ShowsMessageWhenTooManyMutations: StoryObj<MutationsOverTimeProps>
                         body: aggregated_tooManyMutations,
                     },
                 },
+                {
+                    matcher: {
+                        name: 'aggregated_total',
+                        url: AGGREGATED_ENDPOINT,
+                        body: {
+                            dateFrom: '2023-01-01',
+                            dateTo: '2023-12-31',
+                            fields: [],
+                        },
+                    },
+                    response: {
+                        status: 200,
+                        body: aggregated_tooManyMutations_total,
+                    },
+                },
                 {
                     matcher: {
                         name: 'nucleotideMutations',

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

@@ -38,8 +38,8 @@ export interface PrevalenceOverTimeProps {
     confidenceIntervalMethods: ConfidenceIntervalMethod[];
     lapisDateField: string;
     pageSize: boolean | number;
-    yAxisMaxLinear?: AxisMax;
-    yAxisMaxLogarithmic?: AxisMax;
+    yAxisMaxLinear: AxisMax;
+    yAxisMaxLogarithmic: AxisMax;
 }
 
 export const PrevalenceOverTime: FunctionComponent<PrevalenceOverTimeProps> = (componentProps) => {

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

@@ -12,8 +12,8 @@ import { useQuery } from '../useQuery';
 
 export interface TextInputInnerProps {
     lapisField: string;
-    placeholderText?: string;
-    initialValue?: string;
+    placeholderText: string;
+    initialValue: string;
 }
 
 export interface TextInputProps extends TextInputInnerProps {