📈 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: loading indicator issues
Blue Mousec7d8b1659a2b
diff --git a/web/app/pages/Project/Errors/View/ErrorsView.tsx b/web/app/pages/Project/Errors/View/ErrorsView.tsxindex dee6248c8..84bcc49c7 100644--- a/web/app/pages/Project/Errors/View/ErrorsView.tsx+++ b/web/app/pages/Project/Errors/View/ErrorsView.tsx@@ -395,7 +395,8 @@ const ERRORS_TAKE = 30const ErrorsView = () => {const { id, allowedToManage, project } = useCurrentProject()const projectPassword = useProjectPassword(id)- const { timeBucket, timeFormat, period, dateRange, timezone, filters, size } = useViewProjectContext()+ const { errorsRefreshTrigger, timeBucket, timeFormat, period, dateRange, timezone, filters, size } =+ useViewProjectContext()const {t,i18n: { language },@@ -672,6 +673,21 @@ const ErrorsView = () => {// eslint-disable-next-line react-hooks/exhaustive-deps}, [period, dateRange, timeBucket, activeEID, filters])+ // Handle refresh trigger (list + detail)+ useEffect(() => {+ if (errorsRefreshTrigger <= 0) return++ if (activeEID) {+ loadError(activeEID)+ return+ }++ setErrorsSkip(0)+ loadErrors(0, true)+ loadOverview()+ // eslint-disable-next-line react-hooks/exhaustive-deps+ }, [errorsRefreshTrigger])+const chartOptions = useMemo(() => {if (!overview?.chart || !overview.chart.x || overview.chart.x.length === 0) return nullreturn getErrorTrendsChartSettings(overview.chart, timeBucket, timeFormat, chartTypes.line, {@@ -804,6 +820,7 @@ const ErrorsView = () => {<div>{/* Loading bar for refreshes */}{errorLoading && activeError ? <LoadingBar /> : null}+ {errorsLoading && !_isEmpty(errors) ? <LoadingBar /> : null}<DashboardHeaderbackLink={`?${pureSearchParams}`}diff --git a/web/app/pages/Project/Experiments/View/ExperimentsView.tsx b/web/app/pages/Project/Experiments/View/ExperimentsView.tsxindex c1a73d071..b6c1f9a5c 100644--- a/web/app/pages/Project/Experiments/View/ExperimentsView.tsx+++ b/web/app/pages/Project/Experiments/View/ExperimentsView.tsx@@ -320,9 +320,8 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVi}isLoadingRef.current = true- // Only toggle global loading UI when we don't already have cached data- const didShowLoading = showLoading && (!experiments || experiments.length === 0)- if (didShowLoading) {+ // `showLoading` means "show either initial Loader or refresh LoadingBar".+ if (showLoading) {setIsLoading(true)}@@ -339,7 +338,7 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVi}} finally {isLoadingRef.current = false- if (isMountedRef.current && didShowLoading) {+ if (isMountedRef.current && showLoading) {setIsLoading(false)}}@@ -360,8 +359,8 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVireturn}- // Silent refresh - don't show loading state since we already have data- loadExperiments(DEFAULT_EXPERIMENTS_TAKE, (page - 1) * DEFAULT_EXPERIMENTS_TAKE, false)+ // Refresh list (show LoadingBar if we already have data)+ loadExperiments(DEFAULT_EXPERIMENTS_TAKE, (page - 1) * DEFAULT_EXPERIMENTS_TAKE, true)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [experimentsRefreshTrigger, viewingResultsId, page])@@ -370,7 +369,7 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsViuseEffect(() => {if (!viewingResultsId && shouldRefreshListOnReturn) {setShouldRefreshListOnReturn(false)- loadExperiments(DEFAULT_EXPERIMENTS_TAKE, (page - 1) * DEFAULT_EXPERIMENTS_TAKE, false)+ loadExperiments(DEFAULT_EXPERIMENTS_TAKE, (page - 1) * DEFAULT_EXPERIMENTS_TAKE, true)}// eslint-disable-next-line react-hooks/exhaustive-deps}, [viewingResultsId, shouldRefreshListOnReturn, page])@@ -439,7 +438,8 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVisetViewingResultsId(experimentId)}- if (error && isLoading === false) {+ // Only show the big error state if we have no cached data to display.+ if (error && isLoading === false && _isEmpty(experiments)) {return (<div className='bg-gray-50 px-4 py-16 sm:px-6 sm:py-24 md:grid md:place-items-center lg:px-8 dark:bg-slate-900'><div className='mx-auto max-w-max'>@@ -477,7 +477,7 @@ const ExperimentsView = ({ period, from = '', to = '', timezone }: ExperimentsVi}// Show Loader only on initial load (no existing data)- if ((isLoading || isLoading === null) && _isEmpty(experiments)) {+ if ((isLoading === null || isLoading) && _isEmpty(experiments)) {return (<div className='mt-4'><Loader />diff --git a/web/app/pages/Project/View/ViewProject.tsx b/web/app/pages/Project/View/ViewProject.tsxindex a39401717..4ef5eb07e 100644--- a/web/app/pages/Project/View/ViewProject.tsx+++ b/web/app/pages/Project/View/ViewProject.tsx@@ -116,6 +116,7 @@ interface ViewProjectContextType {experimentsRefreshTrigger: numberfeatureFlagsRefreshTrigger: numbersessionsRefreshTrigger: number+ errorsRefreshTrigger: numberperformanceRefreshTrigger: numbertrafficRefreshTrigger: numberfunnelsRefreshTrigger: number@@ -176,6 +177,7 @@ const defaultViewProjectContext: ViewProjectContextType = {experimentsRefreshTrigger: 0,featureFlagsRefreshTrigger: 0,sessionsRefreshTrigger: 0,+ errorsRefreshTrigger: 0,performanceRefreshTrigger: 0,trafficRefreshTrigger: 0,funnelsRefreshTrigger: 0,@@ -271,6 +273,7 @@ const ViewProjectContent = () => {const [experimentsRefreshTrigger, setExperimentsRefreshTrigger] = useState(0)const [featureFlagsRefreshTrigger, setFeatureFlagsRefreshTrigger] = useState(0)const [sessionsRefreshTrigger, setSessionsRefreshTrigger] = useState(0)+ const [errorsRefreshTrigger, setErrorsRefreshTrigger] = useState(0)const [performanceRefreshTrigger, setPerformanceRefreshTrigger] = useState(0)const [trafficRefreshTrigger, setTrafficRefreshTrigger] = useState(0)const [funnelsRefreshTrigger, setFunnelsRefreshTrigger] = useState(0)@@ -685,6 +688,11 @@ const ViewProjectContent = () => {return}+ if (activeTab === PROJECT_TABS.errors) {+ setErrorsRefreshTrigger((prev) => prev + 1)+ return+ }+if (activeTab === PROJECT_TABS.performance) {setPerformanceRefreshTrigger((prev) => prev + 1)return@@ -940,6 +948,7 @@ const ViewProjectContent = () => {experimentsRefreshTrigger,featureFlagsRefreshTrigger,sessionsRefreshTrigger,+ errorsRefreshTrigger,performanceRefreshTrigger,trafficRefreshTrigger,funnelsRefreshTrigger,@@ -999,6 +1008,7 @@ const ViewProjectContent = () => {experimentsRefreshTrigger,featureFlagsRefreshTrigger,sessionsRefreshTrigger,+ errorsRefreshTrigger,performanceRefreshTrigger,trafficRefreshTrigger,funnelsRefreshTrigger,