remove antd modal code

src/client/Containers/Calculation/index.jsx

@@ -1,7 +1,5 @@
 import Result from 'client/Components/Result';
 import Spinner from 'client/Components/Spinner';
-import Modal from 'client/Elements/Modal';
-import withModal from 'client/hocs/Calculation/withModal';
 import { useFetch } from 'client/hooks/Calculation/useFetch';
 import { Box, Flex } from 'client/UIKit/grid';
 import mq from 'client/UIKit/mq';
@@ -45,17 +43,12 @@ const Calculation = () => {
     return <ServerError />;
   }
 
-  const ModalComponent = withModal(Modal);
-
   return (
-    <>
-      <Grid>
-        <Sections width={['100vw', '100vw', '100%']} />
-        <Middle />
-        <ResultsTable minHeight="500px" width={['100vw', '100vw', '100%']} />
-      </Grid>
-      <ModalComponent />
-    </>
+    <Grid>
+      <Sections width={['100vw', '100vw', '100%']} />
+      <Middle />
+      <ResultsTable minHeight="500px" width={['100vw', '100vw', '100%']} />
+    </Grid>
   );
 };
 

src/client/Elements/Modal.jsx

@@ -1,17 +0,0 @@
-import { Modal as AntModal } from 'antd';
-
-const Modal = ({ visible, text, closeModal, ...props }) => {
-  return (
-    <AntModal
-      {...props}
-      centered
-      visible={visible}
-      onOk={() => closeModal()}
-      onCancel={() => closeModal()}
-    >
-      {text}
-    </AntModal>
-  );
-};
-
-export default Modal;

src/client/hocs/Calculation/index.js

@@ -1,16 +1,7 @@
 import withButton from './withButton';
 import withComputedValue from './withComputedValue';
 import withLink from './withLink';
-import withModal from './withModal';
 import withTable from './withTable';
 import withValue from './withValue';
 
-export {
-    withButton,
-    withLink,
-    withValue,
-    withComputedValue,
-    withModal,
-    withTable,
-};
-
+export { withButton, withLink, withValue, withComputedValue, withTable };

src/client/hocs/Calculation/withModal.jsx

@@ -1,14 +0,0 @@
-import { observer } from 'mobx-react-lite';
-import { useModal } from 'client/hooks/Calculation/useModal';
-
-export default Modal =>
-  observer(() => {
-    const { isModalVisible, modalText, closeModal } = useModal();
-    return (
-      <Modal
-        visible={isModalVisible}
-        text={modalText}
-        closeModal={closeModal}
-      />
-    );
-  });

src/client/hooks/Calculation/useModal.js

@@ -1,13 +0,0 @@
-import { useStores } from '../useStores';
-
-export const useModal = () => {
-  const { calculationStore } = useStores();
-  const {
-    modal: { isModalVisible, modalText },
-  } = calculationStore;
-
-  const closeModal = () => {
-    calculationStore.closeModal();
-  };
-  return { isModalVisible, modalText, closeModal };
-};

src/client/stores/CalculationStore/Data/modal.js

@@ -1,13 +0,0 @@
-const modalData = { modal: { isModalVisible: false, modalText: undefined } };
-
-const modalActions = {
-  showModal(text) {
-    this.modal.modalText = text;
-    this.modal.isModalVisible = true;
-  },
-  closeModal() {
-    this.modal.isModalVisible = false;
-  },
-};
-
-export default Object.assign(modalData, modalActions);

src/client/stores/CalculationStore/index.ts

@@ -1,20 +1,17 @@
-import { TableNames } from 'core/types/Calculation/Store/tables';
-import { ElementStatus } from 'core/types/statuses';
+import { ElementParam, ICalculationStore } from 'core/types/Calculation/Store';
 import { ElementsNames } from 'core/types/Calculation/Store/elements';
 import { LinksNames } from 'core/types/Calculation/Store/links';
-import { ICalculationStore, ElementParam } from 'core/types/Calculation/Store';
 import { Process } from 'core/types/Calculation/Store/process';
+import { TableNames } from 'core/types/Calculation/Store/tables';
+import { ElementStatus } from 'core/types/statuses';
 import { isEqual } from 'lodash';
 import { autorun, makeAutoObservable, reaction } from 'mobx';
-
-import values from './Data/values';
-import tables from './Data/tables';
 import staticData from './Data/static';
-import modal from './Data/modal';
-
-import computedEffects from './Effects/computed';
+import tables from './Data/tables';
+import values from './Data/values';
 import actionsEffects from './Effects/actions';
 import autorunEffects from './Effects/autorun';
+import computedEffects from './Effects/computed';
 import reactionEffects from './Effects/reactions';
 
 export const calculationProcess = makeAutoObservable({
@@ -57,7 +54,6 @@ const CalculationStore: ICalculationStore = makeAutoObservable(
     tables,
     computedEffects,
     actionsEffects,
-    modal,
     {
       stores: {
         calculationProcess,

src/core/types/Calculation/Store/index.ts

@@ -1,19 +1,19 @@
+import { TCRMEntity } from '../../Entities/crmEntities';
 import { CRMEntityNames } from '../../Entities/crmEntityNames';
 import { ElementStatus } from '../../statuses';
-import { TCRMEntity } from '../../Entities/crmEntities';
 import { ElementsNames, TElements } from './elements';
 import { TElementFilter } from './filters';
 import { IBaseOption } from './options';
 import { TStaticData } from './staticData';
 import {
+  ITable,
   ITableCell,
   StoreTables,
   TableNames,
   TableProps,
   TCellCallback,
-  ITable,
 } from './tables';
-import { TValue, TValues, ValuesNames, ResultValuesNames } from './values';
+import { ResultValuesNames, TValue, TValues, ValuesNames } from './values';
 
 export type ElementParam =
   | 'value'
@@ -68,10 +68,6 @@ interface ICalculationValues {
     elementName: ElementsNames,
     validation: boolean | undefined,
   ) => void;
-
-  modal: { isModalVisible: boolean; modalText: string };
-  showModal: (text: string) => void;
-  closeModal: () => void;
 }
 
 interface ICalculationTables {