Store Dashboard: Refactor, Update widgets to use DashboardWidget #22859
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,24 +1,25 @@ | ||
| /** @format */ | ||
| /** | ||
| * External dependencies | ||
| */ | ||
| import React, { Component } from 'react'; | ||
| import PropTypes from 'prop-types'; | ||
| import config from 'config'; | ||
| import { bindActionCreators } from 'redux'; | ||
| import { connect } from 'react-redux'; | ||
| import classNames from 'classnames'; | ||
| import { localize } from 'i18n-calypso'; | ||
|
|
||
| /** | ||
| * Internal dependencies | ||
| */ | ||
| import Button from 'components/button'; | ||
| import DashboardWidget from 'woocommerce/components/dashboard-widget'; | ||
| import DashboardWidgetRow from 'woocommerce/components/dashboard-widget/row'; | ||
| import LabelsSetupNotice from 'woocommerce/woocommerce-services/components/labels-setup-notice'; | ||
| import { fetchOrders } from 'woocommerce/state/sites/orders/actions'; | ||
| import { fetchReviews } from 'woocommerce/state/sites/reviews/actions'; | ||
| import formatCurrency from 'lib/format-currency'; | ||
| import { | ||
| areOrdersLoading, | ||
| areOrdersLoaded, | ||
|
|
@@ -30,9 +31,7 @@ import { getSelectedSiteWithFallback } from 'woocommerce/state/sites/selectors'; | |
| import { getLink } from 'woocommerce/lib/nav-utils'; | ||
| import { getPaymentCurrencySettings } from 'woocommerce/state/sites/settings/general/selectors'; | ||
| import { getTotalReviews } from 'woocommerce/state/sites/reviews/selectors'; | ||
| import ShareWidget from 'woocommerce/components/share-widget'; | ||
| import QuerySettingsGeneral from 'woocommerce/components/query-settings-general'; | ||
|
|
||
| class ManageOrdersView extends Component { | ||
|
|
@@ -84,45 +83,60 @@ class ManageOrdersView extends Component { | |
| } | ||
| }; | ||
|
|
||
| shouldShowPendingReviews = () => { | ||
| return config.isEnabled( 'woocommerce/extension-reviews' ) && this.props.pendingReviews; | ||
| }; | ||
|
|
||
| possiblyRenderProcessOrdersWidget = () => { | ||
| const { currency, orders, ordersRevenue, site, translate } = this.props; | ||
| if ( ! orders.length ) { | ||
| return null; | ||
| } | ||
| const currencyValue = ( currency && currency.value ) || ''; | ||
| const orderCountPhrase = translate( '✨ New order', '✨ New orders', { | ||
|
There was a problem hiding this comment. Hi! I've found a possible matching string that has already been translated 18 times: Help me improve these suggestions: react with 👎 if the suggestion doesn't make any sense, or with 👍 if it's a particularly good one (even if not implemented). |
||
| count: orders.length, | ||
| } ); | ||
| const classes = classNames( 'dashboard__process-orders-container', { | ||
| 'has-reviews': this.shouldShowPendingReviews(), | ||
| } ); | ||
| return ( | ||
| <DashboardWidgetRow className={ classes }> | ||
| <DashboardWidget className="dashboard__process-orders-total"> | ||
| <span className="dashboard__process-orders-value">{ orders.length }</span> | ||
| <span className="dashboard__process-orders-label">{ orderCountPhrase }</span> | ||
| </DashboardWidget> | ||
| <DashboardWidget className="dashboard__process-orders-revenue"> | ||
| <span className="dashboard__process-orders-value"> | ||
| { formatCurrency( ordersRevenue, currencyValue ) || ordersRevenue } | ||
| </span> | ||
| <span className="dashboard__process-orders-label">{ translate( '💰 Revenue' ) }</span> | ||
|
There was a problem hiding this comment.
|
||
| </DashboardWidget> | ||
| <DashboardWidget className="dashboard__process-orders-action"> | ||
| <Button href={ getLink( '/store/orders/:site', site ) }> | ||
| { translate( 'Process orders' ) } | ||
| </Button> | ||
| </DashboardWidget> | ||
| </DashboardWidgetRow> | ||
| ); | ||
| }; | ||
|
|
||
| possiblyRenderReviewsWidget = () => { | ||
| if ( ! this.shouldShowPendingReviews() ) { | ||
| return null; | ||
| } | ||
|
|
||
| const { site, pendingReviews, translate } = this.props; | ||
| const countText = translate( '%d pending review', '%d pending reviews', { | ||
| args: [ pendingReviews ], | ||
| count: pendingReviews, | ||
| } ); | ||
|
|
||
| return ( | ||
| <DashboardWidget className="dashboard__reviews-widget" title={ countText } width="third"> | ||
| <Button href={ getLink( '/store/reviews/:site', site ) }> | ||
| { translate( 'Moderate', { context: 'Product reviews widget moderation button' } ) } | ||
| </Button> | ||
| </DashboardWidget> | ||
| ); | ||
| }; | ||
|
|
||
|
|
@@ -138,7 +152,7 @@ class ManageOrdersView extends Component { | |
| ); | ||
| }; | ||
|
|
||
| render() { | ||
| const { site, translate, orders, user } = this.props; | ||
| return ( | ||
| <div className="dashboard__manage-has-orders"> | ||
|
|
@@ -156,34 +170,33 @@ class ManageOrdersView extends Component { | |
|
|
||
| <LabelsSetupNotice /> | ||
|
|
||
| <DashboardWidgetRow> | ||
| { this.possiblyRenderProcessOrdersWidget() } | ||
| { this.possiblyRenderReviewsWidget() } | ||
| </DashboardWidgetRow> | ||
|
|
||
| <DashboardWidget | ||
| className="dashboard__reports-widget" | ||
| image="/calypso/images/extensions/woocommerce/woocommerce-reports.svg" | ||
| imagePosition="right" | ||
| title={ translate( 'Reports' ) } | ||
| > | ||
| <p> | ||
| { translate( | ||
| 'See a detailed breakdown of how your store is doing on the stats screen.' | ||
| ) } | ||
| </p> | ||
| <p> | ||
| <Button href={ getLink( '/store/stats/orders/day/:site', site ) }> | ||
| { orders.length ? translate( 'View full reports' ) : translate( 'View reports' ) } | ||
| </Button> | ||
| </p> | ||
| </DashboardWidget> | ||
|
|
||
| { this.possiblyRenderShareWidget() } | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| function mapStateToProps( state ) { | ||
|
|
||
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
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.
Since this is live and likely won't be turned off, we could just remove this logic now that you are updating this component. Thought it could also be done in a follow-up PR that removes the config settings too.