Notifications: Refresh admin menu after changing comment status

apps/notifications/src/panel/state/notes/actions.js

@@ -5,9 +5,10 @@ export const addNotes = ( notes ) => ( {
 	notes,
 } );
 
-export const removeNotes = ( noteIds ) => ( {
+export const removeNotes = ( noteIds, isComment = false ) => ( {
 	type: types.NOTES_REMOVE,
 	noteIds,
+	isComment,
 } );
 
 export const noteAction = ( action ) => ( noteId ) => ( {

apps/notifications/src/panel/state/notes/thunks/set-approve-status.js

@@ -7,16 +7,16 @@ const setApproveStatus =
 	( noteId, siteId, commentId, isApproved, type, restClient ) => ( dispatch ) => {
 		const comment = wpcom().site( siteId ).comment( commentId );
 
+		comment.update( { status: isApproved ? 'approved' : 'unapproved' }, () =>
+			// getNote() updates the redux store with a fresh object from the API
+			restClient.getNote( noteId )
+		);
+
 		dispatch( approveNote( noteId, isApproved ) );
 		bumpStat( isApproved ? 'unapprove-comment' : 'approve-comment' );
 		recordTracksEvent( 'calypso_notification_note_' + ( isApproved ? 'approve' : 'unapprove' ), {
 			note_type: type,
 		} );
-
-		comment.update( { status: isApproved ? 'approved' : 'unapproved' }, () =>
-			// getNote() updates the redux store with a fresh object from the API
-			restClient.getNote( noteId )
-		);
 	};
 
 export default setApproveStatus;

apps/notifications/src/panel/templates/undo-list-item.jsx

@@ -107,7 +107,8 @@ export class UndoListItem extends Component {
 			comment.update( data, updateSpamStatus );
 		} );
 
-		this.props.removeNotes( [ this.props.note.id ] );
+		const isComment = true;
+		this.props.removeNotes( [ this.props.note.id ], isComment );
 
 		component.finishExecution();
 	};
@@ -124,7 +125,8 @@ export class UndoListItem extends Component {
 
 		this.instance && this.setState( { isVisible: false } );
 
-		this.props.removeNotes( [ this.props.note.id ] );
+		const isComment = true;
+		this.props.removeNotes( [ this.props.note.id ], isComment );
 
 		this.finishExecution();
 	};

client/notifications/index.jsx

@@ -21,12 +21,14 @@ import { connect } from 'react-redux';
 import localStorageHelper from 'store';
 import { recordTracksEvent } from 'calypso/lib/analytics/tracks';
 import wpcom from 'calypso/lib/wp';
+import { requestAdminMenu as requestAdminMenuAction } from 'calypso/state/admin-menu/actions';
 import { recordTracksEvent as recordTracksEventAction } from 'calypso/state/analytics/actions';
 import { setUnseenCount } from 'calypso/state/notifications/actions';
 import { didForceRefresh } from 'calypso/state/notifications-panel/actions';
 import { shouldForceRefresh } from 'calypso/state/notifications-panel/selectors';
 import getCurrentLocaleSlug from 'calypso/state/selectors/get-current-locale-slug';
 import getCurrentLocaleVariant from 'calypso/state/selectors/get-current-locale-variant';
+import getSelectedSiteId from 'calypso/state/ui/selectors/get-selected-site-id';
 
 import './style.scss';
 
@@ -137,6 +139,18 @@ export class Notifications extends Component {
 				this.props.checkToggle();
 			},
 		],
+		APPROVE_NOTE: [
+			() => {
+				this.props.requestAdminMenu( this.props.selectedSiteId );
+			},
+		],
+		NOTES_REMOVE: [
+			( _, { isComment } ) => {
+				if ( isComment ) {
+					this.props.requestAdminMenu( this.props.selectedSiteId );
+				}
+			},
+		],
 	};
 
 	componentDidMount() {
@@ -292,10 +306,13 @@ export default connect(
 	( state ) => ( {
 		currentLocaleSlug: getCurrentLocaleVariant( state ) || getCurrentLocaleSlug( state ),
 		forceRefresh: shouldForceRefresh( state ),
+		selectedSiteId: getSelectedSiteId( state ),
 	} ),
-	{
-		recordTracksEventAction,
-		setUnseenCount,
-		didForceRefresh,
-	}
+	( dispatch ) => ( {
+		recordTracksEventAction: ( name, properties ) =>
+			dispatch( recordTracksEventAction( name, properties ) ),
+		setUnseenCount: ( count ) => dispatch( setUnseenCount( count ) ),
+		didForceRefresh: () => dispatch( didForceRefresh() ),
+		requestAdminMenu: ( siteId ) => dispatch( requestAdminMenuAction( siteId ) ),
+	} )
 )( Notifications );