📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
(feature) Page properties (#431)
Andrii Romasiun118074cd5ffc
diff --git a/app/api/index.ts b/app/api/index.tsindex 9656ee6b1..1c32480e4 100644--- a/app/api/index.ts+++ b/app/api/index.ts@@ -406,6 +406,34 @@ export const getCustomEventsMetadata = (throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message})+export const getPropertyMetadata = (+ pid: string,+ property: string,+ tb: string = 'hour',+ period: string = '1d',+ from: string = '',+ to: string = '',+ filters: string[] = [],+ timezone: string = '',+ password: string | undefined = '',+) =>+ api+ .get(+ `log/property?pid=${pid}&timeBucket=${tb}&period=${period}&from=${from}&to=${to}&timezone=${timezone}&property=${property}&filters=${JSON.stringify(+ filters,+ )}`,+ {+ headers: {+ 'x-password': password,+ },+ },+ )+ .then((response) => response.data)+ .catch((error) => {+ debug('%s', error)+ throw _isEmpty(error.response.data?.message) ? error.response.data : error.response.data.message+ })+export const getProjectCompareData = (pid: string,tb: string = 'hour',diff --git a/app/pages/Captcha/View/Panels.tsx b/app/pages/Captcha/View/Panels.tsxdeleted file mode 100644index 113f3d45d..000000000--- a/app/pages/Captcha/View/Panels.tsx+++ /dev/null@@ -1,521 +0,0 @@-import React, { memo, useState, useEffect, useMemo, Fragment } from 'react'-import type i18next from 'i18next'-import {- FunnelIcon,- MapIcon,- Bars4Icon,- ArrowsPointingOutIcon,- ChartPieIcon,- ArrowLongRightIcon,- ArrowLongLeftIcon,-} from '@heroicons/react/24/outline'-import cx from 'clsx'-import { pie } from 'billboard.js'-import _keys from 'lodash/keys'-import _values from 'lodash/values'-import _map from 'lodash/map'-import _isEmpty from 'lodash/isEmpty'-import _reduce from 'lodash/reduce'-import _round from 'lodash/round'-import _ceil from 'lodash/ceil'-import _orderBy from 'lodash/orderBy'-import _includes from 'lodash/includes'-import _floor from 'lodash/floor'-import _size from 'lodash/size'-import _slice from 'lodash/slice'-import _sum from 'lodash/sum'--import Progress from 'ui/Progress'-import Modal from 'ui/Modal'-import Chart from 'ui/Chart'-import Button from 'ui/Button'--import { IEntry } from 'redux/models/IEntry'--import InteractiveMap from '../../Project/View/components/InteractiveMap'-import { iconClassName } from './ViewCaptcha.helpers'--const ENTRIES_PER_PANEL = 5--const panelsWithBars = ['cc', 'ce', 'os', 'br', 'dv']--const checkIfBarsNeeded = (panelID: string) => {- return _includes(panelsWithBars, panelID)-}--interface IPanelContainer {- name: string- children?: React.ReactNode- noSwitch?: boolean- icon?: React.ReactNode- type: string- openModal?: () => void- activeFragment?: number | string- setActiveFragment?: (arg: number) => void-}--// noSwitch - 'previous' and 'next' buttons-const PanelContainer = ({- name,- children,- noSwitch,- icon,- type,- openModal = () => {},- activeFragment = 0,- setActiveFragment = () => {},-}: IPanelContainer): JSX.Element => (- <div- className={cx(- 'relative min-h-72 overflow-hidden rounded-lg bg-white px-4 pt-5 shadow dark:bg-slate-800/25 sm:px-6 sm:pt-6',- {- 'pb-12': !noSwitch,- 'pb-5': noSwitch,- },- )}- >- <div className='mb-2 flex items-center justify-between'>- <h3 className='flex items-center text-lg font-semibold leading-6 text-gray-900 dark:text-gray-50'>- {icon && (- <>- {icon}- - </>- )}- {name}- </h3>- <div className='flex'>- {checkIfBarsNeeded(type) && (- <Bars4Icon- className={cx(iconClassName, 'cursor-pointer', {- 'text-blue-500': activeFragment === 0,- 'text-gray-900 dark:text-gray-50': activeFragment === 1,- })}- onClick={() => setActiveFragment(0)}- />- )}-- {/* if it is a Country tab */}- {type === 'cc' && (- <>- <MapIcon- className={cx(iconClassName, 'ml-2 cursor-pointer', {- 'text-blue-500': activeFragment === 1,- 'text-gray-900 dark:text-gray-50': activeFragment === 0,- })}- onClick={() => setActiveFragment(1)}- />- <ArrowsPointingOutIcon- className={cx(iconClassName, 'ml-2 cursor-pointer text-gray-900 dark:text-gray-50', {- hidden: activeFragment === 0,- })}- onClick={openModal}- />- </>- )}- {/* if this tab using Circle showing stats panel */}- {(type === 'ce' || type === 'os' || type === 'br' || type === 'dv') && (- <ChartPieIcon- className={cx(iconClassName, 'ml-2 cursor-pointer', {- 'text-blue-500': activeFragment === 1,- 'text-gray-900 dark:text-gray-50': activeFragment === 0,- })}- onClick={() => setActiveFragment(1)}- />- )}- </div>- </div>- {/* for other tabs */}- <div className='flex h-full flex-col overflow-auto scroll-auto'>{children}</div>- </div>-)--// Options for circle chart showing the stats of data-const getPieOptions = (customs: any, uniques: number, t: any) => {- const tQuantity = t('project.quantity')- const tConversion = t('project.conversion')- const tRatio = t('project.ratio')- const quantity = _values(customs)- const conversion = _map(quantity, (el) => _round((el / uniques) * 100, 2))-- return {- tooltip: {- contents: {- text: {- QUANTITY: _values(customs),- CONVERSION: conversion,- },- template: `- <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>- {{- <li class='flex'>- <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:{=COLOR}></div>- <span>{=NAME}</span>- </li>- <hr class='border-gray-200 dark:border-gray-600' />- <li class='flex justify-between'>- <span>${tQuantity}</span>- <span class='pl-4'>{=QUANTITY}</span>- </li>- <li class='flex justify-between'>- <span>${tConversion}</span>- <span class='pl-4'>{=CONVERSION}%</span>- </li>- <li class='flex justify-between'>- <span>${tRatio}</span>- <span class='pl-4'>{=VALUE}</span>- </li>- }}- </ul>`,- },- },- }-}--// Tabs with custom events like submit form, press button, go to the link rate etc.-const CustomEvents = ({- customs,- chartData,- onFilter,- t,-}: {- customs: any- chartData: any- onFilter: any- t: typeof i18next.t-}) => {- const keys = _keys(customs)- const uniques = _sum(chartData.uniques)- const [chartOptions, setChartOptions] = useState<any>({})- const [activeFragment, setActiveFragment] = useState<number>(0)-- useEffect(() => {- if (!_isEmpty(chartData)) {- const options = getPieOptions(customs, uniques, t)- setChartOptions({- data: {- columns: _map(keys, (ev) => [ev, customs[ev]]),- type: pie(),- },- ...options,- })- }- }, [chartData, customs, t]) // eslint-disable-line react-hooks/exhaustive-deps-- // for showing chart circle of stats a data- if (activeFragment === 1 && !_isEmpty(chartData)) {- return (- <PanelContainer- name={t('project.customEv')}- type='ce'- setActiveFragment={setActiveFragment}- activeFragment={activeFragment}- >- {_isEmpty(chartData) ? (- <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>- ) : (- <Chart options={chartOptions} current='panels-ce' />- )}- </PanelContainer>- )- }-- return (- <PanelContainer- name={t('project.customEv')}- type='ce'- setActiveFragment={setActiveFragment}- activeFragment={activeFragment}- >- <table className='table-fixed'>- <thead>- <tr className='text-gray-900 dark:text-gray-50'>- <th className='w-4/6 text-left'>{t('project.event')}</th>- <th className='w-1/6 text-right'>- {t('project.quantity')}- - </th>- <th className='w-1/6 text-right'>{t('project.conversion')}</th>- </tr>- </thead>- <tbody>- {_map(keys, (ev) => (- <tr- key={ev}- className='group cursor-pointer text-gray-900 hover:bg-gray-100 dark:text-gray-50 hover:dark:bg-slate-800'- onClick={() => onFilter('ev', ev)}- >- <td className='flex items-center text-left'>- {ev}- <FunnelIcon className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300' />- </td>- <td className='text-right'>- {customs[ev]}- - </td>- <td className='text-right'>{_round((customs[ev] / uniques) * 100, 2)}%</td>- </tr>- ))}- </tbody>- </table>- </PanelContainer>- )-}--interface IPanel {- name: string- data: IEntry[]- rowMapper?: (row: any) => string | JSX.Element- capitalize?: boolean- linkContent?: boolean- t: typeof i18next.t- icon: any- id: string- hideFilters?: boolean- onFilter: any-}--const Panel = ({- name,- data,- rowMapper = (row: IEntry): string => row.name,- capitalize,- linkContent,- t,- icon,- id,- hideFilters,- onFilter = () => {},-}: IPanel): JSX.Element => {- const [page, setPage] = useState(0)- const currentIndex = page * ENTRIES_PER_PANEL- const total = useMemo(() => _reduce(data, (prev, curr) => prev + curr.count, 0), [data])- const totalPages = _ceil(total / ENTRIES_PER_PANEL)- const entries = useMemo(() => _orderBy(data, 'count', 'desc'), [data])- const entriesToDisplay = _slice(entries, currentIndex, currentIndex + ENTRIES_PER_PANEL)- const [activeFragment, setActiveFragment] = useState(0)- const [modal, setModal] = useState(false)- const canGoPrev = () => page > 0- const canGoNext = () => page < _floor((_size(entries) - 1) / ENTRIES_PER_PANEL)-- const _onFilter = hideFilters ? () => {} : onFilter-- useEffect(() => {- const sizeKeys = _size(entries)-- if (currentIndex > sizeKeys) {- setPage(_floor(sizeKeys / ENTRIES_PER_PANEL))- }- }, [currentIndex, entries])-- useEffect(() => {- setPage(0)- }, [data])-- const onPrevious = () => {- if (canGoPrev()) {- setPage(page - 1)- }- }-- const onNext = () => {- if (canGoNext()) {- setPage(page + 1)- }- }- // Showing map of stats a data- if (id === 'cc' && activeFragment === 1 && !_isEmpty(data)) {- return (- <PanelContainer- name={name}- icon={icon}- type={id}- activeFragment={activeFragment}- setActiveFragment={setActiveFragment}- openModal={() => setModal(true)}- >- <InteractiveMap data={data} total={total} onClickCountry={(key) => _onFilter(id, key)} />- <Modal- onClose={() => setModal(false)}- closeText={t('common.close')}- isOpened={modal}- message={<InteractiveMap data={data} total={total} onClickCountry={(key) => _onFilter(id, key)} />}- size='large'- />- </PanelContainer>- )- }-- // Showing chart of stats a data (start if)- if ((id === 'os' || id === 'br' || id === 'dv') && activeFragment === 1 && !_isEmpty(data)) {- const tQuantity = t('project.quantity')- const tRatio = t('project.ratio')- const columns = _map(data, (el) => [el.name, el.count])- const values = _map(data, (el) => el.count)-- const options = {- data: {- columns,- type: pie(),- },- tooltip: {- contents: {- text: {- QUANTITY: values,- },- template: `- <ul class='bg-gray-100 dark:text-gray-50 dark:bg-slate-800 rounded-md shadow-md px-3 py-1'>- {{- <li class='flex'>- <div class='w-3 h-3 rounded-sm mt-1.5 mr-2' style=background-color:{=COLOR}></div>- <span>{=NAME}</span>- </li>- <hr class='border-gray-200 dark:border-gray-600' />- <li class='flex justify-between'>- <span>${tQuantity}</span>- <span class='pl-4'>{=QUANTITY}</span>- </li>- <li class='flex justify-between'>- <span>${tRatio}</span>- <span class='pl-4'>{=VALUE}</span>- </li>- }}- </ul>`,- },- },- }-- return (- <PanelContainer- name={name}- icon={icon}- type={id}- setActiveFragment={setActiveFragment}- activeFragment={activeFragment}- >- {_isEmpty(data) ? (- <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>- ) : (- <Chart options={options} current={`Panels-${id}`} />- )}- </PanelContainer>- )- }-- return (- <PanelContainer- name={name}- icon={icon}- type={id}- activeFragment={activeFragment}- setActiveFragment={setActiveFragment}- >- {_isEmpty(data) ? (- <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>- ) : (- _map(entriesToDisplay, (entry) => {- const { count, name: entryName } = entry- const perc = _round((count / total) * 100, 2)- const rowData = rowMapper(entry)- const valueData = count-- return (- <Fragment key={entryName}>- <div- className={cx('mt-[0.32rem] flex justify-between rounded first:mt-0 dark:text-gray-50', {- 'group cursor-pointer hover:bg-gray-100 hover:dark:bg-slate-800': !hideFilters,- })}- onClick={() => _onFilter(id, entryName)}- >- {linkContent ? (- <a- className={cx('label flex items-center text-blue-600 hover:underline dark:text-blue-500', {- capitalize,- })}- href={rowData as string}- target='_blank'- rel='noopener noreferrer nofollow'- aria-label={`${rowData} (opens in a new tab)`}- >- {rowData}- {!hideFilters && (- <FunnelIcon className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300' />- )}- </a>- ) : (- <span className={cx('label flex items-center', { capitalize })}>- {rowData}- {!hideFilters && (- <FunnelIcon className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300' />- )}- </span>- )}- <span className='ml-3 dark:text-gray-50'>- {valueData}- - <span className='font-light text-gray-500 dark:text-gray-200'>- ({perc}- %)- </span>- </span>- </div>- <Progress now={perc} />- </Fragment>- )- })- )}- {/* for pagination in tabs */}- {_size(entries) > ENTRIES_PER_PANEL && (- <div className='w-card-toggle-sm absolute bottom-0 sm:!w-card-toggle'>- <div className='mb-2 flex select-none justify-between'>- <div>- <span className='text-xs font-light lowercase text-gray-500 dark:text-gray-200'>- {_size(entries)} {t('project.results')}- </span>- <span className='text-xs font-light text-gray-500 dark:text-gray-200'>- . {t('project.page')} {page + 1} / {totalPages}- </span>- </div>- <div className='flex w-[4.5rem] justify-between'>- <Button- className={cx(- 'border-none bg-gray-100 px-1.5 py-0.5 font-light text-gray-500 shadow dark:bg-slate-800 dark:text-gray-200',- {- 'cursor-not-allowed opacity-50': !canGoPrev(),- 'hover:bg-gray-200 hover:dark:bg-slate-700': canGoPrev(),- },- )}- type='button'- onClick={onPrevious}- disabled={!canGoPrev()}- focus={false}- >- <ArrowLongLeftIcon className='h-5 w-5' />- </Button>- <Button- className={cx(- 'border-none bg-gray-100 px-1.5 py-0.5 font-light text-gray-500 shadow dark:bg-slate-800 dark:text-gray-200',- {- 'cursor-not-allowed opacity-50': !canGoNext(),- 'hover:bg-gray-200 hover:dark:bg-slate-700': canGoNext(),- },- )}- onClick={onNext}- disabled={!canGoNext()}- type='button'- focus={false}- >- <ArrowLongRightIcon className='h-5 w-5' />- </Button>- </div>- </div>- </div>- )}- </PanelContainer>- )-}--const PanelMemo = memo(Panel)-const CustomEventsMemo = memo(CustomEvents)--export { PanelMemo as Panel, CustomEventsMemo as CustomEvents }diff --git a/app/pages/Captcha/View/ViewCaptcha.helpers.tsx b/app/pages/Captcha/View/ViewCaptcha.helpers.tsxindex 01bde9cfa..4b198661d 100644--- a/app/pages/Captcha/View/ViewCaptcha.helpers.tsx+++ b/app/pages/Captcha/View/ViewCaptcha.helpers.tsx@@ -223,7 +223,6 @@ const getFormatDate = (date: Date) => {}export {- iconClassName,getFormatDate,panelIconMapping,typeNameMapping,diff --git a/app/pages/Captcha/View/ViewCaptcha.tsx b/app/pages/Captcha/View/ViewCaptcha.tsxindex 06946c37e..62ff00c59 100644--- a/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/app/pages/Captcha/View/ViewCaptcha.tsx@@ -48,7 +48,7 @@ import Checkbox from 'ui/Checkbox'import FlatPicker from 'ui/Flatpicker'import routes from 'routesPath'import { getProject, getCaptchaData } from 'api'-import { Panel, CustomEvents } from './Panels'+import { Panel } from 'pages/Project/View/Panels'import {getFormatDate,panelIconMapping,@@ -66,7 +66,7 @@ import { onCSVExportClick } from 'pages/Project/View/ViewProject.helpers'import TBPeriodSelector from 'pages/Project/View/components/TBPeriodSelector'import CCRow from '../../Project/View/components/CCRow'import NoEvents from './components/NoEvents'-import Filters from './components/Filters'+import Filters from 'pages/Project/View/components/Filters'const PageLoader = () => (<div className='min-h-min-footer bg-gray-50 dark:bg-slate-900'>@@ -621,13 +621,12 @@ const ViewCaptcha = ({// @ts-ignoreconst url: URL = new URL(window.location)const { searchParams } = url- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {+ for (const [key] of Array.from(searchParams.entries())) {if (!_includes(validFilters, key)) {- return+ continue}searchParams.delete(key)- })+ }const { pathname, search } = urlnavigate(`${pathname}${search}`)setFilters([])@@ -818,6 +817,7 @@ const ViewCaptcha = ({onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}+ resetFilters={resetFilters}/>{dataLoading && (<div className='static mt-4 !bg-transparent' id='loader'>@@ -846,7 +846,6 @@ const ViewCaptcha = ({return (<Panel- t={t}key={type}icon={panelIcon}id={type}@@ -861,7 +860,6 @@ const ViewCaptcha = ({if (type === 'dv') {return (<Panel- t={t}key={type}icon={panelIcon}id={type}@@ -900,7 +898,6 @@ const ViewCaptcha = ({return (<Panel- t={t}key={type}icon={panelIcon}id={type}@@ -946,7 +943,6 @@ const ViewCaptcha = ({return (<Panel- t={t}key={type}icon={panelIcon}id={type}@@ -960,7 +956,6 @@ const ViewCaptcha = ({return (<Panel- t={t}key={type}icon={panelIcon}id={type}@@ -970,9 +965,6 @@ const ViewCaptcha = ({/>)})}- {!_isEmpty(panelsData.customs) && (- <CustomEvents t={t} customs={panelsData.customs} onFilter={filterHandler} chartData={chartData} />- )}</div></div></div>diff --git a/app/pages/Captcha/View/components/Filters.tsx b/app/pages/Captcha/View/components/Filters.tsxdeleted file mode 100644index 317eedf3c..000000000--- a/app/pages/Captcha/View/components/Filters.tsx+++ /dev/null@@ -1,113 +0,0 @@-import React, { memo } from 'react'-import type i18next from 'i18next'-import _truncate from 'lodash/truncate'-import _map from 'lodash/map'-import { useTranslation } from 'react-i18next'--import countries from 'utils/isoCountries'--interface IFiler {- column: string- filter: string- isExclusive: boolean- // eslint-disable-next-line no-shadow- onRemoveFilter: (column: string, filter: string) => void- // eslint-disable-next-line no-shadow- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => void- tnMapping: Record<string, string>- language: string- t: typeof i18next.t-}--const Filter = ({- column,- filter,- isExclusive,- onRemoveFilter,- onChangeExclusive,- tnMapping,- language,- t,-}: IFiler): JSX.Element => {- const displayColumn = tnMapping[column]- let displayFilter = filter-- if (column === 'cc') {- displayFilter = countries.getName(filter, language) as string- }-- if (column === 'pg') {- displayFilter = filter || t('project.redactedPage')- }-- displayFilter = _truncate(displayFilter)-- return (- <span className='mr-2 mt-2 inline-flex items-center rounded-md bg-gray-200 py-0.5 pl-2.5 pr-1 text-sm font-medium text-gray-800 dark:bg-slate-800 dark:text-gray-50'>- {displayColumn}- - <span- className='cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400'- onClick={() => onChangeExclusive(column, filter, !isExclusive)}- >- {t(`common.${isExclusive ? 'isNot' : 'is'}`)}- </span>- "- {displayFilter}- "- <button- onClick={() => onRemoveFilter(column, filter)}- type='button'- className='ml-0.5 inline-flex h-4 w-4 flex-shrink-0 items-center justify-center rounded-full text-gray-800 hover:bg-gray-300 hover:text-gray-900 focus:bg-gray-300 focus:text-gray-900 focus:outline-none dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-gray-800 dark:hover:text-gray-300 dark:focus:bg-gray-800 dark:focus:text-gray-300 '- >- <span className='sr-only'>Remove filter</span>- <svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'>- <path strokeLinecap='round' strokeWidth='1.5' d='M1 1l6 6m0-6L1 7' />- </svg>- </button>- </span>- )-}--interface IFilters {- filters: {- column: string- filter: string- isExclusive: boolean- }[]- // eslint-disable-next-line no-shadow- onRemoveFilter: (column: string, filter: string) => void- // eslint-disable-next-line no-shadow- onChangeExclusive: (column: string, filter: string, isExclusive: boolean) => void- tnMapping: Record<string, string>-}--const Filters = ({ filters, onRemoveFilter, onChangeExclusive, tnMapping }: IFilters) => {- const {- t,- i18n: { language },- } = useTranslation('common')-- return (- <div className='-mt-2 flex flex-wrap justify-center md:justify-start'>- {_map(filters, (props) => {- const { column, filter } = props- const key = `${column}${filter}`-- return (- <Filter- key={key}- onRemoveFilter={onRemoveFilter}- onChangeExclusive={onChangeExclusive}- language={language}- t={t}- tnMapping={tnMapping}- {...props}- />- )- })}- </div>- )-}--export default memo(Filters)diff --git a/app/pages/Captcha/View/components/NoEvents.tsx b/app/pages/Captcha/View/components/NoEvents.tsxindex b07659671..dd99ecfb4 100644--- a/app/pages/Captcha/View/components/NoEvents.tsx+++ b/app/pages/Captcha/View/components/NoEvents.tsx@@ -4,13 +4,10 @@ import _isEmpty from 'lodash/isEmpty'import Button from 'ui/Button'import { DOCS_CAPTCHA_URL } from 'redux/constants'+import { IFilter } from 'pages/Project/View/interfaces/traffic'interface INoEvents {- filters: {- column: string- filter: string- isExclusive: boolean- }[]+ filters: IFilter[]resetFilters: () => void}diff --git a/app/pages/Project/View/Panels.tsx b/app/pages/Project/View/Panels.tsxindex 979ff5da9..b0586c1b4 100644--- a/app/pages/Project/View/Panels.tsx+++ b/app/pages/Project/View/Panels.tsx@@ -46,6 +46,9 @@ import InteractiveMap from './components/InteractiveMap'import UserFlow from './components/UserFlow'import { iconClassName } from './ViewProject.helpers'import Spin from 'ui/icons/Spin'+import { useTranslation } from 'react-i18next'+import CustomEventsDropdown from './components/CustomEventsDropdown'+import { ICustoms, IProperties } from './interfaces/traffic'const ENTRIES_PER_PANEL = 5const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 6@@ -202,7 +205,7 @@ const PanelContainer = ({)}{/* if it is a 'Custom events' tab */}- {type === 'ce' && (+ {(type === 'ce' || type === 'props') && (<><ArrowsPointingOutIconclassName={cx(iconClassName, 'ml-2 cursor-pointer text-slate-400 dark:text-slate-500')}@@ -299,15 +302,25 @@ const getPieOptions = (customs: any, uniques: number, t: any) => {}}-interface ICustomEvents {- customs: any+interface IMetadata {+ customs: ICustoms+ properties: IPropertieschartData: any- onFilter: any- t: typeof i18next.t- getCustomEventMetadata: (event: string) => any+ filters: any[]+ onFilter: (column: string, filter: any, isExclusive?: boolean) => Promise<void>+ getCustomEventMetadata: (event: string) => Promise<any>+ getPropertyMetadata: (property: string) => Promise<any>customTabs: any}+interface ICustomEvents extends IMetadata {+ setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>+}++interface IPageProperties extends IMetadata {+ setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>+}+interface ISortRows {label: stringsortByAscend: boolean@@ -316,11 +329,13 @@ interface ISortRows {interface IKVTable {data: any- t: any+ t: typeof i18next.tuniques: number+ onClick: (key: string, value: string) => void+ displayKeyAsHeader?: boolean}-const KVTable = ({ data, t, uniques }: IKVTable) => {+const KVTable = ({ data, t, uniques, displayKeyAsHeader, onClick }: IKVTable) => {const processed = useMemo(() => {return _reduce(data,@@ -349,7 +364,9 @@ const KVTable = ({ data, t, uniques }: IKVTable) => {<table key={key} className='mb-4 w-full border-separate border-spacing-y-1'><thead><tr className='text-gray-600 dark:text-gray-200'>- <th className='flex w-2/5 items-center pl-2 text-left sm:w-4/6'>{key}</th>+ <th className='flex w-2/5 items-center pl-2 text-left sm:w-4/6'>+ {displayKeyAsHeader ? key : t('project.value')}+ </th><th className='w-[30%] sm:w-1/6'><p className='flex items-center justify-end'>{t('project.quantity')}</p></th>@@ -362,9 +379,15 @@ const KVTable = ({ data, t, uniques }: IKVTable) => {{_map(value, ({ value: nestedValue, count }) => (<trkey={nestedValue}- className='group py-3 text-gray-900 even:bg-gray-50 hover:bg-gray-100 dark:text-gray-50 dark:even:bg-slate-800 hover:dark:bg-slate-700'+ onClick={() => {+ onClick(key, nestedValue)+ }}+ className='group cursor-pointer py-3 text-gray-900 even:bg-gray-50 hover:bg-gray-100 dark:text-gray-50 dark:even:bg-slate-800 hover:dark:bg-slate-700'>- <td className='flex items-center py-1 pl-2 text-left'>{nestedValue}</td>+ <td className='flex items-center py-1 pl-2 text-left'>+ {nestedValue}+ <FunnelIcon className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300' />+ </td><td className='py-1 text-right'>{count} @@ -378,14 +401,51 @@ const KVTable = ({ data, t, uniques }: IKVTable) => {})}-// Tabs with custom events like submit form, press button, go to the link rate etc.-const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCustomEventMetadata }: ICustomEvents) => {+function sortAsc<T>(obj: T, sortByKeys?: boolean): T {+ if (sortByKeys) {+ // @ts-expect-error+ return _fromPairs(_sortBy(_toPairs(obj), (pair) => pair[0])) as T+ }++ return _fromPairs(+ // @ts-expect-error+ _toPairs(obj).sort((a: any, b: any) => {+ return b[1] - a[1]+ }),+ ) as T+}++function sortDesc<T>(obj: T, sortByKeys?: boolean): T {+ if (sortByKeys) {+ // @ts-expect-error+ return _fromPairs(_reverse(_sortBy(_toPairs(obj), (pair) => pair[0]))) as T+ }++ return _fromPairs(+ // @ts-expect-error+ _toPairs(obj).sort((a: any, b: any) => {+ return a[1] - b[1]+ }),+ ) as T+}++const CustomEvents = ({+ customs,+ chartData,+ filters,+ onFilter,+ customTabs = [],+ getCustomEventMetadata,+ setActiveTab,+}: ICustomEvents) => {+ const { t } = useTranslation('common')const [page, setPage] = useState(0)const [detailsOpened, setDetailsOpened] = useState(false)const [activeEvents, setActiveEvents] = useState<any>({})const [loadingEvents, setLoadingEvents] = useState<any>({})const [eventsMetadata, setEventsMetadata] = useState<any>({})const [customsEventsData, setCustomsEventsData] = useState<any>(customs)+ const [triggerEventWhenFiltersChange, setTriggerEventWhenFiltersChange] = useState<string | null>(null)const currentIndex = page * ENTRIES_PER_CUSTOM_EVENTS_PANELconst keys = _keys(customsEventsData)const keysToDisplay = useMemo(@@ -425,6 +485,16 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCussetPage(0)}, [chartData])+ useEffect(() => {+ if (!triggerEventWhenFiltersChange) {+ return+ }++ toggleEventMetadata(triggerEventWhenFiltersChange)()+ setTriggerEventWhenFiltersChange(null)+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [filters, triggerEventWhenFiltersChange])+const onPrevious = () => {if (canGoPrev()) {setPage(page - 1)@@ -437,49 +507,28 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCus}}- const sortedAsc = (obj: any, sortByKeys?: boolean) => {- if (sortByKeys) {- return _fromPairs(_sortBy(_toPairs(obj), (pair) => pair[0]))- }-- return _fromPairs(- _toPairs(obj).sort((a: any, b: any) => {- return b[1] - a[1]- }),- )- }+ // is "e" is not set, then details loading is forced and all checks are skipped+ const toggleEventMetadata = (ev: string) => async (e?: React.MouseEvent<HTMLTableRowElement>) => {+ if (e) {+ e.stopPropagation()- const sortedDesc = (obj: any, sortByKeys?: boolean) => {- if (sortByKeys) {- return _fromPairs(_reverse(_sortBy(_toPairs(obj), (pair) => pair[0])))+ setActiveEvents((events: any) => ({+ ...events,+ [ev]: !events[ev],+ }))}- return _fromPairs(- _toPairs(obj).sort((a: any, b: any) => {- return a[1] - b[1]- }),- )- }-- const toggleEventMetadata = (ev: string) => async (e: any) => {- e.stopPropagation()-- setActiveEvents((events: any) => ({- ...events,- [ev]: !events[ev],- }))-- if (!eventsMetadata[ev]) {+ if (!e || !eventsMetadata[ev]) {setLoadingEvents((events: any) => ({...events,[ev]: true,}))try {- const data = await getCustomEventMetadata(ev)+ const { result } = await getCustomEventMetadata(ev)setEventsMetadata((metadata: any) => ({...metadata,- [ev]: data,+ [ev]: result,}))} catch (reason) {console.error(`[ERROR](toggleEventMetadata) Failed to get metadata for event ${ev}`, reason)@@ -510,7 +559,7 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCusconst sortByKeys = label === 'event'if (sort.sortByAscend) {- setCustomsEventsData(sortedDesc(customsEventsData, sortByKeys))+ setCustomsEventsData(sortDesc(customsEventsData, sortByKeys))setSort({label,sortByAscend: false,@@ -529,7 +578,7 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCusreturn}- setCustomsEventsData(sortedAsc(customsEventsData, sortByKeys))+ setCustomsEventsData(sortAsc(customsEventsData, sortByKeys))setSort({label,sortByAscend: true,@@ -628,7 +677,16 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCus{activeEvents[ev] && !loadingEvents[ev] && (<tr><td className='pl-9' colSpan={3}>- <KVTable data={eventsMetadata[ev]} t={t} uniques={uniques} />+ <KVTable+ data={eventsMetadata[ev]}+ t={t}+ uniques={uniques}+ onClick={async (key, value) => {+ await onFilter(`ev:key:${key}`, value)+ setTriggerEventWhenFiltersChange(ev)+ }}+ displayKeyAsHeader+ /></td></tr>)}@@ -639,11 +697,25 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCus</div>)+ if (_isEmpty(customs)) {+ return (+ <PanelContainer+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}+ type='ce'+ setActiveFragment={setActiveFragment}+ activeFragment={activeFragment}+ onExpandClick={() => setDetailsOpened(true)}+ >+ <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>+ </PanelContainer>+ )+ }+// for showing chart circle of stats a dataif (activeFragment === 1 && !_isEmpty(chartData)) {return (<PanelContainer- name={t('project.customEv')}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -672,7 +744,7 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCusreturn (<PanelContainer- name={t('project.customEv')}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'activeFragment={activeFragment}setActiveFragment={setActiveFragment}@@ -689,7 +761,7 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCusreturn (<PanelContainercustomTabs={customTabs}- name={t('project.customEv')}+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} />}type='ce'setActiveFragment={setActiveFragment}activeFragment={activeFragment}@@ -816,6 +888,411 @@ const CustomEvents = ({ customs, chartData, onFilter, t, customTabs = [], getCus)}+const PageProperties = ({+ properties,+ chartData,+ onFilter,+ filters,+ getPropertyMetadata,+ setActiveTab,+}: IPageProperties) => {+ const { t } = useTranslation('common')+ const [page, setPage] = useState(0)+ const [detailsOpened, setDetailsOpened] = useState(false)+ const [activeProperties, setActiveProperties] = useState<any>({})+ const [loadingDetails, setLoadingDetails] = useState<any>({})+ const [details, setDetails] = useState<any>({})+ const [processedProperties, setProcessedProperties] = useState<IProperties>(properties)+ const currentIndex = page * ENTRIES_PER_CUSTOM_EVENTS_PANEL+ const keys = _keys(processedProperties)+ const keysToDisplay = useMemo(+ () => _slice(keys, currentIndex, currentIndex + ENTRIES_PER_CUSTOM_EVENTS_PANEL),+ [keys, currentIndex],+ )+ const uniques = _sum(chartData.uniques)+ const [activeFragment, setActiveFragment] = useState<number>(0)+ const [triggerTagWhenFiltersChange, setTriggerTagWhenFiltersChange] = useState<string | null>(null)+ const totalPages = useMemo(() => _ceil(_size(keys) / ENTRIES_PER_CUSTOM_EVENTS_PANEL), [keys])+ const canGoPrev = () => page > 0+ const canGoNext = () => page < _floor((_size(keys) - 1) / ENTRIES_PER_CUSTOM_EVENTS_PANEL)+ const [sort, setSort] = useState<ISortRows>({+ label: 'quantity',+ sortByAscend: false,+ sortByDescend: false,+ })++ useEffect(() => {+ const sizeKeys = _size(keys)++ if (currentIndex > sizeKeys) {+ setPage(_floor(sizeKeys / ENTRIES_PER_CUSTOM_EVENTS_PANEL))+ }+ }, [currentIndex, keys])++ useEffect(() => {+ setProcessedProperties(properties)+ setSort({+ label: 'quantity',+ sortByAscend: false,+ sortByDescend: false,+ })+ }, [properties])++ useEffect(() => {+ setPage(0)+ }, [chartData])++ const onPrevious = () => {+ if (canGoPrev()) {+ setPage(page - 1)+ }+ }++ const onNext = () => {+ if (canGoNext()) {+ setPage(page + 1)+ }+ }++ useEffect(() => {+ if (!triggerTagWhenFiltersChange) {+ return+ }++ togglePropertyDetails(triggerTagWhenFiltersChange)()+ setTriggerTagWhenFiltersChange(null)+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [filters, triggerTagWhenFiltersChange])++ // is "e" is not set, then details loading is forced and all checks are skipped+ const togglePropertyDetails = (property: string) => async (e?: React.MouseEvent<HTMLTableRowElement>) => {+ if (e) {+ e.stopPropagation()++ setActiveProperties((events: any) => ({+ ...events,+ [property]: !events[property],+ }))+ }++ if (!e || !details[property]) {+ setLoadingDetails((events: any) => ({+ ...events,+ [property]: true,+ }))++ try {+ const { result } = await getPropertyMetadata(property)+ setDetails((metadata: any) => ({+ ...metadata,+ [property]: result,+ }))+ } catch (reason) {+ console.error(`[ERROR](togglePropertyDetails) Failed to get metadata for property ${property}`, reason)+ setDetails((metadata: any) => ({+ ...metadata,+ [property]: [],+ }))+ }++ setLoadingDetails((events: any) => ({+ ...events,+ [property]: false,+ }))+ }+ }++ const onModalClose = () => {+ setDetailsOpened(false)++ // a timeout is needed to prevent the flicker of data fields in the modal when closing+ setTimeout(() => {+ setActiveProperties({})+ setDetails({})+ }, 300)+ }++ const onSortBy = (label: string) => {+ const sortByKeys = label === 'event'++ if (sort.sortByAscend) {+ setProcessedProperties(sortDesc(processedProperties, sortByKeys))+ setSort({+ label,+ sortByAscend: false,+ sortByDescend: true,+ })+ return+ }++ if (sort.sortByDescend) {+ setProcessedProperties(properties)+ setSort({+ label,+ sortByAscend: false,+ sortByDescend: false,+ })+ return+ }++ setProcessedProperties(sortAsc(processedProperties, sortByKeys))+ setSort({+ label,+ sortByAscend: true,+ sortByDescend: false,+ })+ }++ const PropertiesTable = () => (+ <div className='overflow-y-auto'>+ <table className='w-full border-separate border-spacing-y-1'>+ <thead>+ <tr className='text-base text-gray-900 dark:text-gray-50'>+ <th+ className='flex w-2/5 cursor-pointer items-center pl-2 text-left hover:opacity-90 sm:w-4/6'+ onClick={() => onSortBy('event')}+ >+ {t('project.property')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'event' && sort.sortByAscend}+ sortByDescend={sort.label === 'event' && sort.sortByDescend}+ />+ </th>+ <th className='w-[30%] sm:w-1/6'>+ <p+ className='flex cursor-pointer items-center justify-end hover:opacity-90'+ onClick={() => onSortBy('quantity')}+ >+ {t('project.quantity')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'quantity' && sort.sortByAscend}+ sortByDescend={sort.label === 'quantity' && sort.sortByDescend}+ />+ + </p>+ </th>+ <th className='w-[30%] pr-2 sm:w-1/6'>+ <p+ className='flex cursor-pointer items-center justify-end hover:opacity-90'+ onClick={() => onSortBy('conversion')}+ >+ {t('project.conversion')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'conversion' && sort.sortByAscend}+ sortByDescend={sort.label === 'conversion' && sort.sortByDescend}+ />+ </p>+ </th>+ </tr>+ </thead>+ <tbody>+ {_map(keysToDisplay, (tag) => (+ <Fragment key={tag}>+ <tr+ className={cx(+ 'group cursor-pointer text-base text-gray-900 even:bg-gray-50 hover:bg-gray-100 dark:text-gray-50 dark:even:bg-slate-800 hover:dark:bg-slate-700',+ {+ 'animate-pulse bg-gray-100 dark:bg-slate-700': loadingDetails[tag],+ },+ )}+ onClick={togglePropertyDetails(tag)}+ >+ <td className='flex items-center py-1 text-left'>+ {loadingDetails[tag] ? (+ <Spin className='ml-1 mr-2' />+ ) : activeProperties[tag] ? (+ <ChevronUpIcon className='h-5 w-auto pl-1 pr-2 text-gray-500 hover:opacity-80 dark:text-gray-300' />+ ) : (+ <ChevronDownIcon className='h-5 w-auto pl-1 pr-2 text-gray-500 hover:opacity-80 dark:text-gray-300' />+ )}+ {tag}+ </td>+ <td className='py-1 text-right'>+ {processedProperties[tag]}+ + </td>+ <td className='py-1 pr-2 text-right'>+ {uniques === 0 ? 100 : _round((processedProperties[tag] / uniques) * 100, 2)}%+ </td>+ </tr>+ {activeProperties[tag] && !loadingDetails[tag] && (+ <tr>+ <td className='pl-9' colSpan={3}>+ <KVTable+ data={details[tag]}+ t={t}+ uniques={uniques}+ onClick={async (key, value) => {+ await onFilter(`tag:key:${key}`, value)+ setTriggerTagWhenFiltersChange(tag)+ }}+ />+ </td>+ </tr>+ )}+ </Fragment>+ ))}+ </tbody>+ </table>+ </div>+ )++ if (_isEmpty(properties)) {+ return (+ <PanelContainer+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}+ type='props'+ setActiveFragment={setActiveFragment}+ activeFragment={activeFragment}+ onExpandClick={() => setDetailsOpened(true)}+ >+ <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>+ </PanelContainer>+ )+ }++ return (+ <PanelContainer+ name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} />}+ type='props'+ setActiveFragment={setActiveFragment}+ activeFragment={activeFragment}+ onExpandClick={() => setDetailsOpened(true)}+ >+ <table className='table-fixed'>+ <thead>+ <tr className='text-gray-900 dark:text-gray-50'>+ <th+ className='flex w-4/6 cursor-pointer items-center text-left hover:opacity-90'+ onClick={() => onSortBy('event')}+ >+ {t('project.property')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'event' && sort.sortByAscend}+ sortByDescend={sort.label === 'event' && sort.sortByDescend}+ />+ </th>+ <th className='w-1/6 text-right'>+ <p className='flex cursor-pointer items-center hover:opacity-90' onClick={() => onSortBy('quantity')}>+ {t('project.quantity')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'quantity' && sort.sortByAscend}+ sortByDescend={sort.label === 'quantity' && sort.sortByDescend}+ />+ + </p>+ </th>+ <th className='w-1/6 text-right'>+ <p className='flex cursor-pointer items-center hover:opacity-90' onClick={() => onSortBy('conversion')}>+ {t('project.conversion')}+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'conversion' && sort.sortByAscend}+ sortByDescend={sort.label === 'conversion' && sort.sortByDescend}+ />+ </p>+ </th>+ </tr>+ </thead>+ <tbody>+ {_map(keysToDisplay, (tag) => (+ <tr+ key={tag}+ className='group cursor-pointer text-gray-900 hover:bg-gray-100 dark:text-gray-50 hover:dark:bg-slate-700'+ onClick={() => onFilter('tag:key', tag)}+ >+ <td className='flex items-center text-left'>+ {tag}+ <FunnelIcon className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300' />+ </td>+ <td className='text-right'>+ {processedProperties[tag]}+ + </td>+ <td className='text-right'>+ {/*+ Added a uniques === 0 check because uniques value may be zero and dividing by zero will cause an+ Infinity% value to be displayed.+ */}+ {uniques === 0 ? 100 : _round((processedProperties[tag] / uniques) * 100, 2)}%+ </td>+ </tr>+ ))}+ </tbody>+ </table>+ {/* for pagination in tabs */}+ {_size(keys) > ENTRIES_PER_CUSTOM_EVENTS_PANEL && (+ <div className='w-card-toggle-sm absolute bottom-0 sm:!w-card-toggle'>+ <div className='mb-2 flex select-none justify-between'>+ <div>+ <span className='text-xs font-light lowercase text-gray-500 dark:text-gray-200'>+ {_size(keys)} {t('project.results')}+ </span>+ <span className='text-xs font-light text-gray-500 dark:text-gray-200'>+ . {t('project.page')} {page + 1} / {totalPages}+ </span>+ </div>+ <div className='flex w-[4.5rem] justify-between'>+ <Button+ className={cx(+ 'border-none bg-gray-100 px-1.5 py-0.5 font-light text-gray-500 shadow dark:bg-slate-800 dark:text-gray-200',+ {+ 'cursor-not-allowed opacity-50': !canGoPrev(),+ 'hover:bg-gray-200 hover:dark:bg-slate-700': canGoPrev(),+ },+ )}+ type='button'+ onClick={onPrevious}+ disabled={!canGoPrev()}+ focus={false}+ >+ <ArrowLongLeftIcon className='h-5 w-5' />+ </Button>+ <Button+ className={cx(+ 'border-none bg-gray-100 px-1.5 py-0.5 font-light text-gray-500 shadow dark:bg-slate-800 dark:text-gray-200',+ {+ 'cursor-not-allowed opacity-50': !canGoNext(),+ 'hover:bg-gray-200 hover:dark:bg-slate-700': canGoNext(),+ },+ )}+ onClick={onNext}+ disabled={!canGoNext()}+ type='button'+ focus={false}+ >+ <ArrowLongRightIcon className='h-5 w-5' />+ </Button>+ </div>+ </div>+ </div>+ )}+ <Modal+ onClose={onModalClose}+ isOpened={detailsOpened}+ title={t('project.properties')}+ message={<PropertiesTable />}+ size='large'+ />+ </PanelContainer>+ )+}++const Metadata = (props: IMetadata) => {+ const [activeTab, setActiveTab] = useState<'customEv' | 'properties'>('customEv')++ if (activeTab === 'customEv') {+ return <CustomEvents {...props} setActiveTab={setActiveTab} />+ }++ return <PageProperties {...props} setActiveTab={setActiveTab} />+}+interface IPanel {name: string | JSX.Elementdata: IEntry[]@@ -823,7 +1300,6 @@ interface IPanel {valueMapper?: (value: number) => numbercapitalize?: booleanlinkContent?: boolean- t: typeof i18next.ticon: anyid: stringhideFilters?: boolean@@ -848,7 +1324,6 @@ const Panel = ({valueMapper = (value: number): number => value,capitalize,linkContent,- t,icon,id,hideFilters,@@ -865,6 +1340,7 @@ const Panel = ({filters,projectPassword,}: IPanel): JSX.Element => {+ const { t } = useTranslation('common')const [page, setPage] = useState(0)const currentIndex = page * ENTRIES_PER_PANELconst total = useMemo(() => _reduce(data, (prev, curr) => prev + curr.count, 0), [data])@@ -1196,6 +1672,6 @@ const Panel = ({}const PanelMemo = memo(Panel)-const CustomEventsMemo = memo(CustomEvents)+const MetadataMemo = memo(Metadata)-export { PanelMemo as Panel, CustomEventsMemo as CustomEvents }+export { PanelMemo as Panel, MetadataMemo as Metadata }diff --git a/app/pages/Project/View/ViewProject.helpers.tsx b/app/pages/Project/View/ViewProject.helpers.tsxindex 66dbc25c0..0456bf1c4 100644--- a/app/pages/Project/View/ViewProject.helpers.tsx+++ b/app/pages/Project/View/ViewProject.helpers.tsx@@ -20,6 +20,7 @@ import _map from 'lodash/map'import _split from 'lodash/split'import _replace from 'lodash/replace'import _isEmpty from 'lodash/isEmpty'+import _some from 'lodash/some'import _startsWith from 'lodash/startsWith'import _keys from 'lodash/keys'import _size from 'lodash/size'@@ -1446,7 +1447,40 @@ const getSettingsPerf = (const validTimeBacket = ['hour', 'day', 'week', 'month']const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']-const validFilters = ['cc', 'rg', 'ct', 'pg', 'lc', 'ref', 'dv', 'br', 'os', 'so', 'me', 'ca', 'ev']+const validFilters = [+ 'cc',+ 'rg',+ 'ct',+ 'pg',+ 'lc',+ 'ref',+ 'dv',+ 'br',+ 'os',+ 'so',+ 'me',+ 'ca',+ 'ev',+ 'tag:key',+ 'tag:value',+ 'ev:key',+ 'ev:value',+]+// dynamic filters is when a filter column starts with a specific value and is followed by some arbitrary string+// this is done to build a connnection between dynamic column and value (e.g. for custom event metadata or page properties)+const validDynamicFilters = ['ev:key:', 'tag:key:']++const isFilterValid = (filter: string, checkDynamicFilters = false) => {+ if (_includes(validFilters, filter)) {+ return true+ }++ if (checkDynamicFilters && _some(validDynamicFilters, (prefix) => _startsWith(filter, prefix))) {+ return true+ }++ return false+}export const filterInvalidViewPrefs = (prefs: any): any => {const pids = _keys(prefs)@@ -1491,6 +1525,10 @@ const typeNameMapping = (t: typeof i18next.t) => ({ca: t('project.mapping.ca'),ev: t('project.event'),userFlow: t('main.competitiveFeatures.usfl'),+ 'tag:key': t('project.metamapping.tag.key'),+ 'tag:value': t('project.metamapping.tag.value'),+ 'ev:key': t('project.metamapping.ev.key'),+ 'ev:value': t('project.metamapping.ev.value'),})const iconClassName = 'w-6 h-6'@@ -1576,7 +1614,7 @@ export {getFormatDate,panelIconMapping,typeNameMapping,- validFilters,+ isFilterValid,validPeriods,validTimeBacket,noRegionPeriods,diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsxindex 412f9b9c6..832e777b7 100644--- a/app/pages/Project/View/ViewProject.tsx+++ b/app/pages/Project/View/ViewProject.tsx@@ -137,15 +137,15 @@ import {getErrors,getError,updateErrorStatus,+ getPropertyMetadata,} from 'api'import { getChartPrediction } from 'api/ai'-import { Panel, CustomEvents } from './Panels'+import { Panel, Metadata } from './Panels'import {onCSVExportClick,getFormatDate,panelIconMapping,typeNameMapping,- validFilters,validPeriods,validTimeBacket,noRegionPeriods,@@ -164,6 +164,7 @@ import {SHORTCUTS_TIMEBUCKETS_LISTENERS,CHART_MEASURES_MAPPING_PERF,ERROR_FILTERS_MAPPING,+ isFilterValid,} from './ViewProject.helpers'import CCRow from './components/CCRow'import FunnelsList from './components/FunnelsList'@@ -192,6 +193,7 @@ import { IError } from './interfaces/error'import NoErrorDetails from './components/NoErrorDetails'import WaitingForAnError from './components/WaitingForAnError'import NoSessionDetails from './components/NoSessionDetails'+import { ICustoms, IParams, IProperties, ITrafficLogResponse } from './interfaces/traffic'const SwetrixSDK = require('@swetrix/sdk')const CUSTOM_EV_DROPDOWN_MAX_VISIBLE_LENGTH = 32@@ -351,9 +353,15 @@ const ViewProject = ({// similar areFiltersParsed and areFiltersPerfParsed but using for timeBucketconst [areTimeBucketParsed, setAreTimeBucketParsed] = useState<boolean>(false)- // panelsData is a data used for components <Panels /> and <CustomEvents />,+ // panelsData is a data used for components <Panels /> and <Metadata />,// also using for logic with custom events on chart and export data like csv- const [panelsData, setPanelsData] = useState<any>({})+ const [panelsData, setPanelsData] = useState<{+ types: (keyof IParams)[]+ data: IParams+ customs: ICustoms+ properties: IProperties+ // @ts-expect-error+ }>({})const [overall, setOverall] = useState<Partial<IOverallObject>>({})const [overallPerformance, setOverallPerformance] = useState<Partial<IOverallPerformanceObject>>({})// isPanelsDataEmpty is a true we are display components <NoEvents /> and do not show dropdowns with activeChartMetrics@@ -1176,15 +1184,12 @@ const ViewProject = ({setDataLoading(true)try {- let data: {- timeBucket?: any- chart?: any- params?: any- customs?: any- appliedFilters?: any+ let data: ITrafficLogResponse & {+ overall?: IOverallObject+ }+ let dataCompare: ITrafficLogResponse & {overall?: IOverallObject}- let dataComparelet key = ''let keyCompare = ''let from@@ -1264,6 +1269,7 @@ const ViewProject = ({}}+ // @ts-expect-errorsetProjectCache(id, dataCompare, keyCompare)}@@ -1362,19 +1368,21 @@ const ViewProject = ({return}- const { chart, params, customs, appliedFilters } = data+ const { chart, params, customs, properties, appliedFilters } = datalet newTimebucket = timeBucketsdkInstance?._emitEvent('load', sdkData)if (period === KEY_FOR_ALL_TIME && !_isEmpty(data.timeBucket)) {- // eslint-disable-next-line prefer-destructuring+ // @ts-expect-errornewTimebucket = _includes(data.timeBucket, timeBucket) ? timeBucket : data.timeBucket[0]+ // @ts-expect-errorsetPeriodPairs((prev) => {// find in prev state period === KEY_FOR_ALL_TIME and change tbsconst newPeriodPairs = _map(prev, (item) => {if (item.period === KEY_FOR_ALL_TIME) {return {...item,+ // @ts-expect-errortbs: data.timeBucket.length > 2 ? [data.timeBucket[0], data.timeBucket[1]] : data.timeBucket,}}@@ -1386,14 +1394,18 @@ const ViewProject = ({}if (!_isEmpty(appliedFilters)) {+ // @ts-expect-errorsetFilters(appliedFilters)}+ // @ts-expect-errorif (!_isEmpty(dataCompare)) {+ // @ts-expect-errorif (!_isEmpty(dataCompare?.chart)) {setDataChartCompare(dataCompare.chart)}+ // @ts-expect-errorif (!_isEmpty(dataCompare?.overall)) {setOverallCompare(dataCompare.overall)}@@ -1413,6 +1425,7 @@ const ViewProject = ({rotateXAxis,chartType,customEventsChart,+ // @ts-expect-errordataCompare?.chart,)setChartData(chart)@@ -1421,6 +1434,7 @@ const ViewProject = ({types: _keys(params),data: params,customs,+ properties,})if (activeTab === PROJECT_TABS.traffic) {@@ -1463,6 +1477,24 @@ const ViewProject = ({return getCustomEventsMetadata(id, event, timeBucket, period, '', '', timezone, projectPassword)}+ const _getPropertyMetadata = async (event: string) => {+ if (period === 'custom' && dateRange) {+ return getPropertyMetadata(+ id,+ event,+ timeBucket,+ '',+ getFormatDate(dateRange[0]),+ getFormatDate(dateRange[1]),+ filters,+ timezone,+ projectPassword,+ )+ }++ return getPropertyMetadata(id, event, timeBucket, period, '', '', filters, timezone, projectPassword)+ }+const loadError = useCallback(async (eid: string) => {setErrorLoading(true)@@ -2060,7 +2092,7 @@ const ViewProject = ({)// this funtion is used for requesting the data from the API when the filter is changed- const filterHandler = (column: string, filter: any, isExclusive = false) => {+ const filterHandler = async (column: string, filter: any, isExclusive = false) => {let newFilterslet newFiltersPerflet newFiltersSessions@@ -2170,9 +2202,9 @@ const ViewProject = ({sdkInstance?._emitEvent('filtersupdate', newFilters)if (activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf(true, newFiltersPerf)+ await loadAnalyticsPerf(true, newFiltersPerf)} else if (activeTab === PROJECT_TABS.traffic) {- loadAnalytics(true, newFilters)+ await loadAnalytics(true, newFilters)}}@@ -2712,7 +2744,7 @@ const ViewProject = ({const keyPerf = _replace(key, '_perf', '')- if (!_includes(validFilters, keyPerf)) {+ if (!isFilterValid(keyPerf)) {return}@@ -2736,7 +2768,7 @@ const ViewProject = ({const initialFilters: any[] = []// eslint-disable-next-line lodash/prefer-lodash-methodsearchParams.forEach((value, key) => {- if (!_includes(validFilters, key)) {+ if (!isFilterValid(key, true)) {return}@@ -2768,7 +2800,7 @@ const ViewProject = ({const keySess = _replace(key, '_sess', '')- if (!_includes(validFilters, keySess)) {+ if (!isFilterValid(keySess)) {return}@@ -2802,7 +2834,7 @@ const ViewProject = ({const keyErr = _replace(key, '_err', '')- if (!_includes(validFilters, keyErr)) {+ if (!isFilterValid(keyErr)) {return}@@ -3218,21 +3250,42 @@ const ViewProject = ({return conflicted}- // resetFilters using for reset filters and update url. Also using for components <NoEvents />- // its need for fix bug: when you select filter and you have not data and you can not reset filters- const resetFilters = () => {- // @ts-ignore+ const cleanURLFilters = () => {+ // @ts-expect-errorconst url = new URL(window.location)const { searchParams } = url- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {- if (!_includes(validFilters, key)) {- return++ for (const [key] of Array.from(searchParams.entries())) {+ if (!isFilterValid(key, true)) {+ continue}searchParams.delete(key)- })+ }+const { pathname, search } = url+navigate(`${pathname}${search}`)+ }++ const resetActiveTabFilters = () => {+ cleanURLFilters()++ if (activeTab === PROJECT_TABS.traffic) {+ setFilters([])+ loadAnalytics(true, [])+ } else if (activeTab === PROJECT_TABS.performance) {+ setFiltersPerf([])+ loadAnalyticsPerf(true, [])+ } else if (activeTab === PROJECT_TABS.sessions) {+ setFiltersSessions([])+ } else if (activeTab === PROJECT_TABS.errors) {+ setFiltersErrors([])+ }+ }++ const resetFilters = () => {+ cleanURLFilters()+setFilters([])setFiltersPerf([])setFiltersSessions([])@@ -4086,6 +4139,7 @@ const ViewProject = ({onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}+ resetFilters={resetActiveTabFilters}/>{(sessionsLoading === null || sessionsLoading) && _isEmpty(sessions) && <Loader />}{typeof sessionsLoading === 'boolean' && !sessionsLoading && _isEmpty(sessions) && (@@ -4158,6 +4212,7 @@ const ViewProject = ({onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}+ resetFilters={resetActiveTabFilters}/>{(errorsLoading === null || errorsLoading) && _isEmpty(errors) && <Loader />}{typeof errorsLoading === 'boolean' && !errorsLoading && _isEmpty(errors) && (@@ -4238,7 +4293,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={countryActiveTab}icon={panelIcon}id={countryActiveTab}@@ -4279,7 +4333,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4327,7 +4380,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4344,7 +4396,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}activeTab={activeTab}icon={panelIcon}@@ -4361,7 +4412,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4401,7 +4451,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4419,7 +4468,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4468,6 +4516,7 @@ const ViewProject = ({onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}+ resetFilters={resetActiveTabFilters}/>{dataLoading && (<div className='static mt-4 !bg-transparent' id='loader'>@@ -4501,7 +4550,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={countryActiveTab}icon={panelIcon}id={countryActiveTab}@@ -4543,7 +4591,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4592,7 +4639,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4610,7 +4656,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}activeTab={activeTab}icon={panelIcon}@@ -4628,7 +4673,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4649,7 +4693,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={utmActiveTab}icon={panelIcon}id={utmActiveTab}@@ -4668,7 +4711,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4709,7 +4751,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4728,7 +4769,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4740,16 +4780,16 @@ const ViewProject = ({/>)})}- {!_isEmpty(panelsData.customs) && (- <CustomEvents- t={t}- customs={panelsData.customs}- onFilter={filterHandler}- chartData={chartData}- customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}- getCustomEventMetadata={getCustomEventMetadata}- />- )}+ <Metadata+ customs={panelsData.customs}+ properties={panelsData.properties}+ filters={filters}+ onFilter={filterHandler}+ chartData={chartData}+ customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}+ getCustomEventMetadata={getCustomEventMetadata}+ getPropertyMetadata={_getPropertyMetadata}+ /></div></div>)}@@ -4774,6 +4814,7 @@ const ViewProject = ({onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}+ resetFilters={resetActiveTabFilters}/>{dataLoading && (<div className='static mt-4 !bg-transparent' id='loader'>@@ -4807,7 +4848,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={countryActiveTab}icon={panelIcon}id={countryActiveTab}@@ -4827,7 +4867,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4847,7 +4886,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4895,7 +4933,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}@@ -4914,7 +4951,6 @@ const ViewProject = ({return (<PanelprojectPassword={projectPassword}- t={t}key={type}icon={panelIcon}id={type}diff --git a/app/pages/Project/View/components/CustomEventsDropdown.tsx b/app/pages/Project/View/components/CustomEventsDropdown.tsxnew file mode 100644index 000000000..b5c1695d6--- /dev/null+++ b/app/pages/Project/View/components/CustomEventsDropdown.tsx@@ -0,0 +1,62 @@+import React, { useState } from 'react'+import _map from 'lodash/map'+import { useTranslation } from 'react-i18next'+// @ts-ignore+import OutsideClickHandler from 'react-outside-click-handler'+import { ChevronDownIcon, ChevronUpIcon, XMarkIcon } from '@heroicons/react/24/outline'++interface ICustomEventsDropdown {+ onSelect: any+ title: string+}++const OPTIONS = [+ {+ label: 'project.customEv',+ value: 'customEv',+ },+ {+ label: 'project.properties',+ value: 'properties',+ },+]++const CustomEventsDropdown = ({ onSelect, title }: ICustomEventsDropdown): JSX.Element => {+ const { t } = useTranslation()+ const [show, setShow] = useState<boolean>(false)++ const _onSelect = (value: string) => {+ onSelect(value)+ setShow(false)+ }++ return (+ <OutsideClickHandler onOutsideClick={() => setShow(false)}>+ <span className='cursor-pointer' onClick={() => setShow(!show)}>+ {title} {show ? <ChevronUpIcon className='inline h-4 w-4' /> : <ChevronDownIcon className='inline h-4 w-4' />}+ </span>+ {show && (+ <div className='top-15 absolute left-5 z-10 mt-2 max-h-[200px] min-w-[250px] overflow-auto rounded-md border border-gray-200 bg-white text-gray-900 shadow-lg dark:border-slate-700/50 dark:bg-slate-900'>+ <div className='flex w-full flex-col p-2'>+ <p className='px-1 text-sm font-semibold text-gray-900 dark:text-gray-50'>{t('project.metadata')}</p>+ {_map(OPTIONS, ({ label, value }) => (+ <div+ key={label}+ onClick={() => _onSelect(value)}+ className='flex w-full cursor-pointer flex-row items-center justify-between px-1 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:bg-slate-900 dark:text-gray-200 dark:hover:bg-slate-800'+ >+ <p>{t(label)}</p>+ </div>+ ))}+ </div>+ <XMarkIcon+ className='absolute right-2 top-2 h-5 w-5 cursor-pointer text-gray-900 dark:text-gray-50'+ onClick={() => setShow(!show)}+ />+ </div>+ )}+ </OutsideClickHandler>+ )+}++export default CustomEventsDropdowndiff --git a/app/pages/Project/View/components/Filters.tsx b/app/pages/Project/View/components/Filters.tsxindex 47848a7b5..4ca30a9df 100644--- a/app/pages/Project/View/components/Filters.tsx+++ b/app/pages/Project/View/components/Filters.tsx@@ -1,8 +1,12 @@+import { FunnelIcon, XMarkIcon } from '@heroicons/react/24/outline'import React, { memo } from 'react'import type i18next from 'i18next'import cx from 'clsx'import _truncate from 'lodash/truncate'+import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'+import _startsWith from 'lodash/startsWith'+import _replace from 'lodash/replace'import { useTranslation } from 'react-i18next'import countries from 'utils/isoCountries'@@ -39,7 +43,7 @@ export const Filter = ({canChangeExclusive,removable,}: IFilter): JSX.Element => {- const displayColumn = tnMapping[column]+ let displayColumn = tnMapping[column]let displayFilter = filterif (column === 'cc') {@@ -54,13 +58,27 @@ export const Filter = ({displayFilter = getLocaleDisplayName(displayFilter, language)}+ if (_startsWith(column, 'ev:key:')) {+ const key = _replace(column, /^ev:key:/, '')+ displayColumn = t('project.metamapping.ev.dynamicKey', {+ key,+ })+ }++ if (_startsWith(column, 'tag:key:')) {+ const key = _replace(column, /^tag:key:/, '')+ displayColumn = t('project.metamapping.tag.dynamicKey', {+ key,+ })+ }+const truncatedFilter = _truncate(displayFilter)return (<spantitle={truncatedFilter === displayFilter ? undefined : displayFilter}className={cx(- 'mr-2 mt-2 inline-flex items-center rounded-md bg-gray-200 py-0.5 pl-2.5 pr-1 text-sm font-medium text-gray-800 dark:bg-slate-800 dark:text-gray-50',+ 'm-1 inline-flex items-center rounded-md bg-gray-50 py-0.5 pl-2.5 pr-1 text-sm font-medium text-gray-800 dark:bg-slate-800 dark:text-gray-50',{'pr-2': !removable,},@@ -108,34 +126,48 @@ interface IFilters {// eslint-disable-next-line no-shadowonChangeExclusive: (column: string, filter: string, isExclusive: boolean) => voidtnMapping: Record<string, string>+ resetFilters: () => void}-const Filters = ({ filters, onRemoveFilter, onChangeExclusive, tnMapping }: IFilters) => {+const Filters = ({ filters, onRemoveFilter, onChangeExclusive, tnMapping, resetFilters }: IFilters) => {const {t,i18n: { language },} = useTranslation('common')+ if (_isEmpty(filters)) {+ return null+ }+return (- <div className='-mt-2 flex flex-wrap justify-center md:justify-start'>- {_map(filters, (props) => {- const { column, filter } = props- const key = `${column}${filter}`-- return (- <Filter- key={key}- onRemoveFilter={onRemoveFilter}- onChangeExclusive={onChangeExclusive}- language={language}- t={t}- tnMapping={tnMapping}- canChangeExclusive- removable- {...props}- />- )- })}+ <div className='flex items-center justify-between rounded-md bg-slate-200 p-1 shadow dark:border dark:border-slate-800/50 dark:bg-slate-800/25'>+ <div className=' flex items-center'>+ <FunnelIcon className='box-content size-6 flex-shrink-0 px-1 text-gray-700 dark:text-gray-200' />+ <div className='flex flex-wrap'>+ {_map(filters, (props) => {+ const { column, filter } = props+ const key = `${column}${filter}`++ return (+ <Filter+ key={key}+ onRemoveFilter={onRemoveFilter}+ onChangeExclusive={onChangeExclusive}+ language={language}+ t={t}+ tnMapping={tnMapping}+ canChangeExclusive+ removable+ {...props}+ />+ )+ })}+ </div>+ </div>+ <XMarkIcon+ className='box-content size-6 flex-shrink-0 cursor-pointer stroke-2 px-1 text-gray-800 hover:text-gray-600 dark:text-gray-200 dark:hover:text-gray-300'+ onClick={resetFilters}+ /></div>)}diff --git a/app/pages/Project/View/components/NoEvents.tsx b/app/pages/Project/View/components/NoEvents.tsxindex 2a1896f71..4cac39f19 100644--- a/app/pages/Project/View/components/NoEvents.tsx+++ b/app/pages/Project/View/components/NoEvents.tsx@@ -3,13 +3,10 @@ import { useTranslation } from 'react-i18next'import _isEmpty from 'lodash/isEmpty'import Button from 'ui/Button'+import { IFilter } from '../interfaces/traffic'interface INoEvents {- filters: {- column: string- filter: string- isExclusive: boolean- }[]+ filters: IFilter[]resetFilters: () => void}diff --git a/app/pages/Project/View/components/SearchFilters.tsx b/app/pages/Project/View/components/SearchFilters.tsxindex 343211d3d..37c532e21 100644--- a/app/pages/Project/View/components/SearchFilters.tsx+++ b/app/pages/Project/View/components/SearchFilters.tsx@@ -13,6 +13,7 @@ import { FILTERS_PANELS_ORDER, ERRORS_FILTERS_PANELS_ORDER } from 'redux/constanimport countries from 'utils/isoCountries'import { getFilters, getErrorsFilters } from 'api'import { Filter } from './Filters'+import { IFilter } from '../interfaces/traffic'interface ISearchFilters {projectPassword?: string@@ -27,11 +28,7 @@ interface ISearchFilters {showModal: booleansetShowModal: (show: boolean) => voidtnMapping: Record<string, string>- filters: {- column: string- filter: string- isExclusive: boolean- }[]+ filters: IFilter[]type: 'traffic' | 'errors'}diff --git a/app/pages/Project/View/interfaces/traffic.tsx b/app/pages/Project/View/interfaces/traffic.tsxnew file mode 100644index 000000000..7818cd5fa--- /dev/null+++ b/app/pages/Project/View/interfaces/traffic.tsx@@ -0,0 +1,36 @@+export interface IFilter {+ column: string+ filter: string+ isExclusive: boolean+}++interface IParam {+ name: string+ count: number+}++export interface IParams {+ [key: string]: IParam[]+}++export interface ICustoms {+ [key: string]: number+}++export interface IProperties {+ [key: string]: number+}++export interface ITrafficLogResponse {+ params?: IParams+ chart?: {+ x: string[]+ visits: number[]+ uniques: number[]+ sdur: number[]+ }+ customs: ICustoms+ properties: IProperties+ appliedFilters?: IFilter[]+ timeBucket?: string[]+}diff --git a/package.json b/package.jsonindex 8df7a05e7..09c65a8d4 100644--- a/package.json+++ b/package.json@@ -65,7 +65,7 @@"remix-sitemap": "^3.2.0","remix-utils": "^7.6.0","spacetime": "^7.6.0",- "swetrix": "^3.1.1",+ "swetrix": "^3.2.0","timezone-soft": "^1.5.2"},"eslintConfig": {diff --git a/public/locales/en.json b/public/locales/en.jsonindex 6d4c8fb9e..ce555d19a 100644--- a/public/locales/en.json+++ b/public/locales/en.json@@ -635,6 +635,7 @@"support": "Contact support"},"project": {+ "metadata": "Metadata","search": "Search","loadMore": "Load more","unknownCountry": "Unknown country",@@ -704,6 +705,18 @@"me": "UTM Medium","ca": "UTM Campaign"},+ "metamapping": {+ "ev": {+ "key": "Event key",+ "value": "Event value",+ "dynamicKey": "Event key \"{{key}}\""+ },+ "tag": {+ "key": "Property",+ "value": "Property value",+ "dynamicKey": "Property \"{{key}}\""+ }+ },"redactedPage": "Redacted page","noData": "No data to display","overview": "Overview",@@ -715,6 +728,8 @@"conversion": "Conversion","ratio": "Ratio","customEv": "Custom events",+ "properties": "Properties",+ "property": "Property","noParamData": "No data for this parameter yet","conflictMetric": "The metric you selected conflicts with an already selected one","prev": "Previous",