@vived/app 4.27.0 → 4.28.0

package/lib/Components/Callouts/UC/LookAtCameraUC.js

@@ -91,7 +91,7 @@ class LookAtCameraUCIMP extends LookAtCameraUC {
             const kd = 5;
             const pEffect = kp * error;
             const dEffect = kd * (deltaError / 10);
-            let deltaAng = pEffect + dEffect;
+            const deltaAng = pEffect + dEffect;
             let slerpPercent = deltaAng / error;
             if (slerpPercent > 1) {
                 slerpPercent = 1;

package/lib/Components/Camera/PM/CameraPM.d.ts

@@ -7,6 +7,7 @@ export interface CameraVM {
     farClip: number;
     fov: Angle;
 }
+export declare const defaultCameraVM: CameraVM;
 export declare abstract class CameraPM extends AppObjectPM<CameraVM> {
     static readonly type = "CameraPM";
     static get: (appObjects: AppObjectRepo) => CameraPM | undefined;

package/lib/Components/Camera/PM/CameraPM.js

@@ -1,9 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeCameraPM = exports.CameraPM = void 0;
+exports.makeCameraPM = exports.CameraPM = exports.defaultCameraVM = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ValueObjects_1 = require("../../../ValueObjects");
 const CameraEntity_1 = require("../Entities/CameraEntity");
+exports.defaultCameraVM = {
+    farClip: 0,
+    fov: ValueObjects_1.Angle.FromDegrees(60),
+    nearClip: 0,
+    position: ValueObjects_1.Vector3.Zero(),
+    target: ValueObjects_1.Vector3.One()
+};
 class CameraPM extends AppObject_1.AppObjectPM {
 }
 exports.CameraPM = CameraPM;

package/lib/Components/Camera/index.d.ts

@@ -1,2 +1,4 @@
+export * from "./Adapters";
 export * from "./Entities";
+export * from "./Mocks";
 export * from "./PM";

package/lib/Components/Camera/index.js

@@ -10,5 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./Adapters"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Mocks"), exports);
 __exportStar(require("./PM"), exports);

package/lib/Components/Challenge/Adapters/challengeAuthorHelpHookAdapter.d.ts

@@ -1,3 +1,3 @@
-import { ReactHookPmAdapter } from "../../../Types/ReactHookPmAdapter";
+import { SingletonPmAdapter } from "../../../Types";
 import { ChallengeAuthorHelpVM } from "../PMs/ChallengeAuthorHelpPM";
-export declare const challengeAuthorHelpHookAdapter: ReactHookPmAdapter<ChallengeAuthorHelpVM>;
+export declare const challengeAuthorHelpHookAdapter: SingletonPmAdapter<ChallengeAuthorHelpVM>;

package/lib/Components/Challenge/Adapters/challengeConsumerHelpHookAdapter.d.ts

@@ -1,3 +1,3 @@
-import { ReactHookPmAdapter } from "../../../Types/ReactHookPmAdapter";
+import { SingletonPmAdapter } from "../../../Types";
 import { ChallengeConsumerHelpVM } from "../PMs/ChallengeConsumerHelpPM";
-export declare const challengeConsumerHelpHookAdapter: ReactHookPmAdapter<ChallengeConsumerHelpVM>;
+export declare const challengeConsumerHelpHookAdapter: SingletonPmAdapter<ChallengeConsumerHelpVM>;

package/lib/Components/Challenge/Adapters/selectedChallengeHookAdapter.d.ts

@@ -1,3 +1,3 @@
-import { ReactHookPmAdapter } from "../../../Types/ReactHookPmAdapter";
+import { SingletonPmAdapter } from "../../../Types";
 import { SelectedChallengeVM } from "../PMs/SelectedChallengePM";
-export declare function makeSelectedChallengeHookAdapter<CT>(): ReactHookPmAdapter<SelectedChallengeVM<CT>>;
+export declare const selectedChallengeHookAdapter: SingletonPmAdapter<SelectedChallengeVM>;

package/lib/Components/Challenge/Adapters/selectedChallengeHookAdapter.js

@@ -1,29 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSelectedChallengeHookAdapter = void 0;
+exports.selectedChallengeHookAdapter = void 0;
 const SelectedChallengePM_1 = require("../PMs/SelectedChallengePM");
-function makeSelectedChallengeHookAdapter() {
-    return {
-        defaultVM: {
-            challenge: undefined,
-            options: [],
-        },
-        subscribe: (appObjects, setVM) => {
-            const pm = SelectedChallengePM_1.SelectedChallengePM.get(appObjects);
-            if (!pm) {
-                appObjects.submitError("inspectorTabAdapter", "Unable to find InspectorTabPM");
-                return;
-            }
-            pm.addView(setVM);
-        },
-        unsubscribe: (appObjects, setVM) => {
-            const pm = SelectedChallengePM_1.SelectedChallengePM.get(appObjects);
-            if (!pm) {
-                appObjects.submitError("inspectorTabAdapter", "Unable to find InspectorTabPM");
-                return;
-            }
-            pm.removeView(setVM);
-        },
-    };
-}
-exports.makeSelectedChallengeHookAdapter = makeSelectedChallengeHookAdapter;
+exports.selectedChallengeHookAdapter = {
+    defaultVM: SelectedChallengePM_1.defaultSelectedChallengeVM,
+    subscribe: (appObjects, setVM) => {
+        const pm = SelectedChallengePM_1.SelectedChallengePM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("inspectorTabAdapter", "Unable to find InspectorTabPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (appObjects, setVM) => {
+        const pm = SelectedChallengePM_1.SelectedChallengePM.get(appObjects);
+        if (!pm) {
+            appObjects.submitError("inspectorTabAdapter", "Unable to find InspectorTabPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/Challenge/Controller/setChallenge.d.ts

@@ -1,2 +1,2 @@
 import { AppObjectRepo } from "../../../AppObject";
-export declare function setChallenge<CT>(challenge: CT, appObjects: AppObjectRepo): void;
+export declare function setChallenge(challenge: string, appObjects: AppObjectRepo): void;

package/lib/Components/Challenge/Entities/ChallengeEntity.d.ts

@@ -1,30 +1,23 @@
 import { AppObject, AppObjectEntity, AppObjectRepo } from "../../../AppObject";
-export declare abstract class ChallengeEntity<CT> extends AppObjectEntity {
+export interface Challenge {
+    challengeID: string;
+    name: string;
+    helpHeading: string;
+    consumerHelpText: string;
+    authorHelpText: string;
+    reset: () => void;
+}
+export declare abstract class ChallengeEntity extends AppObjectEntity {
     static type: string;
-    abstract readonly defaultChallenge: CT;
-    abstract get selectedChallenge(): CT;
-    abstract set selectedChallenge(val: CT);
+    abstract registerChallenge(challenge: Challenge): void;
+    abstract get selectedChallenge(): string;
+    abstract set selectedChallenge(id: string);
+    abstract get allChallenges(): Challenge[];
+    abstract get selectedChallengeHeading(): string;
     abstract get selectedChallengeName(): string;
-    abstract get allChallengeNames(): Map<CT, string>;
-    abstract setChallengeNames(list: {
-        value: CT;
-        label: string;
-    }[]): void;
-    abstract get helpHeading(): string;
-    abstract setHelpHeading(list: {
-        value: CT;
-        label: string;
-    }[]): void;
-    abstract get helpText(): string;
-    abstract setHelpText(list: {
-        value: CT;
-        label: string;
-    }[]): void;
-    abstract get authorHelp(): string;
-    abstract setAuthorHelp(list: {
-        value: CT;
-        label: string;
-    }[]): void;
-    static get<ChallengeType>(appObjects: AppObjectRepo): ChallengeEntity<ChallengeType> | undefined;
+    abstract get selectedChallengeConsumerHelp(): string;
+    abstract get selectedChallengeAuthorHelp(): string;
+    abstract resetSelectedChallenge(): void;
+    static get(appObjects: AppObjectRepo): ChallengeEntity | undefined;
 }
-export declare function makeChallengeEntity<CT>(appObject: AppObject, defaultChallenge: CT): ChallengeEntity<CT>;
+export declare function makeChallengeEntity(appObject: AppObject): ChallengeEntity;

package/lib/Components/Challenge/Entities/ChallengeEntity.js

@@ -9,71 +9,61 @@ class ChallengeEntity extends AppObject_1.AppObjectEntity {
 }
 exports.ChallengeEntity = ChallengeEntity;
 ChallengeEntity.type = "ChallengeEntity";
-function makeChallengeEntity(appObject, defaultChallenge) {
-    return new ChallengeEntityImp(appObject, defaultChallenge);
+function makeChallengeEntity(appObject) {
+    return new ChallengeEntityImp(appObject);
 }
 exports.makeChallengeEntity = makeChallengeEntity;
 class ChallengeEntityImp extends ChallengeEntity {
-    constructor(appObject, defaultChallenge) {
+    constructor(appObject) {
         super(appObject, ChallengeEntity.type);
-        this.challengeNameLookup = new Map();
-        this.helpTextLookup = new Map();
-        this.authorHelpLookup = new Map();
-        this.helpHeadingLookup = new Map();
-        this.defaultChallenge = defaultChallenge;
+        this.challengeLookup = new Map();
+        this.noChallenge = {
+            authorHelpText: "",
+            consumerHelpText: "",
+            helpHeading: "",
+            challengeID: "NONE",
+            name: "None",
+            reset: () => { },
+        };
+        this._selectedChallenge = this.noChallenge;
+        this.resetSelectedChallenge = () => {
+            this._selectedChallenge.reset();
+        };
         this.appObjects.registerSingleton(this);
+        this.registerChallenge(this.noChallenge);
     }
-    get selectedChallengeName() {
-        var _a;
-        return (_a = this.challengeNameLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
-    }
-    get allChallengeNames() {
-        return this.challengeNameLookup;
-    }
-    setChallengeNames(list) {
-        list.forEach((item) => {
-            this.challengeNameLookup.set(item.value, item.label);
-        });
-    }
-    get helpText() {
-        var _a;
-        return (_a = this.helpTextLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
-    }
-    setHelpText(list) {
-        list.forEach((item) => {
-            this.helpTextLookup.set(item.value, item.label);
-        });
-    }
-    get authorHelp() {
-        var _a;
-        return (_a = this.authorHelpLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
-    }
-    setAuthorHelp(list) {
-        list.forEach((item) => {
-            this.authorHelpLookup.set(item.value, item.label);
-        });
-    }
-    get helpHeading() {
-        var _a;
-        return (_a = this.helpHeadingLookup.get(this.selectedChallenge)) !== null && _a !== void 0 ? _a : "";
+    registerChallenge(challenge) {
+        this.challengeLookup.set(challenge.challengeID, challenge);
+        this.notifyOnChange();
     }
-    setHelpHeading(list) {
-        list.forEach((item) => {
-            this.helpHeadingLookup.set(item.value, item.label);
-        });
+    get allChallenges() {
+        return Array.from(this.challengeLookup.values());
     }
     get selectedChallenge() {
-        if (!this._selectedChallenge) {
-            return this.defaultChallenge;
+        return this._selectedChallenge.challengeID;
+    }
+    set selectedChallenge(id) {
+        if (id === this._selectedChallenge.challengeID)
+            return;
+        const desiredChallenge = this.challengeLookup.get(id);
+        if (desiredChallenge) {
+            this._selectedChallenge = desiredChallenge;
+            this.notifyOnChange();
         }
         else {
-            return this._selectedChallenge;
+            this.warn(`Challenge ${id} not register`);
         }
     }
-    set selectedChallenge(val) {
-        if (this._selectedChallenge === val)
-            return;
-        this._selectedChallenge = val;
-        this.notifyOnChange();
+    get selectedChallengeName() {
+        return this._selectedChallenge.name;
+    }
+    get selectedChallengeConsumerHelp() {
+        return this._selectedChallenge.consumerHelpText;
+    }
+    get selectedChallengeAuthorHelp() {
+        return this._selectedChallenge.authorHelpText;
+    }
+    get selectedChallengeHeading() {
+        return this._selectedChallenge.helpHeading;
     }
 }

package/lib/Components/Challenge/Mocks/MockSelectedChallengePM.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="jest" />
 import { AppObject, AppObjectRepo } from "../../../AppObject";
 import { SelectedChallengePM } from "../PMs/SelectedChallengePM";
-export declare class MockSelectedChallengePM<CT> extends SelectedChallengePM<CT> {
+export declare class MockSelectedChallengePM extends SelectedChallengePM {
     vmsAreEqual: jest.Mock<any, any>;
     constructor(appObject: AppObject);
 }
-export declare function makeMockSelectedChallengePM<CT>(appObjects: AppObjectRepo): MockSelectedChallengePM<CT>;
+export declare function makeMockSelectedChallengePM(appObjects: AppObjectRepo): MockSelectedChallengePM;

package/lib/Components/Challenge/Mocks/MockSetChallengeUC.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="jest" />
 import { AppObject, AppObjectRepo } from "../../../AppObject";
 import { SetChallengeUC } from "../UCs/SetChallengeUC";
-export declare class MockSetChallengeUC<CT> extends SetChallengeUC<CT> {
+export declare class MockSetChallengeUC extends SetChallengeUC {
     setChallenge: jest.Mock<any, any>;
     constructor(appObject: AppObject);
 }
-export declare function makeMockSetChallengeUC<CT>(appObjects: AppObjectRepo): MockSetChallengeUC<CT>;
+export declare function makeMockSetChallengeUC(appObjects: AppObjectRepo): MockSetChallengeUC;

package/lib/Components/Challenge/Mocks/index.d.ts

@@ -1,3 +1,5 @@
+export * from "./ChallengeEntityMock";
+export * from "./ChallengeMock";
 export * from "./MockChallengeAuthorHelpPM";
 export * from "./MockChallengeConsumerHelpPM";
 export * from "./MockSelectedChallengePM";

package/lib/Components/Challenge/Mocks/index.js

@@ -10,6 +10,8 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./ChallengeEntityMock"), exports);
+__exportStar(require("./ChallengeMock"), exports);
 __exportStar(require("./MockChallengeAuthorHelpPM"), exports);
 __exportStar(require("./MockChallengeConsumerHelpPM"), exports);
 __exportStar(require("./MockSelectedChallengePM"), exports);

package/lib/Components/Challenge/PMs/ChallengeAuthorHelpPM.d.ts

@@ -7,5 +7,5 @@ export declare abstract class ChallengeAuthorHelpPM extends AppObjectPM<Challeng
     static type: string;
     static get(appObjects: AppObjectRepo): ChallengeAuthorHelpPM | undefined;
 }
-export declare function makeChallengeAuthorHelpPM<CT>(appObject: AppObject): ChallengeAuthorHelpPM;
+export declare function makeChallengeAuthorHelpPM(appObject: AppObject): ChallengeAuthorHelpPM;
 export declare const defaultChallengeAuthorHelpVM: ChallengeAuthorHelpVM;

package/lib/Components/Challenge/PMs/ChallengeAuthorHelpPM.js

@@ -16,11 +16,12 @@ function makeChallengeAuthorHelpPM(appObject) {
 exports.makeChallengeAuthorHelpPM = makeChallengeAuthorHelpPM;
 class ChallengeAuthorHelpPMImp extends AppObject_1.AppObjectPM {
     constructor(appObject) {
+        var _a;
         super(appObject, ChallengeAuthorHelpPM.type);
         this.onEntityChange = () => {
             if (!this.challengeEntity)
                 return;
-            const text = this.challengeEntity.authorHelp;
+            const text = this.challengeEntity.selectedChallengeAuthorHelp;
             const heading = this.challengeEntity.selectedChallengeName;
             const vm = {
                 heading,
@@ -28,15 +29,13 @@ class ChallengeAuthorHelpPMImp extends AppObject_1.AppObjectPM {
             };
             this.doUpdateView(vm);
         };
-        this.challengeEntity = appObject.getComponent(ChallengeEntity_1.ChallengeEntity.type);
-        if (!this.challengeEntity) {
-            this.error("PM has been added to an app object that does not have ChallengeEntity");
-            return;
-        }
-        this.challengeEntity.addChangeObserver(this.onEntityChange);
+        (_a = this.challengeEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
         this.onEntityChange();
         this.appObjects.registerSingleton(this);
     }
+    get challengeEntity() {
+        return this.getCachedSingleton(ChallengeEntity_1.ChallengeEntity.type);
+    }
     vmsAreEqual(a, b) {
         if (a.heading !== b.heading)
             return false;

package/lib/Components/Challenge/PMs/ChallengeConsumerHelpPM.d.ts

@@ -8,5 +8,5 @@ export declare abstract class ChallengeConsumerHelpPM extends AppObjectPM<Challe
     static type: string;
     static get(appObjects: AppObjectRepo): ChallengeConsumerHelpPM | undefined;
 }
-export declare function makeChallengeConsumerHelpPM<CT>(appObject: AppObject): ChallengeConsumerHelpPM;
+export declare function makeChallengeConsumerHelpPM(appObject: AppObject): ChallengeConsumerHelpPM;
 export declare const defaultChallengeConsumerHelpVM: ChallengeConsumerHelpVM;

package/lib/Components/Challenge/PMs/ChallengeConsumerHelpPM.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.defaultChallengeConsumerHelpVM = exports.makeChallengeConsumerHelpPM = exports.ChallengeConsumerHelpPM = void 0;
 const AppObject_1 = require("../../../AppObject");
-const App_1 = require("../../App");
+const BaseApp_1 = require("../../BaseApp");
 const ChallengeEntity_1 = require("../Entities/ChallengeEntity");
 class ChallengeConsumerHelpPM extends AppObject_1.AppObjectPM {
     static get(appObjects) {
@@ -15,14 +15,15 @@ function makeChallengeConsumerHelpPM(appObject) {
     return new ChallengeConsumerHelpPMImp(appObject);
 }
 exports.makeChallengeConsumerHelpPM = makeChallengeConsumerHelpPM;
-class ChallengeConsumerHelpPMImp extends AppObject_1.AppObjectPM {
+class ChallengeConsumerHelpPMImp extends ChallengeConsumerHelpPM {
     constructor(appObject) {
+        var _a, _b;
         super(appObject, ChallengeConsumerHelpPM.type);
         this.onEntityChange = () => {
             if (!this.challengeEntity || !this.baseApp)
                 return;
-            const text = this.challengeEntity.helpText;
-            const heading = this.challengeEntity.helpHeading;
+            const text = this.challengeEntity.selectedChallengeConsumerHelp;
+            const heading = this.challengeEntity.selectedChallengeHeading;
             let challengeHelpShow = true;
             if (!text || !heading || this.baseApp.isReviewing) {
                 challengeHelpShow = false;
@@ -34,21 +35,17 @@ class ChallengeConsumerHelpPMImp extends AppObject_1.AppObjectPM {
             };
             this.doUpdateView(vm);
         };
-        this.challengeEntity = appObject.getComponent(ChallengeEntity_1.ChallengeEntity.type);
-        if (!this.challengeEntity) {
-            this.error("PM has been added to an app object that does not have ChallengeEntity");
-            return;
-        }
-        this.baseApp = App_1.BaseAppState.get(appObject.appObjectRepo);
-        if (!this.baseApp) {
-            this.warn(`Unable to find the Base App State`);
-            return;
-        }
-        this.baseApp.addChangeObserver(this.onEntityChange);
-        this.challengeEntity.addChangeObserver(this.onEntityChange);
+        (_a = this.baseApp) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onEntityChange);
+        (_b = this.challengeEntity) === null || _b === void 0 ? void 0 : _b.addChangeObserver(this.onEntityChange);
         this.onEntityChange();
         this.appObjects.registerSingleton(this);
     }
+    get challengeEntity() {
+        return this.getCachedSingleton(ChallengeEntity_1.ChallengeEntity.type);
+    }
+    get baseApp() {
+        return this.getCachedSingleton(BaseApp_1.BaseAppState.type);
+    }
     vmsAreEqual(a, b) {
         if (a.heading !== b.heading)
             return false;

package/lib/Components/Challenge/PMs/SelectedChallengePM.d.ts

@@ -1,13 +1,14 @@
 import { AppObject, AppObjectPM, AppObjectRepo } from "../../../AppObject";
-export interface SelectedChallengeVM<CT> {
-    challenge: CT | undefined;
+export interface SelectedChallengeVM {
+    selectedChallenge: string;
     options: {
-        value: CT;
+        value: string;
         label: string;
     }[];
 }
-export declare abstract class SelectedChallengePM<CT> extends AppObjectPM<SelectedChallengeVM<CT>> {
+export declare const defaultSelectedChallengeVM: SelectedChallengeVM;
+export declare abstract class SelectedChallengePM extends AppObjectPM<SelectedChallengeVM> {
     static type: string;
-    static get<CT>(appObjects: AppObjectRepo): SelectedChallengePM<CT> | undefined;
+    static get(appObjects: AppObjectRepo): SelectedChallengePM | undefined;
 }
-export declare function makeSelectedChallengePM<CT>(appObject: AppObject): SelectedChallengePM<CT>;
+export declare function makeSelectedChallengePM(appObject: AppObject): SelectedChallengePM;

package/lib/Components/Challenge/PMs/SelectedChallengePM.js

@@ -1,8 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeSelectedChallengePM = exports.SelectedChallengePM = void 0;
+exports.makeSelectedChallengePM = exports.SelectedChallengePM = exports.defaultSelectedChallengeVM = void 0;
 const AppObject_1 = require("../../../AppObject");
 const ChallengeEntity_1 = require("../Entities/ChallengeEntity");
+exports.defaultSelectedChallengeVM = {
+    options: [],
+    selectedChallenge: "",
+};
 class SelectedChallengePM extends AppObject_1.AppObjectPM {
     static get(appObjects) {
         return AppObject_1.getSingletonComponent(SelectedChallengePM.type, appObjects);
@@ -16,31 +20,30 @@ function makeSelectedChallengePM(appObject) {
 exports.makeSelectedChallengePM = makeSelectedChallengePM;
 class SelectedChallengePMImp extends SelectedChallengePM {
     constructor(appObject) {
+        var _a;
         super(appObject, SelectedChallengePM.type);
         this.onChallengeChange = () => {
             if (!this.challengeEntity)
                 return;
             const options = [];
-            this.challengeEntity.allChallengeNames.forEach((challengeName, challengeType) => {
-                options.push({ value: challengeType, label: challengeName });
+            this.challengeEntity.allChallenges.forEach((challenge) => {
+                options.push({ value: challenge.challengeID, label: challenge.name });
             });
             const vm = {
-                challenge: this.challengeEntity.selectedChallenge,
+                selectedChallenge: this.challengeEntity.selectedChallenge,
                 options,
             };
             this.doUpdateView(vm);
         };
-        this.challengeEntity = appObject.getComponent(ChallengeEntity_1.ChallengeEntity.type);
-        if (!this.challengeEntity) {
-            this.error("PM has been added to an app object that does not have ChallengeEntity");
-            return;
-        }
-        this.challengeEntity.addChangeObserver(this.onChallengeChange);
+        (_a = this.challengeEntity) === null || _a === void 0 ? void 0 : _a.addChangeObserver(this.onChallengeChange);
         this.onChallengeChange();
         this.appObjects.registerSingleton(this);
     }
+    get challengeEntity() {
+        return this.getCachedSingleton(ChallengeEntity_1.ChallengeEntity.type);
+    }
     vmsAreEqual(a, b) {
-        if (a.challenge !== b.challenge)
+        if (a.selectedChallenge !== b.selectedChallenge)
             return false;
         if (a.options.length !== b.options.length)
             return false;

package/lib/Components/Challenge/UCs/SerializeChallenge.d.ts

@@ -1,6 +1,6 @@
 import { AppObject, AppObjectUC } from "../../../AppObject";
 import { SerializedSystem } from "../../StateMachine";
-export declare class SerializeChallengeUC<CT> extends AppObjectUC implements SerializedSystem {
+export declare class SerializeChallengeUC extends AppObjectUC implements SerializedSystem {
     static readonly type = "SerializeChallengeUC";
     name: string;
     seriliziationVersion: number;

package/lib/Components/Challenge/UCs/SerializeChallenge.js

@@ -14,7 +14,7 @@ class SerializeChallengeUC extends AppObject_1.AppObjectUC {
             stateMachine.registerSerializedSystem(this);
         }
         else {
-            this.warn("Unable to find StateMachineEntity");
+            this.error("Unable to find StateMachineEntity");
         }
     }
     get challenge() {
@@ -23,11 +23,7 @@ class SerializeChallengeUC extends AppObject_1.AppObjectUC {
     getSystemState() {
         if (!this.challenge)
             return {};
-        let challenge = this.challenge
-            .defaultChallenge;
-        if (this.challenge.selectedChallenge) {
-            challenge = this.challenge.selectedChallenge;
-        }
+        const challenge = this.challenge.selectedChallenge;
         const state = {
             challenge,
         };
@@ -49,7 +45,7 @@ class SerializeChallengeUC extends AppObject_1.AppObjectUC {
     applyDefaultState() {
         if (!this.challenge)
             return;
-        this.challenge.selectedChallenge = this.challenge.defaultChallenge;
+        this.challenge.selectedChallenge = "NONE";
     }
 }
 exports.SerializeChallengeUC = SerializeChallengeUC;

package/lib/Components/Challenge/UCs/SetChallengeUC.d.ts

@@ -1,7 +1,7 @@
 import { AppObject, AppObjectRepo, AppObjectUC } from "../../../AppObject";
-export declare abstract class SetChallengeUC<CT> extends AppObjectUC {
+export declare abstract class SetChallengeUC extends AppObjectUC {
     static type: string;
-    abstract setChallenge(challenge: CT): void;
-    static get<CT>(appObjects: AppObjectRepo): SetChallengeUC<CT> | undefined;
+    abstract setChallenge(challenge: string): void;
+    static get(appObjects: AppObjectRepo): SetChallengeUC | undefined;
 }
-export declare function makeSetChallengeUC<CT>(appObject: AppObject): SetChallengeUC<CT>;
+export declare function makeSetChallengeUC<CT>(appObject: AppObject): SetChallengeUC;

package/lib/Components/Challenge/UCs/SetChallengeUC.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeSetChallengeUC = exports.SetChallengeUC = void 0;
 const AppObject_1 = require("../../../AppObject");
 const Dispatcher_1 = require("../../Dispatcher");
+const UndoRedo_1 = require("../../UndoRedo");
 const ChallengeEntity_1 = require("../Entities/ChallengeEntity");
-const SetChallengeUndo_1 = require("./SetChallengeUndo");
 class SetChallengeUC extends AppObject_1.AppObjectUC {
     static get(appObjects) {
         return AppObject_1.getSingletonComponent(SetChallengeUC.type, appObjects);
@@ -21,20 +21,34 @@ class SetChallengeUCImp extends SetChallengeUC {
         return this.getCachedSingleton(ChallengeEntity_1.ChallengeEntity.type);
     }
     get dispatchStateChange() {
-        return this.getCachedSingleton(Dispatcher_1.DispatchStateChangeUC.type);
+        var _a;
+        return (_a = this.getCachedSingleton(Dispatcher_1.DispatchStateChangeUC.type)) === null || _a === void 0 ? void 0 : _a.doDispatch;
+    }
+    get undo() {
+        return this.getCachedSingleton(UndoRedo_1.UndoRedoEntity.type);
     }
     setChallenge(challenge) {
         var _a;
-        if (!this.challengeEntity) {
+        const challengeEntity = this.challengeEntity;
+        const dispatchStateChange = this.dispatchStateChange;
+        if (!challengeEntity || !dispatchStateChange) {
             return;
         }
-        if (this.challengeEntity.selectedChallenge === challenge)
+        if (challengeEntity.selectedChallenge === challenge)
             return;
-        if (this.challengeEntity.selectedChallenge) {
-            new SetChallengeUndo_1.SetChallengeUndo(this.challengeEntity.selectedChallenge, this.appObjects);
-        }
-        this.challengeEntity.selectedChallenge = challenge;
-        (_a = this.dispatchStateChange) === null || _a === void 0 ? void 0 : _a.doDispatch();
+        const initialChallenge = challengeEntity.selectedChallenge;
+        challengeEntity.selectedChallenge = challenge;
+        dispatchStateChange();
+        (_a = this.undo) === null || _a === void 0 ? void 0 : _a.submitAction({
+            undoAction: () => {
+                challengeEntity.selectedChallenge = initialChallenge;
+                dispatchStateChange();
+            },
+            redoAction: () => {
+                challengeEntity.selectedChallenge = challenge;
+                dispatchStateChange();
+            },
+        });
     }
     constructor(appObject) {
         super(appObject, SetChallengeUC.type);

package/lib/Components/Challenge/UCs/ShowChallengeHelpUC.d.ts

@@ -4,4 +4,4 @@ export declare abstract class ShowChallengeHelpUC extends AppObjectUC {
     abstract showChallengeHelp(): void;
     static get: (appObjects: AppObjectRepo) => ShowChallengeHelpUC | undefined;
 }
-export declare function makeShowChallengeHelpUC<CT>(appObject: AppObject): ShowChallengeHelpUC;
+export declare function makeShowChallengeHelpUC(appObject: AppObject): ShowChallengeHelpUC;