@genspectrum/dashboard-components 0.10.4 → 0.11.0

package/src/web-components/visualization/gs-relative-growth-advantage.tsx

@@ -1,11 +1,10 @@
 import { customElement, property } from 'lit/decorators.js';
-import { type DetailedHTMLProps, type HTMLAttributes } from 'react';
+import type { DetailedHTMLProps, HTMLAttributes } from 'react';
 
 import {
     RelativeGrowthAdvantage,
     type RelativeGrowthAdvantageProps,
 } from '../../preact/relativeGrowthAdvantage/relative-growth-advantage';
-import { type AxisMax } from '../../preact/shared/charts/getYAxisMax';
 import { type Equals, type Expect } from '../../utils/typeAssertions';
 import { PreactLitAdapter } from '../PreactLitAdapter';
 
@@ -42,14 +41,24 @@ export class RelativeGrowthAdvantageComponent extends PreactLitAdapter {
      * It must be a valid LAPIS filter object.
      */
     @property({ type: Object })
-    numeratorFilter: Record<string, string | number | null | boolean> = {};
+    numeratorFilter: Record<string, string | string[] | number | null | boolean | undefined> & {
+        nucleotideMutations?: string[];
+        aminoAcidMutations?: string[];
+        nucleotideInsertions?: string[];
+        aminoAcidInsertions?: string[];
+    } = {};
 
     /**
      * LAPIS filter to select the data of the baseline variant.
      * It must be a valid LAPIS filter object.
      */
     @property({ type: Object })
-    denominatorFilter: Record<string, string | number | null | boolean> = {};
+    denominatorFilter: Record<string, string | string[] | number | null | boolean | undefined> & {
+        nucleotideMutations?: string[];
+        aminoAcidMutations?: string[];
+        nucleotideInsertions?: string[];
+        aminoAcidInsertions?: string[];
+    } = {};
 
     /**
      * The generation time represents the number of days over which the variant's relative growth advantage is measured.
@@ -120,20 +129,13 @@ export class RelativeGrowthAdvantageComponent extends PreactLitAdapter {
                 width={this.width}
                 height={this.height}
                 lapisDateField={this.lapisDateField}
-                yAxisMaxConfig={{
-                    linear: this.yAxisMaxLinear,
-                    logarithmic: this.yAxisMaxLogarithmic,
-                }}
+                yAxisMaxLinear={this.yAxisMaxLinear}
+                yAxisMaxLogarithmic={this.yAxisMaxLogarithmic}
             />
         );
     }
 }
 
-export interface RelativeGrowthAdvantageComponentProps extends Omit<RelativeGrowthAdvantageProps, 'yAxisMaxConfig'> {
-    yAxisMaxLinear?: AxisMax;
-    yAxisMaxLogarithmic?: AxisMax;
-}
-
 declare global {
     interface HTMLElementTagNameMap {
         'gs-relative-growth-advantage': RelativeGrowthAdvantageComponent;
@@ -186,13 +188,13 @@ type LapisDateFieldMatches = Expect<
 type YAxisMaxLinearMatches = Expect<
     Equals<
         typeof RelativeGrowthAdvantageComponent.prototype.yAxisMaxLinear,
-        Required<RelativeGrowthAdvantageProps['yAxisMaxConfig']>['linear']
+        RelativeGrowthAdvantageProps['yAxisMaxLinear']
     >
 >;
 type YAxisMaxLogarithmicMatches = Expect<
     Equals<
         typeof RelativeGrowthAdvantageComponent.prototype.yAxisMaxLogarithmic,
-        Required<RelativeGrowthAdvantageProps['yAxisMaxConfig']>['logarithmic']
+        RelativeGrowthAdvantageProps['yAxisMaxLogarithmic']
     >
 >;
 /* eslint-enable @typescript-eslint/no-unused-vars, no-unused-vars */

package/src/web-components/visualization/gs-sequences-by-location.tsx

@@ -102,7 +102,12 @@ export class SequencesByLocationComponent extends PreactLitAdapterWithGridJsStyl
      * you should usually filter by that country here (e.g. { country: 'USA' }).
      */
     @property({ type: Object })
-    lapisFilter: Record<string, string | number | null | boolean> = {};
+    lapisFilter: Record<string, string | string[] | number | null | boolean | undefined> & {
+        nucleotideMutations?: string[];
+        aminoAcidMutations?: string[];
+        nucleotideInsertions?: string[];
+        aminoAcidInsertions?: string[];
+    } = {};
 
     /**
      * Required.

package/src/web-components/visualization/gs-statistics.tsx

@@ -2,7 +2,6 @@ import { customElement, property } from 'lit/decorators.js';
 import type { DetailedHTMLProps, HTMLAttributes } from 'react';
 
 import { Statistics, type StatisticsProps } from '../../preact/statistic/statistics';
-import type { LapisFilter } from '../../types';
 import type { Equals, Expect } from '../../utils/typeAssertions';
 import { PreactLitAdapterWithGridJsStyles } from '../PreactLitAdapterWithGridJsStyles';
 
@@ -19,14 +18,24 @@ export class StatisticsComponent extends PreactLitAdapterWithGridJsStyles {
      * It must be a valid LAPIS filter object.
      */
     @property({ type: Object })
-    numeratorFilter: LapisFilter = {};
+    numeratorFilter: Record<string, string | string[] | number | null | boolean | undefined> & {
+        nucleotideMutations?: string[];
+        aminoAcidMutations?: string[];
+        nucleotideInsertions?: string[];
+        aminoAcidInsertions?: string[];
+    } = {};
 
     /**
      * The filter to apply to the data for the denominator of the proportion.
      * It must be a valid LAPIS filter object.
      */
     @property({ type: Object })
-    denominatorFilter: LapisFilter = {};
+    denominatorFilter: Record<string, string | string[] | number | null | boolean | undefined> & {
+        nucleotideMutations?: string[];
+        aminoAcidMutations?: string[];
+        nucleotideInsertions?: string[];
+        aminoAcidInsertions?: string[];
+    } = {};
 
     /**
      * The width of the component.