📈 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
Rework code with filters, url
kruzhambusd9f407ff5843
diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex b5945ffb2..cafb55cb9 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -20,7 +20,6 @@ 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'@@ -195,12 +194,6 @@ const CHART_METRICS_MAPPING = {cumulativeMode: 'cumulativeMode',}-const ERROR_FILTERS_MAPPING = {- showResolved: 'showResolved',-}--const FILTER_CHART_METRICS_MAPPING_FOR_COMPARE = ['bounce', 'viewsPerUnique', 'trendlines', 'customEvents']-const CHART_METRICS_MAPPING_PERF = {quantiles: 'quantiles',full: 'full',@@ -1573,71 +1566,6 @@ 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',- '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)- const filtered = _reduce(- pids,- (prev: string[], curr: string) => {- const { period, timeBucket } = prefs[curr]-- if (!_includes(validPeriods, period) || !_includes(validTimeBacket, timeBucket)) {- return prev- }-- return [...prev, curr]- },- [],- )-- return _reduce(- filtered,- (prev: any, curr: string) => {- return {- ...prev,- [curr]: prefs[curr],- }- },- {},- )-}-const typeNameMapping = (t: typeof i18next.t) => ({cc: t('project.mapping.cc'),rg: t('project.mapping.rg'),@@ -1708,9 +1636,6 @@ export {getFormatDate,panelIconMapping,typeNameMapping,- isFilterValid,- validPeriods,- validTimeBacket,noRegionPeriods,getSettings,getColumns,@@ -1719,7 +1644,6 @@ export {CHART_METRICS_MAPPING_PERF,getSettingsPerf,transformAIChartData,- FILTER_CHART_METRICS_MAPPING_FOR_COMPARE,getSettingsFunnels,getSettingsSession,SHORTCUTS_TABS_MAP,@@ -1728,6 +1652,5 @@ export {SHORTCUTS_TIMEBUCKETS_LISTENERS,CHART_MEASURES_MAPPING_PERF,getSettingsError,- ERROR_FILTERS_MAPPING,getSettingsUptime,}diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex dc38d1aa9..eb282c506 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -1,3 +1,4 @@+/* eslint-disable react-hooks/exhaustive-deps *//* eslint-disable react/no-unstable-nested-components, react/display-name */import React, {useState,@@ -51,9 +52,7 @@ import _find from 'lodash/find'import _filter from 'lodash/filter'import _uniqBy from 'lodash/uniqBy'import _findIndex from 'lodash/findIndex'-import _startsWith from 'lodash/startsWith'import _debounce from 'lodash/debounce'-import _forEach from 'lodash/forEach'import _some from 'lodash/some'import _pickBy from 'lodash/pickBy'import _every from 'lodash/every'@@ -95,7 +94,6 @@ import {getProjectCacheCustomKeyPerf,isBrowser,TITLE_SUFFIX,- FILTERS_PANELS_ORDER,KEY_FOR_ALL_TIME,MARKETPLACE_URL,getFunnelsCacheKey,@@ -105,7 +103,6 @@ import {OS_LOGO_MAP_DARK,ITBPeriodPairs,ERROR_PANELS_ORDER,- ERRORS_FILTERS_PANELS_ORDER,ERROR_PERIOD_PAIRS,FUNNELS_PERIOD_PAIRS,} from 'redux/constants'@@ -168,8 +165,6 @@ import {getFormatDate,panelIconMapping,typeNameMapping,- validPeriods,- validTimeBacket,noRegionPeriods,getSettings,getColumns,@@ -177,15 +172,12 @@ import {CHART_METRICS_MAPPING_PERF,getSettingsPerf,transformAIChartData,- FILTER_CHART_METRICS_MAPPING_FOR_COMPARE,getSettingsFunnels,SHORTCUTS_TABS_LISTENERS,SHORTCUTS_TABS_MAP,SHORTCUTS_GENERAL_LISTENERS,SHORTCUTS_TIMEBUCKETS_LISTENERS,CHART_MEASURES_MAPPING_PERF,- ERROR_FILTERS_MAPPING,- isFilterValid,} from './ViewProject.helpers'import CCRow from './components/CCRow'import FunnelsList from './components/FunnelsList'@@ -225,6 +217,10 @@ import {ITrafficLogResponse,} from './interfaces/traffic'import { trackCustom } from 'utils/analytics'+import {+ handleNavigationParams, updateFilterState, validTimeBacket, validPeriods, parseFiltersFromUrl, isFilterValid,+ FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, ERROR_FILTERS_MAPPING,+} from './utils/filters'import AddAViewModal from './components/AddAViewModal'import CustomMetrics from './components/CustomMetrics'import { AIProcessedResponse, AIResponse } from './interfaces/ai'@@ -1057,12 +1053,12 @@ const ViewProject = ({const adminTabs = allowedToManage? [- {- id: 'settings',- label: t('common.settings'),- icon: Cog8ToothIcon,- },- ]+ {+ id: 'settings',+ label: t('common.settings'),+ icon: Cog8ToothIcon,+ },+ ]: []if (isSelfhosted) {@@ -2240,241 +2236,50 @@ const ViewProject = ({],)- // this funtion is used for requesting the data from the API when the filter is changedconst filterHandler = async (column: string, filter: any, isExclusive = false) => {- let newFilters- let newFiltersPerf- let newFiltersSessions- let newFiltersErrorsconst columnPerf = `${column}_perf`const columnSessions = `${column}_sess`const columnErrors = `${column}_err`- if (activeTab === PROJECT_TABS.performance) {- if (_find(filtersPerf, (f) => f.filter === filter)) {- newFiltersPerf = _filter(filtersPerf, (f) => f.filter !== filter)-- // @ts-expect-error- const url = new URL(window.location)- url.searchParams.delete(columnPerf)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersPerf(newFiltersPerf)- } else {- newFiltersPerf = [...filtersPerf, { column, filter, isExclusive }]-- const url = new URL(window.location.href)- url.searchParams.append(columnPerf, filter)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersPerf(newFiltersPerf)- }- }-- if (activeTab === PROJECT_TABS.sessions) {- if (_find(filtersSessions, (f) => f.filter === filter)) {- newFiltersSessions = _filter(filtersSessions, (f) => f.filter !== filter)-- // @ts-expect-error- const url = new URL(window.location)- url.searchParams.delete(columnSessions)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersSessions(newFiltersSessions)- } else {- newFiltersSessions = [...filtersSessions, { column, filter, isExclusive }]-- const url = new URL(window.location.href)- url.searchParams.append(columnSessions, filter)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersSessions(newFiltersSessions)- }- }-- if (activeTab === PROJECT_TABS.errors) {- if (_find(filtersErrors, (f) => f.filter === filter)) {- newFiltersErrors = _filter(filtersErrors, (f) => f.filter !== filter)-- const url = new URL(window.location.href)- url.searchParams.delete(columnErrors)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersErrors(newFiltersErrors)- } else {- newFiltersErrors = [...filtersErrors, { column, filter, isExclusive }]-- const url = new URL(window.location.href)- url.searchParams.append(columnErrors, filter)- const { pathname, search } = url- navigate(`${pathname}${search}`)- setFiltersErrors(newFiltersErrors)- }- }-- if (activeTab === PROJECT_TABS.traffic) {- // eslint-disable-next-line no-lonely-if- if (_find(filters, (f) => f.filter === filter) /* && f.filter === filter) */) {- // selected filter is already included into the filters array -> removing it- // removing filter from the state- newFilters = _filter(filters, (f) => f.filter !== filter)- setFilters(newFilters)-- // removing filter from the page URL- const url = new URL(window.location.href)- url.searchParams.delete(column)- const { pathname, search } = url- navigate(`${pathname}${search}`)- } else {- // selected filter is not present in the filters array -> applying it- // sorting filter in the state- newFilters = [...filters, { column, filter, isExclusive }]- setFilters(newFilters)+ let filtersToUpdate: IFilter[] = []- const url = new URL(window.location.href)- url.searchParams.append(column, filter)- const { pathname, search } = url- navigate(`${pathname}${search}`)- }+ if (activeTab === PROJECT_TABS.performance) {+ filtersToUpdate = updateFilterState(navigate, filtersPerf, setFiltersPerf, columnPerf, filter, isExclusive)+ } else if (activeTab === PROJECT_TABS.sessions) {+ filtersToUpdate = updateFilterState(navigate, filtersSessions, setFiltersSessions, columnSessions, filter, isExclusive)+ } else if (activeTab === PROJECT_TABS.errors) {+ filtersToUpdate = updateFilterState(navigate, filtersErrors, setFiltersErrors, columnErrors, filter, isExclusive)+ } else if (activeTab === PROJECT_TABS.traffic) {+ filtersToUpdate = updateFilterState(navigate, filters, setFilters, column, filter, isExclusive)}resetSessions()resetErrors()- sdkInstance?._emitEvent('filtersupdate', newFilters)+ sdkInstance?._emitEvent('filtersupdate', filtersToUpdate)+if (activeTab === PROJECT_TABS.performance) {- await loadAnalyticsPerf(true, newFiltersPerf)+ await loadAnalyticsPerf(true, filtersToUpdate)} else if (activeTab === PROJECT_TABS.traffic) {- await loadAnalytics(true, newFilters)+ await loadAnalytics(true, filtersToUpdate)}}- const onFilterSearch = (items: IFilter[], override: boolean) => {- const newFilters = _filter(items, (item) => {- return !_isEmpty(item.filter)- })- // @ts-expect-error- const url = new URL(window.location)-- console.log('items:', items)- console.log('newFilters:', newFilters)-- if (activeTab === PROJECT_TABS.performance) {- if (override) {- _forEach(FILTERS_PANELS_ORDER, (value) => {- if (url.searchParams.has(`${value}_perf`)) {- url.searchParams.delete(`${value}_perf`)- }- })- }-- _forEach(items, (item) => {- if (url.searchParams.has(`${item.column}_perf`)) {- url.searchParams.delete(`${item.column}_perf`)- }- _forEach(item.filter, (filter) => {- url.searchParams.append(`${item.column}_perf`, filter)- })- })-- const { pathname, search } = url- navigate(`${pathname}${search}`)-- if (!override) {- loadAnalyticsPerf(true, [...filtersPerf, ...newFilters])- setFiltersPerf([...filtersPerf, ...newFilters])- return- }-- setFiltersPerf(newFilters)- loadAnalyticsPerf(true, newFilters)- } else if (activeTab === PROJECT_TABS.sessions) {- if (override) {- _forEach(FILTERS_PANELS_ORDER, (value) => {- if (url.searchParams.has(`${value}_sess`)) {- url.searchParams.delete(`${value}_sess`)- }- })- }-- _forEach(items, (item) => {- if (url.searchParams.has(`${item.column}_sess`)) {- url.searchParams.delete(`${item.column}_sess`)- }- _forEach(item.filter, (filter) => {- url.searchParams.append(`${item.column}_sess`, filter)- })- })-- const { pathname, search } = url- navigate(`${pathname}${search}`)-- resetSessions()-- if (!override) {- setFiltersSessions((prev) => [...prev, ...newFilters])- return- }-- setFiltersSessions(newFilters)- } else if (activeTab === PROJECT_TABS.errors) {- if (override) {- _forEach(ERRORS_FILTERS_PANELS_ORDER, (value) => {- if (url.searchParams.has(`${value}_err`)) {- url.searchParams.delete(`${value}_err`)- }- })- }-- _forEach(items, (item) => {- if (url.searchParams.has(`${item.column}_err`)) {- url.searchParams.delete(`${item.column}_err`)- }- _forEach(item.filter, (filter) => {- url.searchParams.append(`${item.column}_err`, filter)- })- })-- const { pathname, search } = url- navigate(`${pathname}${search}`)-- resetErrors()-- if (!override) {- setFiltersErrors((prev) => [...prev, ...newFilters])- return- }-- setFiltersErrors(newFilters)- } else {- if (override) {- _forEach(FILTERS_PANELS_ORDER, (value) => {- if (url.searchParams.has(value)) {- url.searchParams.delete(value)- }- })- }-- _forEach(items, (item) => {- if (url.searchParams.has(item.column)) {- url.searchParams.delete(item.column)- }- _forEach(item.filter, (filter) => {- url.searchParams.append(item.column, filter)- })- })-- const { pathname, search } = url- navigate(`${pathname}${search}`)-- if (!override) {- loadAnalytics(true, [...filters, ...newFilters])- setFilters([...filters, ...newFilters])- return- }+ const onFilterSearch = (items: IFilter[], override: boolean): void => {+ const url = new URL(window.location.href)- setFilters(newFilters)- loadAnalytics(true, newFilters)+ switch (activeTab) {+ case PROJECT_TABS.performance:+ handleNavigationParams(items, '_perf', url, navigate, override, setFiltersPerf, loadAnalyticsPerf)+ break+ case PROJECT_TABS.sessions:+ handleNavigationParams(items, '_sess', url, navigate, override, setFiltersSessions, resetSessions)+ break+ case PROJECT_TABS.errors:+ handleNavigationParams(items, '_err', url, navigate, override, setFiltersErrors, resetErrors)+ break+ default:+ handleNavigationParams(items, '', url, navigate, override, setFilters, loadAnalytics)}resetSessions()@@ -2512,76 +2317,90 @@ const ViewProject = ({// this function is used for requesting the data from the API when the exclusive filter is changedconst onChangeExclusive = (column: string, filter: string, isExclusive: boolean) => {- let newFilters- if (activeTab === PROJECT_TABS.performance) {- newFilters = _map(filtersPerf, (f) => {- if (f.column === column && f.filter === filter) {- return {- ...f,- isExclusive,- }- }-- return f- })- setFiltersPerf(newFilters)- loadAnalyticsPerf(true, newFilters)- } else if (activeTab === PROJECT_TABS.sessions) {- newFilters = _map(filtersSessions, (f) => {- if (f.column === column && f.filter === filter) {- return {- ...f,- isExclusive,- }- }-- return f- })- setFiltersSessions(newFilters)- } else if (activeTab === PROJECT_TABS.errors) {- newFilters = _map(filtersErrors, (f) => {- if (f.column === column && f.filter === filter) {- return {- ...f,- isExclusive,- }- }-- return f- })- resetErrors()- setFiltersErrors(newFilters)- } else {- newFilters = _map(filters, (f) => {- if (f.column === column && f.filter === filter) {- return {- ...f,- isExclusive,- }+ const updateFilters = (+ filters: IFilter[],+ setFilters: React.Dispatch<React.SetStateAction<IFilter[]>>,+ ): IFilter[] => {+ const newFilters = filters.map(f =>+ f.column === column && f.filter === filter ? { ...f, isExclusive } : f,+ )+ if (JSON.stringify(newFilters) !== JSON.stringify(filters)) {+ setFilters(newFilters)}-- return f- })- setFilters(newFilters)- loadAnalytics(true, newFilters)+ return newFilters}- // storing exclusive filter in the page URL- // @ts-expect-error- const url = new URL(window.location)+ let newFilters: IFilter[]++ switch (activeTab) {+ case PROJECT_TABS.performance:+ newFilters = updateFilters(filtersPerf, setFiltersPerf)+ loadAnalyticsPerf(true, newFilters)+ break+ case PROJECT_TABS.sessions:+ newFilters = updateFilters(filtersSessions, setFiltersSessions)+ break+ case PROJECT_TABS.errors:+ newFilters = updateFilters(filtersErrors, setFiltersErrors)+ resetErrors()+ break+ default:+ newFilters = updateFilters(filters, setFilters)+ loadAnalytics(true, newFilters)+ break+ }- if (activeTab === PROJECT_TABS.performance) {- const columnPerf = `${column}_perf`- url.searchParams.set(columnPerf, filter)- } else {- url.searchParams.set(column, filter)+ const url = new URL(window.location.href)+ const paramName = activeTab === PROJECT_TABS.performance ? `${column}_perf` : column+ if (url.searchParams.get(paramName) !== filter) {+ url.searchParams.set(paramName, filter)+ const { pathname, search } = url+ navigate(`${pathname}${search}`)}- const { pathname, search } = url- navigate(`${pathname}${search}`)sdkInstance?._emitEvent('filtersupdate', newFilters)}++ // Main useEffect for filters parsing+ useEffect(() => {+ switch (activeTab) {+ case PROJECT_TABS.performance:+ parseFiltersFromUrl('_perf', setFiltersPerf, setAreFiltersPerfParsed)+ break+ case PROJECT_TABS.sessions:+ parseFiltersFromUrl('_sess', setFiltersSessions, setAreFiltersSessionsParsed)+ break+ case PROJECT_TABS.errors:+ parseFiltersFromUrl('_err', setFiltersErrors, setAreFiltersErrorsParsed)+ break+ default:+ parseFiltersFromUrl('', setFilters, setAreFiltersParsed)+ break+ }+ }, [activeTab])++ // Parsing timeBucket from URL+ useEffect(() => {+ if (!arePeriodParsed) return++ try {+ // @ts-expect-error+ const url = new URL(window.location)+ const { searchParams } = url+ const initialTimeBucket = searchParams.get('timeBucket')++ if (_includes(validTimeBacket, initialTimeBucket)) {+ const newPeriodFull = _find(periodPairs, (el) => el.period === period)+ if (_includes(newPeriodFull?.tbs, initialTimeBucket)) {+ setTimebucket(initialTimeBucket || periodPairs[3].tbs[1])+ }+ }+ } finally {+ setAreTimeBucketParsed(true)+ }+ }, [arePeriodParsed])+// this function is used for requesting the data from the API when you press the reset buttonconst refreshStats = async () => {if (!isLoading && !dataLoading) {@@ -2941,156 +2760,6 @@ const ViewProject = ({setPeriodPairsCompare(tbPeriodPairsCompare(t, undefined, language))}, [t, language])- // Parsing initial filters from url also using for perfomance tab- useEffect(() => {- // using try/catch because new URL is not supported by browsers like IE, so at least analytics would work without parsing filters- if (activeTab === PROJECT_TABS.performance) {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialFilters: any[] = []- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {- if (!_includes(key, '_perf')) {- return- }-- const keyPerf = _replace(key, '_perf', '')-- if (!isFilterValid(keyPerf)) {- return- }-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: keyPerf,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })- })-- setFiltersPerf(initialFilters)- } finally {- setAreFiltersPerfParsed(true)- }- } else {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialFilters: any[] = []- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {- if (!isFilterValid(key, true)) {- return- }-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: key,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })- })- setFilters(initialFilters)- } finally {- setAreFiltersParsed(true)- }- }- }, [activeTab])-- useEffect(() => {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialFilters: any[] = []- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {- if (!_includes(key, '_sess')) {- return- }-- const keySess = _replace(key, '_sess', '')-- if (!isFilterValid(keySess)) {- return- }-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: keySess,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })- })-- setFiltersSessions(initialFilters)- } catch (reason) {- console.error(`[ERROR] useEffect - Parsing initial filters from url also using for sessions tab: ${reason}`)- } finally {- setAreFiltersSessionsParsed(true)- }- }, [])-- useEffect(() => {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const initialFilters: any[] = []- // eslint-disable-next-line lodash/prefer-lodash-method- searchParams.forEach((value, key) => {- if (!_includes(key, '_err')) {- return- }-- const keyErr = _replace(key, '_err', '')-- if (!isFilterValid(keyErr)) {- return- }-- const isExclusive = _startsWith(value, '!')- initialFilters.push({- column: keyErr,- filter: isExclusive ? value.substring(1) : value,- isExclusive,- })- })-- setFiltersErrors(initialFilters)- } catch (reason) {- console.error(`[ERROR] useEffect - Parsing initial filters from url also using for errors tab: ${reason}`)- } finally {- setAreFiltersErrorsParsed(true)- }- }, [])-- // Parsing timeBucket from url- useEffect(() => {- if (arePeriodParsed) {- try {- // @ts-expect-error- const url = new URL(window.location)- const { searchParams } = url- const intialTimeBucket = searchParams.get('timeBucket')- // eslint-disable-next-line lodash/prefer-lodash-method- if (!_includes(validTimeBacket, intialTimeBucket)) {- return- }- const newPeriodFull = _find(periodPairs, (el) => el.period === period)- if (!_includes(newPeriodFull?.tbs, intialTimeBucket)) {- return- }- setTimebucket(intialTimeBucket || periodPairs[3].tbs[1])- } finally {- setAreTimeBucketParsed(true)- }- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [arePeriodParsed])const resetSessions = () => {setSessionsSkip(0)@@ -3980,8 +3649,8 @@ const ViewProject = ({loading={projectViewsLoading || projectViewsLoading === null}selectItemClassName={!allowedToManage &&- !(projectViewsLoading || projectViewsLoading === null) &&- _isEmpty(projectViews)+ !(projectViewsLoading || projectViewsLoading === null) &&+ _isEmpty(projectViews)? 'block px-4 py-2 text-sm text-gray-700 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50': undefined}@@ -3994,11 +3663,11 @@ const ViewProject = ({createView: true,},!allowedToManage &&- _isEmpty(projectViews) && {- id: 'no-views',- name: t('project.noViewsYet'),- notClickable: true,- },+ _isEmpty(projectViews) && {+ id: 'no-views',+ name: t('project.noViewsYet'),+ notClickable: true,+ },],(x) => !!x,)}@@ -4075,7 +3744,7 @@ const ViewProject = ({!isSelfhosted && {label: t('project.lookingForMore'),lookingForMore: true,- onClick: () => {},+ onClick: () => { },},],(el) => !!el,@@ -4155,8 +3824,8 @@ const ViewProject = ({items={isActiveCompare? _filter(chartMetrics, (el) => {- return !_includes(FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, el.id)- })+ return !_includes(FILTER_CHART_METRICS_MAPPING_FOR_COMPARE, el.id)+ }): chartMetrics}title={t('project.metricVis')}diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsxnew file mode 100644index 000000000..4f64e1fe2--- /dev/null+++ b/web/app/pages/Project/View/utils/filters.tsx@@ -0,0 +1,179 @@+import React from 'react'+import { IFilter } from '../interfaces/traffic'+import _includes from 'lodash/includes'+import _replace from 'lodash/replace'+import _startsWith from 'lodash/startsWith'+import _some from 'lodash/some'+import _keys from 'lodash/keys'+import _reduce from 'lodash/reduce'++export const ERROR_FILTERS_MAPPING = {+ showResolved: 'showResolved',+}++export const FILTER_CHART_METRICS_MAPPING_FOR_COMPARE = ['bounce', 'viewsPerUnique', 'trendlines', 'customEvents']++export const validTimeBacket = ['hour', 'day', 'week', 'month']+export const validPeriods = ['custom', 'today', 'yesterday', '1d', '7d', '4w', '3M', '12M', '24M']+export 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:']+++export const filterInvalidViewPrefs = (prefs: any): any => {+ const pids = _keys(prefs)+ const filtered = _reduce(+ pids,+ (prev: string[], curr: string) => {+ const { period, timeBucket } = prefs[curr]++ if (!_includes(validPeriods, period) || !_includes(validTimeBacket, timeBucket)) {+ return prev+ }++ return [...prev, curr]+ },+ [],+ )++ return _reduce(+ filtered,+ (prev: any, curr: string) => {+ return {+ ...prev,+ [curr]: prefs[curr],+ }+ },+ {},+ )+}++export 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 applyFilters = (items: IFilter[], suffix: string, url: URL, override: boolean): IFilter[] => {+ const filtersToSet: IFilter[] = []+ items.forEach((item) => {+ if (!item.filter) return++ const filters = Array.isArray(item.filter) ? item.filter : [item.filter]+ if (filters.length === 0) return++ const columnSuffix = `${item.column}${suffix}`++ if (override || !url.searchParams.has(columnSuffix)) {+ url.searchParams.delete(columnSuffix)+ filters.forEach((filter) => url.searchParams.append(columnSuffix, filter))+ }++ filtersToSet.push(item)+ })+ return filtersToSet+}++export const handleNavigationParams = (+ items: IFilter[],+ suffix: string,+ url: URL,+ navigate: (url: string) => void,+ override: boolean,+ stateSetter: React.Dispatch<React.SetStateAction<IFilter[]>>,+ loader: (forceReload: boolean, filters: IFilter[]) => void,+): void => {+ const filters = applyFilters(items, suffix, url, override)+ const { pathname, search } = url+ navigate(`${pathname}${search}`)+ stateSetter(override ? filters : (prev) => [...prev, ...filters])+ loader(true, filters)+}++export const updateFilterState = (+ navigate: (str: string) => void,+ filters: IFilter[],+ newFiltersStateSetter: React.Dispatch<React.SetStateAction<IFilter[]>>,+ column: string,+ filter: any,+ isExclusive: boolean,+) => {+ const existingFilterIndex = filters.findIndex((f) => f.filter === filter)+ const url = new URL(window.location.href)+ const { pathname, search } = url++ let updatedFilters: IFilter[]++ if (existingFilterIndex > -1) {+ updatedFilters = filters.filter((_, index) => index !== existingFilterIndex)+ url.searchParams.delete(column)+ } else {+ updatedFilters = [...filters, { column, filter, isExclusive }]+ url.searchParams.append(column, filter)+ }++ if (JSON.stringify(updatedFilters) !== JSON.stringify(filters)) {+ newFiltersStateSetter(updatedFilters)+ navigate(`${pathname}${search}`)+ }++ return updatedFilters+}++export const parseFiltersFromUrl = (+ keySuffix: string,+ setFilters: React.Dispatch<React.SetStateAction<IFilter[]>>,+ setParsedFlag: React.Dispatch<React.SetStateAction<boolean>>,+) => {+ try {+ // @ts-expect-error+ const url = new URL(window.location)+ const { searchParams } = url+ const initialFilters: IFilter[] = []++ searchParams.forEach((value, key) => {+ if (!_includes(key, keySuffix)) return++ const keyWithoutSuffix = _replace(key, keySuffix, '')+ if (!isFilterValid(keyWithoutSuffix)) return++ const isExclusive = _startsWith(value, '!')+ initialFilters.push({+ column: keyWithoutSuffix,+ filter: isExclusive ? value.substring(1) : value,+ isExclusive,+ })+ })++ setFilters(initialFilters)+ } catch (error) {+ console.error(`[ERROR] Parsing filters from URL with suffix ${keySuffix}: ${error}`)+ } finally {+ setParsedFlag(true)+ }+}