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.

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

Protect: Add Home page #40317

Merged
merged 6 commits into from
Dec 10, 2024
Merged

Protect: Add Home page #40317

merged 6 commits into from
Dec 10, 2024

Conversation

dkmyta
Copy link
Contributor

@dkmyta dkmyta commented Nov 22, 2024

Description

Add Home tab, page and stat cards.

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

Does this pull request change what data or activity we track or use?

Testing instructions:

  • Checkout this branch load Protect in JT
  • Ensure you are redirected to the Home tab after passing setup
  • Review the various states of the HomeStatCards error, scanning, idle, disabled
  • Ensure no regressions are introduced

Screenshots

Screen Shot 2024-12-03 at 10 51 06

@github-actions github-actions bot added [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. [Status] In Progress labels Nov 22, 2024
Copy link
Contributor

github-actions bot commented Nov 22, 2024

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • 🔴 Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖


The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.


Follow this PR Review Process:

  1. Ensure all required checks appearing at the bottom of this PR are passing.
  2. Choose a review path based on your changes:
    • A. Team Review: add the "[Status] Needs Team Review" label
      • For most changes, including minor cross-team impacts.
      • Example: Updating a team-specific component or a small change to a shared library.
    • B. Crew Review: add the "[Status] Needs Review" label
      • For significant changes to core functionality.
      • Example: Major updates to a shared library or complex features.
    • C. Both: Start with Team, then request Crew
      • For complex changes or when you need extra confidence.
      • Example: Refactor affecting multiple systems.
  3. Get at least one approval before merging.

Still unsure? Reach out in #jetpack-developers for guidance!


Protect plugin:

  • Next scheduled release: none scheduled.

If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack.

@dkmyta dkmyta self-assigned this Nov 25, 2024
@nateweller nateweller force-pushed the add/protect/core branch 2 times, most recently from dcefb9a to 765d821 Compare November 26, 2024 17:46
Copy link
Contributor

github-actions bot commented Nov 29, 2024

Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.

  • To test on WoA, go to the Plugins menu on a WordPress.com Simple site. Click on the "Upload" button and follow the upgrade flow to be able to upload, install, and activate the Jetpack Beta plugin. Once the plugin is active, go to Jetpack > Jetpack Beta, select your plugin, and enable the add/protect/home branch.

    • For jetpack-mu-wpcom changes, also add define( 'JETPACK_MU_WPCOM_LOAD_VIA_BETA_PLUGIN', true ); to your wp-config.php file.
  • To test on Simple, run the following command on your sandbox:

    bin/jetpack-downloader test jetpack add/protect/home
    
    bin/jetpack-downloader test jetpack-mu-wpcom-plugin add/protect/home
    

Interested in more tips and information?

  • In your local development environment, use the jetpack rsync command to sync your changes to a WoA dev blog.
  • Read more about our development workflow here: PCYsg-eg0-p2
  • Figure out when your changes will be shipped to customers here: PCYsg-eg5-p2

@nateweller nateweller force-pushed the add/protect/core branch 7 times, most recently from 9e76351 to 6c73d5a Compare December 5, 2024 17:49
@@ -457,8 +457,9 @@ public static function get_waf_stats() {
}

return array(
'blockedRequests' => Plan::has_required_plan() ? Waf_Stats::get_blocked_requests() : false,
'blockedRequests' => Waf_Stats::get_blocked_requests(),
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes stats available regardless of plan

@dkmyta dkmyta marked this pull request as ready for review December 5, 2024 22:48
@nateweller
Copy link
Contributor

nateweller commented Dec 5, 2024

Screenshot 2024-12-05 at 4 08 03 PM
  • Header alignment issue when scan in progress on a free plan

@nateweller
Copy link
Contributor

nateweller commented Dec 5, 2024

  • Scan upgrade prompt should redirect to /scan after checkout

@dkmyta
Copy link
Contributor Author

dkmyta commented Dec 5, 2024

Header alignment issue when scan in progress on a free plan

Darnit, I had this fixed previously - I think a few things unforuntately got overwritten in the most recent rebase. Hopefully not much else 😬

@nateweller
Copy link
Contributor

nateweller commented Dec 5, 2024

  • Mismatching line counts across stat cards, we could either apply whitespace: nowrap here as has been done in the Firewall tab header, or update the labels to all wrap two lines?
Screenshot 2024-12-05 at 4 18 27 PM

@nateweller nateweller requested a review from a team December 5, 2024 23:22
@dkmyta
Copy link
Contributor Author

dkmyta commented Dec 5, 2024

Mismatching line counts across stat cards, we could either apply whitespace: nowrap here as has been done in the Firewall tab header, or update the labels to all wrap two lines?

This was a discussion with @ilonagl - the issue with nowrap was that when we are viewing free results the scan card uses the term Vulnerabilities which is too long to fit on a single line. The solution was wrapping the text, but I agree with ensuring there are two lines always 👍🏻

@dkmyta
Copy link
Contributor Author

dkmyta commented Dec 5, 2024

Scan upgrade prompt should redirect to /scan after checkout

I suppose we'll need to upgrade all applicable uses of upgradePlan to supply a redirect now, I guess setting that as the default is best. I wonder if there is also an opportunity here to add a upgrade CTA to the new Home page 🤔

@nateweller
Copy link
Contributor

Screenshot 2024-12-06 at 11 23 32 AM Screenshot 2024-12-06 at 11 25 16 AM
  • The stat cards start wrapping into the next line on < 1400px screen widths, and overflowing horizontally when they are lined up.

@dkmyta
Copy link
Contributor Author

dkmyta commented Dec 6, 2024

The stat cards start wrapping into the next line on < 1400px screen widths, and overflowing horizontally when they are lined up.

Chatted with @ilonagl about how we should go about handling this, obviously not ideal that it wraps at that size as its a pretty common view port size - also not ideal to have it overflow. Open to suggestions!

@nateweller nateweller force-pushed the add/protect/core branch 2 times, most recently from 9745a5f to 68569f2 Compare December 9, 2024 16:48
@dkmyta dkmyta changed the base branch from add/protect/core to protect/refactor/admin-section-hero December 9, 2024 19:41
Base automatically changed from protect/refactor/admin-section-hero to add/protect/core December 9, 2024 21:38
@dkmyta dkmyta requested a review from nateweller December 9, 2024 21:45
@nateweller nateweller force-pushed the add/protect/home branch 4 times, most recently from 481adf6 to bc78984 Compare December 10, 2024 20:24
nateweller and others added 4 commits December 10, 2024 13:29
Protect: Add ShieldIcon Component (#40402)

Components: Add ScanReport (#40419)
Rebase on admin hero section refactor

Revert accidental type changes

Remove testing code

Init project branch

Protect: Add ShieldIcon Component (#40402)

Refactor AdminSectionHero component
@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Dec 10, 2024
@dkmyta dkmyta merged commit 6f961cb into add/protect/core Dec 10, 2024
68 of 70 checks passed
@dkmyta dkmyta deleted the add/protect/home branch December 10, 2024 21:25
@github-actions github-actions bot removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! [Status] Needs Team Review labels Dec 10, 2024
nateweller added a commit that referenced this pull request Dec 11, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 15, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 17, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
nateweller added a commit that referenced this pull request Dec 18, 2024
* Init project branch

* Protect: Add Go to Cloud and Scan now button to Protect primary header (#40057)

Co-authored-by: Nate Weller <hello@nateweller.com>

* Protect: Update Scan and History headers (#40058)

* Update Scan and History section header structure/content

* changelog

* Update projects/plugins/protect/src/js/routes/scan/scan-admin-section-hero.tsx

Co-authored-by: Nate Weller <nate.weller@automattic.com>

---------

Co-authored-by: Nate Weller <nate.weller@automattic.com>

* Protect: de-emphasize cloud link by using link variant (#40211)

* Protect: add ShieldIcon component

* Protect: Add ShieldIcon Component (#40402)

* Protect: Integrate ThreatsDataViews Component (#40076)

* Components: Add ScanReport (#40419)

* Fix type errors

* Protect: add home page

---------

Co-authored-by: Nate Weller <hello@nateweller.com>
Co-authored-by: Nate Weller <nate.weller@automattic.com>
Co-authored-by: Dean Kmyta <dkmyta@automattic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JS Package] Components [JS Package] Scan [Plugin] Protect A plugin with features to protect a site: brute force protection, security scanning, and a WAF. RNA [Tests] Includes Tests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants