From 1d1c4129fa4f868be3c02ab89105831ef50deb1d Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 20 Apr 2021 15:24:20 +0300 Subject: [PATCH] disable tableInsurance reaction while loading kp --- .../Effects/actions/calculate/validate.ts | 16 ++++------------ .../Effects/reactions/tablesReactions.ts | 7 +++++-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts index 7f1af36..b91f34d 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/validate.ts @@ -88,29 +88,21 @@ const validateInsuranceTable = () => { { insuranceCompany: { validation: !isNil( - CalculationStore.tables.tableInsurance.rows[osagoRowIndex] - .insuranceCompany?.value, + tableInsurance.rows[osagoRowIndex].insuranceCompany?.value, ), }, insured: { - validation: !isNil( - CalculationStore.tables.tableInsurance.rows[osagoRowIndex].insured - ?.value, - ), + validation: !isNil(tableInsurance.rows[osagoRowIndex].insured?.value), }, }, { insuranceCompany: { validation: !isNil( - CalculationStore.tables.tableInsurance.rows[kaskoRowIndex] - .insuranceCompany?.value, + tableInsurance.rows[kaskoRowIndex].insuranceCompany?.value, ), }, insured: { - validation: !isNil( - CalculationStore.tables.tableInsurance.rows[kaskoRowIndex].insured - ?.value, - ), + validation: !isNil(tableInsurance.rows[kaskoRowIndex].insured?.value), }, }, ]); diff --git a/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts index 553956e..a343080 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts @@ -2,7 +2,7 @@ import { openNotification } from 'client/Elements/Notification'; import { insuranceOsagoDefaultFilter, - singleValueFilter + singleValueFilter, } from 'core/constants/stores/Calculation/filters'; import valuesConstants from 'core/constants/values'; import { shift, shiftRight } from 'core/tools/array'; @@ -748,12 +748,15 @@ export default [ }, }), - calculationStore => ({ + (calculationStore, calculationProcess) => ({ expression: () => { const { leaseObjectCategory } = calculationStore.values; return leaseObjectCategory; }, effect: (nextLeaseObjectCategory, prevLeaseObjectCategory) => { + if (calculationProcess.process === Process.LoadKp) { + return; + } const nextIsTrailer = nextLeaseObjectCategory === 100000004; const prevIsTrailer = prevLeaseObjectCategory === 100000004;