diff --git a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx index f5274a4bd..0b6fce772 100644 --- a/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx +++ b/frontend/app/components/shared/Filters/FilterModal/FilterModal.tsx @@ -134,7 +134,7 @@ export const getMatchingEntries = ( }; interface Props { - isLive: boolean; + isLive?: boolean; conditionalFilters: any; mobileConditionalFilters: any; onFilterClick?: (filter: any) => void; diff --git a/frontend/app/components/shared/Filters/FilterSelection/FilterSelection.tsx b/frontend/app/components/shared/Filters/FilterSelection/FilterSelection.tsx index 1fdfd970a..b6c8070b7 100644 --- a/frontend/app/components/shared/Filters/FilterSelection/FilterSelection.tsx +++ b/frontend/app/components/shared/Filters/FilterSelection/FilterSelection.tsx @@ -19,6 +19,7 @@ interface Props { isConditional?: boolean; isMobile?: boolean; mode: 'filters' | 'events'; + isLive?: boolean; } function FilterSelection(props: Props) { @@ -33,6 +34,7 @@ function FilterSelection(props: Props) { isConditional, isMobile, mode, + isLive, } = props; const [showModal, setShowModal] = useState(false); @@ -84,7 +86,7 @@ function FilterSelection(props: Props) { {showModal && (
); } diff --git a/frontend/app/types/filter/newFilter.js b/frontend/app/types/filter/newFilter.js index 77aa9649e..8ae2b0019 100644 --- a/frontend/app/types/filter/newFilter.js +++ b/frontend/app/types/filter/newFilter.js @@ -920,15 +920,28 @@ const mapFilters = (list) => { }; const liveFilterSupportedOperators = ['is', 'contains']; +const liveFilterKeys = [ + FilterKey.METADATA, + FilterKey.USERID, + FilterKey.USER_COUNTRY, + FilterKey.USER_CITY, + FilterKey.USER_STATE, + FilterKey.USERANONYMOUSID, + FilterKey.USER_BROWSER, + FilterKey.USER_OS, + FilterKey.USER_DEVICE, + FilterKey.PLATFORM, + FilterKey.UTM_MEDIUM, + FilterKey.UTM_SOURCE, + FilterKey.UTM_CAMPAIGN, +] const mapLiveFilters = (list) => { const obj = {}; list.forEach(filter => { if ( filter.category !== FilterCategory.EVENTS && filter.category !== FilterCategory.DEVTOOLS && - filter.key !== FilterKey.DURATION && - filter.key !== FilterKey.REFERRER && - filter.key !== FilterKey.TAGGED_ELEMENT + liveFilterKeys.includes(filter.key) ) { obj[filter.key] = { ...filter }; obj[filter.key].operatorOptions = filter.operatorOptions.filter(operator => liveFilterSupportedOperators.includes(operator.value));