From 83c5bf5e961ee024ef14edbe0b0fa9209dc68dfb Mon Sep 17 00:00:00 2001 From: Chika Date: Thu, 15 Apr 2021 17:37:41 +0300 Subject: [PATCH] format code --- .../Containers/Calculation/lib/buildElement.js | 7 +++---- .../Calculation/lib/elements/components.ts | 5 ++--- src/client/hocs/Calculation/index.js | 15 ++++++++------- src/client/stores/CalculationStore/Data/values.js | 2 +- .../Effects/actions/calculate/checkValidation.ts | 6 +++--- .../Effects/actions/calculate/prepareData.ts | 2 +- .../Effects/reactions/loadKpReaction/index.ts | 10 +++++----- .../Effects/reactions/tablesReactions.ts | 12 ++++++------ src/core/services/CrmService/index.ts | 4 ++-- src/core/services/CrmService/tools/entity.ts | 6 +++--- src/core/types/Calculation/Requests.ts | 4 +--- src/core/types/Calculation/Store/tables.ts | 4 ++-- 12 files changed, 37 insertions(+), 40 deletions(-) diff --git a/src/client/Containers/Calculation/lib/buildElement.js b/src/client/Containers/Calculation/lib/buildElement.js index 7c95410..2cd7bf1 100644 --- a/src/client/Containers/Calculation/lib/buildElement.js +++ b/src/client/Containers/Calculation/lib/buildElement.js @@ -3,18 +3,17 @@ import { withComputedValue, withLink, withTable, - withValue, + withValue } from 'client/hocs/Calculation'; import { ElementType } from 'core/types/Calculation/Store/elements'; - import elementsActions from './elements/actions'; import elementsComponents from './elements/components'; import elementsComputedValues from './elements/computedValues'; import elementsProps from './elements/elementsProps'; -import elementsTypes from './elements/types'; -import elementsValues from './elements/values'; import tables from './elements/tables'; +import elementsTypes from './elements/types'; import elementsUrls from './elements/urls'; +import elementsValues from './elements/values'; export function buildElement(elementName) { const elementType = elementsTypes[elementName]; diff --git a/src/client/Containers/Calculation/lib/elements/components.ts b/src/client/Containers/Calculation/lib/elements/components.ts index ba70b9f..49fca72 100644 --- a/src/client/Containers/Calculation/lib/elements/components.ts +++ b/src/client/Containers/Calculation/lib/elements/components.ts @@ -1,6 +1,6 @@ -import { StoreTables } from 'core/types/Calculation/Store/tables'; import Button from 'client/Elements/Button'; import Checkbox from 'client/Elements/Checkbox'; +import Download from 'client/Elements/Download'; import Input from 'client/Elements/Input'; import InputNumber from 'client/Elements/InputNumber'; import Label from 'client/Elements/Label'; @@ -9,10 +9,9 @@ import Select from 'client/Elements/Select'; import Switch from 'client/Elements/Switch'; import Table from 'client/Elements/Table'; import TextArea from 'client/Elements/TextArea'; -import Download from 'client/Elements/Download'; - import { Component } from 'core/types/Calculation/components'; import { TElements } from 'core/types/Calculation/Store/elements'; +import { StoreTables } from 'core/types/Calculation/Store/tables'; const elementsComponents: TElements = { selectChannel: Select, diff --git a/src/client/hocs/Calculation/index.js b/src/client/hocs/Calculation/index.js index 6002198..da4614c 100644 --- a/src/client/hocs/Calculation/index.js +++ b/src/client/hocs/Calculation/index.js @@ -1,15 +1,16 @@ import withButton from './withButton'; -import withLink from './withLink'; import withComputedValue from './withComputedValue'; +import withLink from './withLink'; import withModal from './withModal'; import withTable from './withTable'; import withValue from './withValue'; export { - withButton, - withLink, - withValue, - withComputedValue, - withModal, - withTable, + withButton, + withLink, + withValue, + withComputedValue, + withModal, + withTable, }; + diff --git a/src/client/stores/CalculationStore/Data/values.js b/src/client/stores/CalculationStore/Data/values.js index 371adb8..711d540 100644 --- a/src/client/stores/CalculationStore/Data/values.js +++ b/src/client/stores/CalculationStore/Data/values.js @@ -3,7 +3,7 @@ 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 { find, isNil, mergeWith } from 'lodash'; +import { isNil, mergeWith } from 'lodash'; const valuesData = { values: initialValues, diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts index 140b5ea..4359f3d 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/checkValidation.ts @@ -1,10 +1,10 @@ -import { TableNames } from 'core/types/Calculation/Store/tables'; import elementsTitles, { - tablesTitles, + tablesTitles } from 'client/Containers/Calculation/lib/elements/titles'; import CalculationStore from 'client/stores/CalculationStore'; -import { toJS } from 'mobx'; +import { TableNames } from 'core/types/Calculation/Store/tables'; import { omit } from 'lodash'; +import { toJS } from 'mobx'; export default () => { const invalidElements: string[] = []; diff --git a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts index d80c941..419bc58 100644 --- a/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts +++ b/src/client/stores/CalculationStore/Effects/actions/calculate/prepareData.ts @@ -1,10 +1,10 @@ -import { convertPrice } from '../../lib/tools'; import valuesConstants from 'core/constants/values'; import { PaymentRow, PreparedValues } from 'core/types/Calculation/Prepare'; import { IPreparedData } from 'core/types/Calculation/Requests'; import { ICalculationStore } from 'core/types/Calculation/Store'; import { DateTime } from 'luxon'; import { NIL } from 'uuid'; +import { convertPrice } from '../../lib/tools'; export default ({ calculationStore, diff --git a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts index 7a8d101..f611aad 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/loadKpReaction/index.ts @@ -1,16 +1,16 @@ -import { IEvoGraph } from './../../../../../../core/types/Entities/crmEntities'; -/* eslint-disable @typescript-eslint/ban-ts-comment */ -import { IGetCRMEntitiesResponse } from 'core/types/Calculation/Responses'; -import { TElements } from 'core/types/Calculation/Store/elements'; import { message } from 'antd'; import { elementsValues } from 'client/Containers/Calculation/lib/elements/values'; import { openNotification } from 'client/Elements/Notification'; -import CrmService from 'core/services/CrmService'; import { calculationProcess } from 'client/stores/CalculationStore'; import initialValues from 'client/stores/CalculationStore/config/initialValues'; +import CrmService from 'core/services/CrmService'; import { currentDate } from 'core/tools/date'; +/* eslint-disable @typescript-eslint/ban-ts-comment */ +import { IGetCRMEntitiesResponse } from 'core/types/Calculation/Responses'; import { IReactionEffect } from 'core/types/Calculation/Store/effect'; +import { TElements } from 'core/types/Calculation/Store/elements'; import { Process } from 'core/types/Calculation/Store/process'; +import { IEvoGraph } from 'core/types/Entities/crmEntities'; import { ElementStatus } from 'core/types/statuses'; import { NIL } from 'uuid'; import mapKPtoValues from './mapKpToValues'; diff --git a/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts b/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts index 8e3c7c9..553956e 100644 --- a/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts +++ b/src/client/stores/CalculationStore/Effects/reactions/tablesReactions.ts @@ -1,16 +1,16 @@ /* eslint-disable @typescript-eslint/ban-ts-comment */ import { openNotification } from 'client/Elements/Notification'; -import { shiftRight, shift } from 'core/tools/array'; +import { + insuranceOsagoDefaultFilter, + singleValueFilter +} from 'core/constants/stores/Calculation/filters'; +import valuesConstants from 'core/constants/values'; +import { shift, shiftRight } from 'core/tools/array'; import { IReactionEffect } from 'core/types/Calculation/Store/effect'; import { Process } from 'core/types/Calculation/Store/process'; import { ITableCell, TableProps } from 'core/types/Calculation/Store/tables'; import { ElementStatus } from 'core/types/statuses'; import { toJS } from 'mobx'; -import valuesConstants from 'core/constants/values'; -import { - insuranceOsagoDefaultFilter, - singleValueFilter, -} from 'core/constants/stores/Calculation/filters'; const { PERIODS_NUMBER } = valuesConstants; export default [ diff --git a/src/core/services/CrmService/index.ts b/src/core/services/CrmService/index.ts index 1f08bfd..7d17072 100644 --- a/src/core/services/CrmService/index.ts +++ b/src/core/services/CrmService/index.ts @@ -4,16 +4,16 @@ import { CRM_PROXY_URL } from 'core/constants/urls'; import { ICreateKpRequest, IMutateToCRMGQL, - IQueryToCRMGQL, + IQueryToCRMGQL } from 'core/types/Calculation/Requests'; import { IGetCRMEntitiesResponse } from 'core/types/Calculation/Responses'; import { IBaseOption } from 'core/types/Calculation/Store/options'; import { IQuote, TCRMEntity } from 'core/types/Entities/crmEntities'; import { TEntities } from 'core/types/Entities/crmEntityNames'; +import { cloneDeep } from 'lodash'; import { isPlural, singular } from 'pluralize'; import client from './client'; import { convertEntityToOption } from './tools/entity'; -import { cloneDeep } from 'lodash'; export default class { static crmgqlquery = ({ diff --git a/src/core/services/CrmService/tools/entity.ts b/src/core/services/CrmService/tools/entity.ts index df1d7bc..f22abed 100644 --- a/src/core/services/CrmService/tools/entity.ts +++ b/src/core/services/CrmService/tools/entity.ts @@ -1,11 +1,11 @@ -import propsMap from '../propsMap'; import { IBaseOption } from 'core/types/Calculation/Store/options'; import { TCRMEntity } from 'core/types/Entities/crmEntities'; import { CRMEntityNames } from 'core/types/Entities/crmEntityNames'; +import propsMap from '../propsMap'; export function convertEntityToOption( entity: TCRMEntity, - entityName?: CRMEntityNames, + entityName?: CRMEntityNames ): (TCRMEntity & IBaseOption) | undefined { if (!entityName) { throw new Error('entityName is missing'); @@ -30,7 +30,7 @@ export function convertEntityToOption( const optionatedObject = { ...entity, name, - value, + value }; return optionatedObject; } diff --git a/src/core/types/Calculation/Requests.ts b/src/core/types/Calculation/Requests.ts index c55c1df..8931755 100644 --- a/src/core/types/Calculation/Requests.ts +++ b/src/core/types/Calculation/Requests.ts @@ -3,9 +3,7 @@ import { PreparedPayments, PreparedValues } from 'core/types/Calculation/Prepare'; -import { - ElementsNames -} from 'core/types/Calculation/Store/elements'; +import { ElementsNames } from 'core/types/Calculation/Store/elements'; import { TableProps } from 'core/types/Calculation/Store/tables'; import { TValues } from 'core/types/Calculation/Store/values'; import { TCRMEntity } from 'core/types/Entities/crmEntities'; diff --git a/src/core/types/Calculation/Store/tables.ts b/src/core/types/Calculation/Store/tables.ts index 86b915c..541f7fe 100644 --- a/src/core/types/Calculation/Store/tables.ts +++ b/src/core/types/Calculation/Store/tables.ts @@ -1,9 +1,9 @@ -import { TCRMEntity } from './../../Entities/crmEntities'; import { ElementStatus } from '../../statuses'; import { ICalculationStore } from './'; +import { TCRMEntity } from './../../Entities/crmEntities'; +import { TCalculationProcess } from './effect'; import { TElementFilter } from './filters'; import { IBaseOption } from './options'; -import { TCalculationProcess } from './effect'; export type TableNames = 'tableInsurance' | 'tablePayments' | 'tableResults'; export type TableValuesNames =