Merge pull request #817 from google/fix/816-analytics-new-profile-setup

Fix Analytics setup with new profile
google · Nov 7, 2019 · 7683bdc · 7683bdc
2 parents 230bc6e + b01d4fd
commit 7683bdc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/assets/js/components/data-table.js b/assets/js/components/data-table.js
@@ -95,7 +95,7 @@ export const getDataTableFromData = ( data, headers, options ) => {
 			<table
 				className={ `
 					googlesitekit-table__wrapper
-					googlesitekit-table__wrapper--${ data[ 0 ].length }-col
+					googlesitekit-table__wrapper--${ data && data[ 0 ] ? data[ 0 ].length : 1 }-col
 				` }
 			>
 				<thead className="googlesitekit-table__head">

diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
@@ -893,7 +893,7 @@ function ( $order_def ) {
 					return function() use ( $data ) {
 						$property_id              = null;
 						$internal_web_property_id = null;
-						$property_name            = '';
+
 						if ( '0' === $data['propertyID'] ) {
 							$is_new_property = true;
 							$client          = $this->get_client();
@@ -915,8 +915,9 @@ function ( $order_def ) {
 								return new WP_Error( $e->getCode(), $e->getMessage() );
 							}
 							$client->setDefer( $orig_defer );
-							$property_id              = $property->id;
-							$internal_web_property_id = $property->internalWebPropertyID; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
+							/* @var Google_Service_Analytics_Webproperty $property Property instance. */
+							$property_id              = $property->getId();
+							$internal_web_property_id = $property->getInternalWebPropertyId();
 						} else {
 							$is_new_property          = false;
 							$property_id              = $data['propertyID'];