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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
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
12 changes: 3 additions & 9 deletions frontend/src/components/screens/Dashboard.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -24,7 +24,7 @@ import {
type Assignment,
} from "@/lib/api";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { partitionCurrentAndArchive } from "@/lib/semesters";
import { IS_TEST_MODE, now } from "@/lib/testMode";

Expand DownExpand Up@@ -475,13 +475,7 @@ export function Dashboard() {
width={size.w}
height={size.h}
highlightId={suggestNode?.id}
onNodeClick={(n) => {
const p = new URLSearchParams();
p.set("topic", n.name);
p.set("mode", "socratic");
if (n.course_id) p.set("course_id", n.course_id);
router.push(`/learn?${p.toString()}`);
}}
onNodeClick={(n) => router.push(learnHrefForNode(n))}
/>
{/* Courses key — sidebar layout only. Top-nav layout uses the
full My Courses panel in the left column instead. */}
Expand DownExpand Up@@ -1051,7 +1045,7 @@ export function Dashboard() {
highlightId={suggestNode?.id}
onNodeClick={(n) => {
setFullscreen(false);
router.push(`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`);
router.push(learnHrefForNode(n));
}}
/>
</div>
Expand Down
12 changes: 7 additions & 5 deletions frontend/src/components/screens/Tree.tsx
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,7 +14,7 @@ import { getGraph, getCourses, getSessions, deleteGraphNode, type EnrolledCourse
import { useToast } from "../ToastProvider";
import { useConfirm } from "@/lib/useConfirm";
import type { GraphNode as ApiNode, GraphEdge as ApiEdge } from "@/lib/types";
import { apiToGraphNode, type GraphNode, type GraphEdge } from "@/lib/data";
import { apiToGraphNode, learnHrefForNode, type GraphNode, type GraphEdge } from "@/lib/data";

type Tier = "all" | "mastered" | "learning" | "struggling" | "unexplored";

Expand DownExpand Up@@ -132,11 +132,13 @@ export function Tree() {
return n?.id;
}, [suggest, nodes]);

const onLearn = (n: GraphNode) => router.push(
`/learn?topic=${encodeURIComponent(n.name)}&mode=socratic${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
);
const onLearn = (n: GraphNode) => router.push(learnHrefForNode(n));
// Subject-root (course) nodes have no single quiz topic — open the picker
// rather than seeding the course name (mirrors the tutor fix, #319). The
// Quiz screen only reads `topic`/`concept`, so the old `course_id` param was
// dead and is dropped.
const onQuiz = (n: GraphNode) => router.push(
`/quiz?topic=${encodeURIComponent(n.name)}${n.course_id ? `&course_id=${encodeURIComponent(n.course_id)}` : ""}`,
n.is_subject_root ? "/quiz" : `/quiz?topic=${encodeURIComponent(n.name)}`,
);

const del = useConfirm(async () => {
Expand Down
58 changes: 57 additions & 1 deletion frontend/src/lib/data.test.ts
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
import { describe, expect, it } from "vitest";
import { apiToGraphNode, hashSeed, paletteFor } from "./data";
import { apiToGraphNode, hashSeed, learnHrefForNode, paletteFor } from "./data";
import type { GraphNode as ApiNode } from "./types";
import type { EnrolledCourse } from "./api";
import type { GraphNode } from "./data";

function makeApiNode(over: Partial<ApiNode> = {}): ApiNode {
return {
Expand DownExpand Up@@ -107,6 +108,61 @@ describe("apiToGraphNode color resolution", () => {
});
});

function makeGraphNode(over: Partial<GraphNode> = {}): GraphNode {
return {
id: "n1",
name: "Eigenvalues",
subject: "Linear Algebra",
color: "#7a874f",
is_subject_root: false,
mastery_tier: "learning",
mastery_score: 0.5,
course_id: "c1",
...over,
};
}

describe("learnHrefForNode", () => {
it("seeds the topic from a concept node's name", () => {
const href = learnHrefForNode(makeGraphNode({ name: "Eigenvalues" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("topic")).toBe("Eigenvalues");
expect(params.get("mode")).toBe("socratic");
expect(params.get("course")).toBe("c1");
});

it("never sends a subject-root (course) node's name as the topic (#319)", () => {
const href = learnHrefForNode(
makeGraphNode({ name: "Linear Algebra", is_subject_root: true }),
);
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("topic")).toBe(false);
// Still scoped to the course so the tutor opens filtered to it.
expect(params.get("course")).toBe("c1");
expect(params.get("mode")).toBe("socratic");
});

it("scopes the course via the `course` param the Learn screen reads", () => {
// Regression guard: the old handlers passed `course_id`, which Learn
// (searchParams.get("course")) silently ignored, dropping course scope.
const href = learnHrefForNode(makeGraphNode({ course_id: "c42" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.get("course")).toBe("c42");
expect(params.has("course_id")).toBe(false);
});

it("omits the course param when the node has no course_id", () => {
const href = learnHrefForNode(makeGraphNode({ course_id: "" }));
const params = new URLSearchParams(href.split("?")[1]);
expect(params.has("course")).toBe(false);
});

it("honors a non-default mode", () => {
const href = learnHrefForNode(makeGraphNode(), "flashcards");
expect(new URLSearchParams(href.split("?")[1]).get("mode")).toBe("flashcards");
});
});

describe("hashSeed", () => {
it("is deterministic", () => {
expect(hashSeed("hello")).toBe(hashSeed("hello"));
Expand Down
20 changes: 20 additions & 0 deletions frontend/src/lib/data.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -66,6 +66,26 @@ export type GraphEdge = {
strength: number;
};

// Deep-link from a knowledge-graph node into the AI Tutor (`/learn`).
//
// Subject-root (course) nodes carry the *course* name, which must never be
// sent as the session topic: doing so pre-selected the course name as a topic
// on redirect (#319). For a course node we scope the tutor to the course and
// leave the topic empty so the learner picks a concept; concept nodes seed
// their own name as the topic. The course is passed as `course` — the param
// the Learn screen reads (`searchParams.get("course")`); the earlier handlers
// passed `course_id`, which Learn silently ignored, dropping course scope.
export function learnHrefForNode(
n: Pick<GraphNode, "name" | "course_id" | "is_subject_root">,
mode = "socratic",
): string {
const p = new URLSearchParams();
if (!n.is_subject_root) p.set("topic", n.name);
p.set("mode", mode);
if (n.course_id) p.set("course", n.course_id);
return `/learn?${p.toString()}`;
}

// Adapter from the backend `ApiNode` shape to the frontend `GraphNode`
// shape consumed by `KnowledgeGraph`. Hoisted here from Tree/Learn/
// Dashboard so the three screens share a single source of truth.
Expand Down
Loading