Skip to content

add a loading state to DashboardCard #2216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 29, 2025
Merged

add a loading state to DashboardCard #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7238eb0
add a loading state to DashboardCard
gumaerc Apr 28, 2025
922a443
properly check if startDate is set on the run
gumaerc Apr 28, 2025
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
134 changes: 68 additions & 66 deletions frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/DashboardCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -247,6 +254,7 @@ type DashboardCardProps = {
courseNoun?: string
offerUpgrade?: boolean
contextMenuItems?: SimpleMenuItem[]
isLoading?: boolean
}
const DashboardCard: React.FC<DashboardCardProps> = ({
dashboardResource,
Expand All @@ -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} />
) : run.startDate ? (
<CourseStartCountdown startDate={run.startDate} />
) : null
const menuItems = contextMenuItems.concat(getDefaultContextMenuItems(title))
const contextMenu = (
const contextMenu = isLoading ? (
<Skeleton variant="rectangular" width={12} height={24} />
) : (
<SimpleMenu
items={menuItems}
trigger={
Expand All @@ -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>
)
Expand All @@ -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>
Expand All @@ -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>
Expand Down
7 changes: 6 additions & 1 deletion frontends/main/src/app-pages/DashboardPage/CoursewareDisplay/EnrollmentDisplay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -140,6 +142,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
Component="li"
dashboardResource={course}
showNotComplete={false}
isLoading={isLoading}
/>
))}
</EnrollmentsList>
Expand All @@ -151,6 +154,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
Component="li"
dashboardResource={course}
showNotComplete={false}
isLoading={isLoading}
/>
))}
</HiddenEnrollmentsList>
Expand All @@ -165,7 +169,7 @@ const EnrollmentExpandCollapse: React.FC<EnrollmentExpandCollapseProps> = ({
}

const EnrollmentDisplay = () => {
const { data: enrolledCourses } = useQuery({
const { data: enrolledCourses, isLoading } = useQuery({
...enrollmentQueries.coursesList(),
select: mitxonlineEnrollments,
})
Expand All @@ -192,6 +196,7 @@ const EnrollmentDisplay = () => {
<EnrollmentExpandCollapse
shownEnrollments={shownEnrollments}
hiddenEnrollments={expired}
isLoading={isLoading}
/>
</Wrapper>
)
Expand Down
Loading