🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor API utility functions and update GSC data hooks for improved parameter handling
Bill Yang01c988fa7df4
diff --git a/client/src/api/gsc/useGSCData.ts b/client/src/api/gsc/useGSCData.tsindex 490b48775..5e330ef7a 100644--- a/client/src/api/gsc/useGSCData.ts+++ b/client/src/api/gsc/useGSCData.ts@@ -1,7 +1,8 @@import { useQuery } from "@tanstack/react-query";import { Time } from "../../components/DateSelector/types";import { useStore } from "../../lib/store";-import { authedFetch, getQueryParams } from "../utils";+import { toQueryParams } from "../analytics/endpoints/types";+import { authedFetch, buildApiParams } from "../utils";export type GSCDimension = "query" | "page" | "country" | "device";@@ -19,7 +20,7 @@ export type GSCData = {export function useGSCData(dimension: GSCDimension) {const { site, time } = useStore();- const timeParams = getQueryParams(time);+ const timeParams = toQueryParams(buildApiParams(time));return useQuery({queryKey: ["gsc-data", dimension, site, timeParams],@@ -43,7 +44,7 @@ export async function fetchGSCData(dimension: GSCDimension,time: Time): Promise<GSCData[]> {- const timeParams = getQueryParams(time);+ const timeParams = toQueryParams(buildApiParams(time));const response = await authedFetch<{ data: GSCData[] }>(`/gsc/data/${site}`, {...timeParams,dimension,diff --git a/client/src/api/utils.ts b/client/src/api/utils.tsindex 367434ea1..f75cde577 100644--- a/client/src/api/utils.ts+++ b/client/src/api/utils.ts@@ -35,30 +35,6 @@ export function getStartAndEndDate(time: Time): { startDate: string | null; endDreturn { startDate: time.day, endDate: time.day };}-// Internal version that uses snake_case for getQueryParams-function getStartAndEndDateSnake(time: Time) {- const { startDate, endDate } = getStartAndEndDate(time);- return { start_date: startDate, end_date: endDate };-}--export function getQueryParams(time: Time, additionalParams: Record<string, any> = {}): Record<string, any> {- if (time.mode === "past-minutes") {- return {- time_zone: timeZone,- past_minutes_start: time.pastMinutesStart,- past_minutes_end: time.pastMinutesEnd,- ...additionalParams,- };- }-- // Regular date-based approach- return {- ...getStartAndEndDateSnake(time),- time_zone: timeZone,- ...additionalParams,- };-}-/*** Build CommonApiParams from a Time object, handling all time modes including past-minutes.* This centralizes the logic for converting Time to API params across all hooks.diff --git a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.tsindex 40c33ee55..54774e2d3 100644--- a/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts+++ b/client/src/app/[site]/globe/3d/hooks/timelineLayer/useTimelineSessions.ts@@ -3,7 +3,8 @@ import { DateTime } from "luxon";import { useEffect, useMemo } from "react";import { GetSessionsResponse } from "../../../../../../api/analytics/endpoints";import { APIResponse } from "../../../../../../api/types";-import { authedFetch, getQueryParams } from "../../../../../../api/utils";+import { toQueryParams } from "../../../../../../api/analytics/endpoints/types";+import { authedFetch, buildApiParams } from "../../../../../../api/utils";import { getFilteredFilters, useStore } from "../../../../../../lib/store";import { SESSION_PAGE_FILTERS } from "../../../../../../lib/filterGroups";import { useTimelineStore } from "../../../timelineStore";@@ -25,8 +26,7 @@ export function useTimelineSessions() {for (let page = 1; page <= MAX_PAGES; page++) {const requestParams = {- ...getQueryParams(time),- filters: filteredFilters,+ ...toQueryParams(buildApiParams(time, { filters: filteredFilters })),page,limit: PAGE_SIZE,};