From 5ce1a2928e26bbd5a52496be3d34ccdcc8def857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Padez?= Date: Sun, 23 Aug 2026 04:10:33 +0000 Subject: [PATCH] inputs and data views keyed: search, select, tabs, state blocks, data table The DataTable's pagination carries the only interpolated strings in this area ('Showing page {{current}} of {{total}}', '{{size}} / page'). No plural forms: nothing here is a count-varying noun, so inventing one would only add a key nobody uses. DataTable.test.tsx now renders inside an I18nProvider with the real en-GB catalog, so it still asserts the English a user sees rather than a dot-path. Left/right utilities became logical (ms-/me-/ps-/pe-/start-) per D3. --- src/workspaces/components/Data/StateBlock.tsx | 16 +++-- .../components/DataTable/DataTable.test.tsx | 72 +++++++++++-------- .../components/DataTable/DataTable.tsx | 6 +- .../components/DataTable/PaginationBar.tsx | 24 ++++--- src/workspaces/components/SearchInput.tsx | 18 ++--- src/workspaces/components/Select.tsx | 4 +- src/workspaces/components/Tabs/Tabs.tsx | 4 +- 7 files changed, 86 insertions(+), 58 deletions(-) diff --git a/src/workspaces/components/Data/StateBlock.tsx b/src/workspaces/components/Data/StateBlock.tsx index 9f6869d7..ffa15e3f 100644 --- a/src/workspaces/components/Data/StateBlock.tsx +++ b/src/workspaces/components/Data/StateBlock.tsx @@ -2,6 +2,7 @@ import type { LucideIcon } from 'lucide-react'; import type { ReactNode } from 'react'; import { Loader2, TriangleAlert } from 'lucide-react'; import { cn } from 'helpers/cn'; +import { useTranslation } from '@/components/locales'; // Loading, failed, empty. See docs/design-language-interface.md § 6. // @@ -19,12 +20,15 @@ const Shell = ({ children, className }: { children: ReactNode; className?: strin ); -export const LoadingBlock = ({ label = 'Loading…' }: { label?: string }) => ( - - -

{label}

-
-); +export const LoadingBlock = ({ label }: { label?: string }) => { + const { t } = useTranslation(); + return ( + + +

{label ?? t('state.loading')}

+
+ ); +}; /** * The real message is shown, not a friendly substitute for it. On a self-hosted platform the person diff --git a/src/workspaces/components/DataTable/DataTable.test.tsx b/src/workspaces/components/DataTable/DataTable.test.tsx index e73bb808..d193832b 100644 --- a/src/workspaces/components/DataTable/DataTable.test.tsx +++ b/src/workspaces/components/DataTable/DataTable.test.tsx @@ -1,7 +1,21 @@ import type { Column } from './DataTable'; +import type { ReactNode } from 'react'; import { describe, expect, test } from 'bun:test'; import { render, screen, fireEvent, within } from '@testing-library/react'; +import { I18nProvider } from 'i18n'; import { DataTable, useDataControl } from './DataTable'; +import enGB from '../locales/en-GB.json'; + +/** + * The table's own chrome ("Next", "No Data Found.") comes from the `ui.*` catalog now, so these + * assertions only hold inside a provider — the same one the app mounts. Asserting the English a user + * actually sees, rather than a key, is the point of wrapping rather than loosening the expectations. + */ +const withI18n = (ui: ReactNode) => ( + + {ui} + +); type TestItem = { id: number; @@ -55,7 +69,7 @@ const TestWrapper = ({ describe('DataTable', () => { describe('rendering', () => { test('renders table with data', () => { - render(); + render(withI18n()); expect(screen.getByRole('table')).toBeDefined(); expect(screen.getByText('Alpha')).toBeDefined(); @@ -63,7 +77,7 @@ describe('DataTable', () => { }); test('renders column headers', () => { - render(); + render(withI18n()); // Component renders both desktop and mobile versions (hidden via CSS) // so we use getAllByText and verify at least one exists @@ -74,7 +88,7 @@ describe('DataTable', () => { }); test('renders correct number of rows based on page size', () => { - render(); + render(withI18n()); const rows = screen.getAllByRole('row'); // 1 header row + 3 data rows @@ -82,20 +96,20 @@ describe('DataTable', () => { }); test('shows no data message when data is empty', () => { - render(); + render(withI18n()); expect(screen.getByText('No items found')).toBeDefined(); expect(screen.queryByRole('table')).toBeNull(); }); test('shows default no data message', () => { - render(); + render(withI18n()); expect(screen.getByText('No Data Found.')).toBeDefined(); }); test('renders noDataCTA when provided', () => { - render(Add Item} />); + render(withI18n(Add Item} />)); expect(screen.getByRole('button', { name: 'Add Item' })).toBeDefined(); }); @@ -106,7 +120,7 @@ describe('DataTable', () => { return ; }; - const { container } = render(); + const { container } = render(withI18n()); expect(container.innerHTML).toBe(''); }); }); @@ -118,7 +132,7 @@ describe('DataTable', () => { return ; }; - render(); + render(withI18n()); // Should generate columns from object keys (rendered for both mobile/desktop) expect(screen.getAllByText('Id').length).toBeGreaterThan(0); @@ -130,7 +144,7 @@ describe('DataTable', () => { describe('sorting', () => { test('clicking sortable column header triggers sort', () => { - render(); + render(withI18n()); // Get the first "Name" element (desktop version) const nameHeaders = screen.getAllByText('Name'); @@ -143,7 +157,7 @@ describe('DataTable', () => { }); test('clicking same column twice reverses sort order', () => { - render(); + render(withI18n()); const nameHeaders = screen.getAllByText('Name'); fireEvent.click(nameHeaders[0]!); // asc @@ -156,7 +170,7 @@ describe('DataTable', () => { }); test('sort icon is displayed for sortable columns', () => { - render(); + render(withI18n()); // Each sortable column should have the ArrowUpDown icon const headers = screen.getAllByRole('columnheader'); @@ -169,19 +183,19 @@ describe('DataTable', () => { describe('pagination', () => { test('shows pagination bar when data exceeds page size', () => { - render(); + render(withI18n()); expect(screen.getByText(/Showing page 1 of 2/)).toBeDefined(); }); test('does not show pagination when all data fits on one page', () => { - render(); + render(withI18n()); expect(screen.queryByText(/Showing page/)).toBeNull(); }); test('next button navigates to next page', () => { - render(); + render(withI18n()); const nextButton = screen.getByRole('button', { name: 'Next' }); fireEvent.click(nextButton); @@ -192,7 +206,7 @@ describe('DataTable', () => { }); test('previous button navigates to previous page', () => { - render(); + render(withI18n()); const nextButton = screen.getByRole('button', { name: 'Next' }); fireEvent.click(nextButton); @@ -205,7 +219,7 @@ describe('DataTable', () => { }); test('first button goes to first page', () => { - render(); + render(withI18n()); const nextButton = screen.getByRole('button', { name: 'Next' }); fireEvent.click(nextButton); @@ -217,7 +231,7 @@ describe('DataTable', () => { }); test('last button goes to last page', () => { - render(); + render(withI18n()); const lastButton = screen.getByRole('button', { name: 'Last' }); fireEvent.click(lastButton); @@ -226,7 +240,7 @@ describe('DataTable', () => { }); test('navigation buttons are disabled at boundaries', () => { - render(); + render(withI18n()); const firstBtn = screen.getByRole('button', { name: 'First' }); const prevBtn = screen.getByRole('button', { name: 'Prev' }); @@ -258,7 +272,7 @@ describe('DataTable', () => { { field: 'status', label: 'Status', condition: false }, ]; - render(); + render(withI18n()); expect(screen.getAllByText('ID').length).toBeGreaterThan(0); expect(screen.getAllByText('Name').length).toBeGreaterThan(0); @@ -271,7 +285,7 @@ describe('DataTable', () => { { field: 'status', label: 'Status', condition: true }, ]; - render(); + render(withI18n()); expect(screen.getAllByText('Status').length).toBeGreaterThan(0); }); @@ -283,11 +297,11 @@ describe('DataTable', () => { { field: 'status', label: 'Status', condition: () => showStatus }, ]; - const { rerender } = render(); + const { rerender } = render(withI18n()); expect(screen.queryByText('Status')).toBeNull(); showStatus = true; - rerender(); + rerender(withI18n()); expect(screen.getAllByText('Status').length).toBeGreaterThan(0); }); }); @@ -303,7 +317,7 @@ describe('DataTable', () => { }, ]; - render(); + render(withI18n()); const formattedNames = screen.getAllByTestId('formatted-name'); expect(formattedNames.length).toBeGreaterThan(0); @@ -319,7 +333,7 @@ describe('DataTable', () => { }, ]; - render(); + render(withI18n()); // Each row should have a unique test ID based on item.id expect(screen.getByTestId('item-1')).toBeDefined(); @@ -337,7 +351,7 @@ describe('DataTable', () => { }, ]; - render(); + render(withI18n()); expect(screen.getByTestId('action-1')).toBeDefined(); expect(screen.getByText('Edit Alpha')).toBeDefined(); @@ -351,7 +365,7 @@ describe('DataTable', () => { { field: 'name', label: 'Name' }, ]; - render(); + render(withI18n()); // The tooltip indicator (ⓘ) should be present in the ID column headers const idHeaders = screen.getAllByText(/ID/); @@ -367,7 +381,7 @@ describe('DataTable', () => { { field: 'name', label: 'Full Name', labelMobile: 'Name' }, ]; - render(); + render(withI18n()); // Both desktop and mobile labels should be in the DOM (hidden/shown via CSS) expect(screen.getAllByText('Identifier').length).toBeGreaterThan(0); @@ -396,7 +410,7 @@ describe('DataTable', () => { ); }; - render(); + render(withI18n()); const searchInput = screen.getByTestId('search-input'); fireEvent.change(searchInput, { target: { value: 'Alpha' } }); @@ -420,7 +434,7 @@ describe('DataTable', () => { ); }; - render(); + render(withI18n()); fireEvent.click(screen.getByTestId('sort-btn')); diff --git a/src/workspaces/components/DataTable/DataTable.tsx b/src/workspaces/components/DataTable/DataTable.tsx index d2e49a7f..e7c6d194 100644 --- a/src/workspaces/components/DataTable/DataTable.tsx +++ b/src/workspaces/components/DataTable/DataTable.tsx @@ -6,8 +6,10 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp import { useDataControl, type UseDataControlReturn } from 'hooks/useDataControl'; import { PaginationBar } from './PaginationBar'; import { cn } from 'helpers/cn'; +import { useTranslation } from '@/components/locales'; export const DataTable = (props: DataTableProps) => { + const { t } = useTranslation(); const [columns, setColumns] = useState[]>([]); const { dataController, uniqueKey, noDataCTA, noDataMessage } = props; const theUniqueKey = uniqueKey || 'id'; @@ -58,7 +60,7 @@ export const DataTable = (props: DataTableProps) => { if (rawData.length === 0) { return (
-
{noDataMessage || 'No Data Found.'}
+
{noDataMessage || t('dataTable.empty')}
{noDataCTA && <>{noDataCTA}}
); @@ -94,7 +96,7 @@ export const DataTable = (props: DataTableProps) => { {String(labelMobile || label || field || '')} {tooltip ? ⓘ : ''} - {sortKey && } + {sortKey && } {tooltip && ( diff --git a/src/workspaces/components/DataTable/PaginationBar.tsx b/src/workspaces/components/DataTable/PaginationBar.tsx index dea7abd7..2fb009f1 100644 --- a/src/workspaces/components/DataTable/PaginationBar.tsx +++ b/src/workspaces/components/DataTable/PaginationBar.tsx @@ -3,12 +3,14 @@ import type { UseDataControlReturn } from 'hooks/useDataControl'; import { useMemo } from 'react'; import { Button } from '@/components/ui/button'; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; +import { useTranslation } from '@/components/locales'; type PaginationBarProps = { dataManager: UseDataControlReturn; }; export const PaginationBar = (props: PaginationBarProps) => { + const { t } = useTranslation(); const { currentPage, pageCount, changePage, pageSize, setPageSize } = props.dataManager; const pageSizeOptions = useMemo(() => [5, 10, 15, 20], []); @@ -28,10 +30,10 @@ export const PaginationBar = (props: PaginationBarProps) => { {/* LEFT */}
- Showing page {currentPage} of {pageCount} + {t('dataTable.pagination.showingPage', { current: currentPage, total: pageCount })} - p {currentPage}/{pageCount} + {t('dataTable.pagination.showingPageShort', { current: currentPage, total: pageCount })}
diff --git a/src/workspaces/components/Select.tsx b/src/workspaces/components/Select.tsx index 928d7712..77541247 100644 --- a/src/workspaces/components/Select.tsx +++ b/src/workspaces/components/Select.tsx @@ -1,10 +1,12 @@ import { Select as ShadSelect, SelectContent, SelectGroup } from '@/components/ui/select'; import { SelectItem, SelectLabel, SelectTrigger, SelectValue } from '@/components/ui/select'; import { cn } from 'helpers/cn'; +import { useTranslation } from '@/components/locales'; export const Select = (props: SelectProps) => { + const { t } = useTranslation(); const { options, value, onChange, onValueChange, label } = props; - const { name = '', className, placeholder = 'Select...', update } = props; + const { name = '', className, placeholder = t('select.placeholder'), update } = props; if (!options) return null; diff --git a/src/workspaces/components/Tabs/Tabs.tsx b/src/workspaces/components/Tabs/Tabs.tsx index 89961211..64a7f407 100644 --- a/src/workspaces/components/Tabs/Tabs.tsx +++ b/src/workspaces/components/Tabs/Tabs.tsx @@ -1,6 +1,7 @@ import { useRef } from 'react'; import { Select, SelectTrigger, SelectValue, SelectContent, SelectItem } from '@/components/ui/select'; import { Tabs, TabsList, TabsTrigger } from '@/components/ui/tabs'; +import { useTranslation } from '@/components/locales'; type TabsProps = { tabList: { value: string; label: string }[]; @@ -8,6 +9,7 @@ type TabsProps = { setActiveTab: (tab: string) => void; }; const TabsComponent = (props: TabsProps) => { + const { t } = useTranslation(); const { tabList, activeTab, setActiveTab } = props; const tabsListRef = useRef(null); return ( @@ -38,7 +40,7 @@ const TabsComponent = (props: TabsProps) => {