refactor(analytics): replace useGetAnalytics with individual queries for decision outcomes, rule hits, and screening hits

packages/app-builder/src/queries/analytics/factory/create-analytics-query.ts

@@ -0,0 +1,45 @@
+import { useAgnosticNavigation } from '@app-builder/contexts/AgnosticNavigationContext';
+import { type AnalyticsFiltersQuery } from '@app-builder/models/analytics';
+import { getRoute } from '@app-builder/utils/routes';
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
+
+export function createAnalyticsQuery<TData>(queryName: string) {
+  return ({ scenarioId, queryString }: { scenarioId: string; queryString: string }) => {
+    const navigate = useAgnosticNavigation();
+    const endpoint = getRoute('/ressources/analytics/:scenarioId/query/:queryName', {
+      scenarioId,
+      queryName,
+    });
+    console.log('endpoint', endpoint);
+    const qs = queryString ? atob(queryString) : null;
+    const parsed: AnalyticsFiltersQuery = JSON.parse(qs || '{}');
+
+    const { range, compareRange, scenarioVersion, trigger } = parsed;
+
+    return useQuery({
+      queryKey: ['analytics', 'query', scenarioId, queryName, queryString],
+      enabled: Boolean(qs && range),
+      queryFn: async () => {
+        const response = await fetch(endpoint, {
+          method: 'POST',
+          body: JSON.stringify({
+            scenarioVersion,
+            range,
+            compareRange,
+            trigger,
+          }),
+        });
+
+        const responseData = (await response.json()) as { redirectTo: string } | { data: TData };
+
+        if ('redirectTo' in responseData) {
+          navigate(responseData.redirectTo);
+          return;
+        }
+
+        return responseData.data;
+      },
+      placeholderData: keepPreviousData,
+    });
+  };
+}

packages/app-builder/src/queries/analytics/get-decisions-outcomes-per-day.ts

@@ -0,0 +1,5 @@
+import { DecisionOutcomesPerPeriod } from '@app-builder/models/analytics';
+import { createAnalyticsQuery } from './factory/create-analytics-query';
+
+export const useGetDecisionsOutcomesPerDay =
+  createAnalyticsQuery<DecisionOutcomesPerPeriod>('decision-outcomes-per-day');

packages/app-builder/src/queries/analytics/get-rule-hit-table.ts

@@ -0,0 +1,4 @@
+import { RuleHitTableResponse } from '@app-builder/models/analytics/rule-hit';
+import { createAnalyticsQuery } from './factory/create-analytics-query';
+
+export const useGetRuleHitTable = createAnalyticsQuery<RuleHitTableResponse[]>('rule-hit-table');

packages/app-builder/src/queries/analytics/get-rule-vs-decision-outcome.ts

@@ -0,0 +1,4 @@
+import { RuleVsDecisionOutcome } from '@app-builder/models/analytics';
+import { createAnalyticsQuery } from './factory/create-analytics-query';
+
+export const useGetRuleVsDecisionOutcome = createAnalyticsQuery<RuleVsDecisionOutcome[]>('rule-vs-decision-outcome');

packages/app-builder/src/queries/analytics/get-screening-hits-table.ts

@@ -0,0 +1,4 @@
+import { ScreeningHitTableResponse } from '@app-builder/models/analytics';
+import { createAnalyticsQuery } from './factory/create-analytics-query';
+
+export const useGetScreeningHitsTable = createAnalyticsQuery<ScreeningHitTableResponse[]>('screening-hits-table');

packages/app-builder/src/queries/analytics/index.ts

@@ -0,0 +1,5 @@
+export * from './get-available-filters';
+export * from './get-decisions-outcomes-per-day';
+export * from './get-rule-hit-table';
+export * from './get-rule-vs-decision-outcome';
+export * from './get-screening-hits-table';

packages/app-builder/src/routes/_builder+/_analytics+/analytics.$scenarioId.tsx

@@ -16,8 +16,13 @@ import {
   FilterSource,
 } from '@app-builder/models/analytics';
 import { type Scenario } from '@app-builder/models/scenario';
-import { useGetAnalytics } from '@app-builder/queries/analytics/get-analytics';
-import { useGetAvailableFilters } from '@app-builder/queries/analytics/get-available-filters';
+import {
+  useGetAvailableFilters,
+  useGetDecisionsOutcomesPerDay,
+  useGetRuleHitTable,
+  useGetRuleVsDecisionOutcome,
+  useGetScreeningHitsTable,
+} from '@app-builder/queries/analytics';
 import { initServerServices } from '@app-builder/services/init.server';
 import { formatDateTimeWithoutPresets, formatDuration } from '@app-builder/utils/format';
 import { getRoute } from '@app-builder/utils/routes';
@@ -204,22 +209,20 @@ export default function Analytics() {
     return Array.from(descriptors.values());
   }, [availableFilters, seenAvailableFilters]);
 
-  const {
-    data: {
-      decisionOutcomesPerDay: decisionsData,
-      ruleHitTable: ruleHitTableData,
-      screeningHitsTable: screeningHitsTableData,
-      // decisionsScoreDistribution: decisionsScoreDistributionData,
-      ruleVsDecisionOutcome: ruleVsDecisionOutcomeData,
-    } = {
-      decisionOutcomesPerDay: null,
-      ruleHitTable: null,
-      screeningHitsTable: null,
-      // decisionsScoreDistribution: null,
-      ruleVsDecisionOutcome: null,
-    },
-    isFetching: isAnalyticsFetching,
-  } = useGetAnalytics({
+  const { data: decisionsOutcomesPerDayData, isFetching: isDecisionsOutcomesPerDayFetching } =
+    useGetDecisionsOutcomesPerDay({
+      scenarioId,
+      queryString: queryString ?? '',
+    });
+  const { data: ruleHitTableData, isFetching: isRuleHitTableFetching } = useGetRuleHitTable({
+    scenarioId,
+    queryString: queryString ?? '',
+  });
+  const { data: ruleVsDecisionOutcomeData, isFetching: isRuleVsDecisionOutcomeFetching } = useGetRuleVsDecisionOutcome({
+    scenarioId,
+    queryString: queryString ?? '',
+  });
+  const { data: screeningHitsTableData, isFetching: isScreeningHitsTableFetching } = useGetScreeningHitsTable({
     scenarioId,
     queryString: queryString ?? '',
   });
@@ -375,19 +378,22 @@ export default function Analytics() {
             <div className="flex flex-row gap-v2-md w-full items-stretch">
               <div className="basis-full min-w-0">
                 <Decisions
-                  data={decisionsData as DecisionOutcomesPerPeriod}
+                  data={decisionsOutcomesPerDayData as DecisionOutcomesPerPeriod}
                   scenarioVersions={scenarioVersions}
-                  isLoading={isAnalyticsFetching}
+                  isLoading={isDecisionsOutcomesPerDayFetching}
                 />
               </div>
               {/* <div className="basis-1/4 min-w-0">
                 <DecisionsScoreDistribution data={decisionsScoreDistributionData ?? []} />
               </div> */}
             </div>
 
-            <RulesHit data={ruleHitTableData ?? []} isLoading={isAnalyticsFetching} />
-            <RuleVsDecisionOutcomes data={ruleVsDecisionOutcomeData ?? null} isLoading={isAnalyticsFetching} />
-            <ScreeningHits data={screeningHitsTableData ?? []} isLoading={isAnalyticsFetching} />
+            <RulesHit data={ruleHitTableData ?? []} isLoading={isRuleHitTableFetching} />
+            <RuleVsDecisionOutcomes
+              data={ruleVsDecisionOutcomeData ?? null}
+              isLoading={isRuleVsDecisionOutcomeFetching}
+            />
+            <ScreeningHits data={screeningHitsTableData ?? []} isLoading={isScreeningHitsTableFetching} />
           </div>
         </div>
       </I18nProvider>

packages/app-builder/src/routes/ressources+/analytics+/$scenarioId+/query.$queryName.ts

@@ -0,0 +1,85 @@
+import { createServerFn } from '@app-builder/core/requests';
+import { authMiddleware } from '@app-builder/middlewares/auth-middleware';
+import { handleRedirectMiddleware } from '@app-builder/middlewares/handle-redirect-middleware';
+import { analyticsQuery } from '@app-builder/models/analytics';
+import invariant from 'tiny-invariant';
+import { z } from 'zod';
+
+const urlParamsSchema = z.object({
+  scenarioId: z.uuidv4(),
+  queryName: z.string(),
+});
+
+export const action = createServerFn(
+  [handleRedirectMiddleware, authMiddleware],
+  async function createAnalyticsQueryAction({ params, request, context }) {
+    try {
+      const urlParams = urlParamsSchema.parse(params);
+      invariant(urlParams.queryName, 'queryName is required');
+      console.log('urlParams', urlParams);
+
+      const body = await request.json();
+
+      const queryParams = analyticsQuery.parse({
+        ...body,
+        scenarioId: urlParams.scenarioId,
+      });
+
+      switch (urlParams.queryName) {
+        case 'decision-outcomes-per-day': {
+          const data = await context.authInfo.analytics.getDecisionOutcomesPerDay({
+            ...queryParams,
+            scenarioId: urlParams.scenarioId,
+          });
+          return {
+            success: true,
+            data,
+          };
+        }
+
+        case 'rule-hit-table': {
+          const data = await context.authInfo.analytics.getRuleHitTable({
+            ...queryParams,
+            scenarioId: urlParams.scenarioId,
+          });
+          return {
+            success: true,
+            data,
+          };
+        }
+
+        case 'rule-vs-decision-outcome': {
+          const data = await context.authInfo.analytics.getRuleVsDecisionOutcome({
+            ...queryParams,
+            scenarioId: urlParams.scenarioId,
+          });
+          return {
+            success: true,
+            data,
+          };
+        }
+
+        case 'screening-hits-table': {
+          const data = await context.authInfo.analytics.getScreeningHitsTable({
+            ...queryParams,
+            scenarioId: urlParams.scenarioId,
+          });
+          return {
+            success: true,
+            data,
+          };
+        }
+
+        default: {
+          return {
+            success: false,
+            errors: 'Invalid query name',
+          };
+        }
+      }
+    } catch (error) {
+      console.error('error in analytics query', error);
+      return { success: false, errors: 'Internal server error' };
+    }
+  },
+);

packages/app-builder/src/utils/routes/routes.ts

@@ -391,9 +391,9 @@ export const routes = [
         "file": "routes/ressources+/analytics+/$scenarioId+/available_filters.ts"
       },
       {
-        "id": "routes/ressources+/analytics+/$scenarioId+/query",
-        "path": "ressources/analytics/:scenarioId/query",
-        "file": "routes/ressources+/analytics+/$scenarioId+/query.ts"
+        "id": "routes/ressources+/analytics+/$scenarioId+/query.$queryName",
+        "path": "ressources/analytics/:scenarioId/query/:queryName",
+        "file": "routes/ressources+/analytics+/$scenarioId+/query.$queryName.ts"
       },
       {
         "id": "routes/ressources+/annotations+/download-file.$annotationId.$fileId",

packages/app-builder/src/utils/routes/types.ts

@@ -57,7 +57,7 @@ export type RoutePath =
   | '/oidc/auth'
   | '/oidc/callback'
   | '/ressources/analytics/:scenarioId/available_filters'
-  | '/ressources/analytics/:scenarioId/query'
+  | '/ressources/analytics/:scenarioId/query/:queryName'
   | '/ressources/annotations/download-file/:annotationId/:fileId'
   | '/ressources/app-config'
   | '/ressources/auth/logout'
@@ -245,7 +245,7 @@ export type RouteID =
   | 'routes/oidc+/auth'
   | 'routes/oidc+/callback'
   | 'routes/ressources+/analytics+/$scenarioId+/available_filters'
-  | 'routes/ressources+/analytics+/$scenarioId+/query'
+  | 'routes/ressources+/analytics+/$scenarioId+/query.$queryName'
   | 'routes/ressources+/annotations+/download-file.$annotationId.$fileId'
   | 'routes/ressources+/app-config'
   | 'routes/ressources+/auth+/logout'