Skip to content
Merged
Show file tree
Hide file tree
Changes from 17 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
dc82bb2
feat: integrate the v2 endpoints for instructor dashboard certificate…
wgu-jesse-stewart Apr 21, 2026
d0d7732
feat: remove exception and remove invalidation
wgu-jesse-stewart Apr 24, 2026
0a8f79c
fix: remove unused imports and vars
wgu-jesse-stewart Apr 24, 2026
84daed2
fix: tests
wgu-jesse-stewart Apr 24, 2026
7580354
fix: tests
wgu-jesse-stewart Apr 24, 2026
23adf76
feat: expand test coverage
wgu-jesse-stewart Apr 24, 2026
9763743
fix: linting
wgu-jesse-stewart Apr 24, 2026
ff7855e
feat: expand test coverage
wgu-jesse-stewart Apr 24, 2026
e8e489c
feat: test coverage
wgu-jesse-stewart Apr 24, 2026
88b2392
fix: mock data
wgu-jesse-stewart Apr 24, 2026
62890b4
fix: tests
wgu-jesse-stewart Apr 24, 2026
cd35b6a
feat: PR feedback
wgu-jesse-stewart Apr 27, 2026
f442e76
Merge branch 'main' into wgu-jesse-stewart/instructor_dashboard_certi…
wgu-jesse-stewart Apr 27, 2026
ff1b69a
feat: Refactor certificates module to use absolute imports and improv…
wgu-jesse-stewart Apr 27, 2026
0659a5e
fix: tests
wgu-jesse-stewart Apr 27, 2026
be347d0
feat: adds bulk grant exception
wgu-jesse-stewart Apr 28, 2026
ccbe353
Merge branch 'main' into wgu-jesse-stewart/instructor_dashboard_certi…
wgu-jesse-stewart Apr 28, 2026
dd777f4
fix: tests
wgu-jesse-stewart Apr 28, 2026
f980cfa
fix: tests
wgu-jesse-stewart Apr 28, 2026
18a5074
fix: revert config change
wgu-jesse-stewart Apr 28, 2026
3bdb178
feat: fix tests
wgu-jesse-stewart Apr 28, 2026
a685422
feat: increase test coverage
wgu-jesse-stewart Apr 28, 2026
53e3ec4
fix: restore code editor
wgu-jesse-stewart Apr 29, 2026
dd5e256
fix: delete test file
wgu-jesse-stewart Apr 29, 2026
90dbb24
feat: use messages for Modal error
wgu-jesse-stewart Apr 30, 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
5 changes: 5 additions & 0 deletions app.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ declare module '*.svg' {
const content: string;
export default content;
}

declare module '*.scss' {
const content: Record<string, string>;
export default content;
}
2 changes: 1 addition & 1 deletion site.config.dev.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EnvironmentTypes, SiteConfig, footerApp, headerApp, shellApp } from '@o

import { instructorDashboardApp } from './src';

import '@openedx/frontend-base/shell/style';
Comment thread
wgu-jesse-stewart marked this conversation as resolved.
import '@openedx/frontend-base/shell/app.scss';

const siteConfig: SiteConfig = {
siteId: 'instructor-dev',
Expand Down
164 changes: 92 additions & 72 deletions src/certificates/CertificatesPage.test.tsx

Large diffs are not rendered by default.

38 changes: 35 additions & 3 deletions src/certificates/CertificatesPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ import {
useRemoveException,
useRemoveInvalidation,
useToggleCertificateGeneration,
useUploadBulkExceptionsCsv,
} from '@src/certificates/data/apiHook';
import { CertificateFilter } from '@src/certificates/types';
import { CERTIFICATES_PAGE_SIZE, TAB_KEYS, MODAL_TITLES, ALERT_VARIANTS } from '@src/certificates/constants';
import { getErrorMessage } from '@src/certificates/utils/errorHandling';
import messages from '@src/certificates/messages';
import './CertificatesPage.scss';
import '@src/certificates/CertificatesPage.scss';
Comment thread
wgu-jesse-stewart marked this conversation as resolved.
Outdated

const CertificatesPage = () => {
const intl = useIntl();
Expand Down Expand Up @@ -68,6 +69,7 @@ const CertificatesPage = () => {
});

const { mutate: grantExceptions, isPending: isGrantingExceptions } = useGrantBulkExceptions(courseId);
const { mutate: uploadCsvExceptions, isPending: isUploadingCsv } = useUploadBulkExceptionsCsv(courseId);
const { mutate: invalidateCert, isPending: isInvalidating } = useInvalidateCertificate(courseId);
const { mutate: removeExcept, isPending: isRemovingException } = useRemoveException(courseId);
const { mutate: removeInval, isPending: isRemovingInvalidation } = useRemoveInvalidation(courseId);
Expand Down Expand Up @@ -103,6 +105,35 @@ const CertificatesPage = () => {
);
}, [grantExceptions, showToast, showModal, intl]);

const handleUploadCsvExceptions = useCallback((file: File) => {
uploadCsvExceptions(
file,
{
onSuccess: (data) => {
setIsGrantExceptionsOpen(false);
if (data.errors && data.errors.length > 0) {
const errorMessages = data.errors.map(err => `${err.learner}: ${err.message}`).join('\n');
showModal({
title: MODAL_TITLES.ERROR,
message: `Some exceptions failed:\n${errorMessages}`,
variant: ALERT_VARIANTS.WARNING,
});
}
if (data.success && data.success.length > 0) {
showToast(intl.formatMessage(messages.exceptionsGrantedToast, { count: data.success.length }));
}
},
onError: (error) => {
showModal({
title: MODAL_TITLES.ERROR,
Comment thread
wgu-jesse-stewart marked this conversation as resolved.
Outdated
message: getErrorMessage(error, intl.formatMessage(messages.errorGrantException)),
variant: ALERT_VARIANTS.DANGER,
});
},
},
);
}, [uploadCsvExceptions, showToast, showModal, intl]);

const handleInvalidateCertificate = useCallback((learners: string[], notes: string) => {
invalidateCert(
{ learners, notes },
Expand Down Expand Up @@ -263,7 +294,7 @@ const CertificatesPage = () => {
<CertificatesPageHeader
onGrantExceptions={() => setIsGrantExceptionsOpen(true)}
onInvalidateCertificate={() => setIsInvalidateCertificateOpen(true)}
onDisableCertificates={() => setIsDisableCertificatesOpen(true)}
onStudentGeneratedCertificates={() => setIsDisableCertificatesOpen(true)}
/>

<Card variant="muted" className="pt-3 pt-md-4 pb-4 pb-md-6 certificates-card">
Expand Down Expand Up @@ -309,7 +340,8 @@ const CertificatesPage = () => {
isOpen={isGrantExceptionsOpen}
onClose={() => setIsGrantExceptionsOpen(false)}
onSubmit={handleGrantExceptions}
isSubmitting={isGrantingExceptions}
onUploadCsv={handleUploadCsvExceptions}
isSubmitting={isGrantingExceptions || isUploadingCsv}
/>
<InvalidateCertificateModal
isOpen={isInvalidateCertificateOpen}
Expand Down
18 changes: 10 additions & 8 deletions src/certificates/components/CertificatesPageHeader.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { Button, Dropdown, IconButton, Stack } from '@openedx/paragon';
import { Add, Close, MoreVert } from '@openedx/paragon/icons';
import { Add, Cancel, MoreVert } from '@openedx/paragon/icons';
import { useIntl } from '@openedx/frontend-base';
import messages from '@src/certificates/messages';

interface CertificatesPageHeaderProps {
onGrantExceptions: () => void,
onInvalidateCertificate: () => void,
onDisableCertificates: () => void,
onStudentGeneratedCertificates?: () => void,
}

const CertificatesPageHeader = ({
onGrantExceptions,
onInvalidateCertificate,
onDisableCertificates,
onStudentGeneratedCertificates,
}: CertificatesPageHeaderProps) => {
const intl = useIntl();

Expand All @@ -24,18 +24,20 @@ const CertificatesPageHeader = ({
<Dropdown.Toggle
as={IconButton}
src={MoreVert}
alt={intl.formatMessage(messages.disableCertificatesButton)}
alt="More actions"
Comment thread
wgu-jesse-stewart marked this conversation as resolved.
Outdated
id="certificates-more-menu"
/>
<Dropdown.Menu>
<Dropdown.Item onClick={onDisableCertificates}>
{intl.formatMessage(messages.disableCertificatesButton)}
</Dropdown.Item>
{onStudentGeneratedCertificates && (
<Dropdown.Item onClick={onStudentGeneratedCertificates}>
{intl.formatMessage(messages.studentGeneratedCertificatesMenuItem)}
</Dropdown.Item>
)}
</Dropdown.Menu>
</Dropdown>
<Button
variant="outline-primary"
iconBefore={Close}
iconBefore={Cancel}
onClick={onInvalidateCertificate}
className="text-nowrap"
>
Expand Down
2 changes: 1 addition & 1 deletion src/certificates/components/CertificatesToolbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useIntl } from '@openedx/frontend-base';
import FilterDropdown from '@src/certificates/components/FilterDropdown';
import { CertificateFilter } from '@src/certificates/types';
import messages from '@src/certificates/messages';
import '../CertificatesPage.scss';
import '@src/certificates/CertificatesPage.scss';
Comment thread
wgu-jesse-stewart marked this conversation as resolved.
Outdated

interface CertificatesToolbarProps {
search: string,
Expand Down
55 changes: 33 additions & 22 deletions src/certificates/components/DisableCertificatesModal.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,47 +33,57 @@ describe('DisableCertificatesModal', () => {
expect(screen.getByRole('dialog')).toBeInTheDocument();
});

it('renders confirm and cancel buttons', () => {
it('renders save and close buttons', () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} />);

expect(screen.getByRole('button', { name: messages.confirm.defaultMessage })).toBeInTheDocument();
expect(screen.getByRole('button', { name: messages.cancel.defaultMessage })).toBeInTheDocument();
const buttons = screen.getAllByRole('button');
const saveButton = buttons.find(btn => btn.textContent === messages.save.defaultMessage);
const closeButton = buttons.find(btn => btn.textContent === messages.close.defaultMessage);

expect(saveButton).toBeInTheDocument();
expect(closeButton).toBeInTheDocument();
});

it('calls onConfirm when confirm button is clicked', async () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} />);
it('calls onConfirm when save button is clicked and checkbox state changed', async () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} isEnabled={true} />);
const user = userEvent.setup();

const confirmButton = screen.getByRole('button', { name: messages.confirm.defaultMessage });
await user.click(confirmButton);
// Change the checkbox state
const checkbox = screen.getByRole('checkbox');
await user.click(checkbox);

const saveButton = screen.getByRole('button', { name: messages.save.defaultMessage });
await user.click(saveButton);

expect(mockOnConfirm).toHaveBeenCalledTimes(1);
});

it('calls onClose when cancel button is clicked', async () => {
it('calls onClose when close button is clicked', async () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} />);
const user = userEvent.setup();

const cancelButton = screen.getByRole('button', { name: messages.cancel.defaultMessage });
await user.click(cancelButton);
const buttons = screen.getAllByRole('button');
const closeButton = buttons.find(btn => btn.textContent === messages.close.defaultMessage);
await user.click(closeButton);

expect(mockOnClose).toHaveBeenCalledTimes(1);
});

it('disables buttons when isSubmitting is true', () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} isSubmitting={true} />);

const confirmButton = screen.getByRole('button', { name: messages.confirm.defaultMessage });
const cancelButton = screen.getByRole('button', { name: messages.cancel.defaultMessage });
const buttons = screen.getAllByRole('button');
const saveButton = buttons.find(btn => btn.textContent === messages.save.defaultMessage);
const closeButton = buttons.find(btn => btn.textContent === messages.close.defaultMessage);

expect(confirmButton).toBeDisabled();
expect(cancelButton).toBeDisabled();
expect(saveButton).toBeDisabled();
expect(closeButton).toBeDisabled();
});

it('does not render when isOpen is false', () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} isOpen={false} />);

expect(screen.queryByText(messages.disableCertificatesModalTitle.defaultMessage)).not.toBeInTheDocument();
expect(screen.queryByText(messages.studentGeneratedCertificatesModalTitle.defaultMessage)).not.toBeInTheDocument();
});

it('switches title and message based on isEnabled prop', () => {
Expand All @@ -95,11 +105,12 @@ describe('DisableCertificatesModal', () => {
it('enables buttons when not submitting', () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} isSubmitting={false} />);

const confirmButton = screen.getByRole('button', { name: messages.confirm.defaultMessage });
const cancelButton = screen.getByRole('button', { name: messages.cancel.defaultMessage });
const buttons = screen.getAllByRole('button');
const saveButton = buttons.find(btn => btn.textContent === messages.save.defaultMessage);
const closeButton = buttons.find(btn => btn.textContent === messages.close.defaultMessage);

expect(confirmButton).not.toBeDisabled();
expect(cancelButton).not.toBeDisabled();
expect(saveButton).not.toBeDisabled();
expect(closeButton).not.toBeDisabled();
});

it('renders with small size modal', () => {
Expand All @@ -109,11 +120,11 @@ describe('DisableCertificatesModal', () => {
expect(modal).toBeInTheDocument();
});

it('does not have close button in header', () => {
it('has close button in header', () => {
renderWithIntl(<DisableCertificatesModal {...defaultProps} />);

// Modal should not have the default close button (X) in header
// Modal should have the default close button (X) in header
const closeButtons = screen.queryAllByLabelText('Close');
expect(closeButtons.length).toBe(0);
expect(closeButtons.length).toBeGreaterThan(0);
});
});
58 changes: 40 additions & 18 deletions src/certificates/components/DisableCertificatesModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { ActionRow, Button, ModalDialog } from '@openedx/paragon';
import { useState } from 'react';
import { ActionRow, Button, Form, ModalDialog } from '@openedx/paragon';
import { useIntl } from '@openedx/frontend-base';
import messages from '@src/certificates/messages';

Expand All @@ -18,34 +19,55 @@ const DisableCertificatesModal = ({
isSubmitting,
}: DisableCertificatesModalProps) => {
const intl = useIntl();
const [enabled, setEnabled] = useState(isEnabled);

const title = isEnabled
? intl.formatMessage(messages.disableCertificatesModalTitle)
: intl.formatMessage(messages.enableCertificatesModalTitle);
const handleSave = () => {
if (enabled !== isEnabled) {
onConfirm();
} else {
onClose();
}
};

const message = isEnabled
? intl.formatMessage(messages.disableCertificatesModalMessage)
: intl.formatMessage(messages.enableCertificatesModalMessage);
const handleClose = () => {
setEnabled(isEnabled); // Reset to original value
onClose();
};

return (
<ModalDialog
title={title}
onClose={onClose}
title={intl.formatMessage(messages.studentGeneratedCertificatesModalTitle)}
onClose={handleClose}
isOpen={isOpen}
size="sm"
hasCloseButton={false}
size="md"
hasCloseButton
isOverflowVisible={false}
>
<div className="mx-4 mt-4 mb-2.5">
<p>{message}</p>
</div>
<ModalDialog.Header className="border-bottom">
<ModalDialog.Title>
{intl.formatMessage(messages.studentGeneratedCertificatesModalTitle)}
</ModalDialog.Title>
</ModalDialog.Header>
<ModalDialog.Body className="px-4 py-3">
<Form.Group>
<Form.Checkbox
checked={enabled}
onChange={(e) => setEnabled(e.target.checked)}
>
{intl.formatMessage(messages.enableStudentGeneratedCertificates)}
</Form.Checkbox>
<Form.Text className="text-muted">
{intl.formatMessage(messages.studentGeneratedCertificatesDescription)}
</Form.Text>
</Form.Group>
</ModalDialog.Body>
<ModalDialog.Footer>
<ActionRow>
<Button variant="tertiary" onClick={onClose} disabled={isSubmitting}>
{intl.formatMessage(messages.cancel)}
<Button variant="tertiary" onClick={handleClose} disabled={isSubmitting}>
{intl.formatMessage(messages.close)}
</Button>
<Button variant="primary" onClick={onConfirm} disabled={isSubmitting}>
{intl.formatMessage(messages.confirm)}
<Button variant="primary" onClick={handleSave} disabled={isSubmitting}>
{intl.formatMessage(messages.save)}
</Button>
</ActionRow>
</ModalDialog.Footer>
Expand Down
Loading
Loading