de60983ccc
#1954 wired the list-load error off the aggregate managed stores only. With `paginatedLists` on, those stores deliberately skip their all-page walk, so their error is permanently null — while the paged stores that actually drive the sidebar had no error state at all and `loadPage` had a try/finally with no catch. A failing list showed an empty panel with no alert and no Retry, and the connect-time `void loadPage(undefined)` left an unhandled rejection. - Give PagedTools/Prompts/ResourcesState observable error state: an `errorChange` event plus `getError()`, set in a new catch in `loadPage`, cleared on the next success and on disconnect. The rejection is still re-thrown, matching ManagedListState — callers' auth-recovery wrappers key off it to detect a 401. - Catch the connect-time load's rejection (`.catch(() => {})`) now that the failure is recorded as state rather than lost. - Select the error by mode in `usePaginatedList`, the same way `items` already is, and read it in App.tsx from the pagination model. - Rename `useManagedListError` to `useListError`: both store families expose an identical `errorChange`, so the hook declares that one-event contract itself instead of importing ManagedListEventMap. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_0177mPHAdECD18nLLCTwR5rh Signed-off-by: cliffhall <cliff@futurescale.com>
76 lines
2.7 KiB
TypeScript
76 lines
2.7 KiB
TypeScript
import { useState, useEffect, useCallback } from "react";
|
|
import type { InspectorClientProtocol } from "../mcp/inspectorClientProtocol.js";
|
|
import type {
|
|
ManagedResourceTemplatesState,
|
|
ManagedResourceTemplatesStateEventMap,
|
|
} from "../mcp/state/managedResourceTemplatesState.js";
|
|
import type { ResourceTemplateType as ResourceTemplate } from "@modelcontextprotocol/client";
|
|
import type { TypedEventGeneric } from "../mcp/typedEventTarget.js";
|
|
import { useListError } from "./useListError.js";
|
|
|
|
export interface UseManagedResourceTemplatesResult {
|
|
/**
|
|
* The last fetch's failure (transport error, or a result the SDK codec
|
|
* rejected), or `null` when it succeeded. Includes the connect-time load,
|
|
* whose failure has no caller to surface it (#1953).
|
|
*/
|
|
error: Error | null;
|
|
resourceTemplates: ResourceTemplate[];
|
|
refresh: () => Promise<ResourceTemplate[]>;
|
|
}
|
|
|
|
/**
|
|
* React hook that subscribes to ManagedResourceTemplatesState and returns
|
|
* resource templates + refresh.
|
|
*/
|
|
export function useManagedResourceTemplates(
|
|
client: InspectorClientProtocol | null,
|
|
managedResourceTemplatesState: ManagedResourceTemplatesState | null,
|
|
): UseManagedResourceTemplatesResult {
|
|
const [resourceTemplates, setResourceTemplates] = useState<
|
|
ResourceTemplate[]
|
|
>(managedResourceTemplatesState?.getResourceTemplates() ?? []);
|
|
|
|
useEffect(() => {
|
|
if (!managedResourceTemplatesState) {
|
|
setResourceTemplates([]);
|
|
return;
|
|
}
|
|
setResourceTemplates(managedResourceTemplatesState.getResourceTemplates());
|
|
const onResourceTemplatesChange = (
|
|
event: TypedEventGeneric<
|
|
ManagedResourceTemplatesStateEventMap,
|
|
"resourceTemplatesChange"
|
|
>,
|
|
) => {
|
|
setResourceTemplates(event.detail);
|
|
};
|
|
managedResourceTemplatesState.addEventListener(
|
|
"resourceTemplatesChange",
|
|
onResourceTemplatesChange,
|
|
);
|
|
return () => {
|
|
managedResourceTemplatesState.removeEventListener(
|
|
"resourceTemplatesChange",
|
|
onResourceTemplatesChange,
|
|
);
|
|
};
|
|
}, [managedResourceTemplatesState]);
|
|
|
|
const error = useListError(managedResourceTemplatesState);
|
|
|
|
const refresh = useCallback(async (): Promise<ResourceTemplate[]> => {
|
|
if (!managedResourceTemplatesState || !client) return [];
|
|
// A user-initiated refresh forces a cache-bypassing round trip
|
|
// (`cacheMode: "refresh"`) so a modern server's `ttlMs`-cached list can't
|
|
// return stale — and re-stores the fresh aggregate.
|
|
const next = await managedResourceTemplatesState.refresh(
|
|
undefined,
|
|
"refresh",
|
|
);
|
|
setResourceTemplates(next);
|
|
return next;
|
|
}, [client, managedResourceTemplatesState]);
|
|
|
|
return { resourceTemplates, error, refresh };
|
|
}
|