.dockerignore

@@ -0,0 +1,3 @@
+.git
+README.md
+node_modules

apps/api/.dockerignore

@@ -1,7 +1,6 @@
-.git
 Dockerfile
 .dockerignore
 node_modules
-*.log
+npm-debug.log
 dist
 README.md

apps/api/Dockerfile

@@ -2,14 +2,14 @@
 # Make sure you update both files!
 
 FROM node:alpine AS builder
-RUN corepack enable && corepack prepare pnpm@8.9.0 --activate
+RUN corepack enable && corepack prepare pnpm@latest --activate
 ENV PNPM_HOME=/usr/local/bin
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-RUN pnpm add -g turbo@1.12.4 dotenv-cli
+RUN pnpm add -g turbo dotenv-cli
 COPY . .
 RUN turbo prune --scope=api --docker
 
@@ -31,6 +31,7 @@ RUN pnpm install
 # Build the project and its dependencies
 COPY --from=builder /app/out/full/ .
 COPY turbo.json turbo.json
+COPY .env .env
 RUN pnpm dotenv -e .env turbo run build --filter=api...
 
 FROM node:alpine AS runner

apps/api/package.json

@@ -45,7 +45,6 @@
     "fastify": "^4.26.1",
     "jest": "^29.5.0",
     "prettier": "^3.0.0",
-    "shared": "workspace:*",
     "source-map-support": "^0.5.21",
     "supertest": "^6.3.3",
     "ts-jest": "29.1.1",

apps/api/src/proxy/lib/config.ts

@@ -14,7 +14,6 @@ export const queryTTL: Record<string, number | false> = {
   GetDealerPerson: seconds().fromHours(1),
   GetDealerPersons: seconds().fromHours(1),
   GetDealers: seconds().fromMinutes(15),
-  GetEltInsuranceRules: seconds().fromHours(12),
   GetFuelCards: seconds().fromHours(12),
   GetGPSBrands: seconds().fromHours(24),
   GetGPSModels: seconds().fromHours(24),
@@ -33,7 +32,6 @@ export const queryTTL: Record<string, number | false> = {
   GetOpportunities: false,
   GetOpportunity: false,
   GetOpportunityUrl: seconds().fromHours(12),
-  GetOsagoAddproductTypes: seconds().fromHours(12),
   GetProduct: seconds().fromHours(12),
   GetProducts: seconds().fromHours(12),
   GetQuote: false,

apps/api/src/proxy/proxy.controller.ts

@@ -1,21 +1,9 @@
 import { queryTTL } from './lib/config';
-import type { GQLRequest, GQLResponse } from './types';
+import type { GQLRequest } from './types';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import {
+import { All, Controller, Inject, Req, Res } from '@nestjs/common';
-  All,
-  Controller,
-  Delete,
-  Get,
-  HttpException,
-  HttpStatus,
-  Inject,
-  Query,
-  Req,
-  Res,
-} from '@nestjs/common';
 import type { Cache } from 'cache-manager';
 import { FastifyReply, FastifyRequest } from 'fastify';
-import type { QueryItem } from 'shared/types/cache';
 import { env } from 'src/config/env';
 
 type RedisStore = Omit<Cache, 'set'> & {
@@ -27,7 +15,6 @@ export class ProxyController {
   constructor(
     @Inject(CACHE_MANAGER) private readonly cacheManager: RedisStore,
   ) {}
-
   @All('/graphql')
   public async graphql(@Req() req: FastifyRequest, @Res() reply: FastifyReply) {
     const { operationName, query, variables } = req.body as GQLRequest;
@@ -47,81 +34,11 @@ export class ProxyController {
       method: req.method,
     });
 
-    const data = (await response.json()) as GQLResponse;
+    const data = await response.json();
-
-    if (!response.ok || data?.error || data?.errors?.length)
-      throw new HttpException(
-        response.statusText,
-        response.status || HttpStatus.INTERNAL_SERVER_ERROR,
-      );
-
     const ttl = queryTTL[operationName];
     if (data && ttl !== false)
       await this.cacheManager.set(key, data, { ttl: ttl || env.CACHE_TTL });
 
     return reply.send(data);
   }
-
-  @Get('/get-queries')
-  public async getQueriesList(@Res() reply: FastifyReply) {
-    const res = await this.getAllQueries();
-
-    return reply.send(res);
-  }
-
-  private async getAllQueries() {
-    const list = await this.cacheManager.store.keys('*');
-
-    return (Object.keys(queryTTL) as Array<keyof typeof queryTTL>).reduce(
-      (acc, queryName) => {
-        const queries = list.filter((x) => x.split(' ').at(0) === queryName);
-        if (queries.length) {
-          const ttl = queryTTL[queryName];
-          acc[queryName] = { queries, ttl };
-        }
-
-        return acc;
-      },
-      {} as Record<string, QueryItem>,
-    );
-  }
-
-  @Delete('/delete-query')
-  public async deleteQuery(
-    @Query('queryKey') queryKey: string,
-    @Res() reply: FastifyReply,
-  ) {
-    try {
-      await this.cacheManager.del(queryKey);
-
-      return reply.send('ok');
-    } catch (error) {
-      throw new HttpException(error, HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-  }
-
-  @Delete('/reset')
-  public async reset(@Res() reply: FastifyReply) {
-    try {
-      await this.cacheManager.reset();
-
-      return reply.send('ok');
-    } catch (error) {
-      throw new HttpException(error, HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-  }
-
-  @Get('/get-query')
-  public async getQueryValue(
-    @Query('queryKey') queryKey: string,
-    @Res() reply: FastifyReply,
-  ) {
-    try {
-      const value = await this.cacheManager.get(queryKey);
-
-      return reply.send(value);
-    } catch (error) {
-      throw new HttpException(error, HttpStatus.INTERNAL_SERVER_ERROR);
-    }
-  }
 }

apps/api/src/proxy/types.ts

@@ -3,9 +3,3 @@ export type GQLRequest = {
   query: string;
   variables: string;
 };
-
-export type GQLResponse = {
-  data: unknown;
-  error?: unknown;
-  errors?: unknown[];
-};

apps/web/.dockerignore

@@ -1,8 +0,0 @@
-.git
-Dockerfile
-.dockerignore
-node_modules
-*.log
-dist
-.next
-README.md

apps/web/.gitignore

@@ -1,4 +1,3 @@
 
 # Sentry Config File
 .sentryclirc
-/styles/antd.min.css

apps/web/.graphqlrc.yml

@@ -16,7 +16,7 @@ generates:
         object: true
         defaultValue: true
       scalars:
-        UUID: string
+        Uuid: string
         Decimal: number
         DateTime: string
 # exclude: './graphql/crm.schema.graphql'

apps/web/@types/errors.ts

@@ -1,19 +0,0 @@
-import elementsToValues from '@/Components/Calculation/config/map/values';
-
-export const ERR_ELT_KASKO = 'ERR_ELT_KASKO';
-export const ERR_ELT_OSAGO = 'ERR_ELT_OSAGO';
-export const ERR_FINGAP_TABLE = 'ERR_FINGAP_TABLE';
-export const ERR_INSURANCE_TABLE = 'ERR_INSURANCE_TABLE';
-export const ERR_PAYMENTS_TABLE = 'ERR_PAYMENTS_TABLE';
-
-export const ERROR_TABLE_KEYS = [
-  ERR_ELT_KASKO,
-  ERR_ELT_OSAGO,
-  ERR_FINGAP_TABLE,
-  ERR_INSURANCE_TABLE,
-  ERR_PAYMENTS_TABLE,
-];
-
-export const ERROR_ELEMENTS_KEYS = Object.keys(elementsToValues);
-
-export const ERROR_KEYS = [...ERROR_ELEMENTS_KEYS, ...ERROR_TABLE_KEYS];

apps/web/Components/Admin/Cache/Query.tsx

@@ -1,77 +0,0 @@
-import * as cacheApi from '@/api/cache/query';
-import { min } from '@/styles/mq';
-import { useQuery } from '@tanstack/react-query';
-import { memo, useState } from 'react';
-import styled from 'styled-components';
-import { Button, Collapse } from 'ui/elements';
-import { Flex } from 'ui/grid';
-
-type QueryProps = {
-  readonly onDeleteQuery: () => Promise<void>;
-  readonly queryKey: string;
-};
-
-const StyledPre = styled.pre`
-  max-height: 300px;
-  overflow-y: auto;
-
-  ${min('desktop')} {
-    max-height: 800px;
-  }
-`;
-
-export const Query = memo(({ onDeleteQuery, queryKey }: QueryProps) => {
-  const { data, refetch } = useQuery({
-    enabled: false,
-    queryFn: ({ signal }) => signal && cacheApi.getQueryValue(queryKey, { signal }),
-    queryKey: ['admin', 'cache', 'query', queryKey],
-    refetchOnWindowFocus: false,
-  });
-
-  const [activeKey, setActiveKey] = useState<string | undefined>(undefined);
-  const [deletePending, setDeletePending] = useState(false);
-
-  const content = (
-    <>
-      <StyledPre>{JSON.stringify(data, null, 2)}</StyledPre>
-      <Flex justifyContent="flex-end">
-        <Button
-          type="primary"
-          danger
-          disabled={deletePending}
-          onClick={() => {
-            setDeletePending(true);
-            onDeleteQuery().finally(() => {
-              setDeletePending(false);
-            });
-          }}
-        >
-          Удалить
-        </Button>
-      </Flex>
-    </>
-  );
-
-  return (
-    <Collapse
-      bordered={false}
-      activeKey={activeKey}
-      items={[
-        {
-          children: data ? content : 'Загрузка...',
-          key: queryKey,
-          label: queryKey,
-        },
-      ]}
-      onChange={() => {
-        if (activeKey) {
-          setActiveKey(undefined);
-        } else {
-          setActiveKey(queryKey);
-
-          refetch();
-        }
-      }}
-    />
-  );
-});

apps/web/Components/Admin/Cache/QueryList.tsx

@@ -1,22 +0,0 @@
-import { Query } from './Query';
-import * as cacheApi from '@/api/cache/query';
-import { useState } from 'react';
-import type { QueryItem } from 'shared/types/cache';
-
-type QueryListProps = QueryItem;
-
-export const QueryList = ({ queries }: QueryListProps) => {
-  const [deletedQueries, setDeletedQueries] = useState<QueryItem['queries']>([]);
-
-  function handleDeleteQuery(queryKey: string) {
-    return cacheApi
-      .deleteQuery(queryKey)
-      .then(() => setDeletedQueries([...deletedQueries, queryKey]));
-  }
-
-  const activeQueries = queries.filter((queryKey) => !deletedQueries.includes(queryKey));
-
-  return activeQueries.map((queryKey) => (
-    <Query key={queryKey} queryKey={queryKey} onDeleteQuery={() => handleDeleteQuery(queryKey)} />
-  ));
-};

apps/web/Components/Admin/Cache/ReloadButton.tsx

@@ -1,24 +0,0 @@
-import { useState } from 'react';
-import { Button } from 'ui/elements';
-import { ReloadOutlined } from 'ui/elements/icons';
-
-export function ReloadButton({ onClick }: { readonly onClick: () => Promise<unknown> }) {
-  const [pending, setPending] = useState(false);
-
-  return (
-    <Button
-      loading={pending}
-      onClick={() => {
-        setPending(true);
-        onClick().finally(() => {
-          setTimeout(() => {
-            setPending(false);
-          }, 1000);
-        });
-      }}
-      icon={<ReloadOutlined rev="" />}
-    >
-      Обновить
-    </Button>
-  );
-}

apps/web/Components/Admin/Cache/index.tsx

@@ -1,70 +0,0 @@
-import Background from '../../Layout/Background';
-import { useFilteredQueries } from './lib/hooks';
-import { QueryList } from './QueryList';
-import { reset } from '@/api/cache/query';
-import { min } from '@/styles/mq';
-import styled from 'styled-components';
-import { Button, Collapse, Divider, Input } from 'ui/elements';
-
-const Wrapper = styled(Background)`
-  padding: 4px 6px;
-  width: 100vw;
-
-  ${min('tablet')} {
-    min-height: 790px;
-  }
-
-  ${min('laptop')} {
-    padding: 4px 18px 10px;
-    width: 1280px;
-  }
-`;
-
-const Flex = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 10px;
-`;
-
-const ButtonWrapper = styled.div`
-  display: flex;
-  justify-content: flex-end;
-`;
-
-export function Cache() {
-  const { filteredQueries, refetch, setFilterString } = useFilteredQueries();
-
-  function handleDeleteQuery() {
-    return reset().then(() => refetch());
-  }
-
-  if (!filteredQueries) {
-    return <div>Загрузка...</div>;
-  }
-
-  return (
-    <Wrapper>
-      <Divider>Управление кэшем</Divider>
-      <Flex>
-        <Input
-          placeholder="Поиск по запросу"
-          allowClear
-          onChange={(e) => setFilterString(e.target.value)}
-        />
-        <Collapse
-          accordion
-          items={Object.keys(filteredQueries).map((queryGroupName) => ({
-            children: <QueryList {...filteredQueries[queryGroupName]} />,
-            key: queryGroupName,
-            label: queryGroupName,
-          }))}
-        />
-        <ButtonWrapper>
-          <Button type="primary" danger disabled={false} onClick={() => handleDeleteQuery()}>
-            Очистить кэш
-          </Button>
-        </ButtonWrapper>
-      </Flex>
-    </Wrapper>
-  );
-}

apps/web/Components/Admin/Cache/lib/hooks.tsx

@@ -1,30 +0,0 @@
-import { filterQueries } from './utils';
-import * as cacheApi from '@/api/cache/query';
-import type { ResponseQueries } from '@/api/cache/types';
-import { useQuery } from '@tanstack/react-query';
-import { useEffect, useState } from 'react';
-import { useDebounce } from 'use-debounce';
-
-export function useFilteredQueries() {
-  const { data: queries, refetch } = useQuery({
-    enabled: false,
-    queryFn: ({ signal }) => signal && cacheApi.getQueries({ signal }),
-    queryKey: ['admin', 'cache', 'queries'],
-    refetchOnWindowFocus: false,
-  });
-
-  const [filteredQueries, setFilteredQueries] = useState<ResponseQueries | undefined>(queries);
-  const [filterString, setFilterString] = useState('');
-  const [debouncedFilterString] = useDebounce(filterString, 350);
-
-  useEffect(() => {
-    if (!debouncedFilterString) {
-      setFilteredQueries(queries);
-    }
-    if (queries && debouncedFilterString) {
-      setFilteredQueries(filterQueries(queries, debouncedFilterString));
-    }
-  }, [debouncedFilterString, queries]);
-
-  return { filteredQueries, queries, refetch, setFilterString };
-}

apps/web/Components/Admin/Cache/lib/utils.tsx

@@ -1,23 +0,0 @@
-import type { ResponseQueries } from '@/api/cache/types';
-
-export function filterQueries(queriesObj: ResponseQueries, searchStr: string): ResponseQueries {
-  const filteredObj: ResponseQueries = {};
-
-  for (const key in queriesObj) {
-    if (key.includes(searchStr)) {
-      filteredObj[key] = queriesObj[key];
-    } else {
-      const queries: string[] = [];
-      queriesObj[key].queries.forEach((queryKey) => {
-        if (queryKey.toLowerCase().includes(searchStr.toLowerCase())) {
-          queries.push(queryKey);
-        }
-      });
-      if (queries.length) {
-        filteredObj[key] = { ...queriesObj[key], queries };
-      }
-    }
-  }
-
-  return filteredObj;
-}

apps/web/Components/Admin/Layout.tsx

@@ -1,17 +0,0 @@
-import { min } from '@/styles/mq';
-import type { PropsWithChildren } from 'react';
-import styled from 'styled-components';
-
-const Flex = styled.div`
-  display: flex;
-  flex-direction: column;
-
-  ${min('laptop')} {
-    flex-direction: row;
-    justify-content: center;
-  }
-`;
-
-export function Layout({ children }: PropsWithChildren) {
-  return <Flex>{children}</Flex>;
-}

apps/web/Components/Admin/index.ts

@@ -1,2 +0,0 @@
-export * from './Cache';
-export * from './Layout';

apps/web/Components/Calculation/Form/AddProduct/config.ts

@@ -7,7 +7,7 @@ export const rows: FormTabRows = [
   {
     title: 'Регистрация',
   },
-  [['radioObjectRegistration', 'radioTypePTS'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
+  [['radioObjectRegistration', 'radioTypePTS'], { gridTemplateColumns: ['1fr 1fr'] }],
   [['selectRegionRegistration', 'selectTownRegistration', 'selectObjectRegionRegistration']],
   [['selectObjectCategoryTax', 'selectObjectTypeTax', 'tbxVehicleTaxInYear']],
   [['tbxLeaseObjectYear', 'tbxLeaseObjectMotorPower', 'tbxVehicleTaxInLeasingPeriod']],

apps/web/Components/Calculation/Form/CreateKP/config.ts

@@ -12,6 +12,5 @@ export const rows: FormTabRows = [
   [['cbxInsurance', 'cbxRegistrationQuote'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['cbxTechnicalCardQuote', 'cbxNSIB'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['cbxQuoteRedemptionGraph', 'cbxShowFinGAP'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
-  [['cbxQuoteShowAcceptLimit'], { gridTemplateColumns: ['1fr', '1fr 1fr'] }],
   [['tbxQuoteName', 'radioQuoteContactGender'], { gridTemplateColumns: ['1fr', '2fr 1fr'] }],
 ];

apps/web/Components/Calculation/Form/ELT/Components/PolicyTable.tsx

@@ -7,16 +7,16 @@ import { Table } from 'ui/elements';
 
 export const PolicyTable = observer(
   ({
-    onSelectRow,
     storeSelector,
+    onSelectRow,
     ...props
   }: {
     columns: typeof columns;
     onSelectRow: (row: Row) => void;
     storeSelector: StoreSelector;
   }) => {
-    const { $process, $tables } = useStore();
+    const { $tables, $process } = useStore();
-    const { getRows, getSelectedRow, setSelectedKey } = storeSelector($tables.elt);
+    const { getRows, setSelectedKey, getSelectedRow } = storeSelector($tables.elt);
 
     return (
       <Table
@@ -37,12 +37,7 @@ export const PolicyTable = observer(
               $process.add('ELT');
               setSelectedKey(record.key);
               onSelectRow(record);
-              message.success({
+              message.success({ content: 'Выбранный расчет ЭЛТ применен', key: record.key });
-                content: 'Выбранный расчет ЭЛТ применен',
-                duration: 1,
-                key: record.key,
-                onClick: () => message.destroy(record.key),
-              });
               $process.delete('ELT');
             }
           },

apps/web/Components/Calculation/Form/ELT/Kasko.tsx

@@ -1,41 +1,126 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 import { PolicyTable, ReloadButton, Validation } from './Components';
 import { columns } from './lib/config';
-import { resetRow } from './lib/tools';
+import { makeEltKaskoRequest } from './lib/make-request';
 import type { Row, StoreSelector } from './types';
+import { getEltKasko } from '@/api/elt/query';
+import { MAX_FRANCHISE, MAX_INSURANCE, MIN_INSURANCE } from '@/constants/values';
+import helper from '@/process/elt/lib/helper';
 import { useStore } from '@/stores/hooks';
-import { trpcClient } from '@/trpc/client';
+import { defaultRow } from '@/stores/tables/elt/default-values';
+import { useApolloClient } from '@apollo/client';
 import { observer } from 'mobx-react-lite';
+import { omit, sift } from 'radash';
+import { useCallback } from 'react';
 import { Flex } from 'ui/grid';
 
 const storeSelector: StoreSelector = ({ kasko }) => kasko;
 
+const initialData = {
+  ...omit(defaultRow, ['name', 'key', 'id']),
+  error: null,
+  kaskoSum: 0,
+  paymentPeriods: [
+    {
+      kaskoSum: 0,
+    },
+  ],
+};
+
 export const Kasko = observer(() => {
   const store = useStore();
-  const { $calculation, $tables } = store;
+  const { $tables, $calculation } = store;
+  const apolloClient = useApolloClient();
+  const { init } = helper({ apolloClient, store });
 
-  const calculateKasko = trpcClient.eltKasko.useMutation({
+  const handleOnClick = useCallback(async () => {
-    onError() {
+    $tables.elt.kasko.abortController?.abort();
-      $tables.elt.kasko.setRows(
+    $tables.elt.kasko.abortController = new AbortController();
-        $tables.elt.kasko.getRows.map((row) => ({ ...row, status: 'error' }))
-      );
-    },
-    onMutate: () => {
-      const rows = $tables.elt.kasko.getRows;
-      $tables.elt.kasko.setRows(rows.map((row) => ({ ...resetRow(row), status: 'fetching' })));
-    },
-    onSuccess: ({ rows }) => {
-      $tables.elt.kasko.setRows(rows);
-    },
-  });
 
-  function handleOnClick() {
+    const { kasko } = await init();
-    calculateKasko.mutate({
+    $tables.elt.kasko.setRows(kasko);
-      calculation: {
+    const kaskoCompanyIds = sift(
-        values: store.$calculation.$values.getValues(),
+      $tables.insurance
-      },
+        .row('kasko')
+        .getOptions('insuranceCompany')
+        .map((x) => x.value)
+    );
+    const values = $calculation.$values.getValues();
+
+    kaskoCompanyIds.forEach((key) => {
+      const row = $tables.elt.kasko.getRow(key);
+      if (row) {
+        $tables.elt.kasko.setRow({ key, status: 'fetching' });
+        makeEltKaskoRequest({ apolloClient, store }, row)
+          .then((payload) =>
+            getEltKasko(payload, { signal: $tables.elt.kasko.abortController?.signal })
+          )
+          .then((res) => {
+            if (res) {
+              const {
+                kaskoSum = 0,
+                message,
+                skCalcId,
+                totalFranchise = 0,
+                requestId,
+                paymentPeriods,
+              } = res;
+              let { error } = res;
+
+              if (totalFranchise > MAX_FRANCHISE) {
+                error ||= `Франшиза по страховке превышает максимально допустимое значение: ${Intl.NumberFormat(
+                  'ru',
+                  {
+                    currency: 'RUB',
+                    style: 'currency',
+                  }
+                ).format(MAX_FRANCHISE)}`;
+              }
+
+              if (kaskoSum > MAX_INSURANCE) {
+                error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости КАСКО: ${Intl.NumberFormat(
+                  'ru',
+                  {
+                    currency: 'RUB',
+                    style: 'currency',
+                  }
+                ).format(MAX_INSURANCE)}`;
+              }
+
+              if (kaskoSum < MIN_INSURANCE) {
+                error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости КАСКО: ${Intl.NumberFormat(
+                  'ru',
+                  {
+                    currency: 'RUB',
+                    style: 'currency',
+                  }
+                ).format(MIN_INSURANCE)}`;
+              }
+
+              $tables.elt.kasko.setRow({
+                key,
+                message: error || message,
+                numCalc: 0,
+                requestId,
+                skCalcId,
+                status: error ? 'error' : null,
+                sum: values.leasingPeriod <= 16 ? kaskoSum : paymentPeriods?.[0]?.kaskoSum || 0,
+                totalFranchise,
+              });
+            }
+          })
+          .catch((error) => {
+            const _err = error as Error;
+            $tables.elt.kasko.setRow({
+              ...initialData,
+              key,
+              message: _err.message || String(error),
+              status: 'error',
+            });
+          });
+      }
     });
-  }
+  }, [$calculation.$values, $tables.elt.kasko, $tables.insurance, apolloClient, init, store]);
 
   function handleOnSelectRow(row: Row) {
     $tables.insurance.row('kasko').column('insuranceCompany').setValue(row.key);

apps/web/Components/Calculation/Form/ELT/Osago.tsx

@@ -1,42 +1,98 @@
-/* eslint-disable no-negated-condition */
 /* eslint-disable sonarjs/cognitive-complexity */
 import { PolicyTable, ReloadButton, Validation } from './Components';
 import { columns } from './lib/config';
-import { resetRow } from './lib/tools';
+import { makeEltOsagoRequest } from './lib/make-request';
 import type { Row, StoreSelector } from './types';
+import { getEltOsago } from '@/api/elt/query';
+import { MAX_INSURANCE, MIN_INSURANCE } from '@/constants/values';
+import helper from '@/process/elt/lib/helper';
 import { useStore } from '@/stores/hooks';
-import { trpcClient } from '@/trpc/client';
+import { defaultRow } from '@/stores/tables/elt/default-values';
+import { useApolloClient } from '@apollo/client';
 import { observer } from 'mobx-react-lite';
+import { omit, sift } from 'radash';
+import { useCallback } from 'react';
 import { Flex } from 'ui/grid';
 
 const storeSelector: StoreSelector = ({ osago }) => osago;
 
+const initialData = {
+  ...omit(defaultRow, ['name', 'key', 'id']),
+  error: null,
+  premiumSum: 0,
+};
+
 export const Osago = observer(() => {
   const store = useStore();
   const { $tables } = store;
+  const apolloClient = useApolloClient();
+  const { init } = helper({ apolloClient, store });
 
-  const calculateOsago = trpcClient.eltOsago.useMutation({
+  const handleOnClick = useCallback(async () => {
-    onError() {
+    $tables.elt.osago.abortController?.abort();
-      $tables.elt.osago.setRows(
+    $tables.elt.osago.abortController = new AbortController();
-        $tables.elt.osago.getRows.map((row) => ({ ...row, status: 'error' }))
-      );
-    },
-    onMutate: () => {
-      const rows = $tables.elt.osago.getRows;
-      $tables.elt.osago.setRows(rows.map((row) => ({ ...resetRow(row), status: 'fetching' })));
-    },
-    onSuccess: ({ rows }) => {
-      $tables.elt.osago.setRows(rows);
-    },
-  });
 
-  async function handleOnClick() {
+    const { osago } = await init();
-    calculateOsago.mutate({
+    $tables.elt.osago.setRows(osago);
-      calculation: {
+    const osagoCompanyIds = sift(
-        values: store.$calculation.$values.getValues(),
+      $tables.insurance
-      },
+        .row('osago')
+        .getOptions('insuranceCompany')
+        .map((x) => x.value)
+    );
+    osagoCompanyIds.forEach((key) => {
+      const row = $tables.elt.osago.getRow(key);
+      if (row) {
+        row.status = 'fetching';
+        $tables.elt.osago.setRow(row);
+        makeEltOsagoRequest({ apolloClient, store }, row)
+          .then((payload) =>
+            getEltOsago(payload, { signal: $tables.elt.osago.abortController.signal })
+          )
+          .then((res) => {
+            if (res) {
+              const { numCalc, premiumSum = 0, message, skCalcId } = res;
+              let { error } = res;
+              if (premiumSum > MAX_INSURANCE) {
+                error ||= `Сумма по страховке превышает максимально допустимое значение по стоимости ОСАГО: ${Intl.NumberFormat(
+                  'ru',
+                  {
+                    currency: 'RUB',
+                    style: 'currency',
+                  }
+                ).format(MAX_INSURANCE)}`;
+              }
+              if (premiumSum < MIN_INSURANCE) {
+                error ||= `Сумма по страховке не должна быть меньше допустимого значения по стоимости ОСАГО: ${Intl.NumberFormat(
+                  'ru',
+                  {
+                    currency: 'RUB',
+                    style: 'currency',
+                  }
+                ).format(MIN_INSURANCE)}`;
+              }
+              $tables.elt.osago.setRow({
+                key,
+                message: error || message,
+                numCalc,
+                skCalcId,
+                status: error ? 'error' : null,
+                sum: premiumSum,
+              });
+            }
+          })
+          .catch((error) => {
+            const _err = error as Error;
+            $tables.elt.osago.setRow({
+              ...initialData,
+              key,
+              message: _err.message || String(error),
+              status: 'error',
+            });
+          });
+      }
     });
-  }
+  }, [$tables.elt.osago, $tables.insurance, apolloClient, init, store]);
 
   function handleOnSelectRow(row: Row) {
     $tables.insurance.row('osago').column('insuranceCompany').setValue(row.key);

apps/web/Components/Calculation/Form/ELT/lib/config.tsx

@@ -1,7 +1,10 @@
-import type { Row } from '../types';
+import type { RowSchema } from '@/config/schema/elt';
 import type { ColumnsType } from 'antd/lib/table';
 import { CloseOutlined, LoadingOutlined } from 'ui/elements/icons';
 import { Flex } from 'ui/grid';
+import type { z } from 'zod';
+
+type Row = z.infer<typeof RowSchema>;
 
 const formatter = Intl.NumberFormat('ru', {
   currency: 'RUB',

apps/web/Components/Calculation/Form/ELT/lib/make-request.ts

@@ -1,59 +1,10 @@
 /* eslint-disable sonarjs/cognitive-complexity */
 /* eslint-disable complexity */
+import type { Row } from '../types';
 import type { RequestEltKasko, RequestEltOsago } from '@/api/elt/types';
-import type { Row } from '@/Components/Calculation/Form/ELT/types';
 import * as CRMTypes from '@/graphql/crm.types';
 import type { ProcessContext } from '@/process/types';
-import { getCurrentDateString } from '@/utils/date';
 import dayjs from 'dayjs';
-import { first, sort } from 'radash';
-
-export async function ownOsagoRequest(
-  { store, apolloClient }: Pick<ProcessContext, 'apolloClient' | 'store'>,
-  row: Row
-): Promise<NonNullable<CRMTypes.GetOsagoAddproductTypesQuery['evo_addproduct_types']>[number]> {
-  const currentDate = getCurrentDateString();
-
-  const {
-    data: { evo_addproduct_types },
-  } = await apolloClient.query({
-    query: CRMTypes.GetOsagoAddproductTypesDocument,
-    variables: { currentDate },
-  });
-
-  if (!evo_addproduct_types) return null;
-
-  const { leaseObjectCategory, leaseObjectMotorPower, countSeats, maxMass } =
-    store.$calculation.$values.getValues([
-      'leaseObjectCategory',
-      'leaseObjectMotorPower',
-      'countSeats',
-      'maxMass',
-    ]);
-
-  const filteredTypes = evo_addproduct_types.filter(
-    (type) =>
-      type?.evo_accountid === row.key &&
-      type.evo_visible_calc &&
-      type.evo_category === leaseObjectCategory &&
-      type.evo_min_power !== null &&
-      type.evo_max_power !== null &&
-      type.evo_min_power <= leaseObjectMotorPower &&
-      type.evo_max_power >= leaseObjectMotorPower &&
-      type.evo_min_seats_count !== null &&
-      type.evo_max_seats_count !== null &&
-      type.evo_min_seats_count <= countSeats &&
-      type.evo_max_seats_count >= countSeats &&
-      type.evo_min_mass !== null &&
-      type.evo_max_mass !== null &&
-      type.evo_min_mass <= maxMass &&
-      type.evo_max_mass >= maxMass
-  );
-
-  const sortedTypes = sort(filteredTypes, (type) => dayjs(type?.createdon).date());
-
-  return first(sortedTypes) || null;
-}
 
 const getSpecified = (value: unknown) => value !== null && value !== undefined;
 
@@ -243,11 +194,11 @@ export async function makeEltOsagoRequest(
 
     country: 'Россия',
 
-    house: '52',
+    flat: '337',
-    korpus: '5',
+    house: '8',
     region: 'Москва',
     resident: 1,
-    street: 'Космодамианская наб',
+    street: 'ул. Котляковская',
   };
 
   const owner = {
@@ -255,7 +206,7 @@ export async function makeEltOsagoRequest(
     email: 'client@evoleasing.ru',
     factAddress: address,
     inn: '9724016636',
-    kpp: '770501001',
+    kpp: '772401001',
     ogrn: '1207700245037',
     opf: 1,
     opfSpecified: true,
@@ -471,8 +422,7 @@ export async function makeEltKaskoRequest(
   let selfIgnitionSpecified = false;
   if (
     leaseObjectCategory === 100_000_002 ||
-    (evo_leasingobject_type?.evo_id &&
+    (evo_leasingobject_type?.evo_id && ['6', '9', '10'].includes(evo_leasingobject_type?.evo_id))
-      ['6', '8', '9', '10'].includes(evo_leasingobject_type?.evo_id))
   ) {
     notConfirmedGlassesDamages = 3;
     notConfirmedGlassesDamagesSpecified = true;
@@ -573,7 +523,6 @@ export async function makeEltKaskoRequest(
     100_000_011: 3,
     100_000_012: 3,
     100_000_013: 9,
-    100_000_020: 10,
   };
 
   const leaseObjectUseFor = $calculation.element('selectLeaseObjectUseFor').getValue();
@@ -618,26 +567,10 @@ export async function makeEltKaskoRequest(
       }
     }
 
-  let classification = '11606';
+  const classification =
-
+    leaseObjectCategory && [100_000_002, 100_000_003, 100_000_004].includes(leaseObjectCategory)
-  switch (evo_leasingobject_type?.evo_id) {
+      ? '11635'
-    case '7': {
+      : '0';
-      classification = '11611';
-      break;
-    }
-    case '3': {
-      classification = '11607';
-      break;
-    }
-    case '8': {
-      classification = '11650';
-      break;
-    }
-    default: {
-      classification = '11606';
-      break;
-    }
-  }
 
   let INN = '';
   const leadid = $calculation.element('selectLead').getValue();

apps/web/Components/Calculation/Form/ELT/lib/tools.ts

@@ -1,12 +0,0 @@
-import type { Row } from '@/Components/Calculation/Form/ELT/types';
-import { defaultRow } from '@/stores/tables/elt/default-values';
-
-export function resetRow(row: Row): Row {
-  return {
-    ...defaultRow,
-    id: row.id,
-    key: row.key,
-    metodCalc: row.metodCalc,
-    name: row.name,
-  };
-}

apps/web/Components/Calculation/Form/Insurance/config.ts

@@ -1,14 +1,13 @@
 import type { FormTabRows } from '../../lib/render-rows';
-import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'insurance';
 export const title = 'Страхование';
 
 export const rows: FormTabRows = [
   [['tbxLeaseObjectYear', 'selectLeaseObjectUseFor', 'selectLegalClientRegion']],
-  [['tbxMileage', 'tbxInsFranchise', 'selectLegalClientTown']],
+  [['selectEngineType', 'tbxInsFranchise', 'selectLegalClientTown']],
-  [['selectGPSBrand', 'cbxWithTrailer', 'selectInsNSIB']],
+  [['selectLeaseObjectCategory', 'tbxMileage']],
-  [['selectGPSModel', 'cbxInsDecentral', 'selectLeasingWithoutKasko']],
+  [['tbxLeaseObjectMotorPower', 'cbxWithTrailer', 'selectGPSBrand']],
+  [['tbxEngineVolume', 'cbxInsDecentral', 'selectGPSModel']],
+  [['selectLeasingWithoutKasko', 'selectInsNSIB']],
 ];
-
-export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/Insurance/index.jsx

@@ -1,15 +1,15 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, mobileRows, rows, title } from './config';
+import { id, rows, title } from './config';
 import FinGAPTable from './FinGAPTable';
 import InsuranceTable from './InsuranceTable';
-import { Media } from '@/styles/media';
 import { Flex } from 'ui/grid';
 
 function Insurance() {
+  const renderedRows = renderFormRows(rows);
+
   return (
     <Flex flexDirection="column">
-      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
+      {renderedRows}
-      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
       <InsuranceTable />
       <FinGAPTable />
     </Flex>

apps/web/Components/Calculation/Form/LeasingObject/config.ts

@@ -1,5 +1,4 @@
 import type { FormTabRows } from '../../lib/render-rows';
-import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'leasing-object';
 export const title = 'ПЛ';
@@ -17,5 +16,3 @@ export const rows: FormTabRows = [
   [['selectLeaseObjectCategory', 'tbxEngineVolume', 'tbxMileage']],
   [['tbxMaxMass', 'tbxEngineHours', 'tbxVIN']],
 ];
-
-export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/LeasingObject/index.jsx

@@ -1,14 +1,8 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, mobileRows, rows, title } from './config';
+import { id, rows, title } from './config';
-import { Media } from '@/styles/media';
 
 function LeasingObject() {
-  return (
+  return renderFormRows(rows);
-    <>
-      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
-      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
-    </>
-  );
 }
 
 export default {

apps/web/Components/Calculation/Form/SupplierAgent/config.ts

@@ -1,5 +1,4 @@
 import type { FormTabRows } from '../../lib/render-rows';
-import { transformRowsForMobile } from '../lib/utils';
 
 export const id = 'supplier-agent';
 export const title = 'Поставщик/агент';
@@ -21,5 +20,3 @@ export const rows: FormTabRows = [
   [['selectCalcBrokerRewardCondition', 'selectFinDepartmentRewardCondtion'], defaultRowStyle],
   [['tbxCalcBrokerRewardSum', 'tbxFinDepartmentRewardSumm'], defaultRowStyle],
 ];
-
-export const mobileRows = transformRowsForMobile(rows);

apps/web/Components/Calculation/Form/SupplierAgent/index.jsx

@@ -1,14 +1,8 @@
 import renderFormRows from '../../lib/render-rows';
-import { id, mobileRows, rows, title } from './config';
+import { id, rows, title } from './config';
-import { Media } from '@/styles/media';
 
 function Leasing() {
-  return (
+  return renderFormRows(rows);
-    <>
-      <Media lessThan="laptop">{renderFormRows(mobileRows)}</Media>
-      <Media greaterThanOrEqual="laptop">{renderFormRows(rows)}</Media>
-    </>
-  );
 }
 
 export default {

apps/web/Components/Calculation/Form/index.jsx

@@ -8,9 +8,7 @@ import Payments from './Payments';
 import SupplierAgent from './SupplierAgent';
 import Unlimited from './Unlimited';
 import Background from '@/Components/Layout/Background';
-import { useStore } from '@/stores/hooks';
 import { min } from '@/styles/mq';
-import { memo } from 'react';
 import styled from 'styled-components';
 import { Tabs } from 'ui/elements';
 
@@ -46,23 +44,22 @@ const ComponentWrapper = styled.div`
   }
 `;
 
-export const Form = memo(() => {
+function Form({ prune }) {
-  const { $process } = useStore();
-
-  const filteredTabs =
-    $process.has('Unlimited') === false ? formTabs.filter((x) => x.id !== 'unlimited') : formTabs;
-
   return (
     <Wrapper>
       <Tabs type="card" tabBarGutter="5px">
-        {filteredTabs.map(({ Component, id, title }) => (
+        {formTabs
-          <Tabs.TabPane tab={title} key={id}>
+          .filter((tab) => !prune?.includes(tab.id))
-            <ComponentWrapper>
+          .map(({ id, title, Component }) => (
-              <Component />
+            <Tabs.TabPane tab={title} key={id}>
-            </ComponentWrapper>
+              <ComponentWrapper>
-          </Tabs.TabPane>
+                <Component />
-        ))}
+              </ComponentWrapper>
+            </Tabs.TabPane>
+          ))}
       </Tabs>
     </Wrapper>
   );
-});
+}
+
+export default Form;

apps/web/Components/Calculation/Form/lib/utils.js

@@ -1,32 +0,0 @@
-/**
- *
- * @param {import('../../lib/render-rows').FormTabRows} rows
- * @returns {import('../../lib/render-rows').FormTabRows}
- */
-export function transformRowsForMobile(rows) {
-  const mobileRows = [];
-  let columnGroups = {};
-
-  rows.forEach((row) => {
-    if (Array.isArray(row)) {
-      row[0].forEach((item, index) => {
-        if (!columnGroups[index]) {
-          columnGroups[index] = [];
-        }
-        columnGroups[index].push(item);
-      });
-    } else {
-      Object.values(columnGroups).forEach((group) => {
-        mobileRows.push([group, { gridTemplateColumns: '1fr' }]);
-      });
-      columnGroups = {};
-      mobileRows.push(row);
-    }
-  });
-
-  Object.values(columnGroups).forEach((group) => {
-    mobileRows.push([group, { gridTemplateColumns: '1fr' }]);
-  });
-
-  return mobileRows;
-}

apps/web/Components/Calculation/Settings/config.ts

@@ -18,8 +18,8 @@ export const mainRows: FormTabRows = [
   [
     ['btnCreateKP', 'linkDownloadKp'],
     {
-      gap: ['10px'],
+      gap: [0, '10px'],
-      gridTemplateColumns: ['1fr 1fr'],
+      gridTemplateColumns: ['1fr', '1fr 1fr'],
     },
   ],
 ];
@@ -41,8 +41,8 @@ export const unlimitedMainRows: FormTabRows = [
   [
     ['btnCreateKP', 'linkDownloadKp'],
     {
-      gap: ['10px'],
+      gap: [0, '10px'],
-      gridTemplateColumns: ['1fr 1fr'],
+      gridTemplateColumns: ['1fr', '1fr 1fr'],
     },
   ],
 ];

apps/web/Components/Calculation/Settings/index.jsx

@@ -3,7 +3,6 @@ import * as config from './config';
 import Background from '@/Components/Layout/Background';
 import { useStore } from '@/stores/hooks';
 import { min } from '@/styles/mq';
-import { memo } from 'react';
 import styled from 'styled-components';
 
 const Wrapper = styled(Background)`
@@ -18,7 +17,7 @@ const Wrapper = styled(Background)`
   }
 `;
 
-export const Settings = memo(() => {
+export default function Settings() {
   const { $process } = useStore();
 
   const mainRows = $process.has('Unlimited')
@@ -34,4 +33,4 @@ export const Settings = memo(() => {
       {paramsRows}
     </Wrapper>
   );
-});
+}

apps/web/Components/Calculation/Validation/index.jsx

@@ -1,19 +0,0 @@
-import Validation from '../Output/Validation';
-import Background from '@/Components/Layout/Background';
-import { min } from '@/styles/mq';
-import { memo } from 'react';
-import styled from 'styled-components';
-
-const Wrapper = styled(Background)`
-  padding: 4px 10px;
-
-  ${min('laptop')} {
-    padding: 4px 18px;
-  }
-`;
-
-export const Component = memo(() => (
-  <Wrapper>
-    <Validation.Component />
-  </Wrapper>
-));

apps/web/Components/Calculation/config/elements-components.ts

@@ -136,7 +136,6 @@ const components = wrapComponentsMap({
   cbxPartialVAT: e.Switch,
   cbxFloatingRate: e.Switch,
   cbxQuotePriceWithFullVAT: e.Switch,
-  cbxQuoteShowAcceptLimit: e.Switch,
 
   /** Readonly Elements */
   labelLeaseObjectRisk: e.Text,

apps/web/Components/Calculation/config/elements-render/override.tsx

@@ -332,7 +332,7 @@ const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
 
       const RenderedComponent = observer(() => {
         const { $calculation } = useStore();
-        const { max, min } = $calculation.$values.getValue('irrInfo');
+        const { min, max } = $calculation.$values.getValue('irrInfo');
 
         return (
           <Container>
@@ -370,7 +370,7 @@ const overrideRender: Partial<Record<keyof typeof map, RenderProps>> = {
               <Element
                 {...props}
                 id={elementName}
-                addonBefore={isFetching ? <LoadingOutlined spin rev="" /> : null}
+                addonBefore={isFetching && <LoadingOutlined spin rev="" />}
               />
             </Container>
           </Tooltip>

apps/web/Components/Calculation/config/elements-titles.ts

@@ -130,7 +130,6 @@ const titles: Record<ActionElements | ValuesElements, string> = {
   cbxPartialVAT: 'Частичный НДС',
   cbxFloatingRate: 'Плавающая ставка',
   cbxQuotePriceWithFullVAT: 'Отображать Стоимость ПЛ с полным НДС',
-  cbxQuoteShowAcceptLimit: 'Отображать одобренный лимит',
 
   /** Link Elements */
   linkDownloadKp: '',

apps/web/Components/Calculation/config/elements-types.ts

@@ -195,7 +195,6 @@ const types = wrapElementsTypes({
   cbxPartialVAT: t.Switch,
   cbxFloatingRate: t.Switch,
   cbxQuotePriceWithFullVAT: t.Switch,
-  cbxQuoteShowAcceptLimit: t.Switch,
 
   labelLeaseObjectRisk: t.Readonly,
   tbxInsKaskoPriceLeasePeriod: t.Readonly,

apps/web/Components/Calculation/config/map/values.ts

@@ -133,7 +133,6 @@ const elementsToValues = wrapElementsMap({
   cbxPartialVAT: 'partialVAT',
   cbxFloatingRate: 'floatingRate',
   cbxQuotePriceWithFullVAT: 'quotePriceWithFullVAT',
-  cbxQuoteShowAcceptLimit: 'quoteShowAcceptLimit',
 
   /** Readonly Elements */
   labelLeaseObjectRisk: 'leaseObjectRiskName',

apps/web/Components/Calculation/index.js

@@ -0,0 +1,2 @@
+export { default as Form } from './Form';
+export { default as Settings } from './Settings';

apps/web/Components/Calculation/index.tsx

@@ -1,101 +0,0 @@
-import { Form } from './Form';
-import { Layout } from './Layout';
-import { Output } from './Output';
-import { Settings } from './Settings';
-import { Component as Validation } from './Validation';
-import { Notification } from '@/Components/Common';
-import { NavigationBar, Tabs } from '@/Components/Layout/Navigation';
-import { NavigationProvider } from '@/context/navigation';
-import { useErrors, useResults } from '@/stores/hooks';
-import { Media } from '@/styles/media';
-import { getPageTitle } from '@/utils/page';
-import { observer } from 'mobx-react-lite';
-import Head from 'next/head';
-import styled from 'styled-components';
-import { Badge } from 'ui/elements';
-import {
-  BarChartOutlined,
-  CalculatorOutlined,
-  ProfileOutlined,
-  WarningOutlined,
-} from 'ui/elements/icons';
-
-const defaultIconStyle = { fontSize: '1.2rem' };
-
-const StyledBadge = styled(Badge)`
-  color: unset !important;
-`;
-
-export const tabs = [
-  {
-    Component: Settings,
-    Icon: () => <ProfileOutlined style={defaultIconStyle} />,
-    key: 'settings',
-    title: 'Интерес/Расчет',
-  },
-  {
-    Component: Form,
-    Icon: () => <CalculatorOutlined style={defaultIconStyle} />,
-    key: 'form',
-    title: 'Параметры',
-  },
-  {
-    Component: Output,
-    Icon: observer(() => {
-      const { hasResults } = useResults();
-
-      return (
-        <StyledBadge status="success" dot={hasResults}>
-          <BarChartOutlined style={defaultIconStyle} />
-        </StyledBadge>
-      );
-    }),
-    key: 'output',
-    title: 'Результаты',
-  },
-  {
-    Component: Validation,
-    Icon: observer(() => {
-      const { hasErrors } = useErrors();
-
-      return (
-        <StyledBadge status="error" dot={hasErrors}>
-          <WarningOutlined style={defaultIconStyle} />
-        </StyledBadge>
-      );
-    }),
-    key: 'errors',
-    title: 'Ошибки',
-  },
-];
-
-type ContentProps = {
-  readonly initHooks: () => void;
-  readonly title: string;
-};
-
-export function Content({ initHooks, title }: ContentProps) {
-  initHooks();
-
-  return (
-    <>
-      <Head>
-        <title>{getPageTitle(title)}</title>
-      </Head>
-      <Notification />
-      <Media lessThan="laptop">
-        <NavigationProvider>
-          <Tabs tabs={tabs} />
-          <NavigationBar />
-        </NavigationProvider>
-      </Media>
-      <Media greaterThanOrEqual="laptop">
-        <Layout>
-          <Form />
-          <Settings />
-          <Output />
-        </Layout>
-      </Media>
-    </>
-  );
-}

apps/web/Components/Common/Loading.jsx

@@ -1,20 +0,0 @@
-import getColors from '@/styles/colors';
-import styled from 'styled-components';
-import { Result } from 'ui/elements';
-import { LoadingOutlined } from 'ui/elements/icons';
-
-const colors = getColors();
-
-const Title = styled.span`
-  font-size: 1.25rem;
-  color: rgba(0, 0, 0, 0.88);
-`;
-
-export function Loading() {
-  return (
-    <Result
-      icon={<LoadingOutlined style={{ color: colors.COLOR_PRIMARY, fontSize: '60px' }} />}
-      title={<Title>Загрузка...</Title>}
-    />
-  );
-}

apps/web/Components/Common/Notification.tsx

@@ -1,7 +1,4 @@
 /* eslint-disable import/no-mutable-exports */
-import { ERROR_KEYS } from '@/@types/errors';
-import { Media } from '@/styles/media';
-import { getDevice } from '@/utils/device';
 import type { MessageInstance } from 'antd/es/message/interface';
 import type { NotificationInstance } from 'antd/es/notification/interface';
 import type { ReactNode } from 'react';
@@ -10,61 +7,23 @@ import { message as antdMessage, notification as antdNotification } from 'ui/ele
 export let message: Readonly<MessageInstance>;
 export let notification: Readonly<NotificationInstance>;
 
-function createWrapper<T extends NotificationInstance, M extends MessageInstance>(
+export function Notification({ children }: { children: ReactNode }) {
-  notificationObj: T,
-  messageObj: M
-): T {
-  const handler: ProxyHandler<T> = {
-    get(target, prop, receiver) {
-      const notificationMethod = target[prop as keyof T];
-      const messageMethod = messageObj[prop as keyof M];
-
-      if (typeof notificationMethod === 'function' && typeof messageMethod === 'function') {
-        return function (...args: any[]) {
-          const device = getDevice();
-
-          if (device?.isMobile) {
-            if (typeof args[0] === 'object') {
-              if (ERROR_KEYS.includes(args[0].key)) return;
-              args[0].content = args[0].description || args[0].message;
-            }
-
-            messageMethod.apply(messageObj, args);
-          }
-
-          notificationMethod.apply(target, args);
-        };
-      }
-
-      return Reflect.get(target, prop, receiver);
-    },
-  };
-
-  return new Proxy(notificationObj, handler);
-}
-
-export function Notification({ children }: { readonly children?: ReactNode }) {
-  const device = getDevice();
-
   const [messageApi, messageContextHolder] = antdMessage.useMessage({
-    duration: device?.isMobile ? 1.5 : 1.2,
     maxCount: 3,
     top: 70,
   });
 
   const [notificationApi, notificationContextHolder] = antdNotification.useNotification({
-    maxCount: 3,
     placement: 'bottomRight',
-    stack: { threshold: 1 },
   });
 
   message = messageApi;
-  notification = createWrapper(notificationApi, messageApi);
+  notification = notificationApi;
 
   return (
     <>
       {messageContextHolder}
-      <Media greaterThanOrEqual="laptop">{notificationContextHolder}</Media>
+      {notificationContextHolder}
       {children}
     </>
   );

apps/web/Components/Common/index.ts

@@ -1,3 +0,0 @@
-export * from './Error';
-export * from './Loading';
-export * from './Notification';

apps/web/Components/Layout/Auth.jsx

@@ -10,7 +10,7 @@ const UserText = styled.span`
   padding: 0;
   text-transform: uppercase;
   color: #fff;
-  font-size: 0.55rem;
+  font-size: 0.5rem;
   font-family: 'Montserrat';
   font-weight: 500;
   line-height: 1;
@@ -45,7 +45,13 @@ const Logout = styled.a`
 
 function Auth() {
   return (
-    <Flex flexDirection="column" alignItems="flex-end" justifyContent="flex-start" height="100%">
+    <Flex
+      flexDirection="column"
+      alignItems="flex-end"
+      alignSelf={['flex-start']}
+      justifyContent="space-between"
+      height="100%"
+    >
       <User />
       <Logout href="/logout">Выход</Logout>
     </Flex>

apps/web/Components/Layout/Header.jsx

@@ -7,7 +7,6 @@ import { Flex } from 'ui/grid';
 const HeaderContent = styled(Flex)`
   flex-direction: row;
   justify-content: space-between;
-  padding: 14px 12px;
 
   background: linear-gradient(
     90deg,
@@ -16,7 +15,9 @@ const HeaderContent = styled(Flex)`
     var(--color-tertiarty) 100%
   );
 
+  padding: 14px 12px;
   ${min('laptop')} {
+    padding: 14px 12px;
     padding-left: 20px;
   }
 `;

apps/web/Components/Layout/Logo.jsx

@@ -5,7 +5,6 @@ import getColors from '@/styles/colors';
 import { min } from '@/styles/mq';
 import { observer } from 'mobx-react-lite';
 import Image from 'next/image';
-import Link from 'next/link';
 import logo from 'public/assets/images/logo-primary.svg';
 import styled from 'styled-components';
 import { Tag } from 'ui/elements';
@@ -34,9 +33,8 @@ const LogoText = styled.h3`
 const TagWrapper = styled.div`
   font-family: 'Montserrat';
   font-weight: 500;
-
+  * {
-  ${min('tablet')} {
+    font-size: 0.7rem;
-    margin: 0 5px;
   }
 `;
 
@@ -44,11 +42,12 @@ const { COLOR_PRIMARY } = getColors();
 
 const UnlimitedTag = observer(() => {
   const { $process } = useStore();
-
   if ($process.has('Unlimited')) {
     return (
       <TagWrapper>
-        <Tag color={COLOR_PRIMARY}>без ограничений</Tag>
+        <Tag color={COLOR_PRIMARY} style={{ margin: '0 5px' }}>
+          без ограничений
+        </Tag>
       </TagWrapper>
     );
   }
@@ -60,11 +59,9 @@ function Logo() {
   return (
     <Flex flexDirection="column" alignItems="flex-start" justifyContent="space-between">
       <ImageWrapper>
-        <Link prefetch={false} href="/">
+        <Image priority className={styles.logo} alt="logo" src={logo} layout="responsive" />
-          <Image priority className={styles.logo} alt="logo" src={logo} layout="responsive" />
-        </Link>
       </ImageWrapper>
-      <Flex flexDirection={['column', 'row']} alignItems={[undefined, 'center']}>
+      <Flex justifyContent="space-between" alignItems="center">
         <LogoText>Лизинговый Калькулятор</LogoText>
         <UnlimitedTag />
       </Flex>

apps/web/Components/Layout/Menu.tsx

@@ -1,60 +0,0 @@
-import Background from './Background';
-import type { MenuProps } from 'antd';
-import Link from 'next/link';
-import { useRouter } from 'next/router';
-import { Menu } from 'ui/elements';
-import { AppstoreOutlined, SettingOutlined } from 'ui/elements/icons';
-
-const items: MenuProps['items'] = [
-  {
-    children: [
-      {
-        // icon: <HomeOutlined />,
-        key: '/',
-        label: (
-          <Link prefetch={false} href="/">
-            Главная
-          </Link>
-        ),
-      },
-      {
-        // icon: <PlusSquareOutlined />,
-        key: '/unlimited',
-        label: (
-          <Link prefetch={false} href="/unlimited">
-            Без ограничений
-          </Link>
-        ),
-      },
-    ],
-    icon: <AppstoreOutlined />,
-    key: 'home',
-    label: 'Приложение',
-  },
-  {
-    children: [
-      {
-        // icon: <DatabaseOutlined />,
-        key: '/admin/cache',
-        label: (
-          <Link prefetch={false} href="/admin/cache">
-            Управление кэшем
-          </Link>
-        ),
-      },
-    ],
-    icon: <SettingOutlined />,
-    key: 'admin',
-    label: 'Панель управления',
-  },
-];
-
-export function AppMenu() {
-  const { pathname } = useRouter();
-
-  return (
-    <Background>
-      <Menu selectedKeys={[pathname]} mode="horizontal" items={items} />
-    </Background>
-  );
-}

apps/web/Components/Layout/Navigation.jsx

@@ -1,64 +0,0 @@
-import { NavigationContext } from '@/context/navigation';
-import { useContext, useEffect } from 'react';
-import styled from 'styled-components';
-import { Flex } from 'ui/grid';
-
-const Container = styled.div`
-  background-color: white;
-  bottom: 0;
-  display: flex;
-  flex-direction: row;
-  gap: 10px;
-  height: 46px;
-  justify-content: space-around;
-  position: fixed;
-  width: 100%;
-  border-top: 1px solid rgba(5, 5, 5, 0.06);
-  z-index: 999999;
-`;
-
-const TabButton = styled.button`
-  background: ${({ active }) => (active ? 'var(--color-primary)' : 'white')};
-  color: ${({ active }) => (active ? 'white' : 'black')};
-  border-radius: 2px 2px 0 0;
-  border: none;
-  cursor: pointer;
-  height: 100%;
-  width: 100%;
-  font-size: 0.75rem;
-`;
-
-export function NavigationBar() {
-  const { currentTab, setCurrentTab, tabsList } = useContext(NavigationContext);
-
-  return (
-    <Container>
-      {tabsList.map(({ Icon, key, title }) => (
-        <TabButton key={key} active={key === currentTab} onClick={() => setCurrentTab(key)}>
-          <Flex flexDirection="column" alignItems="center">
-            <Icon />
-            {title}
-          </Flex>
-        </TabButton>
-      ))}
-    </Container>
-  );
-}
-
-const Display = styled.div`
-  display: ${(props) => (props.visible ? 'block' : 'none')};
-`;
-
-export function Tabs({ tabs }) {
-  const { currentTab, setTabsList } = useContext(NavigationContext);
-
-  useEffect(() => {
-    setTabsList(tabs);
-  }, [setTabsList, tabs]);
-
-  return tabs.map(({ Component, key }) => (
-    <Display key={key} visible={key === currentTab}>
-      <Component key={key} tabs />
-    </Display>
-  ));
-}

apps/web/Components/Layout/Page.jsx

@@ -2,7 +2,7 @@ import { min } from '@/styles/mq';
 import styled from 'styled-components';
 import { Box } from 'ui/grid';
 
-export const Layout = styled(Box)`
+export const Grid = styled(Box)`
   display: flex;
   flex-direction: column;
   gap: 10px;
@@ -17,4 +17,8 @@ export const Layout = styled(Box)`
     grid-template-columns: 2fr 1fr 1.5fr;
     /* margin: 8px 5%; */
   }
+
+  ${min('desktop-xl')} {
+    margin: 8px 10% !important;
+  }
 `;

apps/web/Components/Layout/index.jsx

@@ -1,26 +1,11 @@
 import Header from './Header';
-import { AppMenu } from './Menu';
+import { Flex } from 'ui/grid';
-import { max, min } from '@/styles/mq';
-import styled from 'styled-components';
 
-const Main = styled.main`
+export default function Layout({ children }) {
-  margin: 8px 0;
-
-  ${max('laptop')} {
-    margin-bottom: calc(46px + 8px); // height of the navigation bar
-  }
-
-  ${min('desktop-xl')} {
-    margin: 8px 10%;
-  }
-`;
-
-export default function Layout({ children, user }) {
   return (
-    <>
+    <Flex flexDirection="column">
       <Header />
-      {user?.admin ? <AppMenu /> : false}
+      <main>{children}</main>
-      <Main>{children}</Main>
+    </Flex>
-    </>
   );
 }

apps/web/Components/Output/Results/config.ts

@@ -7,7 +7,6 @@ export const titles: Record<keyof ResultValues, string> = {
   _resultContractEconomy: 'Экономика',
   _resultContractEconomyWithVAT: 'Экономика, с НДС',
   _resultPi: 'PI',
-  _resultPiRepayment: 'PI для досрочки',
   _resultSumCredit: 'Сумма кредита',
   _resultSumCreditPayment: 'Сумма платежей по кредиту',
   _resultVatRecoverable: 'НДС к возмещению',
@@ -47,7 +46,6 @@ export const formatters = {
   _resultContractEconomy: moneyFormatter,
   _resultContractEconomyWithVAT: moneyFormatter,
   _resultPi: percentFormatter,
-  _resultPiRepayment: percentFormatter,
   _resultSumCredit: moneyFormatter,
   _resultSumCreditPayment: moneyFormatter,
   _resultVatRecoverable: moneyFormatter,
@@ -76,7 +74,6 @@ export const elements: Array<keyof ResultValues> = [
   '_resultContractEconomy',
   '_resultContractEconomyWithVAT',
   '_resultPi',
-  '_resultPiRepayment',
   '_resultSumCredit',
   '_resultSumCreditPayment',
   '_resultVatRecoverable',

apps/web/Components/Output/Results/index.jsx

@@ -22,7 +22,7 @@ const Wrapper = styled.div`
 `;
 
 const Results = observer(() => {
-  const { $process, $results } = useStore();
+  const { $results, $process } = useStore();
 
   const resultsValues = toJS($results.values);
   // eslint-disable-next-line no-negated-condition

apps/web/Components/Output/Validation.jsx

@@ -23,7 +23,29 @@ const AlertWrapper = styled(Box)`
   margin: 0 0 5px 0;
 `;
 
-function getAlerts(errors, title, $process) {
+function getElementsErrors({ $calculation, $process }) {
+  return Object.values($calculation.$validation).map((validation) => {
+    const elementErrors = validation.getErrors();
+    const elementTitle = validation.params.err_title;
+
+    return elementErrors.map(({ key, message }) => (
+      <AlertWrapper>
+        <Alert
+          key={key}
+          type={$process.has('Unlimited') ? 'warning' : 'error'}
+          showIcon
+          message={Message(elementTitle, message)}
+        />
+      </AlertWrapper>
+    ));
+  });
+}
+
+function getPaymentsTableErrors({ $tables, $process }) {
+  const { payments } = $tables;
+  const errors = payments.validation.getErrors();
+  const title = payments.validation.params.err_title;
+
   return errors.map(({ key, message }) => (
     <AlertWrapper>
       <Alert
@@ -36,21 +58,38 @@ function getAlerts(errors, title, $process) {
   ));
 }
 
-function getElementsErrors({ $calculation, $process }) {
+function getInsuranceTableErrors({ $tables, $process }) {
-  return Object.values($calculation.$validation).map((validation) => {
+  const { insurance } = $tables;
-    const elementErrors = validation.getErrors();
+  const errors = insurance.validation.getErrors();
-    const elementTitle = validation.params.err_title;
+  const title = insurance.validation.params.err_title;
 
-    return getAlerts(elementErrors, elementTitle, $process);
+  return errors.map(({ key, message }) => (
-  });
+    <AlertWrapper>
+      <Alert
+        key={key}
+        type={$process.has('Unlimited') ? 'warning' : 'error'}
+        showIcon
+        message={Message(title, message)}
+      />
+    </AlertWrapper>
+  ));
 }
 
-function getTableErrors(tableName, { $process, $tables }) {
+function getFingapTableErrors({ $tables, $process }) {
-  const table = $tables[tableName];
+  const { fingap } = $tables;
-  const errors = table.validation.getErrors();
+  const errors = fingap.validation.getErrors();
-  const title = table.validation.params.err_title;
+  const title = fingap.validation.params.err_title;
 
-  return getAlerts(errors, title, $process);
+  return errors.map(({ key, message }) => (
+    <AlertWrapper>
+      <Alert
+        key={key}
+        type={$process.has('Unlimited') ? 'warning' : 'error'}
+        showIcon
+        message={Message(title, message)}
+      />
+    </AlertWrapper>
+  ));
 }
 
 const Errors = observer(() => {
@@ -62,16 +101,15 @@ const Errors = observer(() => {
   );
   const hasPaymentsErrors = $tables.payments.validation.hasErrors;
   const hasInsuranceErrors = $tables.insurance.validation.hasErrors;
-  const hasFingapErrors = $tables.fingap.validation.hasErrors;
 
-  if (!hasElementsErrors && !hasPaymentsErrors && !hasInsuranceErrors && !hasFingapErrors) {
+  if (!hasElementsErrors && !hasPaymentsErrors && !hasInsuranceErrors) {
     return <Alert type="success" showIcon message="Ошибок нет 🙂" />;
   }
 
   const elementsErrors = getElementsErrors(store);
-  const paymentsErrors = getTableErrors('payments', store);
+  const paymentsErrors = getPaymentsTableErrors(store);
-  const insuranceErrors = getTableErrors('insurance', store);
+  const insuranceErrors = getInsuranceTableErrors(store);
-  const fingapErrors = getTableErrors('fingap', store);
+  const fingapErrors = getFingapTableErrors(store);
 
   const errors = [...elementsErrors, ...paymentsErrors, ...insuranceErrors, ...fingapErrors];
 

apps/web/Components/Output/index.jsx

@@ -42,7 +42,7 @@ const Wrapper = styled(Background)`
   }
 `;
 
-export const Output = observer(({ tabs }) => {
+const Output = observer(() => {
   const { $results } = useStore();
   const [activeKey, setActiveKey] = useState(undefined);
   const { hasErrors } = useErrors();
@@ -52,15 +52,15 @@ export const Output = observer(({ tabs }) => {
       setActiveKey('payments-table');
     }
 
-    if (!tabs && hasErrors) {
+    if (hasErrors) {
       setActiveKey('validation');
     }
-  }, [$results.payments.length, hasErrors, tabs]);
+  }, [$results.payments.length, hasErrors]);
 
   return (
     <Wrapper>
       <Tabs
-        items={tabs ? items.filter((x) => x.key !== 'validation') : items}
+        items={items}
         activeKey={activeKey}
         onChange={(key) => {
           setActiveKey(key);
@@ -69,3 +69,5 @@ export const Output = observer(({ tabs }) => {
     </Wrapper>
   );
 });
+
+export default Output;

apps/web/Dockerfile

@@ -2,14 +2,14 @@
 # Make sure you update both files!
 
 FROM node:alpine AS builder
-RUN corepack enable && corepack prepare pnpm@8.9.0 --activate
+RUN corepack enable && corepack prepare pnpm@latest --activate
 ENV PNPM_HOME=/usr/local/bin
 # Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
 RUN apk add --no-cache libc6-compat
 RUN apk update
 # Set working directory
 WORKDIR /app
-RUN pnpm add -g turbo@1.12.4 dotenv-cli
+RUN pnpm add -g turbo dotenv-cli
 COPY . .
 RUN turbo prune --scope=web --docker
 
@@ -47,9 +47,6 @@ ARG URL_CORE_CALCULATE_DIRECT
 ARG URL_1C_TRANSTAX_DIRECT
 ARG URL_ELT_OSAGO_DIRECT
 ARG URL_ELT_KASKO_DIRECT
-ARG USERNAME_1C_TRANSTAX
-ARG PASSWORD_1C_TRANSTAX
-RUN pnpm dotenv -v NODE_ENV=production -e .env turbo run prebuild --filter=web...
 RUN pnpm dotenv -e .env turbo run build --filter=web...
 
 FROM node:alpine AS runner

apps/web/api/1c/types.ts

@@ -1,12 +1,11 @@
 export type RequestTransTax = {
-  CalcDate: string;
-  CarCategory: string;
   OKTMO: string;
-  Power: number;
+  calcDate: Date;
-  Year: number;
+  carCategory: string;
+  power: number;
+  year: number;
 };
 export type ResponseTransTax = {
-  Error: string;
+  error: string;
-  Tax: number;
+  tax: number;
-  TaxRate: number;
 };

apps/web/api/cache/query.ts

@@ -1,42 +0,0 @@
-import type { ResponseQueries } from './types';
-import getUrls from '@/config/urls';
-import { withHandleError } from '@/utils/axios';
-import axios from 'axios';
-
-const {
-  URL_CACHE_GET_QUERIES,
-  URL_CACHE_DELETE_QUERY,
-  URL_CACHE_RESET_QUERIES,
-  URL_CACHE_GET_QUERY,
-} = getUrls();
-
-export function getQueries({ signal }: { signal: AbortSignal }) {
-  return withHandleError(axios.get<ResponseQueries>(URL_CACHE_GET_QUERIES, { signal })).then(
-    ({ data }) => data
-  );
-}
-
-export function deleteQuery(queryKey: string) {
-  return withHandleError(
-    axios.delete(URL_CACHE_DELETE_QUERY, {
-      params: {
-        queryKey,
-      },
-    })
-  ).then(({ data }) => data);
-}
-
-export function reset() {
-  return withHandleError(axios.delete(URL_CACHE_RESET_QUERIES)).then(({ data }) => data);
-}
-
-export function getQueryValue(queryKey: string, { signal }: { signal: AbortSignal }) {
-  return withHandleError(
-    axios.get<object>(URL_CACHE_GET_QUERY, {
-      params: {
-        queryKey,
-      },
-      signal,
-    })
-  ).then(({ data }) => data);
-}

apps/web/api/cache/types.ts

@@ -1,3 +0,0 @@
-import type { QueryItem } from 'shared/types/cache';
-
-export type ResponseQueries = Record<string, QueryItem>;

apps/web/api/core/types/calculate.ts

@@ -111,7 +111,6 @@ export const PreparedValuesSchema = z.object({
   transTax: z.number(),
   transportTaxGr: z.number(),
   transportTaxGrYear: z.number(),
-  typeRepayment: z.number(),
 });
 
 export type PreparedValues = z.infer<typeof PreparedValuesSchema>;
@@ -400,7 +399,6 @@ const ColumnsSchema = z.object({
     values: z.number().array(),
   }),
   sumRepaymentColumn: z.object({
-    pi: z.number(),
     values: z.number().array(),
   }),
   sumVATCreditColumn: z.object({

apps/web/api/crm/types.ts

@@ -6,7 +6,6 @@ import ValuesSchema from '@/config/schema/values';
 import { z } from 'zod';
 
 export const RequestCreateKPSchema = z.object({
-  __info: z.record(z.any()).optional(),
   calculation: z
     .object({
       calculationValues: ValuesSchema,

apps/web/api/elt/query.ts

@@ -6,18 +6,24 @@ import axios from 'axios';
 
 const { URL_ELT_KASKO, URL_ELT_OSAGO } = getUrls();
 
-export async function getEltOsago(payload: ELT.RequestEltOsago) {
+export async function getEltOsago(
+  payload: ELT.RequestEltOsago,
+  { signal }: { signal: AbortSignal }
+) {
   return withHandleError(
     axios
-      .post<ELT.ResponseEltOsago>(URL_ELT_OSAGO, payload, { timeout: TIMEOUT })
+      .post<ELT.ResponseEltOsago>(URL_ELT_OSAGO, payload, { signal, timeout: TIMEOUT })
       .then(({ data }) => data)
   );
 }
 
-export async function getEltKasko(payload: ELT.RequestEltKasko) {
+export async function getEltKasko(
+  payload: ELT.RequestEltKasko,
+  { signal }: { signal: AbortSignal }
+) {
   return withHandleError(
     axios
-      .post<ELT.ResponseEltKasko>(URL_ELT_KASKO, payload, { timeout: TIMEOUT })
+      .post<ELT.ResponseEltKasko>(URL_ELT_KASKO, payload, { signal, timeout: TIMEOUT })
       .then(({ data }) => data)
   );
 }

apps/web/apollo/client.js

@@ -1,24 +1,20 @@
-import { createLink } from './link';
+import { link } from '@/config/apollo';
 import { ApolloClient, InMemoryCache } from '@apollo/client';
 import { isServer } from 'tools/common';
 
 /** @type {import('@apollo/client').ApolloClient<import('@apollo/client').NormalizedCacheObject>} */
 let apolloClient;
 
-function createApolloClient(headers) {
+function createApolloClient() {
   return new ApolloClient({
     cache: new InMemoryCache(),
-    link: createLink(headers),
+    link,
     ssrMode: isServer(),
   });
 }
 
-export default function initializeApollo(initialState, headers) {
+export default function initializeApollo(initialState = null) {
-  if (isServer() && !headers) {
+  const _apolloClient = apolloClient ?? createApolloClient();
-    throw new Error('initializeApollo: headers must be provided in server side');
-  }
-
-  const _apolloClient = apolloClient ?? createApolloClient(headers);
 
   // If your page has Next.js data fetching methods that use Apollo Client, the initial state
   // gets hydrated here

apps/web/apollo/link.js

@@ -1,133 +0,0 @@
-/* eslint-disable sonarjs/cognitive-complexity */
-import { message } from '@/Components/Common/Notification';
-import { publicRuntimeConfigSchema } from '@/config/schema/runtime-config';
-import getUrls from '@/config/urls';
-import { ApolloLink, from, HttpLink } from '@apollo/client';
-import { setContext } from '@apollo/client/link/context';
-import { onError } from '@apollo/client/link/error';
-import { getCurrentScope } from '@sentry/nextjs';
-import getConfig from 'next/config';
-import { isServer } from 'tools';
-
-function isSovkom(account) {
-  return account.label.toLowerCase().includes('совком');
-}
-
-export function createLink(headers) {
-  const { URL_CRM_GRAPHQL } = getUrls();
-
-  const modifyDataLink = new ApolloLink((operation, forward) => {
-    const context = operation?.getContext();
-
-    return forward(operation).map((response) => {
-      if (!context?.disableModify) {
-        if (Object.keys(response?.data).includes('evo_addproduct_types')) {
-          response.data.evo_addproduct_types = response.data.evo_addproduct_types.map(
-            (evo_addproduct_type) => {
-              if (evo_addproduct_type.evo_graph_price)
-                return {
-                  ...evo_addproduct_type,
-                  label: `${evo_addproduct_type.label} (${evo_addproduct_type.evo_graph_price} руб.)`,
-                };
-
-              return evo_addproduct_type;
-            }
-          );
-        }
-
-        if (Object.keys(response?.data).includes('evo_equipments')) {
-          response.data.evo_equipments = response.data.evo_equipments.map((evo_equipment) => {
-            if (evo_equipment.evo_start_production_year)
-              return {
-                ...evo_equipment,
-                label: `${evo_equipment.label} (${evo_equipment.evo_start_production_year})`,
-              };
-
-            return evo_equipment;
-          });
-        }
-
-        if (operation.operationName === 'GetInsuranceCompanies') {
-          response.data.accounts = response.data.accounts
-            .sort((a, b) => {
-              if (isSovkom(a)) return -1;
-
-              if (isSovkom(b)) return 1;
-
-              return 0;
-            })
-            .map((account) => {
-              const substring = account.label.match(/"(.+)"/u);
-              if (substring)
-                return {
-                  ...account,
-                  label: substring ? substring[1].replaceAll('"', '').trim() : account.label,
-                };
-
-              return account;
-            });
-        }
-      }
-
-      return response;
-    });
-  });
-
-  const httpLink = new HttpLink({
-    uri: URL_CRM_GRAPHQL,
-  });
-
-  const authLink = setContext((_, { headers: existingHeaders }) => {
-    if (process.env.NODE_ENV === 'development') {
-      const { publicRuntimeConfig } = getConfig();
-      const { DEV_AUTH_TOKEN } = publicRuntimeConfigSchema.parse(publicRuntimeConfig);
-
-      if (DEV_AUTH_TOKEN)
-        return {
-          headers: {
-            ...existingHeaders,
-            authorization: `Bearer ${DEV_AUTH_TOKEN}`,
-          },
-        };
-    }
-
-    if (isServer()) {
-      return {
-        headers: {
-          ...existingHeaders,
-          authorization: headers?.authorization,
-        },
-      };
-    }
-
-    return {
-      headers: {
-        ...existingHeaders,
-      },
-    };
-  });
-
-  const key = 'APOLLO_GRAPHQL';
-
-  const errorLink = onError(({ graphQLErrors, networkError, operation, response }) => {
-    const scope = getCurrentScope();
-    scope.setTag('operationName', operation.operationName);
-
-    if (!isServer()) {
-      message.error({
-        content: `Ошибка во время загрузки данных из CRM`,
-        key,
-        onClick: () => message.destroy(key),
-      });
-    }
-
-    scope.setExtras({
-      graphQLErrors,
-      networkError,
-      operation,
-      response,
-    });
-  });
-
-  return from([authLink, errorLink, modifyDataLink, httpLink]);
-}

apps/web/config/apollo.js

@@ -0,0 +1,45 @@
+import getUrls from './urls';
+import { ApolloLink, HttpLink } from '@apollo/client';
+
+const { URL_CRM_GRAPHQL } = getUrls();
+
+const modifyDataLink = new ApolloLink((operation, forward) => {
+  const context = operation?.getContext();
+
+  return forward(operation).map((response) => {
+    if (!context?.disableModify) {
+      if (Object.keys(response?.data).includes('evo_addproduct_types')) {
+        response.data.evo_addproduct_types = response.data.evo_addproduct_types.map((x) => ({
+          ...x,
+          label: `${x.label} (${x.evo_graph_price} руб.)`,
+        }));
+      }
+
+      if (Object.keys(response?.data).includes('evo_equipments')) {
+        response.data.evo_equipments = response.data.evo_equipments.map((x) => ({
+          ...x,
+          label: `${x.label} (${x.evo_start_production_year})`,
+        }));
+      }
+
+      if (operation.operationName === 'GetInsuranceCompanies') {
+        response.data.accounts = response.data.accounts.map((x) => {
+          const substring = x.label.match(/"(.+)"/u);
+
+          return {
+            ...x,
+            label: substring ? substring[1].replaceAll('"', '').trim() : x.label,
+          };
+        });
+      }
+    }
+
+    return response;
+  });
+});
+
+const httpLink = new HttpLink({
+  uri: URL_CRM_GRAPHQL,
+});
+
+export const link = modifyDataLink.concat(httpLink);

apps/web/config/default-options.ts

@@ -104,7 +104,7 @@ export const selectObjectCategoryTax = [
 export const selectLeaseObjectUseFor = alphabetical(
   [
     {
-      label: 'Для представительских целей / перевозки сотрудников ЛП',
+      label: 'Для представительских целей',
       value: 100_000_000,
     },
     {
@@ -151,10 +151,10 @@ export const selectLeaseObjectUseFor = alphabetical(
       label: 'Для перевозки сотрудников других организаций (водитель ЛП)',
       value: 100_000_011,
     },
-    // {
+    {
-    //   label: 'Для перевозки сотрудников ЛП',
+      label: 'Для перевозки сотрудников ЛП',
-    //   value: 100_000_012,
+      value: 100_000_012,
-    // },
+    },
     {
       label: 'Для экскурсионных перевозок в т.ч. на торжества; трансфер в аэропорт и пр.',
       value: 100_000_013,
@@ -183,10 +183,6 @@ export const selectLeaseObjectUseFor = alphabetical(
       label: 'Строительство',
       value: 100_000_019,
     },
-    {
-      label: 'Перевозка опасных и легковоспламеняющихся грузов',
-      value: 100_000_020,
-    },
   ],
   (objectUseFor) => objectUseFor.label.toLowerCase(),
   'asc'
@@ -511,7 +507,6 @@ const defaultOptions: CalculationOptions = {
   cbxPartialVAT: [],
   cbxFloatingRate: [],
   cbxQuotePriceWithFullVAT: [],
-  cbxQuoteShowAcceptLimit: [],
 };
 
 export default defaultOptions;

apps/web/config/default-statuses.ts

@@ -18,7 +18,6 @@ const defaultStatuses: CalculationStatuses = {
   cbxPriceWithDiscount: 'Default',
   cbxQuotePriceWithFullVAT: 'Default',
   cbxQuoteRedemptionGraph: 'Default',
-  cbxQuoteShowAcceptLimit: 'Default',
   cbxRecalcWithRevision: 'Default',
   cbxRegistrationQuote: 'Default',
   cbxShowFinGAP: 'Default',

apps/web/config/default-values.ts

@@ -22,7 +22,7 @@ const defaultValues: CalculationValues = {
   comissionRub: 0,
   configuration: null,
   costIncrease: true,
-  countSeats: 4,
+  countSeats: 0,
   creditRate: RATE,
   dealer: null,
   dealerBroker: null,
@@ -144,7 +144,6 @@ const defaultValues: CalculationValues = {
   partialVAT: false,
   floatingRate: false,
   quotePriceWithFullVAT: false,
-  quoteShowAcceptLimit: true,
 };
 
 export default defaultValues;

apps/web/config/meta.jsx

@@ -2,7 +2,6 @@ import { withBasePath } from '@/config/urls';
 
 export const metaFavicon = (
   <>
-    <link rel="icon" type="image/x-icon" href={withBasePath('/favicon.ico')} sizes="32x32" />
     <link rel="apple-touch-icon" sizes="180x180" href={withBasePath('/apple-touch-icon.png')} />
     <link rel="icon" type="image/png" sizes="32x32" href={withBasePath('/favicon-32x32.png')} />
     <link rel="icon" type="image/png" sizes="16x16" href={withBasePath('/favicon-16x16.png')} />

apps/web/config/schema/elt.ts

@@ -215,6 +215,7 @@ export const RequestEltOsagoSchema = z.object({
         city: z.string(),
         cityKladr: z.string(),
         country: z.string(),
+        flat: z.string(),
         house: z.string(),
         region: z.string(),
         resident: z.number(),
@@ -230,6 +231,7 @@ export const RequestEltOsagoSchema = z.object({
         city: z.string(),
         cityKladr: z.string(),
         country: z.string(),
+        flat: z.string(),
         house: z.string(),
         region: z.string(),
         resident: z.number(),
@@ -270,12 +272,10 @@ export const ResultEltOsagoSchema = z.object({
 
 export const RowSchema = z.object({
   id: z.string(),
-  insuranceCondition: z.string().nullable(),
   key: z.string(),
   message: z.string().nullable(),
-  metodCalc: z.union([z.literal('CRM'), z.literal('ELT')]),
   name: z.string(),
-  numCalc: z.string(),
+  numCalc: z.number(),
   requestId: z.string(),
   skCalcId: z.string(),
   status: z.string().nullable(),

apps/web/config/schema/env.js

@@ -2,28 +2,21 @@ const { z } = require('zod');
 
 const envSchema = z.object({
   BASE_PATH: z.string().optional().default(''),
-  DEV_AUTH_TOKEN: z.string().optional(),
-  PASSWORD_1C_TRANSTAX: z.string(),
   PORT: z.string().optional(),
   SENTRY_AUTH_TOKEN: z.string(),
   SENTRY_DSN: z.string(),
   SENTRY_ENVIRONMENT: z.string(),
   URL_1C_TRANSTAX_DIRECT: z.string(),
-  URL_CACHE_DELETE_QUERY_DIRECT: z.string().default('http://api:3001/proxy/delete-query'),
-  URL_CACHE_GET_QUERIES_DIRECT: z.string().default('http://api:3001/proxy/get-queries'),
-  URL_CACHE_GET_QUERY_DIRECT: z.string().default('http://api:3001/proxy/get-query'),
-  URL_CACHE_RESET_QUERIES_DIRECT: z.string().default('http://api:3001/proxy/reset'),
   URL_CORE_CALCULATE_DIRECT: z.string(),
   URL_CORE_FINGAP_DIRECT: z.string(),
   URL_CRM_CREATEKP_DIRECT: z.string(),
   URL_CRM_DOWNLOADKP_BASE: z.string(),
   URL_CRM_GRAPHQL_DIRECT: z.string(),
-  URL_CRM_GRAPHQL_PROXY: z.string().default('http://api:3001/proxy/graphql'),
+  URL_CRM_GRAPHQL_PROXY: z.string(),
   URL_ELT_KASKO_DIRECT: z.string(),
   URL_ELT_OSAGO_DIRECT: z.string(),
   URL_GET_USER_DIRECT: z.string(),
   USE_DEV_COLORS: z.unknown().optional().transform(Boolean),
-  USERNAME_1C_TRANSTAX: z.string(),
 });
 
 module.exports = envSchema;

apps/web/config/schema/results.ts

@@ -4,7 +4,6 @@ export const ResultValuesSchema = z.object({
   _resultContractEconomy: z.number(),
   _resultContractEconomyWithVAT: z.number(),
   _resultPi: z.number(),
-  _resultPiRepayment: z.number(),
   _resultSumCredit: z.number(),
   _resultSumCreditPayment: z.number(),
   _resultVatRecoverable: z.number(),

apps/web/config/schema/runtime-config.js

@@ -2,7 +2,6 @@ const envSchema = require('./env');
 
 const publicRuntimeConfigSchema = envSchema.pick({
   BASE_PATH: true,
-  DEV_AUTH_TOKEN: true,
   SENTRY_DSN: true,
   SENTRY_ENVIRONMENT: true,
   USE_DEV_COLORS: true,
@@ -10,16 +9,10 @@ const publicRuntimeConfigSchema = envSchema.pick({
 
 const serverRuntimeConfigSchema = envSchema.pick({
   BASE_PATH: true,
-  DEV_AUTH_TOKEN: true,
-  PASSWORD_1C_TRANSTAX: true,
   PORT: true,
   SENTRY_DSN: true,
   SENTRY_ENVIRONMENT: true,
   URL_1C_TRANSTAX_DIRECT: true,
-  URL_CACHE_DELETE_QUERY_DIRECT: true,
-  URL_CACHE_GET_QUERIES_DIRECT: true,
-  URL_CACHE_GET_QUERY_DIRECT: true,
-  URL_CACHE_RESET_QUERIES_DIRECT: true,
   URL_CORE_CALCULATE_DIRECT: true,
   URL_CORE_FINGAP_DIRECT: true,
   URL_CRM_CREATEKP_DIRECT: true,
@@ -28,7 +21,6 @@ const serverRuntimeConfigSchema = envSchema.pick({
   URL_ELT_KASKO_DIRECT: true,
   URL_ELT_OSAGO_DIRECT: true,
   URL_GET_USER_DIRECT: true,
-  USERNAME_1C_TRANSTAX: true,
 });
 
 module.exports = {

apps/web/config/schema/values.ts

@@ -129,7 +129,6 @@ const ValuesSchema = z.object({
   withTrailer: z.boolean(),
   partialVAT: z.boolean(),
   floatingRate: z.boolean(),
-  quoteShowAcceptLimit: z.boolean(),
 
   /**
    * Link Values

apps/web/config/urls.ts

@@ -22,10 +22,6 @@ function getUrls() {
       URL_ELT_KASKO_DIRECT,
       URL_ELT_OSAGO_DIRECT,
       URL_CRM_GRAPHQL_PROXY,
-      URL_CACHE_GET_QUERIES_DIRECT,
-      URL_CACHE_DELETE_QUERY_DIRECT,
-      URL_CACHE_RESET_QUERIES_DIRECT,
-      URL_CACHE_GET_QUERY_DIRECT,
     } = serverRuntimeConfigSchema.parse(serverRuntimeConfig);
 
     return {
@@ -33,10 +29,6 @@ function getUrls() {
       PORT,
       SENTRY_DSN,
       URL_1C_TRANSTAX: URL_1C_TRANSTAX_DIRECT,
-      URL_CACHE_DELETE_QUERY: URL_CACHE_DELETE_QUERY_DIRECT,
-      URL_CACHE_GET_QUERIES: URL_CACHE_GET_QUERIES_DIRECT,
-      URL_CACHE_GET_QUERY: URL_CACHE_GET_QUERY_DIRECT,
-      URL_CACHE_RESET_QUERIES: URL_CACHE_RESET_QUERIES_DIRECT,
       URL_CORE_CALCULATE: URL_CORE_CALCULATE_DIRECT,
       URL_CORE_FINGAP: URL_CORE_FINGAP_DIRECT,
       URL_CRM_CREATEKP: URL_CRM_CREATEKP_DIRECT,
@@ -52,10 +44,6 @@ function getUrls() {
     BASE_PATH,
     SENTRY_DSN,
     URL_1C_TRANSTAX: withBasePath(urls.URL_1C_TRANSTAX_PROXY),
-    URL_CACHE_DELETE_QUERY: withBasePath(urls.URL_CACHE_DELETE_QUERY_PROXY),
-    URL_CACHE_GET_QUERIES: withBasePath(urls.URL_CACHE_GET_QUERIES_PROXY),
-    URL_CACHE_GET_QUERY: withBasePath(urls.URL_CACHE_GET_QUERY_PROXY),
-    URL_CACHE_RESET_QUERIES: withBasePath(urls.URL_CACHE_RESET_QUERIES_PROXY),
     URL_CORE_CALCULATE: withBasePath(urls.URL_CORE_CALCULATE_PROXY),
     URL_CORE_FINGAP: withBasePath(urls.URL_CORE_FINGAP_PROXY),
     URL_CRM_CREATEKP: withBasePath(urls.URL_CRM_CREATEKP_PROXY),

apps/web/config/users.js

@@ -1,4 +1,3 @@
 export const unlimitedRoles = ['Калькулятор без ограничений'];
 export const defaultRoles = ['Лизинговый калькулятор', 'МПЛ', 'Управляющий подразделением'];
-export const adminRoles = ['Калькулятор без ограничений', 'Системный администратор'];
 export const usersSuper = ['akalinina', 'vchikalkin'];

apps/web/constants/page.js

@@ -1,3 +0,0 @@
-export const PAGE_TITLE = 'Лизинговый калькулятор - Эволюция';
-export const PAGE_DESCRIPTION =
-  'Лизинговый калькулятор - Эволюция - Расчет лизинговых платежей - Создание КП';

apps/web/constants/urls.js

@@ -1,9 +1,5 @@
 module.exports = {
   URL_1C_TRANSTAX_PROXY: '/api/1c/transtax',
-  URL_CACHE_DELETE_QUERY_PROXY: '/api/admin/cache/delete',
-  URL_CACHE_GET_QUERIES_PROXY: '/api/admin/cache/get-queries',
-  URL_CACHE_GET_QUERY_PROXY: '/api/admin/cache/get-query',
-  URL_CACHE_RESET_QUERIES_PROXY: '/api/admin/cache/reset',
   URL_CORE_CALCULATE_PROXY: '/api/core/calculate',
   URL_CORE_FINGAP_PROXY: '/api/core/fingap',
   URL_CRM_CREATEKP_PROXY: '/api/crm/create-kp',

apps/web/constants/values.js

@@ -12,5 +12,3 @@ export const VEHICLE_SEATS = 20;
 export const ESN = 1.3;
 export const NSIB_MAX = 5_000_000;
 export const NDFL = 0.13;
-
-export const IRR_THRESHOLD = 0.001;

apps/web/context/navigation.tsx

@@ -1,34 +0,0 @@
-import { createContext, useEffect, useMemo, useState } from 'react';
-
-type Tab = {
-  icon: JSX.Element;
-  key: string;
-  title: string;
-  useShowBadge?: () => boolean;
-};
-
-type NavigationContextType = {
-  currentTab: string;
-  setCurrentTab: (tab: string) => void;
-  setTabsList: (list: Tab[]) => void;
-  tabsList: Tab[];
-};
-
-export const NavigationContext = createContext<NavigationContextType>({} as NavigationContextType);
-
-export function NavigationProvider({ children }: { readonly children: React.ReactNode }) {
-  const [currentTab, setCurrentTab] = useState('');
-  const [tabsList, setTabsList] = useState<Tab[]>([]);
-
-  useEffect(() => {
-    const defaultTab = tabsList.at(0);
-    if (defaultTab) setCurrentTab(defaultTab.key);
-  }, [tabsList]);
-
-  const value = useMemo(
-    () => ({ currentTab, setCurrentTab, setTabsList, tabsList }),
-    [currentTab, setCurrentTab, setTabsList, tabsList]
-  );
-
-  return <NavigationContext.Provider value={value}>{children}</NavigationContext.Provider>;
-}

apps/web/graphql/crm.query.graphql

@@ -8,7 +8,7 @@ query GetTransactionCurrencies {
   }
 }
 
-query GetTransactionCurrency($currencyid: UUID!) {
+query GetTransactionCurrency($currencyid: Uuid!) {
   transactioncurrency(transactioncurrencyid: $currencyid) {
     currencysymbol
     isocurrencycode
@@ -17,33 +17,20 @@ query GetTransactionCurrency($currencyid: UUID!) {
 }
 
 query GetCurrencyChanges($currentDate: DateTime) {
-  evo_currencychanges(
+  evo_currencychanges(statecode: 0, evo_coursedate_param: { eq: $currentDate }) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionDateTime: { fieldName: "evo_coursedate", eq: $currentDate } }
-      ]
-    }
-  ) {
     evo_currencychange
     evo_ref_transactioncurrency
   }
 }
 
 query GetLeads($domainname: String) {
-  systemusers(
+  leads(owner_domainname: $domainname) {
-    filterConditionGroup: {
+    label: fullname
-      andFilterConditions: { filterConditionString: { fieldName: "domainname", eq: $domainname } }
+    value: leadid
-    }
-  ) {
-    leads(orderby: { fieldName: "createdon", sortingType: DESC }) {
-      label: fullname
-      value: leadid
-    }
   }
 }
 
-query GetLead($leadid: UUID!) {
+query GetLead($leadid: Uuid!) {
   lead(leadid: $leadid) {
     evo_agent_accountid
     evo_double_agent_accountid
@@ -65,7 +52,7 @@ query GetLead($leadid: UUID!) {
   }
 }
 
-query GetOpportunity($opportunityid: UUID!) {
+query GetOpportunity($opportunityid: Uuid!) {
   opportunity(opportunityid: $opportunityid) {
     evo_leadid
     accountidData {
@@ -80,28 +67,14 @@ query GetOpportunity($opportunityid: UUID!) {
 }
 
 query GetOpportunities($domainname: String) {
-  systemusers(
+  opportunities(owner_domainname: $domainname) {
-    filterConditionGroup: {
+    label: name
-      andFilterConditions: { filterConditionString: { fieldName: "domainname", eq: $domainname } }
+    value: opportunityid
-    }
-  ) {
-    opportunities(orderby: { fieldName: "createdon", sortingType: DESC }) {
-      label: name
-      value: opportunityid
-    }
   }
 }
 
-query GetQuotes($leadid: UUID!) {
+query GetQuotes($leadid: Uuid!) {
-  quotes(
+  quotes(evo_leadid: $leadid) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionGuid: { fieldName: "evo_leadid", eq: $leadid } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
-    orderby: { fieldName: "createdon", sortingType: DESC }
-  ) {
     label: evo_quotename
     value: quoteid
     evo_recalc_limit
@@ -112,8 +85,8 @@ query GetQuotes($leadid: UUID!) {
   }
 }
 
-query GetQuote($quoteId: UUID!) {
+query GetQuote($quoteId: Uuid!) {
-  quote(quoteid: $quoteId) {
+  quote(quoteId: $quoteId) {
     evo_baseproductid
     evo_one_year_insurance
     evo_min_change_price
@@ -137,30 +110,11 @@ query GetQuote($quoteId: UUID!) {
     evo_promotion
     evo_sale_without_nds
     link
-    evo_committee_quote
-    evo_msfo_irr
-    evo_accept_quoteid
-    evo_power
-    evo_engine_volume
-    evo_nsib
-    evo_addproduct_types {
-      evo_product_type
-    }
-    evo_db_accept_registration
-    evo_product_risks {
-      evo_addproduct_typeid
-    }
-    evo_fingap_payer
-    evo_osago_payer
-    evo_kasko_payer
-    evo_leasing_bonus_summ
-    evo_card_bonus_summ
-    evo_nsib_bonus_summ
   }
 }
 
-query GetQuoteData($quoteId: UUID!) {
+query GetQuoteData($quoteId: Uuid!) {
-  quote(quoteid: $quoteId) {
+  quote(quoteId: $quoteId) {
     evo_addproduct_types {
       evo_product_type
       evo_addproduct_typeid
@@ -255,7 +209,7 @@ query GetQuoteData($quoteId: UUID!) {
     evo_graphs {
       createdon
       evo_sumpay_withnds
-      evo_planpayments(orderby: { fieldName: "evo_plandate", sortingType: ASC }) {
+      evo_planpayments {
         evo_payment_ratio
       }
     }
@@ -309,25 +263,14 @@ query GetQuoteData($quoteId: UUID!) {
     evo_transactioncurrencyid
     evo_equip_price
     evo_coefficien_bonus_reducttion
-    evo_accept_limit_quote
-    evo_kasko_insurance_rulesidData {
-      evo_id
-    }
-    evo_osago_insurance_rulesiddData {
-      evo_id
-    }
   }
 }
 
 query GetTarifs($currentDate: DateTime) {
   evo_tarifs(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-      ]
-    }
   ) {
     label: evo_name
     value: evo_tarifid
@@ -350,7 +293,7 @@ query GetTarifs($currentDate: DateTime) {
   }
 }
 
-query GetTarif($tarifId: UUID!) {
+query GetTarif($tarifId: Uuid!) {
   evo_tarif(evo_tarifid: $tarifId) {
     label: evo_name
     value: evo_tarifid
@@ -364,8 +307,6 @@ query GetTarif($tarifId: UUID!) {
     evo_rates {
       evo_datefrom
       evo_rateid
-      evo_type
-      statecode
     }
     evo_irr_plan
     evo_margin_min
@@ -374,13 +315,9 @@ query GetTarif($tarifId: UUID!) {
 
 query GetRates($currentDate: DateTime) {
   evo_rates(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-      ]
-    }
   ) {
     label: evo_name
     value: evo_rateid
@@ -392,7 +329,7 @@ query GetRates($currentDate: DateTime) {
   }
 }
 
-query GetRate($rateId: UUID!) {
+query GetRate($rateId: Uuid!) {
   evo_rate(evo_rateid: $rateId) {
     evo_base_rate
     evo_credit_period
@@ -403,14 +340,10 @@ query GetRate($rateId: UUID!) {
 
 query GetProducts($currentDate: DateTime) {
   evo_baseproducts(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_relation: [100000000]
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionMultyPicklist: { fieldName: "evo_relation", oneof: [100000000] } }
-      ]
-    }
   ) {
     label: evo_name
     value: evo_baseproductid
@@ -421,7 +354,7 @@ query GetProducts($currentDate: DateTime) {
   }
 }
 
-query GetProduct($productId: UUID!) {
+query GetProduct($productId: Uuid!) {
   evo_baseproduct(evo_baseproductid: $productId) {
     evo_leasingobject_types {
       evo_leasingobject_typeid
@@ -447,13 +380,9 @@ query GetProduct($productId: UUID!) {
 
 query GetSubsidies($currentDate: DateTime) {
   evo_subsidies(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-      ]
-    }
   ) {
     label: evo_name
     value: evo_subsidyid
@@ -461,7 +390,7 @@ query GetSubsidies($currentDate: DateTime) {
   }
 }
 
-query GetSubsidy($subsidyId: UUID!) {
+query GetSubsidy($subsidyId: Uuid!) {
   evo_subsidy(evo_subsidyid: $subsidyId) {
     evo_leasingobject_types {
       evo_leasingobject_typeid
@@ -483,7 +412,7 @@ query GetSubsidy($subsidyId: UUID!) {
   }
 }
 
-query GetImportProgram($importProgramId: UUID!) {
+query GetImportProgram($importProgramId: Uuid!) {
   importProgram: evo_subsidy(evo_subsidyid: $importProgramId) {
     evo_leasingobject_types {
       evo_leasingobject_typeid
@@ -501,7 +430,7 @@ query GetImportProgram($importProgramId: UUID!) {
 }
 
 query GetRegions {
-  evo_regions(orderby: { fieldName: "evo_name", sortingType: ASC }) {
+  evo_regions {
     label: evo_name
     value: evo_regionid
     evo_fias_id
@@ -509,7 +438,7 @@ query GetRegions {
   }
 }
 
-query GetRegion($regionId: UUID!) {
+query GetRegion($regionId: Uuid!) {
   evo_region(evo_regionid: $regionId) {
     evo_oktmo
     accounts {
@@ -519,16 +448,8 @@ query GetRegion($regionId: UUID!) {
   }
 }
 
-query GetTowns($regionId: UUID!) {
+query GetTowns($regionId: Uuid!) {
-  evo_towns(
+  evo_towns(evo_regionid: $regionId) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionGuid: { fieldName: "evo_regionid", eq: $regionId } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
-    orderby: { fieldName: "evo_name", sortingType: ASC }
-  ) {
     evo_fias_id
     label: evo_name
     value: evo_townid
@@ -536,33 +457,22 @@ query GetTowns($regionId: UUID!) {
   }
 }
 
-query GetTown($townId: UUID!) {
+query GetTown($townId: Uuid!) {
   evo_town(evo_townid: $townId) {
     evo_kladr_id
   }
 }
 
 query GetGPSBrands {
-  evo_gps_brands(
+  evo_gps_brands(statecode: 0) {
-    filterConditionGroup: {
-      andFilterConditions: { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-    }
-  ) {
     label: evo_name
     value: evo_gps_brandid
     evo_id
   }
 }
 
-query GetGPSModels($gpsBrandId: UUID!) {
+query GetGPSModels($gpsBrandId: Uuid!) {
-  evo_gps_models(
+  evo_gps_models(evo_gps_brandid: $gpsBrandId) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionGuid: { fieldName: "evo_gps_brandid", eq: $gpsBrandId } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
-  ) {
     label: evo_name
     value: evo_gps_modelid
     evo_id
@@ -570,18 +480,14 @@ query GetGPSModels($gpsBrandId: UUID!) {
 }
 
 query GetLeaseObjectTypes {
-  evo_leasingobject_types(
+  evo_leasingobject_types(statecode: 0) {
-    filterConditionGroup: {
-      andFilterConditions: { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-    }
-  ) {
     label: evo_name
     value: evo_leasingobject_typeid
     evo_leasingobject_typeid
   }
 }
 
-query GetLeaseObjectType($leaseObjectTypeId: UUID!) {
+query GetLeaseObjectType($leaseObjectTypeId: Uuid!) {
   evo_leasingobject_type(evo_leasingobject_typeid: $leaseObjectTypeId) {
     evo_vehicle_type
     evo_id
@@ -592,21 +498,11 @@ query GetLeaseObjectType($leaseObjectTypeId: UUID!) {
     evo_expluatation_period2
     evo_depreciation_rate1
     evo_depreciation_rate2
-    evo_trailer
-    evo_vehicle_body_type_option
-    evo_vehicle_body_types {
-      evo_vehicle_body_typeid
-    }
   }
 }
 
 query GetBrands {
-  evo_brands(
+  evo_brands(statecode: 0) {
-    filterConditionGroup: {
-      andFilterConditions: { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-    }
-    orderby: { fieldName: "evo_name", sortingType: ASC }
-  ) {
     label: evo_name
     value: evo_brandid
     evo_brandid
@@ -614,7 +510,7 @@ query GetBrands {
   }
 }
 
-query GetBrand($brandId: UUID!) {
+query GetBrand($brandId: Uuid!) {
   evo_brand(evo_brandid: $brandId) {
     evo_id
     evo_importer_reward_perc
@@ -624,26 +520,16 @@ query GetBrand($brandId: UUID!) {
   }
 }
 
-query GetModels($brandId: UUID!) {
+query GetModels($brandId: Uuid!) {
-  evo_models(
+  evo_models(statecode: 0, evo_brandid: $brandId) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionGuid: { fieldName: "evo_brandid", eq: $brandId } }
-      ]
-    }
-    orderby: { fieldName: "evo_name", sortingType: ASC }
-  ) {
     label: evo_name
     value: evo_modelid
     evo_modelid
     evo_vehicle_type
-    evo_trailer_sign
-    evo_vehicle_body_typeid
   }
 }
 
-query GetModel($modelId: UUID!) {
+query GetModel($modelId: Uuid!) {
   evo_model(evo_modelid: $modelId) {
     evo_impairment_groupidData {
       evo_name
@@ -655,27 +541,18 @@ query GetModel($modelId: UUID!) {
       evo_id_elt
     }
     evo_running_gear
-    evo_trailer_sign
-    evo_vehicle_body_typeid
   }
 }
 
-query GetConfigurations($modelId: UUID!) {
+query GetConfigurations($modelId: Uuid!) {
-  evo_equipments(
+  evo_equipments(statecode: 0, evo_modelid: $modelId) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionGuid: { fieldName: "evo_modelid", eq: $modelId } }
-      ]
-    }
-  ) {
     label: evo_name
     value: evo_equipmentid
     evo_start_production_year
   }
 }
 
-query GetConfiguration($configurationId: UUID!) {
+query GetConfiguration($configurationId: Uuid!) {
   evo_equipment(evo_equipmentid: $configurationId) {
     evo_impairment_groupidData {
       evo_name
@@ -684,7 +561,7 @@ query GetConfiguration($configurationId: UUID!) {
 }
 
 query GetDealers {
-  dealers {
+  dealers: accounts(evo_account_type: [100000001], statecode: 0, evo_legal_form: 100000001) {
     label: name
     value: accountid
     accountid
@@ -692,16 +569,16 @@ query GetDealers {
   }
 }
 
-query GetDealer($dealerId: UUID!) {
+query GetDealer($dealerId: Uuid!) {
-  dealer(accountid: $dealerId) {
+  dealer: account(accountid: $dealerId) {
     evo_return_leasing_dealer
     evo_broker_accountid
     evo_supplier_financing_accept
   }
 }
 
-query GetDealerPersons($dealerId: UUID!) {
+query GetDealerPersons($dealerId: Uuid!) {
-  dealerPersons: dealer_persons(salonaccountid: $dealerId) {
+  dealerPersons: salon_providers(statecode: 0, salonaccountid: $dealerId) {
     label: name
     value: accountid
     accountid
@@ -711,46 +588,27 @@ query GetDealerPersons($dealerId: UUID!) {
   }
 }
 
-query GetDealerPerson($dealerPersonId: UUID!) {
+query GetDealerPerson($dealerPersonId: Uuid!) {
-  dealer_person(accountid: $dealerPersonId) {
+  account(accountid: $dealerPersonId) {
     evo_supplier_type
     evo_supplier_financing_accept
-    evo_return_leasing_dealer
-    evo_broker_accountid
-    evo_supplier_financing_accept
-    evo_legal_form
-    evo_inn
   }
 }
 
-query GetAgent($agentid: UUID!) {
+query GetAgent($agentid: Uuid!) {
-  agent(accountid: $agentid) {
+  agent: account(accountid: $agentid) {
     label: name
     value: accountid
-    evo_inn
   }
 }
 
-query GetRewardConditions($agentid: UUID!, $currentDate: DateTime) {
+query GetRewardConditions($agentid: Uuid!, $currentDate: DateTime) {
   evo_reward_conditions(
-    filterConditionGroup: {
+    evo_agent_accountid: $agentid
-      andFilterConditionGroup: [
+    evo_datefrom_param: { lte: $currentDate }
-        {
+    evo_dateto_param: { gte: $currentDate }
-          orFilterConditions: [
+    statecode: 0
-            { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
+    evo_agency_agreementid_param: { has: true }
-            { filterConditionDateTime: { fieldName: "evo_dateto", eq: null } }
-          ]
-        }
-        {
-          andFilterConditions: [
-            { filterConditionGuid: { fieldName: "evo_agent_accountid", eq: $agentid } }
-            { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-            { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-            { filterConditionGuid: { fieldName: "evo_agency_agreementid", neq: null } }
-          ]
-        }
-      ]
-    }
   ) {
     label: evo_name
     value: evo_reward_conditionid
@@ -759,7 +617,7 @@ query GetRewardConditions($agentid: UUID!, $currentDate: DateTime) {
   }
 }
 
-query GetRewardCondition($conditionId: UUID!) {
+query GetRewardCondition($conditionId: Uuid!) {
   evo_reward_condition(evo_reward_conditionid: $conditionId) {
     evo_reward_summ
     evo_reduce_reward
@@ -774,27 +632,16 @@ query GetRewardCondition($conditionId: UUID!) {
 }
 
 query GetSotCoefficientType($evo_id: String) {
-  evo_sot_coefficient_types(
+  evo_sot_coefficient_type(evo_id: $evo_id) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionString: { fieldName: "evo_id", eq: $evo_id } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
-  ) {
     evo_sot_coefficient_typeid
   }
 }
 
 query GetCoefficients($currentDate: DateTime) {
   evo_coefficients(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-      ]
-    }
   ) {
     evo_job_titleid
     evo_sot_coefficient_typeid
@@ -820,11 +667,7 @@ query GetCoefficients($currentDate: DateTime) {
 }
 
 query GetSystemUser($domainname: String) {
-  systemusers(
+  systemuser(domainname: $domainname) {
-    filterConditionGroup: {
-      filterCondition: { filterConditionString: { fieldName: "domainname", eq: $domainname } }
-    }
-  ) {
     evo_job_titleid
     businessunitid
     roles {
@@ -842,13 +685,9 @@ fragment CoreAddProductTypesFields on evo_addproduct_type {
 
 query GetAddproductTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_product_type
@@ -862,7 +701,7 @@ query GetAddproductTypes($currentDate: DateTime) {
   }
 }
 
-query GetAddProductType($addproductTypeId: UUID!) {
+query GetAddProductType($addproductTypeId: Uuid!) {
   evo_addproduct_type(evo_addproduct_typeid: $addproductTypeId) {
     evo_description
     evo_helpcard_type
@@ -886,14 +725,10 @@ query GetAddProductType($addproductTypeId: UUID!) {
 
 query GetRegistrationTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000001
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000001 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_leasingobject_types {
@@ -909,14 +744,10 @@ query GetRegistrationTypes($currentDate: DateTime) {
 
 query GetTechnicalCards($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000000
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000000 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_min_period
@@ -930,14 +761,10 @@ query GetTechnicalCards($currentDate: DateTime) {
 
 query GetFuelCards($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000005
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000005 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_min_period
@@ -950,14 +777,10 @@ query GetFuelCards($currentDate: DateTime) {
 
 query GetTelematicTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000004
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000004 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_controls_program
@@ -967,14 +790,10 @@ query GetTelematicTypes($currentDate: DateTime) {
 
 query GetTrackerTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000003
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000003 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_controls_program
@@ -984,14 +803,10 @@ query GetTrackerTypes($currentDate: DateTime) {
 
 query GetInsNSIBTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_product_type: 100000002
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000002 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_max_period
@@ -1009,14 +824,10 @@ query GetInsNSIBTypes($currentDate: DateTime) {
 
 query GetLeasingWithoutKaskoTypes($currentDate: DateTime) {
   evo_addproduct_types(
-    filterConditionGroup: {
+    statecode: 0
-      andFilterConditions: [
+    evo_product_type: 100000007
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
+    evo_datefrom_param: { lte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
+    evo_dateto_param: { gte: $currentDate }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000007 } }
-      ]
-    }
   ) {
     ...CoreAddProductTypesFields
     evo_product_type
@@ -1036,45 +847,16 @@ query GetLeasingWithoutKaskoTypes($currentDate: DateTime) {
   }
 }
 
-query GetOsagoAddproductTypes($currentDate: DateTime) {
+query GetInsuranceCompany($accountId: Uuid!) {
-  evo_addproduct_types(
+  account(accountid: $accountId) {
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-        { filterConditionInt: { fieldName: "evo_product_type", eq: 100000008 } }
-      ]
-    }
-  ) {
-    evo_product_type
-    evo_visible_calc
-    evo_accountid
-    createdon
-    evo_category
-    evo_min_power
-    evo_max_power
-    evo_min_seats_count
-    evo_max_seats_count
-    evo_min_mass
-    evo_max_mass
-    evo_graph_price_withoutnds
-    evo_id
-  }
-}
-
-query GetInsuranceCompany($accountId: UUID!) {
-  account: insurance(accountid: $accountId) {
     evo_osago_with_kasko
     evo_legal_region_calc
     accountid
-    evo_kasko_fact_part
-    evo_kasko_plan_part
   }
 }
 
 query GetInsuranceCompanies {
-  accounts: insurances {
+  accounts(evo_account_type: [100000002], statecode: 0) {
     evo_type_ins_policy
     evo_evokasko_access
     evo_inn
@@ -1083,74 +865,11 @@ query GetInsuranceCompanies {
     evo_id_elt_osago
     evo_id_elt
     evo_id_elt_smr
-    evo_osago_id
-    evo_kasko_category
-    evo_osago_category
-  }
-}
-
-query GetEltInsuranceRules($currentDate: DateTime) {
-  evo_insurance_ruleses(
-    filterConditionGroup: {
-      andFilterConditions: [
-        { filterConditionInt: { fieldName: "statecode", eq: 0 } }
-        { filterConditionDateTime: { fieldName: "evo_datefrom", lte: $currentDate } }
-        { filterConditionDateTime: { fieldName: "evo_dateto", gte: $currentDate } }
-      ]
-    }
-  ) {
-    evo_id
-    evo_datefrom
-    evo_dateto
-    evo_risk
-    evo_category
-    evo_min_period
-    evo_max_period
-    evo_object_type
-    evo_use_for
-    evo_min_price
-    evo_max_price
-    evo_min_year
-    evo_max_year
-    evo_min_power
-    evo_max_power
-    evo_enginie_type
-    evo_opf
-    evo_min_mileage
-    evo_max_mileage
-    evo_brand
-    evo_model
-    evo_region
-    evo_dealer
-    evo_rules_type
-    evo_message
-    evo_discount
-    evo_insurer_accountid
-    evo_brand
-    evo_model
-    evo_region
-    evo_dealer
-    evo_brands {
-      evo_brandid
-    }
-    evo_models {
-      evo_modelid
-    }
-    accounts {
-      accountid
-    }
-    evo_regions {
-      evo_regionid
-    }
   }
 }
 
 query GetRoles($roleName: String) {
-  roles(
+  roles(name: $roleName) {
-    filterConditionGroup: {
-      andFilterConditions: { filterConditionString: { fieldName: "name", eq: $roleName } }
-    }
-  ) {
     systemusers {
       label: fullname
       value: domainname

apps/web/graphql/crm.tools.ts

@@ -1,14 +1,12 @@
 import type * as CRMTypes from '@/graphql/crm.types';
 
-type SystemUser = NonNullable<CRMTypes.GetSystemUserQuery['systemusers']>[number];
+function evo_baseproducts(evo_baseproducts: CRMTypes.GetProductsQuery['evo_baseproducts']) {
-
-function evo_baseproducts(baseproducts: CRMTypes.GetProductsQuery['evo_baseproducts']) {
   return {
     filterBy: {
-      systemuser(systemuser: SystemUser) {
+      systemuser(systemuser: CRMTypes.GetSystemUserQuery['systemuser']) {
-        if (!baseproducts?.length || !systemuser) return [];
+        if (!evo_baseproducts?.length || !systemuser) return [];
 
-        return baseproducts?.filter(
+        return evo_baseproducts?.filter(
           (evo_baseproduct) =>
             !evo_baseproduct?.systemusers?.length ||
             evo_baseproduct?.systemusers?.some(

apps/web/hooks/index.ts

@@ -1 +0,0 @@
-export * from './loading';

apps/web/hooks/loading.ts

@@ -1,30 +0,0 @@
-import { useRouter } from 'next/router';
-import { useEffect, useState } from 'react';
-
-export function usePageLoading() {
-  const [loading, setLoading] = useState(false);
-  const router = useRouter();
-
-  function handleStart() {
-    return setLoading(true);
-  }
-  function handleComplete() {
-    return setLoading(false);
-  }
-
-  useEffect(() => {
-    router.events.on('routeChangeStart', handleStart);
-    router.events.on('routeChangeComplete', handleComplete);
-    router.events.on('routeChangeError', handleComplete);
-
-    return () => {
-      router.events.off('routeChangeStart', handleStart);
-      router.events.off('routeChangeComplete', handleComplete);
-      router.events.off('routeChangeError', handleComplete);
-    };
-  }, []);
-
-  return {
-    loading,
-  };
-}

apps/web/hooks/worker.ts

@@ -1,17 +0,0 @@
-/* eslint-disable no-console */
-import { useEffect } from 'react';
-
-export function useServiceWorker() {
-  useEffect(() => {
-    if ('serviceWorker' in navigator) {
-      navigator.serviceWorker
-        .register('/sw.js')
-        .then((registration) => {
-          console.log('Service Worker registered with scope:', registration.scope);
-        })
-        .catch((error) => {
-          console.log('Service Worker registration failed:', error);
-        });
-    }
-  }, []);
-}

apps/web/mocks/handlers.js

@@ -39,23 +39,20 @@ export const handlers = [
   rest.post(URL_1C_TRANSTAX, (req, res, ctx) =>
     res(
       ctx.json({
-        Error: null,
+        error: null,
-        Tax: _.random(100000, 200000),
+        tax: _.random(100000, 200000),
       })
     )
   ),
-  rest.post(URL_ELT_OSAGO, async (req, res, ctx) =>
+  rest.post(URL_ELT_OSAGO, async (req, res, ctx) => res(
-    res(
       ctx.json({
         numCalc: _.random(1000000, 3000000),
         skCalcId: _.random(50000000, 60000000).toString(),
         premiumSum: _.random(10000, 20000),
         message: 'OSAGO Message',
       })
-    )
+    )),
-  ),
+  rest.post(URL_ELT_KASKO, async (req, res, ctx) => res(
-  rest.post(URL_ELT_KASKO, async (req, res, ctx) =>
-    res(
       ctx.json({
         requestId: _.random(3000000, 4000000).toString(),
         skCalcId: _.random(50000000, 60000000).toString(),
@@ -70,8 +67,7 @@ export const handlers = [
         ],
         totalFranchise: _.random(20000, 40000),
       })
-    )
+    )),
-  ),
 
   // rest.post(URL_CRM_GRAPHQL, (req, res, ctx) => {
   //   return res(ctx.status(503));

apps/web/next.config.js

@@ -29,7 +29,6 @@ module.exports = withSentryConfig(
     },
     experimental: {
       outputFileTracingRoot: path.join(__dirname, '../../'),
-      proxyTimeout: 1000 * 90,
     },
     images: {
       deviceSizes: devices,
@@ -37,17 +36,6 @@ module.exports = withSentryConfig(
     output: 'standalone',
     publicRuntimeConfig: publicRuntimeConfigSchema.parse(env),
     reactStrictMode: true,
-
-    async redirects() {
-      return [
-        {
-          source: '/admin',
-          destination: '/admin/cache',
-          permanent: true,
-        },
-      ];
-    },
-
     async rewrites() {
       return [
         {
@@ -66,10 +54,10 @@ module.exports = withSentryConfig(
           destination: env.URL_CORE_FINGAP_DIRECT,
           source: urls.URL_CORE_FINGAP_PROXY,
         },
-        // {
+        {
-        //   destination: env.URL_1C_TRANSTAX_DIRECT,
+          destination: env.URL_1C_TRANSTAX_DIRECT,
-        //   source: urls.URL_1C_TRANSTAX_PROXY,
+          source: urls.URL_1C_TRANSTAX_PROXY,
-        // },
+        },
         {
           destination: env.URL_ELT_KASKO_DIRECT,
           source: urls.URL_ELT_KASKO_PROXY,
@@ -78,22 +66,6 @@ module.exports = withSentryConfig(
           destination: env.URL_ELT_OSAGO_DIRECT,
           source: urls.URL_ELT_OSAGO_PROXY,
         },
-        {
-          destination: env.URL_CACHE_GET_QUERIES_DIRECT,
-          source: urls.URL_CACHE_GET_QUERIES_PROXY,
-        },
-        {
-          destination: env.URL_CACHE_DELETE_QUERY_DIRECT + '/:path*',
-          source: urls.URL_CACHE_DELETE_QUERY_PROXY + '/:path*',
-        },
-        {
-          destination: env.URL_CACHE_RESET_QUERIES_DIRECT,
-          source: urls.URL_CACHE_RESET_QUERIES_PROXY,
-        },
-        {
-          destination: env.URL_CACHE_GET_QUERY_DIRECT,
-          source: urls.URL_CACHE_GET_QUERY_PROXY,
-        },
         ...favicons.map((fileName) => buildFaviconRewrite(`/${fileName}`)),
       ];
     },

apps/web/package.json

@@ -4,9 +4,7 @@
   "private": true,
   "scripts": {
     "build": "next build",
-    "prebuild": "NODE_ENV=production ts-node --project ./tsconfig.node.json ./scripts/generate-antd-css.ts",
     "dev": "next dev",
-    "predev": "ts-node --project ./tsconfig.node.json ./scripts/generate-antd-css.ts",
     "lint": "next lint",
     "lint:fix": "next lint -- --fix",
     "start": "next start",
@@ -16,7 +14,6 @@
   },
   "dependencies": {
     "@apollo/client": "^3.9.5",
-    "@artsy/fresnel": "^7.1.4",
     "@fontsource/montserrat": "^4.5.14",
     "@sentry/nextjs": "^7.102.0",
     "@sentry/node": "^7.102.0",
@@ -29,15 +26,14 @@
     "dayjs": "^1.11.10",
     "mobx": "^6.12.0",
     "mobx-react-lite": "^4.0.5",
-    "modern-normalize": "^2.0.0",
+    "next": "^14.1.0",
-    "next": "^14.2.5",
+    "normalize.css": "^8.0.1",
     "radash": "^11.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "styled-components": "^5.3.11",
     "superjson": "^2.2.1",
     "tools": "workspace:*",
-    "ua-parser-js": "^1.0.38",
     "ui": "workspace:*",
     "use-debounce": "^9.0.4",
     "zod": "^3.22.4"
@@ -55,17 +51,14 @@
     "@types/react": "^18.2.14",
     "@types/react-dom": "^18.2.6",
     "@types/styled-components": "^5.1.26",
-    "@types/ua-parser-js": "^0.7.39",
     "@vchikalkin/eslint-config-awesome": "^1.1.6",
     "antd": "^5.14.2",
     "eslint": "^8.52.0",
-    "gql-sdl": "^1.1.0",
+    "gql-sdl": "^1.0.0",
     "jest": "^29.4.3",
     "jest-environment-jsdom": "^29.3.1",
     "msw": "^1.1.0",
-    "shared": "workspace:*",
     "ts-jest": "^29.0.5",
-    "ts-node": "^10.9.1",
     "typescript": "^5.3.3"
   },
   "msw": {

apps/web/pages/_app.jsx

@@ -1,18 +1,15 @@
+import 'normalize.css';
 import '../styles/fonts.css';
 import '../styles/globals.css';
 import '../styles/antd-fix.css';
-import '../styles/antd.min.css';
 import initializeQueryClient from '@/api/client';
 import initializeApollo from '@/apollo/client';
-import { Loading } from '@/Components/Common';
+import { Notification } from '@/Components/Common/Notification';
 import Layout from '@/Components/Layout';
 import { theme } from '@/config/ui';
-import { usePageLoading } from '@/hooks';
-import { useServiceWorker } from '@/hooks/worker';
 import StoreProvider from '@/stores/Provider';
 import getColors from '@/styles/colors';
 import { GlobalStyle } from '@/styles/global-style';
-import { MediaContextProvider } from '@/styles/media';
 import { trpcClient } from '@/trpc/client';
 import { ApolloProvider } from '@apollo/client';
 import { QueryClientProvider } from '@tanstack/react-query';
@@ -29,15 +26,9 @@ const colorPrimary = getColors().COLOR_PRIMARY;
 
 function App({ Component, pageProps }) {
   const { initialApolloState, initialQueryState } = pageProps;
-  const apolloClient = useMemo(
+  const apolloClient = useMemo(() => initializeApollo(initialApolloState), [initialApolloState]);
-    () => initializeApollo(initialApolloState, {}),
-    [initialApolloState]
-  );
   const queryClient = useMemo(() => initializeQueryClient(initialQueryState), [initialQueryState]);
 
-  const { loading } = usePageLoading();
-  useServiceWorker();
-
   return (
     <ThemeProvider theme={theme}>
       <Head>
@@ -60,11 +51,11 @@ function App({ Component, pageProps }) {
                 },
               }}
             >
-              <MediaContextProvider>
+              <Notification>
-                <Layout {...pageProps}>
+                <Layout>
-                  {loading ? <Loading /> : <Component {...pageProps} />}
+                  <Component {...pageProps} />
                 </Layout>
-              </MediaContextProvider>
+              </Notification>
             </AntdConfig>
           </QueryClientProvider>
         </ApolloProvider>

apps/web/pages/_document.jsx

@@ -1,26 +1,36 @@
-/* eslint-disable react/no-danger */
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 import { metaFavicon } from '@/config/meta';
-import { PAGE_DESCRIPTION } from '@/constants/page';
+import { withBasePath } from '@/config/urls';
 import Document, { Head, Html, Main, NextScript } from 'next/document';
 import { ServerStyleSheet } from 'styled-components';
+import { createCache, doExtraStyle, StyleProvider } from 'ui/tools';
 
 export default class MyDocument extends Document {
   static async getInitialProps(ctx) {
+    const cache = createCache();
+    let fileName = '';
     const originalRenderPage = ctx.renderPage;
     const sheet = new ServerStyleSheet();
 
     try {
       ctx.renderPage = () =>
         originalRenderPage({
-          enhanceApp: (App) => (props) => sheet.collectStyles(<App {...props} />),
+          enhanceApp: (App) => (props) =>
+            <StyleProvider cache={cache}>{sheet.collectStyles(<App {...props} />)}</StyleProvider>,
         });
 
       const initialProps = await Document.getInitialProps(ctx);
+      fileName = doExtraStyle({
+        cache,
+      });
 
       return {
         ...initialProps,
-        styles: [initialProps.styles, sheet.getStyleElement()],
+        styles: [
+          initialProps.styles,
+          sheet.getStyleElement(),
+          fileName && <link rel="stylesheet" href={withBasePath(`/${fileName}`)} />,
+        ],
       };
     } finally {
       sheet.seal();
@@ -33,7 +43,7 @@ export default class MyDocument extends Document {
         <Head>
           <meta charSet="utf-8" />
           <meta name="theme-color" content="#000000" />
-          <meta name="description" content={PAGE_DESCRIPTION} />
+          <meta name="description" content="Лизинговый калькулятор - Эволюция" />
           {metaFavicon}
         </Head>
         <body>

apps/web/pages/admin/cache.jsx

@@ -1,69 +0,0 @@
-import { getQueries } from '@/api/cache/query';
-import initializeApollo from '@/apollo/client';
-import * as Admin from '@/Components/Admin';
-import { Error } from '@/Components/Common/Error';
-import { getPageTitle } from '@/utils/page';
-import { makeGetUserType } from '@/utils/user';
-import { dehydrate, QueryClient } from '@tanstack/react-query';
-import Head from 'next/head';
-
-function Content() {
-  return (
-    <Admin.Layout>
-      <Head>
-        <title>{getPageTitle('Управление кэшем')}</title>
-      </Head>
-      <Admin.Cache />
-    </Admin.Layout>
-  );
-}
-
-export default function Page(props) {
-  if (props.statusCode !== 200) return <Error {...props} />;
-
-  return <Content />;
-}
-
-/** @type {import('next').GetServerSideProps} */
-export async function getServerSideProps({ req }) {
-  const { cookie = '' } = req.headers;
-
-  const queryClient = new QueryClient();
-  const apolloClient = initializeApollo(null, req.headers);
-  const getUserType = makeGetUserType({ apolloClient, queryClient });
-
-  try {
-    const user = await getUserType({ cookie });
-
-    if (!user.admin) {
-      return {
-        props: {
-          initialQueryState: dehydrate(queryClient),
-          statusCode: 403,
-        },
-      };
-    }
-
-    await queryClient.prefetchQuery(['admin', 'cache', 'queries'], ({ signal }) =>
-      getQueries({ signal })
-    );
-
-    return {
-      props: {
-        calculation: {},
-        initialApolloState: apolloClient.cache.extract(),
-        initialQueryState: dehydrate(queryClient),
-        statusCode: 200,
-        user,
-      },
-    };
-  } catch (error) {
-    return {
-      props: {
-        error: JSON.stringify(error),
-        initialQueryState: dehydrate(queryClient),
-        statusCode: 500,
-      },
-    };
-  }
-}

apps/web/pages/api/1c/transtax.ts

@@ -1,38 +0,0 @@
-import type { ResponseTransTax } from '@/api/1c/types';
-import { serverRuntimeConfigSchema } from '@/config/schema/runtime-config';
-import { withHandleError } from '@/utils/axios';
-import type { HttpError } from '@/utils/error';
-import axios from 'axios';
-import type { NextApiRequest, NextApiResponse } from 'next';
-import getConfig from 'next/config';
-
-const { serverRuntimeConfig } = getConfig();
-const { USERNAME_1C_TRANSTAX, PASSWORD_1C_TRANSTAX, URL_1C_TRANSTAX_DIRECT } =
-  serverRuntimeConfigSchema.parse(serverRuntimeConfig);
-
-export default function handler(req: NextApiRequest, res: NextApiResponse) {
-  const abortController = new AbortController();
-
-  req.on('close', () => {
-    abortController.abort();
-  });
-
-  const params = req.body as ResponseTransTax;
-
-  withHandleError(
-    axios.get<ResponseTransTax>(URL_1C_TRANSTAX_DIRECT, {
-      auth: {
-        password: PASSWORD_1C_TRANSTAX,
-        username: USERNAME_1C_TRANSTAX,
-      },
-      params,
-      signal: abortController.signal,
-    })
-  )
-    .then(({ data }) => res.json(data))
-    .catch((error) => {
-      const _err = error as HttpError;
-
-      return res.json({ message: _err.message });
-    });
-}