Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix(reading): expose workspace skills in composer (#1596)

Bingxi Zhao (Frank)d324df2b66f9
diff --git a/web/components/reading/workspace/ReadingComposer.tsx b/web/components/reading/workspace/ReadingComposer.tsx
index 4e7ee9a58..0d028facf 100644
--- a/web/components/reading/workspace/ReadingComposer.tsx
+++ b/web/components/reading/workspace/ReadingComposer.tsx
@@ -20,6 +20,8 @@ import StandaloneComposer, {
type StandaloneComposerSubmission,
} from "@/components/chat/home/StandaloneComposer";
import { useChatStateAdapter } from "@/features/chat/ChatStateAdapter";
+import { useChatWorkspaces } from "@/hooks/useChatWorkspaces";
+import { useComposerResources } from "@/hooks/useComposerResources";
import { useWorkspaceChatActions } from "@/hooks/useWorkspaceChatActions";
import {
hasPendingAskUser,
@@ -58,7 +60,10 @@ export function ReadingComposer({
setKBs,
setLLMSelection,
setPersonaSelection,
+ setResourceSelection,
} = useChatStateAdapter();
+ const { workspaces } = useChatWorkspaces();
+ const resourceCatalog = useComposerResources(state.workspaceId, workspaces);
const { capabilities, activeCapabilityValue, selectCapability } =
useWorkspaceChatActions();
const { t } = useTranslation();
@@ -144,6 +149,9 @@ export function ReadingComposer({
onLLMSelectionChange={setLLMSelection}
personaSelection={state.personaSelection}
onPersonaSelectionChange={setPersonaSelection}
+ resourceCatalog={resourceCatalog}
+ resourceSelection={state.resourceSelection}
+ onResourceSelectionChange={setResourceSelection}
onSubmit={handleSubmit}
onCancelStreaming={cancelStreamingTurn}
inputPlaceholder={placeholder}
diff --git a/web/tests/reading-composer-resources.spec.tsx b/web/tests/reading-composer-resources.spec.tsx
new file mode 100644
index 000000000..a5b4a2457
--- /dev/null
+++ b/web/tests/reading-composer-resources.spec.tsx
@@ -0,0 +1,99 @@
+import { render } from "@testing-library/react";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+
+import type { ResourceSelection } from "@/features/chat/ChatStateAdapter";
+import type { ComposerResourceCatalog } from "@/hooks/useComposerResources";
+import { initI18n } from "@/i18n/init";
+
+initI18n("en");
+
+const captured = vi.hoisted(() => ({
+ props: null as {
+ resourceCatalog?: ComposerResourceCatalog;
+ resourceSelection?: ResourceSelection;
+ onResourceSelectionChange?: (selection: ResourceSelection) => void;
+ } | null,
+ catalogWorkspaceId: "" as string | null,
+ setResourceSelection: vi.fn(),
+ catalog: { skills: [{ id: "skill-1", name: "Tutor" }], mcp: [] },
+ selection: { skills: ["skill-1"], mcp: [] as string[] },
+}));
+
+vi.mock("@/features/chat/ChatStateAdapter", () => ({
+ useChatStateAdapter: () => ({
+ state: {
+ messages: [],
+ knowledgeBases: [],
+ llmSelection: null,
+ personaSelection: "",
+ resourceSelection: captured.selection,
+ workspaceId: "reading-workspace",
+ isStreaming: false,
+ },
+ sendMessage: vi.fn(),
+ submitUserReply: vi.fn(),
+ cancelStreamingTurn: vi.fn(),
+ setKBs: vi.fn(),
+ setLLMSelection: vi.fn(),
+ setPersonaSelection: vi.fn(),
+ setResourceSelection: captured.setResourceSelection,
+ }),
+}));
+
+vi.mock("@/hooks/useChatWorkspaces", () => ({
+ useChatWorkspaces: () => ({ workspaces: [], error: "" }),
+}));
+
+vi.mock("@/hooks/useComposerResources", () => ({
+ useComposerResources: (workspaceId: string | null) => {
+ captured.catalogWorkspaceId = workspaceId;
+ return captured.catalog;
+ },
+}));
+
+vi.mock("@/hooks/useWorkspaceChatActions", () => ({
+ useWorkspaceChatActions: () => ({
+ capabilities: [],
+ activeCapabilityValue: "",
+ selectCapability: vi.fn(),
+ }),
+}));
+
+vi.mock("@/components/chat/home/StandaloneComposer", () => ({
+ default: (props: typeof captured.props) => {
+ captured.props = props;
+ return <div>composer</div>;
+ },
+}));
+
+const { ReadingComposer } = await import(
+ "@/components/reading/workspace/ReadingComposer"
+);
+
+describe("ReadingComposer resources", () => {
+ beforeEach(() => {
+ captured.props = null;
+ captured.catalogWorkspaceId = "";
+ captured.setResourceSelection.mockClear();
+ });
+
+ it("offers workspace permitted skills and persists the manual selection", () => {
+ render(
+ <ReadingComposer
+ placeholder="Ask about this text"
+ selection={null}
+ onSent={vi.fn()}
+ onRemoveSelection={vi.fn()}
+ linkedSessionIds={[]}
+ />,
+ );
+
+ expect(captured.catalogWorkspaceId).toBe("reading-workspace");
+ expect(captured.props?.resourceCatalog).toEqual(captured.catalog);
+ expect(captured.props?.resourceSelection).toEqual(captured.selection);
+ captured.props?.onResourceSelectionChange?.({ skills: [], mcp: [] });
+ expect(captured.setResourceSelection).toHaveBeenCalledWith({
+ skills: [], mcp: [],
+ });
+ });
+});