cleanup order of items

Author: izadoesdev

apps/dashboard/app/(main)/websites/[id]/_components/tabs/overview-tab.tsx

@@ -416,15 +416,15 @@ export function WebsiteOverviewTab({
 					...(visibleMetrics.pageviews && {
 						pageviews: event.pageviews as number,
 					}),
+					...(visibleMetrics.sessions && {
+						sessions: event.sessions as number,
+					}),
 					...(visibleMetrics.visitors && {
 						visitors:
 							(event.visitors as number) ||
 							(event.unique_visitors as number) ||
 							0,
 					}),
-					...(visibleMetrics.sessions && {
-						sessions: event.sessions as number,
-					}),
 					...(visibleMetrics.bounce_rate && {
 						bounce_rate: event.bounce_rate as number,
 					}),
@@ -488,7 +488,7 @@ export function WebsiteOverviewTab({
 
 	const formatNumber = useCallback(
 		(value: number | null | undefined): string => {
-			if (value == null || Number.isNaN(value)) {
+			if (value === null || value === undefined || Number.isNaN(value)) {
 				return "0";
 			}
 			return Intl.NumberFormat(undefined, {
@@ -808,15 +808,6 @@ export function WebsiteOverviewTab({
 						chartData: miniChartData.pageviews,
 						trend: calculateTrends.pageviews,
 					},
-					{
-						id: "visitors-chart",
-						title: "Visitors",
-						value: analytics.summary?.unique_visitors || 0,
-						description: `${formatNumber(todayVisitors)} today`,
-						icon: UsersIcon,
-						chartData: miniChartData.visitors,
-						trend: calculateTrends.visitors,
-					},
 					{
 						id: "sessions-chart",
 						title: "Sessions",
@@ -826,6 +817,15 @@ export function WebsiteOverviewTab({
 						chartData: miniChartData.sessions,
 						trend: calculateTrends.sessions,
 					},
+					{
+						id: "visitors-chart",
+						title: "Visitors",
+						value: analytics.summary?.unique_visitors || 0,
+						description: `${formatNumber(todayVisitors)} today`,
+						icon: UsersIcon,
+						chartData: miniChartData.visitors,
+						trend: calculateTrends.visitors,
+					},
 					{
 						id: "bounce-rate-chart",
 						title: "Bounce Rate",

apps/dashboard/components/charts/metrics-chart-with-annotations.tsx

@@ -86,7 +86,7 @@ export function MetricsChartWithAnnotations({
 				end_date: dateRange.endDate.toISOString(),
 				granularity: "daily",
 			},
-			metrics: ["pageviews", "visitors", "sessions"],
+			metrics: ["pageviews", "sessions", "visitors"],
 		};
 	}, [dateRange, data]);
 

apps/dashboard/components/charts/metrics-chart.tsx

@@ -307,8 +307,8 @@ type MetricsChartProps = {
 
 const DEFAULT_METRICS = [
 	"pageviews",
-	"visitors",
 	"sessions",
+	"visitors",
 	"bounce_rate",
 	"median_session_duration",
 ];

apps/dashboard/components/charts/metrics-constants.ts

@@ -185,7 +185,7 @@ export const formatPerformanceTime = (value: number): string => {
 };
 
 export const formatCLS = (value: number): string => {
-	if (value == null || Number.isNaN(value)) {
+	if (value === null || value === undefined || Number.isNaN(value)) {
 		return "N/A";
 	}
 	return value.toFixed(3);
@@ -213,10 +213,10 @@ export const ANALYTICS_METRICS: MetricConfig[] = [
 	createMetric("pageviews", "Pageviews", "pageviews", Eye, (value) =>
 		value.toLocaleString()
 	),
-	createMetric("visitors", "Visitors", "visitors", Users, (value) =>
+	createMetric("sessions", "Sessions", "sessions", TrendingUp, (value) =>
 		value.toLocaleString()
 	),
-	createMetric("sessions", "Sessions", "sessions", TrendingUp, (value) =>
+	createMetric("visitors", "Visitors", "visitors", Users, (value) =>
 		value.toLocaleString()
 	),
 	createMetric(