@trackunit/filters-asset-filter-definitions 1.12.0 → 1.12.4

package/index.cjs.js

@@ -12,9 +12,9 @@ var reactFilterComponents = require('@trackunit/react-filter-components');
 var reactFormComponents = require('@trackunit/react-form-components');
 var utilizationIndicator = require('@trackunit/utilization-indicator');
 var geoJsonUtils = require('@trackunit/geo-json-utils');
+var zod = require('zod');
 var reactComponents = require('@trackunit/react-components');
 var stringTs = require('string-ts');
-var zod = require('zod');
 var sharedUtils = require('@trackunit/shared-utils');
 var translationsMachineType = require('@trackunit/translations-machine-type');
 var criticalityIndicator = require('@trackunit/criticality-indicator');
@@ -2476,28 +2476,35 @@ const useActivityFilter = () => {
 };
 
 /**
- * A button to clear recent searches.
+ * Renders the AreaView component, which manages the UI and logic for an area filter.
  *
- * @param {ClearItemButtonProps} props - The props for the ClearItemButton component
- * @returns {ReactElement} ClearItemButton component
+ * @param {FilterViewProps<AreaFilterGeoJsonGeometry>} props - The props for the component.
+ * @returns {ReactElement} The rendered AreaView component.
  */
-const ClearItemButton = ({ onClick }) => {
+const AreaView = (props) => {
     const [t] = useTranslation();
-    return (jsxRuntime.jsx(reactComponents.Tooltip, { label: t("filters.shared.clear"), children: jsxRuntime.jsx(reactComponents.IconButton, { className: "rounded-full", icon: jsxRuntime.jsx(reactComponents.Icon, { name: "Trash", size: "small" }), onClick: onClick, size: "small", variant: "ghost-neutral" }) }));
+    return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(filtersFilterBar.FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey) }), jsxRuntime.jsx(reactFilterComponents.FilterBody, { limitSize: true, children: jsxRuntime.jsx("p", { className: "p-2", children: `${t("assetFilters.boundingBoxFilter.value")}` }) })] }));
 };
-
 /**
- * A footer component that displays a count of recent searches and a clear all button.
+ * Area filter definition
  *
- * @param {RecentSearchesFooterProps} props - The props for the ClearAllFooter component
- * @returns {ReactElement} RecentSearchesFooter component
+ * @returns {AreaFilterDefinition}  Area filter definition
  */
-const RecentSearchesFooter = ({ count, onClearAll }) => {
+const useAreaFilter = () => {
     const [t] = useTranslation();
-    if (count === 0) {
-        return null;
-    }
-    return (jsxRuntime.jsxs("div", { className: "flex items-baseline justify-between gap-x-2 border-t-2 border-neutral-300 px-2 py-0.5", children: [jsxRuntime.jsx(reactComponents.Text, { className: "py-0.5", size: "small", subtle: true, children: t("filters.shared.recentSearches") }), count > 1 ? (jsxRuntime.jsx(reactComponents.Button, { onClick: onClearAll, size: "small", variant: "ghost", children: t("filters.shared.clearAll") })) : null] }));
+    const result = react.useMemo(() => {
+        return {
+            filterKey: "area",
+            type: "area",
+            group: "CURRENT_LOCATION",
+            title: t("assetFilters.area.label"),
+            valueAsText: value => {
+                return t("assetFilters.boundingBoxFilter.value");
+            },
+            component: props => jsxRuntime.jsx(AreaView, { ...props }),
+        };
+    }, [t]);
+    return result;
 };
 
 const areaFilterInternalGeoJsonGeometrySchema = zod.z.union([
@@ -2679,145 +2686,6 @@ const usePlacesSearch = ({ localStorageKey = SHARED_LOCATIONS_LOCAL_STORAGE_KEY,
     ]);
 };
 
-/**
- * Renders the AreaView component, which manages the UI and logic for an area filter
- * with optional search functionality.
- *
- * @param {FilterViewProps<AreaFilterGeoJsonGeometry> & { showWithSearch: boolean }} props - The props for the component.
- * @returns {ReactElement} The rendered AreaView component.
- */
-const AreaView = (props) => {
-    const [t] = useTranslation();
-    const { logEvent } = reactCoreHooks.useAnalytics(filtersFilterBar.FilterEvents);
-    const { places, recentPlaces, setRecentPlaces, selectedPlaceData, setSelectedPrediction, searchString, setSearchString, debouncedSearchString, loading, hint, } = usePlacesSearch({
-        localStorageKey: "shared-recent-locations",
-    });
-    const placeholderOption = react.useMemo(() => {
-        // If no selected option, use this placeholder option
-        // Aka if applied from outside the filter UI
-        if (!props.value) {
-            return null;
-        }
-        const placeholderBbox = geoJsonUtils.getBboxFromGeoJsonPolygon(props.value);
-        return placeholderBbox
-            ? {
-                bBox: placeholderBbox,
-                geometry: props.value,
-                properties: { formattedAddress: t("assetFilters.area.origin.mapArea") },
-                dateIsoString: undefined,
-                placeId: "applied-map-area",
-                description: t("assetFilters.area.origin.mapArea"),
-            }
-            : null;
-    }, [props.value, t]);
-    const selectedOption = react.useMemo(() => getSelectedOption(props.value, recentPlaces), [props.value, recentPlaces]);
-    const setFilter = react.useCallback((place) => {
-        const { properties, bBox, geometry, dateIsoString } = place;
-        if (geometry.type === "Polygon") {
-            // Polygons are stored directly
-            props.filterBarActions.setArea(geometry);
-        }
-        else {
-            // All other geometries are stored by the filter as a
-            // polygon derived from the features bbox
-            props.filterBarActions.setArea(geoJsonUtils.getPolygonFromBbox(bBox));
-        }
-        logEvent("Filters Applied - V2", {
-            type: "AreaFilter",
-            value: properties.formattedAddress,
-            additionalProperties: {
-                geometryType: geometry.type,
-                wasPreviousSearch: Boolean(dateIsoString),
-            },
-        });
-    }, [props.filterBarActions, logEvent]);
-    react.useEffect(() => {
-        if (!selectedPlaceData) {
-            return;
-        }
-        if (selectedPlaceData.placeId === selectedOption?.placeId) {
-            return;
-        }
-        setFilter(selectedPlaceData);
-    }, [selectedPlaceData, setFilter, selectedOption]);
-    if (!props.showWithSearch) {
-        // Temporary while we are testing the new area filter bar behind feature flag
-        // This emulated the old look of the boundingbox filter
-        // TODO [BUSS] Remove this once the new area filter is ready for prime time
-        return (jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [jsxRuntime.jsx(filtersFilterBar.FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey) }), jsxRuntime.jsx(reactFilterComponents.FilterBody, { limitSize: true, children: jsxRuntime.jsx("p", { className: "p-2", children: `${t("assetFilters.boundingBoxFilter.value")}` }) })] }));
-    }
-    return (jsxRuntime.jsxs("div", { children: [jsxRuntime.jsx(filtersFilterBar.FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey), loading: loading, searchEnabled: true, searchProps: {
-                    onChange: setSearchString,
-                    onClear: () => setSearchString(""),
-                    value: searchString,
-                    count: places.length,
-                    placeholder: t("assetFilters.area.searchPlaceholder"),
-                } }), jsxRuntime.jsx(reactFilterComponents.FilterBody, { limitSize: true, children: places.length > 0 || placeholderOption ? (jsxRuntime.jsx(filtersFilterBar.FilterResults, { loading: false, results: [
-                        // Show placeholder option first if selected option is not in filterResult
-                        // Aka if applied from outside the filter UI
-                        ...(placeholderOption && !selectedOption && !debouncedSearchString ? [placeholderOption] : []),
-                        ...places,
-                    ], children: filterResult => (jsxRuntime.jsx(reactFormComponents.RadioGroup, { className: "m-1", id: "areaFilter", onChange: e => {
-                            const findOption = filterResult.find(result => result.description === e.currentTarget.value);
-                            findOption &&
-                                setSelectedPrediction({
-                                    placeId: findOption.placeId,
-                                    description: findOption.description,
-                                });
-                            setSearchString(""); // Clear search input after selection
-                        }, value: selectedOption?.description ??
-                            placeholderOption?.description ?? // placeholder if no selected option
-                            "", children: filterResult.map(({ ...rest }, index) => {
-                            const selected = selectedOption?.description === rest.description;
-                            return (jsxRuntime.jsx(reactFilterComponents.RadioFilterItem, { label: rest.description, selected: selected, suffix: 
-                                // Only show clear button if not currently selected and previously searched
-                                !selected && "dateIsoString" in rest ? (jsxRuntime.jsx(ClearItemButton, { onClick: () => setRecentPlaces(prev => prev.filter(r => r.description !== rest.description)) })) : null, value: rest.description }, index));
-                        }) })) })) : (jsxRuntime.jsx("p", { className: "py-2 text-center text-sm text-neutral-400", children: hint })) }), debouncedSearchString.length === 0 ? (jsxRuntime.jsx(RecentSearchesFooter, { count: recentPlaces.length, onClearAll: () => setRecentPlaces([]) })) : null] }));
-};
-/**
- * Area filter definition
- *
- * @returns {AreaFilterDefinition}  Area filter definition
- */
-const useAreaFilter = ({ showWithSearch } = {
-    showWithSearch: () => true,
-}) => {
-    const [t] = useTranslation();
-    const { recentPlaces } = usePlacesSearch({
-        localStorageKey: "shared-recent-locations",
-    });
-    const result = react.useMemo(() => {
-        return {
-            filterKey: "area",
-            type: "area",
-            group: "CURRENT_LOCATION",
-            title: t("assetFilters.area.label"),
-            showInFilterBar: () => showWithSearch(),
-            valueAsText: value => {
-                // Match the applied area filter to the places option if it exists in the recent places
-                const nameOfSelectedArea = getSelectedOption(value, recentPlaces);
-                return showWithSearch()
-                    ? (nameOfSelectedArea?.description ?? t("assetFilters.area.active"))
-                    : t("assetFilters.boundingBoxFilter.value");
-            },
-            component: props => jsxRuntime.jsx(AreaView, { ...props, showWithSearch: showWithSearch() }),
-        };
-    }, [t, showWithSearch, recentPlaces]);
-    return result;
-};
-const getSelectedOption = (value, options) => {
-    return options.find(option => {
-        // Polygons are compared by their coordinates directly
-        if (option.geometry.type === "Polygon" || option.geometry.type === "MultiPolygon") {
-            return JSON.stringify(option.geometry.coordinates) === JSON.stringify(value?.coordinates);
-        }
-        // All other geometries are stored by the filter as a
-        // polygon derived from the features bbox
-        // therefore we need to compare by that here to reverse the conversion
-        return JSON.stringify(geoJsonUtils.getPolygonFromBbox(option.bBox).coordinates) === JSON.stringify(value?.coordinates);
-    });
-};
-
 /**
  * Renders a filter view component with a header and optional additional elements for Asset IDs.
  *
@@ -4039,6 +3907,31 @@ const useRentalContractOrderNumberFilter = ({ showInFilterBar } = {
     return result;
 };
 
+/**
+ * A button to clear recent searches.
+ *
+ * @param {ClearItemButtonProps} props - The props for the ClearItemButton component
+ * @returns {ReactElement} ClearItemButton component
+ */
+const ClearItemButton = ({ onClick }) => {
+    const [t] = useTranslation();
+    return (jsxRuntime.jsx(reactComponents.Tooltip, { label: t("filters.shared.clear"), children: jsxRuntime.jsx(reactComponents.IconButton, { className: "rounded-full", icon: jsxRuntime.jsx(reactComponents.Icon, { name: "Trash", size: "small" }), onClick: onClick, size: "small", variant: "ghost-neutral" }) }));
+};
+
+/**
+ * A footer component that displays a count of recent searches and a clear all button.
+ *
+ * @param {RecentSearchesFooterProps} props - The props for the ClearAllFooter component
+ * @returns {ReactElement} RecentSearchesFooter component
+ */
+const RecentSearchesFooter = ({ count, onClearAll }) => {
+    const [t] = useTranslation();
+    if (count === 0) {
+        return null;
+    }
+    return (jsxRuntime.jsxs("div", { className: "flex items-baseline justify-between gap-x-2 border-t-2 border-neutral-300 px-2 py-0.5", children: [jsxRuntime.jsx(reactComponents.Text, { className: "py-0.5", size: "small", subtle: true, children: t("filters.shared.recentSearches") }), count > 1 ? (jsxRuntime.jsx(reactComponents.Button, { onClick: onClearAll, size: "small", variant: "ghost", children: t("filters.shared.clearAll") })) : null] }));
+};
+
 const MAX_RECENT_SEARCHES$1 = 20;
 /**
  * Rental contract reference code description filter view component.
@@ -5336,7 +5229,7 @@ const mockForGetAccessManagementModeDesiredSummaryQuery = (variables, data) => {
  *
  * @returns {FilterBarDefinition}  Default asset filter bar definition
  */
-const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, areaShowWithSearch, ownerFilterDefaultValue, showHiddenAssetsEnabled, }) => {
+const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, ownerFilterDefaultValue, showHiddenAssetsEnabled, }) => {
     const assetType = useAssetTypeFilter();
     const metadataCompleteness = useMetadataCompletenessFilter();
     const groups = useGroupIdsFilter();
@@ -5368,12 +5261,7 @@ const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled,
     const ownerAccountIds = useOwnerAccountIdsFilter(ownerFilterDefaultValue);
     const searchProps = react.useMemo(() => ({ localStorageKey: "assetSearch" }), []);
     const search = useSearchFilter(searchProps);
-    const areaEnabledProps = react.useMemo(() => {
-        return {
-            showWithSearch: () => areaShowWithSearch ?? false,
-        };
-    }, [areaShowWithSearch]);
-    const area = useAreaFilter(areaEnabledProps);
+    const area = useAreaFilter();
     const productionYears = useProductionYearFilter();
     const partner = usePartnerFilter();
     const serviceManagementEnabledProps = react.useMemo(() => {

package/index.esm.js

@@ -1,7 +1,7 @@
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { registerTranslations, useNamespaceTranslation } from '@trackunit/i18n-library-translation';
 import { gql } from '@apollo/client';
-import { DefaultCheckboxFilter, FilterEvents, FilterHeader, FilterResults, HierarchicalCheckboxFilter, DefaultRadioFilter } from '@trackunit/filters-filter-bar';
+import { DefaultCheckboxFilter, FilterEvents, FilterHeader, HierarchicalCheckboxFilter, DefaultRadioFilter } from '@trackunit/filters-filter-bar';
 import { useActiveAssetFilters, useAssetQueryFilters } from '@trackunit/filters-graphql-hook';
 import { useQuery } from '@trackunit/react-graphql-hooks';
 import { useMemo, useState, useCallback, useEffect } from 'react';
@@ -9,10 +9,10 @@ import { useAnalytics, useCurrentUser } from '@trackunit/react-core-hooks';
 import { FilterBody, RadioFilterItem } from '@trackunit/react-filter-components';
 import { RadioGroup, RadioItem, Search } from '@trackunit/react-form-components';
 import { ActivityIndicator } from '@trackunit/utilization-indicator';
-import { geoJsonPolygonSchema, geoJsonPointSchema, geoJsonMultiPolygonSchema, geoJsonBboxSchema, getBboxFromGeoJsonPolygon, getPolygonFromBbox } from '@trackunit/geo-json-utils';
-import { Tooltip, IconButton, Icon, Text, Button, useLocalStorage, useDebounce, usePrevious, MenuItem, useMeasure, Popover, PopoverTrigger, PopoverContent, MenuList } from '@trackunit/react-components';
-import { titleCase, lowerCase } from 'string-ts';
+import { geoJsonPolygonSchema, geoJsonPointSchema, geoJsonMultiPolygonSchema, geoJsonBboxSchema } from '@trackunit/geo-json-utils';
 import { z } from 'zod';
+import { useLocalStorage, useDebounce, Tooltip, IconButton, Icon, Text, Button, usePrevious, MenuItem, useMeasure, Popover, PopoverTrigger, PopoverContent, MenuList } from '@trackunit/react-components';
+import { titleCase, lowerCase } from 'string-ts';
 import { objectValues, enumFromValue, nonNullable, hourIntervals } from '@trackunit/shared-utils';
 import { useMachineTypeTranslations } from '@trackunit/translations-machine-type';
 import { CriticalityIndicator } from '@trackunit/criticality-indicator';
@@ -2474,28 +2474,35 @@ const useActivityFilter = () => {
 };
 
 /**
- * A button to clear recent searches.
+ * Renders the AreaView component, which manages the UI and logic for an area filter.
  *
- * @param {ClearItemButtonProps} props - The props for the ClearItemButton component
- * @returns {ReactElement} ClearItemButton component
+ * @param {FilterViewProps<AreaFilterGeoJsonGeometry>} props - The props for the component.
+ * @returns {ReactElement} The rendered AreaView component.
  */
-const ClearItemButton = ({ onClick }) => {
+const AreaView = (props) => {
     const [t] = useTranslation();
-    return (jsx(Tooltip, { label: t("filters.shared.clear"), children: jsx(IconButton, { className: "rounded-full", icon: jsx(Icon, { name: "Trash", size: "small" }), onClick: onClick, size: "small", variant: "ghost-neutral" }) }));
+    return (jsxs(Fragment, { children: [jsx(FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey) }), jsx(FilterBody, { limitSize: true, children: jsx("p", { className: "p-2", children: `${t("assetFilters.boundingBoxFilter.value")}` }) })] }));
 };
-
 /**
- * A footer component that displays a count of recent searches and a clear all button.
+ * Area filter definition
  *
- * @param {RecentSearchesFooterProps} props - The props for the ClearAllFooter component
- * @returns {ReactElement} RecentSearchesFooter component
+ * @returns {AreaFilterDefinition}  Area filter definition
  */
-const RecentSearchesFooter = ({ count, onClearAll }) => {
+const useAreaFilter = () => {
     const [t] = useTranslation();
-    if (count === 0) {
-        return null;
-    }
-    return (jsxs("div", { className: "flex items-baseline justify-between gap-x-2 border-t-2 border-neutral-300 px-2 py-0.5", children: [jsx(Text, { className: "py-0.5", size: "small", subtle: true, children: t("filters.shared.recentSearches") }), count > 1 ? (jsx(Button, { onClick: onClearAll, size: "small", variant: "ghost", children: t("filters.shared.clearAll") })) : null] }));
+    const result = useMemo(() => {
+        return {
+            filterKey: "area",
+            type: "area",
+            group: "CURRENT_LOCATION",
+            title: t("assetFilters.area.label"),
+            valueAsText: value => {
+                return t("assetFilters.boundingBoxFilter.value");
+            },
+            component: props => jsx(AreaView, { ...props }),
+        };
+    }, [t]);
+    return result;
 };
 
 const areaFilterInternalGeoJsonGeometrySchema = z.union([
@@ -2677,145 +2684,6 @@ const usePlacesSearch = ({ localStorageKey = SHARED_LOCATIONS_LOCAL_STORAGE_KEY,
     ]);
 };
 
-/**
- * Renders the AreaView component, which manages the UI and logic for an area filter
- * with optional search functionality.
- *
- * @param {FilterViewProps<AreaFilterGeoJsonGeometry> & { showWithSearch: boolean }} props - The props for the component.
- * @returns {ReactElement} The rendered AreaView component.
- */
-const AreaView = (props) => {
-    const [t] = useTranslation();
-    const { logEvent } = useAnalytics(FilterEvents);
-    const { places, recentPlaces, setRecentPlaces, selectedPlaceData, setSelectedPrediction, searchString, setSearchString, debouncedSearchString, loading, hint, } = usePlacesSearch({
-        localStorageKey: "shared-recent-locations",
-    });
-    const placeholderOption = useMemo(() => {
-        // If no selected option, use this placeholder option
-        // Aka if applied from outside the filter UI
-        if (!props.value) {
-            return null;
-        }
-        const placeholderBbox = getBboxFromGeoJsonPolygon(props.value);
-        return placeholderBbox
-            ? {
-                bBox: placeholderBbox,
-                geometry: props.value,
-                properties: { formattedAddress: t("assetFilters.area.origin.mapArea") },
-                dateIsoString: undefined,
-                placeId: "applied-map-area",
-                description: t("assetFilters.area.origin.mapArea"),
-            }
-            : null;
-    }, [props.value, t]);
-    const selectedOption = useMemo(() => getSelectedOption(props.value, recentPlaces), [props.value, recentPlaces]);
-    const setFilter = useCallback((place) => {
-        const { properties, bBox, geometry, dateIsoString } = place;
-        if (geometry.type === "Polygon") {
-            // Polygons are stored directly
-            props.filterBarActions.setArea(geometry);
-        }
-        else {
-            // All other geometries are stored by the filter as a
-            // polygon derived from the features bbox
-            props.filterBarActions.setArea(getPolygonFromBbox(bBox));
-        }
-        logEvent("Filters Applied - V2", {
-            type: "AreaFilter",
-            value: properties.formattedAddress,
-            additionalProperties: {
-                geometryType: geometry.type,
-                wasPreviousSearch: Boolean(dateIsoString),
-            },
-        });
-    }, [props.filterBarActions, logEvent]);
-    useEffect(() => {
-        if (!selectedPlaceData) {
-            return;
-        }
-        if (selectedPlaceData.placeId === selectedOption?.placeId) {
-            return;
-        }
-        setFilter(selectedPlaceData);
-    }, [selectedPlaceData, setFilter, selectedOption]);
-    if (!props.showWithSearch) {
-        // Temporary while we are testing the new area filter bar behind feature flag
-        // This emulated the old look of the boundingbox filter
-        // TODO [BUSS] Remove this once the new area filter is ready for prime time
-        return (jsxs(Fragment, { children: [jsx(FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey) }), jsx(FilterBody, { limitSize: true, children: jsx("p", { className: "p-2", children: `${t("assetFilters.boundingBoxFilter.value")}` }) })] }));
-    }
-    return (jsxs("div", { children: [jsx(FilterHeader, { ...props.filterDefinition, ...props.filterBarActions, filterHasChanges: props.filterBarActions.appliedFilterKeys().includes(props.filterDefinition.filterKey), loading: loading, searchEnabled: true, searchProps: {
-                    onChange: setSearchString,
-                    onClear: () => setSearchString(""),
-                    value: searchString,
-                    count: places.length,
-                    placeholder: t("assetFilters.area.searchPlaceholder"),
-                } }), jsx(FilterBody, { limitSize: true, children: places.length > 0 || placeholderOption ? (jsx(FilterResults, { loading: false, results: [
-                        // Show placeholder option first if selected option is not in filterResult
-                        // Aka if applied from outside the filter UI
-                        ...(placeholderOption && !selectedOption && !debouncedSearchString ? [placeholderOption] : []),
-                        ...places,
-                    ], children: filterResult => (jsx(RadioGroup, { className: "m-1", id: "areaFilter", onChange: e => {
-                            const findOption = filterResult.find(result => result.description === e.currentTarget.value);
-                            findOption &&
-                                setSelectedPrediction({
-                                    placeId: findOption.placeId,
-                                    description: findOption.description,
-                                });
-                            setSearchString(""); // Clear search input after selection
-                        }, value: selectedOption?.description ??
-                            placeholderOption?.description ?? // placeholder if no selected option
-                            "", children: filterResult.map(({ ...rest }, index) => {
-                            const selected = selectedOption?.description === rest.description;
-                            return (jsx(RadioFilterItem, { label: rest.description, selected: selected, suffix: 
-                                // Only show clear button if not currently selected and previously searched
-                                !selected && "dateIsoString" in rest ? (jsx(ClearItemButton, { onClick: () => setRecentPlaces(prev => prev.filter(r => r.description !== rest.description)) })) : null, value: rest.description }, index));
-                        }) })) })) : (jsx("p", { className: "py-2 text-center text-sm text-neutral-400", children: hint })) }), debouncedSearchString.length === 0 ? (jsx(RecentSearchesFooter, { count: recentPlaces.length, onClearAll: () => setRecentPlaces([]) })) : null] }));
-};
-/**
- * Area filter definition
- *
- * @returns {AreaFilterDefinition}  Area filter definition
- */
-const useAreaFilter = ({ showWithSearch } = {
-    showWithSearch: () => true,
-}) => {
-    const [t] = useTranslation();
-    const { recentPlaces } = usePlacesSearch({
-        localStorageKey: "shared-recent-locations",
-    });
-    const result = useMemo(() => {
-        return {
-            filterKey: "area",
-            type: "area",
-            group: "CURRENT_LOCATION",
-            title: t("assetFilters.area.label"),
-            showInFilterBar: () => showWithSearch(),
-            valueAsText: value => {
-                // Match the applied area filter to the places option if it exists in the recent places
-                const nameOfSelectedArea = getSelectedOption(value, recentPlaces);
-                return showWithSearch()
-                    ? (nameOfSelectedArea?.description ?? t("assetFilters.area.active"))
-                    : t("assetFilters.boundingBoxFilter.value");
-            },
-            component: props => jsx(AreaView, { ...props, showWithSearch: showWithSearch() }),
-        };
-    }, [t, showWithSearch, recentPlaces]);
-    return result;
-};
-const getSelectedOption = (value, options) => {
-    return options.find(option => {
-        // Polygons are compared by their coordinates directly
-        if (option.geometry.type === "Polygon" || option.geometry.type === "MultiPolygon") {
-            return JSON.stringify(option.geometry.coordinates) === JSON.stringify(value?.coordinates);
-        }
-        // All other geometries are stored by the filter as a
-        // polygon derived from the features bbox
-        // therefore we need to compare by that here to reverse the conversion
-        return JSON.stringify(getPolygonFromBbox(option.bBox).coordinates) === JSON.stringify(value?.coordinates);
-    });
-};
-
 /**
  * Renders a filter view component with a header and optional additional elements for Asset IDs.
  *
@@ -4037,6 +3905,31 @@ const useRentalContractOrderNumberFilter = ({ showInFilterBar } = {
     return result;
 };
 
+/**
+ * A button to clear recent searches.
+ *
+ * @param {ClearItemButtonProps} props - The props for the ClearItemButton component
+ * @returns {ReactElement} ClearItemButton component
+ */
+const ClearItemButton = ({ onClick }) => {
+    const [t] = useTranslation();
+    return (jsx(Tooltip, { label: t("filters.shared.clear"), children: jsx(IconButton, { className: "rounded-full", icon: jsx(Icon, { name: "Trash", size: "small" }), onClick: onClick, size: "small", variant: "ghost-neutral" }) }));
+};
+
+/**
+ * A footer component that displays a count of recent searches and a clear all button.
+ *
+ * @param {RecentSearchesFooterProps} props - The props for the ClearAllFooter component
+ * @returns {ReactElement} RecentSearchesFooter component
+ */
+const RecentSearchesFooter = ({ count, onClearAll }) => {
+    const [t] = useTranslation();
+    if (count === 0) {
+        return null;
+    }
+    return (jsxs("div", { className: "flex items-baseline justify-between gap-x-2 border-t-2 border-neutral-300 px-2 py-0.5", children: [jsx(Text, { className: "py-0.5", size: "small", subtle: true, children: t("filters.shared.recentSearches") }), count > 1 ? (jsx(Button, { onClick: onClearAll, size: "small", variant: "ghost", children: t("filters.shared.clearAll") })) : null] }));
+};
+
 const MAX_RECENT_SEARCHES$1 = 20;
 /**
  * Rental contract reference code description filter view component.
@@ -5334,7 +5227,7 @@ const mockForGetAccessManagementModeDesiredSummaryQuery = (variables, data) => {
  *
  * @returns {FilterBarDefinition}  Default asset filter bar definition
  */
-const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, areaShowWithSearch, ownerFilterDefaultValue, showHiddenAssetsEnabled, }) => {
+const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, ownerFilterDefaultValue, showHiddenAssetsEnabled, }) => {
     const assetType = useAssetTypeFilter();
     const metadataCompleteness = useMetadataCompletenessFilter();
     const groups = useGroupIdsFilter();
@@ -5366,12 +5259,7 @@ const useDefaultAssetFilterBarDefinition = ({ sitesEnabled, owningDepotEnabled,
     const ownerAccountIds = useOwnerAccountIdsFilter(ownerFilterDefaultValue);
     const searchProps = useMemo(() => ({ localStorageKey: "assetSearch" }), []);
     const search = useSearchFilter(searchProps);
-    const areaEnabledProps = useMemo(() => {
-        return {
-            showWithSearch: () => areaShowWithSearch ?? false,
-        };
-    }, [areaShowWithSearch]);
-    const area = useAreaFilter(areaEnabledProps);
+    const area = useAreaFilter();
     const productionYears = useProductionYearFilter();
     const partner = usePartnerFilter();
     const serviceManagementEnabledProps = useMemo(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/filters-asset-filter-definitions",
-  "version": "1.12.0",
+  "version": "1.12.4",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -15,23 +15,23 @@
     "zod": "^3.23.8",
     "string-ts": "^2.0.0",
     "tailwind-merge": "^2.0.0",
-    "@trackunit/iris-app-build-utilities": "1.7.113",
-    "@trackunit/filters-filter-bar": "1.8.167",
-    "@trackunit/react-core-hooks": "1.7.121",
-    "@trackunit/react-filter-components": "1.7.161",
-    "@trackunit/react-form-components": "1.8.158",
-    "@trackunit/filters-graphql-hook": "1.11.110",
-    "@trackunit/utilization-indicator": "1.7.147",
-    "@trackunit/geo-json-utils": "1.7.107",
-    "@trackunit/react-components": "1.10.83",
-    "@trackunit/shared-utils": "1.9.107",
-    "@trackunit/translations-machine-type": "1.7.140",
-    "@trackunit/criticality-indicator": "1.7.147",
-    "@trackunit/iris-app-api": "1.10.0",
-    "@trackunit/react-core-contexts-test": "1.7.121",
-    "@trackunit/i18n-library-translation": "1.7.128",
-    "@trackunit/iris-app-runtime-core-api": "1.7.117",
-    "@trackunit/react-graphql-hooks": "1.7.148"
+    "@trackunit/iris-app-build-utilities": "1.7.116",
+    "@trackunit/filters-filter-bar": "1.8.170",
+    "@trackunit/react-core-hooks": "1.7.124",
+    "@trackunit/react-filter-components": "1.7.164",
+    "@trackunit/react-form-components": "1.8.161",
+    "@trackunit/filters-graphql-hook": "1.11.113",
+    "@trackunit/utilization-indicator": "1.7.150",
+    "@trackunit/geo-json-utils": "1.7.110",
+    "@trackunit/react-components": "1.10.86",
+    "@trackunit/shared-utils": "1.9.110",
+    "@trackunit/translations-machine-type": "1.7.143",
+    "@trackunit/criticality-indicator": "1.7.150",
+    "@trackunit/iris-app-api": "1.10.3",
+    "@trackunit/react-core-contexts-test": "1.7.124",
+    "@trackunit/i18n-library-translation": "1.7.131",
+    "@trackunit/iris-app-runtime-core-api": "1.7.120",
+    "@trackunit/react-graphql-hooks": "1.7.151"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",

package/src/defaultFilters/defaults/area/AreaFilter.d.ts

@@ -1,22 +1,15 @@
 import { AreaFilterDefinition, AreaFilterGeoJsonGeometry, FilterViewProps } from "@trackunit/filters-filter-bar";
 import { ReactElement } from "react";
 /**
- * Renders the AreaView component, which manages the UI and logic for an area filter
- * with optional search functionality.
+ * Renders the AreaView component, which manages the UI and logic for an area filter.
  *
- * @param {FilterViewProps<AreaFilterGeoJsonGeometry> & { showWithSearch: boolean }} props - The props for the component.
+ * @param {FilterViewProps<AreaFilterGeoJsonGeometry>} props - The props for the component.
  * @returns {ReactElement} The rendered AreaView component.
  */
-export declare const AreaView: (props: FilterViewProps<AreaFilterGeoJsonGeometry> & {
-    showWithSearch: boolean;
-}) => ReactElement;
-interface AreaFilterProps {
-    showWithSearch: () => boolean;
-}
+export declare const AreaView: (props: FilterViewProps<AreaFilterGeoJsonGeometry>) => ReactElement;
 /**
  * Area filter definition
  *
  * @returns {AreaFilterDefinition}  Area filter definition
  */
-export declare const useAreaFilter: ({ showWithSearch }?: AreaFilterProps) => AreaFilterDefinition;
-export {};
+export declare const useAreaFilter: () => AreaFilterDefinition;

package/src/hooks/useDefaultAssetFilterBarDefinition.d.ts

@@ -13,10 +13,6 @@ interface DefaultAssetFilterBarDefinitionProps {
      * A flag indicating whether service management filters are enabled
      */
     serviceManagementEnabled: boolean | null;
-    /**
-     * A flag indicating whether area filter is enabled
-     */
-    areaShowWithSearch: boolean | null;
     /**
      * A flag indicating whether showing hidden assets is enabled
      */
@@ -31,7 +27,7 @@ interface DefaultAssetFilterBarDefinitionProps {
  *
  * @returns {FilterBarDefinition}  Default asset filter bar definition
  */
-export declare const useDefaultAssetFilterBarDefinition: ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, areaShowWithSearch, ownerFilterDefaultValue, showHiddenAssetsEnabled, }: DefaultAssetFilterBarDefinitionProps) => {
+export declare const useDefaultAssetFilterBarDefinition: ({ sitesEnabled, owningDepotEnabled, serviceManagementEnabled, ownerFilterDefaultValue, showHiddenAssetsEnabled, }: DefaultAssetFilterBarDefinitionProps) => {
     assetType: import("@trackunit/filters-filter-bar").StringArrayFilterDefinition;
     brands: import("@trackunit/filters-filter-bar").StringArrayFilterDefinition;
     models: import("@trackunit/filters-filter-bar").StringArrayFilterDefinition;

package/translation.cjs12.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Клиенты",
 	"fleetlist.column.externalReference": "Внешняя ссылка",
 	"fleetlist.column.groupIds": "Группы",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Последняя передача (GPS)",
 	"fleetlist.column.metadata": "Метаданные",
 	"fleetlist.column.metadataCompleteness": "Полнота метаданных",
 	"fleetlist.column.model": "Модель",

package/translation.cjs13.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clienți",
 	"fleetlist.column.externalReference": "Referință externă",
 	"fleetlist.column.groupIds": "Grupuri",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Văzut ultima dată (GPS)",
 	"fleetlist.column.metadata": "Metadate",
 	"fleetlist.column.metadataCompleteness": "Completitudinea metadatelor",
 	"fleetlist.column.model": "Model",

package/translation.cjs14.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clientes",
 	"fleetlist.column.externalReference": "Referencia externa",
 	"fleetlist.column.groupIds": "Grupos",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Visto por última vez (GPS)",
 	"fleetlist.column.metadata": "Metadatos",
 	"fleetlist.column.metadataCompleteness": "Exhaustividad de los metadatos",
 	"fleetlist.column.model": "Modelo",

package/translation.cjs15.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Kunder",
 	"fleetlist.column.externalReference": "Extern referens",
 	"fleetlist.column.groupIds": "Grupper",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Senast sedd (GPS)",
 	"fleetlist.column.metadata": "Metadata",
 	"fleetlist.column.metadataCompleteness": "Metadatans fullständighet",
 	"fleetlist.column.model": "Modell",

package/translation.cjs17.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "ลูกค้า",
 	"fleetlist.column.externalReference": "ข้อมูลอ้างอิงภายนอก",
 	"fleetlist.column.groupIds": "กลุ่ม",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "ดูล่าสุด (GPS)",
 	"fleetlist.column.metadata": "ข้อมูลอภิพันธุ์",
 	"fleetlist.column.metadataCompleteness": "ความสมบูรณ์ของข้อมูลจำเพาะ",
 	"fleetlist.column.model": "รุ่น",

package/translation.cjs3.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Zákazníci",
 	"fleetlist.column.externalReference": "Externí reference",
 	"fleetlist.column.groupIds": "Skupiny",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Naposledy spatřeno (GPS)",
 	"fleetlist.column.metadata": "Metadata",
 	"fleetlist.column.metadataCompleteness": "Úplnost metadat",
 	"fleetlist.column.model": "Model",

package/translation.cjs5.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clients",
 	"fleetlist.column.externalReference": "Référence externe",
 	"fleetlist.column.groupIds": "Groupes",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Dernière détection (GPS)",
 	"fleetlist.column.metadata": "Métadonnées",
 	"fleetlist.column.metadataCompleteness": "Niveau de collecte des métadonnées",
 	"fleetlist.column.model": "Modèle",

package/translation.cjs8.js

@@ -163,7 +163,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clienti",
 	"fleetlist.column.externalReference": "Riferimento esterno",
 	"fleetlist.column.groupIds": "Gruppi",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Ultimo rilevamento (GPS)",
 	"fleetlist.column.metadata": "Metadati",
 	"fleetlist.column.metadataCompleteness": "Completezza dei metadati",
 	"fleetlist.column.model": "Modello",

package/translation.esm12.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Клиенты",
 	"fleetlist.column.externalReference": "Внешняя ссылка",
 	"fleetlist.column.groupIds": "Группы",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Последняя передача (GPS)",
 	"fleetlist.column.metadata": "Метаданные",
 	"fleetlist.column.metadataCompleteness": "Полнота метаданных",
 	"fleetlist.column.model": "Модель",

package/translation.esm13.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clienți",
 	"fleetlist.column.externalReference": "Referință externă",
 	"fleetlist.column.groupIds": "Grupuri",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Văzut ultima dată (GPS)",
 	"fleetlist.column.metadata": "Metadate",
 	"fleetlist.column.metadataCompleteness": "Completitudinea metadatelor",
 	"fleetlist.column.model": "Model",

package/translation.esm14.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clientes",
 	"fleetlist.column.externalReference": "Referencia externa",
 	"fleetlist.column.groupIds": "Grupos",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Visto por última vez (GPS)",
 	"fleetlist.column.metadata": "Metadatos",
 	"fleetlist.column.metadataCompleteness": "Exhaustividad de los metadatos",
 	"fleetlist.column.model": "Modelo",

package/translation.esm15.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Kunder",
 	"fleetlist.column.externalReference": "Extern referens",
 	"fleetlist.column.groupIds": "Grupper",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Senast sedd (GPS)",
 	"fleetlist.column.metadata": "Metadata",
 	"fleetlist.column.metadataCompleteness": "Metadatans fullständighet",
 	"fleetlist.column.model": "Modell",

package/translation.esm17.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "ลูกค้า",
 	"fleetlist.column.externalReference": "ข้อมูลอ้างอิงภายนอก",
 	"fleetlist.column.groupIds": "กลุ่ม",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "ดูล่าสุด (GPS)",
 	"fleetlist.column.metadata": "ข้อมูลอภิพันธุ์",
 	"fleetlist.column.metadataCompleteness": "ความสมบูรณ์ของข้อมูลจำเพาะ",
 	"fleetlist.column.model": "รุ่น",

package/translation.esm3.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Zákazníci",
 	"fleetlist.column.externalReference": "Externí reference",
 	"fleetlist.column.groupIds": "Skupiny",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Naposledy spatřeno (GPS)",
 	"fleetlist.column.metadata": "Metadata",
 	"fleetlist.column.metadataCompleteness": "Úplnost metadat",
 	"fleetlist.column.model": "Model",

package/translation.esm5.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clients",
 	"fleetlist.column.externalReference": "Référence externe",
 	"fleetlist.column.groupIds": "Groupes",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Dernière détection (GPS)",
 	"fleetlist.column.metadata": "Métadonnées",
 	"fleetlist.column.metadataCompleteness": "Niveau de collecte des métadonnées",
 	"fleetlist.column.model": "Modèle",

package/translation.esm8.js

@@ -161,7 +161,7 @@ var translation = {
 	"fleetlist.column.customerIds": "Clienti",
 	"fleetlist.column.externalReference": "Riferimento esterno",
 	"fleetlist.column.groupIds": "Gruppi",
-	"fleetlist.column.lastSeen": "Last Seen (GPS)",
+	"fleetlist.column.lastSeen": "Ultimo rilevamento (GPS)",
 	"fleetlist.column.metadata": "Metadati",
 	"fleetlist.column.metadataCompleteness": "Completezza dei metadati",
 	"fleetlist.column.model": "Modello",