@livepreso/api 6.45.0 → 6.47.0

package/src/models/appointment.js

@@ -15,13 +15,20 @@ import "../collections/slide-selections.js";
 import "../collections/dispatches.js";
 import "../collections/users.js";
 import "../collections/appointment-tags";
+import "../collections/appointment-deckversion-tags";
+import "../collections/appointment-section-tags";
+import "../collections/appointment-slide-tags";
+import "../collections/appointment-adjunct-tags";
 
 import { AdjunctSectionCollection } from "../collections/adjunct-sections.js";
 import { AdjunctSlideCollection } from "../collections/adjunct-slides.js";
 import { AdjunctSubSlideCollection } from "../collections/adjunct-sub-slides.js";
+import { AppointmentTemplateCollection } from "../collections/appointment-templates.js";
 import { BaseModel } from "./base.js";
+import { ContactPhoneCollection } from "../collections/contact-phones.js";
 import { DeckNoteCollection } from "../collections/deck-notes.js";
 import Promise from "bluebird";
+import _ from "lodash";
 import log from "../log.js";
 import moment from "moment";
 import { register } from "../state-register.js";
@@ -51,9 +58,11 @@ export const AppointmentModel = BaseModel.extend(
 		 * @property {string} viewtype
 		 * @property {boolean} support_mode
 		 * @property {boolean} is_muted
+		 * @property {boolean} is_signing_enabled
 		 * @property {date} no_edit_after
 		 * @property {date} no_share_after
 		 * @property {date} no_delete_after
+		 * @property {string} share_visibility_mode
 		 */
 		props: {
 			name: "stringSanitized",
@@ -75,10 +84,12 @@ export const AppointmentModel = BaseModel.extend(
 			viewtype: "string",
 			support_mode: "boolean",
 			is_muted: "boolean",
+			is_signing_enabled: "boolean",
 			no_edit_after: "date",
 			no_share_after: "date",
 			no_delete_after: "date",
 			no_snapshot_create_after: "date",
+			share_visibility_mode: "string",
 		},
 
 		/**
@@ -152,6 +163,17 @@ export const AppointmentModel = BaseModel.extend(
 					return adjunctSubSlides;
 				},
 			},
+			includedTemplates: {
+				deps: ["id"],
+				fn() {
+					return new AppointmentTemplateCollection(
+						{},
+						{
+							appointment: this,
+						},
+					);
+				},
+			},
 			deckNotes: {
 				deps: ["id"],
 				fn() {
@@ -211,6 +233,16 @@ export const AppointmentModel = BaseModel.extend(
 					return this.cannotEdit || this.cannotDelete;
 				},
 			},
+			// This property should be set by the calling code of the appointment and be the set of
+			// contact phones for all contacts on this preso. It must be fetchd and set after the contact_set
+			// is fetched. It's up to the calling code to decide if this property is required and
+			// therefore the extra fetch
+			contactPhones: {
+				deps: ["id", "contact_set"],
+				fn() {
+					return new ContactPhoneCollection();
+				},
+			},
 		},
 
 		getHooksPath() {
@@ -220,26 +252,26 @@ export const AppointmentModel = BaseModel.extend(
 			return this.deckversion_set.first().getHooksPath();
 		},
 
-		fetchAll(fetchSelf = false, options = {}) {
+		fetchAll(fetchSelf = false, fetchOptions = {}) {
 			return Promise.resolve()
 				.then(() => {
 					if (!this._url || fetchSelf) {
-						return this.fetch(options);
+						return this.fetch(fetchOptions);
 					}
 					return Promise.resolve();
 				})
 				.then(() => {
 					const fetches = [
-						this.deckversion_set.fetchModels(options),
-						this.appointmentssection_set.fetch(options),
-						this.appointmentsslide_set.fetch(options),
-						this.appointmenteditor_set.fetch(options),
-						this.adjunctSlides.fetch(options),
-						this.adjunctSections.fetch(options),
-						this.adjunctSubSlides.fetch(options),
-						this.contact_set.fetchSet(options),
-						this.tags.fetch(options),
-						this.user.fetch(options).catch((e) => {
+						this.deckversion_set?.fetchModels(fetchOptions),
+						this.appointmentssection_set?.fetch(fetchOptions),
+						this.appointmentsslide_set?.fetch(fetchOptions),
+						this.appointmenteditor_set?.fetch(fetchOptions),
+						this.adjunctSlides?.fetch(fetchOptions),
+						this.adjunctSections?.fetch(fetchOptions),
+						this.adjunctSubSlides?.fetch(fetchOptions),
+						this.contact_set?.fetchSet(fetchOptions),
+						this.tags?.fetch(fetchOptions),
+						this.user?.fetch(fetchOptions)?.catch((e) => {
 							if (e.status && e.status === 404) {
 								// It's possible for a user to be deactivated, which means they'll
 								// return with a 404. We want to be able to still load the preso,
@@ -249,52 +281,84 @@ export const AppointmentModel = BaseModel.extend(
 							}
 							throw e;
 						}),
-						this.deckNotes.fetch(options),
-						this.opportunity_set.fetchSet(options).catch(() => {
-							log.error(
-								`Failed to fetch Opportunity set`,
-								this.opportunity_set.toJSON()
-							);
-							return Promise.resolve();
-						}),
+						this.deckNotes?.fetch(fetchOptions),
+						this.includedTemplates.fetch(fetchOptions),
+						this.opportunity_set
+							?.fetchSet(fetchOptions)
+							?.then(() => {
+								return Promise.all(
+									this.opportunity_set.map((opp) =>
+										opp.customer.fetch(fetchOptions),
+									),
+								);
+							})
+							?.catch(() => {
+								log.error(
+									`Failed to fetch Opportunity set`,
+									this.opportunity_set.toJSON(),
+								);
+								return Promise.resolve();
+							}),
 					];
 
 					if (this.latest_snapshot) {
-						fetches.push(this.latest_snapshot.fetch(options));
+						fetches.push(this.latest_snapshot.fetch(fetchOptions));
 					}
 
 					if (this.latest_feed_data) {
-						fetches.push(this.latest_feed_data.fetch(options));
+						fetches.push(this.latest_feed_data.fetch(fetchOptions));
 					}
 
 					if (this.latest_tele) {
-						fetches.push(this.latest_tele.fetch(options));
+						fetches.push(this.latest_tele.fetch(fetchOptions));
 					}
 
 					return Promise.all(fetches);
 				})
 				.then(() => {
+					return Promise.all(
+						this.deckversion_set.map((model) => {
+							return Promise.all([
+								model.screenshots.fetch(fetchOptions),
+								model.template_set.fetchSet(fetchOptions),
+								model.manifest_json.fetch(fetchOptions),
+								model.deck.fetch(fetchOptions),
+							]);
+						}),
+					);
+				})
+				.then(() => {
+					const deckversionTemplates =
+						this.deckversion_set.first().template_set.models;
+
+					const allTemplates = _.uniqBy(
+						this.includedTemplates.models.concat(deckversionTemplates),
+						"id",
+					);
+
+					async function getTemplateOrFetch(adj) {
+						const existingTemplate = allTemplates.find(
+							(t) => t.id === adj.template.id,
+						);
+						if (existingTemplate) {
+							adj.template = existingTemplate;
+						} else {
+							await adj.template.fetch(fetchOptions);
+						}
+
+						return adj;
+					}
+
 					const adjunctSlides = this.adjunctSlides
 						.filter((adj) => adj.template)
-						.map((adj) => adj.template.fetch(options));
+						.map((adj) => getTemplateOrFetch(adj));
+
 					const adjunctSections = this.adjunctSections
 						.filter((adj) => adj.template)
-						.map((adj) => adj.template.fetch(options));
+						.map((adj) => getTemplateOrFetch(adj));
 
 					return Promise.all([...adjunctSlides, ...adjunctSections]);
 				})
-				.then(() => {
-					return Promise.all(
-						this.deckversion_set.map((model) => {
-							return Promise.all([
-								model.screenshots.fetch(options),
-								model.template_set.fetchSet(options),
-								model.manifest_json.fetch(options),
-								model.deck.fetch(options),
-							]);
-						})
-					);
-				})
 				.return(this);
 		},
 
@@ -315,11 +379,13 @@ export const AppointmentModel = BaseModel.extend(
 				preset: this._retrieveURL(appointment.preset),
 				locks: appointment.locks,
 				is_muted: appointment.is_muted,
+				is_signing_enabled: appointment.is_signing_enabled,
 				no_edit_after: appointment.no_edit_after,
 				no_share_after: appointment.no_share_after,
 				no_delete_after: appointment.no_delete_after,
 				team: this._retrieveURL(appointment.team),
 				editors_can_change_editors: appointment.editors_can_change_editors,
+				share_visibility_mode: appointment.share_visibility_mode,
 			};
 
 			if (this.id) {
@@ -328,7 +394,7 @@ export const AppointmentModel = BaseModel.extend(
 
 			return data;
 		},
-	}
+	},
 );
 
 register("AppointmentModel", AppointmentModel);

package/src/models/asset.js

@@ -33,6 +33,20 @@ export const AssetModel = BaseModel.extend(
 			orig_path: "string",
 		},
 
+		/**
+		 * The asset serializer actually returns the file in question for the URL.
+		 * This method returns the actual URL of the asset endpoint, for example:
+		 *
+		 * /api/assets/2/
+		 */
+		assetURL() {
+			// HACK: For some reason the API endpoint returns a url with a pack in it, but
+			// this doesn't actually work. We just want the 'asset' url.
+			return `${this.getResourceURL().replace("/packs/{pack.id}", "")}${
+				this.id
+			}/`;
+		},
+
 		/**
 		 * @property {models.PackModel} pack
 		 */
@@ -43,7 +57,7 @@ export const AssetModel = BaseModel.extend(
 		url() {
 			return this._url;
 		},
-	}
+	},
 );
 
 register("AssetModel", AssetModel);

package/src/models/auto-adjunct-key-check.js

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

package/src/models/auto-adjunct.js

@@ -41,6 +41,7 @@ export const AutoAdjunctModel = BaseModel.extend(
 			sequence: "number",
 			tags: "array",
 			cmsvalkey_set: "array",
+			_tenancy: "object",
 		},
 
 		/**
@@ -52,7 +53,7 @@ export const AutoAdjunctModel = BaseModel.extend(
 			template: "TemplateModel",
 			team: "TeamModel",
 		},
-	}
+	},
 );
 
 register("AutoAdjunctModel", AutoAdjunctModel);

package/src/models/base.js

@@ -21,6 +21,7 @@ export const BaseModel = Model.extend(
 	/** @lends models.BaseModel# */ {
 		modelName: null,
 		queryData: {},
+		detailType: "number",
 
 		// This is unfortunately necessary to avoid the default ampersand model/state
 		// behaviour from automatically hydrating all children and collections on a fetch.
@@ -99,6 +100,15 @@ export const BaseModel = Model.extend(
 				if (def && (def.isState || def instanceof Collection)) {
 					dataCopy[key] = def.toJSON();
 				}
+
+				if (def && Array.isArray(def)) {
+					dataCopy[key] = def.map((obj) => {
+						if (obj instanceof Model) {
+							return obj.toJSON();
+						}
+						return obj;
+					});
+				}
 			}
 
 			this.registerStates();
@@ -131,7 +141,7 @@ export const BaseModel = Model.extend(
 					for (const derivedProp of Object.keys(this._data[derivedKey])) {
 						this[derivedKey].set(
 							derivedProp,
-							this._data[derivedKey][derivedProp]
+							this._data[derivedKey][derivedProp],
 						);
 					}
 				}
@@ -152,9 +162,9 @@ export const BaseModel = Model.extend(
 			const replacements = _.extend(
 				{},
 				{
-					detailKey: "number",
+					detailKey: this.detailType,
 				},
-				this.urlMatchKeys
+				this.urlMatchKeys,
 			);
 
 			const regexes = Object.keys(replacements).reduce((result, key) => {
@@ -162,6 +172,8 @@ export const BaseModel = Model.extend(
 				const name = key.replace(/\./g, "_");
 				if (type === "number") {
 					result[name] = "\\d+";
+				} else if (type === "uuid") {
+					result[name] = "([a-z]|[0-9]|-)+";
 				} else if (type === "string") {
 					result[name] = "\\w+";
 				} else {
@@ -208,7 +220,7 @@ export const BaseModel = Model.extend(
 				Failed to match URL '${url}' for model '${this.modelName}'.
 				This is usually because the regex type for a key hasn't been set.
 				Error: `,
-					e
+					e,
 				);
 				return false;
 			}
@@ -226,8 +238,8 @@ export const BaseModel = Model.extend(
 		// and we want to ignore the hostname (https://staging-demo.salespreso.com)
 		// and strip out the '/api' from both the resource url and the variable url
 		// so that we can use the remaining part to isolate the id
-		_getIDFromURL(url) {
-			const resourceURL = this.getResourceURL();
+		_getIDFromURL(url, resource = "") {
+			const resourceURL = resource || this.getResourceURL();
 
 			if (!url || !resourceURL) {
 				return null;
@@ -318,7 +330,7 @@ export const BaseModel = Model.extend(
 			const Model = registeredStates[model];
 			if (!Model) {
 				throw new Error(
-					`'${model}' not found! Did you forget to import it on the '${this.modelName}' model?`
+					`'${model}' not found! Did you forget to import it on the '${this.modelName}' model?`,
 				);
 			}
 			this._children[prop] = Model;
@@ -328,7 +340,7 @@ export const BaseModel = Model.extend(
 			const Collection = state[collection];
 			if (!Collection) {
 				throw new Error(
-					`'${collection}' not found! Did you forget to import it on the '${this.modelName}' model?`
+					`'${collection}' not found! Did you forget to import it on the '${this.modelName}' model?`,
 				);
 			}
 			this._collections[prop] = Collection;
@@ -362,7 +374,7 @@ export const BaseModel = Model.extend(
 						}
 					}
 				},
-				this
+				this,
 			);
 
 			// Loop throught the collections and replace with the registered collection
@@ -373,7 +385,7 @@ export const BaseModel = Model.extend(
 						this._registerCollection(registeredStates, prop, collection);
 					}
 				},
-				this
+				this,
 			);
 		},
 
@@ -452,10 +464,10 @@ export const BaseModel = Model.extend(
 				_.concat(
 					_.concat(
 						Object.keys(this._unsetChildren),
-						Object.keys(this._unsetCollections)
+						Object.keys(this._unsetCollections),
 					),
-					Object.keys(this._values)
-				)
+					Object.keys(this._values),
+				),
 			);
 
 			keys.forEach((key) => {
@@ -508,12 +520,12 @@ export const BaseModel = Model.extend(
 				if (typeof this._children[child] === "function") {
 					this._safeSet(
 						child,
-						new this._children[child](val, { parent: this })
+						new this._children[child](val, { parent: this }),
 					);
 					this.listenTo(
 						this[child],
 						"all",
-						this._getCachedEventBubblingHandler(child)
+						this._getCachedEventBubblingHandler(child),
 					);
 				} else {
 					this._safeSet(child, val);
@@ -541,7 +553,7 @@ export const BaseModel = Model.extend(
 				if (typeof this._collections[coll] === "function") {
 					this._safeSet(
 						coll,
-						new this._collections[coll](val, { parent: this })
+						new this._collections[coll](val, { parent: this }),
 					);
 				} else {
 					this._safeSet(coll, val);
@@ -601,7 +613,6 @@ export const BaseModel = Model.extend(
 			if (this._url && this.isNew()) {
 				return this.getFullURLPath(this._url);
 			}
-
 			return this.getFullURLPath(this.getPlainURL());
 		},
 
@@ -617,6 +628,10 @@ export const BaseModel = Model.extend(
 				resp += "/";
 			}
 
+			if (!resp.includes("{") || !resp.includes("}")) {
+				return resp;
+			}
+
 			// Replace any values in a url with one from the model.
 			// So if you have /path/to/{model.id}/
 			// It will check the model from "this.model.id" and replace
@@ -655,7 +670,7 @@ export const BaseModel = Model.extend(
 			return sync.apply(this, arguments);
 		},
 
-		serialize() {
+		serialize(opts = { derived: true }) {
 			// Return nothing if data passed is falsy. More than likely this is
 			// a null value
 			if (!this._data) {
@@ -665,7 +680,7 @@ export const BaseModel = Model.extend(
 			const data = Model.prototype.serialize.apply(this, arguments);
 			data.url = this.url();
 
-			let derived = this.getAttributes({ derived: true });
+			let derived = this.getAttributes(opts);
 			derived = Object.keys(derived).reduce((object, key) => {
 				let value = derived[key];
 				if (value instanceof Collection || value instanceof Model) {
@@ -716,7 +731,7 @@ export const BaseModel = Model.extend(
 
 			return null;
 		},
-	}
+	},
 );
 
 function replacePropertyDefinition(object, name) {
@@ -785,7 +800,7 @@ function replacePropertyDefinition(object, name) {
 		get() {
 			if (!this._values) {
 				throw new Error(
-					`Trying to retrieve value ${name} of model ${object.modelName} during constructor`
+					`Trying to retrieve value ${name} of model ${object.modelName} during constructor`,
 				);
 			}
 

package/src/models/base.spec.js

@@ -53,7 +53,7 @@ it("should replace child model strings with the registered model", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "TestModel" },
-		})
+		}),
 	);
 	const model = new Model({ test: 1 });
 	expect(model.test).toBeInstanceOf(TestModel);
@@ -64,7 +64,7 @@ it("should allow the model to be passed in", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "TestModel" },
-		})
+		}),
 	);
 	const model = new Model({ test: new TestModel({ id: 1 }) });
 	expect(model.test.id).toEqual(1);
@@ -76,7 +76,7 @@ it("should reference parent model if foreign key exists", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "TestModel" },
-		})
+		}),
 	);
 	const model = new Model({ test: 1 });
 	expect(model).toEqual(model.test.parent);
@@ -86,7 +86,7 @@ it("should throw an error if the child model doesn't exist", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "DoesntExist" },
-		})
+		}),
 	);
 
 	expect(() => new Model()).toThrow();
@@ -97,7 +97,7 @@ it("should convert a url into a model", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "TestModel" },
-		})
+		}),
 	);
 	const model = new Model({ test: "/api/tests/1/" });
 	expect(model.test.id).toEqual(1);
@@ -115,7 +115,7 @@ it("should convert an object into a model", () => {
 	const Model = G(
 		BaseModel.extend({
 			children: { test: "TestModel" },
-		})
+		}),
 	);
 	const model = new Model({ test: { id: 1 } });
 	expect(model.test.id).toEqual(1);
@@ -127,12 +127,12 @@ it("should replace collection strings with their registered state", () => {
 		BaseCollection.extend({
 			model: "TestModel",
 		}),
-		"TestCollection"
+		"TestCollection",
 	);
 	const Model = G(
 		BaseModel.extend({
 			collections: { tests: "TestCollection" },
-		})
+		}),
 	);
 	const model = new Model({
 		tests: [{ id: 1 }],
@@ -146,12 +146,12 @@ it("should allow a list of models to be passed into a collection", () => {
 		BaseCollection.extend({
 			model: "TestModel",
 		}),
-		"TestCollection"
+		"TestCollection",
 	);
 	const Model = G(
 		BaseModel.extend({
 			collections: { tests: "TestCollection" },
-		})
+		}),
 	);
 	const test = new TestModel({ id: 1 });
 	const model = new Model({
@@ -166,12 +166,12 @@ it("should allow a collection to be passed in directly", () => {
 		BaseCollection.extend({
 			model: "TestModel",
 		}),
-		"TestCollection"
+		"TestCollection",
 	);
 	const Model = G(
 		BaseModel.extend({
 			collections: { tests: "TestCollection" },
-		})
+		}),
 	);
 	const model = new Model({
 		tests: new TestCollection([{ id: 1 }]),
@@ -192,12 +192,12 @@ it("should convert a url into a collection", () => {
 		BaseCollection.extend({
 			model: "TestModel",
 		}),
-		"TestCollection"
+		"TestCollection",
 	);
 	const Model = G(
 		BaseModel.extend({
 			collections: { tests: "TestCollection" },
-		})
+		}),
 	);
 	const model = new Model({ tests: "/api/tests/" });
 	expect(model.tests).toBeInstanceOf(TestCollection);
@@ -209,7 +209,7 @@ it("should convert an array of objects into a collection", () => {
 	const Model = G(
 		BaseModel.extend({
 			collections: { tests: "TestCollection" },
-		})
+		}),
 	);
 	const model = new Model({
 		tests: [{ id: 1 }, { id: 2 }],
@@ -331,13 +331,13 @@ it("should pass through values into a derived collection", () => {
 				name: "string",
 			},
 		}),
-		"DerivedModel"
+		"DerivedModel",
 	);
 
 	const DerivedCollection = G(
 		BaseCollection.extend({
 			model: "DerivedModel",
-		})
+		}),
 	);
 
 	const TestModel = G(
@@ -351,7 +351,7 @@ it("should pass through values into a derived collection", () => {
 				},
 			},
 		}),
-		"TestModel"
+		"TestModel",
 	);
 
 	const model = new TestModel({

package/src/models/choicelist.js

@@ -15,7 +15,7 @@ export const ChoicelistModel = BaseModel.extend(
 			created_date: "date",
 			choices: "array",
 		},
-	}
+	},
 );
 
 register("ChoicelistModel", ChoicelistModel);