@livepreso/api 6.53.0 → 6.54.0

package/src/presentation/appointment-presentation.js

@@ -5,7 +5,7 @@ import "../models/user.js";
 import "../collections/opportunities.js";
 import "../collections/contacts.js";
 
-import { AppointmentModel, TeamModel } from "../models.js";
+import { AppointmentModel, ScenarioModel } from "../models.js";
 
 import { BaseModel } from "../models/base.js";
 import { PresentationDeck } from "./presentation-deck.js";
@@ -59,16 +59,18 @@ export const AppointmentPresentation = BaseModel.extend(
 
 const createFromAppointment = function (appointment, options) {
 	const appointmentPresentation = new AppointmentPresentation();
-	const team = appointment.team ? new TeamModel(appointment.team).id : null;
+	const scenario = appointment.scenario
+		? new ScenarioModel(appointment.scenario).id
+		: null;
 
 	// Note that we're not passing through tags if appointment.tags is empty.
 	// This is because tags currently aren't available in the telepresenter
 	// bundle and we want to fall back on the model tags for now.
 	appointmentPresentation.presentation.decks.add(
 		appointment.deckversion_set.map((model, index) => {
-			const screenshots = PresentationDeck.filterScreenshotsByTeam(
+			const screenshots = PresentationDeck.filterScreenshotsByScenario(
 				model.screenshots,
-				team,
+				scenario,
 			);
 
 			return PresentationDeck.createFromDeckVersion(model, {

package/src/presentation/base-presentation-model.js

@@ -1,6 +1,6 @@
 import { BaseModel } from "../models/base.js";
 import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
-import { TeamModel } from "../models/team.js";
+import { ScenarioModel } from "../models/scenario.js";
 import _ from "lodash";
 
 /**
@@ -24,7 +24,7 @@ BasePresentationModel.screenshotsToMap = function (screenshots) {
 	return screenshots.reduce((result, model) => {
 		if (result[model.subject]) {
 			throw new Error(`
-				Found multiple screenshots that could match this subject. If there is a team
+				Found multiple screenshots that could match this subject. If there is a scenario
 				and a global, be sure to remove the screenshot that you don't need.
 			`);
 		}
@@ -50,52 +50,58 @@ BasePresentationModel.getThumbnail = function (model, screenshots) {
 };
 
 /**
- * Takes a list of screenshots and filters it to only be a list used by a single team
+ * Takes a list of screenshots and filters it to only be a list used by a single scenario
  * (or company wide).
  *
  * The logic should be like this:
  *
- *	* If the team is null, we just return all global screenshots (team = null)
- *	* If we select a team, we take those global screenshots and replace any that have a
- *		team specific version of that screenshot. If none is found, the team will want to
- *		see the same global version. Obviously only one team's screenshots should be available.
+ *	* If the scenario is null, we just return all global screenshots (scenario = null)
+ *	* If we select a scenario, we take those global screenshots and replace any that have a
+ *		scenario specific version of that screenshot. If none is found, the
+ *		scenario will want to see the same global version. Obviously only one
+ *		scenario's screenshots should be available.
  */
-BasePresentationModel.filterScreenshotsByTeam = function (
+BasePresentationModel.filterScreenshotsByScenario = function (
 	_screenshots,
-	_team = null,
+	_scenario = null,
 ) {
 	const screenshots = new DeckVersionScreenshotCollection(_screenshots);
-	const team = _team ? new TeamModel(_team) : null;
+	const scenario = _scenario ? new ScenarioModel({ id: _scenario }) : null;
 
 	const globalScreenshots = screenshots
-		.filter((screen) => screen.team === null)
+		.filter((screen) => screen.scenario === null)
 		.map((screen) => screen.toJSON());
 
 	const result = globalScreenshots;
 
-	if (team) {
-		const teamScreenshots = screenshots
-			.filter((screen) => screen.team && screen.team.url() === team.url())
-			.map((screen) => ({ ...screen.toJSON(), team: screen.team.url() }));
-
-		for (const teamScreen of teamScreenshots) {
+	if (scenario) {
+		const scenarioScreenshots = screenshots
+			.filter(
+				(screen) => screen.scenario && screen.scenario.url() === scenario.url(),
+			)
+			.map((screen) => ({
+				...screen.toJSON(),
+				scenario: screen.scenario.url(),
+			}));
+
+		for (const scenarioScreen of scenarioScreenshots) {
 			const existingGlobalIndex = _.findIndex(result, {
-				subject: teamScreen.subject,
+				subject: scenarioScreen.subject,
 			});
 
 			if (existingGlobalIndex === -1) {
-				// If there isn't an existing global version, just add the team
+				// If there isn't an existing global version, just add the scenario
 				// screenshot to the list
-				result.push(teamScreen);
+				result.push(scenarioScreen);
 			} else {
-				// Otherwise we should use the team version instead of the global version
-				result[existingGlobalIndex] = teamScreen;
+				// Otherwise we should use the scenario version instead of the global version
+				result[existingGlobalIndex] = scenarioScreen;
 			}
 		}
 	}
 
 	// Try to return it in the same order every time
-	const ordered = _.orderBy(result, ["team", "subject"], ["desc", "asc"]);
+	const ordered = _.orderBy(result, ["scenario", "subject"], ["desc", "asc"]);
 	return new DeckVersionScreenshotCollection(ordered);
 };
 

package/src/presentation/base-presentation-model.spec.js

@@ -229,38 +229,38 @@ describe("#getTags", () => {
 	});
 });
 
-describe("#filterScreenshotsByTeam", () => {
+describe("#filterScreenshotsByScenario", () => {
 	const screenshots = new DeckVersionScreenshotCollection([
 		{
 			subject: "/api/slides/1/",
 			image_256: "global-screenshot-1.png",
-			team: null,
+			scenario: null,
 		},
 		{
 			subject: "/api/slides/2/",
 			image_256: "global-screenshot-2.png",
-			team: null,
+			scenario: null,
 		},
 		{
 			subject: "/api/slides/1/",
-			image_256: "team-1-screenshot.png",
-			team: "/api/teams/1/",
+			image_256: "scenario-1-screenshot.png",
+			scenario: "/api/scenarios/50465ccb-8887-4e1c-bb01-84c91a58c7ea/",
 		},
 		{
 			subject: "/api/sections/2/",
-			image_256: "team-1-screenshot.png",
-			team: "/api/teams/1/",
+			image_256: "scenario-1-screenshot.png",
+			scenario: "/api/scenarios/50465ccb-8887-4e1c-bb01-84c91a58c7ea/",
 		},
-		// Just for testing that the team filters don't get cross-contaminated
+		// Just for testing that the scenario filters don't get cross-contaminated
 		{
 			subject: "/api/sections/2/",
-			image_256: "team-2-screenshot.png",
-			team: "/api/teams/2/",
+			image_256: "scenario-2-screenshot.png",
+			scenario: "/api/scenarios/9d35f335-efe7-4e5b-8365-f2afa229469d/",
 		},
 	]);
 
-	it("should just return global screenshots if team is null", () => {
-		const filtered = BasePresentationModel.filterScreenshotsByTeam(
+	it("should just return global screenshots if scenario is null", () => {
+		const filtered = BasePresentationModel.filterScreenshotsByScenario(
 			screenshots,
 			null,
 		).toJSON();
@@ -269,37 +269,37 @@ describe("#filterScreenshotsByTeam", () => {
 			{
 				subject: "/api/slides/1/",
 				image_256: "global-screenshot-1.png",
-				team: null,
+				scenario: null,
 			},
 			{
 				subject: "/api/slides/2/",
 				image_256: "global-screenshot-2.png",
-				team: null,
+				scenario: null,
 			},
 		]);
 	});
 
-	it("should return globals with team override", () => {
-		const filtered = BasePresentationModel.filterScreenshotsByTeam(
+	it("should return globals with scenario override", () => {
+		const filtered = BasePresentationModel.filterScreenshotsByScenario(
 			screenshots,
-			1,
+			"50465ccb-8887-4e1c-bb01-84c91a58c7ea",
 		).toJSON();
 
 		expect(filtered).toEqual([
 			{
 				image_256: "global-screenshot-2.png",
 				subject: "/api/slides/2/",
-				team: null,
+				scenario: null,
 			},
 			{
-				image_256: "team-1-screenshot.png",
+				image_256: "scenario-1-screenshot.png",
 				subject: "/api/sections/2/",
-				team: "/api/teams/1/",
+				scenario: "/api/scenarios/50465ccb-8887-4e1c-bb01-84c91a58c7ea/",
 			},
 			{
-				image_256: "team-1-screenshot.png",
+				image_256: "scenario-1-screenshot.png",
 				subject: "/api/slides/1/",
-				team: "/api/teams/1/",
+				scenario: "/api/scenarios/50465ccb-8887-4e1c-bb01-84c91a58c7ea/",
 			},
 		]);
 	});

package/src/presentation/presentation-section.js

@@ -49,7 +49,10 @@ export const PresentationSection = BasePresentationModel.extend(
 		 * @property {boolean} visible
 		 * @property {number} deckversion
 		 * @property {number} selectionID
-		 * @property {boolean} editable
+		 * @property {bool} editable
+		 * @property {bool} titleEditable
+		 * @property {bool} notesEditable
+		 * @property {bool} tagsEditable
 		 * @property {array} tags
 		 * @property {boolean} impostor
 		 * @property {boolean} isWelcome
@@ -94,6 +97,9 @@ export const PresentationSection = BasePresentationModel.extend(
 			deckversion: "number",
 			selectionID: "number",
 			editable: "boolean",
+			titleEditable: "boolean",
+			notesEditable: "boolean",
+			tagsEditable: "boolean",
 			tags: "array",
 			impostor: "boolean",
 			isWelcome: {
@@ -226,6 +232,11 @@ PresentationSection.createFromSection = function (sectionModel, options = {}) {
 		title: sectionModel.title,
 		deckversion: sectionModel.deckversion.id,
 		editable: tags.indexOf("editable") > -1,
+		// By default this is true for a deck slide. These can be changed later in PM depending
+		// on the logged in user and properties of an AutoAdjunct
+		titleEditable: false,
+		notesEditable: true,
+		tagsEditable: true,
 		tags,
 		index: config.sequence,
 		sequence: config.sequence,
@@ -304,6 +315,9 @@ PresentationSection.createFromAdjunctSection = function (
 		title: adjunctSectionModel.title,
 		deckversion: deckVersionModel.id,
 		editable: false,
+		titleEditable: false,
+		notesEditable: false,
+		tagsEditable: false,
 		index: config.sequence,
 		sequence: config.sequence,
 		visible: config.visible,
@@ -404,6 +418,9 @@ PresentationSection.createFromImpostorSection = function (
 		title: slideModel.title,
 		deckversion: slideModel.section.deckversion.id,
 		editable: tags.indexOf("editable") > -1,
+		titleEditable: false,
+		notesEditable: false,
+		tagsEditable: false,
 		tags,
 		index: config.sequence,
 		sequence: config.sequence,
@@ -467,7 +484,7 @@ PresentationSection.createFromManifestImpostor = function (
 	const slides = section.slides || [];
 	section.slides = null;
 
-	const projectSection = project?.sections.find((s) => s.key === section.key);
+	const projectSection = project?.sections.find((s) => s.key === project.key);
 
 	const presentationSection = new PresentationSection({
 		id: parseInt(_.uniqueId(), 10),
@@ -554,6 +571,10 @@ PresentationSection.createFromAutoAdjunct = function (model, opts = {}) {
 		tags,
 		cmsvalkey_set: autoAdjunct.cmsvalkey_set,
 		namespacedKey: autoAdjunct.namespaced_key,
+		editable: true,
+		titleEditable: true,
+		notesEditable: true,
+		tagsEditable: true,
 	});
 
 	if (autoAdjunct.template) {
@@ -608,6 +629,10 @@ PresentationSection.createFromTemplate = function (template, index, minID = 0) {
 		index,
 		cmsvalkey_set: [],
 		namespacedKey: templateModel.namespaced_key,
+		editable: false,
+		titleEditable: false,
+		notesEditable: false,
+		tagsEditable: false,
 	});
 
 	return presentationSection;

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

@@ -56,6 +56,9 @@ describe("#createFromSection", () => {
 			custom: false,
 			deckversion: 408,
 			editable: false,
+			titleEditable: false,
+			notesEditable: true,
+			tagsEditable: true,
 			html: "https://staging-test-cdn.salespreso.com/media/pack/409/assets/sections/agenda/index.html",
 			id: 1728,
 			impostor: false,
@@ -184,7 +187,6 @@ describe("#createFromAdjunctSection", () => {
 			createdByTemplate: false,
 			custom: false,
 			deckversion: 1,
-			editable: false,
 			id: 1,
 			image:
 				"https://staging-test-cdn.salespreso.com/media/autoadjunct/123.png",
@@ -204,6 +206,10 @@ describe("#createFromAdjunctSection", () => {
 			url: "/api/adjunctsections/1737/",
 			visible: true,
 			cmsvalkey_set: [],
+			editable: false,
+			titleEditable: false,
+			notesEditable: false,
+			tagsEditable: false,
 		};
 
 		expect(presentationSection.toJSON()).toEqual(expected);
@@ -312,6 +318,9 @@ describe("#createFromImpostorSection", () => {
 			custom: false,
 			deckversion: 3,
 			editable: false,
+			titleEditable: false,
+			notesEditable: false,
+			tagsEditable: false,
 			html: "https://staging-test-cdn.salespreso.com/media/pack/427/assets/sections/test-deck/slides/agenda/index.html",
 			id: 23898,
 			impostor: true,
@@ -441,6 +450,10 @@ describe("#createFromAutoAdjunct", () => {
 			title: "Five",
 			url: "/api/adjunctsections/545/",
 			visible: true,
+			editable: true,
+			titleEditable: true,
+			tagsEditable: true,
+			notesEditable: true,
 		};
 		expect(presentationSection.toJSON()).toEqual(expected);
 	});

package/src/presentation/presentation-slide.js

@@ -41,6 +41,9 @@ export const PresentationSlide = BasePresentationModel.extend(
 		 * @property {string} thumbnail
 		 * @property {number} selectionID
 		 * @property {bool} editable
+		 * @property {bool} titleEditable
+		 * @property {bool} notesEditable
+		 * @property {bool} tagsEditable
 		 * @property {array} tags
 		 * @property {string[]} cmsvalkey_set
 		 */
@@ -80,6 +83,9 @@ export const PresentationSlide = BasePresentationModel.extend(
 			thumbnail: "string",
 			selectionID: "number",
 			editable: "boolean",
+			titleEditable: "boolean",
+			notesEditable: "boolean",
+			tagsEditable: "boolean",
 			tags: "array",
 			cmsvalkey_set: "array",
 		},
@@ -170,6 +176,11 @@ PresentationSlide.createFromSlide = function (slideModel, options = {}) {
 		thumbnail: PresentationSlide.getThumbnail(slideModel, options.screenshots),
 		custom: false,
 		editable: tags.indexOf("editable") > -1,
+		// By default this is true for a deck slide. These can be changed later in PM depending
+		// on the logged in user and properties of an AutoAdjunct
+		titleEditable: false,
+		notesEditable: true,
+		tagsEditable: true,
 		title: slideModel.title,
 		section: slideModel.section.id,
 		sectionKey: slideModel.section.key,
@@ -358,6 +369,9 @@ PresentationSlide.createFromManifestJSON = function (
 		css: url2.resolve(manifestJSON.getAssetPath(key), "slide.css"),
 		key: slideKey,
 		editable: false,
+		titleEditable: false,
+		notesEditable: false,
+		tagsEditable: false,
 		sequence: manifestJSON.ordering[key],
 		thumbnail: null,
 		custom: false,
@@ -372,13 +386,13 @@ PresentationSlide.createFromManifestJSON = function (
 
 PresentationSlide.createFromManifestImpostor = function (
 	slide,
-	section,
+	_section,
 	project,
 	index,
 	sectionID,
 ) {
 	const projectSection = project?.sections?.find?.(
-		(s) => s.key === section.key,
+		(s) => s.key === project.key,
 	);
 	const projectSlide = projectSection?.slides?.find?.(
 		(s) => s.key === slide.key,
@@ -387,6 +401,9 @@ PresentationSlide.createFromManifestImpostor = function (
 	const presentationSlide = new PresentationSlide({
 		id: parseInt(_.uniqueId(), 10),
 		editable: slide.tags.indexOf("editable") !== -1,
+		titleEditable: false,
+		notesEditable: true,
+		tagsEditable: true,
 		thumbnail: null,
 		custom: false,
 		visible: true,
@@ -409,6 +426,9 @@ PresentationSlide.createFromTemplate = function (
 		...template,
 		id: minID + parseInt(_.uniqueId(), 10),
 		editable: false,
+		titleEditable: false,
+		notesEditable: false,
+		tagsEditable: false,
 		thumbnail: null,
 		custom: false,
 		visible: true,
@@ -479,6 +499,10 @@ PresentationSlide.createFromAutoAdjunct = function (model, opts = {}) {
 		tags,
 		cmsvalkey_set: autoAdjunct.cmsvalkey_set,
 		namespacedKey: autoAdjunct.namespaced_key,
+		editable: true,
+		titleEditable: true,
+		notesEditable: true,
+		tagsEditable: true,
 	});
 
 	if (autoAdjunct.template) {

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

@@ -46,6 +46,9 @@ describe("#createFromSlide", () => {
 			css: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/slide.css",
 			custom: false,
 			editable: false,
+			titleEditable: false,
+			tagsEditable: true,
+			notesEditable: true,
 			html: "https://staging-test-cdn.salespreso.com/media/pack/410/assets/sections/test-deck/slides/slide-key/index.html",
 			id: 23219,
 			index: 13,
@@ -294,6 +297,10 @@ describe("#createFromAutoAdjunct", () => {
 			title: "Three",
 			url: "/api/adjunctslides/525/",
 			visible: true,
+			editable: true,
+			titleEditable: true,
+			notesEditable: true,
+			tagsEditable: true,
 		};
 
 		expect(presentationSlide.toJSON()).toEqual(expected);

package/src/utils.js

@@ -149,9 +149,19 @@ export function sanitizeBase64(obj, conditionFn = () => true) {
 			return { ...acc, [key]: sanitizeBase64(obj[key], conditionFn) };
 		}, {});
 	} else if (typeof obj === "string") {
-		const re = /^data:image\/[a-zA-Z]+;base64,[A-Za-z0-9+/=]+$/;
-		if (re.test(obj) && conditionFn(obj)) {
-			return "";
+		// Catch anything that looks like base64, or base64%2C (which is the encoded version)
+		// and strip it. This is a last resort, we'd prefer not to be in this position!
+		const re = /base64(,|(%2C))/;
+
+		if (re.test(obj)) {
+			// If you're a developer, let's throw an error.
+			if (process.env.NODE_ENV === "development" && !window.Cypress) {
+				throw new Error("Tried to save a base64 string. Figure out why!");
+			}
+
+			if (conditionFn?.(obj) ?? true) {
+				return "";
+			}
 		}
 	}
 	return obj;

package/src/utils.spec.js

@@ -3,6 +3,7 @@ import {
 	getShortURL,
 	removeMultiByteChars,
 	replaceHostname,
+	sanitizeBase64,
 } from "./utils.js";
 
 describe("getShortURL()", () => {
@@ -160,3 +161,29 @@ describe("replaceHostname()", () => {
 		expect(actual).toEqual(expected);
 	});
 });
+
+describe.only("sanitizeBase64()", () => {
+	["data:image/webp;base64,", "data%3Aimage%2Fwebp%3Bbase64%2C"].forEach(
+		(base64) => {
+			it("should strip base64 from string", () => {
+				expect(sanitizeBase64(base64)).toEqual("");
+			});
+
+			it("should strip base64 from array", () => {
+				expect(sanitizeBase64([base64])).toEqual([""]);
+			});
+
+			it("should strip base64 from nested object", () => {
+				expect(
+					sanitizeBase64({
+						foo: [base64],
+					}),
+				).toEqual({ foo: [""] });
+			});
+
+			it("should not strip if condition says not to", () => {
+				expect(sanitizeBase64(base64, () => false)).toEqual(base64);
+			});
+		},
+	);
+});