fix: require explicit valid seat counts

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: asizikov

src/components/SeatCountConfirmation.tsx

@@ -2,7 +2,7 @@ import { useMemo, useState } from 'react'
 import type { ChangeEvent } from 'react'
 import { PeopleIcon, ArrowRightIcon } from '@primer/octicons-react'
 import { ValidationPopover } from './InfoTip'
-import { getSeatReductionError, parseSeatCountInput } from '../utils/seatCounts'
+import { getSeatCountInputError, parseSeatCountInput } from '../utils/seatCounts'
 
 export type SeatCountConfirmationProps = {
   fileName: string | null
@@ -24,22 +24,22 @@ export function SeatCountConfirmation({
   const [businessDraft, setBusinessDraft] = useState<string>(String(defaultBusinessSeats))
   const [enterpriseDraft, setEnterpriseDraft] = useState<string>(String(defaultEnterpriseSeats))
 
-  const businessError = useMemo(() => getSeatReductionError(businessDraft, defaultBusinessSeats), [businessDraft, defaultBusinessSeats])
-  const enterpriseError = useMemo(() => getSeatReductionError(enterpriseDraft, defaultEnterpriseSeats), [enterpriseDraft, defaultEnterpriseSeats])
+  const businessError = useMemo(() => getSeatCountInputError(businessDraft, defaultBusinessSeats), [businessDraft, defaultBusinessSeats])
+  const enterpriseError = useMemo(() => getSeatCountInputError(enterpriseDraft, defaultEnterpriseSeats), [enterpriseDraft, defaultEnterpriseSeats])
   const hasError = Boolean(businessError || enterpriseError)
-  const normalizedBusinessSeats = parseSeatCountInput(businessDraft, defaultBusinessSeats)
-  const normalizedEnterpriseSeats = parseSeatCountInput(enterpriseDraft, defaultEnterpriseSeats)
-  const hasAddedSeats = normalizedBusinessSeats > defaultBusinessSeats || normalizedEnterpriseSeats > defaultEnterpriseSeats
+  const parsedBusinessSeats = parseSeatCountInput(businessDraft)
+  const parsedEnterpriseSeats = parseSeatCountInput(enterpriseDraft)
+  const hasAddedSeats = (parsedBusinessSeats ?? defaultBusinessSeats) > defaultBusinessSeats || (parsedEnterpriseSeats ?? defaultEnterpriseSeats) > defaultEnterpriseSeats
   const canApply = !hasError && !isApplying
 
   const onBusinessChange = (event: ChangeEvent<HTMLInputElement>) => setBusinessDraft(event.target.value)
   const onEnterpriseChange = (event: ChangeEvent<HTMLInputElement>) => setEnterpriseDraft(event.target.value)
 
   const handleApply = () => {
-    if (!canApply) return
+    if (!canApply || parsedBusinessSeats === null || parsedEnterpriseSeats === null) return
     onConfirm({
-      business: normalizedBusinessSeats,
-      enterprise: normalizedEnterpriseSeats,
+      business: parsedBusinessSeats,
+      enterprise: parsedEnterpriseSeats,
     })
   }
 

src/utils/seatCounts.test.ts

@@ -1,22 +1,26 @@
 import { describe, expect, it } from 'vitest'
-import { getSeatReductionError, parseSeatCountInput } from './seatCounts'
+import { getSeatCountInputError, parseSeatCountInput } from './seatCounts'
 
 describe('seat count helpers', () => {
-  it('normalizes seat count input to the historical minimum', () => {
-    expect(parseSeatCountInput('', 10)).toBe(10)
-    expect(parseSeatCountInput('  ', 10)).toBe(10)
-    expect(parseSeatCountInput(' 12.9 ', 10)).toBe(12)
-    expect(parseSeatCountInput('12.9', 10)).toBe(12)
-    expect(parseSeatCountInput('not-a-number', 10)).toBe(10)
-    expect(parseSeatCountInput('8', 10)).toBe(10)
+  it('parses only explicit whole-number seat counts', () => {
+    expect(parseSeatCountInput('10')).toBe(10)
+    expect(parseSeatCountInput(' 12 ')).toBe(12)
+    expect(parseSeatCountInput('')).toBeNull()
+    expect(parseSeatCountInput('  ')).toBeNull()
+    expect(parseSeatCountInput('12.9')).toBeNull()
+    expect(parseSeatCountInput('not-a-number')).toBeNull()
   })
 
-  it('reports only reductions below the historical count', () => {
-    expect(getSeatReductionError('', 10)).toBeNull()
-    expect(getSeatReductionError('  ', 10)).toBeNull()
-    expect(getSeatReductionError('10', 10)).toBeNull()
-    expect(getSeatReductionError(' 12 ', 10)).toBeNull()
-    expect(getSeatReductionError('12', 10)).toBeNull()
-    expect(getSeatReductionError('8', 10)).toBe('Cannot go below 10 because that count comes from historical report data.')
+  it('requires a whole-number seat count at or above the historical count', () => {
+    const invalidInputError = 'Enter a whole number greater than or equal to 10 because that count comes from historical report data.'
+
+    expect(getSeatCountInputError('', 10)).toBe(invalidInputError)
+    expect(getSeatCountInputError('  ', 10)).toBe(invalidInputError)
+    expect(getSeatCountInputError('12.9', 10)).toBe(invalidInputError)
+    expect(getSeatCountInputError('not-a-number', 10)).toBe(invalidInputError)
+    expect(getSeatCountInputError('10', 10)).toBeNull()
+    expect(getSeatCountInputError(' 12 ', 10)).toBeNull()
+    expect(getSeatCountInputError('12', 10)).toBeNull()
+    expect(getSeatCountInputError('8', 10)).toBe('Cannot go below 10 because that count comes from historical report data.')
   })
 })

src/utils/seatCounts.ts

@@ -6,19 +6,23 @@ export function normalizeSeatCount(value: number, minimum: number): number {
   return Math.max(minimum, Math.floor(value))
 }
 
-export function parseSeatCountInput(raw: string, minimum: number): number {
+export function parseSeatCountInput(raw: string): number | null {
   const trimmed = raw.trim()
-  if (trimmed === '') return minimum
+  if (trimmed === '') return null
+
+  const parsed = Number(trimmed)
+  if (!Number.isFinite(parsed) || !Number.isInteger(parsed)) return null
 
-  return normalizeSeatCount(Number(trimmed), minimum)
+  return parsed
 }
 
-export function getSeatReductionError(value: string, minimum: number): string | null {
-  const trimmed = value.trim()
-  if (trimmed === '') return null
+export function getSeatCountInputError(value: string, minimum: number): string | null {
+  const parsed = parseSeatCountInput(value)
+  if (parsed === null) {
+    return `Enter a whole number greater than or equal to ${minimum.toLocaleString()} because that count comes from historical report data.`
+  }
 
-  const parsed = Number(trimmed)
-  if (!Number.isFinite(parsed) || Math.floor(parsed) >= minimum) return null
+  if (parsed >= minimum) return null
 
   return `Cannot go below ${minimum.toLocaleString()} because that count comes from historical report data.`
 }

src/views/UsersView.tsx

@@ -11,7 +11,7 @@ import {
 import { calculateSavingsDifference } from '../utils/billingComparison'
 import { InfoTip, ValidationPopover } from '../components/InfoTip'
 import { formatAic, formatDifference } from '../utils/format'
-import { getSeatReductionError, parseSeatCountInput } from '../utils/seatCounts'
+import { getSeatCountInputError, parseSeatCountInput } from '../utils/seatCounts'
 import { Trie } from '../utils/trie'
 import { th, thBase, thNum, td, tdNum, sortBtn } from '../components/ui/tableStyles'
 
@@ -75,13 +75,15 @@ export function UsersView({ users, seatOverrides = {}, onSeatOverridesChange, on
   const savedEnterprise = seatOverrides.enterprise ?? defaultEnterprise
   const hasSavedOverride = seatOverrides.business !== undefined || seatOverrides.enterprise !== undefined
 
-  const displayBusiness = isEditing ? (draftBusiness !== '' ? parseInt(draftBusiness, 10) || 0 : savedBusiness) : savedBusiness
-  const displayEnterprise = isEditing ? (draftEnterprise !== '' ? parseInt(draftEnterprise, 10) || 0 : savedEnterprise) : savedEnterprise
+  const parsedDraftBusiness = parseSeatCountInput(draftBusiness)
+  const parsedDraftEnterprise = parseSeatCountInput(draftEnterprise)
+  const displayBusiness = isEditing ? (parsedDraftBusiness ?? savedBusiness) : savedBusiness
+  const displayEnterprise = isEditing ? (parsedDraftEnterprise ?? savedEnterprise) : savedEnterprise
   const businessSeatError = isEditing
-    ? getSeatReductionError(draftBusiness, defaultBusiness)
+    ? getSeatCountInputError(draftBusiness, defaultBusiness)
     : null
   const enterpriseSeatError = isEditing
-    ? getSeatReductionError(draftEnterprise, defaultEnterprise)
+    ? getSeatCountInputError(draftEnterprise, defaultEnterprise)
     : null
   const hasSeatValidationError = Boolean(businessSeatError || enterpriseSeatError)
 
@@ -106,13 +108,11 @@ export function UsersView({ users, seatOverrides = {}, onSeatOverridesChange, on
   }
 
   const handleSave = () => {
-    if (hasSeatValidationError) return
+    if (hasSeatValidationError || parsedDraftBusiness === null || parsedDraftEnterprise === null) return
 
-    const normalizedBusiness = parseSeatCountInput(draftBusiness, defaultBusiness)
-    const normalizedEnterprise = parseSeatCountInput(draftEnterprise, defaultEnterprise)
     const newOverrides: SeatOverrides = {}
-    if (normalizedBusiness !== defaultBusiness) newOverrides.business = normalizedBusiness
-    if (normalizedEnterprise !== defaultEnterprise) newOverrides.enterprise = normalizedEnterprise
+    if (parsedDraftBusiness !== defaultBusiness) newOverrides.business = parsedDraftBusiness
+    if (parsedDraftEnterprise !== defaultEnterprise) newOverrides.enterprise = parsedDraftEnterprise
     onSeatOverridesChange?.(newOverrides)
     setIsEditing(false)
   }