📈 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
fix live visitors and redux
kruzhambusde32a2820168
diff --git a/src/api/index.ts b/src/api/index.tsindex a3687cf0f..867f540a2 100644--- a/src/api/index.ts+++ b/src/api/index.ts@@ -426,7 +426,7 @@ export const getOverallStatsCaptcha = (pids: string[]) =>export const getLiveVisitors = (pids: string[]) =>api.get(`log/hb?pids=[${_map(pids, (pid) => `"${pid}"`).join(',')}]`)- .then((response): { [key: string]: number } => response.data)+ .then((response) => response.data).catch((error) => {debug('%s', error)throw _isEmpty(error.response.data?.message)diff --git a/src/pages/Dashboard/Dashboard.tsx b/src/pages/Dashboard/Dashboard.tsxindex 1322e6aea..34c759192 100644--- a/src/pages/Dashboard/Dashboard.tsx+++ b/src/pages/Dashboard/Dashboard.tsx@@ -530,7 +530,7 @@ const Dashboard = ({isPublic={project?.public}confirmed={confirmed}overall={project?.overall}- live='N/A'+ live={_isNumber(project?.live) ? project?.live : 'N/A'}setUserShareData={() => {}}deleteProjectFailed={() => {}}sharedProjects={[]}diff --git a/src/pages/Project/View/components/LiveVisitorsDropdown.tsx b/src/pages/Project/View/components/LiveVisitorsDropdown.tsxindex 19f700281..4f02dac25 100644--- a/src/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/src/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -43,7 +43,7 @@ const LiveVisitorsDropdown = ({ live, projectId }: {onOutsideClick={() => setShow(false)}><p className='h-5 mr-2 text-gray-900 dark:text-gray-50 text-xl cursor-pointer' onClick={() => setShow(!show)}>- {live}+ {`${live}` || 'N/A'}{' '}{show ? <ChevronUpIcon className='inline w-5 h-5' /> : <ChevronDownIcon className='inline w-5 h-5' />}</p>diff --git a/src/redux/reducers/auth.ts b/src/redux/reducers/auth.tsindex f325985cd..6339228db 100644--- a/src/redux/reducers/auth.ts+++ b/src/redux/reducers/auth.ts@@ -1,7 +1,7 @@/* eslint-disable @typescript-eslint/no-unused-expressions *//* eslint-disable no-unused-expressions *//* eslint-disable no-param-reassign */-import { createSlice, PayloadAction } from '@reduxjs/toolkit'+import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'import _filter from 'lodash/filter'import _map from 'lodash/map'import { IUser } from '../models/IUser'@@ -40,7 +40,7 @@ const authSlice = createSlice({state.isPaidTierUsed = isSelfhosted || (payload?.planCode && payload.planCode !== FREE_TIER_KEY) as boolean},emailVerifySuccessful: (state) => {- state.user = { ...state.user, isActive: true }+ state.user = { ...current(state.user), isActive: true }},signupUpSuccessful: (state, { payload }: PayloadAction<IUser>) => {state.user = payload@@ -64,29 +64,29 @@ const authSlice = createSlice({state.isPaidTierUsed = isSelfhosted},deleteShareProject: (state, { payload }: PayloadAction<string>) => {- const projects = _filter(state.user?.sharedProjects, (item) => item.id !== payload)- state.user = { ...state.user, sharedProjects: projects }+ const projects = _filter(current(state.user?.sharedProjects), (item) => item.id !== payload)+ state.user = { ...current(state.user), sharedProjects: projects }},setUserShareData: (state, { payload }: PayloadAction<{ data: Partial<ISharedProject>, id: string }>) => {- const projects = _map(state.user?.sharedProjects, (item) => {+ const projects = _map(current(state.user?.sharedProjects), (item) => {if (item.id === payload.id) {return { ...item, ...payload.data }}return item})- state.user = { ...state.user, sharedProjects: projects }+ state.user = { ...current(state.user), sharedProjects: projects }},setDontRemember: (state, { payload }: PayloadAction<boolean>) => {state.dontRemember = payload},updateUserData: (state, { payload }: PayloadAction<IUser>) => {- state.user = { ...state.user, ...payload }+ state.user = { ...current(state.user), ...payload }},setApiKey: (state, { payload }: PayloadAction<string>) => {- state.user = { ...state.user, apiKey: payload }+ state.user = { ...current(state.user), apiKey: payload }},setUser: (state, { payload }: PayloadAction<IUser>) => {- state.user = { ...state.user, ...payload }+ state.user = { ...current(state.user), ...payload }},},})diff --git a/src/redux/reducers/ui/alerts.ts b/src/redux/reducers/ui/alerts.tsindex 5596ffa0b..811586b4f 100644--- a/src/redux/reducers/ui/alerts.ts+++ b/src/redux/reducers/ui/alerts.ts@@ -1,4 +1,4 @@-import { createSlice, PayloadAction } from '@reduxjs/toolkit'+import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'import { IAlerts } from 'redux/models/IAlerts'interface IInitialState {@@ -24,7 +24,7 @@ const alertsSlice = createSlice({},setProjectAlertsTotal(state, { payload }: PayloadAction<{ total: number, pageTotal?: number }>) {state.total = payload.total- state.pageTotal = payload.pageTotal || state.pageTotal+ state.pageTotal = payload.pageTotal || current(state.pageTotal)},setProjectAlertsLoading(state, { payload }: PayloadAction<boolean>) {state.loading = payloaddiff --git a/src/redux/reducers/ui/cache.ts b/src/redux/reducers/ui/cache.tsindex e2548be50..63c924f73 100644--- a/src/redux/reducers/ui/cache.ts+++ b/src/redux/reducers/ui/cache.ts@@ -1,4 +1,4 @@-import { createSlice, PayloadAction } from '@reduxjs/toolkit'+import { createSlice, PayloadAction, current } from '@reduxjs/toolkit'import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import {@@ -19,16 +19,6 @@ export const getInitialViewPrefs = (LS_VIEW: string) => {return {}}-// analytics: {},--// analyticsPerf: {},--// captchaAnalytics: {},--// captchaProjectsViewPrefs: getInitialViewPrefs(LS_CAPTCHA_VIEW_PREFS_SETTING),--// // { pid: { period: '7d', timeBucket: 'day' }, ... }-// projectViewPrefs: getInitialViewPrefs(LS_VIEW_PREFS_SETTING),interface IInitialState {analytics: any@@ -80,12 +70,12 @@ const cacheSlice = createSlice({if (_isEmpty(pid)) {state.analytics = {}}- state.analytics = _filter(state.analytics, (project) => project !== pid)+ state.analytics = _filter(current(state.analytics), (project) => project !== pid)}if (pid) {state.analytics = {...state.analytics,- [pid]: _filter(state.analytics[pid], (ckey) => ckey !== key),+ [pid]: _filter(current(state.analytics[pid]), (ckey) => ckey !== key),}}},@@ -101,11 +91,11 @@ const cacheSlice = createSlice({if (_isEmpty(pid)) {state.captchaAnalytics = {}}- state.captchaAnalytics = _filter(state.captchaAnalytics, (project) => project !== pid)+ state.captchaAnalytics = _filter(current(state.captchaAnalytics), (project) => project !== pid)}state.captchaAnalytics = {...state.captchaAnalytics,- [pid]: _filter(state.captchaAnalytics[pid], (ckey) => ckey !== key),+ [pid]: _filter(current(state.captchaAnalytics[pid]), (ckey) => ckey !== key),}},setProjectViewPrefs(state, { payload }: PayloadAction<{ pid: string, period: string, timeBucket: string, rangeDate?: Date[] }>) {@@ -155,11 +145,11 @@ const cacheSlice = createSlice({if (_isEmpty(pid)) {state.analyticsPerf = {}}- state.analyticsPerf = _filter(state.analyticsPerf, (project) => project !== pid)+ state.analyticsPerf = _filter(current(state.analyticsPerf), (project) => project !== pid)}state.analyticsPerf = {...state.analyticsPerf,- [pid]: _filter(state.analyticsPerf[pid], (ckey) => ckey !== key),+ [pid]: _filter(current(state.analyticsPerf[pid]), (ckey) => ckey !== key),}},setProjectForecastCache(state, { payload }: PayloadAction<{ pid: string, key: string, data: any }>) {diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex 6234c51f2..c72206b3a 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -1,4 +1,4 @@-import { createSlice, PayloadAction } from '@reduxjs/toolkit'+import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'import _filter from 'lodash/filter'import _findIndex from 'lodash/findIndex'import _map from 'lodash/map'@@ -97,23 +97,25 @@ const projectsSlice = createSlice({state.isLoadingCaptcha = payload},removeCaptchaProject(state, { payload }: PayloadAction<string>) {- state.captchaProjects = _filter(state.captchaProjects, (project) => project.id !== payload)+ state.captchaProjects = _filter(current(state.captchaProjects), (project) => project.id !== payload)},setLiveStats(state, { payload }: PayloadAction<{ data: any[], shared: boolean }>) {const { data, shared = false } = payloadif (shared) {// @ts-ignore- state.sharedProjects = _map(state.sharedProjects, (res) => ({+ state.sharedProjects = _map(current(state.sharedProjects), (res) => ({...res,project: {...res.project,- live: res.project && data[toNumber(res.project.id)],+ // @ts-ignore+ live: data[res.project.id],},}))} else {- state.projects = _map(state.projects, (res) => ({+ state.projects = _map(current(state.projects), (res) => ({...res,- live: data[toNumber(res.id)],+ // @ts-ignore+ live: data[res.id],}))}},@@ -121,7 +123,7 @@ const projectsSlice = createSlice({const { id, count, shared = false } = payloadif (shared) {- state.sharedProjects = _map(state.sharedProjects, (res) => {+ state.sharedProjects = _map(current(state.sharedProjects), (res) => {if (res.id === id) {return {...res,@@ -131,7 +133,7 @@ const projectsSlice = createSlice({return res})} else {- state.projects = _map(state.projects, (res) => {+ state.projects = _map(current(state.projects), (res) => {if (res.id === id) {return {...res,@@ -146,7 +148,7 @@ const projectsSlice = createSlice({const { project, shared = false } = payloadif (shared) {- state.sharedProjects = _findIndex(state.sharedProjects, (el) => el.id === project.id) >= 0+ state.sharedProjects = _findIndex(current(state.sharedProjects), (el) => el.id === project.id) >= 0? state.sharedProjects: [...state.sharedProjects,@@ -156,7 +158,7 @@ const projectsSlice = createSlice({},]} else {- state.projects = _findIndex(state.projects, (el) => el.id === project.id) >= 0+ state.projects = _findIndex(current(state.projects), (el) => el.id === project.id) >= 0? state.projects: [...state.projects,@@ -171,7 +173,7 @@ const projectsSlice = createSlice({const { data, id, shared = false } = payloadif (shared) {- state.sharedProjects = _map(state.sharedProjects, (res) => {+ state.sharedProjects = _map(current(state.sharedProjects), (res) => {if (res.project && res.project.id === id) {return {...res,@@ -181,7 +183,7 @@ const projectsSlice = createSlice({return res})} else {- state.projects = _map(state.projects, (res) => {+ state.projects = _map(current(state.projects), (res) => {if (res.id === id) {return {...res,@@ -199,10 +201,10 @@ const projectsSlice = createSlice({const { pid, shared = false } = payloadif (shared) {- state.sharedProjects = _filter(state.sharedProjects, (project) => project.id !== pid)+ state.sharedProjects = _filter(current(state.sharedProjects), (project) => project.id !== pid)state.sharedTotal -= 1} else {- state.projects = _filter(state.projects, (project) => project.id !== pid)+ state.projects = _filter(current(state.projects), (project) => project.id !== pid)state.total -= 1}},