📈 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
show project if password exthist
kruzhambus9f3a464985f6
diff --git a/src/pages/Project/ProjectProtectedPassword/index.tsx b/src/pages/Project/ProjectProtectedPassword/index.tsxindex 6cbaacb06..0d9aacaf5 100644--- a/src/pages/Project/ProjectProtectedPassword/index.tsx+++ b/src/pages/Project/ProjectProtectedPassword/index.tsx@@ -12,9 +12,9 @@ import Button from 'ui/Button'import {isValidPassword, MIN_PASSWORD_CHARS,} from 'utils/validator'-import { PROJECTS_PROTECTED } from 'redux/constants'import { checkPassword } from 'api'-import { setItem } from 'utils/localstorage'+import { useDispatch } from 'react-redux'+import UIActions from 'redux/reducers/ui'interface IProjectProtectedPasswordForm {password: string,@@ -39,6 +39,7 @@ const ProjectProtectedPassword = (): JSX.Element => {const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)const [isLoading, setIsLoading] = useState<boolean>(false)const history = useHistory()+ const dispatch = useDispatch()const validate = () => {const allErrors = {} as {@@ -65,7 +66,10 @@ const ProjectProtectedPassword = (): JSX.Element => {await checkPassword(id, data.password).then((res) => {if (res) {- setItem(PROJECTS_PROTECTED, data.password)+ dispatch(UIActions.setProjectProtectedPassword({+ id,+ password: data.password,+ }))history.push(_replace(routes.project, ':id', id))}setErrors({diff --git a/src/pages/Project/View/ViewProject.tsx b/src/pages/Project/View/ViewProject.tsxindex 899598c67..574723be6 100644--- a/src/pages/Project/View/ViewProject.tsx+++ b/src/pages/Project/View/ViewProject.tsx@@ -47,7 +47,7 @@ import {tbPeriodPairs, getProjectCacheKey, LIVE_VISITORS_UPDATE_INTERVAL, DEFAULT_TIMEZONE, CDN_URL, isDevelopment,timeBucketToDays, getProjectCacheCustomKey, roleViewer, MAX_MONTHS_IN_PAST, PROJECT_TABS,TimeFormat, getProjectForcastCacheKey, chartTypes, roleAdmin, TRAFFIC_PANELS_ORDER, PERFORMANCE_PANELS_ORDER, isSelfhosted, tbPeriodPairsCompare,- PERIOD_PAIRS_COMPARE, filtersPeriodPairs, IS_ACTIVE_COMPARE, PROJECTS_PROTECTED_PASSWORD,+ PERIOD_PAIRS_COMPARE, filtersPeriodPairs, IS_ACTIVE_COMPARE, PROJECTS_PROTECTED,} from 'redux/constants'import { IUser } from 'redux/models/IUser'import { IProject, ILiveStats } from 'redux/models/IProject'@@ -152,7 +152,8 @@ const ViewProject = ({} = useParams()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_PASSWORD)?.[id] || '', [id, password])+ 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)@@ -1281,10 +1282,10 @@ const ViewProject = ({useEffect(() => {if (!isLoading && _isEmpty(project)) {- getProject(id)+ getProject(id, false, projectPassword).then(projectRes => {if (!_isEmpty(projectRes)) {- if (projectRes.isPasswordProtected) {+ if (projectRes.isPasswordProtected && !projectRes.isOwner && !projectPassword) {history.push(_replace(routes.project_protected_password, ':id', id))return}diff --git a/src/redux/constants/index.ts b/src/redux/constants/index.tsindex 0bac3368b..0d2df6c14 100644--- a/src/redux/constants/index.ts+++ b/src/redux/constants/index.ts@@ -244,8 +244,7 @@ export const REFRESH_TOKEN: string = 'refresh_token'// LocalStorageexport const PAGE_FORCE_REFRESHED = 'page-force-refreshed'-export const PROJECTS_PROTECTED = 'projects_protected'-export const PROJECTS_PROTECTED_PASSWORD: string = 'projects_protected_password'+export const PROJECTS_PROTECTED: string = 'projects_protected'export const IS_ACTIVE_COMPARE = 'is-active-compare'diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex a9b1d2f82..f72dc003f 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -2,7 +2,7 @@ import { createSlice, current, PayloadAction } from '@reduxjs/toolkit'import _filter from 'lodash/filter'import _findIndex from 'lodash/findIndex'import _map from 'lodash/map'-import { tabForOwnedProject, PROJECT_TABS, PROJECTS_PROTECTED_PASSWORD } from 'redux/constants'+import { tabForOwnedProject, PROJECT_TABS, PROJECTS_PROTECTED } from 'redux/constants'import { setItem, getItem } from 'utils/localstorage'import { IProject, ICaptchaProject, ILiveStats } from 'redux/models/IProject'import { ISharedProject } from 'redux/models/ISharedProject'@@ -53,7 +53,7 @@ const initialState: IInitialState = {alerts: [],subscribers: [],liveStats: {},- password: getItem(PROJECTS_PROTECTED_PASSWORD) || {},+ password: getItem(PROJECTS_PROTECTED) || {},}const projectsSlice = createSlice({@@ -207,7 +207,7 @@ const projectsSlice = createSlice({...state.password,[id]: password,}- setItem(PROJECTS_PROTECTED_PASSWORD, JSON.stringify(state.password))+ setItem(PROJECTS_PROTECTED, JSON.stringify(state.password))},reset(state) {state.projects = []