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!

fix: layout shift on dashboard loading

Blue Mouse34ebb44d48d7
diff --git a/web/app/components/LocaleLinks.tsx b/web/app/components/LocaleLinks.tsx
index 2bcaff608..d6e6a4a0c 100644
--- a/web/app/components/LocaleLinks.tsx
+++ b/web/app/components/LocaleLinks.tsx
@@ -11,7 +11,7 @@ import {
} from '~/lib/constants'
const getUrlFromLocation = (location: Location) => {
- const { pathname, hash, search } = location
+ const { pathname, search } = location
const urlObject = new URL(`${MAIN_URL}${pathname}${search}`)
return urlObject
diff --git a/web/app/pages/Project/View/components/LoaderView.tsx b/web/app/pages/Project/View/components/LoaderView.tsx
new file mode 100644
index 000000000..7397b57cf
--- /dev/null
+++ b/web/app/pages/Project/View/components/LoaderView.tsx
@@ -0,0 +1,20 @@
+import { useSearchParams } from 'react-router'
+import { cn } from '~/utils/generic'
+import Loader from '~/ui/Loader'
+
+export const LoaderView = () => {
+ const [searchParams] = useSearchParams()
+
+ const isEmbedded = searchParams.get('embedded') === 'true'
+
+ return (
+ <div
+ className={cn('flex flex-col bg-gray-50 dark:bg-slate-900', {
+ 'min-h-including-header': !isEmbedded,
+ 'min-h-screen': isEmbedded,
+ })}
+ >
+ <Loader />
+ </div>
+ )
+}
diff --git a/web/app/pages/Project/View/utils/filters.tsx b/web/app/pages/Project/View/utils/filters.tsx
index 3fd4a49b5..2e466dc3c 100644
--- a/web/app/pages/Project/View/utils/filters.tsx
+++ b/web/app/pages/Project/View/utils/filters.tsx
@@ -4,9 +4,6 @@ import _reduce from 'lodash/reduce'
import _some from 'lodash/some'
import _startsWith from 'lodash/startsWith'
-import { VALID_PERIODS, VALID_TIME_BUCKETS } from '~/lib/constants'
-
-import { ProjectPreferences } from '../../../../providers/CurrentProjectProvider'
import { Filter } from '../interfaces/traffic'
export const ERROR_FILTERS_MAPPING = {
@@ -51,39 +48,6 @@ const validFilters = [
// this is done to build a connnection between dynamic column and value (e.g. for custom event metadata or page properties)
const validDynamicFilters = ['ev:key:', 'tag:key:']
-export const filterInvalidPreferences = (
- prefs: Record<string, ProjectPreferences>,
-): Record<string, ProjectPreferences> => {
- const pids = _keys(prefs)
- const filtered = _reduce(
- pids,
- (prev: string[], curr: string) => {
- const { period, timeBucket } = prefs[curr]
-
- if (
- !_includes(VALID_PERIODS, period) ||
- !_includes(VALID_TIME_BUCKETS, timeBucket)
- ) {
- return prev
- }
-
- return [...prev, curr]
- },
- [],
- )
-
- return _reduce(
- filtered,
- (prev: any, curr: string) => {
- return {
- ...prev,
- [curr]: prefs[curr],
- }
- },
- {},
- )
-}
-
export const isFilterValid = (filter: string, checkDynamicFilters = false) => {
// normalise by removing operator prefixes from the URL key
let normalised = filter
diff --git a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
index d258d7183..a6c55a584 100644
--- a/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
+++ b/web/app/pages/Project/tabs/Alerts/ProjectAlertsView.tsx
@@ -40,7 +40,6 @@ import type {
} from '~/routes/projects.$id'
import { Badge, type BadgeProps } from '~/ui/Badge'
import Button from '~/ui/Button'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
@@ -49,6 +48,7 @@ import { Text } from '~/ui/Text'
import routes from '~/utils/routes'
import ProjectAlertsSettings from './ProjectAlertsSettings'
+import { LoaderView } from '../../View/components/LoaderView'
const NoNotificationChannelSet = () => {
const { t } = useTranslation('common')
@@ -275,7 +275,7 @@ function AlertsDataResolver({
function ProjectAlertsWrapper() {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<AlertsDataResolver>
{(deferredData) => <ProjectAlertsInner deferredData={deferredData} />}
</AlertsDataResolver>
diff --git a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
index 0b698771c..d724d0eed 100644
--- a/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
+++ b/web/app/pages/Project/tabs/Errors/ErrorsView.tsx
@@ -96,6 +96,7 @@ import { Text } from '~/ui/Text'
import Tooltip from '~/ui/Tooltip'
import { getRelativeDateIfPossible } from '~/utils/date'
import { getLocaleDisplayName, nFormatter } from '~/utils/generic'
+import { LoaderView } from '../../View/components/LoaderView'
const InteractiveMap = lazy(
() => import('~/pages/Project/View/components/InteractiveMap'),
@@ -511,7 +512,7 @@ function ErrorsDataResolver({
function ErrorsViewWrapper() {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<ErrorsDataResolver>
{(deferredData) => <ErrorsViewInner deferredData={deferredData} />}
</ErrorsDataResolver>
diff --git a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
index 7763888c7..5e4e210db 100644
--- a/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
+++ b/web/app/pages/Project/tabs/Experiments/ExperimentsView.tsx
@@ -17,7 +17,7 @@ import {
} from 'lucide-react'
import { useState, useEffect, useMemo, useRef, useCallback, memo } from 'react'
import { useTranslation } from 'react-i18next'
-import { useSearchParams, useFetcher } from 'react-router'
+import { useFetcher } from 'react-router'
import { toast } from 'sonner'
import DashboardHeader from '~/pages/Project/View/components/DashboardHeader'
@@ -29,7 +29,6 @@ import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import type { ProjectViewActionData } from '~/routes/projects.$id'
import Button from '~/ui/Button'
import Spin from '~/ui/icons/Spin'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
@@ -39,6 +38,7 @@ import routes from '~/utils/routes'
import ExperimentResults from './ExperimentResults'
import ExperimentSettingsModal from './ExperimentSettingsModal'
+import { LoaderView } from '../../View/components/LoaderView'
dayjs.extend(relativeTime)
@@ -384,8 +384,6 @@ const ExperimentsView = ({
const { id } = useCurrentProject()
const { experimentsRefreshTrigger } = useRefreshTriggers()
const { timeBucket } = useViewProjectContext()
- const [searchParams] = useSearchParams()
- const isEmbedded = searchParams.get('embedded') === 'true'
const { t } = useTranslation()
const listFetcher = useFetcher<ProjectViewActionData>()
const actionFetcher = useFetcher<ProjectViewActionData>()
@@ -686,16 +684,7 @@ const ExperimentsView = ({
}
if ((isLoading === null || isLoading) && _isEmpty(experiments)) {
- return (
- <div
- className={cx('flex flex-col bg-gray-50 dark:bg-slate-900', {
- 'min-h-including-header': !isEmbedded,
- 'min-h-screen': isEmbedded,
- })}
- >
- <Loader />
- </div>
- )
+ return <LoaderView />
}
if (viewingResultsId) {
diff --git a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
index b32f49f7a..27f5d4730 100644
--- a/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
+++ b/web/app/pages/Project/tabs/FeatureFlags/FeatureFlagsView.tsx
@@ -62,7 +62,6 @@ import type {
import { Badge } from '~/ui/Badge'
import Button from '~/ui/Button'
import Spin from '~/ui/icons/Spin'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
@@ -74,6 +73,7 @@ import { getProfileDisplayName, ProfileAvatar } from '~/utils/profileAvatars'
import routes from '~/utils/routes'
import FeatureFlagSettingsModal from './FeatureFlagSettingsModal'
+import { LoaderView } from '../../View/components/LoaderView'
dayjs.extend(relativeTime)
@@ -517,7 +517,7 @@ function FeatureFlagsDataResolver({
function FeatureFlagsViewWrapper(props: FeatureFlagsViewProps) {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<FeatureFlagsDataResolver>
{(deferredData) => (
<FeatureFlagsViewInner {...props} deferredData={deferredData} />
diff --git a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
index 5fac5595b..bd8ce240c 100644
--- a/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
+++ b/web/app/pages/Project/tabs/Funnels/FunnelsView.tsx
@@ -40,6 +40,7 @@ import LoadingBar from '~/ui/LoadingBar'
import { Text } from '~/ui/Text'
import { nLocaleFormatter } from '~/utils/generic'
import routes from '~/utils/routes'
+import { LoaderView } from '../../View/components/LoaderView'
interface DeferredFunnelData {
funnelData: FunnelDataResponse | null
@@ -57,7 +58,7 @@ function FunnelDataResolver({
function FunnelsViewWrapper() {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<FunnelDataResolver>
{(deferredData) => <FunnelsViewInner deferredData={deferredData} />}
</FunnelDataResolver>
diff --git a/web/app/pages/Project/tabs/Goals/GoalsView.tsx b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
index e180c497e..0d5d43058 100644
--- a/web/app/pages/Project/tabs/Goals/GoalsView.tsx
+++ b/web/app/pages/Project/tabs/Goals/GoalsView.tsx
@@ -63,7 +63,6 @@ import type {
import BillboardChart from '~/ui/BillboardChart'
import Button from '~/ui/Button'
import Spin from '~/ui/icons/Spin'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Modal from '~/ui/Modal'
import Pagination from '~/ui/Pagination'
@@ -74,6 +73,7 @@ import { nFormatter } from '~/utils/generic'
import routes from '~/utils/routes'
import GoalSettingsModal from './GoalSettingsModal'
+import { LoaderView } from '../../View/components/LoaderView'
const DEFAULT_GOALS_TAKE = 20
@@ -517,7 +517,7 @@ function GoalsDataResolver({
function GoalsViewWrapper(props: GoalsViewProps) {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<GoalsDataResolver>
{(deferredData) => (
<GoalsViewInner {...props} deferredData={deferredData} />
diff --git a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
index 8beec7188..cebc9a4a1 100644
--- a/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
+++ b/web/app/pages/Project/tabs/Performance/PerformanceView.tsx
@@ -53,9 +53,9 @@ import { useCurrentProject } from '~/providers/CurrentProjectProvider'
import { useTheme } from '~/providers/ThemeProvider'
import type { ProjectLoaderData } from '~/routes/projects.$id'
import Dropdown from '~/ui/Dropdown'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import { getStringFromTime, getTimeFromSeconds } from '~/utils/generic'
+import { LoaderView } from '../../View/components/LoaderView'
const InteractiveMap = lazy(
() => import('~/pages/Project/View/components/InteractiveMap'),
@@ -90,7 +90,7 @@ function PerfDataResolver({
function PerformanceViewWrapper(props: PerformanceViewProps) {
return (
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<PerfDataResolver>
{(deferredData) => (
<PerformanceViewInner {...props} deferredData={deferredData} />
diff --git a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
index dad0b2eb1..539a5bf11 100644
--- a/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
+++ b/web/app/pages/Project/tabs/Profiles/ProfilesView.tsx
@@ -32,10 +32,10 @@ import {
useCurrentProject,
useProjectPassword,
} from '~/providers/CurrentProjectProvider'
-import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import Filters from '../../View/components/Filters'
+import { LoaderView } from '../../View/components/LoaderView'
const mapApiProfileToUI = (apiProfile: ApiProfile): Profile => ({
profileId: apiProfile.profileId,
@@ -385,7 +385,7 @@ const ProfilesView = ({ tnMapping }: ProfilesViewProps) => {
showLiveVisitors={false}
/>
{profileLoading && !activeProfile ? (
- <Loader />
+ <LoaderView />
) : (
<ProfileDetails
details={activeProfile}
@@ -421,7 +421,7 @@ const ProfilesView = ({ tnMapping }: ProfilesViewProps) => {
}}
/>
{(profilesLoading === null || profilesLoading) && _isEmpty(profiles) ? (
- <Loader />
+ <LoaderView />
) : null}
{typeof profilesLoading === 'boolean' &&
!profilesLoading &&
diff --git a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
index ef7675939..71cc33da6 100644
--- a/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
+++ b/web/app/pages/Project/tabs/Sessions/SessionsView.tsx
@@ -37,6 +37,7 @@ import Loader from '~/ui/Loader'
import LoadingBar from '~/ui/LoadingBar'
import StatusPage from '~/ui/StatusPage'
import routes from '~/utils/routes'
+import { LoaderView } from '../../View/components/LoaderView'
interface SessionsErrorBoundaryState {
hasError: boolean
@@ -133,7 +134,7 @@ function SessionsDataResolver({
function SessionsViewWrapper(props: SessionsViewProps) {
return (
<SessionsErrorBoundary>
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<SessionsDataResolver>
{(deferredData) => (
<SessionsViewInner {...props} deferredData={deferredData} />
diff --git a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
index cabfd4ea8..06d3b3166 100644
--- a/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
+++ b/web/app/pages/Project/tabs/Traffic/TrafficView.tsx
@@ -102,6 +102,7 @@ import LoadingBar from '~/ui/LoadingBar'
import { getLocaleDisplayName, nLocaleFormatter } from '~/utils/generic'
import { groupRefEntries } from '~/utils/referrers'
import routes from '~/utils/routes'
+import { LoaderView } from '../../View/components/LoaderView'
const InteractiveMap = lazy(
() => import('~/pages/Project/View/components/InteractiveMap'),
@@ -227,7 +228,7 @@ function TrafficDataResolver({
function TrafficViewWrapper(props: TrafficViewProps) {
return (
<TrafficErrorBoundary>
- <Suspense fallback={<Loader />}>
+ <Suspense fallback={<LoaderView />}>
<TrafficDataResolver>
{(deferredData) => (
<TrafficViewInner {...props} deferredData={deferredData} />
diff --git a/web/app/providers/CurrentProjectProvider.tsx b/web/app/providers/CurrentProjectProvider.tsx
index aac4ff62a..b9ace247e 100644
--- a/web/app/providers/CurrentProjectProvider.tsx
+++ b/web/app/providers/CurrentProjectProvider.tsx
@@ -186,7 +186,7 @@ const useProject = (id: string) => {
return { project, mergeProject, isPasswordRequired, submitPassword }
}
-export type ProjectPreferences = {
+type ProjectPreferences = {
period?: Period
timeBucket?: TimeBucket
rangeDate?: Date[]
diff --git a/web/app/routes/projects.$id.tsx b/web/app/routes/projects.$id.tsx
index be3332761..eac361390 100644
--- a/web/app/routes/projects.$id.tsx
+++ b/web/app/routes/projects.$id.tsx
@@ -45,7 +45,6 @@ import {
import { useRequiredParams } from '~/hooks/useRequiredParams'
import {
API_URL,
- MAIN_URL,
DEFAULT_TIMEZONE,
PROJECT_TABS,
getValidTimeBucket,