diff --git a/apps/web/process/load-kp/reactions.ts b/apps/web/process/load-kp/reactions.ts index aa462ad..83904cc 100644 --- a/apps/web/process/load-kp/reactions.ts +++ b/apps/web/process/load-kp/reactions.ts @@ -23,19 +23,30 @@ export default function loadKpReactions({ store, trpcClient }: ReactionsContext) content: `Загружаем КП ${quoteName}...`, }); - const payload = { - values: { - quote: quoteId, - ...pick($calculation.$values.values, ['recalcWithRevision']), - }, - }; + const { recalcWithRevision } = $calculation.$values.values; trpcClient.quote.getData - .query(payload) + .query({ + values: { + quote: quoteId, + recalcWithRevision, + }, + }) .then(({ values, payments, insurance, fingap }) => { + const savedValues = pick($calculation.$values.values, [ + 'lead', + 'opportunity', + 'quote', + 'leadUrl', + 'opportunityUrl', + 'quoteUrl', + ]); + $calculation.$values.setValues({ - values, - exclude: ['lead', 'opportunity', 'quote', 'leadUrl', 'opportunityUrl', 'quoteUrl'], + values: { + ...values, + ...savedValues, + }, }); $tables.payments.setValues(payments.values); diff --git a/apps/web/stores/calculation/values/index.ts b/apps/web/stores/calculation/values/index.ts index a1b4112..125c809 100644 --- a/apps/web/stores/calculation/values/index.ts +++ b/apps/web/stores/calculation/values/index.ts @@ -1,7 +1,6 @@ /* eslint-disable object-curly-newline */ import defaultValues from 'config/default-values'; import { makeAutoObservable } from 'mobx'; -import { pick } from 'radash'; import type RootStore from '../../root'; import type { CalculationValues, Values } from './types'; @@ -18,11 +17,10 @@ export default class ValuesStore { this.values = initialValues; }; - setValues = (params: { values: CalculationValues; exclude: Values[] }) => { - const { values, exclude } = params; + setValues = (params: { values: CalculationValues }) => { + const { values } = params; - const savedValues = pick(this.values, exclude); - this.values = { ...values, ...savedValues }; + this.values = values; }; getValue(valueName: V) {