🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor NoData and SiteSelector components to improve data fetching logic. Updated loading state checks from `isLoading` to `isFetching` for consistency. Enhanced SiteSelector to utilize `setSite` from the store, ensuring correct site context during navigation.
Bill Yang2db89ff7503e
diff --git a/client/src/app/[site]/components/Header/NoData.tsx b/client/src/app/[site]/components/Header/NoData.tsxindex 8e48bfcb6..5058b0221 100644--- a/client/src/app/[site]/components/Header/NoData.tsx+++ b/client/src/app/[site]/components/Header/NoData.tsx@@ -5,11 +5,11 @@ import { useStore } from "../../../../lib/store";export function NoData() {const { site } = useStore();- const { data: siteHasData, isLoading } = useSiteHasData(site);- const { data: siteMetadata, isLoading: isLoadingSiteMetadata } =+ const { data: siteHasData, isFetching } = useSiteHasData(site);+ const { data: siteMetadata, isFetching: isFetchingSiteMetadata } =useGetSite(site);- if (!siteHasData && !isLoading && !isLoadingSiteMetadata) {+ if (!siteHasData && !isFetching && !isFetchingSiteMetadata) {return (<Alert className="mt-4 p-4 bg-yellow-50 border-yellow-200 dark:bg-yellow-900/20 dark:border-yellow-800"><div className="flex flex-col gap-3">diff --git a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx b/client/src/app/[site]/components/Sidebar/SiteSelector.tsxindex e286a797a..06d850c2c 100644--- a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx+++ b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx@@ -9,13 +9,14 @@ import {DropdownMenuTrigger,} from "../../../../components/ui/dropdown-menu";import { authClient } from "../../../../lib/auth";-import { resetStore } from "../../../../lib/store";+import { resetStore, useStore } from "../../../../lib/store";import { userStore } from "../../../../lib/userStore";import { cn } from "../../../../lib/utils";function SiteSelectorContent() {const { data: activeOrganization } = authClient.useActiveOrganization();const { data: sites } = useGetSitesFromOrg(activeOrganization?.id);+ const { setSite } = useStore();const pathname = usePathname();const router = useRouter();@@ -32,6 +33,7 @@ function SiteSelectorContent() {onClick={() => {if (isSelected) return;resetStore();+ setSite(site.siteId.toString());router.push(`/${site.siteId}`);}}className={cn(@@ -64,11 +66,9 @@ function SiteSelectorContent() {}export function SiteSelector() {- const pathname = usePathname();-const { user } = userStore();- const currentSiteId = Number(pathname.split("/")[1]);- const { data: site } = useGetSite(currentSiteId);+ const { site: currentSite } = useStore();+ const { data: site } = useGetSite(currentSite);return (<DropdownMenu>