@webbio/strapi-plugin-page-builder 0.9.9-platform → 0.10.1-platform

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webbio/strapi-plugin-page-builder",
-	"version": "0.9.9-platform",
+	"version": "0.10.1-platform",
 	"description": "This is the description of the plugin.",
 	"scripts": {
 		"develop": "tsc -p tsconfig.server.json -w",
@@ -42,7 +42,7 @@
 	},
 	"peerDependencies": {
 		"@strapi/strapi": "^4.15.0",
-		"@webbio/strapi-plugin-slug": "^3.2.6",
+		"@webbio/strapi-plugin-slug": "^3.3.0",
 		"react": "^17.0.0 || ^18.0.0",
 		"react-dom": "^17.0.0 || ^18.0.0",
 		"react-router-dom": "^5.3.4",

package/server/bootstrap/permissions.ts

@@ -1,3 +1,4 @@
+import uniq from 'lodash/uniq';
 import { Strapi } from '@strapi/strapi';
 import { PLATFORM_UID } from '../../shared/utils/constants';
 
@@ -54,6 +55,8 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 								}
 							});
 
+							const uniquePermissions = uniq(permissions);
+
 							return {
 								$and: [
 									{
@@ -62,9 +65,19 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 										}
 									},
 									{
-										'pageType.uid': {
-											$in: permissions
-										}
+										$or: [
+											{
+												'pageType.uid': {
+													$in: uniquePermissions
+												}
+											},
+											{
+												'pageType.uid': {
+													// This means there is no pageType (which is the case for any other page)
+													$eq: null
+												}
+											}
+										]
 									}
 								]
 							};

package/server/bootstrap.ts

@@ -137,100 +137,86 @@ export default async ({ strapi }: { strapi: Strapi }) => {
 			}
 		},
 		async afterUpdate(event) {
+			await afterUpdate(event?.['result']);
+		},
+		async afterUpdateMany(event) {
 			try {
-				const data = event?.['result'];
-				const hasCollectionTypeRelation =
-					data && data?.collectionTypeData?.[0] && data?.collectionTypeData[0].__type && data?.collectionTypeData[0];
-
-				if (hasCollectionTypeRelation) {
-					const isPublished = data.publishedAt !== undefined;
-					const pageData = isPublished ? { hasPage: !!data.publishedAt } : {};
-
-					await strapi.entityService?.update(data.collectionTypeData[0].__type, data.collectionTypeData[0].id, {
-						data: {
-							...pageData,
-							id: data.collectionTypeData[0].id,
-							lifecycleState: {
-								exit: true
-							}
+				const pagesToUpdate = event.params.where?.id?.['$in'];
+				const pages: Record<string, any>[] | undefined = (await strapi.entityService?.findMany(PAGE_UID, {
+					populate: {
+						collectionTypeData: true
+					},
+					filters: {
+						id: {
+							$in: pagesToUpdate
 						}
-					});
-				}
+					}
+				})) as any;
 
-				// This used to be the way to go. Not sure if the new way works
-				// const data = event?.params?.data;
-				// if (data.collectionTypeData?.__type && data.collectionTypeData.id) {
-				// 	await strapi.entityService?.update(data.collectionTypeData.__type, data.collectionTypeData.id, {
-				// 		data: {
-				// 			id: data.collectionTypeData.id,
-				// 			hasPage: true,
-				// 			lifecycleState: {
-				// 				exit: true
-				// 			}
-				// 		}
-				// 	});
-				// }
+				if (pages && pages.length > 0) {
+					await Promise.all(pages?.map((p) => afterUpdate(p)));
+				}
 			} catch (error) {
-				console.error('Failed to save hasPage data', error);
+				console.error('Failed to save hasPage many data', error);
 			}
 		},
-		// async afterCreate(event) {
-		// 	const data = event?.params?.data;
-		// 	if (data.collectionTypeData?.__type && data.collectionTypeData.id) {
-		// 		await strapi.entityService?.update(data.collectionTypeData.__type, data.collectionTypeData.id, {
-		// 			data: {
-		// 				id: data.collectionTypeData.id,
-		// 				hasPage: true,
-		// 				lifecycleState: {
-		// 					exit: true
-		// 				}
-		// 			}
-		// 		});
-		// 	}
-		// },
 		async beforeDelete(event) {
-			const originalEntity = (await strapi.entityService?.findOne(PAGE_UID, event.params.where.id, {
-				populate: {
-					collectionTypeData: true
-				}
-			})) as Record<string, any> | undefined;
-
-			if (originalEntity?.collectionTypeData?.[0]?.__type && originalEntity?.collectionTypeData?.[0]?.id) {
-				await strapi.entityService?.update(
-					originalEntity.collectionTypeData[0].__type,
-					originalEntity.collectionTypeData[0].id,
-					{
-						data: {
-							id: originalEntity.collectionTypeData[0].id,
-							hasPage: false
-						}
-					}
-				);
-			}
+			await beforeDelete(event.params.where.id);
 		},
 		async beforeDeleteMany(event) {
 			const pagesToDisconnect = event.params.where?.['$and']?.[0]?.id?.['$in'];
 
 			for (const pageId of pagesToDisconnect) {
-				const originalEntity = (await strapi.entityService?.findOne(PAGE_UID, pageId, {
-					populate: {
-						collectionTypeData: true
-					}
-				})) as Record<string, any> | undefined;
+				await beforeDelete(pageId);
+			}
+		}
+	});
+};
 
-				if (originalEntity?.collectionTypeData?.[0]?.__type && originalEntity?.collectionTypeData?.[0]?.id) {
-					await strapi.entityService?.update(
-						originalEntity.collectionTypeData[0].__type,
-						originalEntity.collectionTypeData[0].id,
-						{
-							data: {
-								id: originalEntity.collectionTypeData[0].id,
-								hasPage: false
-							}
-						}
-					);
+const beforeDelete = async (id: number) => {
+	const originalEntity = (await strapi.entityService?.findOne(PAGE_UID, id, {
+		populate: {
+			collectionTypeData: true
+		}
+	})) as Record<string, any> | undefined;
+
+	if (originalEntity?.collectionTypeData?.[0]?.__type && originalEntity?.collectionTypeData?.[0]?.id) {
+		await strapi.entityService?.update(
+			originalEntity.collectionTypeData[0].__type,
+			originalEntity.collectionTypeData[0].id,
+			{
+				data: {
+					id: originalEntity.collectionTypeData[0].id,
+					hasPage: false
 				}
 			}
+		);
+	}
+};
+
+const afterUpdate = async (result: Record<string, any>) => {
+	try {
+		const hasCollectionTypeRelation =
+			result &&
+			result?.collectionTypeData?.[0] &&
+			result?.collectionTypeData[0].__type &&
+			result?.collectionTypeData[0];
+
+		if (hasCollectionTypeRelation) {
+			const isPublished = result.publishedAt !== undefined;
+			const pageData = isPublished ? { hasPage: !!result.publishedAt } : {};
+
+			await strapi.entityService?.update(result.collectionTypeData[0].__type, result.collectionTypeData[0].id, {
+				data: {
+					...pageData,
+					id: result.collectionTypeData[0].id,
+					lifecycleState: {
+						exit: true
+					}
+				}
+			});
 		}
-	});
+	} catch (error) {
+		console.error('Failed to save hasPage data', error);
+	}
 };