From 04f88b98542d8d0da432f63b19d3a37d85318ae8 Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Thu, 7 Nov 2019 20:54:02 +0200
Subject: [PATCH 1/3] ensure new Analytics property fields are assigned
 properly

---
 includes/Modules/Analytics.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
index 7c4fdfccf7f..eabab1ec31c 100644
--- a/includes/Modules/Analytics.php
+++ b/includes/Modules/Analytics.php
@@ -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'];

From 2644c70c5d9dfe34c0df9afee45676049eba3f2b Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Thu, 7 Nov 2019 20:54:16 +0200
Subject: [PATCH 2/3] remove unused variable

---
 includes/Modules/Analytics.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Modules/Analytics.php b/includes/Modules/Analytics.php
index eabab1ec31c..8871c0d980e 100644
--- 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();

From b01d4fd4c8c082bceb823f933c6e393cfa4e937b Mon Sep 17 00:00:00 2001
From: Evan Mattson <evan.mattson@10up.com>
Date: Thu, 7 Nov 2019 20:57:57 +0200
Subject: [PATCH 3/3] fix potential error with zero data in data table

---
 assets/js/components/data-table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/components/data-table.js b/assets/js/components/data-table.js
index 630050b20e1..864f0988921 100644
--- 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">