Skip to content

Migrate off the legacy MUI Grid API (prerequisite for #2770) #3867

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
ChristopherChudzicki merged 2 commits into from
Sep 4, 2026
Merged

Migrate off the legacy MUI Grid API (prerequisite for #2770) #3867

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
1012106
refactor(mui): migrate off the legacy MUI Grid API
ChristopherChudzicki Aug 31, 2026
1c56ddb
refactor(mui): drop the no-op grid wrapper left by GridContainer
ChristopherChudzicki Aug 31, 2026
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
2 changes: 1 addition & 1 deletion frontends/main/src/app-pages/DashboardPage/ProfileContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ const ProfileContent: React.FC = () => {
xs: 3,
},
}}
gridItemProps={{ xs: 3 }}
gridItemProps={{ size: 3 }}
/>
<CheckboxChoiceField
name="goals"
Expand Down
83 changes: 35 additions & 48 deletions frontends/main/src/app-pages/LearningPathListingPage/LearningPathListingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import React, { useCallback, useMemo } from "react"
import {
SimpleMenu,
Grid,
Grid2 as Grid,
LoadingSpinner,
BannerPage,
Container,
Expand All @@ -20,8 +20,6 @@ import { RiPencilFill, RiMore2Line, RiDeleteBinLine } from "@remixicon/react"
import type { LearningPathResource } from "api"
import { useLearningPathsList } from "api/hooks/learningPaths"

import { GridColumn, GridContainer } from "@/components/GridLayout/GridLayout"

import { manageListDialogs } from "@/page-components/ManageListDialogs/ManageListDialogs"
import * as urls from "@/common/urls"
import { useUserMe } from "api/hooks/user"
Expand Down Expand Up @@ -85,51 +83,40 @@ const LearningPathListingPage: React.FC = () => {
className="learningpaths-page"
>
<Container maxWidth="md" style={{ paddingBottom: 100 }}>
<GridContainer>
<GridColumn variant="single-full">
<ListHeaderGrid container justifyContent="space-between">
<Grid item>
<Typography variant="h3" component="h1">
Learning Paths
</Typography>
</Grid>
<Grid
item
justifyContent="flex-end"
alignItems="center"
display="flex"
>
{canEdit ? (
<Button variant="primary" onClick={handleCreate}>
Create new list
</Button>
) : null}
</Grid>
</ListHeaderGrid>
<section>
<LoadingSpinner loading={listingQuery.isLoading} />
{listingQuery.data && (
<PlainList itemSpacing={3}>
{listingQuery.data.results?.map((resource) => {
return (
<li key={resource.id}>
<LearningResourceListCard
resource={resource}
href={urls.learningPathsView(resource.id)}
editMenu={
canEdit ? (
<EditListMenu resource={resource} />
) : null
}
/>
</li>
)
})}
</PlainList>
)}
</section>
</GridColumn>
</GridContainer>
<ListHeaderGrid container justifyContent="space-between">
<Grid>
<Typography variant="h3" component="h1">
Learning Paths
</Typography>
</Grid>
<Grid justifyContent="flex-end" alignItems="center" display="flex">
{canEdit ? (
<Button variant="primary" onClick={handleCreate}>
Create new list
</Button>
) : null}
</Grid>
</ListHeaderGrid>
<section>
<LoadingSpinner loading={listingQuery.isLoading} />
{listingQuery.data && (
<PlainList itemSpacing={3}>
{listingQuery.data.results?.map((resource) => {
return (
<li key={resource.id}>
<LearningResourceListCard
resource={resource}
href={urls.learningPathsView(resource.id)}
editMenu={
canEdit ? <EditListMenu resource={resource} /> : null
}
/>
</li>
)
})}
</PlainList>
)}
</section>
</Container>
</BannerPage>
)
Expand Down
2 changes: 1 addition & 1 deletion frontends/main/src/app-pages/OnboardingPage/OnboardingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ const GridStyle = (
columns: columns,
maxWidth: maxWidth,
},
gridItemProps: { xs: 3 },
gridItemProps: { size: 3 },
}
}

Expand Down
68 changes: 0 additions & 68 deletions frontends/main/src/components/GridLayout/GridLayout.tsx
View file
Open in desktop

This file was deleted.

149 changes: 73 additions & 76 deletions frontends/main/src/page-components/ItemsListing/ItemsListingComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from "react"
import { Grid, Typography, styled } from "ol-components"
import { Grid2 as Grid, Typography, styled } from "ol-components"
import { Button, ButtonLink } from "@mitodl/smoot-design"
import { RiArrowLeftLine, RiArrowUpDownLine } from "@remixicon/react"
import { useToggle, pluralize } from "ol-utilities"
import { GridColumn, GridContainer } from "@/components/GridLayout/GridLayout"
import ItemsListing from "./ItemsListing"
import type { LearningResourceListItem } from "./ItemsListing"
import { MY_LISTS } from "@/common/urls"
Expand Down Expand Up @@ -84,83 +83,81 @@ const ItemsListingComponent: React.FC<ItemsListingComponentProps> = ({
const count = list?.item_count

return (
<GridContainer>
<GridColumn variant="single-full">
<Grid container>
<Grid
item
container
alignItems="center"
justifyContent="space-between"
marginBottom="24px"
>
<Grid item>
<ButtonLink
href={MY_LISTS}
variant="tertiary"
startIcon={<RiArrowLeftLine />}
<>
<Grid container>
<Grid
container
size={12}
alignItems="center"
justifyContent="space-between"
marginBottom="24px"
>
<Grid>
<ButtonLink
href={MY_LISTS}
variant="tertiary"
startIcon={<RiArrowLeftLine />}
>
My Lists
</ButtonLink>
</Grid>
</Grid>
<Grid
container
size={12}
alignItems="center"
justifyContent="space-between"
marginBottom="24px"
>
<HeaderGrid>
<HeaderText>{list?.title}</HeaderText>
{list?.description && (
<DescriptionText>{list.description}</DescriptionText>
)}
</HeaderGrid>
<HeaderGrid alignSelf="flex-start">
{canEdit ? (
<EditButton variant="primary" onClick={handleEdit}>
Edit List
</EditButton>
) : null}
</HeaderGrid>
</Grid>
<ReorderGrid
container
size={12}
alignItems="center"
justifyContent="space-between"
>
<Grid>
{showSort && !!items.length && (
<Button
variant="text"
disabled={count === 0}
startIcon={isSorting ? undefined : <RiArrowUpDownLine />}
onClick={toggleIsSorting.toggle}
>
My Lists
</ButtonLink>
</Grid>
{isSorting ? "Done ordering" : "Reorder"}
</Button>
)}
</Grid>
<Grid
item
container
alignItems="center"
justifyContent="space-between"
marginBottom="24px"
>
<HeaderGrid item>
<HeaderText>{list?.title}</HeaderText>
{list?.description && (
<DescriptionText>{list.description}</DescriptionText>
)}
</HeaderGrid>
<HeaderGrid item alignSelf="flex-start">
{canEdit ? (
<EditButton variant="primary" onClick={handleEdit}>
Edit List
</EditButton>
) : null}
</HeaderGrid>
<Grid>
{count !== undefined && count > 0 ? (
<CountText>{`${count} ${pluralize("item", count)}`}</CountText>
) : null}
</Grid>
<ReorderGrid
item
container
alignItems="center"
justifyContent="space-between"
>
<Grid item>
{showSort && !!items.length && (
<Button
variant="text"
disabled={count === 0}
startIcon={isSorting ? undefined : <RiArrowUpDownLine />}
onClick={toggleIsSorting.toggle}
>
{isSorting ? "Done ordering" : "Reorder"}
</Button>
)}
</Grid>
<Grid item>
{count !== undefined && count > 0 ? (
<CountText>{`${count} ${pluralize("item", count)}`}</CountText>
) : null}
</Grid>
</ReorderGrid>
</Grid>
<ItemsListing
listType={listType}
items={items}
isLoading={isLoading}
isRefetching={isFetching}
sortable={isSorting}
emptyMessage="There are no items in this list yet."
condensed={condensed}
/>
</GridColumn>
</GridContainer>
</ReorderGrid>
</Grid>
<ItemsListing
listType={listType}
items={items}
isLoading={isLoading}
isRefetching={isFetching}
sortable={isSorting}
emptyMessage="There are no items in this list yet."
condensed={condensed}
/>
</>
)
}

Expand Down
4 changes: 2 additions & 2 deletions frontends/ol-components/src/components/ChoiceBox/ChoiceBox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from "react"
import styled from "@emotion/styled"
import { type GridProps } from "@mui/material/Grid"
import { type Grid2Props } from "@mui/material/Grid2"
import { Checkbox } from "@mitodl/smoot-design"
import { Radio } from "../Radio/Radio"

Expand Down Expand Up @@ -110,7 +110,7 @@ interface ChoiceBoxChoice {
description?: string
}

type FieldGridProps = Omit<GridProps, "container" | "item">
type FieldGridProps = Omit<Grid2Props, "container">

interface ChoiceBoxGridProps {
gridProps?: FieldGridProps
Expand Down
Loading
Loading