fix: fix data processing issue on build

Author: guyromellemagayano

src/utils/optimizely.js

@@ -38,7 +38,7 @@ class Optimizely {
 				let promises = [];
 
 				values.map(async (value) => {
-					if ("contentLink" in value) {
+					if (value && Object.prototype.hasOwnProperty.call(value, "contentLink") && Object.keys(value)?.length > 0) {
 						if (value.contentLink.id) {
 							promises.push(request.run("get", CONTENT_ENDPOINT + value.contentLink.id + "?expand=*", body));
 						} else {
@@ -69,51 +69,35 @@ class Optimizely {
 
 						return Promise.resolve(values);
 					})
-					.catch((err) => {
-						this.log.error(`An error occurred while fetching ${"`" + label + "`"} data from the Optimizely/Episerver API`, err.message);
-
-						return Promise.reject(err);
-					});
-			} else if (values && typeof values === "object" && Object.keys(values)?.length > 0) {
+					.catch((err) => Promise.reject(err));
+			} else if (values && Object.prototype.toString.call(values) === "[object Object]" && Object.keys(values)?.length > 0) {
 				let promises = [];
 
-				Object.keys(values).map(async (key) => {
-					if ("contentLink" in values[key]) {
-						if (values[key].contentLink.id) {
-							promises.push(request.run("get", CONTENT_ENDPOINT + values[key].contentLink.id + "?expand=*", body));
-						} else {
-							let message = "Expanded `contentLink` in `" + key + "` is missing `id` key";
+				if (values && Object.prototype.hasOwnProperty.call(values, "id") && Object.keys(values)?.length > 0) {
+					promises.push(request.run("get", CONTENT_ENDPOINT + values.id + "?expand=*", body));
+				} else {
+					let message = "Expanded `" + label + "` is missing `id` key";
 
-							throw message;
-						}
-					} else {
-						let message = "Expanded `" + key + "` is missing `contentLink` key";
-
-						throw message;
-					}
-				});
+					throw message;
+				}
 
 				await Promise.allSettled(promises)
 					.then((res) => {
 						if (res && Array.isArray(res) && res?.length > 0) {
 							res
 								.filter(({ status, value }) => status === "fulfilled" && value !== null)
-								.map(({ value }, index) => {
+								.map(({ value }) => {
 									const { data } = value;
 
-									values[Object.keys(values)[index]] = data;
+									values = data;
 
-									return values[Object.keys(values)[index]];
+									return values;
 								});
 						}
 
 						return Promise.resolve(values);
 					})
-					.catch((err) => {
-						this.log.error(`An error occurred while fetching ${"`" + label + "`"} data from the Optimizely/Episerver API`, err.message);
-
-						return Promise.reject(err);
-					});
+					.catch((err) => Promise.reject(err));
 			} else {
 				this.log.warn("Current `" + label + "` is not an array, object or null. Skipping...");
 			}
@@ -137,26 +121,36 @@ class Optimizely {
 						temp.contentLink?.expanded?.images && Array.isArray(temp.contentLink?.expanded?.images) && temp.contentLink?.expanded?.images?.length > 0 ? await handleExpandedKeyValues(temp.contentLink.expanded.images, "images") : null;
 					const formPromise =
 						temp.contentLink?.expanded?.form && Array.isArray(temp.contentLink?.expanded?.form) && temp.contentLink?.expanded?.form?.length > 0 ? await handleExpandedKeyValues(temp.contentLink?.expanded?.form, "form") : null;
+
 					const expandedKeyValuesPromises = [dynamicStylesPromise, itemsPromise, imagesPromise, formPromise] || [];
+
 					await Promise.allSettled(expandedKeyValuesPromises)
 						.then((res) => {
 							if (res && Array.isArray(res) && res?.length > 0) {
 								res
 									.filter(({ status, value }) => status === "fulfilled" && value !== null)
 									.map(({ value }, index) => {
 										switch (index) {
-											case 0:
+											case 0: {
+												delete temp.contentLink.expanded.dynamicStyles;
 												temp.contentLink.expanded.dynamicStyles = value;
 												break;
-											case 1:
+											}
+											case 1: {
+												delete temp.contentLink.expanded.items;
 												temp.contentLink.expanded.items = value;
 												break;
-											case 2:
+											}
+											case 2: {
+												delete temp.contentLink.expanded.images;
 												temp.contentLink.expanded.images = value;
 												break;
-											case 3:
+											}
+											case 3: {
+												delete temp.contentLink.expanded.form;
 												temp.contentLink.expanded.form = value;
 												break;
+											}
 											default:
 												break;
 										}
@@ -223,30 +217,38 @@ class Optimizely {
 				.catch((err) => Promise.reject(err));
 
 			return expandedData;
-		} else if (data && typeof data === "object" && Object.keys(data).length > 0) {
-			const temp = Object.assign({}, data);
+		} else if (data && Object.prototype.toString.call(data) === "[object Object]" && Object.keys(data)?.length > 0) {
+			try {
+				const expandedDataPromise = new Promise((resolve, reject) => {
+					const temp = Object.assign({}, data);
 
-			const { contentBlocks, contentBlocksTop, contentBlocksBottom } = temp;
+					const { contentBlocks, contentBlocksTop, contentBlocksBottom } = temp;
 
-			if (contentBlocks && Array.isArray(contentBlocks) && contentBlocks?.length > 0) {
-				let expandedContentBlocks = await handleContentBlocks(contentBlocks);
+					if (contentBlocks && Array.isArray(contentBlocks) && contentBlocks?.length > 0) {
+						let expandedContentBlocks = handleContentBlocks(contentBlocks);
 
-				temp.contentBlocks = expandedContentBlocks;
-			}
+						temp.contentBlocks = expandedContentBlocks;
+					}
 
-			if (contentBlocksTop && Array.isArray(contentBlocksTop) && contentBlocksTop?.length > 0) {
-				let expandedContentBlocksTop = await handleContentBlocks(contentBlocksTop);
+					if (contentBlocksTop && Array.isArray(contentBlocksTop) && contentBlocksTop?.length > 0) {
+						let expandedContentBlocksTop = handleContentBlocks(contentBlocksTop);
 
-				temp.contentBlocksTop = expandedContentBlocksTop;
-			}
+						temp.contentBlocksTop = expandedContentBlocksTop;
+					}
 
-			if (contentBlocksBottom && Array.isArray(contentBlocksBottom) && contentBlocksBottom?.length > 0) {
-				let expandedContentBlocksBottom = await handleContentBlocks(contentBlocksBottom);
+					if (contentBlocksBottom && Array.isArray(contentBlocksBottom) && contentBlocksBottom?.length > 0) {
+						let expandedContentBlocksBottom = handleContentBlocks(contentBlocksBottom);
 
-				temp.contentBlocksBottom = expandedContentBlocksBottom;
-			}
+						temp.contentBlocksBottom = expandedContentBlocksBottom;
+					}
 
-			return temp;
+					return temp ? resolve(temp) : reject(temp);
+				});
+
+				return expandedDataPromise;
+			} catch (err) {
+				return Promise.reject(err);
+			}
 		} else return data;
 	}