📈 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
implemented basic filters functionality
Blue Mousee4337c11f3fa
diff --git a/src/api/index.js b/src/api/index.jsindex 4ab109626..e41368e15 100644--- a/src/api/index.js+++ b/src/api/index.js@@ -207,12 +207,13 @@ export const getProjectData = (pid,tb = 'hour',period = '3d',+ filters = [],from = '',to = '',) =>api.get(- `log?pid=${pid}&timeBucket=${tb}&period=${period}&from=${from}&to=${to}`+ `log?pid=${pid}&timeBucket=${tb}&period=${period}&filters=${JSON.stringify(filters)}&from=${from}&to=${to}`).then((response) => response.data).catch((error) => {diff --git a/src/pages/Dashboard/Dashboard.jsx b/src/pages/Dashboard/Dashboard.jsxindex 6aaf68cfc..76cee68d1 100644--- a/src/pages/Dashboard/Dashboard.jsx+++ b/src/pages/Dashboard/Dashboard.jsx@@ -8,11 +8,8 @@ import _isNumber from 'lodash/isNumber'import _map from 'lodash/map'import _filter from 'lodash/filter'import { useTranslation } from 'react-i18next'-import { EyeIcon } from '@heroicons/react/outline'-import { CalendarIcon } from '@heroicons/react/outline'-import { ArrowSmUpIcon } from '@heroicons/react/solid'-import { ArrowSmDownIcon } from '@heroicons/react/solid'-import { XCircleIcon } from '@heroicons/react/solid'+import { EyeIcon, CalendarIcon } from '@heroicons/react/outline'+import { ArrowSmUpIcon, ArrowSmDownIcon, XCircleIcon } from '@heroicons/react/solid'import Modal from 'ui/Modal'import { withAuthentication, auth } from 'hoc/protected'diff --git a/src/pages/Project/View/Panels.jsx b/src/pages/Project/View/Panels.jsxindex d55fc3def..5c08d8071 100644--- a/src/pages/Project/View/Panels.jsx+++ b/src/pages/Project/View/Panels.jsx@@ -1,6 +1,6 @@import React, { memo, useState, useMemo, Fragment } from 'react'-import { ArrowSmUpIcon } from '@heroicons/react/solid'-import { ArrowSmDownIcon } from '@heroicons/react/solid'+import { ArrowSmUpIcon, ArrowSmDownIcon } from '@heroicons/react/solid'+import { FilterIcon } from '@heroicons/react/outline'import cx from 'clsx'import PropTypes from 'prop-types'import _keys from 'lodash/keys'@@ -210,7 +210,7 @@ CustomEvents.propTypes = {}const Panel = ({- name, data, rowMapper, capitalize, linkContent, t,+ name, data, rowMapper, capitalize, linkContent, t, id, hideFilters, onFilter,}) => {const [page, setPage] = useState(0)const currentIndex = page * ENTRIES_PER_PANEL@@ -221,12 +221,18 @@ const Panel = ({const canGoPrev = () => page > 0const canGoNext = () => page < _floor(_size(keys) / ENTRIES_PER_PANEL)+ const _onFilter = hideFilters ? () => { } : onFilter+const onPrevious = () => {if (canGoPrev()) {setPage(page - 1)}}+ const onRowLinkClick = (e) => {+ e.stopPropagation()+ }+const onNext = () => {if (canGoNext()) {setPage(page + 1)@@ -245,14 +251,31 @@ const Panel = ({return (<Fragment key={key}>- <div className='flex justify-between mt-1 dark:text-gray-50'>+ <div+ className={cx('flex justify-between mt-1 dark:text-gray-50 rounded', {+ 'group hover:bg-gray-100 hover:dark:bg-gray-700 cursor-pointer': !hideFilters,+ })}+ onClick={() => _onFilter(id, key)}+ >+ {/* TODO: FIX: CLICKING ON AN EXTERNAL LINK CAUSES FILTER TO ACTIVATE */}{linkContent ? (- <a className={cx('flex label hover:underline text-blue-600 dark:text-blue-500', { capitalize })} href={rowData} target='_blank' rel='noopener noreferrer'>+ <a+ className={cx('flex items-center label hover:underline text-blue-600 dark:text-blue-500', { capitalize })}+ href={rowData}+ target='_blank'+ rel='noopener noreferrer'+ >{rowData}+ {!hideFilters && (+ <FilterIcon className='ml-2 w-4 h-4 text-gray-500 hidden group-hover:flex dark:text-gray-300' />+ )}</a>) : (- <span className={cx('flex label', { capitalize })}>+ <span className={cx('flex items-center label', { capitalize })}>{rowData}+ {!hideFilters && (+ <FilterIcon className='ml-2 w-4 h-4 text-gray-500 hidden group-hover:flex dark:text-gray-300' />+ )}</span>)}<span className='ml-3 dark:text-gray-50'>@@ -302,15 +325,21 @@ const Panel = ({Panel.propTypes = {name: PropTypes.string.isRequired,data: PropTypes.objectOf(PropTypes.number).isRequired,+ id: PropTypes.string,rowMapper: PropTypes.func,+ onFilter: PropTypes.func,capitalize: PropTypes.bool,linkContent: PropTypes.bool,+ hideFilters: PropTypes.bool,}Panel.defaultProps = {+ id: null,rowMapper: null,capitalize: false,linkContent: false,+ onFilter: () => { },+ hideFilters: false,}const PanelMemo = memo(Panel)diff --git a/src/pages/Project/View/ViewProject.jsx b/src/pages/Project/View/ViewProject.jsxindex b94ce25be..1e9f80e53 100644--- a/src/pages/Project/View/ViewProject.jsx+++ b/src/pages/Project/View/ViewProject.jsx@@ -2,7 +2,7 @@ import React, { useState, useEffect, useMemo, memo, useRef } from 'react'import { useHistory, useParams, Link } from 'react-router-dom'import domToImage from 'dom-to-image'import { saveAs } from 'file-saver'-import bb, { area, zoom } from 'billboard.js' // eslint-disable-line+import bb, { area } from 'billboard.js'import Flag from 'react-flagkit'import countries from 'i18n-iso-countries'import countriesEn from 'i18n-iso-countries/langs/en.json'@@ -23,6 +23,7 @@ import _last from 'lodash/last'import _isEmpty from 'lodash/isEmpty'import _replace from 'lodash/replace'import _find from 'lodash/find'+import _filter from 'lodash/filter'import PropTypes from 'prop-types'import Title from 'components/Title'@@ -173,6 +174,7 @@ const ViewProject = ({const [showTotal, setShowTotal] = useState(false)const [chartData, setChartData] = useState({})const [mainChart, setMainChart] = useState(null)+ const [filters, setFilters] = useState([])// That is needed when using 'Export as image' feature// Because headless browser cannot do a request to the DDG API due to absense of The Same Origin Policy headerconst [showIcons, setShowIcons] = useState(true)@@ -187,16 +189,16 @@ const ViewProject = ({history.push(routes.dashboard)}- const loadAnalytics = async () => {- if (!isLoading && !_isEmpty(project)) {+ const loadAnalytics = async (forced = false, newFilters = null) => {+ if (forced || (!isLoading && !_isEmpty(project))) {try {let dataconst key = getProjectCacheKey(period, timeBucket)- if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {+ if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {data = cache[id][key]} else {- data = await getProjectData(id, timeBucket, period)+ data = await getProjectData(id, timeBucket, period, newFilters || filters)setProjectCache(id, period, timeBucket, data || {})}@@ -208,6 +210,7 @@ const ViewProject = ({const { chart, params, customs } = dataif (!_isEmpty(params)) {+ const bbSettings = getSettings(chart, timeBucket, showTotal, t)setChartData(chart)setPanelsData({@@ -216,7 +219,10 @@ const ViewProject = ({customs,})- const bbSettings = getSettings(chart, timeBucket, showTotal, t)+ if (!_isEmpty(mainChart)) {+ mainChart.destroy()+ }+setMainChart(bb.generate(bbSettings))}@@ -227,6 +233,26 @@ const ViewProject = ({}}+ const filterHandler = (column, filter, isExclusive = false) => {+ let newFilters++ // temporarily apply only 1 filter per data type+ if (_find(filters, (f) => f.column === column) /* && f.filter === filter) */) {+ // selected filter is already included into the filters array -> removing it+ newFilters = _filter(filters, (f) => f.column !== column)+ setFilters(newFilters)+ } else {+ // selected filter is not present in the filters array -> applying it+ newFilters = [+ ...filters,+ { column, filter, isExclusive },+ ]+ setFilters(newFilters)+ }++ loadAnalytics(true, newFilters)+ }+useEffect(() => {if (!isLoading && !_isEmpty(chartData) && !_isEmpty(mainChart)) {if (showTotal) {@@ -407,9 +433,9 @@ const ViewProject = ({{_map(panelsData.types, type => {if (type === 'cc') {return (- <Panel t={t} key={type} name={tnMapping[type]} data={panelsData.data[type]} rowMapper={(name) => (+ <Panel t={t} key={type} id={type} onFilter={filterHandler} name={tnMapping[type]} data={panelsData.data[type]} rowMapper={(name) => (<>- <Flag className='rounded-md' country={name} size={21} alt='' />+ <Flag className='rounded-sm' country={name} size={21} alt='' /> {countries.getName(name, language)}</>@@ -419,13 +445,13 @@ const ViewProject = ({if (type === 'dv') {return (- <Panel t={t} key={type} name={tnMapping[type]} data={panelsData.data[type]} capitalize />+ <Panel t={t} key={type} id={type} onFilter={filterHandler} name={tnMapping[type]} data={panelsData.data[type]} capitalize />)}if (type === 'ref') {return (- <Panel t={t} key={type} name={tnMapping[type]} data={panelsData.data[type]} rowMapper={(name) => {+ <Panel t={t} key={type} id={type} onFilter={filterHandler} name={tnMapping[type]} data={panelsData.data[type]} rowMapper={(name) => {const url = new URL(name)return (@@ -444,7 +470,7 @@ const ViewProject = ({}return (- <Panel t={t} key={type} name={tnMapping[type]} data={panelsData.data[type]} />+ <Panel t={t} key={type} id={type} onFilter={filterHandler} name={tnMapping[type]} data={panelsData.data[type]} />)})}{!_isEmpty(panelsData.customs) && (