cleanup cache

Author: izadoesdev

apps/dashboard/app/(main)/websites/[id]/layout.tsx

@@ -5,7 +5,7 @@ import { useAtom } from "jotai";
 import { useParams, usePathname } from "next/navigation";
 import { useRef } from "react";
 import { toast } from "sonner";
-import NotFound from "@/app/not-found";
+import { WebsiteErrorState } from "@/components/website-error-state";
 import { useTrackingSetup } from "@/hooks/use-tracking-setup";
 import { useWebsite } from "@/hooks/use-websites";
 import { isAnalyticsRefreshingAtom } from "@/stores/jotai/filterAtoms";
@@ -20,9 +20,11 @@ export default function WebsiteLayout({ children }: WebsiteLayoutProps) {
 	const { id } = useParams();
 	const pathname = usePathname();
 	const queryClient = useQueryClient();
+	const isDemoRoute = pathname?.startsWith("/demo/");
 	const {
 		isLoading: isWebsiteLoading,
 		isError: isWebsiteError,
+		error: websiteError,
 		data: websiteData,
 	} = useWebsite(id as string);
 	const { isTrackingSetup, isTrackingSetupLoading } = useTrackingSetup(
@@ -46,17 +48,19 @@ export default function WebsiteLayout({ children }: WebsiteLayoutProps) {
 	);
 
 	if (!id) {
-		return <NotFound />;
+		return <WebsiteErrorState error={{ data: { code: "NOT_FOUND" } }} />;
 	}
 
 	if (!isWebsiteLoading && isWebsiteError) {
-		return <NotFound />;
+		return (
+			<WebsiteErrorState error={websiteError} websiteId={id as string} />
+		);
 	}
 
 	const websiteId = id as string;
 	const isToolbarLoading =
-		isWebsiteLoading || isTrackingSetupLoading || isTrackingSetup === null;
-	const isToolbarDisabled = !isTrackingSetup || isToolbarLoading;
+		isWebsiteLoading || (!isDemoRoute && (isTrackingSetupLoading || isTrackingSetup === null));
+	const isToolbarDisabled = !isDemoRoute && (!isTrackingSetup || isToolbarLoading);
 
 	const handleRefresh = async () => {
 		setIsRefreshing(true);
@@ -101,7 +105,8 @@ export default function WebsiteLayout({ children }: WebsiteLayoutProps) {
 			>
 				{isAssistantPage ? (
 					children
-				) : websiteData &&
+				) : !isDemoRoute &&
+					websiteData &&
 					!isTrackingSetupLoading &&
 					isTrackingSetup !== null &&
 					isTrackingSetup === false ? (

apps/dashboard/components/analytics/event-limit-indicator.tsx

@@ -1,14 +1,19 @@
 "use client";
 
 import { WarningIcon } from "@phosphor-icons/react";
+import { usePathname } from "next/navigation";
 import { useQuery } from "@tanstack/react-query";
 import Link from "next/link";
 import { buttonVariants } from "@/components/ui/button";
 import { orpc } from "@/lib/orpc";
 
 export function EventLimitIndicator() {
+	const pathname = usePathname();
+	const isDemoRoute = pathname?.startsWith("/demo/");
+
 	const { data } = useQuery({
 		...orpc.organizations.getUsage.queryOptions(),
+		enabled: !isDemoRoute,
 	});
 
 	if (!data || data.unlimited) {

apps/dashboard/components/providers/billing-provider.tsx

@@ -71,15 +71,16 @@ export function BillingProvider({
 	const params = useParams();
 	const pathname = usePathname();
 
-	// Determine the websiteId - only pass it for demo routes (unauthenticated viewing)
-	// For authenticated users on /websites/*, the backend uses their session context
 	const websiteId = useMemo(() => {
 		if (propWebsiteId) return propWebsiteId;
 
-		// Only use route param for demo routes (public/unauthenticated viewing)
+		const isDemoRoute = pathname?.startsWith("/demo/");
+		
+		if (isDemoRoute) {
 		const routeId = params?.id;
-		if (typeof routeId === "string" && routeId && pathname?.includes("/demo/")) {
+			if (typeof routeId === "string" && routeId) {
 			return routeId;
+			}
 		}
 
 		return undefined;
@@ -104,7 +105,7 @@ export function BillingProvider({
 		refetch: refetchBillingContext,
 	} = useQuery({
 		...orpc.organizations.getBillingContext.queryOptions({
-			websiteId,
+			input: websiteId ? { websiteId } : undefined,
 		}),
 	});