Skip to content
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

Fix ESLint rules-of-hooks warnings #218

Merged
merged 5 commits into from
Mar 29, 2025
Merged

Fix ESLint rules-of-hooks warnings #218

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0891077
This fixes the linter's warning that Hooks must be run in order each …
cliffhall Mar 27, 2025
804a144
Merge branch 'main' into fix-rules-of-hooks-warning
cliffhall Mar 28, 2025
84335ae
Remove else block wrapper for final component return to reduce indent…
cliffhall Mar 28, 2025
7227909
Fix spurious linebreak
cliffhall Mar 28, 2025
dbaa731
Merge branch 'main' into fix-rules-of-hooks-warning
cliffhall Mar 28, 2025
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
55 changes: 28 additions & 27 deletions client/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,6 @@ const PROXY_SERVER_URL = `http://${window.location.hostname}:${PROXY_PORT}`;

const App = () => {
// Handle OAuth callback route
if (window.location.pathname === "/oauth/callback") {
const OAuthCallback = React.lazy(
() => import("./components/OAuthCallback"),
);
return (
<Suspense fallback={<div>Loading...</div>}>
<OAuthCallback />
</Suspense>
);
}
const [resources, setResources] = useState<Resource[]>([]);
const [resourceTemplates, setResourceTemplates] = useState<
ResourceTemplate[]
Expand Down Expand Up @@ -114,22 +104,6 @@ const App = () => {
const nextRequestId = useRef(0);
const rootsRef = useRef<Root[]>([]);

const handleApproveSampling = (id: number, result: CreateMessageResult) => {
setPendingSampleRequests((prev) => {
const request = prev.find((r) => r.id === id);
request?.resolve(result);
return prev.filter((r) => r.id !== id);
});
};

const handleRejectSampling = (id: number) => {
setPendingSampleRequests((prev) => {
const request = prev.find((r) => r.id === id);
request?.reject(new Error("Sampling request rejected"));
return prev.filter((r) => r.id !== id);
});
};

const [selectedResource, setSelectedResource] = useState<Resource | null>(
null,
);
Expand Down Expand Up @@ -224,7 +198,7 @@ const App = () => {
// Connect to the server
connectMcpServer();
}
}, []);
}, [connectMcpServer]);

useEffect(() => {
fetch(`${PROXY_SERVER_URL}/config`)
Expand Down Expand Up @@ -253,6 +227,22 @@ const App = () => {
}
}, []);

const handleApproveSampling = (id: number, result: CreateMessageResult) => {
setPendingSampleRequests((prev) => {
const request = prev.find((r) => r.id === id);
request?.resolve(result);
return prev.filter((r) => r.id !== id);
});
};

const handleRejectSampling = (id: number) => {
setPendingSampleRequests((prev) => {
const request = prev.find((r) => r.id === id);
request?.reject(new Error("Sampling request rejected"));
return prev.filter((r) => r.id !== id);
});
};

const clearError = (tabKey: keyof typeof errors) => {
setErrors((prev) => ({ ...prev, [tabKey]: null }));
};
Expand Down Expand Up @@ -425,6 +415,17 @@ const App = () => {
setLogLevel(level);
};

if (window.location.pathname === "/oauth/callback") {
const OAuthCallback = React.lazy(
() => import("./components/OAuthCallback"),
);
return (
<Suspense fallback={<div>Loading...</div>}>
<OAuthCallback />
</Suspense>
);
}

return (
<div className="flex h-screen bg-background">
<Sidebar
Expand Down