@livepreso/api 6.44.0 → 6.46.0

package/src/models/deck-tags.js

@@ -44,7 +44,7 @@ export const DeckTagsModel = BaseModel.extend(
 				this.items = tags;
 			});
 		},
-	}
+	},
 );
 
 DeckTagsModel.canBeEmpty = true;

package/src/models/deck-version-screenshot.js

@@ -0,0 +1,48 @@
+import "./team.js";
+
+import { BaseModel } from "./base.js";
+import _ from "lodash";
+import { register } from "../state-register.js";
+
+/**
+ * @constructor
+ * @alias models.DeckVersionScreenshotModel
+ * @extends models.BaseModel
+ */
+export const DeckVersionScreenshotModel = BaseModel.extend(
+	/** @lends models.DeckVersionScreenshotModel# */ {
+		modelName: "deckversion-screenshots",
+
+		urlMatchKeys: {
+			"deckversion.id": "number",
+		},
+
+		/**
+		 * @property {date} created_date
+		 * @property {date} modified_date
+		 * @property {string} image_128
+		 * @property {string} image_256
+		 * @property {string} image_512
+		 * @property {string} subject - A url for a screenshotted model (section, slide, etc.)
+		 */
+		props: {
+			created_date: "date",
+			modified_date: "date",
+			image_128: "string",
+			image_256: "string",
+			image_512: "string",
+			subject: "string",
+		},
+
+		children: {
+			team: "TeamModel",
+		},
+
+		serialize() {
+			const data = BaseModel.prototype.serialize.call(this);
+			return _.omit(data, ["url"]);
+		},
+	},
+);
+
+register("DeckVersionScreenshotModel", DeckVersionScreenshotModel);

package/src/models/deck-version.js

@@ -1,13 +1,14 @@
 import "../collections/sections.js";
 import "../collections/deck-notes.js";
-import "../collections/templates.js";
 import "./pack.js";
 import "./deck.js";
 import "./asset.js";
 import "./manifest-json.js";
 
 import { BaseModel } from "./base.js";
+import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
 import Promise from "bluebird";
+import { TemplateCollection } from "../collections.js";
 import _ from "lodash";
 import { register } from "../state-register.js";
 import superagent from "superagent";
@@ -39,6 +40,7 @@ export const DeckVersionModel = BaseModel.extend(
 		 * @property {boolean} has_editable_share_support
 		 * @property {string} point_in_time_share_policy
 		 * @property {string[]} tags
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			image_128: "string",
@@ -59,6 +61,7 @@ export const DeckVersionModel = BaseModel.extend(
 			has_editable_share_support: "boolean",
 			point_in_time_share_policy: "string",
 			tags: "array",
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -77,22 +80,50 @@ export const DeckVersionModel = BaseModel.extend(
 		/**
 		 * @property {collections.SectionCollection} section_set
 		 * @property {models.DeckNoteCollection} note_set
-		 * @property {models.TemplateCollection} template_set
 		 */
 		collections: {
 			section_set: "SectionCollection",
 			note_set: "DeckNoteCollection",
-			template_set: "TemplateCollection",
 		},
 
 		/**
-		 * @todo This should eventually return a hooks interface
-		 * @returns {object}
+		 * @property {collections.DeckVersionScreenshotCollection} screenshots
 		 */
-		getHooks() {
+		derived: {
+			screenshots: {
+				deps: ["id"],
+				fn: function () {
+					const screenshots = new DeckVersionScreenshotCollection(
+						{},
+						{
+							deckversion: this,
+						},
+					);
+					return screenshots;
+				},
+			},
+
+			template_set: {
+				deps: ["id"],
+				fn: function () {
+					const templates = new TemplateCollection(
+						{},
+						{
+							data: {
+								deckversion: this.id,
+								scope: "global",
+							},
+						},
+					);
+					return templates;
+				},
+			},
+		},
+
+		getHooksPath() {
 			if (this.isNew()) {
 				throw new Error(
-					"Can only get hooks from a fetched deckversion or at least have an ID"
+					"Can only get hooks from a fetched deckversion or at least have an ID",
 				);
 			}
 
@@ -117,8 +148,17 @@ export const DeckVersionModel = BaseModel.extend(
 					if (!this.manifest_json.hooks) {
 						throw new Error("Manifest does not contain a hooks entry");
 					}
-					const hooksPath = `${rootAssetUrl}${this.manifest_json.hooks}`;
+					return `${rootAssetUrl}${this.manifest_json.hooks}`;
+				});
+		},
 
+		/**
+		 * @todo This should eventually return a hooks interface
+		 * @returns {object}
+		 */
+		getHooks() {
+			return this.getHooksPath()
+				.then((hooksPath) => {
 					return SystemJS.import(hooksPath);
 				})
 				.then((hooks) => {
@@ -152,6 +192,17 @@ export const DeckVersionModel = BaseModel.extend(
 			return Promise.all(imports);
 		},
 
+		fetch() {
+			const fetch = BaseModel.prototype.fetch.apply(this, arguments);
+
+			return Promise.resolve(fetch).tap(() => {
+				// `template_set` used to come on the deckversion response, but we have since
+				// decided to request it separately (this helps with caching). To keep the app
+				// working with minimal changes, we're making the extra request here.
+				return this.template_set.fetch();
+			});
+		},
+
 		waitForReady() {
 			return this.fetch().then(() => {
 				if (["created", "failed"].indexOf(this.creation_status) > -1) {
@@ -178,7 +229,7 @@ export const DeckVersionModel = BaseModel.extend(
 				upgrade_description: this.upgrade_description,
 			};
 		},
-	}
+	},
 );
 
 register("DeckVersionModel", DeckVersionModel);

package/src/models/deck.js

@@ -56,7 +56,7 @@ export const DeckModel = BaseModel.extend(
 			head_version: "DeckVersionModel",
 			tags: "DeckTagsModel",
 		},
-	}
+	},
 );
 
 register("DeckModel", DeckModel);

package/src/models/dispatch-preview.js

@@ -28,7 +28,7 @@ export const DispatchPreviewModel = BaseModel.extend(
 					throw e;
 				});
 		},
-	}
+	},
 );
 
 register("DispatchPreviewModel", DispatchPreviewModel);

package/src/models/dispatch.js

@@ -105,7 +105,7 @@ export const DispatchModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("DispatchModel", DispatchModel);

package/src/models/event-object.js

@@ -33,7 +33,7 @@ export const EventObjectModel = BaseModel.extend(
 		children: {
 			event: "EventModel",
 		},
-	}
+	},
 );
 
 register("EventObjectModel", EventObjectModel);

package/src/models/event.js

@@ -41,7 +41,7 @@ export const EventModel = BaseModel.extend(
 		collections: {
 			eventobject_set: "EventObjectCollection",
 		},
-	}
+	},
 );
 
 register("EventModel", EventModel);

package/src/models/feed-data.js

@@ -14,10 +14,12 @@ export const FeedDataModel = BaseModel.extend(
 
 		/**
 		 * @property {object} feed_data
+		 * @property {object} feed_debug
 		 * @property {string} creation_status
 		 */
 		props: {
 			feed_data: "object",
+			feed_debug: { type: "object", default: () => {} },
 			creation_status: "string",
 		},
 
@@ -40,7 +42,7 @@ export const FeedDataModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("FeedDataModel", FeedDataModel);

package/src/models/file.js

@@ -31,7 +31,7 @@ export const FileModel = BaseModel.extend(
 		children: {
 			event: "UserModel",
 		},
-	}
+	},
 );
 
 register("FileModel", FileModel);

package/src/models/group.js

@@ -24,7 +24,7 @@ export const GroupModel = BaseModel.extend(
 			const urlRoot = Api.getURL();
 			return `${urlRoot}groups/`;
 		},
-	}
+	},
 );
 
 register("GroupModel", GroupModel);

package/src/models/handover.js

@@ -46,7 +46,7 @@ export const HandoverModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("HandoverModel", HandoverModel);

package/src/models/hosted-preso.js

@@ -44,7 +44,7 @@ export const HostedPresoModel = BaseModel.extend(
 		collections: {
 			user_set: "UserCollection",
 		},
-	}
+	},
 );
 
 register("HostedPresoModel", HostedPresoModel);

package/src/models/image.js

@@ -1,6 +1,8 @@
 import "./user.js";
 
+import { Auth } from "../auth.js";
 import { BaseModel } from "./base.js";
+import SuperAgentRequest from "superagent-bluebird-promise";
 import { register } from "../state-register.js";
 
 /**
@@ -37,7 +39,37 @@ export const ImageModel = BaseModel.extend(
 		children: {
 			event: "UserModel",
 		},
-	}
+		uploadBase64(data) {
+			// mime will be in the format "image/png;base64"
+			const fileType = data.mime.split(";")[0];
+			const fileEnd = fileType.split("/")[1];
+
+			return fetch(data.value)
+				.then((res) => {
+					return res.blob();
+				})
+				.then((blob) => {
+					const file = new File([blob], `image.${fileEnd}`, { type: fileType });
+					const formData = new FormData();
+					formData.append("image_original", file);
+
+					return this.uploadFile(file);
+				});
+		},
+		uploadFile(file) {
+			const formData = new FormData();
+			formData.append("image_original", file);
+
+			return SuperAgentRequest.post(this.url())
+				.send(formData)
+				.set(Auth.headers)
+				.then((response) => {
+					Object.keys(response.body).forEach((key) => {
+						this.set(key, response.body[key]);
+					});
+				});
+		},
+	},
 );
 
 register("ImageModel", ImageModel);

package/src/models/location.js

@@ -57,7 +57,7 @@ export const LocationModel = BaseModel.extend(
 		collections: {
 			contact_set: "ContactCollection",
 		},
-	}
+	},
 );
 
 register("LocationModel", LocationModel);

package/src/models/manifest-json.js

@@ -57,7 +57,8 @@ export const ManifestJSONModel = BaseModel.extend(
 				},
 			},
 			dimensions: {
-				type: "object",
+				// This could be a list or an object
+				type: "any",
 				default: function () {
 					return {
 						width: 1024,
@@ -107,6 +108,45 @@ export const ManifestJSONModel = BaseModel.extend(
 			},
 		},
 
+		derived: {
+			// Most places just need this value, and making it derived
+			// gives us lower overhead (when we convert with .toJSON() it will
+			// also include this value, and means we don't have to convert back to
+			// a model just to get this again.)
+			screenDimensions: {
+				deps: ["dimensions"],
+				fn: function () {
+					return this.getScreenDimensions();
+				},
+			},
+		},
+
+		getDimensionsByName(name) {
+			if (Array.isArray(this.dimensions)) {
+				const dimension = this.dimensions.find(
+					(d) => d.name.toLowerCase() === name.toLowerCase(),
+				);
+				if (!dimension) {
+					return { width: 1024, height: 767 };
+				}
+				return { width: dimension.width, height: dimension.height };
+			}
+			return this.dimensions;
+		},
+
+		getScreenDimensions() {
+			return this.getDimensionsByName("screen");
+		},
+
+		getPDFDimensions() {
+			if (Array.isArray(this.dimensions)) {
+				const defaultPDFDimensions =
+					this.pdfpreferences?.defaultDimensions || "screen";
+				return this.getDimensionsByName(defaultPDFDimensions);
+			}
+			return this.dimensions;
+		},
+
 		/**
 		 * Returns the path to a manifest asset, using its url as the base.
 		 * @param {?string} key
@@ -117,7 +157,7 @@ export const ManifestJSONModel = BaseModel.extend(
 				const [sectionKey, slideKey = null] = key.split("/");
 				const sectionKeyPath = url2.resolve(
 					this.url(),
-					`sections/${sectionKey}/`
+					`sections/${sectionKey}/`,
 				);
 				if (slideKey) {
 					return url2.resolve(sectionKeyPath, `slides/${slideKey}/`);
@@ -144,7 +184,7 @@ export const ManifestJSONModel = BaseModel.extend(
 
 			return BaseModel.prototype.url.call(this);
 		},
-	}
+	},
 );
 
 /**
@@ -204,7 +244,7 @@ ManifestJSONModel.createFromProject = function (projectFile) {
 			};
 			return templates;
 		},
-		{}
+		{},
 	);
 
 	const limits = {
@@ -278,7 +318,18 @@ ManifestJSONModel.createFromProject = function (projectFile) {
 	}
 
 	if (projectFile.dimensions) {
-		manifest.dimensions = projectFile.dimensions;
+		const { dimensions } = projectFile;
+
+		if (Array.isArray(dimensions)) {
+			const screen = dimensions.filter((d) => d.name === "Screen");
+			if (!screen.length || screen.length > 1) {
+				throw new Error(
+					"Dimensions must contain one value named 'Screen' in project.yaml",
+				);
+			}
+		}
+
+		manifest.dimensions = dimensions;
 	}
 
 	if (projectFile.has_editable_share_support) {
@@ -311,7 +362,7 @@ ManifestJSONModel.createFromProject = function (projectFile) {
 	// This means we validate that a fieldset field has a value. Before
 	// this change, it was possible to save with a required field unfilled.
 	// This just keeps backwards compatability.
-	manifest.app_settings.fieldsets.enforce_required = true;
+	manifest.app_settings.fieldsets.enforce_required = false;
 
 	return manifest;
 };

package/src/models/onshare.js

@@ -50,7 +50,7 @@ export const OnShareModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("OnShareModel", OnShareModel);

package/src/models/opportunity.js

@@ -47,7 +47,7 @@ export const OpportunityModel = BaseModel.extend(
 		children: {
 			customer: "CustomerModel",
 		},
-	}
+	},
 );
 
 register("OpportunityModel", OpportunityModel);

package/src/models/pack-diff.js

@@ -55,7 +55,7 @@ export const PackDiffModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("PackDiffModel", PackDiffModel);

package/src/models/pack.js

@@ -38,7 +38,7 @@ export const PackModel = BaseModel.extend(
 			}
 			return `${this.urlRoot()}empty/`;
 		},
-	}
+	},
 );
 
 register("PackModel", PackModel);

package/src/models/preset.js

@@ -20,6 +20,7 @@ export const PresetModel = BaseModel.extend(
 		 * @property {date} created_date
 		 * @property {date} modified_date
 		 * @property {string} name
+		 * @property {string} hash_id
 		 */
 		props: {
 			scope: "string",
@@ -28,6 +29,7 @@ export const PresetModel = BaseModel.extend(
 			modified_date: "date",
 			name: "stringSanitized",
 			context: "object",
+			hash_id: "string",
 		},
 
 		/**
@@ -71,7 +73,7 @@ export const PresetModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 PresetModel.USER_VISIBILITY = "__user__";

package/src/models/refresh-request.js

@@ -25,6 +25,20 @@ export const RefreshRequestModel = BaseModel.extend(
 			user: "UserModel",
 		},
 
+		waitForReady(opts = {}, attempts = 20) {
+			if (attempts === 0) {
+				return Promise.reject();
+			}
+			return this.fetch(opts).then(() => {
+				if (["ready", "failed"].indexOf(this.creation_status) > -1) {
+					return Promise.resolve();
+				}
+				return Promise.delay(1000).then(() =>
+					this.waitForReady(opts, attempts - 1),
+				);
+			});
+		},
+
 		toServer() {
 			if (this.isNew()) {
 				return {
@@ -37,7 +51,7 @@ export const RefreshRequestModel = BaseModel.extend(
 				url: this.url(),
 			};
 		},
-	}
+	},
 );
 
 register("RefreshRequestModel", RefreshRequestModel);

package/src/models/room.js

@@ -38,7 +38,7 @@ export const RoomModel = BaseModel.extend(
 			wamp_version: "string",
 			websocket_server_uri: "string",
 		},
-	}
+	},
 );
 
 register("RoomModel", RoomModel);

package/src/models/salesforce-lookup.js

@@ -24,7 +24,7 @@ export const SalesforceLookupModel = BaseModel.extend(
 			customers: "CustomerCollection",
 			opportunities: "OpportunityCollection",
 		},
-	}
+	},
 );
 
 register("SaleforceLookupModel", SalesforceLookupModel);

package/src/models/section-selection.js

@@ -50,7 +50,7 @@ export const SectionSelectionModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("SectionSelectionModel", SectionSelectionModel);

package/src/models/section.js

@@ -34,6 +34,7 @@ export const SectionModel = BaseModel.extend(
 		 * @property {string} title
 		 * @property {boolean} uploaded
 		 * @property {boolean} visible
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			adjunctslide_limit: "number",
@@ -62,6 +63,7 @@ export const SectionModel = BaseModel.extend(
 				type: "array",
 				default: () => [],
 			},
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -79,7 +81,7 @@ export const SectionModel = BaseModel.extend(
 		collections: {
 			slide_set: "SlideCollection",
 		},
-	}
+	},
 );
 
 register("SectionModel", SectionModel);

package/src/models/slide-selection.js

@@ -50,7 +50,7 @@ export const SlideSelectionModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("SlideSelectionModel", SlideSelectionModel);

package/src/models/slide.js

@@ -35,6 +35,7 @@ export const SlideModel = BaseModel.extend(
 		 * @property {boolean} uploaded
 		 * @property {boolean} visible
 		 * @property {array} tags
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			adjunctslide_limit: "number",
@@ -63,6 +64,7 @@ export const SlideModel = BaseModel.extend(
 				type: "array",
 				default: () => [],
 			},
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -80,7 +82,7 @@ export const SlideModel = BaseModel.extend(
 		collections: {
 			subslide_set: "SubSlideCollection",
 		},
-	}
+	},
 );
 
 register("SlideModel", SlideModel);