Module Overrides: Add support to disable backups UI #10004

ebinnion · 2018-08-08T22:34:11Z

Currently, our module overrides functionality does not allow disabling UI relating to VaultPress or Backups. This is an issue for some of our partnerships where hosting partners need the ability to disable that UI.

Changes proposed in this Pull Request:

Add ability to disable backups related UI.

Testing instructions:

Checkout branch
In an integration plugin, add add_filter( 'jetpack_show_backups', '__return_false' );
Load Jetpack admin page
Ensure that backups and scanning are not mentioned in UI
Install and activate VaultPress
Ensure that backups and scanning are mentioned

Proposed changelog entry for your changes:

Adds ability to disable backups UI by filter when VaultPress is not activated.

Screenshots

After

Before

eliorivero

Looks good and just needs a couple of updates.

eliorivero · 2018-08-09T22:38:50Z

_inc/lib/admin-pages/class.jetpack-react-page.php

+				 *
+				 * @param bool $show_backups Should UI for backups be displayed? True by default.
+				 */
+				'showBackups' => is_plugin_active( 'vaultpress/vaultpress.php' ) || apply_filters( 'jetpack_show_backups', true ),


Use Jetpack::is_plugin_active() instead of is_plugin_active since that one gets plugins that were single or network activated.

eliorivero · 2018-08-09T22:42:11Z

_inc/client/plans/plan-grid.jsx

+		const hideBackupFeature = (
+			! this.props.showBackups &&
+			item &&
+			-1 !== backupFeatureIds.indexOf( item.id )


Lodash's includes function is already imported in this file so you can use it here:

includes( backupFeatureIds, item.id )

Feedback addressed.

ebinnion · 2018-08-09T23:05:56Z

Thanks for the feedback! I've addressed it in the latest commit.

eliorivero · 2018-08-10T15:56:02Z

Code is good now but found a rogue reference

ebinnion · 2018-08-10T16:31:32Z

Thanks. I've addressed that as well as a couple of others I found. 🙇

eliorivero · 2018-08-10T22:54:41Z

Sorry, when Jetpack is disconnected, there's one more reference in the screen in WP Admin > Jetpack:

and another in any WP Admin screen in the connection banner

…or hiding backups UI

… hidden

…bled

jetpackbot · 2018-08-15T15:24:05Z

This is automated (and not very smart btw) check which relies on PULL_REQUEST_TEMPLATE.We encourage you to follow that template as it helps Jetpack maintainers do their job. If you think 'Testing instructions' or 'Proposed changelog entry' are not needed for your PR - please explain why you think so. Thanks for cooperation 🤖

Generated by 🚫 dangerJS

ebinnion · 2018-08-15T15:25:37Z

Thanks for the review @eliorivero. I pushed up two commits to address.

eliorivero

Looks great now!

gravityrail · 2018-08-25T15:59:47Z

class.jetpack.php

@@ -7263,6 +7263,7 @@ public static function handle_post_authorization_actions( $activate_sso = false,
 	}

 	/**
+<<<<<<< HEAD


#9958 #9983 #9992 #10002 #10004 #10010 #10011 #10017 #10031 #10037 #10039 #10040 #10051

#9958 #9983 #9992 #10002 #10004 #10010 #10017 #10031 #10037 #10039 #10040

ebinnion added [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it General [Status] In Progress Admin Page React-powered dashboard under the Jetpack menu labels Aug 8, 2018

ebinnion added this to the 6.5 milestone Aug 8, 2018

ebinnion self-assigned this Aug 8, 2018

ebinnion requested a review from a team as a code owner August 8, 2018 22:34

ebinnion force-pushed the update/module-overrides-vaultpress branch from 729afe7 to 36dcdaa Compare August 8, 2018 23:30

ebinnion changed the title ~~Module Overrides: Add support to disable simulated backups module~~ Module Overrides: Add support to disable backups UI Aug 8, 2018

ebinnion force-pushed the update/module-overrides-vaultpress branch from 36dcdaa to 5e53261 Compare August 9, 2018 19:26

ebinnion requested a review from eliorivero August 9, 2018 20:05

ebinnion added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] In Progress labels Aug 9, 2018

eliorivero previously requested changes Aug 9, 2018

View reviewed changes

eliorivero added [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Aug 9, 2018

abidhahmed added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Aug 10, 2018

ebinnion added 6 commits August 15, 2018 10:20

General: Backups: Add ability to disable backups UI

582ee87

Admin Page: Do not display backups features when UI disabled

4dfc5e9

General: Use Jetpack is_plugin_active function; use lodash includes f…

33f2fdf

…or hiding backups UI

General: Remove more references to backups and scanning if backups UI…

5bdff24

… hidden

General: Banner: Remove backups mention in connection banner

c82fac4

Admin Page: Do not show security feature on dash when backups UI disa…

9a4218c

…bled

ebinnion force-pushed the update/module-overrides-vaultpress branch from 6f68aa8 to 9a4218c Compare August 15, 2018 15:21

eliorivero added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Aug 21, 2018

eliorivero approved these changes Aug 21, 2018

View reviewed changes

ebinnion merged commit e61d65f into master Aug 22, 2018

matticbot added the [Status] Needs Changelog label Aug 22, 2018

ebinnion deleted the update/module-overrides-vaultpress branch August 22, 2018 17:32

ghost removed the [Status] Ready to Merge Go ahead, you can push that green button! label Aug 22, 2018

gravityrail reviewed Aug 25, 2018

View reviewed changes

abidhahmed added [Status] Has Changelog and removed [Status] Needs Changelog labels Aug 28, 2018

oskosk pushed a commit that referenced this pull request Aug 28, 2018

[skip-ci] Added changelogs

7c86fd2

#9958 #9983 #9992 #10002 #10004 #10010 #10011 #10017 #10031 #10037 #10039 #10040 #10051

oskosk pushed a commit that referenced this pull request Aug 28, 2018

[skip-ci] Add test instructions

1942746

#9958 #9983 #9992 #10002 #10004 #10010 #10017 #10031 #10037 #10039 #10040

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Module Overrides: Add support to disable backups UI #10004

Module Overrides: Add support to disable backups UI #10004

ebinnion commented Aug 8, 2018 •

edited

Loading

eliorivero left a comment

eliorivero Aug 9, 2018

eliorivero Aug 9, 2018

ebinnion commented Aug 9, 2018

eliorivero commented Aug 10, 2018

ebinnion commented Aug 10, 2018

eliorivero commented Aug 10, 2018

jetpackbot commented Aug 15, 2018

ebinnion commented Aug 15, 2018

eliorivero left a comment

gravityrail Aug 25, 2018

Module Overrides: Add support to disable backups UI #10004

Module Overrides: Add support to disable backups UI #10004

Conversation

ebinnion commented Aug 8, 2018 • edited Loading

Changes proposed in this Pull Request:

Testing instructions:

Proposed changelog entry for your changes:

Screenshots

eliorivero left a comment

Choose a reason for hiding this comment

eliorivero Aug 9, 2018

Choose a reason for hiding this comment

eliorivero Aug 9, 2018

Choose a reason for hiding this comment

ebinnion commented Aug 9, 2018

eliorivero commented Aug 10, 2018

ebinnion commented Aug 10, 2018

eliorivero commented Aug 10, 2018

jetpackbot commented Aug 15, 2018

ebinnion commented Aug 15, 2018

eliorivero left a comment

Choose a reason for hiding this comment

gravityrail Aug 25, 2018

Choose a reason for hiding this comment

ebinnion commented Aug 8, 2018 •

edited

Loading