From 88557e9da3103344f64446f3f3047d2f927f8161 Mon Sep 17 00:00:00 2001
From: Chika <djchikalkin@gmail.com>
Date: Mon, 7 Sep 2020 14:27:02 +0300
Subject: [PATCH] UI refactor

---
 .../Containers/Calculation/Results/index.jsx  |  7 +++++--
 .../Containers/Calculation/Sections/list.js   |  3 ---
 src/client/Containers/Calculation/Top.jsx     | 14 -------------
 src/client/Containers/Calculation/index.jsx   |  4 +---
 src/client/Elements/Radio.jsx                 | 20 +++++++++----------
 src/client/Elements/Select.jsx                |  4 ++--
 src/core/config/initialStatuses.ts            |  6 +++++-
 7 files changed, 23 insertions(+), 35 deletions(-)
 delete mode 100644 src/client/Containers/Calculation/Top.jsx

diff --git a/src/client/Containers/Calculation/Results/index.jsx b/src/client/Containers/Calculation/Results/index.jsx
index 8c710fe..ba97a48 100644
--- a/src/client/Containers/Calculation/Results/index.jsx
+++ b/src/client/Containers/Calculation/Results/index.jsx
@@ -1,11 +1,14 @@
-import React from 'react';
 import { Divider } from 'antd';
 import Background from 'client/Elements/Background';
+import { PrimaryText } from 'client/Elements/Text';
 import Title from 'client/Elements/Title';
-import { Flex } from 'client/UIKit/grid';
+import React from 'react';
 
 const Results = props => (
   <Background flex="1 0 20%" justifyContent="center">
+    <PrimaryText>Расчет осуществляется по Интересу:</PrimaryText>
+    <PrimaryText>Лизинговой сделке:</PrimaryText>
+    <Divider />
     <Title text="Результаты" />
   </Background>
 );
diff --git a/src/client/Containers/Calculation/Sections/list.js b/src/client/Containers/Calculation/Sections/list.js
index 905482d..9b65aa2 100644
--- a/src/client/Containers/Calculation/Sections/list.js
+++ b/src/client/Containers/Calculation/Sections/list.js
@@ -966,7 +966,6 @@ export default [
         title: 'Агент ФЛ',
         Component: Select,
         props: {
-          disabled: true,
           name: 'selectIndAgent',
           valueName: 'indAgent',
         },
@@ -1035,7 +1034,6 @@ export default [
         title: 'Брокер',
         Component: Select,
         props: {
-          disabled: true,
           name: 'selectCalcBroker',
           valueName: 'calcBroker',
         },
@@ -1072,7 +1070,6 @@ export default [
         props: {
           name: 'selectFinDepartment',
           valueName: 'finDepartment',
-          disabled: true,
         },
       },
       {
diff --git a/src/client/Containers/Calculation/Top.jsx b/src/client/Containers/Calculation/Top.jsx
deleted file mode 100644
index 464b40b..0000000
--- a/src/client/Containers/Calculation/Top.jsx
+++ /dev/null
@@ -1,14 +0,0 @@
-import React from 'react';
-import Background from 'client/Elements/Background';
-import { PrimaryText } from 'client/Elements/Text';
-
-const Top = () => {
-  return (
-    <Background>
-      <PrimaryText>Расчет осуществляется по Интересу:</PrimaryText>
-      <PrimaryText>Лизинговой сделке:</PrimaryText>
-    </Background>
-  );
-};
-
-export default Top;
diff --git a/src/client/Containers/Calculation/index.jsx b/src/client/Containers/Calculation/index.jsx
index 1e80e9f..3a2818b 100644
--- a/src/client/Containers/Calculation/index.jsx
+++ b/src/client/Containers/Calculation/index.jsx
@@ -1,13 +1,11 @@
-import { Flex, Box } from 'client/UIKit/grid';
+import { Box, Flex } from 'client/UIKit/grid';
 import React from 'react';
 import Results from './Results';
 import SectionsList from './Sections';
-import Top from './Top';
 
 const Calculation = () => {
   return (
     <Box mx={['0', '1%', '1%', '10%']}>
-      <Top />
       <Flex flexWrap="wrap" mb="50px">
         <SectionsList />
         <Results />
diff --git a/src/client/Elements/Radio.jsx b/src/client/Elements/Radio.jsx
index d1427ee..04cb361 100644
--- a/src/client/Elements/Radio.jsx
+++ b/src/client/Elements/Radio.jsx
@@ -24,29 +24,29 @@ const Radio = ({ name, style, computedValue, valueName }) => {
       disabled={status === Status.Disabled}
       buttonStyle={style === 'button' && 'solid'}
       value={value}
-      onChange={(e) => {
+      onChange={e => {
         if (e && e.target) setCurrentValue(e.target.value);
       }}
     >
       {options.map((option, i) => {
         switch (style) {
-          case 'button': {
+          case 'button':
             if (option) {
               return (
-                <AntRadio.Button value={option.value || ''}>
+                <AntRadio.Button key={i} value={option.value || ''}>
                   {option.name}
                 </AntRadio.Button>
               );
             }
-          }
+            break;
 
           default:
-            {
-              if (option)
-                return (
-                  <AntRadio value={option.value || ''}>{option.name}</AntRadio>
-                );
-            }
+            if (option)
+              return (
+                <AntRadio key={i} value={option.value || ''}>
+                  {option.name}
+                </AntRadio>
+              );
             break;
         }
       })}
diff --git a/src/client/Elements/Select.jsx b/src/client/Elements/Select.jsx
index 929ff3a..c1a506a 100644
--- a/src/client/Elements/Select.jsx
+++ b/src/client/Elements/Select.jsx
@@ -16,12 +16,12 @@ const Select = ({ disabled, name, showSearch, computedValue, valueName }) => {
 
   return (
     <AntSelect
-      disabled={disabled || status === Status.Disabled}
+      disabled={status === Status.Disabled}
       showSearch={showSearch}
       optionFilterProp="children"
       filterOption={filter}
       value={value}
-      onChange={(val) => setCurrentValue(val)}
+      onChange={val => setCurrentValue(val)}
     >
       {options.map((option, i) => {
         if (option)
diff --git a/src/core/config/initialStatuses.ts b/src/core/config/initialStatuses.ts
index e09edde..2241923 100644
--- a/src/core/config/initialStatuses.ts
+++ b/src/core/config/initialStatuses.ts
@@ -4,6 +4,10 @@ interface IInitialStatuses {
   [elementName: string]: Status;
 }
 
-const initialStatuses: IInitialStatuses = {};
+const initialStatuses: IInitialStatuses = {
+  selectIndAgent: Status.Disabled,
+  selectCalcBroker: Status.Disabled,
+  selectFinDepartment: Status.Disabled,
+};
 
 export default initialStatuses;