From d40a4bf70345d2acaec2fc1f4d93d574758df23c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Thu, 20 Jan 2022 15:52:44 +0500 Subject: [PATCH 1/2] Fix admin well controller .recordParser null ref. exception --- src/pages/AdminPanel/WellController/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/AdminPanel/WellController/index.jsx b/src/pages/AdminPanel/WellController/index.jsx index bbf8199..43f8e5f 100644 --- a/src/pages/AdminPanel/WellController/index.jsx +++ b/src/pages/AdminPanel/WellController/index.jsx @@ -106,7 +106,7 @@ export const WellController = () => { const recordParser = (record) => ({ ...record, - idTelemetry: record.telemetry.id, + idTelemetry: record.telemetry?.id, }) const handlerProps = { From 54a9c6c5c54ffc3b886412abfece4c5e13cd10f7 Mon Sep 17 00:00:00 2001 From: goodm2ice Date: Tue, 25 Jan 2022 18:11:28 +0500 Subject: [PATCH 2/2] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B2=D0=B5=D0=B4=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B0=D1=89=D0=B8=D1=85?= =?UTF-8?q?=20=D1=86=D0=B8=D1=84=D1=80=20=D0=BA=D0=BE=D0=BE=D1=80=D0=B4?= =?UTF-8?q?=D0=B8=D0=BD=D0=B0=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/AdminPanel/DepositController.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/AdminPanel/DepositController.jsx b/src/pages/AdminPanel/DepositController.jsx index 0006785..69e77fe 100644 --- a/src/pages/AdminPanel/DepositController.jsx +++ b/src/pages/AdminPanel/DepositController.jsx @@ -7,7 +7,7 @@ import { AdminDepositService } from '../../services/api' import { arrayOrDefault } from '../../utils' import { min1 } from '../../utils/validationRules' -export const coordsFixed = (coords) => coords?.toPrecision(10) +export const coordsFixed = (coords) => coords && isFinite(coords) ? (+coords).toPrecision(10) : '-' const depositColumns = [ makeColumn('Название', 'caption', { width: 200, editable: true, formItemRules: min1 }),