From 4ec75439c5aaf3e47c2ddd3c8fa0005768c5945c Mon Sep 17 00:00:00 2001 From: Sam Seay Date: Thu, 11 Mar 2021 08:50:23 +1300 Subject: [PATCH] Remove rest API props from onboarding confirmed as no longer used. (https://github.com/woocommerce/woocommerce-admin/pull/6520) --- plugins/woocommerce-admin/readme.txt | 1 + .../src/API/OnboardingProfile.php | 19 ------------------- .../tests/api/onboarding-profile.php | 4 +--- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/plugins/woocommerce-admin/readme.txt b/plugins/woocommerce-admin/readme.txt index bb323f55975..58e507e0898 100644 --- a/plugins/woocommerce-admin/readme.txt +++ b/plugins/woocommerce-admin/readme.txt @@ -101,6 +101,7 @@ Release and roadmap notes are available on the [WooCommerce Developers Blog](htt - Fix: Missing i18n in Welcome modal. #6456 - Fix: Restore visual styles back to Analytics tabs. #5913 - Add: Add a "rather not say" option to revenue in the profile wizard. #6475 +- Dev: Remove `items_purchased` and `account_type` props from onboarding profile API. #6520 - Dev: Added warning when WC-Admin is active but not being used #6453 - Fix: Associated Order Number for refunds was hidden #6428 - Add: Remove Mollie promo note on install #6510 diff --git a/plugins/woocommerce-admin/src/API/OnboardingProfile.php b/plugins/woocommerce-admin/src/API/OnboardingProfile.php index 175554a730c..d5e644f00ed 100644 --- a/plugins/woocommerce-admin/src/API/OnboardingProfile.php +++ b/plugins/woocommerce-admin/src/API/OnboardingProfile.php @@ -240,18 +240,6 @@ class OnboardingProfile extends \WC_REST_Data_Controller { 'installed', ), ), - 'account_type' => array( - 'type' => 'string', - 'description' => __( 'Account type used for Jetpack.', 'woocommerce-admin' ), - 'context' => array( 'view' ), - 'readonly' => true, - 'validate_callback' => 'rest_validate_request_arg', - 'enum' => array( - 'new', - 'existing', - 'google', - ), - ), 'industry' => array( 'type' => 'array', 'description' => __( 'Industry.', 'woocommerce-admin' ), @@ -372,13 +360,6 @@ class OnboardingProfile extends \WC_REST_Data_Controller { 'sanitize_callback' => 'sanitize_title_with_dashes', 'validate_callback' => 'rest_validate_request_arg', ), - 'items_purchased' => array( - 'type' => 'boolean', - 'description' => __( 'Whether or not the user opted to purchase items now or later.', 'woocommerce-admin' ), - 'context' => array( 'view' ), - 'readonly' => true, - 'validate_callback' => 'rest_validate_request_arg', - ), 'setup_client' => array( 'type' => 'boolean', 'description' => __( 'Whether or not this store was setup for a client.', 'woocommerce-admin' ), diff --git a/plugins/woocommerce-admin/tests/api/onboarding-profile.php b/plugins/woocommerce-admin/tests/api/onboarding-profile.php index 07cc7b60312..a879baf3106 100644 --- a/plugins/woocommerce-admin/tests/api/onboarding-profile.php +++ b/plugins/woocommerce-admin/tests/api/onboarding-profile.php @@ -104,10 +104,9 @@ class WC_Tests_API_Onboarding_Profiles extends WC_REST_Unit_Test_Case { $data = $response->get_data(); $properties = $data['schema']['properties']; - $this->assertCount( 16, $properties ); + $this->assertCount( 14, $properties ); $this->assertArrayHasKey( 'completed', $properties ); $this->assertArrayHasKey( 'skipped', $properties ); - $this->assertArrayHasKey( 'account_type', $properties ); $this->assertArrayHasKey( 'industry', $properties ); $this->assertArrayHasKey( 'product_types', $properties ); $this->assertArrayHasKey( 'product_count', $properties ); @@ -118,7 +117,6 @@ class WC_Tests_API_Onboarding_Profiles extends WC_REST_Unit_Test_Case { $this->assertArrayHasKey( 'business_extensions', $properties ); $this->assertArrayHasKey( 'theme', $properties ); $this->assertArrayHasKey( 'wccom_connected', $properties ); - $this->assertArrayHasKey( 'items_purchased', $properties ); $this->assertArrayHasKey( 'plugins', $properties ); $this->assertArrayHasKey( 'setup_client', $properties ); }