Skip to content

Fix TypeError in notifications when note has no actions #108577

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.

Sign up for GitHub

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

Draft
StevenDufresne wants to merge 1 commit into
base: trunk
Choose a base branch
from
+6 −1
Draft

Fix TypeError in notifications when note has no actions #108577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions apps/notifications/src/app/templates/body.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,9 @@ export const NoteBody = ( { note }: { note: Note } ) => {
const isApproved = useSelector( ( state ) => getIsNoteApproved( state, note ) );
const actions = getActions( note );
const hasAction = ( types: string | string[] ) => {
if ( ! actions ) {
return false;
}
const typeArray = Array.isArray( types ) ? types : [ types ];
return typeArray.some( ( type ) => actions.hasOwnProperty( type ) );
};
Expand Down
4 changes: 3 additions & 1 deletion apps/notifications/src/panel/templates/body.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,9 @@ export class NoteBody extends Component {
// Check if we should show the pending approval badge
const noteActions = getActions( this.props.note );
const hasAction = ( types ) =>
[].concat( types ).some( ( type ) => noteActions.hasOwnProperty( type ) );
noteActions
? [].concat( types ).some( ( type ) => noteActions.hasOwnProperty( type ) )
: false;
const showPendingApprovalBadge = hasAction( 'approve-comment' ) && ! this.props.isApproved;

for ( i = 0; i < blocks.length; i++ ) {
Expand Down