@livepreso/api 6.53.0 → 6.53.1

package/src/collections/base.spec.js

@@ -225,4 +225,41 @@ describe("fetchAll", () => {
 		expect(baseCollection.first().id).toEqual(11);
 		expect(baseCollection.last().id).toEqual(30);
 	});
+
+	it("should serialize collection models with urls", async () => {
+		G(BaseCollection.extend({ model: "TestModel" }), "TestCollection");
+		G(
+			BaseModel.extend({
+				modelName: "bar",
+				children: { test: "TestModel" },
+				collections: { tests: "TestCollection" },
+			}),
+			"TestModel",
+		);
+
+		const Collection = G(BaseCollection.extend({ model: "TestModel" }));
+		const baseCollection = new Collection([
+			{
+				id: 1,
+				url: "/api/bar/1/",
+				test: { id: 1, url: "/api/baz/1/" },
+				tests: [{ id: 2, test: { id: 4 } }],
+			},
+			{
+				id: 2,
+				url: "/api/bar/2/",
+				test: { id: 2, url: "/api/baz/2/" },
+				tests: [],
+			},
+		]);
+		expect(baseCollection.serialize({ urlsOnly: true })).toEqual([
+			{
+				id: 1,
+				test: "/api/bar/1/",
+				url: "/api/bar/1/",
+				tests: ["/api/bar/2/"],
+			},
+			{ id: 2, test: "/api/bar/2/", url: "/api/bar/2/", tests: [] },
+		]);
+	});
 });

package/src/models/base.js

@@ -242,7 +242,7 @@ export const BaseModel = Model.extend(
 		getIDFromURL(url, resource = "") {
 			const resourceURL = resource || this.getResourceURL();
 
-			if (!url || !resourceURL) {
+			if (typeof url !== "string" || !resourceURL) {
 				return null;
 			}
 
@@ -693,6 +693,10 @@ export const BaseModel = Model.extend(
 				return {};
 			}
 
+			// Urls only will build a model without its children/collections expanded -
+			// it will return urls instead of the full model.
+			const { urlsOnly = false } = opts ?? {};
+
 			const data = Model.prototype.serialize.apply(this, arguments);
 			data.url = this.url();
 
@@ -706,24 +710,47 @@ export const BaseModel = Model.extend(
 				return object;
 			}, {});
 
-			Object.keys(this._unsetCollections).forEach((key) => {
-				if (this._unsetCollections[key].canBeEmpty && !this._values[key]) {
+			const allCollectionKeys = [
+				...Object.keys(this._unsetCollections),
+				...Object.keys(this._collections),
+			];
+
+			for (const key of allCollectionKeys) {
+				const constructor = this._unsetCollections[key];
+
+				if (urlsOnly && this[key]) {
+					if (typeof this._values[key] === "string") {
+						derived[key] = this._values[key];
+					} else {
+						derived[key] = this[key].map((m) => m.url());
+					}
+				} else if (!constructor) {
+					continue;
+				} else if (constructor.canBeEmpty && !this._values[key]) {
 					derived[key] = [];
 				}
-			});
+			}
 
-			Object.keys(this._unsetChildren).forEach((key) => {
-				if (
-					this._unsetChildren[key].canBeEmpty &&
-					!this._values[key] &&
-					this[key]
-				) {
+			const allChildrenKeys = [
+				...Object.keys(this._unsetChildren),
+				...(urlsOnly ? Object.keys(this._children) : []),
+			];
+
+			for (const key of allChildrenKeys) {
+				const constructor = this._unsetChildren[key];
+
+				if (urlsOnly && this[key]) {
+					derived[key] = this[key].url();
+				} else if (!constructor) {
+					continue;
+				} else if (constructor.canBeEmpty && !this._values[key] && this[key]) {
 					derived[key] = this[key].url();
 				}
-			});
+			}
 
 			return _.extend(data, derived);
 		},
+
 		// Safely retrieve the url from a child or collection that may or may not
 		// be hydrated
 		_retrieveURL(item) {

package/src/models/base.spec.js

@@ -426,3 +426,21 @@ describe(".matchesURL", () => {
 		expect(ActivityModel.matchesURL(url)).toEqual(true);
 	});
 });
+
+it("should allow serializing collections with urls only", () => {
+	G(BaseModel.extend({ modelName: "baz" }), "TestModel");
+	G(BaseCollection.extend({ model: "TestModel" }), "TestCollection");
+	const Model = G(
+		BaseModel.extend({ collections: { tests: "TestCollection" } }),
+	);
+	const model = new Model({
+		tests: [
+			{ id: 1, url: "/api/baz/1/" },
+			{ id: 2, url: "/api/baz/2/" },
+		],
+	});
+	expect(model.serialize({ urlsOnly: true })).toEqual({
+		url: null,
+		tests: ["/api/baz/1/", "/api/baz/2/"],
+	});
+});

package/src/models/deck-version.js

@@ -141,7 +141,7 @@ export const DeckVersionModel = BaseModel.extend(
 						Object.keys(this.getSafeAttrs()).length === 1 ||
 						!this.index_asset
 					) {
-						return this.fetch();
+						return this.fetch({ fetchTemplates: false });
 					}
 					return null;
 				})
@@ -200,14 +200,17 @@ export const DeckVersionModel = BaseModel.extend(
 			return Promise.all(imports);
 		},
 
-		fetch() {
-			const fetch = BaseModel.prototype.fetch.apply(this, arguments);
+		fetch(opts, ...other) {
+			const fetch = BaseModel.prototype.fetch.apply(this, [opts, ...other]);
+			const shouldFetchTemplates = opts?.fetchTemplates ?? true;
 
 			return Promise.resolve(fetch).tap(() => {
 				// `template_set` used to come on the deckversion response, but we have since
 				// decided to request it separately (this helps with caching). To keep the app
 				// working with minimal changes, we're making the extra request here.
-				return this.template_set.fetch();
+				if (shouldFetchTemplates) {
+					return this.template_set.fetch();
+				}
 			});
 		},
 

package/src/presentation/presentation-section.js

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

package/src/presentation/presentation-slide.js

@@ -372,13 +372,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,