From fceef7a9ca2122fa280e15cea8b4f6835698affe Mon Sep 17 00:00:00 2001 From: Jordi Enric Date: Wed, 9 Sep 2026 15:05:57 +0200 Subject: [PATCH] fix(studio): initialize storage reports from selected range --- .../data/reports/storage-report-query.ts | 13 ++++++++++- .../project/[ref]/observability/storage.tsx | 23 +++++++++++-------- 2 files changed, 25 insertions(+), 11 deletions(-) diff --git a/apps/studio/data/reports/storage-report-query.ts b/apps/studio/data/reports/storage-report-query.ts index fb656a10720..978cb3ba59c 100644 --- a/apps/studio/data/reports/storage-report-query.ts +++ b/apps/studio/data/reports/storage-report-query.ts @@ -13,7 +13,7 @@ import type { LogsEndpointParams } from '@/components/interfaces/Settings/Logs/L import { useLogsQuery } from '@/hooks/analytics/useLogsQuery' import { useDatabaseSelectorStateSnapshot } from '@/state/database-selector' -export const useStorageReport = () => { +export const useStorageReport = (initialParams: Partial) => { const { ref: projectRef } = useParams() const useOtel = useFlag('otelLegacyLogs') const [filters, setFilters] = useState([]) @@ -30,6 +30,7 @@ export const useStorageReport = () => { const totalRequests = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.totalRequests.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.totalRequests, formattedFilters), @@ -37,6 +38,7 @@ export const useStorageReport = () => { }) const topRoutes = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.topRoutes.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.topRoutes, formattedFilters), @@ -44,6 +46,7 @@ export const useStorageReport = () => { }) const errorCounts = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.errorCounts.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.errorCounts, formattedFilters), @@ -51,6 +54,7 @@ export const useStorageReport = () => { }) const topErrorRoutes = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.topErrorRoutes.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.topErrorRoutes, formattedFilters), @@ -58,6 +62,7 @@ export const useStorageReport = () => { }) const responseSpeed = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.responseSpeed.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.responseSpeed, formattedFilters), @@ -65,6 +70,7 @@ export const useStorageReport = () => { }) const topSlowRoutes = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.topSlowRoutes.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.topSlowRoutes, formattedFilters), @@ -72,6 +78,7 @@ export const useStorageReport = () => { }) const networkTraffic = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? API_REPORT_QUERIES_OTEL.networkTraffic.safeSql(formattedFilters) : getLogsSql(PRESET_CONFIG.api.queries.networkTraffic, formattedFilters), @@ -79,6 +86,7 @@ export const useStorageReport = () => { }) const cacheHitRate = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? STORAGE_REPORT_QUERIES_OTEL.cacheHitRate.safeSql() : getLogsSql(PRESET_CONFIG.storage.queries.cacheHitRate, []), @@ -86,6 +94,7 @@ export const useStorageReport = () => { }) const topCacheMisses = useLogsQuery({ projectRef, + initialParams, sql: useOtel ? STORAGE_REPORT_QUERIES_OTEL.topCacheMisses.safeSql() : getLogsSql(PRESET_CONFIG.storage.queries.topCacheMisses, []), @@ -169,6 +178,8 @@ export const useStorageReport = () => { topErrorRoute: topErrorRoutes.error, topSlowRoutes: topSlowRoutes.error, networkTraffic: networkTraffic.error, + cacheHitRate: cacheHitRate.error, + topCacheMisses: topCacheMisses.error, }, mergeParams: handleSetParams, filters, diff --git a/apps/studio/pages/project/[ref]/observability/storage.tsx b/apps/studio/pages/project/[ref]/observability/storage.tsx index 1ba7eba2144..e1482036ed6 100644 --- a/apps/studio/pages/project/[ref]/observability/storage.tsx +++ b/apps/studio/pages/project/[ref]/observability/storage.tsx @@ -41,7 +41,19 @@ import type { NextPageWithLayout } from '@/types' const REPORT_TITLE = 'Storage' export const StorageReport: NextPageWithLayout = () => { - const report = useStorageReport() + const { + datePickerHelpers, + datePickerValue, + handleDatePickerChange: handleDatePickerChangeFromHook, + showUpgradePrompt, + setShowUpgradePrompt, + selectedDateRange, + } = useReportDateRange(REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES) + + const report = useStorageReport({ + iso_timestamp_start: datePickerValue.from, + iso_timestamp_end: datePickerValue.to, + }) const { data, @@ -55,15 +67,6 @@ export const StorageReport: NextPageWithLayout = () => { refresh, } = report - const { - datePickerHelpers, - datePickerValue, - handleDatePickerChange: handleDatePickerChangeFromHook, - showUpgradePrompt, - setShowUpgradePrompt, - selectedDateRange, - } = useReportDateRange(REPORT_DATERANGE_HELPER_LABELS.LAST_60_MINUTES) - const handleDatepickerChange = (vals: DatePickerValue) => { const promptShown = handleDatePickerChangeFromHook(vals) if (!promptShown) {