@seedtactics/insight-client 17.0.0-beta.0 → 17.0.0-beta.1

package/dist/cell-status/rebookings.d.ts

@@ -2,6 +2,7 @@ import { Atom } from "jotai";
 import { ServerEventAndTime } from "./loading";
 import { ILogEntry, IRebooking, IRecentHistoricData } from "../network/api";
 import { OrderedMap } from "@seedtactics/immutable-collections";
+export declare function mapUnscheduledRebookings(bookings: ReadonlyArray<Readonly<IRebooking>> | null | undefined): OrderedMap<string, Readonly<IRebooking>>;
 export declare const last30Rebookings: Atom<OrderedMap<string, Readonly<IRebooking>>>;
 export declare const canceledRebookings: Atom<OrderedMap<string, Date>>;
 type ScheduledBooking = {

package/dist/cell-status/rebookings.js

@@ -46,8 +46,11 @@ const unschRebookings = unwrap(atom(async (_, { signal }) => {
         return OrderedMap.empty();
     }
     const bookings = await JobsBackend.unscheduledRebookings(signal);
-    return OrderedMap.build(bookings, (booking) => booking.bookingId);
+    return mapUnscheduledRebookings(bookings);
 }), (prev) => prev ?? OrderedMap.empty());
+export function mapUnscheduledRebookings(bookings) {
+    return OrderedMap.build(bookings ?? [], (booking) => booking.bookingId);
+}
 export const last30Rebookings = atom((get) => {
     const evts = get(rebookingEvts);
     const unsch = get(unschRebookings);

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

@@ -29,7 +29,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 import { useMemo, useState } from "react";
-import { Alert, Box, Button, Card, CardContent, Stack, Typography } from "@mui/material";
+import { Alert, Box, Button, Stack, Typography } from "@mui/material";
 import { LazySeq } from "@seedtactics/immutable-collections";
 import * as api from "../../network/api.js";
 import { InProcMaterial } from "./Material.js";
@@ -150,6 +150,10 @@ 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] }), 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));
+                    return (_jsx(MoveMaterialArrowNode, { kind: {
+                            type: MoveMaterialNodeKindType.BasketSlotZone,
+                            basketId: basket.basketId,
+                            slot,
+                        }, children: _jsxs(Box, { component: "section", "data-testid": `basket-load-station-slot-${slot}`, sx: { border: "1px solid", borderColor: "text.primary", p: 2 }, 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/LoadStation.js

@@ -284,6 +284,21 @@ function selectLoadStationAndQueueProps(loadNum, queues, curSt, hideNonLoading)
     queueMat.forEach((queue) => queue.mats.sort(mkCompareByProperties((mat) => mat.location.queuePosition ?? 0)));
     basketMat.forEach((basket) => basket.mats.sort(mkCompareByProperties((mat) => mat.location.basketSlot ?? 0)));
     const matCount = freeLoading.length + palFaces.valuesToAscLazySeq().sumBy((x) => x.length);
+    const activeBasketSlotCount = activeBasket
+        ? LazySeq.of(activeBasket.emptySlots ?? [])
+            .concat(activeBasket.unknownSlots ?? [])
+            .concat(LazySeq.of(curSt.material).collect((mat) => mat.location.type === api.LocType.InBasket &&
+            mat.location.basketId === activeBasket.basketId
+            ? mat.location.basketSlot
+            : undefined))
+            .concat(LazySeq.of(curSt.material).collect((mat) => mat.action.type === api.ActionType.LoadingToBasket &&
+            mat.action.loadToBasketId === activeBasket.basketId
+            ? mat.action.loadToBasketSlot
+            : undefined))
+            .distinctBy((slot) => slot)
+            .toRArray().length
+        : 0;
+    const layoutCount = Math.max(matCount, activeBasketSlotCount);
     return {
         pallet: pal,
         activeBasket,
@@ -293,7 +308,7 @@ function selectLoadStationAndQueueProps(loadNum, queues, curSt, hideNonLoading)
         queues: queueMat,
         baskets: basketMat,
         elapsedLoadingTime,
-        fsize: matCount <= 2 ? "x-large" : matCount <= 6 ? "large" : "normal",
+        fsize: layoutCount <= 2 ? "x-large" : layoutCount <= 6 ? "large" : "normal",
     };
 }
 function MultiInstructionButton({ loadData }) {

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

@@ -377,6 +377,7 @@ const MatCard = forwardRef(function MatCard(props, ref) {
                     }, children: [_jsx(PartIdenticon, { part: props.mat.partName }), _jsxs(Box, { sx: {
                                 marginLeft: "8px",
                                 flexGrow: 1,
+                                minWidth: 0,
                             }, children: [_jsx(MatCardHeader, { fsize: props.fsize, children: props.mat.partName }), props.displayJob ? (_jsx(MatCardDetail, { fsize: props.fsize, children: props.mat.jobUnique && props.mat.jobUnique !== ""
                                         ? "Assigned to " + props.mat.jobUnique
                                         : "Unassigned material" })) : undefined, !props.hideEmptySerial || props.mat.serial ? (_jsxs(MatCardDetail, { fsize: props.fsize, children: ["Serial: ", props.mat.serial ? props.mat.serial : "none"] })) : undefined, props.mat.workorderId === undefined ||
@@ -391,6 +392,7 @@ const MatCard = forwardRef(function MatCard(props, ref) {
                                 justifyContent: "space-between",
                                 alignItems: "flex-end",
                                 alignSelf: "start",
+                                flexShrink: 0,
                             }, children: [props.mat.serial && props.mat.serial.length >= 1 && !props.hideAvatar ? (_jsx("div", { children: _jsx(Avatar, { style: { width: "30px", height: "30px" }, children: props.mat.serial.slice(-1) }) })) : undefined, props.hideWarningIcon ? undefined : (_jsx("div", { children: _jsx(Warning, { mat: props.mat }) }))] })] }) })] }));
 });
 export const MatSummary = memo(MatCard);

package/dist/data/move-arrows.d.ts

@@ -7,7 +7,8 @@ export declare enum MoveMaterialNodeKindType {
     CompletedExpandedMaterialZone = 3,
     PalletFaceZone = 4,
     QueueZone = 5,
-    BasketZone = 6
+    BasketZone = 6,
+    BasketSlotZone = 7
 }
 export type MoveMaterialNodeKind = {
     readonly type: MoveMaterialNodeKindType.Material;
@@ -28,6 +29,10 @@ export type MoveMaterialNodeKind = {
 } | {
     readonly type: MoveMaterialNodeKindType.BasketZone;
     readonly basketId: number;
+} | {
+    readonly type: MoveMaterialNodeKindType.BasketSlotZone;
+    readonly basketId: number;
+    readonly slot: number;
 };
 export type MoveMaterialIdentifier = string;
 export declare function uniqueIdForNodeKind(kind: MoveMaterialNodeKind): MoveMaterialIdentifier;

package/dist/data/move-arrows.js

@@ -41,6 +41,7 @@ export var MoveMaterialNodeKindType;
     MoveMaterialNodeKindType[MoveMaterialNodeKindType["PalletFaceZone"] = 4] = "PalletFaceZone";
     MoveMaterialNodeKindType[MoveMaterialNodeKindType["QueueZone"] = 5] = "QueueZone";
     MoveMaterialNodeKindType[MoveMaterialNodeKindType["BasketZone"] = 6] = "BasketZone";
+    MoveMaterialNodeKindType[MoveMaterialNodeKindType["BasketSlotZone"] = 7] = "BasketSlotZone";
 })(MoveMaterialNodeKindType || (MoveMaterialNodeKindType = {}));
 export function uniqueIdForNodeKind(kind) {
     switch (kind.type) {
@@ -58,6 +59,8 @@ export function uniqueIdForNodeKind(kind) {
             return "QueueZone-" + kind.queue;
         case MoveMaterialNodeKindType.BasketZone:
             return "BasketZone-" + kind.basketId.toString();
+        case MoveMaterialNodeKindType.BasketSlotZone:
+            return `BasketSlotZone-${kind.basketId}-${kind.slot}`;
     }
 }
 export function memoPropsForNodeKind(kind) {
@@ -74,6 +77,8 @@ export function memoPropsForNodeKind(kind) {
             return [kind.type, kind.queue];
         case MoveMaterialNodeKindType.BasketZone:
             return [kind.type, kind.basketId];
+        case MoveMaterialNodeKindType.BasketSlotZone:
+            return [kind.type, kind.basketId, kind.slot];
     }
 }
 function groupMatByKind(allNodes) {
@@ -82,6 +87,7 @@ function groupMatByKind(allNodes) {
     const faces = new Map();
     const queues = new Map();
     const baskets = new Map();
+    const basketSlots = new Map();
     const material = new Array();
     for (const node of allNodes.values()) {
         switch (node.type) {
@@ -101,6 +107,9 @@ function groupMatByKind(allNodes) {
             case MoveMaterialNodeKindType.BasketZone:
                 baskets.set(node.basketId, node.elem);
                 break;
+            case MoveMaterialNodeKindType.BasketSlotZone:
+                basketSlots.set(`${node.basketId}:${node.slot}`, node.elem);
+                break;
             case MoveMaterialNodeKindType.Material:
                 if (node.material) {
                     material.push([node.elem, node.material]);
@@ -108,7 +117,7 @@ function groupMatByKind(allNodes) {
                 break;
         }
     }
-    return { freeMaterial, completedMaterial, faces, queues, baskets, material };
+    return { freeMaterial, completedMaterial, faces, queues, baskets, basketSlots, material };
 }
 export function computeArrows(container, allNodes) {
     if (!container) {
@@ -261,7 +270,10 @@ export function computeArrows(container, allNodes) {
                 const basketId = mat.action.loadToBasketId;
                 if (basketId === undefined)
                     break;
-                const dest = byKind.baskets.get(basketId);
+                const dest = mat.action.loadToBasketSlot === undefined
+                    ? byKind.baskets.get(basketId)
+                    : (byKind.basketSlots.get(`${basketId}:${mat.action.loadToBasketSlot}`) ??
+                        byKind.baskets.get(basketId));
                 const lastSlotUsed = basketDestUsed.get(basketId) ?? 0;
                 basketDestUsed.set(basketId, lastSlotUsed + 1);
                 arrows.push({

package/dist/index.html

@@ -43,7 +43,7 @@
         }
       }
     </style>
-    <script type="module" crossorigin src="/assets/index-BkKYqUM0.js"></script>
+    <script type="module" crossorigin src="/assets/index-gLnatT5a.js"></script>
     <link rel="stylesheet" crossorigin href="/assets/index-DXfAwuj-.css">
   </head>
   <body>

package/dist/network/backend.d.ts

@@ -15,7 +15,7 @@ export interface JobAPI {
     cancelLoad(materialId: number, operName: string | null, request: Readonly<api.ICancelLoadRequest>): Promise<void>;
     swapMaterialOnPallet(materialId: number, operName: string | null, mat: Readonly<api.IMatToPutOnPallet>): Promise<void>;
     invalidatePalletCycle(materialId: number, operName: string | null | undefined, changeCastingTo: string | null | undefined, changeJobUniqueTo: string | null | undefined, process: number): Promise<Readonly<api.IMaterialDetails> | null | undefined>;
-    unscheduledRebookings(signal?: AbortSignal): Promise<ReadonlyArray<Readonly<api.IRebooking>>>;
+    unscheduledRebookings(signal?: AbortSignal): Promise<ReadonlyArray<Readonly<api.IRebooking>> | null>;
 }
 export interface FmsAPI {
     fMSInformation(): Promise<Readonly<api.IFMSInfo>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seedtactics/insight-client",
-  "version": "17.0.0-beta.0",
+  "version": "17.0.0-beta.1",
   "license": "BSD-3-Clause",
   "repository": {
     "url": "https://github.com/SeedTactics/fms-insight"