Skip to content

fix: allow page grid to take plugin slot id instead #994

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
leangseu-edx merged 4 commits into from
May 13, 2024
Merged

fix: allow page grid to take plugin slot id instead #994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
103d294
fix: allow page grid to take plugin slot id instead
leangseu-edx May 10, 2024
adc9919
chore: add config check
leangseu-edx May 10, 2024
f7b4868
chore: linting
leangseu-edx May 10, 2024
aed9041
chore: variable more readable
leangseu-edx May 13, 2024
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
22 changes: 13 additions & 9 deletions src/pages-and-resources/PagesAndResources.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useContext, useEffect, Suspense } from 'react';
import PropTypes from 'prop-types';
import { getConfig } from '@edx/frontend-platform';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { PageWrap, AppContext } from '@edx/frontend-platform/react';

Expand Down Expand Up @@ -64,6 +65,8 @@ const PagesAndResources = ({ courseId, intl }) => {
);
}

const hasAdditionalCoursePlugin = getConfig()?.pluginSlots?.additional_course_plugin != null;

return (
<PagesAndResourcesProvider courseId={courseId}>
<main className="container container-mw-md px-3">
Expand All @@ -86,16 +89,17 @@ const PagesAndResources = ({ courseId, intl }) => {
<Route path=":appId/settings" element={<PageWrap><Suspense fallback="..."><SettingsComponent url={redirectUrl} /></Suspense></PageWrap>} />
</Routes>

<PageGrid pages={pages} />
<PageGrid pages={pages} pluginSlotId="additional_course_plugin" />
{
(contentPermissionsPages.length > 0) && (
<>
<div className="d-flex justify-content-between my-4 my-md-5 align-items-center">
<h3 className="m-0">{intl.formatMessage(messages.contentPermissions)}</h3>
</div>
<PageGrid pages={contentPermissionsPages} />
</>
)
(contentPermissionsPages.length > 0 || hasAdditionalCoursePlugin)
&& (
<>
<div className="d-flex justify-content-between my-4 my-md-5 align-items-center">
<h3 className="m-0">{intl.formatMessage(messages.contentPermissions)}</h3>
</div>
<PageGrid pages={contentPermissionsPages} pluginSlotId="additional_course_content_plugin" />
</>
)
}
</main>
</PagesAndResourcesProvider>
Expand Down
9 changes: 7 additions & 2 deletions src/pages-and-resources/pages/PageGrid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { CardGrid } from '@openedx/paragon';
import { PluginSlot } from '@openedx/frontend-plugin-framework';
import PageCard, { CoursePageShape } from './PageCard';

const PageGrid = ({ pages }) => (
const PageGrid = ({ pages, pluginSlotId }) => (
<CardGrid columnSizes={{
xs: 12,
sm: 6,
Expand All @@ -16,12 +16,17 @@ const PageGrid = ({ pages }) => (
{pages.map((page) => (
<PageCard page={page} key={page.id} />
))}
<PluginSlot id="additional_course_plugin" />
{pluginSlotId && <PluginSlot id={pluginSlotId} />}
</CardGrid>
);

PageGrid.defaultProps = {
pluginSlotId: null,
};

PageGrid.propTypes = {
pages: PropTypes.arrayOf(CoursePageShape.isRequired).isRequired,
pluginSlotId: PropTypes.string,
};

export default injectIntl(PageGrid);