@localstack/appinspector-ui 1.0.0-dev-f55daae2 → 1.0.0-dev-c7a4c87a

package/dist/index.js

@@ -3417,7 +3417,7 @@ var SpansListPage = () => {
   );
 };
 
-// src/pages/trace-graph.tsx
+// src/pages/trace-graph-page.tsx
 import { Box as Box12, Drawer, Paper as Paper2 } from "@mui/material";
 import { styled } from "@mui/material/styles";
 import { ReactFlowProvider } from "@xyflow/react";
@@ -3838,17 +3838,15 @@ var nodeTypes = {
 var TraceGraph = ({
   initialFocusEventId,
   onEventSelect,
-  traceId,
+  onRefresh,
+  spans,
   viewPortPixelWidth
 }) => {
   const [nodes, setNodes] = useState6([]);
   const [edges, setEdges] = useState6([]);
-  const [isLoading, setIsLoading] = useState6(true);
   const [initialViewSet, setInitialViewSet] = useState6(false);
   const { fitView, setCenter } = useReactFlow();
   const store = useStoreApi();
-  const api = useAppInspectorApi();
-  const [fetchError, setFetchError] = useState6();
   const updateSelectedNode = useCallback6(
     (nodeId) => {
       const { addSelectedNodes } = store.getState();
@@ -3861,57 +3859,40 @@ var TraceGraph = ({
     },
     [nodes, store]
   );
-  const fetchTrace = useCallback6(async () => {
-    setIsLoading(true);
-    try {
-      const response = await api.getSpans({ trace_id: traceId });
-      const spansMap = /* @__PURE__ */ new Map();
-      const rootSpans = [];
-      for (const span of response.spans) {
-        spansMap.set(span.span_id, { ...span, children: [] });
-      }
-      for (const span of response.spans) {
-        const currentSpan = spansMap.get(span.span_id);
-        if (!currentSpan) continue;
-        if (span.parent_span_id && spansMap.has(span.parent_span_id)) {
-          const parentSpan = spansMap.get(span.parent_span_id);
-          if (parentSpan) {
-            parentSpan.children ??= [];
-            parentSpan.children.push(currentSpan);
-          }
-        } else {
-          rootSpans.push(currentSpan);
+  useEffect4(() => {
+    const spansMap = /* @__PURE__ */ new Map();
+    const rootSpans = [];
+    for (const span of spans.data ?? []) {
+      spansMap.set(span.span_id, { ...span, children: [] });
+    }
+    for (const span of spans.data ?? []) {
+      const currentSpan = spansMap.get(span.span_id);
+      if (!currentSpan) continue;
+      if (span.parent_span_id && spansMap.has(span.parent_span_id)) {
+        const parentSpan = spansMap.get(span.parent_span_id);
+        if (parentSpan) {
+          parentSpan.children ??= [];
+          parentSpan.children.push(currentSpan);
         }
+      } else {
+        rootSpans.push(currentSpan);
       }
-      let allNodes = [];
-      let allEdges = [];
-      for (const rootSpan of rootSpans) {
-        const { edges: newEdges, nodes: newNodes } = generateNodesAndEdges(rootSpan, (event) => {
-          onEventSelect(event);
-        });
-        allNodes = [...allNodes, ...newNodes];
-        allEdges = [...allEdges, ...newEdges];
-      }
-      const { edges: layoutedEdges, nodes: layoutedNodes } = getLayoutedNodesAndEdges(allNodes, allEdges);
-      setNodes(layoutedNodes);
-      setEdges(layoutedEdges);
-      setIsLoading(false);
-      setFetchError(void 0);
-    } catch (error) {
-      console.error("Error fetching trace:", error);
-      setFetchError(error instanceof Error ? error : new Error("Unknown error", { cause: error }));
-    } finally {
-      setIsLoading(false);
     }
-  }, [api, traceId, onEventSelect]);
-  const fetchTraceSync = useCallback6(() => {
-    void fetchTrace();
-  }, [fetchTrace]);
-  useEffect4(() => {
-    fetchTraceSync();
-  }, [fetchTraceSync]);
+    let allNodes = [];
+    let allEdges = [];
+    for (const rootSpan of rootSpans) {
+      const { edges: newEdges, nodes: newNodes } = generateNodesAndEdges(rootSpan, (event) => {
+        onEventSelect(event);
+      });
+      allNodes = [...allNodes, ...newNodes];
+      allEdges = [...allEdges, ...newEdges];
+    }
+    const { edges: layoutedEdges, nodes: layoutedNodes } = getLayoutedNodesAndEdges(allNodes, allEdges);
+    setNodes(layoutedNodes);
+    setEdges(layoutedEdges);
+  }, [onEventSelect, spans.data]);
   useEffect4(() => {
-    const shouldSetInitialView = !isLoading && nodes.length > 0 && !initialViewSet;
+    const shouldSetInitialView = !spans.loading && nodes.length > 0 && !initialViewSet;
     if (shouldSetInitialView) {
       if (initialFocusEventId) {
         const focusNode = nodes.find((node) => node.id === initialFocusEventId);
@@ -3929,7 +3910,7 @@ var TraceGraph = ({
       }
       setInitialViewSet(true);
     }
-  }, [isLoading, nodes, initialFocusEventId, viewPortPixelWidth, setCenter, fitView, onEventSelect, initialViewSet]);
+  }, [spans.loading, nodes, initialFocusEventId, viewPortPixelWidth, setCenter, fitView, onEventSelect, initialViewSet]);
   useEffect4(() => {
     if (initialFocusEventId) {
       updateSelectedNode(initialFocusEventId);
@@ -3940,15 +3921,17 @@ var TraceGraph = ({
     updateSelectedNode(node.id);
   }, [onEventSelect, updateSelectedNode]);
   return /* @__PURE__ */ jsxs127(Fragment3, { children: [
-    fetchError && /* @__PURE__ */ jsxs127(
+    spans.error && /* @__PURE__ */ jsxs127(
       Alert3,
       {
-        action: /* @__PURE__ */ jsx134(Button4, { onClick: fetchTraceSync, children: "Retry" }),
+        action: /* @__PURE__ */ jsx134(Button4, { onClick: () => {
+          onRefresh();
+        }, children: "Retry" }),
         severity: "error",
         children: [
           "Unexpected error:",
           " ",
-          fetchError.message
+          spans.error.message
         ]
       }
     ),
@@ -3974,7 +3957,7 @@ var TraceGraph = ({
   ] });
 };
 
-// src/pages/trace-graph.tsx
+// src/pages/trace-graph-page.tsx
 import { Fragment as Fragment4, jsx as jsx135, jsxs as jsxs128 } from "react/jsx-runtime";
 var HEADER_HEIGHT = 56;
 var DRAWER_WIDTH = "35%";
@@ -3995,7 +3978,6 @@ var Main = styled("main", { shouldForwardProp: (property) => property !== "open"
 }));
 var StyledDrawer = styled(Drawer)(() => ({
   "& .MuiDrawer-paper": {
-    backgroundColor: "#ffffff",
     bottom: 0,
     boxSizing: "border-box",
     height: `calc(100% - ${HEADER_HEIGHT.toString()}px)`,
@@ -4011,6 +3993,28 @@ var TraceGraphPage = () => {
   const { traceId } = useParams();
   const [searchParameters] = useSearchParams();
   const spanId = searchParameters.get("spanId");
+  const api = useAppInspectorApi();
+  const [spans, setSpans] = useState7();
+  const [loading, setLoading] = useState7(false);
+  const [fetchError, setFetchError] = useState7();
+  const fetchSpans = useCallback7(async () => {
+    setLoading(true);
+    try {
+      const response = await api.getSpans({
+        trace_id: traceId
+      });
+      setSpans(response.spans);
+      setFetchError(void 0);
+    } catch (error) {
+      console.error(error);
+      setFetchError(error instanceof Error ? error : new Error("Unknown error", { cause: error }));
+    } finally {
+      setLoading(false);
+    }
+  }, [api, traceId]);
+  useEffect5(() => {
+    void fetchSpans();
+  }, [fetchSpans]);
   const [open, setOpen] = useState7(true);
   const [selectedEvent, setSelectedEvent] = useState7();
   const [viewPortPixelWidth, setViewPortPixelWidth] = useState7(0);
@@ -4086,7 +4090,14 @@ var TraceGraphPage = () => {
                   {
                     initialFocusEventId: spanId,
                     onEventSelect: handleEventSelect,
-                    traceId,
+                    onRefresh: () => {
+                      void fetchSpans();
+                    },
+                    spans: {
+                      data: spans,
+                      error: fetchError,
+                      loading
+                    },
                     viewPortPixelWidth
                   }
                 ) })