From 7238eb0ca00b428e41ed8d6c34d932c4bc2fea90 Mon Sep 17 00:00:00 2001
From: Carey Gumaer <gumaerc@mit.edu>
Date: Mon, 28 Apr 2025 16:04:59 -0400
Subject: [PATCH 1/2] add a loading state to DashboardCard

---
 .../CoursewareDisplay/DashboardCard.tsx       | 134 +++++++++---------
 .../CoursewareDisplay/EnrollmentDisplay.tsx   |   7 +-
 2 files changed, 74 insertions(+), 67 deletions(-)

diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
index 27dfc2d114..763586a4e9 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
@@ -1,5 +1,12 @@
 import React from "react"
-import { styled, Link, SimpleMenu, SimpleMenuItem, Stack } from "ol-components"
+import {
+  styled,
+  Link,
+  SimpleMenu,
+  SimpleMenuItem,
+  Stack,
+  Skeleton,
+} from "ol-components"
 import NextLink from "next/link"
 import { EnrollmentStatus, EnrollmentMode } from "./types"
 import type { DashboardCourse } from "./types"
@@ -247,6 +254,7 @@ type DashboardCardProps = {
   courseNoun?: string
   offerUpgrade?: boolean
   contextMenuItems?: SimpleMenuItem[]
+  isLoading?: boolean
 }
 const DashboardCard: React.FC<DashboardCardProps> = ({
   dashboardResource,
@@ -256,10 +264,62 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
   courseNoun = "Course",
   offerUpgrade = true,
   contextMenuItems = [],
+  isLoading = false,
 }) => {
   const { title, marketingUrl, enrollment, run } = dashboardResource
+  const titleSection = isLoading ? (
+    <>
+      <Skeleton variant="text" width="95%" height={16} />
+      <Skeleton variant="text" width={120} height={16} />
+      <Skeleton variant="text" width={120} height={16} />
+    </>
+  ) : (
+    <>
+      <TitleLink size="medium" color="black" href={marketingUrl}>
+        {title}
+      </TitleLink>
+      {enrollment?.status === EnrollmentStatus.Completed ? (
+        <SubtitleLink href="#">
+          {<RiAwardLine size="16px" />}
+          View Certificate
+        </SubtitleLink>
+      ) : null}
+      {enrollment?.mode !== EnrollmentMode.Verified && offerUpgrade ? (
+        <UpgradeBanner
+          data-testid="upgrade-root"
+          canUpgrade={run.canUpgrade}
+          certificateUpgradeDeadline={run.certificateUpgradeDeadline}
+          certificateUpgradePrice={run.certificateUpgradePrice}
+        />
+      ) : null}
+    </>
+  )
+  const buttonSection = isLoading ? (
+    <Skeleton variant="rectangular" width={120} height={32} />
+  ) : (
+    <>
+      <EnrollmentStatusIndicator
+        status={enrollment?.status}
+        showNotComplete={showNotComplete}
+      />
+      <CoursewareButton
+        data-testid="courseware-button"
+        startDate={run.startDate}
+        href={run.coursewareUrl}
+        endDate={run.endDate}
+        courseNoun={courseNoun}
+      />
+    </>
+  )
+  const startDateSection = isLoading ? (
+    <Skeleton variant="text" width={100} height={24} />
+  ) : (
+    <CourseStartCountdown startDate={run.startDate} />
+  )
   const menuItems = contextMenuItems.concat(getDefaultContextMenuItems(title))
-  const contextMenu = (
+  const contextMenu = isLoading ? (
+    <Skeleton variant="rectangular" width={12} height={24} />
+  ) : (
     <SimpleMenu
       items={menuItems}
       trigger={
@@ -277,42 +337,14 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
       className={className}
     >
       <Stack justifyContent="start" alignItems="stretch" gap="8px" flex={1}>
-        <TitleLink size="medium" color="black" href={marketingUrl}>
-          {title}
-        </TitleLink>
-        {enrollment?.status === EnrollmentStatus.Completed ? (
-          <SubtitleLink href="#">
-            {<RiAwardLine size="16px" />}
-            View Certificate
-          </SubtitleLink>
-        ) : null}
-        {enrollment?.mode !== EnrollmentMode.Verified && offerUpgrade ? (
-          <UpgradeBanner
-            data-testid="upgrade-root"
-            canUpgrade={run.canUpgrade}
-            certificateUpgradeDeadline={run.certificateUpgradeDeadline}
-            certificateUpgradePrice={run.certificateUpgradePrice}
-          />
-        ) : null}
+        {titleSection}
       </Stack>
       <Stack gap="8px">
         <Stack direction="row" gap="8px" alignItems="center">
-          <EnrollmentStatusIndicator
-            status={enrollment?.status}
-            showNotComplete={showNotComplete}
-          />
-          <CoursewareButton
-            data-testid="courseware-button"
-            startDate={run.startDate}
-            href={run.coursewareUrl}
-            endDate={run.endDate}
-            courseNoun={courseNoun}
-          />
+          {buttonSection}
           {contextMenu}
         </Stack>
-        {run.startDate ? (
-          <CourseStartCountdown startDate={run.startDate} />
-        ) : null}
+        {startDateSection}
       </Stack>
     </CardRoot>
   )
@@ -332,23 +364,7 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
         width="100%"
       >
         <Stack direction="column" gap="8px" flex={1}>
-          <TitleLink size="medium" color="black" href={marketingUrl}>
-            {title}
-          </TitleLink>
-          {enrollment?.status === EnrollmentStatus.Completed ? (
-            <SubtitleLink href="#">
-              {<RiAwardLine size="16px" />}
-              View Certificate
-            </SubtitleLink>
-          ) : null}
-          {enrollment?.mode !== EnrollmentMode.Verified && offerUpgrade ? (
-            <UpgradeBanner
-              data-testid="upgrade-root"
-              canUpgrade={run.canUpgrade}
-              certificateUpgradeDeadline={run.certificateUpgradeDeadline}
-              certificateUpgradePrice={run.certificateUpgradePrice}
-            />
-          ) : null}
+          {titleSection}
         </Stack>
         {contextMenu}
       </Stack>
@@ -358,23 +374,9 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
         justifyContent="space-between"
         width="100%"
       >
-        {run.startDate ? (
-          <Stack justifyContent="start">
-            <CourseStartCountdown startDate={run.startDate} />
-          </Stack>
-        ) : null}
+        {startDateSection}
         <Stack direction="row" gap="8px" alignItems="center">
-          <EnrollmentStatusIndicator
-            status={enrollment?.status}
-            showNotComplete={showNotComplete}
-          />
-          <CoursewareButton
-            data-testid="courseware-button"
-            startDate={run.startDate}
-            href={run.coursewareUrl}
-            endDate={run.endDate}
-            courseNoun={courseNoun}
-          />
+          {buttonSection}
         </Stack>
       </Stack>
     </CardRoot>
diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
index c38600e53c..ec1bc1ceda 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
@@ -118,11 +118,13 @@ const sortEnrollments = (resources: DashboardCourse[]) => {
 interface EnrollmentExpandCollapseProps {
   shownEnrollments: DashboardCourse[]
   hiddenEnrollments: DashboardCourse[]
+  isLoading?: boolean
 }
 
 const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
   shownEnrollments,
   hiddenEnrollments,
+  isLoading,
 }) => {
   const [shown, setShown] = React.useState(false)
 
@@ -140,6 +142,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
             Component="li"
             dashboardResource={course}
             showNotComplete={false}
+            isLoading={isLoading}
           />
         ))}
       </EnrollmentsList>
@@ -151,6 +154,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
               Component="li"
               dashboardResource={course}
               showNotComplete={false}
+              isLoading={isLoading}
             />
           ))}
         </HiddenEnrollmentsList>
@@ -165,7 +169,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
 }
 
 const EnrollmentDisplay = () => {
-  const { data: enrolledCourses } = useQuery({
+  const { data: enrolledCourses, isLoading } = useQuery({
     ...enrollmentQueries.coursesList(),
     select: mitxonlineEnrollments,
   })
@@ -192,6 +196,7 @@ const EnrollmentDisplay = () => {
       <EnrollmentExpandCollapse
         shownEnrollments={shownEnrollments}
         hiddenEnrollments={expired}
+        isLoading={isLoading}
       />
     </Wrapper>
   )

From 922a4431299c6dcaf1280a2c0c26ac42e5607baa Mon Sep 17 00:00:00 2001
From: Carey Gumaer <gumaerc@mit.edu>
Date: Mon, 28 Apr 2025 17:16:43 -0400
Subject: [PATCH 2/2] properly check if startDate is set on the run

---
 .../DashboardPage/CoursewareDisplay/DashboardCard.tsx         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
index 763586a4e9..5b59e4e1d1 100644
--- a/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
+++ b/frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
@@ -313,9 +313,9 @@ const DashboardCard: React.FC<DashboardCardProps> = ({
   )
   const startDateSection = isLoading ? (
     <Skeleton variant="text" width={100} height={24} />
-  ) : (
+  ) : run.startDate ? (
     <CourseStartCountdown startDate={run.startDate} />
-  )
+  ) : null
   const menuItems = contextMenuItems.concat(getDefaultContextMenuItems(title))
   const contextMenu = isLoading ? (
     <Skeleton variant="rectangular" width={12} height={24} />