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!

hydration errors fixes & other improvements

Blue Mouse01b9b9de24c1
diff --git a/app/App.tsx b/app/App.tsx
index 8e4238dfd..7cef2fe98 100644
--- a/app/App.tsx
+++ b/app/App.tsx
@@ -1,12 +1,9 @@
-import React, {
- useEffect, Suspense, useState,
-} from 'react'
+import React, { useEffect } from 'react'
import { useLocation, Outlet } from '@remix-run/react'
import { useSelector } from 'react-redux'
import { useTranslation } from 'react-i18next'
// @ts-ignore
import { useAlert } from '@blaumaus/react-alert'
-import cx from 'clsx'
import _some from 'lodash/some'
import _includes from 'lodash/includes'
import _startsWith from 'lodash/startsWith'
@@ -16,9 +13,7 @@ import 'dayjs/locale/uk'
import Header from 'components/Header'
import Footer from 'components/Footer'
-import Loader from 'ui/Loader'
-import ScrollToTop from 'hoc/ScrollToTop'
import { getAccessToken } from 'utils/accessToken'
import { authActions } from 'redux/reducers/auth'
import sagaActions from 'redux/sagas/actions'
@@ -34,36 +29,6 @@ const minimalFooterPages = [
'/projects', '/dashboard', '/settings', '/contact',
]
-type FallbackProps = {
- isMinimalFooter: boolean
-}
-
-const Fallback = ({ isMinimalFooter }: FallbackProps): JSX.Element => {
- const [showLoader, setShowLoader] = useState(false)
-
- useEffect(() => {
- let isMounted = true
-
- setTimeout(() => {
- if (isMounted) {
- setShowLoader(true)
- }
- }, 1000)
-
- return () => {
- isMounted = false
- }
- }, [])
-
- return (
- <div className={cx('bg-gray-50 dark:bg-slate-900', { 'min-h-page': !isMinimalFooter, 'min-h-min-footer': isMinimalFooter })}>
- {showLoader && (
- <Loader />
- )}
- </div>
- )
-}
-
interface IApp {
ssrTheme: 'dark' | 'light'
ssrAuthenticated: boolean
@@ -148,20 +113,15 @@ const App: React.FC<IApp> = ({ ssrTheme, ssrAuthenticated }) => {
return (
// eslint-disable-next-line react/jsx-no-useless-fragment
- <Suspense fallback={<></>}>
+ <>
{pathname !== routesPath.main && !isReferralPage && !isProjectViewPage && (
<Header ssrTheme={ssrTheme} authenticated={authenticated} />
)}
- {/* @ts-ignore */}
- <ScrollToTop>
- <Suspense fallback={<Fallback isMinimalFooter={isMinimalFooter} />}>
- <Outlet />
- </Suspense>
- </ScrollToTop>
+ <Outlet />
{!isReferralPage && !isProjectViewPage && (
<Footer minimal={isMinimalFooter} authenticated={authenticated} />
)}
- </Suspense>
+ </>
)
}
diff --git a/app/hoc/ScrollToTop.tsx b/app/hoc/ScrollToTop.tsx
deleted file mode 100644
index 6abc0d7e1..000000000
--- a/app/hoc/ScrollToTop.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-// import React, { useEffect } from 'react'
-import React from 'react'
-// import { useNavigate, useLocation } from '@remix-run/react'
-// import _isEmpty from 'lodash/isEmpty'
-
-interface IScrollToTop {
- children: JSX.Element
-}
-
-// interface StateType {
-// scrollToTopDisable?: boolean
-// }
-
-// interface IHistoryListener {
-// hash: string
-// state?: StateType | null
-// }
-
-// TODO: FIX THIS HOC
-
-/**
- * A HOC which listens to history changes and scrolls to top of the page when triggered.
- *
- * To disable Scroll to top on history.push, you should pass scrollToTopDisable: true state, e.g.:
- * history.push({
- * state: {
- * scrollToTopDisable: true,
- * },
- * })
- *
- * @component
- * @param {HTMLElement} children The children covered by the listener.
- */
-const ScrollToTop: React.FC<IScrollToTop> = ({ children }) => {
- // const location = useLocation()
-
- // useEffect(() => {
- // const { hash, state } = location
-
- // if (!_isEmpty(state) && state?.scrollToTopDisable) {
- // return
- // }
-
- // if (hash !== '') {
- // return
- // }
-
- // setTimeout(() => {
- // window.scrollTo({
- // top: 0,
- // behavior: 'smooth',
- // })
- // }, 0)
- // }, [location])
-
- return children
-}
-
-export default ScrollToTop
diff --git a/app/pages/Captcha/Settings/CaptchaSettings.tsx b/app/pages/Captcha/Settings/CaptchaSettings.tsx
index 4eaa0f80b..b14dfbfaf 100644
--- a/app/pages/Captcha/Settings/CaptchaSettings.tsx
+++ b/app/pages/Captcha/Settings/CaptchaSettings.tsx
@@ -2,7 +2,7 @@
import React, {
useState, useEffect, useMemo, memo, useRef,
} from 'react'
-import { useLocation, useNavigate, useParams } from '@remix-run/react'
+import { useNavigate, useParams } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
@@ -74,25 +74,24 @@ interface ICaptchaSettings {
deleteProjectCache: (pid: string) => void,
analyticsProjects: IProject[],
loading: boolean,
+ isSettings: boolean,
}
const CaptchaSettings = ({
updateProjectFailed, createNewProjectFailed, newProject, projectDeleted, deleteProjectFailed,
loadProjects, isLoading, projects, showError, removeProject, user,
- deleteProjectCache, analyticsProjects, loading,
+ deleteProjectCache, analyticsProjects, loading, isSettings,
}: ICaptchaSettings): JSX.Element => {
const { t }: {
t: (key: string, options?: {
[key: string]: string | number | boolean | undefined
}) => string,
} = useTranslation('common')
- const { pathname } = useLocation()
// @ts-ignore
const { id }: {
id: string,
} = useParams()
const project: ICaptchaProject | IProject = useMemo(() => _find([...projects, ...analyticsProjects], p => p.id === id) || {} as IProject | ICaptchaProject, [projects, analyticsProjects, id])
- const isSettings: boolean = !_isEmpty(id) && (_replace(routes.captcha_settings, ':id', id) === pathname)
const navigate = useNavigate()
const [form, setForm] = useState<IForm>({
name: '',
@@ -344,7 +343,11 @@ const CaptchaSettings = ({
}, [tab])
if (loading) {
- return <Loader />
+ return (
+ <div className='min-h-min-footer bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
+ <Loader />
+ </div>
+ )
}
return (
@@ -612,6 +615,11 @@ CaptchaSettings.propTypes = {
isLoading: PropTypes.bool.isRequired,
user: PropTypes.object.isRequired,
deleteProjectCache: PropTypes.func.isRequired,
+ isSettings: PropTypes.bool,
+}
+
+CaptchaSettings.defaultProps = {
+ isSettings: false,
}
export default memo(withAuthentication(CaptchaSettings, auth.authenticated))
diff --git a/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx b/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx
index f8cc6322e..e8d825bf2 100644
--- a/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx
+++ b/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.container.tsx
@@ -9,6 +9,7 @@ import ProjectAlerts from './ProjectAlertsSettings'
const mapStateToProps = (state: StateType) => ({
alerts: state.ui.alerts.alerts,
user: state.auth.user,
+ loading: state.auth.loading,
total: state.ui.alerts.total,
})
diff --git a/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx b/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
index 91409d5fc..ac99fedc1 100644
--- a/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
+++ b/app/pages/Project/Alerts/Settings/ProjectAlertsSettings.tsx
@@ -37,9 +37,7 @@ import { IUser } from 'redux/models/IUser'
const INTEGRATIONS_LINK = `${routes.user_settings}#integrations`
-const ProjectAlertsSettings = ({
- alerts, setProjectAlerts, showError, user, setProjectAlertsTotal, total, generateAlerts,
-}: {
+interface IProjectAlertsSettings {
alerts: IAlerts[]
setProjectAlerts: (item: IAlerts[]) => void
showError: (message: string) => void
@@ -47,15 +45,15 @@ const ProjectAlertsSettings = ({
setProjectAlertsTotal: (num: number) => void
total: number
generateAlerts: (message: string) => void
-}): JSX.Element => {
+ loading: boolean
+}
+
+const ProjectAlertsSettings = ({
+ alerts, setProjectAlerts, showError, user, setProjectAlertsTotal, total, generateAlerts, loading,
+}: IProjectAlertsSettings): JSX.Element => {
const navigate = useNavigate()
- const { id, pid }: {
- id?: string
- pid?: string
- } = useParams()
- const { pathname }: {
- pathname: string
- } = useLocation()
+ const { id, pid } = useParams()
+ const { pathname } = useLocation()
const { t }: {
t: (key: string, options?: {
[key: string]: string | number | null | undefined
@@ -247,19 +245,19 @@ const ProjectAlertsSettings = ({
<h2 className='mt-2 text-3xl font-bold text-gray-900 dark:text-gray-50'>
{title}
</h2>
- {!isIntegrationLinked && (
- <div className='flex items-center bg-blue-50 dark:text-gray-50 dark:bg-slate-800 rounded px-5 py-3 mt-2 whitespace-pre-wrap text-base'>
- <ExclamationTriangleIcon className='w-5 h-5 mr-1' />
- <Trans
- // @ts-ignore
- t={t}
- i18nKey='alert.noIntegration'
- components={{
- // eslint-disable-next-line jsx-a11y/anchor-has-content
- url: <Link to={INTEGRATIONS_LINK} className='hover:underline text-blue-600 dark:text-blue-500' />,
- }}
- />
- </div>
+ {!loading && !isIntegrationLinked && (
+ <div className='flex items-center bg-blue-50 dark:text-gray-50 dark:bg-slate-800 rounded px-5 py-3 mt-2 whitespace-pre-wrap text-base'>
+ <ExclamationTriangleIcon className='w-5 h-5 mr-1' />
+ <Trans
+ // @ts-ignore
+ t={t}
+ i18nKey='alert.noIntegration'
+ components={{
+ // eslint-disable-next-line jsx-a11y/anchor-has-content
+ url: <Link to={INTEGRATIONS_LINK} className='hover:underline text-blue-600 dark:text-blue-500' />,
+ }}
+ />
+ </div>
)}
<Input
name='name'
@@ -401,6 +399,7 @@ ProjectAlertsSettings.propTypes = {
setProjectAlerts: PropTypes.func.isRequired,
showError: PropTypes.func.isRequired,
user: PropTypes.object.isRequired,
+ loading: PropTypes.bool.isRequired,
}
export default withAuthentication(ProjectAlertsSettings, auth.authenticated)
diff --git a/app/pages/Project/Settings/ProjectSettings.tsx b/app/pages/Project/Settings/ProjectSettings.tsx
index cf7e98bc2..44dc8b9ff 100644
--- a/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.tsx
@@ -2,7 +2,7 @@
import React, {
useState, useEffect, useMemo, memo,
} from 'react'
-import { useLocation, useNavigate, useParams } from '@remix-run/react'
+import { useNavigate, useParams } from '@remix-run/react'
import { useTranslation } from 'react-i18next'
import cx from 'clsx'
import _isEmpty from 'lodash/isEmpty'
@@ -244,12 +244,14 @@ interface IProjectSettings {
dashboardPaginationPage: number,
dashboardPaginationPageShared: number,
loading: boolean,
+ isSettings: boolean,
}
const ProjectSettings = ({
updateProjectFailed, createNewProjectFailed, generateAlerts, projectDeleted, deleteProjectFailed,
loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,
- deleteProjectCache, setProjectProtectedPassword, dashboardPaginationPage, dashboardPaginationPageShared, loading,
+ deleteProjectCache, setProjectProtectedPassword, dashboardPaginationPage, dashboardPaginationPageShared,
+ loading, isSettings,
}: IProjectSettings) => {
const { t, i18n: { language } }: {
t: (key: string, options?: {
@@ -259,13 +261,11 @@ const ProjectSettings = ({
language: string,
},
} = useTranslation('common')
- const { pathname } = useLocation()
// @ts-ignore
const { id }: {
id: string,
} = useParams()
const project: IProjectForShared = useMemo(() => _find([...projects, ..._map(sharedProjects, (item) => item.project)], p => p.id === id) || {} as IProjectForShared, [projects, id, sharedProjects])
- const isSettings: boolean = !_isEmpty(id) && (_replace(routes.project_settings, ':id', id) === pathname)
const navigate = useNavigate()
const [form, setForm] = useState<IForm>({
@@ -521,7 +521,11 @@ const ProjectSettings = ({
}, [form, t, isSettings])
if (loading) {
- return <Loader />
+ return (
+ <div className='min-h-min-footer bg-gray-50 dark:bg-slate-900 flex flex-col py-6 px-4 sm:px-6 lg:px-8'>
+ <Loader />
+ </div>
+ )
}
return (
@@ -790,6 +794,11 @@ ProjectSettings.propTypes = {
user: PropTypes.object.isRequired,
isSharedProject: PropTypes.bool.isRequired,
deleteProjectCache: PropTypes.func.isRequired,
+ isSettings: PropTypes.bool,
+}
+
+ProjectSettings.defaultProps = {
+ isSettings: false,
}
export default memo(withAuthentication(ProjectSettings, auth.authenticated))
diff --git a/app/pages/Project/View/ViewProject.container.tsx b/app/pages/Project/View/ViewProject.container.tsx
index eca40f285..7aedcc729 100644
--- a/app/pages/Project/View/ViewProject.container.tsx
+++ b/app/pages/Project/View/ViewProject.container.tsx
@@ -19,6 +19,7 @@ const mapStateToProps = (state: StateType) => {
cachePerf: state.ui.cache.analyticsPerf,
projectViewPrefs: state.ui.cache.projectViewPrefs,
authenticated: state.auth.authenticated,
+ authLoading: state.auth.loading,
timezone: state.auth.user.timezone,
extensions: state.ui.misc.extensions,
user: state.auth.user,
@@ -34,6 +35,7 @@ const mapStateToProps = (state: StateType) => {
projects: state.ui.projects.projects,
sharedProjects: state.ui.projects.sharedProjects,
isLoading: state.ui.projects.isLoading,
+ authLoading: state.auth.loading,
cache: state.ui.cache.analytics,
cachePerf: state.ui.cache.analyticsPerf,
projectViewPrefs: state.ui.cache.projectViewPrefs,
diff --git a/app/pages/Project/View/ViewProject.tsx b/app/pages/Project/View/ViewProject.tsx
index a862c77d6..b4e1c0df8 100644
--- a/app/pages/Project/View/ViewProject.tsx
+++ b/app/pages/Project/View/ViewProject.tsx
@@ -127,15 +127,20 @@ interface IViewProject {
embedded: boolean,
ssrAuthenticated: boolean,
queryPassword: string | null,
+ authLoading: boolean,
}
const ViewProject = ({
projects, isLoading: _isLoading, showError, cache, cachePerf, setProjectCache, projectViewPrefs, setProjectViewPrefs, setPublicProject,
setLiveStatsForProject, authenticated: csrAuthenticated, timezone, user, sharedProjects, extensions, generateAlert, setProjectCachePerf,
projectTab, setProjectTab, setProjects, setProjectForcastCache, customEventsPrefs, setCustomEventsPrefs, liveStats, password, theme,
- ssrTheme, embedded, ssrAuthenticated, queryPassword,
+ ssrTheme, embedded, ssrAuthenticated, queryPassword, authLoading,
}: IViewProject) => {
- const authenticated = isBrowser ? csrAuthenticated : ssrAuthenticated
+ const authenticated = isBrowser
+ ? authLoading
+ ? ssrAuthenticated
+ : csrAuthenticated
+ : ssrAuthenticated
// t is used for translation
const { t, i18n: { language } }: {
@@ -2426,6 +2431,7 @@ const ViewProject = ({
activeTab={activeTab}
data={panelsData.data[type]}
customTabs={customTabs}
+ // @ts-ignore
rowMapper={({ name: entryName }) => (
<RefRow rowName={entryName} showIcons={showIcons} />
)}
@@ -2445,6 +2451,7 @@ const ViewProject = ({
name={panelName}
data={panelsData.data[type]}
customTabs={customTabs}
+ // @ts-ignore
rowMapper={({ name: entryName }) => decodeURIComponent(entryName)}
/>
)
@@ -2459,6 +2466,7 @@ const ViewProject = ({
id={type}
onFilter={filterHandler}
onFragmentChange={setPgActiveFragment}
+ // @ts-ignore
rowMapper={({ name: entryName }) => {
// todo: add uppercase
return entryName || t('project.redactedPage')
@@ -2568,6 +2576,7 @@ const ViewProject = ({
data={panelsDataPerf.data[countryActiveTab]}
customTabs={customTabs}
rowMapper={rowMapper}
+ // @ts-ignore
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}
/>
)
@@ -2585,6 +2594,7 @@ const ViewProject = ({
activeTab={activeTab}
data={panelsDataPerf.data[type]}
customTabs={customTabs}
+ // @ts-ignore
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}
capitalize
/>
@@ -2603,7 +2613,9 @@ const ViewProject = ({
name={panelName}
data={panelsDataPerf.data[type]}
customTabs={customTabs}
+ // @ts-ignore
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}
+ // @ts-ignore
rowMapper={({ name: entryName }) => {
// todo: add uppercase
return entryName || t('project.redactedPage')
@@ -2623,6 +2635,7 @@ const ViewProject = ({
name={panelName}
data={panelsDataPerf.data[type]}
customTabs={customTabs}
+ // @ts-ignore
valueMapper={(value) => getStringFromTime(getTimeFromSeconds(value), true)}
/>
)
@@ -2716,6 +2729,7 @@ ViewProject.propTypes = {
timezone: PropTypes.string,
embedded: PropTypes.bool.isRequired,
ssrAuthenticated: PropTypes.bool.isRequired,
+ authLoading: PropTypes.bool.isRequired,
queryPassword: PropTypes.string,
}
diff --git a/app/routes/captchas.settings.$id.tsx b/app/routes/captchas.settings.$id.tsx
index e5e637a95..28947e28a 100644
--- a/app/routes/captchas.settings.$id.tsx
+++ b/app/routes/captchas.settings.$id.tsx
@@ -1,5 +1,5 @@
import CaptchaSettings from 'pages/Captcha/Settings'
export default function Index() {
- return <CaptchaSettings />
+ return <CaptchaSettings isSettings />
}
diff --git a/app/routes/projects.settings.$id.tsx b/app/routes/projects.settings.$id.tsx
index 8665e5159..2eca68656 100644
--- a/app/routes/projects.settings.$id.tsx
+++ b/app/routes/projects.settings.$id.tsx
@@ -1,5 +1,5 @@
import ProjectSettings from 'pages/Project/Settings'
export default function Index() {
- return <ProjectSettings />
+ return <ProjectSettings isSettings />
}