From 1d93a63bc7acc5cd8776b70821cb785541308455 Mon Sep 17 00:00:00 2001
From: vchikalkin <djchikalkin@gmail.com>
Date: Tue, 17 Aug 2021 13:50:04 +0300
Subject: [PATCH] fixes #2

---
 .../Calculation/lib/fetchData/index.js         | 18 +++++++++++++-----
 .../stores/CalculationStore/Data/values.js     |  6 ++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/client/Containers/Calculation/lib/fetchData/index.js b/src/client/Containers/Calculation/lib/fetchData/index.js
index fe75bff..048a940 100644
--- a/src/client/Containers/Calculation/lib/fetchData/index.js
+++ b/src/client/Containers/Calculation/lib/fetchData/index.js
@@ -1,4 +1,6 @@
 import CalculationStore from 'client/stores/CalculationStore';
+import initialOptions from 'client/stores/CalculationStore/config/initialOptions';
+import initialValues from 'client/stores/CalculationStore/config/initialValues';
 import UserStore from 'client/stores/UserStore';
 import CrmService from 'core/services/CrmService';
 import { Process } from 'core/types/Calculation/Store/process';
@@ -34,7 +36,7 @@ export default () =>
       .then(
         ([
           { entities: ownerOptions },
-          { entities: initialOptions },
+          { entities: options },
           { entities: staticEntities },
           {
             entities: { systemuser },
@@ -43,10 +45,16 @@ export default () =>
             entities: { insuranceCompany },
           },
         ]) => {
-          CalculationStore.applyOptions(ownerOptions);
-          CalculationStore.applyOptions(initialOptions);
-          CalculationStore.applyStaticData(staticEntities);
-          CalculationStore.applyStaticData({ systemuser: [systemuser] });
+          CalculationStore.applyOptions({
+            ...initialOptions,
+            ...ownerOptions,
+            ...options,
+          });
+          CalculationStore.applyStaticData({
+            ...staticEntities,
+            systemuser: [systemuser],
+          });
+          CalculationStore.setValues(initialValues, true);
           CalculationStore.setTableColumns('tableInsurance')({
             options: { insuranceCompany },
           });
diff --git a/src/client/stores/CalculationStore/Data/values.js b/src/client/stores/CalculationStore/Data/values.js
index 7a8903d..5e4843d 100644
--- a/src/client/stores/CalculationStore/Data/values.js
+++ b/src/client/stores/CalculationStore/Data/values.js
@@ -1,15 +1,13 @@
 import { getValueName } from 'client/Containers/Calculation/lib/elements/tools';
 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 { isNil, mergeWith, pick } from 'lodash';
 
 const valuesData = {
-  values: initialValues,
+  values: {},
   statuses: initialStatuses,
   validations: {},
-  options: initialOptions,
+  options: {},
   filters: initialFilters,
 };