@adcops/autocore-react 3.3.87 → 3.3.90

package/src/assets/AxisZ.tsx

@@ -1,32 +1,32 @@
-/*
- * Copyright (C) 2025 Automated Design Corp. All Rights Reserved.
- * Created Date: 2025-08-28 11:28:14
- * -----
- * Last Modified: 2025-08-28 11:39:53
- * -----
- * 
- */
-
-import type { SVGProps } from "react";
-
-export const SvgAxisZ = (props: SVGProps<SVGSVGElement>) => (
-  <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"
-    {...props}
-  >
-    {/* Bi-directional vertical arrow */}
-    <path d="M18 2v20M15 5l3-3 3 3M15 19l3 3 3-3" />
-    {/* Letter Z */}
-    <path d="M1 4h10l-10 15h10" />
-  </svg>
-);
-
+/*
+ * Copyright (C) 2025 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2025-08-28 11:28:14
+ * -----
+ * Last Modified: 2025-08-28 11:39:53
+ * -----
+ * 
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgAxisZ = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Bi-directional vertical arrow */}
+    <path d="M18 4v16M14 8l4-4 4 4M14 16l4 4 4-4" />
+    {/* Larger Letter Z */}
+    <path d="M2 10h6l-6 6h6" />
+  </svg>
+);
+
 export default SvgAxisZ;

package/src/assets/JogXNeg.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogXNeg = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Triangle pointing left (X negative) */}
+    <path d="M10 6 3 12 10 18Z" fill="currentColor" />
+    {/* Letter X */}
+    <path d="M14 6l8 12M22 6l-8 12" />
+  </svg>
+);
+
+export default SvgJogXNeg;

package/src/assets/JogXPos.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogXPos = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Letter X */}
+    <path d="M2 6l8 12M10 6l-8 12" />
+    {/* Triangle pointing right (X positive) */}
+    <path d="M14 6 21 12 14 18Z" fill="currentColor" />
+  </svg>
+);
+
+export default SvgJogXPos;

package/src/assets/JogYNeg.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogYPos = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Triangle pointing toward the upper-right corner (Y positive, into the mill) */}
+    <path d="M21 3 21 11 13 3Z" fill="currentColor" />
+    {/* Letter Y (lower-left) */}
+    <path d="M4 12l3 4 3-4M7 16v5" />
+  </svg>
+);
+
+export default SvgJogYPos;

package/src/assets/JogYPos.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogYNeg = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Letter Y (upper-right) */}
+    <path d="M20 3l-3 4-3-4M17 7v5" />
+    {/* Triangle pointing toward the lower-left corner (Y negative, out of the mill) */}
+    <path d="M3 21 3 13 11 21Z" fill="currentColor" />
+  </svg>
+);
+
+export default SvgJogYNeg;

package/src/assets/JogZNeg.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogZNeg = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Letter Z */}
+    <path d="M6 2h12L6 10h12" />
+    {/* Triangle pointing down (Z negative) */}
+    <path d="M5 14h14l-7 7Z" fill="currentColor" />
+  </svg>
+);
+
+export default SvgJogZNeg;

package/src/assets/JogZPos.tsx

@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const SvgJogZPos = (props: SVGProps<SVGSVGElement>) => (
+  <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"
+    {...props}
+  >
+    {/* Triangle pointing up (Z positive) */}
+    <path d="M5 10 12 3 19 10Z" fill="currentColor" />
+    {/* Letter Z */}
+    <path d="M6 14h12L6 22h12" />
+  </svg>
+);
+
+export default SvgJogZPos;

package/src/assets/Off.tsx

@@ -0,0 +1,14 @@
+import type { SVGProps } from "react";
+
+export const Off = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    viewBox="0 0 354.487 354.487"
+    fill="currentColor"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path d="M177.241,0C79.504,0,0,79.51,0,177.241c0,97.736,79.51,177.246,177.241,177.246c97.731,0,177.246-79.516,177.246-177.246 C354.487,79.504,274.979,0,177.241,0z M177.241,311.444c-73.994,0-134.198-60.203-134.198-134.203 c0-73.995,60.204-134.199,134.198-134.199c74,0,134.204,60.204,134.204,134.199C311.445,251.241,251.241,311.444,177.241,311.444z" />
+  </svg>
+);
+
+export default Off;

package/src/assets/On.tsx

@@ -0,0 +1,26 @@
+/*
+ * Copyright (C) 2026 Automated Design Corp. All Rights Reserved.
+ * Created Date: 2026-06-02
+ * -----
+ *
+ */
+
+import type { SVGProps } from "react";
+
+export const On = (props: SVGProps<SVGSVGElement>) => (
+  <svg
+    viewBox="0 0 72 72"
+    fill="none"
+    xmlns="http://www.w3.org/2000/svg"
+    {...props}
+  >
+    <path
+      d="M36 16L36 56"
+      stroke="currentColor"
+      strokeLinecap="round"
+      strokeWidth={3.6}
+    />
+  </svg>
+);
+
+export default On;

package/src/assets/index.ts

@@ -3,6 +3,12 @@ export { default as Distance } from "./Distance";
 export { default as JogLong } from "./JogLong";
 export { default as JogMedium } from "./JogMedium";
 export { default as JogShort } from "./JogShort";
+export { default as JogXPos } from "./JogXPos";
+export { default as JogXNeg } from "./JogXNeg";
+export { default as JogYPos } from "./JogYPos";
+export { default as JogYNeg } from "./JogYNeg";
+export { default as JogZPos } from "./JogZPos";
+export { default as JogZNeg } from "./JogZNeg";
 export { default as PythonLogo } from "./PythonLogo";
 export { default as Rotation3D } from "./Rotation3D";
 export { default as RotationCcw } from "./RotationCcw";

package/src/assets/svg/off.svg

@@ -0,0 +1,2 @@
+<svg fill="#000000" version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg"
+    xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 354.487 354.487" xml:space="preserve"><g id="SVGRepo_bgCarrier" stroke-width="0"></g><g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round"></g><g id="SVGRepo_iconCarrier"> <g> <path d="M177.241,0C79.504,0,0,79.51,0,177.241c0,97.736,79.51,177.246,177.241,177.246c97.731,0,177.246-79.516,177.246-177.246 C354.487,79.504,274.979,0,177.241,0z M177.241,311.444c-73.994,0-134.198-60.203-134.198-134.203 c0-73.995,60.204-134.199,134.198-134.199c74,0,134.204,60.204,134.204,134.199C311.445,251.241,251.241,311.444,177.241,311.444z"></path> </g> </g></svg>

package/src/assets/svg/on.svg

@@ -0,0 +1,11 @@
+<svg viewBox="0 0 72 72" id="emoji" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g id="SVGRepo_bgCarrier" stroke-width="0"></g>
+    <g id="SVGRepo_tracerCarrier" stroke-linecap="round" stroke-linejoin="round" stroke="#CCCCCC"
+        stroke-width="0.43200000000000005"></g>
+    <g id="SVGRepo_iconCarrier">
+        <g id="color"></g>
+        <g id="line">
+            <path stroke="#000000" stroke-linecap="round" stroke-width="3.6" d="M36 16L36 56"></path>
+        </g>
+    </g>
+</svg>

package/src/components/JogPanel.tsx

@@ -19,6 +19,7 @@ import { Distance, JogShort, JogMedium, JogLong } from '../assets';
 import { Speed, SpeedSlow, SpeedMedium, SpeedFast } from '../assets';
 import { RotationCcwA, RotationCcwB, RotationCcwC } from '../assets';
 import { RotationCwA, RotationCwB, RotationCwC  } from '../assets';
+import { JogXPos, JogXNeg, JogYPos, JogYNeg, JogZPos, JogZNeg } from '../assets';
 
 /**
  * Enumerates the source button or action when an event occurs.
@@ -125,9 +126,9 @@ interface JogPanelState {
  * A default jog button configuration for linear 3D motion.
  */
 export const DefaultLinearJogButtons : (JogPanelButtonDefinition | undefined)[][] = [
-    [{ icon: "pi pi-arrow-up-left", action: JogPanelAction.yPositive, alt: "Y Positive" }, { icon: "pi pi-arrow-up", action: JogPanelAction.zPositive, alt: "Z Positive" }, undefined],
+    [undefined, { icon: "pi pi-arrow-up", action: JogPanelAction.zPositive, alt: "Z Positive" }, { icon: "pi pi-arrow-down-left", action: JogPanelAction.yNegative, alt: "Y Negative" }],
     [{ icon: "pi pi-arrow-left", action: JogPanelAction.xNegative, alt: "X Negative" }, undefined, { icon: "pi pi-arrow-right", action: JogPanelAction.xPositive, alt: "X Positive" }],
-    [undefined, { icon: "pi pi-arrow-down", action: JogPanelAction.zNegative, alt: "Z Negative" }, { icon: "pi pi-arrow-down-right", action: JogPanelAction.yNegative, alt: "Y Negative" }],
+    [{ icon: "pi pi-arrow-up-right", action: JogPanelAction.yPositive, alt: "Y Positive" }, { icon: "pi pi-arrow-down", action: JogPanelAction.zNegative, alt: "Z Negative" }, undefined],
 ];
 
 /**
@@ -156,9 +157,9 @@ export const DefaultRotationJogButtons : (JogPanelButtonDefinition | undefined)[
  * Example:
  * ```
  * export const kDefaultButtonDefinitions : (JogPanelButtonDefinition | undefined)[][] = [
- *    [{ icon: "pi pi-arrow-up-left", action: JogPanelAction.yPositive, alt: "Y Positive" }, { icon: "pi pi-arrow-up", action: JogPanelAction.zPositive, alt: "Z Positive" }, undefined],
+ *    [undefined, { icon: "pi pi-arrow-up", action: JogPanelAction.zPositive, alt: "Z Positive" }, { icon: "pi pi-arrow-down-left", action: JogPanelAction.yNegative, alt: "Y Negative" }],
  *    [{ icon: "pi pi-arrow-left", action: JogPanelAction.xNegative, alt: "X Negative" }, undefined, { icon: "pi pi-arrow-right", action: JogPanelAction.xPositive, alt: "X Positive" }],
- *    [undefined, { icon: "pi pi-arrow-down", action: JogPanelAction.zNegative, alt: "Z Negative" }, { icon: "pi pi-arrow-down-right", action: JogPanelAction.yNegative, alt: "Y Negative" }],
+ *    [{ icon: "pi pi-arrow-up-right", action: JogPanelAction.yPositive, alt: "Y Positive" }, { icon: "pi pi-arrow-down", action: JogPanelAction.zNegative, alt: "Z Negative" }, undefined],
  * ];
  * ```
  * 
@@ -249,22 +250,22 @@ export class JogPanel extends React.Component<JogPanelProps, JogPanelState> {
             return <i/>
         }
         else if (action == JogPanelAction.xNegative) {
-            return <i className="pi pi-arrow-left" />
+            return <JogXNeg />
         }
         else if (action == JogPanelAction.xPositive) {
-            return <i className="pi pi-arrow-right" />
+            return <JogXPos />
         }
         else if (action == JogPanelAction.yNegative) {
-            return <i className="pi pi-arrow-up-left" />
+            return <JogYNeg />
         }
         else if (action == JogPanelAction.yPositive) {
-            return <i className="pi pi-arrow-down-right" />
+            return <JogYPos />
         }
         else if (action == JogPanelAction.zNegative) {
-            return <i className="pi pi-up" />
+            return <JogZNeg />
         }
         else if (action == JogPanelAction.zPositive) {
-            return <i className="pi pi-down" />
+            return <JogZPos />
         }
         else if (action == JogPanelAction.aNegative) {
             return <RotationCcwA />
@@ -299,24 +300,13 @@ export class JogPanel extends React.Component<JogPanelProps, JogPanelState> {
 
             const action = this.props.buttonDefinitions[row][col]?.action;
 
-            if (action !== undefined && action < JogPanelAction.aPositive ) {
-                return <Button 
-                    key={`${row}-${col}`}
-                    icon={this.props.buttonDefinitions[row][col]?.icon} 
-                    tooltip={this.props.buttonDefinitions[row][col]?.alt} 
-                    onClick={() => this.handleClicked(action)}
-                    className="button-item" 
-                />        
-            }
-            else {
-                return <Button 
-                    key={`${row}-${col}`}                     
-                    tooltip={this.props.buttonDefinitions[row][col]?.alt} 
-                    onClick={() => this.handleClicked(action)}
-                    className="button-item" 
-                    icon={() => this.actionToIcon(action)}/>
-            }
-            
+            return <Button
+                key={`${row}-${col}`}
+                tooltip={this.props.buttonDefinitions[row][col]?.alt}
+                onClick={() => this.handleClicked(action)}
+                className="button-item"
+                icon={() => this.actionToIcon(action)}/>
+
         }
         else {
             return <Button icon="pi" key={`${row}-${col}`} disabled={true} className="button-item empty-slot" />

package/src/components/ams/AmsProvider.tsx

@@ -55,6 +55,16 @@ export interface AmsRole {
      *  feeding NI bridge channel calibration). Empty for purely
      *  test-method-driven roles. */
     used_by_modules: string[];
+    /** Optional per-field seed values declared on the asset_ref's
+     *  `defaults` map. AIS uses these to pre-fill nameplate inputs when
+     *  the operator creates a new asset for this role — the operator
+     *  confirms or edits, the values are never enforced. Absent when no
+     *  asset_ref declared defaults (the common case, since built-in
+     *  load_cell etc. didn't support defaults before the feature
+     *  landed). Keys are field names from the asset_type's schema;
+     *  values are untyped JSON (numbers, strings, booleans) matching
+     *  the field's declared `type`. */
+    defaults?: Record<string, any>;
 }
 export type AmsRoleRegistry = { [assetType: string]: AmsRole[] };
 

package/src/components/ams/AssetDetailView.tsx

@@ -235,7 +235,7 @@ export const AssetDetailView: React.FC = () => {
                     <Button label="Edit" icon="pi pi-pencil"
                         outlined
                         onClick={() => setEditDialogOpen(true)}
-                        tooltip="Edit role, nameplate, and per-axis values. Type, serial, and install date are immutable."
+                        tooltip="Edit serial, role, nameplate, and per-axis values. Type and install date are immutable."
                         tooltipOptions={{ position: 'left' }}
                     />
                     {asset.status === 'active' && (

package/src/components/ams/AssetEditDialog.tsx

@@ -9,12 +9,13 @@
  *      `asset.current_calibration_id` is non-null. Posts via
  *      `ams.update_calibration` (server enforces "current only"). Tab
  *      is hidden entirely for assets that never had a calibration —
- *      "+ Calibration" on <AssetDetailView> is the path to add one.
+ *      "Calibration" on <AssetDetailView> is the path to add one.
  *
- * The server treats `asset_id`, `asset_type`, `serial`, and
- * `install_date` as immutable; the read-only header strip mirrors
- * that. Status stays out of this dialog because the Retire button on
- * <AssetDetailView> already owns that transition.
+ * The server treats `asset_id`, `asset_type`, and `install_date` as
+ * immutable; the read-only header strip mirrors that. `serial` is
+ * editable (free-form traceability metadata) so a mis-keyed serial can
+ * be corrected here. Status stays out of this dialog because the Retire
+ * button on <AssetDetailView> already owns that transition.
  *
  * Save commits the Asset tab first, then (if a calibration is loaded)
  * the Calibration tab. Either failure surfaces inline and stops; the
@@ -175,6 +176,7 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
     // effect below.
     const [roleSelection, setRoleSelection] = useState<string>('');
     const [location, setLocation] = useState<string>('');
+    const [serial, setSerial] = useState<string>('');
     const [customFields, setCustomFields] =
         useState<Record<string, string>>({});
     const [subLocationFields, setSubLocationFields] =
@@ -215,6 +217,9 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
         setSubmitting(false);
         setActiveTab(0);
 
+        // Serial: free-form, editable so operators can correct a typo.
+        setSerial(typeof asset.serial === 'string' ? asset.serial : '');
+
         // Role: pick the dropdown option when the asset's location
         // matches a declared role; otherwise route into ROLE_OTHER so
         // the operator can keep the current custom string.
@@ -365,6 +370,7 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
         const payload: any = {
             asset_id: asset.asset_id,
             location,
+            serial,
             custom,
         };
         if (subLocations) payload.sub_locations = subLocations;
@@ -481,10 +487,11 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
                 </>
             }
         >
-            {/* Read-only context strip — type, serial, install_date.
-                The server treats these as immutable; surfacing them
-                here keeps the operator oriented without inviting an
-                edit that would silently no-op. */}
+            {/* Read-only context strip — type, install_date. The server
+                treats these as immutable; surfacing them here keeps the
+                operator oriented without inviting an edit that would
+                silently no-op. Serial moved into the editable Asset tab
+                below so operators can correct a mis-entered serial. */}
             <div style={{ display: 'grid',
                           gridTemplateColumns: 'auto 1fr',
                           gap: '0.25rem 1rem',
@@ -492,7 +499,6 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
                           color: 'var(--text-secondary-color)',
                           marginBottom: '0.75rem' }}>
                 <span>Type</span>          <span>{typeLabel}</span>
-                <span>Serial</span>        <span>{asset.serial || <em>(none)</em>}</span>
                 {asset.install_date && (
                     <>
                         <span>Installed</span>
@@ -507,6 +513,15 @@ export const AssetEditDialog: React.FC<AssetEditDialogProps> = ({
                           gridTemplateColumns: 'auto 1fr',
                           gap: '0.5rem 1rem',
                           alignItems: 'center' }}>
+                {/* Serial — free-form manufacturer metadata. Editable so
+                    a mis-entered serial can be corrected after the fact. */}
+                <label>Serial</label>
+                <InputText
+                    value={serial}
+                    placeholder="(none)"
+                    onChange={(e) => setSerial(e.target.value)}
+                />
+
                 {/* Role field. Asset types referenced only by_id_field
                     (no by_location asset_ref) come back with an empty
                     role list — we hide the row entirely so the operator

package/src/components/ams/AssetRegistryTable.css

@@ -0,0 +1,12 @@
+/*
+ * Touch-friendly row sizing for the AMS asset list.
+ *
+ * The shop-floor HMI is a touchscreen and operators were mis-tapping
+ * the dense default DataTable rows. Adding vertical padding to each
+ * body cell enlarges the per-row touch target without changing the
+ * column layout or text size.
+ */
+.ams-asset-table .p-datatable-tbody > tr > td {
+    padding-top: 0.9rem;
+    padding-bottom: 0.9rem;
+}