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!

fixed a bug where project settings would not populate

Blue Mouse537562128341
diff --git a/app/pages/Project/Settings/ProjectSettings.tsx b/app/pages/Project/Settings/ProjectSettings.tsx
index 4cd43fdee..138a4c244 100644
--- a/app/pages/Project/Settings/ProjectSettings.tsx
+++ b/app/pages/Project/Settings/ProjectSettings.tsx
@@ -344,6 +344,7 @@ const ProjectSettings = ({
const [dateRange, setDateRange] = useState<Date[]>([])
const [tab, setTab] = useState<string>(tabDeleteDataModal[0].name)
const [showProtected, setShowProtected] = useState<boolean>(false)
+ const [initialised, setInitialised] = useState(false)
// for reset data via filters
const [activeFilter, setActiveFilter] = useState<string[]>([])
@@ -354,7 +355,7 @@ const ProjectSettings = ({
: dashboardPaginationPage * ENTRIES_PER_PAGE_DASHBOARD
useEffect(() => {
- if (authLoading) {
+ if (authLoading || initialised) {
return
}
@@ -373,9 +374,22 @@ const ProjectSettings = ({
ipBlacklist: _isString(project.ipBlacklist) ? project.ipBlacklist : _join(project.ipBlacklist, ', '),
origins: _isString(project.origins) ? project.origins : _join(project.origins, ', '),
})
+ setInitialised(true)
}
}
- }, [user, project, isLoading, isSettings, navigate, showError, projectDeleting, t, authLoading, isLoadingShared])
+ }, [
+ user,
+ project,
+ initialised,
+ isLoading,
+ isSettings,
+ navigate,
+ showError,
+ projectDeleting,
+ t,
+ authLoading,
+ isLoadingShared,
+ ])
const onSubmit = async (data: IForm) => {
if (!projectSaving) {
@@ -575,7 +589,7 @@ const ProjectSettings = ({
document.title = pageTitle
}, [form, t, isSettings])
- if (authLoading) {
+ if (authLoading || !initialised) {
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 />
diff --git a/app/redux/sagas/ui/load_shared_projects.ts b/app/redux/sagas/ui/load_shared_projects.ts
index 5f673012f..f16191497 100644
--- a/app/redux/sagas/ui/load_shared_projects.ts
+++ b/app/redux/sagas/ui/load_shared_projects.ts
@@ -31,6 +31,12 @@ export default function* loadSharedProjects({ payload: { take = ENTRIES_PER_PAGE
} = yield call(getSharedProjects, take, skip, search)
if (total === 0) {
+ yield put(
+ UIActions.setProjectsLoading({
+ isLoading: false,
+ shared: true,
+ }),
+ )
return
}