📈 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
added an ability to sort by Event name & some other improvements
Blue Mousec59a3c79050e
diff --git a/src/pages/Project/View/Panels.tsx b/src/pages/Project/View/Panels.tsxindex 7b74cb774..de729505c 100644--- a/src/pages/Project/View/Panels.tsx+++ b/src/pages/Project/View/Panels.tsx@@ -27,7 +27,7 @@ import _ceil from 'lodash/ceil'import _sortBy from 'lodash/sortBy'import _fromPairs from 'lodash/fromPairs'import _toPairs from 'lodash/toPairs'-import _orderBy from 'lodash/orderBy'+import _reverse from 'lodash/reverse'import Progress from 'ui/Progress'import PulsatingCircle from 'ui/icons/PulsatingCircle'@@ -368,15 +368,23 @@ const getPieOptions = (customs: any, uniques: number, t: any) => {}}-// Tabs with custom events like submit form, press button, go to the link rate etc.-const CustomEvents = ({- customs, chartData, onFilter, t,-}: {+interface ICustomEvents {customs: anychartData: anyonFilter: anyt: (arg0: string) => string-}) => {+}++interface ISortRows {+ label: string+ sortByAscend: boolean+ sortByDescend: boolean+}++// Tabs with custom events like submit form, press button, go to the link rate etc.+const CustomEvents = ({+ customs, chartData, onFilter, t,+}: ICustomEvents) => {const [page, setPage] = useState(0)const [customsEventsData, setCustomsEventsData] = useState<any>(customs)const currentIndex = page * ENTRIES_PER_CUSTOM_EVENTS_PANEL@@ -388,11 +396,7 @@ const CustomEvents = ({const totalPages = useMemo(() => _ceil(_size(keys) / ENTRIES_PER_CUSTOM_EVENTS_PANEL), [keys])const canGoPrev = () => page > 0const canGoNext = () => page < _floor((_size(keys) - 1) / ENTRIES_PER_CUSTOM_EVENTS_PANEL)- const [sort, setSort] = useState<{- label: string- sortByAscend: boolean- sortByDescend: boolean- }>({+ const [sort, setSort] = useState<ISortRows>({label: 'quantity',sortByAscend: false,sortByDescend: false,@@ -426,80 +430,55 @@ const CustomEvents = ({}}- const sortedAsc = (obj: any, transformValue?: (el: any) => number) => _fromPairs(_toPairs(obj).sort((a: any, b: any) => {- if (transformValue) {- return transformValue(b[1]) - transformValue(a[1])+ const sortedAsc = (obj: any, sortByKeys?: boolean) => {+ if (sortByKeys) {+ return _fromPairs(_sortBy(_toPairs(obj), (pair) => pair[0]))}- return b[1] - a[1]- }))+ return _fromPairs(_toPairs(obj).sort((a: any, b: any) => {+ return b[1] - a[1]+ }))+ }- const sortedDesc = (obj: any, transformValue?: (el: any) => number) => _fromPairs(_toPairs(obj).sort((a: any, b: any) => {- if (transformValue) {- return transformValue(a[1]) - transformValue(b[1])+ const sortedDesc = (obj: any, sortByKeys?: boolean) => {+ if (sortByKeys) {+ return _fromPairs(_reverse(_sortBy(_toPairs(obj), (pair) => pair[0])))}- return a[1] - b[1]- }))+ return _fromPairs(_toPairs(obj).sort((a: any, b: any) => {+ return a[1] - b[1]+ }))+ }const onSortBy = (label: string) => {- let sorted- switch (label) {- case 'quantity':- if (sort.sortByAscend) {- sorted = sortedDesc(customsEventsData)- setSort({- label: 'quantity',- sortByAscend: false,- sortByDescend: true,- })- } else if (sort.sortByDescend) {- sorted = customs- setSort({- label: 'quantity',- sortByAscend: false,- sortByDescend: false,- })- } else {- sorted = sortedAsc(customsEventsData)- setSort({- label: 'quantity',- sortByAscend: true,- sortByDescend: false,- })- }- setCustomsEventsData(sorted)- break-- case 'conversion':- if (sort.sortByAscend) {- sorted = sortedDesc(customsEventsData, (el) => _round((el / uniques) * 100, 2))- setSort({- label: 'conversion',- sortByAscend: false,- sortByDescend: true,- })- } else if (sort.sortByDescend) {- sorted = customs- setSort({- label: 'conversion',- sortByAscend: false,- sortByDescend: false,- })- } else {- sorted = sortedAsc(customsEventsData, (el) => _round((el / uniques) * 100, 2))- setSort({- label: 'conversion',- sortByAscend: true,- sortByDescend: false,- })- }- setCustomsEventsData(sorted)- break-- default:- break+ const sortByKeys = label === 'event'++ if (sort.sortByAscend) {+ setCustomsEventsData(sortedDesc(customsEventsData, sortByKeys))+ setSort({+ label,+ sortByAscend: false,+ sortByDescend: true,+ })+ return}++ if (sort.sortByDescend) {+ setCustomsEventsData(customs)+ setSort({+ label,+ sortByAscend: false,+ sortByDescend: false,+ })+ return+ }++ setCustomsEventsData(sortedAsc(customsEventsData, sortByKeys))+ setSort({+ label,+ sortByAscend: true,+ sortByDescend: false,+ })}useEffect(() => {@@ -543,20 +522,33 @@ const CustomEvents = ({<table className='table-fixed'><thead><tr className='text-gray-900 dark:text-gray-50'>- <th className='w-4/6 text-left'>+ <th className='w-4/6 text-left flex items-center cursor-pointer hover:opacity-90' onClick={() => onSortBy('event')}>{t('project.event')}+ <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 items-center'>+ <p className='flex items-center cursor-pointer hover:opacity-90' onClick={() => onSortBy('quantity')}>{t('project.quantity')}- <Sort onClick={() => onSortBy('quantity')} sortByAscend={sort.label === 'quantity' && sort.sortByAscend} sortByDescend={sort.label === 'quantity' && sort.sortByDescend} />+ <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 items-center'>+ <p className='flex items-center cursor-pointer hover:opacity-90' onClick={() => onSortBy('conversion')}>{t('project.conversion')}- <Sort onClick={() => onSortBy('conversion')} sortByAscend={sort.label === 'conversion' && sort.sortByAscend} sortByDescend={sort.label === 'conversion' && sort.sortByDescend} />+ <Sort+ className='ml-1'+ sortByAscend={sort.label === 'conversion' && sort.sortByAscend}+ sortByDescend={sort.label === 'conversion' && sort.sortByDescend}+ /></p></th></tr>diff --git a/src/ui/icons/Sort.tsx b/src/ui/icons/Sort.tsxindex ec9b0cb19..e176c40a6 100644--- a/src/ui/icons/Sort.tsx+++ b/src/ui/icons/Sort.tsx@@ -1,32 +1,37 @@import React from 'react'-import { BarsArrowUpIcon, BarsArrowDownIcon, ChevronUpDownIcon } from '@heroicons/react/24/outline'+import { ChevronUpDownIcon, ChevronUpIcon, ChevronDownIcon } from '@heroicons/react/24/outline'+import cx from 'clsx'-const Sort = ({ sortByAscend, sortByDescend, onClick }: {+interface ISort {sortByAscend?: boolean,sortByDescend?: boolean,- onClick?: () => void-}): JSX.Element => {+ className?: string,+}++const Sort: React.FC<ISort> = ({+ sortByAscend, sortByDescend, className,+}: ISort): JSX.Element => {if (sortByAscend) {return (- <BarsArrowUpIcon onClick={onClick} className='w-6 h-6' />+ <ChevronUpIcon className={cx(className, 'w-4 h-4')} />)}if (sortByDescend) {return (- <BarsArrowDownIcon onClick={onClick} className='w-6 h-6' />+ <ChevronDownIcon className={cx(className, 'w-4 h-4')} />)}return (- <ChevronUpDownIcon onClick={onClick} className='w-6 h-6' />+ <ChevronUpDownIcon className={cx(className, 'w-4 h-4')} />)}Sort.defaultProps = {- sortByAscend: undefined,- sortByDescend: undefined,- onClick: () => {},+ sortByAscend: false,+ sortByDescend: false,+ className: '',}export default Sort