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!

Use hooks

Blue Mouse9f56a576ada5
diff --git a/web/app/modals/NewFunnel.tsx b/web/app/modals/NewFunnel.tsx
index 9f36d4680..5296a7878 100644
--- a/web/app/modals/NewFunnel.tsx
+++ b/web/app/modals/NewFunnel.tsx
@@ -9,36 +9,24 @@ import { useTranslation } from 'react-i18next'
import { getFilters } from '~/api'
import { MIN_FUNNEL_STEPS, MAX_FUNNEL_STEPS } from '~/lib/constants'
import { Funnel } from '~/lib/models/Project'
-import { ProjectForShared } from '~/lib/models/SharedProject'
+import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'
import Combobox from '~/ui/Combobox'
import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
interface NewFunnelProps {
- project: ProjectForShared
onClose: () => void
onSubmit: (name: string, steps: string[]) => Promise<void>
isOpened: boolean
- pid: string
loading: boolean
- allowedToManage: boolean
funnel?: Funnel
- projectPassword?: string
}
const INITIAL_FUNNEL_STEPS = [null, null]
-const NewFunnel = ({
- onClose,
- onSubmit,
- isOpened,
- pid,
- funnel,
- loading,
- project,
- projectPassword,
- allowedToManage,
-}: NewFunnelProps) => {
+const NewFunnel = ({ onClose, onSubmit, isOpened, funnel, loading }: NewFunnelProps) => {
+ const { project, id, allowedToManage } = useCurrentProject()
+ const projectPassword = useProjectPassword(id)
const { t } = useTranslation('common')
const [name, setName] = useState(funnel?.name || '')
const [steps, setSteps] = useState<any[]>(funnel?.steps || INITIAL_FUNNEL_STEPS)
@@ -57,7 +45,7 @@ const NewFunnel = ({
useEffect(() => {
// if project.name is underfined - that means that project is not loaded yet
// (it may be password protected, hence making a filters list request will fail with 403)
- if (_isUndefined(project.name) || !isOpened) {
+ if (_isUndefined(project?.name) || !isOpened) {
return
}
@@ -67,10 +55,10 @@ const NewFunnel = ({
const promises = [
(async () => {
- pgFilters = await getFilters(pid, 'pg', projectPassword)
+ pgFilters = await getFilters(id, 'pg', projectPassword)
})(),
(async () => {
- ceFilters = await getFilters(pid, 'ev', projectPassword)
+ ceFilters = await getFilters(id, 'ev', projectPassword)
})(),
]
@@ -84,7 +72,7 @@ const NewFunnel = ({
}
getFiltersData()
- }, [pid, project, isOpened, projectPassword])
+ }, [id, project, isOpened, projectPassword])
const _onClose = () => {
setTimeout(() => {
diff --git a/web/app/modals/TrackingSnippet.tsx b/web/app/modals/TrackingSnippet.tsx
index dc5eef560..4539ec768 100644
--- a/web/app/modals/TrackingSnippet.tsx
+++ b/web/app/modals/TrackingSnippet.tsx
@@ -1,6 +1,7 @@
import { useTranslation, Trans } from 'react-i18next'
import { API_URL, isSelfhosted } from '~/lib/constants'
+import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import { Badge } from '~/ui/Badge'
import Modal from '~/ui/Modal'
import Textarea from '~/ui/Textarea'
@@ -10,7 +11,6 @@ const API_URL_WITHOUT_TRAILING_SLASH = API_URL.endsWith('/') ? API_URL.slice(0,
interface TrackingSnippetProps {
onClose: () => void
isOpened: boolean
- pid: string
}
const getSnippet = (pid: string) => {
@@ -53,10 +53,11 @@ const getSnippet = (pid: string) => {
const SCRIPT_DOCS_URL = 'https://docs.swetrix.com/install-script'
-const TrackingSnippet = ({ onClose, isOpened, pid }: TrackingSnippetProps) => {
+const TrackingSnippet = ({ onClose, isOpened }: TrackingSnippetProps) => {
+ const { id } = useCurrentProject()
const { t } = useTranslation('common')
- const snippet = getSnippet(pid)
+ const snippet = getSnippet(id)
return (
<Modal
diff --git a/web/app/pages/Captcha/View/ViewCaptcha.tsx b/web/app/pages/Captcha/View/ViewCaptcha.tsx
index 5b0a84687..e4535797e 100644
--- a/web/app/pages/Captcha/View/ViewCaptcha.tsx
+++ b/web/app/pages/Captcha/View/ViewCaptcha.tsx
@@ -587,7 +587,6 @@ const ViewCaptcha = () => {
periodPairs,
timeFormat,
size,
- allowedToManage: project.role === 'admin' || project.role === 'owner',
dataLoading,
activeTab: 'traffic',
filters,
diff --git a/web/app/pages/Project/View/Panels.tsx b/web/app/pages/Project/View/Panels.tsx
index 4471c3dda..8bd88d6b8 100644
--- a/web/app/pages/Project/View/Panels.tsx
+++ b/web/app/pages/Project/View/Panels.tsx
@@ -1699,7 +1699,7 @@ const Panel = ({
)
}
-const PanelMemo = memo(Panel)
-const MetadataMemo = memo(Metadata)
+const PanelMemo = memo(Panel) as typeof Panel
+const MetadataMemo = memo(Metadata) as typeof Metadata
export { PanelMemo as Panel, MetadataMemo as Metadata }
diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsx
index 14dbf9cda..7b4219021 100644
--- a/web/app/pages/Project/View/ViewProject.tsx
+++ b/web/app/pages/Project/View/ViewProject.tsx
@@ -219,7 +219,6 @@ interface ViewProjectContextType {
periodPairs: TBPeriodPairsProps[]
timeFormat: '12-hour' | '24-hour'
size: ReturnType<typeof useSize>[1]
- allowedToManage: boolean
dataLoading: boolean
activeTab: keyof typeof PROJECT_TABS
filters: Filter[]
@@ -240,15 +239,14 @@ export const useViewProjectContext = () => {
const context = useContext(ViewProjectContext)
if (context === undefined) {
- // throw new Error('useViewProjectContext must be used within a ViewProjectContextProvider')
- return {}
+ throw new Error('useViewProjectContext must be used within a ViewProjectContextProvider')
}
return context
}
const ViewProject = () => {
- const { id, project, preferences, updatePreferences, extensions, mergeProject } = useCurrentProject()
+ const { id, project, preferences, updatePreferences, extensions, mergeProject, allowedToManage } = useCurrentProject()
const projectPassword = useProjectPassword(id)
const { embedded, tabs: projectQueryTabs } = useLoaderData<{
@@ -779,8 +777,6 @@ const ViewProject = () => {
[t],
)
- const allowedToManage = project?.role === 'owner' || project?.role === 'admin'
-
const dataNamesFunnel = useMemo(
() => ({
dropoff: t('project.dropoff'),
@@ -2824,7 +2820,7 @@ const ViewProject = () => {
<h2 className='mt-2 text-center font-mono text-xl font-bold break-words break-all text-gray-900 sm:text-left dark:text-gray-50'>
{project.name}
</h2>
- <LockedDashboard project={project} />
+ <LockedDashboard />
</div>
{!embedded ? <Footer /> : null}
</>
@@ -2845,7 +2841,7 @@ const ViewProject = () => {
<h2 className='mt-2 text-center font-mono text-xl font-bold break-words break-all text-gray-900 sm:text-left dark:text-gray-50'>
{project.name}
</h2>
- <WaitingForAnEvent project={project} />
+ <WaitingForAnEvent />
</div>
{!embedded ? <Footer /> : null}
</>
@@ -2892,7 +2888,6 @@ const ViewProject = () => {
periodPairs,
timeFormat,
size,
- allowedToManage,
dataLoading,
activeTab,
filters:
@@ -4347,7 +4342,6 @@ const ViewProject = () => {
return (
<Panel
- projectPassword={projectPassword}
key={countryActiveTab}
icon={panelIcon}
id={countryActiveTab}
@@ -4365,7 +4359,6 @@ const ViewProject = () => {
if (type === 'dv') {
return (
<Panel
- projectPassword={projectPassword}
key={type}
icon={panelIcon}
id={type}
@@ -4400,7 +4393,6 @@ const ViewProject = () => {
if (type === 'pg') {
return (
<Panel
- projectPassword={projectPassword}
key={pageActiveTab}
icon={panelIcon}
id={pageActiveTab}
@@ -4498,12 +4490,8 @@ const ViewProject = () => {
</div>
<ViewProjectHotkeys isOpened={isHotkeysHelpOpened} onClose={() => setIsHotkeysHelpOpened(false)} />
<NewFunnel
- project={project}
- projectPassword={projectPassword}
- pid={id}
funnel={funnelToEdit}
isOpened={isNewFunnelOpened}
- allowedToManage={allowedToManage}
onClose={() => {
setIsNewFunnelOpened(false)
setFunnelToEdit(undefined)
@@ -4520,11 +4508,9 @@ const ViewProject = () => {
/>
<SearchFilters
type={activeTab === PROJECT_TABS.errors ? 'errors' : 'traffic'}
- projectPassword={projectPassword}
showModal={showFiltersSearch}
setShowModal={setShowFiltersSearch}
setProjectFilter={onFilterSearch}
- pid={id}
tnMapping={tnMapping}
filters={
activeTab === PROJECT_TABS.performance
@@ -4537,7 +4523,6 @@ const ViewProject = () => {
}
/>
<AddAViewModal
- projectPassword={projectPassword}
showModal={isAddAViewOpened}
setShowModal={(show) => {
setIsAddAViewOpened(show)
@@ -4549,7 +4534,6 @@ const ViewProject = () => {
setProjectViewToUpdate(undefined)
}}
defaultView={projectViewToUpdate}
- pid={id}
tnMapping={tnMapping}
/>
{!embedded ? <Footer showDBIPMessage /> : null}
diff --git a/web/app/pages/Project/View/components/AddAViewModal.tsx b/web/app/pages/Project/View/components/AddAViewModal.tsx
index bb7cbae52..e3b95f201 100644
--- a/web/app/pages/Project/View/components/AddAViewModal.tsx
+++ b/web/app/pages/Project/View/components/AddAViewModal.tsx
@@ -11,6 +11,7 @@ import { toast } from 'sonner'
import { getFilters, createProjectView, updateProjectView } from '~/api'
import { FILTERS_PANELS_ORDER } from '~/lib/constants'
+import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'
import Combobox from '~/ui/Combobox'
import Input from '~/ui/Input'
import Modal from '~/ui/Modal'
@@ -27,9 +28,7 @@ import {
import { Filter } from './Filters'
interface AddAViewModalProps {
- projectPassword?: string
onSubmit: () => void
- pid: string
showModal: boolean
setShowModal: (show: boolean) => void
tnMapping: Record<string, string>
@@ -196,15 +195,9 @@ interface AddAViewModalErrors {
const MAX_METRICS_IN_VIEW = 3
-const AddAViewModal = ({
- onSubmit,
- pid,
- showModal,
- setShowModal,
- tnMapping,
- projectPassword,
- defaultView,
-}: AddAViewModalProps) => {
+const AddAViewModal = ({ onSubmit, showModal, setShowModal, tnMapping, defaultView }: AddAViewModalProps) => {
+ const { id } = useCurrentProject()
+ const projectPassword = useProjectPassword(id)
const {
t,
i18n: { language },
@@ -221,11 +214,11 @@ const AddAViewModal = ({
const getFiltersList = useCallback(
async (category: string) => {
- const result = await getFilters(pid, category, projectPassword)
+ const result = await getFilters(id, category, projectPassword)
setSearchList(result)
},
- [pid, projectPassword],
+ [id, projectPassword],
)
useEffect(() => {
@@ -336,10 +329,10 @@ const AddAViewModal = ({
try {
// updating an existing view
if (defaultView?.id) {
- await updateProjectView(pid, defaultView?.id, name, activeFilters, customEvents)
+ await updateProjectView(id, defaultView?.id, name, activeFilters, customEvents)
} else {
// crating a new one
- await createProjectView(pid, name, 'traffic', activeFilters, customEvents)
+ await createProjectView(id, name, 'traffic', activeFilters, customEvents)
}
} catch (reason) {
console.error('[ERROR] onViewCreate:', reason)
diff --git a/web/app/pages/Project/View/components/LockedDashboard.tsx b/web/app/pages/Project/View/components/LockedDashboard.tsx
index 99570a678..56344433d 100644
--- a/web/app/pages/Project/View/components/LockedDashboard.tsx
+++ b/web/app/pages/Project/View/components/LockedDashboard.tsx
@@ -3,21 +3,18 @@ import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
import { Link } from 'react-router'
-import { ProjectForShared } from '~/lib/models/SharedProject'
import { DashboardBlockReason } from '~/lib/models/User'
import { useAuth } from '~/providers/AuthProvider'
+import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import routes from '~/utils/routes'
-interface LockedDashboardProps {
- project: ProjectForShared
-}
-
-const LockedDashboard = ({ project }: LockedDashboardProps) => {
+const LockedDashboard = () => {
+ const { project } = useCurrentProject()
const { user } = useAuth()
const { t } = useTranslation('common')
const message = useMemo(() => {
- if (project.role === 'owner') {
+ if (project?.role === 'owner') {
if (user?.dashboardBlockReason === DashboardBlockReason.exceeding_plan_limits) {
return t('project.locked.descExceedingTier')
}
@@ -32,7 +29,7 @@ const LockedDashboard = ({ project }: LockedDashboardProps) => {
}
}
- if (project.role === 'admin' || project.role === 'viewer') {
+ if (project?.role === 'admin' || project?.role === 'viewer') {
return t('project.locked.descSharedProject')
}
@@ -51,7 +48,7 @@ const LockedDashboard = ({ project }: LockedDashboardProps) => {
</h1>
<p className='mt-1 max-w-prose text-base whitespace-pre-line text-gray-700 dark:text-gray-300'>
{message}
- {project.role === 'owner' ? (
+ {project?.role === 'owner' ? (
<>
<br />
<br />
@@ -60,7 +57,7 @@ const LockedDashboard = ({ project }: LockedDashboardProps) => {
) : null}
</p>
</div>
- {project.role === 'owner' ? (
+ {project?.role === 'owner' ? (
<div className='mt-8 flex space-x-3 sm:border-l sm:border-transparent sm:pl-6'>
<Link
to={routes.billing}
diff --git a/web/app/pages/Project/View/components/SearchFilters.tsx b/web/app/pages/Project/View/components/SearchFilters.tsx
index 00fa8511e..fb738584f 100644
--- a/web/app/pages/Project/View/components/SearchFilters.tsx
+++ b/web/app/pages/Project/View/components/SearchFilters.tsx
@@ -7,6 +7,7 @@ import { useTranslation } from 'react-i18next'
import { getFilters, getErrorsFilters } from '~/api'
import { FILTERS_PANELS_ORDER, ERRORS_FILTERS_PANELS_ORDER } from '~/lib/constants'
+import { useCurrentProject, useProjectPassword } from '~/providers/CurrentProjectProvider'
import Checkbox from '~/ui/Checkbox'
import Combobox from '~/ui/Combobox'
import Modal from '~/ui/Modal'
@@ -18,9 +19,7 @@ import { Filter as FilterType } from '../interfaces/traffic'
import { Filter } from './Filters'
interface SearchFiltersProps {
- projectPassword?: string
setProjectFilter: (filters: FilterType[], override: boolean) => void
- pid: string
showModal: boolean
setShowModal: (show: boolean) => void
tnMapping: Record<string, string>
@@ -28,16 +27,9 @@ interface SearchFiltersProps {
type: 'traffic' | 'errors'
}
-const SearchFilters = ({
- setProjectFilter,
- pid,
- showModal,
- setShowModal,
- tnMapping,
- filters,
- projectPassword,
- type,
-}: SearchFiltersProps) => {
+const SearchFilters = ({ setProjectFilter, showModal, setShowModal, tnMapping, filters, type }: SearchFiltersProps) => {
+ const { id } = useCurrentProject()
+ const projectPassword = useProjectPassword(id)
const {
t,
i18n: { language },
@@ -52,14 +44,14 @@ const SearchFilters = ({
let result: any[]
if (type === 'errors') {
- result = await getErrorsFilters(pid, category, projectPassword)
+ result = await getErrorsFilters(id, category, projectPassword)
} else {
- result = await getFilters(pid, category, projectPassword)
+ result = await getFilters(id, category, projectPassword)
}
setSearchList(result)
},
- [pid, projectPassword, type],
+ [id, projectPassword, type],
)
useEffect(() => {
diff --git a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx b/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
index 9463c7a1d..a8dd9ee8a 100644
--- a/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
+++ b/web/app/pages/Project/View/components/WaitingForAnEvent.tsx
@@ -2,20 +2,13 @@ import { useState } from 'react'
import { useTranslation, Trans } from 'react-i18next'
import { Link } from 'react-router'
-import { ProjectForShared } from '~/lib/models/SharedProject'
-import { User } from '~/lib/models/User'
import TrackingSnippet from '~/modals/TrackingSnippet'
import PulsatingCircle from '~/ui/icons/PulsatingCircle'
import routes from '~/utils/routes'
-interface WaitingForAnEventProps {
- user?: User
- project: ProjectForShared
-}
-
const TROUBLESHOOTING_URL = 'https://docs.swetrix.com/troubleshooting'
-const WaitingForAnEvent = ({ project }: WaitingForAnEventProps) => {
+const WaitingForAnEvent = () => {
const { t } = useTranslation('common')
const [isModalOpened, setIsModalOpened] = useState(false)
@@ -63,7 +56,7 @@ const WaitingForAnEvent = ({ project }: WaitingForAnEventProps) => {
</div>
</main>
</div>
- <TrackingSnippet isOpened={isModalOpened} onClose={() => setIsModalOpened(false)} pid={project.id} />
+ <TrackingSnippet isOpened={isModalOpened} onClose={() => setIsModalOpened(false)} />
</div>
)
}
diff --git a/web/app/providers/CurrentProjectProvider.tsx b/web/app/providers/CurrentProjectProvider.tsx
index 9bd1ce2ad..53cce18a7 100644
--- a/web/app/providers/CurrentProjectProvider.tsx
+++ b/web/app/providers/CurrentProjectProvider.tsx
@@ -21,6 +21,7 @@ interface CurrentProjectContextType {
project: Project | null
preferences: ProjectPreferences
extensions: Extension[]
+ allowedToManage: boolean
updatePreferences: (prefs: ProjectPreferences) => void
mergeProject: (project: Partial<Project>) => void
}
@@ -173,7 +174,17 @@ export const CurrentProjectProvider = ({ children, id }: CurrentProjectProviderP
}, [project, isAuthenticated])
return (
- <CurrentProjectContext.Provider value={{ id, project, preferences, updatePreferences, extensions, mergeProject }}>
+ <CurrentProjectContext.Provider
+ value={{
+ id,
+ project,
+ preferences,
+ updatePreferences,
+ extensions,
+ mergeProject,
+ allowedToManage: project?.role === 'owner' || project?.role === 'admin',
+ }}
+ >
{children}
</CurrentProjectContext.Provider>
)