From dc544889511f3e43d0cd18397b958f734c1191c9 Mon Sep 17 00:00:00 2001 From: valterlorran Date: Mon, 2 Oct 2023 16:44:03 +0000 Subject: [PATCH] Launchpad: Add the "from" param to the Customize Domain task (#33404) * Adds the from parameter to the Domain Customize task * Changelog --------- Co-authored-by: Valter Lorran Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6382787931 --- composer.lock | 8 ++++---- vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md | 1 + .../src/features/launchpad/launchpad-task-definitions.php | 6 +++++- vendor/composer/installed.json | 6 +++--- vendor/composer/installed.php | 6 +++--- 5 files changed, 16 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 999aa5a2..c85f693a 100644 --- a/composer.lock +++ b/composer.lock @@ -4,15 +4,15 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "921ca4edf9dd608d1376419ce62ff8ba", + "content-hash": "a4a263632ef19adf60febbad27512091", "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "4.13.0-alpha.1696226389", + "version": "4.13.0-alpha.1696263755", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "88468d6961398295e57e3e4126c395e478d17c65" + "reference": "f4cee7b2520cf804ba8fee8415466cb59699fedb" }, "require-dev": { "automattic/jetpack-changelogger": "^3.3.11", @@ -78,7 +78,7 @@ "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-changelogger", - "reference": "f0af3247aa571f2c9e42f96d15ded7d8f74c6636" + "reference": "5b92ae71c55638576061c010a7bde94e733f05db" }, "require": { "php": ">=5.6", diff --git a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md index d69d6ef0..d0b83588 100644 --- a/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md +++ b/vendor/automattic/jetpack-mu-wpcom/CHANGELOG.md @@ -12,6 +12,7 @@ This is an alpha version! The changes listed here are not final. ### Added - Add new task for user to confirm email when purchasing a domain. - Add plugin to show frontend email nag for domains with unverified email address +- Adds a URL param to identify the source of the navigation on the Customize domain task. ## [4.12.0] - 2023-09-28 ### Added diff --git a/vendor/automattic/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php b/vendor/automattic/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php index 8fe8bc85..2be63cde 100644 --- a/vendor/automattic/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php +++ b/vendor/automattic/jetpack-mu-wpcom/src/features/launchpad/launchpad-task-definitions.php @@ -379,7 +379,11 @@ function wpcom_launchpad_get_task_definitions() { 'is_complete_callback' => 'wpcom_launchpad_is_domain_customize_completed', 'is_visible_callback' => 'wpcom_launchpad_is_domain_customize_task_visible', 'get_calypso_path' => function ( $task, $default, $data ) { - return '/domains/add/' . $data['site_slug_encoded']; + // The from parameter is used to redirect the user back to the Launchpad when they + // click on the Back button on the domain customization page. + // TODO: This can cause problem if this task is used in the future for other flows + // that are not in the Customer Home page. We should find a better way to handle this. + return '/domains/add/' . $data['site_slug_encoded'] . '?from=my-home'; }, ), diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 7262be21..26f7b805 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -2,12 +2,12 @@ "packages": [ { "name": "automattic/jetpack-mu-wpcom", - "version": "4.13.0-alpha.1696226389", - "version_normalized": "4.13.0.0-alpha1696226389", + "version": "4.13.0-alpha.1696263755", + "version_normalized": "4.13.0.0-alpha1696263755", "dist": { "type": "path", "url": "/tmp/jetpack-build/Automattic/jetpack-mu-wpcom", - "reference": "88468d6961398295e57e3e4126c395e478d17c65" + "reference": "f4cee7b2520cf804ba8fee8415466cb59699fedb" }, "require-dev": { "automattic/jetpack-changelogger": "^3.3.11", diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php index 8984487d..5a8a653b 100644 --- a/vendor/composer/installed.php +++ b/vendor/composer/installed.php @@ -11,9 +11,9 @@ ), 'versions' => array( 'automattic/jetpack-mu-wpcom' => array( - 'pretty_version' => '4.13.0-alpha.1696226389', - 'version' => '4.13.0.0-alpha1696226389', - 'reference' => '88468d6961398295e57e3e4126c395e478d17c65', + 'pretty_version' => '4.13.0-alpha.1696263755', + 'version' => '4.13.0.0-alpha1696263755', + 'reference' => 'f4cee7b2520cf804ba8fee8415466cb59699fedb', 'type' => 'jetpack-library', 'install_path' => __DIR__ . '/../automattic/jetpack-mu-wpcom', 'aliases' => array(),