Backups/scan card: Fix broken status for personal plan.#7211
Backups/scan card: Fix broken status for personal plan.#7211eliorivero merged 1 commit intomasterfrom
Conversation
jeherve
left a comment
There was a problem hiding this comment.
I noticed a small issue when using a Personal plan, but when VaultPress isn't active on the site:
|
One small unrelated remark too: I was surprised to be redirected to https://jetpack.com/pricing/settings-security-premium/ when clicking on "Upgrade" while on a free plan. I had no option to pick a Personal plan there. |
|
This looks perfect. Thanks for hitting it @dereksmart ! |
@jeherve what is wrong about that? The setup link will activate VP, and the upgrade prompt is for the Scan feature. edit: Is it that we're showing an upgrade prompt for Scan there? @rickybanister, do you know if we should or should not be showing an upgrade for |
|
Well now that you mention it, it makes sense. I guess I didn't expect an additional prompt there, but now I understand. 👍 |
|
@dereksmart I'm not 100% sure. @MichaelArestad and @richardmuscat can you confirm how we handle this upgrade banner? Should it be 'progressive' and continue to advertise the higher tier of service as the user upgrades? |
|
@rickybanister I don't understand the question as it pertains to this issue. @dereksmart asked if we should show an upgrade notice to enable scans if only backups is enabled (I think) which isn't really a plan upgrade. It's just encouraging the user to enable a feature. To answer your question, though, I don't think we're showing any further upgrade notice to Professional plans (which would encourage upgrading for realtime backups). |
It is a plan upgrade, since scan feature is not available for personal sites, but backups are. |
|
We should show the prompt—if the user has the option to be even more safe we should be showing it to them. At least we can start with that mentality and see how it goes. As to the main purpose of this PR, the set up button will work great for folks that get to this stage without being autoconfigured properly. Let's get it merged. |
|
@dereksmart @rickybanister Got it! Okay. We definitely should show an upgrade banner for that, but as Rick said, in another PR. |
This fixes an issue when we were showing the wrong text on personal plan. It also re-writes the logic to show the content to make it more readable. It also fixes an issue where we were not showing the `set up` button on professional plans if scan was not enabled for some reason.
58ae005 to
537384c
Compare
| support="https://help.vaultpress.com/get-to-know/" | ||
| > | ||
| { cardText } | ||
| support="https://help.vaultpress.com/get-to-know/"> |
There was a problem hiding this comment.
There's an issue here: when this.getCardText() returns empty, the SettingsGroup card is rendered without content, only displaying the information icon.
It should be changed to only show the SettingsGroup if there is something to show there.
There was a problem hiding this comment.
Not sure how you reproduced this, I'm not seeing the info icon. The settingsGroup component shouldn't be rendered here if on a free plan and scan is not enabled.
| let cardText = ''; | ||
|
|
||
| if ( this.props.isFetchingSiteData || this.props.isFetchingVaultPressData ) { | ||
| return __( 'Checking site status…' ); |
There was a problem hiding this comment.
The early return does wonders to this method's code, thank you for that!
* Changelog: first pass at a changelog for 5.0 * Changelog: delete 4.9 testing list. * Changelog: update minimum WP version to match ver. in jetpack.php Fixes #7158 * Changelog: add #6051 * Changelog: add #6753 * Changelog: add #6928 * Changelog: add #6964 * Changelog: add #7014 * Changelog: add #7057 * Changelog: add #7060 * Changelog: add #7068 * Changelog: add #7070 * Changelog: add #7072 * Changelog: add #7071 * Changelog: add release date and post shortlink. * Changelog: add #7094 * Changelog: add #7100 * Changelog: add #7108 * Changelog: add #7113 * Changelog: add #7123 * Changelog: add #7135 * Changelog: add #7143 * Changelog: add #7151 * Changelog: add #6996 * Changelog: add #7105 * Changelog: add #7132 * Changelog: add #7166 * Changelog: fix typo in 4.9 changelog. * Changelog: remove older releases' changelogs. @see p1HpG7-42e-p2 * Changelog: add #7090 * Changelog: add #7095 * Changelog: add #7112 * Changelog: add #7115 * Changelog: add #7122 * Changelog: add #7137 * Changelog: add #7138 * Changelog: add #7140 * Changelog: add #7154 * Changelog: add ##7155 * Changelog: add #7163 * Changelog: add #7167 * Changelog: add #7171 * Changelog: add #7180 * Changelog: add #7181 * Changelog: add #7183 * Changelog: add #7184 * Changelog: add #7189 * Changelog: add #7191 * Changelog: add #7193 * Changelog: add #7198 * Changelog: add #7200 * Changelog: add #7209 * Changelog: add #7212 * Testing list: add instructions for #7115 * Changelog: add #7188 * Changelog: add #7205 * Changelog: add #7225 * Changelog: add #6872 * Changelog: add #7107 * Changelog: add #7118 * Changelog: add #7142 * Changelog: add #7170 * Changelog: add #7210 * Changelog: add #7218 * Changelog: add #7232 * Changelog: add #7211 * Changelog: add #7213 * Changelog: add #7229 * Changelog: add #7230 * Changelog: add #7214 * Draft changelog for 5.0 * Changelog updates: 2nd pass at a clearer changelog. - Fix typos. - Use consistent tense and tone across all changelog. - Remove unclear items. * Changelog: add #7026 * Changelog: add #7058 * Changelog: add #7125 * Changelog: add #7249 * Changelog: add #7185 * add mentions of image widget migration * Changelog: add info about new output for CLI command. * Changelog: add WP version number matching the new Image Widget.
Fixes #6995
This is not testable with the dev tools plan switcher. You must actually change the plan to test this.
The dev tools won't work in testing, because the dev tools only changes the plan class, and it's possible to have these features active without a Jetpack plan.
This fixes an issue when we were showing the wrong text on personal plan. It also re-writes the logic to show the content to make it more readable.
It also fixes an issue where we were not showing the
set upbutton on professional plans if scan was not enabled for some reason.To test: You should see the following statuses
Free plan, no features active
Backups only enabled, (personal plan)
Backups and scan enabled (premium/business)
Personal plan, not enabled yet
Premium/business plan, but not enabled yet
