diff --git a/apps/web/process/bonuses/reactions/common.ts b/apps/web/process/bonuses/reactions/common.ts index c3ab87e..0d0da52 100644 --- a/apps/web/process/bonuses/reactions/common.ts +++ b/apps/web/process/bonuses/reactions/common.ts @@ -1,10 +1,10 @@ import type { ProcessContext } from '../../types'; import helper from '../lib/helper'; import * as CRMTypes from '@/graphql/crm.types'; +import { disposableReaction } from '@/utils/mobx'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; -import { disposableReaction } from 'tools'; dayjs.extend(utc); diff --git a/apps/web/process/bonuses/reactions/validation.ts b/apps/web/process/bonuses/reactions/validation.ts index 809ff08..eff9a3b 100644 --- a/apps/web/process/bonuses/reactions/validation.ts +++ b/apps/web/process/bonuses/reactions/validation.ts @@ -2,8 +2,8 @@ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; const key = uid(7); diff --git a/apps/web/process/calculate/reactions/validation.ts b/apps/web/process/calculate/reactions/validation.ts index ab745b7..6dbb79b 100644 --- a/apps/web/process/calculate/reactions/validation.ts +++ b/apps/web/process/calculate/reactions/validation.ts @@ -3,9 +3,9 @@ import type * as Values from '@/Components/Calculation/config/map/values'; import type * as Insurance from '@/Components/Calculation/Form/Insurance/InsuranceTable/types'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { disposableReaction } from '@/utils/mobx'; import { reaction } from 'mobx'; import { uid } from 'radash'; -import { disposableReaction } from 'tools'; import type { BaseOption } from 'ui/elements/types'; function hasInvalidValueOrOptions(value: unknown, options: Array>) { diff --git a/apps/web/process/configurator/reactions/unlimited.ts b/apps/web/process/configurator/reactions/unlimited.ts index daca5a0..e54b05a 100644 --- a/apps/web/process/configurator/reactions/unlimited.ts +++ b/apps/web/process/configurator/reactions/unlimited.ts @@ -1,6 +1,7 @@ import * as CRMTypes from '@/graphql/crm.types'; import type { ProcessContext } from '@/process/types'; -import { disposableReaction, normalizeOptions } from 'tools'; +import { disposableReaction } from '@/utils/mobx'; +import { normalizeOptions } from 'tools'; export default function unlimitedReactions({ store, apolloClient }: ProcessContext) { const { $calculation, $process } = store; diff --git a/apps/web/process/configurator/reactions/validation.ts b/apps/web/process/configurator/reactions/validation.ts index 3fb6c39..6a523fd 100644 --- a/apps/web/process/configurator/reactions/validation.ts +++ b/apps/web/process/configurator/reactions/validation.ts @@ -2,8 +2,8 @@ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; const key = uid(7); diff --git a/apps/web/process/configurator/reactions/values.ts b/apps/web/process/configurator/reactions/values.ts index d3d27de..da979c2 100644 --- a/apps/web/process/configurator/reactions/values.ts +++ b/apps/web/process/configurator/reactions/values.ts @@ -1,11 +1,12 @@ import type { Elements } from '@/Components/Calculation/config/map/values'; import * as CRMTypes from '@/graphql/crm.types'; import type { ProcessContext } from '@/process/types'; +import { disposableReaction } from '@/utils/mobx'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; import { first, sort } from 'radash'; -import { disposableReaction, normalizeOptions } from 'tools'; +import { normalizeOptions } from 'tools'; dayjs.extend(utc); diff --git a/apps/web/process/gibdd/reactions.ts b/apps/web/process/gibdd/reactions.ts index 3ae52f9..63b42b6 100644 --- a/apps/web/process/gibdd/reactions.ts +++ b/apps/web/process/gibdd/reactions.ts @@ -7,12 +7,13 @@ import { selectObjectCategoryTax } from '@/config/default-options'; import { STALE_TIME } from '@/constants/request'; import * as CRMTypes from '@/graphql/crm.types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction, disposableReaction } from '@/utils/mobx'; import type { QueryFunctionContext } from '@tanstack/react-query'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; import { uid } from 'radash'; -import { debouncedReaction, disposableReaction, normalizeOptions } from 'tools'; +import { normalizeOptions } from 'tools'; dayjs.extend(utc); diff --git a/apps/web/process/insurance/reactions.ts b/apps/web/process/insurance/reactions.ts index 5a42781..a630a61 100644 --- a/apps/web/process/insurance/reactions.ts +++ b/apps/web/process/insurance/reactions.ts @@ -5,9 +5,10 @@ import type { Elements } from '@/Components/Calculation/config/map/values'; import { selectLeaseObjectUseFor } from '@/config/default-options'; import * as CRMTypes from '@/graphql/crm.types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { comparer, reaction, toJS } from 'mobx'; import { uid } from 'radash'; -import { debouncedReaction, normalizeOptions } from 'tools'; +import { normalizeOptions } from 'tools'; export function common({ store, apolloClient }: ProcessContext) { const { $calculation, $tables } = store; diff --git a/apps/web/process/lead-opportunity/reactions/common.ts b/apps/web/process/lead-opportunity/reactions/common.ts index ccdf8cc..3510951 100644 --- a/apps/web/process/lead-opportunity/reactions/common.ts +++ b/apps/web/process/lead-opportunity/reactions/common.ts @@ -1,8 +1,8 @@ import * as CRMTypes from '@/graphql/crm.types'; import type { ProcessContext } from '@/process/types'; +import { disposableReaction } from '@/utils/mobx'; import { reaction } from 'mobx'; import { normalizeOptions } from 'tools/entity'; -import { disposableReaction } from 'tools/mobx'; export default function reactions({ store, apolloClient }: ProcessContext) { const { $calculation, $process } = store; diff --git a/apps/web/process/leasing-object/reactions/validation.ts b/apps/web/process/leasing-object/reactions/validation.ts index 441e708..4def11c 100644 --- a/apps/web/process/leasing-object/reactions/validation.ts +++ b/apps/web/process/leasing-object/reactions/validation.ts @@ -2,9 +2,9 @@ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { autorun } from 'mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; const key = uid(7); diff --git a/apps/web/process/payments/reactions/common.ts b/apps/web/process/payments/reactions/common.ts index b682143..419fa05 100644 --- a/apps/web/process/payments/reactions/common.ts +++ b/apps/web/process/payments/reactions/common.ts @@ -5,10 +5,10 @@ import { selectHighSeasonStart } from '@/config/default-options'; import { MIN_PAYMENT } from '@/constants/values'; import type { ProcessContext } from '@/process/types'; import type { Row } from '@/stores/tables/payments/types'; +import { disposableReaction } from '@/utils/mobx'; import { comparer, reaction, toJS } from 'mobx'; import { shift } from 'radash'; import { difference } from 'tools/array'; -import { disposableReaction } from 'tools/mobx'; const { generateSeasonPaymentsRows, diff --git a/apps/web/process/price/reactions/common.ts b/apps/web/process/price/reactions/common.ts index 748f3e6..dc9eecc 100644 --- a/apps/web/process/price/reactions/common.ts +++ b/apps/web/process/price/reactions/common.ts @@ -1,8 +1,9 @@ import { VAT } from '@/constants/values'; import * as CRMTypes from '@/graphql/crm.types'; import type { ProcessContext } from '@/process/types'; +import { disposableReaction } from '@/utils/mobx'; import { reaction } from 'mobx'; -import { disposableReaction, round } from 'tools'; +import { round } from 'tools'; export default function reactions({ store, apolloClient }: ProcessContext) { const { $calculation, $process } = store; diff --git a/apps/web/process/price/reactions/validation.ts b/apps/web/process/price/reactions/validation.ts index f32e769..329ae31 100644 --- a/apps/web/process/price/reactions/validation.ts +++ b/apps/web/process/price/reactions/validation.ts @@ -2,8 +2,8 @@ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; const key = uid(7); diff --git a/apps/web/process/recalc/reactions.ts b/apps/web/process/recalc/reactions.ts index 7a6ccab..a0a990c 100644 --- a/apps/web/process/recalc/reactions.ts +++ b/apps/web/process/recalc/reactions.ts @@ -5,11 +5,12 @@ import { selectRequirementTelematic } from '@/config/default-options'; import * as CRMTypes from '@/graphql/crm.types'; import type { Values } from '@/stores/calculation/values/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction, disposableReaction } from '@/utils/mobx'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; import { uid } from 'radash'; -import { debouncedReaction, disposableReaction, normalizeOptions } from 'tools'; +import { normalizeOptions } from 'tools'; dayjs.extend(utc); diff --git a/apps/web/process/supplier-agent/lib/create-reactions.ts b/apps/web/process/supplier-agent/lib/create-reactions.ts index d8f7dc7..2667b70 100644 --- a/apps/web/process/supplier-agent/lib/create-reactions.ts +++ b/apps/web/process/supplier-agent/lib/create-reactions.ts @@ -1,12 +1,12 @@ import type { AgentsFields, AgentsRewardConditionsFields, AgentsSumFields } from './types'; import * as CRMTypes from '@/graphql/crm.types'; import type RootStore from '@/stores/root'; +import { disposableReaction } from '@/utils/mobx'; import type { ApolloClient } from '@apollo/client'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; import { normalizeOptions } from 'tools/entity'; -import { disposableReaction } from 'tools/mobx'; dayjs.extend(utc); diff --git a/apps/web/process/supplier-agent/reactions/agents.ts b/apps/web/process/supplier-agent/reactions/agents.ts index 9a1acd5..f0a661f 100644 --- a/apps/web/process/supplier-agent/reactions/agents.ts +++ b/apps/web/process/supplier-agent/reactions/agents.ts @@ -3,10 +3,10 @@ import * as createReactions from '../lib/create-reactions'; import * as fillAgentsFromLead from '../lib/fill-agents-from-lead'; import * as CRMTypes from '@/graphql/crm.types'; import type { ProcessContext } from '@/process/types'; +import { disposableReaction } from '@/utils/mobx'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import { reaction } from 'mobx'; -import { disposableReaction } from 'tools/mobx'; const { fillIndAgent, fillCalcBroker, fillCalcDoubleAgent, fillFinDepartment } = fillAgentsFromLead; const { fillAgentRewardReaction, fillAgentRewardSummReaction } = createReactions; diff --git a/apps/web/process/supplier-agent/reactions/validation.ts b/apps/web/process/supplier-agent/reactions/validation.ts index d4437e4..38524bb 100644 --- a/apps/web/process/supplier-agent/reactions/validation.ts +++ b/apps/web/process/supplier-agent/reactions/validation.ts @@ -2,8 +2,8 @@ import { createValidationSchema } from '../validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import type { ProcessContext } from '@/process/types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; const key = uid(7); diff --git a/apps/web/process/used-pl/reactions.ts b/apps/web/process/used-pl/reactions.ts index 89133f1..fe07f27 100644 --- a/apps/web/process/used-pl/reactions.ts +++ b/apps/web/process/used-pl/reactions.ts @@ -3,9 +3,9 @@ import { createValidationSchema } from './validation'; import type { Elements } from '@/Components/Calculation/config/map/values'; import * as CRMTypes from '@/graphql/crm.types'; import ValidationHelper from '@/stores/validation/helper'; +import { debouncedReaction } from '@/utils/mobx'; import { reaction } from 'mobx'; import { uid } from 'radash'; -import { debouncedReaction } from 'tools'; export function common({ store, apolloClient }: ProcessContext) { const { $calculation } = store; diff --git a/packages/tools/mobx.ts b/apps/web/utils/mobx.ts similarity index 100% rename from packages/tools/mobx.ts rename to apps/web/utils/mobx.ts diff --git a/packages/tools/index.ts b/packages/tools/index.ts index 39c5d2c..a304f23 100644 --- a/packages/tools/index.ts +++ b/packages/tools/index.ts @@ -1,6 +1,5 @@ export * from './array'; export * from './common'; export * from './entity'; -export * from './mobx'; export * from './number'; export * from './object'; diff --git a/packages/tools/package.json b/packages/tools/package.json index ab97624..6afb6f7 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -11,8 +11,5 @@ "eslint": "^8.35.0", "eslint-config-custom": "*" }, - "dependencies": { - "mobx": "^6.8.0", - "radash": "^10.8.1" - } + "dependencies": {} } diff --git a/yarn.lock b/yarn.lock index 02120e2..fd2d651 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7829,11 +7829,6 @@ radash@^10.7.0: resolved "https://registry.yarnpkg.com/radash/-/radash-10.7.0.tgz#aaa164f9697a440d848b88323d51d1bc4f39608a" integrity sha512-dz5NUcGnvn080kKJnyPtqVnP4MWoiwp5qQhEQFK/qMJxCjffQd8tMR4cybxy6y5hupYa5UkSlJRSRY2F7GPBxQ== -radash@^10.8.1: - version "10.8.1" - resolved "https://registry.yarnpkg.com/radash/-/radash-10.8.1.tgz#7a49fa1ec07381dba9174ddadf83401e1db293f9" - integrity sha512-NzYo3XgM9Tzjf5iFPIMG2l5+LSOCi2H7Axe3Ry/1PrhlvuqxUoiLsmcTBtw4CfKtzy5Fzo79STiEj9JZWMfDQg== - rambda@^7.1.0: version "7.4.0" resolved "https://registry.yarnpkg.com/rambda/-/rambda-7.4.0.tgz#61ec9de31d3dd6affe804de3bae04a5b818781e5"