@genspectrum/dashboard-components 0.19.4 → 0.19.5

package/dist/components.d.ts

@@ -1696,11 +1696,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;
     }
 }
 
@@ -1708,7 +1704,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-date-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-statistics': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1716,10 +1712,7 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-location-filter': LocationFilterComponent;
-    }
-    interface HTMLElementEventMap {
-        [gsEventNames.locationChanged]: LocationChangedEvent;
+        'gs-wastewater-mutations-over-time': WastewaterMutationsOverTimeComponent;
     }
 }
 
@@ -1727,7 +1720,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-wastewater-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1735,7 +1728,11 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-statistics': StatisticsComponent;
+        'gs-date-range-filter': DateRangeFilterComponent;
+    }
+    interface HTMLElementEventMap {
+        [gsEventNames.dateRangeFilterChanged]: CustomEvent<Record<string, string>>;
+        [gsEventNames.dateRangeOptionChanged]: DateRangeOptionChangedEvent;
     }
 }
 
@@ -1743,7 +1740,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-statistics': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-date-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1770,10 +1767,10 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-lineage-filter': LineageFilterComponent;
+        'gs-location-filter': LocationFilterComponent;
     }
     interface HTMLElementEventMap {
-        [gsEventNames.lineageFilterChanged]: LineageFilterChangedEvent;
+        [gsEventNames.locationChanged]: LocationChangedEvent;
     }
 }
 
@@ -1781,7 +1778,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-lineage-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-location-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1808,11 +1805,10 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-number-range-filter': NumberRangeFilterComponent;
+        'gs-lineage-filter': LineageFilterComponent;
     }
     interface HTMLElementEventMap {
-        [gsEventNames.numberRangeFilterChanged]: NumberRangeFilterChangedEvent;
-        [gsEventNames.numberRangeValueChanged]: NumberRangeValueChangedEvent;
+        [gsEventNames.lineageFilterChanged]: LineageFilterChangedEvent;
     }
 }
 
@@ -1820,7 +1816,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-number-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-lineage-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }
@@ -1828,7 +1824,11 @@ declare global {
 
 declare global {
     interface HTMLElementTagNameMap {
-        'gs-wastewater-mutations-over-time': WastewaterMutationsOverTimeComponent;
+        'gs-number-range-filter': NumberRangeFilterComponent;
+    }
+    interface HTMLElementEventMap {
+        [gsEventNames.numberRangeFilterChanged]: NumberRangeFilterChangedEvent;
+        [gsEventNames.numberRangeValueChanged]: NumberRangeValueChangedEvent;
     }
 }
 
@@ -1836,7 +1836,7 @@ declare global {
 declare global {
     namespace JSX {
         interface IntrinsicElements {
-            'gs-wastewater-mutations-over-time': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
+            'gs-number-range-filter': DetailedHTMLProps<HTMLAttributes<HTMLElement>, HTMLElement>;
         }
     }
 }

package/dist/components.js

@@ -7162,7 +7162,7 @@ function getFilteredMutationOverTimeData$1({
     if (displayMutationsSet !== null && !displayMutationsSet.has(entry.mutation.code.toUpperCase())) {
       return true;
     }
-    if (applySearchFilter(entry.mutation, sequenceType, mutationFilterValue, annotationProvider)) {
+    if (mutationOrAnnotationDoNotMatchFilter(entry.mutation, sequenceType, mutationFilterValue, annotationProvider)) {
       return true;
     }
     return displayedMutationTypes.some(
@@ -7174,7 +7174,7 @@ function getFilteredMutationOverTimeData$1({
   });
   return filteredData;
 }
-function applySearchFilter(mutation, sequenceType, filterValue, annotationProvider) {
+function mutationOrAnnotationDoNotMatchFilter(mutation, sequenceType, filterValue, annotationProvider) {
   if (filterValue === "") {
     return false;
   }
@@ -9371,10 +9371,16 @@ function useDisplayedSegments(mutations) {
 }
 function getFilteredMutationOverTimeData({
   data,
-  displayedSegments
+  displayedSegments,
+  mutationFilterValue,
+  annotationProvider,
+  sequenceType
 }) {
   const filteredData = new Map2dView(data);
   const mutationsToFilterOut = data.getFirstAxisKeys().filter((entry) => {
+    if (mutationOrAnnotationDoNotMatchFilter(entry, sequenceType, mutationFilterValue, annotationProvider)) {
+      return true;
+    }
     return displayedSegments.some((segment) => segment.segment === entry.segment && !segment.checked);
   });
   mutationsToFilterOut.forEach((entry) => {
@@ -9386,6 +9392,8 @@ const MutationsOverTimeTabs = ({
   mutationOverTimeDataPerLocation,
   originalComponentProps
 }) => {
+  const [mutationFilterValue, setMutationFilterValue] = d("");
+  const annotationProvider = useMutationAnnotationsProvider();
   const [colorScale, setColorScale] = d({ min: 0, max: 1, color: "indigo" });
   const [displayedSegments, setDisplayedSegments] = useDisplayedSegments(mutationOverTimeDataPerLocation);
   const tabs = T$1(
@@ -9394,14 +9402,28 @@ const MutationsOverTimeTabs = ({
       content: /* @__PURE__ */ u$1(
         MutationsOverTimeGrid,
         {
-          data: getFilteredMutationOverTimeData({ data, displayedSegments }),
+          data: getFilteredMutationOverTimeData({
+            data,
+            displayedSegments,
+            mutationFilterValue,
+            annotationProvider,
+            sequenceType: originalComponentProps.sequenceType
+          }),
           colorScale,
           pageSizes: originalComponentProps.pageSizes,
           sequenceType: originalComponentProps.sequenceType
         }
       )
     })),
-    [mutationOverTimeDataPerLocation, displayedSegments, colorScale, originalComponentProps]
+    [
+      mutationOverTimeDataPerLocation,
+      displayedSegments,
+      mutationFilterValue,
+      annotationProvider,
+      colorScale,
+      originalComponentProps.pageSizes,
+      originalComponentProps.sequenceType
+    ]
   );
   const toolbar = /* @__PURE__ */ u$1(
     Toolbar,
@@ -9411,7 +9433,9 @@ const MutationsOverTimeTabs = ({
       originalComponentProps,
       data: mutationOverTimeDataPerLocation,
       displayedSegments,
-      setDisplayedSegments
+      setDisplayedSegments,
+      setFilterValue: setMutationFilterValue,
+      mutationFilterValue
     }
   );
   return /* @__PURE__ */ u$1(PageSizeContextProvider, { pageSizes: originalComponentProps.pageSizes, children: /* @__PURE__ */ u$1(Tabs, { tabs, toolbar }) });
@@ -9421,9 +9445,12 @@ const Toolbar = ({
   setColorScale,
   originalComponentProps,
   displayedSegments,
-  setDisplayedSegments
+  setDisplayedSegments,
+  setFilterValue,
+  mutationFilterValue
 }) => {
   return /* @__PURE__ */ u$1(Fragment, { children: [
+    /* @__PURE__ */ u$1(MutationsOverTimeTextFilter, { setFilterValue, value: mutationFilterValue }),
     /* @__PURE__ */ u$1(ColorScaleSelectorDropdown, { colorScale, setColorScale }),
     /* @__PURE__ */ u$1(
       SegmentSelector,