@adcops/autocore-react 3.3.109 → 3.3.112

package/src/components/tis/ScienceTable.tsx

@@ -0,0 +1,114 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ *
+ * ScienceTable — a presentational wrapper around PrimeReact's DataTable that
+ * gives cycle-data and results tables the crisp, "instrument report" look of
+ * a materials-testing readout (à la Instron Bluehill): a dark title bar, a
+ * dark column-header band with the unit in brackets on a second line, a dark
+ * row-index column, and pale data cells with thin gridlines and centered,
+ * tabular-aligned values.
+ *
+ * Purely visual — it takes rows + a column spec and renders them; it holds no
+ * data-fetching or business logic. Styling lives in ScienceTable.css, scoped
+ * to `.p-datatable.ac-science-table` so it never leaks onto other DataTables.
+ */
+
+import React from 'react';
+import { DataTable } from 'primereact/datatable';
+import { Column } from 'primereact/column';
+import type { ColumnBodyOptions } from 'primereact/column';
+import './ScienceTable.css';
+
+export interface ScienceColumn {
+    /** Row property to read. */
+    field: string;
+    /** Header label (unit rendered separately in brackets). */
+    label: string;
+    /** Optional unit, shown as `[unit]` on a second header line. */
+    units?: string;
+    /** Cell text alignment. Default 'center' (report style). */
+    align?: 'left' | 'center' | 'right';
+    /** Optional custom cell renderer (e.g. numeric formatting). */
+    body?: (row: any) => React.ReactNode;
+    /** Optional per-column style (e.g. minWidth). */
+    style?: React.CSSProperties;
+}
+
+export interface ScienceTableProps {
+    /** Title shown in the dark bar above the table. Omit for no bar. */
+    title?: React.ReactNode;
+    columns: ScienceColumn[];
+    rows: any[];
+    /** Leading 1-based row-index column, like the Bluehill "1". Default true. */
+    showIndex?: boolean;
+    /** Header for the index column. Default "#". */
+    indexHeader?: string;
+    emptyMessage?: string;
+    /** Enable virtual scrolling; pair with `scrollHeight` for large runs. */
+    scrollable?: boolean;
+    scrollHeight?: string;
+    /** Virtual-scroll row height in px. Default 38. */
+    virtualItemSize?: number;
+}
+
+const HeaderCell: React.FC<{ column: ScienceColumn }> = ({ column }) => (
+    <div className="ac-sci-th">
+        <span className="ac-sci-th-name">{column.label}</span>
+        {column.units ? <span className="ac-sci-th-unit">[{column.units}]</span> : null}
+    </div>
+);
+
+export const ScienceTable: React.FC<ScienceTableProps> = ({
+    title,
+    columns,
+    rows,
+    showIndex = true,
+    indexHeader = '#',
+    emptyMessage = 'No data.',
+    scrollable = false,
+    scrollHeight,
+    virtualItemSize = 38,
+}) => {
+    const virtual = scrollable && !!scrollHeight;
+    return (
+        <div className="ac-science-table-wrap">
+            {title != null && <div className="ac-science-table-title">{title}</div>}
+            <div className="ac-science-table-scroll">
+                <DataTable
+                    className="ac-science-table"
+                    value={rows}
+                    scrollable={scrollable}
+                    scrollHeight={scrollHeight}
+                    virtualScrollerOptions={virtual ? { itemSize: virtualItemSize } : undefined}
+                    emptyMessage={emptyMessage}
+                >
+                    {showIndex ? (
+                        <Column
+                            header={indexHeader}
+                            headerClassName="ac-sci-index"
+                            bodyClassName="ac-sci-index"
+                            align="center"
+                            alignHeader="center"
+                            style={{ width: '3.5rem', maxWidth: '3.5rem' }}
+                            body={(_data: any, options: ColumnBodyOptions) => options.rowIndex + 1}
+                        />
+                    ) : null}
+                    {columns.map((c) => (
+                        <Column
+                            key={c.field}
+                            field={c.field}
+                            header={<HeaderCell column={c} />}
+                            align={c.align ?? 'center'}
+                            alignHeader="center"
+                            style={c.style}
+                            bodyClassName="ac-sci-cell"
+                            body={c.body ? (row: any) => c.body!(row) : undefined}
+                        />
+                    ))}
+                </DataTable>
+            </div>
+        </div>
+    );
+};
+
+export default ScienceTable;

package/src/components/tis/TestDataView.tsx

@@ -44,6 +44,8 @@ import { EventEmitterContext } from '../../core/EventEmitterContext';
 import { MessageType } from '../../hub/CommandMessage';
 import { useTis } from './TisProvider';
 import { useRawCycleData } from './useRawCycleData';
+import { ScienceTable } from './ScienceTable';
+import type { ScienceColumn } from './ScienceTable';
 
 ChartJS.register(
     CategoryScale, LinearScale, PointElement, LineElement,
@@ -733,42 +735,53 @@ export const TestDataView: React.FC<TestDataViewProps> = (props) => {
                 </div>
             </div>
 
-            <div className="p-card" style={{ padding: '1rem' }}>
-                <h3 style={{ marginTop: 0 }}>Cycle Data ({cycles.length})</h3>
-                {/* Size-to-content for small runs (≤ CYCLE_VIRTUAL_THRESHOLD
-                    rows) so the Results panel below isn't pushed off-screen
-                    on tests with one or two cycles. Larger runs flip to
-                    virtual scrolling against `cycleTableHeight` so a
-                    1000-cycle test doesn't render 1000 row elements at
-                    once. Operators on test methods that always run a
-                    fixed-size short cycle list see no scrollbar at all. */}
-                {(() => {
-                    const useVirtual = cycles.length > CYCLE_VIRTUAL_THRESHOLD;
-                    return (
-                        <DataTable
-                            value={cycles}
-                            scrollable={useVirtual}
-                            scrollHeight={useVirtual ? cycleTableHeight : undefined}
-                            virtualScrollerOptions={useVirtual ? { itemSize: 38 } : undefined}
-                            emptyMessage="No cycles yet."
-                        >
-                            {schema.cycle_fields.map(f => (
-                                <Column key={f.name} field={f.name}
-                                        header={f.units ? `${f.name} (${f.units})` : f.name}
-                                        body={(row) => formatCell(row[f.name], f.type, f.scale)} />
-                            ))}
-                        </DataTable>
-                    );
-                })()}
-            </div>
-
-            <div className="p-card" style={{ padding: '1rem' }}>
-                <h3 style={{ marginTop: 0 }}>Results</h3>
-                {/* Overlay the server-derived cross-test rollup (avg/min/max/
-                    stddev/count) onto this run's own results. Aggregate fields
-                    are never in `results` — the summary is their only source. */}
-                <ResultsGrid schema={schema.results_fields} values={{ ...results, ...sampleSummary }} />
-            </div>
+            {/* Size-to-content for small runs (≤ CYCLE_VIRTUAL_THRESHOLD
+                rows) so the Results panel below isn't pushed off-screen on
+                tests with one or two cycles. Larger runs flip to virtual
+                scrolling against `cycleTableHeight` so a 1000-cycle test
+                doesn't render 1000 row elements at once. */}
+            {(() => {
+                const useVirtual = cycles.length > CYCLE_VIRTUAL_THRESHOLD;
+                const cycleColumns: ScienceColumn[] = schema.cycle_fields.map(f => ({
+                    field: f.name,
+                    label: f.name,
+                    units: f.units,
+                    body: (row) => formatCell(row[f.name], f.type, f.scale),
+                }));
+                return (
+                    <ScienceTable
+                        title={`Cycle Data (${cycles.length})`}
+                        columns={cycleColumns}
+                        rows={cycles}
+                        scrollable={useVirtual}
+                        scrollHeight={useVirtual ? cycleTableHeight : undefined}
+                        emptyMessage="No cycles yet."
+                    />
+                );
+            })()}
+
+            {/* Overlay the server-derived cross-test rollup (avg/min/max/
+                stddev/count) onto this run's own results. Aggregate fields
+                are never in `results` — the summary is their only source.
+                Rendered as a single-row report table (Bluehill style). */}
+            {(() => {
+                const values = { ...results, ...sampleSummary };
+                const hasValues = Object.keys(values).length > 0;
+                const resultColumns: ScienceColumn[] = schema.results_fields.map(f => ({
+                    field: f.name,
+                    label: f.name,
+                    units: f.units,
+                    body: (row) => formatCell(row[f.name], f.type, f.scale),
+                }));
+                return (
+                    <ScienceTable
+                        title="Results"
+                        columns={resultColumns}
+                        rows={hasValues ? [values] : []}
+                        emptyMessage="No results yet."
+                    />
+                );
+            })()}
 
             {/*
              * View Raw Data dialog — tabular listing of the raw and
@@ -1134,24 +1147,6 @@ const formatNumeric = (v: any): string => {
     return String(v);
 };
 
-const ResultsGrid: React.FC<{ schema: TestFieldDef[]; values: any }> = ({ schema, values }) => {
-    if (!values || Object.keys(values).length === 0) {
-        return <div style={{ color: 'var(--text-secondary-color)' }}>No results yet.</div>;
-    }
-    return (
-        <div style={{ display: 'grid', gridTemplateColumns: 'repeat(auto-fill, minmax(220px, 1fr))', gap: '0.5rem 1rem' }}>
-            {schema.map(f => (
-                <div key={f.name}>
-                    <div style={{ fontSize: '0.8em', color: 'var(--text-secondary-color)' }}>
-                        {f.name}{f.units ? ` (${f.units})` : ''}
-                    </div>
-                    <div>{formatCell(values[f.name], f.type, f.scale)}</div>
-                </div>
-            ))}
-        </div>
-    );
-};
-
 /** Row count above which the Cycle Data table switches into virtual-
  *  scroll mode with a fixed `cycleTableHeight`. At or below the
  *  threshold the table sizes to its content so the Results panel

package/src/components/tis/TestSetupForm.tsx

@@ -242,8 +242,12 @@ const rangeIssue = (f: TestFieldDef, raw: any): string | null => {
     if (f.min == null && f.max == null) return null;
     const disp = Number(rawToDisplay(Number(raw), f.scale));
     if (!Number.isFinite(disp)) return null;
-    if (f.min != null && disp < f.min) return `must be ≥ ${f.min}`;
-    if (f.max != null && disp > f.max) return `must be ≤ ${f.max}`;
+    // Bounds form an unordered interval — an author may write the range in
+    // magnitude order (min:-50, max:-1000), which is numerically inverted.
+    const lo = f.min != null && f.max != null ? Math.min(f.min, f.max) : f.min;
+    const hi = f.min != null && f.max != null ? Math.max(f.min, f.max) : f.max;
+    if (lo != null && disp < lo) return `must be ≥ ${lo}`;
+    if (hi != null && disp > hi) return `must be ≤ ${hi}`;
     return null;
 };
 

package/dist/assets/JogXNeg.d.ts

@@ -1,4 +0,0 @@
-import type { SVGProps } from "react";
-export declare const SvgJogXNeg: (props: SVGProps<SVGSVGElement>) => import("react/jsx-runtime").JSX.Element;
-export default SvgJogXNeg;
-//# sourceMappingURL=JogXNeg.d.ts.map

package/dist/assets/JogXNeg.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JogXNeg.d.ts","sourceRoot":"","sources":["../../src/assets/JogXNeg.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEtC,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,CAAC,aAAa,CAAC,4CAkBxD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/assets/JogXNeg.js

@@ -1 +0,0 @@
-import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";export const SvgJogXNeg=o=>_jsxs("svg",{xmlns:"http://www.w3.org/2000/svg",width:"24",height:"24",viewBox:"0 0 24 24",fill:"none",stroke:"currentColor",strokeWidth:"2",strokeLinecap:"round",strokeLinejoin:"round",...o,children:[_jsx("path",{d:"M10 6 3 12 10 18Z",fill:"currentColor"}),_jsx("path",{d:"M14 6l8 12M22 6l-8 12"})]});export default SvgJogXNeg;

package/dist/assets/JogXPos.d.ts

@@ -1,4 +0,0 @@
-import type { SVGProps } from "react";
-export declare const SvgJogXPos: (props: SVGProps<SVGSVGElement>) => import("react/jsx-runtime").JSX.Element;
-export default SvgJogXPos;
-//# sourceMappingURL=JogXPos.d.ts.map

package/dist/assets/JogXPos.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JogXPos.d.ts","sourceRoot":"","sources":["../../src/assets/JogXPos.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEtC,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,CAAC,aAAa,CAAC,4CAkBxD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/assets/JogXPos.js

@@ -1 +0,0 @@
-import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";export const SvgJogXPos=o=>_jsxs("svg",{xmlns:"http://www.w3.org/2000/svg",width:"24",height:"24",viewBox:"0 0 24 24",fill:"none",stroke:"currentColor",strokeWidth:"2",strokeLinecap:"round",strokeLinejoin:"round",...o,children:[_jsx("path",{d:"M2 6l8 12M10 6l-8 12"}),_jsx("path",{d:"M14 6 21 12 14 18Z",fill:"currentColor"})]});export default SvgJogXPos;

package/dist/assets/JogYNeg.d.ts

@@ -1,4 +0,0 @@
-import type { SVGProps } from "react";
-export declare const SvgJogYPos: (props: SVGProps<SVGSVGElement>) => import("react/jsx-runtime").JSX.Element;
-export default SvgJogYPos;
-//# sourceMappingURL=JogYNeg.d.ts.map

package/dist/assets/JogYNeg.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JogYNeg.d.ts","sourceRoot":"","sources":["../../src/assets/JogYNeg.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEtC,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,CAAC,aAAa,CAAC,4CAkBxD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/assets/JogYNeg.js

@@ -1 +0,0 @@
-import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";export const SvgJogYPos=o=>_jsxs("svg",{xmlns:"http://www.w3.org/2000/svg",width:"24",height:"24",viewBox:"0 0 24 24",fill:"none",stroke:"currentColor",strokeWidth:"2",strokeLinecap:"round",strokeLinejoin:"round",...o,children:[_jsx("path",{d:"M21 3 21 11 13 3Z",fill:"currentColor"}),_jsx("path",{d:"M4 12l3 4 3-4M7 16v5"})]});export default SvgJogYPos;

package/dist/assets/JogYPos.d.ts

@@ -1,4 +0,0 @@
-import type { SVGProps } from "react";
-export declare const SvgJogYNeg: (props: SVGProps<SVGSVGElement>) => import("react/jsx-runtime").JSX.Element;
-export default SvgJogYNeg;
-//# sourceMappingURL=JogYPos.d.ts.map

package/dist/assets/JogYPos.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"JogYPos.d.ts","sourceRoot":"","sources":["../../src/assets/JogYPos.tsx"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEtC,eAAO,MAAM,UAAU,GAAI,OAAO,QAAQ,CAAC,aAAa,CAAC,4CAkBxD,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/dist/assets/JogYPos.js

@@ -1 +0,0 @@
-import{jsx as _jsx,jsxs as _jsxs}from"react/jsx-runtime";export const SvgJogYNeg=o=>_jsxs("svg",{xmlns:"http://www.w3.org/2000/svg",width:"24",height:"24",viewBox:"0 0 24 24",fill:"none",stroke:"currentColor",strokeWidth:"2",strokeLinecap:"round",strokeLinejoin:"round",...o,children:[_jsx("path",{d:"M20 3l-3 4-3-4M17 7v5"}),_jsx("path",{d:"M3 21 3 13 11 21Z",fill:"currentColor"})]});export default SvgJogYNeg;