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
74 changes: 13 additions & 61 deletions api/src/main/webui/package-lock.json

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

4 changes: 2 additions & 2 deletions api/src/main/webui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"react-dom": "^19.2.8",
"react-i18next": "^17.0.11",
"react-json-view-lite": "^2.5.0",
"react-router-dom": "^7.18.1",
"react-router": "^8.0.0",
"victory": "^37.3.6",
"zustand": "^5.0.14"
},
Expand All @@ -47,4 +47,4 @@
"typescript-eslint": "^8.65.0",
"vite": "^8.1.5"
}
}
}
2 changes: 1 addition & 1 deletion api/src/main/webui/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Provides the main layout and outlet for child routes
*/

import { Outlet } from 'react-router-dom';
import { Outlet } from 'react-router';
import { AppLayoutProvider } from '@/components/app/AppLayoutProvider';
import { ThemeProvider } from '@/components/app/ThemeProvider';
import { KafkaAuthProvider } from '@/components/auth/KafkaAuthProvider';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createContext, useContext, useState, useCallback, ReactNode } from 'react';
import { useParams, useNavigate } from 'react-router-dom';
import { useParams, useNavigate } from 'react-router';
import { useQueryClient } from '@tanstack/react-query';
import { KafkaLoginModal } from './KafkaLoginModal';
import { QueryErrorHandler } from './QueryErrorHandler';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { useEffect, useMemo, useState, useCallback } from 'react';
import { useSearchParams } from 'react-router-dom';
import { useSearchParams } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
DataView,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useMemo } from 'react';
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Button,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import {
Tooltip,
} from '@patternfly/react-core';
import { ArrowRightIcon, HomeIcon } from '@patternfly/react-icons';
import { useNavigate } from 'react-router-dom';
import { useNavigate } from 'react-router';
import { useTranslation } from 'react-i18next';
import { useRef, useState } from 'react';
import { KafkaCluster } from '@/api/types';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { Nav, NavItem, NavList, PageSidebar, PageSidebarBody } from '@patternfly/react-core';
import { useTranslation } from 'react-i18next';
import { NavLink, useParams, useLocation } from 'react-router-dom';
import { NavLink, useParams, useLocation } from 'react-router';
import { useAppLayout } from '@/components/app/AppLayoutProvider';

interface NavItemConfig {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useState, useEffect } from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import {
Toolbar,
ToolbarContent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useState, useEffect } from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import {
Toolbar,
ToolbarContent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/

import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import {
Label,
LabelGroup,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { useTranslation } from 'react-i18next';
import { useParams, Link } from 'react-router-dom';
import { useParams, Link } from 'react-router';
import {
EmptyState,
EmptyStateBody,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import {
useControllerStatusLabels,
} from './NodeStatusLabel';
import { formatNumber } from '@/utils/format';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';

interface NodesTableProps {
kafkaId: string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import { useState, useMemo } from 'react';
import { useTranslation } from 'react-i18next';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import { formatDateTime } from '@/utils/dateTime';
import {
Table,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
*/

import * as React from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Card,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import { useState } from 'react';
import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Card,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* - Status breakdown (fully replicated, under-replicated, offline)
*/

import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Card,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useCallback, useMemo } from 'react';
import { Link, useParams } from 'react-router-dom';
import { Link, useParams } from 'react-router';
import { useTranslation } from 'react-i18next';
import { ThProps } from '@patternfly/react-table';
import { UseQueryResult } from '@tanstack/react-query';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Displays a table of Kafka users with filtering and sorting
*/

import { Link } from 'react-router-dom';
import { Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Table,
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webui/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 { RouterProvider } from 'react-router-dom';
import { RouterProvider } from 'react-router';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { router } from './routes';
import './i18n/config';
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webui/src/pages/ErrorPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Error Page - Displayed when routing errors occur
*/

import { useRouteError, isRouteErrorResponse } from 'react-router-dom';
import { useRouteError, isRouteErrorResponse } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Page,
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webui/src/pages/kafka/KafkaLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* Kafka Layout - Wrapper for Kafka cluster pages
*/

import { Outlet, useParams, useLocation, Link } from 'react-router-dom';
import { Outlet, useParams, useLocation, Link } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
Page,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Displays the connect clusters table
*/

import { useParams } from 'react-router-dom';
import { useParams } from 'react-router';
import { PageSection } from '@patternfly/react-core';
import { ConnectClustersTable } from '@/components/kafka/connect/ConnectClustersTable';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Displays the connectors table
*/

import { useParams } from 'react-router-dom';
import { useParams } from 'react-router';
import { PageSection } from '@patternfly/react-core';
import { ConnectorsTable } from '@/components/kafka/connect/ConnectorsTable';

Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webui/src/pages/kafka/connect/ConnectPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Main page for Kafka Connect with tabs for Connectors and Connect Clusters
*/

import { useParams, useNavigate, useLocation, Outlet } from 'react-router-dom';
import { useParams, useNavigate, useLocation, Outlet } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
PageSection,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useState } from 'react';
import { useParams, Link } from 'react-router-dom';
import { useParams, Link } from 'react-router';
import {
PageSection,
Tabs,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { useState } from 'react';
import { useParams } from 'react-router-dom';
import { useParams } from 'react-router';
import {
PageSection,
Title,
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/webui/src/pages/kafka/groups/GroupsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

import { useState, useEffect } from 'react';
import { useParams } from 'react-router-dom';
import { useParams } from 'react-router';
import { useTranslation } from 'react-i18next';
import {
PageSection,
Expand Down
Loading
Loading