📈 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
refactor: Get rid of redux analytics cache
Blue Mouse6d34c3d20d51
diff --git a/web/app/api/index.ts b/web/app/api/index.tsindex e7bf7a262..48e9ca8e3 100644--- a/web/app/api/index.ts+++ b/web/app/api/index.ts@@ -175,7 +175,17 @@ export const generateRefCode = () =>export const getPayoutsInfo = () =>api.get('/user/payouts/info')- .then((response): Partial<User> => response.data)+ .then(+ (+ response,+ ): {+ trials: number+ subscribers: number+ paid: number+ nextPayout: number+ pending: number+ } => response.data,+ ).catch((error) => {const errorsArray = error.response.data.messageif (_isArray(errorsArray)) {@@ -187,7 +197,7 @@ export const getPayoutsInfo = () =>export const getReferrals = () =>api.get('/user/referrals')- .then((response): Partial<User> => response.data)+ .then((response): Partial<User>[] => response.data).catch((error) => {const errorsArray = error.response.data.messageif (_isArray(errorsArray)) {diff --git a/web/app/lib/constants/index.ts b/web/app/lib/constants/index.tsindex 44fb09caf..361fae6a8 100644--- a/web/app/lib/constants/index.ts+++ b/web/app/lib/constants/index.ts@@ -235,10 +235,6 @@ export const PERIOD_PAIRS_COMPARE = {DISABLE: 'disable',} as const-interface StringObject {- [key: string]: string-}-// the order of panels in the project viewexport const TRAFFIC_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'ref', 'lc', 'dv', 'so']export const FILTERS_PANELS_ORDER = ['cc', 'pg', 'br', 'os', 'ref', 'lc', 'dv']@@ -261,44 +257,42 @@ export const timeBucketToDays: {{ lt: 732, tb: ['month'] }, // 24 months]-export const tbsFormatMapper: StringObject = {+export const tbsFormatMapper = {minute: '%I:%M %p',hour: '%I %p',day: '%d %b',month: '%b %Y',year: '%Y',-}+} as const-export const tbsFormatMapperTooltip: StringObject = {+export const tbsFormatMapperTooltip = {minute: '%I:%M %p',hour: '%d %b %I %p',day: '%d %b',month: '%b %Y',year: '%Y',-}+} as const-export const tbsFormatMapperTooltip24h: StringObject = {+export const tbsFormatMapperTooltip24h = {minute: '%H:%M',hour: '%d %b %H:%M',day: '%d %b',month: '%b %Y',year: '%Y',-}+} as const-export const tbsFormatMapper24h: StringObject = {+export const tbsFormatMapper24h = {minute: '%H:%M',hour: '%H:%M',day: '%d %b',month: '%b %Y',year: '%Y',-}+} as const-export const TimeFormat: StringObject = {+export const TimeFormat = {'12-hour': '12-hour','24-hour': '24-hour',-}--export const FREE_TIER_KEY = 'free'+} as constexport const PADDLE_JS_URL = 'https://cdn.paddle.com/paddle/paddle.js'export const PADDLE_VENDOR_ID = 139393@@ -397,42 +391,6 @@ export const getOgImageUrl = (title: string) => {return `${apiUrl}/v1/og-image?title=${title}`}-// Functions-export const getProjectCacheKey = (- period: string,- timeBucket: string,- mode: 'periodical' | 'cumulative',- filters?: any,- meta = '',-): string => `${period}${timeBucket}${mode}${filters ? JSON.stringify(filters) : ''}${meta}`-export const getProjectCaptchaCacheKey = (period: string, timeBucket: string, filters?: any): string =>- `${period}${timeBucket}captcha${filters ? JSON.stringify(filters) : ''}}`-export const getProjectForcastCacheKey = (- period: string,- timeBucket: string,- periodToForecast: string,- filters: any,-): string => `${period}${timeBucket}${periodToForecast}forecast${filters ? JSON.stringify(filters) : ''}`-export const getProjectCacheCustomKey = (- from: string,- to: string,- timeBucket: string,- mode: 'periodical' | 'cumulative',- filters: any,- meta = '',-): string => `cst${from}${to}${timeBucket}-${mode}${filters ? JSON.stringify(filters) : ''}${meta}`-export const getProjectCacheCustomKeyPerf = (- from: string,- to: string,- timeBucket: string,- filters: any,- measure: string,-): string => `${from}-${to}-${timeBucket}perf${filters ? JSON.stringify(filters) : ''}-${measure}`-export const getFunnelsCacheKey = (pid: string, funnelId: string, period: string): string =>- `${pid}${funnelId}${period}funnels`-export const getFunnelsCacheCustomKey = (pid: string, funnelId: string, from: string, to: string): string =>- `${pid}${funnelId}${from}${to}funnels`-// Cookiesexport const GDPR_REQUEST: string = 'gdpr_request'export const CONFIRMATION_TIMEOUT: string = 'confirmation_timeout'@@ -441,39 +399,39 @@ export const TOKEN: string = 'access_token'export const REFRESH_TOKEN: string = 'refresh_token'// LocalStorage-export const PROJECTS_PROTECTED = 'projects_protected'-export const IS_ACTIVE_COMPARE = 'is-active-compare'+export const LS_PROJECTS_PROTECTED = 'projects_protected'+export const LS_IS_ACTIVE_COMPARE = 'is-active-compare'// Funnelsexport const MIN_FUNNEL_STEPS = 2export const MAX_FUNNEL_STEPS = 10// List of languages with translations available-export const whitelist: string[] = ['en', 'uk', 'pl', 'de']+export const whitelist = ['en', 'uk', 'pl', 'de'] as constexport const whitelistWithCC = {en: 'en-GB',uk: 'uk-UA',pl: 'pl-PL',de: 'de-DE',-}+} as constexport const defaultLanguage = 'en'-export const languages: StringObject = {+export const languages = {en: 'English',uk: 'Українська',pl: 'Polski',de: 'Deutsch',-}+} as const-export const languageFlag: StringObject = {+export const languageFlag = {en: 'GB',uk: 'UA',pl: 'PL',de: 'DE',-}+} as const-export const paddleLanguageMapping: StringObject = {+export const paddleLanguageMapping = {uk: 'en',-}+} as const// Increase this counter every time some major change is done within localisation files// This will prevent cached version or raw locale strings being displayed in production@@ -503,28 +461,28 @@ export const PROJECT_TABS = (isSelfhosted ? SELFHOSTED_PROJECT_TABS : PRODUCTION_PROJECT_TABS) as typeof PRODUCTION_PROJECT_TABS-export const QUERY_METRIC: StringObject = {+export const QUERY_METRIC = {PAGE_VIEWS: 'page_views',UNIQUE_PAGE_VIEWS: 'unique_page_views',ONLINE_USERS: 'online_users',CUSTOM_EVENTS: 'custom_events',-}+} as const-export const QUERY_CONDITION: StringObject = {+export const QUERY_CONDITION = {GREATER_THAN: 'greater_than',GREATER_EQUAL_THAN: 'greater_equal_than',LESS_THAN: 'less_than',LESS_EQUAL_THAN: 'less_equal_than',-}+} as const-export const QUERY_TIME: StringObject = {+export const QUERY_TIME = {LAST_15_MINUTES: 'last_15_minutes',LAST_30_MINUTES: 'last_30_minutes',LAST_1_HOUR: 'last_1_hour',LAST_4_HOURS: 'last_4_hours',LAST_24_HOURS: 'last_24_hours',LAST_48_HOURS: 'last_48_hours',-}+} as constexport const INVITATION_EXPIRES_IN = 48 // hoursexport const ENTRIES_PER_PAGE_DASHBOARD = 11diff --git a/web/app/lib/models/UserFlow.ts b/web/app/lib/models/UserFlow.tsindex 507f3999b..5a3c7f2ef 100644--- a/web/app/lib/models/UserFlow.ts+++ b/web/app/lib/models/UserFlow.ts@@ -9,4 +9,4 @@ interface UserFlow {}[]}-export type IUserFlow = UserFlow | null+export type UserFlowType = UserFlow | nulldiff --git a/web/app/lib/reducers/auth.ts b/web/app/lib/reducers/auth.tsindex 66e2f3a45..21b4abd07 100644--- a/web/app/lib/reducers/auth.ts+++ b/web/app/lib/reducers/auth.ts@@ -1,13 +1,11 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit'import { User } from '../models/User'-import { FREE_TIER_KEY, isSelfhosted } from '../constants'interface AuthState {user: Userauthenticated: booleanloading: booleandontRemember: boolean- isPaidTierUsed: boolean}const initialState: AuthState = {@@ -15,8 +13,6 @@ const initialState: AuthState = {authenticated: false,loading: true,dontRemember: false,- // if the app is selfhosted, we assume that the user is using a paid tier so there won't be any restrictions or advertising of it- isPaidTierUsed: isSelfhosted,}const authSlice = createSlice({@@ -29,12 +25,10 @@ const authSlice = createSlice({authSuccessful: (state, { payload }: PayloadAction<User>) => {state.user = payloadstate.authenticated = true- state.isPaidTierUsed = isSelfhosted || ((payload?.planCode && payload.planCode !== FREE_TIER_KEY) as boolean)},logout: (state) => {state.user = {} as Userstate.authenticated = false- state.isPaidTierUsed = isSelfhosted},setDontRemember: (state, { payload }: PayloadAction<boolean>) => {state.dontRemember = payloaddiff --git a/web/app/lib/reducers/ui/cache.ts b/web/app/lib/reducers/ui/cache.tsindex 879e272c3..70f0f778b 100644--- a/web/app/lib/reducers/ui/cache.ts+++ b/web/app/lib/reducers/ui/cache.ts@@ -1,14 +1,6 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit'-import _filter from 'lodash/filter'-import _isEmpty from 'lodash/isEmpty'import { getItem, removeItem, setItem } from 'utils/localstorage'-import {- getProjectCacheKey,- LS_VIEW_PREFS_SETTING,- LS_CAPTCHA_VIEW_PREFS_SETTING,- getProjectCaptchaCacheKey,- isBrowser,-} from 'lib/constants'+import { LS_VIEW_PREFS_SETTING, LS_CAPTCHA_VIEW_PREFS_SETTING, isBrowser } from 'lib/constants'import { filterInvalidViewPrefs } from 'pages/Project/View/utils/filters'const getInitialViewPrefs = (LS_VIEW: string) => {@@ -28,10 +20,6 @@ const getInitialViewPrefs = (LS_VIEW: string) => {}interface InitialState {- analytics: any- analyticsPerf: any- funnels: any- captchaAnalytics: anycaptchaProjectsViewPrefs: anycustomEventsPrefs: anyprojectViewPrefs: {@@ -41,90 +29,18 @@ interface InitialState {rangeDate?: Date[]}} | null- activeReferrals: any[]- referralStatistics: any}const initialState: InitialState = {- analytics: {},- analyticsPerf: {},- funnels: {},- captchaAnalytics: {},captchaProjectsViewPrefs: getInitialViewPrefs(LS_CAPTCHA_VIEW_PREFS_SETTING) || {},projectViewPrefs: getInitialViewPrefs(LS_VIEW_PREFS_SETTING),customEventsPrefs: {},- activeReferrals: [],- referralStatistics: {},}const cacheSlice = createSlice({name: 'cache',initialState,reducers: {- setProjectCache(state, { payload }: PayloadAction<{ pid: string; key: string; data: any }>) {- state.analytics = {- ...state.analytics,- [payload.pid]: {- ...state.analytics[payload.pid],- [payload.key]: payload.data,- },- }- },- setCaptchaProjectCache(state, { payload }: PayloadAction<{ pid: string; key: string; data: any }>) {- state.captchaAnalytics = {- ...state.captchaAnalytics,- [payload.pid]: {- ...state.captchaAnalytics[payload.pid],- [payload.key]: payload.data,- },- }- },- deleteProjectCache(- state,- { payload }: PayloadAction<{ pid?: string; period?: string; timeBucket?: string; filters?: any }>,- ) {- const { pid, period, timeBucket, filters } = payload- let key: string-- if (period && timeBucket && filters) {- key = getProjectCacheKey(period, timeBucket, filters)- }-- if (_isEmpty(period) || _isEmpty(timeBucket)) {- if (_isEmpty(pid)) {- state.analytics = {}- }- state.analytics = _filter(state.analytics, (project) => project !== pid)- }- if (pid) {- state.analytics = {- ...state.analytics,- [pid]: _filter(state.analytics[pid], (ckey) => ckey !== key),- }- }- },- deleteCaptchaProjectCache(- state,- { payload }: PayloadAction<{ pid: string; period?: string; timeBucket?: string }>,- ) {- const { pid, period, timeBucket } = payload- let key: string-- if (period && timeBucket) {- key = getProjectCaptchaCacheKey(period, timeBucket)- }-- if (_isEmpty(period) || _isEmpty(timeBucket)) {- if (_isEmpty(pid)) {- state.captchaAnalytics = {}- }- state.captchaAnalytics = _filter(state.captchaAnalytics, (project) => project !== pid)- }- state.captchaAnalytics = {- ...state.captchaAnalytics,- [pid]: _filter(state.captchaAnalytics[pid], (ckey) => ckey !== key),- }- },setProjectViewPrefs(state,{ payload }: PayloadAction<{ pid: string; period: string; timeBucket: string; rangeDate?: Date[] }>,@@ -191,33 +107,6 @@ const cacheSlice = createSlice({[pid]: viewPrefs,}},- setProjectCachePerf(state, { payload }: PayloadAction<{ pid: string; key: string; data: any }>) {- state.analyticsPerf = {- ...state.analyticsPerf,- [payload.pid]: {- ...state.analyticsPerf[payload.pid],- [payload.key]: payload.data,- },- }- },- setFunnelsCache(state, { payload }: PayloadAction<{ pid: string; key: string; data: any }>) {- state.funnels = {- ...state.funnels,- [payload.pid]: {- ...state.funnels[payload.pid],- [payload.key]: payload.data,- },- }- },- setProjectForecastCache(state, { payload }: PayloadAction<{ pid: string; key: string; data: any }>) {- state.analytics = {- ...state.analytics,- [payload.pid]: {- ...state.analytics[payload.pid],- [payload.key]: payload.data,- },- }- },setCustomEventsPrefs(state, { payload }: PayloadAction<{ pid: string; data: any }>) {state.customEventsPrefs = {...state.customEventsPrefs,@@ -227,12 +116,6 @@ const cacheSlice = createSlice({},}},- setCache(state, { payload }: PayloadAction<{ key: string; value: any }>) {- const { key, value } = payload-- // @ts-ignore- state[key] = value- },},})diff --git a/web/app/lib/reducers/ui/index.ts b/web/app/lib/reducers/ui/index.tsindex 55f9bcd0d..94669fbae 100644--- a/web/app/lib/reducers/ui/index.ts+++ b/web/app/lib/reducers/ui/index.ts@@ -1,12 +1,10 @@import { cacheActions } from './cache'import { miscActions } from './misc'-import { projectsActions } from './projects'import { themeActions } from './theme'const UIActions = {...cacheActions,...miscActions,- ...projectsActions,...themeActions,}diff --git a/web/app/lib/reducers/ui/misc.ts b/web/app/lib/reducers/ui/misc.tsindex 83c2aa13e..cd4fe7c8c 100644--- a/web/app/lib/reducers/ui/misc.ts+++ b/web/app/lib/reducers/ui/misc.ts@@ -1,9 +1,10 @@import { createSlice, PayloadAction } from '@reduxjs/toolkit'-import { LOW_EVENTS_WARNING } from 'lib/constants'+import { LOW_EVENTS_WARNING, LS_PROJECTS_PROTECTED } from 'lib/constants'import { setCookie } from 'utils/cookie'import { secondsTillNextMonth } from 'utils/generic'import { Stats } from 'lib/models/Stats'import { Metainfo } from 'lib/models/Metainfo'+import { getItem, setItem } from 'utils/localstorage'interface InitialState {stats: Stats@@ -13,6 +14,9 @@ interface InitialState {showNoEventsLeftBanner: booleanlastBlogPost: anyextensions: any[]+ projectPasswords: {+ [key: string]: string+ }}const initialState: InitialState = {@@ -28,6 +32,7 @@ const initialState: InitialState = {symbol: '$',code: 'USD',},+ projectPasswords: getItem(LS_PROJECTS_PROTECTED) || {},paddleLoaded: false,paddle: {},showNoEventsLeftBanner: false,@@ -42,6 +47,15 @@ const miscSlice = createSlice({setGeneralStats(state, { payload }: PayloadAction<Stats>) {state.stats = payload},+ setProjectPassword: (state, { payload }: PayloadAction<{ id: string; password: string }>) => {+ const { id, password } = payload++ state.projectPasswords = {+ ...state.projectPasswords,+ [id]: password,+ }+ setItem(LS_PROJECTS_PROTECTED, JSON.stringify(state.projectPasswords))+ },setPaddleLastEvent(state, { payload }: PayloadAction<any>) {state.paddle = { ...state.paddle, lastEvent: payload }},diff --git a/web/app/lib/reducers/ui/projects.ts b/web/app/lib/reducers/ui/projects.tsdeleted file mode 100644index f580b384e..000000000--- a/web/app/lib/reducers/ui/projects.ts+++ /dev/null@@ -1,33 +0,0 @@-import { createSlice, PayloadAction } from '@reduxjs/toolkit'-import { PROJECTS_PROTECTED } from 'lib/constants'-import { setItem, getItem } from 'utils/localstorage'--interface InitialState {- password: {- [key: string]: string- }-}--const initialState: InitialState = {- password: getItem(PROJECTS_PROTECTED) || {},-}--const projectsSlice = createSlice({- name: 'projects',- initialState,- reducers: {- setProjectPassword: (state, { payload }: PayloadAction<{ id: string; password: string }>) => {- const { id, password } = payload-- state.password = {- ...state.password,- [id]: password,- }- setItem(PROJECTS_PROTECTED, JSON.stringify(state.password))- },- },-})--export const projectsActions = projectsSlice.actions--export default projectsSlice.reducerdiff --git a/web/app/lib/store/index.ts b/web/app/lib/store/index.tsindex ad64ff535..f7c50063e 100644--- a/web/app/lib/store/index.ts+++ b/web/app/lib/store/index.ts@@ -3,7 +3,6 @@ import { useDispatch } from 'react-redux'import { isDevelopment } from 'lib/constants'import authSlice from '../reducers/auth'import miscSlice from '../reducers/ui/misc'-import projectsSlice from '../reducers/ui/projects'import themeSlice from '../reducers/ui/theme'import cacheSlice from '../reducers/ui/cache'@@ -11,7 +10,6 @@ const rootReducer = combineReducers({auth: authSlice,ui: combineReducers({misc: miscSlice,- projects: projectsSlice,theme: themeSlice,cache: cacheSlice,}),@@ -19,7 +17,6 @@ const rootReducer = combineReducers({export const store = configureStore({reducer: rootReducer,- middleware: [],devTools: isDevelopment,})diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsxindex a1c87f3e8..8e392b9c4 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx@@ -26,9 +26,7 @@ import { getItem, setItem } from 'utils/localstorage'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import {captchaTbPeriodPairs,- getProjectCaptchaCacheKey,timeBucketToDays,- getProjectCacheCustomKey,MAX_MONTHS_IN_PAST,TimeFormat,chartTypes,@@ -62,13 +60,13 @@ import {PANELS_ORDER,} from './ViewCaptcha.helpers'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 'pages/Project/View/components/Filters'import { useRequiredParams } from 'hooks/useRequiredParams'import { useSelector } from 'react-redux'import { StateType, useAppDispatch } from 'lib/store'+import Filters from './components/Filters'+import TBPeriodSelector from './components/TBPeriodSelector'import UIActions from 'lib/reducers/ui'const PageLoader = () => (@@ -84,9 +82,7 @@ interface ViewCaptchaProps {const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {const { loading: authLoading, user } = useSelector((state: StateType) => state.auth)const { theme } = useSelector((state: StateType) => state.ui.theme)- const { captchaAnalytics: cache, captchaProjectsViewPrefs: projectViewPrefs } = useSelector(- (state: StateType) => state.ui.cache,- )+ const { captchaProjectsViewPrefs } = useSelector((state: StateType) => state.ui.cache)const dispatch = useAppDispatch()@@ -102,16 +98,16 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {const [project, setProject] = useState<CaptchaProject | null>(null)const [areFiltersParsed, setAreFiltersParsed] = useState(false)- const [areTimeBucketParsed, setAreTimeBucketParsed] = useState(false)- const [arePeriodParsed, setArePeriodParsed] = useState(false)const [panelsData, setPanelsData] = useState<any>({})const [isPanelsDataEmpty, setIsPanelsDataEmpty] = useState(false)const [analyticsLoading, setAnalyticsLoading] = useState(true)const [period, setPeriod] = useState<string>(- projectViewPrefs ? projectViewPrefs[id]?.period || periodPairs[4].period : periodPairs[4].period,+ captchaProjectsViewPrefs ? captchaProjectsViewPrefs[id]?.period || periodPairs[4].period : periodPairs[4].period,)const [timeBucket, setTimebucket] = useState<string>(- projectViewPrefs ? projectViewPrefs[id]?.timeBucket || periodPairs[4].tbs[1] : periodPairs[4].tbs[1],+ captchaProjectsViewPrefs+ ? captchaProjectsViewPrefs[id]?.timeBucket || periodPairs[4].tbs[1]+ : periodPairs[4].tbs[1],)const activePeriod: {period: string@@ -137,7 +133,7 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {const [filters, setFilters] = useState<any[]>([])const tnMapping = typeNameMapping(t)const refCalendar = useRef(null)- const localStorageDateRange = projectViewPrefs ? projectViewPrefs[id]?.rangeDate : null+ const localStorageDateRange = captchaProjectsViewPrefs ? captchaProjectsViewPrefs[id]?.rangeDate : nullconst [dateRange, setDateRange] = useState<Date[] | null>(localStorageDateRange ? [new Date(localStorageDateRange[0]), new Date(localStorageDateRange[1])] : null,)@@ -190,43 +186,23 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {navigate(routes.dashboard)}- // this function is used for requesting the data from the API- const loadCaptcha = async (forced: boolean = false, newFilters: any = null) => {- if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {- return- }-+ const loadCaptcha = async () => {setDataLoading(true)+try {let data- let keylet fromlet toif (dateRange) {from = getFormatDate(dateRange[0])to = getFormatDate(dateRange[1])- key = getProjectCacheCustomKey(from, to, timeBucket, 'periodical', newFilters || filters)- } else {- key = getProjectCaptchaCacheKey(period, timeBucket, newFilters || filters)}- if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {- data = cache[id][key]+ if (period === 'custom' && dateRange) {+ data = await getCaptchaData(id, timeBucket, '', filters, from, to)} else {- if (period === 'custom' && dateRange) {- data = await getCaptchaData(id, timeBucket, '', newFilters || filters, from, to)- } else {- data = await getCaptchaData(id, timeBucket, period, newFilters || filters, '', '')- }-- dispatch(- UIActions.setCaptchaProjectCache({- pid: id,- data: data || {},- key,- }),- )+ data = await getCaptchaData(id, timeBucket, period, filters, '', '')}if (_isEmpty(data)) {@@ -236,14 +212,10 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {return}- const { chart, params, customs, appliedFilters, timeBucket: timeBucketFromResponse } = data+ const { chart, params, customs, timeBucket: timeBucketFromResponse } = datalet newTimebucket = timeBucket- if (!_isEmpty(appliedFilters)) {- setFilters(appliedFilters)- }-if (period === KEY_FOR_ALL_TIME && !_isEmpty(timeBucketFromResponse)) {// eslint-disable-next-line prefer-destructuringnewTimebucket = _includes(timeBucketFromResponse, timeBucket) ? timeBucket : timeBucketFromResponse[0]@@ -313,6 +285,14 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {}}, [chartData, mainChart, activeChartMetrics])+ useEffect(() => {+ if (!areFiltersParsed) return++ loadCaptcha()++ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [areFiltersParsed, filters])+// this funtion is used for requesting the data from the API when the filter is changedconst filterHandler = (column: any, filter: any, isExclusive: boolean = false) => {let newFilters@@ -343,8 +323,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {const { pathname, search } = urlnavigate(`${pathname}${search}`)}-- loadCaptcha(true, newFilters)}// this function is used for requesting the data from the API when the exclusive filter is changed@@ -360,7 +338,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {return f})setFilters(newFilters)- loadCaptcha(true, newFilters)// storing exclusive filter in the page URL// @ts-ignore@@ -374,14 +351,67 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {}const refreshStats = () => {- if (!authLoading && !dataLoading) {- loadCaptcha(true)+ if (authLoading || dataLoading) {+ return}++ loadCaptcha()}// Parsing initial filters from the address baruseEffect(() => {- // using try/catch because new URL is not supported by browsers like IE, so at least analytics would work without parsing filters+ try {+ // @ts-ignore+ const url = new URL(window.location)+ const { searchParams } = url+ const intialTimeBucket: string = searchParams.get('timeBucket') || ''+ // eslint-disable-next-line lodash/prefer-lodash-method+ if (!_includes(validTimeBacket, intialTimeBucket)) {+ return+ }+ const newPeriodFull = _find(periodPairs, (el) => el.period === period) || {+ period: '',+ tbs: [],+ label: '',+ }+ if (!_includes(newPeriodFull.tbs, intialTimeBucket)) {+ return+ }+ setTimebucket(intialTimeBucket)+ } catch (reason) {+ console.error('[ERROR](useEffect) Setting timebucket failed:', reason)+ }++ try {+ // @ts-ignore+ const url = new URL(window.location)+ const { searchParams } = url+ const intialPeriod = captchaProjectsViewPrefs+ ? searchParams.get('period') || captchaProjectsViewPrefs[id]?.period+ : searchParams.get('period') || '7d'+ if (!_includes(validPeriods, intialPeriod)) {+ return+ }++ if (intialPeriod === 'custom') {+ // @ts-ignore+ const from = new Date(searchParams.get('from'))+ // @ts-ignore+ const to = new Date(searchParams.get('to'))+ if (from.getDate() && to.getDate()) {+ onRangeDateChange([from, to], true)+ setDateRange([from, to])+ }+ return+ }++ setPeriodPairs(captchaTbPeriodPairs(t, undefined, undefined, language))+ setDateRange(null)+ updatePeriod({ period: intialPeriod })+ } catch (reason) {+ console.error('[ERROR](useEffect) Setting period failed:', reason)+ }+try {// @ts-ignoreconst url = new URL(window.location)@@ -401,37 +431,13 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {})})setFilters(initialFilters)- } finally {- setAreFiltersParsed(true)+ } catch (reason) {+ console.error('[ERROR](useEffect) Setting filters failed:', reason)}- }, [])- useEffect(() => {- if (arePeriodParsed) {- try {- // @ts-ignore- const url = new URL(window.location)- const { searchParams } = url- const intialTimeBucket: string = searchParams.get('timeBucket') || ''- // eslint-disable-next-line lodash/prefer-lodash-method- if (!_includes(validTimeBacket, intialTimeBucket)) {- return- }- const newPeriodFull = _find(periodPairs, (el) => el.period === period) || {- period: '',- tbs: [],- label: '',- }- if (!_includes(newPeriodFull.tbs, intialTimeBucket)) {- return- }- setTimebucket(intialTimeBucket)- } finally {- setAreTimeBucketParsed(true)- }- }+ setAreFiltersParsed(true)// eslint-disable-next-line react-hooks/exhaustive-deps- }, [arePeriodParsed])+ }, [])const onRangeDateChange = (dates: Date[], onRender?: any) => {const days = Math.ceil(Math.abs(dates[1].getTime() - dates[0].getTime()) / (1000 * 3600 * 24))@@ -482,31 +488,10 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {}useEffect(() => {- if (period !== KEY_FOR_ALL_TIME) {- return- }-- if (areFiltersParsed && areTimeBucketParsed && arePeriodParsed) {- loadCaptcha()- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [project, period, chartType, filters, arePeriodParsed])-- useEffect(() => {- if (period === KEY_FOR_ALL_TIME) {- return- }-- if (areFiltersParsed && areTimeBucketParsed && arePeriodParsed) {- loadCaptcha()- }- }, [project, period, chartType, timeBucket, periodPairs, areFiltersParsed, areTimeBucketParsed, arePeriodParsed, t]) // eslint-disable-line-- useEffect(() => {- if (dateRange && arePeriodParsed) {+ if (dateRange && areFiltersParsed) {onRangeDateChange(dateRange)}- }, [dateRange, t, arePeriodParsed]) // eslint-disable-line+ }, [dateRange, areFiltersParsed]) // eslint-disable-lineuseEffect(() => {if (authLoading || !_isEmpty(project)) {@@ -582,39 +567,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {navigate(_replace(routes.captcha_settings, ':id', id))}- useEffect(() => {- try {- // @ts-ignore- const url = new URL(window.location)- const { searchParams } = url- const intialPeriod = projectViewPrefs- ? searchParams.get('period') || projectViewPrefs[id]?.period- : searchParams.get('period') || '7d'- if (!_includes(validPeriods, intialPeriod)) {- return- }-- if (intialPeriod === 'custom') {- // @ts-ignore- const from = new Date(searchParams.get('from'))- // @ts-ignore- const to = new Date(searchParams.get('to'))- if (from.getDate() && to.getDate()) {- onRangeDateChange([from, to], true)- setDateRange([from, to])- }- return- }-- setPeriodPairs(captchaTbPeriodPairs(t, undefined, undefined, language))- setDateRange(null)- updatePeriod({ period: intialPeriod })- } finally {- setArePeriodParsed(true)- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [])-const resetFilters = () => {// @ts-ignoreconst url: URL = new URL(window.location)@@ -628,7 +580,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {const { pathname, search } = urlnavigate(`${pathname}${search}`)setFilters([])- loadCaptcha(true, [])}const exportTypes = [@@ -646,12 +597,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {setChartType(type)}- // useEffect to change chart if we change chart type- useEffect(() => {- loadCaptcha()- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [chartType])-if (authLoading || !project) {return <PageLoader />}diff --git a/web/app/pages/Captcha/View/components/Filters.tsx b/web/app/pages/Captcha/View/components/Filters.tsxnew file mode 100644index 000000000..9971a5c89--- /dev/null+++ b/web/app/pages/Captcha/View/components/Filters.tsx@@ -0,0 +1,160 @@+import { FunnelIcon, XMarkIcon } from '@heroicons/react/24/outline'+import React, { memo } from 'react'+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'+import { getLocaleDisplayName } from 'utils/generic'++interface FilterProps {+ 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>+ canChangeExclusive?: boolean+ removable?: boolean+}++export const Filter = ({+ column,+ filter,+ isExclusive,+ onRemoveFilter,+ onChangeExclusive,+ tnMapping,+ canChangeExclusive,+ removable,+}: FilterProps) => {+ const {+ t,+ i18n: { language },+ } = useTranslation('common')++ let displayColumn = tnMapping[column]+ let displayFilter = filter++ if (column === 'cc') {+ displayFilter = countries.getName(filter, language) as string+ }++ if (column === 'pg') {+ displayFilter = filter || t('project.redactedPage')+ }++ if (column === 'lc') {+ 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 (+ <span+ title={truncatedFilter === displayFilter ? undefined : displayFilter}+ className={cx(+ '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,+ },+ )}+ >+ {displayColumn}+ + {canChangeExclusive ? (+ <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>+ ) : (+ <span>{t(`common.${isExclusive ? 'isNot' : 'is'}`)}</span>+ )}+ "+ {truncatedFilter}+ "+ {removable && (+ <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 FiltersProps {+ // 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>+ resetFilters: () => void+ filters: any+}++const Filters = ({ onRemoveFilter, onChangeExclusive, tnMapping, resetFilters, filters }: FiltersProps) => {+ if (_isEmpty(filters)) {+ return null+ }++ return (+ <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}+ 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>+ )+}++export default memo(Filters)diff --git a/web/app/pages/Captcha/View/components/TBPeriodSelector.tsx b/web/app/pages/Captcha/View/components/TBPeriodSelector.tsxnew file mode 100644index 000000000..20b8b80ad--- /dev/null+++ b/web/app/pages/Captcha/View/components/TBPeriodSelector.tsx@@ -0,0 +1,123 @@+import React, { memo, Fragment, useMemo } from 'react'+import { Popover, PopoverButton, PopoverPanel, Transition } from '@headlessui/react'+import { CalendarDaysIcon } from '@heroicons/react/24/outline'+import { ChevronDownIcon } from '@heroicons/react/20/solid'+import { useTranslation } from 'react-i18next'+import _map from 'lodash/map'+import _includes from 'lodash/includes'+import cx from 'clsx'+import { ALL_PERIODS } from 'lib/constants'++interface TBPeriodSelectorProps {+ title: string | number | React.ReactNode+ items: any[]+ /* (function): A function that is called when an item is selected. */+ onSelect: (item: any, e?: React.MouseEvent<HTMLElement>) => void | null+ activePeriod: any+ classes?: {+ timeBucket?: string+ periods?: string+ }+ updateTimebucket: (timeBucket: string) => void+ timeBucket: string+}++const TBPeriodSelector = ({+ items,+ title,+ onSelect,+ activePeriod,+ classes,+ updateTimebucket,+ timeBucket,+}: TBPeriodSelectorProps) => {+ const { t } = useTranslation('common')++ const periods = useMemo(() => {+ return _map(ALL_PERIODS, (period: string) => ({+ label: t(`project.${period}`),+ value: period,+ available: _includes(activePeriod?.tbs, period),+ }))+ }, [activePeriod, t])++ return (+ <Popover className='relative'>+ {({ open }) => (+ <>+ <PopoverButton className='group inline-flex w-full px-2.5 py-2 text-sm font-medium text-gray-700 outline-none dark:text-gray-50 md:px-4'>+ <CalendarDaysIcon className='mr-1 h-5 w-5' />+ <span>{title}</span>+ <ChevronDownIcon+ className={cx(+ 'ml-2 h-5 w-5 transform-gpu text-gray-700 transition duration-150 ease-in-out group-hover:text-gray-500 dark:text-gray-50',+ {+ 'rotate-180': open,+ },+ )}+ aria-hidden='true'+ />+ </PopoverButton>+ <Transition+ as={Fragment}+ enter='transition ease-out duration-200'+ enterFrom='opacity-0 translate-y-1'+ enterTo='opacity-100 translate-y-0'+ leave='transition ease-in duration-150'+ leaveFrom='opacity-100 translate-y-0'+ leaveTo='opacity-0 translate-y-1'+ >+ {/* w-56 */}+ <PopoverPanel className='absolute left-1/2 right-0 z-20 mt-3 w-max max-w-sm -translate-x-1/2 transform px-4 sm:px-0 md:left-auto md:transform-none lg:max-w-3xl'>+ <div className='overflow-hidden rounded-lg bg-gray-50 p-1 shadow-lg ring-1 ring-black/5 dark:bg-slate-800'>+ <div+ className={cx(+ 'relative z-0 mb-1 flex items-center space-x-5 rounded-md bg-slate-200 px-2 py-3 dark:bg-slate-700',+ classes?.timeBucket,+ )}+ >+ {_map(periods, ({ label, value, available }) => (+ <PopoverButton+ key={value}+ type='button'+ onClick={() => {+ if (!available || timeBucket === value) {+ return+ }++ updateTimebucket(value)+ }}+ className={cx('relative inline-flex items-center text-sm font-medium capitalize', {+ 'text-gray-900 dark:text-gray-50': timeBucket === value,+ 'text-gray-700 dark:text-gray-300': available && timeBucket !== value,+ 'text-gray-400 dark:text-gray-500': !available && timeBucket !== value,+ 'cursor-pointer': available,+ 'cursor-default': !available,+ })}+ >+ {label}+ </PopoverButton>+ ))}+ </div>+ <ul className={cx('w-full text-left', classes?.periods)}>+ {_map(items, (item) => (+ <PopoverButton+ as='li'+ key={item.label}+ onClick={(e: React.MouseEvent<HTMLElement>) => onSelect(item, e)}+ className='block cursor-pointer rounded-md px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-700'+ >+ {item.dropdownLabel || item.label}+ </PopoverButton>+ ))}+ </ul>+ </div>+ </PopoverPanel>+ </Transition>+ </>+ )}+ </Popover>+ )+}++export default memo(TBPeriodSelector)diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex daf6d9f1b..2c5b9fe3a 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -1,7 +1,7 @@import React, { useState, useEffect, useRef } from 'react'import { toast } from 'sonner'import { ChevronDownIcon, CheckIcon } from '@heroicons/react/24/solid'-import { TrashIcon, UserPlusIcon, CurrencyDollarIcon } from '@heroicons/react/24/outline'+import { TrashIcon, UserPlusIcon } from '@heroicons/react/24/outline'import { useTranslation } from 'react-i18next'import cx from 'clsx'import dayjs from 'dayjs'@@ -144,7 +144,7 @@ interface PeopleProps {}const People = ({ project }: PeopleProps) => {- const { isPaidTierUsed, user: currentUser } = useSelector((state: StateType) => state.auth)+ const { user: currentUser } = useSelector((state: StateType) => state.auth)const [showModal, setShowModal] = useState(false)const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)@@ -228,11 +228,6 @@ const People = ({ project }: PeopleProps) => {e.preventDefault()e.stopPropagation()- if (!isPaidTierUsed) {- setIsPaidFeatureOpened(true)- return- }-setBeenSubmitted(true)if (validated) {onSubmit()@@ -352,15 +347,9 @@ const People = ({ project }: PeopleProps) => {customButtons={<buttontype='button'- className={cx(- 'inline-flex w-full justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-indigo-700 sm:ml-3 sm:w-auto sm:text-sm',- {- '!px-3 opacity-80': !isPaidTierUsed,- },- )}+ className='inline-flex w-full justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-base font-medium text-white shadow-sm hover:bg-indigo-700 sm:ml-3 sm:w-auto sm:text-sm'onClick={handleSubmit}>- {!isPaidTierUsed && <CurrencyDollarIcon className='mr-1 h-5 w-5' />}{t('common.invite')}</button>}diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 87ff45b8e..ab423c131 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -49,9 +49,8 @@ import Emails from './Emails'import Select from 'ui/Select'import { useRequiredParams } from 'hooks/useRequiredParams'import { ArrowLeftRight, RotateCcw } from 'lucide-react'-import { StateType, useAppDispatch } from 'lib/store'+import { StateType } from 'lib/store'import { useSelector } from 'react-redux'-import UIActions from 'lib/reducers/ui'const MAX_NAME_LENGTH = 50const MAX_ORIGINS_LENGTH = 300@@ -257,8 +256,6 @@ const DEFAULT_PROJECT_NAME = 'Untitled Project'const ProjectSettings = () => {const { user, loading: authLoading } = useSelector((state: StateType) => state.auth)- const dispatch = useAppDispatch()-const { t } = useTranslation('common')const { id } = useRequiredParams<{ id: string }>()const navigate = useNavigate()@@ -452,11 +449,6 @@ const ProjectSettings = () => {} else {await resetProject(id)}- dispatch(- UIActions.deleteProjectCache({- pid: id,- }),- )toast.success(t('project.settings.resetted'))navigate(routes.dashboard)} catch (reason: any) {diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsxindex 089f389bb..c6680c962 100644--- a/web/app/pages/Project/View/Panels.tsx+++ b/web/app/pages/Project/View/Panels.tsx@@ -48,6 +48,7 @@ import Spin from 'ui/icons/Spin'import { useTranslation } from 'react-i18next'import CustomEventsDropdown from './components/CustomEventsDropdown'import { Customs, Filter, Properties } from './interfaces/traffic'+import { useViewProjectContext } from './ViewProject'const ENTRIES_PER_PANEL = 5const ENTRIES_PER_CUSTOM_EVENTS_PANEL = 6@@ -1381,16 +1382,7 @@ interface PanelProps {hideFilters?: booleanonFilter: anycustomTabs?: any- pid?: string | null- period?: string | null- timeBucket?: string | null- from?: string | null- to?: string | null- timezone?: string | null- activeTab?: stringonFragmentChange?: (arg: number) => void- filters?: Filter[]- projectPassword?: string}const Panel = ({@@ -1405,17 +1397,9 @@ const Panel = ({hideFilters,onFilter = () => {},customTabs = [],- pid,- period,- timeBucket,- from,- to,- timezone,- activeTab,onFragmentChange = () => {},- filters,- projectPassword,}: PanelProps) => {+ const { dataLoading, activeTab } = useViewProjectContext()const { t } = useTranslation('common')const [page, setPage] = useState(0)const currentIndex = page * ENTRIES_PER_PANEL@@ -1499,19 +1483,7 @@ const Panel = ({onExpandClick={() => setModal(true)}customTabs={customTabs}>- {/* @ts-ignore */}- <UserFlow- projectPassword={projectPassword}- pid={pid || ''}- period={period || ''}- timeBucket={timeBucket || ''}- from={from || ''}- to={to || ''}- timezone={timezone || ''}- filters={filters || []}- isReversed={isReversedUserFlow}- setReversed={() => setIsReversedUserFlow(!isReversedUserFlow)}- />+ <UserFlow isReversed={isReversedUserFlow} setReversed={() => setIsReversedUserFlow((prev) => !prev)} /><ModalonClose={() => setModal(false)}closeText={t('common.close')}@@ -1519,7 +1491,7 @@ const Panel = ({customButtons={<buttontype='button'- onClick={() => setIsReversedUserFlow(!isReversedUserFlow)}+ onClick={() => setIsReversedUserFlow((prev) => !prev)}className='mt-3 inline-flex w-full justify-center rounded-md border border-gray-300 bg-white px-4 py-2 text-base font-medium text-gray-700 shadow-sm hover:bg-gray-50 dark:border-none dark:border-gray-600 dark:bg-slate-700 dark:text-gray-50 dark:hover:border-gray-600 dark:hover:bg-gray-700 sm:ml-3 sm:mt-0 sm:w-auto sm:text-sm'>{t('project.reverse')}@@ -1527,18 +1499,7 @@ const Panel = ({}message={<div className='h-[500px] dark:text-gray-800'>- {/* @ts-ignore */}- <UserFlow- projectPassword={projectPassword}- pid={pid || ''}- period={period || ''}- timeBucket={timeBucket || ''}- from={from || ''}- to={to || ''}- timezone={timezone || ''}- filters={filters || []}- isReversed={isReversedUserFlow}- />+ <UserFlow isReversed={isReversedUserFlow} setReversed={() => setIsReversedUserFlow((prev) => !prev)} /></div>}size='large'@@ -1651,7 +1612,8 @@ const Panel = ({<Fragment key={`${id}-${entryName}-${Object.values(rest).join('-')}`}><divclassName={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-700': !hideFilters,+ 'group cursor-pointer hover:bg-gray-100 hover:dark:bg-slate-700': !hideFilters && !dataLoading,+ 'cursor-wait': dataLoading,})}onClick={() => _onFilter(id, entryName)}>diff --git a/web/app/pages/Project/View/ViewProject.helpers.tsx b/web/app/pages/Project/View/ViewProject.helpers.tsxindex d2e2a71ae..6f7eff3d8 100644--- a/web/app/pages/Project/View/ViewProject.helpers.tsx+++ b/web/app/pages/Project/View/ViewProject.helpers.tsx@@ -1,7 +1,6 @@import React from 'react'import type { ChartOptions, GridLineOptions } from 'billboard.js'import type i18next from 'i18next'-// @ts-ignoreimport { saveAs } from 'file-saver'import {GlobeEuropeAfricaIcon,@@ -12,7 +11,6 @@ import {MagnifyingGlassIcon,ServerIcon,} from '@heroicons/react/24/outline'-// @ts-ignoreimport dayjs from 'dayjs'import { area, areaSpline, spline, bar, line } from 'billboard.js'import _forEach from 'lodash/forEach'diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex 19df0319c..2f23a67fc 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -66,17 +66,14 @@ import { getItem, setItem, removeItem } from 'utils/localstorage'import EventsRunningOutBanner from 'components/EventsRunningOutBanner'import {tbPeriodPairs,- getProjectCacheKey,LIVE_VISITORS_UPDATE_INTERVAL,DEFAULT_TIMEZONE,CDN_URL,isDevelopment,timeBucketToDays,- getProjectCacheCustomKey,MAX_MONTHS_IN_PAST,PROJECT_TABS,TimeFormat,- getProjectForcastCacheKey,chartTypes,TRAFFIC_PANELS_ORDER,PERFORMANCE_PANELS_ORDER,@@ -84,15 +81,12 @@ import {tbPeriodPairsCompare,PERIOD_PAIRS_COMPARE,FILTERS_PERIOD_PAIRS,- IS_ACTIVE_COMPARE,- PROJECTS_PROTECTED,- getProjectCacheCustomKeyPerf,+ LS_IS_ACTIVE_COMPARE,+ LS_PROJECTS_PROTECTED,isBrowser,TITLE_SUFFIX,KEY_FOR_ALL_TIME,MARKETPLACE_URL,- getFunnelsCacheKey,- getFunnelsCacheCustomKey,BROWSER_LOGO_MAP,OS_LOGO_MAP,OS_LOGO_MAP_DARK,@@ -243,6 +237,9 @@ interface ViewProjectContextType {timeFormat: '12-hour' | '24-hour'size: ReturnType<typeof useSize>[1]allowedToManage: boolean+ dataLoading: boolean+ activeTab: keyof typeof PROJECT_TABS+ filters: Filter[]// FunctionssetDateRange: Dispatch<SetStateAction<Date[] | null>>@@ -283,21 +280,13 @@ const ViewProject = () => {tabs: string[]}>()- const {- analytics: cache,- analyticsPerf: cachePerf,- funnels: cacheFunnels,- projectViewPrefs,- customEventsPrefs,- } = useSelector((state: StateType) => state.ui.cache)+ const { projectViewPrefs, customEventsPrefs } = useSelector((state: StateType) => state.ui.cache)const { loading: authLoading, authenticated: csrAuthenticated, user } = useSelector((state: StateType) => state.auth)const { theme } = useSelector((state: StateType) => state.ui.theme)- const { extensions } = useSelector((state: StateType) => state.ui.misc)-- const { password } = useSelector((state: StateType) => state.ui.projects)+ const { extensions, projectPasswords } = useSelector((state: StateType) => state.ui.misc)const authenticated = isBrowser ? (authLoading ? ssrAuthenticated : csrAuthenticated) : ssrAuthenticatedconst { timezone = DEFAULT_TIMEZONE } = user || {}@@ -328,14 +317,11 @@ const ViewProject = () => {const [liveVisitors, setLiveVisitors] = useState<number>(0)const projectPassword = useMemo(- () => password[id] || (getItem(PROJECTS_PROTECTED)?.[id] as string) || queryPassword || '',- [id, password, queryPassword],+ () => projectPasswords[id] || (getItem(LS_PROJECTS_PROTECTED)?.[id] as string) || queryPassword || '',+ [id, projectPasswords, queryPassword],)const [areFiltersParsed, setAreFiltersParsed] = useState(false)- const [areFiltersPerfParsed, setAreFiltersPerfParsed] = useState(false)- const [arePeriodParsed, setArePeriodParsed] = useState(false)- const [areTimeBucketParsed, setAreTimeBucketParsed] = useState(false)const [panelsData, setPanelsData] = useState<{types: (keyof Params)[]@@ -388,13 +374,10 @@ const ViewProject = () => {const [filters, setFilters] = useState<Filter[]>([])const [filtersPerf, setFiltersPerf] = useState<Filter[]>([])const [filtersSessions, setFiltersSessions] = useState<Filter[]>([])- const [areFiltersSessionsParsed, setAreFiltersSessionsParsed] = useState(false)const [filtersErrors, setFiltersErrors] = useState<Filter[]>([])- const [areFiltersErrorsParsed, setAreFiltersErrorsParsed] = useState(false)const [filtersSubError, setFiltersSubError] = useState<Filter[]>([])- const [areFiltersSubErrorParsed, setAreFiltersSubErrorParsed] = useState(false)const tnMapping = typeNameMapping(t)const refCalendar = useRef(null)@@ -533,8 +516,6 @@ const ViewProject = () => {try {await getFunnels(id, projectPassword)-- // TODO: Update project was here. Check if it's still needed} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}@@ -559,8 +540,6 @@ const ViewProject = () => {try {await getFunnels(id, projectPassword)-- // TODO: Update project was here. Check if it's still needed} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}@@ -585,8 +564,6 @@ const ViewProject = () => {try {await getFunnels(id, projectPassword)-- // TODO: Update project was here. Check if it's still needed} catch (reason: any) {console.error('[ERROR] (onFunnelCreate)(getFunnels)', reason)}@@ -627,8 +604,8 @@ const ViewProject = () => {period: string}[]>(tbPeriodPairsCompare(t, undefined, language))- const [isActiveCompare, setIsActiveCompare] = useState<boolean>(() => {- const activeCompare = getItem(IS_ACTIVE_COMPARE)+ const [isActiveCompare, setIsActiveCompare] = useState(() => {+ const activeCompare = getItem(LS_IS_ACTIVE_COMPARE)if (typeof activeCompare === 'string') {return activeCompare === 'true'@@ -1073,7 +1050,7 @@ const ViewProject = () => {pathname: _replace(routes.project_protected_password, ':id', id),search: `?theme=${ssrTheme}&embedded=${embedded}`,})- removeItem(PROJECTS_PROTECTED)+ removeItem(LS_PROJECTS_PROTECTED)})return}@@ -1181,15 +1158,7 @@ const ViewProject = () => {setActivePeriodCompare(periodPairsCompare[0].period)}- const loadAnalytics = async (- forced = false,- newFilters: Filter[] | null = null,- newMetrics: ProjectViewCustomEvent[] | null = null,- ) => {- if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {- return- }-+ const loadAnalytics = async () => {setDataLoading(true)try {let data: TrafficLogResponse & {@@ -1198,8 +1167,6 @@ const ViewProject = () => {let dataCompare: TrafficLogResponse & {overall?: OverallObject}- let key = ''- let keyCompare = ''let fromlet fromCompare: string | undefinedlet to@@ -1226,7 +1193,6 @@ const ViewProject = () => {if (activePeriod?.period === 'custom' ? diffCompare <= diff : diffCompare <= activePeriod?.countDays) {fromCompare = getFormatDate(dateRangeCompare[0])toCompare = getFormatDate(dateRangeCompare[1])- keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket, mode, newFilters || filters)} else {toast.error(t('project.compareDateRangeError'))compareDisable()@@ -1242,138 +1208,107 @@ const ViewProject = () => {if (date) {fromCompare = date.fromtoCompare = date.to- keyCompare = getProjectCacheCustomKey(fromCompare, toCompare, timeBucket, mode, newFilters || filters)}}if (!_isEmpty(fromCompare) && !_isEmpty(toCompare)) {- if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare])) {- dataCompare = cache[id][keyCompare]- } else {- dataCompare =- (await getTrafficCompareData(- id,- timeBucket,- '',- newFilters || filters,- fromCompare,- toCompare,- timezone,- projectPassword,- mode,- )) || {}- const compareOverall = await getOverallStats(- [id],- 'custom',+ dataCompare =+ (await getTrafficCompareData(+ id,+ timeBucket,+ '',+ filters,fromCompare,toCompare,timezone,- newFilters || filters,projectPassword,- )- dataCompare.overall = compareOverall[id]- }+ mode,+ )) || {}+ const compareOverall = await getOverallStats(+ [id],+ 'custom',+ fromCompare,+ toCompare,+ timezone,+ filters,+ projectPassword,+ )+ dataCompare.overall = compareOverall[id]}-- dispatch(- UIActions.setProjectCache({- pid: id,- // @ts-expect-error- data: dataCompare,- key: keyCompare,- }),- )}if (dateRange) {from = getFormatDate(dateRange[0])to = getFormatDate(dateRange[1])- key = getProjectCacheCustomKey(from, to, timeBucket, mode, newFilters || filters)- } else {- key = getProjectCacheKey(period, timeBucket, mode, newFilters || filters)}- if (!forced && !_isEmpty(cache[id]) && !_isEmpty(cache[id][key])) {- data = cache[id][key]- // @ts-expect-error- setOverall(data.overall)+ if (period === 'custom' && dateRange) {+ data = await getProjectData(+ id,+ timeBucket,+ '',+ filters,+ customMetrics,+ from,+ to,+ timezone,+ projectPassword,+ mode,+ )+ customEventsChart = await getProjectDataCustomEvents(+ id,+ timeBucket,+ '',+ filters,+ from,+ to,+ timezone,+ activeChartMetricsCustomEvents,+ projectPassword,+ )+ rawOverall = await getOverallStats([id], period, from, to, timezone, filters, projectPassword)} else {- if (period === 'custom' && dateRange) {- data = await getProjectData(- id,- timeBucket,- '',- newFilters || filters,- newMetrics || customMetrics,- from,- to,- timezone,- projectPassword,- mode,- )- customEventsChart = await getProjectDataCustomEvents(- id,- timeBucket,- '',- filters,- from,- to,- timezone,- activeChartMetricsCustomEvents,- projectPassword,- )- rawOverall = await getOverallStats([id], period, from, to, timezone, newFilters || filters, projectPassword)- } else {- data = await getProjectData(- id,- timeBucket,- period,- newFilters || filters,- newMetrics || customMetrics,- '',- '',- timezone,- projectPassword,- mode,- )- customEventsChart = await getProjectDataCustomEvents(- id,- timeBucket,- period,- filters,- '',- '',- timezone,- activeChartMetricsCustomEvents,- projectPassword,- )- rawOverall = await getOverallStats([id], period, '', '', timezone, newFilters || filters, projectPassword)- }-- customEventsChart = customEventsChart?.chart ? customEventsChart.chart.events : customEventsChartData-- dispatch(- UIActions.setCustomEventsPrefs({- pid: id,- data: customEventsChart,- }),+ data = await getProjectData(+ id,+ timeBucket,+ period,+ filters,+ customMetrics,+ '',+ '',+ timezone,+ projectPassword,+ mode,)-- data.overall = rawOverall[id]-- dispatch(- UIActions.setProjectCache({- pid: id,- data,- key,- }),+ customEventsChart = await getProjectDataCustomEvents(+ id,+ timeBucket,+ period,+ filters,+ '',+ '',+ timezone,+ activeChartMetricsCustomEvents,+ projectPassword,)- setOverall(rawOverall[id])+ rawOverall = await getOverallStats([id], period, '', '', timezone, filters, projectPassword)}+ customEventsChart = customEventsChart?.chart ? customEventsChart.chart.events : customEventsChartData++ dispatch(+ UIActions.setCustomEventsPrefs({+ pid: id,+ data: customEventsChart,+ }),+ )++ data.overall = rawOverall[id]+ setOverall(rawOverall[id])+const sdkData = {...(data || {}),- filters: newFilters || filters,+ filters,timezone,timeBucket,period,@@ -1389,7 +1324,7 @@ const ViewProject = () => {return}- const { chart, params, customs, properties, appliedFilters, meta } = data+ const { chart, params, customs, properties, meta } = datalet newTimebucket = timeBucketsdkInstance?._emitEvent('load', sdkData)@@ -1413,11 +1348,6 @@ const ViewProject = () => {setTimebucket(newTimebucket)}- if (!_isEmpty(appliedFilters)) {- // @ts-expect-error- setFilters(appliedFilters)- }-// @ts-expect-errorif (!_isEmpty(dataCompare)) {// @ts-expect-error@@ -1577,25 +1507,22 @@ const ViewProject = () => {return}- const psid = searchParams.get('psid') as stringconst tab = searchParams.get('tab') as string- if (psid && tab === PROJECT_TABS.sessions) {- setActivePSID(psid)- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [authLoading])+ if (tab === PROJECT_TABS.errors) {+ const eid = searchParams.get('eid') as string- useEffect(() => {- if (authLoading) {- return+ if (eid) {+ setActiveEID(eid)+ }}- const eid = searchParams.get('eid') as string- const tab = searchParams.get('tab') as string+ if (tab === PROJECT_TABS.sessions) {+ const psid = searchParams.get('psid') as string- if (eid && tab === PROJECT_TABS.errors) {- setActiveEID(eid)+ if (psid) {+ setActivePSID(psid)+ }}// eslint-disable-next-line react-hooks/exhaustive-deps}, [authLoading])@@ -1610,17 +1537,13 @@ const ViewProject = () => {}, [period, dateRange, timeBucket, activePSID])useEffect(() => {- if (!activeEID) {- return- }-- if (!areFiltersSubErrorParsed) {+ if (!activeEID || !areFiltersParsed) {return}loadError(activeEID)// eslint-disable-next-line react-hooks/exhaustive-deps- }, [period, dateRange, timeBucket, activeEID, filtersSubError, areFiltersSubErrorParsed])+ }, [period, dateRange, timeBucket, activeEID, filtersSubError, areFiltersParsed])const loadSessions = async (forcedSkip?: number) => {if (sessionsLoading) {@@ -1631,7 +1554,7 @@ const ViewProject = () => {try {const skip = typeof forcedSkip === 'number' ? forcedSkip : sessionsSkip- let dataSessions: { sessions: Session[]; appliedFilters: any[] }+ let dataSessions: { sessions: Session[] }let fromlet to@@ -1696,7 +1619,7 @@ const ViewProject = () => {try {const skip = typeof forcedSkip === 'number' ? forcedSkip : errorsSkip- let dataErrors: { errors: SwetrixError[]; appliedFilters: any[] }+ let dataErrors: { errors: SwetrixError[] }let fromlet to@@ -1759,19 +1682,14 @@ const ViewProject = () => {}}- const loadAnalyticsPerf = async (forced = false, newFilters: any[] | null = null) => {- if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {- return- }-+ const loadAnalyticsPerf = async () => {setDataLoading(true)+try {- let dataPerf: { timeBucket?: any; params?: any; appliedFilters?: any; chart?: any }- let key+ let dataPerf: { timeBucket?: any; params?: any; chart?: any }let fromlet tolet dataCompare- let keyCompare = ''let fromCompare: string | undefinedlet toCompare: string | undefinedlet rawOverall: any@@ -1800,13 +1718,6 @@ const ViewProject = () => {if (activePeriod?.period === 'custom' ? diffCompare <= diff : diffCompare <= activePeriod?.countDays) {fromCompare = getFormatDate(dateRangeCompare[0])toCompare = getFormatDate(dateRangeCompare[1])- keyCompare = getProjectCacheCustomKeyPerf(- fromCompare,- toCompare,- timeBucket,- newFilters || filtersPerf,- measure,- )} else {toast.error(t('project.compareDateRangeError'))compareDisable()@@ -1822,122 +1733,61 @@ const ViewProject = () => {if (date) {fromCompare = date.fromtoCompare = date.to- keyCompare = getProjectCacheCustomKeyPerf(- fromCompare,- toCompare,- timeBucket,- newFilters || filtersPerf,- measure,- )}}if (!_isEmpty(fromCompare) && !_isEmpty(toCompare)) {- if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare])) {- dataCompare = cache[id][keyCompare]- } else {- dataCompare = await getPerformanceCompareData(- id,- timeBucket,- '',- newFilters || filtersPerf,- fromCompare,- toCompare,- timezone,- measure,- projectPassword,- )- const compareOverall = await getPerformanceOverallStats(- [id],- 'custom',- fromCompare,- toCompare,- timezone,- newFilters || filters,- measure,- projectPassword,- )- dataCompare.overall = compareOverall[id]- }- }-- dispatch(- UIActions.setProjectCachePerf({- pid: id,- data: dataCompare || {},- key: keyCompare,- }),- )- }-- if (dateRange) {- from = getFormatDate(dateRange[0])- to = getFormatDate(dateRange[1])- key = getProjectCacheCustomKey(from, to, timeBucket, mode, newFilters || filtersPerf, measure)- } else {- key = getProjectCacheKey(period, timeBucket, mode, newFilters || filtersPerf, measure)- }-- if (!forced && !_isEmpty(cachePerf[id]) && !_isEmpty(cachePerf[id][key])) {- dataPerf = cachePerf[id][key]- // @ts-expect-error- setOverallPerformance(dataPerf.overall)- } else {- if (period === 'custom' && dateRange) {- dataPerf = await getPerfData(- id,- timeBucket,- '',- newFilters || filtersPerf,- from,- to,- timezone,- measure,- projectPassword,- )- rawOverall = await getOverallStats([id], period, from, to, timezone, newFilters || filters, projectPassword)- } else {- dataPerf = await getPerfData(+ dataCompare = await getPerformanceCompareData(id,timeBucket,- period,- newFilters || filtersPerf,- '','',+ filtersPerf,+ fromCompare,+ toCompare,timezone,measure,projectPassword,)- rawOverall = await getPerformanceOverallStats(+ const compareOverall = await getPerformanceOverallStats([id],- period,- '',- '',+ 'custom',+ fromCompare,+ toCompare,timezone,- newFilters || filters,+ filtersPerf,measure,projectPassword,)+ dataCompare.overall = compareOverall[id]}+ }- // @ts-expect-error- dataPerf.overall = rawOverall[id]+ if (dateRange) {+ from = getFormatDate(dateRange[0])+ to = getFormatDate(dateRange[1])+ }- dispatch(- UIActions.setProjectCachePerf({- pid: id,- data: dataPerf || {},- key,- }),+ if (period === 'custom' && dateRange) {+ dataPerf = await getPerfData(id, timeBucket, '', filtersPerf, from, to, timezone, measure, projectPassword)+ rawOverall = await getOverallStats([id], period, from, to, timezone, filtersPerf, projectPassword)+ } else {+ dataPerf = await getPerfData(id, timeBucket, period, filtersPerf, '', '', timezone, measure, projectPassword)+ rawOverall = await getPerformanceOverallStats(+ [id],+ period,+ '',+ '',+ timezone,+ filtersPerf,+ measure,+ projectPassword,)- setOverallPerformance(rawOverall[id])}- const { appliedFilters } = dataPerf+ // @ts-expect-error+ dataPerf.overall = rawOverall[id]- if (!_isEmpty(appliedFilters)) {- setFiltersPerf(appliedFilters)- }+ setOverallPerformance(rawOverall[id])if (_keys(dataPerf).length < 2) {setIsPanelsDataEmptyPerf(true)@@ -2020,100 +1870,56 @@ const ViewProject = () => {}}- const loadFunnelsData = useCallback(- async (forced = false) => {- if (!activeFunnel || !activeFunnel.id) {- return- }-- if (!forced && (authLoading || _isEmpty(project) || dataLoading)) {- return- }-- setDataLoading(true)-- let key-- try {- let dataFunnel: { funnel: AnalyticsFunnel[]; totalPageviews: number }- let from- let to-- if (dateRange) {- from = getFormatDate(dateRange[0])- to = getFormatDate(dateRange[1])- key = getFunnelsCacheCustomKey(id, activeFunnel.id, from, to)- } else {- key = getFunnelsCacheKey(id, activeFunnel.id, period)- }-- if (!forced && !_isEmpty(cacheFunnels[id]) && !_isEmpty(cacheFunnels[id][key])) {- dataFunnel = cacheFunnels[id][key]- } else {- if (period === 'custom' && dateRange) {- dataFunnel = await getFunnelData(id, '', from, to, timezone, activeFunnel.id, projectPassword)- } else {- dataFunnel = await getFunnelData(id, period, '', '', timezone, activeFunnel.id, projectPassword)- }+ const loadFunnelsData = async () => {+ if (!activeFunnel?.id) {+ return+ }- dispatch(- UIActions.setFunnelsCache({- pid: id,- data: dataFunnel || {},- key,- }),- )- }+ setDataLoading(true)- const { funnel, totalPageviews } = dataFunnel+ try {+ let dataFunnel: { funnel: AnalyticsFunnel[]; totalPageviews: number }+ let from+ let to- const bbSettings = getSettingsFunnels(funnel, totalPageviews, t)+ if (dateRange) {+ from = getFormatDate(dateRange[0])+ to = getFormatDate(dateRange[1])+ }- if (activeTab === PROJECT_TABS.funnels) {- setMainChart(() => {- const generate = bb.generate(bbSettings)- generate.data.names(dataNamesFunnel)- return generate- })- }+ if (period === 'custom' && dateRange) {+ dataFunnel = await getFunnelData(id, '', from, to, timezone, activeFunnel.id, projectPassword)+ } else {+ dataFunnel = await getFunnelData(id, period, '', '', timezone, activeFunnel.id, projectPassword)+ }- setAnalyticsLoading(false)- setDataLoading(false)- } catch (reason) {- setAnalyticsLoading(false)- setDataLoading(false)+ const { funnel, totalPageviews } = dataFunnel- if (key) {- dispatch(- UIActions.setFunnelsCache({- pid: id,- data: {},- key,- }),- )- }+ const bbSettings = getSettingsFunnels(funnel, totalPageviews, t)- console.error('[ERROR](loadFunnelsData) Loading funnels data failed:', reason)+ if (activeTab === PROJECT_TABS.funnels) {+ setMainChart(() => {+ const generate = bb.generate(bbSettings)+ generate.data.names(dataNamesFunnel)+ return generate+ })}- },- [- activeFunnel,- activeTab,- cacheFunnels,- dataLoading,- dateRange,- id,- authLoading,- period,- project,- projectPassword,- timezone,- t,- dataNamesFunnel,- ],- )++ setAnalyticsLoading(false)+ setDataLoading(false)+ } catch (reason) {+ setAnalyticsLoading(false)+ setDataLoading(false)++ console.error('[ERROR](loadFunnelsData) Loading funnels data failed:', reason)+ }+ }const filterHandler = async (column: string, filter: any, isExclusive = false) => {+ if (dataLoading) {+ return+ }+const columnPerf = `${column}_perf`const columnSessions = `${column}_sess`const columnErrors = `${column}_err`@@ -2188,12 +1994,6 @@ const ViewProject = () => {resetErrors()sdkInstance?._emitEvent('filtersupdate', filtersToUpdate)-- if (activeTab === PROJECT_TABS.performance) {- await loadAnalyticsPerf(true, filtersToUpdate)- } else if (activeTab === PROJECT_TABS.traffic) {- await loadAnalytics(true, filtersToUpdate)- }}const onFilterSearch = (items: Filter[], override: boolean): void => {@@ -2249,7 +2049,6 @@ const ViewProject = () => {}setCustomMetrics(metrics)- loadAnalytics(true, null, metrics)}const onRemoveCustomMetric = (metricId: ProjectViewCustomEvent['id']) => {@@ -2260,7 +2059,6 @@ const ViewProject = () => {const newMetrics = _filter(customMetrics, (metric) => metric.id !== metricId)setCustomMetrics(newMetrics)- loadAnalytics(true, null, newMetrics)}const resetCustomMetrics = () => {@@ -2269,10 +2067,13 @@ const ViewProject = () => {}setCustomMetrics([])- loadAnalytics(true, null, [])}const onChangeExclusive = (column: string, filter: string, isExclusive: boolean) => {+ if (dataLoading) {+ return+ }+const updateFilters = (filters: Filter[], setFilters: React.Dispatch<React.SetStateAction<Filter[]>>): Filter[] => {const newFilters = filters.map((f) => (f.column === column && f.filter === filter ? { ...f, isExclusive } : f))if (JSON.stringify(newFilters) !== JSON.stringify(filters)) {@@ -2286,7 +2087,6 @@ const ViewProject = () => {switch (activeTab) {case PROJECT_TABS.performance:newFilters = updateFilters(filtersPerf, setFiltersPerf)- loadAnalyticsPerf(true, newFilters)breakcase PROJECT_TABS.sessions:newFilters = updateFilters(filtersSessions, setFiltersSessions)@@ -2301,7 +2101,6 @@ const ViewProject = () => {breakdefault:newFilters = updateFilters(filters, setFilters)- loadAnalytics(true, newFilters)break}@@ -2315,26 +2114,52 @@ const ViewProject = () => {sdkInstance?._emitEvent('filtersupdate', newFilters)}- useEffect(() => {- switch (activeTab) {- case PROJECT_TABS.performance:- parseFiltersFromUrl('_perf', searchParams, setFiltersPerf, setAreFiltersPerfParsed)- break- case PROJECT_TABS.sessions:- parseFiltersFromUrl('_sess', searchParams, setFiltersSessions, setAreFiltersSessionsParsed)- break- case PROJECT_TABS.errors:- parseFiltersFromUrl('_err', searchParams, setFiltersErrors, setAreFiltersErrorsParsed)- parseFiltersFromUrl('_subErr', searchParams, setFiltersSubError, setAreFiltersSubErrorParsed)- break- default:- parseFiltersFromUrl('', searchParams, setFilters, setAreFiltersParsed)- break+ const setDashboardTab = (key: keyof typeof PROJECT_TABS) => {+ if (dataLoading) {+ return}- }, [activeTab])++ setActiveTab(key)+ }useEffect(() => {- if (!arePeriodParsed) return+ parseFiltersFromUrl('_perf', searchParams, setFiltersPerf)+ parseFiltersFromUrl('_sess', searchParams, setFiltersSessions)+ parseFiltersFromUrl('_err', searchParams, setFiltersErrors)+ parseFiltersFromUrl('_subErr', searchParams, setFiltersSubError)+ parseFiltersFromUrl('', searchParams, setFilters)++ const parsePeriodFilters = () => {+ try {+ const intialPeriod = projectViewPrefs+ ? searchParams.get('period') || projectViewPrefs[id]?.period+ : searchParams.get('period') || '7d'++ if (!_includes(validPeriods, intialPeriod)) {+ return+ }++ if (intialPeriod === 'custom') {+ // @ts-expect-error+ const from = new Date(searchParams.get('from'))+ // @ts-expect-error+ const to = new Date(searchParams.get('to'))+ if (from.getDate() && to.getDate()) {+ onRangeDateChange([from, to], true)+ setDateRange([from, to])+ }+ return+ }++ setPeriodPairs(tbPeriodPairs(t, undefined, undefined, language))+ setDateRange(null)+ updatePeriod({+ period: intialPeriod,+ })+ } catch {}+ }++ parsePeriodFilters()try {const initialTimeBucket = searchParams.get('timeBucket')@@ -2345,20 +2170,20 @@ const ViewProject = () => {setTimebucket(initialTimeBucket || periodPairs[3].tbs[1])}}- } finally {- setAreTimeBucketParsed(true)- }- }, [arePeriodParsed])+ } catch {}++ setAreFiltersParsed(true)+ }, [activeTab])const refreshStats = async () => {if (!authLoading && !dataLoading) {if (activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf(true)+ loadAnalyticsPerf()return}if (activeTab === PROJECT_TABS.funnels) {- loadFunnelsData(true)+ loadFunnelsData()return}@@ -2384,7 +2209,7 @@ const ViewProject = () => {return}- loadAnalytics(true)+ loadAnalytics()}}@@ -2402,25 +2227,9 @@ const ViewProject = () => {}const forecastChart = async (periodToForecast: string) => {- const key = getProjectForcastCacheKey(period, timeBucket, periodToForecast, filters)- const data = cache[id][key]-- if (!_isEmpty(data)) {- setForecasedChartData(data)- setDataLoading(false)- return- }-try {const result = await getChartPrediction(chartData, periodToForecast, timeBucket)const transformed = transformAIChartData(result)- dispatch(- UIActions.setProjectForecastCache({- pid: id,- data: transformed,- key,- }),- )setForecasedChartData(transformed)} catch (reason) {console.error(`[forecastChart] Error: ${reason}`)@@ -2493,9 +2302,59 @@ const ViewProject = () => {}useEffect(() => {+ if (!areFiltersParsed || activeTab !== PROJECT_TABS.traffic) return+loadAnalytics()++ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [forecasedChartData, mode, areFiltersParsed, activeTab, customMetrics, filters, isActiveCompare])++ useEffect(() => {+ if (!areFiltersParsed || activeTab !== PROJECT_TABS.performance) return++ loadAnalyticsPerf()++ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [areFiltersParsed, activeTab, activePerfMeasure, activeChartMetricsPerf, filtersPerf, isActiveCompare])++ useEffect(() => {+ if (activeTab !== PROJECT_TABS.funnels) return++ loadFunnelsData()++ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [activeFunnel, activeTab])++ useEffect(() => {+ if (authLoading || !areFiltersParsed || activeTab !== PROJECT_TABS.sessions) {+ return+ }++ loadSessions()++ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [activeTab, dateRange, filtersSessions, id, period, projectPassword, timezone, authLoading, areFiltersParsed])++ useEffect(() => {+ if (authLoading || !areFiltersParsed || activeTab !== PROJECT_TABS.errors) {+ return+ }++ loadErrors()+// eslint-disable-next-line react-hooks/exhaustive-deps- }, [forecasedChartData, mode])+ }, [+ activeTab,+ errorOptions,+ dateRange,+ filtersErrors,+ id,+ period,+ projectPassword,+ timezone,+ areFiltersParsed,+ authLoading,+ ])useEffect(() => {searchParams.set('tab', activeTab)@@ -2762,110 +2621,6 @@ const ViewProject = () => {}}- useEffect(() => {- if (period === KEY_FOR_ALL_TIME) {- return- }-- if (areFiltersParsed && areTimeBucketParsed && arePeriodParsed && activeTab === PROJECT_TABS.traffic) {- loadAnalytics()- }- if (areFiltersPerfParsed && areTimeBucketParsed && arePeriodParsed && activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf()- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [- project,- period,- chartType,- filters,- forecasedChartData,- timeBucket,- periodPairs,- areFiltersParsed,- areTimeBucketParsed,- arePeriodParsed,- t,- activeTab,- areFiltersPerfParsed,- ])-- useEffect(() => {- if (authLoading) {- return- }-- if (activeTab === PROJECT_TABS.sessions && areFiltersSessionsParsed) {- loadSessions()- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [- activeTab,- dateRange,- filtersSessions,- id,- period,- projectPassword,- timezone,- areFiltersSessionsParsed,- authLoading,- ])-- useEffect(() => {- if (authLoading) {- return- }-- if (activeTab === PROJECT_TABS.errors && areFiltersErrorsParsed) {- loadErrors()- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [- activeTab,- errorOptions,- dateRange,- filtersErrors,- id,- period,- projectPassword,- timezone,- areFiltersErrorsParsed,- authLoading,- ])-- useEffect(() => {- if (period !== KEY_FOR_ALL_TIME) {- return- }-- if (areFiltersParsed && areTimeBucketParsed && arePeriodParsed && activeTab === PROJECT_TABS.traffic) {- loadAnalytics()- }- if (areFiltersPerfParsed && areTimeBucketParsed && arePeriodParsed && activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf()- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [- project,- period,- chartType,- filters,- forecasedChartData,- areFiltersParsed,- areTimeBucketParsed,- arePeriodParsed,- activeTab,- areFiltersPerfParsed,- ])-- useEffect(() => {- if (!project || !activeFunnel) {- return- }-- loadFunnelsData()- }, [project, activeFunnel, loadFunnelsData, period, t])-useEffect(() => {if (!_isEmpty(activeChartMetricsCustomEvents)) {setActiveChartMetricsCustomEvents([])@@ -2873,10 +2628,10 @@ const ViewProject = () => {}, [period, filters]) // eslint-disable-lineuseEffect(() => {- if (dateRange && arePeriodParsed) {+ if (dateRange && areFiltersParsed) {onRangeDateChange(dateRange)}- }, [dateRange, t, arePeriodParsed]) // eslint-disable-line+ }, [dateRange, t, areFiltersParsed]) // eslint-disable-lineuseEffect(() => {if (!project || project.isLocked) {@@ -2971,6 +2726,10 @@ const ViewProject = () => {}const updateTimebucket = (newTimebucket: string) => {+ if (dataLoading) {+ return+ }+searchParams.set('timeBucket', newTimebucket)setSearchParams(searchParams)setTimebucket(newTimebucket)@@ -2994,49 +2753,10 @@ const ViewProject = () => {setActivePerfMeasure(measure)}- useEffect(() => {- loadAnalyticsPerf()- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [activePerfMeasure, activeChartMetricsPerf])-const openSettingsHandler = () => {navigate(_replace(routes.project_settings, ':id', id))}- // TODO: What the fuck is this?- useEffect(() => {- try {- const intialPeriod = projectViewPrefs- ? searchParams.get('period') || projectViewPrefs[id]?.period- : searchParams.get('period') || '7d'-- if (!_includes(validPeriods, intialPeriod)) {- return- }-- if (intialPeriod === 'custom') {- // @ts-expect-error- const from = new Date(searchParams.get('from'))- // @ts-expect-error- const to = new Date(searchParams.get('to'))- if (from.getDate() && to.getDate()) {- onRangeDateChange([from, to], true)- setDateRange([from, to])- }- return- }-- setPeriodPairs(tbPeriodPairs(t, undefined, undefined, language))- setDateRange(null)- updatePeriod({- period: intialPeriod,- })- } finally {- setArePeriodParsed(true)- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [])-const isConflicted = (conflicts?: string[]) => {if (!conflicts) {return false@@ -3060,14 +2780,16 @@ const ViewProject = () => {}const resetActiveTabFilters = () => {+ if (dataLoading) {+ return+ }+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 && !activeEID) {@@ -3085,11 +2807,6 @@ const ViewProject = () => {setFiltersSessions([])setFiltersErrors([])setFiltersSubError([])- if (activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf(true, [])- } else if (activeTab === PROJECT_TABS.traffic) {- loadAnalytics(true, [])- }}const exportTypes = [@@ -3109,24 +2826,6 @@ const ViewProject = () => {setChartType(type)}- useEffect(() => {- setItem(IS_ACTIVE_COMPARE, JSON.stringify(isActiveCompare))- if (activePeriodCompare === PERIOD_PAIRS_COMPARE.CUSTOM && !dateRangeCompare) {- return- }-- if (isActiveCompare) {- if (activeTab === PROJECT_TABS.performance) {- loadAnalyticsPerf()- }-- if (activeTab === PROJECT_TABS.traffic) {- loadAnalytics()- }- }- // eslint-disable-next-line react-hooks/exhaustive-deps- }, [isActiveCompare, activePeriodCompare, dateRangeCompare])-/* KEYBOARD SHORTCUTS */const generalShortcutsActions = {B: () => setChartTypeOnClick(chartTypes.bar),@@ -3174,7 +2873,7 @@ const ViewProject = () => {return}- setActiveTab(tab)+ setDashboardTab(tab)})// 'General' shortcuts@@ -3230,7 +2929,7 @@ const ViewProject = () => {return}- setActiveTab(item?.id as keyof typeof PROJECT_TABS)+ setDashboardTab(item?.id)}}title={activeTabLabel}capitalise@@ -3247,7 +2946,7 @@ const ViewProject = () => {}e.preventDefault()- setActiveTab(tab.id)+ setDashboardTab(tab.id)}const currentUrl = new URL(window.location.href)@@ -3263,8 +2962,10 @@ const ViewProject = () => {'text-md group inline-flex cursor-pointer items-center whitespace-nowrap border-b-2 px-1 py-2 font-bold',{'border-slate-900 text-slate-900 dark:border-gray-50 dark:text-gray-50': isCurrent,- 'border-transparent text-gray-500 hover:border-gray-300 hover:text-gray-700 dark:text-gray-400 dark:hover:border-gray-300 dark:hover:text-gray-300':- !isCurrent,+ 'border-transparent text-gray-500 dark:text-gray-400': !isCurrent,+ 'cursor-wait': dataLoading && tab.id !== 'settings',+ 'hover:border-gray-300 hover:text-gray-700 dark:hover:border-gray-300 dark:hover:text-gray-300':+ !isCurrent && !dataLoading,},)}aria-current={isCurrent ? 'page' : undefined}@@ -3417,6 +3118,20 @@ const ViewProject = () => {timeFormat,size,allowedToManage,+ dataLoading,+ activeTab,+ filters:+ activeTab === PROJECT_TABS.traffic+ ? filters+ : activeTab === PROJECT_TABS.performance+ ? filtersPerf+ : activeTab === PROJECT_TABS.sessions+ ? filtersSessions+ : activeTab === PROJECT_TABS.errors && !activeEID+ ? filtersErrors+ : activeTab === PROJECT_TABS.errors && activeEID+ ? filtersSubError+ : [],// FunctionssetDateRange,@@ -3478,7 +3193,7 @@ const ViewProject = () => {{activeTab !== PROJECT_TABS.funnels && (<LiveVisitorsDropdownonSessionSelect={(psid) => {- setActiveTab(PROJECT_TABS.sessions)+ setDashboardTab(PROJECT_TABS.sessions)setActivePSID(psid)}}live={liveVisitors}@@ -3488,21 +3203,19 @@ const ViewProject = () => {<div className='mx-auto mt-3 flex w-full max-w-[420px] flex-wrap items-center justify-center gap-y-1 space-x-2 sm:mx-0 sm:w-auto sm:max-w-none sm:flex-nowrap sm:justify-between lg:mt-0'>{activeTab !== PROJECT_TABS.funnels && (<>- <div>- <button- type='button'- title={t('project.refreshStats')}- onClick={refreshStats}- className={cx(- 'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',- {- 'cursor-not-allowed opacity-50': authLoading || dataLoading,- },- )}- >- <ArrowPathIcon className='h-5 w-5 stroke-2 text-gray-700 dark:text-gray-50' />- </button>- </div>+ <button+ type='button'+ title={t('project.refreshStats')}+ onClick={refreshStats}+ className={cx(+ 'relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',+ {+ 'cursor-not-allowed opacity-50': authLoading || dataLoading,+ },+ )}+ >+ <ArrowPathIcon className='h-5 w-5 stroke-2 text-gray-700 dark:text-gray-50' />+ </button>{!isSelfhosted && !isActiveCompare && (<divclassName={cx({@@ -3542,7 +3255,13 @@ const ViewProject = () => {<buttontype='button'title={t('project.search')}- onClick={() => setShowFiltersSearch(true)}+ onClick={() => {+ if (dataLoading) {+ return+ }++ setShowFiltersSearch(true)+ }}className={cx('relative rounded-md bg-gray-50 p-2 text-sm font-medium hover:bg-white hover:shadow-sm focus:z-10 focus:border-indigo-500 focus:outline-none focus:ring-1 focus:ring-indigo-500 dark:bg-slate-900 dark:hover:bg-slate-800 focus:dark:border-gray-200 focus:dark:ring-gray-200',{@@ -3594,10 +3313,14 @@ const ViewProject = () => {}return (- <span className='flex items-center justify-between space-x-4'>+ <span+ className={cx('flex items-center justify-between space-x-4', {+ 'cursor-wait': dataLoading,+ })}+ ><span>{item.name}</span>{allowedToManage && (- <span className='flex space-x-2'>+ <span className='flex cursor-pointer space-x-2'><PencilIconclassName='size-4 hover:text-gray-900 dark:hover:text-gray-50'onClick={(e) => {@@ -3938,11 +3661,13 @@ const ViewProject = () => {timeBucket: activeTab === PROJECT_TABS.errors && !activeEID ? 'hidden' : '',}}activePeriod={activePeriod}- updateTimebucket={updateTimebucket}- timeBucket={timeBucket}items={timeBucketSelectorItems}title={activePeriod?.label}onSelect={(pair) => {+ if (dataLoading) {+ return+ }+if (pair.period === PERIOD_PAIRS_COMPARE.COMPARE) {// @ts-expect-errorif (activeTab === PROJECT_TABS.alerts) {@@ -4099,7 +3824,6 @@ const ViewProject = () => {{activeTab === PROJECT_TABS.sessions && !activePSID && (<><Filters- filters={filtersSessions}onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}@@ -4171,7 +3895,6 @@ const ViewProject = () => {{activeTab === PROJECT_TABS.errors && !activeEID && (<><Filters- filters={filtersErrors}onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}@@ -4233,7 +3956,6 @@ const ViewProject = () => {/>)}<Filters- filters={filtersSubError}onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}@@ -4261,12 +3983,10 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={countryActiveTab}icon={panelIcon}id={countryActiveTab}onFilter={filterHandler}- activeTab={activeTab}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}data={activeError.params[countryActiveTab]}rowMapper={rowMapper}@@ -4306,11 +4026,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={activeError.params[browserActiveTab]}@@ -4358,11 +4076,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={osActiveTab}icon={panelIcon}id={osActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}data={activeError.params[osActiveTab]}@@ -4374,9 +4090,7 @@ const ViewProject = () => {if (type === 'dv') {return (<Panel- projectPassword={projectPassword}key={type}- activeTab={activeTab}icon={panelIcon}id={type}onFilter={filterHandler}@@ -4390,7 +4104,6 @@ const ViewProject = () => {if (type === 'pg') {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}@@ -4413,14 +4126,6 @@ const ViewProject = () => {}}name={pgPanelNameMapping[pgActiveFragment]}data={activeError.params[type]}- period={period}- activeTab={activeTab}- pid={id}- timeBucket={timeBucket}- filters={filters}- from={dateRange ? getFormatDate(dateRange[0]) : null}- to={dateRange ? getFormatDate(dateRange[1]) : null}- timezone={timezone}/>)}@@ -4428,11 +4133,9 @@ const ViewProject = () => {if (type === 'lc') {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={activeError.params[type]}@@ -4445,11 +4148,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={activeError.params[type]}@@ -4518,7 +4219,6 @@ const ViewProject = () => {{!isInAIDetailsMode && (<><Filters- filters={filters}onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}@@ -4564,12 +4264,10 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={countryActiveTab}icon={panelIcon}id={countryActiveTab}onFilter={filterHandler}- activeTab={activeTab}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}data={dataSource[countryActiveTab]}customTabs={customTabs}@@ -4610,11 +4308,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={dataSource[browserActiveTab]}@@ -4662,11 +4358,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={osActiveTab}icon={panelIcon}id={osActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<OSDropdown onSelect={setOsActiveTab} title={osPanelName} />}data={dataSource[osActiveTab]}@@ -4678,9 +4372,7 @@ const ViewProject = () => {if (type === 'dv') {return (<Panel- projectPassword={projectPassword}key={type}- activeTab={activeTab}icon={panelIcon}id={type}onFilter={filterHandler}@@ -4695,13 +4387,11 @@ const ViewProject = () => {if (type === 'ref') {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}onFilter={filterHandler}name={panelName}- activeTab={activeTab}data={dataSource[type]}customTabs={customTabs}rowMapper={({ name: entryName }) => <RefRow rowName={entryName} />}@@ -4714,11 +4404,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={utmActiveTab}icon={panelIcon}id={utmActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<UTMDropdown onSelect={setUtmActiveTab} title={ccPanelName} />}data={dataSource[utmActiveTab]}@@ -4731,7 +4419,6 @@ const ViewProject = () => {if (type === 'pg') {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}@@ -4755,14 +4442,6 @@ const ViewProject = () => {name={pgPanelNameMapping[pgActiveFragment]}data={dataSource[type]}customTabs={customTabs}- period={period}- activeTab={activeTab}- pid={id}- timeBucket={timeBucket}- filters={filters}- from={dateRange ? getFormatDate(dateRange[0]) : null}- to={dateRange ? getFormatDate(dateRange[1]) : null}- timezone={timezone}/>)}@@ -4770,11 +4449,9 @@ const ViewProject = () => {if (type === 'lc') {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={dataSource[type]}@@ -4788,11 +4465,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={dataSource[type]}@@ -4832,7 +4507,6 @@ const ViewProject = () => {<div className='h-80 [&_svg]:!overflow-visible' id='dataChart' /></div><Filters- filters={filtersPerf}onRemoveFilter={filterHandler}onChangeExclusive={onChangeExclusive}tnMapping={tnMapping}@@ -4875,7 +4549,6 @@ const ViewProject = () => {id={countryActiveTab}onFilter={filterHandler}name={<CountryDropdown onSelect={setCountryActiveTab} title={ccPanelName} />}- activeTab={activeTab}data={panelsDataPerf.data[countryActiveTab]}customTabs={customTabs}rowMapper={rowMapper}@@ -4894,7 +4567,6 @@ const ViewProject = () => {id={type}onFilter={filterHandler}name={panelName}- activeTab={activeTab}data={panelsDataPerf.data[type]}customTabs={customTabs}// @ts-expect-error@@ -4911,7 +4583,6 @@ const ViewProject = () => {key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={panelsDataPerf.data[type]}@@ -4955,11 +4626,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={browserActiveTab}icon={panelIcon}id={browserActiveTab}- activeTab={activeTab}onFilter={filterHandler}name={<BrowserDropdown onSelect={setBrowserActiveTab} title={brPanelName} />}data={panelsDataPerf.data[browserActiveTab]}@@ -4970,11 +4639,9 @@ const ViewProject = () => {return (<Panel- projectPassword={projectPassword}key={type}icon={panelIcon}id={type}- activeTab={activeTab}onFilter={filterHandler}name={panelName}data={panelsDataPerf.data[type]}diff --git a/web/app/pages/Project/View/components/Filters.tsx b/web/app/pages/Project/View/components/Filters.tsxindex 2c50c2d10..2f695e65a 100644--- a/web/app/pages/Project/View/components/Filters.tsx+++ b/web/app/pages/Project/View/components/Filters.tsx@@ -10,6 +10,7 @@ import { useTranslation } from 'react-i18next'import countries from 'utils/isoCountries'import { getLocaleDisplayName } from 'utils/generic'+import { useViewProjectContext } from '../ViewProject'interface FilterProps {column: string@@ -34,6 +35,7 @@ export const Filter = ({canChangeExclusive,removable,}: FilterProps) => {+ const { dataLoading } = useViewProjectContext()const {t,i18n: { language },@@ -84,7 +86,9 @@ export const Filter = ({ {canChangeExclusive ? (<span- className='cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400'+ className={cx('cursor-pointer border-b-2 border-dotted border-blue-400 text-blue-400', {+ 'cursor-wait': dataLoading,+ })}onClick={() => onChangeExclusive(column, filter, !isExclusive)}>{t(`common.${isExclusive ? 'isNot' : 'is'}`)}@@ -99,7 +103,12 @@ export const Filter = ({<buttononClick={() => 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'+ className={cx(+ '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',+ {+ 'cursor-wait': dataLoading,+ },+ )}><span className='sr-only'>Remove filter</span><svg className='h-2 w-2' stroke='currentColor' fill='none' viewBox='0 0 8 8'>@@ -112,11 +121,6 @@ export const Filter = ({}interface FiltersProps {- filters: {- column: string- filter: string- isExclusive: boolean- }[]// eslint-disable-next-line no-shadowonRemoveFilter: (column: string, filter: string) => void// eslint-disable-next-line no-shadow@@ -125,7 +129,9 @@ interface FiltersProps {resetFilters: () => void}-const Filters = ({ filters, onRemoveFilter, onChangeExclusive, tnMapping, resetFilters }: FiltersProps) => {+const Filters = ({ onRemoveFilter, onChangeExclusive, tnMapping, resetFilters }: FiltersProps) => {+ const { dataLoading, filters } = useViewProjectContext()+if (_isEmpty(filters)) {return null}@@ -154,7 +160,12 @@ const Filters = ({ filters, onRemoveFilter, onChangeExclusive, tnMapping, resetF</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'+ className={cx(+ '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',+ {+ 'cursor-wait': dataLoading,+ },+ )}onClick={resetFilters}/></div>diff --git a/web/app/pages/Project/View/components/InteractiveMap.tsx b/web/app/pages/Project/View/components/InteractiveMap.tsxindex dfbb6c586..83cd43042 100644--- a/web/app/pages/Project/View/components/InteractiveMap.tsx+++ b/web/app/pages/Project/View/components/InteractiveMap.tsx@@ -10,6 +10,7 @@ import { getTimeFromSeconds, getStringFromTime, nFormatter } from 'utils/genericimport { Entry } from 'lib/models/Entry'import countriesList from 'utils/countries'import { useSearchParams } from '@remix-run/react'+import { useViewProjectContext } from '../ViewProject'interface InteractiveMapProps {data: Entry[]@@ -32,6 +33,7 @@ interface CountryMap {}const InteractiveMap = ({ data, onClickCountry, total }: InteractiveMapProps) => {+ const { dataLoading } = useViewProjectContext()const {t,i18n: { language },@@ -66,18 +68,17 @@ const InteractiveMap = ({ data, onClickCountry, total }: InteractiveMapProps) =><pathkey={value}id={value}- className={+ className={cx(isTrafficTab- ? cx({+ ? {'hover:opacity-90': perc > 0,'fill-[#cfd1d4] dark:fill-[#465d7e46]': perc === 0,'fill-[#92b2e7] dark:fill-[#292d77]': perc > 0 && perc < 3,'fill-[#6f9be3] dark:fill-[#363391]': perc >= 3 && perc < 10,'fill-[#5689db] dark:fill-[#4842be]': perc >= 10 && perc < 20,'fill-[#3b82f6] dark:fill-[#6357ff]': perc >= 20,- 'cursor-pointer': Boolean(ccData),- })- : cx({+ }+ : {'hover:opacity-90': ccData > 0,'fill-[#cfd1d4] dark:fill-[#465d7e46]': ccData === 0,'fill-[#92b2e7] dark:fill-[#292d77]': ccData > 0 && ccData < 1,@@ -87,9 +88,12 @@ const InteractiveMap = ({ data, onClickCountry, total }: InteractiveMapProps) =>'fill-[#f78a8a]': ccData >= 5 && ccData < 7,'fill-[#f76b6b]': ccData >= 7 && ccData < 10,'fill-[#f74b4b]': ccData >= 10,- 'cursor-pointer': Boolean(ccData),- })- }+ },+ {+ 'cursor-pointer': Boolean(ccData) && !dataLoading,+ 'cursor-wait': dataLoading,+ },+ )}d={key.d}onClick={() => perc !== 0 && onClickCountry(value)}onMouseEnter={() => {diff --git a/web/app/pages/Project/View/components/RefRow.tsx b/web/app/pages/Project/View/components/RefRow.tsxindex 40c3de2da..1d42f6114 100644--- a/web/app/pages/Project/View/components/RefRow.tsx+++ b/web/app/pages/Project/View/components/RefRow.tsx@@ -13,7 +13,7 @@ const RefRow = ({ rowName }: { rowName: string }) => {const linkClassName = 'text-blue-600 hover:underline dark:text-blue-500'return (- <div className='scrollbar-thin overflow-hidden hover-always:overflow-auto'>+ <div className='scrollbar-thin flex items-center overflow-hidden hover-always:overflow-auto'>{isUrl && (<imgclassName='float-left mr-1.5 size-5'diff --git a/web/app/pages/Project/View/components/TBPeriodSelector.tsx b/web/app/pages/Project/View/components/TBPeriodSelector.tsxindex 8533a89e1..daba782d0 100644--- a/web/app/pages/Project/View/components/TBPeriodSelector.tsx+++ b/web/app/pages/Project/View/components/TBPeriodSelector.tsx@@ -7,6 +7,7 @@ import _map from 'lodash/map'import _includes from 'lodash/includes'import cx from 'clsx'import { ALL_PERIODS } from 'lib/constants'+import { useViewProjectContext } from '../ViewProject'interface TBPeriodSelectorProps {title: string | number | React.ReactNode@@ -14,23 +15,14 @@ interface TBPeriodSelectorProps {/* (function): A function that is called when an item is selected. */onSelect: (item: any, e?: React.MouseEvent<HTMLElement>) => void | nullactivePeriod: any- updateTimebucket: (tb: string) => void- timeBucket: stringclasses?: {timeBucket?: stringperiods?: string}}-const TBPeriodSelector = ({- items,- title,- onSelect,- activePeriod,- updateTimebucket,- timeBucket,- classes,-}: TBPeriodSelectorProps) => {+const TBPeriodSelector = ({ items, title, onSelect, activePeriod, classes }: TBPeriodSelectorProps) => {+ const { dataLoading, updateTimebucket, timeBucket } = useViewProjectContext()const { t } = useTranslation('common')const periods = useMemo(() => {@@ -91,7 +83,8 @@ const TBPeriodSelector = ({'text-gray-900 dark:text-gray-50': timeBucket === value,'text-gray-700 dark:text-gray-300': available && timeBucket !== value,'text-gray-400 dark:text-gray-500': !available && timeBucket !== value,- 'cursor-pointer': available,+ 'cursor-pointer': available && !dataLoading,+ 'cursor-wait': available && dataLoading,'cursor-default': !available,})}>@@ -105,7 +98,12 @@ const TBPeriodSelector = ({as='li'key={item.label}onClick={(e: React.MouseEvent<HTMLElement>) => onSelect(item, e)}- className='block cursor-pointer rounded-md px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-700'+ className={cx(+ 'block cursor-pointer rounded-md px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:text-gray-50 dark:hover:bg-slate-700',+ {+ 'cursor-wait': dataLoading,+ },+ )}>{item.dropdownLabel || item.label}</PopoverButton>diff --git a/web/app/pages/Project/View/components/UserFlow.tsx b/web/app/pages/Project/View/components/UserFlow.tsxindex af0197b64..244ce8787 100644--- a/web/app/pages/Project/View/components/UserFlow.tsx+++ b/web/app/pages/Project/View/components/UserFlow.tsx@@ -1,45 +1,36 @@-import { useEffect, useState } from 'react'+import { useEffect, useState, memo, useMemo } from 'react'import { toast } from 'sonner'import { ResponsiveSankey } from '@nivo/sankey'-import { IUserFlow } from 'lib/models/UserFlow'+import { UserFlowType } from 'lib/models/UserFlow'import _isEmpty from 'lodash/isEmpty'import { getUserFlow } from 'api'import Loader from 'ui/Loader'-import { Filter } from '../interfaces/traffic'import { useTranslation } from 'react-i18next'+import { useViewProjectContext } from '../ViewProject'+import { getFormatDate } from '../ViewProject.helpers'interface UserFlowProps {- pid: string- period: string- timezone: string- timeBucket: string- from: string- to: stringisReversed?: boolean- filters: Filter[]setReversed: () => void- projectPassword?: string}-const UserFlow = ({- pid,- period,- timeBucket,- from,- to,- timezone,- filters,- setReversed,- isReversed,- projectPassword,-}: UserFlowProps) => {+const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {+ const { dateRange, period, timeBucket, timezone, projectPassword, projectId, filters } = useViewProjectContext()const { t } = useTranslation('common')- const [isLoading, setIsLoading] = useState(true)+ const [isLoading, setIsLoading] = useState<boolean | null>(null)const [userFlow, setUserFlow] = useState<{- ascending: IUserFlow- descending: IUserFlow+ ascending: UserFlowType+ descending: UserFlowType} | null>(null)+ const [from, to] = useMemo(() => {+ if (!dateRange) {+ return [undefined, undefined]+ }++ return [getFormatDate(dateRange[0]), getFormatDate(dateRange[1])]+ }, [dateRange])+const fetchUserFlow = async () => {if (isLoading) {return@@ -49,7 +40,7 @@ const UserFlow = ({try {const { ascending, descending } = await getUserFlow(- pid,+ projectId,timeBucket,period,filters,@@ -69,14 +60,14 @@ const UserFlow = ({useEffect(() => {fetchUserFlow()// eslint-disable-next-line react-hooks/exhaustive-deps- }, [period, timeBucket, from, to, timezone, pid])+ }, [period, timeBucket, from, to, timezone, projectId])useEffect(() => {fetchUserFlow()// eslint-disable-next-line react-hooks/exhaustive-deps}, [filters])- if (isLoading) {+ if (isLoading || isLoading === null) {return <Loader />}@@ -140,4 +131,4 @@ const UserFlow = ({)}-export default UserFlow+export default memo(UserFlow)diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsxindex 4d864874c..f529a15db 100644--- a/web/app/pages/Project/View/utils/filters.tsx+++ b/web/app/pages/Project/View/utils/filters.tsx@@ -146,7 +146,6 @@ export const parseFiltersFromUrl = (keySuffix: string,searchParams: URLSearchParams,setFilters: React.Dispatch<React.SetStateAction<Filter[]>>,- setParsedFlag: React.Dispatch<React.SetStateAction<boolean>>,) => {try {const initialFilters: Filter[] = []@@ -168,7 +167,5 @@ export const parseFiltersFromUrl = (setFilters(initialFilters)} catch (reason) {console.error(`[ERROR] Parsing filters from URL with suffix ${keySuffix}: ${reason}`)- } finally {- setParsedFlag(true)}}diff --git a/web/app/pages/UserSettings/UserSettings.tsx b/web/app/pages/UserSettings/UserSettings.tsxindex 7665b758b..474d64b5d 100644--- a/web/app/pages/UserSettings/UserSettings.tsx+++ b/web/app/pages/UserSettings/UserSettings.tsx@@ -16,7 +16,6 @@ import {EnvelopeIcon,ExclamationTriangleIcon,ArrowDownTrayIcon,- CurrencyDollarIcon,ChevronDownIcon,UserIcon,ChatBubbleLeftEllipsisIcon,@@ -30,7 +29,6 @@ import cx from 'clsx'import {reportFrequencies,DEFAULT_TIMEZONE,- WEEKLY_REPORT_FREQUENCY,CONFIRMATION_TIMEOUT,GDPR_REQUEST,GDPR_EXPORT_TIMEFRAME,@@ -75,7 +73,6 @@ import { StateType, useAppDispatch } from 'lib/store'import { authActions } from 'lib/reducers/auth'import { removeRefreshToken } from 'utils/refreshToken'import { removeAccessToken } from 'utils/accessToken'-import UIActions from 'lib/reducers/ui'import { logout } from 'utils/auth'dayjs.extend(utc)@@ -136,7 +133,7 @@ interface Form extends Partial<User> {}const UserSettings = () => {- const { user, isPaidTierUsed, loading } = useSelector((state: StateType) => state.auth)+ const { user, loading } = useSelector((state: StateType) => state.auth)const dispatch = useAppDispatch()const navigate = useNavigate()@@ -152,7 +149,6 @@ const UserSettings = () => {const [timezone, setTimezone] = useState(user.timezone || DEFAULT_TIMEZONE)const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)const [isPasswordChangeModalOpened, setIsPasswordChangeModalOpened] = useState(false)- const [timezoneChanged, setTimezoneChanged] = useState(false)const [reportFrequency, setReportFrequency] = useState(user.reportFrequency)const [formPresetted, setFormPresetted] = useState(false)const [validated, setValidated] = useState(false)@@ -247,11 +243,6 @@ const UserSettings = () => {}}, [loading, user, formPresetted])- const _setTimezone = (value: string) => {- setTimezoneChanged(true)- setTimezone(value)- }-const handleInput = (event: React.ChangeEvent<HTMLInputElement>) => {const { target } = eventconst value = target.type === 'checkbox' ? target.checked : target.value@@ -288,11 +279,6 @@ const UserSettings = () => {setBeenSubmitted(true)if (validated) {- // if the timezone updates, we need to delete all project cache to refetch it with the new timezone setting afterwards- if (timezoneChanged) {- dispatch(UIActions.deleteProjectCache({}))- }-onSubmit({...form,timezone,@@ -361,23 +347,6 @@ const UserSettings = () => {}}- const _setReportFrequency = (value: string) => {- if (!isPaidTierUsed && value === WEEKLY_REPORT_FREQUENCY) {- setIsPaidFeatureOpened(true)- return- }-- setReportFrequency(value)- }-- const reportIconExtractor = (_: any, index: number) => {- if (!isPaidTierUsed && reportFrequencies[index] === WEEKLY_REPORT_FREQUENCY) {- return <CurrencyDollarIcon className='mr-1 h-5 w-5' />- }-- return null- }-const onAccountDelete = async () => {try {await deleteUser(deletionFeedback)@@ -828,7 +797,7 @@ const UserSettings = () => {</h3><div className='mt-4 grid grid-cols-1 gap-x-4 gap-y-6 lg:grid-cols-2'><div>- <TimezonePicker value={timezone} onChange={_setTimezone} />+ <TimezonePicker value={timezone} onChange={setTimezone} /></div></div><Button className='mt-4' onClick={handleTimezoneSave} primary large>@@ -893,9 +862,8 @@ const UserSettings = () => {label={t('profileSettings.frequency')}className='w-full'items={translatedFrequencies}- iconExtractor={reportIconExtractor}onSelect={(f) =>- _setReportFrequency(+ setReportFrequency(reportFrequencies[_findIndex(translatedFrequencies, (freq) => freq === f)],)}diff --git a/web/app/pages/UserSettings/components/Referral.tsx b/web/app/pages/UserSettings/components/Referral.tsxindex 2c2d92b89..957f43558 100644--- a/web/app/pages/UserSettings/components/Referral.tsx+++ b/web/app/pages/UserSettings/components/Referral.tsx@@ -24,12 +24,12 @@ import {import { isValidEmail } from 'utils/validator'import { useSelector } from 'react-redux'import { StateType, useAppDispatch } from 'lib/store'-import UIActions from 'lib/reducers/ui'import { authActions } from 'lib/reducers/auth'+import { User } from 'lib/models/User'+import Spin from 'ui/icons/Spin'const Referral = () => {const { user } = useSelector((state: StateType) => state.auth)- const { activeReferrals, referralStatistics } = useSelector((state: StateType) => state.ui.cache)const dispatch = useAppDispatch()const {@@ -37,55 +37,47 @@ const Referral = () => {i18n: { language },} = useTranslation('common')const [refCodeGenerating, setRefCodeGenerating] = useState(false)- const [referralStatsRequested, setReferralStatsRequested] = useState(false)- const [activeReferralsRequested, setActiveReferralsRequested] = useState(false)const [paypalInputError, setPaypalInputError] = useState<string | null>(null)const [isPaypalEmailLoading, setIsPaypalEmailLoading] = useState(false)const [paypalEmailAddress, setPaypalEmailAddress] = useState<string | null>(user.paypalPaymentsEmail)+ const [referralStatistics, setReferralStatistics] = useState<{+ trials: number+ subscribers: number+ paid: number+ nextPayout: number+ pending: number+ } | null>(null)+ const [activeReferrals, setActiveReferrals] = useState<Partial<User>[]>([])++ const [isLoading, setIsLoading] = useState<boolean | null>(null)++ const uiIsLoading = isLoading || isLoading === null+const refUrl = `${REF_URL_PREFIX}${user?.refCode}`- useEffect(() => {- const getRefStats = async () => {- try {- const info = await getPayoutsInfo()- dispatch(- UIActions.setCache({- key: 'referralStatistics',- value: info,- }),- )- } catch (reason) {- console.error('[Referral][getRefStats] Something went wrong whilst requesting payouts information', reason)- toast.error(t('apiNotifications.payoutInfoError'))- }+ const loadStatistics = async () => {+ if (isLoading) {+ return}+ setIsLoading(true)- const getActiveReferrals = async () => {- try {- const info = await getReferrals()- dispatch(- UIActions.setCache({- key: 'activeReferrals',- value: info,- }),- )- } catch (reason) {- console.error('[Referral][getActiveReferrals] Something went wrong whilst requesting active referrals', reason)- toast.error(t('apiNotifications.payoutInfoError'))- }+ try {+ const [payoutsInfo, referrals] = await Promise.all([getPayoutsInfo(), getReferrals()])+ setReferralStatistics(payoutsInfo)+ setActiveReferrals(referrals)+ } catch (reason: any) {+ console.error('[loadStatistics] Something went wrong whilst requesting referrals info', reason)+ } finally {+ setIsLoading(false)}+ }- if (!referralStatsRequested && _isEmpty(referralStatistics)) {- setReferralStatsRequested(true)- getRefStats()- }+ useEffect(() => {+ loadStatistics()- if (!activeReferralsRequested && _isEmpty(activeReferrals)) {- setActiveReferralsRequested(true)- getActiveReferrals()- }- }, [referralStatistics, referralStatsRequested, activeReferralsRequested, activeReferrals, t, dispatch])+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [])const onRefCodeGenerate = async () => {if (refCodeGenerating || user.refCode) {@@ -198,123 +190,127 @@ const Referral = () => {{t('profileSettings.referral.generateRefLink')}</Button>)}- {!_isEmpty(referralStatistics) && (- <>- <h3 className='mt-5 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.referralStats')}- </h3>- <div>- <Tooltip- text={t('profileSettings.referral.trialDesc')}- tooltipNode={- <span className='text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.trial')}: <Highlighted>{referralStatistics.trials}</Highlighted>- </span>- }- className='!h-auto !w-auto max-w-max'- />- <Tooltip- text={t('profileSettings.referral.activeDesc')}- tooltipNode={- <span className='text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.active')}: <Highlighted>{referralStatistics.subscribers}</Highlighted>- </span>- }- className='!h-auto !w-auto max-w-max'- />- <Tooltip- text={t('profileSettings.referral.paidDesc')}- tooltipNode={- <span className='text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.paid')}: <Highlighted>US$ {referralStatistics.paid}</Highlighted>- </span>- }- className='!h-auto !w-auto max-w-max'- />- <Tooltip- text={t('profileSettings.referral.nextPayoutDesc')}- tooltipNode={- <span className='text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.nextPayout')}:{' '}- <Highlighted>US$ {referralStatistics.nextPayout}</Highlighted>- </span>- }- className='!h-auto !w-auto max-w-max'- />- <Tooltip- text={t('profileSettings.referral.pendingDesc', {- days: REFERRAL_PENDING_PAYOUT_DAYS,- })}- tooltipNode={- <span className='text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.pending')}: <Highlighted>US$ {referralStatistics.pending}</Highlighted>- </span>- }- className='!h-auto !w-auto max-w-max'- />- </div>- </>+ <h3 className='mt-5 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.referralStats')}+ </h3>+ {referralStatistics ? (+ <div>+ <Tooltip+ text={t('profileSettings.referral.trialDesc')}+ tooltipNode={+ <span className='text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.trial')}: <Highlighted>{referralStatistics.trials}</Highlighted>+ </span>+ }+ className='block'+ />+ <Tooltip+ text={t('profileSettings.referral.activeDesc')}+ tooltipNode={+ <span className='text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.active')}: <Highlighted>{referralStatistics.subscribers}</Highlighted>+ </span>+ }+ className='block'+ />+ <Tooltip+ text={t('profileSettings.referral.paidDesc')}+ tooltipNode={+ <span className='text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.paid')}: <Highlighted>US$ {referralStatistics.paid}</Highlighted>+ </span>+ }+ className='block'+ />+ <Tooltip+ text={t('profileSettings.referral.nextPayoutDesc')}+ tooltipNode={+ <span className='text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.nextPayout')}:{' '}+ <Highlighted>US$ {referralStatistics.nextPayout}</Highlighted>+ </span>+ }+ className='block'+ />+ <Tooltip+ text={t('profileSettings.referral.pendingDesc', {+ days: REFERRAL_PENDING_PAYOUT_DAYS,+ })}+ tooltipNode={+ <span className='text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.pending')}: <Highlighted>US$ {referralStatistics.pending}</Highlighted>+ </span>+ }+ className='block'+ />+ </div>+ ) : (+ <Spin className='!ml-0 mt-2' />)}- {!_isEmpty(activeReferrals) && (- <>- <h3 className='mt-5 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.activeReferrals')}- </h3>- <table className='200 mt-2 min-w-full divide-y divide-gray-300 shadow ring-1 ring-black ring-opacity-5 dark:divide-gray-500 md:rounded-lg'>- <thead className='bg-gray-50 dark:bg-slate-800'>- <tr>- <th- scope='col'- className='py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'- >- {t('profileSettings.referral.activeReferralsTable.plan')}- </th>- <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'>- <Tooltip- text={t('profileSettings.referral.activeReferralsTable.yourCutDesc', {- fee: MERCHANT_FEE,- amount: REFERRAL_CUT * 100,- })}- tooltipNode={<>{t('profileSettings.referral.activeReferralsTable.yourCut')}</>}- className='!h-auto !w-auto max-w-max'- />- </th>- <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'>- {t('profileSettings.referral.activeReferralsTable.registrationDate')}- </th>- </tr>- </thead>- <tbody className='divide-y divide-gray-200 bg-white dark:divide-gray-600 dark:bg-slate-800'>- {_map(activeReferrals, ({ billingFrequency, created, planCode, tierCurrency }, index) => {- // @ts-ignore- const planPrice = PLAN_LIMITS[planCode].price[tierCurrency][billingFrequency]- const referrerCut = calculateReferralCut(planPrice)- const currencySymbol = CURRENCIES[tierCurrency as 'EUR' | 'USD' | 'GBP'].symbol- const tBillingFrequency = t(- billingFrequency === BillingFrequency.monthly ? 'pricing.perMonth' : 'pricing.perYear',- )+ <h3 className='mt-5 flex items-center text-lg font-bold text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.activeReferrals')}+ </h3>+ {!_isEmpty(activeReferrals) ? (+ <table className='200 mt-2 min-w-full divide-y divide-gray-300 shadow ring-1 ring-black ring-opacity-5 dark:divide-gray-500 md:rounded-lg'>+ <thead className='bg-gray-50 dark:bg-slate-800'>+ <tr>+ <th+ scope='col'+ className='py-3.5 pl-4 pr-3 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'+ >+ {t('profileSettings.referral.activeReferralsTable.plan')}+ </th>+ <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'>+ <Tooltip+ text={t('profileSettings.referral.activeReferralsTable.yourCutDesc', {+ fee: MERCHANT_FEE,+ amount: REFERRAL_CUT * 100,+ })}+ tooltipNode={<>{t('profileSettings.referral.activeReferralsTable.yourCut')}</>}+ className='block'+ />+ </th>+ <th scope='col' className='px-3 py-3.5 text-left text-sm font-semibold text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.activeReferralsTable.registrationDate')}+ </th>+ </tr>+ </thead>+ <tbody className='divide-y divide-gray-200 bg-white dark:divide-gray-600 dark:bg-slate-800'>+ {_map(activeReferrals, ({ billingFrequency, created, planCode, tierCurrency }, index) => {+ // @ts-ignore+ const planPrice = PLAN_LIMITS[planCode].price[tierCurrency][billingFrequency]+ const referrerCut = calculateReferralCut(planPrice)+ const currencySymbol = CURRENCIES[tierCurrency as 'EUR' | 'USD' | 'GBP'].symbol+ const tBillingFrequency = t(+ billingFrequency === BillingFrequency.monthly ? 'pricing.perMonth' : 'pricing.perYear',+ )- return (- <tr key={index}>- <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50 sm:pl-6'>- {currencySymbol}- {planPrice}/{tBillingFrequency}- </td>- <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50'>- {currencySymbol}- {referrerCut}/{tBillingFrequency}- </td>- <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50'>- {language === 'en'- ? dayjs(created).locale(language).format('MMMM D, YYYY')- : dayjs(created).locale(language).format('D MMMM, YYYY')}- </td>- </tr>- )- })}- </tbody>- </table>- </>+ return (+ <tr key={index}>+ <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50 sm:pl-6'>+ {currencySymbol}+ {planPrice}/{tBillingFrequency}+ </td>+ <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50'>+ {currencySymbol}+ {referrerCut}/{tBillingFrequency}+ </td>+ <td className='whitespace-nowrap px-3 py-4 text-sm text-gray-900 dark:text-gray-50'>+ {language === 'en'+ ? dayjs(created).locale(language).format('MMMM D, YYYY')+ : dayjs(created).locale(language).format('D MMMM, YYYY')}+ </td>+ </tr>+ )+ })}+ </tbody>+ </table>+ ) : uiIsLoading ? (+ <Spin className='!ml-0 mt-2' />+ ) : (+ <p className='mt-2 text-sm text-gray-900 dark:text-gray-50'>+ {t('profileSettings.referral.noActiveReferrals')}+ </p>)}</>)diff --git a/web/app/ui/Dropdown.tsx b/web/app/ui/Dropdown.tsxindex 392deedfe..6b00e8f4b 100644--- a/web/app/ui/Dropdown.tsx+++ b/web/app/ui/Dropdown.tsx@@ -107,20 +107,26 @@ function Dropdown<T>({},)}>- {header && <p className='px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-50'>{header}</p>}+ {header ? (+ <p className='px-4 py-2 text-sm font-medium text-gray-700 dark:text-gray-50'>{header}</p>+ ) : null}{loading ? (<div className='px-4 py-2'><Spin className='!ml-0' /><span className='sr-only'>Loading...</span></div>) : (- _map(items, (item) => (+ _map(items, (item, index) => (<MenuItem key={keyExtractor ? keyExtractor(item, close) : (item as Key)}><span- className={+ className={cx(selectItemClassName ||- 'block cursor-pointer px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700'- }+ 'block cursor-pointer px-4 py-2 text-sm text-gray-700 hover:bg-gray-200 dark:border-gray-800 dark:bg-slate-800 dark:text-gray-50 dark:hover:bg-slate-700',+ {+ 'rounded-t-md': index === 0 && !header,+ 'rounded-b-md': index === items.length - 1,+ },+ )}role='menuitem'tabIndex={0}onClick={(e: React.MouseEvent<HTMLElement>) => onSelect(item, e, close)}diff --git a/web/app/ui/Tooltip.tsx b/web/app/ui/Tooltip.tsxindex a5cde8c42..0872dc74b 100644--- a/web/app/ui/Tooltip.tsx+++ b/web/app/ui/Tooltip.tsx@@ -22,7 +22,7 @@ const TooltipContent = forwardRef<// 'transform-gpu transition-all duration-300 ease-in-out',// 'data-[state=closed]:scale-90 data-[state=delayed-open]:scale-100',// 'data-[state=closed]:opacity-0 data-[state=delayed-open]:opacity-100',- 'z-50 overflow-hidden rounded-md bg-slate-800 px-3 py-1.5 text-xs text-white ring-1 ring-slate-900/80',+ 'z-50 max-w-80 overflow-hidden rounded-md bg-slate-800 px-3 py-1.5 text-xs text-white ring-1 ring-slate-900/80',className,)}{...props}diff --git a/web/package-lock.json b/web/package-lock.jsonindex bd15b91c3..15dd5f798 100644--- a/web/package-lock.json+++ b/web/package-lock.json@@ -62,6 +62,7 @@"@remix-run/dev": "^2.13.1","@remix-run/eslint-config": "^2.13.1","@tailwindcss/typography": "^0.5.15",+ "@types/file-saver": "^2.0.7","@types/lodash": "^4.17.13","@types/node": "^22.9.0","@types/react": "^18.3.12",@@ -2516,6 +2517,13 @@"@types/estree": "*"}},+ "node_modules/@types/file-saver": {+ "version": "2.0.7",+ "resolved": "https://registry.npmjs.org/@types/file-saver/-/file-saver-2.0.7.tgz",+ "integrity": "sha512-dNKVfHd/jk0SkR/exKGj2ggkB45MAkzvWCaqLUUgkyjITkGNzH8H+yUwr+BLJUBjZOe9w8X3wgmXhZDRg1ED6A==",+ "dev": true,+ "license": "MIT"+ },"node_modules/@types/hast": {"version": "2.3.10","license": "MIT",@@ -2726,16 +2734,16 @@}},"node_modules/@typescript-eslint/parser": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.13.0.tgz",- "integrity": "sha512-w0xp+xGg8u/nONcGw1UXAr6cjCPU1w0XVyBs6Zqaj5eLmxkKQAByTdV/uGgNN5tVvN/kKpoQlP2cL7R+ajZZIQ==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",+ "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==","dev": true,- "license": "BSD-2-Clause",+ "license": "MITClause","dependencies": {- "@typescript-eslint/scope-manager": "8.13.0",- "@typescript-eslint/types": "8.13.0",- "@typescript-eslint/typescript-estree": "8.13.0",- "@typescript-eslint/visitor-keys": "8.13.0",+ "@typescript-eslint/scope-manager": "8.18.0",+ "@typescript-eslint/types": "8.18.0",+ "@typescript-eslint/typescript-estree": "8.18.0",+ "@typescript-eslint/visitor-keys": "8.18.0","debug": "^4.3.4"},"engines": {@@ -2746,23 +2754,19 @@"url": "https://opencollective.com/typescript-eslint"},"peerDependencies": {- "eslint": "^8.57.0 || ^9.0.0"- },- "peerDependenciesMeta": {- "typescript": {- "optional": true- }+ "eslint": "^8.57.0 || ^9.0.0",+ "typescript": ">=4.8.4 <5.8.0"}},"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.13.0.tgz",- "integrity": "sha512-XsGWww0odcUT0gJoBZ1DeulY1+jkaHUciUq4jKNv4cpInbvvrtDoyBH9rE/n2V29wQJPk8iCH1wipra9BhmiMA==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",+ "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==","dev": true,"license": "MIT","dependencies": {- "@typescript-eslint/types": "8.13.0",- "@typescript-eslint/visitor-keys": "8.13.0"+ "@typescript-eslint/types": "8.18.0",+ "@typescript-eslint/visitor-keys": "8.18.0"},"engines": {"node": "^18.18.0 || ^20.9.0 || >=21.1.0"@@ -2773,9 +2777,9 @@}},"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",- "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",+ "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==","dev": true,"license": "MIT","engines": {@@ -2899,14 +2903,14 @@}},"node_modules/@typescript-eslint/typescript-estree": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.13.0.tgz",- "integrity": "sha512-v7SCIGmVsRK2Cy/LTLGN22uea6SaUIlpBcO/gnMGT/7zPtxp90bphcGf4fyrCQl3ZtiBKqVTG32hb668oIYy1g==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",+ "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==","dev": true,- "license": "BSD-2-Clause",+ "license": "MIT","dependencies": {- "@typescript-eslint/types": "8.13.0",- "@typescript-eslint/visitor-keys": "8.13.0",+ "@typescript-eslint/types": "8.18.0",+ "@typescript-eslint/visitor-keys": "8.18.0","debug": "^4.3.4","fast-glob": "^3.3.2","is-glob": "^4.0.3",@@ -2921,16 +2925,14 @@"type": "opencollective","url": "https://opencollective.com/typescript-eslint"},- "peerDependenciesMeta": {- "typescript": {- "optional": true- }+ "peerDependencies": {+ "typescript": ">=4.8.4 <5.8.0"}},"node_modules/@typescript-eslint/typescript-estree/node_modules/@typescript-eslint/types": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",- "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",+ "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==","dev": true,"license": "MIT","engines": {@@ -3025,14 +3027,14 @@}},"node_modules/@typescript-eslint/visitor-keys": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.13.0.tgz",- "integrity": "sha512-7N/+lztJqH4Mrf0lb10R/CbI1EaAMMGyF5y0oJvFoAhafwgiRA7TXyd8TFn8FC8k5y2dTsYogg238qavRGNnlw==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",+ "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==","dev": true,"license": "MIT","dependencies": {- "@typescript-eslint/types": "8.13.0",- "eslint-visitor-keys": "^3.4.3"+ "@typescript-eslint/types": "8.18.0",+ "eslint-visitor-keys": "^4.2.0"},"engines": {"node": "^18.18.0 || ^20.9.0 || >=21.1.0"@@ -3043,9 +3045,9 @@}},"node_modules/@typescript-eslint/visitor-keys/node_modules/@typescript-eslint/types": {- "version": "8.13.0",- "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.13.0.tgz",- "integrity": "sha512-4cyFErJetFLckcThRUFdReWJjVsPCqyBlJTi6IDEpc1GWCIIZRFxVppjWLIMcQhNGhdWJJRYFHpHoDWvMlDzng==",+ "version": "8.18.0",+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",+ "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==","dev": true,"license": "MIT","engines": {@@ -3056,6 +3058,19 @@"url": "https://opencollective.com/typescript-eslint"}},+ "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": {+ "version": "4.2.0",+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",+ "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",+ "dev": true,+ "license": "Apache-2.0",+ "engines": {+ "node": "^18.18.0 || ^20.9.0 || >=21.1.0"+ },+ "funding": {+ "url": "https://opencollective.com/eslint"+ }+ },"node_modules/@ungap/structured-clone": {"version": "1.2.0","dev": true,diff --git a/web/package.json b/web/package.jsonindex 9429ec7f0..6ffbea9b2 100644--- a/web/package.json+++ b/web/package.json@@ -132,6 +132,7 @@"@remix-run/dev": "^2.13.1","@remix-run/eslint-config": "^2.13.1","@tailwindcss/typography": "^0.5.15",+ "@types/file-saver": "^2.0.7","@types/lodash": "^4.17.13","@types/node": "^22.9.0","@types/react": "^18.3.12",diff --git a/web/public/locales/en.json b/web/public/locales/en.jsonindex cb545e947..3a8975990 100644--- a/web/public/locales/en.json+++ b/web/public/locales/en.json@@ -603,6 +603,7 @@"generateRefLink": "Generate referral link","referralStats": "Referral statistics","activeReferrals": "Active referrals",+ "noActiveReferrals": "You have no active referrals yet","trial": "Trial referrals","trialDesc": "Trial users referred by you","active": "Active referrals",