cleanup

Author: izadoesdev

apps/api/src/query/builders/custom-events.ts

@@ -261,6 +261,7 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
 			filterConditions?: string[],
 			filterParams?: Record<string, Filter["value"]>
 		) => {
+			const limit = _limit ?? 1000;
 			const combinedWhereClause = filterConditions?.length
 				? `AND ${filterConditions.join(" AND ")}`
 				: "";
@@ -281,11 +282,13 @@ export const CustomEventsBuilders: Record<string, SimpleQueryConfig> = {
 						${combinedWhereClause}
 					GROUP BY toDate(timestamp)
 					ORDER BY date ASC
+					LIMIT {limit:UInt32}
 				`,
 				params: {
 					websiteId,
 					startDate,
 					endDate,
+					limit,
 					...filterParams,
 				},
 			};

apps/api/src/query/builders/performance.ts

@@ -214,16 +214,16 @@ export const PerformanceBuilders: Record<string, SimpleQueryConfig> = {
 						avgIf(wv.metric_value, wv.metric_name = 'TTFB' AND wv.metric_value > 0) as avg_ttfb,
 						COUNT(*) as measurements
 					FROM ${Analytics.web_vitals_spans} wv
-					LEFT JOIN ${Analytics.events} e ON (
+					INNER JOIN ${Analytics.events} e ON (
 						wv.session_id = e.session_id 
 						AND wv.client_id = e.client_id
 						AND abs(dateDiff('second', wv.timestamp, e.time)) < 60
+						AND e.browser_name != ''
 					)
 					WHERE 
 						wv.client_id = {websiteId:String}
 						AND wv.timestamp >= toDateTime({startDate:String})
 						AND wv.timestamp <= toDateTime(concat({endDate:String}, ' 23:59:59'))
-						AND e.browser_name != ''
 					GROUP BY e.browser_name
 					ORDER BY p50_lcp DESC
 					LIMIT {limit:UInt32}
@@ -341,7 +341,7 @@ export const PerformanceBuilders: Record<string, SimpleQueryConfig> = {
 			return {
 				sql: `
 					SELECT 
-						CONCAT(any(e.region), ', ', any(e.country)) as name,
+						CONCAT(e.region, ', ', e.country) as name,
 						COUNT(DISTINCT wv.anonymous_id) as visitors,
 						avgIf(wv.metric_value, wv.metric_name = 'FCP' AND wv.metric_value > 0) as avg_fcp,
 						quantileIf(0.50)(wv.metric_value, wv.metric_name = 'FCP' AND wv.metric_value > 0) as p50_fcp,
@@ -353,16 +353,16 @@ export const PerformanceBuilders: Record<string, SimpleQueryConfig> = {
 						avgIf(wv.metric_value, wv.metric_name = 'TTFB' AND wv.metric_value > 0) as avg_ttfb,
 						COUNT(*) as measurements
 					FROM ${Analytics.web_vitals_spans} wv
-					LEFT JOIN ${Analytics.events} e ON (
+					INNER JOIN ${Analytics.events} e ON (
 						wv.session_id = e.session_id 
 						AND wv.client_id = e.client_id
 						AND abs(dateDiff('second', wv.timestamp, e.time)) < 60
+						AND e.region != ''
 					)
 					WHERE 
 						wv.client_id = {websiteId:String}
 						AND wv.timestamp >= toDateTime({startDate:String})
 						AND wv.timestamp <= toDateTime(concat({endDate:String}, ' 23:59:59'))
-						AND e.region != ''
 					GROUP BY e.region, e.country
 					ORDER BY p50_lcp DESC
 					LIMIT {limit:UInt32}

apps/api/src/query/simple-builder.ts

@@ -59,7 +59,7 @@ const DANGEROUS_SQL_KEYWORDS = [
 const SQL_EXPRESSIONS = {
 	normalizedPath: Expressions.path.normalized as string,
 	normalizedReferrer: Expressions.referrer.normalized as string,
-	queryString: "queryString(path)" as string,
+	queryString: "queryString(url)" as string,
 } as const;
 
 const REFERRER_MAPPINGS: Record<string, string> = {

apps/api/src/query/types.ts

@@ -10,6 +10,9 @@ import type {
 // Filter Operators
 // ============================================================================
 
+// Note: Both `contains` and `starts_with` use the LIKE operator.
+// The distinction is handled by value formatting: `contains` wraps values with %...%,
+// while `starts_with` appends % to the value (e.g., "value%").
 export const FilterOperators = {
 	eq: "=",
 	ne: "!=",

apps/api/src/types/tables.ts

@@ -3,6 +3,7 @@ import type {
 	BlockedTraffic,
 	CustomEventSpan,
 	CustomEventsHourlyAggregate,
+	CustomOutgoingLink,
 	ErrorHourlyAggregate,
 	ErrorSpanRow,
 	WebVitalsHourlyAggregate,
@@ -32,4 +33,5 @@ export type TableFieldsMap = {
 	"analytics.custom_event_spans": keyof CustomEventSpan;
 	"analytics.custom_events_hourly": keyof CustomEventsHourlyAggregate;
 	"analytics.blocked_traffic": keyof BlockedTraffic;
+	"analytics.outgoing_links": keyof CustomOutgoingLink;
 };

apps/dashboard/app/(auth)/layout.tsx

@@ -32,7 +32,7 @@ export default async function AuthLayout({
 				</div>
 				<Link className="relative z-10" href="https://www.databuddy.cc">
 					<Button
-						className="px-0! text-white/50 hover:bg-transparent hover:text-white/80"
+						className="group px-0! text-white/50 hover:bg-transparent hover:text-white/80"
 						variant="ghost"
 					>
 						<CaretLeftIcon className="size-4 transition-transform duration-200 group-hover:translate-x-[-4px]" />

apps/dashboard/app/(auth)/login/page.tsx

@@ -154,20 +154,19 @@ function LoginPage() {
 									</Badge>
 								)}
 							</Button>
-							<Link
-								className="relative lg:col-span-2"
-								href="/login/magic"
-								passHref
-							>
+							<div className="relative lg:col-span-2">
 								<Button
+									asChild
 									className="w-full"
 									disabled={isLoading}
 									size="lg"
 									type="button"
 									variant="secondary"
 								>
-									<SparkleIcon className="size-4" />
-									Sign in with Magic Link
+									<Link href="/login/magic">
+										<SparkleIcon className="size-4" />
+										Sign in with Magic Link
+									</Link>
 								</Button>
 								{lastUsed === "magic" && (
 									<Badge
@@ -177,7 +176,7 @@ function LoginPage() {
 										Last used
 									</Badge>
 								)}
-							</Link>
+							</div>
 						</div>
 						<div className="relative flex w-full items-center justify-center gap-3">
 							<Separator className="flex-1 opacity-70" />
@@ -263,7 +262,7 @@ function LoginPage() {
 				</div>
 			</div>
 			<div className="mt-5 flex flex-col flex-wrap items-center justify-center gap-4 px-5 text-center lg:flex-row">
-				<p className="flex-1 text-nowrap text-[13px] text-muted-foreground">
+				<p className="flex-1 text-[13px] text-muted-foreground lg:text-nowrap">
 					Don&apos;t have an account?{" "}
 					<Link
 						className="font-medium text-accent-foreground transition-colors duration-200 hover:text-accent-foreground/80"

apps/dashboard/app/(main)/billing/components/usage-row.tsx

@@ -79,7 +79,7 @@ export const UsageRow = memo(function UsageRowComponent({
 							<span className="font-medium">{feature.name}</span>
 							{feature.hasExtraCredits && (
 								<Badge variant="secondary">
-									<GiftIcon size={10} weight="fill" />
+									<GiftIcon className="mr-1" size={10} weight="fill" />
 									Bonus
 								</Badge>
 							)}

apps/dashboard/app/(main)/billing/cost-breakdown/components/usage-breakdown-table.tsx

@@ -130,7 +130,7 @@ export function UsageBreakdownTable({
 
 					return (
 						<div
-							className="group flex items-center gap-4 border-border border-b px-4 py-3 transition-colors hover:bg-accent/50 sm:px-6 sm:py-4"
+							className="group flex items-center gap-4 px-4 py-3 transition-colors hover:bg-accent/50 sm:px-6 sm:py-4"
 							key={item.event_category}
 						>
 							<div className="flex size-10 shrink-0 items-center justify-center rounded border border-accent-foreground/10 bg-secondary">

apps/dashboard/app/(main)/organizations/settings/danger/transfer-assets.tsx

@@ -224,7 +224,7 @@ export function TransferAssets({ organizationId }: TransferAssetsProps) {
 						({organizationWebsites.length})
 					</span>
 				</div>
-				<div className="flex-1 space-y-1 overflow-y-auto">
+				<div className="flex-1 space-y-2 overflow-y-auto">
 					{organizationWebsites.length > 0 ? (
 						organizationWebsites.map((website) => (
 							<WebsiteItem