@livepreso/api 6.55.1 → 6.56.0

package/src/models/pack.js

@@ -23,6 +23,7 @@ export const PackModel = BaseModel.extend(
 			modified_date: "date",
 			hash_digest: "string",
 			hash_algorithm: "string",
+			root_url: "string",
 		},
 
 		/**

package/src/presentation/presentation-deck.js

@@ -17,7 +17,7 @@ import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import log from "../log.js";
 import { register } from "../state-register";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -67,6 +67,9 @@ export const PresentationDeck = BasePresentationModel.extend(
 			version: "number",
 			namespacedKey: "string",
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: true },
+			isSlide: { type: "boolean", default: false },
+			isSection: { type: "boolean", default: false },
 		},
 
 		/**
@@ -406,8 +409,8 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 		index: 0,
 		visible: true,
 		key: manifestJSON.key || "manifest_deck",
-		html: url2.resolve(manifestJSON.getAssetPath(), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(), "slide.css"),
 		common: manifestJSON.common,
 		thumbnail: null,
 		deckID: 1,
@@ -434,8 +437,8 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 			return {
 				key: newKey,
 				sequence,
-				html: url2.resolve(manifestJSON.getAssetPath(key), "index.html"),
-				css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
+				html: resolveURL(manifestJSON.getAssetPath(key), "index.html"),
+				css: resolveURL(manifestJSON.getAssetPath(key), "slide.css"),
 				title: manifestJSON.titles[key],
 				tags: manifestJSON.tags[key] || [],
 				cmsvalkey_set: [],
@@ -500,10 +503,7 @@ PresentationDeck.createFromManifestJSON = function (manifestJSON, project) {
 				key,
 				sequence: manifestJSON.templates[key].ordering,
 				index_asset: {
-					url: url2.resolve(
-						manifestJSON.getTemplateAssetPath(key),
-						"index.html",
-					),
+					url: resolveURL(manifestJSON.getTemplateAssetPath(key), "index.html"),
 				},
 				cmsvalkey_set: cmsvals,
 			};

package/src/presentation/presentation-section.js

@@ -17,7 +17,7 @@ import { PresentationSlide } from "./presentation-slide.js";
 import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import { register } from "../state-register.js";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -102,11 +102,10 @@ export const PresentationSection = BasePresentationModel.extend(
 			tagsEditable: "boolean",
 			tags: "array",
 			impostor: "boolean",
-			isWelcome: {
-				type: "boolean",
-				default: false,
-			},
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: false },
+			isSlide: { type: "boolean", default: false },
+			isSection: { type: "boolean", default: true },
 		},
 
 		/**
@@ -445,8 +444,8 @@ PresentationSection.createFromManifestJSON = function (
 		id: parseInt(_.uniqueId(), 10),
 		index,
 		title: manifestJSON.titles[sectionKey],
-		html: url2.resolve(manifestJSON.getAssetPath(sectionKey), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(sectionKey), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(sectionKey), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(sectionKey), "slide.css"),
 		key: sectionKey,
 		sequence: manifestJSON.ordering[sectionKey] - 1,
 		thumbnail: null,
@@ -484,7 +483,10 @@ PresentationSection.createFromManifestImpostor = function (
 	const slides = section.slides || [];
 	section.slides = null;
 
-	const projectSection = project?.sections.find((s) => s.key === section.key);
+	// Single section with slides
+	const projectSection = project?.sections[0].slides.find(
+		(s) => s.key === section.key,
+	);
 
 	const presentationSection = new PresentationSection({
 		id: parseInt(_.uniqueId(), 10),
@@ -602,11 +604,32 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 	return autoAdjunctSection;
 };
 
-PresentationSection.createFromTemplate = function (template, index, minID = 0) {
+PresentationSection.createFromTemplate = function (
+	template,
+	index,
+	minID = 0,
+	options = {},
+) {
 	const templateModel = new TemplateModel(template);
 
+	_.defaults(options, {
+		rootAssetPath: null,
+	});
+
 	const deckversion = new DeckVersionModel(templateModel.deckversion);
-	const templateAssetRoot = getAssetRoot(templateModel.index_asset.url());
+
+	let html;
+	let css;
+
+	if (options.rootAssetPath) {
+		const origPath = templateModel.index_asset.orig_path;
+		html = `${options.rootAssetPath}${origPath}/index.html`;
+		css = `${options.rootAssetPath}${origPath}/slide.css`;
+	} else {
+		const templateAssetRoot = getAssetRoot(templateModel.index_asset.url());
+		html = `${templateAssetRoot}index.html`;
+		css = `${templateAssetRoot}slide.css`;
+	}
 
 	const presentationSection = new PresentationSection({
 		id: minID + parseInt(_.uniqueId(), 10),
@@ -614,8 +637,8 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
 		template: templateModel,
 		key: `template-${templateModel.key}`,
 		title: templateModel.title,
-		html: `${templateAssetRoot}index.html`,
-		css: `${templateAssetRoot}slide.css`,
+		html,
+		css,
 		custom: false,
 		visible: true,
 		thumbnail: templateModel.image_256,

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

@@ -63,6 +63,8 @@ describe("#createFromSection", () => {
 			id: 1728,
 			impostor: false,
 			index: 0,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "agenda",
 			namespacedKey: "agenda",
@@ -192,6 +194,8 @@ describe("#createFromAdjunctSection", () => {
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			impostor: false,
 			index: 1,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "adjunct-1737",
 			sequence: 1,
@@ -325,6 +329,8 @@ describe("#createFromImpostorSection", () => {
 			id: 23898,
 			impostor: true,
 			index: 0,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "agenda",
 			namespacedKey: "test-deck/agenda",
@@ -437,6 +443,8 @@ describe("#createFromAutoAdjunct", () => {
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			impostor: false,
 			index: 3,
+			isSection: true,
+			isSlide: false,
 			isWelcome: false,
 			key: "autoadjunct-five",
 			sequence: 3,

package/src/presentation/presentation-slide.js

@@ -9,7 +9,7 @@ import { PresentationSubSlide } from "./presentation-subslide.js";
 import _ from "lodash";
 import { getAssetRoot } from "../index.js";
 import { register } from "../state-register.js";
-import url2 from "url";
+import { resolveURL } from "../utils.js";
 
 /**
  * @constructor
@@ -88,6 +88,9 @@ export const PresentationSlide = BasePresentationModel.extend(
 			tagsEditable: "boolean",
 			tags: "array",
 			cmsvalkey_set: "array",
+			isWelcome: { type: "boolean", default: false },
+			isSlide: { type: "boolean", default: true },
+			isSection: { type: "boolean", default: false },
 		},
 
 		/**
@@ -365,8 +368,8 @@ PresentationSlide.createFromManifestJSON = function (
 		id: parseInt(_.uniqueId(), 10),
 		title: manifestJSON.titles[key],
 		index,
-		html: url2.resolve(manifestJSON.getAssetPath(key), "index.html"),
-		css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
+		html: resolveURL(manifestJSON.getAssetPath(key), "index.html"),
+		css: resolveURL(manifestJSON.getAssetPath(key), "slide.css"),
 		key: slideKey,
 		editable: false,
 		titleEditable: false,
@@ -429,9 +432,9 @@ PresentationSlide.createFromTemplate = function (
 		titleEditable: false,
 		notesEditable: false,
 		tagsEditable: false,
-		thumbnail: null,
 		custom: false,
 		visible: true,
+		thumbnail: template.image_256,
 		section: sectionID,
 		// Makes sure templates are rendered with unique IDs
 		autoAdjunctID: Number(_.uniqueId()),

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

@@ -52,6 +52,9 @@ describe("#createFromSlide", () => {
 			html: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/index.html",
 			id: 23219,
 			index: 13,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "slide-key",
 			namespacedKey: "test-deck/slide-key",
 			section: 1738,
@@ -166,6 +169,9 @@ describe("#createFromAdjunctSlide", () => {
 			image:
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			index: 3,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "adjunct-10529",
 			section: null,
 			sequence: 3,
@@ -284,6 +290,9 @@ describe("#createFromAutoAdjunct", () => {
 			image:
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
 			index: 3,
+			isSection: false,
+			isSlide: true,
+			isWelcome: false,
 			key: "autoadjunct-three",
 			sectionKey: "",
 			sequence: 3,

package/src/sync.js

@@ -4,7 +4,6 @@ import _ from "lodash";
 import log from "./log.js";
 import { middlewares } from "./middleware.js";
 import superagent from "superagent";
-import url2 from "url";
 
 const defaults = _.defaults;
 const assign = _.assign;
@@ -30,11 +29,10 @@ export const defaultFetchURL = function ({ model }) {
 
 export const buildURL = function ({ method, model }) {
 	const url = model.url();
-	const urlParse = url2.parse(url);
 
 	// If not a GET request, strip the query params from the url
 	if (method !== "read") {
-		return url.replace(urlParse.search, "");
+		return url.split("?")[0];
 	}
 
 	return url;

package/src/utils.js

@@ -1,12 +1,41 @@
 import _ from "lodash";
 /* eslint-disable no-control-regex */
-import url2 from "url";
 
 export const DATE_FORMAT = "YYYY-MM-DD HH:mm:ss.SSSSSS[Z]";
 export const DATE_FORMAT_T = "YYYY-MM-DDTHH:mm:ss.SSSSSS[Z]";
 
 export function getShortURL(url) {
-	return url2.parse(url).path;
+	if (!url) return url;
+	if (typeof url !== "string") return url;
+
+	try {
+		return new URL(url, "http://a.b").pathname;
+	} catch (e) {
+		return url;
+	}
+}
+
+/**
+ * Resolves a target URL relative to a base URL in a manner similar to a Web browser resolving an anchor tag.
+ * Matches url.resolve() behavior but handles relative bases.
+ */
+export function resolveURL(base, relative) {
+	if (!base) return relative;
+	if (!relative) return base;
+
+	const dummyBase = "http://a.b";
+	try {
+		// Try resolving normally (if base is absolute)
+		return new URL(relative, base).href;
+	} catch (e) {
+		try {
+			// If base is relative, resolve it against a dummy base, then strip it
+			const resolved = new URL(relative, new URL(base, dummyBase));
+			return resolved.href.replace(dummyBase, "");
+		} catch (e2) {
+			return relative;
+		}
+	}
 }
 
 /**