📈 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
some improvments
kruzhambus3bff6f05f35e
diff --git a/src/pages/Project/View/Panels.tsx b/src/pages/Project/View/Panels.tsxindex 4f793c18e..ab1068ef5 100644--- a/src/pages/Project/View/Panels.tsx+++ b/src/pages/Project/View/Panels.tsx@@ -197,7 +197,7 @@ PanelContainer.defaultProps = {// First tab with statsconst Overview = ({- overall, chartData, activePeriod, t, live, sessionDurationAVG, projectId, sessionDurationAVGCompare, isActiveCompare, dataChartCompare, activeDropdownLabelCompare,+ overall, chartData, activePeriod, t, live, sessionDurationAVG, projectId, sessionDurationAVGCompare, isActiveCompare, dataChartCompare, activeDropdownLabelCompare, projectPassword,}: {overall: anychartData: any@@ -210,6 +210,7 @@ const Overview = ({activeDropdownLabelCompare: string | undefineddataChartCompare: anyprojectId: string+ projectPassword: string | undefined}) => {const pageviewsDidGrowUp = overall.percChange >= 0const uniqueDidGrowUp = overall.percChangeUnique >= 0@@ -236,7 +237,7 @@ const Overview = ({{t('dashboard.liveVisitors')}:</div>- <LiveVisitorsDropdown projectId={projectId} live={live} />+ <LiveVisitorsDropdown projectId={projectId} live={live} projectPassword={projectPassword} /></div>{!_isEmpty(chartData) && (<>diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsxindex b357f720a..e22ceebb7 100644--- a/src/pages/Project/View/ViewProject.tsx+++ b/src/pages/Project/View/ViewProject.tsx@@ -155,7 +155,6 @@ const ViewProject = ({const history = useHistory()const project: IProjectForShared = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => ({ ...item.project, role: item.role }))], p => p.id === id) || {} as IProjectForShared, [projects, id, sharedProjects])const projectPassword: string = useMemo(() => password[id] || getItem(PROJECTS_PROTECTED)?.[id] || '', [id, password])- console.log('projectPassword', projectPassword)const isSharedProject = useMemo(() => {const foundProject = _find([..._map(sharedProjects, (item) => item.project)], p => p.id === id)return !_isEmpty(foundProject)@@ -464,9 +463,9 @@ const ViewProject = ({if (!isAllActiveChartMetricsCustomEvents) {if (period === 'custom' && dateRange) {- data = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents)+ data = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents, projectPassword)} else {- data = await getProjectDataCustomEvents(id, timeBucket, period, filters, '', '', timezone, activeChartMetricsCustomEvents)+ data = await getProjectDataCustomEvents(id, timeBucket, period, filters, '', '', timezone, activeChartMetricsCustomEvents, projectPassword)}}@@ -565,7 +564,7 @@ const ViewProject = ({if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare]) && _isEmpty(newFilters || filters)) {dataCompare = cache[id][keyCompare]} else {- dataCompare = await getProjectCompareData(id, timeBucket, '', newFilters || filters, fromCompare, toCompare, timezone)+ dataCompare = await getProjectCompareData(id, timeBucket, '', newFilters || filters, fromCompare, toCompare, timezone, projectPassword)}}@@ -588,11 +587,11 @@ const ViewProject = ({data = cache[id][key]} else {if (period === 'custom' && dateRange) {- data = await getProjectData(id, timeBucket, '', newFilters || filters, from, to, timezone)- customEventsChart = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents)+ data = await getProjectData(id, timeBucket, '', newFilters || filters, from, to, timezone, projectPassword)+ customEventsChart = await getProjectDataCustomEvents(id, timeBucket, '', filters, from, to, timezone, activeChartMetricsCustomEvents, projectPassword)} else {- data = await getProjectData(id, timeBucket, period, newFilters || filters, '', '', timezone)- customEventsChart = await getProjectDataCustomEvents(id, timeBucket, period, filters, '', '', timezone, activeChartMetricsCustomEvents)+ data = await getProjectData(id, timeBucket, period, newFilters || filters, '', '', timezone, projectPassword)+ customEventsChart = await getProjectDataCustomEvents(id, timeBucket, period, filters, '', '', timezone, activeChartMetricsCustomEvents, projectPassword)}customEventsChart = customEventsChart?.chart ? customEventsChart.chart.events : customEventsChartData@@ -731,7 +730,7 @@ const ViewProject = ({if (!_isEmpty(cache[id]) && !_isEmpty(cache[id][keyCompare]) && _isEmpty(newFilters || filtersPerf)) {dataCompare = cache[id][keyCompare]} else {- dataCompare = await getPerfData(id, timeBucket, '', newFilters || filtersPerf, fromCompare, toCompare, timezone)+ dataCompare = await getPerfData(id, timeBucket, '', newFilters || filtersPerf, fromCompare, toCompare, timezone, projectPassword)}}@@ -750,9 +749,9 @@ const ViewProject = ({dataPerf = cachePerf[id][key]} else {if (period === 'custom' && dateRange) {- dataPerf = await getPerfData(id, timeBucket, '', newFilters || filtersPerf, from, to, timezone)+ dataPerf = await getPerfData(id, timeBucket, '', newFilters || filtersPerf, from, to, timezone, projectPassword)} else {- dataPerf = await getPerfData(id, timeBucket, period, newFilters || filtersPerf, '', '', timezone)+ dataPerf = await getPerfData(id, timeBucket, period, newFilters || filtersPerf, '', '', timezone, projectPassword)}setProjectCachePerf(id, dataPerf || {}, key)@@ -1327,7 +1326,7 @@ const ViewProject = ({useEffect(() => {const updateLiveVisitors = async () => {const { id: pid } = project- const result = await getLiveVisitors([pid])+ const result = await getLiveVisitors([pid], projectPassword)setLiveStatsForProject(pid, result[pid])}@@ -1353,8 +1352,8 @@ const ViewProject = ({return}- if (projectRes.isPublic && !projectRes.isOwner) {- getOverallStats([id])+ if (projectRes.isPublic && !projectRes.isOwner && projectRes?.isPasswordProtected) {+ getOverallStats([id], projectPassword).then(res => {setPublicProject({...projectRes,@@ -1375,7 +1374,7 @@ const ViewProject = ({}])}).then(() => {- return getLiveVisitors([id])+ return getLiveVisitors([id], projectPassword)}).then(res => {setLiveStatsForProject(id, res[id])@@ -2049,6 +2048,7 @@ const ViewProject = ({dataChartCompare={dataChartCompare}live={liveStats[id]}projectId={id}+ projectPassword={projectPassword}/>)}{!_isEmpty(panelsData.types) && _map(TRAFFIC_PANELS_ORDER, (type: keyof typeof tnMapping) => {diff --git a/src/pages/Project/View/components/LiveVisitorsDropdown.tsx b/src/pages/Project/View/components/LiveVisitorsDropdown.tsxindex e91c5a571..9c48b80e4 100644--- a/src/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/src/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -10,9 +10,10 @@ import Flag from 'react-flagkit'import { getLiveVisitorsInfo, IGetLiveVisitorsInfo } from 'api'-const LiveVisitorsDropdown = ({ live, projectId }: {+const LiveVisitorsDropdown = ({ live, projectId, projectPassword }: {live: number | string,- projectId: string+ projectId: string,+ projectPassword?: string,}): JSX.Element => {const { t } = useTranslation()const [show, setShow] = useState<boolean>(false)@@ -20,7 +21,7 @@ const LiveVisitorsDropdown = ({ live, projectId }: {const [loading, setLoading] = useState<boolean>(true)const getLiveVisitors = async () => {- await getLiveVisitorsInfo(projectId)+ await getLiveVisitorsInfo(projectId, projectPassword).then((res) => {setLiveInfo(res)})@@ -88,4 +89,8 @@ const LiveVisitorsDropdown = ({ live, projectId }: {)}+LiveVisitorsDropdown.defaultProps = {+ projectPassword: '',+}+export default LiveVisitorsDropdowndiff --git a/src/pages/Project/View/components/UserFlow.tsx b/src/pages/Project/View/components/UserFlow.tsxindex 1bf7142ac..8c5d080e1 100644--- a/src/pages/Project/View/components/UserFlow.tsx+++ b/src/pages/Project/View/components/UserFlow.tsx@@ -1,4 +1,4 @@-import React, { useEffect, useState } from 'react'+import React, { useEffect, useState, useMemo } from 'react'import { ResponsiveSankey } from '@nivo/sankey'import { connect } from 'react-redux'import { StateType, AppDispatch } from 'redux/store'@@ -6,13 +6,15 @@ import UIActions from 'redux/reducers/ui'import { errorsActions } from 'redux/reducers/errors'import { IUserFlow } from 'redux/models/IUserFlow'import _isEmpty from 'lodash/isEmpty'-import { getUserFlowCacheKey } from 'redux/constants'+import { getUserFlowCacheKey, PROJECTS_PROTECTED } from 'redux/constants'import { getUserFlow } from 'api'+import { getItem } from 'utils/localstorage'import Loader from 'ui/Loader'const mapStateToProps = (state: StateType) => ({userFlowAscendingCache: state.ui.cache.userFlowAscending,userFlowDescendingCache: state.ui.cache.userFlowDescending,+ password: state.ui.projects.password,})const mapDispatchToProps = (dispatch: AppDispatch) => ({@@ -41,6 +43,7 @@ const UserFlow = ({disableLegend, pid, period, timeBucket, from, to, timezone, userFlowAscendingCache,userFlowDescendingCache, filters, setReversed,isReversed, setUserFlowAscending, setUserFlowDescending, generateError, t,+ password,}: {disableLegend?: booleanpid: string@@ -62,15 +65,19 @@ const UserFlow = ({t: (key: string) => stringfilters: string[]setReversed: () => void+ password: {+ [key: string]: string+ }}) => {const key = getUserFlowCacheKey(pid, period)const userFlowAscending = userFlowAscendingCache[key]const userFlowDescending = userFlowDescendingCache[key]const [isLoading, setIsLoading] = useState<boolean>(true)+ const projectPassword: string = useMemo(() => password[pid] || getItem(PROJECTS_PROTECTED)?.[pid] || '', [pid, password])const fetchUserFlow = async () => {setIsLoading(true)- await getUserFlow(pid, timeBucket, period, filters, from, to, timezone)+ await getUserFlow(pid, timeBucket, period, filters, from, to, timezone, projectPassword).then((res: {ascending: IUserFlowdescending: IUserFlow