Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Enable tracking on the fly during onboarding (https://github.com/woocommerce/woocommerce-admin/pull/4368) 

* Enable the tracking scripts from client-side on opt-in

* Add more info to tracks debug

* Disable tracks if opted out
This commit is contained in:
Joshua T Flowers 2020-05-18 22:35:50 +03:00 committed by GitHub
parent e6c13a4a02
commit 35616d5f22
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/woocommerce-admin/client/lib/tracks.js
View File

@ -16,7 +16,14 @@ const tracksDebug = debug( 'wc-admin:tracks' );
*/
export function recordEvent( eventName, eventProperties ) {
tracksDebug( 'recordevent %s %o', 'wcadmin_' + eventName, eventProperties );
tracksDebug( 'recordevent %s %o', 'wcadmin_' + eventName, eventProperties, {
_tqk: window._tkq,
shouldRecord:
process.env.NODE_ENV !== 'development' &&
!! window._tkq &&
!! window.wcTracks &&
!! window.wcTracks.isEnabled,
} );
if (
! window.wcTracks ||

24
plugins/woocommerce-admin/client/profile-wizard/steps/usage-modal.js
View File

@ -25,6 +25,7 @@ class UsageModal extends Component {
super( props );
this.state = {
allowTracking: props.allowTracking,
isLoadingScripts: false,
};
this.onTrackingChange = this.onTrackingChange.bind( this );
@ -36,7 +37,7 @@ class UsageModal extends Component {
} );
}
async componentDidUpdate( prevProps ) {
async componentDidUpdate( prevProps, prevState ) {
const {
hasErrors,
isRequesting,
@ -44,8 +45,12 @@ class UsageModal extends Component {
onContinue,
createNotice,
} = this.props;
const { isLoadingScripts } = this.state;
const isRequestSuccessful =
! isRequesting && prevProps.isRequesting && ! hasErrors;
! isRequesting &&
! isLoadingScripts &&
( prevProps.isRequesting || prevState.isLoadingScripts ) &&
! hasErrors;
const isRequestError =
! isRequesting && prevProps.isRequesting && hasErrors;
@ -67,10 +72,21 @@ class UsageModal extends Component {
}
updateTracking() {
const { allowTracking } = this.state;
const { updateOptions } = this.props;
const allowTracking = this.state.allowTracking ? 'yes' : 'no';
if ( allowTracking && typeof window.wcTracks.enable === 'function' ) {
this.setState( { isLoadingScripts: true } );
window.wcTracks.enable( () => {
this.setState( { isLoadingScripts: false } );
} );
} else if ( ! allowTracking ) {
window.wcTracks.isEnabled = false;
}
const trackingValue = allowTracking ? 'yes' : 'no';
updateOptions( {
woocommerce_allow_tracking: allowTracking,
woocommerce_allow_tracking: trackingValue,
} );
}