fix: refresh button in the overview page (#441)

wundergraph · Jan 18, 2024 · d4988d9 · d4988d9
1 parent b5a10a1
commit d4988d9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/controlplane/src/core/bufservices/PlatformService.ts b/controlplane/src/core/bufservices/PlatformService.ts
@@ -4733,34 +4733,19 @@ export default function (opts: RouterOptions): Partial<ServiceImpl<typeof Platfo
           featureId: 'analytics-retention',
         });
 
-        const { dateRange } = validateDateRanges({
+        const { range, dateRange } = validateDateRanges({
           limit: analyticsRetention?.limit ?? 7,
-          range: 0,
-          dateRange: {
-            start: req.startDate,
-            end: req.endDate,
-          },
+          range: req.range,
+          dateRange:
+            req.startDate !== '' && req.endDate !== ''
+              ? {
+                  start: req.startDate,
+                  end: req.endDate,
+                }
+              : undefined,
         });
 
-        if (!dateRange) {
-          return {
-            response: {
-              code: EnumStatusCode.ERR,
-              details: 'Invalid date range',
-            },
-            mostRequestedOperations: [],
-            requestSeries: [],
-            subgraphMetrics: [],
-          };
-        }
-
-        const timeFilters = parseTimeFilters(
-          {
-            start: dateRange.start,
-            end: dateRange.end,
-          },
-          req.range,
-        );
+        const timeFilters = parseTimeFilters(dateRange, range);
 
         const subgraphRepo = new SubgraphRepository(opts.db, authContext.organizationId);
         const subgraphs = await subgraphRepo.listByFederatedGraph(graph.name, { published: true });

diff --git a/studio/src/pages/[organizationSlug]/graph/[slug]/index.tsx b/studio/src/pages/[organizationSlug]/graph/[slug]/index.tsx
@@ -47,12 +47,10 @@ import {
 } from "@tanstack/react-query";
 import { getDashboardAnalyticsView } from "@wundergraph/cosmo-connect/dist/platform/v1/platform-PlatformService_connectquery";
 import { formatISO } from "date-fns";
-import { useRouter } from "next/router";
 import { useContext, useState } from "react";
 import { ReactFlowProvider } from "reactflow";
 
 const GraphOverviewPage: NextPageWithLayout = () => {
-  const router = useRouter();
   const graphData = useContext(GraphContext);
   const [open, setOpen] = useState(false);
   const applyParams = useApplyParams();
@@ -62,9 +60,9 @@ const GraphOverviewPage: NextPageWithLayout = () => {
 
   const getView = getDashboardAnalyticsView.useQuery({
     federatedGraphName: graphData?.graph?.name,
-    startDate: formatISO(dateRange.start),
-    endDate: formatISO(dateRange.end),
     range,
+    startDate: range ? undefined : formatISO(dateRange.start),
+    endDate: range ? undefined : formatISO(dateRange.end),
   });
   const {
     data: dashboardView,