From b5405f52752dba9978035e6325225eae90bf3862 Mon Sep 17 00:00:00 2001
From: Igor Dykhta <igorDykhta@users.noreply.github.com>
Date: Mon, 2 Oct 2023 19:09:46 +0300
Subject: [PATCH] [fix] serializeLayer fixes (#2343)

Signed-off-by: Ihor Dykhta <dikhta.igor@gmail.com>
---
 src/reducers/src/vis-state-updaters.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/reducers/src/vis-state-updaters.ts b/src/reducers/src/vis-state-updaters.ts
index d4871763f6..0e44dbb8d1 100644
--- a/src/reducers/src/vis-state-updaters.ts
+++ b/src/reducers/src/vis-state-updaters.ts
@@ -406,9 +406,11 @@ export function applyLayerConfigUpdater(
     return nextState;
   }
 
-  const serializedOldLayer = serializeLayer(oldLayer, state.schema);
+  // serializeLayer() might return null if the old layer is not valid,
+  // we should still apply the changes in that case
+  const serializedOldLayer = serializeLayer(oldLayer, state.schema) ?? {config: {}};
   const serializedNewLayer = serializeLayer(newLayer, state.schema);
-  if (!serializedNewLayer || !serializedOldLayer) {
+  if (!serializedNewLayer) {
     return state;
   }
   if (!isEqual(serializedOldLayer, serializedNewLayer)) {