Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #55 from openedx/abdullah/paragon-status-alert-dep…
Browse files Browse the repository at this point in the history
…recation

Paragon StatusAlert deprecation
  • Loading branch information
ashultz0 authored Nov 17, 2022
2 parents 4e48407 + 127e30d commit af17366
Show file tree
Hide file tree
Showing 7 changed files with 168 additions and 420 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"precommit": "npm run lint",
"snapshot": "fedx-scripts jest --updateSnapshot",
"start": "fedx-scripts webpack-dev-server --progress",
"test": "fedx-scripts jest --coverage --passWithNoTests",
"test": "TZ=GMT fedx-scripts jest --coverage --passWithNoTests",
"coveralls": "cat ./coverage/lcov.info | coveralls",
"travis-deploy-once": "travis-deploy-once",
"snapshot": "fedx-scripts jest --updateSnapshot"
Expand Down
77 changes: 38 additions & 39 deletions src/console/ConsolePage.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
Collapsible,
Pagination,
SearchField,
StatusAlert,
Alert,
} from '@edx/paragon';

import {
Expand Down Expand Up @@ -113,32 +113,31 @@ export class ConsolePage extends React.Component {
return (
<div className="container half-width-element py-5 align-items-start">
<h1>Program Console</h1>
<StatusAlert
alertType="danger"
<Alert
variant="danger"
dismissible={false}
dialog={(
<div>
<p>
An error was encountered while loading your program list: <em>{`${this.props.loadingError}`}</em>
</p>
<p>
Please try waiting a moment and then refreshing the page.
If the issue persists, please reach out to <a href="mailto:[email protected]">[email protected]</a>.
</p>
</div>
)}
open={!!this.props.loadingError}
/>
<StatusAlert
dismissible={false}
dialog={(
show={!!this.props.loadingError}
>
<div>
<p>
An error was encountered while loading your program list: <em>{`${this.props.loadingError}`}</em>
</p>
<p>
It appears you do not have proper permissions to access this application.
Please reach out to <a href="mailto:[email protected]">[email protected]</a> requesting access to the Registrar service.
Please try waiting a moment and then refreshing the page.
If the issue persists, please reach out to <a href="mailto:[email protected]">[email protected]</a>.
</p>
)}
open={!this.props.authorized && !this.props.loadingError}
/>
</div>
</Alert>
<Alert
dismissible={false}
show={!this.props.authorized && !this.props.loadingError}
variant="warning"
>
<p>
It appears you do not have proper permissions to access this application.
Please reach out to <a href="mailto:[email protected]">[email protected]</a> requesting access to the Registrar service.
</p>
</Alert>
{this.props.data.length > 0 && (
<div>
<SearchField
Expand All @@ -147,14 +146,15 @@ export class ConsolePage extends React.Component {
onClear={() => this.handleFilter('')}
placeholder="Filter by Program Title"
/>
<StatusAlert
<Alert
className="mt-2"
alertType="danger"
variant="danger"
dismissible
dialog="Invalid program title."
open={!!this.props.filterError}
show={!!this.props.filterError}
data-testid="filter-alert"
/>
>
<p>Invalid program title.</p>
</Alert>
<Pagination
className="mt-4"
paginationLabel="pagination navigation"
Expand All @@ -168,19 +168,18 @@ export class ConsolePage extends React.Component {
{this.props.programBanners[program.programKey]
&& !!this.props.programBanners[program.programKey].length
&& this.props.programBanners[program.programKey].map(banner => (
<StatusAlert
<Alert
dismissible
open
show
key={banner.id}
alertType={banner.bannerType}
variant={banner.bannerType}
onClose={() => this.props.removeBanner(program.programKey, banner.id)}
dialog={(
<div className="modal-alert">
{`${banner.message} `}
{banner.linkMessage && <a href={banner.linkHref} target="_blank" rel="noopener noreferrer">{banner.linkMessage}</a>}
</div>
)}
/>
>
<div className="modal-alert">
{`${banner.message} `}
{banner.linkMessage && <a href={banner.linkHref} target="_blank" rel="noopener noreferrer">{banner.linkMessage}</a>}
</div>
</Alert>
))}
{program.areEnrollmentsWritable && this.renderEnrollmentsCollapsible(program)}
{program.areReportsReadable
Expand Down
4 changes: 2 additions & 2 deletions src/console/ConsolePage.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -235,8 +235,8 @@ describe('ConsolePage', () => {
const tree = renderer.create(consolePageComponent).toJSON();

expect(tree).toMatchSnapshot();
expect(wrapper.find('.alert-danger.show .alert-dialog').at(0).text()).toEqual('Sorry something went wrong ');
expect(wrapper.find('.alert-success.show .alert-dialog').at(0).text()).toEqual('You did it! ');
expect(wrapper.find('.alert-danger.show .modal-alert').at(0).text()).toEqual('Sorry something went wrong ');
expect(wrapper.find('.alert-success.show .modal-alert').at(0).text()).toEqual('You did it! ');

wrapper.unmount();
});
Expand Down
Loading

0 comments on commit af17366

Please sign in to comment.