@vived/app 4.27.1 → 4.28.1

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(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;

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

@@ -20,8 +20,8 @@ class ShowChallengeHelpUCImp extends ShowChallengeHelpUC {
             if (!this.challengeEntity || !this.showAlertUC)
                 return;
             ShowAlertUC_1.ShowAlertUC.get(this.appObjects);
-            const title = this.challengeEntity.helpHeading;
-            const message = this.challengeEntity.helpText;
+            const title = this.challengeEntity.selectedChallengeHeading;
+            const message = this.challengeEntity.selectedChallengeConsumerHelp;
             if (!title || !message) {
                 this.warn("Title or message is empty");
                 return;

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

@@ -1,6 +1,7 @@
-import { AppObjectRepo, AppObjectUC } from "../../../AppObject";
+import { AppObject, AppObjectRepo, AppObjectUC } from "../../../AppObject";
 export declare abstract class TryChallengeAgainUC extends AppObjectUC {
     static type: string;
     abstract tryChallengeAgain: () => void;
     static get(appObjects: AppObjectRepo): TryChallengeAgainUC | undefined;
 }
+export declare function makeTryChallengeAgainUC(appObject: AppObject): TryChallengeAgainUC;

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

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TryChallengeAgainUC = void 0;
+exports.makeTryChallengeAgainUC = exports.TryChallengeAgainUC = void 0;
 const AppObject_1 = require("../../../AppObject");
+const BaseApp_1 = require("../../BaseApp");
+const Entities_1 = require("../Entities");
 class TryChallengeAgainUC extends AppObject_1.AppObjectUC {
     static get(appObjects) {
         return AppObject_1.getSingletonComponent(TryChallengeAgainUC.type, appObjects);
@@ -9,3 +11,25 @@ class TryChallengeAgainUC extends AppObject_1.AppObjectUC {
 }
 exports.TryChallengeAgainUC = TryChallengeAgainUC;
 TryChallengeAgainUC.type = "TryChallengeAgainUC";
+function makeTryChallengeAgainUC(appObject) {
+    return new TryChallengeAgainUCImp(appObject);
+}
+exports.makeTryChallengeAgainUC = makeTryChallengeAgainUC;
+class TryChallengeAgainUCImp extends TryChallengeAgainUC {
+    constructor(appObject) {
+        super(appObject, TryChallengeAgainUC.type);
+        this.tryChallengeAgain = () => {
+            var _a;
+            (_a = this.challengeEntity) === null || _a === void 0 ? void 0 : _a.resetSelectedChallenge();
+            if (this.baseApp) {
+                this.baseApp.isReviewing = false;
+            }
+        };
+    }
+    get challengeEntity() {
+        return this.getCachedSingleton(Entities_1.ChallengeEntity.type);
+    }
+    get baseApp() {
+        return this.getCachedSingleton(BaseApp_1.BaseAppState.type);
+    }
+}

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

@@ -1,5 +1,4 @@
 export * from "./SerializeChallenge";
 export * from "./SetChallengeUC";
-export * from "./SetChallengeUndo";
 export * from "./ShowChallengeHelpUC";
 export * from "./TryChallengeAgainUC";

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

@@ -12,6 +12,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./SerializeChallenge"), exports);
 __exportStar(require("./SetChallengeUC"), exports);
-__exportStar(require("./SetChallengeUndo"), exports);
 __exportStar(require("./ShowChallengeHelpUC"), exports);
 __exportStar(require("./TryChallengeAgainUC"), exports);

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

@@ -1,5 +1,6 @@
 export * from "./Controller";
 export * from "./Entities";
+export * from "./Factories";
 export * from "./Mocks";
 export * from "./PMs";
 export * from "./Adapters";

package/lib/Components/Challenge/index.js

@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./Controller"), exports);
 __exportStar(require("./Entities"), exports);
+__exportStar(require("./Factories"), exports);
 __exportStar(require("./Mocks"), exports);
 __exportStar(require("./PMs"), exports);
 __exportStar(require("./Adapters"), exports);

package/lib/Components/ChannelModel/Adapters/channelModelAdapter.js

@@ -5,6 +5,8 @@ const ChannelModelPM_1 = require("../PMs/ChannelModelPM");
 exports.channelModelAdapter = {
     defaultVM: ChannelModelPM_1.defaultChannelModelVM,
     subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
         const pm = ChannelModelPM_1.ChannelModelPM.get(id, appObjects);
         if (!pm) {
             appObjects.submitError("channelModelAdapter", "Unable to find PM");

package/lib/Components/ChannelModel/Adapters/index.d.ts

@@ -2,5 +2,7 @@ export * from "./activeModelAdapter";
 export * from "./activeModelObjectListAdapter";
 export * from "./channelModelAdapter";
 export * from "./channelModelObjectAdapter";
+export * from "./modelHasCalloutsAdapter";
 export * from "./modelHasLandmarksAdapter";
 export * from "./modelObjectsAreHiddenAdapter";
+export * from "./modelObjectsHaveOverlayAdapter";

package/lib/Components/ChannelModel/Adapters/index.js

@@ -14,5 +14,7 @@ __exportStar(require("./activeModelAdapter"), exports);
 __exportStar(require("./activeModelObjectListAdapter"), exports);
 __exportStar(require("./channelModelAdapter"), exports);
 __exportStar(require("./channelModelObjectAdapter"), exports);
+__exportStar(require("./modelHasCalloutsAdapter"), exports);
 __exportStar(require("./modelHasLandmarksAdapter"), exports);
 __exportStar(require("./modelObjectsAreHiddenAdapter"), exports);
+__exportStar(require("./modelObjectsHaveOverlayAdapter"), exports);

package/lib/Components/ChannelModel/Adapters/modelHasCalloutsAdapter.d.ts

@@ -0,0 +1,2 @@
+import { PmAdapter } from "../../../Types";
+export declare const modelHasCalloutsAdapter: PmAdapter<boolean>;

package/lib/Components/ChannelModel/Adapters/modelHasCalloutsAdapter.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelHasCalloutsAdapter = void 0;
+const ModelHasCalloutsPM_1 = require("../PMs/ModelHasCalloutsPM");
+exports.modelHasCalloutsAdapter = {
+    defaultVM: false,
+    subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = ModelHasCalloutsPM_1.ModelHasCalloutsPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("modelHasCalloutsAdapter", "Unable to find RepoHasCalloutsPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = ModelHasCalloutsPM_1.ModelHasCalloutsPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("modelHasCalloutsAdapter", "Unable to find RepoHasCalloutsPM");
+            return;
+        }
+        pm.removeView(setVM);
+    }
+};

package/lib/Components/ChannelModel/Adapters/modelObjectsHaveOverlayAdapter.d.ts

@@ -0,0 +1,2 @@
+import { PmAdapter } from "../../../Types";
+export declare const modelObjectsHaveOverlayAdapter: PmAdapter<boolean>;

package/lib/Components/ChannelModel/Adapters/modelObjectsHaveOverlayAdapter.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelObjectsHaveOverlayAdapter = void 0;
+const ModelObjectsHaveOverlayPM_1 = require("../PMs/ModelObjectsHaveOverlayPM");
+exports.modelObjectsHaveOverlayAdapter = {
+    defaultVM: false,
+    subscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = ModelObjectsHaveOverlayPM_1.ModelObjectsHaveOverlayPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("modelObjectsHaveOverlayAdapter", "Unable to find ModelObjectsHaveOverlayPM");
+            return;
+        }
+        pm.addView(setVM);
+    },
+    unsubscribe: (id, appObjects, setVM) => {
+        if (!id)
+            return;
+        const pm = ModelObjectsHaveOverlayPM_1.ModelObjectsHaveOverlayPM.get(id, appObjects);
+        if (!pm) {
+            appObjects.submitError("modelObjectsHaveOverlayAdapter", "Unable to find ModelObjectsHaveOverlayPM");
+            return;
+        }
+        pm.removeView(setVM);
+    },
+};

package/lib/Components/ChannelModel/Controllers/clearActiveObjectsOverlays.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function clearActiveObjectsOverlays(appObjects: AppObjectRepo): void;

package/lib/Components/ChannelModel/Controllers/clearActiveObjectsOverlays.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.clearActiveObjectsOverlays = void 0;
+const Entities_1 = require("../Entities");
+const ClearModelObjectOverlaysUC_1 = require("../UC/ClearModelObjectOverlaysUC");
+function clearActiveObjectsOverlays(appObjects) {
+    const repo = Entities_1.ChannelModelRepo.get(appObjects);
+    if (!repo) {
+        appObjects.submitError("clearActiveObjectsOverlays", "Unable to find ChannelModelRepo");
+        return;
+    }
+    if (!repo.activeModel) {
+        appObjects.submitWarning("clearActiveObjectsOverlays", "No Model is Active");
+        return;
+    }
+    const uc = ClearModelObjectOverlaysUC_1.ClearModelObjectOverlaysUC.get(repo.activeModel, appObjects);
+    if (!uc) {
+        appObjects.submitError("clearActiveObjectsOverlays", "Unable to find ClearModelObjectOverlaysUC");
+        return;
+    }
+    uc.clearOverlays();
+}
+exports.clearActiveObjectsOverlays = clearActiveObjectsOverlays;

package/lib/Components/ChannelModel/Controllers/index.d.ts

@@ -1,2 +1,3 @@
+export * from "./clearActiveObjectsOverlays";
 export * from "./clickSelectChannelModel";
 export * from "./unhideAllActiveObjects";

package/lib/Components/ChannelModel/Controllers/index.js

@@ -10,5 +10,6 @@ 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("./clearActiveObjectsOverlays"), exports);
 __exportStar(require("./clickSelectChannelModel"), exports);
 __exportStar(require("./unhideAllActiveObjects"), exports);

package/lib/Components/ChannelModel/Controllers/setModelObjectLabel.js

@@ -5,7 +5,7 @@ const Entities_1 = require("../Entities");
 function setModelObjectLabel(label, id, appObjects) {
     const entity = Entities_1.ChannelModelObject.get(id, appObjects);
     if (entity) {
-        entity.label = label;
+        entity.label.custom = label;
     }
     else {
         appObjects.submitWarning("setModelObjectLabel", "Unable to find object by ID");

package/lib/Components/ChannelModel/Factories/channelModelFactory.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { ChannelModelEntity } from "../Entities";
+export declare function makeChannelModelFactory(appObjects: AppObjectRepo): (id: string) => ChannelModelEntity;

package/lib/Components/ChannelModel/Factories/channelModelFactory.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeChannelModelFactory = void 0;
+const Entities_1 = require("../Entities");
+const channelObjectFactory_1 = require("./channelObjectFactory");
+function makeChannelModelFactory(appObjects) {
+    return function channelModelFactory(id) {
+        const ao = appObjects.getOrCreate(id);
+        const entity = Entities_1.makeChannelModelEntity(ao);
+        entity.modelObjectFactory = channelObjectFactory_1.makeChannelObjectFactory(appObjects);
+        return entity;
+    };
+}
+exports.makeChannelModelFactory = makeChannelModelFactory;

package/lib/Components/ChannelModel/Factories/channelObjectFactory.d.ts

@@ -0,0 +1,3 @@
+import { AppObjectRepo } from "../../../AppObject";
+import { ChannelModelObject } from "../Entities";
+export declare function makeChannelObjectFactory(appObjects: AppObjectRepo): (id: string) => ChannelModelObject;

package/lib/Components/ChannelModel/Factories/channelObjectFactory.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeChannelObjectFactory = void 0;
+const Label_1 = require("../../Label");
+const Entities_1 = require("../Entities");
+const PMs_1 = require("../PMs");
+function makeChannelObjectFactory(appObjects) {
+    return function channelObjectFactory(id) {
+        const ao = appObjects.getOrCreate(id);
+        const channelModelEntity = Entities_1.makeChannelModelObject(ao);
+        new Label_1.ClearCustomLabelUC(ao);
+        new Label_1.SetCustomLabelUC(ao);
+        // PM
+        PMs_1.makeChannelModelObjectPM(ao);
+        Label_1.makeLabelPM(ao);
+        return channelModelEntity;
+    };
+}
+exports.makeChannelObjectFactory = makeChannelObjectFactory;

package/lib/Components/ChannelModel/Factories/index.d.ts

@@ -0,0 +1,3 @@
+export * from "./channelModelFactory";
+export * from "./channelObjectFactory";
+export * from "./setupChannelModels";

package/lib/{AppObjectComponents/Hideable → Components/ChannelModel/Factories}/index.js

@@ -10,5 +10,6 @@ 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("./Entities/Hideable"), exports);
-__exportStar(require("./PresentationManagers/IsHiddenPM"), exports);
+__exportStar(require("./channelModelFactory"), exports);
+__exportStar(require("./channelObjectFactory"), exports);
+__exportStar(require("./setupChannelModels"), exports);

package/lib/Components/ChannelModel/Factories/setupChannelModels.d.ts

@@ -0,0 +1,2 @@
+import { AppObjectRepo } from "../../../AppObject";
+export declare function setupChannelModels(appObjects: AppObjectRepo): void;

package/lib/Components/ChannelModel/Factories/setupChannelModels.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setupChannelModels = void 0;
+const Transform3D_1 = require("../../Transform3D");
+const Entities_1 = require("../Entities");
+const PMs_1 = require("../PMs");
+const UC_1 = require("../UC");
+const channelModelFactory_1 = require("./channelModelFactory");
+function setupChannelModels(appObjects) {
+    const appObj = appObjects.getOrCreate("ChannelModels");
+    const repo = Entities_1.makeChannelModelRepo(appObj);
+    // UCs
+    UC_1.makeLoadChannelModelUC(appObj);
+    UC_1.makeSelectChannelModelUC(appObj);
+    Transform3D_1.makeTryPanTransformUC(appObj);
+    UC_1.makeValidateChannelModel(appObj);
+    // PMs
+    PMs_1.makeActiveModelPM(appObj);
+    PMs_1.makeActiveModelObjectListPM(appObj);
+    // Controllers
+    new Transform3D_1.TryMousePanTransformMC(appObj);
+    new Transform3D_1.TryTouchPanTransformTC(appObj);
+    repo.channelModelFactory = channelModelFactory_1.makeChannelModelFactory(appObjects);
+}
+exports.setupChannelModels = setupChannelModels;