From 3e1eea65e9fefc3ecd1f4839ce1aadb4c765a644 Mon Sep 17 00:00:00 2001
From: Wylie Conlon <wylieconlon@gmail.com>
Date: Thu, 7 May 2020 13:29:55 -0400
Subject: [PATCH] Remove optional chaining for required properties

---
 x-pack/plugins/lens/server/migrations.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/lens/server/migrations.ts b/x-pack/plugins/lens/server/migrations.ts
index c8c756574a3da3..eba7865028645c 100644
--- a/x-pack/plugins/lens/server/migrations.ts
+++ b/x-pack/plugins/lens/server/migrations.ts
@@ -113,7 +113,7 @@ const removeLensAutoDate: SavedObjectMigrationFn<LensDocShape, LensDocShape> = (
  * Adds missing timeField arguments to esaggs in the Lens expression
  */
 const addTimeFieldToEsaggs: SavedObjectMigrationFn<LensDocShape, LensDocShape> = (doc, context) => {
-  const expression = doc.attributes?.expression;
+  const expression = doc.attributes.expression;
   if (!expression) {
     return doc;
   }
@@ -178,9 +178,8 @@ const removeInvalidAccessors: SavedObjectMigrationFn<
   LensDocShape<XYStatePost77>
 > = doc => {
   const newDoc = cloneDeep(doc);
-  if (newDoc.attributes?.visualizationType === 'lnsXY') {
-    const datasourceState = newDoc.attributes.state.datasourceStates.indexpattern;
-    const datasourceLayers = datasourceState?.layers ?? {};
+  if (newDoc.attributes.visualizationType === 'lnsXY') {
+    const datasourceLayers = newDoc.attributes.state.datasourceStates.indexpattern.layers || {};
     const xyState = newDoc.attributes.state.visualization;
     (newDoc.attributes as LensDocShape<
       XYStatePost77