Skip to content

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

add formatting (#586)

Bill Yang95c91b3b6802
diff --git a/.prettierignore b/.prettierignore
index 83da85ba9..f07851ec5 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1,3 +1,71 @@
-# So minified script is not formatted
+# Dependencies
+node_modules/
+.pnp/
+.yarn/
+
+# Build outputs
+dist/
+build/
+.next/
+out/
+
+# Environment variables
+.env
+.env.*
+
+# Logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Testing
+coverage/
+.nyc_output/
+
+# Cache
+.cache/
+.turbo/
+.parcel-cache/
+
+# Version control
+.git/
+
+# IDE
+.idea/
+.vscode/*
+!.vscode/settings.json
+!.vscode/extensions.json
+*.swp
+*.swo
+
+# OS
+.DS_Store
+Thumbs.db
+
+# Package files
+package-lock.json
+yarn.lock
+pnpm-lock.yaml
+
+# Minified files
+*.min.js
+*.min.css
**/script.js
+
+# Documentation
**/*.mdx
+
+# Generated files
+*.generated.*
+tsconfig.tsbuildinfo
+
+# Database
+*.db
+*.sqlite
+
+# Binaries
+*.exe
+*.dll
+*.so
+*.dylib
diff --git a/.prettierrc b/.prettierrc
index acbeeec27..27fe4ae5f 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,4 +1,16 @@
{
"printWidth": 120,
- "tabWidth": 2
+ "tabWidth": 2,
+ "useTabs": false,
+ "semi": true,
+ "singleQuote": false,
+ "quoteProps": "as-needed",
+ "jsxSingleQuote": false,
+ "trailingComma": "es5",
+ "bracketSpacing": true,
+ "bracketSameLine": false,
+ "arrowParens": "avoid",
+ "endOfLine": "lf",
+ "singleAttributePerLine": false,
+ "proseWrap": "preserve"
}
diff --git a/client/package-lock.json b/client/package-lock.json
index fc19a03a3..44477a372 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "client",
- "version": "1.5.1",
+ "version": "1.6.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "client",
- "version": "1.5.1",
+ "version": "1.6.1",
"dependencies": {
"@hookform/resolvers": "5.0.1",
"@icons-pack/react-simple-icons": "^13.6.0",
@@ -86,6 +86,7 @@
"@types/node": "^20.14.8",
"@types/react": "19",
"knip": "^5.60.2",
+ "prettier": "^3.6.2",
"tailwindcss": "3.4.1",
"typescript": "^5.8.3"
}
@@ -9334,6 +9335,22 @@
"url": "https://opencollective.com/preact"
}
},
+ "node_modules/prettier": {
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+ "dev": true,
+ "license": "MIT",
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
"node_modules/prop-types": {
"version": "15.8.1",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
diff --git a/client/package.json b/client/package.json
index ae9a78720..66fa153e9 100644
--- a/client/package.json
+++ b/client/package.json
@@ -7,7 +7,9 @@
"build": "next build",
"start": "next start -p 3002",
"lint": "next lint",
- "knip": "knip"
+ "knip": "knip",
+ "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\"",
+ "format:check": "prettier --check \"src/**/*.{js,jsx,ts,tsx,json,css,scss,md}\""
},
"dependencies": {
"@hookform/resolvers": "5.0.1",
@@ -88,6 +90,7 @@
"@types/node": "^20.14.8",
"@types/react": "19",
"knip": "^5.60.2",
+ "prettier": "^3.6.2",
"tailwindcss": "3.4.1",
"typescript": "^5.8.3"
}
diff --git a/client/src/api/admin/excludedIPs.ts b/client/src/api/admin/excludedIPs.ts
index 530b10a0e..3bb1f1108 100644
--- a/client/src/api/admin/excludedIPs.ts
+++ b/client/src/api/admin/excludedIPs.ts
@@ -28,17 +28,13 @@ export const fetchExcludedIPs = async (siteId: string): Promise<ExcludedIPsRespo
// Update excluded IPs for a site
export const updateExcludedIPs = async (siteId: number, excludedIPs: string[]): Promise<UpdateExcludedIPsResponse> => {
- return await authedFetch<UpdateExcludedIPsResponse>(
- `/site/${siteId}/excluded-ips`,
- undefined,
- {
- method: "POST",
- data: {
- siteId: siteId.toString(),
- excludedIPs,
- },
- }
- );
+ return await authedFetch<UpdateExcludedIPsResponse>(`/site/${siteId}/excluded-ips`, undefined, {
+ method: "POST",
+ data: {
+ siteId: siteId.toString(),
+ excludedIPs,
+ },
+ });
};
// Hook to fetch excluded IPs
diff --git a/client/src/api/admin/sites.ts b/client/src/api/admin/sites.ts
index 229f25337..98cf3eeae 100644
--- a/client/src/api/admin/sites.ts
+++ b/client/src/api/admin/sites.ts
@@ -145,9 +145,7 @@ export function useSiteHasData(siteId: string) {
if (!siteId) {
return Promise.resolve(false);
}
- return authedFetch<{ hasData: boolean }>(`/site-has-data/${siteId}`).then(
- (data) => data.hasData
- );
+ return authedFetch<{ hasData: boolean }>(`/site-has-data/${siteId}`).then(data => data.hasData);
},
refetchInterval: 5000,
staleTime: Infinity,
@@ -210,9 +208,7 @@ export function useGetSiteIsPublic(siteId?: string | number) {
}
try {
- const data = await authedFetch<{ isPublic: boolean }>(
- `/site-is-public/${siteId}`
- );
+ const data = await authedFetch<{ isPublic: boolean }>(`/site-is-public/${siteId}`);
return !!data.isPublic;
} catch (error) {
console.error("Error checking if site is public:", error);
@@ -230,9 +226,7 @@ export const useCurrentSite = () => {
const pathname = usePathname();
return {
- site: sites?.sites.find(
- (site) => site.siteId === Number(pathname.split("/")[1])
- ),
+ site: sites?.sites.find(site => site.siteId === Number(pathname.split("/")[1])),
subscription: sites?.subscription,
};
};
diff --git a/client/src/api/analytics/errors/useGetErrorBucketed.ts b/client/src/api/analytics/errors/useGetErrorBucketed.ts
index f5a2185f1..1cc58d23c 100644
--- a/client/src/api/analytics/errors/useGetErrorBucketed.ts
+++ b/client/src/api/analytics/errors/useGetErrorBucketed.ts
@@ -29,11 +29,9 @@ export function useGetErrorBucketed({
return useQuery({
queryKey: ["error-bucketed", time, site, filters, bucket, errorMessage],
queryFn: () => {
- return authedFetch<any>(`/error-bucketed/${site}`, queryParams).then(
- (res) => {
- return res.data;
- }
- );
+ return authedFetch<any>(`/error-bucketed/${site}`, queryParams).then(res => {
+ return res.data;
+ });
},
enabled: enabled && !!errorMessage && !!site,
staleTime: Infinity,
diff --git a/client/src/api/analytics/errors/useGetErrorEvents.ts b/client/src/api/analytics/errors/useGetErrorEvents.ts
index c51a72956..ef8746f63 100644
--- a/client/src/api/analytics/errors/useGetErrorEvents.ts
+++ b/client/src/api/analytics/errors/useGetErrorEvents.ts
@@ -46,10 +46,7 @@ type UseGetErrorEventsOptions = {
};
// Hook for infinite scrolling
-export function useGetErrorEventsInfinite(
- errorMessage: string,
- enabled: boolean = true
-) {
+export function useGetErrorEventsInfinite(errorMessage: string, enabled: boolean = true) {
const { time, site, filters } = useStore();
return useInfiniteQuery({
@@ -63,16 +60,10 @@ export function useGetErrorEventsInfinite(
filters,
};
- return authedFetch<APIResponse<ErrorEventsPaginatedResponse>>(
- `/error-events/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<ErrorEventsPaginatedResponse>>(`/error-events/${site}`, queryParams);
},
initialPageParam: 1,
- getNextPageParam: (
- lastPage: APIResponse<ErrorEventsPaginatedResponse>,
- allPages
- ) => {
+ getNextPageParam: (lastPage: APIResponse<ErrorEventsPaginatedResponse>, allPages) => {
const currentPage = allPages.length;
const totalItems = lastPage.data?.totalCount || 0;
const itemsPerPage = 20;
@@ -84,4 +75,3 @@ export function useGetErrorEventsInfinite(
staleTime: Infinity,
});
}
-
diff --git a/client/src/api/analytics/errors/useGetErrorNames.ts b/client/src/api/analytics/errors/useGetErrorNames.ts
index 7ae0e8643..cafadeb51 100644
--- a/client/src/api/analytics/errors/useGetErrorNames.ts
+++ b/client/src/api/analytics/errors/useGetErrorNames.ts
@@ -32,9 +32,7 @@ export function useGetErrorNamesPaginated({
limit = 10,
page = 1,
useFilters = true,
-}: UseGetErrorNamesOptions): UseQueryResult<
- APIResponse<ErrorNamesPaginatedResponse>
-> {
+}: UseGetErrorNamesOptions): UseQueryResult<APIResponse<ErrorNamesPaginatedResponse>> {
const { time, site, filters } = useStore();
const queryParams = {
@@ -47,10 +45,7 @@ export function useGetErrorNamesPaginated({
return useQuery({
queryKey: ["error-names", time, site, filters, limit, page],
queryFn: () => {
- return authedFetch<APIResponse<ErrorNamesPaginatedResponse>>(
- `/error-names/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<ErrorNamesPaginatedResponse>>(`/error-names/${site}`, queryParams);
},
staleTime: Infinity,
});
@@ -60,9 +55,7 @@ export function useGetErrorNamesPaginated({
export function useGetErrorNames({
limit = 10,
useFilters = true,
-}: Omit<UseGetErrorNamesOptions, "page">): UseQueryResult<
- APIResponse<ErrorNamesStandardResponse>
-> {
+}: Omit<UseGetErrorNamesOptions, "page">): UseQueryResult<APIResponse<ErrorNamesStandardResponse>> {
const { time, site, filters } = useStore();
const queryParams = {
@@ -74,10 +67,7 @@ export function useGetErrorNames({
return useQuery({
queryKey: ["error-names", time, site, filters, limit],
queryFn: () => {
- return authedFetch<APIResponse<ErrorNamesStandardResponse>>(
- `/error-names/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<ErrorNamesStandardResponse>>(`/error-names/${site}`, queryParams);
},
staleTime: Infinity,
});
diff --git a/client/src/api/analytics/events/useGetEventNames.ts b/client/src/api/analytics/events/useGetEventNames.ts
index 97249116b..56df0f16e 100644
--- a/client/src/api/analytics/events/useGetEventNames.ts
+++ b/client/src/api/analytics/events/useGetEventNames.ts
@@ -1,9 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import {
- useStore,
- getFilteredFilters,
- EVENT_FILTERS,
-} from "../../../lib/store";
+import { useStore, getFilteredFilters, EVENT_FILTERS } from "../../../lib/store";
import { authedFetch, getQueryParams } from "../../utils";
export type EventName = {
@@ -26,10 +22,7 @@ export function useGetEventNames() {
filters: filteredFilters.length > 0 ? filteredFilters : undefined,
};
- return authedFetch<{ data: EventName[] }>(
- `/events/names/${site}`,
- params
- ).then((res) => res.data);
+ return authedFetch<{ data: EventName[] }>(`/events/names/${site}`, params).then(res => res.data);
},
});
}
diff --git a/client/src/api/analytics/events/useGetEventProperties.ts b/client/src/api/analytics/events/useGetEventProperties.ts
index 214ba28cd..7de042efa 100644
--- a/client/src/api/analytics/events/useGetEventProperties.ts
+++ b/client/src/api/analytics/events/useGetEventProperties.ts
@@ -1,9 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import {
- useStore,
- getFilteredFilters,
- EVENT_FILTERS,
-} from "../../../lib/store";
+import { useStore, getFilteredFilters, EVENT_FILTERS } from "../../../lib/store";
import { authedFetch, getQueryParams } from "../../utils";
export type EventProperty = {
@@ -19,13 +15,7 @@ export function useGetEventProperties(eventName: string | null) {
const filteredFilters = getFilteredFilters(EVENT_FILTERS);
return useQuery({
- queryKey: [
- "event-properties",
- site,
- eventName,
- timeParams,
- filteredFilters,
- ],
+ queryKey: ["event-properties", site, eventName, timeParams, filteredFilters],
enabled: !!site && !!eventName,
queryFn: () => {
const params = {
@@ -34,10 +24,7 @@ export function useGetEventProperties(eventName: string | null) {
filters: filteredFilters.length > 0 ? filteredFilters : undefined,
};
- return authedFetch<{ data: EventProperty[] }>(
- `/events/properties/${site}`,
- params
- ).then((res) => res.data);
+ return authedFetch<{ data: EventProperty[] }>(`/events/properties/${site}`, params).then(res => res.data);
},
});
}
diff --git a/client/src/api/analytics/events/useGetEvents.ts b/client/src/api/analytics/events/useGetEvents.ts
index 157aa87f7..12a7a540c 100644
--- a/client/src/api/analytics/events/useGetEvents.ts
+++ b/client/src/api/analytics/events/useGetEvents.ts
@@ -47,29 +47,18 @@ export function useGetEvents(count = 10) {
queryFn: () =>
authedFetch<{ data: Event[] }>(`/events/${site}`, {
count,
- }).then((res) => res.data),
+ }).then(res => res.data),
});
}
// New hook with pagination and filtering support
export function useGetEventsInfinite(options: GetEventsOptions = {}) {
const { site, time, filters } = useStore();
- const { startDate, endDate } = options.time
- ? getStartAndEndDate(options.time)
- : getStartAndEndDate(time);
+ const { startDate, endDate } = options.time ? getStartAndEndDate(options.time) : getStartAndEndDate(time);
const pageSize = options.pageSize || 20;
return useInfiniteQuery<EventsResponse, Error>({
- queryKey: [
- "events-infinite",
- site,
- startDate,
- endDate,
- timeZone,
- filters,
- pageSize,
- options.isRealtime,
- ],
+ queryKey: ["events-infinite", site, startDate, endDate, timeZone, filters, pageSize, options.isRealtime],
initialPageParam: 1,
queryFn: async ({ pageParam }) => {
const params: Record<string, any> = {
@@ -90,10 +79,7 @@ export function useGetEventsInfinite(options: GetEventsOptions = {}) {
params.count = options.count;
}
- const response = await authedFetch<EventsResponse>(
- `/events/${site}`,
- params
- );
+ const response = await authedFetch<EventsResponse>(`/events/${site}`, params);
return response;
},
getNextPageParam: (lastPage: EventsResponse) => {
diff --git a/client/src/api/analytics/events/useGetOutboundLinks.ts b/client/src/api/analytics/events/useGetOutboundLinks.ts
index 4a7221014..ee336ceb8 100644
--- a/client/src/api/analytics/events/useGetOutboundLinks.ts
+++ b/client/src/api/analytics/events/useGetOutboundLinks.ts
@@ -1,9 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import {
- useStore,
- getFilteredFilters,
- EVENT_FILTERS,
-} from "../../../lib/store";
+import { useStore, getFilteredFilters, EVENT_FILTERS } from "../../../lib/store";
import { authedFetch, getQueryParams } from "../../utils";
export type OutboundLink = {
@@ -27,10 +23,7 @@ export function useGetOutboundLinks() {
filters: filteredFilters.length > 0 ? filteredFilters : undefined,
};
- return authedFetch<{ data: OutboundLink[] }>(
- `/events/outbound/${site}`,
- params
- ).then((res) => res.data);
+ return authedFetch<{ data: OutboundLink[] }>(`/events/outbound/${site}`, params).then(res => res.data);
},
});
-}
\ No newline at end of file
+}
diff --git a/client/src/api/analytics/funnels/useDeleteFunnel.ts b/client/src/api/analytics/funnels/useDeleteFunnel.ts
index 3ed884d04..b1fa34f97 100644
--- a/client/src/api/analytics/funnels/useDeleteFunnel.ts
+++ b/client/src/api/analytics/funnels/useDeleteFunnel.ts
@@ -8,15 +8,11 @@ export function useDeleteFunnel() {
const queryClient = useQueryClient();
return useMutation<{ success: boolean }, Error, number>({
- mutationFn: async (reportId) => {
+ mutationFn: async reportId => {
try {
- return await authedFetch<{ success: boolean }>(
- `/funnel/${reportId}`,
- undefined,
- {
- method: "DELETE",
- }
- );
+ return await authedFetch<{ success: boolean }>(`/funnel/${reportId}`, undefined, {
+ method: "DELETE",
+ });
} catch (error) {
console.error(error);
throw new Error("Failed to delete funnel");
diff --git a/client/src/api/analytics/funnels/useGetFunnel.ts b/client/src/api/analytics/funnels/useGetFunnel.ts
index 560cb7364..39321b034 100644
--- a/client/src/api/analytics/funnels/useGetFunnel.ts
+++ b/client/src/api/analytics/funnels/useGetFunnel.ts
@@ -56,7 +56,7 @@ export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
configToUse?.startDate,
configToUse?.endDate,
configToUse?.filters,
- configToUse?.steps.map((s) => s.value + s.type),
+ configToUse?.steps.map(s => s.value + s.type),
],
queryFn: async () => {
if (!configToUse) {
@@ -69,14 +69,10 @@ export function useGetFunnel(config?: FunnelRequest, debounce?: boolean) {
timeZone,
};
try {
- const response = await authedFetch<{ data: FunnelResponse[] }>(
- `/funnel/${site}`,
- undefined,
- {
- method: "POST",
- data: fullConfig,
- }
- );
+ const response = await authedFetch<{ data: FunnelResponse[] }>(`/funnel/${site}`, undefined, {
+ method: "POST",
+ data: fullConfig,
+ });
return response.data;
} catch (error) {
@@ -94,12 +90,8 @@ export function useSaveFunnel() {
const { site } = useStore();
const queryClient = useQueryClient();
- return useMutation<
- { success: boolean; funnelId: number },
- Error,
- SaveFunnelRequest
- >({
- mutationFn: async (funnelConfig) => {
+ return useMutation<{ success: boolean; funnelId: number }, Error, SaveFunnelRequest>({
+ mutationFn: async funnelConfig => {
// Add time zone to the request
const fullConfig = {
...funnelConfig,
diff --git a/client/src/api/analytics/funnels/useGetFunnels.ts b/client/src/api/analytics/funnels/useGetFunnels.ts
index 26dd18e29..c861879cb 100644
--- a/client/src/api/analytics/funnels/useGetFunnels.ts
+++ b/client/src/api/analytics/funnels/useGetFunnels.ts
@@ -22,9 +22,7 @@ export function useGetFunnels(siteId?: string | number) {
return [];
}
try {
- const response = await authedFetch<{ data: SavedFunnel[] }>(
- `/funnels/${siteId}`
- );
+ const response = await authedFetch<{ data: SavedFunnel[] }>(`/funnels/${siteId}`);
return response.data;
} catch (error) {
throw new Error("Failed to fetch funnels");
diff --git a/client/src/api/analytics/goals/useCreateGoal.ts b/client/src/api/analytics/goals/useCreateGoal.ts
index 82b92c27f..c7b3735e0 100644
--- a/client/src/api/analytics/goals/useCreateGoal.ts
+++ b/client/src/api/analytics/goals/useCreateGoal.ts
@@ -22,20 +22,14 @@ export function useCreateGoal() {
const queryClient = useQueryClient();
return useMutation<CreateGoalResponse, Error, CreateGoalRequest>({
- mutationFn: async (goalData) => {
+ mutationFn: async goalData => {
try {
- return await authedFetch<CreateGoalResponse>(
- "/goal/create",
- undefined,
- {
- method: "POST",
- data: goalData,
- }
- );
+ return await authedFetch<CreateGoalResponse>("/goal/create", undefined, {
+ method: "POST",
+ data: goalData,
+ });
} catch (error) {
- throw new Error(
- error instanceof Error ? error.message : "Failed to create goal"
- );
+ throw new Error(error instanceof Error ? error.message : "Failed to create goal");
}
},
onSuccess: (_, variables) => {
diff --git a/client/src/api/analytics/goals/useDeleteGoal.ts b/client/src/api/analytics/goals/useDeleteGoal.ts
index cab7bd2d8..d18695dc2 100644
--- a/client/src/api/analytics/goals/useDeleteGoal.ts
+++ b/client/src/api/analytics/goals/useDeleteGoal.ts
@@ -9,17 +9,11 @@ export function useDeleteGoal() {
return useMutation<{ success: boolean }, Error, number>({
mutationFn: async (goalId: number) => {
try {
- return await authedFetch<{ success: boolean }>(
- `/goal/${goalId}`,
- undefined,
- {
- method: "DELETE",
- }
- );
+ return await authedFetch<{ success: boolean }>(`/goal/${goalId}`, undefined, {
+ method: "DELETE",
+ });
} catch (error) {
- throw new Error(
- error instanceof Error ? error.message : "Failed to delete goal"
- );
+ throw new Error(error instanceof Error ? error.message : "Failed to delete goal");
}
},
onSuccess: () => {
diff --git a/client/src/api/analytics/goals/useGetGoals.ts b/client/src/api/analytics/goals/useGetGoals.ts
index 2cd4d9e02..94b3c3615 100644
--- a/client/src/api/analytics/goals/useGetGoals.ts
+++ b/client/src/api/analytics/goals/useGetGoals.ts
@@ -1,9 +1,5 @@
import { useQuery } from "@tanstack/react-query";
-import {
- getFilteredFilters,
- GOALS_PAGE_FILTERS,
- useStore,
-} from "../../../lib/store";
+import { getFilteredFilters, GOALS_PAGE_FILTERS, useStore } from "../../../lib/store";
import { authedFetch, getQueryParams } from "../../utils";
export interface Goal {
@@ -53,16 +49,7 @@ export function useGetGoals({
const timeParams = getQueryParams(time);
return useQuery({
- queryKey: [
- "goals",
- site,
- timeParams,
- filteredFilters,
- page,
- pageSize,
- sort,
- order,
- ],
+ queryKey: ["goals", site, timeParams, filteredFilters, page, pageSize, sort, order],
queryFn: async () => {
return authedFetch<GoalsResponse>(`/goals/${site}`, {
...timeParams,
diff --git a/client/src/api/analytics/goals/useUpdateGoal.ts b/client/src/api/analytics/goals/useUpdateGoal.ts
index 6945bba9f..4e6a34123 100644
--- a/client/src/api/analytics/goals/useUpdateGoal.ts
+++ b/client/src/api/analytics/goals/useUpdateGoal.ts
@@ -25,20 +25,14 @@ export function useUpdateGoal() {
const { site } = useStore();
return useMutation<UpdateGoalResponse, Error, UpdateGoalRequest>({
- mutationFn: async (goalData) => {
+ mutationFn: async goalData => {
try {
- return await authedFetch<UpdateGoalResponse>(
- "/goal/update",
- undefined,
- {
- method: "PUT",
- data: goalData,
- }
- );
+ return await authedFetch<UpdateGoalResponse>("/goal/update", undefined, {
+ method: "PUT",
+ data: goalData,
+ });
} catch (error) {
- throw new Error(
- error instanceof Error ? error.message : "Failed to update goal"
- );
+ throw new Error(error instanceof Error ? error.message : "Failed to update goal");
}
},
onSuccess: () => {
diff --git a/client/src/api/analytics/performance/useGetPerformanceByDimension.ts b/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
index 4f5f2a208..4fd4633e1 100644
--- a/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
+++ b/client/src/api/analytics/performance/useGetPerformanceByDimension.ts
@@ -96,10 +96,7 @@ export function useGetPerformanceByDimension({
sortOrder,
],
queryFn: async () => {
- const response = await authedFetch<{ data: any }>(
- `/performance/by-dimension/${site}`,
- queryParams
- );
+ const response = await authedFetch<{ data: any }>(`/performance/by-dimension/${site}`, queryParams);
return response.data;
},
staleTime: Infinity,
diff --git a/client/src/api/analytics/performance/useGetPerformanceOverview.ts b/client/src/api/analytics/performance/useGetPerformanceOverview.ts
index 493ed9049..df1550be6 100644
--- a/client/src/api/analytics/performance/useGetPerformanceOverview.ts
+++ b/client/src/api/analytics/performance/useGetPerformanceOverview.ts
@@ -22,13 +22,7 @@ export type GetPerformanceOverviewResponse = {
type PeriodTime = "current" | "previous";
-export function useGetPerformanceOverview({
- periodTime,
- site,
-}: {
- periodTime?: PeriodTime;
- site?: number | string;
-}) {
+export function useGetPerformanceOverview({ periodTime, site }: { periodTime?: PeriodTime; site?: number | string }) {
const { time, previousTime, filters } = useStore();
const { selectedPercentile } = usePerformanceStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
@@ -39,18 +33,9 @@ export function useGetPerformanceOverview({
});
return useQuery({
- queryKey: [
- "performance-overview",
- timeToUse,
- site,
- filters,
- selectedPercentile,
- ],
+ queryKey: ["performance-overview", timeToUse, site, filters, selectedPercentile],
queryFn: () => {
- return authedFetch<{ data: GetPerformanceOverviewResponse }>(
- `/performance/overview/${site}`,
- queryParams
- );
+ return authedFetch<{ data: GetPerformanceOverviewResponse }>(`/performance/overview/${site}`, queryParams);
},
staleTime: Infinity,
placeholderData: (_, query: any) => {
diff --git a/client/src/api/analytics/performance/useGetPerformanceTimeSeries.ts b/client/src/api/analytics/performance/useGetPerformanceTimeSeries.ts
index d334be9e1..59d3753fa 100644
--- a/client/src/api/analytics/performance/useGetPerformanceTimeSeries.ts
+++ b/client/src/api/analytics/performance/useGetPerformanceTimeSeries.ts
@@ -1,9 +1,5 @@
import { Filter, TimeBucket } from "@rybbit/shared";
-import {
- UseQueryOptions,
- UseQueryResult,
- useQuery,
-} from "@tanstack/react-query";
+import { UseQueryOptions, UseQueryResult, useQuery } from "@tanstack/react-query";
import { usePerformanceStore } from "../../../app/[site]/performance/performanceStore";
import { useStore } from "../../../lib/store";
import { APIResponse } from "../../types";
@@ -47,16 +43,9 @@ export function useGetPerformanceTimeSeries({
site: number | string;
bucket?: TimeBucket;
dynamicFilters?: Filter[];
- props?: Partial<
- UseQueryOptions<APIResponse<GetPerformanceTimeSeriesResponse>>
- >;
+ props?: Partial<UseQueryOptions<APIResponse<GetPerformanceTimeSeriesResponse>>>;
}): UseQueryResult<APIResponse<GetPerformanceTimeSeriesResponse>> {
- const {
- time,
- previousTime,
- filters: globalFilters,
- bucket: storeBucket,
- } = useStore();
+ const { time, previousTime, filters: globalFilters, bucket: storeBucket } = useStore();
const { selectedPerformanceMetric } = usePerformanceStore();
const timeToUse = periodTime === "previous" ? previousTime : time;
@@ -69,14 +58,7 @@ export function useGetPerformanceTimeSeries({
});
return useQuery({
- queryKey: [
- "performance-time-series",
- timeToUse,
- bucketToUse,
- site,
- combinedFilters,
- selectedPerformanceMetric,
- ],
+ queryKey: ["performance-time-series", timeToUse, bucketToUse, site, combinedFilters, selectedPerformanceMetric],
queryFn: () => {
return authedFetch<APIResponse<GetPerformanceTimeSeriesResponse>>(
`/performance/time-series/${site}`,
@@ -85,14 +67,7 @@ export function useGetPerformanceTimeSeries({
},
placeholderData: (_, query: any) => {
if (!query?.queryKey) return undefined;
- const [, , , prevSite] = query.queryKey as [
- string,
- any,
- TimeBucket,
- string | number,
- Filter[],
- string
- ];
+ const [, , , prevSite] = query.queryKey as [string, any, TimeBucket, string | number, Filter[], string];
if (prevSite === site) {
return query.state.data;
diff --git a/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts b/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts
index ddddf5c0c..8d9f4c914 100644
--- a/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts
+++ b/client/src/api/analytics/sessionReplay/useGetSessionReplayEvents.ts
@@ -46,9 +46,7 @@ export function useGetSessionReplayEvents(siteId: number, sessionId: string) {
return useQuery({
queryKey: ["session-replay-events", siteId, sessionId],
queryFn: () => {
- return authedFetch<GetSessionReplayEventsResponse>(
- `/session-replay/${sessionId}/${siteId}`
- );
+ return authedFetch<GetSessionReplayEventsResponse>(`/session-replay/${sessionId}/${siteId}`);
},
enabled: !!siteId && !!sessionId,
staleTime: 1000 * 60 * 10, // 10 minutes
diff --git a/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts b/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts
index 6011dbf34..8668c42ba 100644
--- a/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts
+++ b/client/src/api/analytics/sessionReplay/useGetSessionReplays.ts
@@ -32,10 +32,7 @@ type UseGetSessionReplaysOptions = {
minDuration?: number;
};
-export function useGetSessionReplays({
- limit = 20,
- minDuration = 30,
-}: UseGetSessionReplaysOptions = {}) {
+export function useGetSessionReplays({ limit = 20, minDuration = 30 }: UseGetSessionReplaysOptions = {}) {
const { time, site, filters } = useStore();
return useInfiniteQuery({
@@ -49,18 +46,12 @@ export function useGetSessionReplays({
minDuration,
};
- const response = await authedFetch<SessionReplayListResponse>(
- `/session-replay/list/${site}`,
- queryParams
- );
+ const response = await authedFetch<SessionReplayListResponse>(`/session-replay/list/${site}`, queryParams);
return response;
},
initialPageParam: 0,
getNextPageParam: (lastPage, allPages) => {
- const totalFetched = allPages.reduce(
- (acc, page) => acc + (page.data?.length || 0),
- 0
- );
+ const totalFetched = allPages.reduce((acc, page) => acc + (page.data?.length || 0), 0);
return lastPage.data?.length === limit ? totalFetched : undefined;
},
staleTime: 1000 * 60 * 5, // 5 minutes
diff --git a/client/src/api/analytics/useGetOrgEventCount.ts b/client/src/api/analytics/useGetOrgEventCount.ts
index 2d0df5359..053563e95 100644
--- a/client/src/api/analytics/useGetOrgEventCount.ts
+++ b/client/src/api/analytics/useGetOrgEventCount.ts
@@ -26,10 +26,7 @@ async function getOrgEventCount({
if (endDate) params.append("endDate", endDate);
if (timeZone) params.append("timeZone", timeZone);
- return authedFetch(
- `/org-event-count/${organizationId}`,
- Object.fromEntries(params)
- );
+ return authedFetch(`/org-event-count/${organizationId}`, Object.fromEntries(params));
}
export function useGetOrgEventCount({
diff --git a/client/src/api/analytics/useGetOverview.ts b/client/src/api/analytics/useGetOverview.ts
index 60c8e6d39..4cef89301 100644
--- a/client/src/api/analytics/useGetOverview.ts
+++ b/client/src/api/analytics/useGetOverview.ts
@@ -21,11 +21,7 @@ type UseGetOverviewOptions = {
| { mode: "range"; startDate: string; endDate: string };
};
-export function useGetOverview({
- periodTime,
- site,
- overrideTime,
-}: UseGetOverviewOptions) {
+export function useGetOverview({ periodTime, site, overrideTime }: UseGetOverviewOptions) {
const { time, previousTime, filters } = useStore();
// Use overrideTime if provided, otherwise use store time
@@ -39,10 +35,7 @@ export function useGetOverview({
return useQuery({
queryKey,
queryFn: () => {
- return authedFetch<{ data: GetOverviewResponse }>(
- `/overview/${site}`,
- queryParams
- );
+ return authedFetch<{ data: GetOverviewResponse }>(`/overview/${site}`, queryParams);
},
staleTime: 60_000,
placeholderData: (_, query: any) => {
diff --git a/client/src/api/analytics/useGetOverviewBucketed.ts b/client/src/api/analytics/useGetOverviewBucketed.ts
index 92afaf08d..304ccacc6 100644
--- a/client/src/api/analytics/useGetOverviewBucketed.ts
+++ b/client/src/api/analytics/useGetOverviewBucketed.ts
@@ -1,9 +1,5 @@
import { Filter, TimeBucket } from "@rybbit/shared";
-import {
- UseQueryOptions,
- UseQueryResult,
- useQuery,
-} from "@tanstack/react-query";
+import { UseQueryOptions, UseQueryResult, useQuery } from "@tanstack/react-query";
import { timeZone } from "../../lib/dateTimeUtils";
import { useStore } from "../../lib/store";
import { APIResponse } from "../types";
@@ -70,10 +66,7 @@ export function useGetOverviewBucketed({
return useQuery({
queryKey,
queryFn: () => {
- return authedFetch<APIResponse<GetOverviewBucketedResponse>>(
- `/overview-bucketed/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<GetOverviewBucketedResponse>>(`/overview-bucketed/${site}`, queryParams);
},
refetchInterval,
placeholderData: (_, query: any) => {
@@ -81,7 +74,7 @@ export function useGetOverviewBucketed({
const queryKeyArray = query.queryKey as any[];
// Find site in query key (position varies based on query type)
- const siteIndex = queryKeyArray.findIndex((item) => item === site);
+ const siteIndex = queryKeyArray.findIndex(item => item === site);
if (siteIndex !== -1) {
return query.state.data;
}
diff --git a/client/src/api/analytics/useGetPageTitles.ts b/client/src/api/analytics/useGetPageTitles.ts
index ef4c7704c..b12b63eaa 100644
--- a/client/src/api/analytics/useGetPageTitles.ts
+++ b/client/src/api/analytics/useGetPageTitles.ts
@@ -35,9 +35,7 @@ export function useGetPageTitlesPaginated({
limit = 10,
page = 1,
useFilters = true,
-}: UseGetPageTitlesOptions): UseQueryResult<
- APIResponse<PageTitlesPaginatedResponse>
-> {
+}: UseGetPageTitlesOptions): UseQueryResult<APIResponse<PageTitlesPaginatedResponse>> {
const { time, site, filters } = useStore();
const queryParams = {
@@ -50,10 +48,7 @@ export function useGetPageTitlesPaginated({
return useQuery({
queryKey: ["page-titles", time, site, filters, limit, page],
queryFn: () => {
- return authedFetch<APIResponse<PageTitlesPaginatedResponse>>(
- `/page-titles/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<PageTitlesPaginatedResponse>>(`/page-titles/${site}`, queryParams);
},
staleTime: Infinity,
});
diff --git a/client/src/api/analytics/useGetRetention.ts b/client/src/api/analytics/useGetRetention.ts
index 5ade17cde..0cebc503d 100644
--- a/client/src/api/analytics/useGetRetention.ts
+++ b/client/src/api/analytics/useGetRetention.ts
@@ -12,10 +12,7 @@ export interface ProcessedRetentionData {
export type RetentionMode = "day" | "week";
-export function useGetRetention(
- mode: RetentionMode = "week",
- range: number = 90
-) {
+export function useGetRetention(mode: RetentionMode = "week", range: number = 90) {
const { site } = useStore();
return useQuery<ProcessedRetentionData>({
queryKey: ["retention", site, mode, range],
diff --git a/client/src/api/analytics/useInfiniteSingleCol.ts b/client/src/api/analytics/useInfiniteSingleCol.ts
index 959ad1a60..02b41dcf3 100644
--- a/client/src/api/analytics/useInfiniteSingleCol.ts
+++ b/client/src/api/analytics/useInfiniteSingleCol.ts
@@ -1,9 +1,5 @@
import { FilterParameter } from "@rybbit/shared";
-import {
- useInfiniteQuery,
- UseInfiniteQueryResult,
- InfiniteData,
-} from "@tanstack/react-query";
+import { useInfiniteQuery, UseInfiniteQueryResult, InfiniteData } from "@tanstack/react-query";
import { SingleColResponse } from "@/api/analytics/useSingleCol";
import { authedFetch, getQueryParams } from "@/api/utils";
import { timeZone } from "@/lib/dateTimeUtils";
@@ -24,9 +20,7 @@ export function useInfiniteSingleCol({
parameter,
limit = 25,
useFilters = true,
-}: UseInfiniteSingleColOptions): UseInfiniteQueryResult<
- InfiniteData<InfinitePaginatedResponse>
-> {
+}: UseInfiniteSingleColOptions): UseInfiniteQueryResult<InfiniteData<InfinitePaginatedResponse>> {
const { time, site, filters } = useStore();
return useInfiniteQuery({
@@ -49,10 +43,7 @@ export function useInfiniteSingleCol({
getNextPageParam: (lastPage, allPages) => {
// If we've fetched all items, don't get next page
const totalItems = lastPage.totalCount;
- const fetchedItemCount = allPages.reduce(
- (acc, page) => acc + page.data.length,
- 0
- );
+ const fetchedItemCount = allPages.reduce((acc, page) => acc + page.data.length, 0);
if (fetchedItemCount >= totalItems) {
return undefined;
diff --git a/client/src/api/analytics/usePaginatedSingleCol.ts b/client/src/api/analytics/usePaginatedSingleCol.ts
index 321657a1c..70ed9697c 100644
--- a/client/src/api/analytics/usePaginatedSingleCol.ts
+++ b/client/src/api/analytics/usePaginatedSingleCol.ts
@@ -39,10 +39,7 @@ export function usePaginatedSingleCol({
return useQuery({
queryKey: [parameter, time, site, filters, limit, page, additionalFilters],
queryFn: async () => {
- const response = await authedFetch<{ data: PaginatedResponse }>(
- `/single-col/${site}`,
- queryParams
- );
+ const response = await authedFetch<{ data: PaginatedResponse }>(`/single-col/${site}`, queryParams);
return response.data;
},
staleTime: 60_000,
diff --git a/client/src/api/analytics/userInfo.ts b/client/src/api/analytics/userInfo.ts
index 901f92f40..319a4ee34 100644
--- a/client/src/api/analytics/userInfo.ts
+++ b/client/src/api/analytics/userInfo.ts
@@ -25,9 +25,7 @@ export function useUserInfo(siteId: number, userId: string) {
return useQuery<UserInfo>({
queryKey: ["user-info", userId, siteId],
queryFn: async () => {
- const response = await authedFetch<{ data: UserInfo }>(
- `/user/info/${userId}/${siteId}`
- );
+ const response = await authedFetch<{ data: UserInfo }>(`/user/info/${userId}/${siteId}`);
return response.data;
},
});
diff --git a/client/src/api/analytics/userSessions.ts b/client/src/api/analytics/userSessions.ts
index 016234618..6145bd6bb 100644
--- a/client/src/api/analytics/userSessions.ts
+++ b/client/src/api/analytics/userSessions.ts
@@ -1,10 +1,6 @@
import { useInfiniteQuery, useQuery } from "@tanstack/react-query";
import { timeZone } from "../../lib/dateTimeUtils";
-import {
- getFilteredFilters,
- SESSION_PAGE_FILTERS,
- useStore,
-} from "../../lib/store";
+import { getFilteredFilters, SESSION_PAGE_FILTERS, useStore } from "../../lib/store";
import { APIResponse } from "../types";
import { authedFetch, getQueryParams } from "../utils";
@@ -72,16 +68,10 @@ export function useGetSessionsInfinite(userId?: string) {
requestParams.endDate = timeParams.endDate;
}
- return authedFetch<APIResponse<GetSessionsResponse>>(
- `/sessions/${site}`,
- requestParams
- );
+ return authedFetch<APIResponse<GetSessionsResponse>>(`/sessions/${site}`, requestParams);
},
initialPageParam: 1,
- getNextPageParam: (
- lastPage: APIResponse<GetSessionsResponse>,
- allPages
- ) => {
+ getNextPageParam: (lastPage: APIResponse<GetSessionsResponse>, allPages) => {
// If we have data and it's a full page (100 items), there might be more
if (lastPage?.data && lastPage.data.length === 100) {
return allPages.length + 1;
@@ -174,13 +164,10 @@ export function useGetSessionDetailsInfinite(sessionId: string | null) {
queryParams.minutes = minutes;
}
- return authedFetch<APIResponse<SessionPageviewsAndEvents>>(
- `/session/${sessionId}/${site}`,
- queryParams
- );
+ return authedFetch<APIResponse<SessionPageviewsAndEvents>>(`/session/${sessionId}/${site}`, queryParams);
},
initialPageParam: 0,
- getNextPageParam: (lastPage) => {
+ getNextPageParam: lastPage => {
if (lastPage?.data?.pagination?.hasMore) {
return lastPage.data.pagination.offset + lastPage.data.pagination.limit;
}
@@ -202,13 +189,10 @@ export function useGetUserSessionCount(userId: string) {
return useQuery<APIResponse<UserSessionCountResponse[]>>({
queryKey: ["user-session-count", userId, site],
queryFn: () => {
- return authedFetch<APIResponse<UserSessionCountResponse[]>>(
- `/user/session-count/${site}`,
- {
- userId,
- timeZone,
- }
- );
+ return authedFetch<APIResponse<UserSessionCountResponse[]>>(`/user/session-count/${site}`, {
+ userId,
+ timeZone,
+ });
},
staleTime: Infinity,
});
diff --git a/client/src/api/analytics/users.ts b/client/src/api/analytics/users.ts
index f4a744d0f..2300beb59 100644
--- a/client/src/api/analytics/users.ts
+++ b/client/src/api/analytics/users.ts
@@ -1,11 +1,7 @@
import { Filter } from "@rybbit/shared";
import { useQuery } from "@tanstack/react-query";
import { timeZone } from "../../lib/dateTimeUtils";
-import {
- useStore,
- USER_PAGE_FILTERS,
- getFilteredFilters,
-} from "../../lib/store";
+import { useStore, USER_PAGE_FILTERS, getFilteredFilters } from "../../lib/store";
import { authedFetch, getStartAndEndDate } from "../utils";
import { APIResponse } from "../types";
import { getQueryParams } from "../utils";
@@ -49,16 +45,7 @@ export function useGetUsers(options: GetUsersOptions) {
pageSize: number;
}
>({
- queryKey: [
- "users",
- site,
- time,
- page,
- pageSize,
- sortBy,
- sortOrder,
- filteredFilters,
- ],
+ queryKey: ["users", site, time, page, pageSize, sortBy, sortOrder, filteredFilters],
queryFn: async () => {
// Build request parameters
const requestParams: Record<string, any> = {
diff --git a/client/src/api/uptime/incidents.ts b/client/src/api/uptime/incidents.ts
index 162bce9a3..8bd3c8080 100644
--- a/client/src/api/uptime/incidents.ts
+++ b/client/src/api/uptime/incidents.ts
@@ -48,19 +48,11 @@ async function getIncidents(params?: GetIncidentsParams) {
}
async function acknowledgeIncident(incidentId: number) {
- return authedFetch(
- `/uptime/incidents/${incidentId}/acknowledge`,
- undefined,
- { method: 'PATCH', data: {} }
- );
+ return authedFetch(`/uptime/incidents/${incidentId}/acknowledge`, undefined, { method: "PATCH", data: {} });
}
async function resolveIncident(incidentId: number) {
- return authedFetch(
- `/uptime/incidents/${incidentId}/resolve`,
- undefined,
- { method: 'PATCH', data: {} }
- );
+ return authedFetch(`/uptime/incidents/${incidentId}/resolve`, undefined, { method: "PATCH", data: {} });
}
// Hooks
@@ -91,4 +83,4 @@ export function useResolveIncident() {
queryClient.invalidateQueries({ queryKey: ["uptime-incidents"] });
},
});
-}
\ No newline at end of file
+}
diff --git a/client/src/api/uptime/monitors.ts b/client/src/api/uptime/monitors.ts
index 6bedb8784..c12f93d7f 100644
--- a/client/src/api/uptime/monitors.ts
+++ b/client/src/api/uptime/monitors.ts
@@ -3,7 +3,7 @@ import { authedFetch } from "../utils";
import { timeZone } from "../../lib/dateTimeUtils";
// Validation rule types
-export type ValidationRule =
+export type ValidationRule =
| {
type: "status_code";
operator: "equals" | "not_equals" | "in" | "not_in";
@@ -376,27 +376,15 @@ export interface UpdateMonitorInput {
}
async function createMonitor(data: CreateMonitorInput) {
- return authedFetch(
- `/uptime/monitors`,
- undefined,
- { method: 'POST', data }
- );
+ return authedFetch(`/uptime/monitors`, undefined, { method: "POST", data });
}
async function updateMonitor(monitorId: number, data: UpdateMonitorInput) {
- return authedFetch(
- `/uptime/monitors/${monitorId}`,
- undefined,
- { method: 'PUT', data }
- );
+ return authedFetch(`/uptime/monitors/${monitorId}`, undefined, { method: "PUT", data });
}
async function deleteMonitor(monitorId: number) {
- return authedFetch(
- `/uptime/monitors/${monitorId}`,
- undefined,
- { method: 'DELETE' }
- );
+ return authedFetch(`/uptime/monitors/${monitorId}`, undefined, { method: "DELETE" });
}
export function useCreateMonitor() {
diff --git a/client/src/api/uptime/notifications.ts b/client/src/api/uptime/notifications.ts
index 258e359e0..7721af63b 100644
--- a/client/src/api/uptime/notifications.ts
+++ b/client/src/api/uptime/notifications.ts
@@ -37,11 +37,7 @@ async function createChannel(data: {
triggerEvents?: string[];
cooldownMinutes?: number;
}) {
- return authedFetch(
- `/uptime/notification-channels`,
- undefined,
- { method: 'POST', data }
- );
+ return authedFetch(`/uptime/notification-channels`, undefined, { method: "POST", data });
}
async function updateChannel(
@@ -55,30 +51,17 @@ async function updateChannel(
cooldownMinutes?: number;
}
) {
- return authedFetch(
- `/uptime/notification-channels/${id}`,
- undefined,
- { method: 'PUT', data }
- );
+ return authedFetch(`/uptime/notification-channels/${id}`, undefined, { method: "PUT", data });
}
async function deleteChannel(id: number) {
- return authedFetch(
- `/uptime/notification-channels/${id}`,
- undefined,
- { method: 'DELETE' }
- );
+ return authedFetch(`/uptime/notification-channels/${id}`, undefined, { method: "DELETE" });
}
async function testChannel(id: number) {
- return authedFetch(
- `/uptime/notification-channels/${id}/test`,
- undefined,
- { method: 'POST', data: {} }
- );
+ return authedFetch(`/uptime/notification-channels/${id}/test`, undefined, { method: "POST", data: {} });
}
-
// Hooks
export function useNotificationChannels() {
return useQuery({
@@ -102,8 +85,7 @@ export function useUpdateChannel() {
const queryClient = useQueryClient();
return useMutation({
- mutationFn: ({ id, data }: { id: number; data: Parameters<typeof updateChannel>[1] }) =>
- updateChannel(id, data),
+ mutationFn: ({ id, data }: { id: number; data: Parameters<typeof updateChannel>[1] }) => updateChannel(id, data),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: ["notification-channels"] });
},
@@ -125,4 +107,4 @@ export function useTestChannel() {
return useMutation({
mutationFn: testChannel,
});
-}
\ No newline at end of file
+}
diff --git a/client/src/api/usePageMetadata.ts b/client/src/api/usePageMetadata.ts
index 54b2ce722..6e99d6b33 100644
--- a/client/src/api/usePageMetadata.ts
+++ b/client/src/api/usePageMetadata.ts
@@ -20,9 +20,7 @@ export function usePageMetadata(pageUrl: string | null) {
try {
// Using Microlink to fetch metadata
const response = await fetch(
- `https://api.microlink.io/?url=${encodeURIComponent(
- pageUrl
- )}&meta=true&screenshot=false`
+ `https://api.microlink.io/?url=${encodeURIComponent(pageUrl)}&meta=true&screenshot=false`
);
if (!response.ok) {
diff --git a/client/src/api/utils.ts b/client/src/api/utils.ts
index e23ebbd6e..b2444d162 100644
--- a/client/src/api/utils.ts
+++ b/client/src/api/utils.ts
@@ -32,10 +32,7 @@ export function getStartAndEndDate(time: Time) {
return { startDate: time.day, endDate: time.day };
}
-export function getQueryParams(
- time: Time,
- additionalParams: Record<string, any> = {}
-): Record<string, any> {
+export function getQueryParams(time: Time, additionalParams: Record<string, any> = {}): Record<string, any> {
if (time.mode === "past-minutes") {
return {
timeZone,
diff --git a/client/src/app/[site]/components/Header/UsageBanners.tsx b/client/src/app/[site]/components/Header/UsageBanners.tsx
index b8e881fe2..ff125894a 100644
--- a/client/src/app/[site]/components/Header/UsageBanners.tsx
+++ b/client/src/app/[site]/components/Header/UsageBanners.tsx
@@ -1,11 +1,7 @@
import { AlertTriangle, ArrowRight } from "lucide-react";
import Link from "next/link";
import { useCurrentSite } from "../../../../api/admin/sites";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
-} from "../../../../components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
import { Button } from "../../../../components/ui/button";
export function UsageBanners() {
@@ -37,14 +33,9 @@ export function UsageBanners() {
<div className="flex items-start space-x-3">
<AlertTriangle className="h-5 w-5 mt-0.5" />
<div className="flex-1">
- <AlertTitle className="text-base font-semibold mb-1">
- Event Limit Exceeded
- </AlertTitle>
+ <AlertTitle className="text-base font-semibold mb-1">Event Limit Exceeded</AlertTitle>
<div className="mb-2 text-sm">
- <strong>
- {formatNumber(subscription.monthlyEventCount || 0)}
- </strong>{" "}
- events used of{" "}
+ <strong>{formatNumber(subscription.monthlyEventCount || 0)}</strong> events used of{" "}
<strong>{formatNumber(subscription.eventLimit)}</strong>
</div>
@@ -61,8 +52,8 @@ export function UsageBanners() {
</div>
) : (
<AlertDescription className="text-sm">
- This site has exceeded its monthly event limit. Please contact
- your organization owner to upgrade the plan.
+ This site has exceeded its monthly event limit. Please contact your organization owner to upgrade the
+ plan.
</AlertDescription>
)}
</div>
@@ -82,10 +73,7 @@ export function UsageBanners() {
Approaching Event Limit
</AlertTitle>
<div className="mb-2 text-sm text-amber-700 dark:text-amber-400">
- <strong>
- {formatNumber(subscription?.monthlyEventCount || 0)}
- </strong>{" "}
- events used of{" "}
+ <strong>{formatNumber(subscription?.monthlyEventCount || 0)}</strong> events used of{" "}
<strong>{formatNumber(subscription?.eventLimit || 0)}</strong>
</div>
@@ -102,8 +90,7 @@ export function UsageBanners() {
</div>
) : (
<AlertDescription className="text-sm text-amber-700 dark:text-amber-400">
- This site is approaching its monthly event limit. You may want
- to notify your organization owner.
+ This site is approaching its monthly event limit. You may want to notify your organization owner.
</AlertDescription>
)}
</div>
diff --git a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx
index fb2a5b919..b6bd66a16 100644
--- a/client/src/app/[site]/components/Sidebar/SiteSelector.tsx
+++ b/client/src/app/[site]/components/Sidebar/SiteSelector.tsx
@@ -41,7 +41,7 @@ function SiteSelectorContent({ onSiteSelect }: { onSiteSelect: () => void }) {
siteId: 1,
domain: "tomato.gg",
},
- ].map((site) => {
+ ].map(site => {
const isSelected = site.siteId === currentSiteId;
return (
<div
@@ -85,7 +85,7 @@ function SiteSelectorContent({ onSiteSelect }: { onSiteSelect: () => void }) {
<PopoverContent align="start" className="w-80 p-2">
<div className="max-h-96 overflow-y-auto">
{sites?.sites
- ? sites.sites.map((site) => {
+ ? sites.sites.map(site => {
const isSelected = site.siteId === currentSiteId;
return (
<div
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
index ef2b5322d..abedb8f37 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx
@@ -1,32 +1,19 @@
import { FilterParameter, FilterType } from "@rybbit/shared";
import { X } from "lucide-react";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "../../../../../components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";
import { useGetRegionName } from "../../../../../lib/geo";
import { removeFilter, updateFilter, useStore } from "../../../../../lib/store";
import { cn } from "../../../../../lib/utils";
-import {
- filterTypeToLabel,
- getParameterNameLabel,
- getParameterValueLabel,
-} from "../../shared/Filters/utils";
+import { filterTypeToLabel, getParameterNameLabel, getParameterValueLabel } from "../../shared/Filters/utils";
-export function Filters({
- availableFilters,
-}: {
- availableFilters?: FilterParameter[];
-}) {
+export function Filters({ availableFilters }: { availableFilters?: FilterParameter[] }) {
const { filters } = useStore();
const { getRegionName } = useGetRegionName();
return (
<div className="flex gap-2 flex-wrap">
{filters.map((filter, i) => {
- const disabled =
- availableFilters && !availableFilters.includes(filter.parameter);
+ const disabled = availableFilters && !availableFilters.includes(filter.parameter);
return (
<Tooltip key={filter.parameter}>
@@ -43,19 +30,13 @@ export function Filters({
disabled ? "bg-neutral-900" : "bg-neutral-850"
)}
>
- <div
- className={cn(
- disabled ? "text-neutral-500" : "text-neutral-300"
- )}
- >
+ <div className={cn(disabled ? "text-neutral-500" : "text-neutral-300")}>
{getParameterNameLabel(filter.parameter)}
</div>
<div
className={cn(
"text-emerald-400 font-medium cursor-pointer whitespace-nowrap",
- (filter.type === "not_equals" ||
- filter.type === "not_contains") &&
- "text-red-400"
+ (filter.type === "not_equals" || filter.type === "not_contains") && "text-red-400"
)}
onClick={() => {
let newType: FilterType = "equals";
@@ -74,12 +55,7 @@ export function Filters({
>
{filterTypeToLabel(filter.type)}
</div>
- <div
- className={cn(
- "text-neutral-100 font-medium whitespace-nowrap",
- disabled && "text-neutral-500"
- )}
- >
+ <div className={cn("text-neutral-100 font-medium whitespace-nowrap", disabled && "text-neutral-500")}>
{getParameterValueLabel(filter, getRegionName)}
</div>
<div
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index 1d0ad78a6..ebb23ebf7 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -3,20 +3,12 @@ import { Filter, FilterParameter } from "@rybbit/shared";
import { ListFilterPlus, Plus } from "lucide-react";
import { useState } from "react";
import { Button } from "../../../../../components/ui/button";
-import {
- DropdownMenu,
- DropdownMenuContent,
- DropdownMenuTrigger,
-} from "../../../../../components/ui/dropdown-menu";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuTrigger } from "../../../../../components/ui/dropdown-menu";
import { useStore } from "../../../../../lib/store";
import { sleep } from "../../../../../lib/utils";
import { FilterComponent } from "../../shared/Filters/FilterComponent";
-export function NewFilterButton({
- availableFilters,
-}: {
- availableFilters?: FilterParameter[];
-}) {
+export function NewFilterButton({ availableFilters }: { availableFilters?: FilterParameter[] }) {
const { filters, setFilters } = useStore();
const [localFilters, setLocalFilters] = useState<Filter[]>(filters);
@@ -53,7 +45,7 @@ export function NewFilterButton({
return (
<DropdownMenu
- onOpenChange={(isOpen) => {
+ onOpenChange={isOpen => {
setLocalFilters(filters);
if (!isOpen) {
onClose();
@@ -75,10 +67,7 @@ export function NewFilterButton({
Filter
</Button>
</DropdownMenuTrigger>
- <DropdownMenuContent
- align="start"
- className="flex flex-col p-0 max-w-[95vw]"
- >
+ <DropdownMenuContent align="start" className="flex flex-col p-0 max-w-[95vw]">
<div className="flex flex-col gap-2 p-3">
{localFilters.map((filter, index) => (
<FilterComponent
@@ -91,12 +80,7 @@ export function NewFilterButton({
))}
</div>
<div className="flex justify-between border-t border-neutral-750 p-3">
- <Button
- variant={"ghost"}
- onClick={() => addLocalFilter()}
- size={"sm"}
- className="gap-1"
- >
+ <Button variant={"ghost"} onClick={() => addLocalFilter()} size={"sm"} className="gap-1">
<Plus className="w-3 h-3" />
Add Filter
</Button>
diff --git a/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx b/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
index c18d799d8..2a6d9aaa3 100644
--- a/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
+++ b/client/src/app/[site]/components/SubHeader/LiveUserCount.tsx
@@ -1,9 +1,5 @@
import { useGetLiveUsercount } from "../../../../api/analytics/useLiveUserCount";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "../../../../components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";
import NumberFlow from "@number-flow/react";
export function LiveUserCount() {
@@ -21,12 +17,7 @@ export function LiveUserCount() {
<Tooltip>
<TooltipTrigger>
<span className="text-sm text-neutral-200 ml-1 font-medium">
- {
- <NumberFlow
- respectMotionPreference={false}
- value={data?.count ?? 0}
- />
- }
+ {<NumberFlow respectMotionPreference={false} value={data?.count ?? 0} />}
<span className="ml-1"></span>
</span>
</TooltipTrigger>
diff --git a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
index 7d8b51b81..e50ba764e 100644
--- a/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
+++ b/client/src/app/[site]/components/shared/Filters/FilterComponent.tsx
@@ -1,13 +1,7 @@
import { Filter, FilterParameter, FilterType } from "@rybbit/shared";
import { Trash } from "lucide-react";
import { Button } from "../../../../../components/ui/button";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "../../../../../components/ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../../../components/ui/select";
import { FilterOptions, OperatorOptions } from "./const";
import { ValueSelect } from "./ValueSelect";
@@ -23,13 +17,13 @@ export function FilterComponent({
availableFilters?: FilterParameter[];
}) {
const availableFilterOptions = availableFilters
- ? FilterOptions.filter((option) => availableFilters?.includes(option.value))
+ ? FilterOptions.filter(option => availableFilters?.includes(option.value))
: FilterOptions;
return (
<div className="grid grid-cols-[220px_auto] md:grid-cols-[160px_100px_250px_auto] gap-2">
<Select
- onValueChange={(value) => {
+ onValueChange={value => {
updateFilter(
{
...filter,
@@ -45,7 +39,7 @@ export function FilterComponent({
<SelectValue placeholder="Filter" />
</SelectTrigger>
<SelectContent>
- {availableFilterOptions.map((option) => (
+ {availableFilterOptions.map(option => (
<SelectItem key={option.value} value={option.value}>
<div className="flex items-center gap-2">
{option.icon}
@@ -57,7 +51,7 @@ export function FilterComponent({
</Select>
<Select
value={filter.type}
- onValueChange={(value) => {
+ onValueChange={value => {
updateFilter(
{
...filter,
@@ -71,7 +65,7 @@ export function FilterComponent({
<SelectValue placeholder="Operator" />
</SelectTrigger>
<SelectContent>
- {OperatorOptions.map((option) => (
+ {OperatorOptions.map(option => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
@@ -79,7 +73,7 @@ export function FilterComponent({
</SelectContent>
</Select>
<ValueSelect
- onChange={(value) => {
+ onChange={value => {
updateFilter({ ...filter, value: value }, index);
}}
parameter={filter.parameter}
diff --git a/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx b/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
index a8f52a289..88ae058fd 100644
--- a/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
+++ b/client/src/app/[site]/components/shared/Filters/ValueSelect.tsx
@@ -40,9 +40,9 @@ export function ValueSelect({
const suggestions = useMemo(() => {
return (
data?.data
- ?.map((item) => item.value)
+ ?.map(item => item.value)
.filter(Boolean)
- .map((val) => ({
+ .map(val => ({
value: val,
label: getValueLabel(val),
})) || []
@@ -56,7 +56,7 @@ export function ValueSelect({
return (
<MultiSelect
- value={value.map((val) => ({
+ value={value.map(val => ({
value: val,
label: getValueLabel(val),
}))}
diff --git a/client/src/app/[site]/components/shared/Filters/utils.ts b/client/src/app/[site]/components/shared/Filters/utils.ts
index f8f7cc182..083b8c688 100644
--- a/client/src/app/[site]/components/shared/Filters/utils.ts
+++ b/client/src/app/[site]/components/shared/Filters/utils.ts
@@ -69,10 +69,7 @@ export const filterTypeToLabel = (type: FilterType) => {
}
};
-export function getParameterValueLabel(
- filter: Filter,
- getRegionName: (region: string) => string | undefined
-) {
+export function getParameterValueLabel(filter: Filter, getRegionName: (region: string) => string | undefined) {
const formatValue = (value: string) => {
if (filter.parameter === "country") {
return getCountryName(value);
diff --git a/client/src/app/[site]/components/shared/Map.tsx b/client/src/app/[site]/components/shared/Map.tsx
index 843108d12..559dd8c3c 100644
--- a/client/src/app/[site]/components/shared/Map.tsx
+++ b/client/src/app/[site]/components/shared/Map.tsx
@@ -57,7 +57,7 @@ export function MapComponent({
useEffect(() => {
if (countryData || subdivisionData) {
- setDataVersion((prev) => prev + 1);
+ setDataVersion(prev => prev + 1);
}
}, [countryData, subdivisionData]);
@@ -234,7 +234,7 @@ export function MapComponent({
return (
<div
- onMouseMove={(e) => {
+ onMouseMove={e => {
if (tooltipContent) {
setTooltipPosition({
x: e.clientX,
diff --git a/client/src/app/[site]/components/shared/StandardSection/Row.tsx b/client/src/app/[site]/components/shared/StandardSection/Row.tsx
index 02b9849cb..a5913aad5 100644
--- a/client/src/app/[site]/components/shared/StandardSection/Row.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/Row.tsx
@@ -9,11 +9,11 @@ import { addFilter, removeFilter, useStore } from "../../../../../lib/store";
// Custom hook for filter handling logic
const useFilterToggle = () => {
- const filters = useStore((state) => state.filters);
+ const filters = useStore(state => state.filters);
const toggleFilter = useCallback(
(parameter: FilterParameter, value: string) => {
- const foundFilter = filters.find((f) => f.parameter === parameter && f.value.some((v) => v === value));
+ const foundFilter = filters.find(f => f.parameter === parameter && f.value.some(v => v === value));
if (foundFilter) {
removeFilter(foundFilter);
} else {
@@ -67,7 +67,7 @@ const RowItem = ({
{leftContent}
{getLabel(item)}
{getLink && (
- <a href={getLink(item)} target="_blank" onClick={(e) => e.stopPropagation()}>
+ <a href={getLink(item)} target="_blank" onClick={e => e.stopPropagation()}>
<SquareArrowOutUpRight
className="ml-0.5 w-3.5 h-3.5 text-neutral-300 hover:text-neutral-100"
strokeWidth={3}
@@ -125,7 +125,7 @@ const Subrows = ({
return (
<div className="flex flex-col gap-2 pl-5 pt-2">
- {itemsForDisplay?.map((e) => (
+ {itemsForDisplay?.map(e => (
<RowItem
key={getKey(e)}
item={e}
@@ -172,9 +172,9 @@ export const Row = ({
<Icon
className="w-4 h-4 text-neutral-400 hover:text-neutral-100"
strokeWidth={3}
- onClick={(e) => {
+ onClick={e => {
e.stopPropagation();
- setExpanded((prev) => !prev);
+ setExpanded(prev => !prev);
}}
/>
) : null;
diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
index 03d527d40..4383b2b91 100644
--- a/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSection.tsx
@@ -40,19 +40,15 @@ export function StandardSection({
hasSubrow?: boolean;
getSubrowLabel?: (item: SingleColResponse) => ReactNode;
}) {
- const { data, isLoading, isFetching, error, refetch } = usePaginatedSingleCol(
- {
- parameter: filterParameter,
- limit: 100,
- page: 1,
- }
- );
+ const { data, isLoading, isFetching, error, refetch } = usePaginatedSingleCol({
+ parameter: filterParameter,
+ limit: 100,
+ page: 1,
+ });
const itemsForDisplay = data?.data;
- const ratio = itemsForDisplay?.[0]?.percentage
- ? 100 / itemsForDisplay[0].percentage
- : 1;
+ const ratio = itemsForDisplay?.[0]?.percentage ? 100 / itemsForDisplay[0].percentage : 1;
return (
<>
@@ -68,9 +64,7 @@ export function StandardSection({
<div className="py-6 flex-1 flex flex-col items-center justify-center gap-3 transition-all">
<AlertCircle className="text-amber-400 w-8 h-8" />
<div className="text-center">
- <div className="text-neutral-100 font-medium mb-1">
- Failed to load data
- </div>
+ <div className="text-neutral-100 font-medium mb-1">Failed to load data</div>
<div className="text-sm text-neutral-400 max-w-md mx-auto mb-3">
{error.message || "An error occurred while fetching data"}
</div>
@@ -93,7 +87,7 @@ export function StandardSection({
{itemsForDisplay?.length ? (
itemsForDisplay
.slice(0, MAX_ITEMS_TO_DISPLAY)
- .map((e) => (
+ .map(e => (
<Row
key={getKey(e)}
e={e}
diff --git a/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
index a1563a2b9..0bf040f9e 100644
--- a/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
+++ b/client/src/app/[site]/components/shared/StandardSection/StandardSectionDialog.tsx
@@ -66,7 +66,7 @@ export function StandardSectionDialog({
// Flatten the pages data
const allItems = useMemo(() => {
if (!data) return [];
- return data.pages.flatMap((page) => page.data);
+ return data.pages.flatMap(page => page.data);
}, [data]);
// Filter data based on search term
@@ -90,7 +90,7 @@ export function StandardSectionDialog({
<div className="flex flex-row gap-1 items-center text-left">
{getLabel(row.original)}
{getLink && (
- <a href={getLink(row.original)} target="_blank" onClick={(e) => e.stopPropagation()}>
+ <a href={getLink(row.original)} target="_blank" onClick={e => e.stopPropagation()}>
<SquareArrowOutUpRight
className="ml-0.5 w-3.5 h-3.5 text-neutral-300 hover:text-neutral-100"
strokeWidth={3}
@@ -102,13 +102,13 @@ export function StandardSectionDialog({
}),
columnHelper.accessor("count", {
header: "Sessions",
- cell: (info) => (
+ cell: info => (
<div className="flex flex-row gap-1 items-center sm:justify-end">{info.getValue().toLocaleString()}</div>
),
}),
columnHelper.accessor("percentage", {
header: "Session %",
- cell: (info) => (
+ cell: info => (
<div className="flex flex-row gap-1 items-center sm:justify-end">{info.getValue().toFixed(1)}%</div>
),
}),
@@ -122,7 +122,7 @@ export function StandardSectionDialog({
cols.push(
columnHelper.accessor("pageviews", {
header: "Pageviews",
- cell: (info) => (
+ cell: info => (
<div className="flex flex-row gap-1 items-center sm:justify-end">{info.getValue()?.toLocaleString()}</div>
),
}) as any
@@ -130,7 +130,7 @@ export function StandardSectionDialog({
cols.push(
columnHelper.accessor("pageviews_percentage", {
header: "Pageviews %",
- cell: (info) => (
+ cell: info => (
<div className="flex flex-row gap-1 items-center sm:justify-end">{info.getValue()?.toFixed(1)}%</div>
),
}) as any
@@ -142,7 +142,7 @@ export function StandardSectionDialog({
cols.push(
columnHelper.accessor("time_on_page_seconds", {
header: "Duration",
- cell: (info) => (
+ cell: info => (
<div className="text-right">{formatSecondsAsMinutesAndSeconds(Math.round(info.getValue() ?? 0))}</div>
),
}) as any
@@ -200,14 +200,14 @@ export function StandardSectionDialog({
placeholder={`Filter ${allItems.length} items...`}
className="pl-9 bg-neutral-900 border-neutral-700 text-xs"
value={searchTerm}
- onChange={(e) => setSearchTerm(e.target.value)}
+ onChange={e => setSearchTerm(e.target.value)}
/>
</div>
<div className="flex flex-col gap-2 overflow-x-auto">
<div className="max-h-[80vh] overflow-y-auto">
<table className="w-full text-xs text-left min-w-max">
<thead className="bg-neutral-900 text-neutral-400 sticky top-0 z-10">
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<tr key={headerGroup.id}>
{headerGroup.headers.map((header, index) => (
<th
diff --git a/client/src/app/[site]/components/shared/icons/Browser.tsx b/client/src/app/[site]/components/shared/icons/Browser.tsx
index 91360cc91..49df3e6e1 100644
--- a/client/src/app/[site]/components/shared/icons/Browser.tsx
+++ b/client/src/app/[site]/components/shared/icons/Browser.tsx
@@ -66,22 +66,11 @@ const BROWSER_TO_LOGO: Record<string, string> = {
Waterfox: "Waterfox.svg",
};
-export function Browser({
- browser,
- size = 16,
-}: {
- browser: string;
- size?: number;
-}) {
+export function Browser({ browser, size = 16 }: { browser: string; size?: number }) {
return (
<>
{BROWSER_TO_LOGO[browser] ? (
- <Image
- src={`/browsers/${BROWSER_TO_LOGO[browser]}`}
- alt={browser || "Other"}
- width={size}
- height={size}
- />
+ <Image src={`/browsers/${BROWSER_TO_LOGO[browser]}`} alt={browser || "Other"} width={size} height={size} />
) : (
<Compass width={size} height={size} />
)}
diff --git a/client/src/app/[site]/components/shared/icons/CountryFlag.tsx b/client/src/app/[site]/components/shared/icons/CountryFlag.tsx
index 662da62ed..86bda6e01 100644
--- a/client/src/app/[site]/components/shared/icons/CountryFlag.tsx
+++ b/client/src/app/[site]/components/shared/icons/CountryFlag.tsx
@@ -3,23 +3,14 @@ import React from "react";
import { getCountryName } from "../../../../../lib/utils";
import { cn } from "@/lib/utils";
-export function CountryFlag({
- country,
- className,
-}: {
- country: string;
- className?: string;
-}) {
+export function CountryFlag({ country, className }: { country: string; className?: string }) {
return (
<>
{CountryFlags[country as keyof typeof CountryFlags]
- ? React.createElement(
- CountryFlags[country as keyof typeof CountryFlags],
- {
- title: getCountryName(country),
- className: cn("w-5", className),
- }
- )
+ ? React.createElement(CountryFlags[country as keyof typeof CountryFlags], {
+ title: getCountryName(country),
+ className: cn("w-5", className),
+ })
: null}
</>
);
diff --git a/client/src/app/[site]/components/shared/icons/OperatingSystem.tsx b/client/src/app/[site]/components/shared/icons/OperatingSystem.tsx
index 917b4bd6b..d5012188a 100644
--- a/client/src/app/[site]/components/shared/icons/OperatingSystem.tsx
+++ b/client/src/app/[site]/components/shared/icons/OperatingSystem.tsx
@@ -24,22 +24,11 @@ const OS_TO_LOGO: Record<string, string> = {
Xbox: "Xbox.svg",
};
-export function OperatingSystem({
- os = "",
- size = 16,
-}: {
- os?: string;
- size?: number;
-}) {
+export function OperatingSystem({ os = "", size = 16 }: { os?: string; size?: number }) {
return (
<>
{OS_TO_LOGO[os] ? (
- <Image
- src={`/operating-systems/${OS_TO_LOGO[os]}`}
- alt={os || "Other"}
- width={size}
- height={size}
- />
+ <Image src={`/operating-systems/${OS_TO_LOGO[os]}`} alt={os || "Other"} width={size} height={size} />
) : (
<Compass width={size} height={size} />
)}
diff --git a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx b/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
index bb492e845..0dbcf2eed 100644
--- a/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
+++ b/client/src/app/[site]/errors/components/EnableErrorTracking.tsx
@@ -2,20 +2,12 @@
import { AlertTriangle, ArrowRight } from "lucide-react";
import Link from "next/link";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
-} from "../../../../components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
import { Button } from "../../../../components/ui/button";
import { useGetErrorNames } from "../../../../api/analytics/errors/useGetErrorNames";
export function EnableErrorTracking() {
- const {
- data: errorData,
- isLoading,
- isError,
- } = useGetErrorNames({ limit: 1 });
+ const { data: errorData, isLoading, isError } = useGetErrorNames({ limit: 1 });
// Don't show banner while loading or if there's an error
if (isLoading || isError) return null;
@@ -38,8 +30,7 @@ export function EnableErrorTracking() {
<code className="bg-amber-100/70 dark:bg-amber-800/50 px-1 py-0.5 rounded text-xs">
data-track-errors="true"
</code>{" "}
- to your script tag. <strong>Note:</strong> Enabling error tracking
- will increase your event usage.
+ to your script tag. <strong>Note:</strong> Enabling error tracking will increase your event usage.
</AlertDescription>
<div className="space-y-2">
@@ -50,10 +41,7 @@ export function EnableErrorTracking() {
size="sm"
className="border-amber-300/70 text-amber-700/90 hover:bg-amber-100/70 dark:border-amber-600/70 dark:text-amber-400/90 dark:hover:bg-amber-800/50"
>
- <Link
- href="https://rybbit.io/docs/script#error-tracking"
- target="_blank"
- >
+ <Link href="https://rybbit.io/docs/script#error-tracking" target="_blank">
View Documentation <ArrowRight className="ml-1 h-3 w-3" />
</Link>
</Button>
diff --git a/client/src/app/[site]/errors/components/ErrorDetails.tsx b/client/src/app/[site]/errors/components/ErrorDetails.tsx
index a632c0e3d..856a340ed 100644
--- a/client/src/app/[site]/errors/components/ErrorDetails.tsx
+++ b/client/src/app/[site]/errors/components/ErrorDetails.tsx
@@ -1,30 +1,14 @@
"use client";
-import {
- ErrorEvent,
- useGetErrorEventsInfinite,
-} from "@/api/analytics/errors/useGetErrorEvents";
+import { ErrorEvent, useGetErrorEventsInfinite } from "@/api/analytics/errors/useGetErrorEvents";
import { Badge } from "@/components/ui/badge";
import { Button } from "@/components/ui/button";
import { Skeleton } from "@/components/ui/skeleton";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { userLocale } from "@/lib/dateTimeUtils";
import { useGetRegionName } from "@/lib/geo";
import { getCountryName } from "@/lib/utils";
-import {
- AlertTriangle,
- Code,
- Hash,
- Laptop,
- Loader2,
- Smartphone,
- TriangleAlert,
- User,
-} from "lucide-react";
+import { AlertTriangle, Code, Hash, Laptop, Loader2, Smartphone, TriangleAlert, User } from "lucide-react";
import { DateTime } from "luxon";
import Link from "next/link";
import { memo, useMemo } from "react";
@@ -75,9 +59,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
};
const formatTimestamp = (timestamp: string) => {
- return DateTime.fromSQL(timestamp, { zone: "utc" })
- .setLocale(userLocale)
- .toRelative();
+ return DateTime.fromSQL(timestamp, { zone: "utc" }).setLocale(userLocale).toRelative();
};
return (
@@ -85,9 +67,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
{/* Header with timestamp and basic info */}
<div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-4">
- <span className="text-sm text-neutral-200">
- {formatTimestamp(errorEvent.timestamp)}
- </span>
+ <span className="text-sm text-neutral-200">{formatTimestamp(errorEvent.timestamp)}</span>
<div className="flex items-center gap-2">
{errorEvent.country && (
<Tooltip>
@@ -107,8 +87,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
<TooltipContent>
<p>
{errorEvent.browser}
- {errorEvent.browser_version &&
- ` ${errorEvent.browser_version}`}
+ {errorEvent.browser_version && ` ${errorEvent.browser_version}`}
</p>
</TooltipContent>
</Tooltip>
@@ -121,8 +100,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
<TooltipContent>
<p>
{errorEvent.operating_system}
- {errorEvent.operating_system_version &&
- ` ${errorEvent.operating_system_version}`}
+ {errorEvent.operating_system_version && ` ${errorEvent.operating_system_version}`}
</p>
</TooltipContent>
</Tooltip>
@@ -182,9 +160,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
<TriangleAlert className="w-4 h-4 mt-0.5 flex-shrink-0" />
<div className="flex-1 min-w-0">
<p className="text-sm font-medium mb-1">Error</p>
- <p className="text-sm text-neutral-300 break-words">
- {errorEvent.message || "No message available"}
- </p>
+ <p className="text-sm text-neutral-300 break-words">{errorEvent.message || "No message available"}</p>
</div>
</div>
</div>
@@ -195,9 +171,7 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
<div className="flex items-start gap-2">
<Code className="w-4 h-4 text-neutral-100 mt-0.5 flex-shrink-0" />
<div className="flex-1 min-w-0">
- <p className="text-sm font-medium text-neutral-100 mb-1">
- Stack Trace:
- </p>
+ <p className="text-sm font-medium text-neutral-100 mb-1">Stack Trace:</p>
{/* File and line info */}
{(errorEvent.fileName || errorEvent.lineNumber) && (
<div className="mb-2">
@@ -208,14 +182,11 @@ function ErrorEventItem({ errorEvent }: { errorEvent: ErrorEvent }) {
target="_blank"
rel="noopener noreferrer"
>
- {errorEvent.fileName && (
- <span>{truncateText(errorEvent.fileName, 100)}</span>
- )}
+ {errorEvent.fileName && <span>{truncateText(errorEvent.fileName, 100)}</span>}
{errorEvent.lineNumber && (
<span className="text-neutral-100">
:{errorEvent.lineNumber}
- {errorEvent.columnNumber &&
- `:${errorEvent.columnNumber}`}
+ {errorEvent.columnNumber && `:${errorEvent.columnNumber}`}
</span>
)}
</Link>
@@ -247,7 +218,7 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
// Flatten all error events into a single array
const allErrorEvents = useMemo(() => {
if (!errorEventsData?.pages) return [];
- return errorEventsData.pages.flatMap((page) => page.data?.data || []);
+ return errorEventsData.pages.flatMap(page => page.data?.data || []);
}, [errorEventsData?.pages]);
// Get total count from the first page
@@ -258,29 +229,22 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
<div className="p-4 bg-neutral-900 border-t border-neutral-800">
<div className="space-y-3">
{Array.from({ length: 3 }).map((_, index) => (
- <div
- key={index}
- className="border border-neutral-800 rounded-lg p-4 bg-neutral-900/50"
- >
+ <div key={index} className="border border-neutral-800 rounded-lg p-4 bg-neutral-900/50">
{/* Header with timestamp and icons */}
<div className="flex items-center justify-between mb-3">
<div className="flex items-center gap-4">
<Skeleton className="h-4 w-20" /> {/* Timestamp */}
<div className="flex items-center gap-2">
- <Skeleton className="h-4 w-4 rounded" />{" "}
- {/* Country flag */}
- <Skeleton className="h-4 w-4 rounded" />{" "}
- {/* Browser icon */}
+ <Skeleton className="h-4 w-4 rounded" /> {/* Country flag */}
+ <Skeleton className="h-4 w-4 rounded" /> {/* Browser icon */}
<Skeleton className="h-4 w-4 rounded" /> {/* OS icon */}
<Skeleton className="h-4 w-4 rounded" /> {/* Device icon */}
</div>
<Skeleton className="h-4 w-48" /> {/* URL */}
</div>
<div className="flex items-center gap-2">
- <Skeleton className="h-5 w-16 rounded-full" />{" "}
- {/* Session badge */}
- <Skeleton className="h-5 w-16 rounded-full" />{" "}
- {/* User badge */}
+ <Skeleton className="h-5 w-16 rounded-full" /> {/* Session badge */}
+ <Skeleton className="h-5 w-16 rounded-full" /> {/* User badge */}
</div>
</div>
@@ -290,10 +254,8 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
<Skeleton className="h-4 w-4 mt-0.5" /> {/* Error icon */}
<div className="flex-1 min-w-0">
<Skeleton className="h-4 w-12 mb-1" /> {/* "Error" label */}
- <Skeleton className="h-4 w-full mb-1" />{" "}
- {/* Error message line 1 */}
- <Skeleton className="h-4 w-3/4" />{" "}
- {/* Error message line 2 */}
+ <Skeleton className="h-4 w-full mb-1" /> {/* Error message line 1 */}
+ <Skeleton className="h-4 w-3/4" /> {/* Error message line 2 */}
</div>
</div>
</div>
@@ -304,12 +266,9 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
<div className="flex items-start gap-2">
<Skeleton className="h-4 w-4 mt-0.5" /> {/* Code icon */}
<div className="flex-1 min-w-0">
- <Skeleton className="h-4 w-20 mb-1" />{" "}
- {/* "Stack Trace:" label */}
- <Skeleton className="h-4 w-64 mb-2" />{" "}
- {/* File name and line */}
- <Skeleton className="h-16 w-full rounded" />{" "}
- {/* Stack trace code block */}
+ <Skeleton className="h-4 w-20 mb-1" /> {/* "Stack Trace:" label */}
+ <Skeleton className="h-4 w-64 mb-2" /> {/* File name and line */}
+ <Skeleton className="h-16 w-full rounded" /> {/* Stack trace code block */}
</div>
</div>
</div>
@@ -339,9 +298,7 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
<div className="text-center text-neutral-400">
<AlertTriangle className="w-6 h-6 mx-auto mb-2" />
<p>No error events found</p>
- <p className="text-sm">
- This error may have occurred outside the current time range.
- </p>
+ <p className="text-sm">This error may have occurred outside the current time range.</p>
</div>
</div>
);
@@ -350,10 +307,7 @@ export function ErrorDetails({ errorMessage }: ErrorDetailsProps) {
return (
<div className="p-4 bg-neutral-900 border-t border-neutral-800 space-y-3 max-h-[70vh] overflow-y-auto">
{allErrorEvents.map((errorEvent, index) => (
- <ErrorEventItem
- key={`${errorEvent.session_id}-${errorEvent.timestamp}-${index}`}
- errorEvent={errorEvent}
- />
+ <ErrorEventItem key={`${errorEvent.session_id}-${errorEvent.timestamp}-${index}`} errorEvent={errorEvent} />
))}
{hasNextPage && (
diff --git a/client/src/app/[site]/errors/components/ErrorListItem.tsx b/client/src/app/[site]/errors/components/ErrorListItem.tsx
index d31747f05..29de59268 100644
--- a/client/src/app/[site]/errors/components/ErrorListItem.tsx
+++ b/client/src/app/[site]/errors/components/ErrorListItem.tsx
@@ -24,11 +24,10 @@ export function ErrorListItem({ errorData }: ErrorListItemProps) {
};
// Get error bucketed data for sparkline
- const { data: errorBucketedData, isLoading: isLoadingBucketed } =
- useGetErrorBucketed({
- errorMessage: errorData.value,
- enabled: true,
- });
+ const { data: errorBucketedData, isLoading: isLoadingBucketed } = useGetErrorBucketed({
+ errorMessage: errorData.value,
+ enabled: true,
+ });
return (
<div
@@ -40,12 +39,8 @@ export function ErrorListItem({ errorData }: ErrorListItemProps) {
<div className="flex flex-col md:flex-row justify-between items-start md:items-center w-full gap-4">
{/* Left side: Error message with icon */}
<div className="flex-1 min-w-0 space-y-1">
- <h3 className="text-sm font-medium truncate">
- {errorData.errorName || "JavaScript Error"}
- </h3>
- <p className="text-xs text-muted-foreground">
- {truncateString(errorData.value, MAX_ERROR_MESSAGE_LENGTH)}
- </p>
+ <h3 className="text-sm font-medium truncate">{errorData.errorName || "JavaScript Error"}</h3>
+ <p className="text-xs text-muted-foreground">{truncateString(errorData.value, MAX_ERROR_MESSAGE_LENGTH)}</p>
</div>
{/* Right side: Sparkline chart and error statistics */}
@@ -65,23 +60,17 @@ export function ErrorListItem({ errorData }: ErrorListItemProps) {
{/* Occurrences */}
<div className="text-center min-w-[80px]">
<div>
- <span className="text-base font-semibold">
- {errorData.count.toLocaleString()}
- </span>
+ <span className="text-base font-semibold">{errorData.count.toLocaleString()}</span>
</div>
<div>
- <span className="text-xs text-foreground/70">
- occurrences
- </span>
+ <span className="text-xs text-foreground/70">occurrences</span>
</div>
</div>
{/* Sessions affected */}
<div className="text-center min-w-[80px]">
<div>
- <span className="text-base font-semibold">
- {errorData.sessionCount.toLocaleString()}
- </span>
+ <span className="text-base font-semibold">{errorData.sessionCount.toLocaleString()}</span>
</div>
<div>
<span className="text-xs text-foreground/70">sessions</span>
@@ -91,15 +80,9 @@ export function ErrorListItem({ errorData }: ErrorListItemProps) {
{/* Expand/Collapse icon */}
<div className="ml-2 flex-shrink-0 flex">
{expanded ? (
- <ChevronDown
- className="w-4 h-4 text-gray-400"
- strokeWidth={3}
- />
+ <ChevronDown className="w-4 h-4 text-gray-400" strokeWidth={3} />
) : (
- <ChevronRight
- className="w-4 h-4 text-gray-400"
- strokeWidth={3}
- />
+ <ChevronRight className="w-4 h-4 text-gray-400" strokeWidth={3} />
)}
</div>
</div>
diff --git a/client/src/app/[site]/errors/components/ErrorListSkeleton.tsx b/client/src/app/[site]/errors/components/ErrorListSkeleton.tsx
index d6e392a53..8e8ff0e86 100644
--- a/client/src/app/[site]/errors/components/ErrorListSkeleton.tsx
+++ b/client/src/app/[site]/errors/components/ErrorListSkeleton.tsx
@@ -10,10 +10,7 @@ export function ErrorListSkeleton({ count = 5 }: ErrorListSkeletonProps) {
return (
<>
{Array.from({ length: count }).map((_, index) => (
- <div
- key={index}
- className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800"
- >
+ <div key={index} className="mb-3 rounded-lg bg-neutral-900 border border-neutral-800">
<div className="p-3">
<div className="flex flex-col md:flex-row justify-between items-start md:items-center w-full gap-4">
{/* Left side: Error name and message */}
diff --git a/client/src/app/[site]/errors/components/ErrorSparklineChart.tsx b/client/src/app/[site]/errors/components/ErrorSparklineChart.tsx
index 9c20038c1..602963136 100644
--- a/client/src/app/[site]/errors/components/ErrorSparklineChart.tsx
+++ b/client/src/app/[site]/errors/components/ErrorSparklineChart.tsx
@@ -14,23 +14,18 @@ interface ErrorSparklineChartProps {
isLoading: boolean;
}
-export function ErrorSparklineChart({
- data,
- isHovering,
- errorMessage,
- isLoading,
-}: ErrorSparklineChartProps) {
+export function ErrorSparklineChart({ data, isHovering, errorMessage, isLoading }: ErrorSparklineChartProps) {
const chartData = useMemo(() => {
if (!data || data.length === 0) {
return [];
}
return data
- .filter((e) => {
+ .filter(e => {
// Filter out dates from the future
return DateTime.fromSQL(e.time).toUTC() <= DateTime.now();
})
- .map((e) => ({
+ .map(e => ({
time: DateTime.fromSQL(e.time).toUTC().toFormat("yyyy-MM-dd HH:mm:ss"),
errors: e.error_count || 0,
}));
@@ -79,11 +74,7 @@ export function ErrorSparklineChart({
value: number;
data: { time: string; errors: number };
}) => {
- const currentTime = DateTime.fromFormat(
- data.time,
- "yyyy-MM-dd HH:mm:ss",
- { zone: "utc" }
- ).toLocal();
+ const currentTime = DateTime.fromFormat(data.time, "yyyy-MM-dd HH:mm:ss", { zone: "utc" }).toLocal();
const currentY = Number(value);
return (
@@ -91,13 +82,10 @@ export function ErrorSparklineChart({
className="bg-neutral-850 p-2 rounded-md text-xs border border-neutral-750 shadow-lg"
style={{ zIndex: 9999, position: "relative" }}
>
- <div className="font-semibold mb-1 text-neutral-200">
- {formatDateTime(currentTime)}
- </div>
+ <div className="font-semibold mb-1 text-neutral-200">{formatDateTime(currentTime)}</div>
<div className="flex justify-between items-center">
<span className="font-medium text-red-400">
- {currentY.toLocaleString()}{" "}
- {currentY === 1 ? "error" : "errors"}
+ {currentY.toLocaleString()} {currentY === 1 ? "error" : "errors"}
</span>
</div>
</div>
diff --git a/client/src/app/[site]/events/components/EventList.tsx b/client/src/app/[site]/events/components/EventList.tsx
index df10b9387..6fbf47fb6 100644
--- a/client/src/app/[site]/events/components/EventList.tsx
+++ b/client/src/app/[site]/events/components/EventList.tsx
@@ -10,79 +10,66 @@ import { cn } from "../../../../lib/utils";
import { EventProperties } from "./EventProperties";
// Skeleton component for EventList
-const EventListSkeleton = memo(
- ({ size = "small" }: { size?: "small" | "large" }) => {
- // Generate widths following Pareto principle with top item at 100%
- const widths = Array.from({ length: 10 }, (_, i) => {
- if (i === 0) {
- // First item always has 100% width
- return 100;
- } else if (i === 1) {
- // Second item gets large width (60-80%)
- return 60 + Math.random() * 20;
- } else {
- // Remaining 8 items get progressively smaller widths (10-40%)
- const factor = 1 - (i - 2) / 8; // Creates a declining factor from 1 to 0.125
- return 10 + factor * 30; // Creates widths from ~40% down to ~15%
- }
- });
+const EventListSkeleton = memo(({ size = "small" }: { size?: "small" | "large" }) => {
+ // Generate widths following Pareto principle with top item at 100%
+ const widths = Array.from({ length: 10 }, (_, i) => {
+ if (i === 0) {
+ // First item always has 100% width
+ return 100;
+ } else if (i === 1) {
+ // Second item gets large width (60-80%)
+ return 60 + Math.random() * 20;
+ } else {
+ // Remaining 8 items get progressively smaller widths (10-40%)
+ const factor = 1 - (i - 2) / 8; // Creates a declining factor from 1 to 0.125
+ return 10 + factor * 30; // Creates widths from ~40% down to ~15%
+ }
+ });
- // Generate random widths for label and value placeholders
- const labelWidths = Array.from({ length: 10 }, (_, i) => {
- // First few items get wider labels
- return i < 3 ? 75 + Math.random() * 100 : 40 + Math.random() * 60;
- });
+ // Generate random widths for label and value placeholders
+ const labelWidths = Array.from({ length: 10 }, (_, i) => {
+ // First few items get wider labels
+ return i < 3 ? 75 + Math.random() * 100 : 40 + Math.random() * 60;
+ });
- const valueWidths = Array.from(
- { length: 10 },
- () => 20 + Math.random() * 40 // Between 20px and 60px
- );
+ const valueWidths = Array.from(
+ { length: 10 },
+ () => 20 + Math.random() * 40 // Between 20px and 60px
+ );
- return (
- <div className="flex flex-col gap-2 pr-2">
- {Array.from({ length: 10 }).map((_, index) => (
+ return (
+ <div className="flex flex-col gap-2 pr-2">
+ {Array.from({ length: 10 }).map((_, index) => (
+ <div key={index} className={cn("relative flex items-center", size === "small" ? "h-6" : "h-9")}>
+ <div
+ className="absolute inset-0 bg-neutral-800 py-2 rounded-md animate-pulse"
+ style={{ width: `${widths[index]}%` }}
+ ></div>
<div
- key={index}
className={cn(
- "relative flex items-center",
- size === "small" ? "h-6" : "h-9"
+ "z-5 mx-2 flex justify-between items-center w-full",
+ size === "small" ? "text-xs" : "text-sm"
)}
>
- <div
- className="absolute inset-0 bg-neutral-800 py-2 rounded-md animate-pulse"
- style={{ width: `${widths[index]}%` }}
- ></div>
- <div
- className={cn(
- "z-5 mx-2 flex justify-between items-center w-full",
- size === "small" ? "text-xs" : "text-sm"
- )}
- >
- <div className="flex items-center gap-1">
- <div className="h-4 w-4 bg-neutral-800 rounded animate-pulse mr-1"></div>
- <div
- className="h-4 bg-neutral-800 rounded animate-pulse"
- style={{ width: `${labelWidths[index]}px` }}
- ></div>
- </div>
+ <div className="flex items-center gap-1">
+ <div className="h-4 w-4 bg-neutral-800 rounded animate-pulse mr-1"></div>
<div
- className={cn(
- "flex gap-2",
- size === "small" ? "text-xs" : "text-sm"
- )}
- >
- <div
- className="h-4 bg-neutral-800 rounded animate-pulse"
- style={{ width: `${valueWidths[index]}px` }}
- ></div>
- </div>
+ className="h-4 bg-neutral-800 rounded animate-pulse"
+ style={{ width: `${labelWidths[index]}px` }}
+ ></div>
+ </div>
+ <div className={cn("flex gap-2", size === "small" ? "text-xs" : "text-sm")}>
+ <div
+ className="h-4 bg-neutral-800 rounded animate-pulse"
+ style={{ width: `${valueWidths[index]}px` }}
+ ></div>
</div>
</div>
- ))}
- </div>
- );
- }
-);
+ </div>
+ ))}
+ </div>
+ );
+});
interface EventListProps {
events: EventName[];
@@ -90,19 +77,14 @@ interface EventListProps {
size?: "small" | "large";
}
-export function EventList({
- events,
- isLoading,
- size = "small",
-}: EventListProps) {
+export function EventList({ events, isLoading, size = "small" }: EventListProps) {
const [expandedEvent, setExpandedEvent] = useState<string | null>(null);
const handleEventClick = (eventName: string) => {
setExpandedEvent(expandedEvent === eventName ? null : eventName);
};
- const { data: eventPropertiesData, isLoading: isLoadingProperties } =
- useGetEventProperties(expandedEvent);
+ const { data: eventPropertiesData, isLoading: isLoadingProperties } = useGetEventProperties(expandedEvent);
if (isLoading) {
return <EventListSkeleton size={size} />;
@@ -126,10 +108,7 @@ export function EventList({
</a>
</div>
) : (
- <NothingFound
- title={"No custom events found"}
- description={"Try a different date range or filter"}
- />
+ <NothingFound title={"No custom events found"} description={"Try a different date range or filter"} />
);
}
@@ -138,7 +117,7 @@ export function EventList({
return (
<div className="flex flex-col gap-2">
- {events.map((event) => {
+ {events.map(event => {
const percentage = (event.count / totalCount) * 100;
const isExpanded = expandedEvent === event.eventName;
@@ -164,32 +143,15 @@ export function EventList({
>
<div className="font-medium truncate max-w-[70%] flex items-center gap-1">
{isExpanded ? (
- <ChevronDown
- className="h-4 w-4 text-neutral-400 hover:text-neutral-100"
- strokeWidth={3}
- />
+ <ChevronDown className="h-4 w-4 text-neutral-400 hover:text-neutral-100" strokeWidth={3} />
) : (
- <ChevronRight
- className="h-4 w-4 text-neutral-400 hover:text-neutral-100"
- strokeWidth={3}
- />
+ <ChevronRight className="h-4 w-4 text-neutral-400 hover:text-neutral-100" strokeWidth={3} />
)}
{event.eventName}
</div>
- <div
- className={cn(
- "text-sm flex gap-2",
- size === "small" ? "text-xs" : "text-sm"
- )}
- >
- <div className="hidden group-hover:block text-neutral-400">
- {Math.round(percentage * 10) / 10}%
- </div>
- <NumberFlow
- respectMotionPreference={false}
- value={event.count}
- format={{ notation: "compact" }}
- />
+ <div className={cn("text-sm flex gap-2", size === "small" ? "text-xs" : "text-sm")}>
+ <div className="hidden group-hover:block text-neutral-400">{Math.round(percentage * 10) / 10}%</div>
+ <NumberFlow respectMotionPreference={false} value={event.count} format={{ notation: "compact" }} />
</div>
</div>
</div>
diff --git a/client/src/app/[site]/events/components/EventLog.tsx b/client/src/app/[site]/events/components/EventLog.tsx
index 717281e7c..0117796cc 100644
--- a/client/src/app/[site]/events/components/EventLog.tsx
+++ b/client/src/app/[site]/events/components/EventLog.tsx
@@ -11,14 +11,7 @@ export function EventLog() {
const loadMoreRef = useRef<HTMLDivElement>(null);
// Fetch events with infinite scrolling
- const {
- data,
- isLoading,
- isError,
- fetchNextPage,
- hasNextPage,
- isFetchingNextPage,
- } = useGetEventsInfinite({
+ const { data, isLoading, isError, fetchNextPage, hasNextPage, isFetchingNextPage } = useGetEventsInfinite({
pageSize: 100,
});
@@ -26,12 +19,7 @@ export function EventLog() {
// Handle scroll for infinite loading
const handleScroll = useCallback(() => {
- if (
- !loadMoreRef.current ||
- !containerRef.current ||
- !hasNextPage ||
- isFetchingNextPage
- ) {
+ if (!loadMoreRef.current || !containerRef.current || !hasNextPage || isFetchingNextPage) {
return;
}
@@ -58,7 +46,7 @@ export function EventLog() {
}, [handleScroll]);
// Flatten all pages of data
- const allEvents = data?.pages.flatMap((page) => page.data) || [];
+ const allEvents = data?.pages.flatMap(page => page.data) || [];
if (isLoading) {
return (
@@ -71,20 +59,11 @@ export function EventLog() {
}
if (isError) {
- return (
- <div className="text-center py-8 text-neutral-400">
- Error loading events. Please try again.
- </div>
- );
+ return <div className="text-center py-8 text-neutral-400">Error loading events. Please try again.</div>;
}
if (allEvents.length === 0) {
- return (
- <NothingFound
- title={"No events found"}
- description={"Try a different date range or filter"}
- />
- );
+ return <NothingFound title={"No events found"} description={"Try a different date range or filter"} />;
}
return (
@@ -110,8 +89,7 @@ export function EventLog() {
{/* Pagination info */}
{data?.pages[0]?.pagination && (
<div className="text-center text-xs text-neutral-400 pt-2">
- Showing {allEvents.length} of{" "}
- {formatter(data.pages[0].pagination.total)} events
+ Showing {allEvents.length} of {formatter(data.pages[0].pagination.total)} events
</div>
)}
</div>
diff --git a/client/src/app/[site]/events/components/EventLogItem.tsx b/client/src/app/[site]/events/components/EventLogItem.tsx
index 508a344ec..e3ee3f769 100644
--- a/client/src/app/[site]/events/components/EventLogItem.tsx
+++ b/client/src/app/[site]/events/components/EventLogItem.tsx
@@ -1,11 +1,7 @@
"use client";
import { Badge } from "@/components/ui/badge";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { ExternalLink, FileText, Laptop, MousePointerClick, Smartphone } from "lucide-react";
import { DateTime } from "luxon";
import Link from "next/link";
@@ -53,9 +49,7 @@ export function EventLogItem({ event }: EventLogItemProps) {
const isPageview = event.type === "pageview";
const isOutbound = event.type === "outbound";
- const fullPath = `https://${event.hostname}${event.pathname}${
- event.querystring ? `${event.querystring}` : ""
- }`;
+ const fullPath = `https://${event.hostname}${event.pathname}${event.querystring ? `${event.querystring}` : ""}`;
// Parse event properties if they exist
let eventProperties: Record<string, any> = {};
@@ -89,37 +83,23 @@ export function EventLogItem({ event }: EventLogItemProps) {
<div className="min-w-0 max-w-[40%]">
{isPageview ? (
<Link href={fullPath} target="_blank" rel="noopener noreferrer">
- <div
- className="text-sm truncate hover:underline"
- title={event.pathname}
- >
- {truncatePath(
- `${event.pathname}${
- event.querystring ? `${event.querystring}` : ""
- }`
- )}
+ <div className="text-sm truncate hover:underline" title={event.pathname}>
+ {truncatePath(`${event.pathname}${event.querystring ? `${event.querystring}` : ""}`)}
</div>
</Link>
) : isOutbound ? (
// For outbound events, show the destination URL from properties
eventProperties.url ? (
<Link href={eventProperties.url} target="_blank" rel="noopener noreferrer">
- <div
- className="text-sm truncate hover:underline text-purple-400"
- title={eventProperties.url}
- >
+ <div className="text-sm truncate hover:underline text-purple-400" title={eventProperties.url}>
{truncatePath(eventProperties.url)}
</div>
</Link>
) : (
- <div className="text-sm font-medium truncate text-purple-400">
- Outbound Link
- </div>
+ <div className="text-sm font-medium truncate text-purple-400">Outbound Link</div>
)
) : (
- <div className="text-sm font-medium truncate">
- {event.event_name}
- </div>
+ <div className="text-sm font-medium truncate">{event.event_name}</div>
)}
</div>
@@ -170,10 +150,7 @@ export function EventLogItem({ event }: EventLogItemProps) {
</div>
{/* User ID */}
- <Link
- href={`/${site}/user/${event.user_id}`}
- className="flex-shrink-0"
- >
+ <Link href={`/${site}/user/${event.user_id}`} className="flex-shrink-0">
<Tooltip>
<TooltipTrigger asChild>
<span className="text-sm font-mono text-neutral-400 hover:text-neutral-300">
@@ -188,9 +165,7 @@ export function EventLogItem({ event }: EventLogItemProps) {
</div>
{/* Timestamp (right-aligned) */}
- <div className="text-sm flex-shrink-0 text-neutral-400 ml-auto">
- {eventTime.toRelative()}
- </div>
+ <div className="text-sm flex-shrink-0 text-neutral-400 ml-auto">{eventTime.toRelative()}</div>
</div>
{/* Bottom row with event properties */}
@@ -206,12 +181,12 @@ export function EventLogItem({ event }: EventLogItemProps) {
<Tooltip>
<TooltipTrigger asChild>
<span className="truncate">
- {(typeof value === 'object') ? JSON.stringify(value) : String(value)}
+ {typeof value === "object" ? JSON.stringify(value) : String(value)}
</span>
</TooltipTrigger>
<TooltipContent>
<span className="max-w-7xl">
- {(typeof value === 'object') ? JSON.stringify(value) : String(value)}
+ {typeof value === "object" ? JSON.stringify(value) : String(value)}
</span>
</TooltipContent>
</Tooltip>
@@ -256,15 +231,13 @@ export const EventLogItemSkeleton = memo(() => {
{/* Bottom row skeleton (properties) - show randomly */}
{Math.random() > 0.5 && (
<div className="flex flex-wrap gap-1 mt-1 ml-6">
- {Array.from({ length: Math.floor(Math.random() * 4) + 1 }).map(
- (_, i) => (
- <div
- key={i}
- className="h-5 bg-neutral-800 rounded animate-pulse"
- style={{ width: `${Math.random() * 60 + 40}px` }}
- ></div>
- )
- )}
+ {Array.from({ length: Math.floor(Math.random() * 4) + 1 }).map((_, i) => (
+ <div
+ key={i}
+ className="h-5 bg-neutral-800 rounded animate-pulse"
+ style={{ width: `${Math.random() * 60 + 40}px` }}
+ ></div>
+ ))}
</div>
)}
</div>
diff --git a/client/src/app/[site]/events/components/EventProperties.tsx b/client/src/app/[site]/events/components/EventProperties.tsx
index 7010952de..1ec33c229 100644
--- a/client/src/app/[site]/events/components/EventProperties.tsx
+++ b/client/src/app/[site]/events/components/EventProperties.tsx
@@ -14,12 +14,7 @@ interface EventPropertiesProps {
size?: "small" | "large";
}
-export function EventProperties({
- properties,
- isLoading,
- selectedEvent,
- size = "small",
-}: EventPropertiesProps) {
+export function EventProperties({ properties, isLoading, selectedEvent, size = "small" }: EventPropertiesProps) {
if (isLoading) {
return <EventPropertiesSkeleton size={size} />;
}
@@ -43,55 +38,40 @@ export function EventProperties({
}
// Group properties by propertyKey
- const groupedProperties = properties.reduce((acc, property) => {
- if (!acc[property.propertyKey]) {
- acc[property.propertyKey] = [];
- }
- acc[property.propertyKey].push(property);
- return acc;
- }, {} as Record<string, EventProperty[]>);
+ const groupedProperties = properties.reduce(
+ (acc, property) => {
+ if (!acc[property.propertyKey]) {
+ acc[property.propertyKey] = [];
+ }
+ acc[property.propertyKey].push(property);
+ return acc;
+ },
+ {} as Record<string, EventProperty[]>
+ );
// Sort keys by the total count of their values
const sortedKeys = Object.keys(groupedProperties).sort((a, b) => {
- const sumA = groupedProperties[a].reduce(
- (sum, prop) => sum + prop.count,
- 0
- );
- const sumB = groupedProperties[b].reduce(
- (sum, prop) => sum + prop.count,
- 0
- );
+ const sumA = groupedProperties[a].reduce((sum, prop) => sum + prop.count, 0);
+ const sumB = groupedProperties[b].reduce((sum, prop) => sum + prop.count, 0);
return sumB - sumA;
});
return (
- <div
- className={cn(
- "flex flex-col gap-4 overflow-y-auto pr-2",
- size === "small" ? "max-h-[30vh]" : "max-h-[60vh]"
- )}
- >
- {sortedKeys.map((key) => {
+ <div className={cn("flex flex-col gap-4 overflow-y-auto pr-2", size === "small" ? "max-h-[30vh]" : "max-h-[60vh]")}>
+ {sortedKeys.map(key => {
// Sort property values by count (descending)
const values = groupedProperties[key].sort((a, b) => b.count - a.count);
return (
- <div
- key={key}
- className={cn(
- "flex flex-col gap-1",
- size === "small" ? "text-xs" : "text-sm"
- )}
- >
+ <div key={key} className={cn("flex flex-col gap-1", size === "small" ? "text-xs" : "text-sm")}>
{/* Property Key Header */}
- <div className="font-semibold text-primary py-1 border-b border-neutral-800">
- {key}
- </div>
+ <div className="font-semibold text-primary py-1 border-b border-neutral-800">{key}</div>
{/* Property Values */}
<div className="pl-4 flex flex-col gap-2">
- {values.map((property) => {
- const totalCount = properties.filter(event => event.propertyKey === property.propertyKey)
+ {values.map(property => {
+ const totalCount = properties
+ .filter(event => event.propertyKey === property.propertyKey)
.reduce((sum, event) => sum + event.count, 0);
const percentage = (property.count / totalCount) * 100;
@@ -111,14 +91,10 @@ export function EventProperties({
<div className="truncate max-w-[70%]">
<Tooltip>
<TooltipTrigger asChild>
- <div className="flex items-center">
- {property.propertyValue}
- </div>
+ <div className="flex items-center">{property.propertyValue}</div>
</TooltipTrigger>
<TooltipContent>
- <p className="max-w-7xl">
- {property.propertyValue}
- </p>
+ <p className="max-w-7xl">{property.propertyValue}</p>
</TooltipContent>
</Tooltip>
</div>
@@ -145,90 +121,60 @@ export function EventProperties({
}
// Skeleton component for EventProperties
-const EventPropertiesSkeleton = memo(
- ({ size = "small" }: { size?: "small" | "large" }) => {
- // Generate random number of property groups (2-4)
- const groupCount = 2 + Math.floor(Math.random() * 3);
-
- // Generate random number of properties per group (2-5)
- const propertyCounts = Array.from(
- { length: groupCount },
- () => 2 + Math.floor(Math.random() * 4)
- );
+const EventPropertiesSkeleton = memo(({ size = "small" }: { size?: "small" | "large" }) => {
+ // Generate random number of property groups (2-4)
+ const groupCount = 2 + Math.floor(Math.random() * 3);
- // Generate random widths for property values
- const generateWidths = (count: number) =>
- Array.from({ length: count }, () => 20 + Math.random() * 80);
+ // Generate random number of properties per group (2-5)
+ const propertyCounts = Array.from({ length: groupCount }, () => 2 + Math.floor(Math.random() * 4));
- // Generate random widths for property bars
- const generateBarWidths = (count: number) =>
- Array.from({ length: count }, () => 20 + Math.random() * 80);
+ // Generate random widths for property values
+ const generateWidths = (count: number) => Array.from({ length: count }, () => 20 + Math.random() * 80);
- return (
- <div
- className={cn(
- "flex flex-col gap-4 overflow-y-auto pr-2",
- size === "small" ? "max-h-[30vh]" : "max-h-[60vh]"
- )}
- >
- {Array.from({ length: groupCount }).map((_, groupIndex) => (
- <div
- key={groupIndex}
- className={cn(
- "flex flex-col gap-1",
- size === "small" ? "text-xs" : "text-sm"
- )}
- >
- {/* Property Key Header Skeleton */}
- <div className="font-semibold py-1 border-b border-neutral-800">
- <div className="h-4 bg-neutral-800 rounded animate-pulse w-24"></div>
- </div>
+ // Generate random widths for property bars
+ const generateBarWidths = (count: number) => Array.from({ length: count }, () => 20 + Math.random() * 80);
- {/* Property Values Skeleton */}
- <div className="pl-4 flex flex-col gap-2">
- {Array.from({ length: propertyCounts[groupIndex] }).map(
- (_, propIndex) => {
- const valueWidths = generateWidths(
- propertyCounts[groupIndex]
- );
- const barWidths = generateBarWidths(
- propertyCounts[groupIndex]
- );
-
- return (
- <div
- key={propIndex}
- className={cn(
- "relative flex items-center px-2 rounded-md",
- size === "small" ? "h-6" : "h-8"
- )}
- >
+ return (
+ <div className={cn("flex flex-col gap-4 overflow-y-auto pr-2", size === "small" ? "max-h-[30vh]" : "max-h-[60vh]")}>
+ {Array.from({ length: groupCount }).map((_, groupIndex) => (
+ <div key={groupIndex} className={cn("flex flex-col gap-1", size === "small" ? "text-xs" : "text-sm")}>
+ {/* Property Key Header Skeleton */}
+ <div className="font-semibold py-1 border-b border-neutral-800">
+ <div className="h-4 bg-neutral-800 rounded animate-pulse w-24"></div>
+ </div>
+
+ {/* Property Values Skeleton */}
+ <div className="pl-4 flex flex-col gap-2">
+ {Array.from({ length: propertyCounts[groupIndex] }).map((_, propIndex) => {
+ const valueWidths = generateWidths(propertyCounts[groupIndex]);
+ const barWidths = generateBarWidths(propertyCounts[groupIndex]);
+
+ return (
+ <div
+ key={propIndex}
+ className={cn("relative flex items-center px-2 rounded-md", size === "small" ? "h-6" : "h-8")}
+ >
+ <div
+ className="absolute inset-0 bg-neutral-800 py-2 opacity-25 rounded-md animate-pulse"
+ style={{ width: `${barWidths[propIndex]}%` }}
+ ></div>
+ <div className="z-10 flex justify-between items-center w-full">
+ <div className="truncate max-w-[70%]">
<div
- className="absolute inset-0 bg-neutral-800 py-2 opacity-25 rounded-md animate-pulse"
- style={{ width: `${barWidths[propIndex]}%` }}
+ className="h-4 bg-neutral-800 rounded animate-pulse"
+ style={{ width: `${valueWidths[propIndex]}px` }}
></div>
- <div className="z-10 flex justify-between items-center w-full">
- <div className="truncate max-w-[70%]">
- <div
- className="h-4 bg-neutral-800 rounded animate-pulse"
- style={{ width: `${valueWidths[propIndex]}px` }}
- ></div>
- </div>
- <div className="flex gap-2">
- <div
- className="h-4 bg-neutral-800 rounded animate-pulse"
- style={{ width: "40px" }}
- ></div>
- </div>
- </div>
</div>
- );
- }
- )}
- </div>
+ <div className="flex gap-2">
+ <div className="h-4 bg-neutral-800 rounded animate-pulse" style={{ width: "40px" }}></div>
+ </div>
+ </div>
+ </div>
+ );
+ })}
</div>
- ))}
- </div>
- );
- }
-);
+ </div>
+ ))}
+ </div>
+ );
+});
diff --git a/client/src/app/[site]/events/page.tsx b/client/src/app/[site]/events/page.tsx
index 27a9024d4..0f10fb4aa 100644
--- a/client/src/app/[site]/events/page.tsx
+++ b/client/src/app/[site]/events/page.tsx
@@ -38,9 +38,9 @@ export default function EventsPage() {
</CardHeader>
<CardContent className="lg:flex-1 lg:min-h-0 overflow-hidden p-0">
<div className="h-auto lg:h-full lg:min-h-0 p-4 pt-0">
- <OutboundLinksList
- outboundLinks={outboundLinksData || []}
- isLoading={isLoadingOutboundLinks}
+ <OutboundLinksList
+ outboundLinks={outboundLinksData || []}
+ isLoading={isLoadingOutboundLinks}
size="large"
/>
</div>
diff --git a/client/src/app/[site]/funnels/components/CreateFunnel.tsx b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
index 249187d28..4fa30fb2b 100644
--- a/client/src/app/[site]/funnels/components/CreateFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/CreateFunnel.tsx
@@ -1,19 +1,9 @@
"use client";
-import {
- FunnelStep,
- useGetFunnel,
- useSaveFunnel,
-} from "../../../../api/analytics/funnels/useGetFunnel";
+import { FunnelStep, useGetFunnel, useSaveFunnel } from "../../../../api/analytics/funnels/useGetFunnel";
import { Time } from "@/components/DateSelector/types";
import { Button } from "@/components/ui/button";
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
-} from "@/components/ui/dialog";
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { Plus } from "lucide-react";
import { DateTime } from "luxon";
import { useState } from "react";
@@ -54,7 +44,7 @@ export function CreateFunnelDialog() {
error,
isLoading: isPending,
} = useGetFunnel(
- steps.some((step) => !step.value)
+ steps.some(step => !step.value)
? undefined
: {
steps,
@@ -66,16 +56,12 @@ export function CreateFunnelDialog() {
);
// Funnel save mutation
- const {
- mutate: saveFunnel,
- isPending: isSaving,
- error: saveError,
- } = useSaveFunnel();
+ const { mutate: saveFunnel, isPending: isSaving, error: saveError } = useSaveFunnel();
// Query funnel without saving
const handleQueryFunnel = () => {
// Validate steps have values
- const hasEmptySteps = steps.some((step) => !step.value);
+ const hasEmptySteps = steps.some(step => !step.value);
if (hasEmptySteps) {
alert("All steps must have values");
return;
@@ -91,7 +77,7 @@ export function CreateFunnelDialog() {
}
// Validate steps have values
- const hasEmptySteps = steps.some((step) => !step.value);
+ const hasEmptySteps = steps.some(step => !step.value);
if (hasEmptySteps) {
alert("All steps must have values");
return;
@@ -109,21 +95,15 @@ export function CreateFunnelDialog() {
endDate = time.day;
} else if (time.mode === "week") {
startDate = time.week;
- const endDateValue = DateTime.fromISO(time.week)
- .plus({ days: 6 })
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.week).plus({ days: 6 }).toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else if (time.mode === "month") {
startDate = time.month;
- const endDateValue = DateTime.fromISO(time.month)
- .endOf("month")
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.month).endOf("month").toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else if (time.mode === "year") {
startDate = time.year;
- const endDateValue = DateTime.fromISO(time.year)
- .endOf("year")
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.year).endOf("year").toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else {
// Fall back to last 7 days for all-time
@@ -147,7 +127,7 @@ export function CreateFunnelDialog() {
// Optional: Show success message
toast?.success("Funnel saved successfully");
},
- onError: (error) => {
+ onError: error => {
// Show error but don't close dialog
toast?.error(`Failed to save funnel: ${error.message}`);
},
diff --git a/client/src/app/[site]/funnels/components/EditFunnel.tsx b/client/src/app/[site]/funnels/components/EditFunnel.tsx
index d61680ee9..e05c39c26 100644
--- a/client/src/app/[site]/funnels/components/EditFunnel.tsx
+++ b/client/src/app/[site]/funnels/components/EditFunnel.tsx
@@ -1,18 +1,9 @@
"use client";
-import {
- FunnelStep,
- useGetFunnel,
- useSaveFunnel,
-} from "../../../../api/analytics/funnels/useGetFunnel";
+import { FunnelStep, useGetFunnel, useSaveFunnel } from "../../../../api/analytics/funnels/useGetFunnel";
import { SavedFunnel } from "../../../../api/analytics/funnels/useGetFunnels";
import { Time } from "@/components/DateSelector/types";
-import {
- Dialog,
- DialogContent,
- DialogHeader,
- DialogTitle,
-} from "@/components/ui/dialog";
+import { Dialog, DialogContent, DialogHeader, DialogTitle } from "@/components/ui/dialog";
import { DateTime } from "luxon";
import { useEffect, useState } from "react";
import { toast } from "sonner";
@@ -26,11 +17,7 @@ interface EditFunnelDialogProps {
onClose: () => void;
}
-export function EditFunnelDialog({
- funnel,
- isOpen,
- onClose,
-}: EditFunnelDialogProps) {
+export function EditFunnelDialog({ funnel, isOpen, onClose }: EditFunnelDialogProps) {
// Time state - initialized from funnel configuration
const [time, setTime] = useState<Time>({
mode: "range",
@@ -67,16 +54,12 @@ export function EditFunnelDialog({
);
// Funnel save mutation
- const {
- mutate: saveFunnel,
- isPending: isSaving,
- error: saveError,
- } = useSaveFunnel();
+ const { mutate: saveFunnel, isPending: isSaving, error: saveError } = useSaveFunnel();
// Query funnel without saving
const handleQueryFunnel = () => {
// Validate steps have values
- const hasEmptySteps = steps.some((step) => !step.value);
+ const hasEmptySteps = steps.some(step => !step.value);
if (hasEmptySteps) {
alert("All steps must have values");
return;
@@ -92,7 +75,7 @@ export function EditFunnelDialog({
}
// Validate steps have values
- const hasEmptySteps = steps.some((step) => !step.value);
+ const hasEmptySteps = steps.some(step => !step.value);
if (hasEmptySteps) {
alert("All steps must have values");
return;
@@ -110,21 +93,15 @@ export function EditFunnelDialog({
endDate = time.day;
} else if (time.mode === "week") {
startDate = time.week;
- const endDateValue = DateTime.fromISO(time.week)
- .plus({ days: 6 })
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.week).plus({ days: 6 }).toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else if (time.mode === "month") {
startDate = time.month;
- const endDateValue = DateTime.fromISO(time.month)
- .endOf("month")
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.month).endOf("month").toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else if (time.mode === "year") {
startDate = time.year;
- const endDateValue = DateTime.fromISO(time.year)
- .endOf("year")
- .toISODate();
+ const endDateValue = DateTime.fromISO(time.year).endOf("year").toISODate();
endDate = endDateValue || DateTime.now().toISODate();
} else {
// Fall back to last 7 days for all-time
@@ -149,7 +126,7 @@ export function EditFunnelDialog({
// Show success message
toast?.success("Funnel updated successfully");
},
- onError: (error) => {
+ onError: error => {
// Show error but don't close dialog
toast?.error(`Failed to update funnel: ${error.message}`);
},
@@ -164,7 +141,7 @@ export function EditFunnelDialog({
}, []);
return (
- <Dialog open={isOpen} onOpenChange={(open) => !open && onClose()}>
+ <Dialog open={isOpen} onOpenChange={open => !open && onClose()}>
<DialogContent className="max-w-[95vw]">
<DialogHeader>
<DialogTitle>Edit Funnel</DialogTitle>
diff --git a/client/src/app/[site]/funnels/components/Funnel.tsx b/client/src/app/[site]/funnels/components/Funnel.tsx
index ef4fb19de..cfdb7d6e6 100644
--- a/client/src/app/[site]/funnels/components/Funnel.tsx
+++ b/client/src/app/[site]/funnels/components/Funnel.tsx
@@ -22,17 +22,10 @@ interface FunnelProps {
setTime: (time: Time) => void;
}
-export function Funnel({
- data,
- isError,
- error,
- isPending,
- time,
- setTime,
-}: FunnelProps) {
+export function Funnel({ data, isError, error, isPending, time, setTime }: FunnelProps) {
// Prepare chart data
const chartData =
- data?.map((step) => ({
+ data?.map(step => ({
stepName: step.step_name,
visitors: step.visitors,
conversionRate: step.conversion_rate,
@@ -71,39 +64,26 @@ export function Funnel({
<span>Conversion from previous step</span>
</div>
</div>
- <DateSelector
- time={time}
- setTime={setTime}
- pastMinutesEnabled={false}
- />
+ <DateSelector time={time} setTime={setTime} pastMinutesEnabled={false} />
</div>
{isError ? (
<div className="h-[400px] flex items-center justify-center">
<div className="text-red-500">
- Error:{" "}
- {error instanceof Error
- ? error.message
- : "Failed to analyze funnel"}
+ Error: {error instanceof Error ? error.message : "Failed to analyze funnel"}
</div>
</div>
) : data && chartData.length > 0 ? (
<div className="space-y-0">
{chartData.map((step, index) => {
// Calculate the percentage width for the bar
- const ratio = firstStep?.visitors
- ? step.visitors / firstStep.visitors
- : 0;
+ const ratio = firstStep?.visitors ? step.visitors / firstStep.visitors : 0;
const barWidth = Math.max(ratio * maxBarWidth, 0);
// For step 2+, calculate the number of users who dropped off
const prevStep = index > 0 ? chartData[index - 1] : null;
- const droppedUsers = prevStep
- ? prevStep.visitors - step.visitors
- : 0;
- const dropoffPercent = prevStep
- ? (droppedUsers / prevStep.visitors) * 100
- : 0;
+ const droppedUsers = prevStep ? prevStep.visitors - step.visitors : 0;
+ const dropoffPercent = prevStep ? (droppedUsers / prevStep.visitors) * 100 : 0;
return (
<div key={step.stepNumber} className="relative pb-6">
@@ -120,12 +100,8 @@ export function Funnel({
{/* Metrics */}
<div className="flex-shrink-0 min-w-[130px] mr-4">
<div className="flex items-baseline">
- <span className="text-lg font-semibold">
- {step.visitors.toLocaleString()}
- </span>
- <span className="text-sm text-neutral-400 ml-1">
- users
- </span>
+ <span className="text-lg font-semibold">{step.visitors.toLocaleString()}</span>
+ <span className="text-sm text-neutral-400 ml-1">users</span>
</div>
</div>
@@ -136,9 +112,7 @@ export function Funnel({
<div
className="absolute h-full rounded-md"
style={{
- width: `${
- (step.visitors / prevStep.visitors) * 100
- }%`,
+ width: `${(step.visitors / prevStep.visitors) * 100}%`,
background: `repeating-linear-gradient(
45deg,
rgba(16, 185, 129, 0.25),
@@ -155,9 +129,7 @@ export function Funnel({
style={{ width: `${barWidth}%` }}
></div>
<div className="absolute top-2 right-2 z-20">
- <div className="text-base font-semibold">
- {round(step.conversionRate, 2)}%
- </div>
+ <div className="text-base font-semibold">{round(step.conversionRate, 2)}%</div>
</div>
</div>
</div>
@@ -174,9 +146,7 @@ export function Funnel({
<div className="pl-8 flex">
<div className="min-w-[180px] mr-4">
<div className="flex items-baseline text-orange-500">
- <span className="text-sm font-medium">
- {droppedUsers.toLocaleString()} dropped
- </span>
+ <span className="text-sm font-medium">{droppedUsers.toLocaleString()} dropped</span>
{/* <span className="text-sm text-neutral-400 ml-1">
({dropoffPercent.toFixed(2)}%)
</span> */}
@@ -191,9 +161,7 @@ export function Funnel({
) : (
<div className="h-[400px] flex items-center justify-center">
<div className="text-neutral-400 text-sm">
- {isPending
- ? "Analyzing funnel..."
- : "Configure your funnel steps and click 'Analyze Funnel'"}
+ {isPending ? "Analyzing funnel..." : "Configure your funnel steps and click 'Analyze Funnel'"}
</div>
</div>
)}
diff --git a/client/src/app/[site]/funnels/components/FunnelForm.tsx b/client/src/app/[site]/funnels/components/FunnelForm.tsx
index 0d253a1a4..93eb2d13b 100644
--- a/client/src/app/[site]/funnels/components/FunnelForm.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelForm.tsx
@@ -59,7 +59,7 @@ export function FunnelForm({
const [showFilters, setShowFilters] = useState(filters.length > 0);
// State to track which event steps have property filtering enabled
const [useProperties, setUseProperties] = useState<boolean[]>(() =>
- steps.map((step) => !!step.eventPropertyKey && step.eventPropertyValue !== undefined)
+ steps.map(step => !!step.eventPropertyKey && step.eventPropertyValue !== undefined)
);
// Fetch suggestions for paths and events
@@ -77,13 +77,13 @@ export function FunnelForm({
// Transform data into SuggestionOption format
const pathSuggestions: SuggestionOption[] =
- pathsData?.data?.map((item) => ({
+ pathsData?.data?.map(item => ({
value: item.value,
label: item.value,
})) || [];
const eventSuggestions: SuggestionOption[] =
- eventsData?.data?.map((item) => ({
+ eventsData?.data?.map(item => ({
value: item.value,
label: item.value,
})) || [];
@@ -182,7 +182,7 @@ export function FunnelForm({
);
}
- if (steps.some((step) => !step.value)) {
+ if (steps.some(step => !step.value)) {
funnelArea = (
<div className="flex items-center justify-center bg-neutral-50 dark:bg-neutral-900 rounded-lg h-full">
<div className="text-center p-6">
@@ -210,7 +210,7 @@ export function FunnelForm({
<div className="space-y-4">
<div>
<label className="text-sm font-medium mb-1 block">Funnel Name</label>
- <Input value={name} onChange={(e) => setName(e.target.value)} placeholder="Enter funnel name" />
+ <Input value={name} onChange={e => setName(e.target.value)} placeholder="Enter funnel name" />
</div>
{/* Funnel Steps in a boxed container */}
@@ -231,10 +231,7 @@ export function FunnelForm({
<div className="flex-shrink-0 w-6 h-6 rounded-full border border-neutral-400 bg-neutral-750 flex items-center justify-center text-xs mt-2">
{index + 1}
</div>
- <Select
- value={step.type}
- onValueChange={(value) => updateStepType(index, value as "page" | "event")}
- >
+ <Select value={step.type} onValueChange={value => updateStepType(index, value as "page" | "event")}>
<SelectTrigger className="min-w-[80px] max-w-[80px] dark:border-neutral-700">
<SelectValue placeholder="Type" />
</SelectTrigger>
@@ -251,7 +248,7 @@ export function FunnelForm({
placeholder={step.type === "page" ? "Path (e.g. /pricing)" : "Event name"}
value={step.value}
className="dark:border-neutral-700"
- onChange={(e) => updateStep(index, "value", e.target.value)}
+ onChange={e => updateStep(index, "value", e.target.value)}
/>
{step.type === "page" && (
<div className="text-xs text-neutral-500 mt-1">
@@ -264,7 +261,7 @@ export function FunnelForm({
placeholder="Label (optional)"
className="dark:border-neutral-700"
value={step.name || ""}
- onChange={(e) => updateStep(index, "name", e.target.value)}
+ onChange={e => updateStep(index, "name", e.target.value)}
/>
{/* Property filtering for event steps */}
@@ -273,7 +270,7 @@ export function FunnelForm({
<div className="flex items-center space-x-2">
<Switch
checked={useProperties[index]}
- onCheckedChange={(checked) => togglePropertyFiltering(index, checked)}
+ onCheckedChange={checked => togglePropertyFiltering(index, checked)}
id={`use-properties-${index}`}
/>
<Label htmlFor={`use-properties-${index}`}>Filter by event property</Label>
@@ -285,13 +282,13 @@ export function FunnelForm({
placeholder="Property key"
className="dark:border-neutral-700"
value={step.eventPropertyKey || ""}
- onChange={(e) => updateStep(index, "eventPropertyKey", e.target.value)}
+ onChange={e => updateStep(index, "eventPropertyKey", e.target.value)}
/>
<Input
placeholder="Property value"
className="dark:border-neutral-700"
value={step.eventPropertyValue !== undefined ? String(step.eventPropertyValue) : ""}
- onChange={(e) => updateStep(index, "eventPropertyValue", e.target.value)}
+ onChange={e => updateStep(index, "eventPropertyValue", e.target.value)}
/>
</div>
)}
diff --git a/client/src/app/[site]/funnels/components/FunnelRow.tsx b/client/src/app/[site]/funnels/components/FunnelRow.tsx
index c2b8e12a4..d876aff9d 100644
--- a/client/src/app/[site]/funnels/components/FunnelRow.tsx
+++ b/client/src/app/[site]/funnels/components/FunnelRow.tsx
@@ -7,12 +7,7 @@ import { ConfirmationModal } from "@/components/ConfirmationModal";
import { DateRangeMode, Time } from "@/components/DateSelector/types";
import { Button } from "@/components/ui/button";
import { Card } from "@/components/ui/card";
-import {
- Tooltip,
- TooltipContent,
- TooltipProvider,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from "@/components/ui/tooltip";
import {
ArrowRight,
ChevronDown,
@@ -109,14 +104,10 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
<div className="mt-1 text-xs text-neutral-400 flex flex-col gap-3">
{/* Steps visualization */}
<div className="flex flex-wrap gap-1">
- <h3 className="font-medium text-neutral-100 text-base mr-2">
- {funnel.name}
- </h3>
+ <h3 className="font-medium text-neutral-100 text-base mr-2">{funnel.name}</h3>
{funnel.steps.map((step, index) => (
<div key={index} className="flex items-center">
- {index > 0 && (
- <ArrowRight className="h-3 w-3 mx-1 text-neutral-400" />
- )}
+ {index > 0 && <ArrowRight className="h-3 w-3 mx-1 text-neutral-400" />}
<Tooltip>
<TooltipTrigger asChild>
<span className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default">
@@ -128,35 +119,26 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
<span className="max-w-[120px] overflow-hidden text-ellipsis inline-block">
{step.name || step.value}
{step.type === "event" && step.eventPropertyKey && (
- <span className="text-xs text-yellow-400 ml-1">
- *
- </span>
+ <span className="text-xs text-yellow-400 ml-1">*</span>
)}
</span>
</span>
</TooltipTrigger>
<TooltipContent side="bottom" className="text-xs">
<div>
- <span className="font-semibold">
- {step.type === "page" ? "Page" : "Event"}:
- </span>{" "}
- {step.value}
+ <span className="font-semibold">{step.type === "page" ? "Page" : "Event"}:</span> {step.value}
</div>
{step.name && (
<div>
- <span className="font-semibold">Label:</span>{" "}
- {step.name}
+ <span className="font-semibold">Label:</span> {step.name}
+ </div>
+ )}
+ {step.type === "event" && step.eventPropertyKey && step.eventPropertyValue !== undefined && (
+ <div>
+ <span className="font-semibold">Property:</span> {step.eventPropertyKey} ={" "}
+ {String(step.eventPropertyValue)}
</div>
)}
- {step.type === "event" &&
- step.eventPropertyKey &&
- step.eventPropertyValue !== undefined && (
- <div>
- <span className="font-semibold">Property:</span>{" "}
- {step.eventPropertyKey} ={" "}
- {String(step.eventPropertyValue)}
- </div>
- )}
</TooltipContent>
</Tooltip>
</div>
@@ -173,14 +155,11 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
key={index}
className="rounded bg-neutral-100 dark:bg-neutral-800 px-1.5 py-0.5 whitespace-nowrap overflow-hidden text-ellipsis flex items-center cursor-default"
>
- <span className="text-neutral-300">
- {getParameterNameLabel(filter.parameter)}
- </span>
+ <span className="text-neutral-300">{getParameterNameLabel(filter.parameter)}</span>
<span
className={cn(
"mx-1",
- filter.type === "not_equals" ||
- filter.type === "not_contains"
+ filter.type === "not_equals" || filter.type === "not_contains"
? "text-red-400"
: "text-emerald-400"
)}
@@ -188,9 +167,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
{filterTypeToLabel(filter.type)}
</span>
<span className="text-neutral-100 max-w-[100px] overflow-hidden text-ellipsis inline-block">
- {filter.value.length > 0
- ? getParameterValueLabel(filter, getRegionName)
- : "empty"}
+ {filter.value.length > 0 ? getParameterValueLabel(filter, getRegionName) : "empty"}
</span>
</span>
))}
@@ -206,7 +183,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
<Button
variant="ghost"
size="icon"
- onClick={(e) => {
+ onClick={e => {
e.stopPropagation();
setIsEditModalOpen(true);
}}
@@ -218,7 +195,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
<Button
variant="ghost"
size="icon"
- onClick={(e) => {
+ onClick={e => {
e.stopPropagation();
setIsDeleteModalOpen(true);
}}
@@ -227,11 +204,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
</Button>
<Button variant="ghost" size="icon" onClick={handleExpand}>
- {expanded ? (
- <ChevronUp strokeWidth={3} />
- ) : (
- <ChevronDown strokeWidth={3} />
- )}
+ {expanded ? <ChevronUp strokeWidth={3} /> : <ChevronDown strokeWidth={3} />}
</Button>
</div>
</div>
@@ -245,22 +218,12 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
<ThreeDotLoader className="h-[400px]" />
) : isError ? (
<div className="text-red-500 p-4 text-center">
- Error loading funnel:{" "}
- {error instanceof Error ? error.message : "Unknown error"}
+ Error loading funnel: {error instanceof Error ? error.message : "Unknown error"}
</div>
) : data && data.length > 0 ? (
- <Funnel
- data={data}
- isError={isError}
- error={error}
- isPending={isPending}
- time={time}
- setTime={setTime}
- />
+ <Funnel data={data} isError={isError} error={error} isPending={isPending} time={time} setTime={setTime} />
) : (
- <div className="text-center p-6 text-neutral-500">
- No funnel data available
- </div>
+ <div className="text-center p-6 text-neutral-500">No funnel data available</div>
)}
</div>
</div>
@@ -281,11 +244,7 @@ export function FunnelRow({ funnel }: FunnelRowProps) {
{/* Edit Funnel Modal */}
{isEditModalOpen && (
- <EditFunnelDialog
- funnel={funnel}
- isOpen={isEditModalOpen}
- onClose={() => setIsEditModalOpen(false)}
- />
+ <EditFunnelDialog funnel={funnel} isOpen={isEditModalOpen} onClose={() => setIsEditModalOpen(false)} />
)}
</Card>
);
diff --git a/client/src/app/[site]/funnels/page.tsx b/client/src/app/[site]/funnels/page.tsx
index 05a904598..52b4b8fae 100644
--- a/client/src/app/[site]/funnels/page.tsx
+++ b/client/src/app/[site]/funnels/page.tsx
@@ -75,7 +75,7 @@ export default function FunnelsPage() {
</div>
<Skeleton className="h-10 w-32" />
</div>
- {[1, 2, 3].map((i) => (
+ {[1, 2, 3].map(i => (
<FunnelRowSkeleton key={i} />
))}
</div>
diff --git a/client/src/app/[site]/goals/components/GoalCard.tsx b/client/src/app/[site]/goals/components/GoalCard.tsx
index 4d038495c..453fc43e8 100644
--- a/client/src/app/[site]/goals/components/GoalCard.tsx
+++ b/client/src/app/[site]/goals/components/GoalCard.tsx
@@ -15,11 +15,7 @@ import {
} from "../../../../components/ui/alert-dialog";
import { Button } from "../../../../components/ui/button";
import GoalFormModal from "./GoalFormModal";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "../../../../components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../components/ui/tooltip";
import { Goal } from "../../../../api/analytics/goals/useGetGoals";
interface GoalCardProps {
@@ -72,17 +68,14 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {
<div className="mt-1">
<span className="text-xs text-neutral-400 mr-2">Pattern:</span>
<code className="text-xs bg-neutral-800 px-1 py-0.5 rounded">
- {goal.goalType === "path"
- ? goal.config.pathPattern
- : goal.config.eventName}
+ {goal.goalType === "path" ? goal.config.pathPattern : goal.config.eventName}
</code>
{goal.goalType === "event" && goal.config.eventPropertyKey && (
<div className="mt-1 text-xs text-neutral-400">
Property:{" "}
<code className="text-xs bg-neutral-800 px-1 py-0.5 rounded text-neutral-100">
- {goal.config.eventPropertyKey}:{" "}
- {String(goal.config.eventPropertyValue)}
+ {goal.config.eventPropertyKey}: {String(goal.config.eventPropertyValue)}
</code>
</div>
)}
@@ -93,15 +86,11 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {
<div className="flex-1 flex justify-center">
<div className="grid grid-cols-2 gap-4">
<div className="text-center">
- <div className="font-bold text-base">
- {goal.total_conversions.toLocaleString()}
- </div>
+ <div className="font-bold text-base">{goal.total_conversions.toLocaleString()}</div>
<div className="text-xs text-neutral-400">Conversions</div>
</div>
<div className="text-center">
- <div className="font-bold text-base">
- {(goal.conversion_rate * 100).toFixed(2)}%
- </div>
+ <div className="font-bold text-base">{(goal.conversion_rate * 100).toFixed(2)}%</div>
<div className="text-xs text-neutral-400">Conversion Rate</div>
</div>
</div>
@@ -118,11 +107,7 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {
</Button>
}
/>
- <Button
- onClick={() => setIsDeleteDialogOpen(true)}
- variant="ghost"
- size="smIcon"
- >
+ <Button onClick={() => setIsDeleteDialogOpen(true)} variant="ghost" size="smIcon">
<Trash2 className="h-4 w-4" />
</Button>
</div>
@@ -137,18 +122,12 @@ export default function GoalCard({ goal, siteId }: GoalCardProps) {
</div>
{/* Delete Confirmation Dialog */}
- <AlertDialog
- open={isDeleteDialogOpen}
- onOpenChange={setIsDeleteDialogOpen}
- >
+ <AlertDialog open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
<AlertDialogContent>
<AlertDialogHeader>
- <AlertDialogTitle>
- Are you sure you want to delete this goal?
- </AlertDialogTitle>
+ <AlertDialogTitle>Are you sure you want to delete this goal?</AlertDialogTitle>
<AlertDialogDescription>
- This action cannot be undone. This will permanently delete the
- goal and remove it from all reports.
+ This action cannot be undone. This will permanently delete the goal and remove it from all reports.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
diff --git a/client/src/app/[site]/goals/components/GoalFormModal.tsx b/client/src/app/[site]/goals/components/GoalFormModal.tsx
index 9959eebb3..b7b6a5943 100644
--- a/client/src/app/[site]/goals/components/GoalFormModal.tsx
+++ b/client/src/app/[site]/goals/components/GoalFormModal.tsx
@@ -38,7 +38,7 @@ const formSchema = z
}),
})
.refine(
- (data) => {
+ data => {
if (data.goalType === "path") {
return !!data.config.pathPattern;
} else if (data.goalType === "event") {
@@ -81,13 +81,13 @@ export default function GoalFormModal({ siteId, goal, trigger }: GoalFormModalPr
// Transform data into SuggestionOption format
const pathSuggestions: SuggestionOption[] =
- pathsData?.data?.map((item) => ({
+ pathsData?.data?.map(item => ({
value: item.value,
label: item.value,
})) || [];
const eventSuggestions: SuggestionOption[] =
- eventsData?.data?.map((item) => ({
+ eventsData?.data?.map(item => ({
value: item.value,
label: item.value,
})) || [];
@@ -184,7 +184,7 @@ export default function GoalFormModal({ siteId, goal, trigger }: GoalFormModalPr
return (
<Dialog
open={isOpen}
- onOpenChange={(open) => {
+ onOpenChange={open => {
setIsOpen(open);
if (!open) {
form.reset();
diff --git a/client/src/app/[site]/goals/components/GoalsList.tsx b/client/src/app/[site]/goals/components/GoalsList.tsx
index e3a521f87..025559f3e 100644
--- a/client/src/app/[site]/goals/components/GoalsList.tsx
+++ b/client/src/app/[site]/goals/components/GoalsList.tsx
@@ -11,7 +11,7 @@ interface GoalsListProps {
export default function GoalsList({ goals, siteId }: GoalsListProps) {
return (
<div className="flex flex-col gap-3">
- {goals.map((goal) => (
+ {goals.map(goal => (
<GoalCard key={goal.goalId} goal={goal} siteId={siteId} />
))}
</div>
diff --git a/client/src/app/[site]/goals/page.tsx b/client/src/app/[site]/goals/page.tsx
index f629bcffe..7929e5e54 100644
--- a/client/src/app/[site]/goals/page.tsx
+++ b/client/src/app/[site]/goals/page.tsx
@@ -36,7 +36,7 @@ export default function GoalsPage() {
},
getPageCount: () => goalsData?.meta?.totalPages || 1,
setPageIndex: (index: number) => {
- setPagination((prev) => ({ ...prev, pageIndex: index }));
+ setPagination(prev => ({ ...prev, pageIndex: index }));
// Scroll to top of page when changing pages
window.scrollTo({
top: 0,
@@ -45,13 +45,13 @@ export default function GoalsPage() {
},
previousPage: () => {
if (pagination.pageIndex > 0) {
- setPagination((prev) => ({ ...prev, pageIndex: prev.pageIndex - 1 }));
+ setPagination(prev => ({ ...prev, pageIndex: prev.pageIndex - 1 }));
window.scrollTo({ top: 0, behavior: "smooth" });
}
},
nextPage: () => {
if (goalsData?.meta && pagination.pageIndex + 1 < goalsData.meta.totalPages) {
- setPagination((prev) => ({ ...prev, pageIndex: prev.pageIndex + 1 }));
+ setPagination(prev => ({ ...prev, pageIndex: prev.pageIndex + 1 }));
window.scrollTo({ top: 0, behavior: "smooth" });
}
},
diff --git a/client/src/app/[site]/journeys/page.tsx b/client/src/app/[site]/journeys/page.tsx
index dd3c7a047..dd3254204 100644
--- a/client/src/app/[site]/journeys/page.tsx
+++ b/client/src/app/[site]/journeys/page.tsx
@@ -58,12 +58,12 @@ export default function JourneysPage() {
const nodes: any[] = [];
const links: any[] = [];
- data?.journeys?.slice(0, maxJourneys).forEach((journey) => {
+ data?.journeys?.slice(0, maxJourneys).forEach(journey => {
for (let i = 0; i < journey.path.length; i++) {
const stepName = journey.path[i];
const stepKey = `${i}_${stepName}`;
- if (!nodes.find((n) => n.id === stepKey)) {
+ if (!nodes.find(n => n.id === stepKey)) {
nodes.push({
id: stepKey,
name: stepName,
@@ -77,7 +77,7 @@ export default function JourneysPage() {
const sourceKey = stepKey;
const targetKey = `${i + 1}_${journey.path[i + 1]}`;
- const existingLink = links.find((l) => l.source === sourceKey && l.target === targetKey);
+ const existingLink = links.find(l => l.source === sourceKey && l.target === targetKey);
if (existingLink) {
existingLink.value += journey.count;
@@ -93,10 +93,10 @@ export default function JourneysPage() {
});
// Calculate dimensions based on node distribution
- const nodesByStep = d3.group(nodes, (d) => d.step);
+ const nodesByStep = d3.group(nodes, d => d.step);
// Calculate max nodes per step for height calculation
- const maxNodesInAnyStep = Math.max(...Array.from(nodesByStep.values()).map((stepNodes) => stepNodes.length));
+ const maxNodesInAnyStep = Math.max(...Array.from(nodesByStep.values()).map(stepNodes => stepNodes.length));
// Width calculation that fills available space but doesn't shrink below minimum
const minStepWidth = 300; // Minimum width per step
@@ -133,9 +133,9 @@ export default function JourneysPage() {
.attr("transform", `translate(${margin.left},${margin.top})`);
// Track incoming and outgoing links for each node
- links.forEach((link) => {
- const sourceNode = nodes.find((n) => n.id === link.source);
- const targetNode = nodes.find((n) => n.id === link.target);
+ links.forEach(link => {
+ const sourceNode = nodes.find(n => n.id === link.source);
+ const targetNode = nodes.find(n => n.id === link.target);
if (sourceNode) sourceNode.outgoingLinks.push(link);
if (targetNode) targetNode.incomingLinks.push(link);
@@ -153,11 +153,11 @@ export default function JourneysPage() {
});
// Find the maximum link value for scaling
- const maxLinkValue = d3.max(links, (link) => link.value) || 1;
+ const maxLinkValue = d3.max(links, link => link.value) || 1;
const linkWidthScale = d3.scaleLinear().domain([0, maxLinkValue]).range([1, MAX_LINK_HEIGHT]);
// Calculate node heights based on connected links
- nodes.forEach((node) => {
+ nodes.forEach(node => {
// Sum the values of incoming and outgoing links
const incomingValue = node.incomingLinks.reduce((sum: number, link: any) => sum + link.value, 0);
const outgoingValue = node.outgoingLinks.reduce((sum: number, link: any) => sum + link.value, 0);
@@ -173,7 +173,7 @@ export default function JourneysPage() {
node.count = node.step === 0 ? outgoingValue : incomingValue;
// Store percentage - find the corresponding journey data
- const matchingJourney = data?.journeys?.find((journey) => {
+ const matchingJourney = data?.journeys?.find(journey => {
// Compare path at this step with node name
return journey.path[node.step] === node.name;
});
@@ -183,7 +183,7 @@ export default function JourneysPage() {
});
// Calculate link positions along each node
- nodes.forEach((node) => {
+ nodes.forEach(node => {
// Sort links by value (descending) for consistent ordering
node.incomingLinks.sort((a: any, b: any) => b.value - a.value);
node.outgoingLinks.sort((a: any, b: any) => b.value - a.value);
@@ -234,9 +234,9 @@ export default function JourneysPage() {
.data(links)
.join("path")
.attr("class", "link")
- .attr("d", (d) => {
- const source = nodes.find((n) => n.id === d.source);
- const target = nodes.find((n) => n.id === d.target);
+ .attr("d", d => {
+ const source = nodes.find(n => n.id === d.source);
+ const target = nodes.find(n => n.id === d.target);
if (!source || !target) return "";
@@ -259,7 +259,7 @@ export default function JourneysPage() {
})
.attr("fill", "none")
.attr("stroke", "hsl(var(--accent-500))")
- .attr("stroke-width", (d) => linkWidthScale(d.value))
+ .attr("stroke-width", d => linkWidthScale(d.value))
.attr("opacity", 0.6)
.attr("data-id", (d, i) => `link-${i}`) // Add unique identifier for each link
// Add hover effects
@@ -268,8 +268,8 @@ export default function JourneysPage() {
const hoveredLinkId = hoveredLink.attr("data-id");
// Find source and target nodes for this link
- const source = nodes.find((n) => n.id === d.source);
- const target = nodes.find((n) => n.id === d.target);
+ const source = nodes.find(n => n.id === d.source);
+ const target = nodes.find(n => n.id === d.target);
// Make all other links more transparent
d3.selectAll(".link")
@@ -315,20 +315,20 @@ export default function JourneysPage() {
})
// Add tooltips showing the exact count
.append("title")
- .text((d) => `Count: ${d.value}`);
+ .text(d => `Count: ${d.value}`);
const nodeGroups = g
.selectAll(".node")
.data(nodes)
.join("g")
.attr("class", "node")
- .attr("transform", (d) => `translate(${d.x},${d.y - d.height / 2})`);
+ .attr("transform", d => `translate(${d.x},${d.y - d.height / 2})`);
nodeGroups
.append("rect")
.attr("class", "node-bar")
.attr("width", 10)
- .attr("height", (d) => d.height)
+ .attr("height", d => d.height)
.attr("fill", "hsl(var(--neutral-500))")
.attr("rx", 2) // Rounded corners
.attr("ry", 2);
@@ -338,8 +338,8 @@ export default function JourneysPage() {
.append("rect")
.attr("class", "node-card")
.attr("x", 18)
- .attr("y", (d) => d.height / 2 - 17) // Position above the vertical center, taller card
- .attr("width", (d) => {
+ .attr("y", d => d.height / 2 - 17) // Position above the vertical center, taller card
+ .attr("width", d => {
// Find the width needed for both lines
const pathText = d.name;
const statsText = `${d.count} (${d.percentage.toFixed(1)}%)`;
@@ -360,7 +360,7 @@ export default function JourneysPage() {
const pathLinks = nodeGroups
.append("a") // Append 'a' element for the link
// Construct the URL using the domain from siteMetadata and the path from the node name
- .attr("xlink:href", (d) => `https://${siteMetadata.domain}${d.name}`)
+ .attr("xlink:href", d => `https://${siteMetadata.domain}${d.name}`)
.attr("target", "_blank") // Open link in a new tab
.attr("rel", "noopener noreferrer"); // Security best practice for target="_blank"
@@ -368,8 +368,8 @@ export default function JourneysPage() {
.append("text")
.attr("class", "node-text node-link-text")
.attr("x", 23)
- .attr("y", (d) => d.height / 2 - 2)
- .text((d) => d.name)
+ .attr("y", d => d.height / 2 - 2)
+ .text(d => d.name)
.attr("font-size", "12px")
.attr("fill", "white")
.attr("text-anchor", "start")
@@ -380,8 +380,8 @@ export default function JourneysPage() {
.append("text")
.attr("class", "node-text node-count-text")
.attr("x", 23) // Same left padding
- .attr("y", (d) => d.height / 2 + 12) // Position for second line
- .text((d) => `${d.count.toLocaleString()}`)
+ .attr("y", d => d.height / 2 + 12) // Position for second line
+ .text(d => `${d.count.toLocaleString()}`)
.attr("font-size", "11px") // Slightly smaller font
.attr("fill", "hsl(var(--neutral-300))")
.attr("text-anchor", "start");
@@ -398,24 +398,24 @@ export default function JourneysPage() {
</div>
<div className="flex justify-end items-center gap-2 mb-2">
<DateSelector time={time} setTime={setTime} pastMinutesEnabled={false} />
- <Select value={steps.toString()} onValueChange={(value) => setSteps(Number(value))}>
+ <Select value={steps.toString()} onValueChange={value => setSteps(Number(value))}>
<SelectTrigger className="w-[120px]">
<SelectValue placeholder="Number of steps" />
</SelectTrigger>
<SelectContent>
- {[2, 3, 4, 5, 6, 7, 8, 9, 10].map((step) => (
+ {[2, 3, 4, 5, 6, 7, 8, 9, 10].map(step => (
<SelectItem key={step} value={step.toString()}>
{step} steps
</SelectItem>
))}
</SelectContent>
</Select>
- <Select value={maxJourneys.toString()} onValueChange={(value) => setMaxJourneys(Number(value))}>
+ <Select value={maxJourneys.toString()} onValueChange={value => setMaxJourneys(Number(value))}>
<SelectTrigger className="w-[140px]">
<SelectValue placeholder="Max journeys" />
</SelectTrigger>
<SelectContent>
- {[10, 25, 50, 100, 150, 200].map((count) => (
+ {[10, 25, 50, 100, 150, 200].map(count => (
<SelectItem key={count} value={count.toString()}>
{count} journeys
</SelectItem>
diff --git a/client/src/app/[site]/main/components/MainSection/Chart.tsx b/client/src/app/[site]/main/components/MainSection/Chart.tsx
index ebcc7d631..78fe068a9 100644
--- a/client/src/app/[site]/main/components/MainSection/Chart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Chart.tsx
@@ -26,12 +26,12 @@ const getMax = (time: Time, bucket: TimeBucket) => {
bucket === "hour"
? 59
: bucket === "fifteen_minutes"
- ? 14
- : bucket === "ten_minutes"
- ? 9
- : bucket === "five_minutes"
- ? 4
- : 0,
+ ? 14
+ : bucket === "ten_minutes"
+ ? 9
+ : bucket === "five_minutes"
+ ? 4
+ : 0,
});
return now < dayDate ? dayDate.toJSDate() : undefined;
} else if (time.mode === "range") {
@@ -45,12 +45,12 @@ const getMax = (time: Time, bucket: TimeBucket) => {
bucket === "hour"
? 59
: bucket === "fifteen_minutes"
- ? 14
- : bucket === "ten_minutes"
- ? 9
- : bucket === "five_minutes"
- ? 4
- : 0,
+ ? 14
+ : bucket === "ten_minutes"
+ ? 9
+ : bucket === "five_minutes"
+ ? 4
+ : 0,
});
return now < rangeDate ? rangeDate.toJSDate() : undefined;
} else if (time.mode === "week") {
@@ -155,7 +155,7 @@ export function Chart({
i >= lengthDiff ? DateTime.fromSQL(previousData?.data?.[i - lengthDiff]?.time ?? "").toUTC() : undefined,
};
})
- .filter((e) => e !== null) || [];
+ .filter(e => e !== null) || [];
const currentDayStr = DateTime.now().toISODate();
const currentMonthStr = DateTime.now().toFormat("yyyy-MM-01");
@@ -233,7 +233,7 @@ export function Chart({
return series.map(({ id, data, color }) => (
<path
key={id}
- d={lineGenerator(data.map((d) => ({ x: xScale(d.data.x), y: yScale(d.data.y) })))!}
+ d={lineGenerator(data.map(d => ({ x: xScale(d.data.x), y: yScale(d.data.y) })))!}
fill="none"
stroke={color}
style={id === "dashedData" ? { strokeDasharray: "3, 6", strokeWidth: 3 } : { strokeWidth: 2 }}
@@ -278,7 +278,7 @@ export function Chart({
? 24
: Math.min(12, data?.data?.length ?? 0)
),
- format: (value) => {
+ format: value => {
const dt = DateTime.fromJSDate(value).setLocale(userLocale);
if (time.mode === "past-minutes") {
if (time.pastMinutesStart < 1440) {
diff --git a/client/src/app/[site]/main/components/MainSection/MainSection.tsx b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
index cb0ea4fcb..ff41f986e 100644
--- a/client/src/app/[site]/main/components/MainSection/MainSection.tsx
+++ b/client/src/app/[site]/main/components/MainSection/MainSection.tsx
@@ -75,34 +75,24 @@ export function MainSection() {
<div className="flex items-center space-x-4">
<Link
href={session.data ? "/" : "https://rybbit.io"}
- className={cn(
- "text-lg font-semibold flex items-center gap-1.5 opacity-75",
- tilt_wrap.className
- )}
+ className={cn("text-lg font-semibold flex items-center gap-1.5 opacity-75", tilt_wrap.className)}
>
<Image src="/rybbit.svg" alt="Rybbit" width={20} height={20} />
rybbit.io
</Link>
</div>
- <span className="text-sm text-neutral-200">
- {SELECTED_STAT_MAP[selectedStat]}
- </span>
+ <span className="text-sm text-neutral-200">{SELECTED_STAT_MAP[selectedStat]}</span>
<BucketSelection />
</div>
<div className="h-[200px] md:h-[290px] relative">
<div className="absolute top-0 left-0 w-full h-full">
- <PreviousChart
- data={previousData}
- max={maxOfDataAndPreviousData}
- />
+ <PreviousChart data={previousData} max={maxOfDataAndPreviousData} />
</div>
<div className="absolute top-0 left-0 w-full h-full">
<Chart
data={data}
max={maxOfDataAndPreviousData}
- previousData={
- time.mode === "all-time" ? undefined : previousData
- }
+ previousData={time.mode === "all-time" ? undefined : previousData}
/>
</div>
</div>
diff --git a/client/src/app/[site]/main/components/MainSection/Overview.tsx b/client/src/app/[site]/main/components/MainSection/Overview.tsx
index d00543e1d..5ef8620cb 100644
--- a/client/src/app/[site]/main/components/MainSection/Overview.tsx
+++ b/client/src/app/[site]/main/components/MainSection/Overview.tsx
@@ -37,16 +37,10 @@ const ChangePercentage = ({
<div
className={cn(
"text-xs flex items-center gap-1",
- (reverseColor ? -change : change) > 0
- ? "text-green-400"
- : "text-red-400"
+ (reverseColor ? -change : change) > 0 ? "text-green-400" : "text-red-400"
)}
>
- {change > 0 ? (
- <TrendingUp className="w-4 h-4" />
- ) : (
- <TrendingDown className="w-4 h-4" />
- )}
+ {change > 0 ? <TrendingUp className="w-4 h-4" /> : <TrendingDown className="w-4 h-4" />}
{Math.abs(change).toFixed(1)}%
</div>
);
@@ -85,14 +79,12 @@ const Stat = ({
// Filter and format sparklines data
const sparklinesData =
data?.data
- ?.filter((d) => {
+ ?.filter(d => {
// For past-minutes mode, ensure we only show data within the specified time range
if (time.mode === "past-minutes") {
const timestamp = new Date(d.time);
const now = new Date();
- const startTime = new Date(
- now.getTime() - time.pastMinutesStart * 60 * 1000
- );
+ const startTime = new Date(now.getTime() - time.pastMinutesStart * 60 * 1000);
return timestamp >= startTime && timestamp <= now;
}
return true;
@@ -148,11 +140,7 @@ const Stat = ({
{postfix && <span>{postfix}</span>}
</span>
)}
- <ChangePercentage
- current={value}
- previous={previous}
- reverseColor={reverseColor}
- />
+ <ChangePercentage current={value} previous={previous} reverseColor={reverseColor} />
</>
)}
</div>
@@ -178,11 +166,10 @@ export function Overview() {
});
// Previous period - automatically handles both regular time-based and past-minutes queries
- const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } =
- useGetOverview({
- site,
- periodTime: "previous",
- });
+ const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } = useGetOverview({
+ site,
+ periodTime: "previous",
+ });
const isLoading = isOverviewLoading || isOverviewLoadingPrevious;
@@ -196,32 +183,18 @@ export function Overview() {
const previousPageviews = overviewDataPrevious?.data?.pageviews ?? 0;
const currentPagesPerSession = overviewData?.data?.pages_per_session ?? 0;
- const previousPagesPerSession =
- overviewDataPrevious?.data?.pages_per_session ?? 0;
+ const previousPagesPerSession = overviewDataPrevious?.data?.pages_per_session ?? 0;
const currentBounceRate = overviewData?.data?.bounce_rate ?? 0;
const previousBounceRate = overviewDataPrevious?.data?.bounce_rate ?? 0;
const currentSessionDuration = overviewData?.data?.session_duration ?? 0;
- const previousSessionDuration =
- overviewDataPrevious?.data?.session_duration ?? 0;
+ const previousSessionDuration = overviewDataPrevious?.data?.session_duration ?? 0;
return (
<div className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-6 gap-0 items-center">
- <Stat
- title="Unique Users"
- id="users"
- value={currentUsers}
- previous={previousUsers}
- isLoading={isLoading}
- />
- <Stat
- title="Sessions"
- id="sessions"
- value={currentSessions}
- previous={previousSessions}
- isLoading={isLoading}
- />
+ <Stat title="Unique Users" id="users" value={currentUsers} previous={previousUsers} isLoading={isLoading} />
+ <Stat title="Sessions" id="sessions" value={currentSessions} previous={previousSessions} isLoading={isLoading} />
<Stat
title="Pageviews"
id="pageviews"
diff --git a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
index 5a80de5c7..c3800be77 100644
--- a/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/PreviousChart.tsx
@@ -46,7 +46,7 @@ export function PreviousChart({
const size = (data?.data.length ?? 0 / 2) + 1;
const formattedData = data?.data
- ?.map((e) => {
+ ?.map(e => {
const timestamp = DateTime.fromSQL(e.time).toUTC();
return {
x: timestamp.toFormat("yyyy-MM-dd HH:mm:ss"),
@@ -97,7 +97,7 @@ export function PreviousChart({
tickRotation: 0,
truncateTickAt: 0,
tickValues: 0,
- format: (value) => {
+ format: value => {
const localTime = DateTime.fromJSDate(value).toLocal();
if ((time.mode === "past-minutes" && time.pastMinutesStart >= 1440) || time.mode === "day") {
diff --git a/client/src/app/[site]/main/components/MainSection/SparklinesChart.tsx b/client/src/app/[site]/main/components/MainSection/SparklinesChart.tsx
index d21e6ddd7..ae24c6c14 100644
--- a/client/src/app/[site]/main/components/MainSection/SparklinesChart.tsx
+++ b/client/src/app/[site]/main/components/MainSection/SparklinesChart.tsx
@@ -23,7 +23,7 @@ export function SparklinesChart({
currentTime: DateTime.fromSQL(e.time),
};
})
- .filter((e) => e !== null);
+ .filter(e => e !== null);
return (
<ResponsiveLine
@@ -75,7 +75,7 @@ export function SparklinesChart({
},
]}
curve="step"
- fill={[{ match: (d) => d.id === "1", id: "gradient" }]}
+ fill={[{ match: d => d.id === "1", id: "gradient" }]}
sliceTooltip={() => null}
enableCrosshair={false}
/>
diff --git a/client/src/app/[site]/main/components/sections/Countries.tsx b/client/src/app/[site]/main/components/sections/Countries.tsx
index c98833349..2c98135b1 100644
--- a/client/src/app/[site]/main/components/sections/Countries.tsx
+++ b/client/src/app/[site]/main/components/sections/Countries.tsx
@@ -1,12 +1,7 @@
"use client";
import { ChevronRight, Expand, Globe } from "lucide-react";
import { useState } from "react";
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from "../../../../../components/ui/basic-tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
import { Card, CardContent } from "../../../../../components/ui/card";
import { getCountryName, getLanguageName } from "../../../../../lib/utils";
import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";
@@ -46,11 +41,7 @@ export function Countries() {
return (
<Card className="h-[405px]">
<CardContent className="mt-2">
- <Tabs
- defaultValue="countries"
- value={tab}
- onValueChange={(value) => setTab(value as Tab)}
- >
+ <Tabs defaultValue="countries" value={tab} onValueChange={value => setTab(value as Tab)}>
<div className="flex flex-row gap-2 justify-between items-center">
<TabsList>
<TabsTrigger value="countries">Countries</TabsTrigger>
@@ -71,10 +62,10 @@ export function Countries() {
<StandardSection
filterParameter="country"
title="Countries"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getFilterLabel={(e) => getCountryName(e.value)}
- getLabel={(e) => {
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getFilterLabel={e => getCountryName(e.value)}
+ getLabel={e => {
return (
<div className="flex gap-2 items-center">
<CountryFlag country={e.value} />
@@ -90,21 +81,21 @@ export function Countries() {
<StandardSection
filterParameter="region"
title="Regions"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getFilterLabel={(e) => {
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getFilterLabel={e => {
const region = subdivisions?.features.find(
- (feature) => feature.properties.iso_3166_2 === e.value
+ feature => feature.properties.iso_3166_2 === e.value
)?.properties;
return region?.name ?? "";
}}
- getLabel={(e) => {
+ getLabel={e => {
if (!e.value) {
return "Unknown";
}
const region = subdivisions?.features.find(
- (feature) => feature.properties.iso_3166_2 === e.value
+ feature => feature.properties.iso_3166_2 === e.value
)?.properties;
const countryCode = e.value.split("-")[0];
@@ -126,9 +117,9 @@ export function Countries() {
<StandardSection
filterParameter="city"
title="Cities"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => {
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => {
if (!e.value || e.value === "-") {
return "Unknown";
}
@@ -136,17 +127,14 @@ export function Countries() {
const { country, region, city } = getCountryCity(e.value) ?? {};
const region_ = subdivisions?.features.find(
- (feature) =>
- feature.properties.iso_3166_2 === `${country}-${region}`
+ feature => feature.properties.iso_3166_2 === `${country}-${region}`
)?.properties;
return (
<div className="flex gap-2 items-center">
<CountryFlag country={country} />
{country}
- {region_?.name && (
- <ChevronRight className="w-4 h-4 mx-[-4px]" />
- )}
+ {region_?.name && <ChevronRight className="w-4 h-4 mx-[-4px]" />}
{region_?.name}
{city && <ChevronRight className="w-4 h-4 mx-[-4px]" />}
{city}
@@ -161,10 +149,10 @@ export function Countries() {
<StandardSection
filterParameter="language"
title="Languages"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getFilterLabel={(e) => getLanguageName(e.value) ?? ""}
- getLabel={(e) => (
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getFilterLabel={e => getLanguageName(e.value) ?? ""}
+ getLabel={e => (
<div className="flex gap-2 items-center">
{getCountryFromLanguage(e.value) ? (
<CountryFlag country={getCountryFromLanguage(e.value)!} />
diff --git a/client/src/app/[site]/main/components/sections/Devices.tsx b/client/src/app/[site]/main/components/sections/Devices.tsx
index 6d0621550..a77b8267a 100644
--- a/client/src/app/[site]/main/components/sections/Devices.tsx
+++ b/client/src/app/[site]/main/components/sections/Devices.tsx
@@ -2,25 +2,14 @@
import { Expand, Monitor, Smartphone, Tablet } from "lucide-react";
import { useState } from "react";
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from "../../../../../components/ui/basic-tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
import { Card, CardContent } from "../../../../../components/ui/card";
import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";
import { Browser } from "../../../components/shared/icons/Browser";
import { OperatingSystem } from "../../../components/shared/icons/OperatingSystem";
import { Button } from "../../../../../components/ui/button";
-type Tab =
- | "devices"
- | "browsers"
- | "os"
- | "dimensions"
- | "browser_versions"
- | "os_versions";
+type Tab = "devices" | "browsers" | "os" | "dimensions" | "browser_versions" | "os_versions";
export function Devices() {
const [tab, setTab] = useState<Tab>("browsers");
@@ -32,11 +21,7 @@ export function Devices() {
return (
<Card className="h-[405px]">
<CardContent className="mt-2">
- <Tabs
- defaultValue="browsers"
- value={tab}
- onValueChange={(value) => setTab(value as Tab)}
- >
+ <Tabs defaultValue="browsers" value={tab} onValueChange={value => setTab(value as Tab)}>
<div className="flex flex-row gap-2 justify-between items-center">
<div className="overflow-x-auto">
<TabsList>
@@ -54,9 +39,9 @@ export function Devices() {
<StandardSection
filterParameter="device_type"
title="Devices"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => (
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => (
<div className="flex gap-2 items-center">
{e.value === "Desktop" && <Monitor className="w-4 h-4" />}
{e.value === "Mobile" && <Smartphone className="w-4 h-4" />}
@@ -72,15 +57,15 @@ export function Devices() {
<StandardSection
filterParameter="browser"
title="Browsers"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => (
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => (
<div className="flex gap-2 items-center">
<Browser browser={e.value} />
{e.value || "Other"}
</div>
)}
- getSubrowLabel={(e) => {
+ getSubrowLabel={e => {
const justBrowser = e.value.split(" ").slice(0, -1).join(" ");
return (
<div className="flex gap-2 items-center">
@@ -97,15 +82,15 @@ export function Devices() {
<TabsContent value="os">
<StandardSection
title="Operating Systems"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => (
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => (
<div className="flex gap-2 items-center">
<OperatingSystem os={e.value || "Other"} />
{e.value || "Other"}
</div>
)}
- getSubrowLabel={(e) => {
+ getSubrowLabel={e => {
const justOS = e.value.split(" ").slice(0, -1).join(" ");
return (
<div className="flex gap-2 items-center">
@@ -123,13 +108,9 @@ export function Devices() {
<TabsContent value="dimensions">
<StandardSection
title="Screen Dimensions"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => (
- <div className="flex gap-2 items-center">
- {e.value || "Other"}
- </div>
- )}
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => <div className="flex gap-2 items-center">{e.value || "Other"}</div>}
filterParameter="dimensions"
expanded={expanded}
close={close}
diff --git a/client/src/app/[site]/main/components/sections/Events.tsx b/client/src/app/[site]/main/components/sections/Events.tsx
index 0ef8305b6..1140b3a48 100644
--- a/client/src/app/[site]/main/components/sections/Events.tsx
+++ b/client/src/app/[site]/main/components/sections/Events.tsx
@@ -45,19 +45,12 @@ function OutboundLinks({ expanded, close }: { expanded: boolean; close: () => vo
<div className="relative">
<div className="flex flex-row gap-2 justify-between pr-1 text-xs text-neutral-400 mb-2">
<div>Outbound Links</div>
- <div className="flex items-center gap-2">
+ <div className="flex items-center gap-2">
<div>Clicks</div>
</div>
</div>
- <OutboundLinksList
- outboundLinks={(outboundLinksData || []).slice(0, 10)}
- isLoading={isLoadingOutboundLinks}
- />
- <OutboundLinksDialog
- outboundLinks={outboundLinksData || []}
- expanded={expanded}
- close={close}
- />
+ <OutboundLinksList outboundLinks={(outboundLinksData || []).slice(0, 10)} isLoading={isLoadingOutboundLinks} />
+ <OutboundLinksDialog outboundLinks={outboundLinksData || []} expanded={expanded} close={close} />
</div>
</>
);
@@ -70,7 +63,7 @@ export function Events() {
return (
<Card>
<CardContent className="mt-2">
- <Tabs defaultValue="events" value={tab} onValueChange={(value) => setTab(value as Tab)}>
+ <Tabs defaultValue="events" value={tab} onValueChange={value => setTab(value as Tab)}>
<div className="flex flex-row gap-2 justify-between items-center">
<div className="overflow-x-auto">
<TabsList>
diff --git a/client/src/app/[site]/main/components/sections/OutboundLinksDialog.tsx b/client/src/app/[site]/main/components/sections/OutboundLinksDialog.tsx
index 3b68aefc4..88db70cc0 100644
--- a/client/src/app/[site]/main/components/sections/OutboundLinksDialog.tsx
+++ b/client/src/app/[site]/main/components/sections/OutboundLinksDialog.tsx
@@ -32,10 +32,10 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
// Prepare data with percentage and filter
const filteredAll = useMemo(() => {
- const base = outboundLinks.map((l) => ({ ...l, percentage: totalCount ? (l.count / totalCount) * 100 : 0 }));
+ const base = outboundLinks.map(l => ({ ...l, percentage: totalCount ? (l.count / totalCount) * 100 : 0 }));
if (!debouncedSearchTerm) return base;
const q = debouncedSearchTerm.toLowerCase();
- return base.filter((l) => l.url.toLowerCase().includes(q));
+ return base.filter(l => l.url.toLowerCase().includes(q));
}, [outboundLinks, totalCount, debouncedSearchTerm]);
// Reset visible rows when filter changes
@@ -48,7 +48,7 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
const hasMore = visibleCount < filteredAll.length;
useEffect(() => {
if (entry?.isIntersecting && hasMore) {
- setVisibleCount((c) => Math.min(c + BATCH_SIZE, filteredAll.length));
+ setVisibleCount(c => Math.min(c + BATCH_SIZE, filteredAll.length));
}
}, [entry?.isIntersecting, hasMore, filteredAll.length]);
@@ -77,7 +77,7 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
function toggleSort(key: SortKey) {
if (key === sortKey) {
- setSortDesc((d) => !d);
+ setSortDesc(d => !d);
} else {
setSortKey(key);
setSortDesc(key === "count" || key === "percentage" || key === "lastClicked");
@@ -97,7 +97,7 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
placeholder={`Filter ${outboundLinks.length} links...`}
className="pl-9 bg-neutral-900 border-neutral-700 text-xs"
value={searchTerm}
- onChange={(e) => setSearchTerm(e.target.value)}
+ onChange={e => setSearchTerm(e.target.value)}
/>
</div>
<div className="flex flex-col gap-2 overflow-x-auto">
@@ -111,7 +111,8 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
>
<div className="flex items-center gap-1">
Outbound Link
- {sortKey === "url" && (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
+ {sortKey === "url" &&
+ (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
</div>
</th>
<th
@@ -120,7 +121,8 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
>
<div className="flex items-center gap-1 justify-end">
Clicks
- {sortKey === "count" && (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
+ {sortKey === "count" &&
+ (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
</div>
</th>
<th
@@ -129,7 +131,8 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
>
<div className="flex items-center gap-1 justify-end">
Click %
- {sortKey === "percentage" && (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
+ {sortKey === "percentage" &&
+ (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
</div>
</th>
<th
@@ -138,7 +141,8 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
>
<div className="flex items-center gap-1 justify-end">
Last Clicked
- {sortKey === "lastClicked" && (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
+ {sortKey === "lastClicked" &&
+ (sortDesc ? <ChevronDown className="h-3 w-3" /> : <ChevronUp className="h-3 w-3" />)}
</div>
</th>
</tr>
@@ -163,8 +167,11 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
>
{row.url}
</a>
- <a href={row.url} target="_blank" rel="noopener noreferrer" onClick={(e) => e.stopPropagation()}>
- <SquareArrowOutUpRight className="ml-0.5 w-3.5 h-3.5 text-neutral-300 hover:text-neutral-100" strokeWidth={3} />
+ <a href={row.url} target="_blank" rel="noopener noreferrer" onClick={e => e.stopPropagation()}>
+ <SquareArrowOutUpRight
+ className="ml-0.5 w-3.5 h-3.5 text-neutral-300 hover:text-neutral-100"
+ strokeWidth={3}
+ />
</a>
</div>
</td>
@@ -192,9 +199,7 @@ export function OutboundLinksDialog({ outboundLinks, expanded, close }: Outbound
</div>
</div>
)}
- {!hasMore && (
- <div className="py-4 text-center text-neutral-500 text-xs">All items loaded</div>
- )}
+ {!hasMore && <div className="py-4 text-center text-neutral-500 text-xs">All items loaded</div>}
</div>
</div>
</DialogContent>
diff --git a/client/src/app/[site]/main/components/sections/Pages.tsx b/client/src/app/[site]/main/components/sections/Pages.tsx
index 4682e96ad..d3bab1ff8 100644
--- a/client/src/app/[site]/main/components/sections/Pages.tsx
+++ b/client/src/app/[site]/main/components/sections/Pages.tsx
@@ -4,12 +4,7 @@ import { useStore } from "@/lib/store";
import { Expand } from "lucide-react";
import { useState } from "react";
import { useGetSite } from "../../../../../api/admin/sites";
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from "../../../../../components/ui/basic-tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
import { Button } from "../../../../../components/ui/button";
import { Card, CardContent } from "../../../../../components/ui/card";
import { truncateString } from "../../../../../lib/utils";
@@ -30,11 +25,7 @@ export function Pages() {
return (
<Card className="h-[405px]">
<CardContent className="mt-2">
- <Tabs
- defaultValue="pages"
- value={tab}
- onValueChange={(value) => setTab(value as Tab)}
- >
+ <Tabs defaultValue="pages" value={tab} onValueChange={value => setTab(value as Tab)}>
<div className="flex flex-row gap-2 justify-between items-center">
<div className="overflow-x-auto">
<TabsList>
@@ -53,12 +44,10 @@ export function Pages() {
<StandardSection
filterParameter="pathname"
title="Pages"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) =>
- truncateString(e.value, MAX_LABEL_LENGTH) || "Other"
- }
- getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => truncateString(e.value, MAX_LABEL_LENGTH) || "Other"}
+ getLink={e => `https://${siteMetadata?.domain}${e.value}`}
expanded={expanded}
close={close}
/>
@@ -67,11 +56,9 @@ export function Pages() {
<StandardSection
filterParameter="page_title"
title="Page Title"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) =>
- truncateString(e.value, MAX_LABEL_LENGTH) || "Other"
- }
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => truncateString(e.value, MAX_LABEL_LENGTH) || "Other"}
// getLink={(e) =>
// e.pathname
// ? `https://${siteMetadata?.domain}${e.pathname}`
@@ -85,12 +72,10 @@ export function Pages() {
<StandardSection
filterParameter="entry_page"
title="Entry Pages"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) =>
- truncateString(e.value, MAX_LABEL_LENGTH) || "Other"
- }
- getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => truncateString(e.value, MAX_LABEL_LENGTH) || "Other"}
+ getLink={e => `https://${siteMetadata?.domain}${e.value}`}
expanded={expanded}
close={close}
/>
@@ -99,12 +84,10 @@ export function Pages() {
<StandardSection
filterParameter="exit_page"
title="Exit Pages"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) =>
- truncateString(e.value, MAX_LABEL_LENGTH) || "Other"
- }
- getLink={(e) => `https://${siteMetadata?.domain}${e.value}`}
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => truncateString(e.value, MAX_LABEL_LENGTH) || "Other"}
+ getLink={e => `https://${siteMetadata?.domain}${e.value}`}
expanded={expanded}
close={close}
/>
@@ -113,9 +96,9 @@ export function Pages() {
<StandardSection
filterParameter="hostname"
title="Hostnames"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
expanded={expanded}
close={close}
/>
diff --git a/client/src/app/[site]/main/components/sections/Referrers.tsx b/client/src/app/[site]/main/components/sections/Referrers.tsx
index f9ec86081..1e70c8881 100644
--- a/client/src/app/[site]/main/components/sections/Referrers.tsx
+++ b/client/src/app/[site]/main/components/sections/Referrers.tsx
@@ -1,25 +1,13 @@
"use client";
import { useState } from "react";
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from "../../../../../components/ui/basic-tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
import { Card, CardContent } from "../../../../../components/ui/card";
import { StandardSection } from "../../../components/shared/StandardSection/StandardSection";
import { Button } from "../../../../../components/ui/button";
import { Expand } from "lucide-react";
import { Favicon } from "../../../../../components/Favicon";
-type Tab =
- | "referrers"
- | "channels"
- | "utm_source"
- | "utm_medium"
- | "utm_campaign"
- | "utm_term"
- | "utm_content";
+type Tab = "referrers" | "channels" | "utm_source" | "utm_medium" | "utm_campaign" | "utm_term" | "utm_content";
export function Referrers() {
const [tab, setTab] = useState<Tab>("referrers");
@@ -31,11 +19,7 @@ export function Referrers() {
return (
<Card className="h-[405px]">
<CardContent className="mt-2">
- <Tabs
- defaultValue="referrers"
- value={tab}
- onValueChange={(value) => setTab(value as Tab)}
- >
+ <Tabs defaultValue="referrers" value={tab} onValueChange={value => setTab(value as Tab)}>
<div className="flex flex-row gap-2 justify-between items-center">
<div className="overflow-x-auto">
<TabsList>
@@ -56,10 +40,10 @@ export function Referrers() {
<StandardSection
filterParameter="referrer"
title="Referrers"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
- getLink={(e) => `https://${e.value}`}
- getLabel={(e) => (
+ getValue={e => e.value}
+ getKey={e => e.value}
+ getLink={e => `https://${e.value}`}
+ getLabel={e => (
<div className="flex items-center">
<Favicon domain={e.value} className="w-4 mr-2" />
{e.value ? e.value : "Direct"}
@@ -73,12 +57,10 @@ export function Referrers() {
<StandardSection
filterParameter="channel"
title="Channels"
- getValue={(e) => e.value}
- getKey={(e) => e.value}
+ getValue={e => e.value}
+ getKey={e => e.value}
// getLink={(e) => `https://${e.value}`}
- getLabel={(e) => (
- <div className="flex items-center">{e.value}</div>
- )}
+ getLabel={e => <div className="flex items-center">{e.value}</div>}
expanded={expanded}
close={close}
/>
@@ -87,9 +69,9 @@ export function Referrers() {
<StandardSection
filterParameter="utm_source"
title="UTM Source"
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
- getValue={(e) => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
+ getValue={e => e.value}
expanded={expanded}
close={close}
/>
@@ -98,9 +80,9 @@ export function Referrers() {
<StandardSection
filterParameter="utm_medium"
title="UTM Medium"
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
- getValue={(e) => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
+ getValue={e => e.value}
expanded={expanded}
close={close}
/>
@@ -109,9 +91,9 @@ export function Referrers() {
<StandardSection
filterParameter="utm_campaign"
title="UTM Campaign"
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
- getValue={(e) => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
+ getValue={e => e.value}
expanded={expanded}
close={close}
/>
@@ -120,9 +102,9 @@ export function Referrers() {
<StandardSection
filterParameter="utm_content"
title="UTM Content"
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
- getValue={(e) => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
+ getValue={e => e.value}
expanded={expanded}
close={close}
/>
@@ -131,9 +113,9 @@ export function Referrers() {
<StandardSection
filterParameter="utm_term"
title="UTM Term"
- getKey={(e) => e.value}
- getLabel={(e) => e.value}
- getValue={(e) => e.value}
+ getKey={e => e.value}
+ getLabel={e => e.value}
+ getValue={e => e.value}
expanded={expanded}
close={close}
/>
diff --git a/client/src/app/[site]/main/components/sections/Weekdays.tsx b/client/src/app/[site]/main/components/sections/Weekdays.tsx
index b12d3508a..8b43eee93 100644
--- a/client/src/app/[site]/main/components/sections/Weekdays.tsx
+++ b/client/src/app/[site]/main/components/sections/Weekdays.tsx
@@ -1,37 +1,14 @@
import { DateTime } from "luxon";
import { useMemo, useState } from "react";
import { useGetOverviewBucketed } from "../../../../../api/analytics/useGetOverviewBucketed";
-import {
- Tabs,
- TabsList,
- TabsTrigger,
-} from "../../../../../components/ui/basic-tabs";
-import {
- Card,
- CardContent,
- CardLoader,
-} from "../../../../../components/ui/card";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "../../../../../components/ui/select";
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "../../../../../components/ui/tooltip";
+import { Tabs, TabsList, TabsTrigger } from "../../../../../components/ui/basic-tabs";
+import { Card, CardContent, CardLoader } from "../../../../../components/ui/card";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../../../components/ui/select";
+import { Tooltip, TooltipContent, TooltipTrigger } from "../../../../../components/ui/tooltip";
import { StatType, useStore } from "../../../../../lib/store";
import { cn } from "../../../../../lib/utils";
-import {
- formatLocalTime,
- hourLabels,
- longDayNames,
- shortDayNames,
-} from "../../../../../lib/dateTimeUtils";
+import { formatLocalTime, hourLabels, longDayNames, shortDayNames } from "../../../../../lib/dateTimeUtils";
export function Weekdays() {
const { site, time } = useStore();
@@ -57,7 +34,7 @@ export function Weekdays() {
.map(() => Array(24).fill(0));
// Process each data point
- data.data.forEach((item) => {
+ data.data.forEach(item => {
if (!item || !item.time) return;
// Parse the timestamp
@@ -104,8 +81,7 @@ export function Weekdays() {
// Get color intensity based on value
const getColorIntensity = (value: number) => {
- if (maxValue === 0 || !isFinite(value) || isNaN(value))
- return "bg-neutral-800";
+ if (maxValue === 0 || !isFinite(value) || isNaN(value)) return "bg-neutral-800";
// Calculate intensity level 1-10
const ratio = value / maxValue;
@@ -173,10 +149,7 @@ export function Weekdays() {
</TabsList>
</Tabs>
- <Select
- value={metric}
- onValueChange={(value) => setMetric(value as StatType)}
- >
+ <Select value={metric} onValueChange={value => setMetric(value as StatType)}>
<SelectTrigger className="w-[160px]" size="sm">
<SelectValue placeholder="Select metric" />
</SelectTrigger>
@@ -185,9 +158,7 @@ export function Weekdays() {
<SelectItem value="pageviews">Pageviews</SelectItem>
<SelectItem value="sessions">Sessions</SelectItem>
<SelectItem value="bounce_rate">Bounce Rate</SelectItem>
- <SelectItem value="pages_per_session">
- Pages per Session
- </SelectItem>
+ <SelectItem value="pages_per_session">Pages per Session</SelectItem>
<SelectItem value="session_duration">Session Duration</SelectItem>
</SelectContent>
</Select>
@@ -201,10 +172,7 @@ export function Weekdays() {
{Array(24)
.fill(0)
.map((_, hour) => (
- <div
- key={hour}
- className="h-4 text-xs flex items-center justify-end pr-2 text-neutral-400"
- >
+ <div key={hour} className="h-4 text-xs flex items-center justify-end pr-2 text-neutral-400">
{hour % 2 === 1 ? hourLabels[hour] : ""}
</div>
))}
@@ -214,10 +182,7 @@ export function Weekdays() {
{/* Day labels */}
<div className="flex h-5">
{shortDayNames.map((day, i) => (
- <div
- key={i}
- className="flex-1 text-center text-xs text-neutral-400"
- >
+ <div key={i} className="flex-1 text-center text-xs text-neutral-400">
{day}
</div>
))}
@@ -238,8 +203,7 @@ export function Weekdays() {
heatmapData[day].length > hour
? heatmapData[day][hour]
: 0;
- const colorClass =
- value > 0 ? getColorIntensity(value) : "bg-neutral-800";
+ const colorClass = value > 0 ? getColorIntensity(value) : "bg-neutral-800";
return (
<Tooltip key={day}>
<TooltipTrigger asChild>
@@ -252,16 +216,11 @@ export function Weekdays() {
</TooltipTrigger>
<TooltipContent className="flex flex-col gap-1 p-2">
<div className="font-medium text-sm">
- {longDayNames[day]} {formatLocalTime(hour, 0)} -{" "}
- {formatLocalTime(hour, 59)}
+ {longDayNames[day]} {formatLocalTime(hour, 0)} - {formatLocalTime(hour, 59)}
</div>
<div className="flex items-center gap-2">
- <span className="font-semibold">
- {formatMetricValue(value)}
- </span>
- <span className="text-neutral-400 text-xs">
- {getMetricDisplayName(metric)}
- </span>
+ <span className="font-semibold">{formatMetricValue(value)}</span>
+ <span className="text-neutral-400 text-xs">{getMetricDisplayName(metric)}</span>
</div>
</TooltipContent>
</Tooltip>
diff --git a/client/src/app/[site]/map/page.tsx b/client/src/app/[site]/map/page.tsx
index 1c6f0aa6a..f8a042e15 100644
--- a/client/src/app/[site]/map/page.tsx
+++ b/client/src/app/[site]/map/page.tsx
@@ -25,7 +25,7 @@ export default function MapPage() {
<span className={cn(mapView === "countries" ? "text-white" : "text-neutral-400")}>Countries</span>
<Switch
checked={mapView === "subdivisions"}
- onCheckedChange={(checked) => setMapView(checked ? "subdivisions" : "countries")}
+ onCheckedChange={checked => setMapView(checked ? "subdivisions" : "countries")}
className="data-[state=checked]:bg-accent-400"
/>
<span className={cn(mapView === "subdivisions" ? "text-white" : "text-neutral-400")}>Subdivisions</span>
@@ -34,7 +34,7 @@ export default function MapPage() {
<span className={cn(mapMode === "total" ? "text-white" : "text-neutral-400")}>Total Visits</span>
<Switch
checked={mapMode === "perCapita"}
- onCheckedChange={(checked) => setMapMode(checked ? "perCapita" : "total")}
+ onCheckedChange={checked => setMapMode(checked ? "perCapita" : "total")}
className="data-[state=checked]:bg-accent-400"
/>
<span className={cn(mapMode === "perCapita" ? "text-white" : "text-neutral-400")}>Per Capita</span>
diff --git a/client/src/app/[site]/pages/components/PageListItem.tsx b/client/src/app/[site]/pages/components/PageListItem.tsx
index c38ce089c..03d5eecb5 100644
--- a/client/src/app/[site]/pages/components/PageListItem.tsx
+++ b/client/src/app/[site]/pages/components/PageListItem.tsx
@@ -23,10 +23,7 @@ type PageListItemProps = {
isLoading?: boolean;
};
-export function PageListItem({
- pageData,
- isLoading = false,
-}: PageListItemProps) {
+export function PageListItem({ pageData, isLoading = false }: PageListItemProps) {
const [isHovering, setIsHovering] = useState(false);
const [thumbnailError, setThumbnailError] = useState(false);
const { data: siteMetadata } = useGetSite();
@@ -42,54 +39,43 @@ export function PageListItem({
};
// Regular bucketed data for sparklines
- const { data: regularData, isLoading: isLoadingRegular } =
- useGetOverviewBucketed({
- site,
- bucket,
- dynamicFilters: [pageSpecificFilter],
- props: {
- enabled: !isPastMinutesMode,
- },
- });
+ const { data: regularData, isLoading: isLoadingRegular } = useGetOverviewBucketed({
+ site,
+ bucket,
+ dynamicFilters: [pageSpecificFilter],
+ props: {
+ enabled: !isPastMinutesMode,
+ },
+ });
// Past minutes data for sparklines
- const { data: pastMinutesData, isLoading: isLoadingPastMinutes } =
- useGetOverviewBucketed({
- site,
- bucket,
- dynamicFilters: [
- {
- parameter: "pathname",
- type: "equals",
- value: [pageData.value],
- },
- ],
- props: {
- enabled: isPastMinutesMode,
+ const { data: pastMinutesData, isLoading: isLoadingPastMinutes } = useGetOverviewBucketed({
+ site,
+ bucket,
+ dynamicFilters: [
+ {
+ parameter: "pathname",
+ type: "equals",
+ value: [pageData.value],
},
- });
+ ],
+ props: {
+ enabled: isPastMinutesMode,
+ },
+ });
// Use the appropriate data source based on mode
const pageTrafficData = isPastMinutesMode ? pastMinutesData : regularData;
- const isLoadingTrafficData = isPastMinutesMode
- ? isLoadingPastMinutes
- : isLoadingRegular;
+ const isLoadingTrafficData = isPastMinutesMode ? isLoadingPastMinutes : isLoadingRegular;
// External URL for the page
- const pageUrl = siteMetadata?.domain
- ? `https://${siteMetadata.domain}${pageData.value}`
- : "";
+ const pageUrl = siteMetadata?.domain ? `https://${siteMetadata.domain}${pageData.value}` : "";
// Fetch page metadata using TanStack Query
- const {
- data: metadata,
- isLoading: isLoadingMetadata,
- isError: isMetadataError,
- } = usePageMetadata(pageUrl);
+ const { data: metadata, isLoading: isLoadingMetadata, isError: isMetadataError } = usePageMetadata(pageUrl);
// Get thumbnail URL from metadata
- const thumbnailUrl =
- !thumbnailError && !isMetadataError ? metadata?.image : null;
+ const thumbnailUrl = !thumbnailError && !isMetadataError ? metadata?.image : null;
// Handle image error
const handleImageError = () => {
@@ -97,11 +83,7 @@ export function PageListItem({
};
return (
- <Card
- className="w-full mb-3"
- onMouseEnter={() => setIsHovering(true)}
- onMouseLeave={() => setIsHovering(false)}
- >
+ <Card className="w-full mb-3" onMouseEnter={() => setIsHovering(true)} onMouseLeave={() => setIsHovering(false)}>
<CardContent className="p-3">
<div className="flex flex-col md:flex-row justify-between items-start md:items-center w-full gap-4">
{/* Left side: Page title/path with thumbnail */}
@@ -120,10 +102,7 @@ export function PageListItem({
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2">
<h3 className="text-base font-medium truncate">
- {truncateString(
- pageData.title || pageData.value,
- MAX_TITLE_LENGTH
- )}
+ {truncateString(pageData.title || pageData.value, MAX_TITLE_LENGTH)}
</h3>
{pageUrl && (
<Link
@@ -136,9 +115,7 @@ export function PageListItem({
</Link>
)}
</div>
- <p className="text-sm text-muted-foreground truncate">
- {pageData.value}
- </p>
+ <p className="text-sm text-muted-foreground truncate">{pageData.value}</p>
</div>
</div>
@@ -157,16 +134,12 @@ export function PageListItem({
{/* Session count and duration */}
<div className="text-right min-w-[120px]">
<div>
- <span className="text-base font-semibold">
- {pageData.count.toLocaleString()}
- </span>
+ <span className="text-base font-semibold">{pageData.count.toLocaleString()}</span>
<span className="text-xs text-foreground/70"> sessions</span>
</div>
{pageData.time_on_page_seconds !== undefined && (
<div>
- <span className="text-base font-semibold">
- {formatShortDuration(pageData.time_on_page_seconds)}{" "}
- </span>
+ <span className="text-base font-semibold">{formatShortDuration(pageData.time_on_page_seconds)} </span>
<span className="text-xs text-foreground/70">avg time</span>
</div>
)}
diff --git a/client/src/app/[site]/pages/components/PageListSkeleton.tsx b/client/src/app/[site]/pages/components/PageListSkeleton.tsx
index 1f5f52351..6b129b2aa 100644
--- a/client/src/app/[site]/pages/components/PageListSkeleton.tsx
+++ b/client/src/app/[site]/pages/components/PageListSkeleton.tsx
@@ -24,8 +24,7 @@ export function PageListSkeleton({ count = 5 }: PageListSkeletonProps) {
<div className="flex-1 min-w-0">
<div className="flex items-center gap-2">
<Skeleton className="h-6 w-64" />
- <Skeleton className="h-4 w-4" />{" "}
- {/* External link icon skeleton */}
+ <Skeleton className="h-4 w-4" /> {/* External link icon skeleton */}
</div>
<Skeleton className="h-4 w-48 mt-1" />
</div>
diff --git a/client/src/app/[site]/pages/components/PageSparklineChart.tsx b/client/src/app/[site]/pages/components/PageSparklineChart.tsx
index 0b5091ca4..69e42bde5 100644
--- a/client/src/app/[site]/pages/components/PageSparklineChart.tsx
+++ b/client/src/app/[site]/pages/components/PageSparklineChart.tsx
@@ -14,12 +14,7 @@ interface PageSparklineChartProps {
isLoading: boolean;
}
-export function PageSparklineChart({
- data,
- isHovering,
- pageTitle,
- isLoading,
-}: PageSparklineChartProps) {
+export function PageSparklineChart({ data, isHovering, pageTitle, isLoading }: PageSparklineChartProps) {
if (isLoading) {
return (
<div className="h-full w-full flex items-center justify-center animate-pulse">
@@ -30,11 +25,11 @@ export function PageSparklineChart({
// Format the chart data
const sparklineData = data?.data
- ?.filter((e) => {
+ ?.filter(e => {
// Filter out dates from the future
return DateTime.fromSQL(e.time).toUTC() <= DateTime.now();
})
- .map((e) => ({
+ .map(e => ({
x: DateTime.fromSQL(e.time).toUTC().toFormat("yyyy-MM-dd HH:mm:ss"),
y: e.sessions || 0,
time: DateTime.fromSQL(e.time).toUTC(),
@@ -104,9 +99,7 @@ export function PageSparklineChart({
return (
<div className="text-sm bg-neutral-900 border border-neutral-700 p-2 rounded-md shadow-md">
<div className="flex items-center justify-between gap-3">
- <div className="text-neutral-200">
- {formatDateTime(timestamp)}
- </div>
+ <div className="text-neutral-200">{formatDateTime(timestamp)}</div>
<div className="font-medium">{value.toLocaleString()}</div>
</div>
</div>
diff --git a/client/src/app/[site]/performance/components/EnableWebVitals.tsx b/client/src/app/[site]/performance/components/EnableWebVitals.tsx
index 532105e90..613d7424e 100644
--- a/client/src/app/[site]/performance/components/EnableWebVitals.tsx
+++ b/client/src/app/[site]/performance/components/EnableWebVitals.tsx
@@ -2,11 +2,7 @@
import { BarChart3, ArrowRight } from "lucide-react";
import Link from "next/link";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
-} from "../../../../components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
import { Button } from "../../../../components/ui/button";
import { useGetPerformanceOverview } from "../../../../api/analytics/performance/useGetPerformanceOverview";
import { useStore } from "../../../../lib/store";
@@ -16,11 +12,7 @@ export function EnableWebVitals() {
const { site } = useStore();
const { selectedPercentile } = usePerformanceStore();
- const {
- data: overviewData,
- isLoading,
- isError,
- } = useGetPerformanceOverview({ site });
+ const { data: overviewData, isLoading, isError } = useGetPerformanceOverview({ site });
// Don't show banner while loading or if there's an error
if (isLoading || isError) return null;
@@ -57,8 +49,7 @@ export function EnableWebVitals() {
<code className="bg-amber-100/70 dark:bg-amber-800/50 px-1 py-0.5 rounded text-xs">
data-web-vitals="true"
</code>{" "}
- to your script tag. <strong>Note:</strong> Enabling Web Vitals will
- increase your event usage.
+ to your script tag. <strong>Note:</strong> Enabling Web Vitals will increase your event usage.
</AlertDescription>
<div className="space-y-2">
@@ -69,10 +60,7 @@ export function EnableWebVitals() {
size="sm"
className="border-amber-300/70 text-amber-700/90 hover:bg-amber-100/70 dark:border-amber-600/70 dark:text-amber-400/90 dark:hover:bg-amber-800/50"
>
- <Link
- href="https://rybbit.io/docs/script#web-vitals-performance-metrics"
- target="_blank"
- >
+ <Link href="https://rybbit.io/docs/script#web-vitals-performance-metrics" target="_blank">
View Documentation <ArrowRight className="ml-1 h-3 w-3" />
</Link>
</Button>
diff --git a/client/src/app/[site]/performance/components/PercentileSelector.tsx b/client/src/app/[site]/performance/components/PercentileSelector.tsx
index cd6a80153..d42af3ca4 100644
--- a/client/src/app/[site]/performance/components/PercentileSelector.tsx
+++ b/client/src/app/[site]/performance/components/PercentileSelector.tsx
@@ -19,7 +19,7 @@ export function PercentileSelector() {
return (
<div className="flex items-center space-x-2">
- {PERCENTILE_OPTIONS.map((option) => {
+ {PERCENTILE_OPTIONS.map(option => {
const isSelected = selectedPercentile === option.value;
return (
@@ -28,16 +28,11 @@ export function PercentileSelector() {
onClick={() => setSelectedPercentile(option.value)}
className={cn(
"flex items-center space-x-1.5 px-2 py-1 rounded text-xs font-medium transition-all",
- isSelected
- ? "bg-neutral-800 text-white"
- : "bg-neutral-900 text-neutral-500 hover:text-neutral-400"
+ isSelected ? "bg-neutral-800 text-white" : "bg-neutral-900 text-neutral-500 hover:text-neutral-400"
)}
>
<div
- className={cn(
- "w-3 h-3 rounded-sm transition-opacity",
- isSelected ? "opacity-100" : "opacity-30"
- )}
+ className={cn("w-3 h-3 rounded-sm transition-opacity", isSelected ? "opacity-100" : "opacity-30")}
style={{ backgroundColor: option.color }}
/>
<span>{option.label}</span>
diff --git a/client/src/app/[site]/performance/components/PerformanceByDimensions.tsx b/client/src/app/[site]/performance/components/PerformanceByDimensions.tsx
index bfbffd377..058dbd900 100644
--- a/client/src/app/[site]/performance/components/PerformanceByDimensions.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceByDimensions.tsx
@@ -1,23 +1,12 @@
"use client";
import { useState } from "react";
-import {
- Tabs,
- TabsContent,
- TabsList,
- TabsTrigger,
-} from "../../../../components/ui/basic-tabs";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "../../../../components/ui/basic-tabs";
import { Card, CardContent } from "../../../../components/ui/card";
import { PerformanceTable } from "./PerformanceTable";
import { PerformanceMap } from "./PerformanceMap";
-type Tab =
- | "pathname"
- | "country"
- | "map"
- | "device_type"
- | "browser"
- | "operating_system";
+type Tab = "pathname" | "country" | "map" | "device_type" | "browser" | "operating_system";
export function PerformanceByDimensions() {
const [tab, setTab] = useState<Tab>("pathname");
@@ -25,34 +14,22 @@ export function PerformanceByDimensions() {
return (
<Card>
<CardContent className="mt-2">
- <Tabs
- defaultValue="pathname"
- value={tab}
- onValueChange={(value) => setTab(value as Tab)}
- >
+ <Tabs defaultValue="pathname" value={tab} onValueChange={value => setTab(value as Tab)}>
<TabsList>
<TabsTrigger value="pathname">Pages</TabsTrigger>
<TabsTrigger value="country">Countries</TabsTrigger>
<TabsTrigger value="map">Map</TabsTrigger>
<TabsTrigger value="device_type">Devices</TabsTrigger>
<TabsTrigger value="browser">Browsers</TabsTrigger>
- <TabsTrigger value="operating_system">
- Operating Systems
- </TabsTrigger>
+ <TabsTrigger value="operating_system">Operating Systems</TabsTrigger>
</TabsList>
<TabsContent value="pathname">
- <PerformanceTable
- dimension="pathname"
- title="Performance by Page"
- />
+ <PerformanceTable dimension="pathname" title="Performance by Page" />
</TabsContent>
<TabsContent value="country">
- <PerformanceTable
- dimension="country"
- title="Performance by Country"
- />
+ <PerformanceTable dimension="country" title="Performance by Country" />
</TabsContent>
<TabsContent value="map">
@@ -60,24 +37,15 @@ export function PerformanceByDimensions() {
</TabsContent>
<TabsContent value="device_type">
- <PerformanceTable
- dimension="device_type"
- title="Performance by Device Type"
- />
+ <PerformanceTable dimension="device_type" title="Performance by Device Type" />
</TabsContent>
<TabsContent value="browser">
- <PerformanceTable
- dimension="browser"
- title="Performance by Browser"
- />
+ <PerformanceTable dimension="browser" title="Performance by Browser" />
</TabsContent>
<TabsContent value="operating_system">
- <PerformanceTable
- dimension="operating_system"
- title="Performance by Operating System"
- />
+ <PerformanceTable dimension="operating_system" title="Performance by Operating System" />
</TabsContent>
</Tabs>
</CardContent>
diff --git a/client/src/app/[site]/performance/components/PerformanceChart.tsx b/client/src/app/[site]/performance/components/PerformanceChart.tsx
index 41d706438..f830a080d 100644
--- a/client/src/app/[site]/performance/components/PerformanceChart.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceChart.tsx
@@ -32,7 +32,7 @@ export function PerformanceChart() {
const [visiblePercentiles, setVisiblePercentiles] = useState<Set<string>>(new Set(["P50", "P75", "P90", "P99"]));
const togglePercentile = (percentile: string) => {
- setVisiblePercentiles((prev) => {
+ setVisiblePercentiles(prev => {
const newSet = new Set(prev);
if (newSet.has(percentile)) {
newSet.delete(percentile);
@@ -71,7 +71,7 @@ export function PerformanceChart() {
p99: item[`${selectedPerformanceMetric}_p99`] ?? null,
};
})
- .filter((e) => e !== null) ?? [];
+ .filter(e => e !== null) ?? [];
// Create separate data series for each percentile - using shades of blue
const percentileColors = {
@@ -86,43 +86,43 @@ export function PerformanceChart() {
id: "P50",
color: percentileColors.p50,
data: processedData
- .map((item) => ({
+ .map(item => ({
x: item.time,
y: item.p50,
}))
- .filter((point) => point.y !== null),
+ .filter(point => point.y !== null),
},
{
id: "P75",
color: percentileColors.p75,
data: processedData
- .map((item) => ({
+ .map(item => ({
x: item.time,
y: item.p75,
}))
- .filter((point) => point.y !== null),
+ .filter(point => point.y !== null),
},
{
id: "P90",
color: percentileColors.p90,
data: processedData
- .map((item) => ({
+ .map(item => ({
x: item.time,
y: item.p90,
}))
- .filter((point) => point.y !== null),
+ .filter(point => point.y !== null),
},
{
id: "P99",
color: percentileColors.p99,
data: processedData
- .map((item) => ({
+ .map(item => ({
x: item.time,
y: item.p99,
}))
- .filter((point) => point.y !== null),
+ .filter(point => point.y !== null),
},
- ].filter((series) => series.data.length > 0 && visiblePercentiles.has(series.id));
+ ].filter(series => series.data.length > 0 && visiblePercentiles.has(series.id));
const formatXAxisValue = (value: any) => {
const dt = DateTime.fromJSDate(value).setLocale(userLocale);
@@ -206,7 +206,7 @@ export function PerformanceChart() {
<div className="flex items-center space-x-4">
<span className="text-sm text-neutral-200">{METRIC_LABELS[selectedPerformanceMetric]}</span>
<div className="flex items-center space-x-2">
- {(["P50", "P75", "P90", "P99"] as const).map((percentile) => {
+ {(["P50", "P75", "P90", "P99"] as const).map(percentile => {
const colors = {
P50: "hsl(var(--indigo-100))", // light blue
P75: "hsl(var(--indigo-300))", // medium blue
@@ -283,9 +283,9 @@ export function PerformanceChart() {
tickRotation: 0,
truncateTickAt: 0,
tickValues: 5,
- format: (value) => formatMetricValue(selectedPerformanceMetric, value),
+ format: value => formatMetricValue(selectedPerformanceMetric, value),
}}
- colors={(d) => d.color}
+ colors={d => d.color}
enableTouchCrosshair={true}
enablePoints={false}
useMesh={true}
diff --git a/client/src/app/[site]/performance/components/PerformanceMap.tsx b/client/src/app/[site]/performance/components/PerformanceMap.tsx
index 285e15bbb..3a5f7fc52 100644
--- a/client/src/app/[site]/performance/components/PerformanceMap.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceMap.tsx
@@ -36,8 +36,7 @@ interface TooltipPosition {
export function PerformanceMap({ height }: { height: string }) {
const params = useParams();
const site = params.site as string;
- const { selectedPercentile, selectedPerformanceMetric } =
- usePerformanceStore();
+ const { selectedPercentile, selectedPerformanceMetric } = usePerformanceStore();
const {
data: performanceData,
@@ -54,13 +53,11 @@ export function PerformanceMap({ height }: { height: string }) {
useEffect(() => {
if (performanceData) {
- setDataVersion((prev) => prev + 1);
+ setDataVersion(prev => prev + 1);
}
}, [performanceData]);
- const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(
- null
- );
+ const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(null);
const [tooltipPosition, setTooltipPosition] = useState<TooltipPosition>({
x: 0,
y: 0,
@@ -102,9 +99,7 @@ export function PerformanceMap({ height }: { height: string }) {
return "rgba(34, 197, 94, 0.8)"; // Green for good performance
} else if (clampedValue <= thresholds.needs_improvement) {
// Interpolate between green and yellow for needs improvement
- const ratio =
- (clampedValue - thresholds.good) /
- (thresholds.needs_improvement - thresholds.good);
+ const ratio = (clampedValue - thresholds.good) / (thresholds.needs_improvement - thresholds.good);
const greenComponent = Math.round(34 + (251 - 34) * ratio);
const redComponent = Math.round(197 + (191 - 197) * ratio);
const blueComponent = Math.round(94 + (36 - 94) * ratio);
@@ -120,15 +115,10 @@ export function PerformanceMap({ height }: { height: string }) {
const handleStyle = (feature: Feature | undefined) => {
const countryCode = feature?.properties?.["ISO_A2"];
- const foundData = processedPerformanceData?.find(
- (item: any) => item.country === countryCode
- );
+ const foundData = processedPerformanceData?.find((item: any) => item.country === countryCode);
const metricValue = foundData?.metricValue || 0;
- const color =
- foundData && metricValue > 0
- ? colorScale(metricValue)
- : "rgba(140, 140, 140, 0.3)";
+ const color = foundData && metricValue > 0 ? colorScale(metricValue) : "rgba(140, 140, 140, 0.3)";
return {
color: color,
@@ -149,9 +139,7 @@ export function PerformanceMap({ height }: { height: string }) {
// Mark this feature as hovered
setHoveredId(countryCode);
- const foundData = processedPerformanceData?.find(
- (item: any) => item.country === countryCode
- );
+ const foundData = processedPerformanceData?.find((item: any) => item.country === countryCode);
if (foundData) {
setTooltipContent({
@@ -197,7 +185,7 @@ export function PerformanceMap({ height }: { height: string }) {
return (
<div
- onMouseMove={(e) => {
+ onMouseMove={e => {
if (tooltipContent) {
setTooltipPosition({
x: e.clientX,
@@ -214,9 +202,7 @@ export function PerformanceMap({ height }: { height: string }) {
<div className="absolute inset-0 bg-neutral-900/30 backdrop-blur-sm z-10 flex items-center justify-center">
<div className="flex flex-col items-center gap-2">
<div className="h-8 w-8 rounded-full border-2 border-accent-400 border-t-transparent animate-spin"></div>
- <span className="text-sm text-neutral-300">
- Loading performance data...
- </span>
+ <span className="text-sm text-neutral-300">Loading performance data...</span>
</div>
</div>
)}
@@ -253,28 +239,18 @@ export function PerformanceMap({ height }: { height: string }) {
}}
>
<div className="font-sm flex items-center gap-1 mb-2">
- {tooltipContent.code && (
- <CountryFlag country={tooltipContent.code} />
- )}
+ {tooltipContent.code && <CountryFlag country={tooltipContent.code} />}
<span className="font-medium">{tooltipContent.name}</span>
</div>
{tooltipContent.eventCount > 0 ? (
<>
<div className="mb-2">
- <span className="text-neutral-300">
- {tooltipContent.metricName}:{" "}
- </span>
+ <span className="text-neutral-300">{tooltipContent.metricName}: </span>
{tooltipContent.metricValue !== null ? (
<span className="font-bold text-accent-400">
- {formatMetricValue(
- selectedPerformanceMetric,
- tooltipContent.metricValue
- )}
- {getMetricUnit(
- selectedPerformanceMetric,
- tooltipContent.metricValue
- )}
+ {formatMetricValue(selectedPerformanceMetric, tooltipContent.metricValue)}
+ {getMetricUnit(selectedPerformanceMetric, tooltipContent.metricValue)}
</span>
) : (
<span className="text-neutral-400">No data</span>
@@ -283,17 +259,13 @@ export function PerformanceMap({ height }: { height: string }) {
<div className="text-xs">
<div className="text-neutral-300">
- <span className="font-bold text-accent-400">
- {tooltipContent.eventCount.toLocaleString()}
- </span>{" "}
+ <span className="font-bold text-accent-400">{tooltipContent.eventCount.toLocaleString()}</span>{" "}
performance events
</div>
</div>
</>
) : (
- <div className="text-neutral-400 text-xs">
- No performance data available
- </div>
+ <div className="text-neutral-400 text-xs">No performance data available</div>
)}
</div>
)}
diff --git a/client/src/app/[site]/performance/components/PerformanceOverview.tsx b/client/src/app/[site]/performance/components/PerformanceOverview.tsx
index a6ce0e3e8..d3507b1f8 100644
--- a/client/src/app/[site]/performance/components/PerformanceOverview.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceOverview.tsx
@@ -8,21 +8,11 @@ import { useGetPerformanceOverview } from "../../../../api/analytics/performance
import { Card, CardContent, CardLoader } from "../../../../components/ui/card";
import { useStore } from "../../../../lib/store";
import { PerformanceMetric, usePerformanceStore } from "../performanceStore";
-import {
- formatMetricValue,
- getMetricColor,
- getMetricUnit,
-} from "../utils/performanceUtils";
+import { formatMetricValue, getMetricColor, getMetricUnit } from "../utils/performanceUtils";
import { PercentileSelector } from "./PercentileSelector";
import { MetricTooltip } from "./shared/MetricTooltip";
-const ChangePercentage = ({
- current,
- previous,
-}: {
- current: number;
- previous: number;
-}) => {
+const ChangePercentage = ({ current, previous }: { current: number; previous: number }) => {
const change = ((current - previous) / previous) * 100;
if (previous === 0) {
@@ -38,17 +28,8 @@ const ChangePercentage = ({
// For performance metrics, lower is better, so we reverse the color logic
return (
- <div
- className={cn(
- "text-xs flex items-center gap-1",
- change < 0 ? "text-green-400" : "text-red-400"
- )}
- >
- {change > 0 ? (
- <TrendingUp className="w-4 h-4" />
- ) : (
- <TrendingDown className="w-4 h-4" />
- )}
+ <div className={cn("text-xs flex items-center gap-1", change < 0 ? "text-green-400" : "text-red-400")}>
+ {change > 0 ? <TrendingUp className="w-4 h-4" /> : <TrendingDown className="w-4 h-4" />}
{Math.abs(change).toFixed(1)}%
</div>
);
@@ -67,11 +48,7 @@ const Stat = ({
previous: number;
isLoading: boolean;
}) => {
- const {
- selectedPerformanceMetric,
- setSelectedPerformanceMetric,
- selectedPercentile,
- } = usePerformanceStore();
+ const { selectedPerformanceMetric, setSelectedPerformanceMetric, selectedPercentile } = usePerformanceStore();
return (
<div
@@ -115,14 +92,12 @@ export function PerformanceOverview() {
const { site } = useStore();
const { selectedPercentile } = usePerformanceStore();
- const {
- data: overviewData,
- isLoading: isOverviewLoading,
- isFetching,
- } = useGetPerformanceOverview({ site });
+ const { data: overviewData, isLoading: isOverviewLoading, isFetching } = useGetPerformanceOverview({ site });
- const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } =
- useGetPerformanceOverview({ site, periodTime: "previous" });
+ const { data: overviewDataPrevious, isLoading: isOverviewLoadingPrevious } = useGetPerformanceOverview({
+ site,
+ periodTime: "previous",
+ });
const isLoading = isOverviewLoading || isOverviewLoadingPrevious;
diff --git a/client/src/app/[site]/performance/components/PerformanceTable.tsx b/client/src/app/[site]/performance/components/PerformanceTable.tsx
index f04a7a619..d4d2e2e7e 100644
--- a/client/src/app/[site]/performance/components/PerformanceTable.tsx
+++ b/client/src/app/[site]/performance/components/PerformanceTable.tsx
@@ -67,11 +67,11 @@ interface PerformanceTableProps {
// Custom hook for filter handling logic
const useFilterToggle = () => {
- const filters = useStore((state) => state.filters);
+ const filters = useStore(state => state.filters);
const toggleFilter = useCallback(
(parameter: FilterParameter, value: string) => {
- const foundFilter = filters.find((f) => f.parameter === parameter && f.value.some((v) => v === value));
+ const foundFilter = filters.find(f => f.parameter === parameter && f.value.some(v => v === value));
if (foundFilter) {
removeFilter(foundFilter);
} else {
@@ -125,15 +125,15 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
dimension === "pathname"
? "Path"
: dimension === "country"
- ? "Country"
- : dimension === "device_type"
- ? "Device Type"
- : dimension === "browser"
- ? "Browser"
- : dimension === "operating_system"
- ? "Operating System"
- : dimension.charAt(0).toUpperCase() + dimension.slice(1),
- cell: (info) => {
+ ? "Country"
+ : dimension === "device_type"
+ ? "Device Type"
+ : dimension === "browser"
+ ? "Browser"
+ : dimension === "operating_system"
+ ? "Operating System"
+ : dimension.charAt(0).toUpperCase() + dimension.slice(1),
+ cell: info => {
const value = info.getValue();
const displayValue = value || (dimension === "pathname" ? "/" : "Unknown");
@@ -181,7 +181,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<a
href={`https://${siteMetadata?.domain}${value}`}
target="_blank"
- onClick={(e) => e.stopPropagation()}
+ onClick={e => e.stopPropagation()}
>
<SquareArrowOutUpRight
className="ml-0.5 w-3.5 h-3.5 text-neutral-300 hover:text-neutral-100"
@@ -202,7 +202,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<MetricTooltip metric="lcp" />
</div>
),
- cell: (info) => (
+ cell: info => (
<div className="text-center">
<MetricCell metric="lcp" value={info.getValue() as number} percentile={selectedPercentile} />
</div>
@@ -215,7 +215,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<MetricTooltip metric="cls" />
</div>
),
- cell: (info) => (
+ cell: info => (
<div className="text-center">
<MetricCell metric="cls" value={info.getValue() as number} percentile={selectedPercentile} />
</div>
@@ -228,7 +228,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<MetricTooltip metric="inp" />
</div>
),
- cell: (info) => (
+ cell: info => (
<div className="text-center">
<MetricCell metric="inp" value={info.getValue() as number} percentile={selectedPercentile} />
</div>
@@ -241,7 +241,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<MetricTooltip metric="fcp" />
</div>
),
- cell: (info) => (
+ cell: info => (
<div className="text-center">
<MetricCell metric="fcp" value={info.getValue() as number} percentile={selectedPercentile} />
</div>
@@ -254,7 +254,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<MetricTooltip metric="ttfb" />
</div>
),
- cell: (info) => (
+ cell: info => (
<div className="text-center">
<MetricCell metric="ttfb" value={info.getValue() as number} percentile={selectedPercentile} />
</div>
@@ -262,7 +262,7 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
}),
columnHelper.accessor("event_count", {
header: "Events",
- cell: (info) => <div className="text-center text-neutral-300">{info.getValue()?.toLocaleString() ?? 0}</div>,
+ cell: info => <div className="text-center text-neutral-300">{info.getValue()?.toLocaleString() ?? 0}</div>,
}),
],
[selectedPercentile]
@@ -273,10 +273,10 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
columns,
getCoreRowModel: getCoreRowModel(),
getSortedRowModel: getSortedRowModel(),
- onSortingChange: (updater) => {
+ onSortingChange: updater => {
setSorting(updater);
// Reset to first page when sorting changes
- setPagination((prev) => ({ ...prev, pageIndex: 0 }));
+ setPagination(prev => ({ ...prev, pageIndex: 0 }));
},
state: {
sorting,
@@ -292,14 +292,14 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
getCanPreviousPage: () => pagination.pageIndex > 0,
getCanNextPage: () => pagination.pageIndex < totalPages - 1,
getPageCount: () => totalPages,
- setPageIndex: (index: number) => setPagination((prev) => ({ ...prev, pageIndex: index })),
+ setPageIndex: (index: number) => setPagination(prev => ({ ...prev, pageIndex: index })),
previousPage: () =>
- setPagination((prev) => ({
+ setPagination(prev => ({
...prev,
pageIndex: Math.max(0, prev.pageIndex - 1),
})),
nextPage: () =>
- setPagination((prev) => ({
+ setPagination(prev => ({
...prev,
pageIndex: Math.min(totalPages - 1, prev.pageIndex + 1),
})),
@@ -392,9 +392,9 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
<>
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id} className="border-neutral-800">
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead
key={header.id}
className={`text-neutral-300 ${
@@ -431,9 +431,9 @@ export function PerformanceTable({ dimension, title }: PerformanceTableProps) {
</TableCell>
</TableRow>
) : (
- table.getRowModel().rows.map((row) => (
+ table.getRowModel().rows.map(row => (
<TableRow key={row.id} className="border-neutral-800 hover:bg-neutral-900/50">
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
diff --git a/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx b/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx
index 096f3d4f6..76eed21f7 100644
--- a/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx
+++ b/client/src/app/[site]/performance/components/shared/MetricTooltip.tsx
@@ -1,8 +1,4 @@
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { HelpCircle } from "lucide-react";
import { PerformanceMetric } from "../../performanceStore";
@@ -25,8 +21,7 @@ const getMetricInfo = (metric: PerformanceMetric): MetricInfo => {
case "cls":
return {
importance: "Core Web Vital",
- description:
- "Measures visual stability. CLS quantifies how much visible content shifts during page load.",
+ description: "Measures visual stability. CLS quantifies how much visible content shifts during page load.",
threshold: "Good CLS scores are 0.1 or less.",
};
case "inp":
@@ -39,8 +34,7 @@ const getMetricInfo = (metric: PerformanceMetric): MetricInfo => {
case "fcp":
return {
importance: "Supporting Metric",
- description:
- "Measures perceived loading speed. FCP marks when the first content element becomes visible.",
+ description: "Measures perceived loading speed. FCP marks when the first content element becomes visible.",
threshold: "Good FCP scores are 1.8 seconds or faster.",
};
case "ttfb":
@@ -70,9 +64,7 @@ export function MetricTooltip({ metric, children }: MetricTooltipProps) {
return (
<Tooltip>
<TooltipTrigger asChild>
- {children || (
- <HelpCircle className="h-3 w-3 text-neutral-300 hover:text-neutral-100 cursor-help" />
- )}
+ {children || <HelpCircle className="h-3 w-3 text-neutral-300 hover:text-neutral-100 cursor-help" />}
</TooltipTrigger>
<TooltipContent side="top" className="max-w-xs p-3">
<div className="space-y-2">
@@ -80,17 +72,11 @@ export function MetricTooltip({ metric, children }: MetricTooltipProps) {
<span className="text-xs font-medium text-neutral-400 uppercase tracking-wide">
{metricInfo.importance}
</span>
- {metricInfo.importance === "Core Web Vital" && (
- <div className="w-2 h-2 bg-blue-400 rounded-full"></div>
- )}
+ {metricInfo.importance === "Core Web Vital" && <div className="w-2 h-2 bg-blue-400 rounded-full"></div>}
</div>
- <p className="text-sm text-neutral-200 leading-relaxed">
- {metricInfo.description}
- </p>
+ <p className="text-sm text-neutral-200 leading-relaxed">{metricInfo.description}</p>
<div className="pt-1 border-t border-neutral-700">
- <p className="text-xs text-neutral-400 italic">
- {metricInfo.threshold}
- </p>
+ <p className="text-xs text-neutral-400 italic">{metricInfo.threshold}</p>
</div>
</div>
</TooltipContent>
diff --git a/client/src/app/[site]/performance/performanceStore.ts b/client/src/app/[site]/performance/performanceStore.ts
index de2917e35..c88175656 100644
--- a/client/src/app/[site]/performance/performanceStore.ts
+++ b/client/src/app/[site]/performance/performanceStore.ts
@@ -11,11 +11,9 @@ type PerformanceStore = {
setSelectedPerformanceMetric: (metric: PerformanceMetric) => void;
};
-export const usePerformanceStore = create<PerformanceStore>((set) => ({
+export const usePerformanceStore = create<PerformanceStore>(set => ({
selectedPercentile: "p90",
- setSelectedPercentile: (percentile) =>
- set({ selectedPercentile: percentile }),
+ setSelectedPercentile: percentile => set({ selectedPercentile: percentile }),
selectedPerformanceMetric: "lcp",
- setSelectedPerformanceMetric: (metric) =>
- set({ selectedPerformanceMetric: metric }),
+ setSelectedPerformanceMetric: metric => set({ selectedPerformanceMetric: metric }),
}));
diff --git a/client/src/app/[site]/performance/utils/performanceUtils.ts b/client/src/app/[site]/performance/utils/performanceUtils.ts
index 0210fa53d..c371a2f00 100644
--- a/client/src/app/[site]/performance/utils/performanceUtils.ts
+++ b/client/src/app/[site]/performance/utils/performanceUtils.ts
@@ -14,10 +14,7 @@ const PERFORMANCE_THRESHOLDS = {
/**
* Get the appropriate color class for a performance metric value based on Web Vitals thresholds
*/
-export const getMetricColor = (
- metric: PerformanceMetric,
- value: number
-): string => {
+export const getMetricColor = (metric: PerformanceMetric, value: number): string => {
const thresholds = PERFORMANCE_THRESHOLDS[metric];
if (!thresholds) {
@@ -39,10 +36,7 @@ export const getMetricColor = (
/**
* Format a performance metric value for display
*/
-export const formatMetricValue = (
- metric: PerformanceMetric,
- value: number
-): string => {
+export const formatMetricValue = (metric: PerformanceMetric, value: number): string => {
if (metric === "cls") {
return round(value, 3).toString();
}
@@ -55,10 +49,7 @@ export const formatMetricValue = (
/**
* Get the appropriate unit for a performance metric value
*/
-export const getMetricUnit = (
- metric: PerformanceMetric,
- value: number
-): string => {
+export const getMetricUnit = (metric: PerformanceMetric, value: number): string => {
if (metric === "cls") return "";
if (value >= 1000) return "s";
return "ms";
diff --git a/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx b/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx
index 73b3fb39b..2ea8c4893 100644
--- a/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx
+++ b/client/src/app/[site]/realtime/RealtimeChart/RealtimeChart.tsx
@@ -27,10 +27,8 @@ export function RealtimeChart() {
return [];
}
- return data.data.map((point) => ({
- time: DateTime.fromSQL(point.time)
- .toUTC()
- .toFormat("yyyy-MM-dd HH:mm:ss"),
+ return data.data.map(point => ({
+ time: DateTime.fromSQL(point.time).toUTC().toFormat("yyyy-MM-dd HH:mm:ss"),
users: point.users,
}));
}, [data]);
@@ -61,28 +59,14 @@ export function RealtimeChart() {
enableLabel={false}
enableGridX={false}
enableGridY={false}
- tooltip={({
- id,
- value,
- data,
- }: {
- id: string | number;
- value: number;
- data: { time: string; users: number };
- }) => {
- const currentTime = DateTime.fromFormat(
- data.time,
- "yyyy-MM-dd HH:mm:ss",
- { zone: "utc" }
- ).toLocal();
+ tooltip={({ id, value, data }: { id: string | number; value: number; data: { time: string; users: number } }) => {
+ const currentTime = DateTime.fromFormat(data.time, "yyyy-MM-dd HH:mm:ss", { zone: "utc" }).toLocal();
const currentY = Number(value);
return (
<div className="bg-neutral-950 p-2 rounded-md text-xs">
<div className="font-semibold mb-1">
- {currentTime.isValid
- ? currentTime.toFormat("h:mm")
- : "Invalid Time"}
+ {currentTime.isValid ? currentTime.toFormat("h:mm") : "Invalid Time"}
</div>
<div className="flex justify-between items-center">
<span className="font-medium">{currentY.toLocaleString()}</span>
diff --git a/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx b/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx
index e9f4a1106..ccf0d48f3 100644
--- a/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx
+++ b/client/src/app/[site]/realtime/RealtimeGlobe/RealtimeGlobe.tsx
@@ -96,7 +96,7 @@ export const World = ({ width }: { width: number }) => {
);
const liveSessionLocationsData = useMemo(() => {
- return liveSessionLocations?.map((e) => ({
+ return liveSessionLocations?.map(e => ({
lat: e.lat,
lng: e.lon,
count: Math.max(1, e.count / highest),
@@ -142,8 +142,8 @@ export const World = ({ width }: { width: number }) => {
hexPolygonColor={(e: any) => {
return randomShader(e.properties.ISO_A2);
}}
- hexTopColor={(d) => weightColor(d.sumWeight)}
- hexSideColor={(d) => weightColor(d.sumWeight)}
+ hexTopColor={d => weightColor(d.sumWeight)}
+ hexSideColor={d => weightColor(d.sumWeight)}
// @ts-ignore
// hexPolygonLabel={(props: any) => {
// console.info(props);
diff --git a/client/src/app/[site]/realtime/RealtimeMap/RealtimeMap.tsx b/client/src/app/[site]/realtime/RealtimeMap/RealtimeMap.tsx
index 952db9bc4..eaf5adea0 100644
--- a/client/src/app/[site]/realtime/RealtimeMap/RealtimeMap.tsx
+++ b/client/src/app/[site]/realtime/RealtimeMap/RealtimeMap.tsx
@@ -28,15 +28,10 @@ interface TooltipPosition {
}
export function RealtimeMap() {
- const {
- data: liveSessionLocations,
- isLoading: isLiveSessionLocationsLoading,
- } = useGetLiveSessionLocations();
+ const { data: liveSessionLocations, isLoading: isLiveSessionLocationsLoading } = useGetLiveSessionLocations();
const { data: countriesGeoData } = useCountries();
const [currentZoom, setCurrentZoom] = useState(1.5); // Initial zoom level
- const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(
- null
- );
+ const [tooltipContent, setTooltipContent] = useState<TooltipContent | null>(null);
const [tooltipPosition, setTooltipPosition] = useState<TooltipPosition>({
x: 0,
y: 0,
@@ -46,7 +41,7 @@ export function RealtimeMap() {
const radiusScale = useMemo(() => {
if (!liveSessionLocations?.length) return () => 0;
- const maxCount = Math.max(...liveSessionLocations.map((loc) => loc.count));
+ const maxCount = Math.max(...liveSessionLocations.map(loc => loc.count));
// Use sqrt scale to make small values more visible
// This directly scales radius (not area) which makes small circles more noticeable
@@ -92,7 +87,7 @@ export function RealtimeMap() {
<div>
<div
className="w-full h-[600px] rounded-lg overflow-hidden border border-neutral-850"
- onMouseMove={(e) => {
+ onMouseMove={e => {
if (tooltipContent) {
setTooltipPosition({
x: e.clientX,
@@ -129,7 +124,7 @@ export function RealtimeMap() {
weight: 0,
}}
eventHandlers={{
- mouseover: (e) => {
+ mouseover: e => {
setTooltipContent({
count: location.count,
city: location.city,
@@ -142,7 +137,7 @@ export function RealtimeMap() {
mouseout: () => {
setTooltipContent(null);
},
- mousemove: (e) => {
+ mousemove: e => {
setTooltipPosition({
x: e.originalEvent.clientX,
y: e.originalEvent.clientY,
@@ -164,9 +159,7 @@ export function RealtimeMap() {
}}
>
<div className="font-sm">
- <span className="font-bold text-accent-400">
- {tooltipContent.count.toLocaleString()}
- </span>{" "}
+ <span className="font-bold text-accent-400">{tooltipContent.count.toLocaleString()}</span>{" "}
<span className="text-neutral-300">
active {tooltipContent.count === 1 ? "user" : "users"}
{tooltipContent.city ? ` from ${tooltipContent.city}` : ""}
diff --git a/client/src/app/[site]/realtime/page.tsx b/client/src/app/[site]/realtime/page.tsx
index 9f2247515..980870079 100644
--- a/client/src/app/[site]/realtime/page.tsx
+++ b/client/src/app/[site]/realtime/page.tsx
@@ -38,7 +38,7 @@ export default function RealtimePage() {
</span>
</div>
Visitors in the last{" "}
- <Select value={minutes} onValueChange={(value) => setMinutes(value as MinutesType)}>
+ <Select value={minutes} onValueChange={value => setMinutes(value as MinutesType)}>
<SelectTrigger>
<SelectValue placeholder="Select a time period" />
</SelectTrigger>
diff --git a/client/src/app/[site]/realtime/realtimeStore.ts b/client/src/app/[site]/realtime/realtimeStore.ts
index c816fcae9..45c0a176d 100644
--- a/client/src/app/[site]/realtime/realtimeStore.ts
+++ b/client/src/app/[site]/realtime/realtimeStore.ts
@@ -1,14 +1,5 @@
import { atom } from "jotai";
-export type MinutesType =
- | "5"
- | "15"
- | "30"
- | "60"
- | "120"
- | "240"
- | "480"
- | "720"
- | "1440";
+export type MinutesType = "5" | "15" | "30" | "60" | "120" | "240" | "480" | "720" | "1440";
export const minutesAtom = atom<MinutesType>("30");
diff --git a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
index 257ee09f1..14187f6d5 100644
--- a/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
+++ b/client/src/app/[site]/replay/components/EnableSessionReplay.tsx
@@ -2,20 +2,12 @@
import { PlayCircle, ArrowRight } from "lucide-react";
import Link from "next/link";
-import {
- Alert,
- AlertDescription,
- AlertTitle,
-} from "../../../../components/ui/alert";
+import { Alert, AlertDescription, AlertTitle } from "../../../../components/ui/alert";
import { Button } from "../../../../components/ui/button";
import { useGetSessionReplays } from "../../../../api/analytics/sessionReplay/useGetSessionReplays";
export function EnableSessionReplay() {
- const {
- data: replayData,
- isLoading,
- isError,
- } = useGetSessionReplays({ limit: 1, minDuration: 0 });
+ const { data: replayData, isLoading, isError } = useGetSessionReplays({ limit: 1, minDuration: 0 });
// Don't show banner while loading or if there's an error
if (isLoading || isError) return null;
@@ -38,8 +30,7 @@ export function EnableSessionReplay() {
<code className="bg-amber-100/70 dark:bg-amber-800/50 px-1 py-0.5 rounded text-xs">
data-session-replay="true"
</code>{" "}
- to your script tag to record user sessions for debugging and
- analysis.
+ to your script tag to record user sessions for debugging and analysis.
</AlertDescription>
<div className="space-y-2">
@@ -50,10 +41,7 @@ export function EnableSessionReplay() {
size="sm"
className="border-amber-300/70 text-amber-700/90 hover:bg-amber-100/70 dark:border-amber-600/70 dark:text-amber-400/90 dark:hover:bg-amber-800/50"
>
- <Link
- href="https://rybbit.io/docs/script#session-replay"
- target="_blank"
- >
+ <Link href="https://rybbit.io/docs/script#session-replay" target="_blank">
View Documentation <ArrowRight className="ml-1 h-3 w-3" />
</Link>
</Button>
diff --git a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx
index e6a986bdd..d37a68988 100644
--- a/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx
+++ b/client/src/app/[site]/replay/components/ReplayBreadcrumbs.tsx
@@ -71,10 +71,7 @@ export function ReplayBreadcrumbs() {
const siteId = Number(params.site);
const { sessionId, player, setCurrentTime } = useReplayStore();
- const { data, isLoading, error } = useGetSessionReplayEvents(
- siteId,
- sessionId
- );
+ const { data, isLoading, error } = useGetSessionReplayEvents(siteId, sessionId);
// Group consecutive events of the same type
const groupedEvents = useMemo(() => {
@@ -91,7 +88,7 @@ export function ReplayBreadcrumbs() {
let currentGroup: (typeof groups)[0] | null = null;
- data.events.forEach((event) => {
+ data.events.forEach(event => {
const eventTypeStr = String(event.type);
const subType = eventTypeStr === "3" ? event.data?.source : undefined;
@@ -151,9 +148,7 @@ export function ReplayBreadcrumbs() {
const getEventDescription = (event: any) => {
const eventTypeStr = String(event.type);
- const eventInfo = EVENT_TYPE_INFO[
- eventTypeStr as keyof typeof EVENT_TYPE_INFO
- ] || {
+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO] || {
name: `Unknown (${eventTypeStr})`,
icon: Globe,
color: "text-gray-400",
@@ -161,10 +156,7 @@ export function ReplayBreadcrumbs() {
// For incremental snapshots, get more detail
if (eventTypeStr === "3" && event.data?.source !== undefined) {
- const incrementalType =
- INCREMENTAL_TYPES[
- event.data.source as keyof typeof INCREMENTAL_TYPES
- ] || "Unknown";
+ const incrementalType = INCREMENTAL_TYPES[event.data.source as keyof typeof INCREMENTAL_TYPES] || "Unknown";
return `${incrementalType}`;
}
@@ -184,8 +176,7 @@ export function ReplayBreadcrumbs() {
const getEventIcon = (event: any) => {
const eventTypeStr = String(event.type);
- const eventInfo =
- EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];
+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];
// Special icons for specific incremental snapshot types
if (eventTypeStr === "3" && event.data?.source !== undefined) {
@@ -232,8 +223,7 @@ export function ReplayBreadcrumbs() {
const getEventColor = (event: any) => {
const eventTypeStr = String(event.type);
- const eventInfo =
- EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];
+ const eventInfo = EVENT_TYPE_INFO[eventTypeStr as keyof typeof EVENT_TYPE_INFO];
return eventInfo?.color || "text-gray-400";
};
@@ -270,10 +260,7 @@ export function ReplayBreadcrumbs() {
<Avatar name={data.metadata.user_id} size={20} />
{data.metadata.user_id.slice(0, 20)}
</div>
- <Link
- href={`/${siteId}/user/${data.metadata.user_id}`}
- className="flex items-center gap-2"
- >
+ <Link href={`/${siteId}/user/${data.metadata.user_id}`} className="flex items-center gap-2">
<Button size="sm">View User</Button>
</Link>
</div>
@@ -307,20 +294,15 @@ export function ReplayBreadcrumbs() {
</div>
<Icon className={cn("w-4 h-4 flex-shrink-0", color)} />
<div className="flex-1 min-w-0">
- <div className="text-xs text-neutral-200 font-medium truncate">
- {description}
- </div>
+ <div className="text-xs text-neutral-200 font-medium truncate">{description}</div>
{group.count > 1 && durationMs > 0 && (
<div className="text-xs text-neutral-500 mt-0.5">
- {Duration.fromMillis(durationMs).toFormat("s.SSS")}s
- duration
+ {Duration.fromMillis(durationMs).toFormat("s.SSS")}s duration
</div>
)}
</div>
{group.count > 5 && (
- <div className="text-xs text-neutral-500 bg-neutral-800 px-1.5 py-0.5 rounded">
- {group.count}
- </div>
+ <div className="text-xs text-neutral-500 bg-neutral-800 px-1.5 py-0.5 rounded">{group.count}</div>
)}
</div>
);
diff --git a/client/src/app/[site]/replay/components/ReplayCard.tsx b/client/src/app/[site]/replay/components/ReplayCard.tsx
index 7c26065ee..3d323d148 100644
--- a/client/src/app/[site]/replay/components/ReplayCard.tsx
+++ b/client/src/app/[site]/replay/components/ReplayCard.tsx
@@ -37,9 +37,7 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {
const startTime = DateTime.fromSQL(replay.start_time, {
zone: "utc",
}).toLocal();
- const duration = replay.duration_ms
- ? Math.ceil(replay.duration_ms / 1000)
- : null;
+ const duration = replay.duration_ms ? Math.ceil(replay.duration_ms / 1000) : null;
const formatDuration = (seconds: number) => {
const minutes = Math.floor(seconds / 60);
@@ -62,9 +60,7 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {
{/* <div className="text-xs text-neutral-500">
{replay.user_id.slice(0, 10)}...
</div> */}
- <div className="text-xs text-neutral-400">
- {startTime.toRelative()}
- </div>
+ <div className="text-xs text-neutral-400">{startTime.toRelative()}</div>
{duration && (
<div className="flex items-center gap-1 text-neutral-400 text-xs">
<Clock className="w-3 h-3" />
@@ -74,22 +70,12 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {
</div>
<div className="text-xs text-neutral-200 truncate mb-2">
- {replay.page_url
- .replace("https://", "")
- .replace("http://", "")
- .replace("www.", "")}
+ {replay.page_url.replace("https://", "").replace("http://", "").replace("www.", "")}
</div>
<div className="flex items-center gap-2 text-sm text-neutral-400">
- <CountryFlagTooltipIcon
- country={replay.country}
- city={replay.city}
- region={replay.region}
- />
- <BrowserTooltipIcon
- browser={replay.browser}
- browser_version={replay.browser_version}
- />
+ <CountryFlagTooltipIcon country={replay.country} city={replay.city} region={replay.region} />
+ <BrowserTooltipIcon browser={replay.browser} browser_version={replay.browser_version} />
<OperatingSystemTooltipIcon
operating_system={replay.operating_system}
operating_system_version={replay.operating_system_version}
@@ -100,10 +86,7 @@ export function ReplayCard({ replay }: { replay: SessionReplayListItem }) {
screen_height={replay.screen_height}
/>
- <Badge
- variant="outline"
- className="flex items-center gap-1 bg-neutral-800 text-gray-300"
- >
+ <Badge variant="outline" className="flex items-center gap-1 bg-neutral-800 text-gray-300">
<MousePointerClick className="w-4 h-4 text-amber-500" />
<span>{formatter(replay.event_count)}</span>
</Badge>
diff --git a/client/src/app/[site]/replay/components/ReplayList.tsx b/client/src/app/[site]/replay/components/ReplayList.tsx
index 1f0d68d14..57a8a0009 100644
--- a/client/src/app/[site]/replay/components/ReplayList.tsx
+++ b/client/src/app/[site]/replay/components/ReplayList.tsx
@@ -27,7 +27,7 @@ export function ReplayList() {
const flattenedData = useMemo(() => {
if (!data) return [];
- return data.pages.flatMap((page) => page.data || []);
+ return data.pages.flatMap(page => page.data || []);
}, [data]);
useEffect(() => {
@@ -57,7 +57,7 @@ export function ReplayList() {
type="number"
value={minDuration}
inputSize="sm"
- onChange={(e) => setMinDuration(Number(e.target.value))}
+ onChange={e => setMinDuration(Number(e.target.value))}
className="w-16"
/>
<div className="text-xs text-neutral-400">s</div>
diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx b/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx
index 125d31568..b0eca1774 100644
--- a/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx
+++ b/client/src/app/[site]/replay/components/player/ReplayPlayer.tsx
@@ -11,13 +11,7 @@ import { ReplayPlayerCore } from "./ReplayPlayerCore";
import { SKIP_SECONDS } from "./utils/replayUtils";
import { ReplayPlayerTopbar } from "./ReplayPlayerTopbar";
-export function ReplayPlayer({
- width,
- height,
-}: {
- width: number;
- height: number;
-}) {
+export function ReplayPlayer({ width, height }: { width: number; height: number }) {
const params = useParams();
const siteId = Number(params.site);
const {
@@ -34,10 +28,7 @@ export function ReplayPlayer({
resetPlayerState,
} = useReplayStore();
- const { data, isLoading, error } = useGetSessionReplayEvents(
- siteId,
- sessionId
- );
+ const { data, isLoading, error } = useGetSessionReplayEvents(siteId, sessionId);
// Reset player state when session changes
useEffect(() => {
@@ -101,9 +92,7 @@ export function ReplayPlayer({
if (error) {
return (
<div className="flex flex-col items-center justify-center h-full p-8">
- <div className="text-red-500 mb-4">
- Error loading replay: {(error as Error).message}
- </div>
+ <div className="text-red-500 mb-4">Error loading replay: {(error as Error).message}</div>
</div>
);
}
@@ -117,18 +106,9 @@ export function ReplayPlayer({
}
return (
- <div
- className="flex flex-col bg-neutral-950 overflow-hidden"
- style={{ width: width, height: height }}
- >
+ <div className="flex flex-col bg-neutral-950 overflow-hidden" style={{ width: width, height: height }}>
<ReplayPlayerTopbar />
- <ReplayPlayerCore
- data={data}
- width={width}
- height={height}
- onPlayPause={handlePlayPause}
- isPlaying={isPlaying}
- />
+ <ReplayPlayerCore data={data} width={width} height={height} onPlayPause={handlePlayPause} isPlaying={isPlaying} />
<ReplayPlayerControls
player={player}
diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx b/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx
index 02abb3016..89240def3 100644
--- a/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx
+++ b/client/src/app/[site]/replay/components/player/ReplayPlayerControls.tsx
@@ -1,13 +1,7 @@
import { Pause, Play } from "lucide-react";
import { ActivitySlider } from "../../../../../components/ui/activity-slider";
import { Button } from "../../../../../components/ui/button";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "../../../../../components/ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "../../../../../components/ui/select";
import { formatTime, PLAYBACK_SPEEDS } from "./utils/replayUtils";
interface ReplayPlayerControlsProps {
@@ -38,12 +32,7 @@ export function ReplayPlayerControls({
return (
<div className="border border-neutral-800 p-2 pb-3 bg-neutral-900 rounded-b-lg pt-6">
<div className="flex items-center">
- <Button
- variant="ghost"
- size="smIcon"
- onClick={onPlayPause}
- disabled={!player}
- >
+ <Button variant="ghost" size="smIcon" onClick={onPlayPause} disabled={!player}>
{isPlaying ? (
<Pause className="w-4 h-4" fill="currentColor" />
) : (
@@ -71,7 +60,7 @@ export function ReplayPlayerControls({
<SelectValue />
</SelectTrigger>
<SelectContent size="sm">
- {PLAYBACK_SPEEDS.map((speed) => (
+ {PLAYBACK_SPEEDS.map(speed => (
<SelectItem key={speed.value} value={speed.value} size="sm">
{speed.label}
</SelectItem>
diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsx b/client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsx
index 863adc71f..9ac462894 100644
--- a/client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsx
+++ b/client/src/app/[site]/replay/components/player/ReplayPlayerCore.tsx
@@ -9,13 +9,7 @@ interface ReplayPlayerCoreProps {
isPlaying: boolean;
}
-export function ReplayPlayerCore({
- data,
- width,
- height,
- onPlayPause,
- isPlaying,
-}: ReplayPlayerCoreProps) {
+export function ReplayPlayerCore({ data, width, height, onPlayPause, isPlaying }: ReplayPlayerCoreProps) {
const { playerContainerRef } = useReplayPlayer({ data, width, height });
return (
@@ -27,11 +21,8 @@ export function ReplayPlayerCore({
position: "relative",
}}
/>
-
- <ReplayPlayerOverlay
- onPlayPause={onPlayPause}
- isPlaying={isPlaying}
- />
+
+ <ReplayPlayerOverlay onPlayPause={onPlayPause} isPlaying={isPlaying} />
</div>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsx b/client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsx
index 5e5672426..2c87b627f 100644
--- a/client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsx
+++ b/client/src/app/[site]/replay/components/player/ReplayPlayerOverlay.tsx
@@ -44,10 +44,7 @@ export function ReplayPlayerOverlay({ onPlayPause, isPlaying }: ReplayPlayerOver
return (
<>
{/* Clickable overlay for play/pause */}
- <div
- className="absolute inset-0 cursor-pointer"
- onClick={handlePlayPauseWithOverlay}
- />
+ <div className="absolute inset-0 cursor-pointer" onClick={handlePlayPauseWithOverlay} />
{/* Play/Pause Overlay Animation */}
{showPlayPauseOverlay && (
@@ -63,4 +60,4 @@ export function ReplayPlayerOverlay({ onPlayPause, isPlaying }: ReplayPlayerOver
)}
</>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx b/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx
index 6c2c99b52..77befd223 100644
--- a/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx
+++ b/client/src/app/[site]/replay/components/player/ReplayPlayerTopbar.tsx
@@ -46,7 +46,7 @@ export function ReplayPlayerTopbar() {
};
const pageViewEvents = useMemo(() => {
- return data?.events?.filter((event) => event.type === 4);
+ return data?.events?.filter(event => event.type === 4);
}, [data?.events]);
// Get the current page URL based on the replay currentTime
@@ -90,11 +90,7 @@ export function ReplayPlayerTopbar() {
region={metadata.region}
className="w-4 h-4"
/>
- <BrowserTooltipIcon
- browser={metadata.browser}
- browser_version={metadata.browser_version}
- size={13}
- />
+ <BrowserTooltipIcon browser={metadata.browser} browser_version={metadata.browser_version} size={13} />
<OperatingSystemTooltipIcon
operating_system={metadata.operating_system}
operating_system_version={metadata.operating_system_version}
diff --git a/client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.ts b/client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.ts
index 4e88b8daf..9ce9c4b06 100644
--- a/client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.ts
+++ b/client/src/app/[site]/replay/components/player/hooks/useActivityPeriods.ts
@@ -24,4 +24,4 @@ export const useActivityPeriods = ({ data, player }: UseActivityPeriodsProps) =>
return () => clearTimeout(timeoutId);
}, [data, player, setActivityPeriods]);
-};
\ No newline at end of file
+};
diff --git a/client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.ts b/client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.ts
index 403f51bfb..02e796bcd 100644
--- a/client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.ts
+++ b/client/src/app/[site]/replay/components/player/hooks/useReplayKeyboardShortcuts.ts
@@ -16,11 +16,7 @@ export const useReplayKeyboardShortcuts = ({
useEffect(() => {
const handleKeyDown = (event: KeyboardEvent) => {
// Only handle hotkeys when the player exists and focus is not on an input/textarea
- if (
- !player ||
- event.target instanceof HTMLInputElement ||
- event.target instanceof HTMLTextAreaElement
- ) {
+ if (!player || event.target instanceof HTMLInputElement || event.target instanceof HTMLTextAreaElement) {
return;
}
@@ -46,4 +42,4 @@ export const useReplayKeyboardShortcuts = ({
document.removeEventListener("keydown", handleKeyDown);
};
}, [player, onSkipBack, onSkipForward, onPlayPause]);
-};
\ No newline at end of file
+};
diff --git a/client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.ts b/client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.ts
index 4599251b1..114c94ea5 100644
--- a/client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.ts
+++ b/client/src/app/[site]/replay/components/player/hooks/useReplayPlayer.ts
@@ -11,13 +11,7 @@ interface UseReplayPlayerProps {
export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) => {
const playerContainerRef = useRef<HTMLDivElement>(null);
- const {
- setPlayer,
- setCurrentTime,
- setIsPlaying,
- setDuration,
- setActivityPeriods,
- } = useReplayStore();
+ const { setPlayer, setCurrentTime, setIsPlaying, setDuration, setActivityPeriods } = useReplayStore();
useEffect(() => {
if (data?.events && playerContainerRef.current) {
@@ -48,7 +42,7 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
// Validate that current time doesn't exceed duration
const currentTime = event.payload;
const playerDuration = newPlayer.getMetaData().totalTime;
-
+
if (playerDuration && currentTime > playerDuration) {
// If we've exceeded duration, pause and set to end
newPlayer.pause();
@@ -77,7 +71,7 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
// Handle page visibility changes to prevent tab-switching issues
let wasPlayingBeforeHidden = false;
-
+
handleVisibilityChange = () => {
if (document.hidden) {
// Tab became hidden - pause if playing and remember state
@@ -97,7 +91,7 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
if (playerDuration) {
setDuration(playerDuration);
}
-
+
// Resume playback
newPlayer.play();
setIsPlaying(true);
@@ -106,8 +100,7 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
}
};
- document.addEventListener('visibilitychange', handleVisibilityChange);
-
+ document.addEventListener("visibilitychange", handleVisibilityChange);
} catch (error) {
console.error("Failed to initialize rrweb player:", error);
return;
@@ -122,7 +115,7 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
playerContainerRef.current.innerHTML = "";
}
if (handleVisibilityChange) {
- document.removeEventListener('visibilitychange', handleVisibilityChange);
+ document.removeEventListener("visibilitychange", handleVisibilityChange);
}
setPlayer(null);
};
@@ -130,4 +123,4 @@ export const useReplayPlayer = ({ data, width, height }: UseReplayPlayerProps) =
}, [data, width, height, setPlayer, setCurrentTime, setIsPlaying, setDuration, setActivityPeriods]);
return { playerContainerRef };
-};
\ No newline at end of file
+};
diff --git a/client/src/app/[site]/replay/components/player/utils/replayUtils.ts b/client/src/app/[site]/replay/components/player/utils/replayUtils.ts
index e95a73768..640031ed1 100644
--- a/client/src/app/[site]/replay/components/player/utils/replayUtils.ts
+++ b/client/src/app/[site]/replay/components/player/utils/replayUtils.ts
@@ -5,14 +5,11 @@ export const formatTime = (ms: number): string => {
return `${minutes}:${seconds.toString().padStart(2, "0")}`;
};
-export const calculateActivityPeriods = (
- events: any[],
- totalDuration: number
-): { start: number; end: number }[] => {
+export const calculateActivityPeriods = (events: any[], totalDuration: number): { start: number; end: number }[] => {
if (!events || events.length === 0) return [];
// Filter for user interaction events (mouse moves, clicks, etc.)
- const interactionEvents = events.filter((event) => {
+ const interactionEvents = events.filter(event => {
const eventType = parseInt(event.type.toString());
// Type 3 = IncrementalSnapshot (includes mouse moves, clicks, etc.)
return eventType === 3;
@@ -27,9 +24,7 @@ export const calculateActivityPeriods = (
const nextEvent = interactionEvents[i + 1];
const currentTime = currentEvent.timestamp - firstEventTime;
- const nextTime = nextEvent
- ? nextEvent.timestamp - firstEventTime
- : totalDuration;
+ const nextTime = nextEvent ? nextEvent.timestamp - firstEventTime : totalDuration;
if (nextTime - currentTime <= inactivityThreshold) {
periods.push({
diff --git a/client/src/app/[site]/replay/components/replayStore.ts b/client/src/app/[site]/replay/components/replayStore.ts
index 8c5b6cfc5..cbfdca349 100644
--- a/client/src/app/[site]/replay/components/replayStore.ts
+++ b/client/src/app/[site]/replay/components/replayStore.ts
@@ -35,33 +35,33 @@ export const useReplayStore = create<{
// Reset all player state when session changes
resetPlayerState: () => void;
-}>((set) => ({
+}>(set => ({
minDuration: 30,
- setMinDuration: (minDuration) => set({ minDuration }),
+ setMinDuration: minDuration => set({ minDuration }),
// Session selection
sessionId: "",
- setSessionId: (sessionId) => set({ sessionId }),
+ setSessionId: sessionId => set({ sessionId }),
// Player state
player: null,
- setPlayer: (player) => set({ player }),
+ setPlayer: player => set({ player }),
// Playback state
isPlaying: false,
- setIsPlaying: (isPlaying) => set({ isPlaying }),
+ setIsPlaying: isPlaying => set({ isPlaying }),
currentTime: 0,
- setCurrentTime: (currentTime) => set({ currentTime }),
+ setCurrentTime: currentTime => set({ currentTime }),
duration: 0,
- setDuration: (duration) => set({ duration }),
+ setDuration: duration => set({ duration }),
playbackSpeed: "1",
- setPlaybackSpeed: (playbackSpeed) => set({ playbackSpeed }),
+ setPlaybackSpeed: playbackSpeed => set({ playbackSpeed }),
activityPeriods: [],
- setActivityPeriods: (activityPeriods) => set({ activityPeriods }),
+ setActivityPeriods: activityPeriods => set({ activityPeriods }),
// Reset all player state when session changes
resetPlayerState: () =>
diff --git a/client/src/app/[site]/reports/page.tsx b/client/src/app/[site]/reports/page.tsx
index e19f4dc12..adf541cb6 100644
--- a/client/src/app/[site]/reports/page.tsx
+++ b/client/src/app/[site]/reports/page.tsx
@@ -8,9 +8,7 @@ export default function ReportsPage() {
return (
<div className="p-6">
<h1 className="text-2xl font-bold mb-4">Reports</h1>
- <p className="text-neutral-400">
- Reports and analytics content will go here.
- </p>
+ <p className="text-neutral-400">Reports and analytics content will go here.</p>
</div>
);
}
diff --git a/client/src/app/[site]/retention/RetentionChart.tsx b/client/src/app/[site]/retention/RetentionChart.tsx
index ae0797e23..4c22be346 100644
--- a/client/src/app/[site]/retention/RetentionChart.tsx
+++ b/client/src/app/[site]/retention/RetentionChart.tsx
@@ -4,10 +4,7 @@ import { nivoTheme } from "@/lib/nivo";
import { ResponsiveLine } from "@nivo/line";
import { DateTime } from "luxon";
import { useMemo } from "react";
-import {
- ProcessedRetentionData,
- RetentionMode,
-} from "../../../api/analytics/useGetRetention";
+import { ProcessedRetentionData, RetentionMode } from "../../../api/analytics/useGetRetention";
import { Skeleton } from "../../../components/ui/skeleton";
interface RetentionChartProps {
@@ -99,7 +96,7 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
return {
id: formattedDate,
- data: points.filter((point) => point.y !== null), // Remove null points
+ data: points.filter(point => point.y !== null), // Remove null points
color: cohortColors[index % cohortColors.length],
};
});
@@ -112,9 +109,7 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
if (!data || chartData.length === 0) {
return (
<div className="h-[400px] flex items-center justify-center">
- <div className="text-neutral-400 text-sm">
- No retention data available
- </div>
+ <div className="text-neutral-400 text-sm">No retention data available</div>
</div>
);
}
@@ -122,11 +117,7 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
// Calculate max Y value with a little headroom
const maxY = Math.min(
100,
- Math.max(
- ...chartData.flatMap((series) =>
- series.data.map((d) => (typeof d.y === "number" ? d.y : 0))
- )
- ) * 1.1
+ Math.max(...chartData.flatMap(series => series.data.map(d => (typeof d.y === "number" ? d.y : 0)))) * 1.1
);
return (
@@ -152,13 +143,13 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
tickPadding: 5,
tickRotation: 0,
tickValues: chartData.length,
- format: (value) => `${value}`,
+ format: value => `${value}`,
}}
axisLeft={{
tickSize: 5,
tickPadding: 5,
tickRotation: 0,
- format: (value) => `${value}%`,
+ format: value => `${value}%`,
}}
enableGridX={true}
gridXValues={Array.from({ length: data.maxPeriods + 1 }, (_, i) => i)}
@@ -197,12 +188,9 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
const xValue = point.data.x as number;
// Find the original cohort date by matching the formatted label
- const cohortEntry = chartData.find(
- (series) => series.id === point.seriesId
- );
+ const cohortEntry = chartData.find(series => series.id === point.seriesId);
const cohortIndex = cohortEntry ? chartData.indexOf(cohortEntry) : -1;
- const originalCohortKey =
- cohortIndex >= 0 && cohortKeys && cohortKeys[cohortIndex];
+ const originalCohortKey = cohortIndex >= 0 && cohortKeys && cohortKeys[cohortIndex];
// Format full date for tooltip
let cohortDateDisplay = point.seriesId;
@@ -214,33 +202,25 @@ export function RetentionChart({ data, isLoading, mode }: RetentionChartProps) {
const endDate = startDate.plus({ days: 6 });
if (startDate.month === endDate.month) {
- cohortDateDisplay = `${startDate.toFormat("MMM dd"
- )} - ${endDate.toFormat("dd, yyyy")}`;
+ cohortDateDisplay = `${startDate.toFormat("MMM dd")} - ${endDate.toFormat("dd, yyyy")}`;
} else if (startDate.year === endDate.year) {
- cohortDateDisplay = `${startDate.toFormat("MMM dd"
- )} - ${endDate.toFormat("MMM dd, yyyy")}`;
+ cohortDateDisplay = `${startDate.toFormat("MMM dd")} - ${endDate.toFormat("MMM dd, yyyy")}`;
} else {
- cohortDateDisplay = `${startDate.toFormat("MMM dd, yyyy"
- )} - ${endDate.toFormat("MMM dd, yyyy")}`;
+ cohortDateDisplay = `${startDate.toFormat("MMM dd, yyyy")} - ${endDate.toFormat("MMM dd, yyyy")}`;
}
}
}
return (
<div className="text-sm bg-neutral-850 p-2 rounded-md border border-neutral-800 shadow-md">
- <div
- className="font-medium mb-1"
- style={{ color: point.seriesColor }}
- >
+ <div className="font-medium mb-1" style={{ color: point.seriesColor }}>
Cohort: {cohortDateDisplay}
</div>
<div className="flex justify-between w-48 text-neutral-200">
<span>
{mode === "day" ? "Day" : "Week"} {xValue}
</span>
- <span className="font-medium">
- {value !== null ? `${value.toFixed(1)}%` : "-"}
- </span>
+ <span className="font-medium">{value !== null ? `${value.toFixed(1)}%` : "-"}</span>
</div>
</div>
);
diff --git a/client/src/app/[site]/retention/page.tsx b/client/src/app/[site]/retention/page.tsx
index b0a0c6c96..f0c47e071 100644
--- a/client/src/app/[site]/retention/page.tsx
+++ b/client/src/app/[site]/retention/page.tsx
@@ -127,7 +127,7 @@ export default function RetentionPage() {
<SelectValue />
</SelectTrigger>
<SelectContent>
- {RANGE_OPTIONS.map((option) => (
+ {RANGE_OPTIONS.map(option => (
<SelectItem key={option.value} value={option.value}>
{option.label}
</SelectItem>
@@ -217,7 +217,7 @@ export default function RetentionPage() {
<div className="p-2 text-sm font-semibold bg-neutral-900 text-neutral-100 text-center sticky left-0 z-10 border-b border-r border-neutral-700">
Cohort
</div>
- {periodHeaders.map((header) => (
+ {periodHeaders.map(header => (
<div
key={header}
className="p-2 text-sm bg-neutral-900 text-neutral-100 text-center border-b border-neutral-700"
@@ -227,7 +227,7 @@ export default function RetentionPage() {
))}
{/* Data Rows */}
- {cohortKeys.map((cohortPeriod) => (
+ {cohortKeys.map(cohortPeriod => (
<Fragment key={cohortPeriod}>
{/* Cohort Info Cell */}
<div className="py-2 px-2 bg-neutral-900 text-sm sticky left-0 z-10 border-r border-neutral-800">
diff --git a/client/src/app/[site]/user/[userId]/components/Calendar.tsx b/client/src/app/[site]/user/[userId]/components/Calendar.tsx
index 73b634b66..eb463a4f4 100644
--- a/client/src/app/[site]/user/[userId]/components/Calendar.tsx
+++ b/client/src/app/[site]/user/[userId]/components/Calendar.tsx
@@ -4,13 +4,9 @@ import { DateTime } from "luxon";
import { UserSessionCountResponse } from "../../../../../api/analytics/userSessions";
import { nivoTheme } from "../../../../../lib/nivo";
-export const VisitCalendar = ({
- sessionCount,
-}: {
- sessionCount: UserSessionCountResponse[];
-}) => {
+export const VisitCalendar = ({ sessionCount }: { sessionCount: UserSessionCountResponse[] }) => {
const data = sessionCount
- .map((e) => ({
+ .map(e => ({
value: e.sessions,
day: DateTime.fromSQL(e.date ?? 0)
.toLocal()
@@ -18,19 +14,13 @@ export const VisitCalendar = ({
}))
.reverse();
- const maxValue = _.get(
- _.sortBy(data, "value")[Math.floor(data.length * 0.95)],
- "value"
- );
+ const maxValue = _.get(_.sortBy(data, "value")[Math.floor(data.length * 0.95)], "value");
if (data.length === 0) {
return null;
}
- const numYears =
- DateTime.fromISO(data[0].day ?? "").year -
- DateTime.fromISO(data.at(-1)?.day ?? "").year +
- 1;
+ const numYears = DateTime.fromISO(data[0].day ?? "").year - DateTime.fromISO(data.at(-1)?.day ?? "").year + 1;
return (
<div style={{ width: "100%", overflowX: "auto", height: "150px" }}>
@@ -50,11 +40,7 @@ export const VisitCalendar = ({
tooltip={({ value, day }) => {
return (
<div className="bg-neutral-900 p-2 rounded-md border border-neutral-800 text-sm">
- {value}{" "}
- <span className="text-neutral-300">
- session{Number(value) > 1 && "s"} on
- </span>{" "}
- {day}
+ {value} <span className="text-neutral-300">session{Number(value) > 1 && "s"} on</span> {day}
</div>
);
}}
diff --git a/client/src/app/[site]/users/page.tsx b/client/src/app/[site]/users/page.tsx
index 4a7e1a014..d0b391bbd 100644
--- a/client/src/app/[site]/users/page.tsx
+++ b/client/src/app/[site]/users/page.tsx
@@ -98,7 +98,7 @@ export default function UsersPage() {
const columns = [
columnHelper.accessor("user_id", {
header: "User ID",
- cell: (info) => (
+ cell: info => (
<Link href={`/${site}/user/${info.getValue()}`}>
<div className=" truncate flex items-center gap-2 text-neutral-250 hover:text-neutral-100 hover:underline">
<Avatar size={20} name={info.getValue() as string} />
@@ -109,7 +109,7 @@ export default function UsersPage() {
}),
columnHelper.accessor("country", {
header: "Country",
- cell: (info) => {
+ cell: info => {
return (
<div className="flex items-center gap-2 whitespace-nowrap">
<Tooltip>
@@ -127,7 +127,7 @@ export default function UsersPage() {
}),
columnHelper.accessor("browser", {
header: "Browser",
- cell: (info) => (
+ cell: info => (
<div className="flex items-center gap-2 whitespace-nowrap">
<Browser browser={info.getValue() || "Unknown"} />
{info.getValue() || "Unknown"}
@@ -136,7 +136,7 @@ export default function UsersPage() {
}),
columnHelper.accessor("operating_system", {
header: "OS",
- cell: (info) => (
+ cell: info => (
<div className="flex items-center gap-2 whitespace-nowrap">
<OperatingSystem os={info.getValue() || ""} />
{info.getValue() || "Unknown"}
@@ -145,7 +145,7 @@ export default function UsersPage() {
}),
columnHelper.accessor("device_type", {
header: "Device",
- cell: (info) => {
+ cell: info => {
const deviceType = info.getValue();
return (
<div className="flex items-center gap-2 whitespace-nowrap">
@@ -158,19 +158,19 @@ export default function UsersPage() {
}),
columnHelper.accessor("pageviews", {
header: ({ column }) => <SortHeader column={column}>Pageviews</SortHeader>,
- cell: (info) => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
+ cell: info => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
}),
columnHelper.accessor("events", {
header: ({ column }) => <SortHeader column={column}>Events</SortHeader>,
- cell: (info) => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
+ cell: info => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
}),
columnHelper.accessor("sessions", {
header: ({ column }) => <SortHeader column={column}>Sessions</SortHeader>,
- cell: (info) => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
+ cell: info => <div className="whitespace-nowrap">{info.getValue().toLocaleString()}</div>,
}),
columnHelper.accessor("last_seen", {
header: ({ column }) => <SortHeader column={column}>Last Seen</SortHeader>,
- cell: (info) => {
+ cell: info => {
const date = DateTime.fromSQL(info.getValue(), {
zone: "utc",
}).toLocal();
@@ -193,7 +193,7 @@ export default function UsersPage() {
}),
columnHelper.accessor("first_seen", {
header: ({ column }) => <SortHeader column={column}>First Seen</SortHeader>,
- cell: (info) => {
+ cell: info => {
const date = DateTime.fromSQL(info.getValue(), {
zone: "utc",
}).toLocal();
@@ -247,9 +247,9 @@ export default function UsersPage() {
<div className="relative overflow-x-auto">
<table className="w-full text-sm text-left">
<thead className="bg-neutral-850 text-neutral-400 ">
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<tr key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<th
key={header.id}
scope="col"
@@ -282,13 +282,13 @@ export default function UsersPage() {
</td>
</tr>
) : (
- table.getRowModel().rows.map((row) => {
+ table.getRowModel().rows.map(row => {
const userId = row.original.user_id;
const href = `/${site}/user/${userId}`;
return (
<tr key={row.id} className="border-b border-neutral-800 group">
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<td key={cell.id} className="px-3 py-3 relative">
{/* <Link
href={href}
diff --git a/client/src/app/admin/components/organizations/Organizations.tsx b/client/src/app/admin/components/organizations/Organizations.tsx
index 2133711cb..e39a85051 100644
--- a/client/src/app/admin/components/organizations/Organizations.tsx
+++ b/client/src/app/admin/components/organizations/Organizations.tsx
@@ -60,12 +60,12 @@ export function Organizations() {
if (!searchQuery.trim()) return organizations;
const lowerSearchQuery = searchQuery.toLowerCase();
- return organizations.filter((org) => {
+ return organizations.filter(org => {
return (
org.name.toLowerCase().includes(lowerSearchQuery) ||
- org.sites.some((site) => site.domain.toLowerCase().includes(lowerSearchQuery)) ||
+ org.sites.some(site => site.domain.toLowerCase().includes(lowerSearchQuery)) ||
org.members.some(
- (member) =>
+ member =>
member.email.toLowerCase().includes(lowerSearchQuery) ||
member.name.toLowerCase().includes(lowerSearchQuery)
)
@@ -151,7 +151,7 @@ export function Organizations() {
{
id: "eventsLast24Hours",
header: ({ column }) => <SortableHeader column={column}>24h Events</SortableHeader>,
- accessorFn: (row) => row.sites.reduce((total, site) => total + Number(site.eventsLast24Hours || 0), 0),
+ accessorFn: row => row.sites.reduce((total, site) => total + Number(site.eventsLast24Hours || 0), 0),
cell: ({ row }) => {
const total = row.original.sites.reduce((sum, site) => sum + Number(site.eventsLast24Hours || 0), 0);
return total.toLocaleString();
@@ -160,19 +160,19 @@ export function Organizations() {
{
id: "subscription",
header: ({ column }) => <SortableHeader column={column}>Subscription</SortableHeader>,
- accessorFn: (row) => row.subscription.planName,
+ accessorFn: row => row.subscription.planName,
cell: ({ row }) => formatSubscriptionStatus(row.original.subscription),
},
{
id: "sites",
header: ({ column }) => <SortableHeader column={column}>Sites</SortableHeader>,
- accessorFn: (row) => row.sites.length,
+ accessorFn: row => row.sites.length,
cell: ({ row }) => <Badge variant="outline">{row.original.sites.length}</Badge>,
},
{
id: "members",
header: ({ column }) => <SortableHeader column={column}>Members</SortableHeader>,
- accessorFn: (row) => row.members.length,
+ accessorFn: row => row.members.length,
cell: ({ row }) => <Badge variant="outline">{row.original.members.length}</Badge>,
},
],
@@ -236,7 +236,7 @@ export function Organizations() {
return (
<AdminLayout title="Organizations">
<GrowthChart data={organizations || []} title="Organizations" color="#8b5cf6" />
-
+
<div className="mb-4">
<SearchInput
placeholder="Search by name, slug, domain, or member email..."
@@ -248,9 +248,9 @@ export function Organizations() {
<div className="rounded-md border border-neutral-700">
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead key={header.id} className={header.id === "expand" ? "w-8" : ""}>
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
</TableHead>
@@ -291,10 +291,10 @@ export function Organizations() {
</TableRow>
))
) : paginatedOrganizations && paginatedOrganizations.length > 0 ? (
- paginatedOrganizations.map((row) => (
+ paginatedOrganizations.map(row => (
<>
<TableRow key={row.id} className="group">
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
@@ -350,7 +350,7 @@ export function Organizations() {
</div>
{row.original.sites.length > 0 ? (
<div className="flex flex-wrap gap-2">
- {row.original.sites.map((site) => (
+ {row.original.sites.map(site => (
<Link
key={site.siteId}
href={`/${site.siteId}`}
@@ -380,7 +380,7 @@ export function Organizations() {
</div>
{row.original.members.length > 0 ? (
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-3">
- {row.original.members.map((member) => (
+ {row.original.members.map(member => (
<div
key={member.userId}
className="p-3 border border-neutral-700 rounded flex items-center justify-between"
diff --git a/client/src/app/admin/components/shared/AdminLayout.tsx b/client/src/app/admin/components/shared/AdminLayout.tsx
index 7721a0576..378eb1104 100644
--- a/client/src/app/admin/components/shared/AdminLayout.tsx
+++ b/client/src/app/admin/components/shared/AdminLayout.tsx
@@ -13,13 +13,8 @@ interface AdminLayoutProps {
showStopImpersonating?: boolean;
}
-export function AdminLayout({
- children,
- title,
- showStopImpersonating = false,
-}: AdminLayoutProps) {
- const { isAdmin, isImpersonating, isCheckingAdmin, stopImpersonating } =
- useAdminPermission();
+export function AdminLayout({ children, title, showStopImpersonating = false }: AdminLayoutProps) {
+ const { isAdmin, isImpersonating, isCheckingAdmin, stopImpersonating } = useAdminPermission();
// If not admin, show access denied
if (!isAdmin && !isCheckingAdmin) {
diff --git a/client/src/app/admin/components/shared/GrowthChart.tsx b/client/src/app/admin/components/shared/GrowthChart.tsx
index d4dca008c..ee8de0b52 100644
--- a/client/src/app/admin/components/shared/GrowthChart.tsx
+++ b/client/src/app/admin/components/shared/GrowthChart.tsx
@@ -16,8 +16,8 @@ export function GrowthChart({ data, title, color = "#3b82f6" }: GrowthChartProps
// Group data by date
const dailyCounts = new Map<string, number>();
-
- data.forEach((item) => {
+
+ data.forEach(item => {
const date = parseUtcTimestamp(item.createdAt).toFormat("yyyy-MM-dd");
dailyCounts.set(date, (dailyCounts.get(date) || 0) + 1);
});
@@ -42,9 +42,7 @@ export function GrowthChart({ data, title, color = "#3b82f6" }: GrowthChartProps
return (
<div className="bg-neutral-900 border border-neutral-700 rounded-lg p-3 sm:p-6 mb-6">
<h3 className="text-base sm:text-lg font-semibold mb-3 sm:mb-4">{title} Growth</h3>
- <div className="h-48 sm:h-64 flex items-center justify-center text-neutral-400 text-sm">
- No data available
- </div>
+ <div className="h-48 sm:h-64 flex items-center justify-center text-neutral-400 text-sm">No data available</div>
</div>
);
}
@@ -55,11 +53,11 @@ export function GrowthChart({ data, title, color = "#3b82f6" }: GrowthChartProps
<div className="h-48 sm:h-64">
<ResponsiveLine
data={chartData}
- margin={{
- top: 20,
- right: 10,
- bottom: 50,
- left: 45
+ margin={{
+ top: 20,
+ right: 10,
+ bottom: 50,
+ left: 45,
}}
xScale={{
type: "time",
@@ -168,4 +166,4 @@ export function GrowthChart({ data, title, color = "#3b82f6" }: GrowthChartProps
</div>
</div>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/app/admin/components/shared/SearchInput.tsx b/client/src/app/admin/components/shared/SearchInput.tsx
index 60fca58f8..f18982bf5 100644
--- a/client/src/app/admin/components/shared/SearchInput.tsx
+++ b/client/src/app/admin/components/shared/SearchInput.tsx
@@ -10,19 +10,14 @@ interface SearchInputProps {
className?: string;
}
-export function SearchInput({
- value,
- onChange,
- placeholder = "Search...",
- className = "max-w-sm",
-}: SearchInputProps) {
+export function SearchInput({ value, onChange, placeholder = "Search...", className = "max-w-sm" }: SearchInputProps) {
return (
<div className={`relative ${className}`}>
<Search className="absolute left-2.5 top-2.5 h-4 w-4 text-neutral-400" />
<Input
placeholder={placeholder}
value={value}
- onChange={(e) => onChange(e.target.value)}
+ onChange={e => onChange(e.target.value)}
className="pl-9 bg-neutral-900 border-neutral-700"
/>
</div>
diff --git a/client/src/app/admin/components/shared/SortableHeader.tsx b/client/src/app/admin/components/shared/SortableHeader.tsx
index 961b7bf49..11e4a4a4b 100644
--- a/client/src/app/admin/components/shared/SortableHeader.tsx
+++ b/client/src/app/admin/components/shared/SortableHeader.tsx
@@ -18,11 +18,7 @@ export function SortableHeader<TData>({
const sortDirection = column.getIsSorted();
return (
- <Button
- variant="ghost"
- onClick={() => column.toggleSorting(sortDirection === "asc")}
- className={className}
- >
+ <Button variant="ghost" onClick={() => column.toggleSorting(sortDirection === "asc")} className={className}>
{children}
{sortDirection === "asc" ? (
<ArrowUp className="ml-2 h-4 w-4" />
diff --git a/client/src/app/admin/components/sites/Sites.tsx b/client/src/app/admin/components/sites/Sites.tsx
index 1b7ef5659..59c454b8b 100644
--- a/client/src/app/admin/components/sites/Sites.tsx
+++ b/client/src/app/admin/components/sites/Sites.tsx
@@ -37,7 +37,7 @@ export function Sites() {
const filteredSites = useMemo(() => {
if (!sites) return [];
- return sites.filter((site) => {
+ return sites.filter(site => {
const lowerSearchQuery = searchQuery.toLowerCase();
return (
site.domain.toLowerCase().includes(lowerSearchQuery) ||
@@ -103,15 +103,15 @@ export function Sites() {
{
id: "subscription",
header: ({ column }) => <SortableHeader column={column}>Subscription</SortableHeader>,
- accessorFn: (row) => row.subscription.planName,
+ accessorFn: row => row.subscription.planName,
cell: ({ row }) => {
const subscription = row.original.subscription;
const statusColor =
subscription.status === "active"
? "default"
: subscription.status === "canceled"
- ? "destructive"
- : "secondary";
+ ? "destructive"
+ : "secondary";
return <Badge variant={statusColor}>{subscription.planName}</Badge>;
},
},
@@ -159,9 +159,9 @@ export function Sites() {
<div className="rounded-md border border-neutral-700">
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead key={header.id}>
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
</TableHead>
@@ -208,9 +208,9 @@ export function Sites() {
</TableCell>
</TableRow>
) : (
- table.getRowModel().rows.map((row) => (
+ table.getRowModel().rows.map(row => (
<TableRow key={row.id}>
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
diff --git a/client/src/app/admin/components/users/UserFilters.tsx b/client/src/app/admin/components/users/UserFilters.tsx
index f4218c1a0..3aa331a04 100644
--- a/client/src/app/admin/components/users/UserFilters.tsx
+++ b/client/src/app/admin/components/users/UserFilters.tsx
@@ -4,13 +4,7 @@ import { Search } from "lucide-react";
import { Table } from "@tanstack/react-table";
import { AdminUser } from "@/types/admin";
import { Input } from "@/components/ui/input";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
interface UserFiltersProps {
table: Table<AdminUser>;
@@ -24,16 +18,14 @@ export function UserFilters({ table }: UserFiltersProps) {
<Input
placeholder="Filter by email..."
value={(table.getColumn("email")?.getFilterValue() as string) ?? ""}
- onChange={(e) =>
- table.getColumn("email")?.setFilterValue(e.target.value)
- }
+ onChange={e => table.getColumn("email")?.setFilterValue(e.target.value)}
className="pl-9 bg-neutral-900 border-neutral-700"
/>
</div>
<div className="w-full md:w-48">
<Select
value={(table.getColumn("role")?.getFilterValue() as string) ?? ""}
- onValueChange={(value) => {
+ onValueChange={value => {
if (value === "all") {
table.getColumn("role")?.setFilterValue("");
} else {
diff --git a/client/src/app/admin/components/users/Users.tsx b/client/src/app/admin/components/users/Users.tsx
index 8e11eb022..6a522ac22 100644
--- a/client/src/app/admin/components/users/Users.tsx
+++ b/client/src/app/admin/components/users/Users.tsx
@@ -67,14 +67,10 @@ export function Users() {
table={
{
getColumn: (columnId: string) => {
- const getFilterValue = () =>
- columnFilters.find((filter) => filter.id === columnId)
- ?.value ?? "";
+ const getFilterValue = () => columnFilters.find(filter => filter.id === columnId)?.value ?? "";
const setFilterValue = (value: string) => {
- const newFilters = columnFilters.filter(
- (filter) => filter.id !== columnId
- );
+ const newFilters = columnFilters.filter(filter => filter.id !== columnId);
if (value) {
newFilters.push({ id: columnId, value });
}
@@ -110,13 +106,10 @@ export function Users() {
table={
{
getCanPreviousPage: () => pagination.pageIndex > 0,
- getCanNextPage: () =>
- pagination.pageIndex <
- Math.ceil(total / pagination.pageSize) - 1,
+ getCanNextPage: () => pagination.pageIndex < Math.ceil(total / pagination.pageSize) - 1,
getPageCount: () => Math.ceil(total / pagination.pageSize),
getState: () => ({ pagination }),
- setPageIndex: (index: number) =>
- setPagination({ ...pagination, pageIndex: index }),
+ setPageIndex: (index: number) => setPagination({ ...pagination, pageIndex: index }),
previousPage: () =>
setPagination({
...pagination,
@@ -125,10 +118,7 @@ export function Users() {
nextPage: () =>
setPagination({
...pagination,
- pageIndex: Math.min(
- Math.ceil(total / pagination.pageSize) - 1,
- pagination.pageIndex + 1
- ),
+ pageIndex: Math.min(Math.ceil(total / pagination.pageSize) - 1, pagination.pageIndex + 1),
}),
} as any
}
diff --git a/client/src/app/admin/components/users/UsersTable.tsx b/client/src/app/admin/components/users/UsersTable.tsx
index 8a7dbdf7a..0752b8153 100644
--- a/client/src/app/admin/components/users/UsersTable.tsx
+++ b/client/src/app/admin/components/users/UsersTable.tsx
@@ -15,14 +15,7 @@ import {
SortingState,
ColumnFiltersState,
} from "@tanstack/react-table";
-import {
- Table,
- TableBody,
- TableCell,
- TableHead,
- TableHeader,
- TableRow,
-} from "@/components/ui/table";
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@/components/ui/table";
import { UserTableSkeleton } from "./UserTableSkeleton";
import { userStore } from "@/lib/userStore";
import { SortableHeader } from "../shared/SortableHeader";
@@ -59,41 +52,28 @@ export function UsersTable({
() => [
{
accessorKey: "id",
- header: ({ column }) => (
- <SortableHeader column={column}>User ID</SortableHeader>
- ),
- cell: ({ row }) => (
- <div className="font-mono">{row.getValue("id")}</div>
- ),
+ header: ({ column }) => <SortableHeader column={column}>User ID</SortableHeader>,
+ cell: ({ row }) => <div className="font-mono">{row.getValue("id")}</div>,
},
{
accessorKey: "name",
- header: ({ column }) => (
- <SortableHeader column={column}>Name</SortableHeader>
- ),
+ header: ({ column }) => <SortableHeader column={column}>Name</SortableHeader>,
cell: ({ row }) => row.getValue("name") || "N/A",
},
{
accessorKey: "email",
- header: ({ column }) => (
- <SortableHeader column={column}>Email</SortableHeader>
- ),
+ header: ({ column }) => <SortableHeader column={column}>Email</SortableHeader>,
cell: ({ row }) => row.getValue("email"),
},
{
accessorKey: "role",
- header: ({ column }) => (
- <SortableHeader column={column}>Role</SortableHeader>
- ),
+ header: ({ column }) => <SortableHeader column={column}>Role</SortableHeader>,
cell: ({ row }) => row.getValue("role") || "user",
},
{
accessorKey: "createdAt",
- header: ({ column }) => (
- <SortableHeader column={column}>Created At</SortableHeader>
- ),
- cell: ({ row }) =>
- new Date(row.getValue("createdAt")).toLocaleDateString(),
+ header: ({ column }) => <SortableHeader column={column}>Created At</SortableHeader>,
+ cell: ({ row }) => new Date(row.getValue("createdAt")).toLocaleDateString(),
},
{
id: "actions",
@@ -126,16 +106,10 @@ export function UsersTable({
globalFilter,
},
pageCount: data ? Math.ceil(data.total / pagination.pageSize) : -1,
- onSortingChange: (updater) =>
- setSorting(typeof updater === "function" ? updater(sorting) : updater),
- onColumnFiltersChange: (updater) =>
- setColumnFilters(
- typeof updater === "function" ? updater(columnFilters) : updater
- ),
- onPaginationChange: (updater) =>
- setPagination(
- typeof updater === "function" ? updater(pagination) : updater
- ),
+ onSortingChange: updater => setSorting(typeof updater === "function" ? updater(sorting) : updater),
+ onColumnFiltersChange: updater =>
+ setColumnFilters(typeof updater === "function" ? updater(columnFilters) : updater),
+ onPaginationChange: updater => setPagination(typeof updater === "function" ? updater(pagination) : updater),
onGlobalFilterChange: setGlobalFilter,
getCoreRowModel: getCoreRowModel(),
getSortedRowModel: getSortedRowModel(),
@@ -150,16 +124,11 @@ export function UsersTable({
<div className="rounded-md border border-neutral-700">
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead key={header.id}>
- {header.isPlaceholder
- ? null
- : flexRender(
- header.column.columnDef.header,
- header.getContext()
- )}
+ {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
</TableHead>
))}
</TableRow>
@@ -175,12 +144,10 @@ export function UsersTable({
</TableCell>
</TableRow>
) : (
- table.getRowModel().rows.map((row) => (
+ table.getRowModel().rows.map(row => (
<TableRow key={row.id}>
- {row.getVisibleCells().map((cell) => (
- <TableCell key={cell.id}>
- {flexRender(cell.column.columnDef.cell, cell.getContext())}
- </TableCell>
+ {row.getVisibleCells().map(cell => (
+ <TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
))
diff --git a/client/src/app/admin/hooks/useAdminPermission.ts b/client/src/app/admin/hooks/useAdminPermission.ts
index fa3ef602d..9971ba4da 100644
--- a/client/src/app/admin/hooks/useAdminPermission.ts
+++ b/client/src/app/admin/hooks/useAdminPermission.ts
@@ -51,12 +51,11 @@ export function useAdminPermission() {
const stopImpersonating = async () => {
try {
await authClient.admin.stopImpersonating();
- setState((prev) => ({ ...prev, isImpersonating: false }));
+ setState(prev => ({ ...prev, isImpersonating: false }));
window.location.reload();
return true;
} catch (err) {
- const errorMessage =
- err instanceof Error ? err.message : "Unknown error occurred";
+ const errorMessage = err instanceof Error ? err.message : "Unknown error occurred";
console.error(`Failed to stop impersonation: ${errorMessage}`);
return false;
}
diff --git a/client/src/app/components/AddSite.tsx b/client/src/app/components/AddSite.tsx
index eb6509e4e..db2b35150 100644
--- a/client/src/app/components/AddSite.tsx
+++ b/client/src/app/components/AddSite.tsx
@@ -103,7 +103,7 @@ export function AddSite({ trigger, disabled }: { trigger?: React.ReactNode; disa
<div>
<Dialog
open={open}
- onOpenChange={(isOpen) => {
+ onOpenChange={isOpen => {
setOpen(isOpen);
if (isOpen) {
resetForm();
@@ -135,7 +135,7 @@ export function AddSite({ trigger, disabled }: { trigger?: React.ReactNode; disa
<Input
id="domain"
value={domain}
- onChange={(e) => setDomain(e.target.value.toLowerCase())}
+ onChange={e => setDomain(e.target.value.toLowerCase())}
placeholder="example.com or sub.example.com"
/>
</div>
diff --git a/client/src/app/components/Footer.tsx b/client/src/app/components/Footer.tsx
index 37cc7f3ce..9912b8125 100644
--- a/client/src/app/components/Footer.tsx
+++ b/client/src/app/components/Footer.tsx
@@ -15,10 +15,7 @@ export function Footer() {
<Link href="https://rybbit.io/docs" className="hover:text-neutral-300">
Docs
</Link>
- <Link
- href="https://github.com/rybbit-io/rybbit"
- className="hover:text-neutral-300"
- >
+ <Link href="https://github.com/rybbit-io/rybbit" className="hover:text-neutral-300">
Github
</Link>
</div>
diff --git a/client/src/app/globals.css b/client/src/app/globals.css
index 1c3f9132f..c9522b2d9 100644
--- a/client/src/app/globals.css
+++ b/client/src/app/globals.css
@@ -29,7 +29,7 @@ body {
--dataviz: 230 100% 85%;
--dataviz-2: 230 100% 92%;
-
+
--accent-50: var(--emerald-50);
--accent-100: var(--emerald-100);
--accent-200: var(--emerald-200);
@@ -181,7 +181,6 @@ body {
--lime-900: 87.6 61.2% 20.2%;
--lime-950: 89.3 80.4% 11.2%;
-
/* Green */
--green-50: 138.5 76.5% 96.7%;
--green-100: 140.6 84.2% 92.5%;
@@ -260,83 +259,83 @@ body {
--blue-900: 224.4 64.3% 32.9%;
--blue-950: 226.2 57.3% 21%;
- /* Indigo */
- --indigo-50: 225.9 100% 96.7%;
- --indigo-100: 226.5 100% 93.9%;
- --indigo-200: 228 96.5% 88.8%;
- --indigo-300: 229.7 93.5% 81.8%;
- --indigo-400: 234.5 89.5% 73.9%;
- --indigo-500: 238.7 83.5% 66.7%;
- --indigo-600: 243.4 75.4% 58.6%;
- --indigo-700: 244.5 57.9% 50.6%;
- --indigo-800: 243.7 54.5% 41.4%;
- --indigo-900: 242.2 47.4% 34.3%;
- --indigo-950: 243.5 47.7% 20.8%;
-
- /* Violet */
- --violet-50: 250 100% 97.6%;
- --violet-100: 251.4 91.3% 95.5%;
- --violet-200: 250.5 95.2% 91.8%;
- --violet-300: 252.5 94.7% 85.1%;
- --violet-400: 255.1 91.7% 76.3%;
- --violet-500: 258.3 89.5% 66.3%;
- --violet-600: 262.1 83.3% 57.8%;
- --violet-700: 263.4 70% 50.4%;
- --violet-800: 263.4 69.3% 42.2%;
- --violet-900: 263.5 67.4% 34.9%;
- --violet-950: 264.1 71.2% 21.6%;
-
- /* Purple */
- --purple-50: 270 100% 98%;
- --purple-100: 268.7 100% 95.5%;
- --purple-200: 268.6 100% 91.8%;
- --purple-300: 269.2 97.4% 85.1%;
- --purple-400: 270 95.2% 75.3%;
- --purple-500: 270.7 91% 65.1%;
- --purple-600: 271.5 81.3% 55.9%;
- --purple-700: 272.1 71.7% 47.1%;
- --purple-800: 272.9 67.2% 39.4%;
- --purple-900: 273.6 65.6% 32%;
- --purple-950: 274.1 75.7% 20.8%;
-
- /* Fuchsia */
- --fuchsia-50: 289.1 100% 97.8%;
- --fuchsia-100: 287 100% 95.5%;
- --fuchsia-200: 288.3 95.8% 90.6%;
- --fuchsia-300: 291.1 93.1% 82.9%;
- --fuchsia-400: 292 91.4% 72.5%;
- --fuchsia-500: 292.2 84.1% 60.6%;
- --fuchsia-600: 293.4 69.5% 48.8%;
- --fuchsia-700: 294.7 72.4% 39.8%;
- --fuchsia-800: 295.4 70.2% 32.9%;
- --fuchsia-900: 296.7 63.6% 28%;
- --fuchsia-950: 297.1 71.7% 17.3%;
-
- /* Pink */
- --pink-50: 327.3 73.3% 97.1%;
- --pink-100: 325.7 77.8% 94.7%;
- --pink-200: 325.9 84.6% 89.8%;
- --pink-300: 327.4 87.1% 81.8%;
- --pink-400: 328.6 85.5% 70.2%;
- --pink-500: 330.4 81.2% 60.4%;
- --pink-600: 333.3 71.4% 50.6%;
- --pink-700: 335.1 77.6% 42%;
- --pink-800: 336.1 74.7% 35.3%;
- --pink-900: 336.8 69% 30.4%;
- --pink-950: 336.8 83.9% 17.3%;
-
- /* Rose */
- --rose-50: 355.7 100% 97.3%;
- --rose-100: 355.6 100% 94.7%;
- --rose-200: 352.7 96.1% 90%;
- --rose-300: 352.6 95.7% 81.8%;
- --rose-400: 351.3 94.5% 71.4%;
- --rose-500: 349.7 89.2% 60.2%;
- --rose-600: 346.8 77.2% 49.8%;
- --rose-700: 345.3 82.7% 40.8%;
- --rose-800: 343.4 79.7% 34.7%;
- --rose-900: 341.5 75.5% 30.4%;
- --rose-950: 341.3 89.1% 17.3%;
+ /* Indigo */
+ --indigo-50: 225.9 100% 96.7%;
+ --indigo-100: 226.5 100% 93.9%;
+ --indigo-200: 228 96.5% 88.8%;
+ --indigo-300: 229.7 93.5% 81.8%;
+ --indigo-400: 234.5 89.5% 73.9%;
+ --indigo-500: 238.7 83.5% 66.7%;
+ --indigo-600: 243.4 75.4% 58.6%;
+ --indigo-700: 244.5 57.9% 50.6%;
+ --indigo-800: 243.7 54.5% 41.4%;
+ --indigo-900: 242.2 47.4% 34.3%;
+ --indigo-950: 243.5 47.7% 20.8%;
+
+ /* Violet */
+ --violet-50: 250 100% 97.6%;
+ --violet-100: 251.4 91.3% 95.5%;
+ --violet-200: 250.5 95.2% 91.8%;
+ --violet-300: 252.5 94.7% 85.1%;
+ --violet-400: 255.1 91.7% 76.3%;
+ --violet-500: 258.3 89.5% 66.3%;
+ --violet-600: 262.1 83.3% 57.8%;
+ --violet-700: 263.4 70% 50.4%;
+ --violet-800: 263.4 69.3% 42.2%;
+ --violet-900: 263.5 67.4% 34.9%;
+ --violet-950: 264.1 71.2% 21.6%;
+
+ /* Purple */
+ --purple-50: 270 100% 98%;
+ --purple-100: 268.7 100% 95.5%;
+ --purple-200: 268.6 100% 91.8%;
+ --purple-300: 269.2 97.4% 85.1%;
+ --purple-400: 270 95.2% 75.3%;
+ --purple-500: 270.7 91% 65.1%;
+ --purple-600: 271.5 81.3% 55.9%;
+ --purple-700: 272.1 71.7% 47.1%;
+ --purple-800: 272.9 67.2% 39.4%;
+ --purple-900: 273.6 65.6% 32%;
+ --purple-950: 274.1 75.7% 20.8%;
+
+ /* Fuchsia */
+ --fuchsia-50: 289.1 100% 97.8%;
+ --fuchsia-100: 287 100% 95.5%;
+ --fuchsia-200: 288.3 95.8% 90.6%;
+ --fuchsia-300: 291.1 93.1% 82.9%;
+ --fuchsia-400: 292 91.4% 72.5%;
+ --fuchsia-500: 292.2 84.1% 60.6%;
+ --fuchsia-600: 293.4 69.5% 48.8%;
+ --fuchsia-700: 294.7 72.4% 39.8%;
+ --fuchsia-800: 295.4 70.2% 32.9%;
+ --fuchsia-900: 296.7 63.6% 28%;
+ --fuchsia-950: 297.1 71.7% 17.3%;
+
+ /* Pink */
+ --pink-50: 327.3 73.3% 97.1%;
+ --pink-100: 325.7 77.8% 94.7%;
+ --pink-200: 325.9 84.6% 89.8%;
+ --pink-300: 327.4 87.1% 81.8%;
+ --pink-400: 328.6 85.5% 70.2%;
+ --pink-500: 330.4 81.2% 60.4%;
+ --pink-600: 333.3 71.4% 50.6%;
+ --pink-700: 335.1 77.6% 42%;
+ --pink-800: 336.1 74.7% 35.3%;
+ --pink-900: 336.8 69% 30.4%;
+ --pink-950: 336.8 83.9% 17.3%;
+
+ /* Rose */
+ --rose-50: 355.7 100% 97.3%;
+ --rose-100: 355.6 100% 94.7%;
+ --rose-200: 352.7 96.1% 90%;
+ --rose-300: 352.6 95.7% 81.8%;
+ --rose-400: 351.3 94.5% 71.4%;
+ --rose-500: 349.7 89.2% 60.2%;
+ --rose-600: 346.8 77.2% 49.8%;
+ --rose-700: 345.3 82.7% 40.8%;
+ --rose-800: 343.4 79.7% 34.7%;
+ --rose-900: 341.5 75.5% 30.4%;
+ --rose-950: 341.3 89.1% 17.3%;
}
.dark {
diff --git a/client/src/app/invitation/components/login.tsx b/client/src/app/invitation/components/login.tsx
index 7f7628d22..2f08c153b 100644
--- a/client/src/app/invitation/components/login.tsx
+++ b/client/src/app/invitation/components/login.tsx
@@ -58,7 +58,7 @@ export function Login({ inviterEmail, organization }: LoginProps) {
placeholder="[email protected]"
required
value={email}
- onChange={(e) => setEmail(e.target.value)}
+ onChange={e => setEmail(e.target.value)}
/>
<AuthInput
@@ -68,7 +68,7 @@ export function Login({ inviterEmail, organization }: LoginProps) {
placeholder="••••••••"
required
value={password}
- onChange={(e) => setPassword(e.target.value)}
+ onChange={e => setPassword(e.target.value)}
/>
<AuthButton isLoading={isLoading} loadingText="Logging in...">
diff --git a/client/src/app/invitation/components/signup.tsx b/client/src/app/invitation/components/signup.tsx
index b9c5a43c3..08dca5521 100644
--- a/client/src/app/invitation/components/signup.tsx
+++ b/client/src/app/invitation/components/signup.tsx
@@ -59,7 +59,7 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
placeholder="[email protected]"
required
value={email}
- onChange={(e) => setEmail(e.target.value)}
+ onChange={e => setEmail(e.target.value)}
/>
<AuthInput
@@ -69,7 +69,7 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
placeholder="••••••••"
required
value={password}
- onChange={(e) => setPassword(e.target.value)}
+ onChange={e => setPassword(e.target.value)}
/>
<AuthButton isLoading={isLoading} loadingText="Creating account...">
diff --git a/client/src/app/invitation/page.tsx b/client/src/app/invitation/page.tsx
index cde2155e7..dd078b484 100644
--- a/client/src/app/invitation/page.tsx
+++ b/client/src/app/invitation/page.tsx
@@ -27,7 +27,7 @@ function AuthComponent() {
<p className="text-center text-sm text-muted-foreground mt-2">You've been invited by {inviterEmail}</p>
</CardHeader>
<CardContent>
- <Tabs defaultValue="login" value={activeTab} onValueChange={(v) => setActiveTab(v as "login" | "signup")}>
+ <Tabs defaultValue="login" value={activeTab} onValueChange={v => setActiveTab(v as "login" | "signup")}>
<TabsList className="grid w-full grid-cols-2 mb-6">
<TabsTrigger value="signup">Sign Up</TabsTrigger>
<TabsTrigger value="login">Login</TabsTrigger>
diff --git a/client/src/app/layout.tsx b/client/src/app/layout.tsx
index 4bda597ce..ba254a2ee 100644
--- a/client/src/app/layout.tsx
+++ b/client/src/app/layout.tsx
@@ -14,11 +14,7 @@ import { AuthenticationGuard } from "../components/AuthenticationGuard";
const inter = Inter({ subsets: ["latin"] });
-export default function RootLayout({
- children,
-}: {
- children: React.ReactNode;
-}) {
+export default function RootLayout({ children }: { children: React.ReactNode }) {
// Use the hook to expose stopImpersonating globally
useStopImpersonation();
@@ -26,12 +22,7 @@ export default function RootLayout({
<html lang="en" className="dark">
<ReactScan />
<TooltipProvider>
- <body
- className={cn(
- "bg-background text-foreground h-full",
- inter.className
- )}
- >
+ <body className={cn("bg-background text-foreground h-full", inter.className)}>
<QueryProvider>
<OrganizationInitializer />
<AuthenticationGuard />
diff --git a/client/src/app/login/page.tsx b/client/src/app/login/page.tsx
index 8892165af..d580b1dcc 100644
--- a/client/src/app/login/page.tsx
+++ b/client/src/app/login/page.tsx
@@ -67,7 +67,7 @@ export default function Page() {
placeholder="[email protected]"
required
value={email}
- onChange={(e) => setEmail(e.target.value)}
+ onChange={e => setEmail(e.target.value)}
/>
<AuthInput
@@ -77,7 +77,7 @@ export default function Page() {
placeholder="••••••••"
required
value={password}
- onChange={(e) => setPassword(e.target.value)}
+ onChange={e => setPassword(e.target.value)}
rightElement={
<Link href="/reset-password" className="text-xs text-muted-foreground hover:text-primary">
Forgot password?
diff --git a/client/src/app/not-found.tsx b/client/src/app/not-found.tsx
index 7cd5453c2..0980641ad 100644
--- a/client/src/app/not-found.tsx
+++ b/client/src/app/not-found.tsx
@@ -18,19 +18,14 @@ export default function NotFound() {
<div className="flex items-center justify-center">
<BarChart3 className="h-24 w-24 text-neutral-400" />
</div>
- <h1 className="text-6xl font-bold text-neutral-900 dark:text-neutral-100">
- 404
- </h1>
+ <h1 className="text-6xl font-bold text-neutral-900 dark:text-neutral-100">404</h1>
</div>
{/* Error Message */}
<div className="space-y-2 max-w-md">
- <h2 className="text-2xl font-semibold text-neutral-800 dark:text-neutral-200">
- Page Not Found
- </h2>
+ <h2 className="text-2xl font-semibold text-neutral-800 dark:text-neutral-200">Page Not Found</h2>
<p className="text-neutral-600 dark:text-neutral-400 leading-relaxed">
- The page you're looking for doesn't exist or has been moved. Let's
- get you back to analyzing your data.
+ The page you're looking for doesn't exist or has been moved. Let's get you back to analyzing your data.
</p>
</div>
@@ -44,10 +39,7 @@ export default function NotFound() {
</Button>
<Button asChild variant="outline" size="lg">
- <Link
- href="javascript:history.back()"
- className="flex items-center gap-2"
- >
+ <Link href="javascript:history.back()" className="flex items-center gap-2">
<ArrowLeft className="h-4 w-4" />
Go Back
</Link>
@@ -56,9 +48,7 @@ export default function NotFound() {
{/* Help Links */}
<div className="pt-8 space-y-2">
- <p className="text-sm text-neutral-500 dark:text-neutral-400">
- Need help? Check out our resources:
- </p>
+ <p className="text-sm text-neutral-500 dark:text-neutral-400">Need help? Check out our resources:</p>
<div className="flex flex-wrap justify-center gap-4 text-sm">
<Link
href="https://rybbit.io/docs"
diff --git a/client/src/app/page.tsx b/client/src/app/page.tsx
index 3ef076b03..574620651 100644
--- a/client/src/app/page.tsx
+++ b/client/src/app/page.tsx
@@ -18,14 +18,9 @@ import { AddSite } from "./components/AddSite";
export default function Home() {
useSetPageTitle("Rybbit · Home");
- const { data: activeOrganization, isPending } =
- authClient.useActiveOrganization();
+ const { data: activeOrganization, isPending } = authClient.useActiveOrganization();
- const {
- data: sites,
- refetch: refetchSites,
- isLoading: isLoadingSites,
- } = useGetSitesFromOrg(activeOrganization?.id);
+ const { data: sites, refetch: refetchSites, isLoading: isLoadingSites } = useGetSitesFromOrg(activeOrganization?.id);
const {
data: userOrganizationsData,
@@ -37,22 +32,18 @@ export default function Home() {
const isLoading = isLoadingOrganizations || isPending || isLoadingSites;
// Check if user has organizations
- const hasOrganizations =
- Array.isArray(userOrganizationsData) && userOrganizationsData.length > 0;
+ const hasOrganizations = Array.isArray(userOrganizationsData) && userOrganizationsData.length > 0;
const hasNoOrganizations = !isLoading && !hasOrganizations;
// Check user permissions for the active organization
- const activeOrgMembership = userOrganizationsData?.find(
- (org) => org.id === activeOrganization?.id
- );
+ const activeOrgMembership = userOrganizationsData?.find(org => org.id === activeOrganization?.id);
const isUserMember = activeOrgMembership?.role === "member";
const canAddSites = hasOrganizations && !isUserMember;
// Check if we should show sites content
const shouldShowSites = hasOrganizations && !isLoading;
- const hasNoSites =
- shouldShowSites && (!sites?.sites || sites.sites.length === 0);
+ const hasNoSites = shouldShowSites && (!sites?.sites || sites.sites.length === 0);
const [createOrgDialogOpen, setCreateOrgDialogOpen] = useState(false);
@@ -77,23 +68,15 @@ export default function Home() {
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
{/* Sites list */}
- {sites?.sites?.map((site) => {
- return (
- <SiteCard
- key={site.siteId}
- siteId={site.siteId}
- domain={site.domain}
- />
- );
+ {sites?.sites?.map(site => {
+ return <SiteCard key={site.siteId} siteId={site.siteId} domain={site.domain} />;
})}
{/* No websites message */}
{hasNoSites && (
<Card className="col-span-full p-6 flex flex-col items-center text-center">
<CardTitle className="mb-2 text-xl">No websites yet</CardTitle>
- <CardDescription className="mb-4">
- Add your first website to start tracking analytics
- </CardDescription>
+ <CardDescription className="mb-4">Add your first website to start tracking analytics</CardDescription>
<AddSite
trigger={
<Button variant="success" disabled={!canAddSites}>
diff --git a/client/src/app/reset-password/page.tsx b/client/src/app/reset-password/page.tsx
index 8ff12c55b..2115619cd 100644
--- a/client/src/app/reset-password/page.tsx
+++ b/client/src/app/reset-password/page.tsx
@@ -117,7 +117,7 @@ export default function ResetPasswordPage() {
placeholder="000000"
required
value={otp}
- onChange={(e) => setOtp(e.target.value)}
+ onChange={e => setOtp(e.target.value)}
/>
<AuthInput
@@ -127,7 +127,7 @@ export default function ResetPasswordPage() {
placeholder="••••••••"
required
value={newPassword}
- onChange={(e) => setNewPassword(e.target.value)}
+ onChange={e => setNewPassword(e.target.value)}
/>
<AuthButton isLoading={isLoading} loadingText="Resetting password...">
@@ -159,7 +159,7 @@ export default function ResetPasswordPage() {
placeholder="[email protected]"
required
value={email}
- onChange={(e) => setEmail(e.target.value)}
+ onChange={e => setEmail(e.target.value)}
/>
<AuthButton isLoading={isLoading} loadingText="Sending code...">
diff --git a/client/src/app/settings/account/components/ChangePassword.tsx b/client/src/app/settings/account/components/ChangePassword.tsx
index 2e85b7d3a..1e967cec9 100644
--- a/client/src/app/settings/account/components/ChangePassword.tsx
+++ b/client/src/app/settings/account/components/ChangePassword.tsx
@@ -122,7 +122,7 @@ export function ChangePassword() {
return (
<Dialog
open={open}
- onOpenChange={(isOpen) => {
+ onOpenChange={isOpen => {
setOpen(isOpen);
if (!isOpen) resetForm();
}}
@@ -148,7 +148,7 @@ export function ChangePassword() {
<Input
id="currentPassword"
value={currentPassword}
- onChange={(e) => setCurrentPassword(e.target.value)}
+ onChange={e => setCurrentPassword(e.target.value)}
type="password"
placeholder="Your current password"
className="pr-10"
@@ -171,8 +171,8 @@ export function ChangePassword() {
passwordStrength <= 2
? "text-red-500"
: passwordStrength === 3
- ? "text-yellow-500"
- : "text-green-500"
+ ? "text-yellow-500"
+ : "text-green-500"
)}
>
{passwordStrength <= 2 ? "Weak" : passwordStrength === 3 ? "Good" : "Strong"}
@@ -183,7 +183,7 @@ export function ChangePassword() {
<Input
id="newPassword"
value={newPassword}
- onChange={(e) => setNewPassword(e.target.value)}
+ onChange={e => setNewPassword(e.target.value)}
type="password"
placeholder="Your new password"
className="pr-10"
@@ -203,7 +203,7 @@ export function ChangePassword() {
{newPassword && (
<>
<div className="flex space-x-1 mt-1.5">
- {[1, 2, 3, 4].map((index) => (
+ {[1, 2, 3, 4].map(index => (
<div
key={index}
className={cn(
@@ -220,8 +220,8 @@ export function ChangePassword() {
passwordStrength <= 2
? "text-red-500"
: passwordStrength === 3
- ? "text-yellow-500"
- : "text-green-500"
+ ? "text-yellow-500"
+ : "text-green-500"
)}
>
{passwordFeedback}
@@ -239,7 +239,7 @@ export function ChangePassword() {
<Input
id="confirmPassword"
value={confirmPassword}
- onChange={(e) => setConfirmPassword(e.target.value)}
+ onChange={e => setConfirmPassword(e.target.value)}
type="password"
placeholder="Confirm your new password"
className="pr-10"
diff --git a/client/src/app/settings/account/components/DeleteAccount.tsx b/client/src/app/settings/account/components/DeleteAccount.tsx
index 0ae97989a..3a661d901 100644
--- a/client/src/app/settings/account/components/DeleteAccount.tsx
+++ b/client/src/app/settings/account/components/DeleteAccount.tsx
@@ -95,7 +95,7 @@ export function DeleteAccount() {
type="password"
placeholder="••••••••"
value={password}
- onChange={(e) => setPassword(e.target.value)}
+ onChange={e => setPassword(e.target.value)}
className={cn("mt-1", passwordError && "border-red-500")}
disabled={isDeleting}
/>
@@ -107,7 +107,7 @@ export function DeleteAccount() {
Cancel
</AlertDialogCancel>
<AlertDialogAction
- onClick={(e) => {
+ onClick={e => {
e.preventDefault();
handleAccountDeletion();
}}
diff --git a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx b/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
index b7b49325e..e7e95cb5a 100644
--- a/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
+++ b/client/src/app/settings/organization/members/components/CreateUserDialog.tsx
@@ -134,7 +134,7 @@ export function CreateUserDialog({ organizationId, onSuccess }: CreateUserDialog
</div>
<div className="grid gap-2">
<Label htmlFor="role">Role</Label>
- <Select value={role} onValueChange={(value) => setRole(value as "admin" | "member")}>
+ <Select value={role} onValueChange={value => setRole(value as "admin" | "member")}>
<SelectTrigger>
<SelectValue placeholder="Select a role" />
</SelectTrigger>
diff --git a/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx b/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx
index 53261eb19..ac3081295 100644
--- a/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx
+++ b/client/src/app/settings/organization/members/components/EditOrganizationDialog.tsx
@@ -21,10 +21,7 @@ interface EditOrganizationDialogProps {
onSuccess: () => void;
}
-export function EditOrganizationDialog({
- organization,
- onSuccess,
-}: EditOrganizationDialogProps) {
+export function EditOrganizationDialog({ organization, onSuccess }: EditOrganizationDialogProps) {
const [name, setName] = useState(organization.name);
const [isLoading, setIsLoading] = useState(false);
const [open, setOpen] = useState(false);
@@ -64,9 +61,7 @@ export function EditOrganizationDialog({
<DialogContent className="max-w-lg">
<DialogHeader>
<DialogTitle>Edit Organization</DialogTitle>
- <DialogDescription>
- Update the details of your organization.
- </DialogDescription>
+ <DialogDescription>Update the details of your organization.</DialogDescription>
</DialogHeader>
<div className="grid gap-4 py-4">
<div className="grid gap-2">
@@ -74,9 +69,7 @@ export function EditOrganizationDialog({
<Input
id="name"
value={name}
- onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
- setName(e.target.value)
- }
+ onChange={(e: React.ChangeEvent<HTMLInputElement>) => setName(e.target.value)}
/>
</div>
</div>
diff --git a/client/src/app/settings/organization/members/components/Invitations.tsx b/client/src/app/settings/organization/members/components/Invitations.tsx
index 8f4f74527..a6fc67df0 100644
--- a/client/src/app/settings/organization/members/components/Invitations.tsx
+++ b/client/src/app/settings/organization/members/components/Invitations.tsx
@@ -115,7 +115,7 @@ export function Invitations({ organizationId, isOwner }: InvitationsProps) {
) : (
<>
{invitations?.length && invitations.length > 0 ? (
- invitations.map((invitation) => (
+ invitations.map(invitation => (
<TableRow key={invitation.id}>
<TableCell>{invitation.email}</TableCell>
<TableCell className="capitalize">{invitation.role}</TableCell>
diff --git a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
index 3703c5244..7a8937aa0 100644
--- a/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
+++ b/client/src/app/settings/organization/members/components/InviteMemberDialog.tsx
@@ -85,7 +85,7 @@ export function InviteMemberDialog({ organizationId, onSuccess }: InviteMemberDi
</div>
<div className="grid gap-2">
<Label htmlFor="role">Role</Label>
- <Select value={role} onValueChange={(value) => setRole(value as "admin" | "member")}>
+ <Select value={role} onValueChange={value => setRole(value as "admin" | "member")}>
<SelectTrigger>
<SelectValue placeholder="Select a role" />
</SelectTrigger>
diff --git a/client/src/app/settings/organization/members/page.tsx b/client/src/app/settings/organization/members/page.tsx
index c40e82d24..41a7903ea 100644
--- a/client/src/app/settings/organization/members/page.tsx
+++ b/client/src/app/settings/organization/members/page.tsx
@@ -53,7 +53,7 @@ function Organization({
const { refetch: refetchInvitations } = useOrganizationInvitations(org.id);
const { data } = authClient.useSession();
- const isOwner = members?.data.find((member) => member.role === "owner" && member.userId === data?.user?.id);
+ const isOwner = members?.data.find(member => member.role === "owner" && member.userId === data?.user?.id);
const handleRefresh = () => {
refetch();
diff --git a/client/src/app/settings/organization/subscription/page.tsx b/client/src/app/settings/organization/subscription/page.tsx
index e881d7edc..b99f92031 100644
--- a/client/src/app/settings/organization/subscription/page.tsx
+++ b/client/src/app/settings/organization/subscription/page.tsx
@@ -20,7 +20,7 @@ export default function OrganizationSubscriptionPage() {
const { data: session } = authClient.useSession();
// Check if the current user is an owner by looking at the members in the active organization
- const currentUserMember = activeOrg?.members?.find((member) => member.userId === session?.user?.id);
+ const currentUserMember = activeOrg?.members?.find(member => member.userId === session?.user?.id);
const isOwner = currentUserMember?.role === "owner";
const isLoading = isLoadingSubscription || isPending;
diff --git a/client/src/app/signup/page.tsx b/client/src/app/signup/page.tsx
index 3f5a1fde1..715facd80 100644
--- a/client/src/app/signup/page.tsx
+++ b/client/src/app/signup/page.tsx
@@ -182,7 +182,7 @@ export default function SignupPage() {
placeholder="[email protected]"
required
value={email}
- onChange={(e) => setEmail(e.target.value)}
+ onChange={e => setEmail(e.target.value)}
/>
<AuthInput
@@ -192,7 +192,7 @@ export default function SignupPage() {
placeholder="••••••••"
required
value={password}
- onChange={(e) => setPassword(e.target.value)}
+ onChange={e => setPassword(e.target.value)}
/>
<AuthButton
@@ -239,7 +239,7 @@ export default function SignupPage() {
type="text"
placeholder="Acme Inc."
value={orgName}
- onChange={(e) => handleOrgNameChange(e.target.value)}
+ onChange={e => handleOrgNameChange(e.target.value)}
required
className="h-10 transition-all bg-neutral-800/50 border-neutral-700"
/>
@@ -294,7 +294,7 @@ export default function SignupPage() {
type="text"
placeholder="example.com or sub.example.com"
value={domain}
- onChange={(e) => setDomain(e.target.value.toLowerCase())}
+ onChange={e => setDomain(e.target.value.toLowerCase())}
required
className="h-10 transition-all bg-neutral-800/50 border-neutral-700"
/>
@@ -384,8 +384,8 @@ export default function SignupPage() {
currentStep === step
? "bg-emerald-600 text-primary-foreground"
: currentStep > step
- ? "bg-emerald-600/20 text-emerald-400 border-2 border-emerald-600/40"
- : "bg-muted-foreground/20 text-muted-foreground border-2 border-muted-foreground/40"
+ ? "bg-emerald-600/20 text-emerald-400 border-2 border-emerald-600/40"
+ : "bg-muted-foreground/20 text-muted-foreground border-2 border-muted-foreground/40"
)}
>
{currentStep > step ? <Check className="h-5 w-5" /> : step}
diff --git a/client/src/app/subscribe/components/FAQSection.tsx b/client/src/app/subscribe/components/FAQSection.tsx
index ec60b1fe7..0b94d15b6 100644
--- a/client/src/app/subscribe/components/FAQSection.tsx
+++ b/client/src/app/subscribe/components/FAQSection.tsx
@@ -13,8 +13,7 @@ const FAQ_ITEMS: FAQItem[] = [
},
{
question: "Can I change my plan later?",
- answer:
- "Absolutely. You can upgrade, downgrade, or cancel your plan at any time through your account settings.",
+ answer: "Absolutely. You can upgrade, downgrade, or cancel your plan at any time through your account settings.",
},
{
question: "What happens if I go over my event limit?",
@@ -29,10 +28,7 @@ export function FAQSection() {
<h3 className="text-xl font-semibold mb-4">Frequently Asked Questions</h3>
{FAQ_ITEMS.map((faq, index) => (
- <div
- key={index}
- className="bg-neutral-800/20 p-5 rounded-lg border border-neutral-700"
- >
+ <div key={index} className="bg-neutral-800/20 p-5 rounded-lg border border-neutral-700">
<h4 className="font-medium mb-2">{faq.question}</h4>
<p className="text-neutral-300">{faq.answer}</p>
</div>
diff --git a/client/src/app/subscribe/components/PricingHeader.tsx b/client/src/app/subscribe/components/PricingHeader.tsx
index 131aadf84..4b9537560 100644
--- a/client/src/app/subscribe/components/PricingHeader.tsx
+++ b/client/src/app/subscribe/components/PricingHeader.tsx
@@ -6,9 +6,7 @@ export function PricingHeader() {
<h1 className="text-4xl md:text-5xl font-bold tracking-tight pb-4 text-transparent bg-clip-text bg-gradient-to-b from-white via-gray-200 to-gray-400">
Simple, Transparent Pricing
</h1>
- <p className="text-lg text-neutral-300 mb-6">
- Privacy-friendly analytics with all the features you need to grow
- </p>
+ <p className="text-lg text-neutral-300 mb-6">Privacy-friendly analytics with all the features you need to grow</p>
</div>
);
}
diff --git a/client/src/app/subscribe/components/TrialUsageStats.tsx b/client/src/app/subscribe/components/TrialUsageStats.tsx
index 981695e4d..ecf4d8c38 100644
--- a/client/src/app/subscribe/components/TrialUsageStats.tsx
+++ b/client/src/app/subscribe/components/TrialUsageStats.tsx
@@ -16,20 +16,13 @@ export function daysElapsed(startDate: string): number {
}
// Extrapolate monthly usage based on current usage and days elapsed
-export function extrapolateMonthlyUsage(
- eventCount: number,
- daysElapsed: number
-): number {
+export function extrapolateMonthlyUsage(eventCount: number, daysElapsed: number): number {
if (daysElapsed <= 0) return eventCount;
const dailyRate = eventCount / daysElapsed;
return Math.round(dailyRate * 30); // Extrapolate to 30 days
}
-export function TrialUsageStats({
- currentUsage,
- daysInTrial,
- projectedMonthlyUsage,
-}: TrialUsageStatsProps) {
+export function TrialUsageStats({ currentUsage, daysInTrial, projectedMonthlyUsage }: TrialUsageStatsProps) {
return (
<div className="max-w-lg mx-auto mt-6">
<div className="bg-blue-900/20 rounded-xl border border-blue-800 p-5">
@@ -40,9 +33,7 @@ export function TrialUsageStats({
<div className="grid grid-cols-2 gap-4 mb-3">
<div>
<p className="text-sm text-neutral-400">Current Usage</p>
- <p className="text-xl font-semibold">
- {currentUsage.toLocaleString()} events
- </p>
+ <p className="text-xl font-semibold">{currentUsage.toLocaleString()} events</p>
</div>
<div>
<p className="text-sm text-neutral-400">Days in Trial</p>
@@ -50,15 +41,9 @@ export function TrialUsageStats({
</div>
</div>
<div className="bg-blue-950/50 p-3 rounded-lg">
- <p className="text-sm text-neutral-300 mb-1">
- Projected Monthly Usage
- </p>
- <p className="text-2xl font-bold text-blue-300">
- {projectedMonthlyUsage.toLocaleString()} events/month
- </p>
- <p className="text-xs text-neutral-400 mt-1">
- Based on your current usage pattern
- </p>
+ <p className="text-sm text-neutral-300 mb-1">Projected Monthly Usage</p>
+ <p className="text-2xl font-bold text-blue-300">{projectedMonthlyUsage.toLocaleString()} events/month</p>
+ <p className="text-xs text-neutral-400 mt-1">Based on your current usage pattern</p>
</div>
</div>
</div>
diff --git a/client/src/app/subscribe/components/utils.ts b/client/src/app/subscribe/components/utils.ts
index 1b84d2ddd..8b453e288 100644
--- a/client/src/app/subscribe/components/utils.ts
+++ b/client/src/app/subscribe/components/utils.ts
@@ -46,14 +46,14 @@ export function findPriceForTier(
// Filter plans by name pattern (with or without -annual suffix) and interval
const plans = stripePrices.filter(
- (plan) =>
+ plan =>
(isAnnual
? plan.name.startsWith("pro") && plan.name.includes("-annual")
: plan.name.startsWith("pro") && !plan.name.includes("-annual")) && plan.interval === interval
);
// Find a plan that matches or exceeds the event limit
- const matchingPlan = plans.find((plan) => plan.limits.events >= eventLimitValue);
+ const matchingPlan = plans.find(plan => plan.limits.events >= eventLimitValue);
const selectedPlan = matchingPlan || plans[plans.length - 1] || null;
// Return the matching plan or the highest tier available
diff --git a/client/src/app/uptime/incidents/page.tsx b/client/src/app/uptime/incidents/page.tsx
index 2cdbab77d..f5e63014b 100644
--- a/client/src/app/uptime/incidents/page.tsx
+++ b/client/src/app/uptime/incidents/page.tsx
@@ -105,7 +105,7 @@ export default function IncidentsPage() {
<div className="flex items-center justify-between mb-6">
<h1 className="text-2xl font-semibold">Incidents</h1>
- <Tabs value={statusFilter} onValueChange={(value) => setStatusFilter(value as any)}>
+ <Tabs value={statusFilter} onValueChange={value => setStatusFilter(value as any)}>
<TabsList>
<TabsTrigger value="active">Active</TabsTrigger>
<TabsTrigger value="acknowledged">Acknowledged</TabsTrigger>
@@ -158,7 +158,7 @@ export default function IncidentsPage() {
</TableCell>
</TableRow>
) : (
- data?.incidents?.map((incident) => (
+ data?.incidents?.map(incident => (
<TableRow key={incident.id}>
<TableCell>{getStatusIcon(incident.status)}</TableCell>
<TableCell>
@@ -169,7 +169,7 @@ export default function IncidentsPage() {
<div className="flex flex-wrap gap-1">
{incident.affectedRegions.length > 3 ? (
<>
- {incident.affectedRegions.slice(0, 3).map((region) => (
+ {incident.affectedRegions.slice(0, 3).map(region => (
<span
key={region}
className={cn(
@@ -185,7 +185,7 @@ export default function IncidentsPage() {
</span>
</>
) : (
- incident.affectedRegions.map((region) => (
+ incident.affectedRegions.map(region => (
<span
key={region}
className={cn(
diff --git a/client/src/app/uptime/monitors/[monitorId]/components/EventsTable.tsx b/client/src/app/uptime/monitors/[monitorId]/components/EventsTable.tsx
index 574b3ed40..0be92b1dc 100644
--- a/client/src/app/uptime/monitors/[monitorId]/components/EventsTable.tsx
+++ b/client/src/app/uptime/monitors/[monitorId]/components/EventsTable.tsx
@@ -43,7 +43,7 @@ export function EventsTable({ monitor, monitorId }: { monitor?: UptimeMonitor; m
// Flatten all pages of events
const allEvents = useMemo(() => {
- return data?.pages.flatMap((page) => page.events) || [];
+ return data?.pages.flatMap(page => page.events) || [];
}, [data]);
const toggleRow = (rowId: string) => {
@@ -123,7 +123,7 @@ export function EventsTable({ monitor, monitorId }: { monitor?: UptimeMonitor; m
columnHelper.accessor("region", {
header: "Region",
cell: ({ row }) => {
- const region = REGIONS.find((r) => r.code === row.original.region);
+ const region = REGIONS.find(r => r.code === row.original.region);
return (
<span className="text-sm flex items-center gap-2">
<CountryFlag country={region?.countryCode || "US"} className="w-5 h-5" />
@@ -161,9 +161,9 @@ export function EventsTable({ monitor, monitorId }: { monitor?: UptimeMonitor; m
<div className="rounded-lg border border-neutral-800">
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead
key={header.id}
style={{
@@ -217,10 +217,10 @@ export function EventsTable({ monitor, monitorId }: { monitor?: UptimeMonitor; m
</TableCell>
</TableRow>
) : (
- table.getRowModel().rows.map((row) => (
+ table.getRowModel().rows.map(row => (
<React.Fragment key={row.id}>
<TableRow className="cursor-pointer hover:bg-neutral-900/50" onClick={() => toggleRow(row.id)}>
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
diff --git a/client/src/app/uptime/monitors/[monitorId]/components/FilterBar.tsx b/client/src/app/uptime/monitors/[monitorId]/components/FilterBar.tsx
index ce82f9466..46d321787 100644
--- a/client/src/app/uptime/monitors/[monitorId]/components/FilterBar.tsx
+++ b/client/src/app/uptime/monitors/[monitorId]/components/FilterBar.tsx
@@ -23,7 +23,7 @@ export function FilterBar({ monitor, isLoading }: FilterBarProps) {
<div className="flex items-center gap-2 justify-between">
{/* Time Range Selector */}
<div className="flex items-center gap-1">
- {TIME_RANGES.map((range) => (
+ {TIME_RANGES.map(range => (
<Button
key={range.value}
variant={timeRange === range.value ? "default" : "ghost"}
@@ -40,13 +40,13 @@ export function FilterBar({ monitor, isLoading }: FilterBarProps) {
{showRegionFilter && !isLoading && (
<Select
value={selectedRegion || "all"}
- onValueChange={(value) => setSelectedRegion(value === "all" ? undefined : value)}
+ onValueChange={value => setSelectedRegion(value === "all" ? undefined : value)}
>
<SelectTrigger size="sm" className="w-[140px] ml-2">
<SelectValue placeholder="Select region" />
</SelectTrigger>
<SelectContent size="sm">
- {REGIONS.filter((region, i) => i === 0 || monitor?.selectedRegions.includes(region.code)).map((region) => (
+ {REGIONS.filter((region, i) => i === 0 || monitor?.selectedRegions.includes(region.code)).map(region => (
<SelectItem key={region.code} value={region.code} size="sm">
<div className="flex items-center gap-2">
{region.countryCode ? (
diff --git a/client/src/app/uptime/monitors/[monitorId]/components/InlineTimingWaterfall.tsx b/client/src/app/uptime/monitors/[monitorId]/components/InlineTimingWaterfall.tsx
index 3d102c809..6f997b022 100644
--- a/client/src/app/uptime/monitors/[monitorId]/components/InlineTimingWaterfall.tsx
+++ b/client/src/app/uptime/monitors/[monitorId]/components/InlineTimingWaterfall.tsx
@@ -48,4 +48,4 @@ export function InlineTimingWaterfall({ event }: InlineTimingWaterfallProps) {
</div>
</TooltipProvider>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/app/uptime/monitors/[monitorId]/components/TimingWaterfall.tsx b/client/src/app/uptime/monitors/[monitorId]/components/TimingWaterfall.tsx
index 87e2ff633..ecc786ecb 100644
--- a/client/src/app/uptime/monitors/[monitorId]/components/TimingWaterfall.tsx
+++ b/client/src/app/uptime/monitors/[monitorId]/components/TimingWaterfall.tsx
@@ -51,10 +51,10 @@ export function TimingWaterfall({ event }: TimingWaterfallProps) {
{renderTimingSegments(timings, totalTime, renderWaterfallSegment)}
</div>
<div className="flex flex-wrap gap-2 mt-2">
- {timings.map((timing) => (
+ {timings.map(timing => (
<TimingLegendItem key={timing.label} timing={timing} />
))}
</div>
</div>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/app/uptime/monitors/[monitorId]/components/timingUtils.ts b/client/src/app/uptime/monitors/[monitorId]/components/timingUtils.ts
index a609e78fe..8d4e7e6eb 100644
--- a/client/src/app/uptime/monitors/[monitorId]/components/timingUtils.ts
+++ b/client/src/app/uptime/monitors/[monitorId]/components/timingUtils.ts
@@ -7,11 +7,11 @@ export interface TimingSegment {
}
export const TIMING_COLORS = {
- dns: "bg-emerald-500", // Green - similar to hsl(160, 70%, 50%)
- tcp: "bg-teal-500", // Turquoise - similar to hsl(180, 70%, 45%)
- tls: "bg-sky-500", // Light Blue - similar to hsl(200, 70%, 45%)
- ttfb: "bg-blue-500", // Blue - for TTFB (not in chart but fits the gradient)
- transfer: "bg-indigo-500", // Deeper Blue - similar to hsl(220, 70%, 50%)
+ dns: "bg-emerald-500", // Green - similar to hsl(160, 70%, 50%)
+ tcp: "bg-teal-500", // Turquoise - similar to hsl(180, 70%, 45%)
+ tls: "bg-sky-500", // Light Blue - similar to hsl(200, 70%, 45%)
+ ttfb: "bg-blue-500", // Blue - for TTFB (not in chart but fits the gradient)
+ transfer: "bg-indigo-500", // Deeper Blue - similar to hsl(220, 70%, 50%)
} as const;
export function getTimingSegments(event: MonitorEvent): TimingSegment[] {
@@ -21,7 +21,7 @@ export function getTimingSegments(event: MonitorEvent): TimingSegment[] {
{ label: "TLS", time: event.tls_time_ms, color: TIMING_COLORS.tls },
{ label: "TTFB", time: event.ttfb_ms, color: TIMING_COLORS.ttfb },
{ label: "Transfer", time: event.transfer_time_ms, color: TIMING_COLORS.transfer },
- ].filter((t) => t.time && t.time > 0);
+ ].filter(t => t.time && t.time > 0);
}
export function calculateTimingMetrics(timings: TimingSegment[], totalTime: number) {
diff --git a/client/src/app/uptime/monitors/[monitorId]/page.tsx b/client/src/app/uptime/monitors/[monitorId]/page.tsx
index 828bd11ef..6b9861153 100644
--- a/client/src/app/uptime/monitors/[monitorId]/page.tsx
+++ b/client/src/app/uptime/monitors/[monitorId]/page.tsx
@@ -48,7 +48,7 @@ const formatUptime = (seconds?: number) => {
};
const formatInterval = (seconds?: number) => {
- const interval = INTERVAL_OPTIONS.find((interval) => interval.value === seconds);
+ const interval = INTERVAL_OPTIONS.find(interval => interval.value === seconds);
return interval?.label || `${seconds}s`;
};
diff --git a/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx b/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx
index fd9da91e7..a50dad20c 100644
--- a/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx
+++ b/client/src/app/uptime/monitors/components/MonitorResponseTimeChart.tsx
@@ -49,7 +49,7 @@ export function MonitorResponseTimeChart({
useEffect(() => {
if (monitorType === "http") {
- setVisibleMetrics(new Set(HTTP_METRICS.map((m) => m.key)));
+ setVisibleMetrics(new Set(HTTP_METRICS.map(m => m.key)));
} else {
setVisibleMetrics(new Set(["response_time_ms"]));
}
@@ -62,7 +62,7 @@ export function MonitorResponseTimeChart({
});
const toggleMetric = (metricKey: string) => {
- setVisibleMetrics((prev) => {
+ setVisibleMetrics(prev => {
const newSet = new Set(prev);
if (newSet.has(metricKey)) {
newSet.delete(metricKey);
@@ -131,7 +131,7 @@ export function MonitorResponseTimeChart({
// For HTTP, show stacked timing metrics
// Order matters for stacking - DNS first, then connection, TLS, and finally transfer
- return HTTP_METRICS.filter((metric) => visibleMetrics.has(metric.key)).map((metric) => ({
+ return HTTP_METRICS.filter(metric => visibleMetrics.has(metric.key)).map(metric => ({
id: metric.label,
color: metric.color,
data: processedData
@@ -218,7 +218,7 @@ export function MonitorResponseTimeChart({
{/* Metric toggles for HTTP monitors */}
{monitorType === "http" && (
<div className="flex items-center gap-2">
- {HTTP_METRICS.map((metric) => {
+ {HTTP_METRICS.map(metric => {
const isVisible = visibleMetrics.has(metric.key);
return (
<button
@@ -254,7 +254,7 @@ export function MonitorResponseTimeChart({
{isLoadingMonitor || isLoading ? (
<Skeleton className="w-full h-[400px] rounded-md" />
- ) : data.length === 0 || data.every((series) => series.data.length === 0) ? (
+ ) : data.length === 0 || data.every(series => series.data.length === 0) ? (
<div className="h-[400px] w-full flex items-center justify-center">
<div className="text-center text-neutral-500">
<p className="text-lg font-medium">No data available</p>
@@ -299,9 +299,9 @@ export function MonitorResponseTimeChart({
tickRotation: 0,
truncateTickAt: 0,
tickValues: 5,
- format: (value) => `${value}ms`,
+ format: value => `${value}ms`,
}}
- colors={(d) => d.color}
+ colors={d => d.color}
lineWidth={1}
enablePoints={false}
useMesh={true}
diff --git a/client/src/app/uptime/monitors/components/MonitorsTable.tsx b/client/src/app/uptime/monitors/components/MonitorsTable.tsx
index 52936eaea..efc1570fd 100644
--- a/client/src/app/uptime/monitors/components/MonitorsTable.tsx
+++ b/client/src/app/uptime/monitors/components/MonitorsTable.tsx
@@ -166,13 +166,13 @@ export function MonitorsTable({ onMonitorClick }: MonitorsTableProps) {
cell: ({ row }) => <UptimeBar monitorId={row.original.id} />,
size: 192,
}),
- columnHelper.accessor((row) => row.status?.lastCheckedAt, {
+ columnHelper.accessor(row => row.status?.lastCheckedAt, {
id: "lastPing",
header: ({ column }) => <SortHeader column={column}>Last Ping</SortHeader>,
cell: ({ getValue }) => <span className="text-neutral-300">{formatLastPing(getValue())}</span>,
size: 112,
}),
- columnHelper.accessor((row) => row.status?.uptimePercentage7d, {
+ columnHelper.accessor(row => row.status?.uptimePercentage7d, {
id: "uptimePercentage",
header: ({ column }) => (
<SortHeader column={column}>
@@ -210,15 +210,15 @@ export function MonitorsTable({ onMonitorClick }: MonitorsTableProps) {
<Input
placeholder="Search monitors by name, URL, or type..."
value={globalFilter}
- onChange={(e) => setGlobalFilter(e.target.value)}
+ onChange={e => setGlobalFilter(e.target.value)}
className="max-w-sm bg-neutral-900"
/>
<div className="rounded-lg border border-neutral-800">
<Table>
<TableHeader>
- {table.getHeaderGroups().map((headerGroup) => (
+ {table.getHeaderGroups().map(headerGroup => (
<TableRow key={headerGroup.id}>
- {headerGroup.headers.map((header) => (
+ {headerGroup.headers.map(header => (
<TableHead
key={header.id}
style={{
@@ -265,13 +265,13 @@ export function MonitorsTable({ onMonitorClick }: MonitorsTableProps) {
</TableCell>
</TableRow>
) : (
- table.getRowModel().rows.map((row) => (
+ table.getRowModel().rows.map(row => (
<TableRow
key={row.id}
className="cursor-pointer hover:bg-neutral-900/50"
onClick={() => onMonitorClick?.(row.original)}
>
- {row.getVisibleCells().map((cell) => (
+ {row.getVisibleCells().map(cell => (
<TableCell key={cell.id}>{flexRender(cell.column.columnDef.cell, cell.getContext())}</TableCell>
))}
</TableRow>
@@ -286,7 +286,7 @@ export function MonitorsTable({ onMonitorClick }: MonitorsTableProps) {
<Pagination
table={table}
data={{
- items: table.getFilteredRowModel().rows.map((row) => row.original),
+ items: table.getFilteredRowModel().rows.map(row => row.original),
total: table.getFilteredRowModel().rows.length,
}}
pagination={pagination}
diff --git a/client/src/app/uptime/monitors/components/UptimeBar.tsx b/client/src/app/uptime/monitors/components/UptimeBar.tsx
index a1aa46303..4f96f0c56 100644
--- a/client/src/app/uptime/monitors/components/UptimeBar.tsx
+++ b/client/src/app/uptime/monitors/components/UptimeBar.tsx
@@ -29,7 +29,7 @@ export function UptimeBar({ monitorId, className }: UptimeBarProps) {
return null;
}
// Process bucket data
- const days = data.buckets.map((bucket) => {
+ const days = data.buckets.map(bucket => {
const date = DateTime.fromSQL(bucket.bucket_time).toLocal();
return {
date: bucket.bucket_formatted,
@@ -46,7 +46,7 @@ export function UptimeBar({ monitorId, className }: UptimeBarProps) {
return (
<TooltipProvider>
<div className={cn("flex gap-1 h-6", className)}>
- {days.map((day) => {
+ {days.map(day => {
const totalChecks = day.totalChecks;
const hasIssues = day.failureCount > 0 || day.timeoutCount > 0;
const uptimePercentage = day.uptimePercentage.toFixed(1);
diff --git a/client/src/app/uptime/monitors/components/UptimeBucketSelection.tsx b/client/src/app/uptime/monitors/components/UptimeBucketSelection.tsx
index 2df88bf6b..892e9059a 100644
--- a/client/src/app/uptime/monitors/components/UptimeBucketSelection.tsx
+++ b/client/src/app/uptime/monitors/components/UptimeBucketSelection.tsx
@@ -72,12 +72,12 @@ export function UptimeBucketSelection({ timeRange, bucket, onBucketChange }: Upt
}, [timeRange, bucket, availableBuckets, onBucketChange]);
return (
- <Select value={bucket} onValueChange={(value) => onBucketChange(value as TimeBucket)}>
+ <Select value={bucket} onValueChange={value => onBucketChange(value as TimeBucket)}>
<SelectTrigger className="w-[120px]" size="sm">
<SelectValue />
</SelectTrigger>
<SelectContent>
- {availableBuckets.map((bucketOption) => (
+ {availableBuckets.map(bucketOption => (
<SelectItem key={bucketOption} value={bucketOption} size="sm">
{bucketLabels[bucketOption]}
</SelectItem>
diff --git a/client/src/app/uptime/monitors/components/dialog/AdvancedTab.tsx b/client/src/app/uptime/monitors/components/dialog/AdvancedTab.tsx
index 247d6b8b5..03264598e 100644
--- a/client/src/app/uptime/monitors/components/dialog/AdvancedTab.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/AdvancedTab.tsx
@@ -73,24 +73,24 @@ export function AdvancedTab({ form, monitorType }: AdvancedTabProps) {
// Sync local state changes back to form field
React.useEffect(() => {
const headersObject = localHeaders
- .filter((h) => h.key !== "") // Only include headers with keys
+ .filter(h => h.key !== "") // Only include headers with keys
.reduce((acc, { key, value }) => ({ ...acc, [key]: value }), {});
field.onChange(Object.keys(headersObject).length > 0 ? headersObject : undefined);
}, [localHeaders, field]);
const updateHeader = (id: string, type: "key" | "value", newValue: string) => {
- setLocalHeaders((prev) =>
- prev.map((header) => (header.id === id ? { ...header, [type]: newValue } : header))
+ setLocalHeaders(prev =>
+ prev.map(header => (header.id === id ? { ...header, [type]: newValue } : header))
);
};
const removeHeader = (id: string) => {
- setLocalHeaders((prev) => prev.filter((header) => header.id !== id));
+ setLocalHeaders(prev => prev.filter(header => header.id !== id));
};
const addHeader = () => {
- setLocalHeaders((prev) => [
+ setLocalHeaders(prev => [
...prev,
{
key: "",
@@ -110,18 +110,18 @@ export function AdvancedTab({ form, monitorType }: AdvancedTabProps) {
</Button>
</div>
<div className="space-y-2">
- {localHeaders.map((header) => (
+ {localHeaders.map(header => (
<div key={header.id} className="flex gap-2 items-center">
<Input
placeholder="Header name"
value={header.key}
- onChange={(e) => updateHeader(header.id, "key", e.target.value)}
+ onChange={e => updateHeader(header.id, "key", e.target.value)}
className="flex-1"
/>
<Input
placeholder="Header value"
value={header.value}
- onChange={(e) => updateHeader(header.id, "value", e.target.value)}
+ onChange={e => updateHeader(header.id, "value", e.target.value)}
className="flex-1"
/>
<Button
diff --git a/client/src/app/uptime/monitors/components/dialog/GeneralTab.tsx b/client/src/app/uptime/monitors/components/dialog/GeneralTab.tsx
index f755c3ce1..c56ddc1e9 100644
--- a/client/src/app/uptime/monitors/components/dialog/GeneralTab.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/GeneralTab.tsx
@@ -92,7 +92,7 @@ export function GeneralTab({ form, monitor, isEdit, monitorType }: GeneralTabPro
</SelectTrigger>
</FormControl>
<SelectContent>
- {HTTP_METHODS.map((method) => (
+ {HTTP_METHODS.map(method => (
<SelectItem key={method} value={method}>
{method}
</SelectItem>
@@ -115,7 +115,7 @@ export function GeneralTab({ form, monitor, isEdit, monitorType }: GeneralTabPro
type="number"
{...field}
value={field.value || ""}
- onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : undefined)}
+ onChange={e => field.onChange(e.target.value ? parseInt(e.target.value) : undefined)}
/>
</FormControl>
<FormMessage />
@@ -154,7 +154,7 @@ export function GeneralTab({ form, monitor, isEdit, monitorType }: GeneralTabPro
type="number"
{...field}
value={field.value || ""}
- onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : undefined)}
+ onChange={e => field.onChange(e.target.value ? parseInt(e.target.value) : undefined)}
/>
</FormControl>
<FormMessage />
@@ -172,7 +172,7 @@ export function GeneralTab({ form, monitor, isEdit, monitorType }: GeneralTabPro
<FormItem>
<FormLabel>Check Interval</FormLabel>
<Select
- onValueChange={(value) => field.onChange(parseInt(value))}
+ onValueChange={value => field.onChange(parseInt(value))}
value={field.value?.toString()}
defaultValue={field.value?.toString()}
>
@@ -182,7 +182,7 @@ export function GeneralTab({ form, monitor, isEdit, monitorType }: GeneralTabPro
</SelectTrigger>
</FormControl>
<SelectContent>
- {INTERVAL_OPTIONS.map((option) => (
+ {INTERVAL_OPTIONS.map(option => (
<SelectItem key={option.value} value={option.value.toString()}>
{option.label}
</SelectItem>
diff --git a/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx b/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
index 6bf33475e..d59051104 100644
--- a/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/MonitorDialog.tsx
@@ -41,7 +41,9 @@ export function MonitorDialog({ monitor, open, onOpenChange }: MonitorDialogProp
const { data: regionsData } = useQuery({
queryKey: ["uptime-regions"],
queryFn: async () => {
- const response = await authedFetch<{ regions: Array<{ code: string; name: string; isHealthy: boolean; isLocal: boolean }> }>("/uptime/regions");
+ const response = await authedFetch<{
+ regions: Array<{ code: string; name: string; isHealthy: boolean; isLocal: boolean }>;
+ }>("/uptime/regions");
return response.regions;
},
enabled: open && IS_CLOUD,
@@ -133,8 +135,15 @@ export function MonitorDialog({ monitor, open, onOpenChange }: MonitorDialogProp
if (globalRegions.length > 0) {
const currentRegions = form.getValues("selectedRegions");
// Only set if empty or has default "local" value
- if (!currentRegions || currentRegions.length === 0 || (currentRegions.length === 1 && currentRegions[0] === "local")) {
- form.setValue("selectedRegions", globalRegions.map(r => r.code));
+ if (
+ !currentRegions ||
+ currentRegions.length === 0 ||
+ (currentRegions.length === 1 && currentRegions[0] === "local")
+ ) {
+ form.setValue(
+ "selectedRegions",
+ globalRegions.map(r => r.code)
+ );
}
}
}
@@ -209,7 +218,7 @@ export function MonitorDialog({ monitor, open, onOpenChange }: MonitorDialogProp
<DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
<Form {...form}>
<form
- onSubmit={form.handleSubmit(onSubmit, (errors) => {
+ onSubmit={form.handleSubmit(onSubmit, errors => {
console.log("Form validation errors:", errors);
})}
>
diff --git a/client/src/app/uptime/monitors/components/dialog/NotificationsTab.tsx b/client/src/app/uptime/monitors/components/dialog/NotificationsTab.tsx
index e345931bd..47a5fbe60 100644
--- a/client/src/app/uptime/monitors/components/dialog/NotificationsTab.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/NotificationsTab.tsx
@@ -1,9 +1,5 @@
import React from "react";
export function NotificationsTab() {
- return (
- <div className="text-neutral-500 text-sm">
- Notification settings will be available in a future update.
- </div>
- );
-}
\ No newline at end of file
+ return <div className="text-neutral-500 text-sm">Notification settings will be available in a future update.</div>;
+}
diff --git a/client/src/app/uptime/monitors/components/dialog/RegionsTab.tsx b/client/src/app/uptime/monitors/components/dialog/RegionsTab.tsx
index 356f6d62f..882c1146b 100644
--- a/client/src/app/uptime/monitors/components/dialog/RegionsTab.tsx
+++ b/client/src/app/uptime/monitors/components/dialog/RegionsTab.tsx
@@ -38,7 +38,7 @@ export function RegionsTab() {
// Set monitoring type on mount
useEffect(() => {
form.setValue("monitoringType", monitoringType);
-
+
// For local monitoring, ensure "local" is selected
if (!IS_CLOUD) {
form.setValue("selectedRegions", ["local"]);
@@ -113,7 +113,7 @@ export function RegionsTab() {
<FormControl>
<Checkbox
checked={isSelected}
- onCheckedChange={(checked) => {
+ onCheckedChange={checked => {
if (!isDisabled) {
let newValue: string[];
if (checked) {
diff --git a/client/src/app/uptime/monitors/components/dialog/index.ts b/client/src/app/uptime/monitors/components/dialog/index.ts
index 6105009d8..c99b898a9 100644
--- a/client/src/app/uptime/monitors/components/dialog/index.ts
+++ b/client/src/app/uptime/monitors/components/dialog/index.ts
@@ -1 +1 @@
-export { MonitorDialog } from "./MonitorDialog";
\ No newline at end of file
+export { MonitorDialog } from "./MonitorDialog";
diff --git a/client/src/app/uptime/monitors/components/monitorSchemas.ts b/client/src/app/uptime/monitors/components/monitorSchemas.ts
index 22d9f9798..c2c929411 100644
--- a/client/src/app/uptime/monitors/components/monitorSchemas.ts
+++ b/client/src/app/uptime/monitors/components/monitorSchemas.ts
@@ -78,7 +78,7 @@ export const createMonitorSchema = z
selectedRegions: z.array(z.string()).optional(),
})
.refine(
- (data) => {
+ data => {
if (data.monitorType === "http") {
return data.httpConfig !== undefined && data.httpConfig.url !== "";
}
@@ -92,7 +92,7 @@ export const createMonitorSchema = z
}
)
.refine(
- (data) => {
+ data => {
if (data.monitoringType === "global") {
return data.selectedRegions && data.selectedRegions.length > 0;
}
@@ -117,4 +117,4 @@ export const updateMonitorSchema = z.object({
// Type exports
export type CreateMonitorFormData = z.infer<typeof createMonitorSchema>;
-export type UpdateMonitorFormData = z.infer<typeof updateMonitorSchema>;
\ No newline at end of file
+export type UpdateMonitorFormData = z.infer<typeof updateMonitorSchema>;
diff --git a/client/src/app/uptime/monitors/components/uptimeStore.ts b/client/src/app/uptime/monitors/components/uptimeStore.ts
index 6e3ce6cfe..b158dbf8e 100644
--- a/client/src/app/uptime/monitors/components/uptimeStore.ts
+++ b/client/src/app/uptime/monitors/components/uptimeStore.ts
@@ -26,11 +26,11 @@ export const useUptimeStore = create<{
setBucket: (bucket: TimeBucket) => void;
selectedRegion?: string;
setSelectedRegion: (region?: string) => void;
-}>((set) => ({
+}>(set => ({
timeRange: "24h",
- setTimeRange: (timeRange) => set({ timeRange }),
+ setTimeRange: timeRange => set({ timeRange }),
bucket: "minute",
- setBucket: (bucket) => set({ bucket }),
+ setBucket: bucket => set({ bucket }),
selectedRegion: undefined,
- setSelectedRegion: (region) => set({ selectedRegion: region }),
+ setSelectedRegion: region => set({ selectedRegion: region }),
}));
diff --git a/client/src/app/uptime/notifications/components/NotificationDialog.tsx b/client/src/app/uptime/notifications/components/NotificationDialog.tsx
index c2514006f..9dbaa2be7 100644
--- a/client/src/app/uptime/notifications/components/NotificationDialog.tsx
+++ b/client/src/app/uptime/notifications/components/NotificationDialog.tsx
@@ -69,13 +69,13 @@ export function NotificationDialog() {
slackChannel: editingChannel.config?.slackChannel || "",
phoneNumber: editingChannel.config?.phoneNumber || "",
});
- setSelectedMonitorIds(editingChannel.monitorIds?.map((id) => id.toString()) || []);
+ setSelectedMonitorIds(editingChannel.monitorIds?.map(id => id.toString()) || []);
}
}, [isDialogOpen, editingChannel, reset]);
const monitorOptions = React.useMemo(() => {
if (!monitorsData) return [];
- return monitorsData.map((monitor) => ({
+ return monitorsData.map(monitor => ({
value: monitor.id.toString(),
label:
monitor.name ||
@@ -97,7 +97,7 @@ export function NotificationDialog() {
if (selectedType === "sms" && data.phoneNumber) config.phoneNumber = data.phoneNumber;
try {
- const monitorIds = selectedMonitorIds.length > 0 ? selectedMonitorIds.map((id) => parseInt(id, 10)) : null;
+ const monitorIds = selectedMonitorIds.length > 0 ? selectedMonitorIds.map(id => parseInt(id, 10)) : null;
if (editingChannel) {
await updateChannel.mutateAsync({
@@ -286,8 +286,8 @@ export function NotificationDialog() {
? "Updating..."
: "Update Channel"
: createChannel.isPending
- ? "Creating..."
- : "Create Channel"}
+ ? "Creating..."
+ : "Create Channel"}
</Button>
</div>
</form>
diff --git a/client/src/app/uptime/notifications/notificationsStore.ts b/client/src/app/uptime/notifications/notificationsStore.ts
index 57f54ff90..5fc968e0e 100644
--- a/client/src/app/uptime/notifications/notificationsStore.ts
+++ b/client/src/app/uptime/notifications/notificationsStore.ts
@@ -8,34 +8,36 @@ interface NotificationsStore {
isDialogOpen: boolean;
selectedType: ChannelType | null;
editingChannel: NotificationChannel | null;
-
+
// Actions
openDialog: (type: ChannelType, channel?: NotificationChannel) => void;
closeDialog: () => void;
resetForm: () => void;
}
-export const useNotificationsStore = create<NotificationsStore>((set) => ({
+export const useNotificationsStore = create<NotificationsStore>(set => ({
// Initial state
isDialogOpen: false,
selectedType: null,
editingChannel: null,
-
+
// Actions
- openDialog: (type, channel) => set({
- isDialogOpen: true,
- selectedType: type,
- editingChannel: channel || null
- }),
-
- closeDialog: () => set({
- isDialogOpen: false,
- editingChannel: null
- }),
-
- resetForm: () =>
- set({
+ openDialog: (type, channel) =>
+ set({
+ isDialogOpen: true,
+ selectedType: type,
+ editingChannel: channel || null,
+ }),
+
+ closeDialog: () =>
+ set({
+ isDialogOpen: false,
+ editingChannel: null,
+ }),
+
+ resetForm: () =>
+ set({
selectedType: null,
- editingChannel: null
+ editingChannel: null,
}),
-}));
\ No newline at end of file
+}));
diff --git a/client/src/app/uptime/notifications/page.tsx b/client/src/app/uptime/notifications/page.tsx
index 20f4541fb..65745216d 100644
--- a/client/src/app/uptime/notifications/page.tsx
+++ b/client/src/app/uptime/notifications/page.tsx
@@ -165,7 +165,7 @@ export default function NotificationsPage() {
</TableCell>
</TableRow>
))
- : data?.channels?.map((channel) => {
+ : data?.channels?.map(channel => {
const config = CHANNEL_CONFIG[channel.type];
const Icon = config.icon;
return (
diff --git a/client/src/components/AuthenticationGuard.tsx b/client/src/components/AuthenticationGuard.tsx
index 7b00bd920..8615282ce 100644
--- a/client/src/components/AuthenticationGuard.tsx
+++ b/client/src/components/AuthenticationGuard.tsx
@@ -13,14 +13,10 @@ export function AuthenticationGuard() {
// Extract potential siteId from path like /{siteId} or /{siteId}/something
const pathSegments = pathname.split("/").filter(Boolean);
- const potentialSiteId =
- pathSegments.length > 0 && !isNaN(Number(pathSegments[0]))
- ? pathSegments[0]
- : undefined;
+ const potentialSiteId = pathSegments.length > 0 && !isNaN(Number(pathSegments[0])) ? pathSegments[0] : undefined;
// Use Tanstack Query to check if site is public
- const { data: isPublicSite, isLoading: isCheckingPublic } =
- useGetSiteIsPublic(potentialSiteId);
+ const { data: isPublicSite, isLoading: isCheckingPublic } = useGetSiteIsPublic(potentialSiteId);
useEffect(() => {
// Only redirect if:
@@ -28,13 +24,7 @@ export function AuthenticationGuard() {
// 2. User is not logged in
// 3. Not on a public route
// 4. Not on a public site
- if (
- !isPending &&
- !isCheckingPublic &&
- !user &&
- !publicRoutes.includes(pathname) &&
- !isPublicSite
- ) {
+ if (!isPending && !isCheckingPublic && !user && !publicRoutes.includes(pathname) && !isPublicSite) {
redirect("/login");
}
}, [isPending, user, pathname, isCheckingPublic, isPublicSite]);
diff --git a/client/src/components/BucketSelection.tsx b/client/src/components/BucketSelection.tsx
index 7549bc9f6..2f25dec59 100644
--- a/client/src/components/BucketSelection.tsx
+++ b/client/src/components/BucketSelection.tsx
@@ -1,13 +1,7 @@
"use client";
import { useStore } from "@/lib/store";
-import {
- SelectItem,
- Select,
- SelectContent,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
+import { SelectItem, Select, SelectContent, SelectTrigger, SelectValue } from "@/components/ui/select";
import { DateTime } from "luxon";
import { Time } from "./DateSelector/types";
@@ -114,10 +108,7 @@ const getOptions = (time: Time) => {
}
if (time.mode === "range") {
- const timeRangeLength = DateTime.fromISO(time.endDate).diff(
- DateTime.fromISO(time.startDate),
- "days"
- ).days;
+ const timeRangeLength = DateTime.fromISO(time.endDate).diff(DateTime.fromISO(time.startDate), "days").days;
return (
<SelectContent>
diff --git a/client/src/components/CodeSnippet.tsx b/client/src/components/CodeSnippet.tsx
index 423d0b3f4..a789b369e 100644
--- a/client/src/components/CodeSnippet.tsx
+++ b/client/src/components/CodeSnippet.tsx
@@ -11,12 +11,7 @@ interface CodeSnippetProps extends React.HTMLAttributes<HTMLPreElement> {
language?: string;
}
-export function CodeSnippet({
- code,
- language,
- className,
- ...props
-}: CodeSnippetProps) {
+export function CodeSnippet({ code, language, className, ...props }: CodeSnippetProps) {
const [hasCopied, setHasCopied] = React.useState(false);
const copyToClipboard = React.useCallback(async () => {
@@ -28,20 +23,16 @@ export function CodeSnippet({
return (
<div className="relative">
<pre
- className={cn("overflow-x-auto rounded-lg border-neutral-500 bg-muted p-3 text-wrap font-mono text-sm", className)}
+ className={cn(
+ "overflow-x-auto rounded-lg border-neutral-500 bg-muted p-3 text-wrap font-mono text-sm",
+ className
+ )}
{...props}
>
- {language && (
- <div className="mb-1 text-xs text-muted-foreground">{language}</div>
- )}
+ {language && <div className="mb-1 text-xs text-muted-foreground">{language}</div>}
<code className="relative rounded bg-muted p-0">{code}</code>
</pre>
- <Button
- size="icon"
- variant="ghost"
- className="absolute right-3 top-3 h-6 w-6"
- onClick={copyToClipboard}
- >
+ <Button size="icon" variant="ghost" className="absolute right-3 top-3 h-6 w-6" onClick={copyToClipboard}>
{hasCopied ? <Check className="size-3" /> : <Copy className="size-3" />}
<span className="sr-only">Copy code</span>
</Button>
diff --git a/client/src/components/ConfirmationModal.tsx b/client/src/components/ConfirmationModal.tsx
index 5ab512e23..a6c6d0331 100644
--- a/client/src/components/ConfirmationModal.tsx
+++ b/client/src/components/ConfirmationModal.tsx
@@ -20,15 +20,7 @@ export const ConfirmationModal: React.FC<{
setIsOpen: (b: boolean) => void;
onConfirm: () => void;
primaryAction?: ButtonProps;
-}> = ({
- title,
- description,
- children,
- isOpen,
- onConfirm,
- setIsOpen,
- primaryAction,
-}) => {
+}> = ({ title, description, children, isOpen, onConfirm, setIsOpen, primaryAction }) => {
const [error, setError] = useState<string | null>(null);
const onSubmit = async () => {
@@ -43,7 +35,7 @@ export const ConfirmationModal: React.FC<{
return (
<div>
- <Dialog open={isOpen} onOpenChange={(e) => setIsOpen(e)}>
+ <Dialog open={isOpen} onOpenChange={e => setIsOpen(e)}>
<DialogTrigger asChild>{children}</DialogTrigger>
<DialogContent className="max-w-lg">
<DialogHeader>
@@ -58,18 +50,10 @@ export const ConfirmationModal: React.FC<{
</Alert>
)}
<DialogFooter>
- <Button
- type="submit"
- onClick={() => setIsOpen(false)}
- variant={"ghost"}
- >
+ <Button type="submit" onClick={() => setIsOpen(false)} variant={"ghost"}>
Cancel
</Button>
- <Button
- type="submit"
- onClick={onSubmit}
- {...primaryAction}
- ></Button>
+ <Button type="submit" onClick={onSubmit} {...primaryAction}></Button>
</DialogFooter>
</DialogContent>
</Dialog>
diff --git a/client/src/components/CopyText.tsx b/client/src/components/CopyText.tsx
index 3c21ce306..f9801ca83 100644
--- a/client/src/components/CopyText.tsx
+++ b/client/src/components/CopyText.tsx
@@ -1,8 +1,4 @@
-import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
-} from "@/components/ui/tooltip";
+import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
import { cn } from "@/lib/utils";
import { Check, Copy } from "lucide-react";
import { ReactNode, useEffect, useState } from "react";
@@ -57,9 +53,7 @@ export function CopyText({
return (
<div className={cn("flex items-center gap-1.5 group", className)}>
- <span className="font-mono text-sm truncate">
- {children || displayText}
- </span>
+ <span className="font-mono text-sm truncate">{children || displayText}</span>
{showCopyButton && (
<Tooltip>
@@ -72,11 +66,7 @@ export function CopyText({
)}
aria-label="Copy to clipboard"
>
- {copied ? (
- <Check className="h-3.5 w-3.5 text-green-500" />
- ) : (
- <Copy className="h-3.5 w-3.5" />
- )}
+ {copied ? <Check className="h-3.5 w-3.5 text-green-500" /> : <Copy className="h-3.5 w-3.5" />}
</button>
</TooltipTrigger>
<TooltipContent>
diff --git a/client/src/components/CreateOrganizationDialog.tsx b/client/src/components/CreateOrganizationDialog.tsx
index bb1be7ae7..175ff6e27 100644
--- a/client/src/components/CreateOrganizationDialog.tsx
+++ b/client/src/components/CreateOrganizationDialog.tsx
@@ -117,7 +117,7 @@ export function CreateOrganizationDialog({ open, onOpenChange, onSuccess, trigge
type="text"
placeholder="Acme Inc."
value={name}
- onChange={(e) => handleNameChange(e.target.value)}
+ onChange={e => handleNameChange(e.target.value)}
required
/>
</div>
diff --git a/client/src/components/DateSelector/CustomDateRangePicker.tsx b/client/src/components/DateSelector/CustomDateRangePicker.tsx
index 16674d9c9..950915f49 100644
--- a/client/src/components/DateSelector/CustomDateRangePicker.tsx
+++ b/client/src/components/DateSelector/CustomDateRangePicker.tsx
@@ -5,32 +5,18 @@ import { DateRange } from "react-day-picker";
import { Button } from "@/components/ui/button";
import { Calendar } from "@/components/ui/calendar";
-import {
- Popover,
- PopoverContent,
- PopoverTrigger,
-} from "@/components/ui/popover";
+import { Popover, PopoverContent, PopoverTrigger } from "@/components/ui/popover";
import { cn } from "@/lib/utils";
import { Time } from "./types";
-export function CustomDateRangePicker({
- className,
- setTime,
-}: {
- className?: string;
- setTime: (time: Time) => void;
-}) {
+export function CustomDateRangePicker({ className, setTime }: { className?: string; setTime: (time: Time) => void }) {
const [date, setDate] = React.useState<DateRange | undefined>();
return (
<div className={cn("grid gap-2", className)}>
<Popover>
<PopoverTrigger asChild>
- <Button
- id="date"
- variant={"ghost"}
- className={cn("justify-start text-left font-normal px-2")}
- >
+ <Button id="date" variant={"ghost"} className={cn("justify-start text-left font-normal px-2")}>
Custom Range
</Button>
</PopoverTrigger>
@@ -40,7 +26,7 @@ export function CustomDateRangePicker({
mode="range"
defaultMonth={date?.from}
selected={date}
- onSelect={(range) => {
+ onSelect={range => {
setDate(range);
if (!range) return;
if (range?.to) {
diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsx
index dea2231ab..a15b894e7 100644
--- a/client/src/components/DateSelector/DateSelector.tsx
+++ b/client/src/components/DateSelector/DateSelector.tsx
@@ -17,9 +17,7 @@ const getLabel = (time: Time) => {
if (time.wellKnown) {
return `${time.wellKnown}`;
}
- const startFormatted = DateTime.fromISO(time.startDate).toFormat(
- "EEEE, MMM d"
- );
+ const startFormatted = DateTime.fromISO(time.startDate).toFormat("EEEE, MMM d");
const endFormatted = DateTime.fromISO(time.endDate).toFormat("EEEE, MMM d");
return `${startFormatted} - ${endFormatted}`;
}
@@ -45,26 +43,18 @@ const getLabel = (time: Time) => {
if (time.week === DateTime.now().startOf("week").toISODate()) {
return "This Week";
}
- if (
- time.week ===
- DateTime.now().minus({ weeks: 1 }).startOf("week").toISODate()
- ) {
+ if (time.week === DateTime.now().minus({ weeks: 1 }).startOf("week").toISODate()) {
return "Last Week";
}
const startDate = DateTime.fromISO(time.week).toFormat("EEEE, MMM d");
- const endDate = DateTime.fromISO(time.week)
- .endOf("week")
- .toFormat("EEEE, MMM d");
+ const endDate = DateTime.fromISO(time.week).endOf("week").toFormat("EEEE, MMM d");
return `${startDate} - ${endDate}`;
}
if (time.mode === "month") {
if (time.month === DateTime.now().startOf("month").toISODate()) {
return "This Month";
}
- if (
- time.month ===
- DateTime.now().minus({ months: 1 }).startOf("month").toISODate()
- ) {
+ if (time.month === DateTime.now().minus({ months: 1 }).startOf("month").toISODate()) {
return "Last Month";
}
return DateTime.fromISO(time.month).toFormat("MMMM yyyy");
@@ -91,10 +81,7 @@ export function DateSelector({
}) {
return (
<DropdownMenu>
- <DropdownMenuTrigger
- className="text-xs sm:text-sm p-2 sm:p-3 h-8 sm:h-9"
- variant={"default"}
- >
+ <DropdownMenuTrigger className="text-xs sm:text-sm p-2 sm:p-3 h-8 sm:h-9" variant={"default"}>
<Calendar className="hidden sm:block w-4 h-4" />
{getLabel(time)}
</DropdownMenuTrigger>
diff --git a/client/src/components/DateSelector/types.ts b/client/src/components/DateSelector/types.ts
index 41df06fb9..f60325441 100644
--- a/client/src/components/DateSelector/types.ts
+++ b/client/src/components/DateSelector/types.ts
@@ -7,12 +7,7 @@ export type DateRangeMode = {
mode: "range";
startDate: string;
endDate: string;
- wellKnown?:
- | "Last 3 days"
- | "Last 7 days"
- | "Last 14 days"
- | "Last 30 days"
- | "Last 60 days";
+ wellKnown?: "Last 3 days" | "Last 7 days" | "Last 14 days" | "Last 30 days" | "Last 60 days";
};
export type WeekMode = {
@@ -40,11 +35,4 @@ export type PastMinutesMode = {
pastMinutesEnd: number;
};
-export type Time =
- | DateMode
- | DateRangeMode
- | WeekMode
- | MonthMode
- | YearMode
- | AllTimeMode
- | PastMinutesMode;
+export type Time = DateMode | DateRangeMode | WeekMode | MonthMode | YearMode | AllTimeMode | PastMinutesMode;
diff --git a/client/src/components/Favicon.tsx b/client/src/components/Favicon.tsx
index 724702039..6c65f8e7b 100644
--- a/client/src/components/Favicon.tsx
+++ b/client/src/components/Favicon.tsx
@@ -1,20 +1,17 @@
import { useState } from "react";
import { cn } from "../lib/utils";
-export function Favicon({
- domain,
- className,
-}: {
- domain: string;
- className?: string;
-}) {
+export function Favicon({ domain, className }: { domain: string; className?: string }) {
const [imageError, setImageError] = useState(false);
const firstLetter = domain.charAt(0).toUpperCase();
if (imageError) {
return (
<div
- className={cn("bg-neutral-700 rounded-full flex items-center justify-center text-xs font-medium text-white", className ?? "w-4 h-4")}
+ className={cn(
+ "bg-neutral-700 rounded-full flex items-center justify-center text-xs font-medium text-white",
+ className ?? "w-4 h-4"
+ )}
>
{firstLetter}
</div>
diff --git a/client/src/components/FreePlanBanner.tsx b/client/src/components/FreePlanBanner.tsx
index 717fb7087..039240229 100644
--- a/client/src/components/FreePlanBanner.tsx
+++ b/client/src/components/FreePlanBanner.tsx
@@ -19,12 +19,8 @@ export function FreePlanBanner() {
<div className="mt-4 px-4 py-3 rounded-lg border border-blue-100 dark:border-blue-400/30 bg-blue-50/80 dark:bg-blue-900/20 text-sm flex gap-4 items-center">
<div className="text-blue-700 dark:text-blue-300 flex items-center font-medium">
<span>
- Free plan: Using{" "}
- <strong>
- {formatNumber(subscription?.monthlyEventCount || 0)}
- </strong>{" "}
- of <strong>{formatNumber(subscription?.eventLimit || 0)}</strong>{" "}
- events
+ Free plan: Using <strong>{formatNumber(subscription?.monthlyEventCount || 0)}</strong> of{" "}
+ <strong>{formatNumber(subscription?.eventLimit || 0)}</strong> events
</span>
</div>
{site.isOwner && (
diff --git a/client/src/components/FreeTrialBanner.tsx b/client/src/components/FreeTrialBanner.tsx
index a952d24cc..4b5426ab9 100644
--- a/client/src/components/FreeTrialBanner.tsx
+++ b/client/src/components/FreeTrialBanner.tsx
@@ -30,8 +30,7 @@ export function FreeTrialBanner() {
<Clock className="h-4 w-4 mr-2 text-blue-500 dark:text-blue-400 flex-shrink-0" />
<span>
Free trial: <strong>{daysRemaining}</strong> days remaining – Using{" "}
- <strong>{formatNumber(eventsUsed)}</strong> of{" "}
- {formatNumber(eventLimit)} events
+ <strong>{formatNumber(eventsUsed)}</strong> of {formatNumber(eventLimit)} events
</span>
</div>
<Button
@@ -59,14 +58,12 @@ export function FreeTrialBanner() {
Your Free Trial Has Ended
</AlertTitle>
<div className="mb-2 text-sm text-amber-700 dark:text-amber-400">
- Your 14-day free trial has expired. Subscribe to continue tracking
- visits again.
+ Your 14-day free trial has expired. Subscribe to continue tracking visits again.
</div>
<div className="flex flex-col space-y-2 sm:flex-row sm:space-y-0 sm:space-x-2 items-start sm:items-center">
<AlertDescription className="text-sm text-amber-700 dark:text-amber-400">
- Choose a subscription plan to continue collecting analytics
- data.
+ Choose a subscription plan to continue collecting analytics data.
</AlertDescription>
<Button
className="bg-amber-500 hover:bg-amber-600 text-white border-amber-400 hover:border-amber-500 py-1 h-auto text-sm"
diff --git a/client/src/components/Loaders.tsx b/client/src/components/Loaders.tsx
index e6a8fe0fa..e00e61fed 100644
--- a/client/src/components/Loaders.tsx
+++ b/client/src/components/Loaders.tsx
@@ -2,9 +2,7 @@ import { cn } from "../lib/utils";
export function ThreeDotLoader({ className }: { className?: string }) {
return (
- <div
- className={cn("flex justify-center items-center h-[500px]", className)}
- >
+ <div className={cn("flex justify-center items-center h-[500px]", className)}>
<div className="animate-pulse flex items-center">
<div className="h-2 w-2 bg-neutral-500 rounded-full mr-1 animate-bounce"></div>
<div className="h-2 w-2 bg-neutral-500 rounded-full mr-1 animate-bounce [animation-delay:0.2s]"></div>
diff --git a/client/src/components/MultiSelect.tsx b/client/src/components/MultiSelect.tsx
index a034bc6e7..7acd68e02 100644
--- a/client/src/components/MultiSelect.tsx
+++ b/client/src/components/MultiSelect.tsx
@@ -8,69 +8,58 @@ import { cn } from "@/lib/utils";
export type MultiSelectProps<
Option,
IsMulti extends boolean = true,
- Group extends GroupBase<Option> = GroupBase<Option>
+ Group extends GroupBase<Option> = GroupBase<Option>,
> = Omit<ReactSelectProps<Option, IsMulti, Group>, "theme" | "classNames"> & {
error?: boolean;
};
-export const MultiSelect = forwardRef<any, MultiSelectProps<any>>(
- ({ className, error, ...props }, ref) => {
- return (
- <Creatable
- ref={ref}
- isMulti
- unstyled
- closeMenuOnSelect={false}
- className={cn(className)}
- classNames={{
- control: ({ isFocused }) =>
- cn(
- "flex min-h-[36px] rounded-md px-3 py-[3px] text-sm shadow-sm transition-colors ",
- "placeholder:text-muted-foreground ",
- "disabled:cursor-not-allowed disabled:opacity-50",
- isFocused && "ring-1 ring-ring",
- error && "border-destructive ring-destructive"
- ),
- placeholder: () => "text-muted-foreground",
- input: () => "text-sm",
- menu: () =>
- "mt-2 rounded-md border-neutral-200 bg-neutral-900 text-neutral-50 shadow-md py-1",
- menuList: () => "text-sm",
- option: ({ isFocused, isSelected }) =>
- cn(
- "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 outline-none transition-colors",
- isSelected && "bg-primary text-primary-foreground",
- isFocused && !isSelected && "bg-accent text-accent-foreground",
- !isFocused &&
- !isSelected &&
- "text-popover-foreground hover:bg-accent hover:text-accent-foreground"
- ),
- multiValue: () =>
- "inline-flex items-center bg-neutral-750 rounded-md text-secondary-foreground mr-1",
- multiValueLabel: () => "px-2 text-xs leading-none",
- multiValueRemove: () =>
- cn(
- "flex items-center justify-center p-1",
- "hover:bg-destructive hover:text-destructive-foreground"
- ),
- valueContainer: () => "gap-1 flex flex-wrap items-center",
- clearIndicator: () =>
- "p-1 text-muted-foreground hover:text-foreground",
- dropdownIndicator: () =>
- "p-1 text-muted-foreground hover:text-foreground",
- indicatorSeparator: () => "bg-input mx-2 my-2 w-[1px]",
- noOptionsMessage: () => "text-muted-foreground p-2 text-sm",
- }}
- styles={{
- control: (base) => ({
- ...base,
- border: "1px solid hsl(var(--neutral-750))",
- }),
- }}
- {...props}
- />
- );
- }
-);
+export const MultiSelect = forwardRef<any, MultiSelectProps<any>>(({ className, error, ...props }, ref) => {
+ return (
+ <Creatable
+ ref={ref}
+ isMulti
+ unstyled
+ closeMenuOnSelect={false}
+ className={cn(className)}
+ classNames={{
+ control: ({ isFocused }) =>
+ cn(
+ "flex min-h-[36px] rounded-md px-3 py-[3px] text-sm shadow-sm transition-colors ",
+ "placeholder:text-muted-foreground ",
+ "disabled:cursor-not-allowed disabled:opacity-50",
+ isFocused && "ring-1 ring-ring",
+ error && "border-destructive ring-destructive"
+ ),
+ placeholder: () => "text-muted-foreground",
+ input: () => "text-sm",
+ menu: () => "mt-2 rounded-md border-neutral-200 bg-neutral-900 text-neutral-50 shadow-md py-1",
+ menuList: () => "text-sm",
+ option: ({ isFocused, isSelected }) =>
+ cn(
+ "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 outline-none transition-colors",
+ isSelected && "bg-primary text-primary-foreground",
+ isFocused && !isSelected && "bg-accent text-accent-foreground",
+ !isFocused && !isSelected && "text-popover-foreground hover:bg-accent hover:text-accent-foreground"
+ ),
+ multiValue: () => "inline-flex items-center bg-neutral-750 rounded-md text-secondary-foreground mr-1",
+ multiValueLabel: () => "px-2 text-xs leading-none",
+ multiValueRemove: () =>
+ cn("flex items-center justify-center p-1", "hover:bg-destructive hover:text-destructive-foreground"),
+ valueContainer: () => "gap-1 flex flex-wrap items-center",
+ clearIndicator: () => "p-1 text-muted-foreground hover:text-foreground",
+ dropdownIndicator: () => "p-1 text-muted-foreground hover:text-foreground",
+ indicatorSeparator: () => "bg-input mx-2 my-2 w-[1px]",
+ noOptionsMessage: () => "text-muted-foreground p-2 text-sm",
+ }}
+ styles={{
+ control: base => ({
+ ...base,
+ border: "1px solid hsl(var(--neutral-750))",
+ }),
+ }}
+ {...props}
+ />
+ );
+});
MultiSelect.displayName = "MultiSelect";
diff --git a/client/src/components/NoOrganization.tsx b/client/src/components/NoOrganization.tsx
index ca328f579..63102cb45 100644
--- a/client/src/components/NoOrganization.tsx
+++ b/client/src/components/NoOrganization.tsx
@@ -24,10 +24,7 @@ export function NoOrganization({
</div>
<CardTitle className="mb-2 text-xl">No Organization</CardTitle>
<CardDescription className="mb-6">{message}</CardDescription>
- <Button
- onClick={() => setCreateOrgDialogOpen(true)}
- className="max-w-xs"
- >
+ <Button onClick={() => setCreateOrgDialogOpen(true)} className="max-w-xs">
<Plus className="mr-2 h-4 w-4" />
Create an Organization
</Button>
diff --git a/client/src/components/OrganizationInitializer.tsx b/client/src/components/OrganizationInitializer.tsx
index a05345700..1e74256b2 100644
--- a/client/src/components/OrganizationInitializer.tsx
+++ b/client/src/components/OrganizationInitializer.tsx
@@ -6,15 +6,10 @@ import { useUserOrganizations } from "../api/admin/organizations";
function OrganizationInitializerInner() {
const { data: organizations } = useUserOrganizations();
- const { data: activeOrganization, isPending: isPendingActiveOrganization } =
- authClient.useActiveOrganization();
+ const { data: activeOrganization, isPending: isPendingActiveOrganization } = authClient.useActiveOrganization();
useEffect(() => {
- if (
- !isPendingActiveOrganization &&
- !activeOrganization &&
- organizations?.length
- ) {
+ if (!isPendingActiveOrganization && !activeOrganization && organizations?.length) {
authClient.organization.setActive({
organizationId: organizations?.[0]?.id,
});
diff --git a/client/src/components/OrganizationSelector.tsx b/client/src/components/OrganizationSelector.tsx
index f0b9b534b..fb28ced88 100644
--- a/client/src/components/OrganizationSelector.tsx
+++ b/client/src/components/OrganizationSelector.tsx
@@ -1,20 +1,12 @@
import { Building2 } from "lucide-react";
import { useState, useEffect } from "react";
import { authClient } from "../lib/auth";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "./ui/select";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "./ui/select";
import { useUserOrganizations } from "../api/admin/organizations";
export function OrganizationSelector() {
- const { data: organizations, isLoading: isLoadingOrganizations } =
- useUserOrganizations();
- const { data: activeOrganization, isPending } =
- authClient.useActiveOrganization();
+ const { data: organizations, isLoading: isLoadingOrganizations } = useUserOrganizations();
+ const { data: activeOrganization, isPending } = authClient.useActiveOrganization();
// Local state to handle the delay when switching organizations
const [selectedOrgId, setSelectedOrgId] = useState<string | null>(null);
@@ -71,7 +63,7 @@ export function OrganizationSelector() {
<SelectValue placeholder="Select an organization" />
</SelectTrigger>
<SelectContent>
- {organizations?.map((org) => (
+ {organizations?.map(org => (
<SelectItem key={org.id} value={org.id}>
<div className="flex items-center">
<Building2 className="h-4 w-4 mr-2 text-muted-foreground" />
diff --git a/client/src/components/Sessions/SessionCard.tsx b/client/src/components/Sessions/SessionCard.tsx
index 6a174c2bd..c436622d3 100644
--- a/client/src/components/Sessions/SessionCard.tsx
+++ b/client/src/components/Sessions/SessionCard.tsx
@@ -1,6 +1,14 @@
import { Skeleton } from "@/components/ui/skeleton";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
-import { ArrowRight, ChevronDown, ChevronRight, ExternalLink, FileText, MousePointerClick, TriangleAlert } from "lucide-react";
+import {
+ ArrowRight,
+ ChevronDown,
+ ChevronRight,
+ ExternalLink,
+ FileText,
+ MousePointerClick,
+ TriangleAlert,
+} from "lucide-react";
import { DateTime } from "luxon";
import { memo, useState } from "react";
import { GetSessionsResponse } from "../../api/analytics/userSessions";
diff --git a/client/src/components/Sessions/SessionDetails.tsx b/client/src/components/Sessions/SessionDetails.tsx
index 2bb7de6ae..fa2f84edc 100644
--- a/client/src/components/Sessions/SessionDetails.tsx
+++ b/client/src/components/Sessions/SessionDetails.tsx
@@ -77,10 +77,10 @@ function PageviewItem({
isEvent
? "bg-amber-900/30 border-amber-500/50"
: isError
- ? "bg-red-900/30 border-red-500/50"
- : isOutbound
- ? "bg-purple-900/30 border-purple-500/50"
- : "bg-blue-900/30 border-blue-500/50"
+ ? "bg-red-900/30 border-red-500/50"
+ : isOutbound
+ ? "bg-purple-900/30 border-purple-500/50"
+ : "bg-blue-900/30 border-blue-500/50"
)}
>
<span className="text-sm font-medium">{index + 1}</span>
@@ -120,11 +120,7 @@ function PageviewItem({
</div>
</Link>
) : isOutbound && item.props?.url ? (
- <Link
- href={String(item.props.url)}
- target="_blank"
- rel="noopener noreferrer"
- >
+ <Link href={String(item.props.url)} target="_blank" rel="noopener noreferrer">
<div
className="text-sm truncate hover:underline text-purple-400"
title={String(item.props.url)}
@@ -136,7 +132,7 @@ function PageviewItem({
</div>
</Link>
) : (
- <div className="text-sm truncate">{item.event_name || 'Outbound Click'}</div>
+ <div className="text-sm truncate">{item.event_name || "Outbound Click"}</div>
)}
</div>
@@ -165,12 +161,12 @@ function PageviewItem({
<Tooltip>
<TooltipTrigger asChild>
<span className="truncate">
- {(typeof value === 'object') ? JSON.stringify(value) : String(value)}
+ {typeof value === "object" ? JSON.stringify(value) : String(value)}
</span>
</TooltipTrigger>
<TooltipContent>
<span className="max-w-7xl">
- {(typeof value === 'object') ? JSON.stringify(value) : String(value)}
+ {typeof value === "object" ? JSON.stringify(value) : String(value)}
</span>
</TooltipContent>
</Tooltip>
@@ -304,7 +300,7 @@ export function SessionDetails({ session, userId }: SessionDetailsProps) {
// Flatten all events into a single array
const allEvents = useMemo(() => {
if (!sessionDetailsData?.pages) return [];
- return sessionDetailsData.pages.flatMap((page) => page.data?.events || []);
+ return sessionDetailsData.pages.flatMap(page => page.data?.events || []);
}, [sessionDetailsData?.pages]);
// Get session details from the first page
diff --git a/client/src/components/Sessions/SessionsList.tsx b/client/src/components/Sessions/SessionsList.tsx
index 7843d7b01..683ba2aff 100644
--- a/client/src/components/Sessions/SessionsList.tsx
+++ b/client/src/components/Sessions/SessionsList.tsx
@@ -12,7 +12,7 @@ export default function SessionsList({ userId }: { userId?: string }) {
// Combine all pages of data
const flattenedData = useMemo(() => {
if (!data) return [];
- return data.pages.flatMap((page) => page.data || []);
+ return data.pages.flatMap(page => page.data || []);
}, [data]);
// Reference for the scroll container
diff --git a/client/src/components/SiteSessionChart.tsx b/client/src/components/SiteSessionChart.tsx
index 2da141d8e..23af961d8 100644
--- a/client/src/components/SiteSessionChart.tsx
+++ b/client/src/components/SiteSessionChart.tsx
@@ -11,10 +11,7 @@ interface SiteSessionChartProps {
height?: number | string;
}
-export function SiteSessionChart({
- data,
- height = 100,
-}: SiteSessionChartProps) {
+export function SiteSessionChart({ data, height = 100 }: SiteSessionChartProps) {
const chartData = useMemo(() => {
if (!data || data.length === 0) {
return [{ id: "sessions", data: [] }];
@@ -23,11 +20,9 @@ export function SiteSessionChart({
return [
{
id: "sessions",
- data: data.map((point) => {
+ data: data.map(point => {
return {
- x: DateTime.fromSQL(point.time)
- .toUTC()
- .toFormat("yyyy-MM-dd HH:mm:ss"),
+ x: DateTime.fromSQL(point.time).toUTC().toFormat("yyyy-MM-dd HH:mm:ss"),
y: point.sessions,
currentTime: DateTime.fromSQL(point.time),
};
@@ -59,7 +54,7 @@ export function SiteSessionChart({
tickPadding: 5,
tickRotation: 0,
tickValues: 3,
- format: (value) => {
+ format: value => {
const time = DateTime.fromJSDate(value);
return time.toFormat(hour12 ? "ha" : "HH:mm");
},
@@ -97,9 +92,7 @@ export function SiteSessionChart({
<div className="bg-neutral-800 border-neutral-700 border p-2 rounded-md">
<div className="text-xs mb-1">Sessions</div>
<div className="flex justify-between text-xs w-20">
- <div className="text-muted-foreground">
- { currentTime.toFormat(hour12 ? "ha" : "HH:mm") }
- </div>
+ <div className="text-muted-foreground">{currentTime.toFormat(hour12 ? "ha" : "HH:mm")}</div>
<div className="font-medium">{currentY.toLocaleString()}</div>
</div>
</div>
diff --git a/client/src/components/SiteSettings/ApiKeyManager.tsx b/client/src/components/SiteSettings/ApiKeyManager.tsx
index d64a0486b..4ead84ab8 100644
--- a/client/src/components/SiteSettings/ApiKeyManager.tsx
+++ b/client/src/components/SiteSettings/ApiKeyManager.tsx
@@ -20,26 +20,18 @@ import { Input } from "@/components/ui/input";
import { Skeleton } from "@/components/ui/skeleton";
import Link from "next/link";
-import {
- useGenerateApiKey,
- useGetApiConfig,
- useRevokeApiKey,
-} from "../../api/admin/apiKey";
+import { useGenerateApiKey, useGetApiConfig, useRevokeApiKey } from "../../api/admin/apiKey";
interface ApiKeyManagerProps {
siteId: number;
disabled?: boolean;
}
-export function ApiKeyManager({
- siteId,
- disabled = false,
-}: ApiKeyManagerProps) {
+export function ApiKeyManager({ siteId, disabled = false }: ApiKeyManagerProps) {
const [showApiKey, setShowApiKey] = useState(false);
// API key hooks
- const { data: apiConfig, isLoading: isLoadingApiConfig } =
- useGetApiConfig(siteId);
+ const { data: apiConfig, isLoading: isLoadingApiConfig } = useGetApiConfig(siteId);
const generateApiKey = useGenerateApiKey();
const revokeApiKey = useRevokeApiKey();
@@ -60,11 +52,7 @@ export function ApiKeyManager({
localhost
</Link>
, server-side applications, or mobile apps using the{" "}
- <Link
- href="https://rybbit.io/docs/api"
- target="_blank"
- className="text-indigo-300 hover:underline"
- >
+ <Link href="https://rybbit.io/docs/api" target="_blank" className="text-indigo-300 hover:underline">
API endpoint
</Link>
.
@@ -82,11 +70,7 @@ export function ApiKeyManager({
<div className="relative">
<Input
type={showApiKey ? "text" : "password"}
- value={
- showApiKey && apiKey
- ? apiKey
- : "rb_••••••••••••••••••••••••••••••••••"
- }
+ value={showApiKey && apiKey ? apiKey : "rb_••••••••••••••••••••••••••••••••••"}
readOnly
className="pr-20 font-mono text-xs"
/>
@@ -98,11 +82,7 @@ export function ApiKeyManager({
onClick={() => setShowApiKey(!showApiKey)}
className="h-7 px-2"
>
- {showApiKey ? (
- <EyeOff className="h-3 w-3" />
- ) : (
- <Eye className="h-3 w-3" />
- )}
+ {showApiKey ? <EyeOff className="h-3 w-3" /> : <Eye className="h-3 w-3" />}
</Button>
{apiKey && (
<Button
@@ -125,11 +105,7 @@ export function ApiKeyManager({
<div className="space-y-4">
<AlertDialog>
<AlertDialogTrigger asChild>
- <Button
- variant="destructive"
- size="sm"
- disabled={disabled || revokeApiKey.isPending}
- >
+ <Button variant="destructive" size="sm" disabled={disabled || revokeApiKey.isPending}>
Revoke API Key
</Button>
</AlertDialogTrigger>
@@ -137,8 +113,8 @@ export function ApiKeyManager({
<AlertDialogHeader>
<AlertDialogTitle>Revoke API Key?</AlertDialogTitle>
<AlertDialogDescription>
- This will immediately invalidate the current API key. Any
- applications using this key will stop working.
+ This will immediately invalidate the current API key. Any applications using this key will stop
+ working.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
diff --git a/client/src/components/SiteSettings/IPExclusionManager.tsx b/client/src/components/SiteSettings/IPExclusionManager.tsx
index 2dd6cb522..592b1335b 100644
--- a/client/src/components/SiteSettings/IPExclusionManager.tsx
+++ b/client/src/components/SiteSettings/IPExclusionManager.tsx
@@ -55,11 +55,11 @@ export function IPExclusionManager({ siteId, disabled = false }: IPExclusionMana
const handleSave = async () => {
// Filter out empty entries and validate
- const filteredIPs = ipList.filter((ip) => ip.trim() !== "");
+ const filteredIPs = ipList.filter(ip => ip.trim() !== "");
const invalidIPs: string[] = [];
const validationErrors: string[] = [];
- filteredIPs.forEach((ip) => {
+ filteredIPs.forEach(ip => {
const validation = validateIPPattern(ip);
if (!validation.valid) {
invalidIPs.push(ip);
@@ -117,7 +117,7 @@ export function IPExclusionManager({ siteId, disabled = false }: IPExclusionMana
<div key={index} className="flex items-center space-x-2">
<Input
value={ip}
- onChange={(e) => updateIPField(index, e.target.value)}
+ onChange={e => updateIPField(index, e.target.value)}
placeholder="e.g., 192.168.1.1 or 10.0.0.0/24"
disabled={disabled}
className={!validateIPPattern(ip).valid && ip.trim() !== "" ? "border-red-500" : ""}
diff --git a/client/src/components/SiteSettings/ScriptBuilder.tsx b/client/src/components/SiteSettings/ScriptBuilder.tsx
index dfeaa0a58..35540fa0d 100644
--- a/client/src/components/SiteSettings/ScriptBuilder.tsx
+++ b/client/src/components/SiteSettings/ScriptBuilder.tsx
@@ -28,24 +28,19 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
const [maskPatternsText, setMaskPatternsText] = useState("");
// Handle pattern text area changes
- const handleSkipPatternsChange = (
- e: React.ChangeEvent<HTMLTextAreaElement>
- ) => {
+ const handleSkipPatternsChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
setSkipPatternsText(e.target.value);
try {
// Try to parse as JSON if it starts with [ and ends with ]
- if (
- e.target.value.trim().startsWith("[") &&
- e.target.value.trim().endsWith("]")
- ) {
+ if (e.target.value.trim().startsWith("[") && e.target.value.trim().endsWith("]")) {
setSkipPatterns(JSON.parse(e.target.value.trim()));
} else {
// Otherwise treat as line-separated values
setSkipPatterns(
e.target.value
.split("\n")
- .map((line) => line.trim())
- .filter((line) => line.length > 0)
+ .map(line => line.trim())
+ .filter(line => line.length > 0)
);
}
} catch (err) {
@@ -53,30 +48,25 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
setSkipPatterns(
e.target.value
.split("\n")
- .map((line) => line.trim())
- .filter((line) => line.length > 0)
+ .map(line => line.trim())
+ .filter(line => line.length > 0)
);
}
};
- const handleMaskPatternsChange = (
- e: React.ChangeEvent<HTMLTextAreaElement>
- ) => {
+ const handleMaskPatternsChange = (e: React.ChangeEvent<HTMLTextAreaElement>) => {
setMaskPatternsText(e.target.value);
try {
// Try to parse as JSON if it starts with [ and ends with ]
- if (
- e.target.value.trim().startsWith("[") &&
- e.target.value.trim().endsWith("]")
- ) {
+ if (e.target.value.trim().startsWith("[") && e.target.value.trim().endsWith("]")) {
setMaskPatterns(JSON.parse(e.target.value.trim()));
} else {
// Otherwise treat as line-separated values
setMaskPatterns(
e.target.value
.split("\n")
- .map((line) => line.trim())
- .filter((line) => line.length > 0)
+ .map(line => line.trim())
+ .filter(line => line.length > 0)
);
}
} catch (err) {
@@ -84,8 +74,8 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
setMaskPatterns(
e.target.value
.split("\n")
- .map((line) => line.trim())
- .filter((line) => line.length > 0)
+ .map(line => line.trim())
+ .filter(line => line.length > 0)
);
}
};
@@ -94,51 +84,51 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
const trackingScript = `<script
src="${globalThis.location.origin}/api/script.js"
data-site-id="${siteId}"${
- debounceValue !== 500
- ? `
+ debounceValue !== 500
+ ? `
data-debounce="${debounceValue}"`
- : ""
- }${
- !autoTrackPageview
- ? `
+ : ""
+ }${
+ !autoTrackPageview
+ ? `
data-auto-track-pageview="false"`
- : ""
- }${
- !autoTrack
- ? `
+ : ""
+ }${
+ !autoTrack
+ ? `
data-track-spa="false"`
- : ""
- }${!trackQuery ? `data-track-query="false"` : ""}${
- !trackOutbound
- ? `
+ : ""
+ }${!trackQuery ? `data-track-query="false"` : ""}${
+ !trackOutbound
+ ? `
data-track-outbound="false"`
- : ""
- }${
- trackErrors
- ? `
+ : ""
+ }${
+ trackErrors
+ ? `
data-track-errors="true"`
- : ""
- }${
- sessionReplay
- ? `
+ : ""
+ }${
+ sessionReplay
+ ? `
data-session-replay="true"`
- : ""
- }${
- skipPatterns.length > 0
- ? `
+ : ""
+ }${
+ skipPatterns.length > 0
+ ? `
data-skip-patterns='${JSON.stringify(skipPatterns)}'`
- : ""
- }${
- maskPatterns.length > 0
- ? `
+ : ""
+ }${
+ maskPatterns.length > 0
+ ? `
data-mask-patterns='${JSON.stringify(maskPatterns)}'`
- : ""
- }${
- webVitals
- ? `
+ : ""
+ }${
+ webVitals
+ ? `
data-web-vitals="true"`
- : ""
- }
+ : ""
+ }
defer
></script>`;
@@ -146,9 +136,7 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-6">
<div className="space-y-3">
<div>
- <h4 className="text-sm font-semibold text-foreground">
- Tracking Script
- </h4>
+ <h4 className="text-sm font-semibold text-foreground">Tracking Script</h4>
<p className="text-xs text-muted-foreground">
Add this script to the <code>&lt;head&gt;</code> of your website
</p>
@@ -161,21 +149,12 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="autoTrackPageview"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="autoTrackPageview" className="text-sm font-medium text-foreground block">
Automatically track initial pageview
</Label>
- <p className="text-xs text-muted-foreground mt-1">
- Track the first pageview when the script loads
- </p>
+ <p className="text-xs text-muted-foreground mt-1">Track the first pageview when the script loads</p>
</div>
- <Switch
- id="autoTrackPageview"
- checked={autoTrackPageview}
- onCheckedChange={setAutoTrackPageview}
- />
+ <Switch id="autoTrackPageview" checked={autoTrackPageview} onCheckedChange={setAutoTrackPageview} />
</div>
</div>
@@ -183,22 +162,14 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="autoTrack"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="autoTrack" className="text-sm font-medium text-foreground block">
Automatically track SPA navigation
</Label>
<p className="text-xs text-muted-foreground mt-1">
- For SPAs: track page views when URL changes (using History
- API)
+ For SPAs: track page views when URL changes (using History API)
</p>
</div>
- <Switch
- id="autoTrack"
- checked={autoTrack}
- onCheckedChange={setAutoTrack}
- />
+ <Switch id="autoTrack" checked={autoTrack} onCheckedChange={setAutoTrack} />
</div>
</div>
@@ -206,22 +177,14 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="trackQuery"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="trackQuery" className="text-sm font-medium text-foreground block">
Track URL query parameters
</Label>
<p className="text-xs text-muted-foreground mt-1">
- Include query parameters in tracked URLs (may contain
- sensitive data)
+ Include query parameters in tracked URLs (may contain sensitive data)
</p>
</div>
- <Switch
- id="trackQuery"
- checked={trackQuery}
- onCheckedChange={setTrackQuery}
- />
+ <Switch id="trackQuery" checked={trackQuery} onCheckedChange={setTrackQuery} />
</div>
</div>
@@ -229,22 +192,14 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="sessionReplay"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="sessionReplay" className="text-sm font-medium text-foreground block">
Enable session replay
</Label>
<p className="text-xs text-muted-foreground mt-1">
- Record user interactions and DOM changes for debugging and UX
- analysis
+ Record user interactions and DOM changes for debugging and UX analysis
</p>
</div>
- <Switch
- id="sessionReplay"
- checked={sessionReplay}
- onCheckedChange={setSessionReplay}
- />
+ <Switch id="sessionReplay" checked={sessionReplay} onCheckedChange={setSessionReplay} />
</div>
</div>
@@ -275,22 +230,14 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="webVitals"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="webVitals" className="text-sm font-medium text-foreground block">
Enable Web Vitals performance metrics
</Label>
<p className="text-xs text-muted-foreground mt-1">
- Collect Core Web Vitals (LCP, CLS, INP) and additional
- metrics (FCP, TTFB)
+ Collect Core Web Vitals (LCP, CLS, INP) and additional metrics (FCP, TTFB)
</p>
</div>
- <Switch
- id="webVitals"
- checked={webVitals}
- onCheckedChange={setWebVitals}
- />
+ <Switch id="webVitals" checked={webVitals} onCheckedChange={setWebVitals} />
</div>
</div>
)}
@@ -299,39 +246,26 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
<div className="space-y-2">
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="trackErrors"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="trackErrors" className="text-sm font-medium text-foreground block">
Track JavaScript errors
</Label>
<p className="text-xs text-muted-foreground mt-1">
Automatically capture and track JavaScript errors on your site
</p>
</div>
- <Switch
- id="trackErrors"
- checked={trackErrors}
- onCheckedChange={setTrackErrors}
- />
+ <Switch id="trackErrors" checked={trackErrors} onCheckedChange={setTrackErrors} />
</div>
</div>
{/* Skip Patterns Option */}
<div className="space-y-2">
<div>
- <Label
- htmlFor="skipPatterns"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="skipPatterns" className="text-sm font-medium text-foreground block">
Skip Patterns
</Label>
+ <p className="text-xs text-muted-foreground mt-1">URL patterns to exclude from tracking (one per line)</p>
<p className="text-xs text-muted-foreground mt-1">
- URL patterns to exclude from tracking (one per line)
- </p>
- <p className="text-xs text-muted-foreground mt-1">
- Use <code>*</code> for single segment wildcard, <code>**</code>{" "}
- for multi-segment wildcard
+ Use <code>*</code> for single segment wildcard, <code>**</code> for multi-segment wildcard
</p>
<Textarea
id="skipPatterns"
@@ -346,18 +280,14 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
{/* Mask Patterns Option */}
<div className="space-y-2">
<div>
- <Label
- htmlFor="maskPatterns"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="maskPatterns" className="text-sm font-medium text-foreground block">
Mask Patterns
</Label>
<p className="text-xs text-muted-foreground mt-1">
URL patterns to anonymize in analytics (one per line)
</p>
<p className="text-xs text-muted-foreground mt-1">
- E.g. <code>/users/*/profile</code> will hide usernames,{" "}
- <code>/orders/**</code> will hide order details
+ E.g. <code>/users/*/profile</code> will hide usernames, <code>/orders/**</code> will hide order details
</p>
<Textarea
id="maskPatterns"
@@ -372,10 +302,7 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
{/* Debounce Option */}
<div className="space-y-2">
<div className="flex flex-col gap-1.5">
- <Label
- htmlFor="debounce"
- className="text-sm font-medium text-foreground"
- >
+ <Label htmlFor="debounce" className="text-sm font-medium text-foreground">
Debounce Duration (ms)
</Label>
<div className="flex items-center gap-2">
@@ -385,19 +312,13 @@ export function ScriptBuilder({ siteId }: ScriptBuilderProps) {
min="0"
max="5000"
value={debounceValue}
- onChange={(e) =>
- setDebounceValue(parseInt(e.target.value) || 0)
- }
+ onChange={e => setDebounceValue(parseInt(e.target.value) || 0)}
className="max-w-[120px]"
/>
- <span className="text-xs text-muted-foreground">
- Default: 500ms
- </span>
+ <span className="text-xs text-muted-foreground">Default: 500ms</span>
</div>
</div>
- <p className="text-xs text-muted-foreground">
- Time to wait before tracking a pageview after URL changes
- </p>
+ <p className="text-xs text-muted-foreground">Time to wait before tracking a pageview after URL changes</p>
</div>
</div>
</div>
diff --git a/client/src/components/SiteSettings/SiteConfiguration.tsx b/client/src/components/SiteSettings/SiteConfiguration.tsx
index 0360844cc..f80d2ef6d 100644
--- a/client/src/components/SiteSettings/SiteConfiguration.tsx
+++ b/client/src/components/SiteSettings/SiteConfiguration.tsx
@@ -39,11 +39,7 @@ interface SiteConfigurationProps {
onClose?: () => void;
}
-export function SiteConfiguration({
- siteMetadata,
- disabled = false,
- onClose,
-}: SiteConfigurationProps) {
+export function SiteConfiguration({ siteMetadata, disabled = false, onClose }: SiteConfigurationProps) {
const { refetch } = useGetSitesFromOrg(siteMetadata?.organizationId ?? "");
const router = useRouter();
@@ -53,9 +49,7 @@ export function SiteConfiguration({
const [isChangingPublic, setIsChangingPublic] = useState(false);
const [isSalting, setIsSalting] = useState(siteMetadata.saltUserIds || false);
const [isChangingSalt, setIsChangingSalt] = useState(false);
- const [isBlockingBots, setIsBlockingBots] = useState(
- siteMetadata.blockBots || false
- );
+ const [isBlockingBots, setIsBlockingBots] = useState(siteMetadata.blockBots || false);
const [isChangingBlockBots, setIsChangingBlockBots] = useState(false);
const [isDeleting, setIsDeleting] = useState(false);
@@ -101,9 +95,7 @@ export function SiteConfiguration({
setIsChangingPublic(true);
await changeSitePublic(siteMetadata.siteId, checked);
setIsPublic(checked);
- toast.success(
- checked ? "Site analytics made public" : "Site analytics made private"
- );
+ toast.success(checked ? "Site analytics made public" : "Site analytics made private");
refetch();
} catch (error) {
console.error("Error changing public status:", error);
@@ -119,9 +111,7 @@ export function SiteConfiguration({
setIsChangingSalt(true);
await changeSiteSalt(siteMetadata.siteId, checked);
setIsSalting(checked);
- toast.success(
- checked ? "User ID salting enabled" : "User ID salting disabled"
- );
+ toast.success(checked ? "User ID salting enabled" : "User ID salting disabled");
refetch();
} catch (error) {
console.error("Error changing salt setting:", error);
@@ -153,10 +143,7 @@ export function SiteConfiguration({
{/* Public Analytics Section */}
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="publicAnalytics"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="publicAnalytics" className="text-sm font-medium text-foreground block">
Public Analytics
</Label>
<p className="text-xs text-muted-foreground mt-1">
@@ -174,15 +161,11 @@ export function SiteConfiguration({
{/* User ID Salting Section */}
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="saltUserIds"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="saltUserIds" className="text-sm font-medium text-foreground block">
Enable User ID Salting
</Label>
<p className="text-xs text-muted-foreground mt-1">
- When enabled, user IDs will be salted with a daily rotating key for
- enhanced privacy
+ When enabled, user IDs will be salted with a daily rotating key for enhanced privacy
</p>
</div>
<Switch
@@ -196,15 +179,11 @@ export function SiteConfiguration({
{/* Bot Blocking Section */}
<div className="flex items-center justify-between">
<div>
- <Label
- htmlFor="blockBots"
- className="text-sm font-medium text-foreground block"
- >
+ <Label htmlFor="blockBots" className="text-sm font-medium text-foreground block">
Block Bot Traffic
</Label>
<p className="text-xs text-muted-foreground mt-1">
- When enabled, traffic from known bots and crawlers will not be
- tracked
+ When enabled, traffic from known bots and crawlers will not be tracked
</p>
</div>
<Switch
@@ -221,25 +200,19 @@ export function SiteConfiguration({
{/* Domain Settings Section */}
<div className="space-y-3">
<div>
- <h4 className="text-sm font-semibold text-foreground">
- Change Domain
- </h4>
- <p className="text-xs text-muted-foreground">
- Update the domain for this site
- </p>
+ <h4 className="text-sm font-semibold text-foreground">Change Domain</h4>
+ <p className="text-xs text-muted-foreground">Update the domain for this site</p>
</div>
<div className="flex space-x-2">
<Input
value={newDomain}
- onChange={(e) => setNewDomain(e.target.value.toLowerCase())}
+ onChange={e => setNewDomain(e.target.value.toLowerCase())}
placeholder="example.com"
/>
<Button
variant="outline"
onClick={handleDomainChange}
- disabled={
- isChangingDomain || newDomain === siteMetadata.domain || disabled
- }
+ disabled={isChangingDomain || newDomain === siteMetadata.domain || disabled}
>
{isChangingDomain ? "Updating..." : "Update"}
</Button>
@@ -251,11 +224,7 @@ export function SiteConfiguration({
<h4 className="text-sm font-semibold text-destructive">Danger Zone</h4>
<AlertDialog>
<AlertDialogTrigger asChild>
- <Button
- variant="destructive"
- className="w-full"
- disabled={disabled}
- >
+ <Button variant="destructive" className="w-full" disabled={disabled}>
<AlertTriangle className="h-4 w-4 mr-2" />
Delete Site
</Button>
@@ -264,18 +233,13 @@ export function SiteConfiguration({
<AlertDialogHeader>
<AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
<AlertDialogDescription>
- This action cannot be undone. This will permanently delete the
- site &quot;{siteMetadata.name}&quot; and all of its analytics
- data.
+ This action cannot be undone. This will permanently delete the site &quot;{siteMetadata.name}&quot; and
+ all of its analytics data.
</AlertDialogDescription>
</AlertDialogHeader>
<AlertDialogFooter>
<AlertDialogCancel>Cancel</AlertDialogCancel>
- <AlertDialogAction
- onClick={handleDelete}
- disabled={isDeleting}
- variant="destructive"
- >
+ <AlertDialogAction onClick={handleDelete} disabled={isDeleting} variant="destructive">
{isDeleting ? "Deleting..." : "Yes, delete site"}
</AlertDialogAction>
</AlertDialogFooter>
diff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsx
index 6358a17a7..59f6a062d 100644
--- a/client/src/components/SiteSettings/SiteSettings.tsx
+++ b/client/src/components/SiteSettings/SiteSettings.tsx
@@ -22,13 +22,7 @@ import { ApiKeyManager } from "./ApiKeyManager";
import { ScriptBuilder } from "./ScriptBuilder";
import { SiteConfiguration } from "./SiteConfiguration";
-export function SiteSettings({
- siteId,
- trigger,
-}: {
- siteId: number;
- trigger?: React.ReactNode;
-}) {
+export function SiteSettings({ siteId, trigger }: { siteId: number; trigger?: React.ReactNode }) {
const { data: siteMetadata, isLoading, error } = useGetSite(siteId);
if (isLoading || !siteMetadata || error) {
@@ -38,17 +32,9 @@ export function SiteSettings({
return <SiteSettingsInner siteMetadata={siteMetadata} trigger={trigger} />;
}
-function SiteSettingsInner({
- siteMetadata,
- trigger,
-}: {
- siteMetadata: SiteResponse;
- trigger?: React.ReactNode;
-}) {
+function SiteSettingsInner({ siteMetadata, trigger }: { siteMetadata: SiteResponse; trigger?: React.ReactNode }) {
const { data: userOrganizationsData } = useUserOrganizations();
- const disabled =
- !userOrganizationsData?.[0]?.role ||
- userOrganizationsData?.[0]?.role === "member";
+ const disabled = !userOrganizationsData?.[0]?.role || userOrganizationsData?.[0]?.role === "member";
const [dialogOpen, setDialogOpen] = useState(false);
const [activeTab, setActiveTab] = useState("script");
@@ -69,9 +55,7 @@ function SiteSettingsInner({
<DialogContent className="sm:max-w-[500px]">
<DialogHeader>
<DialogTitle>Site Settings</DialogTitle>
- <DialogDescription>
- Manage settings for {siteMetadata.domain}
- </DialogDescription>
+ <DialogDescription>Manage settings for {siteMetadata.domain}</DialogDescription>
</DialogHeader>
<Tabs value={activeTab} onValueChange={setActiveTab} className="pb-4">
<TabsList className="grid w-full grid-cols-3">
@@ -80,26 +64,16 @@ function SiteSettingsInner({
<TabsTrigger value="settings">Site Settings</TabsTrigger>
</TabsList>
- <TabsContent
- value="script"
- className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto"
- >
+ <TabsContent value="script" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
<ScriptBuilder siteId={siteMetadata.siteId} />
</TabsContent>
- <TabsContent
- value="apikey"
- className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto"
- >
+ <TabsContent value="apikey" className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">
<ApiKeyManager siteId={siteMetadata.siteId} disabled={disabled} />
</TabsContent>
<TabsContent value="settings">
- <SiteConfiguration
- siteMetadata={siteMetadata}
- disabled={disabled}
- onClose={() => setDialogOpen(false)}
- />
+ <SiteConfiguration siteMetadata={siteMetadata} disabled={disabled} onClose={() => setDialogOpen(false)} />
</TabsContent>
</Tabs>
@@ -111,4 +85,4 @@ function SiteSettingsInner({
</DialogContent>
</Dialog>
);
-}
\ No newline at end of file
+}
diff --git a/client/src/components/SiteSettings/index.ts b/client/src/components/SiteSettings/index.ts
index 57f65c727..6c3eaae41 100644
--- a/client/src/components/SiteSettings/index.ts
+++ b/client/src/components/SiteSettings/index.ts
@@ -1,4 +1,4 @@
export { SiteSettings } from "./SiteSettings";
export { ScriptBuilder } from "./ScriptBuilder";
export { ApiKeyManager } from "./ApiKeyManager";
-export { SiteConfiguration } from "./SiteConfiguration";
\ No newline at end of file
+export { SiteConfiguration } from "./SiteConfiguration";
diff --git a/client/src/components/TooltipIcons/TooltipIcons.tsx b/client/src/components/TooltipIcons/TooltipIcons.tsx
index 3f6ad60a8..8b51b5344 100644
--- a/client/src/components/TooltipIcons/TooltipIcons.tsx
+++ b/client/src/components/TooltipIcons/TooltipIcons.tsx
@@ -7,13 +7,7 @@ import { getCountryName } from "../../lib/utils";
import { Tooltip, TooltipContent, TooltipTrigger } from "../ui/tooltip";
// DeviceIcon component for displaying mobile/desktop icons
-function DeviceIcon({
- deviceType,
- size = 16,
-}: {
- deviceType: string;
- size?: number;
-}) {
+function DeviceIcon({ deviceType, size = 16 }: { deviceType: string; size?: number }) {
const type = deviceType.toLowerCase();
if (type.includes("mobile") || type.includes("tablet")) {
@@ -34,11 +28,7 @@ export function CountryFlagTooltipIcon({
region: string;
className?: string;
}) {
- const getFullLocation = <
- T extends { country: string; city: string; region: string }
- >(
- session: T
- ) => {
+ const getFullLocation = <T extends { country: string; city: string; region: string }>(session: T) => {
let location = "";
if (session.city) {
location += `${session.city}, `;
@@ -139,9 +129,7 @@ export function DeviceTypeTooltipIcon({
<TooltipContent>
<p>
{device_type || "Unknown device"}
- {screen_width &&
- screen_height &&
- ` ${screen_width} x ${screen_height}`}
+ {screen_width && screen_height && ` ${screen_width} x ${screen_height}`}
</p>
</TooltipContent>
</Tooltip>
diff --git a/client/src/components/UsageChart.tsx b/client/src/components/UsageChart.tsx
index 423c0db0f..152f4a2aa 100644
--- a/client/src/components/UsageChart.tsx
+++ b/client/src/components/UsageChart.tsx
@@ -14,12 +14,7 @@ interface UsageChartProps {
timeZone?: string;
}
-export function UsageChart({
- organizationId,
- startDate,
- endDate,
- timeZone = "UTC",
-}: UsageChartProps) {
+export function UsageChart({ organizationId, startDate, endDate, timeZone = "UTC" }: UsageChartProps) {
const { width } = useWindowSize();
// Fetch the data inside the component
@@ -35,7 +30,7 @@ export function UsageChart({
const formattedData =
data?.data
- ?.map((e) => {
+ ?.map(e => {
// Parse timestamp properly - now it's a date instead of datetime
const timestamp = DateTime.fromSQL(e.event_date).toUTC();
@@ -50,7 +45,7 @@ export function UsageChart({
currentTime: timestamp,
};
})
- .filter((e) => e !== null) || [];
+ .filter(e => e !== null) || [];
const chartData = [
{
@@ -59,14 +54,12 @@ export function UsageChart({
},
];
- const maxValue = Math.max(...formattedData.map((d) => d.y), 1);
+ const maxValue = Math.max(...formattedData.map(d => d.y), 1);
if (isLoading) {
return (
<div className="h-48 flex items-center justify-center">
- <div className="text-sm text-muted-foreground">
- Loading usage data...
- </div>
+ <div className="text-sm text-muted-foreground">Loading usage data...</div>
</div>
);
}
@@ -74,9 +67,7 @@ export function UsageChart({
if (error) {
return (
<div className="h-48 flex items-center justify-center">
- <div className="text-sm text-muted-foreground">
- Failed to load usage data
- </div>
+ <div className="text-sm text-muted-foreground">Failed to load usage data</div>
</div>
);
}
@@ -112,7 +103,7 @@ export function UsageChart({
tickRotation: 0,
truncateTickAt: 0,
tickValues: Math.min(maxTicks, 10),
- format: (value) => {
+ format: value => {
const dt = DateTime.fromJSDate(value).setLocale(userLocale);
return dt.toFormat("MMM d");
},
diff --git a/client/src/components/auth/AuthButton.tsx b/client/src/components/auth/AuthButton.tsx
index 83f684dd3..397b730eb 100644
--- a/client/src/components/auth/AuthButton.tsx
+++ b/client/src/components/auth/AuthButton.tsx
@@ -10,14 +10,7 @@ interface AuthButtonProps {
className?: string;
onClick?: () => void;
type?: "button" | "submit" | "reset";
- variant?:
- | "default"
- | "destructive"
- | "outline"
- | "secondary"
- | "ghost"
- | "link"
- | "success";
+ variant?: "default" | "destructive" | "outline" | "secondary" | "ghost" | "link" | "success";
}
export function AuthButton({
@@ -30,13 +23,7 @@ export function AuthButton({
variant = "success",
}: AuthButtonProps) {
return (
- <Button
- type={type}
- className={`w-full ${className}`}
- disabled={isLoading}
- variant={variant}
- onClick={onClick}
- >
+ <Button type={type} className={`w-full ${className}`} disabled={isLoading} variant={variant} onClick={onClick}>
{isLoading ? loadingText : children}
</Button>
);
diff --git a/client/src/components/pagination.tsx b/client/src/components/pagination.tsx
index b68f948cf..9271dca0a 100644
--- a/client/src/components/pagination.tsx
+++ b/client/src/components/pagination.tsx
@@ -2,19 +2,8 @@
import { Table } from "@tanstack/react-table";
import { Button } from "@/components/ui/button";
-import {
- Select,
- SelectContent,
- SelectItem,
- SelectTrigger,
- SelectValue,
-} from "@/components/ui/select";
-import {
- ChevronLeft,
- ChevronRight,
- ChevronsLeft,
- ChevronsRight,
-} from "lucide-react";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
+import { ChevronLeft, ChevronRight, ChevronsLeft, ChevronsRight } from "lucide-react";
// Simplified pagination controller interface
interface PaginationController {
@@ -53,21 +42,13 @@ export function Pagination<TData>({
<>
Showing{" "}
<span className="font-semibold">
- {data?.items?.length
- ? pagination.pageIndex * pagination.pageSize + 1
- : 0}
+ {data?.items?.length ? pagination.pageIndex * pagination.pageSize + 1 : 0}
</span>{" "}
to{" "}
<span className="font-semibold">
- {data?.items?.length
- ? Math.min(
- (pagination.pageIndex + 1) * pagination.pageSize,
- data?.total || 0
- )
- : 0}
+ {data?.items?.length ? Math.min((pagination.pageIndex + 1) * pagination.pageSize, data?.total || 0) : 0}
</span>{" "}
- of <span className="font-semibold">{data?.total || 0}</span>{" "}
- {itemName}
+ of <span className="font-semibold">{data?.total || 0}</span> {itemName}
</>
)}
</div>
@@ -76,7 +57,7 @@ export function Pagination<TData>({
<span className="text-sm text-neutral-400">Page size:</span>
<Select
value={pagination.pageSize.toString()}
- onValueChange={(value) => {
+ onValueChange={value => {
setPagination({
pageIndex: 0, // Reset to first page when changing page size
pageSize: Number(value),
@@ -115,14 +96,8 @@ export function Pagination<TData>({
<span>Loading...</span>
) : (
<>
- Page{" "}
- <span className="font-semibold">
- {table.getState().pagination.pageIndex + 1}
- </span>{" "}
- of{" "}
- <span className="font-semibold">
- {Math.max(table.getPageCount(), 1)}
- </span>
+ Page <span className="font-semibold">{table.getState().pagination.pageIndex + 1}</span> of{" "}
+ <span className="font-semibold">{Math.max(table.getPageCount(), 1)}</span>
</>
)}
</div>
diff --git a/client/src/components/subscription/ExpiredTrialPlan.tsx b/client/src/components/subscription/ExpiredTrialPlan.tsx
index f47c84f4b..cf24900cb 100644
--- a/client/src/components/subscription/ExpiredTrialPlan.tsx
+++ b/client/src/components/subscription/ExpiredTrialPlan.tsx
@@ -2,14 +2,7 @@ import { AlertTriangle, ArrowRight } from "lucide-react";
import { useRouter } from "next/navigation";
import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
import { Button } from "../ui/button";
-import {
- Card,
- CardContent,
- CardDescription,
- CardFooter,
- CardHeader,
- CardTitle,
-} from "../ui/card";
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "../ui/card";
interface ExpiredTrialPlanProps {
message?: string;
@@ -18,8 +11,7 @@ interface ExpiredTrialPlanProps {
export function ExpiredTrialPlan({ message }: ExpiredTrialPlanProps) {
const router = useRouter();
- const defaultMessage =
- "Your 14-day free trial has ended. You need to subscribe to continue tracking visits again.";
+ const defaultMessage = "Your 14-day free trial has ended. You need to subscribe to continue tracking visits again.";
return (
<div className="space-y-6">
@@ -27,8 +19,7 @@ export function ExpiredTrialPlan({ message }: ExpiredTrialPlanProps) {
<CardHeader>
<CardTitle>Trial Expired</CardTitle>
<CardDescription>
- Your free trial has expired. Subscribe to a plan to continue
- tracking visits again.
+ Your free trial has expired. Subscribe to a plan to continue tracking visits again.
</CardDescription>
</CardHeader>
<CardContent>
diff --git a/client/src/components/subscription/ProPlan.tsx b/client/src/components/subscription/ProPlan.tsx
index 23437b64b..dd41ec908 100644
--- a/client/src/components/subscription/ProPlan.tsx
+++ b/client/src/components/subscription/ProPlan.tsx
@@ -14,12 +14,7 @@ import { UsageChart } from "../UsageChart";
import { authClient } from "@/lib/auth";
export function ProPlan() {
- const {
- data: activeSubscription,
- isLoading,
- error: subscriptionError,
- refetch,
- } = useStripeSubscription();
+ const { data: activeSubscription, isLoading, error: subscriptionError, refetch } = useStripeSubscription();
const { data: activeOrg } = authClient.useActiveOrganization();
@@ -35,13 +30,10 @@ export function ProPlan() {
const eventLimit = activeSubscription?.eventLimit || 0;
const currentUsage = activeSubscription?.monthlyEventCount || 0;
- const usagePercentage =
- eventLimit > 0 ? Math.min((currentUsage / eventLimit) * 100, 100) : 0;
+ const usagePercentage = eventLimit > 0 ? Math.min((currentUsage / eventLimit) * 100, 100) : 0;
const isAnnualPlan = activeSubscription?.interval === "year";
- const stripePlan = getStripePrices().find(
- (p) => p.name === activeSubscription?.planName
- );
+ const stripePlan = getStripePrices().find(p => p.name === activeSubscription?.planName);
const currentPlanDetails = activeSubscription
? {
@@ -51,8 +43,7 @@ export function ProPlan() {
interval: stripePlan?.interval,
description: "Advanced analytics for growing projects",
features: ["5 year data retention", "Priority support"],
- color:
- "bg-gradient-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",
+ color: "bg-gradient-to-br from-green-50 to-emerald-100 dark:from-green-800 dark:to-emerald-800",
icon: <Shield className="h-5 w-5" />,
}
: null;
@@ -66,21 +57,18 @@ export function ProPlan() {
setActionError(null);
setIsProcessing(true);
try {
- const response = await fetch(
- `${BACKEND_URL}/stripe/create-portal-session`,
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- credentials: "include",
- body: JSON.stringify({
- returnUrl: window.location.href,
- organizationId,
- flowType,
- }),
- }
- );
+ const response = await fetch(`${BACKEND_URL}/stripe/create-portal-session`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ credentials: "include",
+ body: JSON.stringify({
+ returnUrl: window.location.href,
+ organizationId,
+ flowType,
+ }),
+ });
const data = await response.json();
@@ -104,14 +92,11 @@ export function ProPlan() {
const handleChangePlan = () => createPortalSession("subscription_update");
const handleViewSubscription = () => createPortalSession();
- const handleCancelSubscription = () =>
- createPortalSession("subscription_cancel");
+ const handleCancelSubscription = () => createPortalSession("subscription_cancel");
const getFormattedPrice = () => {
if (!currentPlanDetails) return "$0/month";
- return `${currentPlanDetails.price}/${
- currentPlanDetails.interval === "year" ? "year" : "month"
- }`;
+ return `${currentPlanDetails.price}/${currentPlanDetails.interval === "year" ? "year" : "month"}`;
};
const formatRenewalDate = () => {
@@ -122,9 +107,7 @@ export function ProPlan() {
return `Cancels on ${formattedDate}`;
}
if (activeSubscription.status === "active") {
- return isAnnualPlan
- ? `Renews annually on ${formattedDate}`
- : `Renews monthly on ${formattedDate}`;
+ return isAnnualPlan ? `Renews annually on ${formattedDate}` : `Renews monthly on ${formattedDate}`;
}
return `Status: ${activeSubscription.status}, ends/renews ${formattedDate}`;
};
@@ -141,32 +124,20 @@ export function ProPlan() {
<div className="space-y-6 mt-3 p-2">
<div className="flex justify-between items-start">
<div className="space-y-1">
- <p className="text-3xl font-bold">
- {currentPlanDetails?.name || activeSubscription.planName}
- </p>
+ <p className="text-3xl font-bold">{currentPlanDetails?.name || activeSubscription.planName}</p>
<p className="text text-gray-300">{getFormattedPrice()}</p>
{isAnnualPlan && (
<div className="mt-2 text-sm text-emerald-400">
<p>You save by paying annually (2 months free)</p>
</div>
)}
- <p className="text-neutral-400 text-sm">
- {formatRenewalDate()}
- </p>
+ <p className="text-neutral-400 text-sm">{formatRenewalDate()}</p>
</div>
<div className="space-x-2">
- <Button
- variant="success"
- onClick={handleChangePlan}
- disabled={isProcessing}
- >
+ <Button variant="success" onClick={handleChangePlan} disabled={isProcessing}>
{isProcessing ? "Processing..." : "Change Plan"}
</Button>
- <Button
- variant="outline"
- onClick={handleViewSubscription}
- disabled={isProcessing}
- >
+ <Button variant="outline" onClick={handleViewSubscription} disabled={isProcessing}>
View Details
</Button>
</div>
@@ -179,8 +150,7 @@ export function ProPlan() {
<div className="flex justify-between mb-1">
<span className="text-sm">Events</span>
<span className="text-sm">
- {currentUsage.toLocaleString()} /{" "}
- {eventLimit.toLocaleString()}
+ {currentUsage.toLocaleString()} / {eventLimit.toLocaleString()}
</span>
</div>
<Progress value={usagePercentage} />
@@ -190,15 +160,9 @@ export function ProPlan() {
<div className="mt-4 p-3 bg-amber-50 dark:bg-amber-900/20 rounded-md border border-amber-200 dark:border-amber-800">
<div className="flex items-center justify-between">
<p className="text-sm text-amber-700 dark:text-amber-300">
- <strong>Usage limit reached!</strong> You've exceeded
- your plan's event limit.
+ <strong>Usage limit reached!</strong> You've exceeded your plan's event limit.
</p>
- <Button
- variant="success"
- size="sm"
- onClick={handleChangePlan}
- disabled={isProcessing}
- >
+ <Button variant="success" size="sm" onClick={handleChangePlan} disabled={isProcessing}>
Upgrade Plan
</Button>
</div>
@@ -209,23 +173,16 @@ export function ProPlan() {
{organizationId && (
<div className="space-y-2">
- <h3 className="font-medium text-sm text-neutral-400 mb-2">
- Last 30 Days
- </h3>
- <UsageChart
- organizationId={organizationId}
- startDate={startDate}
- endDate={endDate}
- />
+ <h3 className="font-medium text-sm text-neutral-400 mb-2">Last 30 Days</h3>
+ <UsageChart organizationId={organizationId} startDate={startDate} endDate={endDate} />
</div>
)}
{isAnnualPlan && (
<div className="pt-2 pb-0 px-3 bg-emerald-50 dark:bg-emerald-900/20 rounded-md border border-emerald-100 dark:border-emerald-800">
<p className="text-sm text-emerald-700 dark:text-emerald-300 py-2">
- <strong>Annual Billing:</strong> You're on annual billing
- which saves you money compared to monthly billing. Your
- subscription will renew once per year on{" "}
+ <strong>Annual Billing:</strong> You're on annual billing which saves you money compared to monthly
+ billing. Your subscription will renew once per year on{" "}
{formatDate(activeSubscription.currentPeriodEnd)}.
</p>
</div>
diff --git a/client/src/components/subscription/TrialPlan.tsx b/client/src/components/subscription/TrialPlan.tsx
index dc384df9e..aa766ec5b 100644
--- a/client/src/components/subscription/TrialPlan.tsx
+++ b/client/src/components/subscription/TrialPlan.tsx
@@ -2,25 +2,14 @@ import { ArrowRight, Clock } from "lucide-react";
import { useRouter } from "next/navigation";
import { Alert, AlertDescription, AlertTitle } from "../ui/alert";
import { Button } from "../ui/button";
-import {
- Card,
- CardContent,
- CardDescription,
- CardFooter,
- CardHeader,
- CardTitle,
-} from "../ui/card";
+import { Card, CardContent, CardDescription, CardFooter, CardHeader, CardTitle } from "../ui/card";
import { Progress } from "../ui/progress";
import { TRIAL_EVENT_LIMIT } from "../../lib/subscription/constants";
import { formatDate } from "../../lib/subscription/planUtils";
import { useStripeSubscription } from "../../lib/subscription/useStripeSubscription";
export function TrialPlan() {
- const {
- data: activeSubscription,
- isLoading,
- error: subscriptionError,
- } = useStripeSubscription();
+ const { data: activeSubscription, isLoading, error: subscriptionError } = useStripeSubscription();
const router = useRouter();
@@ -28,9 +17,7 @@ export function TrialPlan() {
const currentUsage = activeSubscription?.monthlyEventCount || 0;
const daysRemaining = activeSubscription?.trialDaysRemaining || 0;
- const trialEndDate = activeSubscription?.currentPeriodEnd
- ? new Date(activeSubscription.currentPeriodEnd)
- : null;
+ const trialEndDate = activeSubscription?.currentPeriodEnd ? new Date(activeSubscription.currentPeriodEnd) : null;
return (
<div className="space-y-6">
@@ -39,10 +26,7 @@ export function TrialPlan() {
<CardTitle className="flex items-center">
Trial Plan <Clock className="ml-2 h-5 w-5 text-blue-500" />
</CardTitle>
- <CardDescription>
- You are currently on a 14-day free trial with up to 1,000,000
- events.
- </CardDescription>
+ <CardDescription>You are currently on a 14-day free trial with up to 1,000,000 events.</CardDescription>
</CardHeader>
<CardContent>
<div className="space-y-6 p-2">
@@ -56,10 +40,7 @@ export function TrialPlan() {
{trialEndDate && <> on {formatDate(trialEndDate)}</>}
</>
) : (
- <>
- Your trial ends today. Subscribe to continue tracking visits
- again.
- </>
+ <>Your trial ends today. Subscribe to continue tracking visits again.</>
)}
</AlertDescription>
</Alert>
@@ -71,16 +52,10 @@ export function TrialPlan() {
<div className="flex justify-between mb-1">
<span className="text-sm">Events</span>
<span className="text-sm">
- {currentUsage.toLocaleString()} /{" "}
- {TRIAL_EVENT_LIMIT.toLocaleString()}
+ {currentUsage.toLocaleString()} / {TRIAL_EVENT_LIMIT.toLocaleString()}
</span>
</div>
- <Progress
- value={Math.min(
- (currentUsage / TRIAL_EVENT_LIMIT) * 100,
- 100
- )}
- />
+ <Progress value={Math.min((currentUsage / TRIAL_EVENT_LIMIT) * 100, 100)} />
</div>
</div>
</div>
diff --git a/client/src/components/ui/activity-slider.tsx b/client/src/components/ui/activity-slider.tsx
index a8d15dd5c..4a6dcd7fb 100644
--- a/client/src/components/ui/activity-slider.tsx
+++ b/client/src/components/ui/activity-slider.tsx
@@ -10,101 +10,97 @@ interface ActivityPeriod {
end: number;
}
-interface ActivitySliderProps
- extends React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> {
+interface ActivitySliderProps extends React.ComponentPropsWithoutRef<typeof SliderPrimitive.Root> {
activityPeriods?: ActivityPeriod[];
duration?: number;
events?: Array<{ timestamp: number; type: string | number }>;
}
-const ActivitySlider = React.forwardRef<
- React.ElementRef<typeof SliderPrimitive.Root>,
- ActivitySliderProps
->(({ className, activityPeriods = [], duration = 100, events = [], ...props }, ref) => {
- const firstEventTime = events.length > 0 ? events[0].timestamp : 0;
-
- return (
- <div className="w-full">
- {/* Event Timeline */}
- <div className="relative h-6 w-full mb-2">
- {events.map((event, index) => {
- const relativeTime = event.timestamp - firstEventTime;
- const position = duration > 0 ? (relativeTime / duration) * 100 : 0;
-
- // Different colors for different event types
- const getEventColor = (type: string | number) => {
- const eventType = parseInt(type.toString());
- switch (eventType) {
- case 2: return "bg-blue-500"; // FullSnapshot
- case 3: return "bg-yellow-500"; // IncrementalSnapshot
- case 4: return "bg-purple-500"; // Meta
- default: return "bg-gray-500";
- }
- };
-
- // Calculate margins to prevent overflow
- // Event bubble is 8px (w-2), so we need 4px margin on each side
- // This translates to approximately 0.5% margin on typical screen widths
- const leftMargin = 0.5;
- const rightMargin = 0.5;
- const constrainedPosition = Math.max(leftMargin, Math.min(100 - rightMargin, position));
-
- return (
- <div
- key={index}
- className={cn(
- "absolute w-2 h-2 rounded-full transform -translate-x-1/2",
- getEventColor(event.type)
- )}
- style={{
- left: `${constrainedPosition}%`,
- top: "50%",
- transform: "translate(-50%, -50%)",
- }}
- title={`Event ${event.type} at ${new Date(event.timestamp).toLocaleTimeString()}`}
- />
- );
- })}
- </div>
-
- {/* Activity Slider */}
- <SliderPrimitive.Root
- ref={ref}
- className={cn(
- "relative flex w-full touch-none select-none items-center",
- className
- )}
- {...props}
- >
- <SliderPrimitive.Track className="relative h-1.5 w-full grow overflow-hidden rounded-full bg-neutral-800">
- {/* Inactive background */}
- <div className="absolute h-full w-full bg-neutral-700" />
-
- {/* Activity periods */}
- {activityPeriods.map((period, index) => {
- const startPercent = duration > 0 ? (period.start / duration) * 100 : 0;
- const widthPercent = duration > 0 ? ((period.end - period.start) / duration) * 100 : 0;
-
+const ActivitySlider = React.forwardRef<React.ElementRef<typeof SliderPrimitive.Root>, ActivitySliderProps>(
+ ({ className, activityPeriods = [], duration = 100, events = [], ...props }, ref) => {
+ const firstEventTime = events.length > 0 ? events[0].timestamp : 0;
+
+ return (
+ <div className="w-full">
+ {/* Event Timeline */}
+ <div className="relative h-6 w-full mb-2">
+ {events.map((event, index) => {
+ const relativeTime = event.timestamp - firstEventTime;
+ const position = duration > 0 ? (relativeTime / duration) * 100 : 0;
+
+ // Different colors for different event types
+ const getEventColor = (type: string | number) => {
+ const eventType = parseInt(type.toString());
+ switch (eventType) {
+ case 2:
+ return "bg-blue-500"; // FullSnapshot
+ case 3:
+ return "bg-yellow-500"; // IncrementalSnapshot
+ case 4:
+ return "bg-purple-500"; // Meta
+ default:
+ return "bg-gray-500";
+ }
+ };
+
+ // Calculate margins to prevent overflow
+ // Event bubble is 8px (w-2), so we need 4px margin on each side
+ // This translates to approximately 0.5% margin on typical screen widths
+ const leftMargin = 0.5;
+ const rightMargin = 0.5;
+ const constrainedPosition = Math.max(leftMargin, Math.min(100 - rightMargin, position));
+
return (
<div
key={index}
- className="absolute h-full bg-neutral-600"
+ className={cn("absolute w-2 h-2 rounded-full transform -translate-x-1/2", getEventColor(event.type))}
style={{
- left: `${startPercent}%`,
- width: `${widthPercent}%`,
+ left: `${constrainedPosition}%`,
+ top: "50%",
+ transform: "translate(-50%, -50%)",
}}
+ title={`Event ${event.type} at ${new Date(event.timestamp).toLocaleTimeString()}`}
/>
);
})}
-
- {/* Progress range */}
- <SliderPrimitive.Range className="absolute h-full bg-green-500" />
- </SliderPrimitive.Track>
- <SliderPrimitive.Thumb className="block h-4 w-4 rounded-full border border-green-500 bg-white shadow transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-green-500 disabled:pointer-events-none disabled:opacity-50 dark:border-green-500 dark:bg-white" />
- </SliderPrimitive.Root>
- </div>
- );
-});
+ </div>
+
+ {/* Activity Slider */}
+ <SliderPrimitive.Root
+ ref={ref}
+ className={cn("relative flex w-full touch-none select-none items-center", className)}
+ {...props}
+ >
+ <SliderPrimitive.Track className="relative h-1.5 w-full grow overflow-hidden rounded-full bg-neutral-800">
+ {/* Inactive background */}
+ <div className="absolute h-full w-full bg-neutral-700" />
+
+ {/* Activity periods */}
+ {activityPeriods.map((period, index) => {
+ const startPercent = duration > 0 ? (period.start / duration) * 100 : 0;
+ const widthPercent = duration > 0 ? ((period.end - period.start) / duration) * 100 : 0;
+
+ return (
+ <div
+ key={index}
+ className="absolute h-full bg-neutral-600"
+ style={{
+ left: `${startPercent}%`,
+ width: `${widthPercent}%`,
+ }}
+ />
+ );
+ })}
+
+ {/* Progress range */}
+ <SliderPrimitive.Range className="absolute h-full bg-green-500" />
+ </SliderPrimitive.Track>
+ <SliderPrimitive.Thumb className="block h-4 w-4 rounded-full border border-green-500 bg-white shadow transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-green-500 disabled:pointer-events-none disabled:opacity-50 dark:border-green-500 dark:bg-white" />
+ </SliderPrimitive.Root>
+ </div>
+ );
+ }
+);
ActivitySlider.displayName = "ActivitySlider";
-export { ActivitySlider };
\ No newline at end of file
+export { ActivitySlider };
diff --git a/client/src/components/ui/alert-dialog.tsx b/client/src/components/ui/alert-dialog.tsx
index 5ce8f099e..410db886a 100644
--- a/client/src/components/ui/alert-dialog.tsx
+++ b/client/src/components/ui/alert-dialog.tsx
@@ -45,31 +45,13 @@ const AlertDialogContent = React.forwardRef<
));
AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
-const AlertDialogHeader = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-2 text-center sm:text-left",
- className
- )}
- {...props}
- />
+const AlertDialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col space-y-2 text-center sm:text-left", className)} {...props} />
);
AlertDialogHeader.displayName = "AlertDialogHeader";
-const AlertDialogFooter = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
+const AlertDialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)} {...props} />
);
AlertDialogFooter.displayName = "AlertDialogFooter";
@@ -77,11 +59,7 @@ const AlertDialogTitle = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Title>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title>
>(({ className, ...props }, ref) => (
- <AlertDialogPrimitive.Title
- ref={ref}
- className={cn("text-lg font-semibold", className)}
- {...props}
- />
+ <AlertDialogPrimitive.Title ref={ref} className={cn("text-lg font-semibold", className)} {...props} />
));
AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
@@ -95,28 +73,15 @@ const AlertDialogDescription = React.forwardRef<
{...props}
/>
));
-AlertDialogDescription.displayName =
- AlertDialogPrimitive.Description.displayName;
+AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName;
const AlertDialogAction = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Action>,
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> & {
- variant?:
- | "default"
- | "destructive"
- | "outline"
- | "secondary"
- | "ghost"
- | "link"
- | "accent"
- | "warning";
+ variant?: "default" | "destructive" | "outline" | "secondary" | "ghost" | "link" | "accent" | "warning";
}
>(({ className, variant = "default", ...props }, ref) => (
- <AlertDialogPrimitive.Action
- ref={ref}
- className={cn(buttonVariants({ variant }), className)}
- {...props}
- />
+ <AlertDialogPrimitive.Action ref={ref} className={cn(buttonVariants({ variant }), className)} {...props} />
));
AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
@@ -126,11 +91,7 @@ const AlertDialogCancel = React.forwardRef<
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Cancel
ref={ref}
- className={cn(
- buttonVariants({ variant: "outline" }),
- "mt-2 sm:mt-0",
- className
- )}
+ className={cn(buttonVariants({ variant: "outline" }), "mt-2 sm:mt-0", className)}
{...props}
/>
));
diff --git a/client/src/components/ui/alert.tsx b/client/src/components/ui/alert.tsx
index 8d50266f5..031aabfdd 100644
--- a/client/src/components/ui/alert.tsx
+++ b/client/src/components/ui/alert.tsx
@@ -8,8 +8,7 @@ const alertVariants = cva(
{
variants: {
variant: {
- default:
- "bg-white text-neutral-950 dark:bg-neutral-950 dark:text-neutral-50",
+ default: "bg-white text-neutral-950 dark:bg-neutral-950 dark:text-neutral-50",
destructive:
"border-red-500/50 text-red-500 dark:border-red-500 [&>svg]:text-red-500 dark:bg-red-950/70 dark:border-red-900/50 dark:text-red-400 dark:dark:border-red-900 dark:[&>svg]:text-red-400",
},
@@ -24,37 +23,22 @@ const Alert = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement> & VariantProps<typeof alertVariants>
>(({ className, variant, ...props }, ref) => (
- <div
- ref={ref}
- role="alert"
- className={cn(alertVariants({ variant }), className)}
- {...props}
- />
+ <div ref={ref} role="alert" className={cn(alertVariants({ variant }), className)} {...props} />
));
Alert.displayName = "Alert";
-const AlertTitle = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
- <h5
- ref={ref}
- className={cn("mb-1 font-medium leading-none tracking-tight", className)}
- {...props}
- />
-));
+const AlertTitle = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLHeadingElement>>(
+ ({ className, ...props }, ref) => (
+ <h5 ref={ref} className={cn("mb-1 font-medium leading-none tracking-tight", className)} {...props} />
+ )
+);
AlertTitle.displayName = "AlertTitle";
-const AlertDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("text-sm [&_p]:leading-relaxed", className)}
- {...props}
- />
-));
+const AlertDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("text-sm [&_p]:leading-relaxed", className)} {...props} />
+ )
+);
AlertDescription.displayName = "AlertDescription";
export { Alert, AlertTitle, AlertDescription };
diff --git a/client/src/components/ui/badge.tsx b/client/src/components/ui/badge.tsx
index 4f0887312..b0eddf436 100644
--- a/client/src/components/ui/badge.tsx
+++ b/client/src/components/ui/badge.tsx
@@ -18,19 +18,16 @@ const badgeVariants = cva(
"border-transparent bg-yellow-500/10 text-yellow-700 hover:bg-yellow-500/20 dark:bg-yellow-500/20 dark:text-yellow-400 dark:hover:bg-yellow-500/30",
success:
"border-transparent bg-green-500/10 text-green-700 hover:bg-green-500/20 dark:bg-green-500/20 dark:text-green-400 dark:hover:bg-green-500/30",
- info:
- "border-transparent bg-blue-500/10 text-blue-700 hover:bg-blue-500/20 dark:bg-blue-500/20 dark:text-blue-400 dark:hover:bg-blue-500/30",
- outline:
+ info: "border-transparent bg-blue-500/10 text-blue-700 hover:bg-blue-500/20 dark:bg-blue-500/20 dark:text-blue-400 dark:hover:bg-blue-500/30",
+ outline:
"border-neutral-300 bg-transparent text-neutral-700 hover:bg-neutral-50 dark:border-neutral-700 dark:text-neutral-300 dark:hover:bg-neutral-800",
ghost:
"border-transparent bg-transparent text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-800",
// Legacy variants for backwards compatibility
green:
"border-transparent bg-green-500/10 text-green-700 hover:bg-green-500/20 dark:bg-green-500/20 dark:text-green-400 dark:hover:bg-green-500/30",
- red:
- "border-transparent bg-red-500/10 text-red-600 hover:bg-red-500/20 dark:bg-red-500/20 dark:text-red-400 dark:hover:bg-red-500/30",
- minimal:
- "border-transparent bg-neutral-200/50 text-neutral-600 dark:bg-neutral-800 dark:text-neutral-400",
+ red: "border-transparent bg-red-500/10 text-red-600 hover:bg-red-500/20 dark:bg-red-500/20 dark:text-red-400 dark:hover:bg-red-500/30",
+ minimal: "border-transparent bg-neutral-200/50 text-neutral-600 dark:bg-neutral-800 dark:text-neutral-400",
},
},
defaultVariants: {
@@ -39,14 +36,10 @@ const badgeVariants = cva(
}
);
-export interface BadgeProps
- extends React.HTMLAttributes<HTMLDivElement>,
- VariantProps<typeof badgeVariants> {}
+export interface BadgeProps extends React.HTMLAttributes<HTMLDivElement>, VariantProps<typeof badgeVariants> {}
function Badge({ className, variant, ...props }: BadgeProps) {
- return (
- <div className={cn(badgeVariants({ variant }), className)} {...props} />
- );
+ return <div className={cn(badgeVariants({ variant }), className)} {...props} />;
}
export { Badge, badgeVariants };
diff --git a/client/src/components/ui/basic-tabs.tsx b/client/src/components/ui/basic-tabs.tsx
index 5f76a0c8c..4b81e2d34 100644
--- a/client/src/components/ui/basic-tabs.tsx
+++ b/client/src/components/ui/basic-tabs.tsx
@@ -13,10 +13,7 @@ const TabsList = React.forwardRef<
>(({ className, ...props }, ref) => (
<TabsPrimitive.List
ref={ref}
- className={cn(
- "inline-flex h-8 items-center justify-start space-x-3",
- className
- )}
+ className={cn("inline-flex h-8 items-center justify-start space-x-3", className)}
{...props}
/>
));
diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsx
index 8b5b3064c..8e75b07c6 100644
--- a/client/src/components/ui/button.tsx
+++ b/client/src/components/ui/button.tsx
@@ -52,13 +52,7 @@ export interface ButtonProps
const Button = React.forwardRef<HTMLButtonElement, ButtonProps>(
({ className, variant, size, asChild = false, ...props }, ref) => {
const Comp = asChild ? Slot : "button";
- return (
- <Comp
- className={cn(buttonVariants({ variant, size, className }))}
- ref={ref}
- {...props}
- />
- );
+ return <Comp className={cn(buttonVariants({ variant, size, className }))} ref={ref} {...props} />;
}
);
Button.displayName = "Button";
diff --git a/client/src/components/ui/calendar.tsx b/client/src/components/ui/calendar.tsx
index cc966e8be..e34956491 100644
--- a/client/src/components/ui/calendar.tsx
+++ b/client/src/components/ui/calendar.tsx
@@ -9,12 +9,7 @@ import { cn } from "@/lib/utils";
export type CalendarProps = React.ComponentProps<typeof DayPicker>;
-function Calendar({
- className,
- classNames,
- showOutsideDays = true,
- ...props
-}: CalendarProps) {
+function Calendar({ className, classNames, showOutsideDays = true, ...props }: CalendarProps) {
return (
<DayPicker
showOutsideDays={showOutsideDays}
@@ -33,8 +28,7 @@ function Calendar({
nav_button_next: "absolute right-1",
table: "w-full border-collapse space-y-1",
head_row: "flex",
- head_cell:
- "text-neutral-500 rounded-md w-8 font-normal text-[0.8rem] dark:text-neutral-400",
+ head_cell: "text-neutral-500 rounded-md w-8 font-normal text-[0.8rem] dark:text-neutral-400",
row: "flex w-full mt-2",
cell: cn(
"relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-neutral-100 [&:has([aria-selected].day-outside)]:bg-neutral-100/50 [&:has([aria-selected].day-range-end)]:rounded-r-md dark:[&:has([aria-selected])]:bg-neutral-800 dark:[&:has([aria-selected].day-outside)]:bg-neutral-800/50",
@@ -42,16 +36,12 @@ function Calendar({
? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
: "[&:has([aria-selected])]:rounded-md"
),
- day: cn(
- buttonVariants({ variant: "ghost" }),
- "h-8 w-8 p-0 font-normal aria-selected:opacity-100"
- ),
+ day: cn(buttonVariants({ variant: "ghost" }), "h-8 w-8 p-0 font-normal aria-selected:opacity-100"),
day_range_start: "day-range-start",
day_range_end: "day-range-end",
day_selected:
"bg-neutral-900 text-neutral-50 hover:bg-neutral-900 hover:text-neutral-50 focus:bg-neutral-900 focus:text-neutral-50 dark:bg-neutral-50 dark:text-neutral-900 dark:hover:bg-neutral-50 dark:hover:text-neutral-900 dark:focus:bg-neutral-50 dark:focus:text-neutral-900",
- day_today:
- "bg-neutral-100 text-neutral-900 dark:bg-neutral-800 dark:text-neutral-50",
+ day_today: "bg-neutral-100 text-neutral-900 dark:bg-neutral-800 dark:text-neutral-50",
day_outside:
"day-outside text-neutral-500 aria-selected:bg-neutral-100/50 aria-selected:text-neutral-500 dark:text-neutral-400 dark:aria-selected:bg-neutral-800/50 dark:aria-selected:text-neutral-400",
day_disabled: "text-neutral-500 opacity-50 dark:text-neutral-400",
@@ -61,12 +51,8 @@ function Calendar({
...classNames,
}}
components={{
- IconLeft: ({ className, ...props }) => (
- <ChevronLeft className={cn("h-4 w-4", className)} {...props} />
- ),
- IconRight: ({ className, ...props }) => (
- <ChevronRight className={cn("h-4 w-4", className)} {...props} />
- ),
+ IconLeft: ({ className, ...props }) => <ChevronLeft className={cn("h-4 w-4", className)} {...props} />,
+ IconRight: ({ className, ...props }) => <ChevronRight className={cn("h-4 w-4", className)} {...props} />,
}}
{...props}
/>
diff --git a/client/src/components/ui/card.tsx b/client/src/components/ui/card.tsx
index 09ae794e9..c46cc7659 100644
--- a/client/src/components/ui/card.tsx
+++ b/client/src/components/ui/card.tsx
@@ -6,10 +6,7 @@ import "ldrs/react/Zoomies.css";
import * as React from "react";
// Default values shown
-const Card = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
+const Card = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(({ className, ...props }, ref) => (
<div
ref={ref}
className={cn(
@@ -21,90 +18,48 @@ const Card = React.forwardRef<
));
Card.displayName = "Card";
-const CardLoader = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
- return (
- <div className="mt-[-15px] absolute top-0 left-0 w-full">
- <Zoomies
- size={1400}
- stroke="3"
- bg-opacity="0.1"
- speed="1.4"
- color="hsl(var(--neutral-400))"
- />
- </div>
- );
-});
+const CardLoader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => {
+ return (
+ <div className="mt-[-15px] absolute top-0 left-0 w-full">
+ <Zoomies size={1400} stroke="3" bg-opacity="0.1" speed="1.4" color="hsl(var(--neutral-400))" />
+ </div>
+ );
+ }
+);
CardLoader.displayName = "CardLoader";
-const CardHeader = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("flex flex-col space-y-1.5 p-4", className)}
- {...props}
- />
-));
+const CardHeader = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("flex flex-col space-y-1.5 p-4", className)} {...props} />
+ )
+);
CardHeader.displayName = "CardHeader";
-const CardTitle = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("font-semibold leading-none tracking-tight", className)}
- {...props}
- />
-));
+const CardTitle = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("font-semibold leading-none tracking-tight", className)} {...props} />
+ )
+);
CardTitle.displayName = "CardTitle";
-const CardDescription = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("text-sm text-neutral-500 dark:text-neutral-400", className)}
- {...props}
- />
-));
+const CardDescription = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("text-sm text-neutral-500 dark:text-neutral-400", className)} {...props} />
+ )
+);
CardDescription.displayName = "CardDescription";
-const CardContent = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("relative p-4 pt-0 transition-all duration-300 ", className)}
- {...props}
- />
-));
+const CardContent = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => (
+ <div ref={ref} className={cn("relative p-4 pt-0 transition-all duration-300 ", className)} {...props} />
+ )
+);
CardContent.displayName = "CardContent";
-const CardFooter = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => (
- <div
- ref={ref}
- className={cn("flex items-center p-4 pt-0", className)}
- {...props}
- />
-));
+const CardFooter = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => <div ref={ref} className={cn("flex items-center p-4 pt-0", className)} {...props} />
+);
CardFooter.displayName = "CardFooter";
-export {
- Card,
- CardContent,
- CardDescription,
- CardFooter,
- CardHeader,
- CardLoader,
- CardTitle,
-};
+export { Card, CardContent, CardDescription, CardFooter, CardHeader, CardLoader, CardTitle };
diff --git a/client/src/components/ui/command.tsx b/client/src/components/ui/command.tsx
index 17169047a..32a28ecbd 100644
--- a/client/src/components/ui/command.tsx
+++ b/client/src/components/ui/command.tsx
@@ -51,7 +51,10 @@ function CommandDialog({
function CommandInput({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Input>) {
return (
- <div data-slot="command-input-wrapper" className="flex h-9 items-center gap-2 border-b border-neutral-200 px-3 dark:border-neutral-800">
+ <div
+ data-slot="command-input-wrapper"
+ className="flex h-9 items-center gap-2 border-b border-neutral-200 px-3 dark:border-neutral-800"
+ >
<SearchIcon className="h-4 w-4 shrink-0 opacity-50" />
<CommandPrimitive.Input
data-slot="command-input"
@@ -76,7 +79,13 @@ function CommandList({ className, ...props }: React.ComponentProps<typeof Comman
}
function CommandEmpty({ ...props }: React.ComponentProps<typeof CommandPrimitive.Empty>) {
- return <CommandPrimitive.Empty data-slot="command-empty" className="py-6 text-center text-sm text-neutral-500 dark:text-neutral-400" {...props} />;
+ return (
+ <CommandPrimitive.Empty
+ data-slot="command-empty"
+ className="py-6 text-center text-sm text-neutral-500 dark:text-neutral-400"
+ {...props}
+ />
+ );
}
function CommandGroup({ className, ...props }: React.ComponentProps<typeof CommandPrimitive.Group>) {
diff --git a/client/src/components/ui/dialog.tsx b/client/src/components/ui/dialog.tsx
index 7e881fce1..a56c82470 100644
--- a/client/src/components/ui/dialog.tsx
+++ b/client/src/components/ui/dialog.tsx
@@ -53,31 +53,13 @@ const DialogContent = React.forwardRef<
));
DialogContent.displayName = DialogPrimitive.Content.displayName;
-const DialogHeader = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-1.5 text-center sm:text-left",
- className
- )}
- {...props}
- />
+const DialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col space-y-1.5 text-center sm:text-left", className)} {...props} />
);
DialogHeader.displayName = "DialogHeader";
-const DialogFooter = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
+const DialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)} {...props} />
);
DialogFooter.displayName = "DialogFooter";
@@ -87,10 +69,7 @@ const DialogTitle = React.forwardRef<
>(({ className, ...props }, ref) => (
<DialogPrimitive.Title
ref={ref}
- className={cn(
- "text-lg font-semibold leading-none tracking-tight mb-2",
- className
- )}
+ className={cn("text-lg font-semibold leading-none tracking-tight mb-2", className)}
{...props}
/>
));
diff --git a/client/src/components/ui/dropdown-menu.tsx b/client/src/components/ui/dropdown-menu.tsx
index e0063688d..c22710fd9 100644
--- a/client/src/components/ui/dropdown-menu.tsx
+++ b/client/src/components/ui/dropdown-menu.tsx
@@ -11,15 +11,12 @@ const DropdownMenu = DropdownMenuPrimitive.Root;
const DropdownMenuTrigger = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
- React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger> &
- ButtonProps & { unstyled?: boolean }
+ React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger> & ButtonProps & { unstyled?: boolean }
>(({ className, variant, size, unstyled, ...props }, ref) => (
<DropdownMenuPrimitive.Trigger
ref={ref}
// className={cn(className)}
- className={
- unstyled ? className : cn(buttonVariants({ variant, size, className }))
- }
+ className={unstyled ? className : cn(buttonVariants({ variant, size, className }))}
{...props}
/>
));
@@ -52,8 +49,7 @@ const DropdownMenuSubTrigger = React.forwardRef<
<ChevronRight className="ml-auto" />
</DropdownMenuPrimitive.SubTrigger>
));
-DropdownMenuSubTrigger.displayName =
- DropdownMenuPrimitive.SubTrigger.displayName;
+DropdownMenuSubTrigger.displayName = DropdownMenuPrimitive.SubTrigger.displayName;
const DropdownMenuSubContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.SubContent>,
@@ -68,8 +64,7 @@ const DropdownMenuSubContent = React.forwardRef<
{...props}
/>
));
-DropdownMenuSubContent.displayName =
- DropdownMenuPrimitive.SubContent.displayName;
+DropdownMenuSubContent.displayName = DropdownMenuPrimitive.SubContent.displayName;
const DropdownMenuContent = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.Content>,
@@ -129,8 +124,7 @@ const DropdownMenuCheckboxItem = React.forwardRef<
{children}
</DropdownMenuPrimitive.CheckboxItem>
));
-DropdownMenuCheckboxItem.displayName =
- DropdownMenuPrimitive.CheckboxItem.displayName;
+DropdownMenuCheckboxItem.displayName = DropdownMenuPrimitive.CheckboxItem.displayName;
const DropdownMenuRadioItem = React.forwardRef<
React.ElementRef<typeof DropdownMenuPrimitive.RadioItem>,
@@ -162,11 +156,7 @@ const DropdownMenuLabel = React.forwardRef<
>(({ className, inset, ...props }, ref) => (
<DropdownMenuPrimitive.Label
ref={ref}
- className={cn(
- "px-2 py-1.5 text-sm font-semibold",
- inset && "pl-8",
- className
- )}
+ className={cn("px-2 py-1.5 text-sm font-semibold", inset && "pl-8", className)}
{...props}
/>
));
@@ -178,25 +168,14 @@ const DropdownMenuSeparator = React.forwardRef<
>(({ className, ...props }, ref) => (
<DropdownMenuPrimitive.Separator
ref={ref}
- className={cn(
- "-mx-1 my-1 h-px bg-neutral-100 dark:bg-neutral-800",
- className
- )}
+ className={cn("-mx-1 my-1 h-px bg-neutral-100 dark:bg-neutral-800", className)}
{...props}
/>
));
DropdownMenuSeparator.displayName = DropdownMenuPrimitive.Separator.displayName;
-const DropdownMenuShortcut = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLSpanElement>) => {
- return (
- <span
- className={cn("ml-auto text-xs tracking-widest opacity-60", className)}
- {...props}
- />
- );
+const DropdownMenuShortcut = ({ className, ...props }: React.HTMLAttributes<HTMLSpanElement>) => {
+ return <span className={cn("ml-auto text-xs tracking-widest opacity-60", className)} {...props} />;
};
DropdownMenuShortcut.displayName = "DropdownMenuShortcut";
diff --git a/client/src/components/ui/form.tsx b/client/src/components/ui/form.tsx
index 561d75458..50d05465a 100644
--- a/client/src/components/ui/form.tsx
+++ b/client/src/components/ui/form.tsx
@@ -1,8 +1,8 @@
-"use client"
+"use client";
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-import { Slot } from "@radix-ui/react-slot"
+import * as React from "react";
+import * as LabelPrimitive from "@radix-ui/react-label";
+import { Slot } from "@radix-ui/react-slot";
import {
Controller,
FormProvider,
@@ -10,27 +10,25 @@ import {
type ControllerProps,
type FieldPath,
type FieldValues,
-} from "react-hook-form"
+} from "react-hook-form";
-import { cn } from "@/lib/utils"
-import { Label } from "@/components/ui/label"
+import { cn } from "@/lib/utils";
+import { Label } from "@/components/ui/label";
-const Form = FormProvider
+const Form = FormProvider;
type FormFieldContextValue<
TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = {
- name: TName
-}
+ name: TName;
+};
-const FormFieldContext = React.createContext<FormFieldContextValue>(
- {} as FormFieldContextValue
-)
+const FormFieldContext = React.createContext<FormFieldContextValue>({} as FormFieldContextValue);
const FormField = <
TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
>({
...props
}: ControllerProps<TFieldValues, TName>) => {
@@ -38,21 +36,21 @@ const FormField = <
<FormFieldContext.Provider value={{ name: props.name }}>
<Controller {...props} />
</FormFieldContext.Provider>
- )
-}
+ );
+};
const useFormField = () => {
- const fieldContext = React.useContext(FormFieldContext)
- const itemContext = React.useContext(FormItemContext)
- const { getFieldState, formState } = useFormContext()
+ const fieldContext = React.useContext(FormFieldContext);
+ const itemContext = React.useContext(FormItemContext);
+ const { getFieldState, formState } = useFormContext();
- const fieldState = getFieldState(fieldContext.name, formState)
+ const fieldState = getFieldState(fieldContext.name, formState);
if (!fieldContext) {
- throw new Error("useFormField should be used within <FormField>")
+ throw new Error("useFormField should be used within <FormField>");
}
- const { id } = itemContext
+ const { id } = itemContext;
return {
id,
@@ -61,36 +59,33 @@ const useFormField = () => {
formDescriptionId: `${id}-form-item-description`,
formMessageId: `${id}-form-item-message`,
...fieldState,
- }
-}
+ };
+};
type FormItemContextValue = {
- id: string
-}
+ id: string;
+};
-const FormItemContext = React.createContext<FormItemContextValue>(
- {} as FormItemContextValue
-)
+const FormItemContext = React.createContext<FormItemContextValue>({} as FormItemContextValue);
-const FormItem = React.forwardRef<
- HTMLDivElement,
- React.HTMLAttributes<HTMLDivElement>
->(({ className, ...props }, ref) => {
- const id = React.useId()
+const FormItem = React.forwardRef<HTMLDivElement, React.HTMLAttributes<HTMLDivElement>>(
+ ({ className, ...props }, ref) => {
+ const id = React.useId();
- return (
- <FormItemContext.Provider value={{ id }}>
- <div ref={ref} className={cn("space-y-1", className)} {...props} />
- </FormItemContext.Provider>
- )
-})
-FormItem.displayName = "FormItem"
+ return (
+ <FormItemContext.Provider value={{ id }}>
+ <div ref={ref} className={cn("space-y-1", className)} {...props} />
+ </FormItemContext.Provider>
+ );
+ }
+);
+FormItem.displayName = "FormItem";
const FormLabel = React.forwardRef<
React.ElementRef<typeof LabelPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
>(({ className, ...props }, ref) => {
- const { error, formItemId } = useFormField()
+ const { error, formItemId } = useFormField();
return (
<Label
@@ -99,80 +94,64 @@ const FormLabel = React.forwardRef<
htmlFor={formItemId}
{...props}
/>
- )
-})
-FormLabel.displayName = "FormLabel"
-
-const FormControl = React.forwardRef<
- React.ElementRef<typeof Slot>,
- React.ComponentPropsWithoutRef<typeof Slot>
->(({ ...props }, ref) => {
- const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
-
- return (
- <Slot
- ref={ref}
- id={formItemId}
- aria-describedby={
- !error
- ? `${formDescriptionId}`
- : `${formDescriptionId} ${formMessageId}`
- }
- aria-invalid={!!error}
- {...props}
- />
- )
-})
-FormControl.displayName = "FormControl"
-
-const FormDescription = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, ...props }, ref) => {
- const { formDescriptionId } = useFormField()
-
- return (
- <p
- ref={ref}
- id={formDescriptionId}
- className={cn("text-[0.8rem] text-neutral-500 dark:text-neutral-400", className)}
- {...props}
- />
- )
-})
-FormDescription.displayName = "FormDescription"
-
-const FormMessage = React.forwardRef<
- HTMLParagraphElement,
- React.HTMLAttributes<HTMLParagraphElement>
->(({ className, children, ...props }, ref) => {
- const { error, formMessageId } = useFormField()
- const body = error ? String(error?.message ?? "") : children
-
- if (!body) {
- return null
+ );
+});
+FormLabel.displayName = "FormLabel";
+
+const FormControl = React.forwardRef<React.ElementRef<typeof Slot>, React.ComponentPropsWithoutRef<typeof Slot>>(
+ ({ ...props }, ref) => {
+ const { error, formItemId, formDescriptionId, formMessageId } = useFormField();
+
+ return (
+ <Slot
+ ref={ref}
+ id={formItemId}
+ aria-describedby={!error ? `${formDescriptionId}` : `${formDescriptionId} ${formMessageId}`}
+ aria-invalid={!!error}
+ {...props}
+ />
+ );
}
+);
+FormControl.displayName = "FormControl";
+
+const FormDescription = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, ...props }, ref) => {
+ const { formDescriptionId } = useFormField();
+
+ return (
+ <p
+ ref={ref}
+ id={formDescriptionId}
+ className={cn("text-[0.8rem] text-neutral-500 dark:text-neutral-400", className)}
+ {...props}
+ />
+ );
+ }
+);
+FormDescription.displayName = "FormDescription";
+
+const FormMessage = React.forwardRef<HTMLParagraphElement, React.HTMLAttributes<HTMLParagraphElement>>(
+ ({ className, children, ...props }, ref) => {
+ const { error, formMessageId } = useFormField();
+ const body = error ? String(error?.message ?? "") : children;
+
+ if (!body) {
+ return null;
+ }
+
+ return (
+ <p
+ ref={ref}
+ id={formMessageId}
+ className={cn("text-[0.8rem] font-medium text-red-500 dark:text-red-900", className)}
+ {...props}
+ >
+ {body}
+ </p>
+ );
+ }
+);
+FormMessage.displayName = "FormMessage";
- return (
- <p
- ref={ref}
- id={formMessageId}
- className={cn("text-[0.8rem] font-medium text-red-500 dark:text-red-900", className)}
- {...props}
- >
- {body}
- </p>
- )
-})
-FormMessage.displayName = "FormMessage"
-
-export {
- useFormField,
- Form,
- FormItem,
- FormLabel,
- FormControl,
- FormDescription,
- FormMessage,
- FormField,
-}
+export { useFormField, Form, FormItem, FormLabel, FormControl, FormDescription, FormMessage, FormField };
diff --git a/client/src/components/ui/input-with-suggestions.tsx b/client/src/components/ui/input-with-suggestions.tsx
index ce9170c76..c22d802f7 100644
--- a/client/src/components/ui/input-with-suggestions.tsx
+++ b/client/src/components/ui/input-with-suggestions.tsx
@@ -14,81 +14,80 @@ interface InputWithSuggestionsProps extends React.InputHTMLAttributes<HTMLInputE
onValueChange?: (value: string) => void;
}
-export const InputWithSuggestions = React.forwardRef<
- HTMLInputElement,
- InputWithSuggestionsProps
->(({ suggestions, onValueChange, className, value: controlledValue, ...props }, ref) => {
- const [open, setOpen] = React.useState(false);
- const [internalValue, setInternalValue] = React.useState("");
- const wrapperRef = React.useRef<HTMLDivElement>(null);
-
- // Use controlled value if provided, otherwise use internal state
- const value = controlledValue !== undefined ? controlledValue : internalValue;
+export const InputWithSuggestions = React.forwardRef<HTMLInputElement, InputWithSuggestionsProps>(
+ ({ suggestions, onValueChange, className, value: controlledValue, ...props }, ref) => {
+ const [open, setOpen] = React.useState(false);
+ const [internalValue, setInternalValue] = React.useState("");
+ const wrapperRef = React.useRef<HTMLDivElement>(null);
- const filteredSuggestions = suggestions.filter((suggestion) =>
- suggestion.value.toLowerCase().includes(String(value).toLowerCase())
- );
+ // Use controlled value if provided, otherwise use internal state
+ const value = controlledValue !== undefined ? controlledValue : internalValue;
- React.useEffect(() => {
- const handleClickOutside = (event: MouseEvent) => {
- if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) {
- setOpen(false);
- }
- };
+ const filteredSuggestions = suggestions.filter(suggestion =>
+ suggestion.value.toLowerCase().includes(String(value).toLowerCase())
+ );
- document.addEventListener("mousedown", handleClickOutside);
- return () => document.removeEventListener("mousedown", handleClickOutside);
- }, []);
+ React.useEffect(() => {
+ const handleClickOutside = (event: MouseEvent) => {
+ if (wrapperRef.current && !wrapperRef.current.contains(event.target as Node)) {
+ setOpen(false);
+ }
+ };
- const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
- const newValue = e.target.value;
- if (controlledValue === undefined) {
- setInternalValue(newValue);
- }
- onValueChange?.(newValue);
- props.onChange?.(e);
- setOpen(true);
- };
+ document.addEventListener("mousedown", handleClickOutside);
+ return () => document.removeEventListener("mousedown", handleClickOutside);
+ }, []);
+
+ const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+ const newValue = e.target.value;
+ if (controlledValue === undefined) {
+ setInternalValue(newValue);
+ }
+ onValueChange?.(newValue);
+ props.onChange?.(e);
+ setOpen(true);
+ };
- const handleSuggestionClick = (suggestion: string) => {
- if (controlledValue === undefined) {
- setInternalValue(suggestion);
- }
- onValueChange?.(suggestion);
- if (props.onChange) {
- const syntheticEvent = {
- target: { value: suggestion },
- } as React.ChangeEvent<HTMLInputElement>;
- props.onChange(syntheticEvent);
- }
- setOpen(false);
- };
+ const handleSuggestionClick = (suggestion: string) => {
+ if (controlledValue === undefined) {
+ setInternalValue(suggestion);
+ }
+ onValueChange?.(suggestion);
+ if (props.onChange) {
+ const syntheticEvent = {
+ target: { value: suggestion },
+ } as React.ChangeEvent<HTMLInputElement>;
+ props.onChange(syntheticEvent);
+ }
+ setOpen(false);
+ };
- return (
- <div ref={wrapperRef} className="relative w-full">
- <Input
- ref={ref}
- value={value}
- onChange={handleInputChange}
- onFocus={() => setOpen(true)}
- className={className}
- {...props}
- />
- {open && filteredSuggestions.length > 0 && (
- <div className="absolute z-50 mt-1 w-full max-h-60 overflow-auto rounded-md border border-neutral-200 bg-white shadow-md dark:border-neutral-800 dark:bg-neutral-900">
- {filteredSuggestions.map((suggestion) => (
- <div
- key={suggestion.value}
- className="relative cursor-pointer px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800"
- onClick={() => handleSuggestionClick(suggestion.value)}
- >
- {suggestion.label || suggestion.value}
- </div>
- ))}
- </div>
- )}
- </div>
- );
-});
+ return (
+ <div ref={wrapperRef} className="relative w-full">
+ <Input
+ ref={ref}
+ value={value}
+ onChange={handleInputChange}
+ onFocus={() => setOpen(true)}
+ className={className}
+ {...props}
+ />
+ {open && filteredSuggestions.length > 0 && (
+ <div className="absolute z-50 mt-1 w-full max-h-60 overflow-auto rounded-md border border-neutral-200 bg-white shadow-md dark:border-neutral-800 dark:bg-neutral-900">
+ {filteredSuggestions.map(suggestion => (
+ <div
+ key={suggestion.value}
+ className="relative cursor-pointer px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800"
+ onClick={() => handleSuggestionClick(suggestion.value)}
+ >
+ {suggestion.label || suggestion.value}
+ </div>
+ ))}
+ </div>
+ )}
+ </div>
+ );
+ }
+);
-InputWithSuggestions.displayName = "InputWithSuggestions";
\ No newline at end of file
+InputWithSuggestions.displayName = "InputWithSuggestions";
diff --git a/client/src/components/ui/input.tsx b/client/src/components/ui/input.tsx
index c1496013d..4deed9d1e 100644
--- a/client/src/components/ui/input.tsx
+++ b/client/src/components/ui/input.tsx
@@ -1,7 +1,7 @@
-import * as React from "react"
-import { cva, type VariantProps } from "class-variance-authority"
+import * as React from "react";
+import { cva, type VariantProps } from "class-variance-authority";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
const inputVariants = cva(
"flex w-full rounded-md border border-neutral-200 bg-transparent shadow-sm transition-colors file:border-0 file:bg-transparent file:font-medium file:text-neutral-950 placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 dark:border-neutral-800 dark:file:text-neutral-50 dark:placeholder:text-neutral-400 dark:focus-visible:ring-neutral-300",
@@ -16,24 +16,15 @@ const inputVariants = cva(
inputSize: "default",
},
}
-)
+);
export interface InputProps
extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "size">,
VariantProps<typeof inputVariants> {}
-const Input = React.forwardRef<HTMLInputElement, InputProps>(
- ({ className, type, inputSize, ...props }, ref) => {
- return (
- <input
- type={type}
- className={cn(inputVariants({ inputSize, className }))}
- ref={ref}
- {...props}
- />
- )
- }
-)
-Input.displayName = "Input"
+const Input = React.forwardRef<HTMLInputElement, InputProps>(({ className, type, inputSize, ...props }, ref) => {
+ return <input type={type} className={cn(inputVariants({ inputSize, className }))} ref={ref} {...props} />;
+});
+Input.displayName = "Input";
-export { Input }
+export { Input };
diff --git a/client/src/components/ui/multi-select.tsx b/client/src/components/ui/multi-select.tsx
index cdda5e136..46aa3a0ed 100644
--- a/client/src/components/ui/multi-select.tsx
+++ b/client/src/components/ui/multi-select.tsx
@@ -40,21 +40,21 @@ export function MultiSelect({
const [open, setOpen] = React.useState(false);
const [search, setSearch] = React.useState("");
- const selected = React.useMemo(() => options.filter((option) => value.includes(option.value)), [options, value]);
+ const selected = React.useMemo(() => options.filter(option => value.includes(option.value)), [options, value]);
const handleSelect = (option: MultiSelectOption) => {
- const newValue = value.includes(option.value) ? value.filter((v) => v !== option.value) : [...value, option.value];
+ const newValue = value.includes(option.value) ? value.filter(v => v !== option.value) : [...value, option.value];
onValueChange?.(newValue);
};
const handleRemove = (option: MultiSelectOption) => {
- onValueChange?.(value.filter((v) => v !== option.value));
+ onValueChange?.(value.filter(v => v !== option.value));
};
const filteredOptions = React.useMemo(() => {
if (!search) return options;
const searchLower = search.toLowerCase();
- return options.filter((option) => option.label.toLowerCase().includes(searchLower));
+ return options.filter(option => option.label.toLowerCase().includes(searchLower));
}, [options, search]);
return (
@@ -69,23 +69,23 @@ export function MultiSelect({
>
<div className="flex gap-1 flex-wrap">
{selected.length > 0 ? (
- selected.map((option) => (
+ selected.map(option => (
<Badge key={option.value} variant="secondary" className={cn("mr-1", badgeClassName)}>
{option.label}
<button
className="ml-1 ring-offset-background rounded-full outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2"
- onKeyDown={(e) => {
+ onKeyDown={e => {
if (e.key === "Enter") {
e.preventDefault();
e.stopPropagation();
handleRemove(option);
}
}}
- onMouseDown={(e) => {
+ onMouseDown={e => {
e.preventDefault();
e.stopPropagation();
}}
- onClick={(e) => {
+ onClick={e => {
e.preventDefault();
e.stopPropagation();
handleRemove(option);
@@ -108,7 +108,7 @@ export function MultiSelect({
<CommandList>
<CommandEmpty>{emptyText}</CommandEmpty>
<CommandGroup>
- {filteredOptions.map((option) => {
+ {filteredOptions.map(option => {
const isSelected = value.includes(option.value);
return (
<CommandItem
diff --git a/client/src/components/ui/navigation-menu.tsx b/client/src/components/ui/navigation-menu.tsx
index a4375bd5d..1fb979ee0 100644
--- a/client/src/components/ui/navigation-menu.tsx
+++ b/client/src/components/ui/navigation-menu.tsx
@@ -11,10 +11,7 @@ const NavigationMenu = React.forwardRef<
>(({ className, children, ...props }, ref) => (
<NavigationMenuPrimitive.Root
ref={ref}
- className={cn(
- "relative z-10 flex max-w-max flex-1 items-center justify-center",
- className
- )}
+ className={cn("relative z-10 flex max-w-max flex-1 items-center justify-center", className)}
{...props}
>
{children}
@@ -29,10 +26,7 @@ const NavigationMenuList = React.forwardRef<
>(({ className, ...props }, ref) => (
<NavigationMenuPrimitive.List
ref={ref}
- className={cn(
- "group flex flex-1 list-none items-center justify-center space-x-1",
- className
- )}
+ className={cn("group flex flex-1 list-none items-center justify-center space-x-1", className)}
{...props}
/>
));
@@ -95,8 +89,7 @@ const NavigationMenuViewport = React.forwardRef<
/>
</div>
));
-NavigationMenuViewport.displayName =
- NavigationMenuPrimitive.Viewport.displayName;
+NavigationMenuViewport.displayName = NavigationMenuPrimitive.Viewport.displayName;
const NavigationMenuIndicator = React.forwardRef<
React.ElementRef<typeof NavigationMenuPrimitive.Indicator>,
@@ -113,8 +106,7 @@ const NavigationMenuIndicator = React.forwardRef<
<div className="relative top-[60%] h-2 w-2 rotate-45 rounded-tl-sm bg-neutral-200 shadow-md dark:bg-neutral-800" />
</NavigationMenuPrimitive.Indicator>
));
-NavigationMenuIndicator.displayName =
- NavigationMenuPrimitive.Indicator.displayName;
+NavigationMenuIndicator.displayName = NavigationMenuPrimitive.Indicator.displayName;
export {
navigationMenuTriggerStyle,
diff --git a/client/src/components/ui/progress.tsx b/client/src/components/ui/progress.tsx
index 95d72d2b2..b529ad706 100644
--- a/client/src/components/ui/progress.tsx
+++ b/client/src/components/ui/progress.tsx
@@ -11,10 +11,7 @@ const Progress = React.forwardRef<
>(({ className, value, ...props }, ref) => (
<ProgressPrimitive.Root
ref={ref}
- className={cn(
- "relative h-2 w-full overflow-hidden rounded-full bg-neutral-200 dark:bg-neutral-800",
- className
- )}
+ className={cn("relative h-2 w-full overflow-hidden rounded-full bg-neutral-200 dark:bg-neutral-800", className)}
{...props}
>
<ProgressPrimitive.Indicator
diff --git a/client/src/components/ui/scroll-area.tsx b/client/src/components/ui/scroll-area.tsx
index e6c144af5..667abc69d 100644
--- a/client/src/components/ui/scroll-area.tsx
+++ b/client/src/components/ui/scroll-area.tsx
@@ -5,17 +5,9 @@ import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area";
import { cn } from "@/lib/utils";
-function ScrollArea({
- className,
- children,
- ...props
-}: React.ComponentProps<typeof ScrollAreaPrimitive.Root>) {
+function ScrollArea({ className, children, ...props }: React.ComponentProps<typeof ScrollAreaPrimitive.Root>) {
return (
- <ScrollAreaPrimitive.Root
- data-slot="scroll-area"
- className={cn("relative", className)}
- {...props}
- >
+ <ScrollAreaPrimitive.Root data-slot="scroll-area" className={cn("relative", className)} {...props}>
<ScrollAreaPrimitive.Viewport
data-slot="scroll-area-viewport"
className="focus-visible:ring-ring/50 size-full rounded-[inherit] transition-[color,box-shadow] outline-none focus-visible:ring-[3px] focus-visible:outline-1"
@@ -39,10 +31,8 @@ function ScrollBar({
orientation={orientation}
className={cn(
"flex touch-none p-px transition-colors select-none",
- orientation === "vertical" &&
- "h-full w-2.5 border-l border-l-transparent",
- orientation === "horizontal" &&
- "h-2.5 flex-col border-t border-t-transparent",
+ orientation === "vertical" && "h-full w-2.5 border-l border-l-transparent",
+ orientation === "horizontal" && "h-2.5 flex-col border-t border-t-transparent",
className
)}
{...props}
diff --git a/client/src/components/ui/select.tsx b/client/src/components/ui/select.tsx
index 64acd61c4..f23cb3919 100644
--- a/client/src/components/ui/select.tsx
+++ b/client/src/components/ui/select.tsx
@@ -30,13 +30,7 @@ const SelectTrigger = React.forwardRef<
>
{children}
<SelectPrimitive.Icon asChild>
- <ChevronDown
- className={cn(
- "opacity-50",
- size === "default" && "h-4 w-4",
- size === "sm" && "h-3 w-3"
- )}
- />
+ <ChevronDown className={cn("opacity-50", size === "default" && "h-4 w-4", size === "sm" && "h-3 w-3")} />
</SelectPrimitive.Icon>
</SelectPrimitive.Trigger>
));
@@ -48,10 +42,7 @@ const SelectScrollUpButton = React.forwardRef<
>(({ className, ...props }, ref) => (
<SelectPrimitive.ScrollUpButton
ref={ref}
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
{...props}
>
<ChevronUp className="h-4 w-4" />
@@ -65,56 +56,47 @@ const SelectScrollDownButton = React.forwardRef<
>(({ className, ...props }, ref) => (
<SelectPrimitive.ScrollDownButton
ref={ref}
- className={cn(
- "flex cursor-default items-center justify-center py-1",
- className
- )}
+ className={cn("flex cursor-default items-center justify-center py-1", className)}
{...props}
>
<ChevronDown className="h-4 w-4" />
</SelectPrimitive.ScrollDownButton>
));
-SelectScrollDownButton.displayName =
- SelectPrimitive.ScrollDownButton.displayName;
+SelectScrollDownButton.displayName = SelectPrimitive.ScrollDownButton.displayName;
const SelectContent = React.forwardRef<
React.ElementRef<typeof SelectPrimitive.Content>,
React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content> & {
size?: "default" | "sm";
}
->(
- (
- { className, children, position = "popper", size = "default", ...props },
- ref
- ) => (
- <SelectPrimitive.Portal>
- <SelectPrimitive.Content
- ref={ref}
+>(({ className, children, position = "popper", size = "default", ...props }, ref) => (
+ <SelectPrimitive.Portal>
+ <SelectPrimitive.Content
+ ref={ref}
+ className={cn(
+ "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",
+ position === "popper" &&
+ "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+ size === "sm" && "text-xs",
+ className
+ )}
+ position={position}
+ {...props}
+ >
+ <SelectScrollUpButton />
+ <SelectPrimitive.Viewport
className={cn(
- "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-neutral-200 bg-white text-neutral-950 shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",
+ "p-1",
position === "popper" &&
- "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
- size === "sm" && "text-xs",
- className
+ "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
)}
- position={position}
- {...props}
>
- <SelectScrollUpButton />
- <SelectPrimitive.Viewport
- className={cn(
- "p-1",
- position === "popper" &&
- "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
- )}
- >
- {children}
- </SelectPrimitive.Viewport>
- <SelectScrollDownButton />
- </SelectPrimitive.Content>
- </SelectPrimitive.Portal>
- )
-);
+ {children}
+ </SelectPrimitive.Viewport>
+ <SelectScrollDownButton />
+ </SelectPrimitive.Content>
+ </SelectPrimitive.Portal>
+));
SelectContent.displayName = SelectPrimitive.Content.displayName;
const SelectLabel = React.forwardRef<
@@ -154,12 +136,7 @@ const SelectItem = React.forwardRef<
>
<span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
<SelectPrimitive.ItemIndicator>
- <Check
- className={cn(
- size === "default" && "h-4 w-4",
- size === "sm" && "h-3 w-3"
- )}
- />
+ <Check className={cn(size === "default" && "h-4 w-4", size === "sm" && "h-3 w-3")} />
</SelectPrimitive.ItemIndicator>
</span>
<SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
@@ -173,10 +150,7 @@ const SelectSeparator = React.forwardRef<
>(({ className, ...props }, ref) => (
<SelectPrimitive.Separator
ref={ref}
- className={cn(
- "-mx-1 my-1 h-px bg-neutral-100 dark:bg-neutral-800",
- className
- )}
+ className={cn("-mx-1 my-1 h-px bg-neutral-100 dark:bg-neutral-800", className)}
{...props}
/>
));
diff --git a/client/src/components/ui/separator.tsx b/client/src/components/ui/separator.tsx
index fef37fbc4..a5eb8ecc9 100644
--- a/client/src/components/ui/separator.tsx
+++ b/client/src/components/ui/separator.tsx
@@ -8,24 +8,19 @@ import { cn } from "@/lib/utils";
const Separator = React.forwardRef<
React.ElementRef<typeof SeparatorPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
->(
- (
- { className, orientation = "horizontal", decorative = true, ...props },
- ref
- ) => (
- <SeparatorPrimitive.Root
- ref={ref}
- decorative={decorative}
- orientation={orientation}
- className={cn(
- "shrink-0 bg-neutral-200 dark:bg-neutral-800",
- orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
- className
- )}
- {...props}
- />
- )
-);
+>(({ className, orientation = "horizontal", decorative = true, ...props }, ref) => (
+ <SeparatorPrimitive.Root
+ ref={ref}
+ decorative={decorative}
+ orientation={orientation}
+ className={cn(
+ "shrink-0 bg-neutral-200 dark:bg-neutral-800",
+ orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+ className
+ )}
+ {...props}
+ />
+));
Separator.displayName = SeparatorPrimitive.Root.displayName;
export { Separator };
diff --git a/client/src/components/ui/sheet.tsx b/client/src/components/ui/sheet.tsx
index ed0ed29d4..ce24aff11 100644
--- a/client/src/components/ui/sheet.tsx
+++ b/client/src/components/ui/sheet.tsx
@@ -56,56 +56,29 @@ interface SheetContentProps
const SheetContent = React.forwardRef<
React.ElementRef<typeof SheetPrimitive.Content>,
SheetContentProps & { showClose?: boolean }
->(
- (
- { side = "right", className, children, showClose = true, ...props },
- ref
- ) => (
- <SheetPortal>
- <SheetOverlay />
- <SheetPrimitive.Content
- ref={ref}
- className={cn(sheetVariants({ side }), className)}
- {...props}
- >
- {showClose && (
- <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800">
- <X className="h-4 w-4" />
- <span className="sr-only">Close</span>
- </SheetPrimitive.Close>
- )}
- {children}
- </SheetPrimitive.Content>
- </SheetPortal>
- )
-);
+>(({ side = "right", className, children, showClose = true, ...props }, ref) => (
+ <SheetPortal>
+ <SheetOverlay />
+ <SheetPrimitive.Content ref={ref} className={cn(sheetVariants({ side }), className)} {...props}>
+ {showClose && (
+ <SheetPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800">
+ <X className="h-4 w-4" />
+ <span className="sr-only">Close</span>
+ </SheetPrimitive.Close>
+ )}
+ {children}
+ </SheetPrimitive.Content>
+ </SheetPortal>
+));
SheetContent.displayName = SheetPrimitive.Content.displayName;
-const SheetHeader = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col space-y-2 text-center sm:text-left",
- className
- )}
- {...props}
- />
+const SheetHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col space-y-2 text-center sm:text-left", className)} {...props} />
);
SheetHeader.displayName = "SheetHeader";
-const SheetFooter = ({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) => (
- <div
- className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
- )}
- {...props}
- />
+const SheetFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
+ <div className={cn("flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", className)} {...props} />
);
SheetFooter.displayName = "SheetFooter";
@@ -115,10 +88,7 @@ const SheetTitle = React.forwardRef<
>(({ className, ...props }, ref) => (
<SheetPrimitive.Title
ref={ref}
- className={cn(
- "text-lg font-semibold text-neutral-950 dark:text-neutral-50",
- className
- )}
+ className={cn("text-lg font-semibold text-neutral-950 dark:text-neutral-50", className)}
{...props}
/>
));
diff --git a/client/src/components/ui/skeleton.tsx b/client/src/components/ui/skeleton.tsx
index 8e1592bc9..546706489 100644
--- a/client/src/components/ui/skeleton.tsx
+++ b/client/src/components/ui/skeleton.tsx
@@ -1,15 +1,7 @@
import { cn } from "@/lib/utils";
-function Skeleton({
- className,
- ...props
-}: React.HTMLAttributes<HTMLDivElement>) {
- return (
- <div
- className={cn("animate-pulse rounded-md bg-neutral-850", className)}
- {...props}
- />
- );
+function Skeleton({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) {
+ return <div className={cn("animate-pulse rounded-md bg-neutral-850", className)} {...props} />;
}
export { Skeleton };
diff --git a/client/src/components/ui/slider.tsx b/client/src/components/ui/slider.tsx
index a9fa28003..f9ccbfa13 100644
--- a/client/src/components/ui/slider.tsx
+++ b/client/src/components/ui/slider.tsx
@@ -11,10 +11,7 @@ const Slider = React.forwardRef<
>(({ className, ...props }, ref) => (
<SliderPrimitive.Root
ref={ref}
- className={cn(
- "relative flex w-full touch-none select-none items-center",
- className
- )}
+ className={cn("relative flex w-full touch-none select-none items-center", className)}
{...props}
>
<SliderPrimitive.Track className="relative h-1.5 w-full grow overflow-hidden rounded-full bg-neutral-900/20 dark:bg-neutral-50/20">
diff --git a/client/src/components/ui/sonner.tsx b/client/src/components/ui/sonner.tsx
index 01893abab..2962e26c1 100644
--- a/client/src/components/ui/sonner.tsx
+++ b/client/src/components/ui/sonner.tsx
@@ -16,8 +16,7 @@ const Toaster = ({ ...props }: ToasterProps) => {
classNames: {
toast:
"group toast group-[.toaster]:bg-white group-[.toaster]:text-neutral-950 group-[.toaster]:border-neutral-200 group-[.toaster]:shadow-lg dark:group-[.toaster]:bg-neutral-850 dark:group-[.toaster]:text-neutral-50 dark:group-[.toaster]:border-neutral-700",
- description:
- "group-[.toast]:text-neutral-500 dark:group-[.toast]:text-neutral-400",
+ description: "group-[.toast]:text-neutral-500 dark:group-[.toast]:text-neutral-400",
actionButton:
"group-[.toast]:bg-neutral-900 group-[.toast]:text-neutral-50 dark:group-[.toast]:bg-neutral-50 dark:group-[.toast]:text-neutral-900",
cancelButton:
diff --git a/client/src/components/ui/textarea.tsx b/client/src/components/ui/textarea.tsx
index a065d8853..3caf2f3b1 100644
--- a/client/src/components/ui/textarea.tsx
+++ b/client/src/components/ui/textarea.tsx
@@ -1,22 +1,21 @@
-import * as React from "react"
+import * as React from "react";
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
-const Textarea = React.forwardRef<
- HTMLTextAreaElement,
- React.ComponentProps<"textarea">
->(({ className, ...props }, ref) => {
- return (
- <textarea
- className={cn(
- "flex min-h-[60px] w-full rounded-md border border-neutral-200 bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-neutral-800 dark:placeholder:text-neutral-400 dark:focus-visible:ring-neutral-300",
- className
- )}
- ref={ref}
- {...props}
- />
- )
-})
-Textarea.displayName = "Textarea"
+const Textarea = React.forwardRef<HTMLTextAreaElement, React.ComponentProps<"textarea">>(
+ ({ className, ...props }, ref) => {
+ return (
+ <textarea
+ className={cn(
+ "flex min-h-[60px] w-full rounded-md border border-neutral-200 bg-transparent px-3 py-2 text-base shadow-sm placeholder:text-neutral-500 focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:cursor-not-allowed disabled:opacity-50 md:text-sm dark:border-neutral-800 dark:placeholder:text-neutral-400 dark:focus-visible:ring-neutral-300",
+ className
+ )}
+ ref={ref}
+ {...props}
+ />
+ );
+ }
+);
+Textarea.displayName = "Textarea";
-export { Textarea }
+export { Textarea };
diff --git a/client/src/components/ui/tooltip.tsx b/client/src/components/ui/tooltip.tsx
index c4e67992e..6069914f1 100644
--- a/client/src/components/ui/tooltip.tsx
+++ b/client/src/components/ui/tooltip.tsx
@@ -7,10 +7,7 @@ import { cn } from "@/lib/utils";
const TooltipProvider = TooltipPrimitive.Provider;
-const Tooltip = ({
- delayDuration = 300,
- ...props
-}: React.ComponentProps<typeof TooltipPrimitive.Root>) => (
+const Tooltip = ({ delayDuration = 300, ...props }: React.ComponentProps<typeof TooltipPrimitive.Root>) => (
<TooltipPrimitive.Root delayDuration={delayDuration} {...props} />
);
diff --git a/client/src/hooks/useAdminUsers.ts b/client/src/hooks/useAdminUsers.ts
index 6d98edb69..9e64fff66 100644
--- a/client/src/hooks/useAdminUsers.ts
+++ b/client/src/hooks/useAdminUsers.ts
@@ -10,9 +10,7 @@ import { useRouter } from "next/navigation";
export function useAdminUsers() {
const router = useRouter();
// Table state
- const [sorting, setSorting] = useState<SortingState>([
- { id: "createdAt", desc: true },
- ]);
+ const [sorting, setSorting] = useState<SortingState>([{ id: "createdAt", desc: true }]);
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
const [pagination, setPagination] = useState({ pageIndex: 0, pageSize: 50 });
const [globalFilter, setGlobalFilter] = useState("");
@@ -21,14 +19,13 @@ export function useAdminUsers() {
const fetchUsers = async () => {
// Default sort configuration from sorting state
const sortBy = sorting.length > 0 ? sorting[0].id : "createdAt";
- const sortDirection =
- sorting.length > 0 ? (sorting[0].desc ? "desc" : "asc") : "desc";
+ const sortDirection = sorting.length > 0 ? (sorting[0].desc ? "desc" : "asc") : "desc";
// Apply filters if any
let emailFilter = "";
let roleFilter = "";
- columnFilters.forEach((filter) => {
+ columnFilters.forEach(filter => {
if (filter.id === "email" && typeof filter.value === "string") {
emailFilter = filter.value;
}
@@ -71,14 +68,7 @@ export function useAdminUsers() {
users: AdminUser[];
total: number;
}>({
- queryKey: [
- "admin-users",
- pagination.pageIndex,
- pagination.pageSize,
- sorting,
- columnFilters,
- globalFilter,
- ],
+ queryKey: ["admin-users", pagination.pageIndex, pagination.pageSize, sorting, columnFilters, globalFilter],
queryFn: fetchUsers,
});
@@ -92,8 +82,7 @@ export function useAdminUsers() {
// Redirect to home after impersonation
return true;
} catch (err) {
- const errorMessage =
- err instanceof Error ? err.message : "Unknown error occurred";
+ const errorMessage = err instanceof Error ? err.message : "Unknown error occurred";
console.error(`Failed to impersonate user: ${errorMessage}`);
return false;
}
@@ -105,8 +94,7 @@ export function useAdminUsers() {
await authClient.admin.stopImpersonating();
return true;
} catch (err) {
- const errorMessage =
- err instanceof Error ? err.message : "Unknown error occurred";
+ const errorMessage = err instanceof Error ? err.message : "Unknown error occurred";
console.error(`Failed to stop impersonation: ${errorMessage}`);
return false;
}
diff --git a/client/src/hooks/useInView.ts b/client/src/hooks/useInView.ts
index 79863a6e4..8680baf97 100644
--- a/client/src/hooks/useInView.ts
+++ b/client/src/hooks/useInView.ts
@@ -8,9 +8,7 @@ interface UseInViewOptions extends IntersectionObserverInit {
persistVisibility?: boolean;
}
-export function useInView<T extends HTMLElement = HTMLDivElement>(
- options?: UseInViewOptions
-) {
+export function useInView<T extends HTMLElement = HTMLDivElement>(options?: UseInViewOptions) {
const { persistVisibility = true, ...observerOptions } = options || {};
const ref = useRef<T>(null);
const [isInView, setIsInView] = useState(false);
diff --git a/client/src/lib/auth.ts b/client/src/lib/auth.ts
index c226394a7..a7c142433 100644
--- a/client/src/lib/auth.ts
+++ b/client/src/lib/auth.ts
@@ -1,8 +1,4 @@
-import {
- adminClient,
- organizationClient,
- emailOTPClient,
-} from "better-auth/client/plugins";
+import { adminClient, organizationClient, emailOTPClient } from "better-auth/client/plugins";
import { createAuthClient } from "better-auth/react";
export const authClient = createAuthClient({
diff --git a/client/src/lib/countryPopulation.ts b/client/src/lib/countryPopulation.ts
index 74c705dc0..002cbeda1 100644
--- a/client/src/lib/countryPopulation.ts
+++ b/client/src/lib/countryPopulation.ts
@@ -208,7 +208,6 @@ export function getCountryPopulation(countryCode: string): number {
const normalizedCode = countryCode.slice(0, 2).toUpperCase();
// Use 1 million as default if country not found or has 0 pop
- const population =
- countryPopulations[normalizedCode] || countryPopulations.XX || 1;
+ const population = countryPopulations[normalizedCode] || countryPopulations.XX || 1;
return Math.max(population, 0.001); // Ensure a minimum population to avoid division by zero
}
diff --git a/client/src/lib/dateTimeUtils.ts b/client/src/lib/dateTimeUtils.ts
index f3feba433..1e9ca9f97 100644
--- a/client/src/lib/dateTimeUtils.ts
+++ b/client/src/lib/dateTimeUtils.ts
@@ -42,7 +42,7 @@ function getLocalizedWeekdayNames(locale: string, format: "narrow" | "short" | "
date.setDate(today.getDate() + ((day - today.getDay() + 7) % 7));
const parts = formatter.formatToParts(date);
- const weekday = parts.find((part) => part.type === "weekday");
+ const weekday = parts.find(part => part.type === "weekday");
return weekday?.value ?? fallback[format][i];
});
diff --git a/client/src/lib/geo.ts b/client/src/lib/geo.ts
index 2ca88fb14..2ffe468c2 100644
--- a/client/src/lib/geo.ts
+++ b/client/src/lib/geo.ts
@@ -5,11 +5,7 @@ export type { Subdivisions, Country } from "./geoStore";
// Hook-based access (for components that need reactive updates)
export const useSubdivisions = () => {
- const {
- subdivisions,
- isLoadingSubdivisions: isLoading,
- subdivisionsError: error,
- } = useGeoStore();
+ const { subdivisions, isLoadingSubdivisions: isLoading, subdivisionsError: error } = useGeoStore();
return {
data: subdivisions,
@@ -19,11 +15,7 @@ export const useSubdivisions = () => {
};
export const useCountries = () => {
- const {
- countries,
- isLoadingCountries: isLoading,
- countriesError: error,
- } = useGeoStore();
+ const { countries, isLoadingCountries: isLoading, countriesError: error } = useGeoStore();
return {
data: countries,
diff --git a/client/src/lib/geoStore.ts b/client/src/lib/geoStore.ts
index 954e6203e..52f21d23c 100644
--- a/client/src/lib/geoStore.ts
+++ b/client/src/lib/geoStore.ts
@@ -66,8 +66,7 @@ export const useGeoStore = create<GeoStore>((set, get) => ({
set({ subdivisions: data, isLoadingSubdivisions: false });
} catch (error) {
set({
- subdivisionsError:
- error instanceof Error ? error.message : "Unknown error",
+ subdivisionsError: error instanceof Error ? error.message : "Unknown error",
isLoadingSubdivisions: false,
});
}
@@ -82,8 +81,7 @@ export const useGeoStore = create<GeoStore>((set, get) => ({
set({ countries: data, isLoadingCountries: false });
} catch (error) {
set({
- countriesError:
- error instanceof Error ? error.message : "Unknown error",
+ countriesError: error instanceof Error ? error.message : "Unknown error",
isLoadingCountries: false,
});
}
@@ -91,11 +89,7 @@ export const useGeoStore = create<GeoStore>((set, get) => ({
getRegionName: (region: string) => {
const { subdivisions } = get();
- return (
- subdivisions?.features.find(
- (feature) => feature.properties.iso_3166_2 === region
- )?.properties.name ?? ""
- );
+ return subdivisions?.features.find(feature => feature.properties.iso_3166_2 === region)?.properties.name ?? "";
},
}));
diff --git a/client/src/lib/ipValidation.ts b/client/src/lib/ipValidation.ts
index 8518954c2..84d4dc696 100644
--- a/client/src/lib/ipValidation.ts
+++ b/client/src/lib/ipValidation.ts
@@ -21,11 +21,11 @@ export interface IPValidationResult {
export function validateIPPattern(pattern: string): IPValidationResult {
try {
const trimmedPattern = pattern.trim();
-
+
if (!trimmedPattern) {
return { valid: true }; // Empty is valid (will be filtered out)
}
-
+
// Single IP
if (!trimmedPattern.includes("/") && !trimmedPattern.includes("-")) {
return validateSingleIP(trimmedPattern);
@@ -91,7 +91,7 @@ function validateCIDR(cidr: string): IPValidationResult {
/**
* Validate range notation (IPv4 only)
- *
+ *
* NOTE: Range notation is only supported for IPv4 addresses.
* IPv6 range notation is not supported due to the complexity of proper
* numerical comparison of 128-bit addresses. Use CIDR notation instead
@@ -119,12 +119,12 @@ function validateRange(range: string): IPValidationResult {
try {
new Address6(startIP);
new Address6(endIP);
- return {
- valid: false,
- error: "IPv6 range notation not supported. Use CIDR notation instead (e.g., 2001:db8::/32)"
+ return {
+ valid: false,
+ error: "IPv6 range notation not supported. Use CIDR notation instead (e.g., 2001:db8::/32)",
};
} catch {
return { valid: false, error: "Invalid IP addresses in range" };
}
}
-}
\ No newline at end of file
+}
diff --git a/client/src/lib/store.ts b/client/src/lib/store.ts
index 698ee23f8..d0812c5d8 100644
--- a/client/src/lib/store.ts
+++ b/client/src/lib/store.ts
@@ -3,13 +3,7 @@ import { DateTime } from "luxon";
import { create } from "zustand";
import { Time } from "../components/DateSelector/types";
-export type StatType =
- | "pageviews"
- | "sessions"
- | "users"
- | "pages_per_session"
- | "bounce_rate"
- | "session_duration";
+export type StatType = "pageviews" | "sessions" | "users" | "pages_per_session" | "bounce_rate" | "session_duration";
export const SESSION_PAGE_FILTERS: FilterParameter[] = [
"hostname",
@@ -128,9 +122,9 @@ type Store = {
setFilters: (filters: Filter[]) => void;
};
-export const useStore = create<Store>((set) => ({
+export const useStore = create<Store>(set => ({
site: "",
- setSite: (site) => {
+ setSite: site => {
// Get current URL search params to check for stored state
let urlParams: URLSearchParams | null = null;
if (typeof window !== "undefined") {
@@ -143,7 +137,7 @@ export const useStore = create<Store>((set) => ({
const hasStatInUrl = urlParams?.has("stat");
// Only set defaults if not present in URL
- set((state) => ({
+ set(state => ({
site,
time: hasTimeInUrl
? state.time
@@ -192,11 +186,7 @@ export const useStore = create<Store>((set) => ({
pastMinutesEnd: time.pastMinutesEnd + timeDiff,
};
} else if (time.mode === "range") {
- const timeRangeLength =
- DateTime.fromISO(time.endDate).diff(
- DateTime.fromISO(time.startDate),
- "days"
- ).days + 1;
+ const timeRangeLength = DateTime.fromISO(time.endDate).diff(DateTime.fromISO(time.startDate), "days").days + 1;
if (timeRangeLength > 180) {
bucketToUse = "month";
@@ -208,12 +198,8 @@ export const useStore = create<Store>((set) => ({
previousTime = {
mode: "range",
- startDate:
- DateTime.fromISO(time.startDate)
- .minus({ days: timeRangeLength })
- .toISODate() ?? "",
- endDate:
- DateTime.fromISO(time.startDate).minus({ days: 1 }).toISODate() ?? "",
+ startDate: DateTime.fromISO(time.startDate).minus({ days: timeRangeLength }).toISODate() ?? "",
+ endDate: DateTime.fromISO(time.startDate).minus({ days: 1 }).toISODate() ?? "",
};
} else if (time.mode === "week") {
bucketToUse = "day";
@@ -225,8 +211,7 @@ export const useStore = create<Store>((set) => ({
bucketToUse = "day";
previousTime = {
mode: "month",
- month:
- DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
+ month: DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
};
} else if (time.mode === "year") {
bucketToUse = "month";
@@ -250,16 +235,15 @@ export const useStore = create<Store>((set) => ({
}
},
bucket: "hour",
- setBucket: (bucket) => set({ bucket }),
+ setBucket: bucket => set({ bucket }),
selectedStat: "users",
- setSelectedStat: (stat) => set({ selectedStat: stat }),
+ setSelectedStat: stat => set({ selectedStat: stat }),
filters: [],
- setFilters: (filters) => set({ filters }),
+ setFilters: filters => set({ filters }),
}));
export const resetStore = () => {
- const { setSite, setTime, setBucket, setSelectedStat, setFilters } =
- useStore.getState();
+ const { setSite, setTime, setBucket, setSelectedStat, setFilters } = useStore.getState();
setSite("");
setTime({ mode: "day", day: DateTime.now().toISODate() });
setBucket("hour");
@@ -287,8 +271,7 @@ export const goBack = () => {
setTime(
{
mode: "range",
- startDate:
- startDate.minus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
+ startDate: startDate.minus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
endDate: startDate.toISODate() ?? "",
},
false
@@ -305,8 +288,7 @@ export const goBack = () => {
setTime(
{
mode: "month",
- month:
- DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
+ month: DateTime.fromISO(time.month).minus({ months: 1 }).toISODate() ?? "",
},
false
);
@@ -345,8 +327,7 @@ export const goForward = () => {
setTime(
{
mode: "range",
- startDate:
- startDate.plus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
+ startDate: startDate.plus({ days: daysBetweenStartAndEnd }).toISODate() ?? "",
// Cap the end date at today
endDate: proposedEndDate.toISODate() ?? "",
},
@@ -364,8 +345,7 @@ export const goForward = () => {
setTime(
{
mode: "month",
- month:
- DateTime.fromISO(time.month).plus({ months: 1 }).toISODate() ?? "",
+ month: DateTime.fromISO(time.month).plus({ months: 1 }).toISODate() ?? "",
},
false
);
@@ -383,7 +363,7 @@ export const goForward = () => {
export const addFilter = (filter: Filter) => {
const { filters, setFilters } = useStore.getState();
const filterExists = filters.some(
- (f) =>
+ f =>
f.parameter === filter.parameter &&
f.type === filter.type &&
JSON.stringify(f.value) === JSON.stringify(filter.value)
@@ -395,7 +375,7 @@ export const addFilter = (filter: Filter) => {
export const removeFilter = (filter: Filter) => {
const { filters, setFilters } = useStore.getState();
- setFilters(filters.filter((f) => f !== filter));
+ setFilters(filters.filter(f => f !== filter));
};
export const updateFilter = (filter: Filter, index: number) => {
@@ -405,5 +385,5 @@ export const updateFilter = (filter: Filter, index: number) => {
export const getFilteredFilters = (parameters: FilterParameter[]) => {
const { filters } = useStore.getState();
- return filters.filter((f) => parameters.includes(f.parameter));
+ return filters.filter(f => parameters.includes(f.parameter));
};
diff --git a/client/src/lib/stripe.ts b/client/src/lib/stripe.ts
index f064912fe..2b3922b63 100644
--- a/client/src/lib/stripe.ts
+++ b/client/src/lib/stripe.ts
@@ -148,7 +148,7 @@ export const getStripePrices = () => {
if (process.env.NEXT_PUBLIC_BACKEND_URL?.includes("app.rybbit.io")) {
return STRIPE_PRICES;
}
- return STRIPE_PRICES.map((price) => ({
+ return STRIPE_PRICES.map(price => ({
...price,
priceId: TEST_TO_PRICE_ID[price.name as keyof typeof TEST_TO_PRICE_ID],
}));
diff --git a/client/src/lib/subscription/useStripeSubscription.ts b/client/src/lib/subscription/useStripeSubscription.ts
index bd7b319ee..0cf1a7a7a 100644
--- a/client/src/lib/subscription/useStripeSubscription.ts
+++ b/client/src/lib/subscription/useStripeSubscription.ts
@@ -25,16 +25,13 @@ export function useStripeSubscription() {
return null;
}
- const response = await fetch(
- `${BACKEND_URL}/stripe/subscription?organizationId=${activeOrg.id}`,
- {
- method: "GET",
- headers: {
- "Content-Type": "application/json",
- },
- credentials: "include",
- }
- );
+ const response = await fetch(`${BACKEND_URL}/stripe/subscription?organizationId=${activeOrg.id}`, {
+ method: "GET",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ credentials: "include",
+ });
if (!response.ok) {
if (response.status === 401) {
diff --git a/client/src/lib/userStore.ts b/client/src/lib/userStore.ts
index 992823795..acf096f5a 100644
--- a/client/src/lib/userStore.ts
+++ b/client/src/lib/userStore.ts
@@ -7,11 +7,11 @@ export const userStore = create<{
isPending: boolean;
setSession: (user: User) => void;
setIsPending: (isPending: boolean) => void;
-}>((set) => ({
+}>(set => ({
user: null,
isPending: true,
- setSession: (user) => set({ user }),
- setIsPending: (isPending) => set({ isPending }),
+ setSession: user => set({ user }),
+ setIsPending: isPending => set({ isPending }),
}));
authClient.getSession().then(({ data: session }) => {
diff --git a/client/src/lib/utils.ts b/client/src/lib/utils.ts
index 5973fd363..ca8850fa0 100644
--- a/client/src/lib/utils.ts
+++ b/client/src/lib/utils.ts
@@ -27,7 +27,7 @@ export function formatSecondsAsMinutesAndSeconds(value: number) {
}
}
-export const sleep = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
+export const sleep = (ms: number) => new Promise(resolve => setTimeout(resolve, ms));
export const getCountryName = (countryCode: string) => {
return countries[countryCode as keyof typeof countries]?.name;
diff --git a/client/src/providers/QueryProvider.tsx b/client/src/providers/QueryProvider.tsx
index 0d1b30873..a8d56c903 100644
--- a/client/src/providers/QueryProvider.tsx
+++ b/client/src/providers/QueryProvider.tsx
@@ -4,11 +4,7 @@ import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
import { ReactQueryDevtools } from "@tanstack/react-query-devtools";
import { useState } from "react";
-export default function QueryProvider({
- children,
-}: {
- children: React.ReactNode;
-}) {
+export default function QueryProvider({ children }: { children: React.ReactNode }) {
const [queryClient] = useState(() => new QueryClient());
return (
diff --git a/docs-v2/src/components/GitHubStarButton.tsx b/docs-v2/src/components/GitHubStarButton.tsx
index 1011b353f..3bff580ea 100644
--- a/docs-v2/src/components/GitHubStarButton.tsx
+++ b/docs-v2/src/components/GitHubStarButton.tsx
@@ -50,4 +50,4 @@ export function GitHubStarButton() {
</a>
</div>
);
-}
\ No newline at end of file
+}
diff --git a/server/package-lock.json b/server/package-lock.json
index cf1a563ca..92f9f2d2e 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "rybbit-backend",
- "version": "1.5.1",
+ "version": "1.6.1",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "rybbit-backend",
- "version": "1.5.1",
+ "version": "1.6.1",
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
"@axiomhq/pino": "^1.3.1",
@@ -54,6 +54,7 @@
"jsdom": "^26.1.0",
"knip": "^5.60.2",
"pino-pretty": "^13.1.1",
+ "prettier": "^3.6.2",
"terser": "^5.40.0",
"typescript": "^5.8.3",
"vitest": "^3.2.2"
@@ -2798,6 +2799,21 @@
"react-dom": "^18.0 || ^19.0 || ^19.0.0-rc"
}
},
+ "node_modules/@react-email/render/node_modules/prettier": {
+ "version": "3.5.3",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
+ "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+ "license": "MIT",
+ "bin": {
+ "prettier": "bin/prettier.cjs"
+ },
+ "engines": {
+ "node": ">=14"
+ },
+ "funding": {
+ "url": "https://github.com/prettier/prettier?sponsor=1"
+ }
+ },
"node_modules/@rollup/rollup-android-arm-eabi": {
"version": "4.42.0",
"resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.42.0.tgz",
@@ -7126,9 +7142,11 @@
}
},
"node_modules/prettier": {
- "version": "3.5.3",
- "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz",
- "integrity": "sha512-QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==",
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+ "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+ "dev": true,
+ "license": "MIT",
"bin": {
"prettier": "bin/prettier.cjs"
},
diff --git a/server/package.json b/server/package.json
index ee0fbdc77..2710adf47 100644
--- a/server/package.json
+++ b/server/package.json
@@ -18,7 +18,9 @@
"db:pull": "drizzle-kit pull --config=drizzle.config.ts",
"db:drop": "drizzle-kit drop --config=drizzle.config.ts",
"db:check": "drizzle-kit check --config=drizzle.config.ts",
- "knip": "knip"
+ "knip": "knip",
+ "format": "prettier --write \"src/**/*.{js,ts,json,md}\"",
+ "format:check": "prettier --check \"src/**/*.{js,ts,json,md}\""
},
"dependencies": {
"@aws-sdk/client-s3": "^3.842.0",
@@ -67,6 +69,7 @@
"jsdom": "^26.1.0",
"knip": "^5.60.2",
"pino-pretty": "^13.1.1",
+ "prettier": "^3.6.2",
"terser": "^5.40.0",
"typescript": "^5.8.3",
"vitest": "^3.2.2"
diff --git a/server/src/analytics-script/build.js b/server/src/analytics-script/build.js
index 65790ad2e..7b38ccf31 100644
--- a/server/src/analytics-script/build.js
+++ b/server/src/analytics-script/build.js
@@ -1,12 +1,12 @@
-import { build } from 'esbuild';
-import { existsSync, mkdirSync } from 'fs';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
+import { build } from "esbuild";
+import { existsSync, mkdirSync } from "fs";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
const __dirname = dirname(fileURLToPath(import.meta.url));
// Ensure public directory exists
-const publicDir = '../../public';
+const publicDir = "../../public";
if (!existsSync(publicDir)) {
mkdirSync(publicDir, { recursive: true });
}
@@ -15,35 +15,35 @@ async function buildScript() {
try {
// Build the full version
await build({
- entryPoints: ['./index.ts'],
+ entryPoints: ["./index.ts"],
bundle: true,
- format: 'iife',
- target: 'es2020',
- outfile: '../../public/script-full.js',
+ format: "iife",
+ target: "es2020",
+ outfile: "../../public/script-full.js",
minify: false,
sourcemap: false,
- platform: 'browser',
+ platform: "browser",
});
- console.log('✅ Built script-full.js');
+ console.log("✅ Built script-full.js");
// Build the minified version
await build({
- entryPoints: ['./index.ts'],
+ entryPoints: ["./index.ts"],
bundle: true,
- format: 'iife',
- target: 'es2020',
- outfile: '../../public/script.js',
+ format: "iife",
+ target: "es2020",
+ outfile: "../../public/script.js",
minify: true,
sourcemap: false,
- platform: 'browser',
+ platform: "browser",
});
- console.log('✅ Built script.js (minified)');
+ console.log("✅ Built script.js (minified)");
} catch (error) {
- console.error('Build failed:', error);
+ console.error("Build failed:", error);
process.exit(1);
}
}
-buildScript();
\ No newline at end of file
+buildScript();
diff --git a/server/src/analytics-script/config.test.ts b/server/src/analytics-script/config.test.ts
index a0213a614..d5731cdc9 100644
--- a/server/src/analytics-script/config.test.ts
+++ b/server/src/analytics-script/config.test.ts
@@ -15,10 +15,7 @@ describe("parseScriptConfig", () => {
});
it("should parse valid configuration", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
const config = parseScriptConfig(mockScriptTag);
@@ -52,38 +49,25 @@ describe("parseScriptConfig", () => {
mockScriptTag.setAttribute("src", "/script.js"); // No host part
const config = parseScriptConfig(mockScriptTag);
expect(config).toBeNull();
- expect(consoleSpy).toHaveBeenCalledWith(
- "Please provide a valid analytics host"
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Please provide a valid analytics host");
});
it("should handle missing site ID", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
const config = parseScriptConfig(mockScriptTag);
expect(config).toBeNull();
- expect(consoleSpy).toHaveBeenCalledWith(
- "Please provide a valid site ID using the data-site-id attribute"
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Please provide a valid site ID using the data-site-id attribute");
});
it("should handle invalid site ID", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "not-a-number");
const config = parseScriptConfig(mockScriptTag);
expect(config).toBeNull();
});
it("should parse custom debounce duration", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
mockScriptTag.setAttribute("data-debounce", "1000");
@@ -92,10 +76,7 @@ describe("parseScriptConfig", () => {
});
it("should handle negative debounce duration", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
mockScriptTag.setAttribute("data-debounce", "-100");
@@ -104,10 +85,7 @@ describe("parseScriptConfig", () => {
});
it("should parse boolean flags correctly", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
mockScriptTag.setAttribute("data-auto-track-pageview", "false");
mockScriptTag.setAttribute("data-track-spa", "false");
@@ -122,40 +100,25 @@ describe("parseScriptConfig", () => {
});
it("should parse skip patterns", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
- mockScriptTag.setAttribute(
- "data-skip-patterns",
- '["/admin/**", "/api/**"]'
- );
+ mockScriptTag.setAttribute("data-skip-patterns", '["/admin/**", "/api/**"]');
const config = parseScriptConfig(mockScriptTag);
expect(config?.skipPatterns).toEqual(["/admin/**", "/api/**"]);
});
it("should parse mask patterns", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
- mockScriptTag.setAttribute(
- "data-mask-patterns",
- '["/user/*/profile", "/post/*"]'
- );
+ mockScriptTag.setAttribute("data-mask-patterns", '["/user/*/profile", "/post/*"]');
const config = parseScriptConfig(mockScriptTag);
expect(config?.maskPatterns).toEqual(["/user/*/profile", "/post/*"]);
});
it("should handle invalid JSON in patterns gracefully", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
mockScriptTag.setAttribute("data-skip-patterns", "invalid-json");
@@ -164,10 +127,7 @@ describe("parseScriptConfig", () => {
});
it("should support legacy site-id attribute", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("site-id", "456");
const config = parseScriptConfig(mockScriptTag);
@@ -175,10 +135,7 @@ describe("parseScriptConfig", () => {
});
it("should enable web vitals when data-web-vitals is true", () => {
- mockScriptTag.setAttribute(
- "src",
- "https://analytics.example.com/script.js"
- );
+ mockScriptTag.setAttribute("src", "https://analytics.example.com/script.js");
mockScriptTag.setAttribute("data-site-id", "123");
mockScriptTag.setAttribute("data-web-vitals", "true");
diff --git a/server/src/analytics-script/index.ts b/server/src/analytics-script/index.ts
index 7eebf3098..4ea83d53b 100644
--- a/server/src/analytics-script/index.ts
+++ b/server/src/analytics-script/index.ts
@@ -19,10 +19,7 @@ declare global {
}
// Check if user has opted out
- if (
- window.__RYBBIT_OPTOUT__ ||
- localStorage.getItem("disable-rybbit") !== null
- ) {
+ if (window.__RYBBIT_OPTOUT__ || localStorage.getItem("disable-rybbit") !== null) {
// Create no-op implementation
window.rybbit = {
pageview: () => {},
@@ -50,18 +47,16 @@ declare global {
// Initialize web vitals if enabled
if (config.enableWebVitals) {
- const webVitalsCollector = new WebVitalsCollector(
- (vitals: WebVitalsData) => {
- tracker.trackWebVitals(vitals);
- }
- );
+ const webVitalsCollector = new WebVitalsCollector((vitals: WebVitalsData) => {
+ tracker.trackWebVitals(vitals);
+ });
webVitalsCollector.initialize();
}
// Initialize error tracking if enabled
if (config.trackErrors) {
// Global error handler for uncaught errors
- window.addEventListener("error", (event) => {
+ window.addEventListener("error", event => {
tracker.trackError(event.error || new Error(event.message), {
filename: event.filename,
lineno: event.lineno,
@@ -70,11 +65,8 @@ declare global {
});
// Global handler for unhandled promise rejections
- window.addEventListener("unhandledrejection", (event) => {
- const error =
- event.reason instanceof Error
- ? event.reason
- : new Error(String(event.reason));
+ window.addEventListener("unhandledrejection", event => {
+ const error = event.reason instanceof Error ? event.reason : new Error(String(event.reason));
tracker.trackError(error, {
type: "unhandledrejection",
});
@@ -84,9 +76,7 @@ declare global {
// Create debounced pageview tracker
const trackPageview = () => tracker.trackPageview();
const debouncedTrackPageview =
- config!.debounceDuration > 0
- ? debounce(trackPageview, config!.debounceDuration)
- : trackPageview;
+ config!.debounceDuration > 0 ? debounce(trackPageview, config!.debounceDuration) : trackPageview;
// Setup event listeners
function setupEventListeners() {
@@ -115,15 +105,9 @@ declare global {
// Check for outbound links
if (config!.trackOutbound) {
- const link = (e.target as HTMLElement).closest(
- "a"
- ) as HTMLAnchorElement;
+ const link = (e.target as HTMLElement).closest("a") as HTMLAnchorElement;
if (link?.href && isOutboundLink(link.href)) {
- tracker.trackOutbound(
- link.href,
- link.innerText || link.textContent || "",
- link.target || "_self"
- );
+ tracker.trackOutbound(link.href, link.innerText || link.textContent || "", link.target || "_self");
}
}
});
@@ -159,10 +143,8 @@ declare global {
// Setup public API
window.rybbit = {
pageview: () => tracker.trackPageview(),
- event: (name: string, properties: Record<string, any> = {}) =>
- tracker.trackEvent(name, properties),
- error: (error: Error, properties: ErrorProperties = {}) =>
- tracker.trackError(error, properties),
+ event: (name: string, properties: Record<string, any> = {}) => tracker.trackEvent(name, properties),
+ error: (error: Error, properties: ErrorProperties = {}) => tracker.trackError(error, properties),
trackOutbound: (url: string, text: string = "", target: string = "_self") =>
tracker.trackOutbound(url, text, target),
identify: (userId: string) => tracker.identify(userId),
diff --git a/server/src/analytics-script/sessionReplay.ts b/server/src/analytics-script/sessionReplay.ts
index 9c609060d..bacf5d4a5 100644
--- a/server/src/analytics-script/sessionReplay.ts
+++ b/server/src/analytics-script/sessionReplay.ts
@@ -1,8 +1,4 @@
-import {
- ScriptConfig,
- SessionReplayEvent,
- SessionReplayBatch,
-} from "./types.js";
+import { ScriptConfig, SessionReplayEvent, SessionReplayBatch } from "./types.js";
// rrweb types (simplified for our use case)
declare global {
@@ -32,11 +28,7 @@ export class SessionReplayRecorder {
private batchTimer?: number;
private sendBatch: (batch: SessionReplayBatch) => Promise<void>;
- constructor(
- config: ScriptConfig,
- userId: string,
- sendBatch: (batch: SessionReplayBatch) => Promise<void>
- ) {
+ constructor(config: ScriptConfig, userId: string, sendBatch: (batch: SessionReplayBatch) => Promise<void>) {
this.config = config;
this.userId = userId;
this.sendBatch = sendBatch;
@@ -78,7 +70,7 @@ export class SessionReplayRecorder {
try {
this.stopRecordingFn = window.rrweb.record({
- emit: (event) => {
+ emit: event => {
this.addEvent({
type: event.type,
data: event.data,
diff --git a/server/src/analytics-script/tracking.test.ts b/server/src/analytics-script/tracking.test.ts
index 2ba1c319b..940d37045 100644
--- a/server/src/analytics-script/tracking.test.ts
+++ b/server/src/analytics-script/tracking.test.ts
@@ -182,23 +182,17 @@ describe("Tracker", () => {
})
);
- const body = JSON.parse(
- vi.mocked(global.fetch).mock.calls[0][1]!.body as string
- );
+ const body = JSON.parse(vi.mocked(global.fetch).mock.calls[0][1]!.body as string);
expect(body.event_name).toBe("button_click");
expect(body.properties).toBe(JSON.stringify({ button: "submit" }));
});
it("should validate custom event name", () => {
- const consoleSpy = vi
- .spyOn(console, "error")
- .mockImplementation(() => {});
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
tracker.trackEvent("", {});
expect(global.fetch).not.toHaveBeenCalled();
- expect(consoleSpy).toHaveBeenCalledWith(
- "Event name is required and must be a string for custom events"
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Event name is required and must be a string for custom events");
consoleSpy.mockRestore();
});
@@ -206,9 +200,7 @@ describe("Tracker", () => {
it("should track outbound link", async () => {
tracker.trackOutbound("https://external.com", "External Link", "_blank");
- const body = JSON.parse(
- vi.mocked(global.fetch).mock.calls[0][1]!.body as string
- );
+ const body = JSON.parse(vi.mocked(global.fetch).mock.calls[0][1]!.body as string);
expect(body.type).toBe("outbound");
expect(body.properties).toBe(
JSON.stringify({
@@ -230,9 +222,7 @@ describe("Tracker", () => {
tracker.trackWebVitals(vitals);
- const body = JSON.parse(
- vi.mocked(global.fetch).mock.calls[0][1]!.body as string
- );
+ const body = JSON.parse(vi.mocked(global.fetch).mock.calls[0][1]!.body as string);
expect(body.type).toBe("performance");
expect(body.event_name).toBe("web-vitals");
expect(body.lcp).toBe(2500);
@@ -240,20 +230,15 @@ describe("Tracker", () => {
});
it("should handle fetch errors gracefully", async () => {
- const consoleSpy = vi
- .spyOn(console, "error")
- .mockImplementation(() => {});
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
vi.mocked(global.fetch).mockRejectedValue(new Error("Network error"));
tracker.trackPageview();
// Wait for async operation
- await new Promise((resolve) => setTimeout(resolve, 0));
+ await new Promise(resolve => setTimeout(resolve, 0));
- expect(consoleSpy).toHaveBeenCalledWith(
- "Failed to send tracking data:",
- expect.any(Error)
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Failed to send tracking data:", expect.any(Error));
consoleSpy.mockRestore();
});
@@ -263,13 +248,10 @@ describe("Tracker", () => {
// Enable error tracking for this test
const errorConfig = { ...config, trackErrors: true };
const tracker = new Tracker(errorConfig);
- const sendSpy = vi
- .spyOn(tracker, "sendTrackingData")
- .mockResolvedValue();
+ const sendSpy = vi.spyOn(tracker, "sendTrackingData").mockResolvedValue();
const error = new Error("Test error");
- error.stack =
- "Error: Test error\n at https://example.com/app.js:10:5";
+ error.stack = "Error: Test error\n at https://example.com/app.js:10:5";
tracker.trackError(error, {
filename: "https://example.com/app.js",
@@ -289,9 +271,7 @@ describe("Tracker", () => {
it("should filter out third-party errors by filename", () => {
const errorConfig = { ...config, trackErrors: true };
const tracker = new Tracker(errorConfig);
- const sendSpy = vi
- .spyOn(tracker, "sendTrackingData")
- .mockResolvedValue();
+ const sendSpy = vi.spyOn(tracker, "sendTrackingData").mockResolvedValue();
// Mock window.location.origin to ensure we have a proper origin for comparison
Object.defineProperty(window, "location", {
@@ -319,13 +299,10 @@ describe("Tracker", () => {
it("should filter out third-party errors by stack trace", () => {
const errorConfig = { ...config, trackErrors: true };
const tracker = new Tracker(errorConfig);
- const sendSpy = vi
- .spyOn(tracker, "sendTrackingData")
- .mockResolvedValue();
+ const sendSpy = vi.spyOn(tracker, "sendTrackingData").mockResolvedValue();
const error = new Error("Third party error");
- error.stack =
- "Error: Third party error\n at https://ads.google.com/script.js:1:1";
+ error.stack = "Error: Third party error\n at https://ads.google.com/script.js:1:1";
tracker.trackError(error, {
lineno: 1,
@@ -338,13 +315,9 @@ describe("Tracker", () => {
it("should track errors with unknown origin (e.g., NetworkError)", () => {
const errorConfig = { ...config, trackErrors: true };
const tracker = new Tracker(errorConfig);
- const sendSpy = vi
- .spyOn(tracker, "sendTrackingData")
- .mockResolvedValue();
+ const sendSpy = vi.spyOn(tracker, "sendTrackingData").mockResolvedValue();
- const error = new Error(
- "NetworkError when attempting to fetch resource"
- );
+ const error = new Error("NetworkError when attempting to fetch resource");
error.name = "TypeError";
// Clear stack to avoid test environment paths
error.stack = undefined;
@@ -365,13 +338,10 @@ describe("Tracker", () => {
it("should handle invalid filename URLs gracefully", () => {
const errorConfig = { ...config, trackErrors: true };
const tracker = new Tracker(errorConfig);
- const sendSpy = vi
- .spyOn(tracker, "sendTrackingData")
- .mockResolvedValue();
+ const sendSpy = vi.spyOn(tracker, "sendTrackingData").mockResolvedValue();
const error = new Error("Test error");
- error.stack =
- "Error: Test error\n at https://example.com/app.js:10:5";
+ error.stack = "Error: Test error\n at https://example.com/app.js:10:5";
tracker.trackError(error, {
filename: "invalid-url",
@@ -395,23 +365,16 @@ describe("Tracker", () => {
it("should identify user", () => {
tracker.identify("user-456");
- expect(window.localStorage.setItem).toHaveBeenCalledWith(
- "rybbit-user-id",
- "user-456"
- );
+ expect(window.localStorage.setItem).toHaveBeenCalledWith("rybbit-user-id", "user-456");
expect(tracker.getUserId()).toBe("user-456");
});
it("should validate user ID", () => {
- const consoleSpy = vi
- .spyOn(console, "error")
- .mockImplementation(() => {});
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
tracker.identify("");
expect(window.localStorage.setItem).not.toHaveBeenCalled();
- expect(consoleSpy).toHaveBeenCalledWith(
- "User ID must be a non-empty string"
- );
+ expect(consoleSpy).toHaveBeenCalledWith("User ID must be a non-empty string");
consoleSpy.mockRestore();
});
@@ -420,9 +383,7 @@ describe("Tracker", () => {
tracker.identify("user-789");
tracker.clearUserId();
- expect(window.localStorage.removeItem).toHaveBeenCalledWith(
- "rybbit-user-id"
- );
+ expect(window.localStorage.removeItem).toHaveBeenCalledWith("rybbit-user-id");
expect(tracker.getUserId()).toBeNull();
});
@@ -433,9 +394,7 @@ describe("Tracker", () => {
});
tracker.identify("user-123");
- expect(consoleSpy).toHaveBeenCalledWith(
- "Could not persist user ID to localStorage"
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Could not persist user ID to localStorage");
consoleSpy.mockRestore();
});
diff --git a/server/src/analytics-script/tracking.ts b/server/src/analytics-script/tracking.ts
index 4218ab4f3..238e9fed0 100644
--- a/server/src/analytics-script/tracking.ts
+++ b/server/src/analytics-script/tracking.ts
@@ -1,10 +1,4 @@
-import {
- BasePayload,
- ScriptConfig,
- TrackingPayload,
- WebVitalsData,
- SessionReplayBatch,
-} from "./types.js";
+import { BasePayload, ScriptConfig, TrackingPayload, WebVitalsData, SessionReplayBatch } from "./types.js";
import { findMatchingPattern } from "./utils.js";
import { SessionReplayRecorder } from "./sessionReplay.js";
@@ -35,10 +29,8 @@ export class Tracker {
private async initializeSessionReplay(): Promise<void> {
try {
- this.sessionReplayRecorder = new SessionReplayRecorder(
- this.config,
- this.customUserId || "",
- (batch) => this.sendSessionReplayBatch(batch)
+ this.sessionReplayRecorder = new SessionReplayRecorder(this.config, this.customUserId || "", batch =>
+ this.sendSessionReplayBatch(batch)
);
await this.sessionReplayRecorder.initialize();
} catch (error) {
@@ -46,27 +38,22 @@ export class Tracker {
}
}
- private async sendSessionReplayBatch(
- batch: SessionReplayBatch
- ): Promise<void> {
+ private async sendSessionReplayBatch(batch: SessionReplayBatch): Promise<void> {
try {
// Include API key if configured
if (this.config.apiKey) {
batch.apiKey = this.config.apiKey;
}
-
- await fetch(
- `${this.config.analyticsHost}/session-replay/record/${this.config.siteId}`,
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify(batch),
- mode: "cors",
- keepalive: false, // Disable keepalive for large session replay requests
- }
- );
+
+ await fetch(`${this.config.analyticsHost}/session-replay/record/${this.config.siteId}`, {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify(batch),
+ mode: "cors",
+ keepalive: false, // Disable keepalive for large session replay requests
+ });
} catch (error) {
console.error("Failed to send session replay batch:", error);
throw error;
@@ -133,18 +120,9 @@ export class Tracker {
}
}
- track(
- eventType: TrackingPayload["type"],
- eventName: string = "",
- properties: Record<string, any> = {}
- ): void {
- if (
- eventType === "custom_event" &&
- (!eventName || typeof eventName !== "string")
- ) {
- console.error(
- "Event name is required and must be a string for custom events"
- );
+ track(eventType: TrackingPayload["type"], eventName: string = "", properties: Record<string, any> = {}): void {
+ if (eventType === "custom_event" && (!eventName || typeof eventName !== "string")) {
+ console.error("Event name is required and must be a string for custom events");
return;
}
@@ -158,9 +136,7 @@ export class Tracker {
type: eventType,
event_name: eventName,
properties:
- eventType === "custom_event" ||
- eventType === "outbound" ||
- eventType === "error"
+ eventType === "custom_event" || eventType === "outbound" || eventType === "error"
? JSON.stringify(properties)
: undefined,
};
@@ -176,11 +152,7 @@ export class Tracker {
this.track("custom_event", name, properties);
}
- trackOutbound(
- url: string,
- text: string = "",
- target: string = "_self"
- ): void {
+ trackOutbound(url: string, text: string = "", target: string = "_self"): void {
this.track("outbound", "", { url, text, target });
}
@@ -242,9 +214,7 @@ export class Tracker {
if (additionalInfo.lineno) {
const lineNum =
- typeof additionalInfo.lineno === "string"
- ? parseInt(additionalInfo.lineno, 10)
- : additionalInfo.lineno;
+ typeof additionalInfo.lineno === "string" ? parseInt(additionalInfo.lineno, 10) : additionalInfo.lineno;
if (lineNum && lineNum !== 0) {
errorProperties.lineNumber = lineNum;
}
@@ -252,9 +222,7 @@ export class Tracker {
if (additionalInfo.colno) {
const colNum =
- typeof additionalInfo.colno === "string"
- ? parseInt(additionalInfo.colno, 10)
- : additionalInfo.colno;
+ typeof additionalInfo.colno === "string" ? parseInt(additionalInfo.colno, 10) : additionalInfo.colno;
if (colNum && colNum !== 0) {
errorProperties.columnNumber = colNum;
}
@@ -262,10 +230,7 @@ export class Tracker {
// Add any other additional info
for (const key in additionalInfo) {
- if (
- !["lineno", "colno"].includes(key) &&
- additionalInfo[key] !== undefined
- ) {
+ if (!["lineno", "colno"].includes(key) && additionalInfo[key] !== undefined) {
errorProperties[key] = additionalInfo[key];
}
}
diff --git a/server/src/analytics-script/tsconfig.json b/server/src/analytics-script/tsconfig.json
index a2d304c61..775051c46 100644
--- a/server/src/analytics-script/tsconfig.json
+++ b/server/src/analytics-script/tsconfig.json
@@ -12,12 +12,6 @@
"noEmit": true,
"types": ["vitest/globals"]
},
- "include": [
- "*.ts"
- ],
- "exclude": [
- "node_modules",
- "*.test.ts",
- "build.js"
- ]
-}
\ No newline at end of file
+ "include": ["*.ts"],
+ "exclude": ["node_modules", "*.test.ts", "build.js"]
+}
diff --git a/server/src/analytics-script/utils.test.ts b/server/src/analytics-script/utils.test.ts
index 4e3ff1352..41dc2ce88 100644
--- a/server/src/analytics-script/utils.test.ts
+++ b/server/src/analytics-script/utils.test.ts
@@ -1,63 +1,63 @@
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { patternToRegex, findMatchingPattern, debounce, isOutboundLink, parseJsonSafely } from './utils.js';
-
-describe('utils', () => {
- describe('patternToRegex', () => {
- it('should convert simple wildcards', () => {
- const regex = patternToRegex('/api/*/users');
- expect(regex.test('/api/v1/users')).toBe(true);
- expect(regex.test('/api/v2/users')).toBe(true);
- expect(regex.test('/api/v1/v2/users')).toBe(false);
- });
-
- it('should convert double wildcards', () => {
- const regex = patternToRegex('/api/**/users');
- expect(regex.test('/api/v1/users')).toBe(true);
- expect(regex.test('/api/v1/v2/users')).toBe(true);
- expect(regex.test('/api/users')).toBe(true); // ** can match empty path
-
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest";
+import { patternToRegex, findMatchingPattern, debounce, isOutboundLink, parseJsonSafely } from "./utils.js";
+
+describe("utils", () => {
+ describe("patternToRegex", () => {
+ it("should convert simple wildcards", () => {
+ const regex = patternToRegex("/api/*/users");
+ expect(regex.test("/api/v1/users")).toBe(true);
+ expect(regex.test("/api/v2/users")).toBe(true);
+ expect(regex.test("/api/v1/v2/users")).toBe(false);
+ });
+
+ it("should convert double wildcards", () => {
+ const regex = patternToRegex("/api/**/users");
+ expect(regex.test("/api/v1/users")).toBe(true);
+ expect(regex.test("/api/v1/v2/users")).toBe(true);
+ expect(regex.test("/api/users")).toBe(true); // ** can match empty path
+
// Test ** at beginning
- const regex2 = patternToRegex('/**/users');
- expect(regex2.test('/users')).toBe(true);
- expect(regex2.test('/api/users')).toBe(true);
- expect(regex2.test('/api/v1/users')).toBe(true);
+ const regex2 = patternToRegex("/**/users");
+ expect(regex2.test("/users")).toBe(true);
+ expect(regex2.test("/api/users")).toBe(true);
+ expect(regex2.test("/api/v1/users")).toBe(true);
});
- it('should escape special regex characters', () => {
- const regex = patternToRegex('/api/users.json');
- expect(regex.test('/api/users.json')).toBe(true);
- expect(regex.test('/api/usersXjson')).toBe(false);
+ it("should escape special regex characters", () => {
+ const regex = patternToRegex("/api/users.json");
+ expect(regex.test("/api/users.json")).toBe(true);
+ expect(regex.test("/api/usersXjson")).toBe(false);
});
- it('should handle complex patterns', () => {
- const regex = patternToRegex('/api/*/users/**/*.json');
- expect(regex.test('/api/v1/users/123/profile.json')).toBe(true);
- expect(regex.test('/api/v1/users/admin/settings/config.json')).toBe(true);
- expect(regex.test('/api/v1/posts/123/data.json')).toBe(false);
+ it("should handle complex patterns", () => {
+ const regex = patternToRegex("/api/*/users/**/*.json");
+ expect(regex.test("/api/v1/users/123/profile.json")).toBe(true);
+ expect(regex.test("/api/v1/users/admin/settings/config.json")).toBe(true);
+ expect(regex.test("/api/v1/posts/123/data.json")).toBe(false);
});
});
- describe('findMatchingPattern', () => {
- const patterns = ['/api/*/users', '/admin/**', '*.json'];
+ describe("findMatchingPattern", () => {
+ const patterns = ["/api/*/users", "/admin/**", "*.json"];
- it('should find matching pattern', () => {
- expect(findMatchingPattern('/api/v1/users', patterns)).toBe('/api/*/users');
- expect(findMatchingPattern('/admin/settings/general', patterns)).toBe('/admin/**');
+ it("should find matching pattern", () => {
+ expect(findMatchingPattern("/api/v1/users", patterns)).toBe("/api/*/users");
+ expect(findMatchingPattern("/admin/settings/general", patterns)).toBe("/admin/**");
});
- it('should return null for no match', () => {
- expect(findMatchingPattern('/public/images/logo.png', patterns)).toBe(null);
+ it("should return null for no match", () => {
+ expect(findMatchingPattern("/public/images/logo.png", patterns)).toBe(null);
});
- it('should handle invalid patterns gracefully', () => {
- const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
- const invalidPatterns = ['[invalid'];
- expect(findMatchingPattern('/test', invalidPatterns)).toBe(null);
+ it("should handle invalid patterns gracefully", () => {
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+ const invalidPatterns = ["[invalid"];
+ expect(findMatchingPattern("/test", invalidPatterns)).toBe(null);
consoleSpy.mockRestore();
});
});
- describe('debounce', () => {
+ describe("debounce", () => {
beforeEach(() => {
vi.useFakeTimers();
});
@@ -66,22 +66,22 @@ describe('utils', () => {
vi.restoreAllMocks();
});
- it('should debounce function calls', () => {
+ it("should debounce function calls", () => {
const fn = vi.fn();
const debouncedFn = debounce(fn, 100);
- debouncedFn('a');
- debouncedFn('b');
- debouncedFn('c');
+ debouncedFn("a");
+ debouncedFn("b");
+ debouncedFn("c");
expect(fn).not.toHaveBeenCalled();
vi.advanceTimersByTime(100);
expect(fn).toHaveBeenCalledOnce();
- expect(fn).toHaveBeenCalledWith('c');
+ expect(fn).toHaveBeenCalledWith("c");
});
- it('should reset timer on each call', () => {
+ it("should reset timer on each call", () => {
const fn = vi.fn();
const debouncedFn = debounce(fn, 100);
@@ -89,61 +89,61 @@ describe('utils', () => {
vi.advanceTimersByTime(50);
debouncedFn();
vi.advanceTimersByTime(50);
-
+
expect(fn).not.toHaveBeenCalled();
-
+
vi.advanceTimersByTime(50);
expect(fn).toHaveBeenCalledOnce();
});
});
- describe('isOutboundLink', () => {
+ describe("isOutboundLink", () => {
beforeEach(() => {
// Mock window.location
- Object.defineProperty(window, 'location', {
+ Object.defineProperty(window, "location", {
value: {
- hostname: 'example.com'
+ hostname: "example.com",
},
- writable: true
+ writable: true,
});
});
- it('should detect outbound links', () => {
- expect(isOutboundLink('https://external.com/page')).toBe(true);
- expect(isOutboundLink('http://another-site.org')).toBe(true);
+ it("should detect outbound links", () => {
+ expect(isOutboundLink("https://external.com/page")).toBe(true);
+ expect(isOutboundLink("http://another-site.org")).toBe(true);
});
- it('should detect internal links', () => {
- expect(isOutboundLink('https://example.com/page')).toBe(false);
- expect(isOutboundLink('/relative/path')).toBe(false);
+ it("should detect internal links", () => {
+ expect(isOutboundLink("https://example.com/page")).toBe(false);
+ expect(isOutboundLink("/relative/path")).toBe(false);
});
- it('should handle invalid URLs', () => {
- expect(isOutboundLink('not-a-url')).toBe(false);
- expect(isOutboundLink('')).toBe(false);
+ it("should handle invalid URLs", () => {
+ expect(isOutboundLink("not-a-url")).toBe(false);
+ expect(isOutboundLink("")).toBe(false);
});
});
- describe('parseJsonSafely', () => {
- it('should parse valid JSON', () => {
- expect(parseJsonSafely('["a", "b"]', [])).toEqual(['a', 'b']);
- expect(parseJsonSafely('{"key": "value"}', {})).toEqual({ key: 'value' });
+ describe("parseJsonSafely", () => {
+ it("should parse valid JSON", () => {
+ expect(parseJsonSafely('["a", "b"]', [])).toEqual(["a", "b"]);
+ expect(parseJsonSafely('{"key": "value"}', {})).toEqual({ key: "value" });
});
- it('should return fallback for invalid JSON', () => {
- const consoleSpy = vi.spyOn(console, 'error').mockImplementation(() => {});
- expect(parseJsonSafely('invalid', [])).toEqual([]);
- expect(parseJsonSafely('{invalid}', {})).toEqual({});
+ it("should return fallback for invalid JSON", () => {
+ const consoleSpy = vi.spyOn(console, "error").mockImplementation(() => {});
+ expect(parseJsonSafely("invalid", [])).toEqual([]);
+ expect(parseJsonSafely("{invalid}", {})).toEqual({});
consoleSpy.mockRestore();
});
- it('should return fallback for null/empty values', () => {
- expect(parseJsonSafely(null, ['default'])).toEqual(['default']);
- expect(parseJsonSafely('', { default: true })).toEqual({ default: true });
+ it("should return fallback for null/empty values", () => {
+ expect(parseJsonSafely(null, ["default"])).toEqual(["default"]);
+ expect(parseJsonSafely("", { default: true })).toEqual({ default: true });
});
- it('should enforce array type when fallback is array', () => {
+ it("should enforce array type when fallback is array", () => {
expect(parseJsonSafely('{"not": "array"}', [])).toEqual([]);
});
});
-});
\ No newline at end of file
+});
diff --git a/server/src/analytics-script/utils.ts b/server/src/analytics-script/utils.ts
index fed76289a..2fbc0ef17 100644
--- a/server/src/analytics-script/utils.ts
+++ b/server/src/analytics-script/utils.ts
@@ -2,31 +2,29 @@
* Convert wildcard pattern to regex
*/
export function patternToRegex(pattern: string): RegExp {
- const DOUBLE_WILDCARD_TOKEN = '__DOUBLE_ASTERISK_TOKEN__';
- const SINGLE_WILDCARD_TOKEN = '__SINGLE_ASTERISK_TOKEN__';
+ const DOUBLE_WILDCARD_TOKEN = "__DOUBLE_ASTERISK_TOKEN__";
+ const SINGLE_WILDCARD_TOKEN = "__SINGLE_ASTERISK_TOKEN__";
// Replace wildcards with tokens
- let tokenized = pattern
- .replace(/\*\*/g, DOUBLE_WILDCARD_TOKEN)
- .replace(/\*/g, SINGLE_WILDCARD_TOKEN);
+ let tokenized = pattern.replace(/\*\*/g, DOUBLE_WILDCARD_TOKEN).replace(/\*/g, SINGLE_WILDCARD_TOKEN);
// Escape special regex characters (except our tokens)
- let escaped = tokenized.replace(/[.+?^${}()|[\]\\]/g, '\\$&');
+ let escaped = tokenized.replace(/[.+?^${}()|[\]\\]/g, "\\$&");
// Handle ** patterns specially before escaping slashes
// Replace /**/ with a pattern that matches / or /anything/
- escaped = escaped.replace(new RegExp(`/${DOUBLE_WILDCARD_TOKEN}/`, 'g'), '/(?:.+/)?');
-
+ escaped = escaped.replace(new RegExp(`/${DOUBLE_WILDCARD_TOKEN}/`, "g"), "/(?:.+/)?");
+
// Replace remaining ** (at start or end)
- escaped = escaped.replace(new RegExp(DOUBLE_WILDCARD_TOKEN, 'g'), '.*');
+ escaped = escaped.replace(new RegExp(DOUBLE_WILDCARD_TOKEN, "g"), ".*");
// Now escape forward slashes
- escaped = escaped.replace(/\//g, '\\/');
+ escaped = escaped.replace(/\//g, "\\/");
// Replace single wildcards
- let regexPattern = escaped.replace(new RegExp(SINGLE_WILDCARD_TOKEN, 'g'), '[^/]+');
+ let regexPattern = escaped.replace(new RegExp(SINGLE_WILDCARD_TOKEN, "g"), "[^/]+");
- return new RegExp('^' + regexPattern + '$');
+ return new RegExp("^" + regexPattern + "$");
}
/**
@@ -49,12 +47,9 @@ export function findMatchingPattern(path: string, patterns: string[]): string |
/**
* Debounce function implementation
*/
-export function debounce<T extends (...args: any[]) => any>(
- func: T,
- wait: number
-): (...args: Parameters<T>) => void {
+export function debounce<T extends (...args: any[]) => any>(func: T, wait: number): (...args: Parameters<T>) => void {
let timeout: NodeJS.Timeout | null = null;
-
+
return (...args: Parameters<T>) => {
if (timeout) {
clearTimeout(timeout);
@@ -70,7 +65,7 @@ export function isOutboundLink(url: string): boolean {
try {
const currentHost = window.location.hostname;
const linkHost = new URL(url).hostname;
- return linkHost !== currentHost && linkHost !== '';
+ return linkHost !== currentHost && linkHost !== "";
} catch (e) {
return false;
}
@@ -85,7 +80,7 @@ export function parseJsonSafely<T>(value: string | null, fallback: T): T {
const parsed = JSON.parse(value);
return Array.isArray(fallback) && !Array.isArray(parsed) ? fallback : parsed;
} catch (e) {
- console.error('Error parsing JSON:', e);
+ console.error("Error parsing JSON:", e);
return fallback;
}
-}
\ No newline at end of file
+}
diff --git a/server/src/analytics-script/webVitals.test.ts b/server/src/analytics-script/webVitals.test.ts
index 4850247f6..17b20a323 100644
--- a/server/src/analytics-script/webVitals.test.ts
+++ b/server/src/analytics-script/webVitals.test.ts
@@ -23,19 +23,19 @@ describe("WebVitalsCollector", () => {
mockMetricCallbacks = new Map();
// Setup mocks to capture callbacks
- vi.mocked(onLCP).mockImplementation((callback) => {
+ vi.mocked(onLCP).mockImplementation(callback => {
mockMetricCallbacks.set(onLCP, callback);
});
- vi.mocked(onCLS).mockImplementation((callback) => {
+ vi.mocked(onCLS).mockImplementation(callback => {
mockMetricCallbacks.set(onCLS, callback);
});
- vi.mocked(onINP).mockImplementation((callback) => {
+ vi.mocked(onINP).mockImplementation(callback => {
mockMetricCallbacks.set(onINP, callback);
});
- vi.mocked(onFCP).mockImplementation((callback) => {
+ vi.mocked(onFCP).mockImplementation(callback => {
mockMetricCallbacks.set(onFCP, callback);
});
- vi.mocked(onTTFB).mockImplementation((callback) => {
+ vi.mocked(onTTFB).mockImplementation(callback => {
mockMetricCallbacks.set(onTTFB, callback);
});
@@ -153,10 +153,7 @@ describe("WebVitalsCollector", () => {
collector.initialize();
- expect(consoleSpy).toHaveBeenCalledWith(
- "Error initializing web vitals tracking:",
- expect.any(Error)
- );
+ expect(consoleSpy).toHaveBeenCalledWith("Error initializing web vitals tracking:", expect.any(Error));
consoleSpy.mockRestore();
});
diff --git a/server/src/analytics-script/webVitals.ts b/server/src/analytics-script/webVitals.ts
index dba2a309e..2ba3c8fa4 100644
--- a/server/src/analytics-script/webVitals.ts
+++ b/server/src/analytics-script/webVitals.ts
@@ -54,9 +54,7 @@ export class WebVitalsCollector {
this.data[metricName] = metric.value;
// Check if all metrics are collected
- const allCollected = Object.values(this.data).every(
- (value) => value !== null
- );
+ const allCollected = Object.values(this.data).every(value => value !== null);
if (allCollected) {
this.sendData();
}
diff --git a/server/src/api/admin/collectTelemetry.ts b/server/src/api/admin/collectTelemetry.ts
index d64cc9eda..a7617ea4e 100644
--- a/server/src/api/admin/collectTelemetry.ts
+++ b/server/src/api/admin/collectTelemetry.ts
@@ -40,4 +40,4 @@ export async function collectTelemetry(
console.error("Error collecting telemetry:", error);
return reply.status(500).send({ error: "Failed to collect telemetry" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/admin/getAdminOrganizations.ts b/server/src/api/admin/getAdminOrganizations.ts
index df25a1a2b..3fa91cba4 100644
--- a/server/src/api/admin/getAdminOrganizations.ts
+++ b/server/src/api/admin/getAdminOrganizations.ts
@@ -87,7 +87,7 @@ export async function getAdminOrganizations(request: FastifyRequest, reply: Fast
}
// Get all sites for all organizations
- const allOrgIds = organizationsData.map((org) => org.id);
+ const allOrgIds = organizationsData.map(org => org.id);
const orgSites = await db
.select({
siteId: sites.siteId,
@@ -153,7 +153,7 @@ export async function getAdminOrganizations(request: FastifyRequest, reply: Fast
const orgSubscriptionMap = await getOrganizationSubscriptions(organizationsData, true);
// Build the final response with subscription data
- const enrichedOrganizations: AdminOrganizationData[] = organizationsData.map((org) => {
+ const enrichedOrganizations: AdminOrganizationData[] = organizationsData.map(org => {
const subscriptionData = orgSubscriptionMap.get(org.id)!; // Non-null assertion since service always returns data
return {
diff --git a/server/src/api/admin/getAdminSites.ts b/server/src/api/admin/getAdminSites.ts
index 7f58e3dd4..5d853431b 100644
--- a/server/src/api/admin/getAdminSites.ts
+++ b/server/src/api/admin/getAdminSites.ts
@@ -13,7 +13,6 @@ interface EventCountResult {
total_events: number;
}
-
export async function getAdminSites(request: FastifyRequest, reply: FastifyReply) {
const isAdmin = await getIsUserAdmin(request);
@@ -106,7 +105,7 @@ export async function getAdminSites(request: FastifyRequest, reply: FastifyReply
}
// Combine all data
- const enrichedSites = sitesData.map((site) => {
+ const enrichedSites = sitesData.map(site => {
const subscription = site.organizationId
? orgSubscriptionMap.get(site.organizationId)
: { planName: "free", status: "free" };
diff --git a/server/src/api/analytics/events/getEventNames.ts b/server/src/api/analytics/events/getEventNames.ts
index 8f5e73521..d6b85b8c3 100644
--- a/server/src/api/analytics/events/getEventNames.ts
+++ b/server/src/api/analytics/events/getEventNames.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getTimeStatement,
- processResults,
- getFilterStatement,
-} from "../utils.js";
+import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -22,18 +18,8 @@ export interface GetEventNamesRequest {
}>;
}
-export async function getEventNames(
- req: FastifyRequest<GetEventNamesRequest>,
- res: FastifyReply
-) {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+export async function getEventNames(req: FastifyRequest<GetEventNamesRequest>, res: FastifyReply) {
+ const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
diff --git a/server/src/api/analytics/events/getEventProperties.ts b/server/src/api/analytics/events/getEventProperties.ts
index 5a9fb0d6e..024dc0b4f 100644
--- a/server/src/api/analytics/events/getEventProperties.ts
+++ b/server/src/api/analytics/events/getEventProperties.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getTimeStatement,
- processResults,
- getFilterStatement,
-} from "../utils.js";
+import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -23,19 +19,8 @@ export interface GetEventPropertiesRequest {
}>;
}
-export async function getEventProperties(
- req: FastifyRequest<GetEventPropertiesRequest>,
- res: FastifyReply
-) {
- const {
- startDate,
- endDate,
- timeZone,
- eventName,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+export async function getEventProperties(req: FastifyRequest<GetEventPropertiesRequest>, res: FastifyReply) {
+ const { startDate, endDate, timeZone, eventName, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
@@ -79,8 +64,7 @@ export async function getEventProperties(
},
});
- const data =
- await processResults<GetEventPropertiesResponse[number]>(result);
+ const data = await processResults<GetEventPropertiesResponse[number]>(result);
return res.send({ data });
} catch (error) {
console.error("Generated Query:", query);
diff --git a/server/src/api/analytics/events/getEvents.ts b/server/src/api/analytics/events/getEvents.ts
index 484ba3310..4e3dd8e2b 100644
--- a/server/src/api/analytics/events/getEvents.ts
+++ b/server/src/api/analytics/events/getEvents.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- processResults,
- getTimeStatement,
- getFilterStatement,
-} from "../utils.js";
+import { processResults, getTimeStatement, getFilterStatement } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -36,20 +32,9 @@ interface GetEventsRequest {
}>;
}
-export async function getEvents(
- req: FastifyRequest<GetEventsRequest>,
- res: FastifyReply
-) {
+export async function getEvents(req: FastifyRequest<GetEventsRequest>, res: FastifyReply) {
const { site } = req.params;
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- page = "1",
- pageSize = "20",
- count,
- } = req.query;
+ const { startDate, endDate, timeZone, filters, page = "1", pageSize = "20", count } = req.query;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
@@ -62,9 +47,7 @@ export async function getEvents(
// Get time and filter statements if parameters are provided
const timeStatement =
- startDate || endDate
- ? getTimeStatement(req.query)
- : "AND timestamp > now() - INTERVAL 30 MINUTE"; // Default to last 30 minutes if no time range specified
+ startDate || endDate ? getTimeStatement(req.query) : "AND timestamp > now() - INTERVAL 30 MINUTE"; // Default to last 30 minutes if no time range specified
const filterStatement = filters ? getFilterStatement(filters) : "";
@@ -129,8 +112,7 @@ export async function getEvents(
},
});
- const events =
- await processResults<GetEventsResponse[number]>(eventsResult);
+ const events = await processResults<GetEventsResponse[number]>(eventsResult);
return res.send({
data: events,
diff --git a/server/src/api/analytics/events/getOutboundLinks.ts b/server/src/api/analytics/events/getOutboundLinks.ts
index 8cea02832..a51f9773f 100644
--- a/server/src/api/analytics/events/getOutboundLinks.ts
+++ b/server/src/api/analytics/events/getOutboundLinks.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getTimeStatement,
- processResults,
- getFilterStatement,
-} from "../utils.js";
+import { getTimeStatement, processResults, getFilterStatement } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -21,18 +17,8 @@ export interface GetOutboundLinksRequest {
Querystring: FilterParams<{}>;
}
-export async function getOutboundLinks(
- req: FastifyRequest<GetOutboundLinksRequest>,
- res: FastifyReply
-) {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+export async function getOutboundLinks(req: FastifyRequest<GetOutboundLinksRequest>, res: FastifyReply) {
+ const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
@@ -70,9 +56,9 @@ export async function getOutboundLinks(
}
const rawData = await processResults<RawOutboundEvent>(result);
-
+
const urlCounts = new Map<string, { count: number; lastClicked: string }>();
-
+
rawData.forEach(event => {
try {
const props = JSON.parse(event.properties);
@@ -105,4 +91,4 @@ export async function getOutboundLinks(
console.error("Error fetching outbound links:", error);
return res.status(500).send({ error: "Failed to fetch outbound links" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/analytics/funnels/createFunnel.ts b/server/src/api/analytics/funnels/createFunnel.ts
index 33b4b16d2..109000d10 100644
--- a/server/src/api/analytics/funnels/createFunnel.ts
+++ b/server/src/api/analytics/funnels/createFunnel.ts
@@ -33,9 +33,7 @@ export async function createFunnel(
// Validate request
if (!steps || steps.length < 2) {
- return reply
- .status(400)
- .send({ error: "At least 2 steps are required for a funnel" });
+ return reply.status(400).send({ error: "At least 2 steps are required for a funnel" });
}
if (!name) {
@@ -62,9 +60,7 @@ export async function createFunnel(
}
if (existingFunnel.siteId !== Number(site)) {
- return reply
- .status(403)
- .send({ error: "Funnel does not belong to this site" });
+ return reply.status(403).send({ error: "Funnel does not belong to this site" });
}
// Update existing funnel
diff --git a/server/src/api/analytics/funnels/deleteFunnel.ts b/server/src/api/analytics/funnels/deleteFunnel.ts
index 88553cb2e..0f1467d4f 100644
--- a/server/src/api/analytics/funnels/deleteFunnel.ts
+++ b/server/src/api/analytics/funnels/deleteFunnel.ts
@@ -25,24 +25,17 @@ export async function deleteFunnel(
}
if (!funnel.siteId) {
- return reply
- .status(400)
- .send({ error: "Invalid funnel: missing site ID" });
+ return reply.status(400).send({ error: "Invalid funnel: missing site ID" });
}
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSite(
- request,
- funnel.siteId.toString()
- );
+ const userHasAccessToSite = await getUserHasAccessToSite(request, funnel.siteId.toString());
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
// Delete the funnel
- await db
- .delete(funnelsTable)
- .where(eq(funnelsTable.reportId, parseInt(funnelId)));
+ await db.delete(funnelsTable).where(eq(funnelsTable.reportId, parseInt(funnelId)));
return reply.status(200).send({ success: true });
} catch (error) {
diff --git a/server/src/api/analytics/funnels/getFunnel.ts b/server/src/api/analytics/funnels/getFunnel.ts
index 59dd1e871..565b56a25 100644
--- a/server/src/api/analytics/funnels/getFunnel.ts
+++ b/server/src/api/analytics/funnels/getFunnel.ts
@@ -1,12 +1,7 @@
import { FastifyRequest } from "fastify";
import { FastifyReply } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getTimeStatement,
- processResults,
- getFilterStatement,
- patternToRegex,
-} from "../utils.js";
+import { getTimeStatement, processResults, getFilterStatement, patternToRegex } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import SqlString from "sqlstring";
import { Filter } from "../types.js";
@@ -49,9 +44,7 @@ export async function getFunnel(
// Validate request
if (!steps || steps.length < 2) {
- return reply
- .status(400)
- .send({ error: "At least 2 steps are required for a funnel" });
+ return reply.status(400).send({ error: "At least 2 steps are required for a funnel" });
}
// Check user access to site
@@ -70,48 +63,33 @@ export async function getFunnel(
});
// Get filter conditions using the existing utility function
- const filterConditions =
- filters && filters.length > 0
- ? getFilterStatement(JSON.stringify(filters))
- : "";
+ const filterConditions = filters && filters.length > 0 ? getFilterStatement(JSON.stringify(filters)) : "";
// Build conditional statements for each step
- const stepConditions = steps.map((step) => {
+ const stepConditions = steps.map(step => {
if (step.type === "page") {
// Use pattern matching for page paths to support wildcards
- return `type = 'pageview' AND match(pathname, ${SqlString.escape(
- patternToRegex(step.value)
- )})`;
+ return `type = 'pageview' AND match(pathname, ${SqlString.escape(patternToRegex(step.value))})`;
} else {
// Start with the base event match condition
- let eventClause = `type = 'custom_event' AND event_name = ${SqlString.escape(
- step.value
- )}`;
+ let eventClause = `type = 'custom_event' AND event_name = ${SqlString.escape(step.value)}`;
// Add property matching if both key and value are provided
if (step.eventPropertyKey && step.eventPropertyValue !== undefined) {
// Access the sub-column directly for native JSON type
- const propValueAccessor = `props.${SqlString.escapeId(
- step.eventPropertyKey
- )}`;
+ const propValueAccessor = `props.${SqlString.escapeId(step.eventPropertyKey)}`;
// Comparison needs to handle the dynamic type returned
// Let ClickHouse handle the comparison based on the provided value type
if (typeof step.eventPropertyValue === "string") {
- eventClause += ` AND toString(${propValueAccessor}) = ${SqlString.escape(
- step.eventPropertyValue
- )}`;
+ eventClause += ` AND toString(${propValueAccessor}) = ${SqlString.escape(step.eventPropertyValue)}`;
} else if (typeof step.eventPropertyValue === "number") {
// Use toFloat64 or toInt* depending on expected number type
- eventClause += ` AND toFloat64OrNull(${propValueAccessor}) = ${SqlString.escape(
- step.eventPropertyValue
- )}`;
+ eventClause += ` AND toFloat64OrNull(${propValueAccessor}) = ${SqlString.escape(step.eventPropertyValue)}`;
} else if (typeof step.eventPropertyValue === "boolean") {
// Booleans might be stored as 0/1 or true/false in JSON
// Comparing toUInt8 seems robust
- eventClause += ` AND toUInt8OrNull(${propValueAccessor}) = ${
- step.eventPropertyValue ? 1 : 0
- }`;
+ eventClause += ` AND toUInt8OrNull(${propValueAccessor}) = ${step.eventPropertyValue ? 1 : 0}`;
}
}
@@ -218,8 +196,6 @@ export async function getFunnel(
return reply.send({ data });
} catch (error) {
console.error("Error executing funnel query:", error);
- return reply
- .status(500)
- .send({ error: "Failed to execute funnel analysis" });
+ return reply.status(500).send({ error: "Failed to execute funnel analysis" });
}
}
diff --git a/server/src/api/analytics/funnels/getFunnels.ts b/server/src/api/analytics/funnels/getFunnels.ts
index 7167bbb38..162e3ed8a 100644
--- a/server/src/api/analytics/funnels/getFunnels.ts
+++ b/server/src/api/analytics/funnels/getFunnels.ts
@@ -29,7 +29,7 @@ export async function getFunnels(
.orderBy(funnelsTable.createdAt);
// Transform the records to a more frontend-friendly structure
- const funnels = funnelRecords.map((record) => {
+ const funnels = funnelRecords.map(record => {
const data = record.data as any;
return {
id: record.reportId,
diff --git a/server/src/api/analytics/getErrorBucketed.ts b/server/src/api/analytics/getErrorBucketed.ts
index 2f2b0f16d..ebb1a7493 100644
--- a/server/src/api/analytics/getErrorBucketed.ts
+++ b/server/src/api/analytics/getErrorBucketed.ts
@@ -4,49 +4,27 @@ import SqlString from "sqlstring";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "./query-validation.js";
-import {
- getFilterStatement,
- getTimeStatement,
- TimeBucketToFn,
- bucketIntervalMap,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, TimeBucketToFn, bucketIntervalMap, processResults } from "./utils.js";
import { TimeBucket } from "./types.js";
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
- const { params: validatedParams, bucket: validatedBucket } =
- validateTimeStatementFillParams(params, bucket);
+ const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
- if (
- validatedParams.startDate &&
- validatedParams.endDate &&
- validatedParams.timeZone
- ) {
+ if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
const { startDate, endDate, timeZone } = validatedParams;
return `WITH FILL FROM ${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
- timeZone
- )}))
+ TimeBucketToFn[validatedBucket]
+ }(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)}))
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(
- timeZone
- )}),
- ${TimeBucketToFn[validatedBucket]}(toTimeZone(now(), ${SqlString.escape(
- timeZone
- )})),
- ${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
+ toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
+ ${TimeBucketToFn[validatedBucket]}(toTimeZone(now(), ${SqlString.escape(timeZone)})),
+ ${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
timeZone
)})) + INTERVAL 1 DAY
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (
- validatedParams.pastMinutesStart !== undefined &&
- validatedParams.pastMinutesEnd !== undefined
- ) {
+ if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
return `WITH FILL FROM now() - INTERVAL ${validatedParams.pastMinutesStart} MINUTE
TO now() - INTERVAL ${validatedParams.pastMinutesEnd} MINUTE
STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
@@ -70,17 +48,12 @@ export type GetErrorBucketedResponse = {
error_count: number;
}[];
-export async function getErrorBucketed(
- req: FastifyRequest<GetErrorBucketedRequest>,
- res: FastifyReply
-) {
+export async function getErrorBucketed(req: FastifyRequest<GetErrorBucketedRequest>, res: FastifyReply) {
const site = req.params.site;
const { bucket, errorMessage } = req.query;
if (!errorMessage) {
- return res
- .status(400)
- .send({ error: "errorMessage parameter is required" });
+ return res.status(400).send({ error: "errorMessage parameter is required" });
}
const numericSiteId = Number(site);
@@ -117,7 +90,7 @@ export async function getErrorBucketed(
query_params: {
siteId: numericSiteId,
errorMessage: errorMessage,
- timeZone: req.query.timeZone || 'UTC',
+ timeZone: req.query.timeZone || "UTC",
},
});
diff --git a/server/src/api/analytics/getErrorEvents.ts b/server/src/api/analytics/getErrorEvents.ts
index 63383b95b..6326fc062 100644
--- a/server/src/api/analytics/getErrorEvents.ts
+++ b/server/src/api/analytics/getErrorEvents.ts
@@ -1,11 +1,7 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
interface GetErrorEventsRequest {
@@ -50,21 +46,9 @@ type ErrorEventsPaginatedResponse = {
totalCount: number;
};
-const getErrorEventsQuery = (
- request: FastifyRequest<GetErrorEventsRequest>,
- isCountQuery: boolean = false
-) => {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- errorMessage,
- limit,
- page,
- pastMinutesStart,
- pastMinutesEnd,
- } = request.query;
+const getErrorEventsQuery = (request: FastifyRequest<GetErrorEventsRequest>, isCountQuery: boolean = false) => {
+ const { startDate, endDate, timeZone, filters, errorMessage, limit, page, pastMinutesStart, pastMinutesEnd } =
+ request.query;
const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
@@ -77,12 +61,7 @@ const getErrorEventsQuery = (
}
}
// Default to 20 for error events
- const limitStatement =
- !isCountQuery && validatedLimit
- ? `LIMIT ${validatedLimit}`
- : isCountQuery
- ? ""
- : "LIMIT 20";
+ const limitStatement = !isCountQuery && validatedLimit ? `LIMIT ${validatedLimit}` : isCountQuery ? "" : "LIMIT 20";
let validatedOffset: number | null = null;
if (!isCountQuery && page !== undefined) {
@@ -92,8 +71,7 @@ const getErrorEventsQuery = (
validatedOffset = pageOffset;
}
}
- const offsetStatement =
- !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
+ const offsetStatement = !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
if (isCountQuery) {
return `
@@ -154,10 +132,7 @@ const getErrorEventsQuery = (
`;
};
-export async function getErrorEvents(
- req: FastifyRequest<GetErrorEventsRequest>,
- res: FastifyReply
-) {
+export async function getErrorEvents(req: FastifyRequest<GetErrorEventsRequest>, res: FastifyReply) {
const site = req.params.site;
const { errorMessage, page } = req.query;
@@ -195,9 +170,7 @@ export async function getErrorEvents(
errorMessage: errorMessage,
},
});
- const countData = await processResults<{ totalCount: number }>(
- countResult
- );
+ const countData = await processResults<{ totalCount: number }>(countResult);
const totalCount = countData.length > 0 ? countData[0].totalCount : 0;
return res.send({ data: { data: items, totalCount } });
} else {
diff --git a/server/src/api/analytics/getErrorNames.ts b/server/src/api/analytics/getErrorNames.ts
index 6f6176797..fc62cd6dd 100644
--- a/server/src/api/analytics/getErrorNames.ts
+++ b/server/src/api/analytics/getErrorNames.ts
@@ -1,11 +1,7 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
interface GetErrorNamesRequest {
@@ -33,10 +29,7 @@ type ErrorNamesPaginatedResponse = {
totalCount: number;
};
-const getErrorNamesQuery = (
- request: FastifyRequest<GetErrorNamesRequest>,
- isCountQuery: boolean = false
-) => {
+const getErrorNamesQuery = (request: FastifyRequest<GetErrorNamesRequest>, isCountQuery: boolean = false) => {
const { filters, limit, page } = request.query;
const filterStatement = getFilterStatement(filters);
@@ -50,12 +43,7 @@ const getErrorNamesQuery = (
}
}
// Default to 10 for non-paginated use
- const limitStatement =
- !isCountQuery && validatedLimit
- ? `LIMIT ${validatedLimit}`
- : isCountQuery
- ? ""
- : "LIMIT 10";
+ const limitStatement = !isCountQuery && validatedLimit ? `LIMIT ${validatedLimit}` : isCountQuery ? "" : "LIMIT 10";
let validatedOffset: number | null = null;
if (!isCountQuery && page !== undefined) {
@@ -65,8 +53,7 @@ const getErrorNamesQuery = (
validatedOffset = pageOffset;
}
}
- const offsetStatement =
- !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
+ const offsetStatement = !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
// For errors, we want to count total occurrences and unique sessions affected
// Group by error message instead of error name
@@ -116,10 +103,7 @@ const getErrorNamesQuery = (
`;
};
-export async function getErrorNames(
- req: FastifyRequest<GetErrorNamesRequest>,
- res: FastifyReply
-) {
+export async function getErrorNames(req: FastifyRequest<GetErrorNamesRequest>, res: FastifyReply) {
const site = req.params.site;
const { page } = req.query;
@@ -151,9 +135,7 @@ export async function getErrorNames(
siteId: Number(site),
},
});
- const countData = await processResults<{ totalCount: number }>(
- countResult
- );
+ const countData = await processResults<{ totalCount: number }>(countResult);
const totalCount = countData.length > 0 ? countData[0].totalCount : 0;
return res.send({ data: { data: items, totalCount } });
} else {
diff --git a/server/src/api/analytics/getJourneys.ts b/server/src/api/analytics/getJourneys.ts
index 3cf280380..a8f07badc 100644
--- a/server/src/api/analytics/getJourneys.ts
+++ b/server/src/api/analytics/getJourneys.ts
@@ -16,13 +16,7 @@ export const getJourneys = async (
) => {
try {
const { site } = request.params;
- const {
- steps = "3",
- startDate,
- endDate,
- timeZone = "UTC",
- limit = "100",
- } = request.query;
+ const { steps = "3", startDate, endDate, timeZone = "UTC", limit = "100" } = request.query;
const maxSteps = parseInt(steps, 10);
const journeyLimit = parseInt(limit, 10);
diff --git a/server/src/api/analytics/getLiveSessionLocations.ts b/server/src/api/analytics/getLiveSessionLocations.ts
index 2533e7e87..3c320a4a0 100644
--- a/server/src/api/analytics/getLiveSessionLocations.ts
+++ b/server/src/api/analytics/getLiveSessionLocations.ts
@@ -31,9 +31,7 @@ WITH stuff AS (
events
WHERE
site_id = {site:Int32}
- AND timestamp > now() - interval ${SqlString.escape(
- Number(req.query.time)
- )} minute
+ AND timestamp > now() - interval ${SqlString.escape(Number(req.query.time))} minute
GROUP BY
session_id
)
diff --git a/server/src/api/analytics/getOrgEventCount.ts b/server/src/api/analytics/getOrgEventCount.ts
index 08eec29a1..adbd281c9 100644
--- a/server/src/api/analytics/getOrgEventCount.ts
+++ b/server/src/api/analytics/getOrgEventCount.ts
@@ -33,14 +33,10 @@ export async function getOrgEventCount(
const userSites = await getSitesUserHasAccessTo(req);
// Filter to only sites in the requested organization
- const orgSites = userSites.filter(
- (site) => site.organizationId === organizationId
- );
+ const orgSites = userSites.filter(site => site.organizationId === organizationId);
if (orgSites.length === 0) {
- return res
- .status(403)
- .send({ error: "No access to organization or no sites found" });
+ return res.status(403).send({ error: "No access to organization or no sites found" });
}
const siteIds = orgSites.map((site: any) => site.siteId);
@@ -106,8 +102,6 @@ export async function getOrgEventCount(
return res.send({ data });
} catch (error) {
console.error("Error fetching organization event count:", error);
- return res
- .status(500)
- .send({ error: "Failed to fetch organization event count" });
+ return res.status(500).send({ error: "Failed to fetch organization event count" });
}
}
diff --git a/server/src/api/analytics/getOverview.ts b/server/src/api/analytics/getOverview.ts
index 284e27a09..320e8b881 100644
--- a/server/src/api/analytics/getOverview.ts
+++ b/server/src/api/analytics/getOverview.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParameter } from "./types.js";
import { FilterParams } from "@rybbit/shared";
@@ -74,18 +70,8 @@ export interface OverviewRequest {
Querystring: FilterParams;
}
-export async function getOverview(
- req: FastifyRequest<OverviewRequest>,
- res: FastifyReply
-) {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+export async function getOverview(req: FastifyRequest<OverviewRequest>, res: FastifyReply) {
+ const { startDate, endDate, timeZone, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
diff --git a/server/src/api/analytics/getOverviewBucketed.ts b/server/src/api/analytics/getOverviewBucketed.ts
index 81fe10f8b..26087892e 100644
--- a/server/src/api/analytics/getOverviewBucketed.ts
+++ b/server/src/api/analytics/getOverviewBucketed.ts
@@ -4,43 +4,25 @@ import SqlString from "sqlstring";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "./query-validation.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
- TimeBucketToFn,
- bucketIntervalMap,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults, TimeBucketToFn, bucketIntervalMap } from "./utils.js";
import { TimeBucket } from "./types.js";
-
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
- const { params: validatedParams, bucket: validatedBucket } =
- validateTimeStatementFillParams(params, bucket);
-
- if (
- validatedParams.startDate &&
- validatedParams.endDate &&
- validatedParams.timeZone
- ) {
+ const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
+
+ if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
const { startDate, endDate, timeZone } = validatedParams;
return `WITH FILL FROM toTimeZone(
- toDateTime(${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
timeZone
)}))),
'UTC'
)
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(
- timeZone
- )}),
+ toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
now(),
toTimeZone(
- toDateTime(${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
timeZone
)}))) + INTERVAL 1 DAY,
'UTC'
@@ -48,10 +30,7 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (
- validatedParams.pastMinutesStart !== undefined &&
- validatedParams.pastMinutesEnd !== undefined
- ) {
+ if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
const { pastMinutesStart: start, pastMinutesEnd: end } = validatedParams;
// Calculate exact timestamps in JavaScript to avoid runtime ClickHouse calculations
@@ -60,10 +39,7 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
const endTimestamp = new Date(now.getTime() - end * 60 * 1000);
// Format as YYYY-MM-DD HH:MM:SS without milliseconds for ClickHouse
- const startIso = startTimestamp
- .toISOString()
- .slice(0, 19)
- .replace("T", " ");
+ const startIso = startTimestamp.toISOString().slice(0, 19).replace("T", " ");
const endIso = endTimestamp.toISOString().slice(0, 19).replace("T", " ");
return ` WITH FILL
@@ -91,15 +67,7 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
}
const getQuery = (params: FilterParams<{ bucket: TimeBucket }>) => {
- const {
- startDate,
- endDate,
- timeZone,
- bucket,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = params;
+ const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
const filterStatement = getFilterStatement(filters);
const pastMinutesRange =
@@ -121,9 +89,7 @@ SELECT
FROM
(
SELECT
- toDateTime(${
- TimeBucketToFn[bucket]
- }(toTimeZone(start_time, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(start_time, ${SqlString.escape(timeZone)}))) AS time,
COUNT() AS sessions,
AVG(pages_in_session) AS pages_per_session,
sumIf(1, pages_in_session = 1) / COUNT() AS bounce_rate,
@@ -144,16 +110,12 @@ FROM
AND type = 'pageview'
GROUP BY session_id
)
- GROUP BY time ORDER BY time ${
- isAllTime ? "" : getTimeStatementFill(params, bucket)
- }
+ GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}
) AS session_stats
FULL JOIN
(
SELECT
- toDateTime(${
- TimeBucketToFn[bucket]
- }(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
COUNT(*) AS pageviews,
COUNT(DISTINCT user_id) AS users
FROM events
@@ -162,9 +124,7 @@ FULL JOIN
${filterStatement}
${getTimeStatement(params)}
AND type = 'pageview'
- GROUP BY time ORDER BY time ${
- isAllTime ? "" : getTimeStatementFill(params, bucket)
- }
+ GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}
) AS page_stats
USING time
ORDER BY time`;
@@ -172,7 +132,6 @@ ORDER BY time`;
return query;
};
-
type getOverviewBucketed = { time: string; pageviews: number }[];
export async function getOverviewBucketed(
@@ -186,15 +145,7 @@ export async function getOverviewBucketed(
}>,
res: FastifyReply
) {
- const {
- startDate,
- endDate,
- timeZone,
- bucket,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = req.query;
+ const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
diff --git a/server/src/api/analytics/getPageTitles.ts b/server/src/api/analytics/getPageTitles.ts
index 7ef0ff3cb..97234f755 100644
--- a/server/src/api/analytics/getPageTitles.ts
+++ b/server/src/api/analytics/getPageTitles.ts
@@ -1,11 +1,7 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
interface GetPageTitlesRequest {
@@ -33,20 +29,8 @@ type PageTitlesPaginatedResponse = {
totalCount: number;
};
-const getPageTitlesQuery = (
- request: FastifyRequest<GetPageTitlesRequest>,
- isCountQuery: boolean = false
-) => {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- limit,
- page,
- pastMinutesStart,
- pastMinutesEnd,
- } = request.query;
+const getPageTitlesQuery = (request: FastifyRequest<GetPageTitlesRequest>, isCountQuery: boolean = false) => {
+ const { startDate, endDate, timeZone, filters, limit, page, pastMinutesStart, pastMinutesEnd } = request.query;
const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
@@ -59,12 +43,7 @@ const getPageTitlesQuery = (
}
}
// StandardSection usually shows a small number, e.g., 7 or 10. Let's default to 10 for non-paginated use.
- const limitStatement =
- !isCountQuery && validatedLimit
- ? `LIMIT ${validatedLimit}`
- : isCountQuery
- ? ""
- : "LIMIT 10";
+ const limitStatement = !isCountQuery && validatedLimit ? `LIMIT ${validatedLimit}` : isCountQuery ? "" : "LIMIT 10";
let validatedOffset: number | null = null;
if (!isCountQuery && page !== undefined) {
@@ -74,8 +53,7 @@ const getPageTitlesQuery = (
validatedOffset = pageOffset;
}
}
- const offsetStatement =
- !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
+ const offsetStatement = !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
// For page_title, we want to count distinct sessions that viewed this title.
// We also need a representative pathname and calculate average time on page.
@@ -143,10 +121,7 @@ const getPageTitlesQuery = (
`;
};
-export async function getPageTitles(
- req: FastifyRequest<GetPageTitlesRequest>,
- res: FastifyReply
-) {
+export async function getPageTitles(req: FastifyRequest<GetPageTitlesRequest>, res: FastifyReply) {
const site = req.params.site;
const { page } = req.query;
@@ -178,9 +153,7 @@ export async function getPageTitles(
siteId: Number(site),
},
});
- const countData = await processResults<{ totalCount: number }>(
- countResult
- );
+ const countData = await processResults<{ totalCount: number }>(countResult);
const totalCount = countData.length > 0 ? countData[0].totalCount : 0;
return res.send({ data: { data: items, totalCount } });
} else {
diff --git a/server/src/api/analytics/getRetention.ts b/server/src/api/analytics/getRetention.ts
index 6773a7224..8a079f1e5 100644
--- a/server/src/api/analytics/getRetention.ts
+++ b/server/src/api/analytics/getRetention.ts
@@ -50,9 +50,7 @@ export const getRetention = async (
WITH UserFirstPeriod AS (
SELECT
user_id,
- ${periodFunction}(min(timestamp)${
- retentionMode === "week" ? ", 1" : ""
- }) AS cohort_period
+ ${periodFunction}(min(timestamp)${retentionMode === "week" ? ", 1" : ""}) AS cohort_period
FROM events
WHERE site_id = {siteId:UInt16}
-- Use the configurable time range
@@ -62,9 +60,7 @@ WITH UserFirstPeriod AS (
PeriodActivity AS (
SELECT DISTINCT
user_id,
- ${periodFunction}(timestamp${
- retentionMode === "week" ? ", 1" : ""
- }) AS activity_period
+ ${periodFunction}(timestamp${retentionMode === "week" ? ", 1" : ""}) AS activity_period
FROM events
WHERE site_id = {siteId:UInt16}
-- Match the date range filter
@@ -121,20 +117,15 @@ ORDER BY
};
// Process raw retention data into a grid-friendly format
-function processRetentionData(
- rawData: RetentionDataRow[]
-): Omit<ProcessedRetentionData, "mode" | "range"> {
+function processRetentionData(rawData: RetentionDataRow[]): Omit<ProcessedRetentionData, "mode" | "range"> {
if (!rawData || rawData.length === 0) {
return { cohorts: {}, maxPeriods: 0 };
}
- const processedCohorts: Record<
- string,
- { size: number; percentages: (number | null)[] }
- > = {};
+ const processedCohorts: Record<string, { size: number; percentages: (number | null)[] }> = {};
let maxPeriodDiff = 0;
- rawData.forEach((row) => {
+ rawData.forEach(row => {
if (!processedCohorts[row.cohort_period]) {
processedCohorts[row.cohort_period] = {
size: row.cohort_size,
@@ -142,14 +133,10 @@ function processRetentionData(
};
}
// Ensure array is long enough, filling gaps with null
- while (
- processedCohorts[row.cohort_period].percentages.length <=
- row.period_difference
- ) {
+ while (processedCohorts[row.cohort_period].percentages.length <= row.period_difference) {
processedCohorts[row.cohort_period].percentages.push(null);
}
- processedCohorts[row.cohort_period].percentages[row.period_difference] =
- row.retention_percentage;
+ processedCohorts[row.cohort_period].percentages[row.period_difference] = row.retention_percentage;
if (row.period_difference > maxPeriodDiff) {
maxPeriodDiff = row.period_difference;
@@ -159,7 +146,7 @@ function processRetentionData(
// Ensure all percentage arrays have the same length for grid alignment
const finalMaxPeriods = Math.max(maxPeriodDiff, 0);
- Object.values(processedCohorts).forEach((cohort) => {
+ Object.values(processedCohorts).forEach(cohort => {
// Ensure all cohorts have the same number of periods
while (cohort.percentages.length <= finalMaxPeriods) {
cohort.percentages.push(null);
diff --git a/server/src/api/analytics/getSession.ts b/server/src/api/analytics/getSession.ts
index a94c25953..b2f87e27f 100644
--- a/server/src/api/analytics/getSession.ts
+++ b/server/src/api/analytics/getSession.ts
@@ -63,10 +63,7 @@ export interface GetSessionRequest {
};
}
-export async function getSession(
- req: FastifyRequest<GetSessionRequest>,
- res: FastifyReply
-) {
+export async function getSession(req: FastifyRequest<GetSessionRequest>, res: FastifyReply) {
const { sessionId, site } = req.params;
const limit = req.query.limit ? parseInt(req.query.limit) : 100;
const offset = req.query.offset ? parseInt(req.query.offset) : 0;
@@ -78,9 +75,7 @@ export async function getSession(
}
// Add time filter if minutes is provided
- const timeFilter = minutes
- ? `timestamp > now() - interval ${minutes} minute`
- : "";
+ const timeFilter = minutes ? `timestamp > now() - interval ${minutes} minute` : "";
// Add the WHERE clause connector if timeFilter exists
const timeFilterWithConnector = timeFilter ? `AND ${timeFilter}` : "";
@@ -156,35 +151,34 @@ OFFSET {offset:Int32}
`;
// Execute queries in parallel
- const [sessionResultSettled, countResultSettled, eventsResultSettled] =
- await Promise.allSettled([
- clickhouse.query({
- query: sessionQuery,
- format: "JSONEachRow",
- query_params: {
- siteId: Number(site),
- sessionId,
- },
- }),
- clickhouse.query({
- query: countQuery,
- format: "JSONEachRow",
- query_params: {
- siteId: Number(site),
- sessionId,
- },
- }),
- clickhouse.query({
- query: eventsQuery,
- format: "JSONEachRow",
- query_params: {
- siteId: Number(site),
- sessionId,
- limit,
- offset,
- },
- }),
- ]);
+ const [sessionResultSettled, countResultSettled, eventsResultSettled] = await Promise.allSettled([
+ clickhouse.query({
+ query: sessionQuery,
+ format: "JSONEachRow",
+ query_params: {
+ siteId: Number(site),
+ sessionId,
+ },
+ }),
+ clickhouse.query({
+ query: countQuery,
+ format: "JSONEachRow",
+ query_params: {
+ siteId: Number(site),
+ sessionId,
+ },
+ }),
+ clickhouse.query({
+ query: eventsQuery,
+ format: "JSONEachRow",
+ query_params: {
+ siteId: Number(site),
+ sessionId,
+ limit,
+ offset,
+ },
+ }),
+ ]);
// Check if queries were successful
if (sessionResultSettled.status === "rejected") {
diff --git a/server/src/api/analytics/getSessions.ts b/server/src/api/analytics/getSessions.ts
index 42b357565..cdbc195cd 100644
--- a/server/src/api/analytics/getSessions.ts
+++ b/server/src/api/analytics/getSessions.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -50,10 +46,7 @@ export interface GetSessionsRequest {
}>;
}
-export async function getSessions(
- req: FastifyRequest<GetSessionsRequest>,
- res: FastifyReply
-) {
+export async function getSessions(req: FastifyRequest<GetSessionsRequest>, res: FastifyReply) {
const { filters, page, userId } = req.query;
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
diff --git a/server/src/api/analytics/getSingleCol.ts b/server/src/api/analytics/getSingleCol.ts
index 72a5c9aa8..b1cc8d7eb 100644
--- a/server/src/api/analytics/getSingleCol.ts
+++ b/server/src/api/analytics/getSingleCol.ts
@@ -2,12 +2,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParameter } from "./types.js";
-import {
- getFilterStatement,
- getSqlParam,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getSqlParam, getTimeStatement, processResults } from "./utils.js";
import { FilterParams } from "@rybbit/shared";
interface GetSingleColRequest {
@@ -52,21 +47,9 @@ type GetSingleColPaginatedResponse = {
totalCount: number;
};
-const getQuery = (
- request: FastifyRequest<GetSingleColRequest>,
- isCountQuery: boolean = false
-) => {
- const {
- startDate,
- endDate,
- timeZone,
- filters,
- parameter,
- limit,
- page,
- pastMinutesStart,
- pastMinutesEnd,
- } = request.query;
+const getQuery = (request: FastifyRequest<GetSingleColRequest>, isCountQuery: boolean = false) => {
+ const { startDate, endDate, timeZone, filters, parameter, limit, page, pastMinutesStart, pastMinutesEnd } =
+ request.query;
const filterStatement = getFilterStatement(filters);
const timeStatement = getTimeStatement(request.query);
@@ -78,12 +61,7 @@ const getQuery = (
validatedLimit = parsedLimit;
}
}
- const limitStatement =
- !isCountQuery && validatedLimit
- ? `LIMIT ${validatedLimit}`
- : isCountQuery
- ? ""
- : "LIMIT 100";
+ const limitStatement = !isCountQuery && validatedLimit ? `LIMIT ${validatedLimit}` : isCountQuery ? "" : "LIMIT 100";
let validatedOffset: number | null = null;
if (!isCountQuery && page !== undefined) {
@@ -93,8 +71,7 @@ const getQuery = (
validatedOffset = pageOffset;
}
}
- const offsetStatement =
- !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
+ const offsetStatement = !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
if (parameter === "event_name") {
if (isCountQuery) {
@@ -341,10 +318,7 @@ const getQuery = (
`;
};
-export async function getSingleCol(
- req: FastifyRequest<GetSingleColRequest>,
- res: FastifyReply
-) {
+export async function getSingleCol(req: FastifyRequest<GetSingleColRequest>, res: FastifyReply) {
const { parameter, page } = req.query;
const site = req.params.site;
diff --git a/server/src/api/analytics/getUserSessionCount.ts b/server/src/api/analytics/getUserSessionCount.ts
index d8f0b40b1..06170ee03 100644
--- a/server/src/api/analytics/getUserSessionCount.ts
+++ b/server/src/api/analytics/getUserSessionCount.ts
@@ -19,10 +19,7 @@ export type GetUserSessionCountResponse = {
sessions: number;
}[];
-export async function getUserSessionCount(
- req: FastifyRequest<GetUserSessionCountRequest>,
- res: FastifyReply
-) {
+export async function getUserSessionCount(req: FastifyRequest<GetUserSessionCountRequest>, res: FastifyReply) {
const { site } = req.params;
const { userId, timeZone = "UTC" } = req.query;
@@ -57,16 +54,13 @@ export async function getUserSessionCount(
},
});
- const data =
- await processResults<GetUserSessionCountResponse[number]>(result);
+ const data = await processResults<GetUserSessionCountResponse[number]>(result);
return res.send({
data,
});
} catch (error) {
console.error("Error fetching user session count:", error);
- return res
- .status(500)
- .send({ error: "Failed to fetch user session count" });
+ return res.status(500).send({ error: "Failed to fetch user session count" });
}
}
diff --git a/server/src/api/analytics/getUserSessions.ts b/server/src/api/analytics/getUserSessions.ts
index 181a7da7d..c35a4a2df 100644
--- a/server/src/api/analytics/getUserSessions.ts
+++ b/server/src/api/analytics/getUserSessions.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
// Individual pageview type
@@ -53,10 +49,7 @@ export interface GetUserSessionsRequest {
};
}
-export async function getUserSessions(
- req: FastifyRequest<GetUserSessionsRequest>,
- res: FastifyReply
-) {
+export async function getUserSessions(req: FastifyRequest<GetUserSessionsRequest>, res: FastifyReply) {
const { startDate, endDate, timeZone, site, filters } = req.query;
const userId = req.params.userId;
@@ -105,7 +98,7 @@ ORDER BY timestamp ASC
// Group pageviews by session
const sessions: Record<string, GroupedSession> = {};
- pageviews.forEach((pageview) => {
+ pageviews.forEach(pageview => {
const {
session_id,
timestamp,
@@ -151,15 +144,12 @@ ORDER BY timestamp ASC
});
// Sort pageviews by timestamp in descending order
- sessions[session_id].pageviews.sort(
- (a, b) =>
- new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime()
- );
+ sessions[session_id].pageviews.sort((a, b) => new Date(b.timestamp).getTime() - new Date(a.timestamp).getTime());
});
// Calculate duration for each session and convert to array
const groupedSessions = Object.values(sessions)
- .map((session) => {
+ .map(session => {
// Calculate duration in seconds
const firstTime = new Date(session.firstTimestamp).getTime();
const lastTime = new Date(session.lastTimestamp).getTime();
@@ -167,11 +157,7 @@ ORDER BY timestamp ASC
return session;
})
- .sort(
- (a, b) =>
- new Date(b.lastTimestamp).getTime() -
- new Date(a.lastTimestamp).getTime()
- );
+ .sort((a, b) => new Date(b.lastTimestamp).getTime() - new Date(a.lastTimestamp).getTime());
return res.send({ data: groupedSessions });
} catch (error) {
diff --git a/server/src/api/analytics/getUsers.ts b/server/src/api/analytics/getUsers.ts
index 83b5ab5ee..fa697fcce 100644
--- a/server/src/api/analytics/getUsers.ts
+++ b/server/src/api/analytics/getUsers.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "./utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "./utils.js";
import { getUserHasAccessToSitePublic } from "../../lib/auth-utils.js";
import { FilterParams } from "@rybbit/shared";
@@ -36,10 +32,7 @@ export interface GetUsersRequest {
}>;
}
-export async function getUsers(
- req: FastifyRequest<GetUsersRequest>,
- res: FastifyReply
-) {
+export async function getUsers(req: FastifyRequest<GetUsersRequest>, res: FastifyReply) {
const {
startDate,
endDate,
@@ -64,13 +57,7 @@ export async function getUsers(
const offset = (pageNum - 1) * pageSizeNum;
// Validate sort parameters
- const validSortFields = [
- "first_seen",
- "last_seen",
- "pageviews",
- "sessions",
- "events",
- ];
+ const validSortFields = ["first_seen", "last_seen", "pageviews", "sessions", "events"];
const actualSortBy = validSortFields.includes(sortBy) ? sortBy : "last_seen";
const actualSortOrder = sortOrder === "asc" ? "ASC" : "DESC";
@@ -144,9 +131,7 @@ WHERE
]);
const data = await processResults<GetUsersResponse[number]>(result);
- const countData = await processResults<{ total_count: number }>(
- countResult
- );
+ const countData = await processResults<{ total_count: number }>(countResult);
const totalCount = countData[0]?.total_count || 0;
return res.send({
diff --git a/server/src/api/analytics/goals/createGoal.ts b/server/src/api/analytics/goals/createGoal.ts
index dbbeeec09..6d4c28d7a 100644
--- a/server/src/api/analytics/goals/createGoal.ts
+++ b/server/src/api/analytics/goals/createGoal.ts
@@ -12,12 +12,10 @@ const eventConfigSchema = z
.object({
eventName: z.string().min(1, "Event name cannot be empty"),
eventPropertyKey: z.string().optional(),
- eventPropertyValue: z
- .union([z.string(), z.number(), z.boolean()])
- .optional(),
+ eventPropertyValue: z.union([z.string(), z.number(), z.boolean()]).optional(),
})
.refine(
- (data) => {
+ data => {
// If one property matching field is provided, both must be provided
if (data.eventPropertyKey && data.eventPropertyValue === undefined) {
return false;
@@ -28,8 +26,7 @@ const eventConfigSchema = z
return true;
},
{
- message:
- "Both eventPropertyKey and eventPropertyValue must be provided together or omitted together",
+ message: "Both eventPropertyKey and eventPropertyValue must be provided together or omitted together",
}
);
@@ -43,13 +40,11 @@ const goalSchema = z
pathPattern: z.string().optional(),
eventName: z.string().optional(),
eventPropertyKey: z.string().optional(),
- eventPropertyValue: z
- .union([z.string(), z.number(), z.boolean()])
- .optional(),
+ eventPropertyValue: z.union([z.string(), z.number(), z.boolean()]).optional(),
}),
})
.refine(
- (data) => {
+ data => {
if (data.goalType === "path") {
return !!data.config.pathPattern;
} else if (data.goalType === "event") {
@@ -77,10 +72,7 @@ export async function createGoal(
const { siteId, name, goalType, config } = validatedData;
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSite(
- request,
- siteId.toString()
- );
+ const userHasAccessToSite = await getUserHasAccessToSite(request, siteId.toString());
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/goals/deleteGoal.ts b/server/src/api/analytics/goals/deleteGoal.ts
index 033977cb4..961932c9f 100644
--- a/server/src/api/analytics/goals/deleteGoal.ts
+++ b/server/src/api/analytics/goals/deleteGoal.ts
@@ -25,10 +25,7 @@ export async function deleteGoal(
}
// Check user access to the site
- const userHasAccessToSite = await getUserHasAccessToSite(
- request,
- goalToDelete.siteId.toString()
- );
+ const userHasAccessToSite = await getUserHasAccessToSite(request, goalToDelete.siteId.toString());
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
diff --git a/server/src/api/analytics/goals/getGoals.ts b/server/src/api/analytics/goals/getGoals.ts
index bd6929b22..583f2f817 100644
--- a/server/src/api/analytics/goals/getGoals.ts
+++ b/server/src/api/analytics/goals/getGoals.ts
@@ -4,12 +4,7 @@ import { goals } from "../../../db/postgres/schema.js";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { eq, desc, asc, sql } from "drizzle-orm";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
- patternToRegex,
-} from "../utils.js";
+import { getFilterStatement, getTimeStatement, processResults, patternToRegex } from "../utils.js";
import SqlString from "sqlstring";
import { FilterParams } from "@rybbit/shared";
@@ -72,9 +67,7 @@ export async function getGoals(
}
if (isNaN(pageSizeNumber) || pageSizeNumber < 1 || pageSizeNumber > 100) {
- return reply
- .status(400)
- .send({ error: "Invalid page size, must be between 1 and 100" });
+ return reply.status(400).send({ error: "Invalid page size, must be between 1 and 100" });
}
// Check user access to site
@@ -164,9 +157,7 @@ export async function getGoals(
format: "JSONEachRow",
});
- const totalSessionsData = await processResults<{ total_sessions: number }>(
- totalSessionsResult
- );
+ const totalSessionsData = await processResults<{ total_sessions: number }>(totalSessionsResult);
const totalSessions = totalSessionsData[0]?.total_sessions || 0;
// Build a single query that calculates all goal conversions at once using conditional aggregation
@@ -193,34 +184,24 @@ export async function getGoals(
if (!eventName) continue;
- let eventClause = `type = 'custom_event' AND event_name = ${SqlString.escape(
- eventName
- )}`;
+ let eventClause = `type = 'custom_event' AND event_name = ${SqlString.escape(eventName)}`;
// Add property matching if needed
if (eventPropertyKey && eventPropertyValue !== undefined) {
// Access the sub-column directly for native JSON type
- const propValueAccessor = `props.${SqlString.escapeId(
- eventPropertyKey
- )}`;
+ const propValueAccessor = `props.${SqlString.escapeId(eventPropertyKey)}`;
// Comparison needs to handle the Dynamic type returned
// Let ClickHouse handle the comparison based on the provided value type
if (typeof eventPropertyValue === "string") {
- eventClause += ` AND toString(${propValueAccessor}) = ${SqlString.escape(
- eventPropertyValue
- )}`;
+ eventClause += ` AND toString(${propValueAccessor}) = ${SqlString.escape(eventPropertyValue)}`;
} else if (typeof eventPropertyValue === "number") {
// Use toFloat64 or toInt* depending on expected number type
- eventClause += ` AND toFloat64OrNull(${propValueAccessor}) = ${SqlString.escape(
- eventPropertyValue
- )}`;
+ eventClause += ` AND toFloat64OrNull(${propValueAccessor}) = ${SqlString.escape(eventPropertyValue)}`;
} else if (typeof eventPropertyValue === "boolean") {
// Booleans might be stored as 0/1 or true/false in JSON
// Comparing toUInt8 seems robust
- eventClause += ` AND toUInt8OrNull(${propValueAccessor}) = ${
- eventPropertyValue ? 1 : 0
- }`;
+ eventClause += ` AND toUInt8OrNull(${propValueAccessor}) = ${eventPropertyValue ? 1 : 0}`;
}
}
@@ -236,7 +217,7 @@ export async function getGoals(
if (conditionalClauses.length === 0) {
// If no valid goals to calculate, return the goals without conversion data
- const goalsWithZeroConversions = siteGoals.map((goal) => ({
+ const goalsWithZeroConversions = siteGoals.map(goal => ({
...goal,
total_conversions: 0,
total_sessions: totalSessions,
@@ -269,28 +250,23 @@ export async function getGoals(
format: "JSONEachRow",
});
- const conversionData =
- await processResults<Record<string, number>>(conversionResult);
+ const conversionData = await processResults<Record<string, number>>(conversionResult);
// If we didn't get any results, use zeros
const conversions = conversionData[0] || {};
// Combine goals data with conversion metrics
- const goalsWithConversions: GoalWithConversions[] = siteGoals.map(
- (goal) => {
- const totalConversions =
- conversions[`goal_${goal.goalId}_conversions`] || 0;
- const conversionRate =
- totalSessions > 0 ? totalConversions / totalSessions : 0;
-
- return {
- ...goal,
- total_conversions: totalConversions,
- total_sessions: totalSessions,
- conversion_rate: conversionRate,
- };
- }
- );
+ const goalsWithConversions: GoalWithConversions[] = siteGoals.map(goal => {
+ const totalConversions = conversions[`goal_${goal.goalId}_conversions`] || 0;
+ const conversionRate = totalSessions > 0 ? totalConversions / totalSessions : 0;
+
+ return {
+ ...goal,
+ total_conversions: totalConversions,
+ total_sessions: totalSessions,
+ conversion_rate: conversionRate,
+ };
+ });
return reply.send({
data: goalsWithConversions,
diff --git a/server/src/api/analytics/goals/updateGoal.ts b/server/src/api/analytics/goals/updateGoal.ts
index 6e88ba825..b00c29a98 100644
--- a/server/src/api/analytics/goals/updateGoal.ts
+++ b/server/src/api/analytics/goals/updateGoal.ts
@@ -13,12 +13,10 @@ const eventConfigSchema = z
.object({
eventName: z.string().min(1, "Event name cannot be empty"),
eventPropertyKey: z.string().optional(),
- eventPropertyValue: z
- .union([z.string(), z.number(), z.boolean()])
- .optional(),
+ eventPropertyValue: z.union([z.string(), z.number(), z.boolean()]).optional(),
})
.refine(
- (data) => {
+ data => {
// If one property matching field is provided, both must be provided
if (data.eventPropertyKey && data.eventPropertyValue === undefined) {
return false;
@@ -29,8 +27,7 @@ const eventConfigSchema = z
return true;
},
{
- message:
- "Both eventPropertyKey and eventPropertyValue must be provided together or omitted together",
+ message: "Both eventPropertyKey and eventPropertyValue must be provided together or omitted together",
}
);
@@ -45,13 +42,11 @@ const updateGoalSchema = z
pathPattern: z.string().optional(),
eventName: z.string().optional(),
eventPropertyKey: z.string().optional(),
- eventPropertyValue: z
- .union([z.string(), z.number(), z.boolean()])
- .optional(),
+ eventPropertyValue: z.union([z.string(), z.number(), z.boolean()]).optional(),
}),
})
.refine(
- (data) => {
+ data => {
if (data.goalType === "path") {
return !!data.config.pathPattern;
} else if (data.goalType === "event") {
@@ -89,16 +84,11 @@ export async function updateGoal(
// Check if the goal belongs to the specified site
if (existingGoal.siteId !== siteId) {
- return reply
- .status(403)
- .send({ error: "Goal does not belong to the specified site" });
+ return reply.status(403).send({ error: "Goal does not belong to the specified site" });
}
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSite(
- request,
- siteId.toString()
- );
+ const userHasAccessToSite = await getUserHasAccessToSite(request, siteId.toString());
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/analytics/performance/getPerformanceByDimension.ts b/server/src/api/analytics/performance/getPerformanceByDimension.ts
index fc1012c6d..b73b30c1b 100644
--- a/server/src/api/analytics/performance/getPerformanceByDimension.ts
+++ b/server/src/api/analytics/performance/getPerformanceByDimension.ts
@@ -1,11 +1,7 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "../utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "../utils.js";
import { FilterParams } from "@rybbit/shared";
interface GetPerformanceByDimensionRequest {
@@ -57,10 +53,7 @@ type GetPerformanceByDimensionPaginatedResponse = {
totalCount: number;
};
-const getQuery = (
- request: FastifyRequest<GetPerformanceByDimensionRequest>,
- isCountQuery: boolean = false
-) => {
+const getQuery = (request: FastifyRequest<GetPerformanceByDimensionRequest>, isCountQuery: boolean = false) => {
const queryParams = request.query;
const {
startDate,
@@ -77,14 +70,7 @@ const getQuery = (
} = queryParams;
// Validate dimension
- const validDimensions = [
- "pathname",
- "country",
- "device_type",
- "browser",
- "operating_system",
- "region",
- ];
+ const validDimensions = ["pathname", "country", "device_type", "browser", "operating_system", "region"];
if (!validDimensions.includes(dimension)) {
throw new Error(`Invalid dimension: ${dimension}`);
@@ -100,12 +86,7 @@ const getQuery = (
validatedLimit = parsedLimit;
}
}
- const limitStatement =
- !isCountQuery && validatedLimit
- ? `LIMIT ${validatedLimit}`
- : isCountQuery
- ? ""
- : "LIMIT 100";
+ const limitStatement = !isCountQuery && validatedLimit ? `LIMIT ${validatedLimit}` : isCountQuery ? "" : "LIMIT 100";
let validatedOffset: number | null = null;
if (!isCountQuery && page !== undefined) {
@@ -115,8 +96,7 @@ const getQuery = (
validatedOffset = pageOffset;
}
}
- const offsetStatement =
- !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
+ const offsetStatement = !isCountQuery && validatedOffset ? `OFFSET ${validatedOffset}` : "";
// Handle sorting
const validSortColumns = [
@@ -148,12 +128,9 @@ const getQuery = (
"ttfb_p90",
"ttfb_p99",
];
- const validSortBy =
- sortBy && validSortColumns.includes(sortBy) ? sortBy : "event_count";
+ const validSortBy = sortBy && validSortColumns.includes(sortBy) ? sortBy : "event_count";
const validSortOrder = sortOrder === "asc" ? "ASC" : "DESC";
- const orderByStatement = !isCountQuery
- ? `ORDER BY ${validSortBy} ${validSortOrder} NULLS LAST`
- : "";
+ const orderByStatement = !isCountQuery ? `ORDER BY ${validSortBy} ${validSortOrder} NULLS LAST` : "";
const baseCteQuery = `
PerformanceStats AS (
@@ -288,8 +265,6 @@ export async function getPerformanceByDimension(
if (isPaginatedRequest) {
console.error("Failed countQuery for dimension:", dimension);
}
- return res
- .status(500)
- .send({ error: "Failed to fetch performance by dimension" });
+ return res.status(500).send({ error: "Failed to fetch performance by dimension" });
}
}
diff --git a/server/src/api/analytics/performance/getPerformanceOverview.ts b/server/src/api/analytics/performance/getPerformanceOverview.ts
index 67a89dfba..4a45ed36b 100644
--- a/server/src/api/analytics/performance/getPerformanceOverview.ts
+++ b/server/src/api/analytics/performance/getPerformanceOverview.ts
@@ -1,10 +1,6 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
-} from "../utils.js";
+import { getFilterStatement, getTimeStatement, processResults } from "../utils.js";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { PerformanceOverviewMetrics } from "../types.js";
import { FilterParams } from "@rybbit/shared";
@@ -49,10 +45,7 @@ export interface PerformanceOverviewRequest {
Querystring: FilterParams;
}
-export async function getPerformanceOverview(
- req: FastifyRequest<PerformanceOverviewRequest>,
- res: FastifyReply
-) {
+export async function getPerformanceOverview(req: FastifyRequest<PerformanceOverviewRequest>, res: FastifyReply) {
const site = req.params.site;
const userHasAccessToSite = await getUserHasAccessToSitePublic(req, site);
if (!userHasAccessToSite) {
@@ -74,8 +67,6 @@ export async function getPerformanceOverview(
return res.send({ data: data[0] });
} catch (error) {
console.error("Error fetching performance overview:", error);
- return res
- .status(500)
- .send({ error: "Failed to fetch performance overview" });
+ return res.status(500).send({ error: "Failed to fetch performance overview" });
}
}
diff --git a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
index 902f699b8..5cffef310 100644
--- a/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
+++ b/server/src/api/analytics/performance/getPerformanceTimeSeries.ts
@@ -1,46 +1,28 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../../db/clickhouse/clickhouse.js";
-import {
- getFilterStatement,
- getTimeStatement,
- processResults,
- TimeBucketToFn,
- bucketIntervalMap,
-} from "../utils.js";
+import { getFilterStatement, getTimeStatement, processResults, TimeBucketToFn, bucketIntervalMap } from "../utils.js";
import SqlString from "sqlstring";
import { getUserHasAccessToSitePublic } from "../../../lib/auth-utils.js";
import { validateTimeStatementFillParams } from "../query-validation.js";
import { TimeBucket, PerformanceTimeSeriesPoint } from "../types.js";
import { FilterParams } from "@rybbit/shared";
-
function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
- const { params: validatedParams, bucket: validatedBucket } =
- validateTimeStatementFillParams(params, bucket);
+ const { params: validatedParams, bucket: validatedBucket } = validateTimeStatementFillParams(params, bucket);
- if (
- validatedParams.startDate &&
- validatedParams.endDate &&
- validatedParams.timeZone
- ) {
+ if (validatedParams.startDate && validatedParams.endDate && validatedParams.timeZone) {
const { startDate, endDate, timeZone } = validatedParams;
return `WITH FILL FROM toTimeZone(
- toDateTime(${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(
timeZone
)}))),
'UTC'
)
TO if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(
- timeZone
- )}),
+ toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
now(),
toTimeZone(
- toDateTime(${
- TimeBucketToFn[validatedBucket]
- }(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
+ toDateTime(${TimeBucketToFn[validatedBucket]}(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(
timeZone
)}))) + INTERVAL 1 DAY,
'UTC'
@@ -48,10 +30,7 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
) STEP INTERVAL ${bucketIntervalMap[validatedBucket]}`;
}
// For specific past minutes range - convert to exact timestamps for better performance
- if (
- validatedParams.pastMinutesStart !== undefined &&
- validatedParams.pastMinutesEnd !== undefined
- ) {
+ if (validatedParams.pastMinutesStart !== undefined && validatedParams.pastMinutesEnd !== undefined) {
const { pastMinutesStart: start, pastMinutesEnd: end } = validatedParams;
// Calculate exact timestamps in JavaScript to avoid runtime ClickHouse calculations
@@ -60,10 +39,7 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
const endTimestamp = new Date(now.getTime() - end * 60 * 1000);
// Format as YYYY-MM-DD HH:MM:SS without milliseconds for ClickHouse
- const startIso = startTimestamp
- .toISOString()
- .slice(0, 19)
- .replace("T", " ");
+ const startIso = startTimestamp.toISOString().slice(0, 19).replace("T", " ");
const endIso = endTimestamp.toISOString().slice(0, 19).replace("T", " ");
return ` WITH FILL
@@ -91,25 +67,14 @@ function getTimeStatementFill(params: FilterParams, bucket: TimeBucket) {
}
const getQuery = (params: FilterParams<{ bucket: TimeBucket }>) => {
- const {
- startDate,
- endDate,
- timeZone,
- bucket,
- filters,
- pastMinutesStart,
- pastMinutesEnd,
- } = params;
+ const { startDate, endDate, timeZone, bucket, filters, pastMinutesStart, pastMinutesEnd } = params;
const filterStatement = getFilterStatement(filters);
- const isAllTime =
- !startDate && !endDate && !pastMinutesStart && !pastMinutesEnd;
+ const isAllTime = !startDate && !endDate && !pastMinutesStart && !pastMinutesEnd;
const query = `
SELECT
- toDateTime(${
- TimeBucketToFn[bucket]
- }(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
+ toDateTime(${TimeBucketToFn[bucket]}(toTimeZone(timestamp, ${SqlString.escape(timeZone)}))) AS time,
quantile(0.5)(lcp) AS lcp_p50,
quantile(0.75)(lcp) AS lcp_p75,
quantile(0.9)(lcp) AS lcp_p90,
@@ -137,9 +102,7 @@ WHERE
AND type = 'performance'
${filterStatement}
${getTimeStatement(params)}
-GROUP BY time ORDER BY time ${
- isAllTime ? "" : getTimeStatementFill(params, bucket)
- }`;
+GROUP BY time ORDER BY time ${isAllTime ? "" : getTimeStatementFill(params, bucket)}`;
return query;
};
@@ -177,8 +140,6 @@ export async function getPerformanceTimeSeries(
return res.send({ data });
} catch (error) {
console.error("Error fetching performance time series:", error);
- return res
- .status(500)
- .send({ error: "Failed to fetch performance time series" });
+ return res.status(500).send({ error: "Failed to fetch performance time series" });
}
}
diff --git a/server/src/api/analytics/query-validation.ts b/server/src/api/analytics/query-validation.ts
index c2394f01c..cf5cab206 100644
--- a/server/src/api/analytics/query-validation.ts
+++ b/server/src/api/analytics/query-validation.ts
@@ -23,21 +23,21 @@ const dateParamsSchema = z.object({
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
endDate: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
timeZone: z
.string()
.min(1, { message: "Time zone cannot be empty" })
.refine(
- (tz) => {
+ tz => {
try {
// Test if time zone is valid by attempting to format a date with it
Intl.DateTimeFormat(undefined, { timeZone: tz });
@@ -59,21 +59,21 @@ const fillDateParamsSchema = z.object({
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
endDate: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
timeZone: z
.string()
.min(1, { message: "Time zone cannot be empty" })
.refine(
- (tz) => {
+ tz => {
try {
// Test if time zone is valid by attempting to format a date with it
Intl.DateTimeFormat(undefined, { timeZone: tz });
@@ -99,16 +99,13 @@ const timeStatementParamsSchema = z
end: z.number().nonnegative(),
})
.optional()
- .refine((data) => !data || data.start > data.end, {
+ .refine(data => !data || data.start > data.end, {
message: "start must be greater than end (start = older, end = newer)",
}),
})
- .refine(
- (data) => data.date !== undefined || data.pastMinutesRange !== undefined,
- {
- message: "Either date or pastMinutesRange must be provided",
- }
- )
+ .refine(data => data.date !== undefined || data.pastMinutesRange !== undefined, {
+ message: "Either date or pastMinutesRange must be provided",
+ })
// Set default empty objects if schema validation fails
.catch({
date: undefined,
@@ -124,14 +121,14 @@ const filterParamsTimeStatementFillSchema = z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
endDate: z
.string()
.regex(dateRegex, { message: "Invalid date format. Use YYYY-MM-DD" })
.optional()
- .refine((date) => !date || !isNaN(Date.parse(date)), {
+ .refine(date => !date || !isNaN(Date.parse(date)), {
message: "Invalid date value",
}),
timeZone: z
@@ -139,7 +136,7 @@ const filterParamsTimeStatementFillSchema = z
.min(1, { message: "Time zone cannot be empty" })
.optional()
.refine(
- (tz) => {
+ tz => {
if (!tz) return true;
try {
// Test if time zone is valid by attempting to format a date with it
@@ -154,53 +151,46 @@ const filterParamsTimeStatementFillSchema = z
pastMinutesStart: z
.union([z.string(), z.number()])
.optional()
- .transform((val) => {
+ .transform(val => {
if (val === undefined) return undefined;
const num = typeof val === "string" ? Number(val) : val;
return isNaN(num) ? undefined : num;
})
- .refine((val) => val === undefined || val >= 0, {
+ .refine(val => val === undefined || val >= 0, {
message: "pastMinutesStart must be non-negative",
}),
pastMinutesEnd: z
.union([z.string(), z.number()])
.optional()
- .transform((val) => {
+ .transform(val => {
if (val === undefined) return undefined;
const num = typeof val === "string" ? Number(val) : val;
return isNaN(num) ? undefined : num;
})
- .refine((val) => val === undefined || val >= 0, {
+ .refine(val => val === undefined || val >= 0, {
message: "pastMinutesEnd must be non-negative",
}),
filters: z.string().optional(),
})
.refine(
- (data) => {
+ data => {
const hasDateParams = data.startDate && data.endDate && data.timeZone;
- const hasPastMinutesParams =
- data.pastMinutesStart !== undefined &&
- data.pastMinutesEnd !== undefined;
+ const hasPastMinutesParams = data.pastMinutesStart !== undefined && data.pastMinutesEnd !== undefined;
return hasDateParams || hasPastMinutesParams;
},
{
- message:
- "Either (startDate, endDate, timeZone) or (pastMinutesStart, pastMinutesEnd) must be provided",
+ message: "Either (startDate, endDate, timeZone) or (pastMinutesStart, pastMinutesEnd) must be provided",
}
)
.refine(
- (data) => {
- if (
- data.pastMinutesStart !== undefined &&
- data.pastMinutesEnd !== undefined
- ) {
+ data => {
+ if (data.pastMinutesStart !== undefined && data.pastMinutesEnd !== undefined) {
return data.pastMinutesStart > data.pastMinutesEnd;
}
return true;
},
{
- message:
- "pastMinutesStart must be greater than pastMinutesEnd (start = older, end = newer)",
+ message: "pastMinutesStart must be greater than pastMinutesEnd (start = older, end = newer)",
}
);
@@ -230,12 +220,7 @@ const timeBucketSchema = z.enum([
/**
* Schema for filter type values
*/
-const filterTypeSchema = z.enum([
- "equals",
- "not_equals",
- "contains",
- "not_contains",
-]);
+const filterTypeSchema = z.enum(["equals", "not_equals", "contains", "not_contains"]);
/**
* Schema for filter parameter values
@@ -295,10 +280,7 @@ export function validateTimeStatementParams(params: unknown) {
* @param bucket Raw bucket parameter
* @returns Validated parameters and bucket
*/
-export function validateTimeStatementFillParams(
- params: FilterParams,
- bucket: unknown
-) {
+export function validateTimeStatementFillParams(params: FilterParams, bucket: unknown) {
const validatedBucket = timeBucketSchema.parse(bucket);
const validatedParams = filterParamsTimeStatementFillSchema.parse(params);
diff --git a/server/src/api/analytics/utils.ts b/server/src/api/analytics/utils.ts
index 7bef4324c..0ac9b6eb7 100644
--- a/server/src/api/analytics/utils.ts
+++ b/server/src/api/analytics/utils.ts
@@ -1,21 +1,13 @@
import { ResultSet } from "@clickhouse/client";
import { FilterParams } from "@rybbit/shared";
import SqlString from "sqlstring";
-import {
- filterParamSchema,
- validateFilters,
- validateTimeStatementParams,
-} from "./query-validation.js";
+import { filterParamSchema, validateFilters, validateTimeStatementParams } from "./query-validation.js";
import { FilterParameter, FilterType } from "./types.js";
export function getTimeStatement(
- params: Pick<
- FilterParams,
- "startDate" | "endDate" | "timeZone" | "pastMinutesStart" | "pastMinutesEnd"
- >
+ params: Pick<FilterParams, "startDate" | "endDate" | "timeZone" | "pastMinutesStart" | "pastMinutesEnd">
) {
- const { startDate, endDate, timeZone, pastMinutesStart, pastMinutesEnd } =
- params;
+ const { startDate, endDate, timeZone, pastMinutesStart, pastMinutesEnd } = params;
// Construct the legacy format for validation
const pastMinutesRange =
@@ -23,10 +15,7 @@ export function getTimeStatement(
? { start: Number(pastMinutesStart), end: Number(pastMinutesEnd) }
: undefined;
- const date =
- startDate && endDate && timeZone
- ? { startDate, endDate, timeZone }
- : undefined;
+ const date = startDate && endDate && timeZone ? { startDate, endDate, timeZone } : undefined;
// Sanitize inputs with Zod
const sanitized = validateTimeStatementParams({
@@ -42,20 +31,14 @@ export function getTimeStatement(
// Use SqlString.escape for date and timeZone values
return `AND timestamp >= toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(
- startDate
- )}, ${SqlString.escape(timeZone)})),
+ toStartOfDay(toDateTime(${SqlString.escape(startDate)}, ${SqlString.escape(timeZone)})),
'UTC'
)
AND timestamp < if(
- toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(
- timeZone
- )}),
+ toDate(${SqlString.escape(endDate)}) = toDate(now(), ${SqlString.escape(timeZone)}),
now(),
toTimeZone(
- toStartOfDay(toDateTime(${SqlString.escape(
- endDate
- )}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
+ toStartOfDay(toDateTime(${SqlString.escape(endDate)}, ${SqlString.escape(timeZone)})) + INTERVAL 1 DAY,
'UTC'
)
)`;
@@ -71,10 +54,7 @@ export function getTimeStatement(
const endTimestamp = new Date(now.getTime() - end * 60 * 1000);
// Format as YYYY-MM-DD HH:MM:SS without milliseconds for ClickHouse
- const startIso = startTimestamp
- .toISOString()
- .slice(0, 19)
- .replace("T", " ");
+ const startIso = startTimestamp.toISOString().slice(0, 19).replace("T", " ");
const endIso = endTimestamp.toISOString().slice(0, 19).replace("T", " ");
return `AND timestamp > toDateTime(${SqlString.escape(startIso)}) AND timestamp <= toDateTime(${SqlString.escape(endIso)})`;
@@ -84,9 +64,7 @@ export function getTimeStatement(
return "";
}
-export async function processResults<T>(
- results: ResultSet<"JSONEachRow">
-): Promise<T[]> {
+export async function processResults<T>(results: ResultSet<"JSONEachRow">): Promise<T[]> {
const data: T[] = await results.json();
for (const row of data) {
for (const key in row) {
@@ -175,11 +153,8 @@ export function getFilterStatement(filters: string) {
return (
"AND " +
filtersArray
- .map((filter) => {
- const x =
- filter.type === "contains" || filter.type === "not_contains"
- ? "%"
- : "";
+ .map(filter => {
+ const x = filter.type === "contains" || filter.type === "not_contains" ? "%" : "";
if (filter.parameter === "entry_page") {
if (filter.value.length === 1) {
@@ -192,17 +167,12 @@ export function getFilterStatement(filters: string) {
FROM events
GROUP BY session_id
)
- WHERE entry_pathname ${filterTypeToOperator(
- filter.type
- )} ${SqlString.escape(x + filter.value[0] + x)}
+ WHERE entry_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}
)`;
}
const valuesWithOperator = filter.value.map(
- (value) =>
- `entry_pathname ${filterTypeToOperator(
- filter.type
- )} ${SqlString.escape(x + value + x)}`
+ value => `entry_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`
);
return `session_id IN (
@@ -229,17 +199,12 @@ export function getFilterStatement(filters: string) {
FROM events
GROUP BY session_id
)
- WHERE exit_pathname ${filterTypeToOperator(
- filter.type
- )} ${SqlString.escape(x + filter.value[0] + x)}
+ WHERE exit_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + filter.value[0] + x)}
)`;
}
const valuesWithOperator = filter.value.map(
- (value) =>
- `exit_pathname ${filterTypeToOperator(
- filter.type
- )} ${SqlString.escape(x + value + x)}`
+ value => `exit_pathname ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`
);
return `session_id IN (
@@ -262,10 +227,8 @@ export function getFilterStatement(filters: string) {
}
const valuesWithOperator = filter.value.map(
- (value) =>
- `${getSqlParam(filter.parameter)} ${filterTypeToOperator(
- filter.type
- )} ${SqlString.escape(x + value + x)}`
+ value =>
+ `${getSqlParam(filter.parameter)} ${filterTypeToOperator(filter.type)} ${SqlString.escape(x + value + x)}`
);
return `(${valuesWithOperator.join(" OR ")})`;
@@ -322,4 +285,3 @@ export const bucketIntervalMap = {
month: "1 MONTH",
year: "1 YEAR",
} as const;
-
diff --git a/server/src/api/sessionReplay/getSessionReplayEvents.ts b/server/src/api/sessionReplay/getSessionReplayEvents.ts
index 54fde93d0..5260de897 100644
--- a/server/src/api/sessionReplay/getSessionReplayEvents.ts
+++ b/server/src/api/sessionReplay/getSessionReplayEvents.ts
@@ -12,18 +12,12 @@ export async function getSessionReplayEvents(
const { sessionId } = request.params;
const sessionReplayService = new SessionReplayQueryService();
- const replayData = await sessionReplayService.getSessionReplayEvents(
- siteId,
- sessionId
- );
+ const replayData = await sessionReplayService.getSessionReplayEvents(siteId, sessionId);
return reply.send(replayData);
} catch (error) {
console.error("Error fetching session replay events:", error);
- if (
- error instanceof Error &&
- error.message === "Session replay not found"
- ) {
+ if (error instanceof Error && error.message === "Session replay not found") {
return reply.status(404).send({ error: "Session replay not found" });
}
return reply.status(500).send({ error: "Internal server error" });
diff --git a/server/src/api/sessionReplay/getSessionReplays.ts b/server/src/api/sessionReplay/getSessionReplays.ts
index ad77446ad..72db79634 100644
--- a/server/src/api/sessionReplay/getSessionReplays.ts
+++ b/server/src/api/sessionReplay/getSessionReplays.ts
@@ -27,12 +27,8 @@ export async function getSessionReplays(
startDate: request.query.startDate,
endDate: request.query.endDate,
timeZone: request.query.timeZone,
- pastMinutesStart: request.query.pastMinutesStart
- ? Number(request.query.pastMinutesStart)
- : undefined,
- pastMinutesEnd: request.query.pastMinutesEnd
- ? Number(request.query.pastMinutesEnd)
- : undefined,
+ pastMinutesStart: request.query.pastMinutesStart ? Number(request.query.pastMinutesStart) : undefined,
+ pastMinutesEnd: request.query.pastMinutesEnd ? Number(request.query.pastMinutesEnd) : undefined,
filters: filters || "",
});
diff --git a/server/src/api/sessionReplay/recordSessionReplay.ts b/server/src/api/sessionReplay/recordSessionReplay.ts
index c3ad1b02c..2ce2a0be0 100644
--- a/server/src/api/sessionReplay/recordSessionReplay.ts
+++ b/server/src/api/sessionReplay/recordSessionReplay.ts
@@ -15,7 +15,7 @@ const recordSessionReplaySchema = z.object({
type: z.union([z.string(), z.number()]),
data: z.any(),
timestamp: z.number(),
- }),
+ })
),
metadata: z
.object({
@@ -33,7 +33,7 @@ export async function recordSessionReplay(
Params: { site: string };
Body: RecordSessionReplayRequest;
}>,
- reply: FastifyReply,
+ reply: FastifyReply
) {
try {
const siteId = Number(request.params.site);
diff --git a/server/src/api/sites/addSite.ts b/server/src/api/sites/addSite.ts
index 71d476d3c..de2d1cd8b 100644
--- a/server/src/api/sites/addSite.ts
+++ b/server/src/api/sites/addSite.ts
@@ -18,22 +18,13 @@ export async function addSite(
}>,
reply: FastifyReply
) {
- const {
- domain,
- name,
- organizationId,
- public: isPublic,
- saltUserIds,
- blockBots,
- } = request.body;
+ const { domain, name, organizationId, public: isPublic, saltUserIds, blockBots } = request.body;
// Validate domain format using regex
- const domainRegex =
- /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
+ const domainRegex = /^(?:[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?\.)+[a-zA-Z]{2,}$/;
if (!domainRegex.test(domain)) {
return reply.status(400).send({
- error:
- "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
+ error: "Invalid domain format. Must be a valid domain like example.com or sub.example.com",
});
}
@@ -58,10 +49,7 @@ export async function addSite(
// First, get the user's role in the organization
const member = await db.query.member.findFirst({
where: (member, { and, eq }) =>
- and(
- eq(member.userId, session.user.id),
- eq(member.organizationId, organizationId)
- ),
+ and(eq(member.userId, session.user.id), eq(member.organizationId, organizationId)),
});
if (!member) {
@@ -73,8 +61,7 @@ export async function addSite(
// Check if the user's role is admin or owner
if (member.role !== "admin" && member.role !== "owner") {
return reply.status(403).send({
- error:
- "You must be an admin or owner to add sites to this organization",
+ error: "You must be an admin or owner to add sites to this organization",
});
}
@@ -100,8 +87,7 @@ export async function addSite(
public: newSite[0].public || false,
saltUserIds: newSite[0].saltUserIds || false,
domain: newSite[0].domain,
- blockBots:
- newSite[0].blockBots === undefined ? true : newSite[0].blockBots,
+ blockBots: newSite[0].blockBots === undefined ? true : newSite[0].blockBots,
excludedIPs: Array.isArray(newSite[0].excludedIPs) ? newSite[0].excludedIPs : [],
apiKey: newSite[0].apiKey,
});
diff --git a/server/src/api/sites/changeSiteDomain.ts b/server/src/api/sites/changeSiteDomain.ts
index 92d1ba9e2..b571a25e5 100644
--- a/server/src/api/sites/changeSiteDomain.ts
+++ b/server/src/api/sites/changeSiteDomain.ts
@@ -13,7 +13,7 @@ export async function changeSiteDomain(
newDomain: string;
};
}>,
- reply: FastifyReply,
+ reply: FastifyReply
) {
const { siteId, newDomain } = request.body;
diff --git a/server/src/api/sites/deleteSite.ts b/server/src/api/sites/deleteSite.ts
index 8dd065391..e3c8b161c 100644
--- a/server/src/api/sites/deleteSite.ts
+++ b/server/src/api/sites/deleteSite.ts
@@ -7,16 +7,10 @@ import { loadAllowedDomains } from "../../lib/allowedDomains.js";
import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
import { siteConfig } from "../../lib/siteConfig.js";
-export async function deleteSite(
- request: FastifyRequest<{ Params: { id: string } }>,
- reply: FastifyReply
-) {
+export async function deleteSite(request: FastifyRequest<{ Params: { id: string } }>, reply: FastifyReply) {
const { id } = request.params;
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- id
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, id);
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/sites/getSite.ts b/server/src/api/sites/getSite.ts
index 9ce9c0603..e82e58a39 100644
--- a/server/src/api/sites/getSite.ts
+++ b/server/src/api/sites/getSite.ts
@@ -10,10 +10,7 @@ interface GetSiteParams {
};
}
-export async function getSite(
- request: FastifyRequest<GetSiteParams>,
- reply: FastifyReply
-) {
+export async function getSite(request: FastifyRequest<GetSiteParams>, reply: FastifyReply) {
const { id } = request.params;
const userId = request.user?.id;
@@ -31,10 +28,7 @@ export async function getSite(
const isOwner = site.createdBy === userId;
// Check user access to site
- const userHasAccessToSite = await getUserHasAccessToSitePublic(
- request,
- site.siteId
- );
+ const userHasAccessToSite = await getUserHasAccessToSitePublic(request, site.siteId);
if (!userHasAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
diff --git a/server/src/api/sites/getSiteApiConfig.ts b/server/src/api/sites/getSiteApiConfig.ts
index b33f3cab0..4fd43f1d2 100644
--- a/server/src/api/sites/getSiteApiConfig.ts
+++ b/server/src/api/sites/getSiteApiConfig.ts
@@ -4,10 +4,7 @@ import { sites } from "../../db/postgres/schema.js";
import { eq, and } from "drizzle-orm";
import { getUserHasAdminAccessToSite } from "../../lib/auth-utils.js";
-export async function getSiteApiConfig(
- request: FastifyRequest,
- reply: FastifyReply
-) {
+export async function getSiteApiConfig(request: FastifyRequest, reply: FastifyReply) {
try {
if (!request.user) {
return reply.status(401).send({ success: false, error: "Unauthorized" });
@@ -15,15 +12,12 @@ export async function getSiteApiConfig(
const { siteId } = request.params as { siteId: string };
const parsedSiteId = parseInt(siteId, 10);
-
+
if (isNaN(parsedSiteId)) {
return reply.status(400).send({ success: false, error: "Invalid site ID" });
}
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(parsedSiteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(parsedSiteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -54,4 +48,4 @@ export async function getSiteApiConfig(
error: "Failed to get site API configuration",
});
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/sites/getSiteHasData.ts b/server/src/api/sites/getSiteHasData.ts
index 1cd8ed5a7..9b9393538 100644
--- a/server/src/api/sites/getSiteHasData.ts
+++ b/server/src/api/sites/getSiteHasData.ts
@@ -1,10 +1,7 @@
import { FastifyReply, FastifyRequest } from "fastify";
import { clickhouse } from "../../db/clickhouse/clickhouse.js";
-export async function getSiteHasData(
- request: FastifyRequest<{ Params: { site: string } }>,
- reply: FastifyReply
-) {
+export async function getSiteHasData(request: FastifyRequest<{ Params: { site: string } }>, reply: FastifyReply) {
const { site } = request.params;
try {
@@ -17,7 +14,7 @@ export async function getSiteHasData(
siteId: Number(site),
},
})
- .then((res) => res.json());
+ .then(res => res.json());
const hasData = pageviewsData[0].count > 0;
return {
diff --git a/server/src/api/sites/getSiteIsPublic.ts b/server/src/api/sites/getSiteIsPublic.ts
index e7cfdcc75..a93617c9e 100644
--- a/server/src/api/sites/getSiteIsPublic.ts
+++ b/server/src/api/sites/getSiteIsPublic.ts
@@ -1,10 +1,7 @@
import { FastifyRequest, FastifyReply } from "fastify";
import { siteConfig } from "../../lib/siteConfig.js";
-export async function getSiteIsPublic(
- request: FastifyRequest<{ Params: { site: string } }>,
- reply: FastifyReply
-) {
+export async function getSiteIsPublic(request: FastifyRequest<{ Params: { site: string } }>, reply: FastifyReply) {
const { site } = request.params;
const isPublic = siteConfig.isSitePublic(site);
return reply.status(200).send({ isPublic });
diff --git a/server/src/api/sites/getSitesFromOrg.ts b/server/src/api/sites/getSitesFromOrg.ts
index 9cc7406e4..3452ee129 100644
--- a/server/src/api/sites/getSitesFromOrg.ts
+++ b/server/src/api/sites/getSitesFromOrg.ts
@@ -31,33 +31,22 @@ export async function getSitesFromOrg(
db
.select()
.from(member)
- .where(
- and(
- eq(member.organizationId, organizationId),
- eq(member.userId, userId)
- )
- )
+ .where(and(eq(member.organizationId, organizationId), eq(member.userId, userId)))
.limit(1),
db.select().from(sites).where(eq(sites.organizationId, organizationId)),
- db
- .select()
- .from(organization)
- .where(eq(organization.id, organizationId))
- .limit(1),
+ db.select().from(organization).where(eq(organization.id, organizationId)).limit(1),
]);
// If not admin, verify user is a member of the organization
if (!isOwner && memberCheck.length === 0) {
- return res
- .status(403)
- .send({ error: "Access denied to this organization" });
+ return res.status(403).send({ error: "Access denied to this organization" });
}
// Query session counts for the sites
const sessionCountMap = new Map<number, number>();
if (sitesData.length > 0) {
- const siteIds = sitesData.map((site) => site.siteId);
+ const siteIds = sitesData.map(site => site.siteId);
const sessionCountsResult = await clickhouse.query({
query: `
@@ -75,11 +64,7 @@ export async function getSitesFromOrg(
if (Array.isArray(sessionCounts)) {
sessionCounts.forEach((row: any) => {
- if (
- row &&
- typeof row.site_id === "number" &&
- typeof row.total_sessions === "number"
- ) {
+ if (row && typeof row.site_id === "number" && typeof row.total_sessions === "number") {
sessionCountMap.set(Number(row.site_id), row.total_sessions);
}
});
@@ -101,16 +86,14 @@ export async function getSitesFromOrg(
}
// Enhance sites data with session counts and subscription info
- const enhancedSitesData = sitesData.map((site) => ({
+ const enhancedSitesData = sitesData.map(site => ({
...site,
sessionsLast24Hours: sessionCountMap.get(site.siteId) || 0,
isOwner: isOwner,
}));
// Sort by sessions descending
- enhancedSitesData.sort(
- (a, b) => b.sessionsLast24Hours - a.sessionsLast24Hours
- );
+ enhancedSitesData.sort((a, b) => b.sessionsLast24Hours - a.sessionsLast24Hours);
return res.status(200).send({
organization: orgInfo[0] || null,
diff --git a/server/src/api/sites/updateSiteApiConfig.ts b/server/src/api/sites/updateSiteApiConfig.ts
index e175b902c..bee84d118 100644
--- a/server/src/api/sites/updateSiteApiConfig.ts
+++ b/server/src/api/sites/updateSiteApiConfig.ts
@@ -12,10 +12,7 @@ const updateApiConfigSchema = z.object({
action: z.enum(["generate_api_key", "revoke_api_key"]),
});
-export async function updateSiteApiConfig(
- request: FastifyRequest,
- reply: FastifyReply
-) {
+export async function updateSiteApiConfig(request: FastifyRequest, reply: FastifyReply) {
try {
if (!request.user) {
return reply.status(401).send({ success: false, error: "Unauthorized" });
@@ -23,15 +20,12 @@ export async function updateSiteApiConfig(
const { siteId } = request.params as { siteId: string };
const parsedSiteId = parseInt(siteId, 10);
-
+
if (isNaN(parsedSiteId)) {
return reply.status(400).send({ success: false, error: "Invalid site ID" });
}
- const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(
- request,
- String(parsedSiteId)
- );
+ const userHasAdminAccessToSite = await getUserHasAdminAccessToSite(request, String(parsedSiteId));
if (!userHasAdminAccessToSite) {
return reply.status(403).send({ error: "Forbidden" });
}
@@ -53,24 +47,19 @@ export async function updateSiteApiConfig(
switch (action) {
case "generate_api_key":
// Generate a secure random API key with rb_ prefix
- const apiKey = `rb_${crypto.randomBytes(16).toString('hex')}`;
+ const apiKey = `rb_${crypto.randomBytes(16).toString("hex")}`;
updateData.apiKey = apiKey;
break;
case "revoke_api_key":
updateData.apiKey = null;
break;
-
}
// Update the site
- const updatedSite = await db
- .update(sites)
- .set(updateData)
- .where(eq(sites.siteId, parsedSiteId))
- .returning({
- apiKey: sites.apiKey,
- });
+ const updatedSite = await db.update(sites).set(updateData).where(eq(sites.siteId, parsedSiteId)).returning({
+ apiKey: sites.apiKey,
+ });
// Update the site config cache
if (action === "generate_api_key" || action === "revoke_api_key") {
@@ -88,4 +77,4 @@ export async function updateSiteApiConfig(
error: "Failed to update site API configuration",
});
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/sites/updateSiteExcludedIPs.ts b/server/src/api/sites/updateSiteExcludedIPs.ts
index f5fe8dc19..6daca8da6 100644
--- a/server/src/api/sites/updateSiteExcludedIPs.ts
+++ b/server/src/api/sites/updateSiteExcludedIPs.ts
@@ -63,7 +63,7 @@ export async function updateSiteExcludedIPs(request: FastifyRequest, reply: Fast
}
// Update the database and cache atomically
- await db.transaction(async (tx) => {
+ await db.transaction(async tx => {
// Update the database
await tx
.update(sites)
diff --git a/server/src/api/stripe/createCheckoutSession.ts b/server/src/api/stripe/createCheckoutSession.ts
index 3374ece9a..35dc11d92 100644
--- a/server/src/api/stripe/createCheckoutSession.ts
+++ b/server/src/api/stripe/createCheckoutSession.ts
@@ -2,11 +2,7 @@ import { eq, and } from "drizzle-orm";
import { FastifyReply, FastifyRequest } from "fastify";
import Stripe from "stripe";
import { db } from "../../db/postgres/postgres.js";
-import {
- organization,
- user as userSchema,
- member,
-} from "../../db/postgres/schema.js";
+import { organization, user as userSchema, member } from "../../db/postgres/schema.js";
import { stripe } from "../../lib/stripe.js";
interface CheckoutRequestBody {
@@ -29,8 +25,7 @@ export async function createCheckoutSession(
if (!priceId || !successUrl || !cancelUrl || !organizationId) {
return reply.status(400).send({
- error:
- "Missing required parameters: priceId, successUrl, cancelUrl, organizationId",
+ error: "Missing required parameters: priceId, successUrl, cancelUrl, organizationId",
});
}
@@ -41,12 +36,7 @@ export async function createCheckoutSession(
role: member.role,
})
.from(member)
- .where(
- and(
- eq(member.userId, userId),
- eq(member.organizationId, organizationId)
- )
- )
+ .where(and(eq(member.userId, userId), eq(member.organizationId, organizationId)))
.limit(1);
if (!memberResult.length || memberResult[0].role !== "owner") {
@@ -80,9 +70,7 @@ export async function createCheckoutSession(
const org = orgResult[0];
if (!user || !org) {
- return reply
- .status(404)
- .send({ error: "User or organization not found" });
+ return reply.status(404).send({ error: "User or organization not found" });
}
let stripeCustomerId = org.stripeCustomerId;
@@ -100,10 +88,7 @@ export async function createCheckoutSession(
stripeCustomerId = customer.id;
// 4. Update the organization with the new Stripe Customer ID
- await db
- .update(organization)
- .set({ stripeCustomerId })
- .where(eq(organization.id, organizationId));
+ await db.update(organization).set({ stripeCustomerId }).where(eq(organization.id, organizationId));
}
// 5. Create a Stripe Checkout Session
diff --git a/server/src/api/stripe/createPortalSession.ts b/server/src/api/stripe/createPortalSession.ts
index 5576e4324..5ede4e93e 100644
--- a/server/src/api/stripe/createPortalSession.ts
+++ b/server/src/api/stripe/createPortalSession.ts
@@ -8,16 +8,10 @@ import Stripe from "stripe";
interface PortalRequestBody {
returnUrl: string;
organizationId: string;
- flowType?:
- | "subscription_update"
- | "subscription_cancel"
- | "payment_method_update";
+ flowType?: "subscription_update" | "subscription_cancel" | "payment_method_update";
}
-export async function createPortalSession(
- request: FastifyRequest<{ Body: PortalRequestBody }>,
- reply: FastifyReply
-) {
+export async function createPortalSession(request: FastifyRequest<{ Body: PortalRequestBody }>, reply: FastifyReply) {
const { returnUrl, organizationId, flowType } = request.body;
const userId = request.user?.id;
@@ -38,12 +32,7 @@ export async function createPortalSession(
role: member.role,
})
.from(member)
- .where(
- and(
- eq(member.userId, userId),
- eq(member.organizationId, organizationId)
- )
- )
+ .where(and(eq(member.userId, userId), eq(member.organizationId, organizationId)))
.limit(1);
if (!memberResult.length || memberResult[0].role !== "owner") {
@@ -64,9 +53,7 @@ export async function createPortalSession(
const org = orgResult[0];
if (!org || !org.stripeCustomerId) {
- return reply
- .status(404)
- .send({ error: "Organization or Stripe customer ID not found" });
+ return reply.status(404).send({ error: "Organization or Stripe customer ID not found" });
}
// 3. Create a Stripe Billing Portal Session, with optional direct flow
@@ -86,9 +73,7 @@ export async function createPortalSession(
});
if (subscriptions.data.length === 0) {
- return reply
- .status(404)
- .send({ error: "No active subscription found" });
+ return reply.status(404).send({ error: "No active subscription found" });
}
const subscriptionId = subscriptions.data[0].id;
@@ -108,9 +93,7 @@ export async function createPortalSession(
});
if (subscriptions.data.length === 0) {
- return reply
- .status(404)
- .send({ error: "No active subscription found" });
+ return reply.status(404).send({ error: "No active subscription found" });
}
const subscriptionId = subscriptions.data[0].id;
@@ -128,9 +111,7 @@ export async function createPortalSession(
}
}
- const portalSession = await (
- stripe as Stripe
- ).billingPortal.sessions.create(sessionConfig);
+ const portalSession = await (stripe as Stripe).billingPortal.sessions.create(sessionConfig);
// 4. Return the Billing Portal Session URL
return reply.send({ portalUrl: portalSession.url });
diff --git a/server/src/api/stripe/getSubscription.ts b/server/src/api/stripe/getSubscription.ts
index 660432773..112538b4c 100644
--- a/server/src/api/stripe/getSubscription.ts
+++ b/server/src/api/stripe/getSubscription.ts
@@ -3,11 +3,7 @@ import { FastifyReply, FastifyRequest } from "fastify";
import Stripe from "stripe";
import { db } from "../../db/postgres/postgres.js";
import { organization } from "../../db/postgres/schema.js";
-import {
- DEFAULT_EVENT_LIMIT,
- getStripePrices,
- StripePlan,
-} from "../../lib/const.js";
+import { DEFAULT_EVENT_LIMIT, getStripePrices, StripePlan } from "../../lib/const.js";
import { stripe } from "../../lib/stripe.js";
import { DateTime } from "luxon";
@@ -15,8 +11,7 @@ import { DateTime } from "luxon";
function findPlanDetails(priceId: string): StripePlan | undefined {
return getStripePrices().find(
(plan: StripePlan) =>
- plan.priceId === priceId ||
- (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)
+ plan.priceId === priceId || (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)
);
}
@@ -76,12 +71,8 @@ export async function getSubscriptionInner(organizationId: string) {
id: subscription.id,
planName: "Unknown Plan", // Indicate missing details
status: subscription.status,
- currentPeriodStart: new Date(
- subscriptionItem.current_period_start * 1000
- ),
- currentPeriodEnd: new Date(
- subscriptionItem.current_period_end * 1000
- ),
+ currentPeriodStart: new Date(subscriptionItem.current_period_start * 1000),
+ currentPeriodEnd: new Date(subscriptionItem.current_period_end * 1000),
cancelAtPeriodEnd: subscription.cancel_at_period_end,
eventLimit: 0, // Unknown limit
monthlyEventCount: org.monthlyEventCount || 0,
@@ -94,9 +85,7 @@ export async function getSubscriptionInner(organizationId: string) {
id: subscription.id,
planName: planDetails.name,
status: subscription.status,
- currentPeriodStart: new Date(
- subscriptionItem.current_period_start * 1000
- ),
+ currentPeriodStart: new Date(subscriptionItem.current_period_start * 1000),
currentPeriodEnd: new Date(subscriptionItem.current_period_end * 1000),
cancelAtPeriodEnd: subscription.cancel_at_period_end,
eventLimit: planDetails.limits.events,
@@ -147,9 +136,7 @@ export async function getSubscription(
console.error("Get Subscription Error:", error);
// Handle specific Stripe errors if necessary
if (error instanceof Stripe.errors.StripeError) {
- return reply
- .status(error.statusCode || 500)
- .send({ error: error.message });
+ return reply.status(error.statusCode || 500).send({ error: error.message });
} else {
return reply.status(500).send({
error: "Failed to fetch subscription details",
diff --git a/server/src/api/stripe/webhook.ts b/server/src/api/stripe/webhook.ts
index 8f65b2448..827d8a7a4 100644
--- a/server/src/api/stripe/webhook.ts
+++ b/server/src/api/stripe/webhook.ts
@@ -10,10 +10,7 @@ dotenv.config();
const webhookSecret = process.env.STRIPE_WEBHOOK_SECRET;
-export async function handleWebhook(
- request: FastifyRequest,
- reply: FastifyReply
-) {
+export async function handleWebhook(request: FastifyRequest, reply: FastifyReply) {
if (!webhookSecret) {
console.error("Stripe webhook secret is not configured.");
return reply.status(500).send({ error: "Webhook secret not configured." });
@@ -29,11 +26,7 @@ export async function handleWebhook(
return reply.status(400).send("Webhook error: No raw body available");
}
- event = (stripe as Stripe).webhooks.constructEvent(
- rawBody,
- sig as string,
- webhookSecret
- );
+ event = (stripe as Stripe).webhooks.constructEvent(rawBody, sig as string, webhookSecret);
} catch (err: any) {
console.error(`Webhook signature verification failed: ${err.message}`);
return reply.status(400).send(`Webhook Error: ${err.message}`);
@@ -61,22 +54,16 @@ export async function handleWebhook(
// If the organization doesn't have the customer ID yet, update it
if (existingOrg.length === 0) {
- console.log(
- `Updating organization ${organizationId} with Stripe customer ID ${stripeCustomerId}`
- );
+ console.log(`Updating organization ${organizationId} with Stripe customer ID ${stripeCustomerId}`);
await db
.update(organization)
.set({ stripeCustomerId: stripeCustomerId })
.where(eq(organization.id, organizationId));
} else {
- console.log(
- `Organization ${existingOrg[0].id} already has Stripe customer ID ${stripeCustomerId}`
- );
+ console.log(`Organization ${existingOrg[0].id} already has Stripe customer ID ${stripeCustomerId}`);
}
} catch (dbError: any) {
- console.error(
- `Database error updating organization with Stripe customer ID: ${dbError.message}`
- );
+ console.error(`Database error updating organization with Stripe customer ID: ${dbError.message}`);
// Decide if you should still return 200 to Stripe or signal an error
}
} else {
diff --git a/server/src/api/uptime/deleteMonitor.ts b/server/src/api/uptime/deleteMonitor.ts
index 927c31803..106e35f26 100644
--- a/server/src/api/uptime/deleteMonitor.ts
+++ b/server/src/api/uptime/deleteMonitor.ts
@@ -44,7 +44,7 @@ export async function deleteMonitor(request: FastifyRequest<DeleteMonitorParams>
await uptimeService.onMonitorDeleted(Number(monitorId));
// Delete monitor and related records in a transaction
- await db.transaction(async (tx) => {
+ await db.transaction(async tx => {
// Delete monitor status first
await tx.delete(uptimeMonitorStatus).where(eq(uptimeMonitorStatus.monitorId, Number(monitorId)));
diff --git a/server/src/api/uptime/getMonitor.ts b/server/src/api/uptime/getMonitor.ts
index 48d4a7e6b..afcc8db5c 100644
--- a/server/src/api/uptime/getMonitor.ts
+++ b/server/src/api/uptime/getMonitor.ts
@@ -11,10 +11,7 @@ interface GetMonitorParams {
};
}
-export async function getMonitor(
- request: FastifyRequest<GetMonitorParams>,
- reply: FastifyReply
-) {
+export async function getMonitor(request: FastifyRequest<GetMonitorParams>, reply: FastifyReply) {
const session = await getSessionFromReq(request);
const userId = session?.user?.id;
const { monitorId } = request.params;
@@ -35,10 +32,7 @@ export async function getMonitor(
// Check if user has access to the monitor's organization
const userHasAccess = await db.query.member.findFirst({
- where: and(
- eq(member.userId, userId),
- eq(member.organizationId, monitor.organizationId)
- ),
+ where: and(eq(member.userId, userId), eq(member.organizationId, monitor.organizationId)),
});
if (!userHasAccess) {
@@ -66,4 +60,4 @@ export async function getMonitor(
console.error("Error retrieving monitor:", error);
return reply.status(500).send({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/getMonitorStatus.ts b/server/src/api/uptime/getMonitorStatus.ts
index 843eee9e1..428997790 100644
--- a/server/src/api/uptime/getMonitorStatus.ts
+++ b/server/src/api/uptime/getMonitorStatus.ts
@@ -13,10 +13,7 @@ interface GetMonitorStatusRequest {
};
}
-export async function getMonitorStatus(
- request: FastifyRequest<GetMonitorStatusRequest>,
- reply: FastifyReply
-) {
+export async function getMonitorStatus(request: FastifyRequest<GetMonitorStatusRequest>, reply: FastifyReply) {
const session = await getSessionFromReq(request);
const userId = session?.user?.id;
const { monitorId } = request.params;
@@ -37,10 +34,7 @@ export async function getMonitorStatus(
// Check if user has access to the monitor's organization
const userHasAccess = await db.query.member.findFirst({
- where: and(
- eq(member.userId, userId),
- eq(member.organizationId, monitor.organizationId)
- ),
+ where: and(eq(member.userId, userId), eq(member.organizationId, monitor.organizationId)),
});
if (!userHasAccess) {
@@ -139,4 +133,4 @@ export async function getMonitorStatus(
console.error("Error retrieving monitor status:", error);
return reply.status(500).send({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/getMonitorUptime.ts b/server/src/api/uptime/getMonitorUptime.ts
index b74d2c2f9..318131ef2 100644
--- a/server/src/api/uptime/getMonitorUptime.ts
+++ b/server/src/api/uptime/getMonitorUptime.ts
@@ -13,10 +13,7 @@ interface GetMonitorUptimeRequest {
};
}
-export async function getMonitorUptime(
- request: FastifyRequest<GetMonitorUptimeRequest>,
- reply: FastifyReply
-) {
+export async function getMonitorUptime(request: FastifyRequest<GetMonitorUptimeRequest>, reply: FastifyReply) {
const session = await getSessionFromReq(request);
const userId = session?.user?.id;
const { monitorId } = request.params;
@@ -37,10 +34,7 @@ export async function getMonitorUptime(
// Check if user has access to the monitor's organization
const userHasAccess = await db.query.member.findFirst({
- where: and(
- eq(member.userId, userId),
- eq(member.organizationId, monitor.organizationId)
- ),
+ where: and(eq(member.userId, userId), eq(member.organizationId, monitor.organizationId)),
});
if (!userHasAccess) {
@@ -172,12 +166,14 @@ export async function getMonitorUptime(
totalUptimeSeconds: estimatedTotalUptimeSeconds,
currentUptimeSeconds,
totalMonitoringSeconds,
- lastDowntime: lastDowntime ? {
- timestamp: lastDowntime.downtime_start,
- error: lastDowntime.error_message,
- errorType: lastDowntime.error_type,
- status: lastDowntime.status,
- } : null,
+ lastDowntime: lastDowntime
+ ? {
+ timestamp: lastDowntime.downtime_start,
+ error: lastDowntime.error_message,
+ errorType: lastDowntime.error_type,
+ status: lastDowntime.status,
+ }
+ : null,
monitoringSince: first_check,
lastCheck: last_check,
uptimePercentage: 100 - stats.downtime_percentage,
@@ -188,4 +184,4 @@ export async function getMonitorUptime(
console.error("Error retrieving monitor uptime:", error);
return reply.status(500).send({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/getMonitorUptimeBuckets.ts b/server/src/api/uptime/getMonitorUptimeBuckets.ts
index 8fd126db8..bf23decfd 100644
--- a/server/src/api/uptime/getMonitorUptimeBuckets.ts
+++ b/server/src/api/uptime/getMonitorUptimeBuckets.ts
@@ -123,10 +123,10 @@ export async function getMonitorUptimeBuckets(
timeout_checks: number;
uptime_percentage: number;
}> = [];
-
+
for (let i = 0; i < days; i++) {
const date = new Date(nowInTz);
-
+
if (bucket === "hour") {
// For hourly buckets, generate 24 buckets per day
for (let h = 0; h < 24; h++) {
@@ -135,7 +135,7 @@ export async function getMonitorUptimeBuckets(
if (date <= nowInTz) {
allBuckets.push({
bucket_time: date.toISOString(),
- bucket_formatted: date.toISOString().slice(0, 13) + ':00:00',
+ bucket_formatted: date.toISOString().slice(0, 13) + ":00:00",
total_checks: 0,
successful_checks: 0,
failed_checks: 0,
@@ -151,9 +151,8 @@ export async function getMonitorUptimeBuckets(
const diff = date.getDate() - dayOfWeek + (dayOfWeek === 0 ? -6 : 1); // Monday as start
date.setDate(diff);
date.setHours(0, 0, 0, 0);
-
- if (allBuckets.length === 0 ||
- !allBuckets.some(b => b.bucket_formatted === date.toISOString().slice(0, 10))) {
+
+ if (allBuckets.length === 0 || !allBuckets.some(b => b.bucket_formatted === date.toISOString().slice(0, 10))) {
allBuckets.push({
bucket_time: date.toISOString(),
bucket_formatted: date.toISOString().slice(0, 10),
@@ -181,9 +180,7 @@ export async function getMonitorUptimeBuckets(
}
// Merge actual data with empty buckets
- const bucketsMap = new Map(
- buckets.map((b: any) => [b.bucket_formatted, b])
- );
+ const bucketsMap = new Map(buckets.map((b: any) => [b.bucket_formatted, b]));
const mergedBuckets = allBuckets.map(emptyBucket => {
const actualData = bucketsMap.get(emptyBucket.bucket_formatted);
@@ -191,9 +188,7 @@ export async function getMonitorUptimeBuckets(
});
// Sort by bucket_time ascending (oldest first) for frontend display
- mergedBuckets.sort((a, b) =>
- new Date(a.bucket_time).getTime() - new Date(b.bucket_time).getTime()
- );
+ mergedBuckets.sort((a, b) => new Date(a.bucket_time).getTime() - new Date(b.bucket_time).getTime());
return reply.status(200).send({
buckets: mergedBuckets,
@@ -212,4 +207,4 @@ export async function getMonitorUptimeBuckets(
console.error("Error retrieving monitor uptime buckets:", error);
return reply.status(500).send({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/getMonitors.ts b/server/src/api/uptime/getMonitors.ts
index a6c24d539..1c437b723 100644
--- a/server/src/api/uptime/getMonitors.ts
+++ b/server/src/api/uptime/getMonitors.ts
@@ -13,23 +13,20 @@ interface GetMonitorsRequest {
Querystring: GetMonitorsQuery;
}
-export async function getMonitors(
- request: FastifyRequest<GetMonitorsRequest>,
- reply: FastifyReply
-) {
+export async function getMonitors(request: FastifyRequest<GetMonitorsRequest>, reply: FastifyReply) {
const session = await getSessionFromReq(request);
const userId = session?.user?.id;
if (!userId) {
return reply.status(401).send({ error: "Unauthorized" });
}
-
+
// Get user's organizations
const userOrgs = await db
.select({ organizationId: member.organizationId })
.from(member)
.where(eq(member.userId, userId));
-
+
if (userOrgs.length === 0) {
return reply.status(403).send({ error: "No organization access" });
}
@@ -42,7 +39,7 @@ export async function getMonitors(
// Build where conditions
const orgIds = userOrgs.map(org => org.organizationId);
const conditions = [];
-
+
// Filter by specific organization if provided, otherwise all user's organizations
if (organizationId) {
// Check if user has access to the specified organization
@@ -54,11 +51,11 @@ export async function getMonitors(
// Use inArray for multiple orgs
conditions.push(inArray(uptimeMonitors.organizationId, orgIds));
}
-
+
if (enabled !== undefined) {
conditions.push(eq(uptimeMonitors.enabled, enabled));
}
-
+
if (monitorType) {
conditions.push(eq(uptimeMonitors.monitorType, monitorType));
}
@@ -78,19 +75,19 @@ export async function getMonitors(
// Get monitor IDs for uptime calculations
const monitorIds = monitors.map(m => m.monitor.id);
-
+
// Calculate uptime percentages from ClickHouse if we have monitors
let uptimeData: Record<number, { percentage24h: number; percentage7d: number; percentage30d: number }> = {};
-
+
if (monitorIds.length > 0) {
try {
const now = DateTime.now();
const periods = [
- { key: '24h', startTime: now.minus({ hours: 24 }).toFormat("yyyy-MM-dd HH:mm:ss") },
- { key: '7d', startTime: now.minus({ days: 7 }).toFormat("yyyy-MM-dd HH:mm:ss") },
- { key: '30d', startTime: now.minus({ days: 30 }).toFormat("yyyy-MM-dd HH:mm:ss") }
+ { key: "24h", startTime: now.minus({ hours: 24 }).toFormat("yyyy-MM-dd HH:mm:ss") },
+ { key: "7d", startTime: now.minus({ days: 7 }).toFormat("yyyy-MM-dd HH:mm:ss") },
+ { key: "30d", startTime: now.minus({ days: 30 }).toFormat("yyyy-MM-dd HH:mm:ss") },
];
-
+
// Run queries for each period
const uptimeResults = await Promise.all(
periods.map(async ({ key, startTime }) => {
@@ -104,44 +101,42 @@ export async function getMonitors(
AND timestamp >= {startTime:String}
GROUP BY monitor_id
`;
-
+
const result = await clickhouse.query({
query,
query_params: {
monitorIds,
- startTime
+ startTime,
},
- format: 'JSONEachRow'
+ format: "JSONEachRow",
});
-
+
const data = await processResults<{
monitor_id: number;
successful_checks: number;
total_checks: number;
}>(result);
-
+
return { key, data };
})
);
-
+
// Organize results by monitor ID
monitorIds.forEach(monitorId => {
uptimeData[monitorId] = {
percentage24h: 0,
percentage7d: 0,
- percentage30d: 0
+ percentage30d: 0,
};
});
-
+
uptimeResults.forEach(({ key, data }) => {
data.forEach(row => {
- const percentage = row.total_checks > 0
- ? (row.successful_checks / row.total_checks) * 100
- : 0;
-
- if (key === '24h') uptimeData[row.monitor_id].percentage24h = percentage;
- else if (key === '7d') uptimeData[row.monitor_id].percentage7d = percentage;
- else if (key === '30d') uptimeData[row.monitor_id].percentage30d = percentage;
+ const percentage = row.total_checks > 0 ? (row.successful_checks / row.total_checks) * 100 : 0;
+
+ if (key === "24h") uptimeData[row.monitor_id].percentage24h = percentage;
+ else if (key === "7d") uptimeData[row.monitor_id].percentage7d = percentage;
+ else if (key === "30d") uptimeData[row.monitor_id].percentage30d = percentage;
});
});
} catch (error) {
@@ -150,26 +145,28 @@ export async function getMonitors(
}
}
- const result = monitors.map((row) => ({
+ const result = monitors.map(row => ({
...row.monitor,
- status: row.status ? {
- ...row.status,
- uptimePercentage24h: uptimeData[row.monitor.id]?.percentage24h || null,
- uptimePercentage7d: uptimeData[row.monitor.id]?.percentage7d || null,
- uptimePercentage30d: uptimeData[row.monitor.id]?.percentage30d || null,
- } : null,
+ status: row.status
+ ? {
+ ...row.status,
+ uptimePercentage24h: uptimeData[row.monitor.id]?.percentage24h || null,
+ uptimePercentage7d: uptimeData[row.monitor.id]?.percentage7d || null,
+ uptimePercentage30d: uptimeData[row.monitor.id]?.percentage30d || null,
+ }
+ : null,
}));
return reply.status(200).send(result);
} catch (error) {
if (error instanceof Error && error.name === "ZodError") {
const zodError = error as any;
- return reply.status(400).send({
+ return reply.status(400).send({
error: "Validation error",
- details: zodError.errors
+ details: zodError.errors,
});
}
console.error("Error retrieving monitors:", error);
return reply.status(500).send({ error: "Internal server error" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/getRegions.ts b/server/src/api/uptime/getRegions.ts
index b9b165327..c95a95528 100644
--- a/server/src/api/uptime/getRegions.ts
+++ b/server/src/api/uptime/getRegions.ts
@@ -4,10 +4,7 @@ import { db } from "../../db/postgres/postgres.js";
import { agentRegions } from "../../db/postgres/uptimeSchema.js";
import { getSessionFromReq } from "../../lib/auth-utils.js";
-export async function getRegions(
- request: FastifyRequest,
- reply: FastifyReply
-) {
+export async function getRegions(request: FastifyRequest, reply: FastifyReply) {
const session = await getSessionFromReq(request);
const userId = session?.user?.id;
@@ -35,7 +32,7 @@ export async function getRegions(
name: region.name,
isHealthy: region.isHealthy ?? true,
lastHealthCheck: region.lastHealthCheck,
- isLocal: region.code === 'local',
+ isLocal: region.code === "local",
}));
return reply.send({
@@ -45,4 +42,4 @@ export async function getRegions(
console.error("Error fetching regions:", error);
return reply.status(500).send({ error: "Failed to fetch regions" });
}
-}
\ No newline at end of file
+}
diff --git a/server/src/api/uptime/incidents.ts b/server/src/api/uptime/incidents.ts
index fefaab9bf..d79416a4f 100644
--- a/server/src/api/uptime/incidents.ts
+++ b/server/src/api/uptime/incidents.ts
@@ -83,7 +83,9 @@ export const incidentsRoutes = async (server: FastifyInstance) => {
ELSE 'Unknown Monitor'
END
`,
- affectedRegions: sql<string[]>`ARRAY_REMOVE(ARRAY_AGG(DISTINCT ${uptimeIncidents.region} ORDER BY ${uptimeIncidents.region}), NULL)`,
+ affectedRegions: sql<
+ string[]
+ >`ARRAY_REMOVE(ARRAY_AGG(DISTINCT ${uptimeIncidents.region} ORDER BY ${uptimeIncidents.region}), NULL)`,
startTime: sql<string>`MIN(${uptimeIncidents.startTime})`,
endTime: sql<string>`MAX(${uptimeIncidents.endTime})`,
status: uptimeIncidents.status,
@@ -278,4 +280,3 @@ export const incidentsRoutes = async (server: FastifyInstance) => {
},
});
};
-
diff --git a/server/src/api/uptime/schemas.ts b/server/src/api/uptime/schemas.ts
index d080827c5..27aed9e91 100644
--- a/server/src/api/uptime/schemas.ts
+++ b/server/src/api/uptime/schemas.ts
@@ -105,7 +105,7 @@ export const createMonitorSchema = z
selectedRegions: z.array(z.string()).default([]),
})
.refine(
- (data) => {
+ data => {
if (data.monitorType === "http") {
return data.httpConfig !== undefined;
}
@@ -116,7 +116,7 @@ export const createMonitorSchema = z
},
{
message: "Monitor type specific configuration is required",
- },
+ }
);
// Update monitor schema (similar to create but with optional fields)
@@ -136,7 +136,7 @@ export const getMonitorsQuerySchema = z.object({
organizationId: z.string().optional(),
enabled: z
.enum(["true", "false"])
- .transform((val) => val === "true")
+ .transform(val => val === "true")
.optional(),
monitorType: z.enum(["http", "tcp"]).optional(),
limit: z.string().transform(Number).pipe(z.number().int().positive().max(100)).default("50"),
diff --git a/server/src/api/uptime/utils.ts b/server/src/api/uptime/utils.ts
index 6588efe61..ef415d322 100644
--- a/server/src/api/uptime/utils.ts
+++ b/server/src/api/uptime/utils.ts
@@ -8,5 +8,5 @@ export async function getUserOrganizations(userId: string) {
.from(member)
.where(eq(member.userId, userId));
- return userOrgs.map((org) => org.organizationId);
+ return userOrgs.map(org => org.organizationId);
}
diff --git a/server/src/api/user/getUserOrganizations.ts b/server/src/api/user/getUserOrganizations.ts
index 36264ff5f..cac5e972d 100644
--- a/server/src/api/user/getUserOrganizations.ts
+++ b/server/src/api/user/getUserOrganizations.ts
@@ -4,10 +4,7 @@ import { eq } from "drizzle-orm";
import { member, organization } from "../../db/postgres/schema.js";
import { getSessionFromReq } from "../../lib/auth-utils.js";
-export const getUserOrganizations = async (
- request: FastifyRequest,
- reply: FastifyReply
-) => {
+export const getUserOrganizations = async (request: FastifyRequest, reply: FastifyReply) => {
try {
const session = await getSessionFromReq(request);
diff --git a/server/src/api/user/listOrganizationMembers.ts b/server/src/api/user/listOrganizationMembers.ts
index 5ed739c0e..954944a18 100644
--- a/server/src/api/user/listOrganizationMembers.ts
+++ b/server/src/api/user/listOrganizationMembers.ts
@@ -20,7 +20,7 @@ interface UserInfo {
export async function listOrganizationMembers(
request: FastifyRequest<ListOrganizationMembersRequest>,
- reply: FastifyReply,
+ reply: FastifyReply
) {
try {
const { organizationId } = request.params;
@@ -68,7 +68,7 @@ export async function listOrganizationMembers(
// Transform the results to the expected format
return reply.send({
success: true,
- data: organizationMembers.map((m) => ({
+ data: organizationMembers.map(m => ({
id: m.id,
role: m.role,
userId: m.userId,
diff --git a/server/src/db/postgres/schema.ts b/server/src/db/postgres/schema.ts
index 40e7db173..4cdfcae93 100644
--- a/server/src/db/postgres/schema.ts
+++ b/server/src/db/postgres/schema.ts
@@ -35,7 +35,7 @@ export const user = pgTable(
overMonthlyLimit: boolean().default(false),
monthlyEventCount: integer().default(0),
},
- (table) => [unique("user_username_unique").on(table.username), unique("user_email_unique").on(table.email)],
+ table => [unique("user_username_unique").on(table.username), unique("user_email_unique").on(table.email)]
);
export const verification = pgTable("verification", {
@@ -66,7 +66,7 @@ export const sites = pgTable(
excludedIPs: jsonb("excluded_ips").default([]), // Array of IP addresses/ranges to exclude
apiKey: text("api_key"), // Format: rb_{32_hex_chars} = 35 chars total
},
- (table) => [
+ table => [
foreignKey({
columns: [table.createdBy],
foreignColumns: [user.id],
@@ -77,7 +77,7 @@ export const sites = pgTable(
foreignColumns: [organization.id],
name: "sites_organization_id_organization_id_fk",
}),
- ],
+ ]
);
// Active sessions table
@@ -99,7 +99,7 @@ export const funnels = pgTable(
createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.siteId],
foreignColumns: [sites.siteId],
@@ -110,7 +110,7 @@ export const funnels = pgTable(
foreignColumns: [user.id],
name: "funnels_user_id_user_id_fk",
}),
- ],
+ ]
);
export const account = pgTable(
@@ -130,13 +130,13 @@ export const account = pgTable(
createdAt: timestamp({ mode: "string" }).notNull(),
updatedAt: timestamp({ mode: "string" }).notNull(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.userId],
foreignColumns: [user.id],
name: "account_userId_user_id_fk",
}),
- ],
+ ]
);
export const organization = pgTable(
@@ -152,7 +152,7 @@ export const organization = pgTable(
monthlyEventCount: integer().default(0),
overMonthlyLimit: boolean().default(false),
},
- (table) => [unique("organization_slug_unique").on(table.slug)],
+ table => [unique("organization_slug_unique").on(table.slug)]
);
export const member = pgTable(
@@ -164,7 +164,7 @@ export const member = pgTable(
role: text().notNull(),
createdAt: timestamp({ mode: "string" }).notNull(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.organizationId],
foreignColumns: [organization.id],
@@ -175,7 +175,7 @@ export const member = pgTable(
foreignColumns: [user.id],
name: "member_userId_user_id_fk",
}),
- ],
+ ]
);
export const invitation = pgTable(
@@ -189,7 +189,7 @@ export const invitation = pgTable(
status: text().notNull(),
expiresAt: timestamp({ mode: "string" }).notNull(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.inviterId],
foreignColumns: [user.id],
@@ -200,7 +200,7 @@ export const invitation = pgTable(
foreignColumns: [organization.id],
name: "invitation_organizationId_organization_id_fk",
}),
- ],
+ ]
);
export const session = pgTable(
@@ -217,14 +217,14 @@ export const session = pgTable(
impersonatedBy: text(),
activeOrganizationId: text(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.userId],
foreignColumns: [user.id],
name: "session_userId_user_id_fk",
}),
unique("session_token_unique").on(table.token),
- ],
+ ]
);
// Goals table for tracking conversion goals
@@ -246,13 +246,13 @@ export const goals = pgTable(
}>(),
createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.siteId],
foreignColumns: [sites.siteId],
name: "goals_site_id_sites_site_id_fk",
}),
- ],
+ ]
);
// Telemetry table for tracking self-hosted instances
diff --git a/server/src/db/postgres/uptimeSchema.ts b/server/src/db/postgres/uptimeSchema.ts
index 38e23553a..71b884e88 100644
--- a/server/src/db/postgres/uptimeSchema.ts
+++ b/server/src/db/postgres/uptimeSchema.ts
@@ -105,7 +105,7 @@ export const uptimeMonitors = pgTable(
.notNull()
.references(() => user.id),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.organizationId],
foreignColumns: [organization.id],
@@ -116,7 +116,7 @@ export const uptimeMonitors = pgTable(
foreignColumns: [user.id],
name: "uptime_monitors_created_by_user_id_fk",
}),
- ],
+ ]
);
// Monitor status tracking
@@ -138,7 +138,7 @@ export const uptimeMonitorStatus = pgTable(
averageResponseTime24h: real("average_response_time_24h"),
updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.monitorId],
foreignColumns: [uptimeMonitors.id],
@@ -149,7 +149,7 @@ export const uptimeMonitorStatus = pgTable(
check("uptime_monitor_status_uptime_7d_check", sql`uptime_percentage_7d >= 0 AND uptime_percentage_7d <= 100`),
check("uptime_monitor_status_uptime_30d_check", sql`uptime_percentage_30d >= 0 AND uptime_percentage_30d <= 100`),
index("uptime_monitor_status_updated_at_idx").on(table.updatedAt),
- ],
+ ]
);
// Alert configuration (scaffolding)
@@ -170,13 +170,13 @@ export const uptimeAlerts = pgTable(
enabled: boolean("enabled").default(true),
createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.monitorId],
foreignColumns: [uptimeMonitors.id],
name: "uptime_alerts_monitor_id_uptime_monitors_id_fk",
}),
- ],
+ ]
);
// Alert history (scaffolding)
@@ -194,7 +194,7 @@ export const uptimeAlertHistory = pgTable(
resolvedAt: timestamp("resolved_at", { mode: "string" }),
alertData: jsonb("alert_data"), // Context about what triggered the alert
},
- (table) => [
+ table => [
foreignKey({
columns: [table.alertId],
foreignColumns: [uptimeAlerts.id],
@@ -205,7 +205,7 @@ export const uptimeAlertHistory = pgTable(
foreignColumns: [uptimeMonitors.id],
name: "uptime_alert_history_monitor_id_uptime_monitors_id_fk",
}),
- ],
+ ]
);
// Agent regions for VPS-based monitoring
@@ -253,7 +253,7 @@ export const uptimeIncidents = pgTable(
createdAt: timestamp("created_at", { mode: "string" }).defaultNow(),
updatedAt: timestamp("updated_at", { mode: "string" }).defaultNow(),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.organizationId],
foreignColumns: [organization.id],
@@ -274,7 +274,7 @@ export const uptimeIncidents = pgTable(
foreignColumns: [user.id],
name: "uptime_incidents_resolved_by_user_id_fk",
}),
- ],
+ ]
);
// Notification channels table
@@ -318,7 +318,7 @@ export const notificationChannels = pgTable(
.notNull()
.references(() => user.id),
},
- (table) => [
+ table => [
foreignKey({
columns: [table.organizationId],
foreignColumns: [organization.id],
@@ -329,5 +329,5 @@ export const notificationChannels = pgTable(
foreignColumns: [user.id],
name: "notification_channels_created_by_user_id_fk",
}),
- ],
-);
\ No newline at end of file
+ ]
+);
diff --git a/server/src/index.ts b/server/src/index.ts
index 00f931c32..92ea01069 100644
--- a/server/src/index.ts
+++ b/server/src/index.ts
@@ -168,7 +168,7 @@ server.register(fastifyStatic, {
server.register(
async (fastify, options) => {
- await fastify.register((fastify) => {
+ await fastify.register(fastify => {
const authHandler = toNodeHandler(options.auth);
fastify.addContentTypeParser(
@@ -176,7 +176,7 @@ server.register(
/* c8 ignore next 3 */
(_request, _payload, done) => {
done(null, null);
- },
+ }
);
fastify.all("/api/auth/*", async (request, reply: any) => {
@@ -189,7 +189,7 @@ server.register(
});
});
},
- { auth: auth! },
+ { auth: auth! }
);
const PUBLIC_ROUTES: string[] = [
@@ -254,12 +254,12 @@ server.addHook("onRequest", async (request, reply) => {
let processedUrl = url;
// Bypass auth for public routes (now including the prepended /api)
- if (PUBLIC_ROUTES.some((route) => processedUrl.includes(route))) {
+ if (PUBLIC_ROUTES.some(route => processedUrl.includes(route))) {
return;
}
// Check if it's an analytics route and get site ID (now including the prepended /api)
- if (ANALYTICS_ROUTES.some((route) => processedUrl.startsWith(route))) {
+ if (ANALYTICS_ROUTES.some(route => processedUrl.startsWith(route))) {
const siteId = extractSiteId(processedUrl);
if (siteId && (await isSitePublic(siteId))) {
@@ -381,10 +381,10 @@ if (IS_CLOUD) {
server.get("/api/uptime/monitors/:monitorId/uptime", getMonitorUptime);
server.get("/api/uptime/monitors/:monitorId/buckets", getMonitorUptimeBuckets);
server.get("/api/uptime/regions", getRegions);
-
+
// Register incidents routes
server.register(incidentsRoutes);
-
+
// Register notification routes
server.register(notificationRoutes);
}
diff --git a/server/src/lib/auth-utils.ts b/server/src/lib/auth-utils.ts
index 004d33880..059ce54c9 100644
--- a/server/src/lib/auth-utils.ts
+++ b/server/src/lib/auth-utils.ts
@@ -88,8 +88,8 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f
// Extract organization IDs
const organizationIds = memberRecords
- .filter((record) => !adminOnly || record.role !== "member")
- .map((record) => record.organizationId);
+ .filter(record => !adminOnly || record.role !== "member")
+ .map(record => record.organizationId);
// Get sites for these organizations
const siteRecords = await db.select().from(sites).where(inArray(sites.organizationId, organizationIds));
@@ -112,17 +112,17 @@ export async function getSitesUserHasAccessTo(req: FastifyRequest, adminOnly = f
// for routes that are potentially public
export async function getUserHasAccessToSitePublic(req: FastifyRequest, siteId: string | number) {
const [sites, isPublic] = await Promise.all([getSitesUserHasAccessTo(req), isSitePublic(siteId)]);
- return sites.some((site) => site.siteId === Number(siteId)) || isPublic;
+ return sites.some(site => site.siteId === Number(siteId)) || isPublic;
}
export async function getUserHasAccessToSite(req: FastifyRequest, siteId: string | number) {
const sites = await getSitesUserHasAccessTo(req);
- return sites.some((site) => site.siteId === Number(siteId));
+ return sites.some(site => site.siteId === Number(siteId));
}
export async function getUserHasAdminAccessToSite(req: FastifyRequest, siteId: string | number) {
const sites = await getSitesUserHasAccessTo(req, true);
- return sites.some((site) => site.siteId === Number(siteId));
+ return sites.some(site => site.siteId === Number(siteId));
}
export async function getUserIsInOrg(req: FastifyRequest, organizationId: string) {
diff --git a/server/src/lib/auth.ts b/server/src/lib/auth.ts
index 0a6dbef65..ea3cf0437 100644
--- a/server/src/lib/auth.ts
+++ b/server/src/lib/auth.ts
@@ -22,13 +22,13 @@ const pluginList = [
allowUserToCreateOrganization: true,
// Set the creator role to owner
creatorRole: "owner",
- sendInvitationEmail: async (invitation) => {
+ sendInvitationEmail: async invitation => {
const inviteLink = `${process.env.BASE_URL}/invitation?invitationId=${invitation.invitation.id}&organization=${invitation.organization.name}&inviterEmail=${invitation.inviter.user.email}`;
await sendInvitationEmail(
invitation.email,
invitation.inviter.user.email,
invitation.organization.name,
- inviteLink,
+ inviteLink
);
},
}),
@@ -194,7 +194,7 @@ export function initAuth(allowedOrigins: string[]) {
enabled: true,
// Add a hook to run before deleting a user
// i dont think this works
- beforeDelete: async (user) => {
+ beforeDelete: async user => {
// Delete all memberships for this user first
console.log(`Cleaning up memberships for user ${user.id} before deletion`);
try {
diff --git a/server/src/lib/const.ts b/server/src/lib/const.ts
index eecf818ad..2ed27ea37 100644
--- a/server/src/lib/const.ts
+++ b/server/src/lib/const.ts
@@ -175,7 +175,7 @@ export const getStripePrices = () => {
if (process.env.STRIPE_SECRET_KEY?.startsWith("sk_live")) {
return STRIPE_PRICES;
}
- return STRIPE_PRICES.map((price) => ({
+ return STRIPE_PRICES.map(price => ({
...price,
priceId: TEST_TO_PRICE_ID[price.name as keyof typeof TEST_TO_PRICE_ID],
}));
diff --git a/server/src/lib/ipUtils.ts b/server/src/lib/ipUtils.ts
index 30d92ba64..f424ce2d5 100644
--- a/server/src/lib/ipUtils.ts
+++ b/server/src/lib/ipUtils.ts
@@ -50,7 +50,7 @@ export function validateIPPattern(pattern: string): { valid: boolean; error?: st
// Range notation (IPv4 only)
if (trimmedPattern.includes("-")) {
- const [startIP, endIP] = trimmedPattern.split("-").map((ip) => ip.trim());
+ const [startIP, endIP] = trimmedPattern.split("-").map(ip => ip.trim());
if (!startIP || !endIP) {
return { valid: false, error: "Invalid range format" };
}
@@ -112,7 +112,7 @@ export function matchesCIDR(ipAddress: string, cidr: string): boolean {
*/
export function matchesRange(ipAddress: string, range: string): boolean {
try {
- const [startIP, endIP] = range.split("-").map((ip) => ip.trim());
+ const [startIP, endIP] = range.split("-").map(ip => ip.trim());
// Try IPv4 first
try {
diff --git a/server/src/lib/rateLimiter.ts b/server/src/lib/rateLimiter.ts
index 07775e8ed..cf0cd2df0 100644
--- a/server/src/lib/rateLimiter.ts
+++ b/server/src/lib/rateLimiter.ts
@@ -47,7 +47,10 @@ export const apiKeyRateLimiter = new ApiKeyRateLimiter();
// Clean up expired entries every 5 minutes
if (IS_CLOUD) {
- setInterval(() => {
- apiKeyRateLimiter.cleanup();
- }, 5 * 60 * 1000);
-}
\ No newline at end of file
+ setInterval(
+ () => {
+ apiKeyRateLimiter.cleanup();
+ },
+ 5 * 60 * 1000
+ );
+}
diff --git a/server/src/lib/resend.ts b/server/src/lib/resend.ts
index 8966e40cb..1c0839639 100644
--- a/server/src/lib/resend.ts
+++ b/server/src/lib/resend.ts
@@ -7,11 +7,7 @@ if (IS_CLOUD) {
resend = new Resend(process.env.RESEND_API_KEY);
}
-export const sendEmail = async (
- email: string,
- subject: string,
- html: string
-) => {
+export const sendEmail = async (email: string, subject: string, html: string) => {
if (!resend) {
return;
// not sure how to handle self hosted instances without resend
@@ -158,9 +154,5 @@ export const sendInvitationEmail = async (
</body>
</html>
`;
- await sendEmail(
- email,
- "You're Invited to Join an Organization on Rybbit",
- html
- );
+ await sendEmail(email, "You're Invited to Join an Organization on Rybbit", html);
};
diff --git a/server/src/lib/siteConfig.ts b/server/src/lib/siteConfig.ts
index 05bf86013..3e3c48313 100644
--- a/server/src/lib/siteConfig.ts
+++ b/server/src/lib/siteConfig.ts
@@ -250,7 +250,6 @@ class SiteConfig {
return false;
}
}
-
}
// Singleton instance
diff --git a/server/src/lib/twilio.ts b/server/src/lib/twilio.ts
index b4aa8f538..92461cba0 100644
--- a/server/src/lib/twilio.ts
+++ b/server/src/lib/twilio.ts
@@ -11,10 +11,7 @@ if (IS_CLOUD && process.env.TWILIO_ACCOUNT_SID && process.env.TWILIO_AUTH_TOKEN)
twilioClient = twilio(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN);
}
-export const sendSMS = async (
- phoneNumber: string,
- message: string
-): Promise<{ success: boolean; error?: string }> => {
+export const sendSMS = async (phoneNumber: string, message: string): Promise<{ success: boolean; error?: string }> => {
if (!twilioClient) {
logger.info("Twilio client not initialized - skipping SMS notification");
return { success: false, error: "SMS not configured" };
@@ -36,18 +33,18 @@ export const sendSMS = async (
return { success: true };
} catch (error) {
logger.error({ phoneNumber, error }, "Failed to send SMS");
- return {
- success: false,
- error: error instanceof Error ? error.message : "Failed to send SMS"
+ return {
+ success: false,
+ error: error instanceof Error ? error.message : "Failed to send SMS",
};
}
};
export const isSMSConfigured = (): boolean => {
return !!(
- twilioClient &&
+ twilioClient &&
process.env.TWILIO_PHONE_NUMBER &&
process.env.TWILIO_ACCOUNT_SID &&
process.env.TWILIO_AUTH_TOKEN
);
-};
\ No newline at end of file
+};
diff --git a/server/src/services/admin/subscriptionService.ts b/server/src/services/admin/subscriptionService.ts
index dba736195..ccee2caf7 100644
--- a/server/src/services/admin/subscriptionService.ts
+++ b/server/src/services/admin/subscriptionService.ts
@@ -17,7 +17,7 @@ export interface SubscriptionData {
function findPlanDetails(priceId: string): StripePlan | undefined {
return getStripePrices().find(
(plan: StripePlan) =>
- plan.priceId === priceId || (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId),
+ plan.priceId === priceId || (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)
);
}
@@ -29,7 +29,7 @@ function findPlanDetails(priceId: string): StripePlan | undefined {
*/
async function fetchSubscriptionsForCustomers(
stripeCustomerIds: Set<string>,
- includeFullDetails = false,
+ includeFullDetails = false
): Promise<Map<string, SubscriptionData>> {
const subscriptionMap = new Map<string, SubscriptionData>();
@@ -85,7 +85,7 @@ async function fetchSubscriptionsForCustomers(
// Rate limiting: wait 50ms between requests (20 req/s)
if (hasMore) {
- await new Promise((resolve) => setTimeout(resolve, 50));
+ await new Promise(resolve => setTimeout(resolve, 50));
}
}
} catch (error) {
@@ -103,12 +103,12 @@ async function fetchSubscriptionsForCustomers(
*/
export async function getOrganizationSubscriptions(
organizations: Array<{ id: string; stripeCustomerId?: string | null }>,
- includeFullDetails = false,
+ includeFullDetails = false
): Promise<
Map<string, SubscriptionData & { planName: string; status: string; eventLimit: number; currentPeriodEnd: Date }>
> {
- const orgsWithStripe = organizations.filter((org) => org.stripeCustomerId);
- const stripeCustomerIds = new Set(orgsWithStripe.map((org) => org.stripeCustomerId!));
+ const orgsWithStripe = organizations.filter(org => org.stripeCustomerId);
+ const stripeCustomerIds = new Set(orgsWithStripe.map(org => org.stripeCustomerId!));
const subscriptionMap = await fetchSubscriptionsForCustomers(stripeCustomerIds, includeFullDetails);
diff --git a/server/src/services/replay/sessionReplayIngestService.ts b/server/src/services/replay/sessionReplayIngestService.ts
index b28f9540a..d1a18df0f 100644
--- a/server/src/services/replay/sessionReplayIngestService.ts
+++ b/server/src/services/replay/sessionReplayIngestService.ts
@@ -27,13 +27,10 @@ export class SessionReplayIngestService {
const { userId: clientUserId, events, metadata } = request;
// Generate user ID server-side if not provided by client
- const userId = clientUserId && clientUserId.trim()
- ? clientUserId.trim()
- : userIdService.generateUserId(
- requestMeta?.ipAddress || "",
- requestMeta?.userAgent || "",
- siteId
- );
+ const userId =
+ clientUserId && clientUserId.trim()
+ ? clientUserId.trim()
+ : userIdService.generateUserId(requestMeta?.ipAddress || "", requestMeta?.userAgent || "", siteId);
// Get or create a session ID from the sessions service
const { sessionId } = await sessionsService.updateSession({
@@ -44,11 +41,11 @@ export class SessionReplayIngestService {
// Check if R2 storage is enabled for cloud deployments
let r2BatchKey: string | null = null;
let eventDataArray: any[] = [];
-
+
if (r2Storage.isEnabled()) {
// Extract event data for R2 storage
eventDataArray = events.map(event => event.data);
-
+
try {
// Store event data batch in R2
r2BatchKey = await r2Storage.storeBatch(siteId, sessionId, eventDataArray);
@@ -61,7 +58,7 @@ export class SessionReplayIngestService {
// Prepare events for batch insert
const eventsToInsert = events.map((event, index) => {
const serializedData = JSON.stringify(event.data);
-
+
if (r2BatchKey) {
// R2 storage: store metadata only in ClickHouse
return {
@@ -110,13 +107,7 @@ export class SessionReplayIngestService {
// Update or insert metadata
if (metadata) {
- await this.updateSessionMetadata(
- siteId,
- sessionId,
- userId,
- metadata,
- requestMeta
- );
+ await this.updateSessionMetadata(siteId, sessionId, userId, metadata, requestMeta);
}
}
@@ -185,9 +176,7 @@ export class SessionReplayIngestService {
// Calculate duration
const startTime = new Date(sessionReplayData.start_time);
- const endTime = sessionReplayData.end_time
- ? new Date(sessionReplayData.end_time)
- : null;
+ const endTime = sessionReplayData.end_time ? new Date(sessionReplayData.end_time) : null;
const durationMs = endTime ? endTime.getTime() - startTime.getTime() : null;
// Insert or update metadata
@@ -198,12 +187,8 @@ export class SessionReplayIngestService {
site_id: siteId,
session_id: sessionId,
user_id: userId,
- start_time: DateTime.fromJSDate(startTime).toFormat(
- "yyyy-MM-dd HH:mm:ss"
- ),
- end_time: endTime
- ? DateTime.fromJSDate(endTime).toFormat("yyyy-MM-dd HH:mm:ss")
- : null,
+ start_time: DateTime.fromJSDate(startTime).toFormat("yyyy-MM-dd HH:mm:ss"),
+ end_time: endTime ? DateTime.fromJSDate(endTime).toFormat("yyyy-MM-dd HH:mm:ss") : null,
duration_ms: durationMs,
event_count: sessionReplayData.event_count || 0,
compressed_size_bytes: sessionReplayData.compressed_size_bytes || 0,
@@ -218,10 +203,8 @@ export class SessionReplayIngestService {
operating_system: trackingData.operatingSystem || "",
operating_system_version: trackingData.operatingSystemVersion || "",
language: trackingData.language || "",
- screen_width:
- sessionReplayData.screen_width || metadata?.viewportWidth || 0,
- screen_height:
- sessionReplayData.screen_height || metadata?.viewportHeight || 0,
+ screen_width: sessionReplayData.screen_width || metadata?.viewportWidth || 0,
+ screen_height: sessionReplayData.screen_height || metadata?.viewportHeight || 0,
device_type: trackingData.deviceType || "",
channel: trackingData.channel || "",
hostname: trackingData.hostname || "",
diff --git a/server/src/services/replay/sessionReplayQueryService.ts b/server/src/services/replay/sessionReplayQueryService.ts
index 841b13221..c3f1f4fd5 100644
--- a/server/src/services/replay/sessionReplayQueryService.ts
+++ b/server/src/services/replay/sessionReplayQueryService.ts
@@ -20,7 +20,7 @@ export class SessionReplayQueryService {
offset?: number;
userId?: string;
minDuration?: number;
- } & Pick<FilterParams, "startDate" | "endDate" | "timeZone" | "pastMinutesStart" | "pastMinutesEnd" | "filters">,
+ } & Pick<FilterParams, "startDate" | "endDate" | "timeZone" | "pastMinutesStart" | "pastMinutesEnd" | "filters">
): Promise<SessionReplayListItem[]> {
const { limit = 50, offset = 0, userId, minDuration } = options;
@@ -164,7 +164,7 @@ export class SessionReplayQueryService {
// Group events by batch key for efficient R2 retrieval
const eventsByBatch = new Map<string | null, EventRow[]>();
- eventsResults.forEach((event) => {
+ eventsResults.forEach(event => {
const key = event.event_data_key;
if (!eventsByBatch.has(key)) {
eventsByBatch.set(key, []);
diff --git a/server/src/services/replay/trackingUtils.ts b/server/src/services/replay/trackingUtils.ts
index 5ab6cfd0f..ddeb926a9 100644
--- a/server/src/services/replay/trackingUtils.ts
+++ b/server/src/services/replay/trackingUtils.ts
@@ -32,7 +32,7 @@ export async function parseTrackingData(
hostname: string,
language: string,
screenWidth: number,
- screenHeight: number,
+ screenHeight: number
): Promise<TrackingData> {
// Parse user agent
const ua = UAParser(userAgent);
diff --git a/server/src/services/shared/requestValidation.test.ts b/server/src/services/shared/requestValidation.test.ts
index 4b1dcd1ca..250225d82 100644
--- a/server/src/services/shared/requestValidation.test.ts
+++ b/server/src/services/shared/requestValidation.test.ts
@@ -187,7 +187,7 @@ describe("validateOrigin", () => {
expect(result).toEqual({ success: true });
expect(consoleSpy).toHaveBeenCalledWith(
- "[Validation] Origin check disabled. Allowing request for site 1 from origin: https://example.com",
+ "[Validation] Origin check disabled. Allowing request for site 1 from origin: https://example.com"
);
consoleSpy.mockRestore();
diff --git a/server/src/services/shared/requestValidation.ts b/server/src/services/shared/requestValidation.ts
index 9089c8db8..fa5cde232 100644
--- a/server/src/services/shared/requestValidation.ts
+++ b/server/src/services/shared/requestValidation.ts
@@ -28,10 +28,7 @@ export interface OriginValidationResult {
* @param apiKey The API key from the payload
* @returns An object with success status and optional error message
*/
-export async function validateApiKey(
- siteId: string | number,
- apiKey?: string
-): Promise<ApiKeyValidationResult> {
+export async function validateApiKey(siteId: string | number, apiKey?: string): Promise<ApiKeyValidationResult> {
if (!apiKey) {
return { success: false };
}
@@ -57,24 +54,17 @@ export async function validateApiKey(
}
}
-
/**
* Validates if the request's origin matches the registered domain for the site
* @param siteId The site ID from the tracking payload
* @param requestOrigin The origin header from the request
* @returns An object with success status and optional error message
*/
-export async function validateOrigin(
- siteId: string | number,
- requestOrigin?: string,
-): Promise<OriginValidationResult> {
+export async function validateOrigin(siteId: string | number, requestOrigin?: string): Promise<OriginValidationResult> {
try {
// If origin checking is disabled, return success
if (DISABLE_ORIGIN_CHECK) {
- logger.info(
- { siteId, origin: requestOrigin || "none" },
- "Origin check disabled, allowing request"
- );
+ logger.info({ siteId, origin: requestOrigin || "none" }, "Origin check disabled, allowing request");
return { success: true };
}
@@ -147,4 +137,4 @@ export async function validateOrigin(
*/
export function checkApiKeyRateLimit(apiKey: string): boolean {
return apiKeyRateLimiter.isAllowed(apiKey);
-}
\ No newline at end of file
+}
diff --git a/server/src/services/storage/r2StorageService.ts b/server/src/services/storage/r2StorageService.ts
index 87a588196..87bf07df2 100644
--- a/server/src/services/storage/r2StorageService.ts
+++ b/server/src/services/storage/r2StorageService.ts
@@ -34,7 +34,7 @@ class R2StorageService {
response: {
...response.response,
headers: Object.fromEntries(
- Object.entries(response.response.headers).filter(([key]) => !key.toLowerCase().includes("checksum")),
+ Object.entries(response.response.headers).filter(([key]) => !key.toLowerCase().includes("checksum"))
),
},
};
@@ -95,7 +95,7 @@ class R2StorageService {
eventCount: eventDataArray.length.toString(),
compression: "zstd",
},
- }),
+ })
);
return key;
@@ -119,7 +119,7 @@ class R2StorageService {
new GetObjectCommand({
Bucket: this.bucketName,
Key: key,
- }),
+ })
);
if (!response.Body) {
@@ -194,7 +194,7 @@ class R2StorageService {
new DeleteObjectCommand({
Bucket: this.bucketName,
Key: key,
- }),
+ })
);
} catch (error) {
console.error("[R2Storage] Failed to delete batch:", error);
diff --git a/server/src/services/tracker/const.ts b/server/src/services/tracker/const.ts
index b736f0d79..74d47b001 100644
--- a/server/src/services/tracker/const.ts
+++ b/server/src/services/tracker/const.ts
@@ -599,16 +599,7 @@ const emailSources = [
"campaign",
];
-const smsSources = [
- "sms",
- "text",
- "twilio",
- "message",
- "whatsapp",
- "viber",
- "line",
- "imessage",
-];
+const smsSources = ["sms", "text", "twilio", "message", "whatsapp", "viber", "line", "imessage"];
// Medium types
const socialMediums = [
@@ -1100,14 +1091,10 @@ export function getSourceType(source: string): string {
const lowerSource = source.toLowerCase();
// Check domains first
- if (searchDomains.some((domain) => lowerSource.includes(domain)))
- return "search";
- if (socialDomains.some((domain) => lowerSource.includes(domain)))
- return "social";
- if (videoDomains.some((domain) => lowerSource.includes(domain)))
- return "video";
- if (shoppingDomains.some((domain) => lowerSource.includes(domain)))
- return "shopping";
+ if (searchDomains.some(domain => lowerSource.includes(domain))) return "search";
+ if (socialDomains.some(domain => lowerSource.includes(domain))) return "social";
+ if (videoDomains.some(domain => lowerSource.includes(domain))) return "video";
+ if (shoppingDomains.some(domain => lowerSource.includes(domain))) return "shopping";
// Check source names
if (searchSources.includes(lowerSource)) return "search";
@@ -1185,8 +1172,5 @@ export function isPaidTraffic(medium: string, source: string): boolean {
"pinterest ads",
];
- return (
- paidMediums.some((pm) => lowerMedium.includes(pm)) ||
- paidSources.some((ps) => lowerSource.includes(ps))
- );
+ return paidMediums.some(pm => lowerMedium.includes(pm)) || paidSources.some(ps => lowerSource.includes(ps));
}
diff --git a/server/src/services/tracker/getChannel.ts b/server/src/services/tracker/getChannel.ts
index 4897dccde..2aefe1254 100644
--- a/server/src/services/tracker/getChannel.ts
+++ b/server/src/services/tracker/getChannel.ts
@@ -19,31 +19,31 @@ function getMobileAppCategory(appId: string): { type: string; isPaid: boolean }
const appIdLower = appId.toLowerCase();
// Check against our defined app ID lists
- if (socialAppIds.some((id) => appIdLower.includes(id))) {
+ if (socialAppIds.some(id => appIdLower.includes(id))) {
return { type: "Organic Social", isPaid: false };
}
- if (videoAppIds.some((id) => appIdLower.includes(id))) {
+ if (videoAppIds.some(id => appIdLower.includes(id))) {
return { type: "Organic Video", isPaid: false };
}
- if (searchAppIds.some((id) => appIdLower.includes(id))) {
+ if (searchAppIds.some(id => appIdLower.includes(id))) {
return { type: "Organic Search", isPaid: false };
}
- if (emailAppIds.some((id) => appIdLower.includes(id))) {
+ if (emailAppIds.some(id => appIdLower.includes(id))) {
return { type: "Email", isPaid: false };
}
- if (shoppingAppIds.some((id) => appIdLower.includes(id))) {
+ if (shoppingAppIds.some(id => appIdLower.includes(id))) {
return { type: "Organic Shopping", isPaid: false };
}
- if (newsAppIds.some((id) => appIdLower.includes(id))) {
+ if (newsAppIds.some(id => appIdLower.includes(id))) {
return { type: "News", isPaid: false };
}
- if (productivityAppIds.some((id) => appIdLower.includes(id))) {
+ if (productivityAppIds.some(id => appIdLower.includes(id))) {
return { type: "Productivity", isPaid: false };
}
@@ -99,7 +99,7 @@ function isSelfReferral(referringDomain: string, hostname: string): boolean {
function getChannelDetails(
referrer: string,
querystring: string,
- hostname?: string,
+ hostname?: string
): {
channel: string;
sourceType: string;
diff --git a/server/src/services/tracker/pageviewQueue.ts b/server/src/services/tracker/pageviewQueue.ts
index cdf7d484a..e4b7ece20 100644
--- a/server/src/services/tracker/pageviewQueue.ts
+++ b/server/src/services/tracker/pageviewQueue.ts
@@ -55,13 +55,13 @@ class PageviewQueue {
// Get batch of pageviews
const batch = this.queue.splice(0, this.batchSize);
- const ips = [...new Set(batch.map((pv) => pv.ipAddress))];
+ const ips = [...new Set(batch.map(pv => pv.ipAddress))];
let geoData: Record<string, { data: any }> = {};
try {
// Process each IP to get geo data using local implementation
- const geoPromises = ips.map(async (ip) => {
+ const geoPromises = ips.map(async ip => {
const locationData = await getLocation(ip);
return { ip, locationData };
});
@@ -77,7 +77,7 @@ class PageviewQueue {
}
// Process each pageview with its geo data
- const processedPageviews = batch.map((pv) => {
+ const processedPageviews = batch.map(pv => {
const dataForIp = geoData?.[pv.ipAddress];
const countryCode = dataForIp?.data?.countryIso || "";
diff --git a/server/src/services/tracker/trackEvent.ts b/server/src/services/tracker/trackEvent.ts
index 2cf7e6899..08256459d 100644
--- a/server/src/services/tracker/trackEvent.ts
+++ b/server/src/services/tracker/trackEvent.ts
@@ -48,7 +48,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [
.string()
.max(2048)
.refine(
- (val) => {
+ val => {
try {
JSON.parse(val);
return true;
@@ -56,7 +56,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [
return false;
}
},
- { message: "Properties must be a valid JSON string" },
+ { message: "Properties must be a valid JSON string" }
)
.optional(), // Optional but must be valid JSON if present
user_id: z.string().max(255).optional(),
@@ -108,27 +108,29 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [
.string()
.max(2048)
.refine(
- (val) => {
+ val => {
try {
const parsed = JSON.parse(val);
// Validate outbound-specific properties
if (typeof parsed.url !== "string" || parsed.url.length === 0) return false;
if (parsed.text && typeof parsed.text !== "string") return false;
if (parsed.target && typeof parsed.target !== "string") return false;
-
+
// Validate URL format
try {
new URL(parsed.url);
} catch {
return false;
}
-
+
return true;
} catch (e) {
return false;
}
},
- { message: "Properties must be valid JSON with outbound link fields (url required, text and target optional)" },
+ {
+ message: "Properties must be valid JSON with outbound link fields (url required, text and target optional)",
+ }
),
user_id: z.string().max(255).optional(),
api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars
@@ -153,7 +155,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [
.string()
.max(4096) // Larger limit for error details
.refine(
- (val) => {
+ val => {
try {
const parsed = JSON.parse(val);
// Validate error-specific properties
@@ -183,7 +185,7 @@ export const trackingPayloadSchema = z.discriminatedUnion("type", [
{
message:
"Properties must be valid JSON with error fields (message, stack, fileName, lineNumber, columnNumber)",
- },
+ }
),
user_id: z.string().max(255).optional(),
api_key: z.string().max(35).optional(), // rb_ prefix + 32 hex chars
@@ -219,7 +221,7 @@ export async function trackEvent(request: FastifyRequest, reply: FastifyReply) {
if (apiKeyValidation.error) {
logger.warn(
{ siteId: validatedPayload.site_id, error: apiKeyValidation.error },
- "Request rejected - API key validation failed",
+ "Request rejected - API key validation failed"
);
return reply.status(403).send({
success: false,
@@ -232,7 +234,7 @@ export async function trackEvent(request: FastifyRequest, reply: FastifyReply) {
if (!checkApiKeyRateLimit(validatedPayload.api_key)) {
logger.warn(
{ apiKey: validatedPayload.api_key, siteId: validatedPayload.site_id },
- "Rate limit exceeded for API key",
+ "Rate limit exceeded for API key"
);
return reply.status(429).send({
success: false,
@@ -248,7 +250,7 @@ export async function trackEvent(request: FastifyRequest, reply: FastifyReply) {
if (!originValidation.success) {
logger.warn(
{ siteId: validatedPayload.site_id, error: originValidation.error },
- "Request rejected - origin validation failed",
+ "Request rejected - origin validation failed"
);
return reply.status(403).send({
success: false,
@@ -296,7 +298,7 @@ export async function trackEvent(request: FastifyRequest, reply: FastifyReply) {
const payload = createBasePayload(
request, // Pass request for IP/UA
validatedPayload.type,
- validatedPayload, // Add validated payload back
+ validatedPayload // Add validated payload back
);
// Update session
const { sessionId } = await sessionsService.updateSession({
diff --git a/server/src/services/tracker/utils.ts b/server/src/services/tracker/utils.ts
index f6d24ba3f..7fde74c92 100644
--- a/server/src/services/tracker/utils.ts
+++ b/server/src/services/tracker/utils.ts
@@ -85,7 +85,7 @@ export function clearSelfReferrer(referrer: string, hostname: string): string {
export function createBasePayload(
request: FastifyRequest,
eventType: "pageview" | "custom_event" | "performance" | "error" | "outbound" = "pageview",
- validatedBody: ValidatedTrackingPayload,
+ validatedBody: ValidatedTrackingPayload
): TotalTrackingPayload {
// Use custom user agent if provided, otherwise fall back to header
const userAgent = validatedBody.user_agent || request.headers["user-agent"] || "";
diff --git a/server/src/services/uptime/checks/httpCheck.ts b/server/src/services/uptime/checks/httpCheck.ts
index b84b26dd6..ac5d275bc 100644
--- a/server/src/services/uptime/checks/httpCheck.ts
+++ b/server/src/services/uptime/checks/httpCheck.ts
@@ -66,7 +66,7 @@ export async function performHttpCheck(options: HttpCheckOptions): Promise<HttpC
case "basic":
if (options.auth.credentials?.username && options.auth.credentials?.password) {
const encoded = Buffer.from(
- `${options.auth.credentials.username}:${options.auth.credentials.password}`,
+ `${options.auth.credentials.username}:${options.auth.credentials.password}`
).toString("base64");
headers["Authorization"] = `Basic ${encoded}`;
}
diff --git a/server/src/services/uptime/checks/tcpCheck.ts b/server/src/services/uptime/checks/tcpCheck.ts
index b84eedd47..2a7846d02 100644
--- a/server/src/services/uptime/checks/tcpCheck.ts
+++ b/server/src/services/uptime/checks/tcpCheck.ts
@@ -1,6 +1,6 @@
-import net from 'net';
-import { performance } from 'perf_hooks';
-import { TcpCheckResult } from '../types.js';
+import net from "net";
+import { performance } from "perf_hooks";
+import { TcpCheckResult } from "../types.js";
interface TcpCheckOptions {
host: string;
@@ -10,50 +10,50 @@ interface TcpCheckOptions {
export async function performTcpCheck(options: TcpCheckOptions): Promise<TcpCheckResult> {
const startTime = performance.now();
-
- return new Promise<TcpCheckResult>((resolve) => {
+
+ return new Promise<TcpCheckResult>(resolve => {
const socket = new net.Socket();
const timeout = options.timeoutMs || 30000;
-
+
// Set timeout
socket.setTimeout(timeout);
-
+
// Handle successful connection
- socket.on('connect', () => {
+ socket.on("connect", () => {
const responseTimeMs = Math.round(performance.now() - startTime);
socket.destroy();
-
+
resolve({
- status: 'success',
+ status: "success",
responseTimeMs,
validationErrors: [],
});
});
-
+
// Handle errors
- socket.on('error', (error: any) => {
+ socket.on("error", (error: any) => {
const responseTimeMs = Math.round(performance.now() - startTime);
socket.destroy();
-
- let errorType = 'connection_error';
- let errorMessage = error.message || 'Connection failed';
-
- if (error.code === 'ECONNREFUSED') {
- errorType = 'connection_refused';
+
+ let errorType = "connection_error";
+ let errorMessage = error.message || "Connection failed";
+
+ if (error.code === "ECONNREFUSED") {
+ errorType = "connection_refused";
errorMessage = `Connection refused to ${options.host}:${options.port}`;
- } else if (error.code === 'ENOTFOUND') {
- errorType = 'dns_failure';
+ } else if (error.code === "ENOTFOUND") {
+ errorType = "dns_failure";
errorMessage = `Host ${options.host} not found`;
- } else if (error.code === 'ETIMEDOUT') {
- errorType = 'connection_timeout';
- errorMessage = 'Connection timed out';
- } else if (error.code === 'EHOSTUNREACH') {
- errorType = 'host_unreachable';
+ } else if (error.code === "ETIMEDOUT") {
+ errorType = "connection_timeout";
+ errorMessage = "Connection timed out";
+ } else if (error.code === "EHOSTUNREACH") {
+ errorType = "host_unreachable";
errorMessage = `Host ${options.host} is unreachable`;
}
-
+
resolve({
- status: errorType === 'connection_timeout' ? 'timeout' : 'failure',
+ status: errorType === "connection_timeout" ? "timeout" : "failure",
responseTimeMs,
validationErrors: [],
error: {
@@ -62,38 +62,38 @@ export async function performTcpCheck(options: TcpCheckOptions): Promise<TcpChec
},
});
});
-
+
// Handle timeout
- socket.on('timeout', () => {
+ socket.on("timeout", () => {
const responseTimeMs = Math.round(performance.now() - startTime);
socket.destroy();
-
+
resolve({
- status: 'timeout',
+ status: "timeout",
responseTimeMs,
validationErrors: [],
error: {
message: `Connection timeout after ${timeout}ms`,
- type: 'connection_timeout',
+ type: "connection_timeout",
},
});
});
-
+
// Attempt connection
try {
socket.connect(options.port, options.host);
} catch (error: any) {
const responseTimeMs = Math.round(performance.now() - startTime);
-
+
resolve({
- status: 'failure',
+ status: "failure",
responseTimeMs,
validationErrors: [],
error: {
- message: error.message || 'Failed to initiate connection',
- type: 'connection_error',
+ message: error.message || "Failed to initiate connection",
+ type: "connection_error",
},
});
}
});
-}
\ No newline at end of file
+}
diff --git a/server/src/services/uptime/monitorExecutor.ts b/server/src/services/uptime/monitorExecutor.ts
index 9de150bd5..0710d33aa 100644
--- a/server/src/services/uptime/monitorExecutor.ts
+++ b/server/src/services/uptime/monitorExecutor.ts
@@ -82,7 +82,7 @@ export class MonitorExecutor {
removeOnFail: {
count: 100,
},
- },
+ }
);
// Set up event listeners
@@ -94,7 +94,7 @@ export class MonitorExecutor {
this.logger.error(err as Error, `Job ${job?.id} failed`);
});
- this.worker.on("error", (err) => {
+ this.worker.on("error", err => {
this.logger.error(err as Error, "Worker error");
});
@@ -107,7 +107,7 @@ export class MonitorExecutor {
// });
// Wait for worker to be ready
- await new Promise<void>((resolve) => {
+ await new Promise<void>(resolve => {
if (this.worker) {
this.worker.once("ready", () => {
resolve();
@@ -241,7 +241,7 @@ export class MonitorExecutor {
where: and(
inArray(agentRegions.code, globalRegions),
eq(agentRegions.enabled, true),
- eq(agentRegions.isHealthy, true),
+ eq(agentRegions.isHealthy, true)
),
});
@@ -251,8 +251,8 @@ export class MonitorExecutor {
}
// Execute checks in parallel across all regions
- const regionPromises = regions.map((region) =>
- this.executeAgentCheck(monitor, region).catch((error) => {
+ const regionPromises = regions.map(region =>
+ this.executeAgentCheck(monitor, region).catch(error => {
this.logger.error(error as Error, `Error executing check in region ${region.code}`);
return {
region: region.code,
@@ -269,7 +269,7 @@ export class MonitorExecutor {
},
} as HttpCheckResult,
};
- }),
+ })
);
const regionResults = await Promise.all(regionPromises);
@@ -285,11 +285,11 @@ export class MonitorExecutor {
}
// Update monitor status based on the majority of regions
- const successCount = regionResults.filter((r) => r.result.status === "success").length;
+ const successCount = regionResults.filter(r => r.result.status === "success").length;
const overallStatus = successCount > regionResults.length / 2 ? "success" : "failure";
// Use the average response time from successful checks
- const successfulResults = regionResults.filter((r) => r.result.status === "success");
+ const successfulResults = regionResults.filter(r => r.result.status === "success");
const avgResponseTime =
successfulResults.length > 0
? successfulResults.reduce((sum, r) => sum + r.result.responseTimeMs, 0) / successfulResults.length
@@ -307,7 +307,7 @@ export class MonitorExecutor {
await this.updateMonitorStatus(monitor.id, aggregatedResult);
this.logger.info(
- `✅ Global monitor check completed: ${monitor.id} - ${overallStatus} (${regionResults.length} regions)`,
+ `✅ Global monitor check completed: ${monitor.id} - ${overallStatus} (${regionResults.length} regions)`
);
} catch (error) {
this.logger.error(error as Error, `Error processing global monitor check ${monitor.id}`);
@@ -316,7 +316,7 @@ export class MonitorExecutor {
private async executeAgentCheck(
monitor: any,
- region: any,
+ region: any
): Promise<{ region: string; result: HttpCheckResult | TcpCheckResult }> {
const jobId = `${monitor.id}-${Date.now()}-${region.code}`;
@@ -374,7 +374,7 @@ export class MonitorExecutor {
private async storeMonitorEvent(
monitor: any,
result: HttpCheckResult | TcpCheckResult,
- regionCode: string = "local",
+ regionCode: string = "local"
): Promise<void> {
// Helper to ensure timing values are non-negative or undefined
const sanitizeTiming = (value: number | undefined): number | undefined => {
@@ -469,7 +469,7 @@ export class MonitorExecutor {
currentStatus,
result,
consecutiveFailures,
- consecutiveSuccesses,
+ consecutiveSuccesses
);
} catch (error) {
this.logger.error(error as Error, "Failed to update monitor status");
@@ -482,7 +482,7 @@ export class MonitorExecutor {
currentStatus: string,
result: HttpCheckResult | TcpCheckResult,
consecutiveFailures: number,
- consecutiveSuccesses: number,
+ consecutiveSuccesses: number
): Promise<void> {
try {
// Get monitor details for incident creation
@@ -500,7 +500,7 @@ export class MonitorExecutor {
where: and(
eq(uptimeIncidents.monitorId, monitorId),
eq(uptimeIncidents.status, "active"),
- eq(uptimeIncidents.region, "local"),
+ eq(uptimeIncidents.region, "local")
),
});
@@ -541,7 +541,7 @@ export class MonitorExecutor {
await this.notificationService.sendIncidentNotifications(
monitor,
{ ...activeIncident, status: "resolved", endTime: now },
- "recovery",
+ "recovery"
);
}
// Status remains DOWN (Update failure count)
@@ -563,7 +563,7 @@ export class MonitorExecutor {
private async handleRegionalIncident(
monitor: any,
region: string,
- result: HttpCheckResult | TcpCheckResult,
+ result: HttpCheckResult | TcpCheckResult
): Promise<void> {
try {
const currentStatus = result.status === "success" ? "up" : "down";
@@ -614,7 +614,7 @@ export class MonitorExecutor {
where: and(
eq(uptimeIncidents.monitorId, monitor.id),
eq(uptimeIncidents.status, "active"),
- eq(uptimeIncidents.region, region),
+ eq(uptimeIncidents.region, region)
),
});
@@ -651,14 +651,14 @@ export class MonitorExecutor {
})
.where(eq(uptimeIncidents.id, activeIncident.id));
this.logger.info(
- `Resolved incident ${activeIncident.id} for monitor ${monitor.id} (${monitor.name}) in region ${region}`,
+ `Resolved incident ${activeIncident.id} for monitor ${monitor.id} (${monitor.name}) in region ${region}`
);
// Send recovery notifications for regional incident
await this.notificationService.sendIncidentNotifications(
monitor,
{ ...activeIncident, status: "resolved", endTime: now },
- "recovery",
+ "recovery"
);
}
// If check failed and there's already an active incident, update it
diff --git a/server/src/services/uptime/monitorScheduler.ts b/server/src/services/uptime/monitorScheduler.ts
index 0f390019a..a2cc8a3c3 100644
--- a/server/src/services/uptime/monitorScheduler.ts
+++ b/server/src/services/uptime/monitorScheduler.ts
@@ -146,26 +146,26 @@ export class MonitorScheduler {
// First, remove repeatable job configuration
const repeatableJobs = await this.queue.getRepeatableJobs();
- const monitorRepeatableJobs = repeatableJobs.filter((job) => job.name === jobName || job.id === jobName);
+ const monitorRepeatableJobs = repeatableJobs.filter(job => job.name === jobName || job.id === jobName);
- await Promise.all(monitorRepeatableJobs.map((job) => this.queue.removeRepeatableByKey(job.key)));
+ await Promise.all(monitorRepeatableJobs.map(job => this.queue.removeRepeatableByKey(job.key)));
// Then remove any non-repeat jobs (only remove jobs that don't belong to scheduler)
const jobs = await this.queue.getJobs(["waiting", "active", "completed", "failed"]);
- const monitorJobs = jobs.filter((job) => {
+ const monitorJobs = jobs.filter(job => {
// Only remove jobs that match our monitor and aren't repeat jobs
return (job.name === jobName || job.id === jobName) && !job.repeatJobKey;
});
await Promise.all(
- monitorJobs.map(async (job) => {
+ monitorJobs.map(async job => {
try {
await job.remove();
} catch (err) {
// Ignore errors for jobs that can't be removed (e.g., repeat jobs)
this.logger.warn({ jobId: job.id, error: err }, "Could not remove job");
}
- }),
+ })
);
this.logger.info({ monitorId }, "Removed schedule for monitor");
@@ -210,11 +210,11 @@ export class MonitorScheduler {
Promise.race([
this.queueEvents.close(),
new Promise((_, reject) => setTimeout(() => reject(new Error("Queue events close timeout")), 3000)),
- ]).catch((err) => this.logger.error(err, "Queue events close error")),
+ ]).catch(err => this.logger.error(err, "Queue events close error")),
Promise.race([
this.queue.close(),
new Promise((_, reject) => setTimeout(() => reject(new Error("Queue close timeout")), 3000)),
- ]).catch((err) => this.logger.error(err, "Queue close error")),
+ ]).catch(err => this.logger.error(err, "Queue close error")),
]);
this.logger.info("BullMQ monitor scheduler shut down successfully");
diff --git a/server/src/services/uptime/notificationService.ts b/server/src/services/uptime/notificationService.ts
index fc9678b68..078d2801b 100644
--- a/server/src/services/uptime/notificationService.ts
+++ b/server/src/services/uptime/notificationService.ts
@@ -36,7 +36,12 @@ interface Incident {
export class NotificationService {
private logger = createServiceLogger("notification-service");
- async sendTestNotification(channel: NotificationChannel, monitor: Monitor, incident: Incident, eventType: "down" | "recovery"): Promise<void> {
+ async sendTestNotification(
+ channel: NotificationChannel,
+ monitor: Monitor,
+ incident: Incident,
+ eventType: "down" | "recovery"
+ ): Promise<void> {
try {
if (channel.type === "email" && channel.config.email) {
await this.sendEmailNotification(channel.config.email, monitor, incident, eventType);
@@ -48,7 +53,7 @@ export class NotificationService {
channel.config.slackChannel,
monitor,
incident,
- eventType,
+ eventType
);
} else if (channel.type === "sms" && channel.config.phoneNumber) {
await this.sendSMSNotification(channel.config.phoneNumber, monitor, incident, eventType);
@@ -65,12 +70,12 @@ export class NotificationService {
const channels = await db.query.notificationChannels.findMany({
where: and(
eq(notificationChannels.organizationId, monitor.organizationId),
- eq(notificationChannels.enabled, true),
+ eq(notificationChannels.enabled, true)
),
});
// Filter channels that should receive notifications for this monitor
- const relevantChannels = channels.filter((channel) => {
+ const relevantChannels = channels.filter(channel => {
// Check if channel triggers for this event type
if (!channel.triggerEvents?.includes(eventType)) {
return false;
@@ -87,7 +92,7 @@ export class NotificationService {
// Check cooldown for each channel
const now = new Date();
- const channelsToNotify = relevantChannels.filter((channel) => {
+ const channelsToNotify = relevantChannels.filter(channel => {
if (!channel.lastNotifiedAt) return true;
const lastNotified = new Date(channel.lastNotifiedAt);
@@ -108,7 +113,7 @@ export class NotificationService {
channel.config.slackChannel,
monitor,
incident,
- eventType,
+ eventType
);
} else if (channel.type === "sms" && channel.config.phoneNumber) {
await this.sendSMSNotification(channel.config.phoneNumber, monitor, incident, eventType);
@@ -132,7 +137,7 @@ export class NotificationService {
email: string,
monitor: Monitor,
incident: Incident,
- eventType: "down" | "recovery",
+ eventType: "down" | "recovery"
): Promise<void> {
const monitorName =
monitor.name || monitor.httpConfig?.url || `${monitor.tcpConfig?.host}:${monitor.tcpConfig?.port}`;
@@ -185,7 +190,7 @@ export class NotificationService {
webhookUrl: string,
monitor: Monitor,
incident: Incident,
- eventType: "down" | "recovery",
+ eventType: "down" | "recovery"
): Promise<void> {
const monitorName =
monitor.name || monitor.httpConfig?.url || `${monitor.tcpConfig?.host}:${monitor.tcpConfig?.port}`;
@@ -270,7 +275,7 @@ export class NotificationService {
slackChannel: string | undefined,
monitor: Monitor,
incident: Incident,
- eventType: "down" | "recovery",
+ eventType: "down" | "recovery"
): Promise<void> {
const monitorName =
monitor.name || monitor.httpConfig?.url || `${monitor.tcpConfig?.host}:${monitor.tcpConfig?.port}`;
@@ -365,7 +370,7 @@ export class NotificationService {
phoneNumber: string,
monitor: Monitor,
incident: Incident,
- eventType: "down" | "recovery",
+ eventType: "down" | "recovery"
): Promise<void> {
const monitorName =
monitor.name || monitor.httpConfig?.url || `${monitor.tcpConfig?.host}:${monitor.tcpConfig?.port}`;
@@ -376,16 +381,13 @@ export class NotificationService {
message = `🔴 ALERT: ${monitorName} is DOWN in ${region}`;
if (incident.lastError) {
// Truncate error to fit SMS limits
- const truncatedError = incident.lastError.length > 50
- ? incident.lastError.substring(0, 47) + "..."
- : incident.lastError;
+ const truncatedError =
+ incident.lastError.length > 50 ? incident.lastError.substring(0, 47) + "..." : incident.lastError;
message += ` - ${truncatedError}`;
}
} else {
const duration = incident.endTime
- ? DateTime.fromSQL(incident.endTime)
- .diff(DateTime.fromSQL(incident.startTime))
- .toFormat("h'h' m'm'")
+ ? DateTime.fromSQL(incident.endTime).diff(DateTime.fromSQL(incident.startTime)).toFormat("h'h' m'm'")
: "Unknown";
message = `✅ RECOVERY: ${monitorName} is UP in ${region} after ${duration} downtime`;
}
@@ -396,7 +398,7 @@ export class NotificationService {
}
const result = await sendSMS(phoneNumber, message);
-
+
if (!result.success) {
throw new Error(result.error || "Failed to send SMS");
}
diff --git a/server/src/services/uptime/regionHealthChecker.ts b/server/src/services/uptime/regionHealthChecker.ts
index 25210186b..d64200de6 100644
--- a/server/src/services/uptime/regionHealthChecker.ts
+++ b/server/src/services/uptime/regionHealthChecker.ts
@@ -40,15 +40,15 @@ export class RegionHealthChecker {
});
// Filter out local region
- const remoteRegions = regions.filter((r) => r.code !== "local");
+ const remoteRegions = regions.filter(r => r.code !== "local");
this.logger.debug(`Checking health of ${remoteRegions.length} remote regions`);
- const healthPromises = remoteRegions.map((region) =>
- this.checkRegionHealth(region).catch((error) => {
+ const healthPromises = remoteRegions.map(region =>
+ this.checkRegionHealth(region).catch(error => {
this.logger.error(error, `Error checking health of region ${region.code}`);
return { region, isHealthy: false };
- }),
+ })
);
const results = await Promise.all(healthPromises);
@@ -64,7 +64,7 @@ export class RegionHealthChecker {
.where(eq(agentRegions.code, region.code));
}
- const healthyCount = results.filter((r) => r.isHealthy).length;
+ const healthyCount = results.filter(r => r.isHealthy).length;
this.logger.info({ healthyCount, totalRegions: remoteRegions.length }, "Region health check complete");
} catch (error) {
this.logger.error(error, "Error in region health check");
diff --git a/server/src/services/uptime/types.ts b/server/src/services/uptime/types.ts
index 0429712df..f5276fc18 100644
--- a/server/src/services/uptime/types.ts
+++ b/server/src/services/uptime/types.ts
@@ -53,7 +53,7 @@ export interface ValidationRule {
export interface MonitorEvent {
monitor_id: number;
organization_id: string;
- timestamp: string; // ClickHouse DateTime format: YYYY-MM-DD HH:MM:SS
+ timestamp: string; // ClickHouse DateTime format: YYYY-MM-DD HH:MM:SS
monitor_type: string;
monitor_url: string;
monitor_name: string;
diff --git a/server/src/services/uptime/validationEngine.ts b/server/src/services/uptime/validationEngine.ts
index e3db53e78..5b0b68c5a 100644
--- a/server/src/services/uptime/validationEngine.ts
+++ b/server/src/services/uptime/validationEngine.ts
@@ -1,4 +1,4 @@
-import { HttpCheckResult, ValidationRule } from './types.js';
+import { HttpCheckResult, ValidationRule } from "./types.js";
export function applyValidationRules(
result: HttpCheckResult,
@@ -6,7 +6,7 @@ export function applyValidationRules(
responseBody?: string
): string[] {
const errors: string[] = [];
-
+
for (const rule of rules) {
try {
const error = validateRule(result, rule, responseBody);
@@ -14,43 +14,39 @@ export function applyValidationRules(
errors.push(error);
}
} catch (e) {
- errors.push(`Validation rule error: ${e instanceof Error ? e.message : 'Unknown error'}`);
+ errors.push(`Validation rule error: ${e instanceof Error ? e.message : "Unknown error"}`);
}
}
-
+
return errors;
}
-function validateRule(
- result: HttpCheckResult,
- rule: ValidationRule,
- responseBody?: string
-): string | null {
+function validateRule(result: HttpCheckResult, rule: ValidationRule, responseBody?: string): string | null {
switch (rule.type) {
- case 'status_code':
+ case "status_code":
if (!result.statusCode) return null;
return validateStatusCode(result.statusCode, rule);
-
- case 'response_time':
+
+ case "response_time":
return validateResponseTime(result.responseTimeMs, rule);
-
- case 'response_body_contains':
- if (!responseBody) return 'Response body is empty';
+
+ case "response_body_contains":
+ if (!responseBody) return "Response body is empty";
return validateBodyContains(responseBody, rule, true);
-
- case 'response_body_not_contains':
+
+ case "response_body_not_contains":
if (!responseBody) return null;
return validateBodyContains(responseBody, rule, false);
-
- case 'header_exists':
+
+ case "header_exists":
return validateHeaderExists(result.headers, rule);
-
- case 'header_value':
+
+ case "header_value":
return validateHeaderValue(result.headers, rule);
-
- case 'response_size':
+
+ case "response_size":
return validateResponseSize(result.bodySizeBytes, rule);
-
+
default:
return `Unknown validation rule type: ${rule.type}`;
}
@@ -58,148 +54,131 @@ function validateRule(
function validateStatusCode(statusCode: number, rule: ValidationRule): string | null {
const value = rule.value;
-
+
switch (rule.operator) {
- case 'equals':
+ case "equals":
if (statusCode !== value) {
return `Status code ${statusCode} does not equal ${value}`;
}
break;
-
- case 'not_equals':
+
+ case "not_equals":
if (statusCode === value) {
return `Status code ${statusCode} equals ${value}`;
}
break;
-
- case 'in':
+
+ case "in":
if (Array.isArray(value) && !value.includes(statusCode)) {
- return `Status code ${statusCode} is not in [${value.join(', ')}]`;
+ return `Status code ${statusCode} is not in [${value.join(", ")}]`;
}
break;
-
- case 'not_in':
+
+ case "not_in":
if (Array.isArray(value) && value.includes(statusCode)) {
- return `Status code ${statusCode} is in [${value.join(', ')}]`;
+ return `Status code ${statusCode} is in [${value.join(", ")}]`;
}
break;
}
-
+
return null;
}
function validateResponseTime(responseTimeMs: number, rule: ValidationRule): string | null {
const value = rule.value as number;
-
+
switch (rule.operator) {
- case 'less_than':
+ case "less_than":
if (responseTimeMs >= value) {
return `Response time ${responseTimeMs}ms is not less than ${value}ms`;
}
break;
-
- case 'greater_than':
+
+ case "greater_than":
if (responseTimeMs <= value) {
return `Response time ${responseTimeMs}ms is not greater than ${value}ms`;
}
break;
}
-
+
return null;
}
-function validateBodyContains(
- body: string,
- rule: ValidationRule,
- shouldContain: boolean
-): string | null {
+function validateBodyContains(body: string, rule: ValidationRule, shouldContain: boolean): string | null {
const searchValue = String(rule.value);
const caseSensitive = rule.caseSensitive !== false;
-
+
const bodyToSearch = caseSensitive ? body : body.toLowerCase();
const valueToSearch = caseSensitive ? searchValue : searchValue.toLowerCase();
-
+
const contains = bodyToSearch.includes(valueToSearch);
-
+
if (shouldContain && !contains) {
return `Response body does not contain "${searchValue}"`;
} else if (!shouldContain && contains) {
return `Response body contains "${searchValue}"`;
}
-
+
return null;
}
-function validateHeaderExists(
- headers: Record<string, string>,
- rule: ValidationRule
-): string | null {
- if (!rule.header) return 'Header name not specified';
-
- const headerKey = Object.keys(headers).find(
- key => key.toLowerCase() === rule.header!.toLowerCase()
- );
-
+function validateHeaderExists(headers: Record<string, string>, rule: ValidationRule): string | null {
+ if (!rule.header) return "Header name not specified";
+
+ const headerKey = Object.keys(headers).find(key => key.toLowerCase() === rule.header!.toLowerCase());
+
if (!headerKey) {
return `Header "${rule.header}" does not exist`;
}
-
+
return null;
}
-function validateHeaderValue(
- headers: Record<string, string>,
- rule: ValidationRule
-): string | null {
- if (!rule.header) return 'Header name not specified';
-
- const headerKey = Object.keys(headers).find(
- key => key.toLowerCase() === rule.header!.toLowerCase()
- );
-
+function validateHeaderValue(headers: Record<string, string>, rule: ValidationRule): string | null {
+ if (!rule.header) return "Header name not specified";
+
+ const headerKey = Object.keys(headers).find(key => key.toLowerCase() === rule.header!.toLowerCase());
+
if (!headerKey) {
return `Header "${rule.header}" does not exist`;
}
-
+
const headerValue = headers[headerKey];
const expectedValue = String(rule.value);
-
+
switch (rule.operator) {
- case 'equals':
+ case "equals":
if (headerValue !== expectedValue) {
return `Header "${rule.header}" value "${headerValue}" does not equal "${expectedValue}"`;
}
break;
-
- case 'contains':
+
+ case "contains":
if (!headerValue.includes(expectedValue)) {
return `Header "${rule.header}" value "${headerValue}" does not contain "${expectedValue}"`;
}
break;
}
-
+
return null;
}
-function validateResponseSize(
- sizeBytes: number,
- rule: ValidationRule
-): string | null {
+function validateResponseSize(sizeBytes: number, rule: ValidationRule): string | null {
const value = rule.value as number;
-
+
switch (rule.operator) {
- case 'less_than':
+ case "less_than":
if (sizeBytes >= value) {
return `Response size ${sizeBytes} bytes is not less than ${value} bytes`;
}
break;
-
- case 'greater_than':
+
+ case "greater_than":
if (sizeBytes <= value) {
return `Response size ${sizeBytes} bytes is not greater than ${value} bytes`;
}
break;
}
-
+
return null;
-}
\ No newline at end of file
+}
diff --git a/server/src/services/usageService.ts b/server/src/services/usageService.ts
index 0a8746309..aa9708653 100644
--- a/server/src/services/usageService.ts
+++ b/server/src/services/usageService.ts
@@ -71,7 +71,7 @@ class UsageService {
.from(sites)
.where(eq(sites.organizationId, organizationId));
- return siteRecords.map((record) => record.siteId);
+ return siteRecords.map(record => record.siteId);
} catch (error) {
this.logger.error(error as Error, `Error getting sites for organization ${organizationId}`);
return [];
@@ -116,7 +116,7 @@ class UsageService {
if (!priceId) {
this.logger.error(
- `Subscription item price ID not found for organization ${orgData.id}, sub ${subscription.id}`,
+ `Subscription item price ID not found for organization ${orgData.id}, sub ${subscription.id}`
);
return [DEFAULT_EVENT_LIMIT, this.getStartOfMonth()];
}
@@ -124,7 +124,7 @@ class UsageService {
// Find corresponding plan details from constants
const planDetails = getStripePrices().find(
(plan: StripePlan) =>
- plan.priceId === priceId || (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId),
+ plan.priceId === priceId || (plan.annualDiscountPriceId && plan.annualDiscountPriceId === priceId)
);
// Get the event limit from the plan
@@ -146,11 +146,11 @@ class UsageService {
if (subscriptionStartDate >= currentMonth) {
periodStart = subscriptionStartDate.toISODate() as string;
this.logger.info(
- `Organization ${orgData.name} subscribed during current month on ${periodStart}. Using subscription start date for counting.`,
+ `Organization ${orgData.name} subscribed during current month on ${periodStart}. Using subscription start date for counting.`
);
} else {
this.logger.info(
- `Organization ${orgData.name} subscription started before current month. Using month start for counting.`,
+ `Organization ${orgData.name} subscription started before current month. Using month start for counting.`
);
}
}
@@ -247,7 +247,7 @@ class UsageService {
this.sitesOverLimit.add(siteId);
}
this.logger.info(
- `Organization ${orgData.name} is over limit. Added ${siteIds.length} sites to blocked list.`,
+ `Organization ${orgData.name} is over limit. Added ${siteIds.length} sites to blocked list.`
);
} else {
for (const siteId of siteIds) {
@@ -261,7 +261,7 @@ class UsageService {
this.logger.info(
`Updated organization ${
orgData.name
- }: ${pageviewCount.toLocaleString()} events, limit ${eventLimit.toLocaleString()}, ${periodInfo}`,
+ }: ${pageviewCount.toLocaleString()} events, limit ${eventLimit.toLocaleString()}, ${periodInfo}`
);
} catch (error) {
this.logger.error(error as Error, `Error processing organization ${orgData.id}`);
diff --git a/server/src/services/userId/userIdService.ts b/server/src/services/userId/userIdService.ts
index 5a6ad014f..c8417a6fe 100644
--- a/server/src/services/userId/userIdService.ts
+++ b/server/src/services/userId/userIdService.ts
@@ -17,7 +17,7 @@ class UserIdService {
private getDailySalt(): string {
if (!SECRET) {
console.error(
- "FATAL: BETTER_AUTH_SECRET environment variable is not set. User ID generation will be insecure or fail.",
+ "FATAL: BETTER_AUTH_SECRET environment variable is not set. User ID generation will be insecure or fail."
);
throw new Error("BETTER_AUTH_SECRET environment variable is missing.");
}
diff --git a/server/src/types/sessionReplay.ts b/server/src/types/sessionReplay.ts
index 7a771c8f4..b92617dc5 100644
--- a/server/src/types/sessionReplay.ts
+++ b/server/src/types/sessionReplay.ts
@@ -39,7 +39,7 @@ export interface SessionReplayMetadata {
hostname: string;
referrer: string;
hasReplayData: boolean;
- recordingStatus: 'recording' | 'completed' | 'failed';
+ recordingStatus: "recording" | "completed" | "failed";
createdAt: Date;
}
@@ -80,4 +80,4 @@ export interface GetSessionReplayEventsResponse {
data: any;
}>;
metadata: SessionReplayMetadata;
-}
\ No newline at end of file
+}
diff --git a/server/src/utils.test.ts b/server/src/utils.test.ts
index 7111ff9cf..249c7a5a0 100644
--- a/server/src/utils.test.ts
+++ b/server/src/utils.test.ts
@@ -18,9 +18,7 @@ describe("normalizeOrigin", () => {
it("should remove multi-level subdomains", () => {
expect(normalizeOrigin("api.v1.example.com")).toBe("example.com");
expect(normalizeOrigin("www.blog.example.com")).toBe("example.com");
- expect(normalizeOrigin("https://api.v2.staging.example.com")).toBe(
- "example.com"
- );
+ expect(normalizeOrigin("https://api.v2.staging.example.com")).toBe("example.com");
});
});
@@ -28,9 +26,7 @@ describe("normalizeOrigin", () => {
it("should handle .co.uk domains correctly", () => {
expect(normalizeOrigin("www.example.co.uk")).toBe("example.co.uk");
expect(normalizeOrigin("api.example.co.uk")).toBe("example.co.uk");
- expect(normalizeOrigin("https://subdomain.example.co.uk")).toBe(
- "example.co.uk"
- );
+ expect(normalizeOrigin("https://subdomain.example.co.uk")).toBe("example.co.uk");
});
it("should handle .com.au domains correctly", () => {
@@ -40,9 +36,7 @@ describe("normalizeOrigin", () => {
it("should handle .org.uk domains correctly", () => {
expect(normalizeOrigin("www.charity.org.uk")).toBe("charity.org.uk");
- expect(normalizeOrigin("subdomain.charity.org.uk")).toBe(
- "charity.org.uk"
- );
+ expect(normalizeOrigin("subdomain.charity.org.uk")).toBe("charity.org.uk");
});
it("should handle .gov.uk domains correctly", () => {
@@ -51,12 +45,8 @@ describe("normalizeOrigin", () => {
});
it("should handle .edu.au domains correctly", () => {
- expect(normalizeOrigin("www.university.edu.au")).toBe(
- "university.edu.au"
- );
- expect(normalizeOrigin("library.university.edu.au")).toBe(
- "university.edu.au"
- );
+ expect(normalizeOrigin("www.university.edu.au")).toBe("university.edu.au");
+ expect(normalizeOrigin("library.university.edu.au")).toBe("university.edu.au");
});
});
@@ -64,45 +54,27 @@ describe("normalizeOrigin", () => {
it("should handle full URLs with protocols", () => {
expect(normalizeOrigin("https://www.example.com")).toBe("example.com");
expect(normalizeOrigin("http://api.example.com")).toBe("example.com");
- expect(normalizeOrigin("https://subdomain.example.co.uk")).toBe(
- "example.co.uk"
- );
+ expect(normalizeOrigin("https://subdomain.example.co.uk")).toBe("example.co.uk");
});
it("should handle URLs with paths", () => {
- expect(normalizeOrigin("https://www.example.com/path/to/page")).toBe(
- "example.com"
- );
- expect(normalizeOrigin("https://api.example.com/v1/users")).toBe(
- "example.com"
- );
+ expect(normalizeOrigin("https://www.example.com/path/to/page")).toBe("example.com");
+ expect(normalizeOrigin("https://api.example.com/v1/users")).toBe("example.com");
});
it("should handle URLs with query parameters", () => {
- expect(normalizeOrigin("https://www.example.com?param=value")).toBe(
- "example.com"
- );
- expect(normalizeOrigin("https://api.example.com/search?q=test")).toBe(
- "example.com"
- );
+ expect(normalizeOrigin("https://www.example.com?param=value")).toBe("example.com");
+ expect(normalizeOrigin("https://api.example.com/search?q=test")).toBe("example.com");
});
it("should handle URLs with fragments", () => {
- expect(normalizeOrigin("https://www.example.com#section")).toBe(
- "example.com"
- );
- expect(normalizeOrigin("https://blog.example.com/post#comments")).toBe(
- "example.com"
- );
+ expect(normalizeOrigin("https://www.example.com#section")).toBe("example.com");
+ expect(normalizeOrigin("https://blog.example.com/post#comments")).toBe("example.com");
});
it("should handle URLs with ports", () => {
- expect(normalizeOrigin("https://www.example.com:8080")).toBe(
- "example.com"
- );
- expect(normalizeOrigin("http://api.example.com:3000")).toBe(
- "example.com"
- );
+ expect(normalizeOrigin("https://www.example.com:8080")).toBe("example.com");
+ expect(normalizeOrigin("http://api.example.com:3000")).toBe("example.com");
});
it("should handle plain hostnames without protocol", () => {
@@ -138,9 +110,7 @@ describe("normalizeOrigin", () => {
it("should handle domains with hyphens", () => {
expect(normalizeOrigin("www.my-site.com")).toBe("my-site.com");
- expect(normalizeOrigin("api.my-awesome-site.co.uk")).toBe(
- "my-awesome-site.co.uk"
- );
+ expect(normalizeOrigin("api.my-awesome-site.co.uk")).toBe("my-awesome-site.co.uk");
});
it("should handle domains with numbers", () => {
@@ -209,15 +179,9 @@ describe("normalizeOrigin", () => {
"https://shop.example.net",
];
- const results = domains.map((domain) => normalizeOrigin(domain));
+ const results = domains.map(domain => normalizeOrigin(domain));
- expect(results).toEqual([
- "example.com",
- "example.com",
- "example.co.uk",
- "example.org",
- "example.net",
- ]);
+ expect(results).toEqual(["example.com", "example.com", "example.co.uk", "example.org", "example.net"]);
});
});
});
diff --git a/server/src/utils.ts b/server/src/utils.ts
index a7df8b32a..146941ccf 100644
--- a/server/src/utils.ts
+++ b/server/src/utils.ts
@@ -217,7 +217,7 @@ export const getIpAddress = (request: FastifyRequest): string => {
if (forwardedFor && typeof forwardedFor === "string") {
const ips = forwardedFor
.split(",")
- .map((ip) => ip.trim())
+ .map(ip => ip.trim())
.filter(Boolean);
if (ips.length > 0) {
// Always use the first IP - the original client