feat(components): initial mutations over time component

GenSpectrum · Jul 17, 2024 · 7007045 · 7007045
1 parent 48ea46e
commit 7007045
Show file tree

Hide file tree

Showing 32 changed files with 12,935 additions and 49 deletions.
diff --git a/components/package-lock.json b/components/package-lock.json
diff --git a/components/package.json b/components/package.json
@@ -68,6 +68,7 @@
         "flatpickr": "^4.6.13",
         "gridjs": "^6.2.0",
         "lit": "^3.1.3",
+        "object-hash": "^3.0.0",
         "preact": "^10.20.1",
         "zod": "^3.23.0"
     },
@@ -87,6 +88,7 @@
         "@storybook/web-components": "^8.0.9",
         "@storybook/web-components-vite": "^8.0.9",
         "@types/node": "^20.12.7",
+        "@types/object-hash": "^3.0.6",
         "@typescript-eslint/eslint-plugin": "^7.14.1",
         "@typescript-eslint/parser": "^7.14.1",
         "autoprefixer": "^10.4.19",

diff --git a/components/src/constants.ts b/components/src/constants.ts
@@ -1,4 +1,4 @@
-export const LAPIS_URL = 'https://lapis.cov-spectrum.org/open/v2/';
+export const LAPIS_URL = 'https://lapis.cov-spectrum.org/open/v2';
 
 export const AGGREGATED_ENDPOINT = `${LAPIS_URL}/sample/aggregated`;
 export const NUCLEOTIDE_MUTATIONS_ENDPOINT = `${LAPIS_URL}/sample/nucleotideMutations`;

diff --git a/components/src/operator/FillMissingOperator.spec.ts b/components/src/operator/FillMissingOperator.spec.ts
@@ -10,7 +10,9 @@ describe('FillMissingOperator', () => {
         const query = new FillMissingOperator(
             child,
             'id',
-            (ids) => [Math.min(...ids), Math.max(...ids)],
+            (ids) => {
+                return { min: Math.min(...ids), max: Math.max(...ids) };
+            },
             (min, max) => {
                 const result = [];
                 for (let i = min; i <= max; i++) {

diff --git a/components/src/operator/FillMissingOperator.ts b/components/src/operator/FillMissingOperator.ts
@@ -5,7 +5,9 @@ export class FillMissingOperator<Data, KeyToFill extends keyof Data> implements
     constructor(
         private child: Operator<Data>,
         private keyField: KeyToFill,
-        private getMinMaxFn: (values: Iterable<Data[KeyToFill]>) => [Data[KeyToFill], Data[KeyToFill]] | null,
+        private getMinMaxFn: (
+            values: Iterable<Data[KeyToFill]>,
+        ) => { min: Data[KeyToFill]; max: Data[KeyToFill] } | null,
         private getAllRequiredKeysFn: (min: Data[KeyToFill], max: Data[KeyToFill]) => Data[KeyToFill][],
         private defaultValueFn: (key: Data[KeyToFill]) => Data,
     ) {}
@@ -17,7 +19,7 @@ export class FillMissingOperator<Data, KeyToFill extends keyof Data> implements
         if (minMax === null) {
             return childEvaluated;
         }
-        const [min, max] = minMax;
+        const { min, max } = minMax;
         const requiredKeys = this.getAllRequiredKeysFn(min, max);
         const content = childEvaluated.content;
         for (const key of requiredKeys) {

diff --git a/components/src/preact/mutationComparison/queryMutationData.ts b/components/src/preact/mutationComparison/queryMutationData.ts
@@ -28,6 +28,17 @@ export function filterMutationData(
     data: MutationData[],
     displayedSegments: DisplayedSegment[],
     displayedMutationTypes: DisplayedMutationType[],
+) {
+    return data.map((mutationEntry) => ({
+        displayName: mutationEntry.displayName,
+        data: filterBySegmentAndMutationType(mutationEntry.data, displayedSegments, displayedMutationTypes),
+    }));
+}
+
+export function filterBySegmentAndMutationType(
+    data: SubstitutionOrDeletionEntry[],
+    displayedSegments: DisplayedSegment[],
+    displayedMutationTypes: DisplayedMutationType[],
 ) {
     const byDisplayedSegments = (mutationEntry: SubstitutionOrDeletionEntry) => {
         if (mutationEntry.mutation.segment === undefined) {
@@ -45,8 +56,5 @@ export function filterMutationData(
         );
     };
 
-    return data.map((mutationEntry) => ({
-        displayName: mutationEntry.displayName,
-        data: mutationEntry.data.filter(byDisplayedSegments).filter(byDisplayedMutationTypes),
-    }));
+    return data.filter(byDisplayedSegments).filter(byDisplayedMutationTypes);
 }