diff --git a/src/pages/Well/Telemetry/Operations/TargetEditor.jsx b/src/pages/Well/Telemetry/Operations/TargetEditor.jsx index dc1dfd1..4e83c91 100644 --- a/src/pages/Well/Telemetry/Operations/TargetEditor.jsx +++ b/src/pages/Well/Telemetry/Operations/TargetEditor.jsx @@ -4,7 +4,7 @@ import { Button, Modal } from 'antd' import { useWell } from '@asb/context' import { invokeWebApiWrapperAsync } from '@components/factory' import { EditableTable, makeGroupColumn, makeNumericColumn, makeNumericRender, makeSelectColumn } from '@components/Table' -import { DetectedOperationService, OperationValueService } from '@api' +import { OperationValueService } from '@api' import { arrayOrDefault } from '@utils' const columnOptions = { @@ -14,7 +14,7 @@ const columnOptions = { const scroll = { y: '75vh', scrollToFirstRowOnChange: true } const numericRender = makeNumericRender(2) -export const TargetEditor = memo(({ loading, onChange }) => { +export const TargetEditor = memo(({ loading, onChange, options }) => { const [targets, setTargets] = useState([]) const [showModal, setShowModal] = useState(false) const [showLoader, setShowLoader] = useState(false) @@ -62,9 +62,6 @@ export const TargetEditor = memo(({ loading, onChange }) => { useEffect(() => { invokeWebApiWrapperAsync( async () => { - const categories = arrayOrDefault(await DetectedOperationService.getCategories()) - const options = categories.map(({ id, name }) => ({ value: id, label: name })) - setTargetColumns([ makeSelectColumn('Название', 'idOperationCategory', options, undefined, { ...columnOptions, width: 200 }, { showSearch: true, diff --git a/src/pages/Well/Telemetry/Operations/index.jsx b/src/pages/Well/Telemetry/Operations/index.jsx index 3d3748e..14f4674 100644 --- a/src/pages/Well/Telemetry/Operations/index.jsx +++ b/src/pages/Well/Telemetry/Operations/index.jsx @@ -142,8 +142,8 @@ const Operations = memo(() => { )} - {permissions.detectedOperation.get && permissions.operationValue.get && ( - + {permissions.detectedOperation.get && permissions.operationValue.get && categories && ( + )}