@vived/app 6.6.0 → 6.7.0

package/dist/esm/Procedure/Adapters/procedureHintAdapter.test.js

@@ -48,6 +48,7 @@ describe("procedureHintAdapter", () => {
             authoringValidationMessage: null,
             score: null,
             isSubmitted: false,
+            stepCategories: { event_a: "assessed" },
         });
         expect(setVM).toHaveBeenCalledWith({
             showHints: false,

package/dist/esm/Procedure/Adapters/procedureHintAdapter.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedureHintAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureHintAdapter.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureHintAdapter } from \"./procedureHintAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureHintAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureHintAdapter.defaultVM;\r\n\t\texpect(defaultVM.showHints).toBe(true);\r\n\t\texpect(defaultVM.nextExpectedEvent).toBeNull();\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureHintAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only hint fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\tshowHints: false,\r\n\t\t\tnextExpectedEvent: \"event_a\",\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\torderMatters: true,\r\n\t\t\tisQuiz: false,\r\n\t\t\tuserEventLog: [],\r\n\t\t\tcurrentStepIndex: 0,\r\n\t\t\tisComplete: false,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tprogressPercentage: 0,\r\n\t\t\tavailableEvents: [],\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tscore: null,\r\n\t\t\tisSubmitted: false,\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\tshowHints: false,\r\n\t\t\tnextExpectedEvent: \"event_a\",\r\n\t\t});\r\n\t});\r\n});\r\n"]}
+{"version":3,"file":"procedureHintAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureHintAdapter.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureHintAdapter } from \"./procedureHintAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureHintAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureHintAdapter.defaultVM;\r\n\t\texpect(defaultVM.showHints).toBe(true);\r\n\t\texpect(defaultVM.nextExpectedEvent).toBeNull();\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureHintAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only hint fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureHintAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\tshowHints: false,\r\n\t\t\tnextExpectedEvent: \"event_a\",\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\torderMatters: true,\r\n\t\t\tisQuiz: false,\r\n\t\t\tuserEventLog: [],\r\n\t\t\tcurrentStepIndex: 0,\r\n\t\t\tisComplete: false,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tprogressPercentage: 0,\r\n\t\t\tavailableEvents: [],\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tscore: null,\r\n\t\t\tisSubmitted: false,\r\n\t\t\tstepCategories: { event_a: \"assessed\" },\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\tshowHints: false,\r\n\t\t\tnextExpectedEvent: \"event_a\",\r\n\t\t});\r\n\t});\r\n});\r\n"]}

package/dist/esm/Procedure/Adapters/procedureProgressAdapter.js

@@ -10,6 +10,7 @@ function mapToProgressVM(vm) {
         progressPercentage: vm.progressPercentage,
         isQuiz: vm.isQuiz,
         isSubmitted: vm.isSubmitted,
+        stepCategories: vm.stepCategories,
     };
 }
 class ProcedureProgressAdapter {
@@ -24,6 +25,7 @@ class ProcedureProgressAdapter {
             progressPercentage: 0,
             isQuiz: false,
             isSubmitted: false,
+            stepCategories: {},
         };
         this.wrappers = new WeakMap();
     }

package/dist/esm/Procedure/Adapters/procedureProgressAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedureProgressAdapter.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureProgressAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,SAAS,eAAe,CAAC,EAAe;IACtC,OAAO;QACL,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,eAAe,EAAE,EAAE,CAAC,eAAe;QACnC,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,gBAAgB,EAAE,EAAE,CAAC,gBAAgB;QACrC,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;QACzC,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,WAAW,EAAE,EAAE,CAAC,WAAW;KAC5B,CAAC;AACJ,CAAC;AAED,MAAM,wBAAwB;IAA9B;QAGE,cAAS,GAAwB;YAC/B,QAAQ,EAAE,EAAE;YACZ,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,EAAE;YAChB,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,kBAAkB,EAAE,CAAC;YACrB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;SACnB,CAAC;QAEM,aAAQ,GAAG,IAAI,OAAO,EAG3B,CAAC;IA0BN,CAAC;IAxBC,SAAS,CACP,UAAyB,EACzB,KAAwC;QAExC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,EAAE,CAAC,MAAM;YAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,WAAW,CACT,UAAyB,EACzB,KAAwC;QAExC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC","sourcesContent":["import { SingletonPmAdapter, AppObjectRepo } from \"@vived/core\";\r\nimport { ProcedurePM } from \"../PM/ProcedurePM\";\r\nimport { ProcedureProgressVM, ProcedureVM } from \"../types\";\r\n\r\nfunction mapToProgressVM(vm: ProcedureVM): ProcedureProgressVM {\r\n  return {\r\n    eventIds: vm.eventIds,\r\n    availableEvents: vm.availableEvents,\r\n    userEventLog: vm.userEventLog,\r\n    currentStepIndex: vm.currentStepIndex,\r\n    isComplete: vm.isComplete,\r\n    orderMatters: vm.orderMatters,\r\n    progressPercentage: vm.progressPercentage,\r\n    isQuiz: vm.isQuiz,\r\n    isSubmitted: vm.isSubmitted,\r\n  };\r\n}\r\n\r\nclass ProcedureProgressAdapter\r\n  implements SingletonPmAdapter<ProcedureProgressVM>\r\n{\r\n  defaultVM: ProcedureProgressVM = {\r\n    eventIds: [],\r\n    availableEvents: [],\r\n    userEventLog: [],\r\n    currentStepIndex: 0,\r\n    isComplete: false,\r\n    orderMatters: true,\r\n    progressPercentage: 0,\r\n    isQuiz: false,\r\n    isSubmitted: false,\r\n  };\r\n\r\n  private wrappers = new WeakMap<\r\n    (vm: ProcedureProgressVM) => void,\r\n    (vm: ProcedureVM) => void\r\n  >();\r\n\r\n  subscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureProgressVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = (vm: ProcedureVM) => setVM(mapToProgressVM(vm));\r\n    this.wrappers.set(setVM, wrapper);\r\n    pm.addView(wrapper);\r\n    if (pm.lastVM) setVM(mapToProgressVM(pm.lastVM));\r\n  }\r\n\r\n  unsubscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureProgressVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = this.wrappers.get(setVM);\r\n    if (wrapper) {\r\n      pm.removeView(wrapper);\r\n      this.wrappers.delete(setVM);\r\n    }\r\n  }\r\n}\r\n\r\nexport const procedureProgressAdapter = new ProcedureProgressAdapter();\r\n"]}
+{"version":3,"file":"procedureProgressAdapter.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureProgressAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,SAAS,eAAe,CAAC,EAAe;IACtC,OAAO;QACL,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,eAAe,EAAE,EAAE,CAAC,eAAe;QACnC,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,gBAAgB,EAAE,EAAE,CAAC,gBAAgB;QACrC,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;QACzC,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,WAAW,EAAE,EAAE,CAAC,WAAW;QAC3B,cAAc,EAAE,EAAE,CAAC,cAAc;KAClC,CAAC;AACJ,CAAC;AAED,MAAM,wBAAwB;IAA9B;QAGE,cAAS,GAAwB;YAC/B,QAAQ,EAAE,EAAE;YACZ,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,EAAE;YAChB,gBAAgB,EAAE,CAAC;YACnB,UAAU,EAAE,KAAK;YACjB,YAAY,EAAE,IAAI;YAClB,kBAAkB,EAAE,CAAC;YACrB,MAAM,EAAE,KAAK;YACb,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,EAAE;SACnB,CAAC;QAEM,aAAQ,GAAG,IAAI,OAAO,EAG3B,CAAC;IA0BN,CAAC;IAxBC,SAAS,CACP,UAAyB,EACzB,KAAwC;QAExC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,CAAC;QAChE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,EAAE,CAAC,MAAM;YAAE,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;IAED,WAAW,CACT,UAAyB,EACzB,KAAwC;QAExC,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,IAAI,wBAAwB,EAAE,CAAC","sourcesContent":["import { SingletonPmAdapter, AppObjectRepo } from \"@vived/core\";\r\nimport { ProcedurePM } from \"../PM/ProcedurePM\";\r\nimport { ProcedureProgressVM, ProcedureVM } from \"../types\";\r\n\r\nfunction mapToProgressVM(vm: ProcedureVM): ProcedureProgressVM {\r\n  return {\r\n    eventIds: vm.eventIds,\r\n    availableEvents: vm.availableEvents,\r\n    userEventLog: vm.userEventLog,\r\n    currentStepIndex: vm.currentStepIndex,\r\n    isComplete: vm.isComplete,\r\n    orderMatters: vm.orderMatters,\r\n    progressPercentage: vm.progressPercentage,\r\n    isQuiz: vm.isQuiz,\r\n    isSubmitted: vm.isSubmitted,\r\n    stepCategories: vm.stepCategories,\r\n  };\r\n}\r\n\r\nclass ProcedureProgressAdapter\r\n  implements SingletonPmAdapter<ProcedureProgressVM>\r\n{\r\n  defaultVM: ProcedureProgressVM = {\r\n    eventIds: [],\r\n    availableEvents: [],\r\n    userEventLog: [],\r\n    currentStepIndex: 0,\r\n    isComplete: false,\r\n    orderMatters: true,\r\n    progressPercentage: 0,\r\n    isQuiz: false,\r\n    isSubmitted: false,\r\n    stepCategories: {},\r\n  };\r\n\r\n  private wrappers = new WeakMap<\r\n    (vm: ProcedureProgressVM) => void,\r\n    (vm: ProcedureVM) => void\r\n  >();\r\n\r\n  subscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureProgressVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = (vm: ProcedureVM) => setVM(mapToProgressVM(vm));\r\n    this.wrappers.set(setVM, wrapper);\r\n    pm.addView(wrapper);\r\n    if (pm.lastVM) setVM(mapToProgressVM(pm.lastVM));\r\n  }\r\n\r\n  unsubscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureProgressVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = this.wrappers.get(setVM);\r\n    if (wrapper) {\r\n      pm.removeView(wrapper);\r\n      this.wrappers.delete(setVM);\r\n    }\r\n  }\r\n}\r\n\r\nexport const procedureProgressAdapter = new ProcedureProgressAdapter();\r\n"]}

package/dist/esm/Procedure/Adapters/procedureProgressAdapter.test.js

@@ -18,6 +18,7 @@ describe("procedureProgressAdapter", () => {
         expect(defaultVM.progressPercentage).toBe(0);
         expect(defaultVM.isQuiz).toBe(false);
         expect(defaultVM.isSubmitted).toBe(false);
+        expect(defaultVM.stepCategories).toEqual({});
     });
     it("calls addView on the PM when subscribing", () => {
         const { mockPM, appObjects } = makeTestRig();
@@ -55,6 +56,7 @@ describe("procedureProgressAdapter", () => {
             authoringValidationMessage: null,
             score: null,
             showHints: false,
+            stepCategories: { event_a: "assessed" },
         });
         expect(setVM).toHaveBeenCalledWith({
             eventIds: ["event_a"],
@@ -66,6 +68,7 @@ describe("procedureProgressAdapter", () => {
             progressPercentage: 100,
             isQuiz: true,
             isSubmitted: true,
+            stepCategories: { event_a: "assessed" },
         });
     });
 });

package/dist/esm/Procedure/Adapters/procedureProgressAdapter.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedureProgressAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureProgressAdapter.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureProgressAdapter } from \"./procedureProgressAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureProgressAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureProgressAdapter.defaultVM;\r\n\t\texpect(defaultVM.eventIds).toEqual([]);\r\n\t\texpect(defaultVM.availableEvents).toEqual([]);\r\n\t\texpect(defaultVM.userEventLog).toEqual([]);\r\n\t\texpect(defaultVM.currentStepIndex).toBe(0);\r\n\t\texpect(defaultVM.isComplete).toBe(false);\r\n\t\texpect(defaultVM.orderMatters).toBe(true);\r\n\t\texpect(defaultVM.progressPercentage).toBe(0);\r\n\t\texpect(defaultVM.isQuiz).toBe(false);\r\n\t\texpect(defaultVM.isSubmitted).toBe(false);\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureProgressAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only progress fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tisComplete: true,\r\n\t\t\torderMatters: false,\r\n\t\t\tprogressPercentage: 100,\r\n\t\t\tisQuiz: true,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tnextExpectedEvent: null,\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tscore: null,\r\n\t\t\tshowHints: false,\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tisComplete: true,\r\n\t\t\torderMatters: false,\r\n\t\t\tprogressPercentage: 100,\r\n\t\t\tisQuiz: true,\r\n\t\t\tisSubmitted: true,\r\n\t\t});\r\n\t});\r\n});\r\n"]}
+{"version":3,"file":"procedureProgressAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureProgressAdapter.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureProgressAdapter } from \"./procedureProgressAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureProgressAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureProgressAdapter.defaultVM;\r\n\t\texpect(defaultVM.eventIds).toEqual([]);\r\n\t\texpect(defaultVM.availableEvents).toEqual([]);\r\n\t\texpect(defaultVM.userEventLog).toEqual([]);\r\n\t\texpect(defaultVM.currentStepIndex).toBe(0);\r\n\t\texpect(defaultVM.isComplete).toBe(false);\r\n\t\texpect(defaultVM.orderMatters).toBe(true);\r\n\t\texpect(defaultVM.progressPercentage).toBe(0);\r\n\t\texpect(defaultVM.isQuiz).toBe(false);\r\n\t\texpect(defaultVM.isSubmitted).toBe(false);\r\n\t\texpect(defaultVM.stepCategories).toEqual({});\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureProgressAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only progress fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureProgressAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tisComplete: true,\r\n\t\t\torderMatters: false,\r\n\t\t\tprogressPercentage: 100,\r\n\t\t\tisQuiz: true,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tnextExpectedEvent: null,\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tscore: null,\r\n\t\t\tshowHints: false,\r\n\t\t\tstepCategories: { event_a: \"assessed\" },\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tisComplete: true,\r\n\t\t\torderMatters: false,\r\n\t\t\tprogressPercentage: 100,\r\n\t\t\tisQuiz: true,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tstepCategories: { event_a: \"assessed\" },\r\n\t\t});\r\n\t});\r\n});\r\n"]}

package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.js

@@ -10,6 +10,7 @@ function mapToQuizResultVM(vm) {
         userEventLog: vm.userEventLog,
         score: vm.score,
         isSubmitted: vm.isSubmitted,
+        stepCategories: vm.stepCategories,
     };
 }
 class ProcedureQuizResultAdapter {
@@ -24,6 +25,7 @@ class ProcedureQuizResultAdapter {
             userEventLog: [],
             score: null,
             isSubmitted: false,
+            stepCategories: {},
         };
         this.wrappers = new WeakMap();
     }

package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedureQuizResultAdapter.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureQuizResultAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,SAAS,iBAAiB,CAAC,EAAe;IACxC,OAAO;QACL,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;QACzC,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,eAAe,EAAE,EAAE,CAAC,eAAe;QACnC,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,WAAW,EAAE,EAAE,CAAC,WAAW;KAC5B,CAAC;AACJ,CAAC;AAED,MAAM,0BAA0B;IAAhC;QAGE,cAAS,GAA0B;YACjC,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,KAAK;YACb,kBAAkB,EAAE,CAAC;YACrB,QAAQ,EAAE,EAAE;YACZ,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,KAAK;SACnB,CAAC;QAEM,aAAQ,GAAG,IAAI,OAAO,EAG3B,CAAC;IA0BN,CAAC;IAxBC,SAAS,CACP,UAAyB,EACzB,KAA0C;QAE1C,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,EAAE,CAAC,MAAM;YAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CACT,UAAyB,EACzB,KAA0C;QAE1C,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,EAAE,CAAC","sourcesContent":["import { SingletonPmAdapter, AppObjectRepo } from \"@vived/core\";\r\nimport { ProcedurePM } from \"../PM/ProcedurePM\";\r\nimport { ProcedureQuizResultVM, ProcedureVM } from \"../types\";\r\n\r\nfunction mapToQuizResultVM(vm: ProcedureVM): ProcedureQuizResultVM {\r\n  return {\r\n    isComplete: vm.isComplete,\r\n    isQuiz: vm.isQuiz,\r\n    progressPercentage: vm.progressPercentage,\r\n    eventIds: vm.eventIds,\r\n    availableEvents: vm.availableEvents,\r\n    orderMatters: vm.orderMatters,\r\n    userEventLog: vm.userEventLog,\r\n    score: vm.score,\r\n    isSubmitted: vm.isSubmitted,\r\n  };\r\n}\r\n\r\nclass ProcedureQuizResultAdapter\r\n  implements SingletonPmAdapter<ProcedureQuizResultVM>\r\n{\r\n  defaultVM: ProcedureQuizResultVM = {\r\n    isComplete: false,\r\n    isQuiz: false,\r\n    progressPercentage: 0,\r\n    eventIds: [],\r\n    availableEvents: [],\r\n    orderMatters: true,\r\n    userEventLog: [],\r\n    score: null,\r\n    isSubmitted: false,\r\n  };\r\n\r\n  private wrappers = new WeakMap<\r\n    (vm: ProcedureQuizResultVM) => void,\r\n    (vm: ProcedureVM) => void\r\n  >();\r\n\r\n  subscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureQuizResultVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = (vm: ProcedureVM) => setVM(mapToQuizResultVM(vm));\r\n    this.wrappers.set(setVM, wrapper);\r\n    pm.addView(wrapper);\r\n    if (pm.lastVM) setVM(mapToQuizResultVM(pm.lastVM));\r\n  }\r\n\r\n  unsubscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureQuizResultVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = this.wrappers.get(setVM);\r\n    if (wrapper) {\r\n      pm.removeView(wrapper);\r\n      this.wrappers.delete(setVM);\r\n    }\r\n  }\r\n}\r\n\r\nexport const procedureQuizResultAdapter = new ProcedureQuizResultAdapter();\r\n"]}
+{"version":3,"file":"procedureQuizResultAdapter.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureQuizResultAdapter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAGhD,SAAS,iBAAiB,CAAC,EAAe;IACxC,OAAO;QACL,UAAU,EAAE,EAAE,CAAC,UAAU;QACzB,MAAM,EAAE,EAAE,CAAC,MAAM;QACjB,kBAAkB,EAAE,EAAE,CAAC,kBAAkB;QACzC,QAAQ,EAAE,EAAE,CAAC,QAAQ;QACrB,eAAe,EAAE,EAAE,CAAC,eAAe;QACnC,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,YAAY,EAAE,EAAE,CAAC,YAAY;QAC7B,KAAK,EAAE,EAAE,CAAC,KAAK;QACf,WAAW,EAAE,EAAE,CAAC,WAAW;QAC3B,cAAc,EAAE,EAAE,CAAC,cAAc;KAClC,CAAC;AACJ,CAAC;AAED,MAAM,0BAA0B;IAAhC;QAGE,cAAS,GAA0B;YACjC,UAAU,EAAE,KAAK;YACjB,MAAM,EAAE,KAAK;YACb,kBAAkB,EAAE,CAAC;YACrB,QAAQ,EAAE,EAAE;YACZ,eAAe,EAAE,EAAE;YACnB,YAAY,EAAE,IAAI;YAClB,YAAY,EAAE,EAAE;YAChB,KAAK,EAAE,IAAI;YACX,WAAW,EAAE,KAAK;YAClB,cAAc,EAAE,EAAE;SACnB,CAAC;QAEM,aAAQ,GAAG,IAAI,OAAO,EAG3B,CAAC;IA0BN,CAAC;IAxBC,SAAS,CACP,UAAyB,EACzB,KAA0C;QAE1C,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,CAAC,EAAe,EAAE,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;QAClC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACpB,IAAI,EAAE,CAAC,MAAM;YAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,WAAW,CACT,UAAyB,EACzB,KAA0C;QAE1C,MAAM,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACvC,IAAI,CAAC,EAAE;YAAE,OAAO;QAChB,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE,CAAC;YACZ,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACvB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;CACF;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,EAAE,CAAC","sourcesContent":["import { SingletonPmAdapter, AppObjectRepo } from \"@vived/core\";\r\nimport { ProcedurePM } from \"../PM/ProcedurePM\";\r\nimport { ProcedureQuizResultVM, ProcedureVM } from \"../types\";\r\n\r\nfunction mapToQuizResultVM(vm: ProcedureVM): ProcedureQuizResultVM {\r\n  return {\r\n    isComplete: vm.isComplete,\r\n    isQuiz: vm.isQuiz,\r\n    progressPercentage: vm.progressPercentage,\r\n    eventIds: vm.eventIds,\r\n    availableEvents: vm.availableEvents,\r\n    orderMatters: vm.orderMatters,\r\n    userEventLog: vm.userEventLog,\r\n    score: vm.score,\r\n    isSubmitted: vm.isSubmitted,\r\n    stepCategories: vm.stepCategories,\r\n  };\r\n}\r\n\r\nclass ProcedureQuizResultAdapter\r\n  implements SingletonPmAdapter<ProcedureQuizResultVM>\r\n{\r\n  defaultVM: ProcedureQuizResultVM = {\r\n    isComplete: false,\r\n    isQuiz: false,\r\n    progressPercentage: 0,\r\n    eventIds: [],\r\n    availableEvents: [],\r\n    orderMatters: true,\r\n    userEventLog: [],\r\n    score: null,\r\n    isSubmitted: false,\r\n    stepCategories: {},\r\n  };\r\n\r\n  private wrappers = new WeakMap<\r\n    (vm: ProcedureQuizResultVM) => void,\r\n    (vm: ProcedureVM) => void\r\n  >();\r\n\r\n  subscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureQuizResultVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = (vm: ProcedureVM) => setVM(mapToQuizResultVM(vm));\r\n    this.wrappers.set(setVM, wrapper);\r\n    pm.addView(wrapper);\r\n    if (pm.lastVM) setVM(mapToQuizResultVM(pm.lastVM));\r\n  }\r\n\r\n  unsubscribe(\r\n    appObjects: AppObjectRepo,\r\n    setVM: (vm: ProcedureQuizResultVM) => void,\r\n  ): void {\r\n    const pm = ProcedurePM.get(appObjects);\r\n    if (!pm) return;\r\n    const wrapper = this.wrappers.get(setVM);\r\n    if (wrapper) {\r\n      pm.removeView(wrapper);\r\n      this.wrappers.delete(setVM);\r\n    }\r\n  }\r\n}\r\n\r\nexport const procedureQuizResultAdapter = new ProcedureQuizResultAdapter();\r\n"]}

package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.test.js

@@ -18,6 +18,7 @@ describe("procedureQuizResultAdapter", () => {
         expect(defaultVM.userEventLog).toEqual([]);
         expect(defaultVM.score).toBeNull();
         expect(defaultVM.isSubmitted).toBe(false);
+        expect(defaultVM.stepCategories).toEqual({});
     });
     it("calls addView on the PM when subscribing", () => {
         const { mockPM, appObjects } = makeTestRig();
@@ -59,6 +60,7 @@ describe("procedureQuizResultAdapter", () => {
             authoringValidationMessage: null,
             currentStepIndex: 1,
             showHints: false,
+            stepCategories: { event_a: "assessed" },
         });
         expect(setVM).toHaveBeenCalledWith({
             isComplete: true,
@@ -70,6 +72,7 @@ describe("procedureQuizResultAdapter", () => {
             userEventLog: ["event_a"],
             score,
             isSubmitted: true,
+            stepCategories: { event_a: "assessed" },
         });
     });
 });

package/dist/esm/Procedure/Adapters/procedureQuizResultAdapter.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"procedureQuizResultAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureQuizResultAdapter.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAE/D,SAAS,WAAW;IACnB,MAAM,UAAU,GAAG,iBAAiB,EAAE,CAAC;IACvC,MAAM,MAAM,GAAG,mBAAmB,CAAC,UAAU,CAAC,CAAC;IAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;AAC/B,CAAC;AAED,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC3C,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC3C,MAAM,SAAS,GAAG,0BAA0B,CAAC,SAAS,CAAC;QACvD,MAAM,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACzC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7C,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACvC,MAAM,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC9C,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAC3C,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;QACnC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,GAAG,EAAE;QACnD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC;QAC7C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAExB,0BAA0B,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAExD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACxD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC;QAC7C,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAC9B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAExB,0BAA0B,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QACxD,0BAA0B,CAAC,WAAW,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAE1D,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,gBAAgB,EAAE,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,GAAG,EAAE;QACxD,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,WAAW,EAAE,CAAC;QAC7C,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAExB,0BAA0B,CAAC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;QAExD,MAAM,KAAK,GAAG;YACb,UAAU,EAAE,EAAE;YACd,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;SACjF,CAAC;QAEF,MAAM,eAAe,GAAI,MAAM,CAAC,OAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACvE,eAAe,CAAC;YACf,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,kBAAkB,EAAE,EAAE;YACtB,QAAQ,EAAE,CAAC,SAAS,CAAC;YACrB,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YACrD,YAAY,EAAE,KAAK;YACnB,YAAY,EAAE,CAAC,SAAS,CAAC;YACzB,KAAK;YACL,WAAW,EAAE,IAAI;YACjB,iBAAiB,EAAE,IAAI;YACvB,iBAAiB,EAAE,IAAI;YACvB,0BAA0B,EAAE,IAAI;YAChC,gBAAgB,EAAE,CAAC;YACnB,SAAS,EAAE,KAAK;SAChB,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,CAAC,oBAAoB,CAAC;YAClC,UAAU,EAAE,IAAI;YAChB,MAAM,EAAE,IAAI;YACZ,kBAAkB,EAAE,EAAE;YACtB,QAAQ,EAAE,CAAC,SAAS,CAAC;YACrB,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;YACrD,YAAY,EAAE,KAAK;YACnB,YAAY,EAAE,CAAC,SAAS,CAAC;YACzB,KAAK;YACL,WAAW,EAAE,IAAI;SACjB,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureQuizResultAdapter } from \"./procedureQuizResultAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureQuizResultAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureQuizResultAdapter.defaultVM;\r\n\t\texpect(defaultVM.isComplete).toBe(false);\r\n\t\texpect(defaultVM.isQuiz).toBe(false);\r\n\t\texpect(defaultVM.progressPercentage).toBe(0);\r\n\t\texpect(defaultVM.eventIds).toEqual([]);\r\n\t\texpect(defaultVM.availableEvents).toEqual([]);\r\n\t\texpect(defaultVM.orderMatters).toBe(true);\r\n\t\texpect(defaultVM.userEventLog).toEqual([]);\r\n\t\texpect(defaultVM.score).toBeNull();\r\n\t\texpect(defaultVM.isSubmitted).toBe(false);\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureQuizResultAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only quiz result fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst score = {\r\n\t\t\tpercentage: 75,\r\n\t\t\tcomparison: [{ eventId: \"event_a\", expected: true, actual: true, correct: true }],\r\n\t\t};\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\tisComplete: true,\r\n\t\t\tisQuiz: true,\r\n\t\t\tprogressPercentage: 75,\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\torderMatters: false,\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tscore,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tnextExpectedEvent: null,\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tshowHints: false,\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\tisComplete: true,\r\n\t\t\tisQuiz: true,\r\n\t\t\tprogressPercentage: 75,\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\torderMatters: false,\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tscore,\r\n\t\t\tisSubmitted: true,\r\n\t\t});\r\n\t});\r\n});\r\n"]}
+{"version":3,"file":"procedureQuizResultAdapter.test.js","sourceRoot":"","sources":["../../../../src/Procedure/Adapters/procedureQuizResultAdapter.test.ts"],"names":[],"mappings":"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","sourcesContent":["import { makeAppObjectRepo } from \"@vived/core\";\r\nimport { procedureQuizResultAdapter } from \"./procedureQuizResultAdapter\";\r\nimport { makeMockProcedurePM } from \"../Mocks/MockProcedurePM\";\r\n\r\nfunction makeTestRig() {\r\n\tconst appObjects = makeAppObjectRepo();\r\n\tconst mockPM = makeMockProcedurePM(appObjects);\r\n\treturn { appObjects, mockPM };\r\n}\r\n\r\ndescribe(\"procedureQuizResultAdapter\", () => {\r\n\tit(\"has the correct default VM shape\", () => {\r\n\t\tconst defaultVM = procedureQuizResultAdapter.defaultVM;\r\n\t\texpect(defaultVM.isComplete).toBe(false);\r\n\t\texpect(defaultVM.isQuiz).toBe(false);\r\n\t\texpect(defaultVM.progressPercentage).toBe(0);\r\n\t\texpect(defaultVM.eventIds).toEqual([]);\r\n\t\texpect(defaultVM.availableEvents).toEqual([]);\r\n\t\texpect(defaultVM.orderMatters).toBe(true);\r\n\t\texpect(defaultVM.userEventLog).toEqual([]);\r\n\t\texpect(defaultVM.score).toBeNull();\r\n\t\texpect(defaultVM.isSubmitted).toBe(false);\r\n\t\texpect(defaultVM.stepCategories).toEqual({});\r\n\t});\r\n\r\n\tit(\"calls addView on the PM when subscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.addView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"calls removeView on the PM when unsubscribing\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.removeView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\t\tprocedureQuizResultAdapter.unsubscribe(appObjects, setVM);\r\n\r\n\t\texpect(mockPM.removeView).toHaveBeenCalled();\r\n\t});\r\n\r\n\tit(\"maps only quiz result fields from the full VM\", () => {\r\n\t\tconst { mockPM, appObjects } = makeTestRig();\r\n\t\tmockPM.addView = jest.fn();\r\n\t\tconst setVM = jest.fn();\r\n\r\n\t\tprocedureQuizResultAdapter.subscribe(appObjects, setVM);\r\n\r\n\t\tconst score = {\r\n\t\t\tpercentage: 75,\r\n\t\t\tcomparison: [{ eventId: \"event_a\", expected: true, actual: true, correct: true }],\r\n\t\t};\r\n\r\n\t\tconst capturedWrapper = (mockPM.addView as jest.Mock).mock.calls[0][0];\r\n\t\tcapturedWrapper({\r\n\t\t\tisComplete: true,\r\n\t\t\tisQuiz: true,\r\n\t\t\tprogressPercentage: 75,\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\torderMatters: false,\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tscore,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tvalidationMessage: null,\r\n\t\t\tnextExpectedEvent: null,\r\n\t\t\tauthoringValidationMessage: null,\r\n\t\t\tcurrentStepIndex: 1,\r\n\t\t\tshowHints: false,\r\n\t\t\tstepCategories: { event_a: \"assessed\" },\r\n\t\t});\r\n\r\n\t\texpect(setVM).toHaveBeenCalledWith({\r\n\t\t\tisComplete: true,\r\n\t\t\tisQuiz: true,\r\n\t\t\tprogressPercentage: 75,\r\n\t\t\teventIds: [\"event_a\"],\r\n\t\t\tavailableEvents: [{ id: \"event_a\", name: \"Event A\" }],\r\n\t\t\torderMatters: false,\r\n\t\t\tuserEventLog: [\"event_a\"],\r\n\t\t\tscore,\r\n\t\t\tisSubmitted: true,\r\n\t\t\tstepCategories: { event_a: \"assessed\" },\r\n\t\t});\r\n\t});\r\n});\r\n"]}

package/dist/esm/Procedure/Entities/ProcedureEntity.js

@@ -12,6 +12,55 @@ ProcedureEntity.get = (appObjects) => getSingletonComponent(ProcedureEntity.type
 export function makeProcedureEntity(appObject) {
     return new ProcedureEntityImp(appObject);
 }
+/**
+ * Aligns `actual` against `expected` by longest common subsequence (LCS) and
+ * reports, for each index of `expected`, whether that step takes part in the
+ * alignment. `matched.filter(Boolean).length` is the LCS length.
+ *
+ * Pure function over two plain arrays: callers decide what goes in. That is the
+ * seam for event categories (#53) — pre-filter both arrays to the assessed
+ * subsequence and nothing in here needs to change.
+ *
+ * Deterministic tie-break: when several alignments share the maximum length
+ * (e.g. two swapped steps), the one that matches the EARLIEST expected steps
+ * wins, so the same step is reported incorrect on every run.
+ *
+ * O(n·m) dynamic programming; procedures are ~20 steps at most.
+ */
+function alignBySubsequence(expected, actual) {
+    const n = expected.length;
+    const m = actual.length;
+    // lcs[i][j] = LCS length of expected[i..] against actual[j..]
+    const lcs = Array.from({ length: n + 1 }, () => new Array(m + 1).fill(0));
+    for (let i = n - 1; i >= 0; i--) {
+        for (let j = m - 1; j >= 0; j--) {
+            lcs[i][j] =
+                expected[i] === actual[j]
+                    ? lcs[i + 1][j + 1] + 1
+                    : Math.max(lcs[i + 1][j], lcs[i][j + 1]);
+        }
+    }
+    // Walk forward from the start. Matching an equal pair is always optimal.
+    // On a mismatch, prefer skipping the actual entry whenever that costs
+    // nothing, which keeps the current (earliest) expected step in play.
+    const matched = new Array(n).fill(false);
+    let e = 0; // index into expected
+    let a = 0; // index into actual
+    while (e < n && a < m) {
+        if (expected[e] === actual[a]) {
+            matched[e] = true;
+            e++;
+            a++;
+        }
+        else if (lcs[e][a + 1] === lcs[e][a]) {
+            a++;
+        }
+        else {
+            e++;
+        }
+    }
+    return matched;
+}
 class ProcedureEntityImp extends ProcedureEntity {
     get helpHeading() {
         if (this._isQuiz)
@@ -44,17 +93,48 @@ class ProcedureEntityImp extends ProcedureEntity {
         return this._currentStepIndex;
     }
     get isComplete() {
-        if (this._eventIds.length === 0)
+        const expected = this.evaluatedEventIds;
+        if (expected.length === 0)
             return false;
         if (this._orderMatters) {
-            return this._currentStepIndex >= this._eventIds.length;
+            return this._currentStepIndex >= expected.length;
         }
         else {
-            const requiredEvents = new Set(this._eventIds);
-            const emittedEvents = new Set(this._userEventLog);
+            const requiredEvents = new Set(expected);
+            const emittedEvents = new Set(this.evaluatedUserEventLog);
             return Array.from(requiredEvents).every((event) => emittedEvents.has(event));
         }
     }
+    /**
+     * Whether a step takes part in evaluation (#53). In training every authored
+     * step counts. In quiz mode only "assessed" steps do: instructional steps are
+     * quiz-neutral, so they are filtered out of BOTH the authored list and the
+     * student's log before any scoring, progress, completion or hint decision.
+     * Categories come from the injected lookup at call time, never from state.
+     */
+    isEvaluated(eventId) {
+        return !this._isQuiz || this._getEventCategory(eventId) === "assessed";
+    }
+    /** The authored steps that are evaluated (all of them outside quiz mode). */
+    get evaluatedEventIds() {
+        return this._eventIds.filter((eventId) => this.isEvaluated(eventId));
+    }
+    /** The student's log restricted to evaluated steps. */
+    get evaluatedUserEventLog() {
+        return this._userEventLog.filter((eventId) => this.isEvaluated(eventId));
+    }
+    /**
+     * The validation message for a quiz whose authored steps are all
+     * instructional (#53), or null when it is not that case. Such a quiz has
+     * events but nothing to score — scoring, progress and completion all run on
+     * the empty assessed subsequence — so it must be flagged rather than silently
+     * treated as valid.
+     */
+    get quizNeedsAssessedStepMessage() {
+        return this._isQuiz && this.evaluatedEventIds.length === 0
+            ? "A quiz needs at least one assessed step"
+            : null;
+    }
     get validationMessage() {
         return this._validationMessage;
     }
@@ -118,10 +198,30 @@ class ProcedureEntityImp extends ProcedureEntity {
         if (!this._eventIds.includes(eventId)) {
             return;
         }
+        if (!this.isEvaluated(eventId)) {
+            // Quiz mode, instructional step: quiz-neutral. Record it once as evidence
+            // the student reached this guidance step, but a re-emission (e.g.
+            // revisiting a viewpoint) is not re-logged — mirroring the benign-revisit
+            // rule for assessed steps and keeping the log bounded no matter how often
+            // the student oscillates. It never advances the attempt nor flags a wrong
+            // step; however they got here counts the same.
+            if (!this._userEventLog.includes(eventId)) {
+                this._userEventLog.push(eventId);
+                this.updateState();
+            }
+            return;
+        }
+        if (this._orderMatters && this.isBenignRevisit(eventId)) {
+            // Re-emission of an already-completed step (a toggle, a navigation
+            // arrival, an accidental double-trigger). It carries no information about
+            // the attempt, so it neither enters the log nor flashes a hint.
+            return;
+        }
         this._userEventLog.push(eventId);
         if (this._orderMatters) {
-            if (this._currentStepIndex < this._eventIds.length) {
-                const expectedEvent = this._eventIds[this._currentStepIndex];
+            const expected = this.evaluatedEventIds;
+            if (this._currentStepIndex < expected.length) {
+                const expectedEvent = expected[this._currentStepIndex];
                 if (eventId === expectedEvent) {
                     this._currentStepIndex++;
                     this._validationMessage = null;
@@ -133,10 +233,25 @@ class ProcedureEntityImp extends ProcedureEntity {
         }
         this.updateState();
     }
+    /**
+     * An event is a benign revisit when it is an evaluated step that has already
+     * been completed. Well-defined because addEventId guarantees eventIds are
+     * unique, so indexOf identifies the step. An early emission of a LATER step
+     * is not a revisit and is still logged and flagged. `currentStepIndex`
+     * indexes the evaluated list, so the lookup is against that list too.
+     */
+    isBenignRevisit(eventId) {
+        const stepIndex = this.evaluatedEventIds.indexOf(eventId);
+        return stepIndex !== -1 && stepIndex < this._currentStepIndex;
+    }
     validateProgress() {
         if (this._eventIds.length === 0) {
             return "At least one event must be added to the procedure";
         }
+        const quizMessage = this.quizNeedsAssessedStepMessage;
+        if (quizMessage) {
+            return quizMessage;
+        }
         if (this.isComplete) {
             return null;
         }
@@ -146,17 +261,18 @@ class ProcedureEntityImp extends ProcedureEntity {
         return null;
     }
     getNextExpectedEvent() {
-        if (!this._showHints || this._eventIds.length === 0) {
+        const expected = this.evaluatedEventIds;
+        if (!this._showHints || expected.length === 0) {
             return null;
         }
         if (this._orderMatters) {
-            if (this._currentStepIndex < this._eventIds.length) {
-                return this._eventIds[this._currentStepIndex];
+            if (this._currentStepIndex < expected.length) {
+                return expected[this._currentStepIndex];
             }
         }
         else {
-            const emittedEvents = new Set(this._userEventLog);
-            return (this._eventIds.find((eventId) => !emittedEvents.has(eventId)) || null);
+            const emittedEvents = new Set(this.evaluatedUserEventLog);
+            return expected.find((eventId) => !emittedEvents.has(eventId)) || null;
         }
         return null;
     }
@@ -187,30 +303,52 @@ class ProcedureEntityImp extends ProcedureEntity {
         this._isRecording = value;
         this.updateState();
     }
+    setEventCategoryLookup(lookup) {
+        // Wiring, not serialized state: it is not part of the state hash. Notify
+        // directly so a PM built before the factory wired the lookup rebuilds.
+        this._getEventCategory = lookup;
+        this.notifyOnChange();
+    }
+    getEventCategory(eventId) {
+        return this._getEventCategory(eventId);
+    }
     getProgressPercentage() {
-        if (this._eventIds.length === 0)
+        const expected = this.evaluatedEventIds;
+        if (expected.length === 0)
             return 0;
         if (this._orderMatters) {
-            return Math.round((this._currentStepIndex / this._eventIds.length) * 100);
+            return Math.round((this._currentStepIndex / expected.length) * 100);
         }
         else {
-            const requiredEvents = new Set(this._eventIds);
-            const emittedEvents = new Set(this._userEventLog);
+            const requiredEvents = new Set(expected);
+            const emittedEvents = new Set(this.evaluatedUserEventLog);
             const completedCount = Array.from(requiredEvents).filter((event) => emittedEvents.has(event)).length;
-            return Math.round((completedCount / this._eventIds.length) * 100);
+            return Math.round((completedCount / expected.length) * 100);
         }
     }
     calculateScore() {
-        if (this._eventIds.length === 0) {
+        // In quiz mode only assessed steps are scored (#53): instructional steps
+        // are dropped from BOTH the expected list and the log, so a quiz made only
+        // of instructional steps scores like an empty procedure.
+        const expectedIds = this.evaluatedEventIds;
+        if (expectedIds.length === 0) {
             return { percentage: 0, comparison: [] };
         }
         const comparison = [];
         let correctCount = 0;
         if (this._orderMatters) {
-            for (let i = 0; i < this._eventIds.length; i++) {
-                const eventId = this._eventIds[i];
+            // The score answers "did the student perform the required steps in the
+            // required order?" — so it is the longest run of expected steps that
+            // appear in order in the log, not a positional index-by-index compare
+            // (which collapsed to near zero after a single extra, skipped, or
+            // repeated step). Extra authored events are not penalized here.
+            // Both arrays are already the assessed subsequence in quiz mode, so an
+            // instructional emission can never shift the alignment.
+            const matched = alignBySubsequence(expectedIds, this.evaluatedUserEventLog);
+            for (let i = 0; i < expectedIds.length; i++) {
+                const eventId = expectedIds[i];
                 const expected = true;
-                const actual = i < this._userEventLog.length && this._userEventLog[i] === eventId;
+                const actual = matched[i];
                 const correct = actual;
                 comparison.push({ eventId, expected, actual, correct });
                 if (correct)
@@ -218,8 +356,8 @@ class ProcedureEntityImp extends ProcedureEntity {
             }
         }
         else {
-            const emittedEvents = new Set(this._userEventLog);
-            for (const eventId of this._eventIds) {
+            const emittedEvents = new Set(this.evaluatedUserEventLog);
+            for (const eventId of expectedIds) {
                 const expected = true;
                 const actual = emittedEvents.has(eventId);
                 const correct = actual;
@@ -228,7 +366,7 @@ class ProcedureEntityImp extends ProcedureEntity {
                     correctCount++;
             }
         }
-        const percentage = Math.round((correctCount / this._eventIds.length) * 100);
+        const percentage = Math.round((correctCount / expectedIds.length) * 100);
         return { percentage, comparison };
     }
     submit() {
@@ -246,7 +384,7 @@ class ProcedureEntityImp extends ProcedureEntity {
         if (this._eventIds.length === 0) {
             return "At least one event must be added to the procedure";
         }
-        return this._validationMessage;
+        return this.quizNeedsAssessedStepMessage ?? this._validationMessage;
     }
     updateState() {
         const stateHash = JSON.stringify({
@@ -275,6 +413,7 @@ class ProcedureEntityImp extends ProcedureEntity {
         this._validationMessage = null;
         this._score = null;
         this._isSubmitted = false;
+        this._getEventCategory = () => "assessed";
         this.memoizedState = new MemoizedString("", this.notifyOnChange);
         this.appObjects.registerSingleton(this);
         this.updateState();