From def0aecec3e39c0e94ff90376ce1331e60d20f8a Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Tue, 29 Dec 2020 13:47:34 +0300
Subject: [PATCH] get preparedValues from calculation response

---
 .../stores/CalculationStore/Effects/actions/calculate/index.js  | 2 +-
 src/core/types/Calculation/Responses.ts                         | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/index.js b/src/client/stores/CalculationStore/Effects/actions/calculate/index.js
index 23c509c..7459c10 100644
--- a/src/client/stores/CalculationStore/Effects/actions/calculate/index.js
+++ b/src/client/stores/CalculationStore/Effects/actions/calculate/index.js
@@ -82,7 +82,7 @@ export default async () => {
       results.showResultsTable(preparedData, res);
       results.showResults(preparedData, res);
 
-      return { ...res, ...preparedData };
+      return Object.assign(preparedData, res);
     })
     .catch(err => {
       openNotification({
diff --git a/src/core/types/Calculation/Responses.ts b/src/core/types/Calculation/Responses.ts
index b6d3d24..35e6b2f 100644
--- a/src/core/types/Calculation/Responses.ts
+++ b/src/core/types/Calculation/Responses.ts
@@ -1,3 +1,4 @@
+import { PreparedValues } from './Prepare';
 import { TCRMEntity } from '../Entities/crmEntities';
 import { TEntities } from '../Entities/crmEntityNames';
 import { ColumnsNames, IColumn, PostValues } from './Core';
@@ -9,4 +10,5 @@ export interface IGetCRMEntitiesResponse {
 export interface IGetCalculationResponse {
   columns: { [column in ColumnsNames]?: IColumn };
   postValues: PostValues;
+  preparedValues: PreparedValues;
 }