Make Homescreen Default to Single Column Layout (https://github.com/woocommerce/woocommerce-admin/pull/7969)
* Add database migration deleting layout option * Remove calls to update the option * Remove unused variable * Add changelog * Remove unused var (lint failure) * Increase e2e test timeout to 1000 * Fix test: navigate to homescreen Co-authored-by: Moon <moon.kyong@automattic.com>
This commit is contained in:
parent
b19ca6b4d1
commit
b9b4c82dca
|
@ -0,0 +1,4 @@
|
||||||
|
Significance: patch
|
||||||
|
Type: Fix
|
||||||
|
|
||||||
|
Ensure homescreen defaults to single column layout. #7969
|
|
@ -76,7 +76,6 @@ export const Tasks: React.FC< TasksProps > = ( { query } ) => {
|
||||||
const taskListsFinished = false;
|
const taskListsFinished = false;
|
||||||
updateOptions( {
|
updateOptions( {
|
||||||
woocommerce_task_list_prompt_shown: true,
|
woocommerce_task_list_prompt_shown: true,
|
||||||
woocommerce_default_homepage_layout: 'two_columns',
|
|
||||||
} );
|
} );
|
||||||
}, [ taskLists, isResolving ] );
|
}, [ taskLists, isResolving ] );
|
||||||
|
|
||||||
|
|
|
@ -147,7 +147,6 @@ describe( 'Task', () => {
|
||||||
);
|
);
|
||||||
expect( updateOptions ).toHaveBeenCalledWith( {
|
expect( updateOptions ).toHaveBeenCalledWith( {
|
||||||
woocommerce_task_list_prompt_shown: true,
|
woocommerce_task_list_prompt_shown: true,
|
||||||
woocommerce_default_homepage_layout: 'two_columns',
|
|
||||||
} );
|
} );
|
||||||
} );
|
} );
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
*/
|
*/
|
||||||
import { __ } from '@wordpress/i18n';
|
import { __ } from '@wordpress/i18n';
|
||||||
import { useEffect } from '@wordpress/element';
|
import { useEffect } from '@wordpress/element';
|
||||||
import { useDispatch, useSelect } from '@wordpress/data';
|
import { useSelect } from '@wordpress/data';
|
||||||
import { ONBOARDING_STORE_NAME, OPTIONS_STORE_NAME } from '@woocommerce/data';
|
import { ONBOARDING_STORE_NAME, OPTIONS_STORE_NAME } from '@woocommerce/data';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,7 +30,6 @@ const taskDashboardSelect = ( select ) => {
|
||||||
};
|
};
|
||||||
|
|
||||||
const TaskDashboard = ( { query, twoColumns } ) => {
|
const TaskDashboard = ( { query, twoColumns } ) => {
|
||||||
const { updateOptions } = useDispatch( OPTIONS_STORE_NAME );
|
|
||||||
const {
|
const {
|
||||||
keepCompletedTaskList,
|
keepCompletedTaskList,
|
||||||
isResolving: isResolvingOptions,
|
isResolving: isResolvingOptions,
|
||||||
|
@ -119,16 +118,6 @@ const TaskDashboard = ( { query, twoColumns } ) => {
|
||||||
'Get ready to start selling',
|
'Get ready to start selling',
|
||||||
'woocommerce-admin'
|
'woocommerce-admin'
|
||||||
) }
|
) }
|
||||||
onComplete={ () =>
|
|
||||||
updateOptions( {
|
|
||||||
woocommerce_default_homepage_layout: 'two_columns',
|
|
||||||
} )
|
|
||||||
}
|
|
||||||
onHide={ () =>
|
|
||||||
updateOptions( {
|
|
||||||
woocommerce_default_homepage_layout: 'two_columns',
|
|
||||||
} )
|
|
||||||
}
|
|
||||||
/>
|
/>
|
||||||
) }
|
) }
|
||||||
</>
|
</>
|
||||||
|
|
|
@ -310,6 +310,13 @@ function wc_admin_update_290_update_apperance_task_option() {
|
||||||
delete_option( 'woocommerce_task_list_appearance_complete' );
|
delete_option( 'woocommerce_task_list_appearance_complete' );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete the old woocommerce_default_homepage_layout option.
|
||||||
|
*/
|
||||||
|
function wc_admin_update_290_delete_default_homepage_layout_option() {
|
||||||
|
delete_option( 'woocommerce_default_homepage_layout' );
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update DB Version.
|
* Update DB Version.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -54,6 +54,5 @@ export class PaymentsSetup extends BasePage {
|
||||||
async enableCashOnDelivery() {
|
async enableCashOnDelivery() {
|
||||||
await this.page.waitForSelector( '.woocommerce-task-payment-cod' );
|
await this.page.waitForSelector( '.woocommerce-task-payment-cod' );
|
||||||
await this.clickButtonWithText( 'Enable' );
|
await this.clickButtonWithText( 'Enable' );
|
||||||
await waitForTimeout( 500 );
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,6 +77,9 @@ const testAdminPaymentSetupTask = () => {
|
||||||
await waitForTimeout( 1000 );
|
await waitForTimeout( 1000 );
|
||||||
await homeScreen.clickOnTaskList( 'Set up payments' );
|
await homeScreen.clickOnTaskList( 'Set up payments' );
|
||||||
await paymentsSetup.enableCashOnDelivery();
|
await paymentsSetup.enableCashOnDelivery();
|
||||||
|
await homeScreen.navigate();
|
||||||
|
await homeScreen.isDisplayed();
|
||||||
|
await waitForTimeout( 1000 );
|
||||||
await homeScreen.clickOnTaskList( 'Set up payments' );
|
await homeScreen.clickOnTaskList( 'Set up payments' );
|
||||||
await paymentsSetup.isDisplayed();
|
await paymentsSetup.isDisplayed();
|
||||||
await paymentsSetup.methodHasBeenSetup( 'cod' );
|
await paymentsSetup.methodHasBeenSetup( 'cod' );
|
||||||
|
|
|
@ -71,6 +71,7 @@ class Install {
|
||||||
),
|
),
|
||||||
'2.9.0' => array(
|
'2.9.0' => array(
|
||||||
'wc_admin_update_290_update_apperance_task_option',
|
'wc_admin_update_290_update_apperance_task_option',
|
||||||
|
'wc_admin_update_290_delete_default_homepage_layout_option',
|
||||||
'wc_admin_update_290_db_version',
|
'wc_admin_update_290_db_version',
|
||||||
),
|
),
|
||||||
'3.0.0' => array(
|
'3.0.0' => array(
|
||||||
|
|
Loading…
Reference in New Issue