Skip to content

Merge conflicts resolved - Pr 987 ready for review #1237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BHAVISHYA2005 wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Merge conflicts resolved - Pr 987 ready for review #1237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
84c0af4
feat: add auto-refresh functionality to UI
Oct 2, 2025
6c30c9f
Fix hydration with ClientOnly
Oct 2, 2025
fbcce77
Add auto-refresh functionality
Oct 2, 2025
18c299e
removing un usual file
Oct 2, 2025
61f7a02
Fix theme hydration warning
Oct 3, 2025
f1e2111
Replace custom polling with SWR
Oct 3, 2025
123db59
Fix CI e2e test connectivity with port-forward fallback
Oct 3, 2025
a6a49de
Merge branch 'main' into feature/ui-auto-refresh
rishabh998186 Oct 3, 2025
248674d
Merge branch 'kagent-dev:main' into feature/ui-auto-refresh
rishabh998186 Oct 3, 2025
46335cb
5-second refresh option, consolidate API URL logic with getBackendUrl…
Oct 3, 2025
158f049
Merge branch 'main' into feature/ui-auto-refresh
rishabh998186 Oct 7, 2025
d636948
Merge branch 'kagent-dev:main' into feature/ui-auto-refresh
rishabh998186 Oct 9, 2025
941bfc2
fix: add dev only CORS middleware
Oct 9, 2025
da659f1
Reduce SWR refresh interval from 30s to 5s
Oct 9, 2025
49536e9
adding dependency
Oct 9, 2025
79f5543
Merge branch 'main' into feature/ui-auto-refresh
rishabh998186 Oct 23, 2025
868bc82
feat: implement auto-refresh functionality for agents using server ac…
Oct 24, 2025
5ed4aac
removing unwanted changes
Oct 24, 2025
835955c
Merge origin/main - resolved AgentsProvider conflict
BHAVISHYA2005 Jan 23, 2026
b652a5d
Merge branch 'main' into pr-987
BHAVISHYA2005 Jan 23, 2026
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
214 changes: 214 additions & 0 deletions ui/package-lock.json
View file
Open in desktop

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

6 changes: 6 additions & 0 deletions ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
"@radix-ui/react-progress": "^1.1.8",
"@radix-ui/react-radio-group": "^1.3.8",
"@radix-ui/react-scroll-area": "^1.2.10",
"@radix-ui/react-select": "^2.2.5",
"@radix-ui/react-separator": "^1.1.7",
"@radix-ui/react-slot": "^1.2.3",
"@radix-ui/react-switch": "^1.2.6",
"@radix-ui/react-select": "^2.2.6",
"@radix-ui/react-separator": "^1.1.8",
"@radix-ui/react-slot": "^1.2.4",
Expand All @@ -47,6 +51,8 @@
"rehype-external-links": "^3.0.0",
"remark-gfm": "^4.0.1",
"sonner": "^2.0.7",
"swr": "^2.3.6",
"tailwind-merge": "^2.6.0",
"tailwind-merge": "^3.4.0",
"tailwindcss-animate": "^1.0.7",
"uuid": "^13.0.0",
Expand Down
31 changes: 17 additions & 14 deletions ui/src/app/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { Footer } from "@/components/Footer";
import { ThemeProvider } from "@/components/ThemeProvider";
import { Toaster } from "@/components/ui/sonner";
import { AppInitializer } from "@/components/AppInitializer";
import { SettingsProvider } from "@/contexts/SettingsContext";

const geistSans = Geist({
variable: "--font-geist-sans",
Expand All @@ -21,20 +22,22 @@ export const metadata: Metadata = {
export default function RootLayout({ children }: { children: React.ReactNode }) {
return (
<TooltipProvider>
<AgentsProvider>
<html lang="en" className="">
<body className={`${geistSans.className} flex flex-col h-screen overflow-hidden`}>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<AppInitializer>
<Header />
<main className="flex-1 overflow-y-scroll w-full mx-auto">{children}</main>
<Footer />
</AppInitializer>
<Toaster richColors/>
</ThemeProvider>
</body>
</html>
</AgentsProvider>
<SettingsProvider>
<AgentsProvider>
<html lang="en" suppressHydrationWarning>
<body className={`${geistSans.className} flex flex-col h-screen overflow-hidden`}>
<ThemeProvider attribute="class" defaultTheme="system" enableSystem disableTransitionOnChange>
<AppInitializer>
<Header />
<main className="flex-1 overflow-y-scroll w-full mx-auto">{children}</main>
<Footer />
</AppInitializer>
<Toaster richColors/>
</ThemeProvider>
</body>
</html>
</AgentsProvider>
</SettingsProvider>
</TooltipProvider>
);
}
7 changes: 7 additions & 0 deletions ui/src/components/AgentList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import { ErrorState } from "./ErrorState";
import { Button } from "./ui/button";
import { LoadingState } from "./LoadingState";
import { useAgents } from "./AgentsProvider";
import { RefreshIndicator } from "./RefreshIndicator";
import { SettingsPanel } from "./SettingsPanel";
import { ClientOnly } from "./ClientOnly";

export default function AgentList() {
const { agents , loading, error } = useAgents();
Expand All @@ -24,7 +27,11 @@ export default function AgentList() {
<div className="flex justify-between items-center mb-8">
<div className="flex items-center gap-4">
<h1 className="text-2xl font-bold">Agents</h1>
<RefreshIndicator />
</div>
<ClientOnly>
<SettingsPanel />
</ClientOnly>
</div>

{agents?.length === 0 ? (
Expand Down
Loading