Skip to content

📈 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!

combine properties & custom event components; simplify extension logic

Blue Mouse2c8efbf24399
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index a94573833..fe79f1bb5 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -19,7 +19,7 @@ import _slice from 'lodash/slice'
import _sortBy from 'lodash/sortBy'
import _sum from 'lodash/sum'
import _toPairs from 'lodash/toPairs'
-import { FilterIcon, PuzzleIcon, ScanIcon } from 'lucide-react'
+import { FilterIcon, ScanIcon } from 'lucide-react'
import React, { memo, useState, useEffect, useMemo, Fragment } from 'react'
import { useTranslation } from 'react-i18next'
import { Link, LinkProps, useNavigate } from 'react-router'
@@ -33,50 +33,13 @@ import Spin from '~/ui/icons/Spin'
import Modal from '~/ui/Modal'
import { nFormatter } from '~/utils/generic'
-import CustomEventsDropdown from './components/CustomEventsDropdown'
import { Customs, Filter, Properties } from './interfaces/traffic'
import { useViewProjectContext } from './ViewProject'
-import { iconClassName, typeNameMapping } from './ViewProject.helpers'
+import { typeNameMapping } from './ViewProject.helpers'
const ENTRIES_PER_PANEL = 8
const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 7
-// function that checks if there are custom tabs for a specific type
-const checkCustomTabs = (panelID: string, customTabs: CustomTab[]) => {
- if (_isEmpty(customTabs)) return false
-
- return Boolean(_find(customTabs, (el) => el.panelID === panelID))
-}
-
-const removeDuplicates = (arr: any[], keys: string[]) => {
- const uniqueObjects: any[] = []
-
- const isDuplicate = (obj: any) => {
- for (const uniqueObj of uniqueObjects) {
- let isMatch = true
-
- for (const key of keys) {
- if (uniqueObj[key] !== obj[key]) {
- isMatch = false
- break
- }
- }
- if (isMatch) {
- return true
- }
- }
- return false
- }
-
- for (const obj of arr) {
- if (!isDuplicate(obj)) {
- uniqueObjects.push(obj)
- }
- }
-
- return uniqueObjects
-}
-
interface PanelContainerProps {
name: React.ReactNode
children?: React.ReactNode
@@ -84,8 +47,6 @@ interface PanelContainerProps {
type: string
activeFragment?: number | string
setActiveFragment?: (arg: number) => void
- customTabs?: CustomTab[]
- isCustomContent?: boolean
tabs?: Array<
| {
id: string
@@ -109,20 +70,60 @@ const PanelContainer = ({
type,
activeFragment = 0,
setActiveFragment = () => {},
- customTabs = [],
- isCustomContent,
tabs,
onTabChange,
activeTabId,
}: PanelContainerProps) => {
+ const { customPanelTabs } = useViewProjectContext()
const { t } = useTranslation('common')
+ const panelExtensions = useMemo(() => {
+ return customPanelTabs.filter((tab) => tab.panelID === type)
+ }, [customPanelTabs, type])
+
+ const panelTabs = useMemo(() => {
+ if (panelExtensions.length === 0) {
+ return tabs
+ }
+
+ const panelTabs = [...(tabs || [])]
+
+ if (panelTabs.length === 0) {
+ panelTabs.push({
+ id: 'default',
+ label: 'Data',
+ hasData: true,
+ })
+ }
+
+ return [
+ ...panelTabs,
+ ...panelExtensions.map((tab) => ({
+ id: tab.extensionID,
+ label: 'Addon',
+ hasData: true,
+ })),
+ ]
+ }, [panelExtensions, tabs])
+
+ const contentRenderer = () => {
+ const { extensionID, tabContent } =
+ _find(panelExtensions, (tab) => tab.extensionID === activeTabId) || ({} as CustomTab)
+
+ if (extensionID) {
+ // Using this instead of dangerouslySetInnerHTML to support script tags
+ return <InnerHTML className='absolute overflow-auto' html={tabContent || ''} />
+ }
+
+ return children
+ }
+
return (
<div
className={cx(
'h-[26rem] overflow-hidden rounded-lg border border-gray-300 bg-white px-4 py-5 dark:border-slate-800/60 dark:bg-slate-800/25',
{
- 'col-span-2': ['ce', 'props'].includes(type),
+ 'col-span-2': ['ce', 'props', 'metadata'].includes(type),
},
)}
>
@@ -132,9 +133,9 @@ const PanelContainer = ({
{name}
</h3>
<div className='scrollbar-thin flex items-center gap-2.5'>
- {tabs && onTabChange ? (
+ {panelTabs && onTabChange ? (
<>
- {tabs.map((tab, index) => {
+ {panelTabs.map((tab, index) => {
if (Array.isArray(tab)) {
const dropdownTabs = tab
const activeDropdownTab = dropdownTabs.find((t) => t.id === activeTabId)
@@ -192,55 +193,10 @@ const PanelContainer = ({
)
})}
</>
- ) : (
- <>
- {checkCustomTabs(type, customTabs) ? (
- <>
- {/* This is a temp fix to prevent multiple tabs of the same extensionID be displayed */}
- {/* TODO: Investigate the issue and fix it */}
- {_map(
- removeDuplicates(customTabs, ['extensionID', 'panelID']),
- ({ extensionID, panelID, onOpen }) => {
- if (panelID !== type) return null
-
- const onClick = () => {
- onOpen?.()
- setActiveFragment(extensionID)
- }
-
- return (
- <button
- type='button'
- key={`${extensionID}-${panelID}`}
- onClick={onClick}
- aria-label='Switch to custom tab'
- className='ml-1 rounded-md p-1 hover:bg-gray-50 dark:hover:bg-slate-700'
- >
- <PuzzleIcon
- className={cx(iconClassName, {
- 'text-slate-900 dark:text-gray-50': activeFragment === extensionID,
- 'text-slate-400 dark:text-slate-500': activeFragment === 0,
- })}
- strokeWidth={1.5}
- />
- </button>
- )
- },
- )}
- </>
- ) : null}
- </>
- )}
+ ) : null}
</div>
</div>
- {/* for other tabs */}
- <div
- className={cx('flex h-full flex-col overflow-x-auto', {
- relative: isCustomContent,
- })}
- >
- {children}
- </div>
+ <div className='relative flex h-full flex-col overflow-x-auto'>{contentRenderer()}</div>
</div>
)
}
@@ -259,24 +215,9 @@ interface MetadataProps {
filters: Filter[]
getCustomEventMetadata: (event: string) => Promise<any>
getPropertyMetadata: (property: string) => Promise<any>
- customTabs: CustomTab[]
getFilterLink: (column: string, value: string) => LinkProps['to']
-}
-
-interface CustomEventsProps extends MetadataProps {
- setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>
- dataKeys: {
- properties: string[]
- customEv: string[]
- }
-}
-
-interface PagePropertiesProps extends MetadataProps {
- setActiveTab: React.Dispatch<React.SetStateAction<'customEv' | 'properties'>>
- dataKeys: {
- properties: string[]
- customEv: string[]
- }
+ onTabChange: (tab: string) => void
+ activeTabId: string
}
interface SortRows {
@@ -476,32 +417,29 @@ function sortDesc<T>(obj: T, sortByKeys?: boolean): T {
) as T
}
-const CustomEvents = ({
+const Metadata = ({
customs,
+ properties,
chartData,
filters,
- customTabs = [],
getCustomEventMetadata,
- setActiveTab,
+ getPropertyMetadata,
getFilterLink,
- dataKeys,
-}: CustomEventsProps) => {
+ onTabChange,
+ activeTabId,
+}: MetadataProps) => {
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 [eventsData, setEventsData] = useState<any>(customs)
const [triggerEventWhenFiltersChange, setTriggerEventWhenFiltersChange] = useState<string | null>(null)
- const currentIndex = page * ENTRIES_PER_CUSTOM_EVENTS_PANEL
- const keys = _keys(customsEventsData)
- const keysToDisplay = useMemo(
- () => _slice(keys, currentIndex, currentIndex + ENTRIES_PER_CUSTOM_EVENTS_PANEL),
- [keys, currentIndex],
- )
+
+ const keys = _keys(eventsData)
+ const keysToDisplay = useMemo(() => _slice(keys, 0, ENTRIES_PER_CUSTOM_EVENTS_PANEL), [keys])
+
const uniques = _sum(chartData.uniques)
- const [activeFragment, setActiveFragment] = useState(0)
const [sort, setSort] = useState<SortRows>({
label: 'quantity',
sortByAscend: false,
@@ -509,39 +447,52 @@ const CustomEvents = ({
})
const navigate = useNavigate()
- useEffect(() => {
- const sizeKeys = _size(keys)
-
- if (currentIndex > sizeKeys) {
- setPage(_floor(sizeKeys / ENTRIES_PER_CUSTOM_EVENTS_PANEL))
+ const dataKeys = useMemo(() => {
+ return {
+ properties: Object.keys(properties || {}),
+ customEv: Object.keys(customs || {}),
}
- }, [currentIndex, keys])
+ }, [properties, customs])
+
+ const tabs = [
+ {
+ id: 'ce',
+ label: t('project.customEv'),
+ hasData: dataKeys.customEv.length > 0,
+ },
+ {
+ id: 'props',
+ label: t('project.properties'),
+ hasData: dataKeys.properties.length > 0,
+ },
+ ]
useEffect(() => {
- setCustomsEventsData(customs)
+ if (activeTabId === 'ce') {
+ setEventsData(customs)
+ } else {
+ setEventsData(properties)
+ }
+
setSort({
label: 'quantity',
sortByAscend: false,
sortByDescend: false,
})
- }, [customs])
-
- useEffect(() => {
- setPage(0)
- }, [chartData])
+ }, [customs, properties, activeTabId])
useEffect(() => {
if (!triggerEventWhenFiltersChange) {
return
}
- toggleEventMetadata(triggerEventWhenFiltersChange)()
+ toggleDetails(triggerEventWhenFiltersChange)()
setTriggerEventWhenFiltersChange(null)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [filters, triggerEventWhenFiltersChange])
// is "e" is not set, then details loading is forced and all checks are skipped
- const toggleEventMetadata = (ev: string) => async (e?: React.MouseEvent<HTMLTableRowElement>) => {
+ const toggleDetails = (ev: string) => async (e?: React.MouseEvent<HTMLTableRowElement>) => {
if (e) {
e.stopPropagation()
@@ -558,13 +509,15 @@ const CustomEvents = ({
}))
try {
- const { result } = await getCustomEventMetadata(ev)
+ const fn = activeTabId === 'ce' ? getCustomEventMetadata : getPropertyMetadata
+
+ const { result } = await fn(ev)
setEventsMetadata((metadata: any) => ({
...metadata,
[ev]: result,
}))
} catch (reason) {
- console.error(`[ERROR](toggleEventMetadata) Failed to get metadata for event ${ev}`, reason)
+ console.error(`[ERROR](toggleDetails) Failed to get metadata for event ${ev}`, reason)
setEventsMetadata((metadata: any) => ({
...metadata,
[ev]: [],
@@ -592,7 +545,7 @@ const CustomEvents = ({
const sortByKeys = label === 'event'
if (sort.sortByAscend) {
- setCustomsEventsData(sortDesc(customsEventsData, sortByKeys))
+ setEventsData(sortDesc(eventsData, sortByKeys))
setSort({
label,
sortByAscend: false,
@@ -602,7 +555,7 @@ const CustomEvents = ({
}
if (sort.sortByDescend) {
- setCustomsEventsData(customs)
+ setEventsData(eventsData)
setSort({
label,
sortByAscend: false,
@@ -611,7 +564,7 @@ const CustomEvents = ({
return
}
- setCustomsEventsData(sortAsc(customsEventsData, sortByKeys))
+ setEventsData(sortAsc(eventsData, sortByKeys))
setSort({
label,
sortByAscend: true,
@@ -619,6 +572,13 @@ const CustomEvents = ({
})
}
+ const _getFilterLink = (column: string | null, value: string) => {
+ if (activeTabId === 'ce') {
+ return getFilterLink('ev' + (column ? `:key:${column}` : ''), value)
+ }
+ return getFilterLink('tag:key' + (column ? `:${column}` : ''), value)
+ }
+
const CustomEventsTable = () => (
<div className='overflow-y-auto'>
<table className='w-full border-separate border-spacing-y-1'>
@@ -674,7 +634,7 @@ const CustomEvents = ({
'animate-pulse bg-gray-100 dark:bg-slate-700': loadingEvents[ev],
},
)}
- onClick={toggleEventMetadata(ev)}
+ onClick={toggleDetails(ev)}
>
<td className='flex items-center py-1 text-left'>
{loadingEvents[ev] ? (
@@ -687,11 +647,11 @@ const CustomEvents = ({
{ev}
</td>
<td className='py-1 text-right'>
- {customsEventsData[ev]}
+ {eventsData[ev]}
&nbsp;&nbsp;
</td>
<td className='py-1 pr-2 text-right'>
- {uniques === 0 ? 100 : _round((customsEventsData[ev] / uniques) * 100, 2)}%
+ {uniques === 0 ? 100 : _round((eventsData[ev] / uniques) * 100, 2)}%
</td>
</tr>
{activeEvents[ev] && !loadingEvents[ev] ? (
@@ -701,7 +661,7 @@ const CustomEvents = ({
data={eventsMetadata[ev]}
uniques={uniques}
onClick={async (key, value) => {
- const link = getFilterLink(`ev:key:${key}`, value)
+ const link = _getFilterLink(key, value)
navigate(link)
setTriggerEventWhenFiltersChange(ev)
}}
@@ -717,50 +677,12 @@ const CustomEvents = ({
</div>
)
- if (_isEmpty(customs)) {
- return (
- <PanelContainer
- // @ts-expect-error - onSelect not typed
- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}
- type='ce'
- setActiveFragment={setActiveFragment}
- activeFragment={activeFragment}
- >
- <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>
- </PanelContainer>
- )
- }
-
- // Showing custom tabs (Extensions Marketplace)
- // todo: check activeFragment for being equal to customTabs -> extensionID + panelID
- if (!_isEmpty(customTabs) && typeof activeFragment === 'string') {
- const { tabContent } = _find(customTabs, (tab) => tab.extensionID === activeFragment) || ({} as CustomTab)
+ const renderTabContent = () => {
+ if (_isEmpty(eventsData)) {
+ return <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>
+ }
return (
- <PanelContainer
- // @ts-expect-error - onSelect not typed
- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}
- type='ce'
- activeFragment={activeFragment}
- setActiveFragment={setActiveFragment}
- customTabs={customTabs}
- isCustomContent
- >
- {/* Using this instead of dangerouslySetInnerHTML to support script tags */}
- {tabContent ? <InnerHTML className='absolute overflow-auto' html={tabContent} /> : null}
- </PanelContainer>
- )
- }
-
- return (
- <PanelContainer
- customTabs={customTabs}
- // @ts-expect-error - onSelect not typed
- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.customEv')} data={dataKeys} />}
- type='ce'
- setActiveFragment={setActiveFragment}
- activeFragment={activeFragment}
- >
<>
<div className='mb-1 flex items-center justify-between px-1 py-1'>
<span className='w-4/6 text-sm font-medium text-gray-600 dark:text-gray-400'>{t('project.event')}</span>
@@ -775,15 +697,15 @@ const CustomEvents = ({
<div className='space-y-0.5'>
{_map(
_orderBy(
- keysToDisplay.map((ev) => ({ key: ev, value: customsEventsData[ev] })),
+ keysToDisplay.map((ev) => ({ key: ev, value: eventsData[ev] })),
'value',
'desc',
),
(item) => {
const ev = item.key
- const perc = uniques === 0 ? 100 : _round((customsEventsData[ev] / uniques) * 100, 2)
- const maxValue = Math.max(...(Object.values(customsEventsData) as number[]))
- const link = getFilterLink('ev', ev)
+ const perc = uniques === 0 ? 100 : _round((eventsData[ev] / uniques) * 100, 2)
+ const maxValue = Math.max(...(Object.values(eventsData) as number[]))
+ const link = _getFilterLink(null, ev)
return (
<div
@@ -796,7 +718,7 @@ const CustomEvents = ({
<div
className='absolute inset-0 rounded-sm bg-blue-50 dark:bg-blue-900/10'
style={{
- width: `${(customsEventsData[ev] / maxValue) * 100}%`,
+ width: `${(eventsData[ev] / maxValue) * 100}%`,
}}
/>
@@ -809,7 +731,7 @@ const CustomEvents = ({
<div className='ml-2 h-4 w-4 group-hover:hidden' />
</div>
<div className='relative z-10 w-1/6 text-right'>
- <span className='text-sm font-medium text-gray-900 dark:text-gray-50'>{customsEventsData[ev]}</span>
+ <span className='text-sm font-medium text-gray-900 dark:text-gray-50'>{eventsData[ev]}</span>
</div>
<div className='relative z-10 w-1/6 text-right'>
<span className='text-sm font-medium text-gray-900 dark:text-gray-50'>{perc}%</span>
@@ -828,376 +750,30 @@ const CustomEvents = ({
<ScanIcon className='mr-1.5 size-4' />
<span>{t('common.details')}</span>
</Button>
+ <Modal
+ onClose={onModalClose}
+ isOpened={detailsOpened}
+ title={t('project.customEv')}
+ message={<CustomEventsTable />}
+ size='large'
+ />
</>
- <Modal
- onClose={onModalClose}
- isOpened={detailsOpened}
- title={t('project.customEv')}
- message={<CustomEventsTable />}
- size='large'
- />
- </PanelContainer>
- )
-}
-
-const PageProperties = ({
- properties,
- chartData,
- filters,
- getPropertyMetadata,
- setActiveTab,
- getFilterLink,
- dataKeys,
-}: PagePropertiesProps) => {
- 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<Properties>(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(0)
- const [triggerTagWhenFiltersChange, setTriggerTagWhenFiltersChange] = useState<string | null>(null)
- const [sort, setSort] = useState<SortRows>({
- label: 'quantity',
- sortByAscend: false,
- sortByDescend: false,
- })
- const navigate = useNavigate()
-
- 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])
-
- 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 : null}
- sortByDescend={sort.label === 'event' ? sort.sortByDescend : null}
- />
- </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 : null}
- sortByDescend={sort.label === 'quantity' ? sort.sortByDescend : null}
- />
- &nbsp;&nbsp;
- </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 : null}
- sortByDescend={sort.label === 'conversion' ? sort.sortByDescend : null}
- />
- </p>
- </th>
- </tr>
- </thead>
- <tbody>
- {_map(keys, (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='mr-2 ml-1' />
- ) : activeProperties[tag] ? (
- <ChevronUpIcon className='h-5 w-auto pr-2 pl-1 text-gray-500 hover:opacity-80 dark:text-gray-300' />
- ) : (
- <ChevronDownIcon className='h-5 w-auto pr-2 pl-1 text-gray-500 hover:opacity-80 dark:text-gray-300' />
- )}
- {tag}
- </td>
- <td className='py-1 text-right'>
- {processedProperties[tag]}
- &nbsp;&nbsp;
- </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}>
- <KVTableContainer
- data={details[tag]}
- uniques={uniques}
- onClick={async (key, value) => {
- const link = getFilterLink(`tag:key:${key}`, value)
- navigate(link)
- setTriggerTagWhenFiltersChange(tag)
- }}
- />
- </td>
- </tr>
- ) : null}
- </Fragment>
- ))}
- </tbody>
- </table>
- </div>
- )
-
- if (_isEmpty(properties)) {
- return (
- <PanelContainer
- // @ts-expect-error - onSelect not typed
- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} data={dataKeys} />}
- type='props'
- setActiveFragment={setActiveFragment}
- activeFragment={activeFragment}
- >
- <p className='mt-1 text-base text-gray-700 dark:text-gray-300'>{t('project.noParamData')}</p>
- </PanelContainer>
)
}
return (
<PanelContainer
- // @ts-expect-error - onSelect not typed
- name={<CustomEventsDropdown onSelect={setActiveTab} title={t('project.properties')} data={dataKeys} />}
- type='props'
- setActiveFragment={setActiveFragment}
- activeFragment={activeFragment}
+ name={t('project.metadata')}
+ type='metadata'
+ tabs={tabs}
+ onTabChange={onTabChange}
+ activeTabId={activeTabId}
>
- <>
- <div className='mb-1 flex items-center justify-between px-1 py-1'>
- <span className='w-4/6 text-sm font-medium text-gray-600 dark:text-gray-400'>{t('project.property')}</span>
- <span className='w-1/6 text-right text-sm font-medium text-gray-600 dark:text-gray-400'>
- {t('project.quantity')}
- </span>
- <span className='w-1/6 text-right text-sm font-medium text-gray-600 dark:text-gray-400'>
- {t('project.conversion')}
- </span>
- </div>
-
- <div className='space-y-0.5'>
- {_map(
- _orderBy(
- keysToDisplay.map((tag) => ({ key: tag, value: processedProperties[tag] })),
- 'value',
- 'desc',
- ),
- (item) => {
- const tag = item.key
- const perc = uniques === 0 ? 100 : _round((processedProperties[tag] / uniques) * 100, 2)
- const link = getFilterLink('tag:key', tag)
-
- return (
- <div
- key={`${tag}-${item.value}`}
- className='group relative flex cursor-pointer items-center rounded-sm px-1 py-1.5 hover:bg-gray-50 dark:text-gray-50 hover:dark:bg-slate-800'
- onClick={() => {
- navigate(link)
- }}
- >
- <div
- className='absolute inset-0 rounded-sm bg-blue-50 dark:bg-blue-900/10'
- style={{
- width: `${(processedProperties[tag] / Math.max(...Object.values(processedProperties))) * 100}%`,
- }}
- />
-
- <div className='relative z-10 flex w-4/6 min-w-0 items-center'>
- <span className='flex items-center truncate text-sm text-gray-900 dark:text-gray-100'>{tag}</span>
- <FilterIcon
- className='ml-2 hidden h-4 w-4 text-gray-500 group-hover:block dark:text-gray-300'
- strokeWidth={1.5}
- />
- <div className='ml-2 h-4 w-4 group-hover:hidden' />
- </div>
- <div className='relative z-10 w-1/6 text-right'>
- <span className='text-sm font-medium text-gray-900 dark:text-gray-50'>
- {processedProperties[tag]}
- </span>
- </div>
- <div className='relative z-10 w-1/6 text-right'>
- <span className='text-sm font-medium text-gray-900 dark:text-gray-50'>{perc}%</span>
- </div>
- </div>
- )
- },
- )}
- </div>
- <Button
- className='mx-auto mt-2 max-w-max border border-gray-300 bg-white px-3 py-2 text-sm font-medium text-gray-700 hover:bg-gray-50 dark:border-slate-800/50 dark:bg-slate-800 dark:text-gray-200 hover:dark:bg-slate-700'
- type='button'
- onClick={() => setDetailsOpened(true)}
- focus={false}
- >
- <ScanIcon className='mr-1.5 size-4' />
- <span>{t('common.details')}</span>
- </Button>
- </>
- <Modal
- onClose={onModalClose}
- isOpened={detailsOpened}
- title={t('project.properties')}
- message={<PropertiesTable />}
- size='large'
- />
+ {renderTabContent()}
</PanelContainer>
)
}
-const Metadata = (props: MetadataProps) => {
- const [activeTab, setActiveTab] = useState<'customEv' | 'properties'>('customEv')
-
- const dataKeys = useMemo(() => {
- return {
- properties: Object.keys(props.properties || {}),
- customEv: Object.keys(props.customs || {}),
- }
- }, [props.properties, props.customs])
-
- if (activeTab === 'customEv') {
- return <CustomEvents {...props} dataKeys={dataKeys} setActiveTab={setActiveTab} />
- }
-
- return <PageProperties {...props} dataKeys={dataKeys} setActiveTab={setActiveTab} />
-}
-
interface FilterWrapperProps {
children: React.ReactNode
as: 'Link' | 'div'
@@ -1227,7 +803,6 @@ interface PanelProps {
icon: any
id: string
hideFilters?: boolean
- customTabs?: CustomTab[]
onFragmentChange?: (arg: number) => void
getFilterLink?: (column: string, value: string) => LinkProps['to']
tabs?: Array<
@@ -1259,7 +834,6 @@ const Panel = ({
icon,
id,
hideFilters,
- customTabs = [],
onFragmentChange = () => {},
getFilterLink = () => '',
tabs,
@@ -1453,30 +1027,6 @@ const Panel = ({
</div>
)
- // Showing custom tabs (Extensions Marketplace)
- // todo: check activeFragment for being equal to customTabs -> extensionID + panelID
- if (!_isEmpty(customTabs) && typeof activeFragment === 'string' && !_isEmpty(data)) {
- const { tabContent } = _find(customTabs, (tab) => tab.extensionID === activeFragment) || ({} as CustomTab)
-
- return (
- <PanelContainer
- name={name}
- icon={icon}
- type={id}
- activeFragment={activeFragment}
- setActiveFragment={_setActiveFragment}
- customTabs={customTabs}
- isCustomContent
- tabs={tabs}
- onTabChange={onTabChange}
- activeTabId={activeTabId}
- >
- {/* Using this instead of dangerouslySetInnerHTML to support script tags */}
- {tabContent ? <InnerHTML className='absolute overflow-auto' html={tabContent} /> : null}
- </PanelContainer>
- )
- }
-
return (
<PanelContainer
name={name}
@@ -1484,7 +1034,6 @@ const Panel = ({
type={id}
activeFragment={activeFragment}
setActiveFragment={_setActiveFragment}
- customTabs={customTabs}
tabs={tabs}
onTabChange={onTabChange}
activeTabId={activeTabId}
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index bf0eb1856..b7d3846f3 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -122,7 +122,13 @@ import LoadingBar from '~/ui/LoadingBar'
import Select from '~/ui/Select'
import { trackCustom } from '~/utils/analytics'
import { periodToCompareDate } from '~/utils/compareConvertDate'
-import { getTimeFromSeconds, getStringFromTime, getLocaleDisplayName, nLocaleFormatter } from '~/utils/generic'
+import {
+ getTimeFromSeconds,
+ getStringFromTime,
+ getLocaleDisplayName,
+ nLocaleFormatter,
+ removeDuplicates,
+} from '~/utils/generic'
import { getItem, setItem } from '~/utils/localstorage'
import routes from '~/utils/routes'
@@ -208,6 +214,7 @@ interface ViewProjectContextType {
dataLoading: boolean
activeTab: keyof typeof PROJECT_TABS
filters: Filter[]
+ customPanelTabs: CustomTab[]
// Functions
updatePeriod: (newPeriod: { period: Period; label?: string }) => void
@@ -601,6 +608,26 @@ const ViewProject = () => {
'ref',
)
+ const [panelsActiveTabs, setPanelsActiveTabs] = useState<{
+ metadata: 'ce' | 'props'
+ }>({
+ metadata: 'ce',
+ })
+
+ const setPanelTab = (
+ panel: keyof typeof panelsActiveTabs,
+ tab: (typeof panelsActiveTabs)[keyof typeof panelsActiveTabs],
+ ) => {
+ const extensionTab = customPanelTabs.find((el) => el.panelID === panel && el.tabContent === tab)
+
+ extensionTab?.onOpen?.()
+
+ setPanelsActiveTabs((prev) => ({
+ ...prev,
+ [panel]: tab,
+ }))
+ }
+
// Create version data mapping for browser and OS panels
const createVersionDataMapping = useMemo(() => {
const browserVersions: { [key: string]: Entry[] } = {}
@@ -2101,6 +2128,14 @@ const ViewProject = () => {
}
})
+ // temp fix until it's deployed so I could change it in SDK and extensions too
+ const processPanelId = (id: string) => {
+ if (id === 'ce') {
+ return 'metadata'
+ }
+ return id
+ }
+
sdk = new SwetrixSDK(
processedExtensions,
{
@@ -2127,20 +2162,27 @@ const ViewProject = () => {
setCustomExportTypes((prev) => _filter(prev, (row) => row.label !== label))
},
onAddPanelTab: (extensionID: string, panelID: string, tabContent?: string, onOpen?: () => void) => {
- setCustomPanelTabs((prev) => [
- ...prev,
- {
- extensionID,
- panelID,
- tabContent,
- onOpen,
- },
- ])
+ const processedPanelID = processPanelId(panelID)
+ setCustomPanelTabs((prev) =>
+ removeDuplicates(
+ [
+ ...prev,
+ {
+ extensionID,
+ panelID: processedPanelID,
+ tabContent,
+ onOpen,
+ },
+ ],
+ ['extensionID', 'panelID'],
+ ),
+ )
},
onUpdatePanelTab: (extensionID: string, panelID: string, tabContent: any) => {
+ const processedPanelID = processPanelId(panelID)
setCustomPanelTabs((prev) =>
_map(prev, (row) => {
- if (row.extensionID === extensionID && row.panelID === panelID) {
+ if (row.extensionID === extensionID && row.panelID === processedPanelID) {
return {
...row,
tabContent,
@@ -2152,8 +2194,9 @@ const ViewProject = () => {
)
},
onRemovePanelTab: (extensionID: string, panelID: string) => {
+ const processedPanelID = processPanelId(panelID)
setCustomPanelTabs((prev) =>
- _filter(prev, (row) => row.extensionID !== extensionID && row.panelID !== panelID),
+ _filter(prev, (row) => row.extensionID !== extensionID && row.panelID !== processedPanelID),
)
},
},
@@ -2615,6 +2658,7 @@ const ViewProject = () => {
dataLoading,
activeTab,
filters,
+ customPanelTabs,
// Functions
updatePeriod,
@@ -3703,8 +3747,6 @@ const ViewProject = () => {
<div className='mt-5 grid grid-cols-1 gap-3 sm:grid-cols-2'>
{!_isEmpty(panelsData.types)
? _map(TRAFFIC_PANELS_ORDER, (type: string) => {
- const customTabs = _filter(customPanelTabs, (tab) => tab.panelID === type)
-
if (type === 'location') {
const locationTabs = [
{ id: 'cc', label: t('project.mapping.cc'), hasData: !!panelsData.data.cc },
@@ -3748,7 +3790,6 @@ const ViewProject = () => {
onTabChange={(tab) => setLocationActiveTab(tab as 'cc' | 'rg' | 'ct' | 'lc' | 'map')}
activeTabId={locationActiveTab}
data={panelsData.data[locationActiveTab]}
- customTabs={customTabs}
rowMapper={rowMapper}
customRenderer={
locationActiveTab === 'map'
@@ -3876,7 +3917,6 @@ const ViewProject = () => {
onTabChange={(tab) => setDeviceActiveTab(tab as 'br' | 'os' | 'dv')}
activeTabId={deviceActiveTab}
data={panelsData.data[deviceActiveTab]}
- customTabs={customTabs}
rowMapper={getDeviceRowMapper(deviceActiveTab)}
capitalize={deviceActiveTab === 'dv'}
versionData={
@@ -3932,7 +3972,6 @@ const ViewProject = () => {
onTabChange={(tab) => setPageActiveTab(tab as 'pg' | 'host' | 'userFlow')}
activeTabId={pageActiveTab}
data={panelsData.data[pageActiveTab]}
- customTabs={customTabs}
customRenderer={
pageActiveTab === 'userFlow'
? () => <UserFlow isReversed={false} setReversed={() => {}} />
@@ -3975,7 +4014,6 @@ const ViewProject = () => {
}
activeTabId={trafficSourcesActiveTab}
data={panelsData.data[trafficSourcesActiveTab]}
- customTabs={customTabs}
rowMapper={getTrafficSourcesRowMapper(trafficSourcesActiveTab)}
/>
)
@@ -3991,9 +4029,10 @@ const ViewProject = () => {
filters={filters}
getFilterLink={getFilterLink}
chartData={chartData}
- customTabs={_filter(customPanelTabs, (tab) => tab.panelID === 'ce')}
getCustomEventMetadata={getCustomEventMetadata}
getPropertyMetadata={_getPropertyMetadata}
+ onTabChange={(tab) => setPanelTab('metadata', tab as 'ce' | 'props')}
+ activeTabId={panelsActiveTabs.metadata}
/>
) : null}
</div>
diff --git a/web/app/utils/generic.ts b/web/app/utils/generic.ts
index 9dc218205..75e33c835 100644
--- a/web/app/utils/generic.ts
+++ b/web/app/utils/generic.ts
@@ -148,3 +148,32 @@ export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve
export const cn = (...args: ClassValue[]) => {
return twMerge(clsx(args))
}
+
+export const removeDuplicates = (arr: any[], keys: string[]) => {
+ const uniqueObjects: any[] = []
+
+ const isDuplicate = (obj: any) => {
+ for (const uniqueObj of uniqueObjects) {
+ let isMatch = true
+
+ for (const key of keys) {
+ if (uniqueObj[key] !== obj[key]) {
+ isMatch = false
+ break
+ }
+ }
+ if (isMatch) {
+ return true
+ }
+ }
+ return false
+ }
+
+ for (const obj of arr) {
+ if (!isDuplicate(obj)) {
+ uniqueObjects.push(obj)
+ }
+ }
+
+ return uniqueObjects
+}