@vived/app 4.18.0 → 4.18.1

package/lib/Components/ChannelModel/Entities/ChannelModel.d.ts

@@ -28,7 +28,7 @@ export declare abstract class ChannelModelEntity extends AppObjectEntity {
     abstract set modelError(val: Error | undefined);
     abstract get modelObjectIds(): string[];
     abstract get data(): ChannelModelDTOv2;
-    abstract setupFromData(data: ChannelModelDTOv0 | ChannelModelDTOv1 | ChannelModelDTOv2): void;
+    abstract setupFromData(data: object): void;
     abstract originalCollectionID?: string;
     abstract modelObjectFactory(id: string): ChannelModelObject;
     abstract addModelObject(id?: string): ChannelModelObject;

package/lib/Components/ChannelModel/Entities/ChannelModel.js

@@ -41,14 +41,54 @@ class ChannelModelEntityImp extends ChannelModelEntity {
         this._state = new Entities_1.MemoizedString(ChannelModelState.INIT, this.notifyOnChange);
         this.modelObjectLookup = new Map();
         this.setupFromData = (data) => {
-            if (data.version === 2) {
-                this.setupDataV2(data);
+            if ("bounds_max" in data) {
+                this.bounds_max = ValueObjects_1.Vector3.FromDTO(data.bounds_max);
             }
-            else if (data.version === 1) {
-                this.setupDataV2(this.mapDataV1toV2(data));
+            else {
+                this.bounds_max = ValueObjects_1.Vector3.Zero();
             }
-            else if (data.version === 0) {
-                this.setupDataV2(this.mapDataV0toV2(data));
+            if ("bounds_min" in data) {
+                this.bounds_min = ValueObjects_1.Vector3.FromDTO(data.bounds_min);
+            }
+            else {
+                this.bounds_min = ValueObjects_1.Vector3.Zero();
+            }
+            if ("defaultPosition" in data) {
+                this.defaultPosition = ValueObjects_1.Vector3.FromDTO(data.defaultPosition);
+            }
+            else {
+                this.defaultPosition = ValueObjects_1.Vector3.Zero();
+            }
+            if ("defaultRotation" in data) {
+                this.defaultRotation = ValueObjects_1.Quaternion.FromDTO(data.defaultRotation);
+            }
+            else {
+                this.defaultRotation = ValueObjects_1.Quaternion.Identity();
+            }
+            if ("defaultScale" in data) {
+                this.defaultScale = data.defaultScale;
+            }
+            else {
+                this.defaultScale = 1;
+            }
+            if ("name" in data) {
+                this.name = data.name;
+            }
+            else {
+                this.name = "Unnamed Channel";
+            }
+            if ("originalCollectionID" in data) {
+                this.originalCollectionID = data.originalCollectionID;
+            }
+            if ("objects" in data) {
+                const objects = data.objects;
+                objects.forEach((obj) => {
+                    var _a;
+                    const modelObj = this.addModelObject(obj.id);
+                    modelObj.label = obj.label;
+                    modelObj.subMeshPaths = obj.meshPaths;
+                    modelObj.tags = (_a = obj.tags) !== null && _a !== void 0 ? _a : [];
+                });
             }
         };
     }
@@ -150,65 +190,4 @@ class ChannelModelEntityImp extends ChannelModelEntity {
             originalCollectionID: this.originalCollectionID,
         };
     }
-    setupDataV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, originalCollectionID, } = data;
-        this.bounds_max = ValueObjects_1.Vector3.FromDTO(bounds_max);
-        this.bounds_min = ValueObjects_1.Vector3.FromDTO(bounds_min);
-        this.defaultPosition = ValueObjects_1.Vector3.FromDTO(defaultPosition);
-        this.defaultRotation = ValueObjects_1.Quaternion.FromDTO(defaultRotation);
-        this.defaultScale = defaultScale;
-        this.name = name;
-        this.originalCollectionID = originalCollectionID;
-        objects.forEach((obj) => {
-            const { id, label, meshPaths, tags } = obj;
-            const modelObj = this.addModelObject(id);
-            modelObj.label = label;
-            modelObj.subMeshPaths = meshPaths;
-            modelObj.tags = tags;
-        });
-    }
-    mapDataV1toV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, } = data;
-        const mappedObject = objects.map((obj) => {
-            const { id, label, meshPaths } = obj;
-            return {
-                id,
-                label,
-                meshPaths,
-                tags: [],
-            };
-        });
-        return {
-            bounds_max,
-            bounds_min,
-            defaultPosition,
-            defaultRotation,
-            defaultScale,
-            name,
-            objects: mappedObject,
-            version: 2,
-        };
-    }
-    mapDataV0toV2(data) {
-        const { bounds_max, bounds_min, defaultPosition, defaultRotation, defaultScale, name, objects, } = data;
-        const mappedObject = objects.map((obj) => {
-            const { id, label, meshPaths } = obj;
-            return {
-                id,
-                label,
-                meshPaths,
-                tags: [],
-            };
-        });
-        return {
-            bounds_max,
-            bounds_min,
-            defaultPosition,
-            defaultRotation,
-            defaultScale,
-            name,
-            objects: mappedObject,
-            version: 2,
-        };
-    }
 }

package/package.json

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