@eintrek/erp-shell 0.1.71 → 0.1.73

package/README.md

@@ -176,6 +176,28 @@ progress API: `API.md` next to it.
   shell's adapters), `guide-ui.tsx`, `guide-styles.ts`. Tests:
   `src/guide/*.test.ts`.
 
+### 0.1.73
+
+- `GuideStep.status`: a short status line in the bubble while it returns
+  text, read again on every page change. A select step names a wrong pick
+  ("ยังไม่ใช่ชื่อคุณ") instead of waiting in silence (owner, 3 Nov 2026:
+  Plannex's managers step, someone else picked, nothing moved).
+- In a replay (ทบทวน), a select step offers ถัดไป when the next step's target
+  is already on the page (a form's save button), so a review never has to
+  change a real record to go on. Not while the next target needs the pick
+  (Plannex's save shows only once the user is a manager). First runs are
+  unchanged.
+- The "?" button opens the help dialog straight away, without the
+  "ไกด์เริ่มต้น 0/0" row, when every mission is hidden for this user
+  (`guideMenuShown`). `useGuideEntry()` still answers `{ done, total }`;
+  an app's own entry row should hide at `total === 0` too.
+
+### 0.1.72
+
+- "ขั้นที่ x/y" counts only the steps this person will see: a step whose
+  `requires` they lack or whose `skipIf` holds is left out (Plannex mission 3
+  said 1/6 and ended at 5/6).
+
 ### 0.1.71
 
 - Escape on the finish card closes it where the person is. Only the button

package/dist/chunks/{guide-runtime-BTatpm-V.esm.js → guide-runtime-C7Z00QwM.esm.js}

@@ -337,6 +337,16 @@ function publishGuideEntry(next, openPanel) {
         emit();
     }
 }
+/**
+ * Whether the "?" menu offers "ไกด์เริ่มต้น": a tour whose missions are all
+ * hidden for this user (`visible`, e.g. Plannex without an employee record)
+ * has nothing to open, and "0/0" led to an empty panel. The entry itself
+ * stays published: apps wait on it before they load the facts that make
+ * missions visible.
+ */
+function guideMenuShown(e) {
+    return !!e && e.total > 0;
+}
 /** Opens the tour's quest panel, when this user has a tour here. */
 function openGuidePanel() {
     openPanelImpl?.();
@@ -727,11 +737,34 @@ function announceStep(d, suite, env) {
     const ctx = guideContext(env, d.state.progress.context, routeParamsFor(step, env));
     const title = s.bridge ? COPY.bridgeTitle : plainTitle(resolveText(step.title, ctx));
     const why = s.bridge ? COPY.bridgeWhy(suite.appName) : plainTitle(resolveText(step.why, ctx));
+    const pos = stepPosition(mission, s.index, env, d.state.progress.context);
     d.effects.push({
         type: "announce",
-        text: `ขั้นที่ ${s.index + 1} จาก ${mission.steps.length}. ${title}${why ? `. ${why}` : ""}`,
+        text: `ขั้นที่ ${pos.no} จาก ${pos.total}. ${title}${why ? `. ${why}` : ""}`,
     });
 }
+/**
+ * "ขั้นที่ no จาก total" counting only the steps this person will see: a step
+ * whose `requires` they lack or whose `skipIf` holds is left out (the step on
+ * screen always counts).
+ */
+function stepPosition(mission, index, env, context) {
+    let no = 0;
+    let total = 0;
+    mission.steps.forEach((step, i) => {
+        if (i !== index) {
+            if (step.requires && !safe(() => env.can(step.requires), true))
+                return;
+            const ctx = guideContext(env, context, routeParamsFor(step, env));
+            if (step.skipIf && safe(() => step.skipIf(ctx), false))
+                return;
+        }
+        total++;
+        if (i <= index)
+            no = total;
+    });
+    return { no: Math.max(no, 1), total: Math.max(total, 1) };
+}
 /** "กด [บันทึก]" → "กด บันทึก" (for screen readers). */
 function plainTitle(t) {
     return t.replace(/\[([^\]]+)\]/g, "$1");
@@ -780,6 +813,7 @@ function enterStep(d, suite, env, mission, index, opts) {
     const where = placeRoute(steps, i);
     const away = !!where && !matchRoute(where, env.pathname, env.search, env.code);
     const bridge = !away && needsBridge(step, env, ctx);
+    const nts = !away && !bridge && nothingToSaveHolds(step, env, ctx);
     setScreen(d, {
         name: "step",
         mission: mission.key,
@@ -791,7 +825,9 @@ function enterStep(d, suite, env, mission, index, opts) {
         confirmExit: false,
         misses: 0,
         armed: hiddenAnchorShown(step, env),
-        nothingToSave: !away && !bridge && nothingToSaveHolds(step, env, ctx),
+        nothingToSave: nts,
+        status: away || bridge ? null : stepStatus(shownStep(step, nts), ctx),
+        replayNext: !away && !bridge && opts.replay && replayCanGoOn(mission, i, env, d.state.progress.context, nts),
     });
     if (!opts.replay) {
         const cp = checkpointAtOrBefore(steps, i);
@@ -834,6 +870,54 @@ function setNothingToSave(d, suite, env, on) {
     if (stepTargetVisible(step, env, ctx, s.bridge))
         announceStep(d, suite, env);
 }
+/** The step's status line (GuideStep.status): trimmed text, or null. */
+function stepStatus(step, ctx) {
+    if (!step.status)
+        return null;
+    const text = safe(() => step.status(ctx), undefined);
+    return typeof text === "string" && text.trim() ? text.trim() : null;
+}
+/**
+ * In a replay, whether a "select" step may go on with ถัดไป: the next step
+ * this person sees has its target on the page already (or there is none).
+ * A pick that makes the next step's target (a save shown only once the
+ * right value is chosen) is still needed.
+ */
+function replayCanGoOn(mission, index, env, context, nothingToSave = false) {
+    if (stepKind(shownStep(mission.steps[index], nothingToSave)) !== "select")
+        return false;
+    for (let i = index + 1; i < mission.steps.length; i++) {
+        const next = mission.steps[i];
+        const ctx = guideContext(env, context, routeParamsFor(next, env));
+        if (next.requires && !safe(() => env.can(next.requires), true))
+            continue;
+        if (next.skipIf && safe(() => next.skipIf(ctx), false))
+            continue;
+        if (!next.target)
+            return true;
+        if (stepTargetVisible(next, env, ctx, false))
+            return true;
+        // A commit step with nothing to save is read on its saved state.
+        return nothingToSaveHolds(next, env, ctx);
+    }
+    return true;
+}
+/** Keep the status line and a replay's ถัดไป current (the page changed). */
+function syncStatus(d, suite, env) {
+    const s = d.state.screen;
+    if (s.name !== "step")
+        return;
+    const mission = findMission(suite, s.mission);
+    if (!mission)
+        return;
+    const step = shownStep(mission.steps[s.index], s.nothingToSave);
+    const ctx = guideContext(env, d.state.progress.context, routeParamsFor(step, env));
+    const off = s.phase === "away" || s.bridge;
+    const status = off ? null : stepStatus(step, ctx);
+    const replayNext = !off && s.replay && replayCanGoOn(mission, s.index, env, d.state.progress.context, s.nothingToSave);
+    if (status !== s.status || replayNext !== s.replayNext)
+        setScreen(d, { ...s, status, replayNext });
+}
 function markReadyIfVisible(d, suite, env) {
     const s = d.state.screen;
     if (s.name !== "step" || s.phase !== "waiting")
@@ -1219,6 +1303,7 @@ function reduceGuide(state, action, suite, env) {
             else if (!cur.bridge && needsBridge(step, env, ctx)) {
                 setScreen(d, { ...cur, bridge: true, phase: "waiting" });
             }
+            syncStatus(d, suite, env);
             markReadyIfVisible(d, suite, env);
             break;
         }
@@ -1281,6 +1366,12 @@ function reduceGuide(state, action, suite, env) {
                 advance(d, suite, env);
                 break;
             }
+            if (kind === "select") {
+                // A replay goes on without a pick when the next step is on the page.
+                if (s.replay && replayCanGoOn(mission, s.index, env, d.state.progress.context, s.nothingToSave))
+                    advance(d, suite, env);
+                break;
+            }
             if (kind !== "input")
                 break;
             const ctx = guideContext(env, d.state.progress.context, routeParamsFor(step, env));
@@ -2287,6 +2378,7 @@ const GUIDE_CSS = `
 .eg-b-t{margin:0;font-size:16px;font-weight:600;line-height:1.45}
 .eg-b-w{margin:2px 0 0;font-size:13.5px;color:var(--eg-muted)}
 .eg-bubble.eg-err .eg-b-t{color:var(--eg-danger)}
+.eg-b-s{margin:6px 0 0;font-size:13px;font-weight:600;color:var(--eg-danger)}
 .eg-k{display:inline-block;background:var(--eg-tint);color:var(--eg-strong);border-radius:7px;padding:0 7px;font-weight:600}
 .eg-b-f{display:flex;align-items:center;justify-content:space-between;margin-top:12px;gap:8px}
 .eg-b-f .eg-btn{height:34px;padding:0 14px;font-size:13.5px}
@@ -2520,7 +2612,7 @@ function StepLayer(p) {
     const showBubble = p.phase === "ready" && (!!spot || !p.hasTarget);
     const gap = p.showHand ? 34 : 14;
     const spotKey = spot ? `${spot.x}|${spot.y}|${spot.width}|${spot.height}` : "";
-    const contentKey = `${p.bubble.title}|${p.bubble.why}|${p.bubble.error?.title ?? ""}|${p.bubble.showNext}`;
+    const contentKey = `${p.bubble.title}|${p.bubble.why}|${p.bubble.error?.title ?? ""}|${p.bubble.status ?? ""}|${p.bubble.showNext}`;
     // What the bubble sits beside: the target, with an open list over it (the
     // list is what the person is choosing from now). What it must not cover:
     // open lists, and the other anchors the step allows (a map step's
@@ -2643,7 +2735,7 @@ function BubbleBody(p) {
     const b = p.bubble;
     const title = b.error ? b.error.title : b.title;
     const why = b.error ? (b.error.detail ?? "") : b.why;
-    return (jsxs(Fragment, { children: [jsxs("div", { className: "eg-b-top", children: [jsxs("span", { className: "eg-mis", children: ["\u0E20\u0E32\u0E23\u0E01\u0E34\u0E08 ", b.missionNo, " \u00B7 ", b.missionTitle, b.replay ? " (ทบทวน)" : ""] }), jsxs("span", { className: "eg-cnt", children: ["\u0E02\u0E31\u0E49\u0E19\u0E17\u0E35\u0E48 ", b.index + 1, "/", b.total] })] }), jsx("div", { className: "eg-pips", "aria-hidden": "true", children: Array.from({ length: b.total }, (_, i) => (jsx("i", { className: i < b.index ? "eg-d" : i === b.index ? "eg-c" : undefined }, i))) }), jsx("p", { className: "eg-b-t", id: BUBBLE_TITLE_ID, children: jsx(GuideTitle, { text: title }) }), jsx("p", { className: "eg-b-w", id: BUBBLE_WHY_ID, hidden: !why, children: jsx(GuideTitle, { text: why }) }), jsxs("div", { className: "eg-b-f", children: [jsx("button", { type: "button", className: "eg-exit", onClick: p.onExit, children: b.replay ? "จบการทบทวน" : "ออกจากไกด์" }), jsxs("span", { style: { display: "flex", gap: 6 }, children: [b.showEndWithoutSave ? (jsx("button", { type: "button", className: "eg-btn eg-ghost", onClick: p.onEndWithoutSave, children: "\u0E08\u0E1A\u0E42\u0E14\u0E22\u0E44\u0E21\u0E48\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01" })) : null, b.showNext ? (jsx("button", { type: "button", className: "eg-btn eg-primary", onClick: p.onNext, children: "\u0E16\u0E31\u0E14\u0E44\u0E1B" })) : null] })] })] }));
+    return (jsxs(Fragment, { children: [jsxs("div", { className: "eg-b-top", children: [jsxs("span", { className: "eg-mis", children: ["\u0E20\u0E32\u0E23\u0E01\u0E34\u0E08 ", b.missionNo, " \u00B7 ", b.missionTitle, b.replay ? " (ทบทวน)" : ""] }), jsxs("span", { className: "eg-cnt", children: ["\u0E02\u0E31\u0E49\u0E19\u0E17\u0E35\u0E48 ", b.index + 1, "/", b.total] })] }), jsx("div", { className: "eg-pips", "aria-hidden": "true", children: Array.from({ length: b.total }, (_, i) => (jsx("i", { className: i < b.index ? "eg-d" : i === b.index ? "eg-c" : undefined }, i))) }), jsx("p", { className: "eg-b-t", id: BUBBLE_TITLE_ID, children: jsx(GuideTitle, { text: title }) }), jsx("p", { className: "eg-b-w", id: BUBBLE_WHY_ID, hidden: !why, children: jsx(GuideTitle, { text: why }) }), b.status && !b.error ? (jsx("p", { className: "eg-b-s", role: "status", "data-eg-status": "", children: b.status })) : null, jsxs("div", { className: "eg-b-f", children: [jsx("button", { type: "button", className: "eg-exit", onClick: p.onExit, children: b.replay ? "จบการทบทวน" : "ออกจากไกด์" }), jsxs("span", { style: { display: "flex", gap: 6 }, children: [b.showEndWithoutSave ? (jsx("button", { type: "button", className: "eg-btn eg-ghost", onClick: p.onEndWithoutSave, children: "\u0E08\u0E1A\u0E42\u0E14\u0E22\u0E44\u0E21\u0E48\u0E1A\u0E31\u0E19\u0E17\u0E36\u0E01" })) : null, b.showNext ? (jsx("button", { type: "button", className: "eg-btn eg-primary", onClick: p.onNext, children: "\u0E16\u0E31\u0E14\u0E44\u0E1B" })) : null] })] })] }));
 }
 /** The fingertip at ≈62% across and down the target; upside down near the bottom. */
 function handPosition(spot, viewportHeight) {
@@ -3789,12 +3881,14 @@ function GuideRuntimeInner({ config, organizationId, code, routing, progress: pr
                 missionNo,
                 missionTitle: mission.title,
                 replay: screen.replay,
-                index: screen.index,
-                total: mission.steps.length,
+                // Steps this person skips (requires / skipIf) are not counted.
+                index: stepPosition(mission, screen.index, env(), state.progress.context).no - 1,
+                total: stepPosition(mission, screen.index, env(), state.progress.context).total,
                 title: bridge ? "กดปุ่มเมนู" : resolveText(step.title, stepCtx),
                 why: bridge ? `เมนูทั้งหมดของ ${suite.appName} อยู่ในนี้` : resolveText(step.why, stepCtx),
                 error: screen.error,
-                showNext: !bridge && (kind === "input" || kind === "view"),
+                status: bridge ? null : screen.status,
+                showNext: !bridge && (kind === "input" || kind === "view" || (kind === "select" && screen.replay && screen.replayNext)),
                 showEndWithoutSave: !bridge && screen.replay && kind === "commit",
             }, hasTarget: bridge || !!step.target, targetPressable: targetPressable(step, bridge), phase: screen.phase, confirmExit: screen.confirmExit, reopenHint: suite.reopenHint, nudge: state.nudge, moving: moving, onExit: () => dispatch({ type: "exit" }), onNext: () => dispatch({ type: "next" }), onEndWithoutSave: () => dispatch({ type: "endWithoutSave" }), onRetry: () => dispatch({ type: "retry" }), onGoResume: () => dispatch({ type: "goResume" }), onExitConfirm: () => dispatch({ type: "exitConfirm" }), onExitCancel: () => dispatch({ type: "exitCancel" }) }));
     }
@@ -3846,5 +3940,5 @@ function useFactsKey(facts) {
     }, [facts]);
 }
 
-export { API_EVENT as A, GUIDE_EVENT_PREFIX as G, GUIDE_LAYER_ATTRIBUTE as a, GuideErrorBoundary as b, GuideProgressConflict as c, GuideRuntime as d, apiCallDetail as e, emitGuideEvent as f, fillRoute as g, guideAnchor as h, matchRoute as i, reportApiEvent as j, loadGuides as l, matchApiPath as m, openGuidePanel as o, reportApiCall as r, storeGuides as s, useGuideEntry as u };
-//# sourceMappingURL=guide-runtime-BTatpm-V.esm.js.map
+export { API_EVENT as A, GUIDE_EVENT_PREFIX as G, GUIDE_LAYER_ATTRIBUTE as a, GuideErrorBoundary as b, GuideProgressConflict as c, GuideRuntime as d, apiCallDetail as e, emitGuideEvent as f, fillRoute as g, guideAnchor as h, guideMenuShown as i, matchRoute as j, reportApiEvent as k, loadGuides as l, matchApiPath as m, openGuidePanel as o, reportApiCall as r, storeGuides as s, useGuideEntry as u };
+//# sourceMappingURL=guide-runtime-C7Z00QwM.esm.js.map