[Synthetics] Filtering - location filter counts are off when filter i…

…s applied (elastic#155437) Co-authored-by: Anjola Adeuyi <57623705+anjola-adeuyi@users.noreply.github.com> Co-authored-by: gitstart_bot <gitstart_bot@users.noreply.github.com> Co-authored-by: shahzad31 <shahzad31comp@gmail.com>
shahzad31 · Apr 21, 2023 · f95ebdf · f95ebdf
1 parent b494716
commit f95ebdf
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...s/public/apps/synthetics/components/monitors_page/common/monitor_filters/filter_group.tsx b/...s/public/apps/synthetics/components/monitors_page/common/monitor_filters/filter_group.tsx
@@ -61,7 +61,18 @@ export const FilterGroup = ({
       label: LOCATION_LABEL,
       field: 'locations',
       values: getSyntheticsFilterDisplayValues(
-        mixUrlValues(data.locations, urlParams.locations),
+        mixUrlValues(
+          data.locations.map((locationData) => {
+            const matchingLocation = locations.find(
+              (location) => location.id === locationData.label
+            );
+            return {
+              label: matchingLocation ? matchingLocation.label : locationData.label,
+              count: locationData.count,
+            };
+          }),
+          urlParams.locations
+        ),
         'locations',
         locations
       ),

diff --git a/...ics/public/apps/synthetics/components/monitors_page/common/monitor_filters/use_filters.ts b/...ics/public/apps/synthetics/components/monitors_page/common/monitor_filters/use_filters.ts
@@ -132,7 +132,7 @@ export const useFilters = (): FiltersList => {
           })) ?? [],
       schedules:
         schedules?.buckets?.map(({ key, doc_count: count }) => ({
-          label: key,
+          label: String(key),
           count,
         })) ?? [],
     };