@livepreso/api 6.44.0 → 6.45.0

package/src/presentation/presentation-deck.js

@@ -41,6 +41,7 @@ export const PresentationDeck = BasePresentationModel.extend(
 		 * @property {boolean} editable
 		 * @property {array} tags
 		 * @property {number} version
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			html: "string",
@@ -57,6 +58,7 @@ export const PresentationDeck = BasePresentationModel.extend(
 			editable: "boolean",
 			tags: "array",
 			version: "number",
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -109,11 +111,13 @@ PresentationDeck.createFromDeckVersion = function (
 ) {
 	_.defaults(options, {
 		index: 0,
+		autoAdjuncts: new collections.AutoAdjunctCollection(),
 		adjunctSections: new collections.AdjunctSectionCollection(),
 		adjunctSlides: new collections.AdjunctSlideCollection(),
 		adjunctSubSlides: new collections.AdjunctSubSlideCollection(),
 		sectionSelections: new collections.SectionSelectionCollection(),
 		slideSelections: new collections.SlideSelectionCollection(),
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 		rootAssetPath: null,
 		templates: null,
 		choicelist: null,
@@ -138,7 +142,10 @@ PresentationDeck.createFromDeckVersion = function (
 		css,
 		id: deckVersionModel.id,
 		index: options.index,
-		thumbnail: deckVersionModel.image_256,
+		thumbnail: PresentationDeck.getThumbnail(
+			deckVersionModel,
+			options.screenshots
+		),
 		deckID: deckVersionModel.deck.id,
 		visible: true,
 		key: deckVersionModel.deck.key,
@@ -148,6 +155,7 @@ PresentationDeck.createFromDeckVersion = function (
 		tags,
 		version: deckVersionModel.version,
 		usesImpostorSections: isImpostorDeck(deckVersionModel),
+		cmsvalkey_set: deckVersionModel.cmsvalkey_set || [],
 	});
 
 	if (!deck.key) {
@@ -342,13 +350,41 @@ PresentationDeck.createFromDeckVersion = function (
 			options.templates.map((template, index) => {
 				return PresentationSection.createFromTemplate(
 					template,
-					index,
+					deck.sections.length + index,
 					options.getUniqueAdjunctID()
 				);
 			})
 		);
 	}
 
+	// This is generally only used by screenshots
+	if (options.autoAdjuncts) {
+		const autoSections = options.autoAdjuncts.map((auto, index) => {
+			// 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."
+				);
+			}
+
+			const section = PresentationSection.createFromTemplate(
+				auto.template,
+				deck.sections.length + index,
+				options.getUniqueAdjunctID()
+			);
+
+			// We've just borrowed the "from template" method above. We want to add
+			// back some of the specific keys about the auto.
+			section.autoAdjunctID = auto.id;
+			section.key = auto.key;
+			section.title = auto.name;
+
+			return section;
+		});
+
+		deck.sections.add(autoSections);
+	}
+
 	setSequentialSequences(deck);
 
 	return deck;
@@ -368,6 +404,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 		title: "Local",
 		version: 1,
 		tags: manifestJSON.tags[""] || [],
+		cmsvalkey_set: [],
 	});
 
 	const usesImpostorSections = _.some(
@@ -391,6 +428,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 				css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
 				title: manifestJSON.titles[key],
 				tags: manifestJSON.tags[key] || [],
+				cmsvalkey_set: [],
 			};
 		});
 

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

@@ -1,4 +1,5 @@
 import { DeckVersionModel } from "../models/deck-version";
+import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
 import { G } from "sp-test/api";
 import { ManifestJSONModel } from "../models/manifest-json";
 import { PresentationDeck } from "./presentation-deck";
@@ -57,6 +58,7 @@ describe("#createFromManifestJSON", () => {
 
 describe("#createFromDeckVersion", () => {
 	const deckVersionJSON = {
+		image_256: "http://path/to/deck/thumbnail.png",
 		template_set: [
 			{
 				id: 20,
@@ -87,6 +89,7 @@ describe("#createFromDeckVersion", () => {
 			{
 				id: 1,
 				title: "Section 1",
+				image_256: "default_section.png",
 				index_asset: {
 					url: "http://path/to/index.html",
 				},
@@ -99,6 +102,7 @@ describe("#createFromDeckVersion", () => {
 						index_asset: {
 							url: "http://path/to/index.html",
 						},
+						image_256: "default_slide.png",
 						subslide_set: [],
 						section: { id: 1 },
 					},
@@ -107,6 +111,7 @@ describe("#createFromDeckVersion", () => {
 			{
 				id: 2,
 				title: "Section 2",
+				image_256: "default_section.png",
 				index_asset: {
 					url: "http://path/to/index.html",
 				},
@@ -117,6 +122,7 @@ describe("#createFromDeckVersion", () => {
 			{
 				id: 3,
 				title: "Section 3",
+				image_256: "default_section.png",
 				index_asset: {
 					url: "http://path/to/index.html",
 				},
@@ -158,4 +164,51 @@ describe("#createFromDeckVersion", () => {
 		);
 		expect(lastSection.css).toEqual("http://path/to/template/orange/slide.css");
 	});
+
+	describe("Screenshots", () => {
+		it("should use the default image from the slide if no screenshot found", () => {
+			const deck = new DeckVersionModel(deckVersionJSON);
+			const presentationDeck = PresentationDeck.createFromDeckVersion(deck);
+			expect(presentationDeck.thumbnail).toEqual(deckVersionJSON.image_256);
+		});
+
+		it("should use the screenshot model if it matches", () => {
+			const deck = new DeckVersionModel(deckVersionJSON);
+			const options = {
+				screenshots: new DeckVersionScreenshotCollection([
+					{ subject: deck.url(), image_256: "test-screenshot.png" },
+				]),
+			};
+
+			const presentationDeck = PresentationDeck.createFromDeckVersion(
+				deck,
+				options
+			);
+			expect(presentationDeck.thumbnail).toEqual("test-screenshot.png");
+		});
+
+		it("should pass screenshots to nested models", () => {
+			const deck = new DeckVersionModel(deckVersionJSON);
+			const section = deck.section_set.first();
+			const slide = section.slide_set.first();
+
+			const options = {
+				screenshots: new DeckVersionScreenshotCollection([
+					{ subject: deck.url(), image_256: "test-screenshot.png" },
+					{ subject: section.url(), image_256: "test-screenshot.png" },
+					{ subject: slide.url(), image_256: "test-screenshot.png" },
+				]),
+			};
+
+			const presentationDeck = PresentationDeck.createFromDeckVersion(
+				deck,
+				options
+			);
+			const presentationSection = presentationDeck.sections.first();
+			const presentationSlide = presentationSection.slides.first();
+
+			expect(presentationSection.thumbnail).toEqual("test-screenshot.png");
+			expect(presentationSlide.thumbnail).toEqual("test-screenshot.png");
+		});
+	});
 });

package/src/presentation/presentation-section.js

@@ -1,5 +1,7 @@
 import "./presentation-slides.js";
 
+import * as collections from "../collections.js";
+
 import {
 	AdjunctSectionModel,
 	AdjunctSlideModel,
@@ -50,6 +52,7 @@ export const PresentationSection = BasePresentationModel.extend(
 		 * @property {array} tags
 		 * @property {boolean} impostor
 		 * @property {boolean} isWelcome
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			id: "number",
@@ -95,6 +98,7 @@ export const PresentationSection = BasePresentationModel.extend(
 				type: "boolean",
 				default: () => false,
 			},
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -169,6 +173,7 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		rootAssetPath: null,
 		selections: null,
 		choicelist: null,
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	let html;
@@ -201,7 +206,10 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		css,
 		key: sectionModel.key,
 		adjunctSlideLimit: sectionModel.adjunctslide_limit,
-		thumbnail: sectionModel.image_256,
+		thumbnail: PresentationSection.getThumbnail(
+			sectionModel,
+			options.screenshots
+		),
 		custom: false,
 		impostor: false,
 		title: sectionModel.title,
@@ -212,6 +220,7 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		sequence: config.sequence,
 		visible: config.visible,
 		selectionID: config.selectionID,
+		cmsvalkey_set: sectionModel.cmsvalkey_set,
 	});
 
 	return section;
@@ -237,6 +246,7 @@ PresentationSection.createFromAdjunctSection = function (
 		getUniqueAdjunctID: () => {
 			return parseInt(_.uniqueId(), 10);
 		},
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	const keyID =
@@ -284,6 +294,7 @@ PresentationSection.createFromAdjunctSection = function (
 		index: config.sequence,
 		sequence: config.sequence,
 		visible: config.visible,
+		cmsvalkey_set: [],
 	});
 
 	if (adjunctSectionModel.template) {
@@ -308,7 +319,13 @@ PresentationSection.createFromAdjunctSection = function (
 		}
 		section.html = html;
 		section.css = css;
-		section.thumbnail = adjunctSectionModel.template.image_256;
+		section.thumbnail =
+			// Try and use autoadjunct screenshot (if there is one), otherwise
+			// use the template's image as a fallback
+			PresentationSection.getThumbnail(
+				adjunctSectionModel.creator_autoadjunct,
+				options.screenshots
+			) || adjunctSectionModel.template.image_256;
 	} else {
 		section.image = adjunctSectionModel.image_original;
 	}
@@ -325,6 +342,7 @@ PresentationSection.createFromImpostorSection = function (
 		rootAssetPath: null,
 		selections: null,
 		choicelist: null,
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	let html;
@@ -359,7 +377,10 @@ PresentationSection.createFromImpostorSection = function (
 		css,
 		key: slideModel.key,
 		adjunctSlideLimit: slideModel.adjunctslide_limit,
-		thumbnail: slideModel.image_256,
+		thumbnail: PresentationSection.getThumbnail(
+			slideModel,
+			options.screenshots
+		),
 		custom: false,
 		impostor: true,
 		title: slideModel.title,
@@ -370,6 +391,7 @@ PresentationSection.createFromImpostorSection = function (
 		sequence: config.sequence,
 		visible: config.visible,
 		selectionID: config.selectionID,
+		cmsvalkey_set: slideModel.cmsvalkey_set,
 	});
 
 	return section;
@@ -393,6 +415,7 @@ PresentationSection.createFromManifestJSON = function (
 		visible: true,
 		deckversion: 1,
 		tags: manifestJSON.tags[sectionKey] || null,
+		cmsvalkey_set: [],
 	});
 
 	const slideKeys = Object.keys(manifestJSON.titles).filter((slideKey) => {
@@ -455,6 +478,7 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		deckversionID: -1,
 		sequence: opts.index,
 		impostor: false,
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	const tags = PresentationSection.getTags(
@@ -480,7 +504,10 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		index: options.index,
 		key: autoAdjunct.key,
 		createdByAutoAdjunct: false,
-		thumbnail: autoAdjunct.image_256,
+		thumbnail: PresentationSection.getThumbnail(
+			autoAdjunct,
+			options.screenshots
+		),
 		temporary: true,
 		title: autoAdjunct.name,
 		visible: options.visible,
@@ -488,10 +515,14 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		deckversion: options.deckversionID,
 		impostor: options.impostor,
 		tags,
+		cmsvalkey_set: autoAdjunct.cmsvalkey_set,
 	});
 
 	if (autoAdjunct.template) {
-		autoAdjunctSection.thumbnail = autoAdjunct.template.image_256;
+		// If we've found a new screenshot for it, we don't want to override it here
+		if (!autoAdjunctSection.thumbnail) {
+			autoAdjunctSection.thumbnail = autoAdjunct.template.image_256;
+		}
 		autoAdjunctSection.createdByTemplate = true;
 		autoAdjunctSection.templateID = autoAdjunct.template.id;
 		autoAdjunctSection.html = autoAdjunct.template.index_asset.url();
@@ -525,6 +556,7 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
 		sequence: 9000 + templateModel.sequence,
 		createdByTemplate: true,
 		index,
+		cmsvalkey_set: [],
 	});
 
 	return presentationSection;

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

@@ -1,5 +1,6 @@
 import { AdjunctSectionModel } from "../models/adjunct-section";
 import { AutoAdjunctModel } from "../models/auto-adjunct";
+import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
 import { PresentationSection } from "./presentation-section";
 import { SectionModel } from "../models/section";
 import { SlideModel } from "../models/slide";
@@ -90,10 +91,49 @@ describe("#createFromSection", () => {
 
 		expect(presentationSection.tags).toEqual(["section-tag"]);
 	});
+
+	describe("Screenshots", () => {
+		it("should use the default image from the slide if no screenshot found", () => {
+			const data = getSectionJSON();
+			const section = new SectionModel(data);
+			const presentationSection =
+				PresentationSection.createFromSection(section);
+			expect(presentationSection.thumbnail).toEqual(data.image_256);
+		});
+
+		it("should use the screenshot model if it matches", () => {
+			const section = new SectionModel(getSectionJSON());
+			const options = {
+				screenshots: new DeckVersionScreenshotCollection([
+					{ subject: section.url(), image_256: "test-screenshot.png" },
+				]),
+			};
+
+			const presentationSection = PresentationSection.createFromSection(
+				section,
+				options
+			);
+			expect(presentationSection.thumbnail).toEqual("test-screenshot.png");
+		});
+	});
 });
 
 describe("#createFromAdjunctSection", () => {
-	const getAdjunctSectionJSON = () => {
+	const getAdjunctSectionJSON = (includeTemplate) => {
+		const template = {
+			id: 1,
+			image_256: "template.png",
+			index_asset: {
+				created_date: "2021-07-22T04:57:32.977770Z",
+				data: "index.html",
+				id: 148204,
+				modified_date: "2021-07-22T04:57:32.977790Z",
+				orig_path: "templates/test-template/foo",
+				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",
+			},
+		};
+
 		return {
 			adjunct: "https://staging-test.salespreso.com/api/adjuncts/7470/",
 			appointment: "https://staging-test.salespreso.com/api/appointments/2422/",
@@ -120,7 +160,7 @@ describe("#createFromAdjunctSection", () => {
 			modified_date: "2021-09-20T01:57:55.125229Z",
 			sequence: 1,
 			tags: [],
-			template: null,
+			template: includeTemplate ? template : null,
 			title: "Five",
 			url: "https://staging-test.salespreso.com/api/adjunctsections/1737/",
 		};
@@ -162,6 +202,7 @@ describe("#createFromAdjunctSection", () => {
 			title: "Five",
 			url: "/api/adjunctsections/1737/",
 			visible: true,
+			cmsvalkey_set: [],
 		};
 
 		expect(presentationSection.toJSON()).toEqual(expected);
@@ -180,6 +221,40 @@ describe("#createFromAdjunctSection", () => {
 
 		expect(presentationSection.tags).toEqual(["adjunctsection-tag"]);
 	});
+
+	describe("Screenshots", () => {
+		it("should use the default image from the model if no screenshot found", () => {
+			const data = getAdjunctSectionJSON(true);
+			const adjunctSection = new AdjunctSectionModel(data);
+			const presentationSlide = PresentationSection.createFromAdjunctSection(
+				adjunctSection,
+				{ id: 1 }
+			);
+			expect(presentationSlide.thumbnail).toEqual(data.template.image_256);
+		});
+
+		it("should use the screenshot model if it matches", () => {
+			const adjunctSection = new AdjunctSectionModel(
+				getAdjunctSectionJSON(true)
+			);
+
+			const options = {
+				screenshots: new DeckVersionScreenshotCollection([
+					{
+						subject: "/api/autoadjuncts/545/",
+						image_256: "test-screenshot.png",
+					},
+				]),
+			};
+
+			const presentationSection = PresentationSection.createFromAdjunctSection(
+				adjunctSection,
+				{ id: 1 },
+				options
+			);
+			expect(presentationSection.thumbnail).toEqual("test-screenshot.png");
+		});
+	});
 });
 
 describe("#createFromImpostorSection", () => {
@@ -273,6 +348,34 @@ describe("#createFromImpostorSection", () => {
 
 		expect(presentationSection.tags).toEqual(["impostorsection-tag"]);
 	});
+
+	describe("Screenshots", () => {
+		it("should use the default image from the model if no screenshot found", () => {
+			const data = getImpostorSectionJSON();
+			const impostorSection = new SlideModel(data);
+			const presentationSection = PresentationSection.createFromImpostorSection(
+				impostorSection,
+				null
+			);
+			expect(presentationSection.thumbnail).toEqual(data.image_256);
+		});
+
+		it("should use the screenshot model if it matches", () => {
+			const impostorSection = new SlideModel(getImpostorSectionJSON());
+			const options = {
+				screenshots: new DeckVersionScreenshotCollection([
+					{ subject: impostorSection.url(), image_256: "test-screenshot.png" },
+				]),
+			};
+
+			const presentationSection = PresentationSection.createFromImpostorSection(
+				impostorSection,
+				null,
+				options
+			);
+			expect(presentationSection.thumbnail).toEqual("test-screenshot.png");
+		});
+	});
 });
 
 describe("#createFromAutoAdjunct", () => {
@@ -360,4 +463,34 @@ describe("#createFromAutoAdjunct", () => {
 
 		expect(presentationSection.tags).toEqual(["autoadjunct-tag"]);
 	});
+
+	describe("Screenshots", () => {
+		it("should use the default image from the model if no screenshot found", () => {
+			const data = getAutoAdjunctJSON();
+			const options = { index: 3, deckversionID: 12 };
+			const autoAdjunct = new AutoAdjunctModel(data);
+			const presentationSection = PresentationSection.createFromAutoAdjunct(
+				autoAdjunct,
+				options
+			);
+			expect(presentationSection.thumbnail).toEqual(data.image_256);
+		});
+
+		it("should use the screenshot model if it matches", () => {
+			const autoAdjunct = new AutoAdjunctModel(getAutoAdjunctJSON());
+			const options = {
+				index: 3,
+				deckversionID: 12,
+				screenshots: new DeckVersionScreenshotCollection([
+					{ subject: autoAdjunct.url(), image_256: "test-screenshot.png" },
+				]),
+			};
+
+			const presentationSection = PresentationSection.createFromAutoAdjunct(
+				autoAdjunct,
+				options
+			);
+			expect(presentationSection.thumbnail).toEqual("test-screenshot.png");
+		});
+	});
 });

package/src/presentation/presentation-slide.js

@@ -41,6 +41,7 @@ export const PresentationSlide = BasePresentationModel.extend(
 		 * @property {number} selectionID
 		 * @property {bool} editable
 		 * @property {array} tags
+		 * @property {string[]} cmsvalkey_set
 		 */
 		props: {
 			id: "number",
@@ -77,6 +78,7 @@ export const PresentationSlide = BasePresentationModel.extend(
 			selectionID: "number",
 			editable: "boolean",
 			tags: "array",
+			cmsvalkey_set: "array",
 		},
 
 		/**
@@ -116,6 +118,7 @@ export const PresentationSlide = BasePresentationModel.extend(
 PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 	_.defaults(options, {
 		adjunctSubSlides: new collections.AdjunctSubSlideCollection(),
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 		rootAssetPath: null,
 		selections: null,
 		choicelist: null,
@@ -154,7 +157,7 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 		html,
 		css,
 		key: slideModel.key,
-		thumbnail: slideModel.image_256,
+		thumbnail: PresentationSlide.getThumbnail(slideModel, options.screenshots),
 		custom: false,
 		editable: tags.indexOf("editable") > -1,
 		title: slideModel.title,
@@ -164,6 +167,7 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 		sequence: config.sequence,
 		visible: config.visible,
 		selectionID: config.selectionID,
+		cmsvalkey_set: slideModel.cmsvalkey_set,
 	});
 
 	slide.subslides.add(
@@ -229,6 +233,7 @@ PresentationSlide.createFromAdjunctSlide = function (
 		getUniqueAdjunctID: () => {
 			return parseInt(_.uniqueId(), 10);
 		},
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	const keyID =
@@ -272,6 +277,7 @@ PresentationSlide.createFromAdjunctSlide = function (
 		index: config.sequence,
 		sequence: config.sequence,
 		visible: config.visible,
+		cmsvalkey_set: [],
 	});
 
 	if (adjunctSlideModel.template) {
@@ -296,7 +302,14 @@ PresentationSlide.createFromAdjunctSlide = function (
 		}
 		slide.html = html;
 		slide.css = css;
-		slide.thumbnail = adjunctSlideModel.template.image_256;
+
+		slide.thumbnail =
+			// Try and use autoadjunct screenshot (if there is one), otherwise
+			// use the template's image as a fallback
+			PresentationSlide.getThumbnail(
+				adjunctSlideModel.creator_autoadjunct,
+				options.screenshots
+			) || adjunctSlideModel.template.image_256;
 	} else {
 		slide.image = adjunctSlideModel.image_original;
 	}
@@ -326,6 +339,7 @@ PresentationSlide.createFromManifestJSON = function (
 		visible: true,
 		section: sectionID,
 		tags: manifestJSON.tags[key] || null,
+		cmsvalkey_set: [],
 	});
 
 	return slide;
@@ -368,11 +382,12 @@ PresentationSlide.createFromTemplate = function (
 		autoAdjunctID: Number(_.uniqueId()),
 		index,
 		createdByTemplate: true,
+		cmsvalkey_set: [],
 	});
 	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") {
@@ -387,6 +402,7 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 		deckversionID: -1,
 		sequence: opts.index,
 		impostor: false,
+		screenshots: new collections.DeckVersionScreenshotCollection(),
 	});
 
 	const tags = PresentationSlide.getTags(
@@ -412,7 +428,7 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 		index: options.index,
 		key: autoAdjunct.key,
 		createdByAutoAdjunct: false,
-		thumbnail: autoAdjunct.image_256,
+		thumbnail: PresentationSlide.getThumbnail(autoAdjunct, options.screenshots),
 		temporary: true,
 		title: autoAdjunct.name,
 		visible: options.visible,
@@ -420,10 +436,14 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 		deckversion: options.deckversionID,
 		impostor: options.impostor,
 		tags,
+		cmsvalkey_set: autoAdjunct.cmsvalkey_set,
 	});
 
 	if (autoAdjunct.template) {
-		autoAdjunctSlide.thumbnail = autoAdjunct.template.image_256;
+		// If we've found a new screenshot for it, we don't want to override it here
+		if (!autoAdjunctSlide.thumbnail) {
+			autoAdjunctSlide.thumbnail = autoAdjunct.template.image_256;
+		}
 		autoAdjunctSlide.createdByTemplate = true;
 		autoAdjunctSlide.templateID = autoAdjunct.template.id;
 		autoAdjunctSlide.html = autoAdjunct.template.index_asset.url();