@livepreso/api 6.53.1 → 6.54.0

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,
@@ -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,
@@ -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);
+			});
+		},
+	);
+});

package/.rush/temp/operation/build/error.log

@@ -1,3 +0,0 @@
-Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
-  npx update-browserslist-db@latest
-  Why you should do it regularly: https://github.com/browserslist/update-db#readme

package/rush-logs/api.build.error.log

@@ -1,3 +0,0 @@
-Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
-  npx update-browserslist-db@latest
-  Why you should do it regularly: https://github.com/browserslist/update-db#readme