Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust the logic of display of the store setup link. (https://github.com/woocommerce/woocommerce-admin/pull/5180)

This commit is contained in:
Sam Seay 2020-09-25 09:23:27 +12:00 committed by GitHub
parent ce3dab196e
commit e6d5786d1b
2 changed files with 89 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
plugins/woocommerce-admin/client/header/activity-panel/index.js
View File

@ -128,79 +128,80 @@ export class ActivityPanel extends Component {
query,
} = this.props;
// Don't show the inbox on the Home screen.
const { location } = this.props.getHistory();
const showInbox = isEmbedded || location.pathname !== '/';
const isPerformingSetupTask =
query.task &&
! query.path &&
( requestingTaskListOptions === true ||
( taskListHidden === false && taskListComplete === false ) );
if ( ! taskListComplete && showInbox ) {
return [
{
// Don't show the inbox on the Home screen.
const { location } = this.props.getHistory();
const showInbox =
( isEmbedded || location.pathname !== '/' ) &&
! isPerformingSetupTask;
const inbox = showInbox
? {
name: 'inbox',
title: __( 'Inbox', 'woocommerce-admin' ),
icon: <i className="material-icons-outlined">inbox</i>,
unread: hasUnreadNotes,
},
{
name: 'setup',
title: __( 'Store Setup', 'woocommerce-admin' ),
icon: <SetupProgress />,
},
isPerformingSetupTask && {
}
: null;
const setup =
! taskListComplete && ! isPerformingSetupTask
? {
name: 'setup',
title: __( 'Store Setup', 'woocommerce-admin' ),
icon: <SetupProgress />,
}
: null;
const ordersStockAndReviews =
taskListComplete && ! isPerformingSetupTask
? [
{
name: 'orders',
title: __( 'Orders', 'woocommerce-admin' ),
icon: <PagesIcon />,
unread: hasUnreadOrders,
},
manageStock === 'yes' && {
name: 'stock',
title: __( 'Stock', 'woocommerce-admin' ),
icon: (
<i className="material-icons-outlined">
widgets
</i>
),
unread: hasUnreadStock,
},
reviewsEnabled === 'yes' && {
name: 'reviews',
title: __( 'Reviews', 'woocommerce-admin' ),
icon: (
<i className="material-icons-outlined">
star_border
</i>
),
unread: hasUnapprovedReviews,
},
].filter( Boolean )
: [];
const help = isPerformingSetupTask
? {
name: 'help',
title: __( 'Help', 'woocommerce-admin' ),
icon: <i className="material-icons-outlined">support</i>,
},
].filter( Boolean );
}
icon: <Icon icon={ lifesaver } />,
}
: null;
return [
! isPerformingSetupTask && showInbox
? {
name: 'inbox',
title: __( 'Inbox', 'woocommerce-admin' ),
icon: <i className="material-icons-outlined">inbox</i>,
unread: hasUnreadNotes,
}
: null,
! isPerformingSetupTask && {
name: 'orders',
title: __( 'Orders', 'woocommerce-admin' ),
icon: <PagesIcon />,
unread: hasUnreadOrders,
},
! isPerformingSetupTask && manageStock === 'yes'
? {
name: 'stock',
title: __( 'Stock', 'woocommerce-admin' ),
icon: (
<i className="material-icons-outlined">widgets</i>
),
unread: hasUnreadStock,
}
: null,
! isPerformingSetupTask && reviewsEnabled === 'yes'
? {
name: 'reviews',
title: __( 'Reviews', 'woocommerce-admin' ),
icon: (
<i className="material-icons-outlined">
star_border
</i>
),
unread: hasUnapprovedReviews,
}
: null,
isPerformingSetupTask && {
name: 'help',
title: __( 'Help', 'woocommerce-admin' ),
icon: <Icon icon={ lifesaver } />,
},
].filter( Boolean );
return [ inbox, ...ordersStockAndReviews, setup, help ].filter(
Boolean
);
}
getPanelContent( tab ) {

28
plugins/woocommerce-admin/client/header/activity-panel/test/index.js
View File

@ -120,4 +120,32 @@ describe( 'Activity Panel', () => {
// Expect that "Help" tab is absent.
expect( screen.queryByText( 'Help' ) ).toBeNull();
} );
it( 'should only render the store setup link when TaskList is not complete', () => {
const { queryByText, rerender } = render(
<ActivityPanel
requestingTaskListOptions={ false }
taskListComplete={ false }
taskListHidden={ false }
query={ {
task: 'products',
} }
/>
);
expect( queryByText( 'Store Setup' ) ).toBeDefined();
rerender(
<ActivityPanel
requestingTaskListOptions={ false }
taskListComplete
taskListHidden={ false }
query={ {
task: 'products',
} }
/>
);
expect( queryByText( 'Store Setup' ) ).toBeNull();
} );
} );