Display my alerts #170
Display my alerts #170
Conversation
…into kw-my-alerts
src/services/activityReports.js
Outdated
| [Op.and]: [ | ||
| { | ||
| status: { | ||
| [Op.ne]: 'approved', |
There was a problem hiding this comment.
Should approved reports be shown on the alerts? It seems like that would get pretty cluttered over time.
There was a problem hiding this comment.
True. No need to have approved reports.
There was a problem hiding this comment.
Hmm...Op.ne (not equal) should take care of not bringing in approved reports. Do you still see 'approved' in the alerts section?
There was a problem hiding this comment.
This report was filled out and submitted by userid 5 and approved by userid 1. When I log backin as userid 5 it shows up.
|
|
||
| const collaboratorsWithTags = collaborators.map((collaborator) => ( | ||
| <Tag | ||
| key={collaborator.fullName.slice(1, 13)} |
| <tr key={`my_alerts_${id}`}> | ||
| <td> | ||
| <Link | ||
| to={`/activity-reports/${id}/activity-summary`} |
There was a problem hiding this comment.
If the /activity-summary is removed the user will be redirected to the review page if the report is not in draft mode (the report is waiting for approval or "Needs Action")
Yes, it blends a bit. Double checked the background color. It matches the design, but I'll run this by @arickalewis1 It also looks like |
| } | ||
|
|
||
| MyAlerts.propTypes = { | ||
| reports: PropTypes.node.isRequired, |
There was a problem hiding this comment.
I'm getting this in the console:
Warning: Failed prop type: Invalid prop reportssupplied toMyAlerts, expected a ReactNode
src/services/activityReports.js
Outdated
| { | ||
| [Op.and]: [ | ||
| { | ||
| status: { [Op.ne]: 'approved' }, |
There was a problem hiding this comment.
Do any of these status strings exist in a Constant? It'd be good to refer to the constants rather than hard coding in the query.
There was a problem hiding this comment.
Good catch!
Fixed.
Description of change
Displays alerts for managers, authors and collaborators. If there are no alerts, an empty area will be displayed with the text "You're all caught up" (per design).
How to test
Issue(s)
Checklist