Skip to content

📈 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!

fixed user flow projectc password crash

Blue Mouseaed496a8f91d
diff --git a/app/pages/Project/View/Panels.tsx b/app/pages/Project/View/Panels.tsx
index a296150ad..d9544c3df 100644
--- a/app/pages/Project/View/Panels.tsx
+++ b/app/pages/Project/View/Panels.tsx
@@ -955,11 +955,13 @@ interface IPanel {
activeTab?: string
onFragmentChange?: (arg: number) => void
filters?: string[]
+ projectPassword?: string
}
const Panel = ({
name, data, rowMapper, valueMapper, capitalize, linkContent, t, icon, id, hideFilters,
onFilter, customTabs, pid, period, timeBucket, from, to, timezone, activeTab, onFragmentChange, filters,
+ projectPassword,
}: IPanel): JSX.Element => {
const [page, setPage] = useState(0)
const currentIndex = page * ENTRIES_PER_PANEL
@@ -1055,6 +1057,7 @@ const Panel = ({
>
{/* @ts-ignore */}
<UserFlow
+ projectPassword={projectPassword}
disableLegend
pid={pid || ''}
period={period || ''}
@@ -1084,6 +1087,7 @@ const Panel = ({
<div className='h-[500px] dark:text-gray-800'>
{/* @ts-ignore */}
<UserFlow
+ projectPassword={projectPassword}
pid={pid || ''}
period={period || ''}
timeBucket={timeBucket || ''}
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsx
index 776f203c0..a3a5b12f5 100644
--- a/app/pages/Project/View/ViewProject.tsx
+++ b/app/pages/Project/View/ViewProject.tsx
@@ -2453,16 +2453,16 @@ const ViewProject = ({
if (activeTab === PROJECT_TABS.alerts) {
return
}
-
+
if (isActiveCompare) {
compareDisable()
} else {
setIsActiveCompare(true)
}
-
+
return
}
-
+
if (pair.isCustomDate) {
setTimeout(() => {
// @ts-ignore
@@ -2666,6 +2666,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={countryActiveTab}
icon={panelIcon}
@@ -2712,6 +2713,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2760,6 +2762,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2777,6 +2780,7 @@ const ViewProject = ({
if (type === 'dv') {
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
activeTab={activeTab}
@@ -2794,6 +2798,7 @@ const ViewProject = ({
if (type === 'ref') {
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2816,6 +2821,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={utmActiveTab}
icon={panelIcon}
@@ -2839,6 +2845,7 @@ const ViewProject = ({
if (type === 'pg') {
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2878,6 +2885,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2955,6 +2963,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={countryActiveTab}
icon={panelIcon}
@@ -2979,6 +2988,7 @@ const ViewProject = ({
if (type === 'dv') {
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -2998,6 +3008,7 @@ const ViewProject = ({
if (type === 'pg') {
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -3017,7 +3028,7 @@ const ViewProject = ({
/>
)
}
-
+
if (type === 'br') {
const rowMapper = (entry: any) => {
const { name: entryName } = entry
@@ -3045,6 +3056,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
@@ -3063,6 +3075,7 @@ const ViewProject = ({
return (
<Panel
+ projectPassword={projectPassword}
t={t}
key={type}
icon={panelIcon}
diff --git a/app/pages/Project/View/components/UserFlow.tsx b/app/pages/Project/View/components/UserFlow.tsx
index d3aa1bbc7..24555fc5b 100644
--- a/app/pages/Project/View/components/UserFlow.tsx
+++ b/app/pages/Project/View/components/UserFlow.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect, useState, useMemo } from 'react'
+import { useEffect, useState } from 'react'
import { ResponsiveSankey } from '@nivo/sankey'
import { connect } from 'react-redux'
import { StateType, AppDispatch } from 'redux/store'
@@ -6,9 +6,8 @@ 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, PROJECTS_PROTECTED } from 'redux/constants'
+import { getUserFlowCacheKey } from 'redux/constants'
import { getUserFlow } from 'api'
-import { getItem } from 'utils/localstorage'
import Loader from 'ui/Loader'
const mapStateToProps = (state: StateType) => ({
@@ -41,12 +40,7 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({
},
})
-const UserFlow = ({
- disableLegend, pid, period, timeBucket, from, to, timezone, userFlowAscendingCache,
- userFlowDescendingCache, filters, setReversed,
- isReversed, setUserFlowAscending, setUserFlowDescending, generateError, t,
- password,
-}: {
+interface IJSXUserFlow {
disableLegend?: boolean
pid: string
userFlowAscendingCache: {
@@ -67,15 +61,19 @@ const UserFlow = ({
t: (key: string) => string
filters: string[]
setReversed: () => void
- password: {
- [key: string]: string
- }
-}) => {
+ projectPassword?: string
+}
+
+const UserFlow = ({
+ disableLegend, pid, period, timeBucket, from, to, timezone, userFlowAscendingCache,
+ userFlowDescendingCache, filters, setReversed,
+ isReversed, setUserFlowAscending, setUserFlowDescending, generateError, t,
+ projectPassword,
+}: IJSXUserFlow) => {
const key = getUserFlowCacheKey(pid, period, filters)
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)