@livepreso/api 6.40.0 → 6.43.0

package/src/presentation/presentation-sections.js

@@ -1,7 +1,7 @@
 import "./presentation-section.js";
 
-import { register } from "../state-register.js";
 import { BasePresentationCollection } from "./base-presentation-collection.js";
+import { register } from "../state-register.js";
 
 /**
  * @constructor
@@ -12,7 +12,7 @@ import { BasePresentationCollection } from "./base-presentation-collection.js";
 export const PresentationSectionCollection = BasePresentationCollection.extend(
 	/** @lends presentation.PresentationSectionCollection# */ {
 		comparator: "sequence",
-		model: "PresentationSection"
+		model: "PresentationSection",
 	}
 );
 

package/src/presentation/presentation-slide.js

@@ -1,15 +1,15 @@
 import "./presentation-subslides.js";
 
-import url2 from "url";
-
-import _ from "lodash";
-
 import * as collections from "../collections.js";
-import { getAssetRoot } from "../index.js";
+
 import { AdjunctSlideModel, AutoAdjunctModel, SlideModel } from "../models.js";
-import { register } from "../state-register.js";
+
 import { BasePresentationModel } from "./base-presentation-model.js";
 import { PresentationSubSlide } from "./presentation-subslide.js";
+import _ from "lodash";
+import { getAssetRoot } from "../index.js";
+import { register } from "../state-register.js";
+import url2 from "url";
 
 /**
  * @constructor
@@ -47,19 +47,19 @@ export const PresentationSlide = BasePresentationModel.extend(
 			adjunctID: "number",
 			autoAdjunctID: {
 				type: "number",
-				default: null
+				default: null,
 			},
 			templateID: {
 				type: "number",
-				default: null
+				default: null,
 			},
 			createdByAutoAdjunct: {
 				type: "boolean",
-				default: false
+				default: false,
 			},
 			createdByTemplate: {
 				type: "boolean",
-				default: false
+				default: false,
 			},
 			html: "string",
 			css: "string",
@@ -76,21 +76,21 @@ export const PresentationSlide = BasePresentationModel.extend(
 			thumbnail: "string",
 			selectionID: "number",
 			editable: "boolean",
-			tags: "array"
+			tags: "array",
 		},
 
 		/**
 		 * @property {models.AdjunctModel} adjunct
 		 */
 		children: {
-			adjunct: "AdjunctModel"
+			adjunct: "AdjunctModel",
 		},
 
 		/**
 		 * @property {presentation.PresentationSubSlideCollection} subslides
 		 */
 		collections: {
-			subslides: "PresentationSubSlideCollection"
+			subslides: "PresentationSubSlideCollection",
 		},
 
 		url() {
@@ -102,7 +102,7 @@ export const PresentationSlide = BasePresentationModel.extend(
 				}
 			}
 			return this._url;
-		}
+		},
 	}
 );
 
@@ -113,7 +113,7 @@ export const PresentationSlide = BasePresentationModel.extend(
  * @param {object} [options]
  * @returns {presentation.PresentationSlide}
  */
-PresentationSlide.createFromSlide = function(slideModel, options = {}) {
+PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 	_.defaults(options, {
 		adjunctSubSlides: new collections.AdjunctSubSlideCollection(),
 		rootAssetPath: null,
@@ -121,7 +121,7 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
 		choicelist: null,
 		getUniqueAdjunctID: () => {
 			return parseInt(_.uniqueId(), 10);
-		}
+		},
 	});
 
 	let html;
@@ -146,6 +146,8 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
 		options
 	);
 
+	const tags = PresentationSlide.getTags(slideModel, options);
+
 	const slide = new PresentationSlide({
 		id: slideModel.id,
 		adjunctID: null,
@@ -154,23 +156,23 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
 		key: slideModel.key,
 		thumbnail: slideModel.image_256,
 		custom: false,
-		editable: slideModel.tags.indexOf("editable") > -1,
+		editable: tags.indexOf("editable") > -1,
 		title: slideModel.title,
 		section: slideModel.section.id,
-		tags: slideModel.tags,
+		tags,
 		index: config.sequence,
 		sequence: config.sequence,
 		visible: config.visible,
-		selectionID: config.selectionID
+		selectionID: config.selectionID,
 	});
 
 	slide.subslides.add(
-		slideModel.subslide_set.map(model => {
+		slideModel.subslide_set.map((model) => {
 			return PresentationSubSlide.createFromSubSlide(model, options);
 		})
 	);
 
-	const adjunctSubslides = options.adjunctSubSlides.filter(model => {
+	const adjunctSubslides = options.adjunctSubSlides.filter((model) => {
 		return model.slide.id === slideModel.id;
 	});
 
@@ -181,7 +183,7 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
 	if (
 		adjunctSubslides.length &&
 		!slide.subslides.length &&
-		!(slideModel.tags.indexOf("subslide_container") > -1)
+		!(tags.indexOf("subslide_container") > -1)
 	) {
 		slide.subslides.add(PresentationSubSlide.createFromSlide(slide));
 	}
@@ -198,7 +200,7 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
 
 			return PresentationSubSlide.createFromAdjunctSubSlide(model, slideModel, {
 				...options,
-				id
+				id,
 			});
 		})
 	);
@@ -214,7 +216,7 @@ PresentationSlide.createFromSlide = function(slideModel, options = {}) {
  * @param {object} [options]
  * @returns {presentation.PresentationSlide}
  */
-PresentationSlide.createFromAdjunctSlide = function(
+PresentationSlide.createFromAdjunctSlide = function (
 	adjunctSlideModel,
 	section = null,
 	options = {}
@@ -226,7 +228,7 @@ PresentationSlide.createFromAdjunctSlide = function(
 		choicelist: null,
 		getUniqueAdjunctID: () => {
 			return parseInt(_.uniqueId(), 10);
-		}
+		},
 	});
 
 	const keyID =
@@ -241,6 +243,7 @@ PresentationSlide.createFromAdjunctSlide = function(
 		key = adjunctSlideModel.key;
 	} else if (keyID) {
 		key = `adjunct-${keyID}`;
+		adjunctSlideModel.key = key;
 	}
 
 	const config = PresentationSlide.getVisibilityAndSequence(
@@ -248,6 +251,8 @@ PresentationSlide.createFromAdjunctSlide = function(
 		options
 	);
 
+	const tags = PresentationSlide.getTags(adjunctSlideModel, options);
+
 	const slide = new PresentationSlide({
 		id: options.id || options.getUniqueAdjunctID(),
 		adjunct: adjunctSlideModel.adjunct ? adjunctSlideModel.adjunct.url() : null,
@@ -263,10 +268,10 @@ PresentationSlide.createFromAdjunctSlide = function(
 		temporary: adjunctSlideModel.created_by_autoadjunct,
 		title: adjunctSlideModel.title,
 		section: section ? section.id : null,
-		tags: adjunctSlideModel.tags,
+		tags,
 		index: config.sequence,
 		sequence: config.sequence,
-		visible: config.visible
+		visible: config.visible,
 	});
 
 	if (adjunctSlideModel.template) {
@@ -299,7 +304,7 @@ PresentationSlide.createFromAdjunctSlide = function(
 	return slide;
 };
 
-PresentationSlide.createFromManifestJSON = function(
+PresentationSlide.createFromManifestJSON = function (
 	manifestJSON,
 	key,
 	sectionID,
@@ -320,13 +325,13 @@ PresentationSlide.createFromManifestJSON = function(
 		custom: false,
 		visible: true,
 		section: sectionID,
-		tags: manifestJSON.tags[key] || null
+		tags: manifestJSON.tags[key] || null,
 	});
 
 	return slide;
 };
 
-PresentationSlide.createFromManifestImpostor = function(
+PresentationSlide.createFromManifestImpostor = function (
 	slide,
 	index,
 	sectionID
@@ -339,13 +344,13 @@ PresentationSlide.createFromManifestImpostor = function(
 		visible: true,
 		section: sectionID,
 		index,
-		...slide
+		...slide,
 	});
 
 	return presentationSlide;
 };
 
-PresentationSlide.createFromTemplate = function(
+PresentationSlide.createFromTemplate = function (
 	template,
 	index,
 	sectionID,
@@ -362,12 +367,12 @@ PresentationSlide.createFromTemplate = function(
 		// Makes sure templates are rendered with unique IDs
 		autoAdjunctID: Number(_.uniqueId()),
 		index,
-		createdByTemplate: true
+		createdByTemplate: true,
 	});
 	return presentationSlide;
 };
 
-PresentationSlide.createFromAutoAdjunct = function(model, opts) {
+PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 	const requiredKeys = ["index", "deckversionID"];
 	for (const key of requiredKeys) {
 		if (typeof opts[key] === "undefined") {
@@ -381,9 +386,18 @@ PresentationSlide.createFromAutoAdjunct = function(model, opts) {
 		index: -1,
 		deckversionID: -1,
 		sequence: opts.index,
-		impostor: false
+		impostor: false,
 	});
 
+	const tags = PresentationSlide.getTags(
+		{
+			isAutoAdjunct: true,
+			key: model.key,
+			tags: model.tags,
+		},
+		options
+	);
+
 	const autoAdjunct = new AutoAdjunctModel(model);
 
 	const autoAdjunctSlide = new PresentationSlide({
@@ -404,7 +418,8 @@ PresentationSlide.createFromAutoAdjunct = function(model, opts) {
 		visible: options.visible,
 		allowConvert: options.allowConvert,
 		deckversion: options.deckversionID,
-		impostor: options.impostor
+		impostor: options.impostor,
+		tags,
 	});
 
 	if (autoAdjunct.template) {

package/src/presentation/presentation-slide.spec.js

@@ -0,0 +1,250 @@
+import { AdjunctSlideModel } from "../models/adjunct-slide";
+import { AutoAdjunctModel } from "../models/auto-adjunct";
+import { PresentationSlide } from "./presentation-slide";
+import { SlideModel } from "../models/slide";
+
+describe("#createFromSlide", () => {
+	const getSlideJSON = () => {
+		return {
+			created_date: "2021-07-22T04:57:56.484060Z",
+			description: "",
+			enabled: true,
+			id: 23219,
+			image_128: null,
+			image_256: null,
+			image_512: null,
+			index_asset: {
+				created_date: "2021-07-22T04:57:32.977770Z",
+				data: "sections/test-deck/slides/slide-key/index.html",
+				id: 148204,
+				modified_date: "2021-07-22T04:57:32.977790Z",
+				orig_path: "sections/test-deck/slides/slide-key",
+				pack: "https://staging-test.salespreso.com/api/packs/410/",
+				url: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/index.html",
+			},
+			key: "slide-key",
+			modified_date: "2021-07-22T05:03:07.778106Z",
+			namespaced_key: "test-deck/slide-key",
+			section: "https://staging-test.salespreso.com/api/sections/1738/",
+			sequence: 13,
+			subslide_set: [],
+			tags: [],
+			title: "Digital Transformation",
+			url: "https://staging-test.salespreso.com/api/slides/23219/",
+		};
+	};
+
+	it("should create a presentation slide", async () => {
+		const slide = new SlideModel(getSlideJSON());
+		const presentationSlide = PresentationSlide.createFromSlide(slide);
+
+		const expected = {
+			adjunctID: null,
+			autoAdjunctID: null,
+			createdByAutoAdjunct: false,
+			createdByTemplate: false,
+			css: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/slide.css",
+			custom: false,
+			editable: false,
+			html: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/index.html",
+			id: 23219,
+			index: 13,
+			key: "slide-key",
+			section: 1738,
+			selectionID: null,
+			sequence: 13,
+			subslides: [],
+			tags: [],
+			templateID: null,
+			thumbnail: null,
+			title: "Digital Transformation",
+			url: "/api/slides/23219/",
+			visible: true,
+		};
+
+		expect(presentationSlide.toJSON()).toEqual(expected);
+	});
+
+	it("should use deckTags when available", async () => {
+		const slide = new SlideModel(getSlideJSON());
+		const options = {
+			deckTags: { "test-deck/slide-key": ["slide-tag"] },
+		};
+
+		const presentationSlide = PresentationSlide.createFromSlide(slide, options);
+
+		expect(presentationSlide.tags).toEqual(["slide-tag"]);
+	});
+});
+
+describe("#createFromAdjunctSlide", () => {
+	const getAdjunctSlideJSON = () => {
+		return {
+			adjunct: "https://staging-test.salespreso.com/api/adjuncts/7457/",
+			appointment: "https://staging-test.salespreso.com/api/appointments/2426/",
+			created_by_autoadjunct: true,
+			created_date: "2021-09-20T05:34:45.267698Z",
+			creator_autoadjunct:
+				"https://staging-test.salespreso.com/api/autoadjuncts/541/",
+			deleted: false,
+			enabled: true,
+			html_content:
+				'<img src="https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png">',
+			id: 10529,
+			image_128:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_256:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_512:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_1024:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.png",
+			image_original:
+				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
+			modified_date: "2021-09-20T05:34:45.267703Z",
+			section: "https://staging-test.salespreso.com/api/sections/1755/",
+			sequence: 3,
+			tags: [],
+			template: null,
+			title: "Six",
+			url: "https://staging-test.salespreso.com/api/adjunctslides/10529/",
+		};
+	};
+
+	it("should create a presentation slide", async () => {
+		const adjunctSlide = new AdjunctSlideModel(getAdjunctSlideJSON());
+		const presentationSlide =
+			PresentationSlide.createFromAdjunctSlide(adjunctSlide);
+
+		const expected = {
+			adjunct: {
+				url: "https://staging-test.salespreso.com/api/adjuncts/7457/",
+			},
+			adjunctID: 10529,
+			autoAdjunctID: 541,
+			createdByAutoAdjunct: true,
+			createdByTemplate: false,
+			custom: false,
+			id: 1,
+			image:
+				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
+			index: 3,
+			key: "adjunct-10529",
+			section: null,
+			sequence: 3,
+			subslides: [],
+			tags: [],
+			templateID: null,
+			temporary: true,
+			thumbnail:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			title: "Six",
+			url: "/api/adjunctslides/10529/",
+			visible: true,
+		};
+
+		expect(presentationSlide.toJSON()).toEqual(expected);
+	});
+
+	it("should use deckTags when available", async () => {
+		const adjunctSlide = new AdjunctSlideModel(getAdjunctSlideJSON());
+		const options = {
+			deckTags: { "test-deck/adjunct-10529": ["adjunctslide-tag"] },
+		};
+
+		const presentationSlide = PresentationSlide.createFromAdjunctSlide(
+			adjunctSlide,
+			null,
+			options
+		);
+
+		expect(presentationSlide.tags).toEqual(["adjunctslide-tag"]);
+	});
+});
+
+describe("#createFromAutoAdjunct", () => {
+	const getAutoAdjunctJSON = () => {
+		return {
+			after_key: "test-deck/industry_insights",
+			created_date: "2021-08-02T00:28:41.992805Z",
+			deck: "https://staging-test.salespreso.com/api/decks/4/",
+			enabled: true,
+			id: 525,
+			image_128:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_256:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_512:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			image_1024:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.png",
+			image_original:
+				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
+			key: "autoadjunct-three",
+			modified_date: "2021-09-15T05:52:49.234837Z",
+			name: "Three",
+			parent_key: "test-deck",
+			sequence: 4,
+			tags: [],
+			team: null,
+			template: null,
+			url: "https://staging-test.salespreso.com/api/autoadjuncts/525/",
+		};
+	};
+
+	it("should create a presentation slide", async () => {
+		const autoAdjunct = new AutoAdjunctModel(getAutoAdjunctJSON());
+		const options = {
+			index: 3,
+			deckversionID: 12,
+		};
+
+		const presentationSlide = PresentationSlide.createFromAutoAdjunct(
+			autoAdjunct,
+			options
+		);
+
+		const expected = {
+			adjunctID: 525,
+			autoAdjunctID: 525,
+			createdByAutoAdjunct: false,
+			createdByTemplate: false,
+			css: "",
+			html: "",
+			id: 525,
+			image:
+				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
+			index: 3,
+			key: "autoadjunct-three",
+			sequence: 3,
+			subslides: [],
+			tags: [],
+			templateID: null,
+			temporary: true,
+			thumbnail:
+				"https://staging-test-cdn.salespreso.com/media/CACHE/images/autoadjunct/123/456.jpg",
+			title: "Three",
+			url: "/api/adjunctslides/525/",
+			visible: true,
+		};
+
+		expect(presentationSlide.toJSON()).toEqual(expected);
+	});
+
+	it("should use deckTags when available", async () => {
+		const autoAdjunct = new AutoAdjunctModel(getAutoAdjunctJSON());
+		const options = {
+			index: 3,
+			deckversionID: 12,
+			deckTags: {
+				"test-deck/autoadjunct-three": ["autoadjunct-tags"],
+			},
+		};
+
+		const presentationSlide = PresentationSlide.createFromAutoAdjunct(
+			autoAdjunct,
+			options
+		);
+		expect(presentationSlide.tags).toEqual(["autoadjunct-tags"]);
+	});
+});

package/src/presentation/presentation-slides.js

@@ -1,7 +1,7 @@
 import "./presentation-slide.js";
 
-import { register } from "../state-register.js";
 import { BasePresentationCollection } from "./base-presentation-collection.js";
+import { register } from "../state-register.js";
 
 /**
  * @constructor
@@ -12,7 +12,7 @@ import { BasePresentationCollection } from "./base-presentation-collection.js";
 export const PresentationSlideCollection = BasePresentationCollection.extend(
 	/** @lends presentation.PresentationSlideCollection# */ {
 		comparator: "sequence",
-		model: "PresentationSlide"
+		model: "PresentationSlide",
 	}
 );
 

package/src/presentation/presentation-subslide.js

@@ -1,8 +1,8 @@
-import _ from "lodash";
-
 import { AdjunctSubSlideModel, SubSlideModel } from "../models.js";
-import { register } from "../state-register.js";
+
 import { BasePresentationModel } from "./base-presentation-model.js";
+import _ from "lodash";
+import { register } from "../state-register.js";
 
 /**
  * @constructor
@@ -41,14 +41,14 @@ export const PresentationSubSlide = BasePresentationModel.extend(
 			slide: "number",
 			image: "string",
 			_orig_image: "string",
-			tags: "array"
+			tags: "array",
 		},
 
 		/**
 		 * @property {models.AdjunctModel} adjunct
 		 */
 		children: {
-			adjunct: "AdjunctModel"
+			adjunct: "AdjunctModel",
 		},
 
 		url() {
@@ -61,7 +61,7 @@ export const PresentationSubSlide = BasePresentationModel.extend(
 			}
 
 			return this._url;
-		}
+		},
 	}
 );
 
@@ -72,13 +72,13 @@ export const PresentationSubSlide = BasePresentationModel.extend(
  * @param {object} [options]
  * @returns {presentation.PresentationSubSlide}
  */
-PresentationSubSlide.createFromSubSlide = function(
+PresentationSubSlide.createFromSubSlide = function (
 	subSlideModel,
 	options = {}
 ) {
 	_.defaults(options, {
 		selections: null,
-		choicelist: null
+		choicelist: null,
 	});
 
 	const config = PresentationSubSlide.getVisibilityAndSequence(
@@ -86,6 +86,8 @@ PresentationSubSlide.createFromSubSlide = function(
 		options
 	);
 
+	const tags = PresentationSubSlide.getTags(subSlideModel, options);
+
 	const subslide = new PresentationSubSlide({
 		id: subSlideModel.id,
 		adjunctID: null,
@@ -94,10 +96,10 @@ PresentationSubSlide.createFromSubSlide = function(
 		custom: false,
 		title: subSlideModel.title,
 		slide: subSlideModel.slide.id,
-		tags: subSlideModel.tags,
+		tags,
 		index: config.sequence,
 		sequence: config.sequence,
-		visible: config.visible
+		visible: config.visible,
 	});
 
 	return subslide;
@@ -111,7 +113,7 @@ PresentationSubSlide.createFromSubSlide = function(
  * @param {object} [options]
  * @returns {presentation.PresentationSubSlide}
  */
-PresentationSubSlide.createFromAdjunctSubSlide = function(
+PresentationSubSlide.createFromAdjunctSubSlide = function (
 	adjunctSubSlideModel,
 	slideModel,
 	options = {}
@@ -122,14 +124,19 @@ PresentationSubSlide.createFromAdjunctSubSlide = function(
 		choicelist: null,
 		getUniqueAdjunctID: () => {
 			return parseInt(_.uniqueId(), 10);
-		}
+		},
 	});
 
+	const key = `adjunct-${adjunctSubSlideModel.id}`;
+	adjunctSubSlideModel.key = key;
+
 	const config = PresentationSubSlide.getVisibilityAndSequence(
 		adjunctSubSlideModel,
 		options
 	);
 
+	const tags = PresentationSubSlide.getTags(adjunctSubSlideModel, options);
+
 	const subslide = new PresentationSubSlide({
 		id: options.id || options.getUniqueAdjunctID(),
 		adjunct: adjunctSubSlideModel.adjunct
@@ -137,21 +144,21 @@ PresentationSubSlide.createFromAdjunctSubSlide = function(
 			: null,
 		adjunctID: adjunctSubSlideModel.id,
 		html_content: adjunctSubSlideModel.html_content,
-		key: `adjunct-${adjunctSubSlideModel.id}`,
+		key,
 		image: adjunctSubSlideModel.image_256,
 		custom: true,
 		title: adjunctSubSlideModel.title,
 		slide: slideModel.id,
-		tags: adjunctSubSlideModel.tags,
+		tags,
 		index: config.sequence,
 		sequence: config.sequence,
-		visible: config.visible
+		visible: config.visible,
 	});
 
 	return subslide;
 };
 
-PresentationSubSlide.createFromSlide = function(slide) {
+PresentationSubSlide.createFromSlide = function (slide) {
 	const subslide = new PresentationSubSlide({
 		id: slide.id,
 		createdFromSlide: true,
@@ -164,7 +171,7 @@ PresentationSubSlide.createFromSlide = function(slide) {
 		title: slide.title,
 		slide: slide.id,
 		image: slide.image,
-		tags: slide.tags
+		tags: slide.tags,
 	});
 
 	return subslide;