@livepreso/api 6.42.1 → 6.43.0

package/src/presentation/presentation-slide.js

@@ -156,7 +156,7 @@ 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,
@@ -183,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));
 	}
@@ -243,6 +243,7 @@ PresentationSlide.createFromAdjunctSlide = function (
 		key = adjunctSlideModel.key;
 	} else if (keyID) {
 		key = `adjunct-${keyID}`;
+		adjunctSlideModel.key = key;
 	}
 
 	const config = PresentationSlide.getVisibilityAndSequence(
@@ -250,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,
@@ -265,7 +268,7 @@ 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,
@@ -386,6 +389,15 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 		impostor: false,
 	});
 
+	const tags = PresentationSlide.getTags(
+		{
+			isAutoAdjunct: true,
+			key: model.key,
+			tags: model.tags,
+		},
+		options
+	);
+
 	const autoAdjunct = new AutoAdjunctModel(model);
 
 	const autoAdjunctSlide = new PresentationSlide({
@@ -407,6 +419,7 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts) {
 		allowConvert: options.allowConvert,
 		deckversion: options.deckversionID,
 		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-subslide.js

@@ -127,11 +127,16 @@ PresentationSubSlide.createFromAdjunctSubSlide = function (
 		},
 	});
 
+	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
@@ -139,12 +144,12 @@ 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,

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

@@ -15,9 +15,6 @@ describe("#createFromSubSlide", () => {
 		index_asset: {
 			created_date: "2020-07-20T03:25:15.530683Z",
 			data: "sections/test-deck/slides/why_myob_vision/index.html",
-			hash_algorithm: "sha-256",
-			hash_digest:
-				"5e2426643a0d9f9360f343891da19faecf6bd37584ed4be05528c87b981f1f26",
 			id: 7836,
 			modified_date: "2020-07-20T03:25:15.530717Z",
 			orig_path: "sections/test-deck/slides/why_myob_vision",
@@ -55,6 +52,19 @@ describe("#createFromSubSlide", () => {
 
 		expect(presentationSub.toJSON()).toEqual(expected);
 	});
+
+	it("should use deckTags when available", async () => {
+		const subslide = new SubSlideModel(subslideJSON);
+		const options = {
+			deckTags: { "test-deck/why_myob_vision/subslide-1": ["subslide-tag"] },
+		};
+		const presentationSub = PresentationSubSlide.createFromSubSlide(
+			subslide,
+			options
+		);
+
+		expect(presentationSub.tags).toEqual(["subslide-tag"]);
+	});
 });
 
 describe("#createFromAdjunctSubSlide", () => {
@@ -107,11 +117,30 @@ describe("#createFromAdjunctSubSlide", () => {
 			index: 2,
 			sequence: 2,
 			visible: true,
+			tags: [],
 			url: subslide.url(),
 		};
 
 		expect(presentationSub.toJSON()).toEqual(expected);
 	});
+
+	it("should use deckTags when available", async () => {
+		const subslide = new AdjunctSubSlideModel(adjunctSubSlideJSON);
+
+		const options = {
+			id: 23,
+			deckTags: {
+				"test-deck/why_myob_vision/adjunct-562": ["adjunctsubslide-tag"],
+			},
+		};
+		const presentationSub = PresentationSubSlide.createFromAdjunctSubSlide(
+			subslide,
+			{ id: 58 },
+			options
+		);
+
+		expect(presentationSub.tags).toEqual(["adjunctsubslide-tag"]);
+	});
 });
 
 describe("#createFromSlide", () => {

package/src/presentation/presentation.js

@@ -18,7 +18,7 @@ export const Presentation = BasePresentationModel.extend({
 Presentation.createFromDeckversion = function (deckversionURL, options) {
 	const deckversion = new DeckVersionModel(deckversionURL);
 
-	options = _.defaults(options, {
+	const opts = _.defaults(options, {
 		includeTemplates: false,
 	});
 
@@ -31,9 +31,21 @@ Presentation.createFromDeckversion = function (deckversionURL, options) {
 			]);
 		})
 		.then(() => {
+			return deckversion.deck.tags.fetch();
+		})
+		.then(() => {
+			const deckTags = deckversion.deck.tags.items.reduce((tagObj, tagItem) => {
+				tagObj[tagItem.namespaced_key] = tagItem.tags;
+				return tagObj;
+			}, {});
+
 			const presentation = new Presentation();
-			const createOpts = {};
-			if (options.includeTemplates) {
+
+			const createOpts = {
+				deckTags,
+			};
+
+			if (opts.includeTemplates) {
 				createOpts.templates = deckversion.template_set.toJSON();
 			}
 

package/src/state-register.js

@@ -4,3 +4,10 @@ export const register = (name, State) => {
 	State.prototype._registerName = name;
 	registeredStates[name] = State;
 };
+
+export const getState = (name) => {
+	if (!registeredStates[name]) {
+		throw new Error(`Registered state '${name}' not found.`);
+	}
+	return registeredStates[name];
+};

package/api.build.error.log

@@ -1,16 +0,0 @@
-PASS src/presentation/base-presentation-model.spec.js (48.024s)
-PASS src/presentation/presentation-subslide.spec.js (48.051s)
-PASS src/presentation/presentation-deck.spec.js (48.156s)
-PASS src/utils.spec.js (48.326s)
-PASS src/collections/base.spec.js (48.602s)
-PASS src/models/timing-log.spec.js (48.606s)
-PASS src/models/base.spec.js (49.267s)
-PASS src/api.spec.js
-PASS src/models/user.spec.js
-PASS src/auth.spec.js
-
-Test Suites: 10 passed, 10 total
-Tests:       96 passed, 96 total
-Snapshots:   0 total
-Time:        55.047s
-Ran all test suites.