diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.spec.tsx b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.spec.tsx
index 02bb80bfd..cd2452a33 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.spec.tsx
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.spec.tsx
@@ -15,8 +15,8 @@ const {
} = vi.hoisted(() => ({
hookReturn: {
exercises: [
- { id: 1, name: "Ex One", question_type: "mchoice", qnumber: "Q1" },
- { id: 2, name: "Ex Two", question_type: "activecode", qnumber: "Q2" }
+ { id: 1, name: "Ex One", author: "Author One", question_type: "mchoice", qnumber: "Q1" },
+ { id: 2, name: "Ex Two", author: "Author Two", question_type: "activecode", qnumber: "Q2" }
],
pagination: { total: 2, page: 0, limit: 20, pages: 1 },
loading: false,
@@ -157,6 +157,7 @@ describe("SmartSearchExercises", () => {
renderWithMantine(
);
expect(screen.getByRole("heading", { name: "Search exercises" })).toBeInTheDocument();
expect(screen.getByText("Showing 2 of 2 exercises")).toBeInTheDocument();
+ expect(screen.queryByText("2 of 2 results shown.")).not.toBeInTheDocument();
});
it("returns to the list view from the toolbar back button", async () => {
@@ -217,4 +218,11 @@ describe("SmartSearchExercises", () => {
expect(monoCells.length).toBe(2);
expect(monoCells[0].textContent).toBe("Ex One");
});
+
+ it("does not duplicate visible Name and Author cell text in title attributes", () => {
+ renderWithMantine(
);
+
+ expect(screen.getByText("Ex One")).not.toHaveAttribute("title");
+ expect(screen.getByText("Author One")).not.toHaveAttribute("title");
+ });
});
diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.tsx b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.tsx
index 39d8ee379..a36a7550e 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.tsx
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/components/routes/AssignmentBuilder/components/exercises/components/SearchExercises/SmartSearchExercises.tsx
@@ -16,8 +16,7 @@ import {
Switch,
TagsInput,
Text,
- Tooltip,
- VisuallyHidden
+ Tooltip
} from "@mantine/core";
import { datasetSelectors } from "@store/dataset/dataset.logic";
import {
@@ -53,11 +52,7 @@ type FilterMetaValue = { value: string | string[] | null };
const MATCH_CONTAINS = "contains";
const MATCH_IN = "in";
-const renderEllipsis = (text?: string | null) => (
-
- {text}
-
-);
+const renderEllipsis = (text?: string | null) =>
{text}
;
export const SmartSearchExercises = ({
setCurrentEditExercise,
@@ -284,7 +279,7 @@ export const SmartSearchExercises = ({
filter: { variant: "text", placeholder: "Search by name" }
},
cell: ({ row }) => (
-
+
{row.original.name}
)
@@ -381,7 +376,7 @@ export const SmartSearchExercises = ({
>
Search exercises}
+ aria-label="Search exercises"
value={globalTerms}
onChange={(terms) => onGlobalFilterChange(terms.join(" "))}
placeholder="Search terms…"
@@ -474,6 +469,7 @@ export const SmartSearchExercises = ({
ariaLabel="Search exercises"
fillHeight
scrollSentinelRef={sentinelRef}
+ showFilterResultsStatus={false}
/>
)}
diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/components/ui/DataGrid.tsx b/bases/rsptx/assignment_server_api/assignment_builder/src/components/ui/DataGrid.tsx
index bfb763fe8..cc8af00e3 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/components/ui/DataGrid.tsx
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/components/ui/DataGrid.tsx
@@ -85,6 +85,7 @@ export interface DataGridProps
{
loading?: boolean;
emptyMessage?: React.ReactNode;
filterResultsLabel?: string;
+ showFilterResultsStatus?: boolean;
filterResultsTotal?: number;
tableFrameClassName?: string;
ariaLabel?: string;
@@ -190,6 +191,7 @@ export function DataGrid({
initialSorting = [],
loading = false,
emptyMessage = "Nothing here yet",
+ showFilterResultsStatus = true,
filterResultsLabel = "results",
filterResultsTotal = data.length,
tableFrameClassName,
@@ -251,7 +253,8 @@ export function DataGrid({
const resolvedPageCount = table.getPageCount();
const rows = table.getRowModel().rows;
const filteredRowCount = table.getFilteredRowModel().rows.length;
- const announcesFilterResults = enableGlobalFilter || enableColumnFilters;
+ const announcesFilterResults =
+ showFilterResultsStatus && (enableGlobalFilter || enableColumnFilters);
const tabbableRowId = rows.some((row) => row.id === keyboardRowId) ? keyboardRowId : rows[0]?.id;
// Column filters shrink the table from the inside, so a page index that came
diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.spec.ts b/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.spec.ts
index 9d02c9f4a..4da4d1a55 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.spec.ts
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.spec.ts
@@ -50,6 +50,13 @@ describe("course-aware browser history", () => {
}
);
+ it("does not redirect the Vite development shell without course metadata", () => {
+ expect(reconcileServerCourse("", "course-2", "/builder/22")).toBeNull();
+ expect(syncCourseHistoryEntry("", "/builder/22")).toBeNull();
+ expect(getRestoredCourseDestination(true, "", "/builder/22")).toBeNull();
+ expect(sessionStorage.getItem("assignment-builder.active-course")).toBeNull();
+ });
+
it("redirects a stale grader entry to the grader assignment list", () => {
syncCourseHistoryEntry("course-1", "/grader/22");
diff --git a/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.ts b/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.ts
index f8d18ed35..5970c238f 100644
--- a/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.ts
+++ b/bases/rsptx/assignment_server_api/assignment_builder/src/courseHistory.ts
@@ -82,7 +82,11 @@ export const reconcileServerCourse = (
serverCourse: string | undefined,
pathname: string
): string | null => {
- if (!serverCourse || serverCourse === pageCourse) return null;
+ // The Vite development shell intentionally has no course metadata. In that
+ // environment the authenticated API can still report a current course, but
+ // treating it as a mismatch creates a redirect loop between the production
+ // route and the Vite client route.
+ if (!pageCourse || !serverCourse || serverCourse === pageCourse) return null;
markCourseSwitch(serverCourse);
return getCourseSwitchDestination(pathname);
@@ -93,6 +97,8 @@ export const reconcileServerCourse = (
* from another course is stale and must not restore an assignment-specific URL.
*/
export const syncCourseHistoryEntry = (currentCourse: string, pathname: string): string | null => {
+ if (!currentCourse) return null;
+
const entryCourse = getHistoryState()[HISTORY_COURSE_KEY];
const activeCourse = getStoredCourse();
@@ -137,7 +143,7 @@ export const getRestoredCourseDestination = (
pageCourse: string,
pathname: string
): string | null => {
- if (!persisted) return null;
+ if (!persisted || !pageCourse) return null;
const activeCourse = getStoredCourse();
const activeCourseMismatch = Boolean(activeCourse && activeCourse !== pageCourse);