@livepreso/api 6.45.0 → 6.47.0

package/src/presentation/base-presentation-model.spec.js

@@ -50,7 +50,7 @@ describe("#getVisibilityAndSequence", () => {
 			},
 			{
 				choicelist,
-			}
+			},
 		);
 
 		const expected = {
@@ -80,7 +80,7 @@ describe("#getVisibilityAndSequence", () => {
 			},
 			{
 				selections,
-			}
+			},
 		);
 
 		const expected = {
@@ -122,7 +122,7 @@ describe("#getVisibilityAndSequence", () => {
 			{
 				choicelist,
 				selections,
-			}
+			},
 		);
 
 		const expected = {
@@ -262,7 +262,7 @@ describe("#filterScreenshotsByTeam", () => {
 	it("should just return global screenshots if team is null", () => {
 		const filtered = BasePresentationModel.filterScreenshotsByTeam(
 			screenshots,
-			null
+			null,
 		).toJSON();
 
 		expect(filtered).toEqual([
@@ -282,7 +282,7 @@ describe("#filterScreenshotsByTeam", () => {
 	it("should return globals with team override", () => {
 		const filtered = BasePresentationModel.filterScreenshotsByTeam(
 			screenshots,
-			1
+			1,
 		).toJSON();
 
 		expect(filtered).toEqual([

package/src/presentation/presentation-deck.js

@@ -50,7 +50,10 @@ export const PresentationDeck = BasePresentationModel.extend(
 			deckID: "number",
 			index: "number",
 			thumbnail: "string",
-			visible: "boolean",
+			visible: {
+				type: "boolean",
+				visible: true,
+			},
 			key: "string",
 			common: "object",
 			title: "string",
@@ -93,7 +96,7 @@ export const PresentationDeck = BasePresentationModel.extend(
 
 			return this._url;
 		},
-	}
+	},
 );
 
 /**
@@ -107,7 +110,7 @@ export const PresentationDeck = BasePresentationModel.extend(
  */
 PresentationDeck.createFromDeckVersion = function (
 	deckVersionModel,
-	options = {}
+	options = {},
 ) {
 	_.defaults(options, {
 		index: 0,
@@ -123,6 +126,8 @@ PresentationDeck.createFromDeckVersion = function (
 		choicelist: null,
 	});
 
+	options.screenshots = PresentationDeck.screenshotsToMap(options.screenshots);
+
 	const assetRoot = getAssetRoot(deckVersionModel.index_asset.url());
 	let html;
 	let css;
@@ -144,7 +149,7 @@ PresentationDeck.createFromDeckVersion = function (
 		index: options.index,
 		thumbnail: PresentationDeck.getThumbnail(
 			deckVersionModel,
-			options.screenshots
+			options.screenshots,
 		),
 		deckID: deckVersionModel.deck.id,
 		visible: true,
@@ -161,7 +166,7 @@ PresentationDeck.createFromDeckVersion = function (
 	if (!deck.key) {
 		log.warn(
 			"Deck key not available to presentation",
-			deckVersionModel.deck.toJSON()
+			deckVersionModel.deck.toJSON(),
 		);
 	}
 
@@ -186,7 +191,7 @@ PresentationDeck.createFromDeckVersion = function (
 					url: selection.slide.url(),
 					id: selection.id,
 				};
-			})
+			}),
 		);
 
 	// We want all adjuncts to have fake ids that can't possibly overlap with the ids of
@@ -214,7 +219,7 @@ PresentationDeck.createFromDeckVersion = function (
 		deckVersionModel.section_set.forEach((sectionModel) => {
 			const section = PresentationSection.createFromSection(
 				sectionModel,
-				options
+				options,
 			);
 
 			section.addSlides(sectionModel.slide_set, options);
@@ -231,7 +236,7 @@ PresentationDeck.createFromDeckVersion = function (
 			const section = PresentationSection.createFromAdjunctSection(
 				adjunctSection,
 				DeckVersionModel,
-				options
+				options,
 			);
 
 			deck.sections.add(section);
@@ -264,7 +269,7 @@ PresentationDeck.createFromDeckVersion = function (
 				const section = PresentationSection.createFromImpostorSection(
 					slideModel,
 					DeckVersionModel,
-					options
+					options,
 				);
 
 				deck.sections.add(section);
@@ -281,7 +286,7 @@ PresentationDeck.createFromDeckVersion = function (
 				const slide = PresentationSlide.createFromAdjunctSlide(
 					adjunctSlideModel,
 					null,
-					options
+					options,
 				);
 
 				slides.push(slide);
@@ -297,7 +302,7 @@ PresentationDeck.createFromDeckVersion = function (
 		// next section.
 		deck.sections.models.reverse().forEach((section) => {
 			const sectionSlides = slides.filter(
-				(slide) => slide.sequence > section.sequence
+				(slide) => slide.sequence > section.sequence,
 			);
 
 			section.slides.add(sectionSlides);
@@ -337,7 +342,7 @@ PresentationDeck.createFromDeckVersion = function (
 				const adjunctSection = PresentationSection.createFromAdjunctSection(
 					adjunctSlideModel,
 					DeckVersionModel,
-					options
+					options,
 				);
 
 				deck.sections.add(adjunctSection);
@@ -351,9 +356,9 @@ PresentationDeck.createFromDeckVersion = function (
 				return PresentationSection.createFromTemplate(
 					template,
 					deck.sections.length + index,
-					options.getUniqueAdjunctID()
+					options.getUniqueAdjunctID(),
 				);
-			})
+			}),
 		);
 	}
 
@@ -363,14 +368,14 @@ PresentationDeck.createFromDeckVersion = function (
 			// We already have the template on the deckversion, so we can find it here.
 			if (!auto.template) {
 				throw new Error(
-					"Attempted to use an autoadjunct that has no template."
+					"Attempted to use an autoadjunct that has no template.",
 				);
 			}
 
 			const section = PresentationSection.createFromTemplate(
 				auto.template,
 				deck.sections.length + index,
-				options.getUniqueAdjunctID()
+				options.getUniqueAdjunctID(),
 			);
 
 			// We've just borrowed the "from template" method above. We want to add
@@ -409,7 +414,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 
 	const usesImpostorSections = _.some(
 		manifestJSON.tags,
-		(tags) => tags.indexOf("section-header") !== -1
+		(tags) => tags.indexOf("section-header") !== -1,
 	);
 	deck.usesImpostorSections = usesImpostorSections;
 
@@ -435,7 +440,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 		items = _.sortBy(items, "sequence");
 
 		const sections = items.filter(
-			(item) => item.tags.indexOf("section-header") !== -1
+			(item) => item.tags.indexOf("section-header") !== -1,
 		);
 
 		sections.forEach((item, index) => {
@@ -452,7 +457,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 		deck.sections.add(
 			sections.map((section, index) => {
 				return PresentationSection.createFromManifestImpostor(section, index);
-			})
+			}),
 		);
 
 		deck.realSection = PresentationSection.createFromManifestImpostor(items[0]);
@@ -466,9 +471,9 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 				return PresentationSection.createFromManifestJSON(
 					manifestJSON,
 					key,
-					index
+					index,
 				);
-			})
+			}),
 		);
 	}
 
@@ -481,7 +486,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 				index_asset: {
 					url: url2.resolve(
 						manifestJSON.getTemplateAssetPath(key),
-						"index.html"
+						"index.html",
 					),
 				},
 			};
@@ -492,7 +497,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 		deck.sections.add(
 			templates.map((template, index) => {
 				return PresentationSection.createFromTemplate(template, index, minID);
-			})
+			}),
 		);
 	}
 

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

@@ -141,7 +141,7 @@ describe("#createFromDeckVersion", () => {
 		expect(deck.sections.length).toEqual(3);
 		expect(deck.sections.at(0).title).toEqual("Section 1");
 		expect(deck.sections.at(deck.sections.length - 1).title).toEqual(
-			"Section 3"
+			"Section 3",
 		);
 	});
 
@@ -160,7 +160,7 @@ describe("#createFromDeckVersion", () => {
 		expect(lastSection.title).toEqual("Orange");
 		expect(lastSection.key).toEqual("template-orange");
 		expect(lastSection.html).toEqual(
-			"http://path/to/template/orange/index.html"
+			"http://path/to/template/orange/index.html",
 		);
 		expect(lastSection.css).toEqual("http://path/to/template/orange/slide.css");
 	});
@@ -182,7 +182,7 @@ describe("#createFromDeckVersion", () => {
 
 			const presentationDeck = PresentationDeck.createFromDeckVersion(
 				deck,
-				options
+				options,
 			);
 			expect(presentationDeck.thumbnail).toEqual("test-screenshot.png");
 		});
@@ -202,7 +202,7 @@ describe("#createFromDeckVersion", () => {
 
 			const presentationDeck = PresentationDeck.createFromDeckVersion(
 				deck,
-				options
+				options,
 			);
 			const presentationSection = presentationDeck.sections.first();
 			const presentationSlide = presentationSection.slides.first();

package/src/presentation/presentation-decks.js

@@ -13,7 +13,7 @@ export const PresentationDeckCollection = BasePresentationCollection.extend(
 	/** @lends presentation.PresentationDeckCollection# */ {
 		comparator: "sequence",
 		model: "PresentationDeck",
-	}
+	},
 );
 
 register("PresentationDeckCollection", PresentationDeckCollection);

package/src/presentation/presentation-section.js

@@ -96,7 +96,7 @@ export const PresentationSection = BasePresentationModel.extend(
 			impostor: "boolean",
 			isWelcome: {
 				type: "boolean",
-				default: () => false,
+				default: false,
 			},
 			cmsvalkey_set: "array",
 		},
@@ -106,6 +106,7 @@ export const PresentationSection = BasePresentationModel.extend(
 		 */
 		children: {
 			adjunct: "AdjunctModel",
+			template: "TemplateModel",
 		},
 
 		/**
@@ -135,12 +136,12 @@ export const PresentationSection = BasePresentationModel.extend(
 						return PresentationSlide.createFromAdjunctSlide(
 							slide,
 							this,
-							options
+							options,
 						);
 					}
 
 					return PresentationSlide.createFromSlide(slide, options);
-				})
+				}),
 			);
 		},
 
@@ -158,7 +159,7 @@ export const PresentationSection = BasePresentationModel.extend(
 			}
 			return this._url;
 		},
-	}
+	},
 );
 
 /**
@@ -176,6 +177,10 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
+	options.screenshots = PresentationSection.screenshotsToMap(
+		options.screenshots,
+	);
+
 	let html;
 	let css;
 
@@ -194,7 +199,7 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 
 	const config = PresentationSection.getVisibilityAndSequence(
 		sectionModel,
-		options
+		options,
 	);
 
 	const tags = PresentationSection.getTags(sectionModel, options);
@@ -208,7 +213,7 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		adjunctSlideLimit: sectionModel.adjunctslide_limit,
 		thumbnail: PresentationSection.getThumbnail(
 			sectionModel,
-			options.screenshots
+			options.screenshots,
 		),
 		custom: false,
 		impostor: false,
@@ -237,7 +242,7 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 PresentationSection.createFromAdjunctSection = function (
 	adjunctSectionModel,
 	deckVersionModel,
-	options = {}
+	options = {},
 ) {
 	_.defaults(options, {
 		rootAssetPath: null,
@@ -249,6 +254,10 @@ PresentationSection.createFromAdjunctSection = function (
 		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
+	options.screenshots = PresentationSection.screenshotsToMap(
+		options.screenshots,
+	);
+
 	const keyID =
 		adjunctSectionModel.id ||
 		(adjunctSectionModel.creator_autoadjunct
@@ -266,20 +275,17 @@ PresentationSection.createFromAdjunctSection = function (
 
 	const config = PresentationSection.getVisibilityAndSequence(
 		adjunctSectionModel,
-		options
+		options,
 	);
 
 	const tags = PresentationSection.getTags(adjunctSectionModel, options);
+	const autoAdjunctID = adjunctSectionModel.creator_autoadjunct?.id || null;
 
 	const section = new PresentationSection({
 		id: options.getUniqueAdjunctID(),
-		adjunct: adjunctSectionModel.adjunct
-			? adjunctSectionModel.adjunct.url()
-			: null,
+		adjunct: adjunctSectionModel.adjunct,
 		adjunctID: adjunctSectionModel.id,
-		autoAdjunctID: adjunctSectionModel.creator_autoadjunct
-			? adjunctSectionModel.creator_autoadjunct.id
-			: null,
+		autoAdjunctID,
 		key,
 		thumbnail: adjunctSectionModel.image_256,
 		custom: !adjunctSectionModel.created_by_autoadjunct,
@@ -294,13 +300,15 @@ PresentationSection.createFromAdjunctSection = function (
 		index: config.sequence,
 		sequence: config.sequence,
 		visible: config.visible,
-		cmsvalkey_set: [],
+		cmsvalkey_set: adjunctSectionModel.template?.cmsvalkey_set || [],
+		templateID: adjunctSectionModel.template?.id || null,
+		template: adjunctSectionModel.template || null,
 	});
 
 	if (adjunctSectionModel.template) {
 		if (!adjunctSectionModel.template.index_asset) {
 			throw new Error(
-				"Template missing index_asset. Do you have the whole template available?"
+				"Template missing index_asset. Do you have the whole template available?",
 			);
 		}
 		const origPath = adjunctSectionModel.template.index_asset.orig_path;
@@ -312,7 +320,7 @@ PresentationSection.createFromAdjunctSection = function (
 			css = `${options.rootAssetPath}${origPath}/slide.css`;
 		} else {
 			const assetRoot = getAssetRoot(
-				adjunctSectionModel.template.index_asset.url()
+				adjunctSectionModel.template.index_asset.url(),
 			);
 			html = `${assetRoot}index.html`;
 			css = `${assetRoot}slide.css`;
@@ -324,7 +332,7 @@ PresentationSection.createFromAdjunctSection = function (
 			// use the template's image as a fallback
 			PresentationSection.getThumbnail(
 				adjunctSectionModel.creator_autoadjunct,
-				options.screenshots
+				options.screenshots,
 			) || adjunctSectionModel.template.image_256;
 	} else {
 		section.image = adjunctSectionModel.image_original;
@@ -336,7 +344,7 @@ PresentationSection.createFromAdjunctSection = function (
 PresentationSection.createFromImpostorSection = function (
 	slideModel,
 	DeckVersionModel,
-	options = {}
+	options = {},
 ) {
 	_.defaults(options, {
 		rootAssetPath: null,
@@ -345,6 +353,10 @@ PresentationSection.createFromImpostorSection = function (
 		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
+	options.screenshots = PresentationSection.screenshotsToMap(
+		options.screenshots,
+	);
+
 	let html;
 	let css;
 
@@ -352,7 +364,7 @@ PresentationSection.createFromImpostorSection = function (
 
 	if (options.rootAssetPath) {
 		const baseRoot = getAssetRoot(
-			slideModel.section.deckversion.index_asset.url()
+			slideModel.section.deckversion.index_asset.url(),
 		);
 		const sectionPath = assetRoot.slice(baseRoot.length);
 
@@ -365,11 +377,10 @@ PresentationSection.createFromImpostorSection = function (
 
 	const config = PresentationSection.getVisibilityAndSequence(
 		slideModel,
-		options
+		options,
 	);
 
 	const tags = PresentationSection.getTags(slideModel, options);
-
 	const section = new PresentationSection({
 		id: slideModel.id,
 		adjunctID: null,
@@ -379,7 +390,7 @@ PresentationSection.createFromImpostorSection = function (
 		adjunctSlideLimit: slideModel.adjunctslide_limit,
 		thumbnail: PresentationSection.getThumbnail(
 			slideModel,
-			options.screenshots
+			options.screenshots,
 		),
 		custom: false,
 		impostor: true,
@@ -400,7 +411,7 @@ PresentationSection.createFromImpostorSection = function (
 PresentationSection.createFromManifestJSON = function (
 	manifestJSON,
 	sectionKey,
-	index
+	index,
 ) {
 	const section = new PresentationSection({
 		id: parseInt(_.uniqueId(), 10),
@@ -428,9 +439,9 @@ PresentationSection.createFromManifestJSON = function (
 				manifestJSON,
 				key,
 				section.id,
-				slideIndex
+				slideIndex,
 			);
-		})
+		}),
 	);
 
 	return section;
@@ -455,8 +466,8 @@ PresentationSection.createFromManifestImpostor = function (section, index) {
 			PresentationSlide.createFromManifestImpostor(
 				slide,
 				index,
-				presentationSection.id
-			)
+				presentationSection.id,
+			),
 		);
 	});
 
@@ -481,13 +492,17 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
+	options.screenshots = PresentationSection.screenshotsToMap(
+		options.screenshots,
+	);
+
 	const tags = PresentationSection.getTags(
 		{
 			isAutoAdjunct: true,
 			key: model.key,
 			tags: model.tags,
 		},
-		options
+		options,
 	);
 
 	const autoAdjunct = new AutoAdjunctModel(model);
@@ -497,7 +512,8 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		adjunctID: autoAdjunct.id,
 		autoAdjunctID: autoAdjunct.id,
 		createdByTemplate: autoAdjunct.template !== null,
-		templateID: autoAdjunct.template ? autoAdjunct.template.id : null,
+		templateID: autoAdjunct.template?.id || null,
+		template: autoAdjunct.template || null,
 		html: "",
 		css: "",
 		sequence: options.sequence,
@@ -506,7 +522,7 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		createdByAutoAdjunct: false,
 		thumbnail: PresentationSection.getThumbnail(
 			autoAdjunct,
-			options.screenshots
+			options.screenshots,
 		),
 		temporary: true,
 		title: autoAdjunct.name,
@@ -526,6 +542,16 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		autoAdjunctSection.createdByTemplate = true;
 		autoAdjunctSection.templateID = autoAdjunct.template.id;
 		autoAdjunctSection.html = autoAdjunct.template.index_asset.url();
+
+		const missingKeys = autoAdjunct.template.cmsvalkey_set
+			.filter((t) => {
+				return !autoAdjunctSection.cmsvalkey_set.find((k) => k.startsWith(t));
+			})
+			.map((t) => {
+				return `${t}-autoadjunct-${autoAdjunct.id}`;
+			});
+
+		autoAdjunctSection.cmsvalkey_set.push(...missingKeys);
 	} else {
 		autoAdjunctSection.image = autoAdjunct.image_original;
 	}
@@ -538,9 +564,11 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
 
 	const deckversion = new DeckVersionModel(templateModel.deckversion);
 	const templateAssetRoot = getAssetRoot(templateModel.index_asset.url());
+
 	const presentationSection = new PresentationSection({
 		id: minID + parseInt(_.uniqueId(), 10),
 		templateID: templateModel.id,
+		template: templateModel,
 		key: `template-${templateModel.key}`,
 		title: templateModel.title,
 		html: `${templateAssetRoot}index.html`,