@vived/host 3.12.0 → 3.12.1

package/lib/Components/AppSandbox/Factories/setupAppSandbox.js

@@ -9,6 +9,8 @@ const Entities_3 = require("../Entities");
 const PMs_1 = require("../PMs");
 const UCs_2 = require("../UCs");
 const setupStandardHostHandlers_1 = require("../../Handler/setupStandardHostHandlers");
+const Handler_1 = require("../../Handler");
+const submitActivityAssetHandlerSandbox_1 = require("../UCs/submitActivityAssetHandlerSandbox");
 function setupAppSandbox(appID, appObjects) {
     const ao = appObjects.getOrCreate(appID);
     // Entities
@@ -27,6 +29,10 @@ function setupAppSandbox(appID, appObjects) {
     PMs_1.makeSandboxStatePM(ao);
     PMs_1.makeShowInspectorPM(ao);
     PMs_1.makeStartInZSpacePM(ao);
+    const submitActivityAssetUC = appObjects.getSingleton(Handler_1.SubmitActivityAssetHandler.type);
+    if (submitActivityAssetUC) {
+        submitActivityAssetUC.action = submitActivityAssetHandlerSandbox_1.makeSubmitActivityAssetHandlerSandbox(appObjects);
+    }
     return entity;
 }
 exports.setupAppSandbox = setupAppSandbox;

package/lib/Components/AppSandbox/UCs/submitActivityAssetHandlerSandbox.d.ts

@@ -0,0 +1,3 @@
+import { HostAppObjectRepo } from "../../../HostAppObject";
+import { SubmitActivityAssetAction } from "../../Handler/UCs/SubmitActivityAssetHandler";
+export declare function makeSubmitActivityAssetHandlerSandbox(appObjects: HostAppObjectRepo): SubmitActivityAssetAction;

package/lib/Components/AppSandbox/UCs/submitActivityAssetHandlerSandbox.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.makeSubmitActivityAssetHandlerSandbox = void 0;
+const __1 = require("..");
+const Assets_1 = require("../../Assets");
+function makeSubmitActivityAssetHandlerSandbox(appObjects) {
+    return function submitActivityAssetHandler(assetFile, callback) {
+        const sandbox = __1.AppSandboxEntity.get(appObjects);
+        if (!sandbox) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "Unable to find AppSandboxEntity");
+            callback(undefined);
+            return;
+        }
+        if (!sandbox.mockActivityID) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "No activity ID found");
+            callback(undefined);
+            return;
+        }
+        const ownerID = sandbox.mockActivityID;
+        const newAssetData = {
+            name: "Activity Asset",
+            description: "Asset for activity " + ownerID,
+            file: assetFile,
+            owner: ownerID
+        };
+        const newAssetUC = Assets_1.NewAssetUC.get(appObjects);
+        if (!newAssetUC) {
+            appObjects.submitError("makeSubmitActivityAssetHandlerSandbox", "Unable to find NewAssetUC");
+            callback(undefined);
+            return;
+        }
+        newAssetUC.create(newAssetData).then((assetID) => {
+            callback(assetID);
+        });
+    };
+}
+exports.makeSubmitActivityAssetHandlerSandbox = makeSubmitActivityAssetHandlerSandbox;

package/lib/Components/Assets/Factories/setupAssetsForSandbox.js

@@ -17,6 +17,7 @@ function setupAssetsForSandbox(appObjects) {
     UCs_1.makeGetAssetFileUC(assetRepoAO);
     UCs_1.makeGetAssetUC(assetRepoAO);
     UCs_1.makePrefetchAssets(assetRepoAO);
+    UCs_1.makeNewAssetUC(assetRepoAO);
     UCs_1.makeNewAppAssetUC(appAssetsAO);
     UCs_1.makeGetAppAssetUC(appAssetsAO);
     // PMs

package/lib/Components/Assets/UCs/NewAssetUC.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeNewAssetUC = exports.NewAssetUC = void 0;
 const HostAppObject_1 = require("../../../HostAppObject");
-const Dialog_1 = require("../../Dialog");
 const UCs_1 = require("../../VivedAPI/UCs");
 const Entities_1 = require("../Entities");
 class NewAssetUC extends HostAppObject_1.HostAppObjectUC {
@@ -23,44 +22,23 @@ class NewAssetUCImp extends NewAssetUC {
             const postNewAsset = this.postNewAsset;
             const assetRepo = this.assetRepo;
             if (!postNewAsset || !assetRepo) {
-                return Promise.reject();
+                return Promise.reject(new Error("Missing dependencies"));
             }
-            return new Promise((resolve) => {
-                var _a;
-                const { description, file, name, owner } = data;
-                const newAssetData = {
-                    description,
-                    name,
-                    file,
-                    ownerID: owner
-                };
-                const spinnerDialog = (_a = this.spinnerFactory) === null || _a === void 0 ? void 0 : _a.make({
-                    title: "New Asset",
-                    message: "Posting new asset..."
-                });
-                postNewAsset(newAssetData)
-                    .then((resp) => {
-                    const newAsset = assetRepo.assetFactory(resp.id);
-                    newAsset.setFile(file);
-                    newAsset.description = description;
-                    newAsset.name = name;
-                    newAsset.filename = resp.filename;
-                    assetRepo.add(newAsset);
-                    spinnerDialog === null || spinnerDialog === void 0 ? void 0 : spinnerDialog.close();
-                    resolve(resp.id);
-                })
-                    .catch((e) => {
-                    var _a;
-                    this.error("create new asset error: " + e.message);
-                    spinnerDialog === null || spinnerDialog === void 0 ? void 0 : spinnerDialog.close();
-                    const dialogDTO = {
-                        buttonLabel: "OK",
-                        message: `Something went wrong when creating a new app asset. Check the console. ${e.message}`,
-                        title: "New Asset Error"
-                    };
-                    (_a = this.alertFactory) === null || _a === void 0 ? void 0 : _a.make(dialogDTO);
-                    resolve("");
-                });
+            const { description, file, name, owner } = data;
+            const newAssetData = {
+                description,
+                name,
+                file,
+                ownerID: owner
+            };
+            return postNewAsset(newAssetData).then((resp) => {
+                const newAsset = assetRepo.assetFactory(resp.id);
+                newAsset.setFile(file);
+                newAsset.description = description;
+                newAsset.name = name;
+                newAsset.filename = resp.filename;
+                assetRepo.add(newAsset);
+                return resp.id;
             });
         };
         this.appObjects.registerSingleton(this);
@@ -72,10 +50,4 @@ class NewAssetUCImp extends NewAssetUC {
     get assetRepo() {
         return this.getCachedSingleton(Entities_1.AssetRepo.type);
     }
-    get spinnerFactory() {
-        return this.getCachedSingleton(Dialog_1.MakeSpinnerDialogUC.type);
-    }
-    get alertFactory() {
-        return this.getCachedSingleton(Dialog_1.MakeAlertDialogUC.type);
-    }
 }

package/lib/Components/Dialog/Entities/Alert.d.ts

@@ -16,6 +16,7 @@ export declare class AlertDialogEntity extends Dialog {
     readonly message: string;
     readonly buttonLabel: string;
     readonly preventOutsideDismiss: boolean;
+    hasBeenClosed: boolean;
     private postClose?;
     close: () => void;
     private _isOpen;

package/lib/Components/Dialog/Entities/Alert.js

@@ -9,7 +9,9 @@ class AlertDialogEntity extends DialogQueue_1.Dialog {
         super(appObject, AlertDialogEntity.type);
         this.dialogType = exports.alertDialogType;
         this.preventOutsideDismiss = false;
+        this.hasBeenClosed = false;
         this.close = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postClose) {
                 this.postClose();

package/lib/Components/Dialog/Entities/Confirm.d.ts

@@ -18,6 +18,7 @@ export declare class ConfirmDialogEntity extends Dialog {
     readonly confirmButtonLabel: string;
     readonly cancelButtonLabel: string;
     readonly preventOutsideDismiss = true;
+    hasBeenClosed: boolean;
     private postCancel?;
     cancel: () => void;
     private postConfirm?;

package/lib/Components/Dialog/Entities/Confirm.js

@@ -9,13 +9,16 @@ class ConfirmDialogEntity extends DialogQueue_1.Dialog {
         super(appObject, ConfirmDialogEntity.type);
         this.dialogType = exports.confirmDialogType;
         this.preventOutsideDismiss = true;
+        this.hasBeenClosed = false;
         this.cancel = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postCancel) {
                 this.postCancel();
             }
         };
         this.confirm = () => {
+            this.hasBeenClosed = true;
             this.isOpen = false;
             if (this.postConfirm) {
                 this.postConfirm();

package/lib/Components/Dialog/Entities/DialogQueue.d.ts

@@ -3,6 +3,7 @@ export declare abstract class Dialog extends HostAppObjectEntity {
     abstract dialogType: string;
     abstract preventOutsideDismiss: boolean;
     abstract isOpen: boolean;
+    abstract hasBeenClosed: boolean;
 }
 export declare abstract class DialogQueue extends HostAppObjectEntity {
     static type: string;

package/lib/Components/Dialog/Entities/DialogQueue.js

@@ -29,17 +29,30 @@ class DialogRepoImp extends DialogQueue {
             this.notifyOnChange();
         };
         this.activeDialogHasClosed = () => {
-            const activeDialog = this.activeDialog;
-            if (activeDialog !== null) {
+            const currentActiveDialog = this.activeDialog;
+            if (currentActiveDialog !== null) {
+                currentActiveDialog.removeChangeObserver(this.notifyOnChange);
+                this.filterOutClosedDialogs();
                 this.dialogQueue.splice(0, 1);
                 const newActiveDialog = this.activeDialog;
                 if (newActiveDialog !== null) {
                     newActiveDialog.isOpen = true;
                 }
-                activeDialog.removeChangeObserver(this.notifyOnChange);
                 this.notifyOnChange();
             }
         };
+        this.filterOutClosedDialogs = () => {
+            const dialogsToKeep = [];
+            this.dialogQueue.forEach((dialog) => {
+                if (!dialog.hasBeenClosed) {
+                    dialogsToKeep.push(dialog);
+                }
+                else {
+                    dialog.removeChangeObserver(this.notifyOnChange);
+                }
+            });
+            this.dialogQueue = dialogsToKeep;
+        };
         this.appObjects.registerSingleton(this);
     }
     get activeDialog() {

package/lib/Components/Dialog/Entities/MarkDownEditor.d.ts

@@ -1,5 +1,5 @@
-import { HostAppObject, HostAppObjectRepo } from '../../../HostAppObject';
-import { Dialog } from './DialogQueue';
+import { HostAppObject, HostAppObjectRepo } from "../../../HostAppObject";
+import { Dialog } from "./DialogQueue";
 export interface DialogMarkDownEditorDTO {
     initialText: string;
     onConfirm: (text: string) => void;
@@ -11,6 +11,7 @@ export declare class MarkDownEditorDialogEntity extends Dialog {
     readonly dialogType = "MARKDOWN_EDITOR";
     readonly initialText: string;
     readonly preventOutsideDismiss = true;
+    hasBeenClosed: boolean;
     cancel: () => void;
     private postConfirm;
     confirm: (text: string) => void;

package/lib/Components/Dialog/Entities/MarkDownEditor.js

@@ -3,16 +3,19 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MarkDownEditorDialogEntity = exports.markDownEditorDialogType = void 0;
 const Entities_1 = require("../../../Entities");
 const DialogQueue_1 = require("./DialogQueue");
-exports.markDownEditorDialogType = 'MARKDOWN_EDITOR';
+exports.markDownEditorDialogType = "MARKDOWN_EDITOR";
 class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     constructor(data, appObject) {
         super(appObject, MarkDownEditorDialogEntity.type);
         this.dialogType = exports.markDownEditorDialogType;
         this.preventOutsideDismiss = true;
+        this.hasBeenClosed = false;
         this.cancel = () => {
+            this.hasBeenClosed = true; // added setting hasBeenClosed
             this.isOpen = false;
         };
         this.confirm = (text) => {
+            this.hasBeenClosed = true; // added setting hasBeenClosed
             this.isOpen = false;
             this.postConfirm(text);
         };
@@ -23,12 +26,12 @@ class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     static get(assetID, appObjects) {
         const appObject = appObjects.get(assetID);
         if (!appObject) {
-            appObjects.submitWarning('MarkDownEditorDialogEntity.get', 'Unable to find app object');
+            appObjects.submitWarning("MarkDownEditorDialogEntity.get", "Unable to find app object");
             return undefined;
         }
         const uc = appObject.getComponent(MarkDownEditorDialogEntity.type);
         if (!uc) {
-            appObjects.submitWarning('MarkDownEditorDialogEntity.get', 'App Object does not have DialogAlertEntity');
+            appObjects.submitWarning("MarkDownEditorDialogEntity.get", "App Object does not have DialogAlertEntity");
             return undefined;
         }
         return uc;
@@ -41,4 +44,4 @@ class MarkDownEditorDialogEntity extends DialogQueue_1.Dialog {
     }
 }
 exports.MarkDownEditorDialogEntity = MarkDownEditorDialogEntity;
-MarkDownEditorDialogEntity.type = 'MarkDownEditorDialogEntity';
+MarkDownEditorDialogEntity.type = "MarkDownEditorDialogEntity";

package/lib/Components/Dialog/Entities/SelectModel.d.ts

@@ -6,6 +6,7 @@ export declare class SelectModelDialogEntity extends Dialog {
     static type: string;
     static get(assetID: string, appObjects: HostAppObjectRepo): SelectModelDialogEntity | undefined;
     readonly dialogType = "SELECT_CHANNEL_MODEL";
+    hasBeenClosed: boolean;
     private _isOpen;
     get isOpen(): boolean;
     set isOpen(val: boolean);

package/lib/Components/Dialog/Entities/SelectModel.js

@@ -8,6 +8,7 @@ class SelectModelDialogEntity extends DialogQueue_1.Dialog {
     constructor(appObject) {
         super(appObject, SelectModelDialogEntity.type);
         this.dialogType = exports.selectModelDialogType;
+        this.hasBeenClosed = false;
         this._isOpen = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
         this.preventOutsideDismiss = true;
         this.memoizedIsReady = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);

package/lib/Components/Dialog/Entities/Spinner.d.ts

@@ -19,6 +19,7 @@ export declare class SpinnerDialogEntity extends Dialog {
     private _isOpen;
     set isOpen(open: boolean);
     get isOpen(): boolean;
+    hasBeenClosed: boolean;
     close: () => void;
     constructor(data: DialogSpinnerDTO, appObject: HostAppObject);
 }

package/lib/Components/Dialog/Entities/Spinner.js

@@ -11,7 +11,9 @@ class SpinnerDialogEntity extends DialogQueue_1.Dialog {
         this.mininumuLifespan = 2000;
         this.preventOutsideDismiss = true;
         this._isOpen = new Entities_1.MemoizedBoolean(false, this.notifyOnChange);
+        this.hasBeenClosed = false;
         this.close = () => {
+            this.hasBeenClosed = true;
             if (this.createdAt === undefined) {
                 this.isOpen = false;
                 return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vived/host",
-  "version": "3.12.0",
+  "version": "3.12.1",
   "description": "Public Host package for the VIVED Learning App system",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",