-
Notifications
You must be signed in to change notification settings - Fork 31
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.
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
feat: Add download csv button to people management #1369
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
import React, { useState, useEffect } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { useIntl } from '@edx/frontend-platform/i18n'; | ||
|
||
import { | ||
Icon, Spinner, StatefulButton, Toast, useToggle, | ||
} from '@openedx/paragon'; | ||
import { Download, Check } from '@openedx/paragon/icons'; | ||
import { logError } from '@edx/frontend-platform/logging'; | ||
import { downloadCsv, getTimeStampedFilename } from '../../utils'; | ||
|
||
const csvHeaders = ['Name', 'Email', 'Joined Organization', 'Enrollments']; | ||
|
||
const dataEntryToRow = (entry) => { | ||
const { enterpriseCustomerUser: { name, email, joinedOrg }, enrollments } = entry; | ||
return [name, email, joinedOrg, enrollments]; | ||
}; | ||
|
||
const DownloadCsvButton = ({ testId, fetchData, totalCt }) => { | ||
const [buttonState, setButtonState] = useState('pageLoading'); | ||
const [isToastOpen, openToast, closeToast] = useToggle(false); | ||
const intl = useIntl(); | ||
|
||
useEffect(() => { | ||
if (fetchData) { | ||
setButtonState('default'); | ||
} | ||
}, [fetchData]); | ||
|
||
const handleClick = async () => { | ||
setButtonState('pending'); | ||
fetchData().then((response) => { | ||
const fileName = getTimeStampedFilename('people-report.csv'); | ||
downloadCsv(fileName, response.results, csvHeaders, dataEntryToRow); | ||
openToast(); | ||
setButtonState('complete'); | ||
}).catch((err) => { | ||
logError(err); | ||
}); | ||
}; | ||
|
||
const toastText = intl.formatMessage({ | ||
id: 'adminPortal.peopleManagement.dataTable.download.toast', | ||
defaultMessage: 'Successfully downloaded', | ||
description: 'Toast message for the people management download button.', | ||
}); | ||
return ( | ||
<> | ||
{ isToastOpen | ||
&& ( | ||
<Toast onClose={closeToast} show={isToastOpen}> | ||
{toastText} | ||
</Toast> | ||
)} | ||
<StatefulButton | ||
state={buttonState} | ||
className="download-button" | ||
data-testid={testId} | ||
labels={{ | ||
default: intl.formatMessage({ | ||
id: 'adminPortal.peopleManagement.dataTable.download.button', | ||
defaultMessage: `Download all (${totalCt})`, | ||
description: 'Label for the people management download button', | ||
}), | ||
pending: intl.formatMessage({ | ||
id: 'adminPortal.peopleManagement.dataTable.download.button.pending', | ||
defaultMessage: 'Downloading', | ||
description: 'Label for the people management download button when the download is in progress.', | ||
}), | ||
complete: intl.formatMessage({ | ||
id: 'adminPortal.peopleManagement.dataTable.download.button.complete', | ||
defaultMessage: 'Downloaded', | ||
description: 'Label for the people management download button when the download is complete.', | ||
}), | ||
pageLoading: intl.formatMessage({ | ||
id: 'adminPortal.peopleManagement.dataTable.download.button.loading', | ||
defaultMessage: 'Download module activity', | ||
description: 'Label for the people management download button when the page is loading.', | ||
}), | ||
}} | ||
icons={{ | ||
default: <Icon src={Download} />, | ||
pending: <Spinner animation="border" variant="light" size="sm" />, | ||
complete: <Icon src={Check} />, | ||
pageLoading: <Icon src={Download} variant="light" />, | ||
}} | ||
disabledStates={['pending', 'pageLoading']} | ||
onClick={handleClick} | ||
/> | ||
</> | ||
); | ||
}; | ||
|
||
DownloadCsvButton.defaultProps = { | ||
testId: 'download-csv-button', | ||
}; | ||
|
||
DownloadCsvButton.propTypes = { | ||
// eslint-disable-next-line react/forbid-prop-types | ||
fetchData: PropTypes.func.isRequired, | ||
totalCt: PropTypes.number, | ||
testId: PropTypes.string, | ||
}; | ||
|
||
export default DownloadCsvButton; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
98 changes: 98 additions & 0 deletions
98
src/components/PeopleManagement/tests/DownloadCsvButton.test.jsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,98 @@ | ||
import React from 'react'; | ||
import { IntlProvider } from '@edx/frontend-platform/i18n'; | ||
import { logError } from '@edx/frontend-platform/logging'; | ||
import { act, render, screen } from '@testing-library/react'; | ||
|
||
import '@testing-library/jest-dom/extend-expect'; | ||
|
||
import userEvent from '@testing-library/user-event'; | ||
import DownloadCsvButton from '../DownloadCSVButton'; | ||
import { downloadCsv } from '../../../utils'; | ||
|
||
jest.mock('file-saver', () => ({ | ||
...jest.requireActual('file-saver'), | ||
saveAs: jest.fn(), | ||
})); | ||
|
||
jest.mock('../../../utils', () => ({ | ||
downloadCsv: jest.fn(), | ||
getTimeStampedFilename: (suffix) => `2024-01-20-${suffix}`, | ||
})); | ||
|
||
jest.mock('@edx/frontend-platform/logging', () => ({ | ||
...jest.requireActual('@edx/frontend-platform/logging'), | ||
logError: jest.fn(), | ||
})); | ||
|
||
const mockData = { | ||
results: [ | ||
{ | ||
enterprise_customer_user: { | ||
email: '[email protected]', | ||
joined_org: 'Apr 07, 2024', | ||
name: 'A', | ||
}, | ||
enrollments: 3, | ||
}, | ||
{ | ||
enterprise_customer_user: { | ||
email: '[email protected]', | ||
joined_org: 'Apr 08, 2024', | ||
name: 'B', | ||
}, | ||
enrollments: 4, | ||
}, | ||
], | ||
}; | ||
|
||
const testId = 'test-id-1'; | ||
const DEFAULT_PROPS = { | ||
totalCt: mockData.results.length, | ||
fetchData: jest.fn(() => Promise.resolve(mockData)), | ||
testId, | ||
}; | ||
|
||
const DownloadCSVButtonWrapper = props => ( | ||
<IntlProvider locale="en"> | ||
<DownloadCsvButton {...props} /> | ||
</IntlProvider> | ||
); | ||
|
||
describe('DownloadCSVButton', () => { | ||
const flushPromises = () => new Promise(setImmediate); | ||
|
||
it('renders download csv button correctly.', async () => { | ||
render(<DownloadCSVButtonWrapper {...DEFAULT_PROPS} />); | ||
expect(screen.getByTestId(testId)).toBeInTheDocument(); | ||
|
||
// Validate button text | ||
expect(screen.getByText('Download all (2)')).toBeInTheDocument(); | ||
|
||
// Click the download button. | ||
screen.getByTestId(testId).click(); | ||
await flushPromises(); | ||
|
||
expect(DEFAULT_PROPS.fetchData).toHaveBeenCalled(); | ||
const expectedFileName = '2024-01-20-people-report.csv'; | ||
const expectedHeaders = ['Name', 'Email', 'Joined Organization', 'Enrollments']; | ||
expect(downloadCsv).toHaveBeenCalledWith(expectedFileName, mockData.results, expectedHeaders, expect.any(Function)); | ||
}); | ||
it('download button should handle error returned by the API endpoint.', async () => { | ||
const props = { | ||
...DEFAULT_PROPS, | ||
fetchData: jest.fn(() => Promise.reject(new Error('Error fetching data'))), | ||
}; | ||
render(<DownloadCSVButtonWrapper {...props} />); | ||
expect(screen.getByTestId(testId)).toBeInTheDocument(); | ||
|
||
act(() => { | ||
// Click the download button. | ||
userEvent.click(screen.getByTestId(testId)); | ||
}); | ||
|
||
await flushPromises(); | ||
|
||
expect(DEFAULT_PROPS.fetchData).toHaveBeenCalled(); | ||
expect(logError).toHaveBeenCalled(); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we add in a test for filtered results?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good point! The DownloadCsvButton component doesn't have awareness of filters, and this would have to be tested at the level of the PeopleManagementPage. As of right now there are no unit tests for the table part of the PeopleManagementPage, and adding that I feel is a substantial enough task outside the scope of this change to address it as a separate ticket.