📈 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: when navigating to project password view, theme and embedded parameters are always set in the URL
Blue Mouse011ea6d808ac
diff --git a/web/app/pages/Project/ProjectProtectedPassword/index.tsx b/web/app/pages/Project/ProjectProtectedPassword/index.tsxindex c2a7d10ea..30b9ffd94 100644--- a/web/app/pages/Project/ProjectProtectedPassword/index.tsx+++ b/web/app/pages/Project/ProjectProtectedPassword/index.tsx@@ -4,13 +4,12 @@ import _replace from 'lodash/replace'import _size from 'lodash/size'import React, { useState, useEffect, memo } from 'react'import { useTranslation } from 'react-i18next'-import { Link, useNavigate } from 'react-router'+import { Link, useNavigate, useSearchParams } from 'react-router'import { checkPassword } from '~/api'import Footer from '~/components/Footer'import Header from '~/components/Header'import { useRequiredParams } from '~/hooks/useRequiredParams'-import { useTheme } from '~/providers/ThemeProvider'import Button from '~/ui/Button'import Input from '~/ui/Input'import routes from '~/utils/routes'@@ -28,7 +27,6 @@ interface ProjectProtectedPasswordProps {}const ProjectProtectedPassword = ({ embedded }: ProjectProtectedPasswordProps) => {- const { theme } = useTheme()const { t } = useTranslation('common')const [form, setForm] = useState<ProjectProtectedPasswordForm>({password: '',@@ -41,6 +39,7 @@ const ProjectProtectedPassword = ({ embedded }: ProjectProtectedPasswordProps) =const [beenSubmitted, setBeenSubmitted] = useState(false)const [isLoading, setIsLoading] = useState(false)const navigate = useNavigate()+ const [searchParams] = useSearchParams()const validate = () => {const allErrors = {} as {@@ -66,27 +65,42 @@ const ProjectProtectedPassword = ({ embedded }: ProjectProtectedPasswordProps) =}, [form]) // eslint-disable-lineconst onSubmit = async (data: ProjectProtectedPasswordForm) => {- if (!isLoading) {- setIsLoading(true)- await checkPassword(pid, data.password)- .then((result) => {- if (result) {- setProjectPassword(pid, data.password)- navigate({- pathname: _replace(routes.project, ':id', pid),- search: `?embedded=${embedded}&theme=${theme}`,- })- return+ if (isLoading) {+ return+ }++ setIsLoading(true)+ await checkPassword(pid, data.password)+ .then((result) => {+ if (result) {+ const searchParamsObj = new URLSearchParams()++ if (searchParams.has('theme')) {+ searchParamsObj.set('theme', searchParams.get('theme')!)+ }++ if (searchParams.has('embedded')) {+ searchParamsObj.set('embedded', searchParams.get('embedded')!)}- setErrors({- password: t('apiNotifications.incorrectPassword'),++ const searchString = searchParamsObj.toString()+ const search = searchString ? `?${searchString}` : undefined++ setProjectPassword(pid, data.password)+ navigate({+ pathname: _replace(routes.project, ':id', pid),+ search,})+ return+ }+ setErrors({+ password: t('apiNotifications.incorrectPassword'),})- .catch(console.error)- .finally(() => {- setIsLoading(false)- })- }+ })+ .catch(console.error)+ .finally(() => {+ setIsLoading(false)+ })}const handleInput = ({ target }: { target: HTMLInputElement }) => {diff --git a/web/app/providers/CurrentProjectProvider.tsx b/web/app/providers/CurrentProjectProvider.tsxindex cc4353e3f..dd038fbed 100644--- a/web/app/providers/CurrentProjectProvider.tsx+++ b/web/app/providers/CurrentProjectProvider.tsx@@ -14,7 +14,6 @@ import { getProjectPreferences, setProjectPreferences } from '../pages/Project/Vimport { CHART_METRICS_MAPPING } from '../pages/Project/View/ViewProject.helpers'import { useAuth } from './AuthProvider'-import { useTheme } from './ThemeProvider'interface CurrentProjectContextType {id: string@@ -44,28 +43,37 @@ export const useProjectPassword = (id: string) => {return projectPassword}-const useIsEmbedded = () => {- const [searchParams] = useSearchParams()-- return searchParams.get('embedded') === 'true'-}-const useProject = (id: string) => {- const { theme } = useTheme()const { t } = useTranslation('common')const navigate = useNavigate()const { isLoading: authLoading } = useAuth()const projectPassword = useProjectPassword(id)- const isEmbedded = useIsEmbedded()const [project, setProject] = useState<Project | null>(null)+ const [searchParams] = useSearchParams()++ const params = useMemo(() => {+ const searchParamsObj = new URLSearchParams()++ if (searchParams.has('theme')) {+ searchParamsObj.set('theme', searchParams.get('theme')!)+ }++ if (searchParams.has('embedded')) {+ searchParamsObj.set('embedded', searchParams.get('embedded')!)+ }++ const searchString = searchParamsObj.toString()+ return searchString ? `?${searchString}` : undefined+ }, [searchParams])+const onErrorLoading = useCallback(() => {if (projectPassword) {checkPassword(id, projectPassword).then((res) => {if (res) {navigate({pathname: _replace(routes.project, ':id', id),- search: `?theme=${theme}&embedded=${isEmbedded}`,+ search: params,})return}@@ -73,7 +81,7 @@ const useProject = (id: string) => {toast.error(t('apiNotifications.incorrectPassword'))navigate({pathname: _replace(routes.project_protected_password, ':pid', id),- search: `?theme=${theme}&embedded=${isEmbedded}`,+ search: params,})removeItem(LS_PROJECTS_PROTECTED_KEY)})@@ -82,7 +90,7 @@ const useProject = (id: string) => {toast.error(t('project.noExist'))navigate(routes.dashboard)- }, [id, projectPassword, navigate, t, isEmbedded, theme])+ }, [id, projectPassword, navigate, t, params])useEffect(() => {if (authLoading || project) {@@ -98,7 +106,7 @@ const useProject = (id: string) => {if (result.isPasswordProtected && !result.role && !projectPassword) {navigate({pathname: _replace(routes.project_protected_password, ':pid', id),- search: `?theme=${theme}&embedded=${isEmbedded}`,+ search: params,})return}@@ -109,7 +117,7 @@ const useProject = (id: string) => {console.error('[ERROR] (getProject)', reason)onErrorLoading()})- }, [authLoading, project, id, projectPassword, navigate, onErrorLoading, isEmbedded, theme])+ }, [authLoading, project, id, projectPassword, navigate, onErrorLoading, params])const mergeProject = useCallback((project: Partial<Project>) => {setProject((prev) => {