Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor SiteSettings and metadata handling for improved siteId usage

Bill Yang1a4ea4678c67
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.ts
index 883a69965..40bb611fa 100644
--- a/client/src/api/admin/sites.ts
+++ b/client/src/api/admin/sites.ts
@@ -60,11 +60,14 @@ export function useSiteHasData(siteId: string) {
return useGenericQuery<boolean>(`site-has-data/${siteId}`);
}
-export function useGetSiteMetadata() {
- const { site } = useStore();
+export function useGetSiteMetadata(siteId?: string | number) {
const { data, isLoading } = useGetSites();
+ const { site } = useStore();
+
+ const siteIdToUse = siteId ?? site;
+
return {
- siteMetadata: data?.find(({ siteId }) => siteId === Number(site)),
+ siteMetadata: data?.find((site) => site.siteId === Number(siteIdToUse)),
isLoading,
};
}
diff --git a/client/src/app/[site]/Header/Header.tsx b/client/src/app/[site]/Header/Header.tsx
index 5703dd1ad..e91ad66f1 100644
--- a/client/src/app/[site]/Header/Header.tsx
+++ b/client/src/app/[site]/Header/Header.tsx
@@ -47,7 +47,7 @@ export function Header() {
<div className="flex items-center gap-1 text-base text-neutral-600 dark:text-neutral-400">
<Circle size={12} weight="fill" color="hsl(var(--green-500))" />
{data?.count} users online
- <SiteSettings />
+ <SiteSettings siteId={site?.siteId ?? 0} />
</div>
</div>
<div className="flex space-x-2">
diff --git a/client/src/components/SiteCard.tsx b/client/src/components/SiteCard.tsx
index e48aa048e..c32b20af3 100644
--- a/client/src/components/SiteCard.tsx
+++ b/client/src/components/SiteCard.tsx
@@ -85,7 +85,7 @@ export function SiteCard({ siteId, domain }: SiteCardProps) {
{domain}
</span>
</Link>
- <SiteSettings />
+ <SiteSettings siteId={siteId} />
</div>
<div className="relative mt-1 mb-1 rounded-md p-2 overflow-hidden">
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index 5c2c10aca..07099d162 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -41,8 +41,8 @@ import {
} from "@/api/admin/sites";
import { BACKEND_URL } from "@/lib/const";
-export function SiteSettings() {
- const { siteMetadata } = useGetSiteMetadata();
+export function SiteSettings({ siteId }: { siteId: number }) {
+ const { siteMetadata } = useGetSiteMetadata(siteId);
if (!siteMetadata) {
return null;