@nualang/nualang-ui-components 0.1.1418 → 0.1.1419

package/dist/Lists/Courses/Courses.js

@@ -5,7 +5,7 @@ import CourseCard from "../../Cards/Course/Course";
 import useListScroll from "../../hooks/useListScroll";
 import { SingleLineGridList, SingleLineGridListItem, GridListItem } from "../ListElements";
 import { getStudentSortOrder, setStudentSortOrder } from "../../utils/studentSort";
-import { CLASSROOM_COURSES_SORT_ORDER_KEY, compareCoursesBySortOrder, compareCoursesByLastVisit, getCourseVisits, recordCourseVisit } from "../../utils/courseSort";
+import { CLASSROOM_COURSES_SORT_ORDER_KEY, compareCoursesBySortOrder, compareCoursesByLastVisit, getCourseVisits, normalizeCourseSortOrder, recordCourseVisit } from "../../utils/courseSort";
 
 // import { propsAreEqual } from '../../utils';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
@@ -165,7 +165,7 @@ function Courses({
   handleViewCourseTopic,
   ...otherProps
 }) {
-  const [sortOrder, setSortOrder] = useState(() => getStudentSortOrder(CLASSROOM_COURSES_SORT_ORDER_KEY, "oldest"));
+  const [sortOrder, setSortOrder] = useState(() => normalizeCourseSortOrder(getStudentSortOrder(CLASSROOM_COURSES_SORT_ORDER_KEY, "default")));
   // Snapshot taken on mount so opening a course doesn't reshuffle the list
   // under the user mid-click; the fresh order shows on the way back in.
   const [visits, setVisits] = useState(getCourseVisits);
@@ -199,7 +199,7 @@ function Courses({
     // The courses arrive from Dynamo oldest-first, so the default order is
     // simply the array as given — the courses added to the classroom first
     // stay at the top.
-    if (sortOrder === "oldest") return courses;
+    if (sortOrder === "default") return courses;
     if (sortOrder === "newest") return [...courses].reverse();
     if (sortOrder === "recentlyViewed") {
       // Sorting the default order means never-opened courses stay in it,
@@ -235,8 +235,8 @@ function Courses({
           label: t("sort_by"),
           autoWidth: true,
           children: [/*#__PURE__*/_jsx(MenuItem, {
-            value: "oldest",
-            children: t("oldest")
+            value: "default",
+            children: t("default")
           }), /*#__PURE__*/_jsx(MenuItem, {
             value: "newest",
             children: t("newest")

package/dist/Lists/Courses/Courses.test.js

@@ -44,7 +44,7 @@ describe("Courses", () => {
     } = renderCourses();
     unmount();
   });
-  it("defaults to the order the courses arrive in, oldest first", async () => {
+  it("defaults to the order the courses arrive in, oldest added first", async () => {
     // No stored preference — courses added to the classroom first stay at the
     // top, in the order Dynamo sent them down.
     const {
@@ -56,6 +56,19 @@ describe("Courses", () => {
     expect(courseNames).toEqual(props.courses.map(c => c.courseName));
     unmount();
   });
+  it("falls back to the default order when a stale preference is stored", async () => {
+    // The order was named "oldest" in 0.1.1418; a teacher who picked it then
+    // still has that in localStorage.
+    localStorage.setItem(CLASSROOM_COURSES_SORT_ORDER_KEY, "oldest");
+    const {
+      unmount
+    } = renderCourses({
+      showSortControl: true
+    });
+    const courseNames = await renderedCourseNames();
+    expect(courseNames).toEqual(props.courses.map(c => c.courseName));
+    unmount();
+  });
   it("reverses the courses when the newest preference is stored", async () => {
     localStorage.setItem(CLASSROOM_COURSES_SORT_ORDER_KEY, "newest");
     const {

package/dist/utils/courseSort.js

@@ -44,8 +44,14 @@ export const recordCourseVisit = (courseId, timestamp = Date.now()) => {
 // stable sort leaves them in whatever order the caller passed them in.
 export const compareCoursesByLastVisit = (a = {}, b = {}, visits = {}) => (visits[b.courseId] || 0) - (visits[a.courseId] || 0);
 
-// "oldest" and "newest" have no comparator here — there is no timestamp for
-// classroom-course membership, only array position. "oldest" is the order the
+// Every order the classroom courses dropdown offers. Anything else — a stale
+// preference from an older release, or a hand-edited value — is treated as
+// "default" rather than leaving the dropdown showing a blank label.
+export const COURSE_SORT_ORDERS = ["default", "newest", "alphabetical", "recentlyChanged", "recentlyViewed"];
+export const normalizeCourseSortOrder = order => COURSE_SORT_ORDERS.includes(order) ? order : "default";
+
+// "default" and "newest" have no comparator here — there is no timestamp for
+// classroom-course membership, only array position. "default" is the order the
 // courses arrive in from Dynamo, so callers leave the array untouched; "newest"
 // is that same array reversed.
 // "recentlyViewed" needs the visits map, so it has its own comparator above.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nualang/nualang-ui-components",
-  "version": "0.1.1418",
+  "version": "0.1.1419",
   "type": "module",
   "main": "dist/index.js",
   "files": [