Fix wrong dates in Reviews and Orders panels of the Activity Panel (https://github.com/woocommerce/woocommerce-admin/pull/2013)
* Fix wrong dates in Reviews and Orders panels of the Activity Panel * Avoid using long boolean checks in unread-indicators
This commit is contained in:
parent
e31be343e2
commit
f4c487dcd5
|
@ -90,7 +90,11 @@ class InboxPanel extends Component {
|
|||
title={ note.title }
|
||||
date={ note.date_created_gmt }
|
||||
icon={ <Gridicon icon={ note.icon } size={ 48 } /> }
|
||||
unread={ ! lastRead || new Date( note.date_created_gmt ).getTime() > lastRead }
|
||||
unread={
|
||||
! lastRead ||
|
||||
! note.date_created_gmt ||
|
||||
new Date( note.date_created_gmt + 'Z' ).getTime() > lastRead
|
||||
}
|
||||
actions={ getButtonsFromActions( note.actions ) }
|
||||
>
|
||||
<span dangerouslySetInnerHTML={ sanitizeHTML( note.content ) } />
|
||||
|
|
|
@ -151,7 +151,7 @@ function OrdersPanel( { orders, isRequesting, isError, orderStatuses } ) {
|
|||
key={ order.order_id }
|
||||
className="woocommerce-order-activity-card"
|
||||
title={ orderCardTitle( order ) }
|
||||
date={ order.date_created }
|
||||
date={ order.date_created_gmt }
|
||||
subtitle={
|
||||
<div>
|
||||
<span>
|
||||
|
|
|
@ -8,7 +8,6 @@ import { Component, Fragment } from '@wordpress/element';
|
|||
import { compose } from '@wordpress/compose';
|
||||
import Gridicon from 'gridicons';
|
||||
import interpolateComponents from 'interpolate-components';
|
||||
import moment from 'moment';
|
||||
import { get, noop, isNull } from 'lodash';
|
||||
import PropTypes from 'prop-types';
|
||||
import { withDispatch } from '@wordpress/data';
|
||||
|
@ -135,11 +134,7 @@ class ReviewsPanel extends Component {
|
|||
key={ review.id }
|
||||
title={ title }
|
||||
subtitle={ subtitle }
|
||||
date={
|
||||
review.date_created_gmt
|
||||
? moment( review.date_created_gmt + 'Z' ).format( 'YYYY-MM-DDTH:mm:ss' )
|
||||
: null
|
||||
}
|
||||
date={ review.date_created_gmt }
|
||||
icon={ icon }
|
||||
actions={ cardActions() }
|
||||
unread={
|
||||
|
|
|
@ -17,11 +17,17 @@ export function getUnreadNotes( select ) {
|
|||
};
|
||||
|
||||
const latestNote = getNotes( notesQuery );
|
||||
const isError = Boolean( getNotesError( notesQuery ) );
|
||||
const isRequesting = isGetNotesRequesting( notesQuery );
|
||||
|
||||
if ( isError || isRequesting ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return (
|
||||
! Boolean( getNotesError( notesQuery ) ) &&
|
||||
! isGetNotesRequesting( notesQuery ) &&
|
||||
latestNote[ 0 ] &&
|
||||
new Date( latestNote[ 0 ].date_created_gmt ).getTime() > userData.activity_panel_inbox_last_read
|
||||
new Date( latestNote[ 0 ].date_created_gmt + 'Z' ).getTime() >
|
||||
userData.activity_panel_inbox_last_read
|
||||
);
|
||||
}
|
||||
|
||||
|
@ -44,13 +50,11 @@ export function getUnreadOrders( select ) {
|
|||
const isError = Boolean( getReportItemsError( 'orders', ordersQuery ) );
|
||||
const isRequesting = isReportItemsRequesting( 'orders', ordersQuery );
|
||||
|
||||
if ( ! isError && ! isRequesting ) {
|
||||
if ( totalOrders > 0 ) {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
if ( isError || isRequesting ) {
|
||||
return null;
|
||||
}
|
||||
return null;
|
||||
|
||||
return totalOrders > 0;
|
||||
}
|
||||
|
||||
export function getUnreadReviews( select ) {
|
||||
|
@ -119,9 +123,12 @@ export function getUnreadStock( select ) {
|
|||
};
|
||||
getItems( 'products', productsQuery );
|
||||
const lowInStockCount = getItemsTotalCount( 'products', productsQuery );
|
||||
const isError = Boolean( getItemsError( 'products', productsQuery ) );
|
||||
const isRequesting = isGetItemsRequesting( 'products', productsQuery );
|
||||
|
||||
return ! getItemsError( 'products', productsQuery ) &&
|
||||
! isGetItemsRequesting( 'products', productsQuery )
|
||||
? lowInStockCount > 0
|
||||
: false;
|
||||
if ( isError || isRequesting ) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return lowInStockCount > 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue