Skip to content

Commit

Permalink
Merge branch 'develop' into fix/506-amp-tag-detection
Browse files Browse the repository at this point in the history
  • Loading branch information
@aaemnnosttv
aaemnnosttv authored Oct 10, 2019
2 parents 45f7b4a + 1a2b1e7 commit b0bdda6
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 83 deletions.
156 changes: 76 additions & 80 deletions assets/js/modules/analytics/dashboard/dashboard-widget.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,88 +170,84 @@ class AnalyticsDashboardWidget extends Component {
{ ! receivingData && (
error ? getDataErrorComponent( __( 'Analytics', 'google-site-kit' ), error, true, true, true ) : getNoDataComponent( __( 'Analytics', 'google-site-kit' ), true, true, true )
) }
{ receivingData && (
<Fragment>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
title={ sprintf( __( 'Audience overview for the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
headerCtaLink="http://analytics.google.com"
>
<AnalyticsDashboardWidgetOverview
selectedStats={ selectedStats }
handleStatSelection={ this.handleStatSelection }
handleDataError={ this.handleDataError }
handleDataSuccess={ this.handleDataSuccess }
/>
<AnalyticsDashboardWidgetSiteStats
selectedStats={ selectedStats }
series={ series }
vAxes={ vAxes }
dateRangeFrom={ dateRangeFrom }
/>
</Layout>
</div>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
footer
title={ sprintf( __( 'Top content over the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLink="https://analytics.google.com"
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
footerCtaLabel={ __( 'Analytics', 'google-site-kit' ) }
footerCtaLink="https://analytics.google.com"
>
<AnalyticsDashboardWidgetTopPagesTable />
</Layout>
</div>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
footer
title={ sprintf( __( 'Top acquisition sources over the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLink="https://analytics.google.com"
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
footerCtaLabel={ __( 'Analytics', 'google-site-kit' ) }
footerCtaLink="https://analytics.google.com"
>
<div className="mdc-layout-grid">
<div className="mdc-layout-grid__inner">
<div className="
mdc-layout-grid__cell
mdc-layout-grid__cell--span-4-desktop
mdc-layout-grid__cell--span-8-tablet
mdc-layout-grid__cell--span-4-phone
">
<DashboardAcquisitionPieChart />
</div>
<div className="
mdc-layout-grid__cell
mdc-layout-grid__cell--span-8-desktop
mdc-layout-grid__cell--span-8-tablet
mdc-layout-grid__cell--span-4-phone
">
<AnalyticsDashboardWidgetTopAcquisitionSources />
</div>
</div>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
title={ sprintf( __( 'Audience overview for the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
headerCtaLink="http://analytics.google.com"
>
<AnalyticsDashboardWidgetOverview
selectedStats={ selectedStats }
handleStatSelection={ this.handleStatSelection }
handleDataError={ this.handleDataError }
handleDataSuccess={ this.handleDataSuccess }
/>
<AnalyticsDashboardWidgetSiteStats
selectedStats={ selectedStats }
series={ series }
vAxes={ vAxes }
dateRangeFrom={ dateRangeFrom }
/>
</Layout>
</div>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
footer
title={ sprintf( __( 'Top content over the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLink="https://analytics.google.com"
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
footerCtaLabel={ __( 'Analytics', 'google-site-kit' ) }
footerCtaLink="https://analytics.google.com"
>
<AnalyticsDashboardWidgetTopPagesTable />
</Layout>
</div>
<div className={ `
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
${ wrapperClass }
` }>
<Layout
header
footer
title={ sprintf( __( 'Top acquisition sources over the last %s', 'google-site-kit' ), dateRangeFrom ) }
headerCtaLink="https://analytics.google.com"
headerCtaLabel={ __( 'See full stats in Analytics', 'google-site-kit' ) }
footerCtaLabel={ __( 'Analytics', 'google-site-kit' ) }
footerCtaLink="https://analytics.google.com"
>
<div className="mdc-layout-grid">
<div className="mdc-layout-grid__inner">
<div className="
mdc-layout-grid__cell
mdc-layout-grid__cell--span-4-desktop
mdc-layout-grid__cell--span-8-tablet
mdc-layout-grid__cell--span-4-phone
">
<DashboardAcquisitionPieChart />
</div>
</Layout>
<div className="
mdc-layout-grid__cell
mdc-layout-grid__cell--span-8-desktop
mdc-layout-grid__cell--span-8-tablet
mdc-layout-grid__cell--span-4-phone
">
<AnalyticsDashboardWidgetTopAcquisitionSources />
</div>
</div>
</div>
</Fragment>
) }
</Layout>
</div>
<div className="
mdc-layout-grid__cell
mdc-layout-grid__cell--span-12
Expand Down
15 changes: 13 additions & 2 deletions assets/js/modules/tagmanager/setup.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,14 @@ class TagmanagerSetup extends Component {
let errorMsg = '';
const responseData = await data.get( TYPE_MODULES, 'tagmanager', 'accounts-containers', queryArgs );

if ( ! selectedAccount && 0 === responseData.accounts.length ) {
errorCode = 'accountEmpty';
errorMsg = __(
'We didn’t find an associated Google Tag Manager account, would you like to set it up now? If you’ve just set up an account please re-fetch your account to sync it with Site Kit.',
'google-site-kit'
);
}

// Verify if user has access to the selected account.
if ( selectedAccount && ! responseData.accounts.find( ( account ) => account.accountId === selectedAccount ) ) {
data.invalidateCacheGroup( TYPE_MODULES, 'tagmanager', 'accounts-containers' );
Expand All @@ -147,12 +155,15 @@ class TagmanagerSetup extends Component {
responseData.containers.push( chooseContainer );

if ( this._isMounted ) {
const accountId = responseData.accounts[ 0 ] ? responseData.accounts[ 0 ].accountId : null;
const publicId = responseData.containers[ 0 ] ? responseData.containers[ 0 ].publicId : null;

this.setState( {
isLoading: false,
accounts: responseData.accounts,
selectedAccount: ( selectedAccount ) ? selectedAccount : responseData.accounts[ 0 ].accountId,
selectedAccount: ( selectedAccount ) ? selectedAccount : accountId,
containers: responseData.containers,
selectedContainer: ( selectedContainer ) ? selectedContainer : responseData.containers[ 0 ].publicId,
selectedContainer: ( selectedContainer ) ? selectedContainer : publicId,
refetch: false,
errorCode,
errorMsg,
Expand Down
2 changes: 1 addition & 1 deletion includes/Modules/TagManager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ protected function parse_data_response( $method, $datapoint, $response ) {
'containers' => array(),
);
if ( 0 === count( $response['accounts'] ) ) {
return new WP_Error( 'google_tagmanager_account_empty', __( 'We didn’t find an associated Google Tag Manager account, would you like to set it up now? If you’ve just set up an account please re-fetch your account to sync it with Site Kit.', 'google-site-kit' ), array( 'status' => 500 ) );
return $response;
}
if ( is_array( $this->_list_accounts_data ) && isset( $this->_list_accounts_data['accountId'] ) ) {
$account_id = $this->_list_accounts_data['accountId'];
Expand Down

0 comments on commit b0bdda6

Please sign in to comment.