@genspectrum/dashboard-components 1.9.0 → 1.9.1

package/dist/components.d.ts

@@ -1653,7 +1653,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-genome-data-viewer': GenomeDataViewerComponent;
+        'gs-wastewater-mutations-over-time': WastewaterMutationsOverTimeComponent;
     }
 }
 
@@ -1661,7 +1661,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-genome-data-viewer': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-wastewater-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1669,7 +1669,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutation-comparison-component': MutationComparisonComponent;
+        'gs-genome-data-viewer': GenomeDataViewerComponent;
     }
 }
 
@@ -1677,7 +1677,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-mutation-comparison-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-genome-data-viewer': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1685,7 +1685,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-mutations': MutationsComponent;
+        'gs-mutation-comparison-component': MutationComparisonComponent;
     }
 }
 
@@ -1693,7 +1693,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-mutations': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-mutation-comparison-component': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1701,7 +1701,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
+        'gs-mutations': MutationsComponent;
     }
 }
 
@@ -1709,7 +1709,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-prevalence-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-mutations': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1717,7 +1717,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-aggregate': AggregateComponent;
+        'gs-prevalence-over-time': PrevalenceOverTimeComponent;
     }
 }
 
@@ -1725,7 +1725,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-aggregate': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-prevalence-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1733,7 +1733,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-number-sequences-over-time': NumberSequencesOverTimeComponent;
+        'gs-relative-growth-advantage': RelativeGrowthAdvantageComponent;
     }
 }
 
@@ -1741,7 +1741,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-number-sequences-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-relative-growth-advantage': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1749,7 +1749,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-relative-growth-advantage': RelativeGrowthAdvantageComponent;
+        'gs-aggregate': AggregateComponent;
     }
 }
 
@@ -1757,7 +1757,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-relative-growth-advantage': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-aggregate': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1765,7 +1765,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-sequences-by-location': SequencesByLocationComponent;
+        'gs-number-sequences-over-time': NumberSequencesOverTimeComponent;
     }
 }
 
@@ -1773,7 +1773,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-number-sequences-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1797,7 +1797,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-statistics': StatisticsComponent;
+        'gs-sequences-by-location': SequencesByLocationComponent;
     }
 }
 
@@ -1805,7 +1805,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-statistics': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-sequences-by-location': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1813,11 +1813,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-date-range-filter': DateRangeFilterComponent;
-    }
-    interface HTMLElementEventMap {
-        [gsEventNames.dateRangeFilterChanged]: CustomEvent<Record<string, string>>;
-        [gsEventNames.dateRangeOptionChanged]: DateRangeOptionChangedEvent;
+        'gs-statistics': StatisticsComponent;
     }
 }
 
@@ -1825,7 +1821,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-date-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-statistics': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1833,7 +1829,10 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-wastewater-mutations-over-time': WastewaterMutationsOverTimeComponent;
+        'gs-location-filter': LocationFilterComponent;
+    }
+    interface HTMLElementEventMap {
+        [gsEventNames.locationChanged]: LocationChangedEvent;
     }
 }
 
@@ -1841,7 +1840,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-wastewater-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1849,10 +1848,11 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-location-filter': LocationFilterComponent;
+        'gs-date-range-filter': DateRangeFilterComponent;
     }
     interface HTMLElementEventMap {
-        [gsEventNames.locationChanged]: LocationChangedEvent;
+        [gsEventNames.dateRangeFilterChanged]: CustomEvent<Record<string, string>>;
+        [gsEventNames.dateRangeOptionChanged]: DateRangeOptionChangedEvent;
     }
 }
 
@@ -1860,7 +1860,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-date-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }

package/dist/components.js

@@ -15396,27 +15396,35 @@ async function fetchLineageAutocompleteList({
   lapisFilter,
   signal
 }) {
-  const [countsByLineage, lineageTree] = await Promise.all([
+  const [countsByLineage, { lineageTree, aliasMapping }] = await Promise.all([
     getCountsByLineage({
       lapisUrl,
       lapisField,
       lapisFilter,
       signal
     }),
-    getLineageTree({ lapisUrl, lapisField, signal })
+    getLineageTreeAndAliases({ lapisUrl, lapisField, signal })
   ]);
-  return Array.from(lineageTree.keys()).sort((a2, b2) => a2.localeCompare(b2)).map((lineage2) => {
-    return [
-      {
-        lineage: lineage2,
-        count: countsByLineage.get(lineage2) ?? 0
-      },
-      {
-        lineage: `${lineage2}*`,
-        count: getCountsIncludingSublineages(lineage2, lineageTree, countsByLineage)
-      }
-    ];
-  }).flat();
+  const prefixToLineage = findMissingPrefixMappings(lineageTree, aliasMapping);
+  const actualLineageItems = Array.from(lineageTree.keys()).flatMap((lineage2) => [
+    {
+      lineage: lineage2,
+      count: countsByLineage.get(lineage2) ?? 0
+    },
+    {
+      lineage: `${lineage2}*`,
+      count: getCountsIncludingSublineages(lineage2, lineageTree, countsByLineage)
+    }
+  ]);
+  const prefixAliasItems = Array.from(prefixToLineage.entries()).map(([prefix, actualLineage]) => ({
+    lineage: `${prefix}*`,
+    count: getCountsIncludingSublineages(actualLineage, lineageTree, countsByLineage)
+  }));
+  return [...actualLineageItems, ...prefixAliasItems].sort((a2, b2) => {
+    const aKey = a2.lineage.replace(/\*/g, " ");
+    const bKey = b2.lineage.replace(/\*/g, " ");
+    return aKey.localeCompare(bKey);
+  });
 }
 async function getCountsByLineage({
   lapisUrl,
@@ -15430,18 +15438,22 @@ async function getCountsByLineage({
   const countsByLineageArray = (await fetchAggregatedOperator.evaluate(lapisUrl, signal)).content;
   return new Map(countsByLineageArray.map((value) => [value[lapisField], value.count]));
 }
-async function getLineageTree({
+async function getLineageTreeAndAliases({
   lapisUrl,
   lapisField,
   signal
 }) {
   const lineageDefinitions = await fetchLineageDefinition({ lapisUrl, lapisField, signal });
   const lineageTree = /* @__PURE__ */ new Map();
+  const aliasMapping = /* @__PURE__ */ new Map();
   Object.entries(lineageDefinitions).forEach(([lineage2, definition]) => {
     var _a;
     if (!lineageTree.has(lineage2)) {
       lineageTree.set(lineage2, { children: [] });
     }
+    if (definition.aliases && definition.aliases.length > 0) {
+      aliasMapping.set(lineage2, definition.aliases);
+    }
     (_a = definition.parents) == null ? void 0 : _a.forEach((parent) => {
       var _a2;
       const parentChildren = (_a2 = lineageTree.get(parent)) == null ? void 0 : _a2.children;
@@ -15449,7 +15461,7 @@ async function getLineageTree({
       lineageTree.set(parent, { children: newParentChildren });
     });
   });
-  return lineageTree;
+  return { lineageTree, aliasMapping };
 }
 function getCountsIncludingSublineages(lineage2, lineageTree, countsByLineage) {
   const descendants = getAllDescendants(lineage2, lineageTree);
@@ -15467,6 +15479,29 @@ function getAllDescendants(lineage2, lineageTree) {
   });
   return /* @__PURE__ */ new Set([...children, ...childrenOfChildren.flatMap((child) => Array.from(child))]);
 }
+function findMissingPrefixMappings(lineageTree, aliasMapping) {
+  const lineages = Array.from(lineageTree.keys());
+  const lineagesSet = new Set(lineages);
+  const allPrefixes = lineages.flatMap((lineage2) => {
+    const parts = lineage2.split(".");
+    return parts.map((_2, i2) => parts.slice(0, i2 + 1).join("."));
+  });
+  const missingPrefixes = new Set(allPrefixes.filter((prefix) => !lineagesSet.has(prefix)));
+  const reverseAliasMapping = /* @__PURE__ */ new Map();
+  aliasMapping.forEach((aliases, lineage2) => {
+    aliases.forEach((alias) => {
+      reverseAliasMapping.set(alias, lineage2);
+    });
+  });
+  const prefixToLineage = /* @__PURE__ */ new Map();
+  missingPrefixes.forEach((prefix) => {
+    const actualLineage = reverseAliasMapping.get(prefix);
+    if (actualLineage) {
+      prefixToLineage.set(prefix, actualLineage);
+    }
+  });
+  return prefixToLineage;
+}
 const lineageSelectorPropsSchema = z$2.object({
   lapisField: z$2.string().min(1),
   placeholderText: z$2.string().optional(),