@livepreso/api 6.40.0 → 6.43.0

package/src/presentation/presentation-deck.js

@@ -1,23 +1,23 @@
 import "./presentation-sections.js";
 
-import url2 from "url";
-
-import _ from "lodash";
-
 import * as collections from "../collections";
-import { getAssetRoot } from "../index.js";
-import log from "../log.js";
-import { DeckVersionModel } from "../models";
-import { register } from "../state-register";
+
 import {
 	getMaxID,
 	isImpostor,
 	isImpostorDeck,
-	setSequentialSequences
+	setSequentialSequences,
 } from "../utils.js";
+
 import { BasePresentationModel } from "./base-presentation-model";
+import { DeckVersionModel } from "../models";
 import { PresentationSection } from "./presentation-section";
 import { PresentationSlide } from "./presentation-slide";
+import _ from "lodash";
+import { getAssetRoot } from "../index.js";
+import log from "../log.js";
+import { register } from "../state-register";
+import url2 from "url";
 
 /**
  * @constructor
@@ -56,32 +56,32 @@ export const PresentationDeck = BasePresentationModel.extend(
 			usesImpostorSections: "boolean",
 			editable: "boolean",
 			tags: "array",
-			version: "number"
+			version: "number",
 		},
 
 		/**
 		 * @property {presentation.PresentationSection} realSection
 		 */
 		children: {
-			realSection: "PresentationSection"
+			realSection: "PresentationSection",
 		},
 
 		derived: {
 			welcomeSlide: {
-				fn: function() {
+				fn: function () {
 					return new PresentationSection({
 						...this.getAttributes({ props: true }),
-						isWelcome: true
+						isWelcome: true,
 					});
-				}
-			}
+				},
+			},
 		},
 
 		/**
 		 * @property {presentation.PresentationSectionCollection} sections
 		 */
 		collections: {
-			sections: "PresentationSectionCollection"
+			sections: "PresentationSectionCollection",
 		},
 
 		url() {
@@ -90,7 +90,7 @@ export const PresentationDeck = BasePresentationModel.extend(
 			}
 
 			return this._url;
-		}
+		},
 	}
 );
 
@@ -103,7 +103,7 @@ export const PresentationDeck = BasePresentationModel.extend(
  * @param {collections.AdjunctSectionCollection}} [adjunctSections]
  * @returns {presentation.PresentationDeck}
  */
-PresentationDeck.createFromDeckVersion = function(
+PresentationDeck.createFromDeckVersion = function (
 	deckVersionModel,
 	options = {}
 ) {
@@ -116,7 +116,7 @@ PresentationDeck.createFromDeckVersion = function(
 		slideSelections: new collections.SlideSelectionCollection(),
 		rootAssetPath: null,
 		templates: null,
-		choicelist: null
+		choicelist: null,
 	});
 
 	const assetRoot = getAssetRoot(deckVersionModel.index_asset.url());
@@ -131,7 +131,7 @@ PresentationDeck.createFromDeckVersion = function(
 		css = `${assetRoot}slide.css`;
 	}
 
-	const tags = deckVersionModel.tags || [];
+	const tags = PresentationDeck.getTags(deckVersionModel, options);
 
 	const deck = new PresentationDeck({
 		html,
@@ -146,7 +146,8 @@ PresentationDeck.createFromDeckVersion = function(
 		title: deckVersionModel.deck.title,
 		editable: tags.indexOf("editable") > -1,
 		tags,
-		version: deckVersionModel.version
+		version: deckVersionModel.version,
+		usesImpostorSections: isImpostorDeck(deckVersionModel),
 	});
 
 	if (!deck.key) {
@@ -161,21 +162,21 @@ PresentationDeck.createFromDeckVersion = function(
 	const slideSelections = options.slideSelections;
 
 	options.selections = sectionSelections
-		.map(selection => {
+		.map((selection) => {
 			return {
 				sequence: selection.sequence,
 				visible: selection.visible,
 				url: selection.section.url(),
-				id: selection.id
+				id: selection.id,
 			};
 		})
 		.concat(
-			slideSelections.map(selection => {
+			slideSelections.map((selection) => {
 				return {
 					sequence: selection.sequence,
 					visible: selection.visible,
 					url: selection.slide.url(),
-					id: selection.id
+					id: selection.id,
 				};
 			})
 		);
@@ -185,7 +186,7 @@ PresentationDeck.createFromDeckVersion = function(
 	// all existing IDs then use the getUniqueAdjunctID function to retrieve an incremented ID
 	let maxID = getMaxID(deckVersionModel);
 
-	options.getUniqueAdjunctID = function() {
+	options.getUniqueAdjunctID = function () {
 		return ++maxID;
 	};
 
@@ -196,13 +197,13 @@ PresentationDeck.createFromDeckVersion = function(
 	// internally retrieve the correct sequence & visibility data depending on whether
 	// we're using selections or a choicelist.
 
-	if (!isImpostorDeck(deckVersionModel)) {
+	if (!deck.usesImpostorSections) {
 		// Non impostor deck using selections or a choicelist. Slides are already
 		// associated with the correct sections, so all we have to do is turn
 		// everything into a presentation model and pass the options through with
 		// the selections or choicelist data.
 
-		deckVersionModel.section_set.forEach(sectionModel => {
+		deckVersionModel.section_set.forEach((sectionModel) => {
 			const section = PresentationSection.createFromSection(
 				sectionModel,
 				options
@@ -211,14 +212,14 @@ PresentationDeck.createFromDeckVersion = function(
 			section.addSlides(sectionModel.slide_set, options);
 			deck.sections.add(section);
 
-			const adjunctSlides = options.adjunctSlides.filter(slide => {
+			const adjunctSlides = options.adjunctSlides.filter((slide) => {
 				return slide.section && slide.section.id === section.id;
 			});
 
 			section.addSlides(adjunctSlides, options);
 		});
 
-		options.adjunctSections.forEach(adjunctSection => {
+		options.adjunctSections.forEach((adjunctSection) => {
 			const section = PresentationSection.createFromAdjunctSection(
 				adjunctSection,
 				DeckVersionModel,
@@ -232,14 +233,13 @@ PresentationDeck.createFromDeckVersion = function(
 		// only contains one section, which is the "real" section but is not used in
 		// the presentation. Some slides have the tag "section-header", and these slides
 		// will be turned into sections and may be given sets of slides.
-		deck.usesImpostorSections = true;
 
 		const realSection = deckVersionModel.section_set.first();
 
 		deck.realSection = new PresentationSection({
 			id: realSection.id,
 			key: realSection.key,
-			adjunctSlideLimit: realSection.adjunctslide_limit
+			adjunctSlideLimit: realSection.adjunctslide_limit,
 		});
 
 		let slides = [];
@@ -249,7 +249,7 @@ PresentationDeck.createFromDeckVersion = function(
 		// section; if it is just a slide then we add it to the slides array, which will contain
 		// all slides. We can't allocate slides to sections yet because we don't know
 		// which section a slide belongs to.
-		realSection.slide_set.forEach(slideModel => {
+		realSection.slide_set.forEach((slideModel) => {
 			const isSection = isImpostor(slideModel);
 
 			if (isSection) {
@@ -268,8 +268,8 @@ PresentationDeck.createFromDeckVersion = function(
 
 		// We filter the adjunct slides and add all the non-section slides to the slides array too.
 		options.adjunctSlides
-			.filter(slide => !isImpostor(slide))
-			.forEach(adjunctSlideModel => {
+			.filter((slide) => !isImpostor(slide))
+			.forEach((adjunctSlideModel) => {
 				const slide = PresentationSlide.createFromAdjunctSlide(
 					adjunctSlideModel,
 					null,
@@ -287,9 +287,9 @@ PresentationDeck.createFromDeckVersion = function(
 		// slides with the sequence > 110 then I know that all slides with a sequence > 110
 		// are valid. I then remove those slides from the slides array and move down to the
 		// next section.
-		deck.sections.models.reverse().forEach(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);
@@ -300,17 +300,17 @@ PresentationDeck.createFromDeckVersion = function(
 			// and a 100% chance that it's incorrect for adjunct slides as we
 			// didn't populate the section field when we created the adjunct slides.
 			// We update those now with the correct section.
-			section.slides.forEach(slide => {
+			section.slides.forEach((slide) => {
 				slide.section = section.id;
 			});
 
-			slides = slides.filter(slide => slide.sequence <= section.sequence);
+			slides = slides.filter((slide) => slide.sequence <= section.sequence);
 		});
 
 		// Average the adjunct slide limit used across the entire deck over each section
 		// in the deck. We do this before we add the adjunct impostor sections, 'cause you
 		// can't add custom slides to those.
-		deck.sections.forEach(section => {
+		deck.sections.forEach((section) => {
 			section.adjunctSlideLimit = section.adjunctSlideLimit
 				? section.adjunctSlideLimit
 				: Math.floor(realSection.adjunctSlideLimit / deck.sections.length);
@@ -324,8 +324,8 @@ PresentationDeck.createFromDeckVersion = function(
 		// but because adjunct sections can't have slides we're adding them after the
 		// slide-assigning process
 		options.adjunctSlides
-			.filter(slide => isImpostor(slide))
-			.forEach(adjunctSlideModel => {
+			.filter((slide) => isImpostor(slide))
+			.forEach((adjunctSlideModel) => {
 				const adjunctSection = PresentationSection.createFromAdjunctSection(
 					adjunctSlideModel,
 					DeckVersionModel,
@@ -354,7 +354,7 @@ PresentationDeck.createFromDeckVersion = function(
 	return deck;
 };
 
-PresentationDeck.createFromManifestJSON = function(manifestJSON) {
+PresentationDeck.createFromManifestJSON = function (manifestJSON) {
 	const deck = new PresentationDeck({
 		id: parseInt(_.uniqueId(), 10),
 		index: 0,
@@ -366,18 +366,20 @@ PresentationDeck.createFromManifestJSON = function(manifestJSON) {
 		thumbnail: null,
 		deckID: 1,
 		title: "Local",
-		version: 1
+		version: 1,
+		tags: manifestJSON.tags[""] || [],
 	});
 
 	const usesImpostorSections = _.some(
 		manifestJSON.tags,
-		tags => tags.indexOf("section-header") !== -1
+		(tags) => tags.indexOf("section-header") !== -1
 	);
+	deck.usesImpostorSections = usesImpostorSections;
 
 	if (usesImpostorSections) {
 		deck.usesImpostorSections = true;
 
-		let items = Object.keys(manifestJSON.titles).map(key => {
+		let items = Object.keys(manifestJSON.titles).map((key) => {
 			const sequence = manifestJSON.toJSON().ordering[key];
 			const splitKey = key.split("/");
 			const newKey = splitKey[splitKey.length - 1];
@@ -388,14 +390,14 @@ PresentationDeck.createFromManifestJSON = function(manifestJSON) {
 				html: url2.resolve(manifestJSON.getAssetPath(key), "index.html"),
 				css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
 				title: manifestJSON.titles[key],
-				tags: manifestJSON.tags[key] || []
+				tags: manifestJSON.tags[key] || [],
 			};
 		});
 
 		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) => {
@@ -417,7 +419,7 @@ PresentationDeck.createFromManifestJSON = function(manifestJSON) {
 
 		deck.realSection = PresentationSection.createFromManifestImpostor(items[0]);
 	} else {
-		const sectionKeys = Object.keys(manifestJSON.titles).filter(title => {
+		const sectionKeys = Object.keys(manifestJSON.titles).filter((title) => {
 			return title.split("/").length === 1;
 		});
 
@@ -433,7 +435,7 @@ PresentationDeck.createFromManifestJSON = function(manifestJSON) {
 	}
 
 	if (manifestJSON.templates) {
-		const templates = Object.keys(manifestJSON.templates).map(key => {
+		const templates = Object.keys(manifestJSON.templates).map((key) => {
 			return {
 				...manifestJSON.templates[key],
 				key,
@@ -442,8 +444,8 @@ PresentationDeck.createFromManifestJSON = function(manifestJSON) {
 					url: url2.resolve(
 						manifestJSON.getTemplateAssetPath(key),
 						"index.html"
-					)
-				}
+					),
+				},
 			};
 		});
 

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

@@ -1,6 +1,5 @@
-import { G } from "sp-test/api";
-
 import { DeckVersionModel } from "../models/deck-version";
+import { G } from "sp-test/api";
 import { ManifestJSONModel } from "../models/manifest-json";
 import { PresentationDeck } from "./presentation-deck";
 
@@ -20,7 +19,7 @@ describe("#createFromManifestJSON", () => {
 				section_2: "Section 2",
 				"section_2/slide_1": "Section 2 Slide 1",
 				"section_2/slide_2": "Section 2 Slide 2",
-				section_3: "Section 3"
+				section_3: "Section 3",
 			},
 			ordering: {
 				section_1: 1,
@@ -28,19 +27,19 @@ describe("#createFromManifestJSON", () => {
 				section_2: 2,
 				"section_2/slide_1": 1,
 				"section_2/slide_2": 2,
-				section_3: 3
+				section_3: 3,
 			},
 			templates: {
 				apple: {
 					title: "Apple",
-					ordering: 1
+					ordering: 1,
 				},
 				orange: {
 					title: "Orange",
-					ordering: 2
-				}
+					ordering: 2,
+				},
 			},
-			tags: {}
+			tags: {},
 		});
 
 		const deck = PresentationDeck.createFromManifestJSON(model);
@@ -65,8 +64,8 @@ describe("#createFromDeckVersion", () => {
 				key: "apple",
 				sequence: 1,
 				index_asset: {
-					url: "http://path/to/template/apple/index.html"
-				}
+					url: "http://path/to/template/apple/index.html",
+				},
 			},
 			{
 				id: 21,
@@ -74,22 +73,22 @@ describe("#createFromDeckVersion", () => {
 				key: "orange",
 				sequence: 2,
 				index_asset: {
-					url: "http://path/to/template/orange/index.html"
-				}
-			}
+					url: "http://path/to/template/orange/index.html",
+				},
+			},
 		],
 		index_asset: {
-			url: "http://path/to/index.html"
+			url: "http://path/to/index.html",
 		},
 		deck: {
-			id: 1
+			id: 1,
 		},
 		section_set: [
 			{
 				id: 1,
 				title: "Section 1",
 				index_asset: {
-					url: "http://path/to/index.html"
+					url: "http://path/to/index.html",
 				},
 				deckversion: { id: 1 },
 				sequence: 1,
@@ -98,34 +97,34 @@ describe("#createFromDeckVersion", () => {
 						id: 1,
 						title: "Slide 1",
 						index_asset: {
-							url: "http://path/to/index.html"
+							url: "http://path/to/index.html",
 						},
 						subslide_set: [],
-						section: { id: 1 }
-					}
-				]
+						section: { id: 1 },
+					},
+				],
 			},
 			{
 				id: 2,
 				title: "Section 2",
 				index_asset: {
-					url: "http://path/to/index.html"
+					url: "http://path/to/index.html",
 				},
 				deckversion: { id: 1 },
 				sequence: 2,
-				slide_set: []
+				slide_set: [],
 			},
 			{
 				id: 3,
 				title: "Section 3",
 				index_asset: {
-					url: "http://path/to/index.html"
+					url: "http://path/to/index.html",
 				},
 				deckversion: { id: 1 },
 				sequence: 3,
-				slide_set: []
-			}
-		]
+				slide_set: [],
+			},
+		],
 	};
 
 	it("should not add template sections to the end of a deck", async () => {
@@ -144,7 +143,7 @@ describe("#createFromDeckVersion", () => {
 		G(DeckVersionModel);
 		const model = new DeckVersionModel(deckVersionJSON);
 		const deck = PresentationDeck.createFromDeckVersion(model, {
-			templates: model.template_set
+			templates: model.template_set,
 		});
 
 		expect(deck.sections.length).toEqual(5);

package/src/presentation/presentation-decks.js

@@ -1,7 +1,7 @@
 import "./presentation-deck.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 PresentationDeckCollection = BasePresentationCollection.extend(
 	/** @lends presentation.PresentationDeckCollection# */ {
 		comparator: "sequence",
-		model: "PresentationDeck"
+		model: "PresentationDeck",
 	}
 );