Fix advanced analytics startup

Author: ericceg

src/App.tsx

@@ -1,6 +1,7 @@
 import { Suspense, lazy, useEffect, useRef } from 'react';
 import { HashRouter, Navigate, Route, Routes, useLocation } from 'react-router-dom';
 
+import { advancedAnalyticsRequestCacheKey } from '@/lib/analytics/cacheKey';
 import { resolveAdvancedAnalyticsTimeRange } from '@/lib/analytics/timeRange';
 import { runAdvancedAnalytics } from '@/lib/tauri';
 import { Sidebar } from '@/components/Sidebar';
@@ -158,9 +159,6 @@ export default function App() {
     }
     startupAdvancedAnalyticsDataVersion.current = startupDataVersionKey;
 
-    const requestCacheKey = (request: AdvancedAnalyticsRunRequest) =>
-      JSON.stringify({ request, dataVersion });
-
     const fixedAllTimeRange: AdvancedAnalyticsTimeRangeConfig = { preset: 'all' };
     const requestsByRangeKey = new Map<string, AdvancedAnalyticsRunRequest>();
     const appendRequestForRange = (timeRange: AdvancedAnalyticsTimeRangeConfig | undefined) => {
@@ -192,7 +190,10 @@ export default function App() {
           try {
             const response = await runAdvancedAnalytics(request);
             if (!cancelled) {
-              setCachedAdvancedAnalytics(requestCacheKey(request), response);
+              setCachedAdvancedAnalytics(
+                advancedAnalyticsRequestCacheKey(request, dataVersion),
+                response
+              );
             }
           } catch (error) {
             console.error('Automatic startup advanced analytics computation failed', error);

src/lib/analytics/cacheKey.ts

@@ -0,0 +1,33 @@
+import type { AdvancedAnalyticsRunRequest } from '@/types';
+
+export function advancedAnalyticsRequestCacheKey(
+  request: AdvancedAnalyticsRunRequest,
+  dataVersion: string | null
+) {
+  const requestSignature = {
+    startDate: request.startDate,
+    endDate: request.endDate,
+    metrics: request.metrics.map((metric) => ({
+      id: metric.id,
+      kind: metric.kind,
+      base: metric.base,
+      formula: metric.formula
+    })),
+    streaks: request.streaks.map((streak) => ({
+      id: streak.id,
+      metricId: streak.metricId,
+      additionalMetricIds: streak.additionalMetricIds,
+      period: streak.period,
+      thresholdOperator: streak.thresholdOperator,
+      thresholdValue: streak.thresholdValue
+    })),
+    charts: request.charts.map((chart) => ({
+      id: chart.id,
+      chartType: chart.chartType,
+      metricIds: chart.metricIds,
+      granularity: chart.granularity
+    }))
+  };
+
+  return JSON.stringify({ request: requestSignature, dataVersion });
+}

src/pages/AdvancedAnalyticsPage.tsx

@@ -3,6 +3,7 @@ import { open } from '@tauri-apps/plugin-dialog';
 
 import { AnalyticsLibrary } from '@/components/analytics/AnalyticsLibrary';
 import { TransferSelectionPanel } from '@/components/analytics/TransferSelectionPanel';
+import { advancedAnalyticsRequestCacheKey } from '@/lib/analytics/cacheKey';
 import {
   buildAdvancedAnalyticsTransferFile,
   mergeAdvancedAnalyticsTransferData,
@@ -79,34 +80,6 @@ function AnalyticsLoadingBar({
   );
 }
 
-function requestCacheKey(request: AdvancedAnalyticsRunRequest, dataVersion: string | null) {
-  const requestSignature = {
-    startDate: request.startDate,
-    endDate: request.endDate,
-    metrics: request.metrics.map((metric) => ({
-      id: metric.id,
-      kind: metric.kind,
-      base: metric.base,
-      formula: metric.formula
-    })),
-    streaks: request.streaks.map((streak) => ({
-      id: streak.id,
-      metricId: streak.metricId,
-      additionalMetricIds: streak.additionalMetricIds,
-      period: streak.period,
-      thresholdOperator: streak.thresholdOperator,
-      thresholdValue: streak.thresholdValue
-    })),
-    charts: request.charts.map((chart) => ({
-      id: chart.id,
-      chartType: chart.chartType,
-      metricIds: chart.metricIds,
-      granularity: chart.granularity
-    }))
-  };
-  return JSON.stringify({ request: requestSignature, dataVersion });
-}
-
 function buildRequest(
   range: { startDate?: string; endDate?: string },
   metrics: AdvancedAnalyticsRunRequest['metrics'],
@@ -217,7 +190,7 @@ export function AdvancedAnalyticsPage() {
     const request = buildRequest(range, metrics, streaks, charts);
     return {
       request,
-      cacheKey: requestCacheKey(request, dataVersion)
+      cacheKey: advancedAnalyticsRequestCacheKey(request, dataVersion)
     };
   }, [charts, dataVersion, metrics, selectedItem, streaks]);
 
@@ -238,7 +211,7 @@ export function AdvancedAnalyticsPage() {
       const request = buildRequest(range, metrics, streaks, charts);
       byRangeKey.set(key, {
         request,
-        cacheKey: requestCacheKey(request, dataVersion)
+        cacheKey: advancedAnalyticsRequestCacheKey(request, dataVersion)
       });
     }
 
@@ -367,7 +340,7 @@ export function AdvancedAnalyticsPage() {
     for (const metric of viewTabMetrics) {
       const range = resolveAdvancedAnalyticsTimeRange(metric.timeRange);
       const request = buildRequest(range, metrics, streaks, charts);
-      const cacheKey = requestCacheKey(request, dataVersion);
+      const cacheKey = advancedAnalyticsRequestCacheKey(request, dataVersion);
       const response = getResponse(cacheKey);
       results[metric.id] = response?.metricResults[metric.id];
     }
@@ -379,7 +352,7 @@ export function AdvancedAnalyticsPage() {
     for (const streak of streaks) {
       const range = resolveAdvancedAnalyticsTimeRange(STREAK_FIXED_TIME_RANGE);
       const request = buildRequest(range, metrics, streaks, charts);
-      const cacheKey = requestCacheKey(request, dataVersion);
+      const cacheKey = advancedAnalyticsRequestCacheKey(request, dataVersion);
       const response = getResponse(cacheKey);
       results[streak.id] = response?.streakResults[streak.id];
     }
@@ -391,7 +364,7 @@ export function AdvancedAnalyticsPage() {
     for (const chart of charts) {
       const range = resolveAdvancedAnalyticsTimeRange(chart.timeRange);
       const request = buildRequest(range, metrics, streaks, charts);
-      const cacheKey = requestCacheKey(request, dataVersion);
+      const cacheKey = advancedAnalyticsRequestCacheKey(request, dataVersion);
       const response = getResponse(cacheKey);
       results[chart.id] = response?.chartResults[chart.id];
     }