From 983155e0fabe94fc2c982dcfda033bc4c12cbcec Mon Sep 17 00:00:00 2001 From: ts_salikhov Date: Fri, 12 Aug 2022 16:18:04 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WellCompositeEditor/WellCompositeSections.jsx | 2 +- src/pages/Cluster/ClusterWells.jsx | 2 +- src/pages/Cluster/CompaniesTable.jsx | 13 ++++++------- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx index d0a07ef..12d819b 100644 --- a/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx +++ b/src/pages/Analytics/WellCompositeEditor/WellCompositeSections.jsx @@ -20,7 +20,7 @@ import { import Tvd from '@pages/WellOperations/Tvd' import WellOperationsTable from '@pages/Cluster/WellOperationsTable' import NewParamsTable from './NewParamsTable' -import CompaniesTable from "@pages/Cluster/CompaniesTable"; +import CompaniesTable from '@pages/Cluster/CompaniesTable' const filtersMinMax = [ { text: 'min', value: 'min' }, diff --git a/src/pages/Cluster/ClusterWells.jsx b/src/pages/Cluster/ClusterWells.jsx index a824372..bdafb5e 100755 --- a/src/pages/Cluster/ClusterWells.jsx +++ b/src/pages/Cluster/ClusterWells.jsx @@ -27,7 +27,7 @@ import { import Tvd from '@pages/WellOperations/Tvd' import WellOperationsTable from './WellOperationsTable' -import CompaniesTable from "@pages/Cluster/CompaniesTable"; +import CompaniesTable from '@pages/Cluster/CompaniesTable' const filtersMinMax = [ { text: 'min', value: 'min' }, diff --git a/src/pages/Cluster/CompaniesTable.jsx b/src/pages/Cluster/CompaniesTable.jsx index 1d24e13..bc27a1f 100644 --- a/src/pages/Cluster/CompaniesTable.jsx +++ b/src/pages/Cluster/CompaniesTable.jsx @@ -1,8 +1,7 @@ import React, { memo, useMemo } from 'react' -import { Table } from 'antd' import { BankOutlined } from '@ant-design/icons' -import { makeTextColumn } from '@components/Table' +import { makeTextColumn, Table } from '@components/Table' const columns = [ makeTextColumn('', 'logo'), @@ -13,10 +12,10 @@ const columns = [ const CompaniesTable = memo(({companies}) => { const dataCompanies = useMemo(() => companies?.map((company) => ({ key: company.id, - logo: , + logo: companies?.logo ? : , caption: company.caption, companyTypeCaption: company.companyTypeCaption, - })), [companies]); + })), [companies]) return ( { pagination={{ defaultPageSize: 10 }} tableName={'well_operations'} /> - ); -}); + ) +}) -export default CompaniesTable; \ No newline at end of file +export default CompaniesTable \ No newline at end of file