📈 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
Move projectId & password to currentProject hook
Blue Mousecc5294e41e2e
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsxindex abb391e2b..9e45914ff 100644--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx@@ -586,8 +586,6 @@ const ViewCaptcha = ({ ssrTheme }: ViewCaptchaProps) => {<ViewProjectContext.Providervalue={{// States- projectId: project?.id,- projectPassword: '',timezone,dateRange,isLoading: authLoading,diff --git a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsxindex c47b81749..4d37dc25e 100644--- a/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx+++ b/web/app/pages/Project/Alerts/View/ProjectAlertsView.tsx@@ -30,7 +30,7 @@ import Modal from '~/ui/Modal'import Pagination from '~/ui/Pagination'import routes from '~/utils/routes'-import { useViewProjectContext } from '../../View/ViewProject'+import { useCurrentProject } from '../../View/providers/CurrentProjectProvider'const Separator = ({ className }: { className?: string }) => (<svg viewBox='0 0 2 2' className={cx('h-0.5 w-0.5 flex-none fill-gray-400', className)}>@@ -182,7 +182,7 @@ const AddAlert = ({ handleNewAlert, isLimitReached }: AddAlertProps) => {}const ProjectAlerts = () => {- const { projectId } = useViewProjectContext()+ const { id } = useCurrentProject()const { t } = useTranslation()const { user, authenticated } = useSelector((state: StateType) => state.auth)const [isPaidFeatureOpened, setIsPaidFeatureOpened] = useState(false)@@ -208,7 +208,7 @@ const ProjectAlerts = () => {setIsLoading(true)try {- const result = await getProjectAlerts(projectId, take, skip)+ const result = await getProjectAlerts(id, take, skip)setAlerts(result.results)setTotal(result.total)} catch (reason: any) {@@ -253,7 +253,7 @@ const ProjectAlerts = () => {return}- navigate(_replace(routes.create_alert, ':pid', projectId))+ navigate(_replace(routes.create_alert, ':pid', id))}const onDelete = async (id: string) => {@@ -339,7 +339,7 @@ const ProjectAlerts = () => {key={alert.id}{...alert}openAlert={(id) => {- navigate(_replace(_replace(routes.alert_settings, ':pid', projectId), ':id', id))+ navigate(_replace(_replace(routes.alert_settings, ':pid', id), ':id', id))}}deleteAlert={onDelete}queryMetricTMapping={queryMetricTMapping}diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex ff64e809f..33324856c 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -212,8 +212,6 @@ const ERRORS_TAKE = 30interface ViewProjectContextType {// States- projectId: string- projectPassword: stringtimezone: stringdateRange: Date[] | nullisLoading: boolean@@ -2901,8 +2899,6 @@ const ViewProject = () => {<ViewProjectContext.Providervalue={{// States- projectId: project?.id,- projectPassword,timezone,dateRange,isLoading: authLoading,diff --git a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsxindex ea688b9e0..6e0749554 100644--- a/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx+++ b/web/app/pages/Project/View/components/LiveVisitorsDropdown.tsx@@ -10,7 +10,7 @@ import { PROJECT_TABS } from '~/lib/constants'import Flag from '~/ui/Flag'import PulsatingCircle from '~/ui/icons/PulsatingCircle'-import { useViewProjectContext } from '../ViewProject'+import { useCurrentProject, useProjectPassword } from '../providers/CurrentProjectProvider'interface LiveVisitorsDropdownProps {live: number | string@@ -18,7 +18,8 @@ interface LiveVisitorsDropdownProps {}const LiveVisitorsDropdown = ({ live, onSessionSelect }: LiveVisitorsDropdownProps) => {- const { projectId, projectPassword } = useViewProjectContext()+ const { id } = useCurrentProject()+ const projectPassword = useProjectPassword(id)const { t } = useTranslation()const [show, setShow] = useState(false)const [loading, setLoading] = useState(true)@@ -26,7 +27,7 @@ const LiveVisitorsDropdown = ({ live, onSessionSelect }: LiveVisitorsDropdownProconst getLiveVisitors = async () => {try {- const info = await getLiveVisitorsInfo(projectId, projectPassword)+ const info = await getLiveVisitorsInfo(id, projectPassword)setLiveInfo(info)} catch (reason) {console.error('[LiveVisitorsDropdown] getLiveVisitors:', reason)diff --git a/web/app/pages/Project/View/components/UserFlow.tsx b/web/app/pages/Project/View/components/UserFlow.tsxindex e6367a02b..c48a3f8dd 100644--- a/web/app/pages/Project/View/components/UserFlow.tsx+++ b/web/app/pages/Project/View/components/UserFlow.tsx@@ -8,6 +8,7 @@ import { getUserFlow } from '~/api'import { UserFlowType } from '~/lib/models/UserFlow'import Loader from '~/ui/Loader'+import { useCurrentProject, useProjectPassword } from '../providers/CurrentProjectProvider'import { useViewProjectContext } from '../ViewProject'import { getFormatDate } from '../ViewProject.helpers'@@ -17,7 +18,9 @@ interface UserFlowProps {}const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {- const { dateRange, period, timeBucket, timezone, projectPassword, projectId, filters } = useViewProjectContext()+ const { dateRange, period, timeBucket, timezone, filters } = useViewProjectContext()+ const { id } = useCurrentProject()+ const projectPassword = useProjectPassword(id)const { t } = useTranslation('common')const [isLoading, setIsLoading] = useState<boolean | null>(null)const [userFlow, setUserFlow] = useState<{@@ -42,7 +45,7 @@ const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {try {const { ascending, descending } = await getUserFlow(- projectId,+ id,timeBucket,period,filters,@@ -62,7 +65,7 @@ const UserFlow = ({ setReversed, isReversed }: UserFlowProps) => {useEffect(() => {fetchUserFlow()// eslint-disable-next-line react-hooks/exhaustive-deps- }, [filters, period, timeBucket, from, to, timezone, projectId])+ }, [filters, period, timeBucket, from, to, timezone, id])if (isLoading || isLoading === null) {return <Loader />