@livepreso/api 6.55.2 → 6.56.0

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;
+		}
+	}
 }
 
 /**