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

Improve UX/UI of enabling performance features via standalone plugins #1091

Merged
merged 10 commits into from
Apr 1, 2024
Merged

Improve UX/UI of enabling performance features via standalone plugins #1091

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
81b052c
Initial changes
mukeshpanchal27 Mar 26, 2024
ba46e01
Merge branch 'trunk' into fix/1031-improve-ui
mukeshpanchal27 Mar 27, 2024
b71fdc5
Apply suggestions from code review
mukeshpanchal27 Mar 27, 2024
2630a2f
Use admin action approach
mukeshpanchal27 Mar 27, 2024
a9cf6b3
Address review feedbacks
mukeshpanchal27 Mar 28, 2024
7149848
Merge branch 'trunk' into fix/1031-improve-ui
mukeshpanchal27 Mar 29, 2024
6a528b7
Apply suggestions from code review
mukeshpanchal27 Mar 29, 2024
46357b0
Added sanitize for file
mukeshpanchal27 Mar 29, 2024
ca50cf0
Merge branch 'trunk' into fix/1031-improve-ui
felixarntz Mar 29, 2024
03fea45
Update CSS for new version
mukeshpanchal27 Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
49 changes: 0 additions & 49 deletions includes/admin/js/perflab-plugin-management.js
View file
Open in desktop

This file was deleted.

186 changes: 97 additions & 89 deletions includes/admin/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,13 @@ function perflab_add_features_page() {
*/
function perflab_load_features_page() {
// Handle script enqueuing for settings page.
add_action( 'admin_enqueue_scripts', 'perflab_enqueue_modules_page_scripts' );
add_action( 'admin_enqueue_scripts', 'perflab_enqueue_features_page_scripts' );

// Handle admin notices for settings page.
add_action( 'admin_notices', 'perflab_plugin_admin_notices' );

// Handle style for settings page.
add_action( 'admin_head', 'perflab_print_features_page_style' );
}

/**
Expand Down Expand Up @@ -204,137 +207,142 @@ function perflab_dismiss_wp_pointer_wrapper() {
* Callback function to handle admin scripts.
*
* @since 2.8.0
* @since n.e.x.t Renamed to perflab_enqueue_features_page_scripts().
*/
function perflab_enqueue_modules_page_scripts() {
wp_enqueue_script( 'updates' );

wp_localize_script(
'updates',
'_wpUpdatesItemCounts',
array(
'settings' => array(
'totals' => wp_get_update_data(),
),
)
);

function perflab_enqueue_features_page_scripts() {
wp_enqueue_script( 'thickbox' );
wp_enqueue_style( 'thickbox' );

wp_enqueue_script( 'plugin-install' );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved

wp_enqueue_script(
'perflab-plugin-management',
plugin_dir_url( __FILE__ ) . 'js/perflab-plugin-management.js',
array( 'jquery' ),
'1.0.0',
array(
'in_footer' => true,
'strategy' => 'defer',
)
);
}

/**
* Callback function hooked to admin_action_perflab_activate_plugin to handle plugin activation.
* Callback for handling installation/activation of plugin.
*
* @since 2.8.0
* @since n.e.x.t
*/
function perflab_activate_plugin() {
// Do not proceed if plugin query arg is not present.
if ( empty( $_GET['plugin'] ) ) {
return;
function perflab_install_activate_plugin_callback() {
check_admin_referer( 'perflab_install_activate_plugin' );

require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
require_once ABSPATH . 'wp-admin/includes/class-wp-ajax-upgrader-skin.php';

if ( ! isset( $_GET['slug'] ) ) {
wp_die( esc_html__( 'Missing required parameter.', 'performance-lab' ) );
}

$plugin = sanitize_text_field( wp_unslash( $_GET['plugin'] ) );
$plugin_slug = sanitize_text_field( wp_unslash( $_GET['slug'] ) );

check_admin_referer( "perflab_activate_plugin_{$plugin}" );
if ( ! $plugin_slug ) {
wp_die( esc_html__( 'Invalid plugin.', 'performance-lab' ) );
}

$is_plugin_installed = ! isset( $_GET['file'] ) || ! $_GET['file'];

// Install the plugin if it is not installed yet.
if ( $is_plugin_installed ) {
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
// Check if the user have plugin installation capability.
if ( ! current_user_can( 'install_plugins' ) ) {
wp_die( esc_html__( 'Sorry, you are not allowed to manage plugins for this site. Please contact the administrator.', 'performance-lab' ) );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
}

$api = perflab_query_plugin_info( $plugin_slug );

// Return early if plugin API returns an error.
if ( ! $api ) {
wp_die( esc_html__( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server’s configuration.', 'performance-lab' ) );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
}

// Replace new Plugin_Installer_Skin with new Quiet_Upgrader_Skin when output needs to be suppressed.
$skin = new WP_Ajax_Upgrader_Skin( array( 'api' => $api ) );
$upgrader = new Plugin_Upgrader( $skin );
$result = $upgrader->install( $api['download_link'] );

if ( is_wp_error( $result ) ) {
wp_die( esc_html( $result->get_error_message() ) );
} elseif ( is_wp_error( $skin->result ) ) {
wp_die( esc_html( $skin->result->get_error_message() ) );
} elseif ( $skin->get_errors()->has_errors() ) {
wp_die( esc_html( $skin->get_error_messages() ) );
}

// If `$plugin` is a plugin slug rather than a plugin basename, determine the full plugin basename.
if ( ! str_contains( $plugin, '/' ) ) {
$plugins = get_plugins( '/' . $plugin );
$plugins = get_plugins( '/' . $plugin_slug );

if ( empty( $plugins ) ) {
wp_die( esc_html__( 'Plugin not found.', 'default' ) );
}

$plugin_file_names = array_keys( $plugins );
$plugin = $plugin . '/' . $plugin_file_names[0];
$plugin_basename = $plugin_slug . '/' . $plugin_file_names[0];
} else {
$plugin_basename = $_GET['file'];
}

if ( ! current_user_can( 'activate_plugin', $plugin ) ) {
wp_die( esc_html__( 'Sorry, you are not allowed to activate this plugin.', 'default' ) );
if ( ! current_user_can( 'activate_plugin', $plugin_basename ) ) {
wp_die( esc_html__( 'Sorry, you are not allowed to manage plugins for this site. Please contact the administrator.', 'performance-lab' ) );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
}

// Activate the plugin in question and return to prior screen.
$do_plugin_activation = activate_plugins( $plugin );
$referer = wp_get_referer();
if ( ! is_wp_error( $do_plugin_activation ) ) {
$referer = add_query_arg(
array(
'activate' => true,
),
$referer
);
$result = activate_plugin( $plugin_basename );
if ( is_wp_error( $result ) ) {
wp_die( esc_html( $result->get_error_messages() ) );
}

if ( wp_safe_redirect( $referer ) ) {
$url = add_query_arg(
array(
'page' => PERFLAB_SCREEN,
'activate' => 'true',
),
admin_url( 'options-general.php' )
);

if ( wp_safe_redirect( $url ) ) {
exit;
}
}
add_action( 'admin_action_perflab_activate_plugin', 'perflab_activate_plugin' );
mukeshpanchal27 marked this conversation as resolved.
Show resolved Hide resolved
add_action( 'admin_action_perflab_install_activate_plugin', 'perflab_install_activate_plugin_callback' );

/**
* Callback function hooked to admin_action_perflab_deactivate_plugin to handle plugin deactivation.
* Callback function to handle admin inline style.
*
* @since 2.8.0
* @since n.e.x.t
*/
function perflab_deactivate_plugin() {
// Do not proceed if plugin query arg is not present.
if ( empty( $_GET['plugin'] ) ) {
return;
function perflab_print_features_page_style() {
?>
<style type="text/css">
.plugin-card .name, .plugin-card .desc {
margin-left: 0;
}

// The plugin being deactivated.
$plugin = sanitize_text_field( wp_unslash( $_GET['plugin'] ) );

check_admin_referer( "perflab_deactivate_plugin_{$plugin}" );

if ( ! current_user_can( 'deactivate_plugin', $plugin ) ) {
wp_die( esc_html__( 'Sorry, you are not allowed to deactivate this plugin.', 'default' ) );
}

// Deactivate the plugin in question and return to prior screen.
deactivate_plugins( $plugin );
$referer = add_query_arg(
array(
'deactivate' => true,
),
wp_get_referer()
);
if ( wp_safe_redirect( $referer ) ) {
exit;
.plugin-card-top {
min-height: auto;
}
</style>
<?php
}
add_action( 'admin_action_perflab_deactivate_plugin', 'perflab_deactivate_plugin' );

/**
* Callback function hooked to admin_notices to render admin notices on the plugin's screen.
*
* @since 2.8.0
*/
function perflab_plugin_admin_notices() {
if ( ! current_user_can( 'install_plugins' ) ) {
wp_admin_notice(
esc_html__( 'Due to your site\'s configuration, you may not be able to activate the performance features, unless the underlying plugin is already installed. Please install the relevant plugins manually.', 'performance-lab' ),
array(
'type' => 'warning',
)
);
return;
}

if ( isset( $_GET['activate'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
?>
<div class="notice notice-success is-dismissible">
<p><?php esc_html_e( 'Plugin activated.', 'default' ); ?></p>
</div>
<?php
} elseif ( isset( $_GET['deactivate'] ) ) { // phpcs:ignore WordPress.Security.NonceVerification.Recommended
?>
<div class="notice notice-success is-dismissible">
<p><?php esc_html_e( 'Plugin deactivated.', 'default' ); ?></p>
</div>
<?php
wp_admin_notice(
esc_html__( 'Feature activated.', 'performance-lab' ),
array(
'type' => 'success',
'dismissible' => true,
)
);
}
}