Add sorting to my alerts #212
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| /* eslint-disable jsx-a11y/anchor-is-valid */ | ||
| import React from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import { Tag, Table } from '@trussworks/react-uswds'; | ||
|
|
@@ -51,12 +52,16 @@ function renderReports(reports) { | |
| </Tag> | ||
| )); | ||
|
|
||
| const idKey = `my_alerts_${id}`; | ||
| const idLink = `/activity-reports/${id}`; | ||
| const statusClassName = `smart-hub--table-tag-status smart-hub--status-${status}`; | ||
|
|
||
| return ( | ||
| <tr key={idKey}> | ||
| <td> | ||
| <Link | ||
| to={idLink} | ||
| href={idLink} | ||
| > | ||
| {displayId} | ||
| </Link> | ||
|
|
@@ -79,7 +84,7 @@ function renderReports(reports) { | |
| </td> | ||
| <td> | ||
| <Tag | ||
| className={statusClassName} | ||
| > | ||
| {status === 'needs_action' ? 'Needs action' : status} | ||
| </Tag> | ||
|
|
@@ -89,51 +94,121 @@ function renderReports(reports) { | |
| }); | ||
| } | ||
|
|
||
| export function renderTotal(offset, perPage, activePage, reportsCount) { | ||
| const from = offset >= reportsCount ? 0 : offset + 1; | ||
| const offsetTo = perPage * activePage; | ||
| let to; | ||
| if (offsetTo > reportsCount) { | ||
| to = reportsCount; | ||
| } else { | ||
| to = offsetTo; | ||
| } | ||
| return `${from}-${to} of ${reportsCount}`; | ||
|
There was a problem hiding this comment. Let's hide this until pagination is active. With 11 reports the table is displaying all 11 (good, since otherwise one would be inaccessible) but this says |
||
| } | ||
|
|
||
| function MyAlerts(props) { | ||
| const { | ||
| reports, | ||
| newBtn, | ||
| alertsSortConfig, | ||
| alertsOffset, | ||
| alertsPerPage, | ||
| alertsActivePage, | ||
| alertReportsCount, | ||
| sortHandler, | ||
| } = props; | ||
| const getClassNamesFor = (name) => (alertsSortConfig.sortBy === name ? alertsSortConfig.direction : ''); | ||
|
|
||
| const renderColumnHeader = (displayName, name) => { | ||
| const sortClassName = getClassNamesFor(name); | ||
| let fullAriaSort; | ||
| switch (sortClassName) { | ||
| case 'asc': | ||
| fullAriaSort = 'ascending'; | ||
| break; | ||
| case 'desc': | ||
| fullAriaSort = 'descending'; | ||
| break; | ||
| default: | ||
| fullAriaSort = 'none'; | ||
| break; | ||
| } | ||
| return ( | ||
| <th scope="col" aria-sort={fullAriaSort}> | ||
| <a | ||
| role="button" | ||
| tabIndex={0} | ||
| onClick={() => { | ||
| sortHandler(name); | ||
| }} | ||
| onKeyPress={() => sortHandler(name)} | ||
| className={sortClassName} | ||
| aria-label={`${displayName}. Activate to sort ${ | ||
| sortClassName === 'asc' ? 'descending' : 'ascending' | ||
| }`} | ||
| > | ||
| {displayName} | ||
| </a> | ||
| </th> | ||
| ); | ||
| }; | ||
|
|
||
| return ( | ||
| <> | ||
| {reports && reports.length === 0 && ( | ||
| <Container className="landing" padding={0}> | ||
| <div id="caughtUp"> | ||
| <div> | ||
| <h2>You're all caught up!</h2> | ||
| </div> | ||
| {newBtn && ( | ||
| <p id="beginNew"> | ||
| Would you like to begin a new activity report? | ||
| </p> | ||
| )} | ||
| {newBtn && <NewReport />} | ||
| </div> | ||
| </Container> | ||
| )} | ||
| {reports && reports.length > 0 && ( | ||
| <SimpleBar> | ||
| <Container className="landing inline-size" padding={0}> | ||
| <span | ||
| id="alertsTotalCount" | ||
| aria-label={`Displaying rows ${renderTotal( | ||
| alertsOffset, | ||
| alertsPerPage, | ||
| alertsActivePage, | ||
| alertReportsCount, | ||
| )}`} | ||
| > | ||
| {renderTotal( | ||
| alertsOffset, | ||
| alertsPerPage, | ||
| alertsActivePage, | ||
| alertReportsCount, | ||
| )} | ||
| </span> | ||
|
|
||
| <Table bordered={false}> | ||
| <caption className="smart-hub--table-caption"> | ||
| My activity report alerts | ||
| <p id="arTblDesc">with sorting</p> | ||
| </caption> | ||
| <thead> | ||
| <tr> | ||
| {renderColumnHeader('Report ID', 'regionId')} | ||
| {renderColumnHeader('Grantee', 'activityRecipients')} | ||
| {renderColumnHeader('Start date', 'startDate')} | ||
| {renderColumnHeader('Creator', 'author')} | ||
| {renderColumnHeader('Collaborator(s)', 'collaborators')} | ||
| {renderColumnHeader('Status', 'status')} | ||
| </tr> | ||
| </thead> | ||
| <tbody>{renderReports(reports)}</tbody> | ||
| </Table> | ||
| </Container> | ||
| </SimpleBar> | ||
| )} | ||
| </> | ||
| ); | ||
|
|
@@ -142,10 +217,20 @@ function MyAlerts({ reports, newBtn }) { | |
| MyAlerts.propTypes = { | ||
| reports: PropTypes.arrayOf(PropTypes.object), | ||
| newBtn: PropTypes.bool.isRequired, | ||
| alertsSortConfig: PropTypes.shape({ sortBy: PropTypes.string, direction: PropTypes.string }), | ||
| alertsOffset: PropTypes.number, | ||
| alertsPerPage: PropTypes.number, | ||
| alertsActivePage: PropTypes.number, | ||
| alertReportsCount: PropTypes.number.isRequired, | ||
| sortHandler: PropTypes.func.isRequired, | ||
| }; | ||
|
|
||
| MyAlerts.defaultProps = { | ||
| reports: [], | ||
| alertsSortConfig: { sortBy: 'startDate', direction: 'asc' }, | ||
| alertsOffset: 0, | ||
| alertsPerPage: 7, | ||
|
There was a problem hiding this comment. I changed it to 10, but right now since the pagination is not working it will be a placeholder only until we find a way to integrate the pagination with sorting (HHS#369) |
||
| alertsActivePage: 1, | ||
| }; | ||
|
|
||
| export default MyAlerts; | ||
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.
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.
Are both
toandhrefrequired?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.
Removed href.