rebase with main

Author: Ahtesham Quraish

Dockerfile

@@ -76,4 +76,4 @@ USER mitodl
 
 EXPOSE 8061
 ENV PORT 8061
-CMD ["sh", "-c", "exec granian --interface asginl --host 0.0.0.0 --port 8061 --workers ${GRANIAN_WORKERS:-3} --blocking-threads 1 main.asgi:application"]
+CMD ["sh", "-c", "exec granian --interface asginl --reload --host 0.0.0.0 --port 8061 --workers ${GRANIAN_WORKERS:-3} --blocking-threads 1 main.asgi:application"]

RELEASE.rst

@@ -1,6 +1,47 @@
 Release Notes
 =============
 
+Version 0.68.3 (Released May 19, 2026)
+--------------
+
+- fix: link the podcast episode to its detail page and fix the video count on collection page (#3345)
+
+Version 0.68.2 (Released May 19, 2026)
+--------------
+
+- feat: add video embed page and route group restructure (#3327)
+- dashboard refactor: useHomeDashboardData (#3342)
+- fix: add heading tags to B2B org section (#3347)
+- fix: certificate page being indexed in google search (#3348)
+- Granian reload for local dev (#3351)
+
+Version 0.68.1 (Released May 19, 2026)
+--------------
+
+- split EnrollmentDisplay into HomeEnrollmentsDisplay + ProgramEnrollMentDisplay… (#3341)
+- Remove enrollment-dashboard feature flag (#3343)
+- feat: Added Program Record Link to Learn Dashboard Program Card . (#3336)
+- Update dependency drf-spectacular to >=0.29,<0.30 (#2734)
+
+Version 0.68.0 (Released May 13, 2026)
+--------------
+
+- fix open textbooks (#3337)
+- youtube etl should not unpublish ovs (#3334)
+- dashboard refactor stage 2 (#3330)
+- Adds a feature flag to link ocw course urls to corresponding learn urls (/courses/o/*) (#3263)
+- Min score for vector learning resources endpoint (#3285)
+- Update dependency granian to v2.7.4 [SECURITY] (#3309)
+- Update dependency litellm to v1.83.10 [SECURITY] (#3331)
+- Update dependency urllib3 to v2.7.0 [SECURITY] (#3329)
+
+Version 0.67.2 (Released May 12, 2026)
+--------------
+
+- feat: display MicroMasters® label on MITxOnline program product pages (#3318)
+- fix: add sitemap for video and podcast page (#3323)
+- Show (and count) only published items in userlists/paths (#3321)
+
 Version 0.67.1 (Released May 11, 2026)
 --------------
 

frontends/api/src/generated/v0/api.ts

@@ -35,12 +35,9 @@ import { ErrorContent } from "../ErrorPage/ErrorPageTemplate"
 import { matchOrganizationBySlug } from "@/common/utils"
 import { ResourceType, getKey } from "./CoursewareDisplay/helpers"
 import {
-  getCourseRunForSelectedLanguage,
-  getDistinctLanguageOptions,
-  getResolvedRunForSelectedLanguage,
-  getSelectedLanguageOption,
-  selectBestContractEnrollmentForLanguage,
-} from "./CoursewareDisplay/languageOptions"
+  getDistinctDashboardLanguageOptions,
+  resolveSlotForLanguage,
+} from "./CoursewareDisplay/model/dashboardViewModel"
 import UnstyledRawHTML from "@/components/UnstyledRawHTML/UnstyledRawHTML"
 
 const HeaderRoot = styled.div(({ theme }) => ({
@@ -159,7 +156,9 @@ const WelcomeMessage: React.FC<{ contract?: ContractPage }> = ({
   return (
     <Stack gap="12px" paddingTop="40px" paddingBottom="24px">
       <Stack direction="row" justifyContent="space-between" alignItems="center">
-        <Typography variant="h5">{welcomeMessage}</Typography>
+        <Typography variant="h5" component="h2">
+          {welcomeMessage}
+        </Typography>
         <Link
           scroll={false}
           color="red"
@@ -398,54 +397,36 @@ const OrgProgramCollectionDisplay: React.FC<{
             enrollments?.filter(
               (enrollment) => enrollment.b2b_contract_id === contract.id,
             ) ?? []
-          // Prefer the user's existing enrollment for the selected language
-          // over the next/best run, so older-run enrollments stay visible
-          // when the contract surfaces a newer run.
-          const selectedLanguageEnrollment =
-            selectBestContractEnrollmentForLanguage(
-              course,
-              contractEnrollments,
-              selectedLanguageKey,
-            )
-          const selectedLanguageOption = getSelectedLanguageOption(
+          const { displayedEnrollment, displayedRun } = resolveSlotForLanguage(
             course,
+            contractEnrollments,
             selectedLanguageKey,
+            { contractId: contract.id },
           )
-          const selectedRun = selectedLanguageEnrollment
-            ? ((course.courseruns ?? []).find(
-                (r) => r.id === selectedLanguageEnrollment.run.id,
-              ) ?? null)
-            : getCourseRunForSelectedLanguage(course, selectedLanguageKey)
-          const resolvedRun = getResolvedRunForSelectedLanguage(
-            course,
-            selectedLanguageOption,
-            selectedRun,
-            selectedLanguageEnrollment,
-            contract.id,
-          )
+
+          const resource = displayedEnrollment
+            ? {
+                type: DashboardType.CourseRunEnrollment,
+                data: displayedEnrollment,
+              }
+            : { type: DashboardType.Course, data: course }
+
           return (
             <DashboardCardStyled
               Component="li"
               key={getKey({
                 resourceType: ResourceType.Course,
                 id: course.id,
-                runId: selectedLanguageEnrollment?.run.id ?? resolvedRun?.id,
+                runId: displayedEnrollment?.run.id ?? displayedRun?.id,
               })}
-              resource={
-                selectedLanguageEnrollment
-                  ? {
-                      type: DashboardType.CourseRunEnrollment,
-                      data: selectedLanguageEnrollment,
-                    }
-                  : { type: DashboardType.Course, data: course }
-              }
+              resource={resource}
               noun="Module"
               offerUpgrade={false}
               buttonHref={
-                selectedLanguageEnrollment?.run.courseware_url ??
-                resolvedRun?.courseware_url
+                displayedEnrollment?.run.courseware_url ??
+                displayedRun?.courseware_url
               }
-              selectedCourseRun={resolvedRun}
+              selectedCourseRun={displayedRun}
               contractId={contract.id}
             />
           )
@@ -526,56 +507,37 @@ const OrgProgramDisplay: React.FC<{
                 courseRunEnrollments?.filter(
                   (enrollment) => enrollment.b2b_contract_id === contract?.id,
                 ) ?? []
-              // Prefer the user's existing enrollment for the selected
-              // language over the next/best run, so older-run enrollments
-              // stay visible when the contract surfaces a newer run.
-              const selectedLanguageEnrollment =
-                selectBestContractEnrollmentForLanguage(
+              const { displayedEnrollment, displayedRun } =
+                resolveSlotForLanguage(
                   course,
                   contractEnrollments,
                   selectedLanguageKey,
+                  { contractId: contract?.id },
                 )
-              const selectedLanguageOption = getSelectedLanguageOption(
-                course,
-                selectedLanguageKey,
-              )
-              const selectedRun = selectedLanguageEnrollment
-                ? ((course.courseruns ?? []).find(
-                    (r) => r.id === selectedLanguageEnrollment.run.id,
-                  ) ?? null)
-                : getCourseRunForSelectedLanguage(course, selectedLanguageKey)
-              const resolvedRun = getResolvedRunForSelectedLanguage(
-                course,
-                selectedLanguageOption,
-                selectedRun,
-                selectedLanguageEnrollment,
-                contract?.id,
-              )
+
+              const resource = displayedEnrollment
+                ? {
+                    type: DashboardType.CourseRunEnrollment,
+                    data: displayedEnrollment,
+                  }
+                : { type: DashboardType.Course, data: course }
 
               return (
                 <DashboardCardStyled
                   Component="li"
                   key={getKey({
                     resourceType: ResourceType.Course,
                     id: course.id,
-                    runId:
-                      selectedLanguageEnrollment?.run.id ?? resolvedRun?.id,
+                    runId: displayedEnrollment?.run.id ?? displayedRun?.id,
                   })}
-                  resource={
-                    selectedLanguageEnrollment
-                      ? {
-                          type: DashboardType.CourseRunEnrollment,
-                          data: selectedLanguageEnrollment,
-                        }
-                      : { type: DashboardType.Course, data: course }
-                  }
+                  resource={resource}
                   noun="Module"
                   offerUpgrade={false}
                   buttonHref={
-                    selectedLanguageEnrollment?.run.courseware_url ??
-                    resolvedRun?.courseware_url
+                    displayedEnrollment?.run.courseware_url ??
+                    displayedRun?.courseware_url
                   }
-                  selectedCourseRun={resolvedRun}
+                  selectedCourseRun={displayedRun}
                   contractId={contract?.id}
                 />
               )
@@ -644,8 +606,13 @@ const ContractContentInternal: React.FC<ContractContentInternalProps> = ({
     [coursesQuery.data?.results],
   )
   const languageOptions = React.useMemo(
-    () => getDistinctLanguageOptions(contractCourses),
-    [contractCourses],
+    () =>
+      getDistinctDashboardLanguageOptions(
+        contractCourses,
+        courseRunEnrollmentsQuery.data ?? [],
+        { contractId: contract.id },
+      ),
+    [contract.id, contractCourses, courseRunEnrollmentsQuery.data],
   )
   const [selectedLanguageKey, setSelectedLanguageKey] = React.useState("")
 
@@ -810,7 +777,7 @@ const ContractContentInternal: React.FC<ContractContentInternalProps> = ({
         </ProgramCollectionsList>
         {programsQuery.data?.results.length === 0 && (
           <HeaderRoot>
-            <Typography variant="h3" component="h1">
+            <Typography variant="h3" component="h2">
               No programs found
             </Typography>
           </HeaderRoot>

frontends/main/src/app-pages/DashboardPage/ContractContent.tsx

@@ -2044,6 +2044,46 @@ describe.each([
       )
     })
 
+    test.each([{ useProductPages: false }, { useProductPages: true }])(
+      "Context menu for program enrollment includes Program Record to mitxonline (flag=$useProductPages)",
+      async ({ useProductPages }) => {
+        mockedUseFeatureFlagEnabled.mockReturnValue(useProductPages)
+        setupUserApis()
+
+        const program = mitxonline.factories.programs.simpleProgram({
+          id: 99,
+          readable_id: "program-for-record-test",
+        })
+        const programEnrollment =
+          mitxonline.factories.enrollment.programEnrollmentV3({
+            program,
+          })
+
+        renderWithProviders(
+          <DashboardCard
+            resource={{
+              type: DashboardType.ProgramEnrollment,
+              data: programEnrollment,
+            }}
+          />,
+        )
+
+        const card = getCard()
+        const contextMenuButton = within(card).getByRole("button", {
+          name: "More options",
+        })
+        await user.click(contextMenuButton)
+
+        const programRecordItem = screen.getByRole("menuitem", {
+          name: "Program Record",
+        })
+        expect(programRecordItem).toHaveAttribute(
+          "href",
+          mitxonlineLegacyUrl("/records/99/"),
+        )
+      },
+    )
+
     test.each([{ useProductPages: false }, { useProductPages: true }])(
       "Context menu for course enrollment shows View Details (flag=$useProductPages) using readable_id",
       async ({ useProductPages }) => {

frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.test.tsx

@@ -205,6 +205,13 @@ const getContextMenuItems = (
       })
     }
 
+    menuItems.push({
+      className: "dashboard-card-menu-item",
+      key: "program-record",
+      label: "Program Record",
+      href: mitxonlineLegacyUrl(`/records/${program.id}/`),
+    })
+
     if (
       program.display_mode !== DisplayModeEnum.Course &&
       !isVerifiedEnrollmentMode(resource.data.enrollment_mode)