Skip to content

Commit

Permalink
[CMSP-992] plugin documentation update (#273)
Browse files Browse the repository at this point in the history
* add initial admin interface class
hook to mu-plugin > 1.4.0

* some more scaffolding

* require at least 6.4

* don't show notices if wp_admin_notice doesn't exist

* add notice if mu-plugin was not found

* add notice if the mu-plugin is old

* fix link and change decimal to string

* use spaces instead of line breaks

* add helper function to get current max age
this is either set in the mu-plugin or empty. if empty, it should default to 1 week

* add notice if less than 1 week but not == 600 seconds

* add docblock

* add translator comments

* update tested up to and requires at least values in readmes

* version bump

* bump composer deps

* don't display the warnings if we aren't on the pantheon cache admin page

* convert static class to a namespace
there's no reason to make this a class since we're not using any class features

* add a bootstrapper for namespace-only files

* lint

* escape the wp_die message

* use a helper for humanized time calculations

* we still need to test the current max age

* pass the current max age to the message, too
and be specific that we're talking about seconds

* use the filterable value for default max age
because it could be something different

* add a helper function for retrieving the default max age
this is helpful so we can always return the filtered value

* also display the seconds in the successful test

* rank the max age value
don't say it's "very low" unless that's actually accurate.

* add caching to the ranked compare

* make the color more severe if it's a bigger issue

* change the color of the admin notice based on the severity of the diff

* clear the transient when the option is updated

* break notice type into a variable

* fix the translator note

* keep the rank but hide it from the dom

* add unit tests

* add initial behat test
let's just see if we can assume this will work

* fix failing test

* specify the element where the notices are

* add site health check test

* actually save the changes

* remove max age check
only exists in an html comment anyway

* simplify the site health check

* add the message when you expand the accordion

* add other site health things

* change press to click?

* add "open the accordion" as a custom step

* move behat stuff around

* move stuff around again

* update the behat.yml

* remove custom context and try "when I follow"

* move to checking the text inside the elements

* target the hidden element

* use hidden='hidden'

* call it a div

* simplify the tests

* remove press
since we can't actually press

* it did actually find the right heading
maybe it will find the right text?

* add @\since tags

* add changelog and upgrade notice

* let's try checking for some of the hidden text

* period at the end of the sentence

* add the ranks back
this shows us that our ranking function is working

* add the messages

* remove age rank tests
because goutte doesn't natively interpret html comments

* add github testing badge
since phpunit is no longer run on circle

* add script to maybe skip behat tests if we don't need to run them

* add step to workflow

* do not run if the circle config changes

* also ignore if scripts (that aren't behat-related) have changed

* fix the logic (again)

* one more flippity flip

* remove the "ignoring" message
it's actually implied by the fact that is_ignored is checked

* use function to determine if a file should be ignored

Co-authored-by: Phil Tyler <[email protected]>

* update changelog to note mu-plugin updates

* add functionality to automatically set the default_ttl if it was set to 600

* trigger the setting change and display an admin notice informing users it was done
only show the notice to users who haven't already seen it and who can manage_options

* add unit tests for set_max_age_to_default

* move the max age update notice to the bootstrap

* remove the set_max_age_updated helper
this wasn't working and meant that we were needing to make multiple update options in a short space of time. we might have actually been running into race conditions where one update was overwriting the other one.

* use a new option for the updated flag

* add _notice to the user meta key so it's distinct from the new option

* update tests for new changes

* add translator note

* user notice about 600 second update is not dismissable
because it only appears once

* don't show seconds in updated notice

* pass the function into the apply_filter hook
so you can selectively disable specific notices

* add docblock

* add test for the notice

* return the value of disable_notices
rather than hard-coded "false"

* Add scenario to set max-age to 600 and auto-update to the default value

* here's a behat test that might not work
not sure if it will know what pantheon-cache[default-ttl] is without giving it an element to look at.

* fixed it based on upstream tests

* refresh the page

* go to instead of refresh
since refresh isn't a thing ¯\_(ツ)_/¯

* remove all the old npm stuff and use all new npm stuff

* add node build to the build & tag workflow

* add del package

* repurpos gruntfile into gulpfile

* repackage gulpfile and package.json as a module

* add additional test failure messaging

* gitignore assets

* don't export the gulpfile

* invoke sass correctly

* proper sassing

* add a main.scss file

* compiler tweaks

* use concat

* initial styles

* enqueue css

* use the filter added in pantheon-systems/pantheon-mu-plugin#46 to add header

* some initial styles for the max age box

* add a global admin notice that appears once

* remove seconds from the notice

* test the new notice

* set dismissable depending on which notice we're showing

* show the max age rank html comment

* fix the conditionals for cs

* update behat tests for new notice language

* bugfix: don't update user meta that max_age was updated if it hasn't been

* add one more thing to test in behat

* add a test for the error, specifically

* add a test for the warning

* simplify the conditionals

* lint

* specify the pages that we're on?

* remove specific element

* fix typo

* take out the dashboard main page goto

* validate the setting was saved

* let's just remove the 5 days notice

* just remove the test
we have similar things being tested in phpunit

* we can actually remove current_max_age >= WEEK_IN_SECONDS
this is covered by max_age_rank. if max_age_rank is 0 it, by definition, means that the current max age is >= WEEK_IN_SECONDS

* if we're only comparing two things, we don't need to break the if clauses up

* we do want to warn users if they have manually set their max age to 600
we just don't want to warn them if we're about to (or just did) change it to a week for them

* there should only be one css file

* remove seconds

* check stored default_ttl value

* fix failing test

* fix translators note

* remove seconds

* remove redundant check

* tweak the logic again

* fix the test by updating the default ttl

* add the description after the input

* styles for box and info bar

* update the filter name

* filter the input box

* add a padding helper

* ...and use it

* lint

* add styling for links in the info bar.

* no padding on the right
padding the right makes the bar flush with the edge of the box

* adjust h3 margin
so it looks better when there's no banner

* style the select input

* don't render the info bar

* use wp_kses_post instead of esc_html_e
we might want to add links to this bar

* helper function for available dropdown options and make it filterable

* Refactor default_ttl_input function to handle custom options and filterable dropdown

* remove seconds from behat tests

* add a period for dumb lint rule

* remove hyphen from max-age
in everything user-facing

* update the tests

* conditionally append a timestamp to the css version
to refresh it on each page load if debug is true

* don't show the input box if the ttl is unset

* remove filters in teardown

* remove hyphen in tests

* specify method visibility

* test the setting description callback

* test the default ttl option input callback

* test max_age_options and filter

* add a behat test for the select input

* maybe change the then

* remove all hyphens

* be more specific about the select input

* try using the class and the select

* let's try checking to see if the response contains the selected option

* print for debugging

* one last try before I give up

* remove the new behat test

* use a simple true/false gate for max_age header

* display a warning if the default_ttl is saved to a value that's not one of the default optiosn

* show the dropdown with the custom value
so a new value can be selected from the droptdown when prompted

* remove placeholder comment

* gix the global warning shown logic

* make sure to take into consideration custom and filtered

* bail early if the max age is filtered

* better comment

* remove value range entirely

* remove recommendation if filtered

* break out custom and filtered outputs
filtered displays the grayed out input box
custom adds to the dropdown

* update tests

* translator note

* move the debug note

Co-authored-by: Phil Tyler <[email protected]>

* add since and return values

* push the description down a bit

* personalized message based on current cache max age

* remove current when not necessary

* update tests, add a data provider

* update changelog

* cache max age filter docs

* document filter to disable notices

* emdash

Co-authored-by: Phil Tyler <[email protected]>

* add missing links

* emdash

* update the 2.0.0 upgrade notice

* add upgrade notice to .md

* remove linebreak

* add -dev tag to versions

* fix readme spacing

---------

Co-authored-by: Phil Tyler <[email protected]>
  • Loading branch information
jazzsequence and pwtyler authored May 23, 2024
1 parent a399b1a commit abe003f
Show file tree
Hide file tree
Showing 7 changed files with 348 additions and 182 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 46 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Automatically clear related pages from Pantheon's Edge when you update content.

## Description ##

[![Actively Maintained](https://img.shields.io/badge/Pantheon-Actively_Maintained-yellow?logo=pantheon&color=FFDC28)](https://pantheon.io/docs/oss-support-levels#actively-maintained-support)
[![Actively Maintained](https://img.shields.io/badge/Pantheon-Actively_Maintained-yellow?logo=pantheon&color=FFDC28)](https://pantheon.io/docs/oss-support-levels#actively-maintained-support)
[![Lint and Test](https://github.com/pantheon-systems/pantheon-advanced-page-cache/actions/workflows/lint-test.yml/badge.svg)](https://github.com/pantheon-systems/pantheon-advanced-page-cache/actions/workflows/lint-test.yml)
[![CircleCI](https://circleci.com/gh/pantheon-systems/pantheon-advanced-page-cache.svg?style=svg)](https://circleci.com/gh/pantheon-systems/pantheon-advanced-page-cache)

Expand Down Expand Up @@ -163,6 +163,20 @@ add_filter( 'pantheon_purge_post_type_ignored', 'filter_ignored_posts' );

This will prevent the cache from being purged if the given post type is updated.

### Setting the Cache Max Age with a filter

The cache max age setting is controlled by the [Pantheon Page Cache](https://docs.pantheon.io/guides/wordpress-configurations/wordpress-cache-pluginhttps://docs.pantheon.io/guides/wordpress-configurations/wordpress-cache-plugin) admin page. As of 2.0.0, there are three cache age options by default — 1 week, 1 month, 1 year. Pantheon Advanced Page Cache automatically purges the cache of updated and related posts and pages, but you might want to override the cache max age value and set it programmatically. In this case, you can use the `pantheon_cache_default_max_age` filter added in [Pantheon MU plugin 1.4.0+](https://docs.pantheon.io/guides/wordpress-configurations/wordpress-cache-plugin#override-the-default-max-age). For example:

```php
add_filter( 'pantheon_cache_default_max_age', function() {
return 10 * DAY_IN_SECONDS;
} );
```

When the cache max age is filtered in this way, the admin option is disabled and a notice is displayed.

![Page Cache Max Age with filtered value](.wordpress-org/screenshots/page-cache-max-age-filtered.png)

## WP-CLI Commands ##

This plugin implements a variety of [WP-CLI](https://wp-cli.org) commands. All commands are grouped into the `wp pantheon cache` namespace.
Expand Down Expand Up @@ -334,7 +348,7 @@ Different WordPress actions cause different surrogate keys to be purged, documen
## Surrogate Keys for taxonomy terms ##
Setting surrogate keys for posts with large numbers of taxonomies (such as WooCommerce products with a large number of global attributes) can suffer from slower queries. Surrogate keys can be skipped for 'product' post types' taxonomy terms (or any other criteria you see fit) with the following filter:

``` php
```php
function custom_should_add_terms($should_add_terms, $wp_query) {
if ( $wp_query->is_singular( 'product' ) ) {
return false;
Expand All @@ -344,6 +358,28 @@ function custom_should_add_terms($should_add_terms, $wp_query) {
add_filter('pantheon_should_add_terms', 'custom_should_add_terms', 10, 2);
```

## Other Filters ##

### `pantheon_apc_disable_admin_notices`
Since 2.0.0, Pantheon Advanced Page Cache displays a number of admin notices about your current cache max age value. You can disable these notices with the `pantheon_apc_disable_admin_notices` filter.

```php
add_filter( 'pantheon_apc_disable_admin_notices', '__return_true' );
```

Alternately, the function callback is passed into the `pantheon_apc_disable_admin_notices` filter, allowing you to specify precisely _which_ notice to disable, for example:

```php
add_filter( 'pantheon_apc_disable_admin_notices', function( $disable_notices, $callback ) {
if ( $callback === '\\Pantheon_Advanced_Page_Cache\\Admin_Interface\\admin_notice_maybe_recommend_higher_max_age' ) {
return true;
}
return $disable_notices;
}, 10, 2 );
```

The above example would disable _only_ the admin notice recommending a higher cache max age.

## Plugin Integrations ##

Pantheon Advanced Page Cache integrates with WordPress plugins, including:
Expand All @@ -356,7 +392,9 @@ See [CONTRIBUTING.md](https://github.com/pantheon-systems/pantheon-advanced-page

## Changelog ##
### 2.0.0-dev ###
* Adds new admin alerts and Site Health tests about default cache max-age settings and recommendations [[#268](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/268)]. The default Pantheon GCDN cache max-age value has been updated to 1 week in the [Pantheon MU plugin](https://github.com/pantheon-systems/pantheon-mu-plugin). For more information, see the [release note](https://docs.pantheon.io/release-notes/2024/04/pantheon-mu-plugin-1-4-0-update).
* Adds new admin alerts and Site Health tests about default cache max age settings and recommendations [[#268](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/268), [#271](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/271)]. The default Pantheon GCDN cache max age value has been updated to 1 week in the [Pantheon MU plugin](https://github.com/pantheon-systems/pantheon-mu-plugin). For more information, see the [release note](https://docs.pantheon.io/release-notes/2024/04/pantheon-mu-plugin-1-4-0-update).
* Updated UI in Pantheon Page Cache admin page when used in a Pantheon environment (with the Pantheon MU plugin). [[#272](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/272)]
* Automatically updates the cache max age to the recommended value (1 week) if it was saved at the old default value (600 seconds). [[#269](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/269)]

### 1.5.0 (March 11, 2024) ###
* Adds filter `pantheon_purge_post_type_ignored` to allow an array of post types to ignore before purging cache [[#258](https://github.com/pantheon-systems/pantheon-advanced-page-cache/pull/258)]
Expand Down Expand Up @@ -436,5 +474,10 @@ See [CONTRIBUTING.md](https://github.com/pantheon-systems/pantheon-advanced-page

## Upgrade Notice ##

### 2.0.0-dev ###
This release requires a minimum WordPress version of 6.4.0. It uses Site Health checks and the `wp_admin_notices` function to alert users to the new cache max-age default settings and recommendations. The plugin will still function with earlier versions, but you will not get the benefit of the alerts and Site Health checks.

This version also automatically updates the cache max age (set in the [Pantheon Page Cache settings](https://docs.pantheon.io/guides/wordpress-configurations/wordpress-cache-plugin)) to the recommended value (1 week) if it was saved at the old default value (600 seconds). If the cache max age was set to any other value (or not set at all), it will not be changed. A one-time notice will be displayed in the admin interface to inform administrators of this change.

### 1.3.0 ###
Note that the Pantheon Advanced Page Cache 1.3.0 release now prefixes keys on a WordPress Multisite (WPMS) with the blog ID. For users who already have this plugin installed on a WPMS, they will need to click the Clear Cache button on the settings page to generate the prefixed keys.
40 changes: 20 additions & 20 deletions inc/admin-interface.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Controller for the admin interface that builds on top of the Pantheon MU plugin.
*
* @since 2.0.0
* @since 2.0.0-dev
* @package Pantheon_Advanced_Page_Cache
*/

Expand All @@ -11,7 +11,7 @@
/**
* Kick off the important bits.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function bootstrap() {
Expand Down Expand Up @@ -47,7 +47,7 @@ function bootstrap() {
/**
* Enqueue admin assets.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function enqueue_admin_assets() {
Expand All @@ -65,7 +65,7 @@ function enqueue_admin_assets() {
/**
* Add a header to the max-age setting field.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return string
*/
function add_max_age_setting_header() {
Expand All @@ -86,7 +86,7 @@ function add_max_age_setting_header() {
/**
* Add a description to the max-age setting field.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return string
*/
function add_max_age_setting_description() {
Expand Down Expand Up @@ -121,7 +121,7 @@ function add_max_age_setting_description() {
*
* @param int $default_input The default TTL input field from the mu-plugin.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return int
*/
function update_default_ttl_input( $default_input ) {
Expand Down Expand Up @@ -159,7 +159,7 @@ function update_default_ttl_input( $default_input ) {
/**
* Filter the allowed HTML for the max-age input field.
*
* @since 2.0.0
* @since 2.0.0-dev
* @param array $allowed_html The allowed HTML.
* @return array
*/
Expand All @@ -172,7 +172,7 @@ function max_age_input_allowed_html( $allowed_html ) {
/**
* Get the default max age options. Default values are 1 week, 1 month, 1 year.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return array
*/
function max_age_options() {
Expand All @@ -194,7 +194,7 @@ function max_age_options() {
/**
* Display an admin notice if the Pantheon MU plugin was not found.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function admin_notice_no_mu_plugin() {
Expand All @@ -221,7 +221,7 @@ function admin_notice_no_mu_plugin() {
/**
* Display an admin notice if the Pantheon MU plugin is out of date.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function admin_notice_old_mu_plugin() {
Expand Down Expand Up @@ -259,7 +259,7 @@ function admin_notice_old_mu_plugin() {
/**
* Display an admin notice if the max-age is less than a week but not equal to 600 seconds.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function admin_notice_maybe_recommend_higher_max_age() {
Expand Down Expand Up @@ -329,7 +329,7 @@ function admin_notice_maybe_recommend_higher_max_age() {
*
* If the site existed prior to 1.4.0 of the mu-plugin, the default value is 600 seconds. Otherwise, the default value is 1 week.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return int
*/
function get_current_max_age() {
Expand All @@ -348,7 +348,7 @@ function get_current_max_age() {
*
* @param array $tests The Site Health tests.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return array
*/
function default_cache_max_age_test( $tests ) {
Expand All @@ -365,7 +365,7 @@ function default_cache_max_age_test( $tests ) {
*
* @param bool $recommended Whether to get the recommended max-age.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return string
*/
function humanized_max_age( $recommended = false ) {
Expand All @@ -379,7 +379,7 @@ function humanized_max_age( $recommended = false ) {
/**
* Get the default max-age.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return int
*/
function get_default_max_age() {
Expand All @@ -389,7 +389,7 @@ function get_default_max_age() {
/**
* Compare the current max-age to the default max-age.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return int A ranked value from 0 to 10 where 0 is optimal (equal to or greater than the recommended max age) and 10 is very bad.
*/
function max_age_compare() {
Expand Down Expand Up @@ -418,7 +418,7 @@ function max_age_compare() {
/**
* The GCDN cache max-age Site Health test.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return array
*/
function test_cache_max_age() {
Expand Down Expand Up @@ -484,7 +484,7 @@ function test_cache_max_age() {
/**
* Clear the max-age compare cache when the max-age is updated.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function clear_max_age_compare_cache() {
Expand All @@ -494,7 +494,7 @@ function clear_max_age_compare_cache() {
/**
* Set the default_ttl from the mu-plugin to WEEK_IN_SECONDS if it was saved as 600 seconds.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return bool
*/
function set_max_age_to_default() {
Expand Down Expand Up @@ -529,7 +529,7 @@ function set_max_age_to_default() {
/**
* Display an admin notice if the max-age was updated.
*
* @since 2.0.0
* @since 2.0.0-dev
* @return void
*/
function max_age_updated_admin_notice() {
Expand Down
Loading

0 comments on commit abe003f

Please sign in to comment.