Skip to content
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

Jump to bottom

Admin Page: new Performance tab. #10941

Merged
merged 4 commits into from
Dec 18, 2018
Merged

Admin Page: new Performance tab. #10941

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
504f2cb
Admin Page: new Performance tab.
jeherve Dec 11, 2018
1ef419a
Add settings description
keoshi Dec 13, 2018
a68d015
Fix imports
jeherve Dec 18, 2018
736819d
Make the new Performance tab the default tab in Jetpack settings
jeherve Dec 18, 2018
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
1 change: 1 addition & 0 deletions _inc/client/admin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ function render() {
<Route path="/settings" name={ i18n.translate( 'Settings', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/discussion" name={ i18n.translate( 'Discussion', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/security" name={ i18n.translate( 'Security', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/performance" name={ i18n.translate( 'Performance', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/traffic" name={ i18n.translate( 'Traffic', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/writing" name={ i18n.translate( 'Writing', { context: 'Navigation item.' } ) } component={ Main } />
<Route path="/sharing" name={ i18n.translate( 'Sharing', { context: 'Navigation item.' } ) } component={ Main } />
Expand Down
225 changes: 113 additions & 112 deletions _inc/client/components/navigation-settings/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
/**
* External dependencies
*
* @format
*/

import PropTypes from 'prop-types';
import React from 'react';
import createReactClass from 'create-react-class';
Expand All @@ -18,14 +21,11 @@ import intersection from 'lodash/intersection';
/**
* Internal dependencies
*/
import {
filterSearch,
getSearchTerm
} from 'state/search';
import { filterSearch, getSearchTerm } from 'state/search';
import {
userCanManageModules as _userCanManageModules,
userIsSubscriber as _userIsSubscriber,
userCanPublish
userCanPublish,
} from 'state/initial-state';
import { isSiteConnected, isCurrentUserLinked } from 'state/connection';
import { isModuleActivated, getModules } from 'state/modules';
Expand Down Expand Up @@ -81,11 +81,11 @@ export const NavigationSettings = createReactClass( {
trackNavClick( target ) {
analytics.tracks.recordJetpackClick( {
target: 'nav_item',
path: target
path: target,
} );
},

/**
/**
* The UrlSearch mixin callback to form a new location href string.
*
* @param {string} href the current location string
Expand All @@ -100,7 +100,7 @@ export const NavigationSettings = createReactClass( {
return '#' + splitHash[ 0 ] + ( keyword ? '?term=' + keyword : '' );
},

/**
/**
* Check that the module list includes at least one of these modules.
*
* @param {array} modules Modules that are probably included in the module list.
Expand All @@ -120,87 +120,91 @@ export const NavigationSettings = createReactClass( {
if ( this.props.userCanManageModules ) {
navItems = (
<NavTabs selectedText={ this.props.route.name }>
{
this.hasAnyOfThese( [
'masterbar',
'markdown',
'after-the-deadline',
'custom-content-types',
'photon',
'carousel',
'post-by-email',
'infinite-scroll',
'minileven'
] ) && (
<NavItem
path="#writing"
onClick={ this.handleClickForTracking( 'writing' ) }
selected={ this.props.route.path === '/writing' || this.props.route.path === '/settings' }>
{ __( 'Writing', { context: 'Navigation item.' } ) }
</NavItem>
)
}
{
this.hasAnyOfThese( [
'publicize',
'sharedaddy',
'likes'
] ) && (
<NavItem
path="#sharing"
onClick={ this.handleClickForTracking( 'sharing' ) }
selected={ this.props.route.path === '/sharing' }>
{ __( 'Sharing', { context: 'Navigation item.' } ) }
</NavItem>
)
}
{
this.hasAnyOfThese( [
'comments',
'gravatar-hovercards',
'markdown',
'subscriptions'
] ) && (
<NavItem
path="#discussion"
onClick={ this.handleClickForTracking( 'discussion' ) }
selected={ this.props.route.path === '/discussion' }>
{ __( 'Discussion', { context: 'Navigation item.' } ) }
</NavItem>
)
}
{
this.hasAnyOfThese( [
'seo-tools',
'wordads',
'stats',
'related-posts',
'verification-tools',
'sitemaps',
'google-analytics'
] ) && (
{ this.hasAnyOfThese( [
'carousel',
'lazy-images',
'photon',
'photon-cdn',
'search',
'videopress',
] ) && (
<NavItem
path="#traffic"
onClick={ this.handleClickForTracking( 'traffic' ) }
selected={ this.props.route.path === '/traffic' }>
{ __( 'Traffic', { context: 'Navigation item.' } ) }
path="#performance"
onClick={ this.handleClickForTracking( 'performance' ) }
selected={
this.props.route.path === '/performance' || this.props.route.path === '/settings'
}
>
{ __( 'Performance', { context: 'Navigation item.' } ) }
</NavItem>
)
}
{
( this.hasAnyOfThese( [
'protect',
'sso',
'vaultpress'
] ) || this.props.isPluginActive( 'akismet/akismet.php' ) ) && (
<NavItem
path="#security"
onClick={ this.handleClickForTracking( 'security' ) }
selected={ this.props.route.path === '/security' }>
{ __( 'Security', { context: 'Navigation item.' } ) }
</NavItem>
)
}
) }
{ this.hasAnyOfThese( [
'masterbar',
'markdown',
'after-the-deadline',
'custom-content-types',
'post-by-email',
'infinite-scroll',
'minileven',
] ) && (
<NavItem
path="#writing"
onClick={ this.handleClickForTracking( 'writing' ) }
selected={ this.props.route.path === '/writing' }
>
{ __( 'Writing', { context: 'Navigation item.' } ) }
</NavItem>
) }
{ this.hasAnyOfThese( [ 'publicize', 'sharedaddy', 'likes' ] ) && (
<NavItem
path="#sharing"
onClick={ this.handleClickForTracking( 'sharing' ) }
selected={ this.props.route.path === '/sharing' }
>
{ __( 'Sharing', { context: 'Navigation item.' } ) }
</NavItem>
) }
{ this.hasAnyOfThese( [
'comments',
'gravatar-hovercards',
'markdown',
'subscriptions',
] ) && (
<NavItem
path="#discussion"
onClick={ this.handleClickForTracking( 'discussion' ) }
selected={ this.props.route.path === '/discussion' }
>
{ __( 'Discussion', { context: 'Navigation item.' } ) }
</NavItem>
) }
{ this.hasAnyOfThese( [
'seo-tools',
'wordads',
'stats',
'related-posts',
'verification-tools',
'sitemaps',
'google-analytics',
] ) && (
<NavItem
path="#traffic"
onClick={ this.handleClickForTracking( 'traffic' ) }
selected={ this.props.route.path === '/traffic' }
>
{ __( 'Traffic', { context: 'Navigation item.' } ) }
</NavItem>
) }
{ ( this.hasAnyOfThese( [ 'protect', 'sso', 'vaultpress' ] ) ||
this.props.isPluginActive( 'akismet/akismet.php' ) ) && (
<NavItem
path="#security"
onClick={ this.handleClickForTracking( 'security' ) }
selected={ this.props.route.path === '/security' }
>
{ __( 'Security', { context: 'Navigation item.' } ) }
</NavItem>
) }
</NavTabs>
);
} else if ( this.props.isSubscriber ) {
Expand All @@ -209,32 +213,29 @@ export const NavigationSettings = createReactClass( {
if ( ! this.props.isModuleActivated( 'publicize' ) || ! this.props.userCanPublish ) {
sharingTab = '';
} else {
sharingTab = this.hasAnyOfThese( [
'publicize'
] ) && (
sharingTab = this.hasAnyOfThese( [ 'publicize' ] ) && (
<NavItem
path="#sharing"
onClick={ this.handleClickForTracking( 'sharing' ) }
selected={ this.props.route.path === '/sharing' }>
selected={ this.props.route.path === '/sharing' }
>
{ __( 'Sharing', { context: 'Navigation item.' } ) }
</NavItem>
);
}
navItems = (
<NavTabs selectedText={ this.props.route.name }>
{
this.hasAnyOfThese( [
'after-the-deadline',
'post-by-email'
] ) && (
<NavItem
path="#writing"
onClick={ this.handleClickForTracking( 'writing' ) }
selected={ this.props.route.path === '/writing' || this.props.route.path === '/settings' }>
{ __( 'Writing', { context: 'Navigation item.' } ) }
</NavItem>
)
}
{ this.hasAnyOfThese( [ 'after-the-deadline', 'post-by-email' ] ) && (
<NavItem
path="#writing"
onClick={ this.handleClickForTracking( 'writing' ) }
selected={
this.props.route.path === '/writing' || this.props.route.path === '/settings'
}
>
{ __( 'Writing', { context: 'Navigation item.' } ) }
</NavItem>
) }
{
// Give only Publicize to non admin users
sharingTab
Expand All @@ -252,11 +253,11 @@ export const NavigationSettings = createReactClass( {
</SectionNav>
</div>
);
}
},
} );

NavigationSettings.contextTypes = {
router: PropTypes.object.isRequired
router: PropTypes.object.isRequired,
};

NavigationSettings.propTypes = {
Expand All @@ -266,7 +267,7 @@ NavigationSettings.propTypes = {
isLinked: PropTypes.bool.isRequired,
isSiteConnected: PropTypes.bool.isRequired,
isModuleActivated: PropTypes.func.isRequired,
searchHasFocus: PropTypes.bool.isRequired
searchHasFocus: PropTypes.bool.isRequired,
};

NavigationSettings.defaultProps = {
Expand All @@ -276,11 +277,11 @@ NavigationSettings.defaultProps = {
isLinked: false,
isSiteConnected: false,
isModuleActivated: noop,
searchHasFocus: false
searchHasFocus: false,
};

export default connect(
( state ) => {
state => {
return {
userCanManageModules: _userCanManageModules( state ),
isSubscriber: _userIsSubscriber( state ),
Expand All @@ -290,12 +291,12 @@ export default connect(
isModuleActivated: module => isModuleActivated( state, module ),
moduleList: getModules( state ),
isPluginActive: plugin_slug => isPluginActive( state, plugin_slug ),
searchTerm: getSearchTerm( state )
searchTerm: getSearchTerm( state ),
};
},
( dispatch ) => {
dispatch => {
return {
searchForTerm: ( term ) => dispatch( filterSearch( term ) )
searchForTerm: term => dispatch( filterSearch( term ) ),
};
}
)( NavigationSettings );
1 change: 1 addition & 0 deletions _inc/client/components/non-admin-view/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class NonAdminView extends React.Component {
case '/settings':
case '/writing':
case '/sharing':
case '/performance':
if ( ! this.props.isSubscriber ) {
navComponent = <NavigationSettings { ...this.props } />;
pageComponent = <SearchableSettings
Expand Down
2 changes: 2 additions & 0 deletions _inc/client/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,7 @@ class Main extends React.Component {
case '/security':
case '/traffic':
case '/discussion':
case '/performance':
case '/writing':
case '/sharing':
case '/privacy':
Expand Down Expand Up @@ -281,6 +282,7 @@ window.wpNavMenuClassChange = function() {
'#/general',
'#/discussion',
'#/security',
'#/performance',
'#/traffic',
'#/writing',
'#/sharing',
Expand Down
Loading