From c347095ded5e0257f2afa450cd875eb455740a6e Mon Sep 17 00:00:00 2001 From: vchikalkin Date: Tue, 28 Mar 2023 11:53:29 +0300 Subject: [PATCH] process: move init hooks to /hooks dir --- .../Components/Calculation/builders/build-action.tsx | 5 +++-- apps/web/pages/index.jsx | 10 +++++----- apps/web/process/hooks/index.ts | 1 + apps/web/process/{ => hooks}/init/get-initial-data.ts | 0 .../web/process/{ => hooks}/init/get-insurance-data.js | 0 apps/web/process/{ => hooks}/init/get-main-data.js | 0 apps/web/process/{ => hooks}/init/index.js | 0 apps/web/process/hooks/reactions.ts | 4 ++-- 8 files changed, 11 insertions(+), 9 deletions(-) rename apps/web/process/{ => hooks}/init/get-initial-data.ts (100%) rename apps/web/process/{ => hooks}/init/get-insurance-data.js (100%) rename apps/web/process/{ => hooks}/init/get-main-data.js (100%) rename apps/web/process/{ => hooks}/init/index.js (100%) diff --git a/apps/web/Components/Calculation/builders/build-action.tsx b/apps/web/Components/Calculation/builders/build-action.tsx index 5b165b3..a59ae10 100644 --- a/apps/web/Components/Calculation/builders/build-action.tsx +++ b/apps/web/Components/Calculation/builders/build-action.tsx @@ -1,5 +1,5 @@ import type { Elements } from '../config/map/actions'; -import { useProcessContext } from '@/process/hooks'; +import { useProcessContext } from '@/process/hooks/common'; import { useStatus } from '@/stores/calculation/statuses/hooks'; import { observer } from 'mobx-react-lite'; import type { ComponentType } from 'react'; @@ -21,7 +21,8 @@ export default function buildAction( return ( - import(`process/${processName}/action`).then((module) => module.action(context))} + import(`process/${processName}/action`).then((module) => module.action(context)) + } status={status} {...props} /> diff --git a/apps/web/pages/index.jsx b/apps/web/pages/index.jsx index 7a3b5cb..158869c 100644 --- a/apps/web/pages/index.jsx +++ b/apps/web/pages/index.jsx @@ -3,9 +3,9 @@ import initializeApollo from '@/apollo/client'; import * as Calculation from '@/Components/Calculation'; import { Error } from '@/Components/Common/Error'; import Output from '@/Components/Output'; -import { useReactions } from '@/process/hooks'; import * as CRMTypes from '@/graphql/crm.types'; -import * as init from '@/process/init'; +import { useInsuranceData, useMainData, useReactions } from '@/process/hooks'; +import { getInitialData } from '@/process/hooks/init'; import { min } from '@/styles/mq'; import { dehydrate, QueryClient } from '@tanstack/react-query'; import Head from 'next/head'; @@ -37,8 +37,8 @@ const Grid = styled(Box)` `; function Home(props) { - init.useMainData(); - init.useInsuranceData(); + useMainData(); + useInsuranceData(); useReactions(); if (props.statusCode !== 200) return ; @@ -86,7 +86,7 @@ export const getServerSideProps = async ({ req }) => { props: { statusCode: 403 }, }; } - const { values, options } = await init.getInitialData(apolloClient, user); + const { values, options } = await getInitialData(apolloClient, user); return { props: { diff --git a/apps/web/process/hooks/index.ts b/apps/web/process/hooks/index.ts index a17ffcc..07c491c 100644 --- a/apps/web/process/hooks/index.ts +++ b/apps/web/process/hooks/index.ts @@ -1,2 +1,3 @@ export * from './common'; +export * from './init'; export * from './reactions'; diff --git a/apps/web/process/init/get-initial-data.ts b/apps/web/process/hooks/init/get-initial-data.ts similarity index 100% rename from apps/web/process/init/get-initial-data.ts rename to apps/web/process/hooks/init/get-initial-data.ts diff --git a/apps/web/process/init/get-insurance-data.js b/apps/web/process/hooks/init/get-insurance-data.js similarity index 100% rename from apps/web/process/init/get-insurance-data.js rename to apps/web/process/hooks/init/get-insurance-data.js diff --git a/apps/web/process/init/get-main-data.js b/apps/web/process/hooks/init/get-main-data.js similarity index 100% rename from apps/web/process/init/get-main-data.js rename to apps/web/process/hooks/init/get-main-data.js diff --git a/apps/web/process/init/index.js b/apps/web/process/hooks/init/index.js similarity index 100% rename from apps/web/process/init/index.js rename to apps/web/process/hooks/init/index.js diff --git a/apps/web/process/hooks/reactions.ts b/apps/web/process/hooks/reactions.ts index 2870e2d..1ab2e73 100644 --- a/apps/web/process/hooks/reactions.ts +++ b/apps/web/process/hooks/reactions.ts @@ -20,7 +20,7 @@ import * as subsidyImportProgram from '@/process/subsidy-import-program'; import * as supplierAgent from '@/process/supplier-agent'; import * as usedPl from '@/process/used-pl'; -export type Config = { +type Config = { prune: string[]; }; @@ -28,7 +28,7 @@ function useProcess({ reactions }: Process, config?: Config) { const context = useProcessContext(); Object.keys(reactions).forEach((name) => { - if (config?.prune?.length && !config?.prune.includes(name)) { + if (!config?.prune.includes(name)) { const injector = reactions[name]; injector(context); }