From f6af6053591fdbb97b37435d22a73caba9df611b Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Wed, 24 Mar 2021 16:16:18 +0300
Subject: [PATCH] fix merge empty array when apply options

---
 src/client/stores/CalculationStore/Data/values.js | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/client/stores/CalculationStore/Data/values.js b/src/client/stores/CalculationStore/Data/values.js
index cc7bb3e..e9ec461 100644
--- a/src/client/stores/CalculationStore/Data/values.js
+++ b/src/client/stores/CalculationStore/Data/values.js
@@ -2,7 +2,7 @@ import initialFilters from 'client/stores/CalculationStore/config/initialFilters
 import initialOptions from 'client/stores/CalculationStore/config/initialOptions';
 import initialStatuses from 'client/stores/CalculationStore/config/initialStatuses';
 import initialValues from 'client/stores/CalculationStore/config/initialValues';
-import { merge } from 'lodash';
+import { isNil, mergeWith } from 'lodash';
 
 const valuesData = {
   values: initialValues,
@@ -50,7 +50,12 @@ const valuesActions = {
     this.options[elementName] = options;
   },
   applyOptions(options) {
-    this.options = merge(this.options, options);
+    this.options = mergeWith(this.options, options, (obj, src) => {
+      if (!isNil(src)) {
+        return src;
+      }
+      return obj;
+    });
   },
 
   getFilter(elementName) {