📈 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: prevent repeated fetcher side effects
Blue Moused7bc8f0863c1
diff --git a/web/app/pages/Organisations/Settings/People.tsx b/web/app/pages/Organisations/Settings/People.tsxindex 97fcf8372..310c1e9c9 100644--- a/web/app/pages/Organisations/Settings/People.tsx+++ b/web/app/pages/Organisations/Settings/People.tsx@@ -17,7 +17,7 @@ import {CaretDownIcon,CheckIcon,} from '@phosphor-icons/react'-import React, { Fragment, useState, useEffect } from 'react'+import React, { Fragment, useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'import { toast } from 'sonner'@@ -83,7 +83,9 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {} = useTranslation('common')const { user } = useAuth()- const changeRole = (memberId: string, newRole: Role) => {+ const changeRole = (memberId: string, currentRole: Role, newRole: Role) => {+ if (newRole === currentRole || fetcher.state !== 'idle') return+const formData = new FormData()formData.set('intent', 'update-member-role')formData.set('memberId', memberId)@@ -144,7 +146,9 @@ const UsersList = ({ members, onRemove, fetcher }: UsersListProps) => {<MenuItem key={itRole}><buttontype='button'- onClick={() => changeRole(member.id, itRole)}+ onClick={() =>+ changeRole(member.id, member.role, itRole)+ }className='flex w-full items-center justify-between rounded-md px-3 py-2.5 text-left transition-colors hover:bg-gray-100 dark:hover:bg-slate-800'><div>@@ -233,6 +237,7 @@ const People = ({ organisation }: PeopleProps) => {role?: string}>({})const [validated, setValidated] = useState(false)+ const lastHandledData = useRef<OrganisationSettingsActionData | null>(null)const [showDeleteModal, setShowDeleteModal] = useState(false)const [memberToRemove, setMemberToRemove] = useState<@@ -259,6 +264,10 @@ const People = ({ organisation }: PeopleProps) => {/* eslint-disable react-hooks/set-state-in-effect */useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.success) {const { intent } = fetcher.dataif (intent === 'invite-member') {diff --git a/web/app/pages/Organisations/Settings/Projects.tsx b/web/app/pages/Organisations/Settings/Projects.tsxindex be0f66b56..8ba2326f9 100644--- a/web/app/pages/Organisations/Settings/Projects.tsx+++ b/web/app/pages/Organisations/Settings/Projects.tsx@@ -8,7 +8,7 @@ import _filter from 'lodash/filter'import _isEmpty from 'lodash/isEmpty'import _map from 'lodash/map'import _replace from 'lodash/replace'-import { useState, useEffect, useMemo } from 'react'+import { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { Link } from '~/ui/Link'import { useFetcher } from 'react-router'@@ -207,6 +207,7 @@ export const Projects = ({ organisation }: ProjectsProps) => {DetailedOrganisation['projects'][number] | null>(null)const [selectedProject, setSelectedProject] = useState<any>(null)+ const lastHandledData = useRef<OrganisationSettingsActionData | null>(null)const [currentPage, setCurrentPage] = useState(1)const [search, setSearch] = useState('')@@ -221,6 +222,10 @@ export const Projects = ({ organisation }: ProjectsProps) => {/* eslint-disable react-hooks/set-state-in-effect */useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.success) {const { intent } = fetcher.dataif (intent === 'add-project') {diff --git a/web/app/pages/Organisations/Settings/index.tsx b/web/app/pages/Organisations/Settings/index.tsxindex bae231610..9d3bf755a 100644--- a/web/app/pages/Organisations/Settings/index.tsx+++ b/web/app/pages/Organisations/Settings/index.tsx@@ -11,7 +11,7 @@ import {UserCircleIcon,WarningOctagonIcon,} from '@phosphor-icons/react'-import React, { useState, useEffect, useMemo } from 'react'+import React, { useState, useEffect, useMemo, useRef } from 'react'import { useTranslation } from 'react-i18next'import { Link } from '~/ui/Link'import {@@ -65,6 +65,7 @@ const OrganisationSettings = () => {const [beenSubmitted, setBeenSubmitted] = useState(false)const [showDelete, setShowDelete] = useState(false)const [isFormDirty, setIsFormDirty] = useState(false)+ const lastHandledData = useRef<OrganisationSettingsActionData | null>(null)const organisation = loaderData?.organisation || nullconst error = loaderData?.error@@ -88,6 +89,10 @@ const OrganisationSettings = () => {fetcher.formData?.get('intent') === 'delete-organisation'useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.success) {const { intent } = fetcher.datadiff --git a/web/app/pages/Project/Settings/Emails/Emails.tsx b/web/app/pages/Project/Settings/Emails/Emails.tsxindex 666bd64ec..0d8b10308 100644--- a/web/app/pages/Project/Settings/Emails/Emails.tsx+++ b/web/app/pages/Project/Settings/Emails/Emails.tsx@@ -112,12 +112,17 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {} = useTranslation('common')const { id: projectId } = useParams()const fetcher = useFetcher<ProjectSettingsActionData>()+ const lastHandledData = useRef<ProjectSettingsActionData | null>(null)const [open, setOpen] = useState(false)const openRef = useRef<HTMLUListElement>(null)useOnClickOutside(openRef, () => setOpen(false))const { id, addedAt, isConfirmed, email, reportFrequency } = data || {}useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.intent === 'update-subscriber') {if (fetcher.data.success && fetcher.data.subscriber) {const updated = fetcher.data.subscriber@@ -136,6 +141,8 @@ const EmailList = ({ data, onRemove, setEmails }: EmailListProps) => {}, [fetcher.data, setEmails, t])const changeRole = (reportType: { value: string; label: string }) => {+ if (reportType.value === reportFrequency || fetcher.state !== 'idle') return+fetcher.submit({intent: 'update-subscriber',@@ -303,6 +310,9 @@ const Emails = ({ projectId }: { projectId: string }) => {const [showDeleteModal, setShowDeleteModal] = useState(false)const [emailToRemove, setEmailToRemove] = useState<Subscriber | null>(null)const removingEmailId = useRef<string | null>(null)+ const lastHandledLoadData = useRef<ProjectSettingsActionData | null>(null)+ const lastHandledData = useRef<ProjectSettingsActionData | null>(null)+ const lastHandledRemoveData = useRef<ProjectSettingsActionData | null>(null)const isDeleting = removeFetcher.state !== 'idle'@@ -318,6 +328,10 @@ const Emails = ({ projectId }: { projectId: string }) => {}, []) // eslint-disable-lineuseEffect(() => {+ if (!loadFetcher.data) return+ if (lastHandledLoadData.current === loadFetcher.data) return+ lastHandledLoadData.current = loadFetcher.data+if (loadFetcher.data?.intent === 'get-subscribers') {if (loadFetcher.data.success) {setTimeout(() => {@@ -333,6 +347,10 @@ const Emails = ({ projectId }: { projectId: string }) => {}, [loadFetcher.data])useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.intent === 'add-subscriber') {if (fetcher.data.success && fetcher.data.subscriber) {setTimeout(@@ -351,10 +369,11 @@ const Emails = ({ projectId }: { projectId: string }) => {}, [fetcher.data, t])useEffect(() => {- if (- removeFetcher.state === 'idle' &&- removeFetcher.data?.intent === 'remove-subscriber'- ) {+ if (removeFetcher.state !== 'idle' || !removeFetcher.data) return+ if (lastHandledRemoveData.current === removeFetcher.data) return+ lastHandledRemoveData.current = removeFetcher.data++ if (removeFetcher.data?.intent === 'remove-subscriber') {if (removeFetcher.data.success) {const capturedId = removingEmailId.currentsetTimeout(() => {diff --git a/web/app/pages/Project/Settings/People/People.tsx b/web/app/pages/Project/Settings/People/People.tsxindex 76747045c..f03cec794 100644--- a/web/app/pages/Project/Settings/People/People.tsx+++ b/web/app/pages/Project/Settings/People/People.tsx@@ -15,9 +15,9 @@ import {CaretDownIcon,CheckIcon,} from '@phosphor-icons/react'-import React, { Fragment, useState, useEffect } from 'react'+import React, { Fragment, useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'-import { useFetcher, useRevalidator } from 'react-router'+import { useFetcher } from 'react-router'import { toast } from 'sonner'import { roles, INVITATION_EXPIRES_IN, isSelfhosted } from '~/lib/constants'import { Role } from '~/lib/models/Organisation'@@ -85,23 +85,26 @@ const TableUserRow = ({}: TableUserRowProps) => {const { t } = useTranslation('common')const fetcher = useFetcher<ProjectSettingsActionData>()- const revalidator = useRevalidator()+ const lastHandledData = useRef<ProjectSettingsActionData | null>(null)const { id, created, confirmed, role, user } = data || {}useEffect(() => {- if (fetcher.state === 'idle' && fetcher.data) {- if (fetcher.data.intent === 'change-share-role') {- if (fetcher.data.success) {- toast.success(t('apiNotifications.roleUpdated'))- revalidator.revalidate()- } else if (fetcher.data.error) {- toast.error(fetcher.data.error)- }+ if (fetcher.state !== 'idle' || !fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data++ if (fetcher.data.intent === 'change-share-role') {+ if (fetcher.data.success) {+ toast.success(t('apiNotifications.roleUpdated'))+ } else if (fetcher.data.error) {+ toast.error(fetcher.data.error)}}- }, [fetcher.state, fetcher.data, t, revalidator])+ }, [fetcher.state, fetcher.data, t])const changeRole = (newRole: string) => {+ if (newRole === role || fetcher.state !== 'idle') return+fetcher.submit({ intent: 'change-share-role', shareId: id, role: newRole },{ method: 'POST', action: `/projects/settings/${projectId}` },@@ -242,6 +245,7 @@ const People = ({ project }: PeopleProps) => {role?: string}>({})const [validated, setValidated] = useState(false)+ const lastHandledData = useRef<ProjectSettingsActionData | null>(null)const [showDeleteModal, setShowDeleteModal] = useState(false)const [memberToRemove, setMemberToRemove] =@@ -252,30 +256,32 @@ const People = ({ project }: PeopleProps) => {const isSubmitting = fetcher.state !== 'idle'useEffect(() => {- if (fetcher.state === 'idle' && fetcher.data) {- if (fetcher.data.intent === 'share-project') {- if (fetcher.data.success) {- toast.success(t('apiNotifications.userInvited'))- setTimeout(() => {- setShowModal(false)- setBeenSubmitted(false)- setErrors({})- setValidated(false)- }, 0)- setTimeout(() => setForm({ email: '', role: 'viewer' }), 300)- } else if (fetcher.data.error) {- toast.error(fetcher.data.error)- }- } else if (fetcher.data.intent === 'delete-share-user') {- if (fetcher.data.success) {- toast.success(t('apiNotifications.userRemoved'))- setTimeout(() => {- setShowDeleteModal(false)- setMemberToRemove(null)- }, 0)- } else if (fetcher.data.error) {- toast.error(fetcher.data.error)- }+ if (fetcher.state !== 'idle' || !fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data++ if (fetcher.data.intent === 'share-project') {+ if (fetcher.data.success) {+ toast.success(t('apiNotifications.userInvited'))+ setTimeout(() => {+ setShowModal(false)+ setBeenSubmitted(false)+ setErrors({})+ setValidated(false)+ }, 0)+ setTimeout(() => setForm({ email: '', role: 'viewer' }), 300)+ } else if (fetcher.data.error) {+ toast.error(fetcher.data.error)+ }+ } else if (fetcher.data.intent === 'delete-share-user') {+ if (fetcher.data.success) {+ toast.success(t('apiNotifications.userRemoved'))+ setTimeout(() => {+ setShowDeleteModal(false)+ setMemberToRemove(null)+ }, 0)+ } else if (fetcher.data.error) {+ toast.error(fetcher.data.error)}}}, [fetcher.state, fetcher.data, t])diff --git a/web/app/pages/Project/Settings/ProjectSettings.tsx b/web/app/pages/Project/Settings/ProjectSettings.tsxindex 728cb1066..be1e67725 100644--- a/web/app/pages/Project/Settings/ProjectSettings.tsx+++ b/web/app/pages/Project/Settings/ProjectSettings.tsx@@ -441,6 +441,7 @@ const ProjectSettings = () => {const [tab, setTab] = useState(DELETE_DATA_MODAL_TABS[0].name)const [showProtected, setShowProtected] = useState(false)const lastSavedForm = useRef<Form>(getFormFromProject(initialProject))+ const lastHandledFetcherData = useRef<ProjectSettingsActionData | null>(null)const lastHandledAutosaveData = useRef<ProjectSettingsActionData | null>(null)const activeAutosave = useRef<{updates: Partial<Form>@@ -827,6 +828,10 @@ const ProjectSettings = () => {}, [])useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledFetcherData.current === fetcher.data) return+ lastHandledFetcherData.current = fetcher.data+if (fetcher.data?.success) {const { intent, project: updatedProject } = fetcher.datadiff --git a/web/app/pages/Project/Settings/tabs/Revenue.tsx b/web/app/pages/Project/Settings/tabs/Revenue.tsxindex d97889ffa..33b0b772c 100644--- a/web/app/pages/Project/Settings/tabs/Revenue.tsx+++ b/web/app/pages/Project/Settings/tabs/Revenue.tsx@@ -66,7 +66,7 @@ const PROVIDER_CONFIG: Record<RevenueProvider, ProviderConfig> = {label: 'Paddle',icon: <PaddleSVG className='size-6' />,apiKeyPrefix: 'pdl_live_',- docsUrl: `${DOCS_URL}/revenue/paddle`,+ docsUrl: `${DOCS_URL}/analytics-dashboard/revenue-tracking#supported-sources`,},}@@ -89,6 +89,7 @@ const Revenue = ({ projectId }: Props) => {const [selectedCurrency, setSelectedCurrency] =useState<RevenueCurrency>('USD')const pendingCurrency = useRef<RevenueCurrency | null>(null)+ const lastHandledData = useRef<ProjectSettingsActionData | null>(null)const isConnecting =fetcher.state !== 'idle' &&@@ -106,51 +107,53 @@ const Revenue = ({ projectId }: Props) => {}, [projectId])useEffect(() => {- if (fetcher.state === 'idle' && fetcher.data) {- const { intent, success, error, revenueStatus } = fetcher.data-- if (intent === 'get-revenue-status') {- setIsLoading(false)- if (success && revenueStatus) {- setStatus(revenueStatus)- if (- revenueStatus.currency === 'USD' ||- revenueStatus.currency === 'EUR' ||- revenueStatus.currency === 'GBP'- ) {- setSelectedCurrency(revenueStatus.currency)- }- } else if (error) {- console.error('Failed to load revenue status:', error)- }- } else if (intent === 'connect-revenue') {- if (success) {- toast.success(t('project.settings.revenue.connected'))- setApiKeys({ stripe: '', paddle: '' })- fetcher.submit(- { intent: 'get-revenue-status' },- { method: 'POST', action: `/projects/settings/${projectId}` },- )- } else if (error) {- toast.error(error)- }- } else if (intent === 'disconnect-revenue') {- if (success) {- toast.success(t('project.settings.revenue.disconnected'))- setStatus({ connected: false })- } else if (error) {- toast.error(error)- }- } else if (intent === 'update-revenue-currency') {- if (success) {- toast.success(t('project.settings.revenue.currencyUpdated'))- const currency = pendingCurrency.current || selectedCurrency- setStatus((prev) => (prev ? { ...prev, currency } : prev))- pendingCurrency.current = null- } else if (error) {- pendingCurrency.current = null- toast.error(error)+ if (fetcher.state !== 'idle' || !fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data++ const { intent, success, error, revenueStatus } = fetcher.data++ if (intent === 'get-revenue-status') {+ setIsLoading(false)+ if (success && revenueStatus) {+ setStatus(revenueStatus)+ if (+ revenueStatus.currency === 'USD' ||+ revenueStatus.currency === 'EUR' ||+ revenueStatus.currency === 'GBP'+ ) {+ setSelectedCurrency(revenueStatus.currency)}+ } else if (error) {+ console.error('Failed to load revenue status:', error)+ }+ } else if (intent === 'connect-revenue') {+ if (success) {+ toast.success(t('project.settings.revenue.connected'))+ setApiKeys({ stripe: '', paddle: '' })+ fetcher.submit(+ { intent: 'get-revenue-status' },+ { method: 'POST', action: `/projects/settings/${projectId}` },+ )+ } else if (error) {+ toast.error(error)+ }+ } else if (intent === 'disconnect-revenue') {+ if (success) {+ toast.success(t('project.settings.revenue.disconnected'))+ setStatus({ connected: false })+ } else if (error) {+ toast.error(error)+ }+ } else if (intent === 'update-revenue-currency') {+ if (success) {+ toast.success(t('project.settings.revenue.currencyUpdated'))+ const currency = pendingCurrency.current || selectedCurrency+ setStatus((prev) => (prev ? { ...prev, currency } : prev))+ pendingCurrency.current = null+ } else if (error) {+ pendingCurrency.current = null+ toast.error(error)}}}, [fetcher.state, fetcher.data, t, projectId, selectedCurrency, fetcher])diff --git a/web/app/pages/UserSettings/components/Organisations.tsx b/web/app/pages/UserSettings/components/Organisations.tsxindex 9ddc9637e..acf99c391 100644--- a/web/app/pages/UserSettings/components/Organisations.tsx+++ b/web/app/pages/UserSettings/components/Organisations.tsx@@ -1,7 +1,7 @@import dayjs from 'dayjs'import _filter from 'lodash/filter'import _map from 'lodash/map'-import { memo, useState, useEffect } from 'react'+import { memo, useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'import { toast } from 'sonner'@@ -27,9 +27,14 @@ const Organisations = ({ membership }: OrganisationsProps) => {const { organisation, confirmed, role, created } = membershipconst fetcher = useFetcher<UserSettingsActionData>()+ const lastHandledData = useRef<UserSettingsActionData | null>(null)const isLoading = fetcher.state !== 'idle'useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.intent === 'reject-organisation-invitation') {if (fetcher.data.success) {mergeUser({diff --git a/web/app/pages/UserSettings/components/ProjectList.tsx b/web/app/pages/UserSettings/components/ProjectList.tsxindex 4db312b4d..8505a5d72 100644--- a/web/app/pages/UserSettings/components/ProjectList.tsx+++ b/web/app/pages/UserSettings/components/ProjectList.tsx@@ -1,7 +1,7 @@import dayjs from 'dayjs'import _filter from 'lodash/filter'import _map from 'lodash/map'-import { memo, useState, useEffect } from 'react'+import { memo, useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'import { toast } from 'sonner'@@ -23,6 +23,7 @@ const ProjectList = ({ item }: ProjectListProps) => {} = useTranslation('common')const { user, mergeUser } = useAuth()const fetcher = useFetcher<UserSettingsActionData>()+ const lastHandledData = useRef<UserSettingsActionData | null>(null)const [showDeleteModal, setShowDeleteModal] = useState(false)const { created, confirmed, id, role, project } = item@@ -30,6 +31,10 @@ const ProjectList = ({ item }: ProjectListProps) => {const isPending = fetcher.state !== 'idle'useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.intent === 'reject-project-share') {if (fetcher.data.success) {mergeUser({diff --git a/web/app/pages/UserSettings/components/Socialisations.tsx b/web/app/pages/UserSettings/components/Socialisations.tsxindex 54705f176..a265a9016 100644--- a/web/app/pages/UserSettings/components/Socialisations.tsx+++ b/web/app/pages/UserSettings/components/Socialisations.tsx@@ -1,6 +1,6 @@import { CheckCircleIcon, XCircleIcon } from '@phosphor-icons/react'import _map from 'lodash/map'-import { useEffect, useState } from 'react'+import { useEffect, useRef, useState } from 'react'import { useTranslation } from 'react-i18next'import { useFetcher } from 'react-router'import { toast } from 'sonner'@@ -66,10 +66,15 @@ const Socialisations = () => {const { t } = useTranslation('common')const [isLoading, setIsLoading] = useState(false)const fetcher = useFetcher<UserSettingsActionData>()+ const lastHandledData = useRef<UserSettingsActionData | null>(null)const isUnlinking = fetcher.state !== 'idle'const { generateSSOAuthURL, linkBySSOHash } = useAuthProxy()useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.intent === 'unlink-sso') {if (fetcher.data.success) {loadUser()diff --git a/web/app/pages/UserSettings/components/TwoFA.tsx b/web/app/pages/UserSettings/components/TwoFA.tsxindex 0d8d2ee34..45346ba1b 100644--- a/web/app/pages/UserSettings/components/TwoFA.tsx+++ b/web/app/pages/UserSettings/components/TwoFA.tsx@@ -1,4 +1,4 @@-import React, { useState, useEffect } from 'react'+import React, { useState, useEffect, useRef } from 'react'import { useTranslation } from 'react-i18next'import { QRCode } from 'react-qr-code'import { useFetcher } from 'react-router'@@ -15,6 +15,7 @@ import { Text } from '~/ui/Text'const TwoFA = () => {const { user, mergeUser } = useAuth()const fetcher = useFetcher<UserSettingsActionData>()+ const lastHandledData = useRef<UserSettingsActionData | null>(null)const { t } = useTranslation('common')const [twoFAConfigurating, setTwoFAConfigurating] = useState(false)@@ -32,6 +33,10 @@ const TwoFA = () => {fetcher.state === 'submitting' || fetcher.state === 'loading'useEffect(() => {+ if (!fetcher.data) return+ if (lastHandledData.current === fetcher.data) return+ lastHandledData.current = fetcher.data+if (fetcher.data?.success) {const { intent, twoFAData } = fetcher.data