@eintrek/erp-shell 0.1.70 → 0.1.72

package/README.md

@@ -176,6 +176,18 @@ progress API: `API.md` next to it.
   shell's adapters), `guide-ui.tsx`, `guide-styles.ts`. Tests:
   `src/guide/*.test.ts`.
 
+### 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
+  follows `complete.action`, which may lead to another app (Platform's finish
+  goes to Peoplx).
+
 ### 0.1.70
 
 - `GuideSuite.reopenHint`: what the skip and exit confirms say about

package/dist/chunks/{guide-runtime-CUCcs6q0.esm.js → guide-runtime-B-3myqxe.esm.js}

@@ -727,11 +727,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");
@@ -1453,6 +1476,11 @@ function reduceGuide(state, action, suite, env) {
                 d.effects.push({ type: "navigate", href: filled });
             break;
         }
+        case "dismissComplete":
+            if (s.name !== "complete")
+                break;
+            setScreen(d, { name: "idle" });
+            break;
         case "openPanel":
             if (state.audience !== "none" && s.name === "idle") {
                 d.state = { ...d.state, panelOpen: true };
@@ -3566,8 +3594,10 @@ function GuideRuntimeInner({ config, organizationId, code, routing, progress: pr
                     dispatchRef.current({ type: "rest" });
                 }
                 else if (sc.name === "complete") {
+                    // Escape closes the card where the person is; only the button
+                    // follows complete.action, which may be another app.
                     stop();
-                    dispatchRef.current({ type: "finish" });
+                    dispatchRef.current({ type: "dismissComplete" });
                 }
                 else if (s.panelOpen) {
                     stop();
@@ -3782,8 +3812,9 @@ 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,
@@ -3840,4 +3871,4 @@ function useFactsKey(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-CUCcs6q0.esm.js.map
+//# sourceMappingURL=guide-runtime-B-3myqxe.esm.js.map