@livepreso/api 6.53.1 → 6.55.0

package/cjs/utils.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.spec.js","names":["_utils","require","describe","test","url","expect","getShortURL","toEqual","testString","removeMultiByteChars","testString2","testString3","it","actual","getHostname","toThrow","replaceHostname","data","expected","beforeURL","afterURL","first","anArray","nestedObject","second"],"sources":["../src/utils.spec.js"],"sourcesContent":["import {\n\tgetHostname,\n\tgetShortURL,\n\tremoveMultiByteChars,\n\treplaceHostname,\n} from \"./utils.js\";\n\ndescribe(\"getShortURL()\", () => {\n\ttest(\"shorten a full url to a short one\", () => {\n\t\tconst url = \"http://client.salespreso.com/api/users/1/\";\n\t\texpect(getShortURL(url)).toEqual(\"/api/users/1/\");\n\t});\n\n\ttest(\"not break an already short url\", () => {\n\t\tconst url = \"/api/users/1/\";\n\t\texpect(getShortURL(url)).toEqual(\"/api/users/1/\");\n\t});\n});\n\ndescribe(\"removeMultiByteChars()\", () => {\n\ttest(\"correctly strip offending multibyte characters from string\", () => {\n\t\tconst testString = \"SUZI LUCK’S CANTEEN & COCKTAIL BAR\";\n\t\texpect(removeMultiByteChars(testString)).toEqual(\n\t\t\t\"SUZI LUCKS CANTEEN & COCKTAIL BAR\",\n\t\t);\n\t});\n\n\ttest(\"sanitize urls correctly\", () => {\n\t\tconst testString = \"http://client.salespreso.com/api/users/1/’\";\n\t\tconst testString2 = \"/api/users/1/’\";\n\t\tconst testString3 = \"/api/users/1/?param=1&test=3&_r=4\";\n\t\texpect(removeMultiByteChars(testString)).toEqual(\n\t\t\t\"http://client.salespreso.com/api/users/1/\",\n\t\t);\n\t\texpect(removeMultiByteChars(testString2)).toEqual(\"/api/users/1/\");\n\t\texpect(removeMultiByteChars(testString3)).toEqual(\n\t\t\t\"/api/users/1/?param=1&test=3&_r=4\",\n\t\t);\n\t});\n});\n\ndescribe(\"getHostname()\", () => {\n\tit(\"throws an error if hostname isn't a string\", () => {\n\t\tconst actual = () => getHostname(null);\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"returns a hostname from a full URL\", () => {\n\t\tconst actual = getHostname(\"https://www.horse.com/api/horses/1/\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n\n\tit(\"returns a hostname from just the domain\", () => {\n\t\tconst actual = getHostname(\"https://www.horse.com/\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n\n\tit(\"just returns the hostname\", () => {\n\t\tconst actual = getHostname(\"www.horse.com\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n});\n\ndescribe(\"replaceHostname()\", () => {\n\tit(\"throws an error if not from hostname\", () => {\n\t\tconst actual = () => replaceHostname(\"foo\", null, \"brand.new.com\");\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"throws an error if not to hostname\", () => {\n\t\tconst actual = () => replaceHostname(\"foo\", \"old.url.com\", null);\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"replaces hostname of a string\", () => {\n\t\tconst data = \"https://old.url.com/api/appointments/1/\";\n\t\tconst expected = \"https://brand.new.com/api/appointments/1/\";\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"takes into account the protocol\", () => {\n\t\tconst data = \"http://old.url.com/api/appointments/1/\";\n\t\tconst expected = \"http://brand.new.com/api/appointments/1/\";\n\t\tconst actual = replaceHostname(\n\t\t\tdata,\n\t\t\t\"https://old.url.com/\",\n\t\t\t\"https://brand.new.com/\",\n\t\t);\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"replaces hostnames in an array\", () => {\n\t\tconst data = [\n\t\t\t\"https://old.url.com/api/appointments/1/\",\n\t\t\t\"https://old.url.com/api/foo/1/bars/1/\",\n\t\t];\n\t\tconst expected = [\n\t\t\t\"https://brand.new.com/api/appointments/1/\",\n\t\t\t\"https://brand.new.com/api/foo/1/bars/1/\",\n\t\t];\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"replaces hostnames in an object\", () => {\n\t\tconst data = {\n\t\t\turl: \"https://old.url.com/api/appointments/1/\",\n\t\t};\n\t\tconst expected = {\n\t\t\turl: \"https://brand.new.com/api/appointments/1/\",\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"hostnames not related aren't affected\", () => {\n\t\tconst data = {\n\t\t\turl: \"https://some.otherurl.com/helloworld/\",\n\t\t};\n\t\tconst expected = {\n\t\t\turl: \"https://some.otherurl.com/helloworld/\",\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"updates data that is nested\", () => {\n\t\tconst beforeURL = \"https://old.url.com/api/appointments/1/\";\n\t\tconst afterURL = \"https://some.otherurl.com/api/appointments/1/\";\n\n\t\tconst data = {\n\t\t\tfirst: beforeURL,\n\t\t\tanArray: [beforeURL, beforeURL],\n\t\t\tnestedObject: {\n\t\t\t\tfirst: beforeURL,\n\t\t\t\tsecond: beforeURL,\n\t\t\t},\n\t\t};\n\n\t\tconst expected = {\n\t\t\tfirst: afterURL,\n\t\t\tanArray: [afterURL, afterURL],\n\t\t\tnestedObject: {\n\t\t\t\tfirst: afterURL,\n\t\t\t\tsecond: afterURL,\n\t\t\t},\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"some.otherurl.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"does not affect hostname within a string\", () => {\n\t\tconst data = \"room:old.url.com:123\";\n\t\tconst expected = \"room:old.url.com:123\";\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"some.otherurl.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n});\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"utils.spec.js","names":["_utils","require","describe","test","url","expect","getShortURL","toEqual","testString","removeMultiByteChars","testString2","testString3","it","actual","getHostname","toThrow","replaceHostname","data","expected","beforeURL","afterURL","first","anArray","nestedObject","second","only","forEach","base64","sanitizeBase64","foo"],"sources":["../src/utils.spec.js"],"sourcesContent":["import {\n\tgetHostname,\n\tgetShortURL,\n\tremoveMultiByteChars,\n\treplaceHostname,\n\tsanitizeBase64,\n} from \"./utils.js\";\n\ndescribe(\"getShortURL()\", () => {\n\ttest(\"shorten a full url to a short one\", () => {\n\t\tconst url = \"http://client.salespreso.com/api/users/1/\";\n\t\texpect(getShortURL(url)).toEqual(\"/api/users/1/\");\n\t});\n\n\ttest(\"not break an already short url\", () => {\n\t\tconst url = \"/api/users/1/\";\n\t\texpect(getShortURL(url)).toEqual(\"/api/users/1/\");\n\t});\n});\n\ndescribe(\"removeMultiByteChars()\", () => {\n\ttest(\"correctly strip offending multibyte characters from string\", () => {\n\t\tconst testString = \"SUZI LUCK’S CANTEEN & COCKTAIL BAR\";\n\t\texpect(removeMultiByteChars(testString)).toEqual(\n\t\t\t\"SUZI LUCKS CANTEEN & COCKTAIL BAR\",\n\t\t);\n\t});\n\n\ttest(\"sanitize urls correctly\", () => {\n\t\tconst testString = \"http://client.salespreso.com/api/users/1/’\";\n\t\tconst testString2 = \"/api/users/1/’\";\n\t\tconst testString3 = \"/api/users/1/?param=1&test=3&_r=4\";\n\t\texpect(removeMultiByteChars(testString)).toEqual(\n\t\t\t\"http://client.salespreso.com/api/users/1/\",\n\t\t);\n\t\texpect(removeMultiByteChars(testString2)).toEqual(\"/api/users/1/\");\n\t\texpect(removeMultiByteChars(testString3)).toEqual(\n\t\t\t\"/api/users/1/?param=1&test=3&_r=4\",\n\t\t);\n\t});\n});\n\ndescribe(\"getHostname()\", () => {\n\tit(\"throws an error if hostname isn't a string\", () => {\n\t\tconst actual = () => getHostname(null);\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"returns a hostname from a full URL\", () => {\n\t\tconst actual = getHostname(\"https://www.horse.com/api/horses/1/\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n\n\tit(\"returns a hostname from just the domain\", () => {\n\t\tconst actual = getHostname(\"https://www.horse.com/\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n\n\tit(\"just returns the hostname\", () => {\n\t\tconst actual = getHostname(\"www.horse.com\");\n\t\texpect(actual).toEqual(\"www.horse.com\");\n\t});\n});\n\ndescribe(\"replaceHostname()\", () => {\n\tit(\"throws an error if not from hostname\", () => {\n\t\tconst actual = () => replaceHostname(\"foo\", null, \"brand.new.com\");\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"throws an error if not to hostname\", () => {\n\t\tconst actual = () => replaceHostname(\"foo\", \"old.url.com\", null);\n\t\texpect(actual).toThrow();\n\t});\n\n\tit(\"replaces hostname of a string\", () => {\n\t\tconst data = \"https://old.url.com/api/appointments/1/\";\n\t\tconst expected = \"https://brand.new.com/api/appointments/1/\";\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"takes into account the protocol\", () => {\n\t\tconst data = \"http://old.url.com/api/appointments/1/\";\n\t\tconst expected = \"http://brand.new.com/api/appointments/1/\";\n\t\tconst actual = replaceHostname(\n\t\t\tdata,\n\t\t\t\"https://old.url.com/\",\n\t\t\t\"https://brand.new.com/\",\n\t\t);\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"replaces hostnames in an array\", () => {\n\t\tconst data = [\n\t\t\t\"https://old.url.com/api/appointments/1/\",\n\t\t\t\"https://old.url.com/api/foo/1/bars/1/\",\n\t\t];\n\t\tconst expected = [\n\t\t\t\"https://brand.new.com/api/appointments/1/\",\n\t\t\t\"https://brand.new.com/api/foo/1/bars/1/\",\n\t\t];\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"replaces hostnames in an object\", () => {\n\t\tconst data = {\n\t\t\turl: \"https://old.url.com/api/appointments/1/\",\n\t\t};\n\t\tconst expected = {\n\t\t\turl: \"https://brand.new.com/api/appointments/1/\",\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"hostnames not related aren't affected\", () => {\n\t\tconst data = {\n\t\t\turl: \"https://some.otherurl.com/helloworld/\",\n\t\t};\n\t\tconst expected = {\n\t\t\turl: \"https://some.otherurl.com/helloworld/\",\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"brand.new.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"updates data that is nested\", () => {\n\t\tconst beforeURL = \"https://old.url.com/api/appointments/1/\";\n\t\tconst afterURL = \"https://some.otherurl.com/api/appointments/1/\";\n\n\t\tconst data = {\n\t\t\tfirst: beforeURL,\n\t\t\tanArray: [beforeURL, beforeURL],\n\t\t\tnestedObject: {\n\t\t\t\tfirst: beforeURL,\n\t\t\t\tsecond: beforeURL,\n\t\t\t},\n\t\t};\n\n\t\tconst expected = {\n\t\t\tfirst: afterURL,\n\t\t\tanArray: [afterURL, afterURL],\n\t\t\tnestedObject: {\n\t\t\t\tfirst: afterURL,\n\t\t\t\tsecond: afterURL,\n\t\t\t},\n\t\t};\n\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"some.otherurl.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n\n\tit(\"does not affect hostname within a string\", () => {\n\t\tconst data = \"room:old.url.com:123\";\n\t\tconst expected = \"room:old.url.com:123\";\n\t\tconst actual = replaceHostname(data, \"old.url.com\", \"some.otherurl.com\");\n\t\texpect(actual).toEqual(expected);\n\t});\n});\n\ndescribe.only(\"sanitizeBase64()\", () => {\n\t[\"data:image/webp;base64,\", \"data%3Aimage%2Fwebp%3Bbase64%2C\"].forEach(\n\t\t(base64) => {\n\t\t\tit(\"should strip base64 from string\", () => {\n\t\t\t\texpect(sanitizeBase64(base64)).toEqual(\"\");\n\t\t\t});\n\n\t\t\tit(\"should strip base64 from array\", () => {\n\t\t\t\texpect(sanitizeBase64([base64])).toEqual([\"\"]);\n\t\t\t});\n\n\t\t\tit(\"should strip base64 from nested object\", () => {\n\t\t\t\texpect(\n\t\t\t\t\tsanitizeBase64({\n\t\t\t\t\t\tfoo: [base64],\n\t\t\t\t\t}),\n\t\t\t\t).toEqual({ foo: [\"\"] });\n\t\t\t});\n\n\t\t\tit(\"should not strip if condition says not to\", () => {\n\t\t\t\texpect(sanitizeBase64(base64, () => false)).toEqual(base64);\n\t\t\t});\n\t\t},\n\t);\n});\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@livepreso/api",
   "license": "UNLICENSED",
-  "version": "6.53.1",
+  "version": "6.55.0",
   "description": "Everything to do with talking to the SalePreso API",
   "main": "index.js",
   "module": "esm/index.js",

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

@@ -1,3 +1,3 @@
-Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
+Browserslist: browsers data (caniuse-lite) is 9 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.log

@@ -3,7 +3,7 @@ Invoking: run-p build:*
 > @livepreso/api@6.53.0 build:cjs
 > BABEL_ENV=cjs babel --delete-dir-on-start src/ --out-dir=cjs/ -s
 
-Browserslist: browsers data (caniuse-lite) is 8 months old. Please run:
+Browserslist: browsers data (caniuse-lite) is 9 months old. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
-Successfully compiled 163 files with Babel (3818ms).
+Successfully compiled 163 files with Babel (17903ms).

package/src/api.js

@@ -20,7 +20,7 @@ export const Api = {
 	 * @memberof api.Api
 	 * @prop {number} version
 	 */
-	version: 32,
+	version: 33,
 
 	/**
 	 * Initialize the api. Connects to the network and returns the

package/src/collections/auto-adjuncts.js

@@ -1,6 +1,5 @@
 import "../models/auto-adjunct.js";
 
-import Auth from "../auth.js";
 import { BaseCollection } from "./base.js";
 import { register } from "../state-register.js";
 
@@ -23,27 +22,6 @@ export const AutoAdjunctCollection = BaseCollection.extend(
 				},
 			});
 		},
-
-		fetch(opts = {}) {
-			const { user } = Auth;
-
-			if (!opts.data) {
-				opts.data = {};
-			}
-
-			// Let's only add this if it's not already being set, in case a global user
-			// DOES want to see a specific team.
-			if (!opts.data.team) {
-				//
-				// Filter all global autoadjuncts, and only query teams that
-				// the authorized user is a part of. This is mostly for the case where
-				// a 'global' temp slide admin could end up seeing autoadjuncts for
-				// many teams - which would be increadibly confusing.
-				opts.data.team = [null].concat(user.team_set.map((team) => team.id));
-			}
-
-			return BaseCollection.prototype.fetch.call(this, opts);
-		},
 	},
 );
 

package/src/collections/cms-vals.js

@@ -1,3 +1,4 @@
+import _ from "lodash";
 import "../models/cms-val.js";
 
 import Auth from "../auth.js";
@@ -43,4 +44,31 @@ export const CMSValCollection = BaseCollection.extend(
 
 CMSValCollection.canBeEmpty = true;
 
+CMSValCollection.getPrioritized = (cmsVals, tenancy = Auth.user.tenancy) => {
+	const cmsValsGroupedBySlides = _.groupBy(cmsVals, "key");
+
+	return _.map(cmsValsGroupedBySlides, (group) => {
+		const scenarioCmsVal = group.find((cmsValue) => !!cmsValue.scenario);
+
+		// The first cms val owned by the tenancy you're in
+		const tenancyStandardDeckCmsVal = group.find(
+			(cmsValue) =>
+				!cmsValue.scenario && cmsValue._tenancy?.owner_id === tenancy.id,
+		);
+
+		// The first cms val owned by the parent tenancy.
+		const parentTenancyStandardDeckCmsVal = group.find(
+			(cmsValue) =>
+				!cmsValue.scenario && cmsValue._tenancy?.owner_id !== tenancy.id,
+		);
+
+		// Order of preference: Scenario > Tenancy > Parent Tenancy
+		return (
+			scenarioCmsVal ||
+			tenancyStandardDeckCmsVal ||
+			parentTenancyStandardDeckCmsVal
+		);
+	});
+};
+
 register("CMSValCollection", CMSValCollection);

package/src/collections/cms-vals.spec.js

@@ -0,0 +1,66 @@
+import { CMSValCollection } from "./cms-vals.js";
+
+const childTenancy = { id: "66d7572f-85f6-4552-879a-25cf05ae311f" };
+const parentTenancy = { id: "cf5ad5a5-d149-42b4-b09b-e52b7afdf507" };
+const testScenarioURL =
+	"http://my/api/scenario/362bddc7-1821-4f43-921c-244e5c3175f7/";
+
+describe("#.getPrioritized", () => {
+	const scenarioCmsVal = {
+		id: 1,
+		key: "foo",
+		value: "Scenario",
+		scenario: testScenarioURL,
+		_tenancy: { owner_id: childTenancy.id },
+	};
+
+	const tenancyCmsVal = {
+		id: 2,
+		key: "foo",
+		value: "Tenancy",
+		scenario: testScenarioURL,
+		_tenancy: { owner_id: childTenancy.id },
+	};
+
+	const parentTenancyCmsVal = {
+		id: 3,
+		key: "foo",
+		value: "Parent Tenancy",
+		scenario: testScenarioURL,
+		_tenancy: { owner_id: parentTenancy.id },
+	};
+
+	const testFn = (cmsvals, tenancy) =>
+		CMSValCollection.getPrioritized(cmsvals, tenancy).filter(
+			(c) => c.key === "foo",
+		);
+
+	it("prefer scenario cmsval over others", () => {
+		const cmsvals = [scenarioCmsVal, tenancyCmsVal, parentTenancyCmsVal];
+		const results = testFn(cmsvals, childTenancy);
+		expect(results).toHaveLength(1);
+		expect(results[0].value).toEqual("Scenario");
+	});
+
+	it("prefer tenancy cmsval over others", () => {
+		const cmsvals = [
+			{ ...scenarioCmsVal, key: "bar" },
+			tenancyCmsVal,
+			parentTenancyCmsVal,
+		];
+		const results = testFn(cmsvals, childTenancy);
+		expect(results).toHaveLength(1);
+		expect(results[0].value).toEqual("Tenancy");
+	});
+
+	it("prefer global tenancy cmsval over others", () => {
+		const cmsvals = [
+			{ ...scenarioCmsVal, key: "bar" },
+			{ ...tenancyCmsVal, key: "baz" },
+			parentTenancyCmsVal,
+		];
+		const results = testFn(cmsvals, childTenancy);
+		expect(results).toHaveLength(1);
+		expect(results[0].value).toEqual("Parent Tenancy");
+	});
+});

package/src/collections/deck-version-screenshots.js

@@ -1,6 +1,5 @@
 import "../models/deck-version-screenshot.js";
 
-import Auth from "../auth.js";
 import { BaseCollection } from "./base.js";
 import { register } from "../state-register.js";
 
@@ -14,27 +13,6 @@ export const DeckVersionScreenshotCollection = BaseCollection.extend(
 	/** @lends collections.DeckVersionScreenshotCollection# */ {
 		model: "DeckVersionScreenshotModel",
 
-		fetch(opts = {}) {
-			const { user } = Auth;
-
-			if (!opts.data) {
-				opts.data = {};
-			}
-
-			// Let's only add this if it's not already being set, in case a global user
-			// DOES want to see a specific team.
-			if (user && !opts.data.team) {
-				//
-				// Filter all global autoadjuncts, and only query teams that
-				// the authorized user is a part of. This is mostly for the case where
-				// a 'global' temp slide admin could end up seeing autoadjuncts for
-				// many teams - which would be increadibly confusing.
-				opts.data.team = [null].concat(user.team_set.map((team) => team.id));
-			}
-
-			return BaseCollection.prototype.fetch.call(this, opts);
-		},
-
 		url() {
 			if (!this._url && this.parent) {
 				this._options.deckversion = this.parent;

package/src/collections/scenarios.js

@@ -0,0 +1,18 @@
+import "../models/scenario.js";
+
+import { BaseCollection } from "./base.js";
+import { register } from "../state-register.js";
+
+/**
+ * @constructor
+ * @alias collections.ScenarioCollection
+ * @extends collections.BaseCollection
+ * @see models.ScenarioModel
+ */
+export const ScenarioCollection = BaseCollection.extend(
+	/** @lends collections.ScenarioCollection# */ {
+		model: "ScenarioModel",
+	},
+);
+
+register("ScenarioCollection", ScenarioCollection);

package/src/collections.js

@@ -12,12 +12,10 @@ export * from "./collections/base";
 export * from "./collections/cms-vals";
 export * from "./collections/contacts";
 export * from "./collections/contact-phones";
-export * from "./collections/created-assets";
 export * from "./collections/customers";
 export * from "./collections/deck-versions";
 export * from "./collections/deck-version-screenshots";
 export * from "./collections/decks";
-export * from "./collections/deleted-assets";
 export * from "./collections/dispatches";
 export * from "./collections/events";
 export * from "./collections/event-objects";
@@ -26,6 +24,7 @@ export * from "./collections/opportunities";
 export * from "./collections/pack-diffs";
 export * from "./collections/packs";
 export * from "./collections/presets";
+export * from "./collections/scenarios";
 export * from "./collections/section-selections";
 export * from "./collections/sections";
 export * from "./collections/signing-backends";

package/src/fixtures.js

@@ -22,8 +22,24 @@ const presentationCollections = {
 	PresentationSubSlides: presentation.PresentationSubSlides,
 };
 
+function uuid() {
+	return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (c) => {
+		const r = (Math.random() * 16) | 0;
+		const v = c === "x" ? r : (r & 0x3) | 0x8;
+		return v.toString(16);
+	});
+}
+
 function makeFactory(name, Model, ignoreFields = []) {
-	const factory = Factory.define(name, Model).sequence("id");
+	const factory = Factory.define(name, Model);
+	const { detailType } = Model.prototype;
+	if (detailType === "string" || detailType === "number") {
+		factory.sequence("id");
+	} else if (detailType === "uuid") {
+		factory.attr("id", () => uuid());
+	} else {
+		throw new Error("Unknown detailType " + detailType);
+	}
 
 	const { _definition: definition, _children: children } = Model.prototype;
 

package/src/middlewares/base.js

@@ -1,6 +1,5 @@
-/* eslint-disable */
 export default class BaseMiddleware {
-	preflight(request, model) {
+	preflight(request, model, options) {
 		return request;
 	}
 

package/src/models/appointment.js

@@ -3,6 +3,7 @@ import "./snapshot.js";
 import "./feed-data.js";
 import "./preset.js";
 import "./team.js";
+import "./scenario.js";
 import "./hosted-preso.js";
 import "./appointment-stats.js";
 import "./appointment-tags.js";
@@ -122,6 +123,8 @@ export const AppointmentModel = BaseModel.extend(
 		 * @property {models.SnapshotModel} latest_snapshot
 		 * @property {models.UserModel} user
 		 * @property {models.AppointmentStatsModel} appointmentStats
+		 * @property {models.ScenarioModel} scenario
+		 * @property {models.TeamModel} team_branding
 		 */
 		children: {
 			preset: "PresetModel",
@@ -130,7 +133,8 @@ export const AppointmentModel = BaseModel.extend(
 			user: "UserModel",
 			latest_tele: "HostedPresoModel",
 			stats: "AppointmentStatsModel",
-			team: "TeamModel",
+			scenario: "ScenarioModel",
+			team_branding: "TeamModel",
 		},
 
 		/**
@@ -273,6 +277,14 @@ export const AppointmentModel = BaseModel.extend(
 						this.adjunctSubSlides?.fetch(fetchOptions),
 						this.contact_set?.fetchSet(fetchOptions),
 						this.tags?.fetch(fetchOptions),
+						this.team_branding?.fetch(fetchOptions),
+						this.scenario?.fetch(fetchOptions)?.catch((e) => {
+							if (e.status === 404) {
+								this.scenario = null;
+								return;
+							}
+							throw e;
+						}),
 						this.user?.fetch(fetchOptions)?.catch((e) => {
 							if (e.status && e.status === 404) {
 								// It's possible for a user to be deactivated, which means they'll
@@ -318,16 +330,29 @@ export const AppointmentModel = BaseModel.extend(
 					return Promise.all(fetches);
 				})
 				.then(() => {
-					return Promise.all(
-						this.deckversion_set.map((model) => {
+					const scenarioID = this.scenario?.id ?? null;
+					const scenarioFilter = [null];
+					if (scenarioID) {
+						scenarioFilter.push(scenarioID);
+					}
+
+					return Promise.all([
+						this.scenario?.owner_team?.fetch?.(fetchOptions),
+						...this.deckversion_set.map((model) => {
 							return Promise.all([
-								model.screenshots.fetch(fetchOptions),
+								model.screenshots.fetch(
+									_.merge(fetchOptions, {
+										data: {
+											scenario: scenarioFilter,
+										},
+									}),
+								),
 								model.template_set.fetchSet(fetchOptions),
 								model.manifest_json.fetch(fetchOptions),
 								model.deck.fetch(fetchOptions),
 							]);
 						}),
-					);
+					]);
 				})
 				.then(() => {
 					const deckversionTemplates =
@@ -385,7 +410,8 @@ export const AppointmentModel = BaseModel.extend(
 				no_edit_after: appointment.no_edit_after,
 				no_share_after: appointment.no_share_after,
 				no_delete_after: appointment.no_delete_after,
-				team: this._retrieveURL(appointment.team),
+				scenario: this._retrieveURL(appointment.scenario),
+				team_branding: this._retrieveURL(appointment.team_branding),
 				editors_can_change_editors: appointment.editors_can_change_editors,
 				share_visibility_mode: appointment.share_visibility_mode,
 			};

package/src/models/auto-adjunct.js

@@ -1,5 +1,5 @@
 import "./template.js";
-import "./team.js";
+import "./scenario.js";
 import "./deck.js";
 
 import { BaseModel } from "./base.js";
@@ -49,11 +49,12 @@ export const AutoAdjunctModel = BaseModel.extend(
 		/**
 		 * @property {models.DeckModel} deck
 		 * @property {models.TemplateModel} template
+		 * @property {models.ScenarioModel} scenario
 		 */
 		children: {
 			deck: "DeckModel",
 			template: "TemplateModel",
-			team: "TeamModel",
+			scenario: "ScenarioModel",
 		},
 	},
 );

package/src/models/base.js

@@ -259,8 +259,9 @@ export const BaseModel = Model.extend(
 			}
 
 			const idStr = urlEnd.split(resourceEnd).join("");
-
-			if ((idStr.match(/\//g) || []).length === 1) {
+			if (this.detailType === "uuid") {
+				return idStr.slice(0, -1);
+			} else if ((idStr.match(/\//g) || []).length === 1) {
 				return parseInt(idStr.slice(0, -1), 10);
 			}
 

package/src/models/cms-val.js

@@ -1,5 +1,5 @@
 import "./user.js";
-import "./team.js";
+import "./scenario.js";
 import "./deck.js";
 
 import { BaseModel } from "../models/base.js";
@@ -28,12 +28,12 @@ export const CMSValModel = BaseModel.extend(
 		/**
 		 * @property {models.UserModel} user
 		 * @property {models.DeckModel} deck
-		 * @property {models.TeamModel} team
+		 * @property {models.ScenarioModel} scenario
 		 */
 		children: {
 			user: "UserModel",
 			deck: "DeckModel",
-			team: "TeamModel",
+			scenario: "ScenarioModel",
 		},
 
 		url() {

package/src/models/customer.js

@@ -133,6 +133,7 @@ export const CustomerModel = BaseModel.extend(
 				title: this.title,
 				website: this.website,
 				team_set: this._retrieveURL(this.team_set),
+				logo_original: this.logo_original,
 			};
 
 			if (this.id) {

package/src/models/deck-layout.js

@@ -0,0 +1,54 @@
+import { BaseModel } from "./base.js";
+import { register } from "../state-register.js";
+
+/**
+ * @constructor
+ * @alias models.DeckLayoutModel
+ * @extends models.BaseModel
+ */
+export const DeckLayoutModel = BaseModel.extend(
+	/** @lends models.DeckLayoutModel# */ {
+		modelName: "deck-layout",
+
+		props: {
+			items: "object",
+		},
+
+		fetch(opts) {
+			return BaseModel.prototype.fetch.call(this, opts).tap((tags) => {
+				this.items = tags;
+			});
+		},
+
+		toJSON() {
+			return this.items;
+		},
+
+		toServer() {
+			return this.items;
+		},
+
+		save() {
+			return BaseModel.prototype.save.call(this).tap((tags) => {
+				this.items = tags;
+			});
+		},
+
+		getPlainURL() {
+			const _url = BaseModel.prototype.getPlainURL.call(this);
+
+			// Because the URL has {id} in it, the matcher replaces the deck id
+			// with the value but also automatically adds it as a detail ID (which
+			// doesn't make sense here). We strip the extra ID off here.
+			//
+			// Ie the default plain URL would look like:
+			// /api/decks/{id}/layout/{id}/ and this splitting gives us the correct
+			// /api/decks/{id}/layout/ instead.
+			return _url.split("/").slice(0, -2).concat([""]).join("/");
+		},
+	},
+);
+
+DeckLayoutModel.canBeEmpty = true;
+
+register("DeckLayoutModel", DeckLayoutModel);

package/src/models/deck-version-screenshot.js

@@ -1,4 +1,4 @@
-import "./team.js";
+import "./scenario.js";
 
 import { BaseModel } from "./base.js";
 import _ from "lodash";
@@ -35,7 +35,7 @@ export const DeckVersionScreenshotModel = BaseModel.extend(
 		},
 
 		children: {
-			team: "TeamModel",
+			scenario: "ScenarioModel",
 		},
 
 		serialize() {

package/src/models/deck-version.js

@@ -7,6 +7,7 @@ import "./manifest-json.js";
 
 import { Auth } from "../auth.js";
 import { BaseModel } from "./base.js";
+import { DeckLayoutModel } from "./deck-layout.js";
 import { DeckVersionScreenshotCollection } from "../collections/deck-version-screenshots.js";
 import Promise from "bluebird";
 import { TemplateCollection } from "../collections.js";
@@ -225,31 +226,28 @@ export const DeckVersionModel = BaseModel.extend(
 			);
 		},
 
-		fetchLayout: function (presetId, teamIds) {
+		fetchLayout: async function (presetId, scenarioID) {
 			let queryParams = { version: this.version };
 			if (presetId) {
 				queryParams.preset_id = presetId;
 			}
-			if (teamIds) {
-				queryParams.team_id = teamIds;
+			if (scenarioID) {
+				queryParams.scenario_id = scenarioID;
 			}
 
 			if (!this.id) {
 				return Promise.reject(new Error("DeckVersion has no ID."));
 			}
 
-			const path = `${this.deck.url()}layout/`;
+			const layout = new DeckLayoutModel(
+				{ id: this.deck.id },
+				{
+					data: queryParams,
+				},
+			);
+			await layout.fetch();
 
-			return superagent
-				.get(path)
-				.set(Auth.headers)
-				.query(queryParams)
-				.then((res) => {
-					if (!res.ok) {
-						return Promise.reject(res);
-					}
-					return res.body;
-				});
+			return layout.toJSON();
 		},
 
 		toServer() {

package/src/models/image.js

@@ -50,9 +50,6 @@ export const ImageModel = BaseModel.extend(
 				})
 				.then((blob) => {
 					const file = new File([blob], `image.${fileEnd}`, { type: fileType });
-					const formData = new FormData();
-					formData.append("image_original", file);
-
 					return this.uploadFile(file);
 				});
 		},

package/src/models/pack-diff.js

@@ -1,6 +1,5 @@
 import "./pack.js";
-import "../collections/created-assets.js";
-import "../collections/deleted-assets.js";
+import { AssetCollection } from "../collections.js";
 
 import { BaseModel } from "./base.js";
 import { register } from "../state-register.js";
@@ -29,13 +28,19 @@ export const PackDiffModel = BaseModel.extend(
 			modified_date: "date",
 		},
 
-		/**
-		 * @property {collections.AssetCollection} created
-		 * @property {collections.AssetCollection} deleted
-		 */
-		collections: {
-			created: "CreatedAssetCollection",
-			deleted: "DeletedAssetCollection",
+		derived: {
+			created: {
+				fn: function () {
+					const url = `${this.getPlainURL()}created/`;
+					return new AssetCollection({ url });
+				},
+			},
+			deleted: {
+				fn: function () {
+					const url = `${this.getPlainURL()}deleted/`;
+					return new AssetCollection({ url });
+				},
+			},
 		},
 
 		/**