Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 13 additions & 43 deletions ui/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"dependencies": {
"react": "^19.2.7",
"react-dom": "^19.2.8",
"react-router-dom": "^7.18.1"
"react-router": "^8.3.0"
},
"devDependencies": {
"@testing-library/dom": "^10.4.1",
Expand Down
2 changes: 1 addition & 1 deletion ui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
useNavigate,
useParams,
useSearchParams,
} from "react-router-dom";
} from "react-router";
import TraceList from "./components/TraceList";
import TraceWaterfall from "./components/TraceWaterfall";
import LogView from "./components/LogView";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Alerts.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useState } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
listAlerts,
listAlertEvents,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/LogView.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fragment, useEffect, useState } from "react";
import { Link, useSearchParams } from "react-router-dom";
import { Link, useSearchParams } from "react-router";
import { listLogs, type LogRow } from "../api";
import { firstRunHint } from "../empty";
import { traceHref } from "../links";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/MetricChart.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useMemo, useState } from "react";
import { Link, useNavigate, useSearchParams } from "react-router-dom";
import { Link, useNavigate, useSearchParams } from "react-router";
import {
getMetricExemplars,
getMetricFacet,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/MetricList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Fragment, useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import {
getMetricFacet,
getMetricHistFacet,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/ServiceMap.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { useNavigate } from "react-router-dom";
import { useNavigate } from "react-router";
import { getServiceMap, type ServiceMapData } from "../api";
import { rowKeyActivate } from "../a11y";
import { firstRunHint } from "../empty";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/Services.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { Link } from "react-router-dom";
import { Link } from "react-router";
import { listServices, type ServiceRed } from "../api";
import { useControls, rangeParams } from "../timerange";
import { useSort } from "../sort";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/TraceList.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useState } from "react";
import { Link, useSearchParams } from "react-router-dom";
import { Link, useSearchParams } from "react-router";
import { listTraces, type TraceSummary } from "../api";
import { useControls, rangeParams } from "../timerange";
import { useSort } from "../sort";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/TraceWaterfall.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useRef, useState } from "react";
import { Link, useSearchParams } from "react-router-dom";
import { Link, useSearchParams } from "react-router";
import { getTrace, type SpanRow } from "../api";
import { rowKeyActivate } from "../a11y";
import { logsHref } from "../links";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react";
import ReactDOM from "react-dom/client";
import { BrowserRouter } from "react-router-dom";
import { BrowserRouter } from "react-router";
import App from "./App";
import { TimeRangeProvider } from "./timerange";
import "./styles.css";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/routes.a11y.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
// JEF-443's Alerts row rework).
import { describe, expect, it, vi } from "vitest";
import { render, screen } from "@testing-library/react";
import { MemoryRouter } from "react-router-dom";
import { MemoryRouter } from "react-router";
import type { ReactElement } from "react";
import { axe } from "vitest-axe";
import App from "./App";
Expand Down
2 changes: 1 addition & 1 deletion ui/src/timerange.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createContext, useContext, useEffect, useState, type ReactNode } from "react";
import { useSearchParams } from "react-router-dom";
import { useSearchParams } from "react-router";

// Relative ranges. `ms: 0` means unbounded ("all").
export const RANGES: { key: string; label: string; ms: number }[] = [
Expand Down