diff --git a/web/src/pages/SvodPage/SummaryTable.jsx b/web/src/pages/SvodPage/SummaryTable.jsx index eb41a65..d50dc2c 100644 --- a/web/src/pages/SvodPage/SummaryTable.jsx +++ b/web/src/pages/SvodPage/SummaryTable.jsx @@ -5,6 +5,7 @@ import useDenomination from '../../components/common/useDenomination'; import { blueColumn, greenColumn, orangeColumn } from '../../components/RealtimeTable/constants/columnColors'; import { sectionCodeColor } from '../../components/RealtimeTable/constants/columnConfig'; import { buildRowHierarchy } from '../../components/RealtimeTable/utils/rowUtils'; +import { formatSummaryAmount } from './summaryFormat'; const tableSize = (rem) => rem * 16; const ROW_VIRTUALIZER_OPTIONS = { @@ -68,11 +69,10 @@ const scaleColumns = (columns, divisor) => columns.map((column) => { ...(children ? { columns: children } : {}), ...(isAmount ? { Cell: ({ cell }) => { const value = cell.getValue(); + const formatted = formatSummaryAmount(value, divisor); + if (formatted !== null) return formatted; if (value === null || value === undefined || value === '') return originalCell ? originalCell({ cell }) : '—'; - const numeric = Number(value); - if (!Number.isFinite(numeric)) return originalCell ? originalCell({ cell }) : value; - if (numeric === 0) return '-'; - return new Intl.NumberFormat('ru-RU', { maximumFractionDigits: 2 }).format(numeric / divisor); + return originalCell ? originalCell({ cell }) : value; } } : {}), }; }); diff --git a/web/src/pages/SvodPage/summaryFormat.js b/web/src/pages/SvodPage/summaryFormat.js new file mode 100644 index 0000000..989d8bb --- /dev/null +++ b/web/src/pages/SvodPage/summaryFormat.js @@ -0,0 +1,10 @@ +const amountFormatter = new Intl.NumberFormat('ru-RU', { maximumFractionDigits: 2 }); + +// Возвращает null, если значение не число: вызывающий отдаёт исходное значение. +export const formatSummaryAmount = (value, divisor) => { + if (value === null || value === undefined || value === '') return null; + const numeric = Number(value); + if (!Number.isFinite(numeric)) return null; + if (numeric === 0) return '-'; + return amountFormatter.format(numeric / divisor); +}; diff --git a/web/src/pages/SvodPage/summaryFormat.test.js b/web/src/pages/SvodPage/summaryFormat.test.js new file mode 100644 index 0000000..075ddd1 --- /dev/null +++ b/web/src/pages/SvodPage/summaryFormat.test.js @@ -0,0 +1,37 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; + +const NBSP = ' '; + +test('formatSummaryAmount: форматирование и делители', async () => { + const { formatSummaryAmount } = await import('./summaryFormat.js'); + assert.equal(formatSummaryAmount(0, 1), '-'); + assert.equal(formatSummaryAmount('0', 1000), '-'); + assert.equal(formatSummaryAmount(1234.567, 1), `1${NBSP}234,57`); + assert.equal(formatSummaryAmount(5_000_000, 1000), `5${NBSP}000`); + assert.equal(formatSummaryAmount(5_000_000, 1e6), '5'); + assert.equal(formatSummaryAmount('1500', 1), `1${NBSP}500`); +}); + +test('formatSummaryAmount: нечисловые значения возвращают null', async () => { + const { formatSummaryAmount } = await import('./summaryFormat.js'); + for (const v of [null, undefined, '', 'abc', Number.NaN, Number.POSITIVE_INFINITY]) { + assert.equal(formatSummaryAmount(v, 1), null); + } +}); + +test('Intl.NumberFormat создаётся один раз на модуль', async () => { + const Original = Intl.NumberFormat; + let created = 0; + Intl.NumberFormat = function CountingNumberFormat(...args) { + created += 1; + return new Original(...args); + }; + try { + const { formatSummaryAmount } = await import('./summaryFormat.js?fresh'); + for (let i = 1; i <= 50; i += 1) formatSummaryAmount(i * 100, 1000); + assert.equal(created, 1); + } finally { + Intl.NumberFormat = Original; + } +});