From f3d9991c5d7a531426d57fd7e3b675e32f66a77d Mon Sep 17 00:00:00 2001
From: Marta Bondyra <marta.bondyra@gmail.com>
Date: Wed, 1 Dec 2021 19:32:20 +0100
Subject: [PATCH] Update embeddable.tsx

make sure conflict error logic will execute
---
 x-pack/plugins/lens/public/embeddable/embeddable.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/lens/public/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
index 4e512ba27ac01c..aef3cda8679ea0 100644
--- a/x-pack/plugins/lens/public/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/embeddable/embeddable.tsx
@@ -284,10 +284,10 @@ export class Embeddable
   }
 
   private maybeAddConflictError(
-    errors: ErrorMessage[],
+    errors?: ErrorMessage[],
     sharingSavedObjectProps?: SharingSavedObjectProps
   ) {
-    const ret = [...errors];
+    const ret = [...(errors || [])];
 
     if (sharingSavedObjectProps?.outcome === 'conflict' && !!this.deps.spaces) {
       ret.push({
@@ -303,7 +303,7 @@ export class Embeddable
       });
     }
 
-    return ret;
+    return ret?.length ? ret : undefined;
   }
 
   async initializeSavedVis(input: LensEmbeddableInput) {
@@ -330,7 +330,7 @@ export class Embeddable
       this.deps.documentToExpression
     );
     this.expression = expression;
-    this.errors = errors && this.maybeAddConflictError(errors, metaInfo?.sharingSavedObjectProps);
+    this.errors = this.maybeAddConflictError(errors, metaInfo?.sharingSavedObjectProps);
 
     if (this.errors) {
       this.logError('validation');