Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Filter modal fixes (#4553)
RobertJoonase6993b1f8be7
diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.jsindex 95a814e779..2a194185a3 100644--- a/assets/js/dashboard/components/combobox.js+++ b/assets/js/dashboard/components/combobox.js@@ -1,14 +1,25 @@-import React, { Fragment, useState, useCallback, useEffect, useRef } from 'react'+/** @format */++import React, {+ Fragment,+ useState,+ useCallback,+ useEffect,+ useRef+} from 'react'import { Transition } from '@headlessui/react'import { ChevronDownIcon } from '@heroicons/react/20/solid'import classNames from 'classnames'import { useMountedEffect, useDebounce } from '../custom-hooks'-function Option({isHighlighted, onClick, onMouseEnter, text, id}) {- const className = classNames('relative cursor-pointer select-none py-2 px-3', {- 'text-gray-900 dark:text-gray-300': !isHighlighted,- 'bg-indigo-600 text-white': isHighlighted,- })+function Option({ isHighlighted, onClick, onMouseEnter, text, id }) {+ const className = classNames(+ 'relative cursor-pointer select-none py-2 px-3',+ {+ 'text-gray-900 dark:text-gray-300': !isHighlighted,+ 'bg-indigo-600 text-white': isHighlighted+ }+ )return (// eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions@@ -27,7 +38,7 @@ function scrollTo(wrapper, id) {const el = wrapper.querySelector('#' + id)if (el) {- el.scrollIntoView({block: 'center'})+ el.scrollIntoView({ block: 'center' })}}}@@ -48,7 +59,7 @@ export default function PlausibleCombobox({placeholder,forceLoading,className,- boxClass,+ boxClass}) {const isEmpty = values.length === 0const [options, setOptions] = useState([])@@ -63,8 +74,12 @@ export default function PlausibleCombobox({const loading = isLoading || !!forceLoadingconst visibleOptions = [...options]- if (freeChoice && search.length > 0 && options.every(option => option.value !== search)) {- visibleOptions.push({value: search, label: search, freeChoice: true})+ if (+ freeChoice &&+ search.length > 0 &&+ options.every((option) => option.value !== search)+ ) {+ visibleOptions.push({ value: search, label: search, freeChoice: true })}const afterFetchOptions = useCallback((loadedOptions) => {@@ -74,6 +89,7 @@ export default function PlausibleCombobox({}, [])const initialFetchOptions = useCallback(() => {+ setLoading(true)fetchOptions('').then(afterFetchOptions)}, [fetchOptions, afterFetchOptions])@@ -87,7 +103,9 @@ export default function PlausibleCombobox({const debouncedSearchOptions = useDebounce(searchOptions)useEffect(() => {- if (isOpen) { initialFetchOptions() }+ if (isOpen) {+ initialFetchOptions()+ }}, [isOpen, initialFetchOptions])useMountedEffect(() => {@@ -136,13 +154,19 @@ export default function PlausibleCombobox({}function isOptionDisabled(option) {- const optionAlreadySelected = values.some((val) => val.value === option.value)- const optionDisabled = (disabledOptions || []).some((val) => val?.value === option.value)+ const optionAlreadySelected = values.some(+ (val) => val.value === option.value+ )+ const optionDisabled = (disabledOptions || []).some(+ (val) => val?.value === option.value+ )return optionAlreadySelected || optionDisabled}function onInput(e) {- if (!isOpen) { setOpen(true) }+ if (!isOpen) {+ setOpen(true)+ }setSearch(e.target.value)}@@ -177,15 +201,19 @@ export default function PlausibleCombobox({}const handleClick = useCallback((e) => {- if (containerRef.current && containerRef.current.contains(e.target)) { return }+ if (containerRef.current && containerRef.current.contains(e.target)) {+ return+ }setSearch('')setOpen(false)}, [])useEffect(() => {- document.addEventListener("mousedown", handleClick, false)- return () => { document.removeEventListener("mousedown", handleClick, false) }+ document.addEventListener('mousedown', handleClick, false)+ return () => {+ document.removeEventListener('mousedown', handleClick, false)+ }}, [handleClick])useEffect(() => {@@ -194,7 +222,8 @@ export default function PlausibleCombobox({}}, [isEmpty, singleOption, autoFocus])- const searchBoxClass = 'border-none py-1 px-0 w-full inline-block rounded-md focus:outline-none focus:ring-0 text-sm'+ const searchBoxClass =+ 'border-none py-1 px-0 w-full inline-block rounded-md focus:outline-none focus:ring-0 text-sm'const containerClass = classNames('relative w-full', {[className]: !!className,@@ -205,17 +234,17 @@ export default function PlausibleCombobox({const itemSelected = values.length === 1return (- <div className='flex items-center truncate'>- { itemSelected && renderSingleSelectedItem() }+ <div className="flex items-center truncate">+ {itemSelected && renderSingleSelectedItem()}<inputclassName={searchBoxClass}ref={searchRef}value={search}- style={{backgroundColor: "inherit"}}+ style={{ backgroundColor: 'inherit' }}placeholder={itemSelected ? '' : placeholder}type="text"- onChange={onInput}>- </input>+ onChange={onInput}+ ></input></div>)}@@ -233,32 +262,55 @@ export default function PlausibleCombobox({function renderMultiOptionContent() {return (<>- { values.map((value) => {- return (- <div key={value.value} className="bg-indigo-100 dark:bg-indigo-600 flex justify-between w-full rounded-sm px-2 py-0.5 m-0.5 text-sm">- <span className='break-all'>{value.label}</span>- <span onClick={(e) => removeOption(value, e)} className="cursor-pointer font-bold ml-1">×</span>- </div>- )- })- }- <input className={searchBoxClass} ref={searchRef} value={search} style={{backgroundColor: "inherit"}} placeholder={placeholder} type="text" onChange={onInput}></input>+ {values.map((value) => {+ return (+ <div+ key={value.value}+ className="bg-indigo-100 dark:bg-indigo-600 flex justify-between w-full rounded-sm px-2 py-0.5 m-0.5 text-sm"+ >+ <span className="break-all">{value.label}</span>+ <span+ onClick={(e) => removeOption(value, e)}+ className="cursor-pointer font-bold ml-1"+ >+ ×+ </span>+ </div>+ )+ })}+ <input+ className={searchBoxClass}+ ref={searchRef}+ value={search}+ style={{ backgroundColor: 'inherit' }}+ placeholder={placeholder}+ type="text"+ onChange={onInput}+ ></input></>)}function renderDropDownContent() {- const matchesFound = visibleOptions.length > 0 && visibleOptions.some(option => !isOptionDisabled(option))+ const matchesFound =+ visibleOptions.length > 0 &&+ visibleOptions.some((option) => !isOptionDisabled(option))if (loading) {- return <div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">Loading options...</div>+ return (+ <div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">+ Loading options...+ </div>+ )}if (matchesFound) {return visibleOptions- .filter(option => !isOptionDisabled(option))+ .filter((option) => !isOptionDisabled(option)).map((option, i) => {- const text = option.freeChoice ? `Filter by '${option.label}'` : option.label+ const text = option.freeChoice+ ? `Filter by '${option.label}'`+ : option.labelreturn (<Option@@ -274,24 +326,30 @@ export default function PlausibleCombobox({}if (freeChoice) {- return <div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">Start typing to apply filter</div>+ return (+ <div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">+ Start typing to apply filter+ </div>+ )}return (<div className="relative cursor-default select-none py-2 px-4 text-gray-700 dark:text-gray-300">- No matches found in the current dashboard. Try selecting a different time range or searching for something different+ No matches found in the current dashboard. Try selecting a different+ time range or searching for something different</div>)}- const defaultBoxClass = 'pl-2 pr-8 py-1 w-full dark:bg-gray-900 dark:text-gray-300 rounded-md shadow-sm border border-gray-300 dark:border-gray-700 focus-within:border-indigo-500 focus-within:ring-1 focus-within:ring-indigo-500'+ const defaultBoxClass =+ 'pl-2 pr-8 py-1 w-full dark:bg-gray-900 dark:text-gray-300 rounded-md shadow-sm border border-gray-300 dark:border-gray-700 focus-within:border-indigo-500 focus-within:ring-1 focus-within:ring-indigo-500'const finalBoxClass = classNames(boxClass || defaultBoxClass, {- 'border-indigo-500 ring-1 ring-indigo-500': isOpen,+ 'border-indigo-500 ring-1 ring-indigo-500': isOpen})return (<div onKeyDown={onKeyDown} ref={containerRef} className={containerClass}>- <div onClick={toggleOpen} className={finalBoxClass }>+ <div onClick={toggleOpen} className={finalBoxClass}>{singleOption && renderSingleOptionContent()}{!singleOption && renderMultiOptionContent()}<div className="cursor-pointer absolute inset-y-0 right-0 flex items-center pr-2">@@ -299,26 +357,47 @@ export default function PlausibleCombobox({{loading && <Spinner />}</div></div>- {isOpen && <Transition- as={Fragment}- leave="transition ease-in duration-100"- leaveFrom="opacity-100"- leaveTo="opacity-0"- show={isOpen}- >- <ul ref={listRef} className="z-50 absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm dark:bg-gray-900">- { renderDropDownContent() }- </ul>- </Transition>}+ {isOpen && (+ <Transition+ as={Fragment}+ leave="transition ease-in duration-100"+ leaveFrom="opacity-100"+ leaveTo="opacity-0"+ show={isOpen}+ >+ <ul+ ref={listRef}+ className="z-50 absolute mt-1 max-h-60 w-full overflow-auto rounded-md bg-white py-1 text-base shadow-lg ring-1 ring-black ring-opacity-5 focus:outline-none sm:text-sm dark:bg-gray-900"+ >+ {renderDropDownContent()}+ </ul>+ </Transition>+ )}</div>)}function Spinner() {return (- <svg className="animate-spin h-4 w-4 text-indigo-500" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24">- <circle className="opacity-25" cx="12" cy="12" r="10" stroke="currentColor" strokeWidth="4"></circle>- <path className="opacity-75" fill="currentColor" d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"></path>+ <svg+ className="animate-spin h-4 w-4 text-indigo-500"+ xmlns="http://www.w3.org/2000/svg"+ fill="none"+ viewBox="0 0 24 24"+ >+ <circle+ className="opacity-25"+ cx="12"+ cy="12"+ r="10"+ stroke="currentColor"+ strokeWidth="4"+ ></circle>+ <path+ className="opacity-75"+ fill="currentColor"+ d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"+ ></path></svg>)}diff --git a/assets/js/dashboard/components/filter-operator-selector.js b/assets/js/dashboard/components/filter-operator-selector.jsindex 155e0164bc..32a1852147 100644--- a/assets/js/dashboard/components/filter-operator-selector.js+++ b/assets/js/dashboard/components/filter-operator-selector.js@@ -1,9 +1,16 @@-import React, { Fragment } from "react";+/** @format */-import { FILTER_OPERATIONS, FILTER_OPERATIONS_DISPLAY_NAMES, isFreeChoiceFilter, supportsIsNot } from "../util/filters";-import { Menu, Transition } from "@headlessui/react";+import React, { Fragment } from 'react'++import {+ FILTER_OPERATIONS,+ FILTER_OPERATIONS_DISPLAY_NAMES,+ supportsContains,+ supportsIsNot+} from '../util/filters'+import { Menu, Transition } from '@headlessui/react'import { ChevronDownIcon } from '@heroicons/react/20/solid'-import classNames from "classnames";+import classNames from 'classnames'export default function FilterOperatorSelector(props) {const filterName = props.forFilter@@ -15,11 +22,11 @@ export default function FilterOperatorSelector(props) {{({ active }) => (<spanonClick={() => props.onSelect(operation)}- className={classNames("cursor-pointer block px-4 py-2 text-sm", {- "bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100": active,- "text-gray-700 dark:text-gray-200": !active- }- )}+ className={classNames('cursor-pointer block px-4 py-2 text-sm', {+ 'bg-gray-100 dark:bg-gray-900 text-gray-900 dark:text-gray-100':+ active,+ 'text-gray-700 dark:text-gray-200': !active+ })}>{FILTER_OPERATIONS_DISPLAY_NAMES[operation]}</span>@@ -29,7 +36,7 @@ export default function FilterOperatorSelector(props) {)}- const containerClass = classNames("w-full", {+ const containerClass = classNames('w-full', {'opacity-20 cursor-default pointer-events-none': props.isDisabled})@@ -41,7 +48,10 @@ export default function FilterOperatorSelector(props) {<div className="w-full"><Menu.Button className="inline-flex justify-between items-center w-full rounded-md border border-gray-300 dark:border-gray-500 shadow-sm px-4 py-2 bg-white dark:bg-gray-800 text-sm text-gray-700 dark:text-gray-200 hover:bg-gray-50 dark:hover:bg-gray-850 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-offset-gray-100 dark:focus:ring-offset-gray-900 focus:ring-indigo-500 text-left">{FILTER_OPERATIONS_DISPLAY_NAMES[props.selectedType]}- <ChevronDownIcon className="-mr-2 ml-2 h-4 w-4 text-gray-500 dark:text-gray-400" aria-hidden="true" />+ <ChevronDownIcon+ className="-mr-2 ml-2 h-4 w-4 text-gray-500 dark:text-gray-400"+ aria-hidden="true"+ /></Menu.Button></div>@@ -61,9 +71,18 @@ export default function FilterOperatorSelector(props) {><div className="py-1">{renderTypeItem(FILTER_OPERATIONS.is, true)}- {renderTypeItem(FILTER_OPERATIONS.isNot, supportsIsNot(filterName))}- {renderTypeItem(FILTER_OPERATIONS.contains, isFreeChoiceFilter(filterName))}- {renderTypeItem(FILTER_OPERATIONS.contains_not, isFreeChoiceFilter(filterName) && supportsIsNot(filterName))}+ {renderTypeItem(+ FILTER_OPERATIONS.isNot,+ supportsIsNot(filterName)+ )}+ {renderTypeItem(+ FILTER_OPERATIONS.contains,+ supportsContains(filterName)+ )}+ {renderTypeItem(+ FILTER_OPERATIONS.contains_not,+ supportsContains(filterName) && supportsIsNot(filterName)+ )}</div></Menu.Items></Transition>diff --git a/assets/js/dashboard/last-load-context.tsx b/assets/js/dashboard/last-load-context.tsxnew file mode 100644index 0000000000..65bf9595a3--- /dev/null+++ b/assets/js/dashboard/last-load-context.tsx@@ -0,0 +1,46 @@+/* @format */+import React, {+ createContext,+ useEffect,+ useContext,+ useState,+ useCallback,+ ReactNode+} from 'react'+import { useMountedEffect } from './custom-hooks'++const LastLoadContext = createContext(new Date())++export const useLastLoadContext = () => {+ return useContext(LastLoadContext)+}++export default function LastLoadContextProvider({+ children+}: {+ children: ReactNode+}) {+ const [timestamp, setTimestamp] = useState(new Date())++ const updateTimestamp = useCallback(() => {+ setTimestamp(new Date())+ }, [setTimestamp])++ useEffect(() => {+ document.addEventListener('tick', updateTimestamp)++ return () => {+ document.removeEventListener('tick', updateTimestamp)+ }+ }, [updateTimestamp])++ useMountedEffect(() => {+ updateTimestamp()+ }, [])++ return (+ <LastLoadContext.Provider value={timestamp}>+ {children}+ </LastLoadContext.Provider>+ )+}diff --git a/assets/js/dashboard/query-context.tsx b/assets/js/dashboard/query-context.tsxindex 498f8b9d2b..a523125a42 100644--- a/assets/js/dashboard/query-context.tsx+++ b/assets/js/dashboard/query-context.tsx@@ -1,13 +1,5 @@/* @format */-import React, {- createContext,- useMemo,- useEffect,- useContext,- useState,- useCallback,- ReactNode-} from 'react'+import React, { createContext, useMemo, useContext, ReactNode } from 'react'import { useLocation } from 'react-router'import { useMountedEffect } from './custom-hooks'import * as api from './api'@@ -30,8 +22,7 @@ import {const queryContextDefaultValue = {query: queryDefaultValue,- otherSearch: {} as Record<string, unknown>,- lastLoadTimestamp: new Date()+ otherSearch: {} as Record<string, unknown>}export type QueryContextValue = typeof queryContextDefaultValue@@ -130,26 +121,12 @@ export default function QueryContextProvider({match_day_of_week})- const [lastLoadTimestamp, setLastLoadTimestamp] = useState(new Date())- const updateLastLoadTimestamp = useCallback(() => {- setLastLoadTimestamp(new Date())- }, [setLastLoadTimestamp])-- useEffect(() => {- document.addEventListener('tick', updateLastLoadTimestamp)-- return () => {- document.removeEventListener('tick', updateLastLoadTimestamp)- }- }, [updateLastLoadTimestamp])-useMountedEffect(() => {api.cancelAll()- updateLastLoadTimestamp()}, [])return (- <QueryContext.Provider value={{ query, otherSearch, lastLoadTimestamp }}>+ <QueryContext.Provider value={{ query, otherSearch }}>{children}</QueryContext.Provider>)diff --git a/assets/js/dashboard/router.tsx b/assets/js/dashboard/router.tsxindex c3cfdb5de7..a58028b27e 100644--- a/assets/js/dashboard/router.tsx+++ b/assets/js/dashboard/router.tsx@@ -26,6 +26,7 @@ import ConversionsModal from './stats/modals/conversions'import FilterModal from './stats/modals/filter-modal'import QueryContextProvider from './query-context'import { DashboardKeybinds } from './dashboard-keybinds'+import LastLoadContextProvider from './last-load-context'const queryClient = new QueryClient({defaultOptions: {@@ -39,8 +40,10 @@ function DashboardElement() {return (<QueryClientProvider client={queryClient}><QueryContextProvider>- <Dashboard />- {/** render any children of the root route below */}+ <LastLoadContextProvider>+ <Dashboard />+ {/** render any children of the root route below */}+ </LastLoadContextProvider><Outlet /></QueryContextProvider></QueryClientProvider>diff --git a/assets/js/dashboard/stats/current-visitors.js b/assets/js/dashboard/stats/current-visitors.jsindex c86daebb94..5be2652fa7 100644--- a/assets/js/dashboard/stats/current-visitors.js+++ b/assets/js/dashboard/stats/current-visitors.js@@ -1,18 +1,23 @@-import React, { useCallback, useEffect, useState } from 'react';-import { AppNavigationLink } from '../navigation/use-app-navigate';+/** @format */++import React, { useCallback, useEffect, useState } from 'react'+import { AppNavigationLink } from '../navigation/use-app-navigate'import * as api from '../api'-import { Tooltip } from '../util/tooltip';-import { SecondsSinceLastLoad } from '../util/seconds-since-last-load';-import { useQueryContext } from '../query-context';-import { useSiteContext } from '../site-context';+import { Tooltip } from '../util/tooltip'+import { SecondsSinceLastLoad } from '../util/seconds-since-last-load'+import { useQueryContext } from '../query-context'+import { useSiteContext } from '../site-context'+import { useLastLoadContext } from '../last-load-context'export default function CurrentVisitors({ tooltipBoundary }) {- const { query, lastLoadTimestamp } = useQueryContext();- const site = useSiteContext();+ const { query } = useQueryContext()+ const lastLoadTimestamp = useLastLoadContext()+ const site = useSiteContext()const [currentVisitors, setCurrentVisitors] = useState(null)const updateCount = useCallback(() => {- api.get(`/api/stats/${encodeURIComponent(site.domain)}/current-visitors`)+ api+ .get(`/api/stats/${encodeURIComponent(site.domain)}/current-visitors`).then((res) => setCurrentVisitors(res))}, [site.domain])@@ -31,8 +36,13 @@ export default function CurrentVisitors({ tooltipBoundary }) {function tooltipInfo() {return (<div>- <p className="whitespace-nowrap text-small">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp} />s ago</p>- <p className="whitespace-nowrap font-normal text-xs">Click to view realtime dashboard</p>+ <p className="whitespace-nowrap text-small">+ Last updated{' '}+ <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp} />s ago+ </p>+ <p className="whitespace-nowrap font-normal text-xs">+ Click to view realtime dashboard+ </p></div>)}@@ -40,11 +50,21 @@ export default function CurrentVisitors({ tooltipBoundary }) {if (currentVisitors !== null && query.filters.length === 0) {return (<Tooltip info={tooltipInfo()} boundary={tooltipBoundary}>- <AppNavigationLink search={(prev) => ({ ...prev, period: 'realtime' })} className="block ml-1 md:ml-2 mr-auto text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300">- <svg className="inline w-2 mr-1 md:mr-2 text-green-500 fill-current" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">+ <AppNavigationLink+ search={(prev) => ({ ...prev, period: 'realtime' })}+ className="block ml-1 md:ml-2 mr-auto text-xs md:text-sm font-bold text-gray-500 dark:text-gray-300"+ >+ <svg+ className="inline w-2 mr-1 md:mr-2 text-green-500 fill-current"+ viewBox="0 0 16 16"+ xmlns="http://www.w3.org/2000/svg"+ ><circle cx="8" cy="8" r="8" /></svg>- {currentVisitors} <span className="hidden sm:inline-block">current visitor{currentVisitors === 1 ? '' : 's'}</span>+ {currentVisitors}{' '}+ <span className="hidden sm:inline-block">+ current visitor{currentVisitors === 1 ? '' : 's'}+ </span></AppNavigationLink></Tooltip>)diff --git a/assets/js/dashboard/stats/graph/top-stats.js b/assets/js/dashboard/stats/graph/top-stats.jsindex 53faaa8c72..24d544b374 100644--- a/assets/js/dashboard/stats/graph/top-stats.js+++ b/assets/js/dashboard/stats/graph/top-stats.js@@ -1,13 +1,16 @@-import React from "react";-import { Tooltip } from '../../util/tooltip';-import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load';-import classNames from "classnames";-import numberFormatter, { durationFormatter } from '../../util/number-formatter';-import * as storage from '../../util/storage';-import { formatDateRange } from '../../util/date';-import { getGraphableMetrics } from "./graph-util";-import { useQueryContext } from "../../query-context";-import { useSiteContext } from "../../site-context";+/** @format */++import React from 'react'+import { Tooltip } from '../../util/tooltip'+import { SecondsSinceLastLoad } from '../../util/seconds-since-last-load'+import classNames from 'classnames'+import numberFormatter, { durationFormatter } from '../../util/number-formatter'+import * as storage from '../../util/storage'+import { formatDateRange } from '../../util/date'+import { getGraphableMetrics } from './graph-util'+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'+import { useLastLoadContext } from '../../last-load-context'function Maybe({ condition, children }) {if (condition) {@@ -21,21 +24,31 @@ function renderPercentageComparison(name, comparison, forceDarkBg = false) {const formattedComparison = numberFormatter(Math.abs(comparison))const defaultClassName = classNames({- "pl-2 text-xs dark:text-gray-100": !forceDarkBg,- "pl-2 text-xs text-gray-100": forceDarkBg+ 'pl-2 text-xs dark:text-gray-100': !forceDarkBg,+ 'pl-2 text-xs text-gray-100': forceDarkBg})const noChangeClassName = classNames({- "pl-2 text-xs text-gray-700 dark:text-gray-300": !forceDarkBg,- "pl-2 text-xs text-gray-300": forceDarkBg+ 'pl-2 text-xs text-gray-700 dark:text-gray-300': !forceDarkBg,+ 'pl-2 text-xs text-gray-300': forceDarkBg})if (comparison > 0) {const color = name === 'Bounce rate' ? 'text-red-400' : 'text-green-500'- return <span className={defaultClassName}><span className={color + ' font-bold'}>↑</span> {formattedComparison}%</span>+ return (+ <span className={defaultClassName}>+ <span className={color + ' font-bold'}>↑</span>{' '}+ {formattedComparison}%+ </span>+ )} else if (comparison < 0) {const color = name === 'Bounce rate' ? 'text-green-500' : 'text-red-400'- return <span className={defaultClassName}><span className={color + ' font-bold'}>↓</span> {formattedComparison}%</span>+ return (+ <span className={defaultClassName}>+ <span className={color + ' font-bold'}>↓</span>{' '}+ {formattedComparison}%+ </span>+ )} else if (comparison === 0) {return <span className={noChangeClassName}>〰 0%</span>} else {@@ -48,7 +61,9 @@ function topStatNumberShort(name, value) {return durationFormatter(value)} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {return value + '%'- } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) {+ } else if (+ ['average revenue', 'total revenue'].includes(name.toLowerCase())+ ) {return value?.short} else {return numberFormatter(value)@@ -60,7 +75,9 @@ function topStatNumberLong(name, value) {return durationFormatter(value)} else if (['bounce rate', 'conversion rate'].includes(name.toLowerCase())) {return value + '%'- } else if (['average revenue', 'total revenue'].includes(name.toLowerCase())) {+ } else if (+ ['average revenue', 'total revenue'].includes(name.toLowerCase())+ ) {return value?.long} else {return (value || 0).toLocaleString()@@ -68,8 +85,9 @@ function topStatNumberLong(name, value) {}export default function TopStats({ data, onMetricUpdate, tooltipBoundary }) {- const { query, lastLoadTimestamp } = useQueryContext();- const site = useSiteContext();+ const { query } = useQueryContext()+ const lastLoadTimestamp = useLastLoadContext()+ const site = useSiteContext()function tooltip(stat) {let statName = stat.name.toLowerCase()@@ -77,16 +95,28 @@ export default function TopStats({ data, onMetricUpdate, tooltipBoundary }) {return (<div>- {query.comparison && <div className="whitespace-nowrap">- {topStatNumberLong(stat.name, stat.value)} vs. {topStatNumberLong(stat.name, stat.comparison_value)} {statName}- <span className="ml-2">{renderPercentageComparison(stat.name, stat.change, true)}</span>- </div>}-- {!query.comparison && <div className="whitespace-nowrap">- {topStatNumberLong(stat.name, stat.value)} {statName}- </div>}+ {query.comparison && (+ <div className="whitespace-nowrap">+ {topStatNumberLong(stat.name, stat.value)} vs.{' '}+ {topStatNumberLong(stat.name, stat.comparison_value)} {statName}+ <span className="ml-2">+ {renderPercentageComparison(stat.name, stat.change, true)}+ </span>+ </div>+ )}- {stat.name === 'Current visitors' && <p className="font-normal text-xs">Last updated <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp} />s ago</p>}+ {!query.comparison && (+ <div className="whitespace-nowrap">+ {topStatNumberLong(stat.name, stat.value)} {statName}+ </div>+ )}++ {stat.name === 'Current visitors' && (+ <p className="font-normal text-xs">+ Last updated{' '}+ <SecondsSinceLastLoad lastLoadTimestamp={lastLoadTimestamp} />s ago+ </p>+ )}</div>)}@@ -105,7 +135,11 @@ export default function TopStats({ data, onMetricUpdate, tooltipBoundary }) {function blinkingDot() {return (- <div key="dot" className="block pulsating-circle" style={{ left: '125px', top: '52px' }}></div>+ <div+ key="dot"+ className="block pulsating-circle"+ style={{ left: '125px', top: '52px' }}+ ></div>)}@@ -118,46 +152,75 @@ export default function TopStats({ data, onMetricUpdate, tooltipBoundary }) {const [statDisplayName, statExtraName] = stat.name.split(/(\(.+\))/g)- const statDisplayNameClass = classNames('text-xs font-bold tracking-wide text-gray-500 uppercase dark:text-gray-400 whitespace-nowrap flex w-content border-b', {- 'text-indigo-700 dark:text-indigo-500 border-indigo-700 dark:border-indigo-500': isSelected,- 'group-hover:text-indigo-700 dark:group-hover:text-indigo-500 border-transparent': !isSelected- })+ const statDisplayNameClass = classNames(+ 'text-xs font-bold tracking-wide text-gray-500 uppercase dark:text-gray-400 whitespace-nowrap flex w-content border-b',+ {+ 'text-indigo-700 dark:text-indigo-500 border-indigo-700 dark:border-indigo-500':+ isSelected,+ 'group-hover:text-indigo-700 dark:group-hover:text-indigo-500 border-transparent':+ !isSelected+ }+ )return (<div className={statDisplayNameClass}>{statDisplayName}- {statExtraName && <span className="hidden sm:inline-block ml-1">{statExtraName}</span>}+ {statExtraName && (+ <span className="hidden sm:inline-block ml-1">{statExtraName}</span>+ )}</div>)}function renderStat(stat, index) {- const className = classNames('px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none', {- 'cursor-pointer': canMetricBeGraphed(stat),- 'lg:border-l border-gray-300': index > 0,- 'border-r lg:border-r-0': index % 2 === 0- })+ const className = classNames(+ 'px-4 md:px-6 w-1/2 my-4 lg:w-auto group select-none',+ {+ 'cursor-pointer': canMetricBeGraphed(stat),+ 'lg:border-l border-gray-300': index > 0,+ 'border-r lg:border-r-0': index % 2 === 0+ }+ )return (- <Tooltip key={stat.name} info={tooltip(stat, query)} className={className} onClick={() => { maybeUpdateMetric(stat) }} boundary={tooltipBoundary}>+ <Tooltip+ key={stat.name}+ info={tooltip(stat, query)}+ className={className}+ onClick={() => {+ maybeUpdateMetric(stat)+ }}+ boundary={tooltipBoundary}+ >{renderStatName(stat)}<div className="my-1 space-y-2"><div><span className="flex items-center justify-between whitespace-nowrap">- <p className="font-bold text-xl dark:text-gray-100" id={stat.graph_metric}>{topStatNumberShort(stat.name, stat.value)}</p>+ <p+ className="font-bold text-xl dark:text-gray-100"+ id={stat.graph_metric}+ >+ {topStatNumberShort(stat.name, stat.value)}+ </p><Maybe condition={!query.comparison}>{renderPercentageComparison(stat.name, stat.change)}</Maybe></span><Maybe condition={query.comparison}>- <p className="text-xs dark:text-gray-100">{formatDateRange(site, data.from, data.to)}</p>+ <p className="text-xs dark:text-gray-100">+ {formatDateRange(site, data.from, data.to)}+ </p></Maybe></div><Maybe condition={query.comparison}><div>- <p className="font-bold text-xl text-gray-500 dark:text-gray-400">{topStatNumberShort(stat.name, stat.comparison_value)}</p>- <p className="text-xs text-gray-500 dark:text-gray-400">{formatDateRange(site, data.comparing_from, data.comparing_to)}</p>+ <p className="font-bold text-xl text-gray-500 dark:text-gray-400">+ {topStatNumberShort(stat.name, stat.comparison_value)}+ </p>+ <p className="text-xs text-gray-500 dark:text-gray-400">+ {formatDateRange(site, data.comparing_from, data.comparing_to)}+ </p></div></Maybe></div>@@ -171,5 +234,5 @@ export default function TopStats({ data, onMetricUpdate, tooltipBoundary }) {stats.push(blinkingDot())}- return stats || null;+ return stats || null}diff --git a/assets/js/dashboard/stats/modals/filter-modal-props-row.js b/assets/js/dashboard/stats/modals/filter-modal-props-row.jsindex d8fd123ba8..7de1553646 100644--- a/assets/js/dashboard/stats/modals/filter-modal-props-row.js+++ b/assets/js/dashboard/stats/modals/filter-modal-props-row.js@@ -1,20 +1,28 @@-import React, { useMemo } from "react"+/** @format */++import React, { useMemo } from 'react'import { TrashIcon } from '@heroicons/react/20/solid'-import FilterOperatorSelector from "../../components/filter-operator-selector"+import FilterOperatorSelector from '../../components/filter-operator-selector'import Combobox from '../../components/combobox'import { apiPath } from '../../util/url'-import { EVENT_PROPS_PREFIX, FILTER_OPERATIONS, fetchSuggestions, getPropertyKeyFromFilterKey } from '../../util/filters'-import { useQueryContext } from "../../query-context"-import { useSiteContext } from "../../site-context"+import {+ EVENT_PROPS_PREFIX,+ FILTER_OPERATIONS,+ fetchSuggestions,+ getPropertyKeyFromFilterKey,+ isFreeChoiceFilterOperation+} from '../../util/filters'+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'export default function FilterModalPropsRow({filter,showDelete,disabledOptions,onUpdate,- onDelete,+ onDelete}) {const { query } = useQueryContext()const site = useSiteContext()@@ -31,16 +39,28 @@ export default function FilterModalPropsRow({)function fetchPropKeyOptions(input) {- return fetchSuggestions(apiPath(site, `/suggestions/prop_key`), query, input)+ return fetchSuggestions(+ apiPath(site, `/suggestions/prop_key`),+ query,+ input+ )}function fetchPropValueOptions(input) {- if ([FILTER_OPERATIONS.contains, FILTER_OPERATIONS.contains_not].includes(operation) || propKey == "") {+ if (+ [FILTER_OPERATIONS.contains, FILTER_OPERATIONS.contains_not].includes(+ operation+ ) ||+ propKey == ''+ ) {return Promise.resolve([])}- return fetchSuggestions(apiPath(site, `/suggestions/prop_value`), query, input, [- FILTER_OPERATIONS.isNot, filterKey, ['(none)']- ])+ return fetchSuggestions(+ apiPath(site, `/suggestions/prop_value`),+ query,+ input,+ [FILTER_OPERATIONS.isNot, filterKey, ['(none)']]+ )}function onPropKeySelect(selection) {@@ -72,7 +92,9 @@ export default function FilterModalPropsRow({<FilterOperatorSelectorisDisabled={!filterKey}forFilter={'prop_value'}- onSelect={(newOperation) => onUpdate([newOperation, filterKey, clauses])}+ onSelect={(newOperation) =>+ onUpdate([newOperation, filterKey, clauses])+ }selectedType={operation}/></div>@@ -83,13 +105,16 @@ export default function FilterModalPropsRow({values={selectedClauses}onSelect={onPropValueSelect}placeholder={'Value'}- freeChoice={operation == FILTER_OPERATIONS.contains}+ freeChoice={isFreeChoiceFilterOperation(operation)}/></div>{showDelete && (<div className="col-span-1 flex flex-col justify-center">{/* eslint-disable-next-line jsx-a11y/anchor-is-valid */}- <a className="ml-2 text-red-600 h-5 w-5 cursor-pointer" onClick={onDelete}>+ <a+ className="ml-2 text-red-600 h-5 w-5 cursor-pointer"+ onClick={onDelete}+ ><TrashIcon /></a></div>diff --git a/assets/js/dashboard/stats/modals/filter-modal-row.js b/assets/js/dashboard/stats/modals/filter-modal-row.jsindex adcc2ad50d..03b171022a 100644--- a/assets/js/dashboard/stats/modals/filter-modal-row.js+++ b/assets/js/dashboard/stats/modals/filter-modal-row.js@@ -1,48 +1,66 @@-import React, { useMemo } from "react"+/** @format */-import FilterOperatorSelector from "../../components/filter-operator-selector"+import React, { useMemo } from 'react'++import FilterOperatorSelector from '../../components/filter-operator-selector'import Combobox from '../../components/combobox'-import { FILTER_OPERATIONS, fetchSuggestions, isFreeChoiceFilter, getLabel, formattedFilters } from "../../util/filters"+import {+ FILTER_OPERATIONS,+ fetchSuggestions,+ isFreeChoiceFilterOperation,+ getLabel,+ formattedFilters+} from '../../util/filters'import { apiPath } from '../../util/url'-import { useQueryContext } from "../../query-context"-import { useSiteContext } from "../../site-context"+import { useQueryContext } from '../../query-context'+import { useSiteContext } from '../../site-context'-export default function FilterModalRow({- filter,- labels,- onUpdate-}) {- const { query } = useQueryContext();- const site = useSiteContext();+export default function FilterModalRow({ filter, labels, onUpdate }) {+ const { query } = useQueryContext()+ const site = useSiteContext()const [operation, filterKey, clauses] = filterconst selectedClauses = useMemo(- () => clauses.map((value) => ({ value, label: getLabel(labels, filterKey, value) })),+ () =>+ clauses.map((value) => ({+ value,+ label: getLabel(labels, filterKey, value)+ })),// eslint-disable-next-line react-hooks/exhaustive-deps[filter, labels])function onComboboxSelect(selection) {const newClauses = selection.map(({ value }) => value)- const newLabels = Object.fromEntries(selection.map(({ label, value }) => [value, label]))-- onUpdate(- [operation, filterKey, newClauses],- newLabels+ const newLabels = Object.fromEntries(+ selection.map(({ label, value }) => [value, label]))++ onUpdate([operation, filterKey, newClauses], newLabels)}function fetchOptions(input) {- if ([FILTER_OPERATIONS.contains, FILTER_OPERATIONS.contains_not].includes(operation)) {+ if (+ [FILTER_OPERATIONS.contains, FILTER_OPERATIONS.contains_not].includes(+ operation+ )+ ) {return Promise.resolve([])}let additionalFilter = null- if (filterKey !== 'goal') { additionalFilter = [FILTER_OPERATIONS.isNot, filterKey, clauses] }+ if (filterKey !== 'goal') {+ additionalFilter = [FILTER_OPERATIONS.isNot, filterKey, clauses]+ }- return fetchSuggestions(apiPath(site, `/suggestions/${filterKey}`), query, input, additionalFilter)+ return fetchSuggestions(+ apiPath(site, `/suggestions/${filterKey}`),+ query,+ input,+ additionalFilter+ )}return (@@ -50,14 +68,16 @@ export default function FilterModalRow({<div className="col-span-3"><FilterOperatorSelectorforFilter={filterKey}- onSelect={(newOperation) => onUpdate([newOperation, filterKey, clauses], labels)}+ onSelect={(newOperation) =>+ onUpdate([newOperation, filterKey, clauses], labels)+ }selectedType={operation}/></div><div className="col-span-8 ml-2"><ComboboxfetchOptions={fetchOptions}- freeChoice={isFreeChoiceFilter(filterKey)}+ freeChoice={isFreeChoiceFilterOperation(operation)}values={selectedClauses}onSelect={onComboboxSelect}placeholder={`Select ${withIndefiniteArticle(formattedFilters[filterKey])}`}@@ -70,7 +90,12 @@ export default function FilterModalRow({function withIndefiniteArticle(word) {if (word.startsWith('UTM')) {return `a ${word}`- } if (['a', 'e', 'i', 'o', 'u'].some((vowel) => word.toLowerCase().startsWith(vowel))) {+ }+ if (+ ['a', 'e', 'i', 'o', 'u'].some((vowel) =>+ word.toLowerCase().startsWith(vowel)+ )+ ) {return `an ${word}`}return `a ${word}`diff --git a/assets/js/dashboard/util/filters.js b/assets/js/dashboard/util/filters.jsindex 31f96a0b19..f1ad74f5e0 100644--- a/assets/js/dashboard/util/filters.js+++ b/assets/js/dashboard/util/filters.js@@ -1,35 +1,37 @@-import React, { useMemo } from "react"+/** @format */++import React, { useMemo } from 'react'import * as api from '../api'import { useQueryContext } from '../query-context'export const FILTER_MODAL_TO_FILTER_GROUP = {- 'page': ['page', 'entry_page', 'exit_page'],- 'source': ['source', 'referrer'],- 'location': ['country', 'region', 'city'],- 'screen': ['screen'],- 'browser': ['browser', 'browser_version'],- 'os': ['os', 'os_version'],- 'utm': ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'],- 'goal': ['goal'],- 'props': ['props'],- 'hostname': ['hostname']+ page: ['page', 'entry_page', 'exit_page'],+ source: ['source', 'referrer'],+ location: ['country', 'region', 'city'],+ screen: ['screen'],+ browser: ['browser', 'browser_version'],+ os: ['os', 'os_version'],+ utm: ['utm_medium', 'utm_source', 'utm_campaign', 'utm_term', 'utm_content'],+ goal: ['goal'],+ props: ['props'],+ hostname: ['hostname']}export const FILTER_GROUP_TO_MODAL_TYPE = Object.fromEntries(- Object.entries(FILTER_MODAL_TO_FILTER_GROUP)- .flatMap(([modalName, filterGroups]) => filterGroups.map((filterGroup) => [filterGroup, modalName]))+ Object.entries(FILTER_MODAL_TO_FILTER_GROUP).flatMap(+ ([modalName, filterGroups]) =>+ filterGroups.map((filterGroup) => [filterGroup, modalName])+ ))-export const NO_CONTAINS_OPERATOR = new Set(['screen'].concat(FILTER_MODAL_TO_FILTER_GROUP['location']))--export const EVENT_PROPS_PREFIX = "props:"+export const EVENT_PROPS_PREFIX = 'props:'export const FILTER_OPERATIONS = {is: 'is',isNot: 'is_not',contains: 'contains',contains_not: 'contains_not'-};+}export const FILTER_OPERATIONS_DISPLAY_NAMES = {[FILTER_OPERATIONS.is]: 'is',@@ -42,22 +44,29 @@ const OPERATION_PREFIX = {[FILTER_OPERATIONS.isNot]: '!',[FILTER_OPERATIONS.contains]: '~',[FILTER_OPERATIONS.is]: ''-};-+}export function supportsIsNot(filterName) {return !['goal', 'prop_key'].includes(filterName)}-export function isFreeChoiceFilter(filterName) {- return !NO_CONTAINS_OPERATOR.has(filterName)+export function supportsContains(filterName) {+ return !['screen']+ .concat(FILTER_MODAL_TO_FILTER_GROUP['location'])+ .includes(filterName)+}++export function isFreeChoiceFilterOperation(operation) {+ return [FILTER_OPERATIONS.contains, FILTER_OPERATIONS.contains_not].includes(+ operation+ )}// As of March 2023, Safari does not support negative lookbehind regexes. In case it throws an error, falls back to plain | matching. This means// escaping pipe characters in filters does not currently work in Safari-let NON_ESCAPED_PIPE_REGEX;+let NON_ESCAPED_PIPE_REGEXtry {- NON_ESCAPED_PIPE_REGEX = new RegExp("(?<!\\\\)\\|", "g")+ NON_ESCAPED_PIPE_REGEX = new RegExp('(?<!\\\\)\\|', 'g')} catch (_e) {NON_ESCAPED_PIPE_REGEX = '|'}@@ -77,11 +86,15 @@ export function getPropertyKeyFromFilterKey(filterKey) {}export function getFiltersByKeyPrefix(query, prefix) {- return query.filters.filter(([_operation, filterKey, _clauses]) => filterKey.startsWith(prefix))+ return query.filters.filter(([_operation, filterKey, _clauses]) =>+ filterKey.startsWith(prefix)+ )}function omitFiltersByKeyPrefix(query, prefix) {- return query.filters.filter(([_operation, filterKey, _clauses]) => !filterKey.startsWith(prefix))+ return query.filters.filter(+ ([_operation, filterKey, _clauses]) => !filterKey.startsWith(prefix)+ )}export function replaceFilterByPrefix(query, prefix, filter) {@@ -92,18 +105,27 @@ export function isFilteringOnFixedValue(query, filterKey, expectedValue) {const filters = query.filters.filter(([_operation, key]) => filterKey == key)if (filters.length == 1) {const [operation, _filterKey, clauses] = filters[0]- return operation === FILTER_OPERATIONS.is && clauses.length === 1 && (!expectedValue || clauses[0] == expectedValue)+ return (+ operation === FILTER_OPERATIONS.is &&+ clauses.length === 1 &&+ (!expectedValue || clauses[0] == expectedValue)+ )}return false}export function hasGoalFilter(query) {- return getFiltersByKeyPrefix(query, "goal").length > 0+ return getFiltersByKeyPrefix(query, 'goal').length > 0}export function useHasGoalFilter() {- const { query: { filters } } = useQueryContext();- return useMemo(() => getFiltersByKeyPrefix({ filters }, "goal").length > 0, [filters]);+ const {+ query: { filters }+ } = useQueryContext()+ return useMemo(+ () => getFiltersByKeyPrefix({ filters }, 'goal').length > 0,+ [filters]+ )}export function isRealTimeDashboard(query) {@@ -111,8 +133,10 @@ export function isRealTimeDashboard(query) {}export function useIsRealtimeDashboard() {- const { query: { period } } = useQueryContext();- return useMemo(() => isRealTimeDashboard({ period }), [period]);+ const {+ query: { period }+ } = useQueryContext()+ return useMemo(() => isRealTimeDashboard({ period }), [period])}export function plainFilterText(query, [operation, filterKey, clauses]) {@@ -132,19 +156,34 @@ export function styledFilterText(query, [operation, filterKey, clauses]) {const formattedFilter = formattedFilters[filterKey]if (formattedFilter) {- return <>{formattedFilter} {FILTER_OPERATIONS_DISPLAY_NAMES[operation]} {clauses.map((value) => <b key={value}>{getLabel(query.labels, filterKey, value)}</b>).reduce((prev, curr) => [prev, ' or ', curr])} </>+ return (+ <>+ {formattedFilter} {FILTER_OPERATIONS_DISPLAY_NAMES[operation]}{' '}+ {clauses+ .map((value) => (+ <b key={value}>{getLabel(query.labels, filterKey, value)}</b>+ ))+ .reduce((prev, curr) => [prev, ' or ', curr])}{' '}+ </>+ )} else if (filterKey.startsWith(EVENT_PROPS_PREFIX)) {const propKey = getPropertyKeyFromFilterKey(filterKey)- return <>Property <b>{propKey}</b> {FILTER_OPERATIONS_DISPLAY_NAMES[operation]} {clauses.map((label) => <b key={label}>{label}</b>).reduce((prev, curr) => [prev, ' or ', curr])} </>+ return (+ <>+ Property <b>{propKey}</b> {FILTER_OPERATIONS_DISPLAY_NAMES[operation]}{' '}+ {clauses+ .map((label) => <b key={label}>{label}</b>)+ .reduce((prev, curr) => [prev, ' or ', curr])}{' '}+ </>+ )}throw new Error(`Unknown filter: ${filterKey}`)}-// Note: Currently only a single goal filter can be applied at a time.export function getGoalFilter(query) {- return getFiltersByKeyPrefix(query, "goal")[0] || null+ return getFiltersByKeyPrefix(query, 'goal')[0] || null}export function formatFilterGroup(filterGroup) {@@ -162,7 +201,9 @@ export function formatFilterGroup(filterGroup) {export function cleanLabels(filters, labels, mergedFilterKey, mergedLabels) {const filteredBy = Object.fromEntries(filters- .flatMap(([_operation, filterKey, clauses]) => ['country', 'region', 'city'].includes(filterKey) ? clauses : [])+ .flatMap(([_operation, filterKey, clauses]) =>+ ['country', 'region', 'city'].includes(filterKey) ? clauses : []+ ).map((value) => [value, true]))let result = { ...labels }@@ -172,7 +213,10 @@ export function cleanLabels(filters, labels, mergedFilterKey, mergedLabels) {}}- if (mergedFilterKey && ['country', 'region', 'city'].includes(mergedFilterKey)) {+ if (+ mergedFilterKey &&+ ['country', 'region', 'city'].includes(mergedFilterKey)+ ) {result = {...result,...mergedLabels@@ -182,12 +226,15 @@ export function cleanLabels(filters, labels, mergedFilterKey, mergedLabels) {return result}-const EVENT_FILTER_KEYS = new Set(["name", "page", "goal", "hostname"])+const EVENT_FILTER_KEYS = new Set(['name', 'page', 'goal', 'hostname'])export function serializeApiFilters(filters) {const apiFilters = filters.map(([operation, filterKey, clauses]) => {let apiFilterKey = `visit:${filterKey}`- if (filterKey.startsWith(EVENT_PROPS_PREFIX) || EVENT_FILTER_KEYS.has(filterKey)) {+ if (+ filterKey.startsWith(EVENT_PROPS_PREFIX) ||+ EVENT_FILTER_KEYS.has(filterKey)+ ) {apiFilterKey = `event:${filterKey}`}return [operation, apiFilterKey, clauses]@@ -220,39 +267,40 @@ export function getFilterGroup([_operation, filterKey, _clauses]) {return filterKey.startsWith(EVENT_PROPS_PREFIX) ? 'props' : filterKey}-export const formattedFilters = {- 'goal': 'Goal',- 'props': 'Property',- 'prop_key': 'Property',- 'prop_value': 'Value',- 'source': 'Source',- 'utm_medium': 'UTM Medium',- 'utm_source': 'UTM Source',- 'utm_campaign': 'UTM Campaign',- 'utm_content': 'UTM Content',- 'utm_term': 'UTM Term',- 'referrer': 'Referrer URL',- 'screen': 'Screen size',- 'browser': 'Browser',- 'browser_version': 'Browser Version',- 'os': 'Operating System',- 'os_version': 'Operating System Version',- 'country': 'Country',- 'region': 'Region',- 'city': 'City',- 'page': 'Page',- 'hostname': 'Hostname',- 'entry_page': 'Entry Page',- 'exit_page': 'Exit Page',+ goal: 'Goal',+ props: 'Property',+ prop_key: 'Property',+ prop_value: 'Value',+ source: 'Source',+ utm_medium: 'UTM Medium',+ utm_source: 'UTM Source',+ utm_campaign: 'UTM Campaign',+ utm_content: 'UTM Content',+ utm_term: 'UTM Term',+ referrer: 'Referrer URL',+ screen: 'Screen size',+ browser: 'Browser',+ browser_version: 'Browser Version',+ os: 'Operating System',+ os_version: 'Operating System Version',+ country: 'Country',+ region: 'Region',+ city: 'City',+ page: 'Page',+ hostname: 'Hostname',+ entry_page: 'Entry Page',+ exit_page: 'Exit Page'}-export function parseLegacyFilter(filterKey, rawValue) {- const operation = Object.keys(OPERATION_PREFIX)- .find(operation => OPERATION_PREFIX[operation] === rawValue[0]) || FILTER_OPERATIONS.is;+ const operation =+ Object.keys(OPERATION_PREFIX).find(+ (operation) => OPERATION_PREFIX[operation] === rawValue[0]+ ) || FILTER_OPERATIONS.is- const value = operation === FILTER_OPERATIONS.is ? rawValue : rawValue.substring(1)+ const value =+ operation === FILTER_OPERATIONS.is ? rawValue : rawValue.substring(1)const clauses = value.split(NON_ESCAPED_PIPE_REGEX)