@seedtactics/insight-client 16.8.4-beta.1 → 16.8.4-beta.10

package/dist/components/LogEntry.js

@@ -48,7 +48,7 @@ import { useAtomValue } from "jotai";
 import { fmsInformation } from "../network/server-settings.js";
 import { basketDisplayName, loadStationDisplayName } from "../cell-status/station-cycles.js";
 import { filterRemoveAddQueue } from "./log-entry-queue-filter.js";
-import { basketContainerName } from "./log-entry-container-name.js";
+import { basketContainerName, basketCycleDescription } from "./log-entry-container-name.js";
 const ColoredSpan = styled("span", { shouldForwardProp: (prop) => prop.toString()[0] !== "$" })(({ $type }) => {
     switch ($type) {
         case "machine":
@@ -191,14 +191,7 @@ function display(props, fmsInfo) {
         }
         case api.LogType.BasketCycle: {
             const basketName = basketDisplayName(fmsInfo.basketName);
-            if (entry.startofcycle) {
-                return (_jsxs("span", { children: [basketName, " ", entry.pal, " started cycle"] }));
-            }
-            else {
-                return (_jsxs("span", { children: [basketName, " ", entry.pal, " completed cycle", entry.containerIds && entry.containerIds.length > 0
-                            ? ` from ${entry.containerIds.length} UUID fragment${entry.containerIds.length === 1 ? "" : "s"}`
-                            : ""] }));
-            }
+            return _jsx("span", { children: basketCycleDescription(entry, basketName) });
         }
         case api.LogType.BasketInLocation: {
             const basketName = basketDisplayName(fmsInfo.basketName);

package/dist/components/log-entry-container-name.d.ts

@@ -1,4 +1,6 @@
 import * as api from "../network/api.js";
 type ContainerNameEntry = Readonly<Pick<api.ILogEntry, "pal" | "containerId">>;
+type BasketCycleEntry = ContainerNameEntry & Readonly<Pick<api.ILogEntry, "startofcycle" | "containerIds">>;
 export declare function basketContainerName(entry: ContainerNameEntry, basketName: string): string;
+export declare function basketCycleDescription(entry: BasketCycleEntry, basketName: string): string;
 export {};

package/dist/components/log-entry-container-name.js

@@ -5,3 +5,13 @@ export function basketContainerName(entry, basketName) {
         return `${basketName} ${entry.pal}`;
     return basketName;
 }
+export function basketCycleDescription(entry, basketName) {
+    const container = basketContainerName(entry, basketName);
+    if (entry.startofcycle)
+        return `${container} started cycle`;
+    const fragmentCount = entry.containerIds?.length ?? 0;
+    const fragments = fragmentCount > 0
+        ? ` from ${fragmentCount} UUID fragment${fragmentCount === 1 ? "" : "s"}`
+        : "";
+    return `${container} completed cycle${fragments}`;
+}

package/dist/components/operations/Programs.js

@@ -249,7 +249,7 @@ export function ProgramSummaryTable() {
 function ProgramContentCode() {
     const ct = useAtomValue(programContent);
     const [highlighted, setHighlighted] = useState(null);
-    const worker = useMemo(() => new Worker(new URL("./ProgramHighlight.ts", import.meta.url), { type: "module" }), []);
+    const worker = useMemo(() => new Worker(new URL("./ProgramHighlight.js", import.meta.url), { type: "module" }), []);
     useEffect(() => {
         let set = (h) => setHighlighted(h);
         const handleMessage = (event) => set(event.data);

package/dist/components/station-monitor/BasketLoadStationWork.js

@@ -28,81 +28,86 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
-import { useEffect, useMemo, useState } from "react";
+import { useMemo, useState } from "react";
 import { Alert, Box, Button, Card, CardContent, Stack, Typography } from "@mui/material";
 import { LazySeq } from "@seedtactics/immutable-collections";
 import * as api from "../../network/api.js";
 import { InProcMaterial } from "./Material.js";
 import { MoveMaterialArrowNode } from "./MoveMaterialArrows.js";
 import { MoveMaterialNodeKindType } from "../../data/move-arrows.js";
-function isNonNegativeInteger(value) {
-    return Number.isInteger(value) && (value ?? -1) >= 0;
+function isPositiveInteger(value) {
+    return Number.isInteger(value) && (value ?? 0) > 0;
 }
 function isNonBlank(value) {
     return typeof value === "string" && value.trim() !== "";
 }
-function actionPhase(mat, basketId) {
+function basketAction(mat, basketId) {
     if (mat.location.type === api.LocType.InBasket &&
         mat.location.basketId === basketId &&
         (mat.action.type === api.ActionType.UnloadToInProcess ||
             mat.action.type === api.ActionType.UnloadToCompletedMaterial)) {
-        if (!isNonNegativeInteger(mat.location.basketSlot)) {
-            return "invalid";
+        if (!isPositiveInteger(mat.location.basketSlot)) {
+            return { type: "invalid" };
         }
-        return "unload";
+        return { type: "valid", workId: mat.action.workId };
     }
     if (mat.action.type === api.ActionType.LoadingToBasket) {
-        if (!isNonNegativeInteger(mat.action.loadToBasketId))
-            return "invalid";
+        if (!isPositiveInteger(mat.action.loadToBasketId))
+            return { type: "invalid" };
         if (mat.action.loadToBasketId !== basketId)
             return undefined;
-        if (!isNonNegativeInteger(mat.action.loadToBasketSlot) ||
-            (mat.location.type !== api.LocType.Free &&
+        const reloadsSameSlot = mat.location.type === api.LocType.InBasket &&
+            mat.location.basketId === basketId &&
+            mat.location.basketSlot === mat.action.loadToBasketSlot;
+        if (!isPositiveInteger(mat.action.loadToBasketSlot) ||
+            (!reloadsSameSlot &&
+                mat.location.type !== api.LocType.Free &&
                 (mat.location.type !== api.LocType.InQueue || !isNonBlank(mat.location.currentQueue)))) {
-            return "invalid";
+            return { type: "invalid" };
         }
-        return "load";
+        return { type: "valid", workId: mat.action.workId };
     }
     return undefined;
 }
 function confirmableWork(material, basketId) {
     const classifiedActions = LazySeq.of(material)
-        .collect((mat) => {
-        const phase = actionPhase(mat, basketId);
-        return phase === undefined ? undefined : { phase, workId: mat.action.workId };
-    })
+        .collect((mat) => basketAction(mat, basketId))
         .toRArray();
-    if (classifiedActions.some(({ phase }) => phase === "invalid")) {
+    if (classifiedActions.some((action) => action.type === "invalid")) {
         return { type: "inconsistent" };
     }
-    const phaseActions = classifiedActions.filter((action) => action.phase !== "invalid");
-    if (phaseActions.length === 0)
+    const validActions = classifiedActions.filter((action) => action.type === "valid");
+    if (validActions.length === 0)
         return { type: "none" };
-    const tagged = phaseActions.filter((action) => isNonBlank(action.workId));
+    const tagged = validActions.filter((action) => isNonBlank(action.workId));
     const workIds = LazySeq.of(tagged).toHashSet(({ workId }) => workId);
-    const phases = LazySeq.of(tagged).toHashSet(({ phase }) => phase);
-    if (tagged.length !== phaseActions.length || workIds.size !== 1 || phases.size !== 1) {
+    if (tagged.length !== validActions.length || workIds.size !== 1) {
         return { type: "inconsistent" };
     }
     return {
         type: "confirmable",
-        work: { workId: tagged[0].workId, phase: tagged[0].phase },
+        work: { workId: tagged[0].workId },
     };
 }
-function loadingSource(mat) {
+function loadingInstruction(mat) {
+    if (mat.location.type === api.LocType.InBasket &&
+        mat.location.basketId === mat.action.loadToBasketId &&
+        mat.location.basketSlot === mat.action.loadToBasketSlot) {
+        return "Unload, re-plate, and reload this slot";
+    }
     if (mat.location.type === api.LocType.InQueue && mat.location.currentQueue) {
-        return mat.location.currentQueue;
+        return `Load from ${mat.location.currentQueue}`;
     }
-    return "raw material";
+    return "Load from raw material";
 }
 function SlotMaterial({ material, fsize, }) {
     return material.map((mat) => (_jsx(MoveMaterialArrowNode, { kind: { type: MoveMaterialNodeKindType.Material, material: mat }, children: _jsx(InProcMaterial, { mat: mat, fsize: fsize }) }, mat.materialID)));
 }
 export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsize, submitCommand, }) {
-    const [submission, setSubmission] = useState("idle");
+    const [submission, setSubmission] = useState();
     const workState = useMemo(() => confirmableWork(material, basket.basketId), [basket.basketId, material]);
     const work = workState.type === "confirmable" ? workState.work : undefined;
-    useEffect(() => setSubmission("idle"), [work?.workId]);
+    const submissionState = submission !== undefined && submission.workId === work?.workId ? submission.state : "idle";
     const materialBySlot = useMemo(() => LazySeq.of(material)
         .filter((mat) => mat.location.type === api.LocType.InBasket &&
         mat.location.basketId === basket.basketId &&
@@ -124,16 +129,19 @@ export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsi
     async function submit() {
         if (work === undefined || submitCommand === undefined)
             return;
-        setSubmission("submitting");
+        const submittedWorkId = work.workId;
+        setSubmission({ workId: submittedWorkId, state: "submitting" });
         try {
-            setSubmission(await submitCommand(stationNumber, { workId: work.workId }));
+            const state = await submitCommand(stationNumber, { workId: submittedWorkId });
+            setSubmission((current) => current?.workId === submittedWorkId ? { workId: submittedWorkId, state } : current);
         }
         catch {
-            setSubmission("error");
+            setSubmission((current) => current?.workId === submittedWorkId ? { workId: submittedWorkId, state: "error" } : current);
         }
     }
-    const submissionDisabled = submission === "submitting" || submission === "accepted" || submission === "conflict";
-    const buttonLabel = work?.phase === "unload" ? "Unload Complete" : "Load Complete";
+    const submissionDisabled = submissionState === "submitting" ||
+        submissionState === "accepted" ||
+        submissionState === "conflict";
     return (_jsxs(Stack, { spacing: 2, sx: { mt: 2 }, children: [_jsx(Typography, { variant: "h6", children: "Basket slots" }), _jsx(Box, { sx: {
                     display: "grid",
                     gridTemplateColumns: "repeat(auto-fit, minmax(15em, 1fr))",
@@ -142,6 +150,6 @@ export function BasketLoadStationWorkflow({ stationNumber, basket, material, fsi
                     const slotMaterial = materialBySlot.get(slot) ?? [];
                     const loads = loadsBySlot.get(slot) ?? [];
                     const isUnknown = basket.unknownSlots?.includes(slot) === true;
-                    return (_jsx(Card, { "data-testid": `basket-load-station-slot-${slot}`, variant: "outlined", children: _jsxs(CardContent, { children: [_jsxs(Typography, { variant: "h6", children: ["Slot ", slot + 1] }), slotMaterial.length > 0 ? (_jsx(SlotMaterial, { material: slotMaterial, fsize: fsize })) : (_jsx(Typography, { color: isUnknown ? "warning.main" : "text.secondary", children: isUnknown ? "Unknown" : "Empty" })), loads.map((mat, index) => (_jsxs(Box, { sx: { mt: 1 }, children: [_jsxs(Typography, { children: ["Load from ", loadingSource(mat)] }), _jsxs(Typography, { variant: "body2", color: "text.secondary", children: [mat.partName, " \u00B7 Process ", mat.action.processAfterLoad ?? mat.process] })] }, `${mat.jobUnique}-${mat.process}-${index}`)))] }) }, slot));
-                }) }), work && submitCommand ? (_jsx(Box, { sx: { display: "flex", justifyContent: "flex-end" }, children: _jsx(Button, { variant: "contained", disabled: submissionDisabled, onClick: () => void submit(), children: buttonLabel }) })) : work ? (_jsx(Alert, { severity: "warning", children: "Basket work confirmation is not configured." })) : workState.type === "inconsistent" ? (_jsx(Alert, { severity: "warning", children: "Basket work is inconsistent. Wait for refreshed material actions before confirming." })) : null, submission === "accepted" ? (_jsx(Alert, { severity: "success", children: "Confirmation accepted. Waiting for refreshed work." })) : submission === "conflict" ? (_jsx(Alert, { severity: "warning", children: "Basket work changed before confirmation. Review the refreshed slots and try again." })) : submission === "error" ? (_jsx(Alert, { severity: "error", children: "Unable to confirm basket work. No work was assumed complete." })) : null] }));
+                    return (_jsx(Card, { "data-testid": `basket-load-station-slot-${slot}`, variant: "outlined", children: _jsxs(CardContent, { children: [_jsxs(Typography, { variant: "h6", children: ["Slot ", slot] }), slotMaterial.length > 0 ? (_jsx(SlotMaterial, { material: slotMaterial, fsize: fsize })) : (_jsx(Typography, { color: isUnknown ? "warning.main" : "text.secondary", children: isUnknown ? "Unknown" : "Empty" })), loads.map((mat, index) => (_jsxs(Box, { sx: { mt: 1 }, children: [_jsx(Typography, { children: loadingInstruction(mat) }), _jsxs(Typography, { variant: "body2", color: "text.secondary", children: [mat.partName, " \u00B7 Process ", mat.action.processAfterLoad ?? mat.process] })] }, `${mat.jobUnique}-${mat.process}-${index}`)))] }) }, slot));
+                }) }), work && submitCommand ? (_jsx(Box, { sx: { display: "flex", justifyContent: "flex-end" }, children: _jsx(Button, { variant: "contained", disabled: submissionDisabled, onClick: () => void submit(), children: "Confirm" }) })) : work ? (_jsx(Alert, { severity: "warning", children: "Basket work confirmation is not configured." })) : workState.type === "inconsistent" ? (_jsx(Alert, { severity: "warning", children: "Basket work is inconsistent. Wait for refreshed material actions before confirming." })) : null, submissionState === "accepted" ? (_jsx(Alert, { severity: "success", children: "Confirmation accepted. Waiting for refreshed work." })) : submissionState === "conflict" ? (_jsx(Alert, { severity: "warning", children: "Basket work changed before confirmation. Review the refreshed slots and try again." })) : submissionState === "error" ? (_jsx(Alert, { severity: "error", children: "Unable to confirm basket work. No work was assumed complete." })) : null] }));
 }

package/dist/components/station-monitor/Material.js

@@ -235,14 +235,12 @@ export function MaterialAction({ mat, displayActionForSinglePallet, fsize, }) {
                 }
             }
         case api.ActionType.LoadingToBasket:
-            return (_jsxs(MatCardDetail, { fsize: fsize, children: ["Load into ", basketName, " ", mat.action.loadToBasketId ?? "", mat.action.loadToBasketSlot !== undefined
-                        ? ` slot ${mat.action.loadToBasketSlot + 1}`
-                        : ""] }));
+            return (_jsxs(MatCardDetail, { fsize: fsize, children: ["Load into ", basketName, " ", mat.action.loadToBasketId ?? "", mat.action.loadToBasketSlot !== undefined ? ` slot ${mat.action.loadToBasketSlot}` : ""] }));
         case api.ActionType.UnloadToInProcess:
         case api.ActionType.UnloadToCompletedMaterial:
             if (mat.action.unloadToBasketId) {
                 return (_jsxs(MatCardDetail, { fsize: fsize, children: ["Unload to ", basketName, " ", mat.action.unloadToBasketId, mat.action.unloadToBasketSlot !== undefined
-                            ? ` slot ${mat.action.unloadToBasketSlot + 1}`
+                            ? ` slot ${mat.action.unloadToBasketSlot}`
                             : ""] }));
             }
             else if (mat.action.unloadIntoQueue) {

package/dist/components/station-monitor/SystemOverview.js

@@ -446,7 +446,7 @@ function PalletFaces({ maxNumFaces, mats: allMats, loadingOntoPallet, noFilter,
     }
 }
 function BasketContents({ mats }) {
-    const byPosition = LazySeq.of(mats).orderedGroupBy((m) => (m.location.basketSlot ?? 0) + 1);
+    const byPosition = LazySeq.of(mats).orderedGroupBy((m) => m.location.basketSlot ?? 0);
     return (_jsx(Box, { sx: {
             display: "flex",
             flexWrap: "wrap",

package/dist/extension.d.ts

@@ -0,0 +1,11 @@
+import type { AppProps } from "./components/App.js";
+/**
+ * Starts one complete FMS Insight application with optional statically composed custom pages.
+ */
+export declare function bootstrapInsight(appProps?: AppProps, rootElement?: HTMLElement): Promise<void>;
+export { customState } from "./cell-status/custom-state.js";
+export type { AppProps };
+export { defaultChooseModes } from "./components/ChooseMode.js";
+export type { ChooseModeItem } from "./components/ChooseMode.js";
+export { RouteLocation } from "./components/routes.js";
+export { authenticatedFetch } from "./network/backend.js";

package/dist/extension.js

@@ -0,0 +1,21 @@
+import { createStore } from "jotai";
+import { registerNetworkBackend } from "./network/backend.js";
+import { fmsInformation, loadInfo } from "./network/server-settings.js";
+import { render } from "./renderer.js";
+/**
+ * Starts one complete FMS Insight application with optional statically composed custom pages.
+ */
+export async function bootstrapInsight(appProps = {}, rootElement) {
+    const root = rootElement ?? document.getElementById("root");
+    if (!root) {
+        throw new Error("Unable to start FMS Insight: no root element was provided or found");
+    }
+    registerNetworkBackend();
+    const store = createStore();
+    store.set(fmsInformation, await loadInfo());
+    render(appProps, root, store);
+}
+export { customState } from "./cell-status/custom-state.js";
+export { defaultChooseModes } from "./components/ChooseMode.js";
+export { RouteLocation } from "./components/routes.js";
+export { authenticatedFetch } from "./network/backend.js";

package/dist/index.html

@@ -3,7 +3,6 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-    <link rel="manifest" href="/assets/manifest-BzJli0lx.webmanifest" />
     <link rel="shortcut icon" href="/assets/favicon-gWFxiJK2.ico" />
     <title>SeedTactic FMS Insight</title>
     <style type="text/css">
@@ -44,7 +43,7 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-Y5yNHUvc.js"></script>
+    <script type="module" crossorigin src="/assets/index-BB3Eqktr.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DXfAwuj-.css">
   </head>
   <body>

package/dist/index.js

@@ -30,7 +30,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-import { bootstrapInsight } from "./bootstrap.js";
+import { bootstrapInsight } from "./extension.js";
 import { ApiException } from "./network/api.js";
 async function main() {
     const developmentProps = import.meta.env.DEV

package/dist/network/backend.js

@@ -64,7 +64,8 @@ export function setUserToken(u) {
 }
 /** Performs a request using the authenticated Insight user's bearer token, when present. */
 export function authenticatedFetch(url, init) {
-    const headers = new Headers(init?.headers);
+    const headers = new Headers(url instanceof Request ? url.headers : undefined);
+    new Headers(init?.headers).forEach((value, name) => headers.set(name, value));
     if (userAccessToken) {
         headers.set("Authorization", "Bearer " + userAccessToken);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedtactics/insight-client",
-  "version": "16.8.4-beta.1",
+  "version": "16.8.4-beta.10",
   "license": "BSD-3-Clause",
   "repository": {
     "url": "https://github.com/SeedTactics/fms-insight"
@@ -11,7 +11,7 @@
   ],
   "type": "module",
   "exports": {
-    "./bootstrap": "./dist/bootstrap.js",
+    "./extension": "./dist/extension.js",
     "./cell-status/*": "./dist/cell-status/*.js",
     "./components/*": "./dist/components/*.js",
     "./components/analysis/*": "./dist/components/analysis/*.js",
@@ -46,9 +46,9 @@
     "jotai-family": "^1.0.2",
     "jsbarcode": "^3.12.3",
     "oidc-client-ts": "^3.5.0",
-    "react": "^19.2.7",
+    "react": "^19.2.8",
     "react-calendar": "^6.0.1",
-    "react-dom": "^19.2.7",
+    "react-dom": "^19.2.8",
     "react-error-boundary": "^6.1.2",
     "react-resize-detector": "^12.3.0",
     "react-timeago": "^8.3.0",
@@ -61,16 +61,17 @@
     "@types/d3-sankey": "^0.12.5",
     "@types/d3-scale": "^4.0.9",
     "@types/d3-shape": "^3.1.8",
-    "@types/node": "^26.1.1",
+    "@types/node": "^26.1.2",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^6.0.3",
+    "@vitejs/plugin-react": "^6.0.4",
     "@vitest/browser-playwright": "^4.1.10",
-    "jsdom": "^29.1.1",
+    "jsdom": "^30.0.1",
     "nswag": "^14.7.1",
-    "oxfmt": "^0.59.0",
-    "oxlint": "^1.74.0",
-    "oxlint-tsgolint": "^0.25.0",
+    "oxfmt": "^0.61.0",
+    "oxlint": "^1.76.0",
+    "oxlint-tsgolint": "^7.0.2001",
+    "playwright": "^1.62.0",
     "typescript": "^7.0.2",
     "vite": "^8.1.5",
     "vitest": "^4.1.10",
@@ -79,7 +80,7 @@
   "scripts": {
     "type-check": "tsc --noEmit --skipLibCheck",
     "lint": "oxlint --type-aware",
-    "build": "tsc --noEmit --skipLibCheck && vite build",
+    "build": "vite build",
     "build:package": "tsc --project tsconfig.publish.json && cp -Tr ../../docs ./docs",
     "start": "vite",
     "test:unit": "vitest run --project unit",