Skip to content

Commit

Permalink
New Feature: My Jetpack Welcome Flow (#38534)
Browse files Browse the repository at this point in the history
* Set WelcomeFlow structure and update WelcomeBanner (async site-only connection) (#37715)

* Enhance TermsOfService component

* Update MyJetpack connection hook and its usage

* Update WelcomeBanner text and add async site registration on click

* changelog

* Add events and banner dismissal upon connection success

* Update versions

* Add WelcomeFlow (separate code) structure

* Revert WelcomeBanner code

* Update banner

* Update versions

* Hide notices when welcome banner is active

* Code improvements

* Prevent reloading on site connection

* Introduce Notice templating (unify Notices)

* Improve displaying notices when welcome banner is active

* Improve styling of disabled 'x' button

* Add evaluation form to Welcome Flow (#37790)

* Enhance TermsOfService component

* Update MyJetpack connection hook and its usage

* Update WelcomeBanner text and add async site registration on click

* changelog

* Add events and banner dismissal upon connection success

* Update versions

* Add WelcomeFlow (separate code) structure

* Revert WelcomeBanner code

* Update banner

* Update versions

* Add evaluation form step

* Add evaluation processing step and styles

* Add evaluation steps to welcome flow

* Replace classnames with clsx

* Update image filename

* Hide notices when welcome banner is active

* Code improvements

* Prevent reloading on site connection

* Introduce Notice templating (unify Notices)

* Add 'currentStep' prop to dismiss Tracks event

* Add more info to dismiss Tracks event

* Code improvements

* Add /recommendations/evaluation endpoint handling (#38011)

* Enhance TermsOfService component

* Update MyJetpack connection hook and its usage

* Update WelcomeBanner text and add async site registration on click

* changelog

* Add events and banner dismissal upon connection success

* Update versions

* Add WelcomeFlow (separate code) structure

* Revert WelcomeBanner code

* Update banner

* Update versions

* Add evaluation form step

* Add evaluation processing step and styles

* Add evaluation steps to welcome flow

* Replace classnames with clsx

* Update image filename

* Hide notices when welcome banner is active

* Code improvements

* Prevent reloading on site connection

* Introduce Notice templating (unify Notices)

* Add 'currentStep' prop to dismiss Tracks event

* Add more info to dismiss Tracks event

* Code improvements

* Improve mutation hook code

* Add recommendations evaluation endpoint handling

* Implement saving evaluation recommendations

* Delete remaining reference

* Code improvements and analytics

* Fix code review comments

* Fix phan

* Fix phan 2

* Surpress other parameters

* Fix phan completely

* Improve Tracks events

* Add Evaluation Recommendations logic (#38171)

* Add ValueStore logic

* Add Evaluation Recommendations logic

* changelog

* Fix refactor leftover

* Improve querying evaluation endpoints

* Code review improvements

* Extend ProductCard component and create recommendations UI (#38319)

* Refactor ProductCard to ts, add 'recommendation' property

* Add price component and purchase button

* Refactor and cleanup code

* Fix backup card

* Revert to short descriptions

* Improve recommendation button names

* Fix additional actions typing

* Fix determining state of the recommended product

* Fix literal translation handling (transpilation bug)

* Fix checkout link redirect

* Fix purchase button

* Minor code review improvements

* Improve handling checkout urls

* Fix nitpicks

* Improve handling free offerings and upgrade urls

* Don't make admin flag required (as it's not required in every case now)

* Fix code splitting issue

* Activate plugins on 'start for free' action

* Add Evaluation Recommendations context menu (#38378)

* Refactor ProductCard to ts, add 'recommendation' property

* Add price component and purchase button

* Refactor and cleanup code

* Fix backup card

* Revert to short descriptions

* Improve recommendation button names

* Fix additional actions typing

* Fix determining state of the recommended product

* Fix literal translation handling (transpilation bug)

* Fix boost card popover

* Add delete endpoint, unify with others

* Extend functionality of Welcome Banner and Evaluation Recommendations hooks

* Add context menu to view layer

* Fix checkout link redirect

* Fix purchase button

* Minor code review improvements

* Improve handling checkout urls

* Code review improvements

* Fix nitpicks

* Improve handling free offerings and upgrade urls

* Don't make admin flag required (as it's not required in every case now)

* Fix code splitting issue

* Add recommendations initializer tweaks (#38452)

* Refactor ProductCard to ts, add 'recommendation' property

* Add price component and purchase button

* Refactor and cleanup code

* Fix backup card

* Revert to short descriptions

* Improve recommendation button names

* Fix additional actions typing

* Fix determining state of the recommended product

* Fix literal translation handling (transpilation bug)

* Fix boost card popover

* Add delete endpoint, unify with others

* Extend functionality of Welcome Banner and Evaluation Recommendations hooks

* Add context menu to view layer

* Add silent redBubble alerts - don't show in menu

* Hide recommendations when user purchases the product

* Fix checkout link redirect

* Fix purchase button

* Minor code review improvements

* Improve handling checkout urls

* Code review improvements

* Fix nitpicks

* Improve handling free offerings and upgrade urls

* Don't make admin flag required (as it's not required in every case now)

* Fix code splitting issue

* Leftover after merge conflict resolution

* Welcome Flow: Various tweaks and fixes (#38536)

* Various tweaks and fixes

* Improve layout of product card, hide boost tooltip on click

* Fix Protect tooltips dependency

* Display notices when in survey step

* Remove red dot on survey step, don't show survey step when user is not new

* Fix condition, and add comment

* Improve 'start for free' actions and small fixes

* Dismiss recommendations instead of deleting them

* Fix condition

* Redoing recommendations only happens locally

* Limit recommendations to 3

* Code review fixes and disabling 'start for free' functionality

* Change placement of Boost tooltip and revert click functionality

* Welcome Flow: fixes and improvements pt. 2 (#38589)

* Apply min-width 300px to cards

* Set loading state of site connection button

* Fix parsing active modules array

* Update changelogger

* Fix Tracks events code

* Update projects/packages/my-jetpack/_inc/components/product-card/index.tsx

Co-authored-by: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>

---------

Co-authored-by: jboland88 <18016357+jboland88@users.noreply.github.com>
Co-authored-by: Ian Ramos <5714212+IanRamosC@users.noreply.github.com>

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/10169516259

Upstream-Ref: Automattic/jetpack@13650c1
  • Loading branch information
robertsreberski authored and matticbot committed Jul 30, 2024
1 parent 88ae383 commit 608be76
Show file tree
Hide file tree
Showing 15 changed files with 123 additions and 113 deletions.
76 changes: 38 additions & 38 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-blaze/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"require": {
"php": ">=7.0",
"automattic/jetpack-assets": "^2.2.0",
"automattic/jetpack-connection": "^2.11.2",
"automattic/jetpack-connection": "^2.11.3-alpha",
"automattic/jetpack-constants": "^2.0.3",
"automattic/jetpack-plans": "^0.4.7",
"automattic/jetpack-redirect": "^2.0.2",
Expand Down
8 changes: 8 additions & 0 deletions vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [2.11.3-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

### Added
- Added support for 'recommendations_evaluation' Jetpack option"

## [2.11.2] - 2024-07-22
### Fixed
- Fixed textdomain on i18n messages imported from the IDC package. [#38412]
Expand Down Expand Up @@ -1131,6 +1138,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- Separate the connection library into its own package.

[2.11.3-alpha]: https://github.com/Automattic/jetpack-connection/compare/v2.11.2...v2.11.3-alpha
[2.11.2]: https://github.com/Automattic/jetpack-connection/compare/v2.11.1...v2.11.2
[2.11.1]: https://github.com/Automattic/jetpack-connection/compare/v2.11.0...v2.11.1
[2.11.0]: https://github.com/Automattic/jetpack-connection/compare/v2.10.2...v2.11.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,8 @@ public static function get_option_names( $type = 'compact' ) {
'identity_crisis_url_secret', // (array) The IDC URL secret and its expiration date.
'identity_crisis_ip_requester', // (array) The IDC IP address and its expiration date.
'dismissed_welcome_banner', // (bool) Determines if the welcome banner has been dismissed or not.
'recommendations_evaluation', // (object) Catalog of recommended modules with corresponding score following successful site evaluation in Welcome Banner.
'dismissed_recommendations', // (bool) Determines if the recommendations have been dismissed or not.
'historically_active_modules', // (array) List of installed plugins/enabled modules that have at one point in time been active and working
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '2.11.2';
const PACKAGE_VERSION = '2.11.3-alpha';

const PACKAGE_SLUG = 'connection';

Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.1",
"automattic/jetpack-assets": "^2.2.0",
"automattic/jetpack-connection": "^2.11.2",
"automattic/jetpack-connection": "^2.11.3-alpha",
"automattic/jetpack-device-detection": "^2.1.3",
"automattic/jetpack-logo": "^2.0.3",
"automattic/jetpack-redirect": "^2.0.2",
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-masterbar/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-blaze": "^0.22.3",
"automattic/jetpack-compat": "^3.0.2",
"automattic/jetpack-device-detection": "^2.1.3",
"automattic/jetpack-connection": "^2.11.2",
"automattic/jetpack-connection": "^2.11.3-alpha",
"automattic/jetpack-jitm": "^3.1.14",
"automattic/jetpack-logo": "^2.0.3",
"automattic/jetpack-plans": "^0.4.7",
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-mu-wpcom/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"automattic/jetpack-blocks": "^2.0.4",
"automattic/jetpack-calypsoify": "^0.1.2",
"automattic/jetpack-classic-theme-helper": "^0.4.3",
"automattic/jetpack-connection": "^2.11.2",
"automattic/jetpack-connection": "^2.11.3-alpha",
"automattic/jetpack-masterbar": "^0.6.0",
"automattic/jetpack-redirect": "^2.0.2",
"automattic/jetpack-stats-admin": "^0.21.0",
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^2.11.2"
"automattic/jetpack-connection": "^2.11.3-alpha"
},
"require-dev": {
"yoast/phpunit-polyfills": "1.1.0",
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-stats-admin/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^2.11.2",
"automattic/jetpack-connection": "^2.11.3-alpha",
"automattic/jetpack-constants": "^2.0.3",
"automattic/jetpack-plans": "^0.4.7",
"automattic/jetpack-stats": "^0.13.0",
Expand Down
Loading

0 comments on commit 608be76

Please sign in to comment.