Skip to content

feat: break up load api to tab specific #740

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
KristinAoki merged 11 commits into from
Dec 19, 2023
Merged

feat: break up load api to tab specific #740

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6da561a
feat: break up load api to tab specific
KristinAoki Dec 11, 2023
8870275
fix: lint errors
KristinAoki Dec 11, 2023
78c041f
chore: update tests
KristinAoki Dec 11, 2023
a526b2f
fix: lint errors
KristinAoki Dec 11, 2023
53bb3d9
chore: increase code coverage
KristinAoki Dec 12, 2023
71ab057
fix: failing test
KristinAoki Dec 12, 2023
fda3ce9
feat: update tests to use executeThunks
KristinAoki Dec 12, 2023
f86d24a
fix: failing tests
KristinAoki Dec 15, 2023
abeb563
chore: remove unused code
KristinAoki Dec 18, 2023
b7d6ca6
Merge branch 'master' into KristinAoki/fix-home-api-time-out
KristinAoki Dec 18, 2023
08eb6d0
fix: lint errors
KristinAoki Dec 18, 2023
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
90 changes: 59 additions & 31 deletions src/studio-home/StudioHome.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import React from 'react';
import {
Button,
Container,
Icon,
Layout,
MailtoLink,
Row,
} from '@edx/paragon';
import { Add as AddIcon } from '@edx/paragon/icons/es5';
import { Add as AddIcon, Error } from '@edx/paragon/icons';
import { injectIntl, intlShape } from '@edx/frontend-platform/i18n';
import { StudioFooter } from '@edx/frontend-component-footer';
import { getConfig } from '@edx/frontend-platform';
Expand All @@ -21,10 +23,12 @@ import VerifyEmailLayout from './verify-email-layout';
import CreateNewCourseForm from './create-new-course-form';
import messages from './messages';
import { useStudioHome } from './hooks';
import AlertMessage from '../generic/alert-message';

const StudioHome = ({ intl }) => {
const {
isLoadingPage,
isFailedLoadingPage,
studioHomeData,
isShowProcessing,
anyQueryIsFailed,
Expand All @@ -34,6 +38,7 @@ const StudioHome = ({ intl }) => {
isShowOrganizationDropdown,
hasAbilityToCreateNewCourse,
setShowNewCourseContainer,
dispatch,
} = useStudioHome();

const {
Expand All @@ -47,6 +52,10 @@ const StudioHome = ({ intl }) => {
function getHeaderButtons() {
const headerButtons = [];

if (isFailedLoadingPage || !userIsActive) {
return headerButtons;
}

if (isShowEmailStaff) {
headerButtons.push(
<MailtoLink to={studioRequestEmail}>{intl.formatMessage(messages.emailStaffBtnText)}</MailtoLink>,
Expand Down Expand Up @@ -93,6 +102,53 @@ const StudioHome = ({ intl }) => {
return (<Loading />);
}

const getMainBody = () => {
if (isFailedLoadingPage) {
return (
<AlertMessage
variant="danger"
description={(
<Row className="m-0 align-items-center">
<Icon src={Error} className="text-danger-500 mr-1" />
<span>{intl.formatMessage(messages.homePageLoadFailedMessage)}</span>
</Row>
)}
/>
);
}
if (!userIsActive) {
return <VerifyEmailLayout />;
}
return (
<Layout
lg={[{ span: 9 }, { span: 3 }]}
md={[{ span: 9 }, { span: 3 }]}
sm={[{ span: 9 }, { span: 3 }]}
xs={[{ span: 9 }, { span: 3 }]}
xl={[{ span: 9 }, { span: 3 }]}
>
<Layout.Element>
<section>
{showNewCourseContainer && (
<CreateNewCourseForm handleOnClickCancel={() => setShowNewCourseContainer(false)} />
)}
{isShowOrganizationDropdown && <OrganizationSection />}
<TabsSection
tabsData={studioHomeData}
showNewCourseContainer={showNewCourseContainer}
onClickNewCourse={() => setShowNewCourseContainer(true)}
isShowProcessing={isShowProcessing}
dispatch={dispatch}
/>
</section>
</Layout.Element>
<Layout.Element>
<HomeSidebar />
</Layout.Element>
</Layout>
);
};

return (
<>
<Header isHiddenMainMenu />
Expand All @@ -101,40 +157,12 @@ const StudioHome = ({ intl }) => {
<article className="studio-home-sub-header">
<section>
<SubHeader
title={intl.formatMessage(messages.headingTitle, { studioShortName })}
title={intl.formatMessage(messages.headingTitle, { studioShortName: studioShortName || 'Studio' })}
headerActions={headerButtons}
/>
</section>
</article>
{!userIsActive ? (
<VerifyEmailLayout />
) : (
<Layout
lg={[{ span: 9 }, { span: 3 }]}
md={[{ span: 9 }, { span: 3 }]}
sm={[{ span: 9 }, { span: 3 }]}
xs={[{ span: 9 }, { span: 3 }]}
xl={[{ span: 9 }, { span: 3 }]}
>
<Layout.Element>
<section>
{showNewCourseContainer && (
<CreateNewCourseForm handleOnClickCancel={() => setShowNewCourseContainer(false)} />
)}
{isShowOrganizationDropdown && <OrganizationSection />}
<TabsSection
tabsData={studioHomeData}
showNewCourseContainer={showNewCourseContainer}
onClickNewCourse={() => setShowNewCourseContainer(true)}
isShowProcessing={isShowProcessing}
/>
</section>
</Layout.Element>
<Layout.Element>
<HomeSidebar />
</Layout.Element>
</Layout>
)}
{getMainBody()}
</section>
</Container>
<div className="alert-toast">
Expand Down
Loading