@webbio/strapi-plugin-page-builder 0.3.2 → 0.3.4-platform

package/admin/src/api/page-type.ts

@@ -9,11 +9,11 @@ export type PageType = {
 
 const QUERY_KEY = 'page-types';
 
-const fetchPageTypes = async ({ fetchClient }: any): Promise<PageType[]> => {
+const fetchPageTypes = async ({ fetchClient }: Record<string, any>): Promise<PageType[]> => {
 	const { get } = fetchClient;
-	const result = await get(`/content-manager/collection-types/api::page-type.page-type`);
+	const result = await get(`/content-manager/collection-types/api::page-type.page-type?page=1&pageSize=100`);
 
-	return result?.data?.results?.map((entity: any) => ({
+	return result?.data?.results?.map((entity: Record<string, any>) => ({
 		id: entity.id,
 		uid: entity.uid,
 		title: entity.title,
@@ -21,11 +21,12 @@ const fetchPageTypes = async ({ fetchClient }: any): Promise<PageType[]> => {
 	}));
 };
 
-export const useGetPageTypes = (params: any) => {
+export const useGetPageTypes = (params: Record<string, any>) => {
 	const fetchClient = useFetchClient();
 	params = {
 		...params,
 		fetchClient
 	};
+
 	return useQuery<PageType[], Error>(QUERY_KEY, () => fetchPageTypes(params));
 };

package/admin/src/api/platform-page-types.ts

@@ -0,0 +1,40 @@
+import { useQuery } from 'react-query';
+
+import { useFetchClient } from '@strapi/helper-plugin';
+
+import { PageType } from './page-type';
+
+const QUERY_KEY = 'pageTypesForPlatform';
+
+const fetchPageTypesForPlatform = async ({ fetchClient, id }: Record<string, any>): Promise<PageType[]> => {
+	if (!id) return [];
+
+	const { get } = fetchClient;
+	const pageTypesByPlatformResult = await get(
+		`/content-manager/relations/api::platform.platform/${id}/pageTypes?page=1&pageSize=100`
+	);
+	const pageTypesResult = await get(`/content-manager/collection-types/api::page-type.page-type?page=1&pageSize=100`);
+
+	return pageTypesByPlatformResult?.data?.results?.map((entity: Record<string, any>) => {
+		const fullPageType = pageTypesResult?.data?.results?.find(
+			(pageType: Record<string, any>) => pageType.id === entity.id
+		);
+
+		return {
+			id: entity.id,
+			uid: fullPageType.uid,
+			title: fullPageType.title,
+			templateId: fullPageType?.template?.id
+		};
+	});
+};
+
+export const useGetPageTypesForPlatform = (params: Record<string, any>) => {
+	const fetchClient = useFetchClient();
+	params = {
+		...params,
+		fetchClient
+	};
+
+	return useQuery<PageType[], Error>([QUERY_KEY, params?.id], () => fetchPageTypesForPlatform(params));
+};

package/admin/src/api/platform.ts

@@ -2,7 +2,6 @@ import { useQuery } from 'react-query';
 
 import { useFetchClient } from '@strapi/helper-plugin';
 
-import getRequestUrl from '../utils/getRequestUrl';
 import { PageType } from './page-type';
 
 export type Platform = {
@@ -13,22 +12,23 @@ export type Platform = {
 
 const QUERY_KEY = 'platforms';
 
-const fetchPlatforms = async ({ fetchClient }: any): Promise<Platform[]> => {
+const fetchPlatforms = async ({ fetchClient }: Record<string, any>): Promise<Platform[]> => {
 	const { get } = fetchClient;
-	const result = await get(getRequestUrl(`/platform`));
+	const result = await get('/content-manager/collection-types/api::platform.platform?page=1&pageSize=100');
 
-	return result?.data?.map((entity: any) => ({
+	return result?.data?.results.map((entity: Record<string, any>) => ({
 		id: entity.id,
 		title: entity.title,
 		pageTypes: entity.pageTypes
 	}));
 };
 
-export const useGetPlatforms = (params: any) => {
+export const useGetPlatforms = (params: Record<string, any>) => {
 	const fetchClient = useFetchClient();
 	params = {
 		...params,
 		fetchClient
 	};
+
 	return useQuery<Platform[], Error>(QUERY_KEY, () => fetchPlatforms(params));
 };

package/admin/src/components/EditView/CollectionTypeSettings/index.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import { useCMEditViewDataManager } from '@strapi/helper-plugin';
 import { Flex } from '@strapi/design-system';
@@ -8,10 +8,13 @@ import { Wrapper } from '../wrapper';
 import { CreatePageButton } from './CreatePageButton';
 import { PAGE_TYPE_PAGE, PAGE_UID } from '../../../../../shared/utils/constants';
 import S from '../Details/styles';
+import { PlatformSelect } from '../Platform/platform-select';
+import { Platform, useGetPlatforms } from '../../../api/platform';
 
 export const CollectionTypeSettings = () => {
 	const { layout, isCreatingEntry, initialData, onChange } = useCMEditViewDataManager() as any;
-
+	const { data: platforms } = useGetPlatforms({});
+	const [selectedPlatform, setSelectedPlatform] = useState<Platform | undefined | null>(initialData?.platform?.[0]);
 	const isUserCreatedContentType = layout.uid.startsWith('api::');
 	const linkedPage = initialData.page?.[0];
 
@@ -33,26 +36,62 @@ export const CollectionTypeSettings = () => {
 		return null;
 	}
 
+	useEffect(() => {
+		setSelectedPlatform(initialData?.platform?.[0]);
+	}, [initialData]);
+
+	const setFormValue = (name: string, value?: string | Record<string, any>[]) => {
+		onChange({
+			target: {
+				name,
+				value
+			},
+			shouldSetInitialValue: true
+		});
+	};
+
+	const handleSelectPlatform = async (platformId: string) => {
+		const platform = platforms?.find((platform) => platform.id === Number(platformId));
+
+		if (platform && platform.title) {
+			setSelectedPlatform(platform);
+			const formPlatform = {
+				...platform,
+				label: platform.title,
+				value: platform.id
+			};
+			setFormValue('platform', [formPlatform]);
+		} else {
+			setFormValue('platform', []);
+			setSelectedPlatform(null);
+		}
+	};
+
 	return (
-		<Wrapper title="Gekoppelde pagina">
-			<Flex direction="column" gap={4} width="100%" alignItems="start">
-				{showCreatePageButton && <CreatePageButton />}
+		<>
+			<Wrapper title="Platform">
+				<PlatformSelect platforms={platforms} selectedPlatform={selectedPlatform} onChange={handleSelectPlatform} />
+			</Wrapper>
+			<Wrapper title="Gekoppelde pagina">
+				<Flex direction="column" gap={4} width="100%" alignItems="start">
+					{showCreatePageButton && <CreatePageButton />}
 
-				{url && (
-					<Flex direction="column" alignItems="start" width="100%" gap={1}>
-						<S.SubtleType variant="omega" fontWeight="bold" textColor="neutral800">
-							{PAGE_TYPE_PAGE}
-						</S.SubtleType>
-						<S.EntityLinkWrapper variant="pi" textColor="neutral800">
-							<S.EntityLink title={linkedPage.title || '-'} to={url} variant="pi">
-								<Link />
-								{linkedPage.title || '-'}
-							</S.EntityLink>
-						</S.EntityLinkWrapper>
-					</Flex>
-				)}
-			</Flex>
-		</Wrapper>
+					{url && (
+						<Flex direction="column" alignItems="start" width="100%" gap={1}>
+							<S.SubtleType variant="omega" fontWeight="bold" textColor="neutral800">
+								{PAGE_TYPE_PAGE}
+							</S.SubtleType>
+							<S.EntityLinkWrapper variant="pi" textColor="neutral800">
+								<S.EntityLink title={linkedPage.title || '-'} to={url} variant="pi">
+									<Link />
+									{linkedPage.title || '-'}
+								</S.EntityLink>
+							</S.EntityLinkWrapper>
+						</Flex>
+					)}
+				</Flex>
+			</Wrapper>
+		</>
 	);
 };
 

package/admin/src/components/EditView/PageSettings/index.tsx

@@ -3,7 +3,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { useCMEditViewDataManager } from '@strapi/helper-plugin';
 import { Stack, Flex } from '@strapi/design-system';
 import { Cog, Cross } from '@strapi/icons';
-import { getFetchClient } from '@strapi/helper-plugin';
+import { getFetchClient, useRBACProvider } from '@strapi/helper-plugin';
 import { TemplateSelect } from '../Template/TemplateSelect';
 import { PageTypeSelect } from '../page-type-select';
 import { CollectionTypeSearch } from '../CollectionTypeSearch';
@@ -18,6 +18,7 @@ import getRequestUrl from '../../../utils/getRequestUrl';
 export const PageSettings = () => {
 	const { isCreatingEntry, initialData, onChange, modifiedData, ...rest } = useCMEditViewDataManager() as any;
 	const { data: allPageTypes } = useGetPageTypes({});
+	const { allPermissions } = useRBACProvider();
 	const { data: platforms } = useGetPlatforms({});
 	const [pageTypes, setPageTypes] = useState(allPageTypes);
 	const [selectedPageType, setSelectedPageType] = useState<PageType | undefined | null>(initialData?.initialPageType);
@@ -39,6 +40,18 @@ export const PageSettings = () => {
 		});
 	};
 
+	const getPlatformFromPermissions = () => {
+		const checkPagePremissions = allPermissions.filter((permission) => permission.subject === 'api::page.page');
+
+		const checkedConditions = checkPagePremissions.filter(
+			(permission) =>
+				permission.action === 'plugin::content-manager.explorer.create' ||
+				permission.action === 'plugin::content-manager.explorer.update'
+		);
+	};
+
+	getPlatformFromPermissions();
+
 	useEffect(() => {
 		setSelectedPageType(initialData?.initialPageType);
 
@@ -110,7 +123,11 @@ export const PageSettings = () => {
 		const { get } = getFetchClient();
 		const { data: platFormData } = await get(pageTypeUrl);
 
-		setPageTypes(platFormData[0].pageTypes);
+		const filterPageTypeByPlatform = platFormData[0].pageTypes.filter(
+			(data) => allPageTypes?.find((pageData) => pageData.uid === data.uid)
+		);
+
+		setPageTypes(filterPageTypeByPlatform);
 	};
 
 	return (

package/admin/src/components/PageFilters/filters.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import set from 'lodash/set';
 
 import { Stack } from '@strapi/design-system';
@@ -10,6 +10,7 @@ import PlatformFilter from './PlatformFilter';
 import { Platform, useGetPlatforms } from '../../api/platform';
 import { PAGE_TYPE, PAGE_TYPE_NO_FILTER, PLATFORM_NO_FILTER } from '../../constants';
 import { PageType } from '../../api/page-type';
+import { useGetPageTypesForPlatform } from '../../api/platform-page-types';
 
 interface PageFiltersProps {
 	hidePageType?: boolean;
@@ -21,10 +22,12 @@ const PageFilters = ({ hidePageType }: PageFiltersProps) => {
 	const { data: platforms } = useGetPlatforms({});
 
 	const selectedPlatformTitle = useMemo(() => getPlatformFromQuery(query, platforms), [query, platforms]);
-	const selectedPageTypeUid = useMemo(
-		() => getPageTypeFromQuery(query, getPageTypesFromPlatformTitle(selectedPlatformTitle, platforms)),
-		[query, platforms, selectedPlatformTitle]
-	);
+
+	const { data: pageTypesForPlatform } = useGetPageTypesForPlatform({
+		id: platforms?.find((p) => p.title === selectedPlatformTitle)?.id
+	});
+
+	const selectedPageTypeUid = useMemo(() => getPageTypeFromQuery(query, []), [query, platforms, selectedPlatformTitle]);
 
 	const handleFilterChange = (
 		filters: Record<string, any>,
@@ -88,7 +91,7 @@ const PageFilters = ({ hidePageType }: PageFiltersProps) => {
 			{!hidePageType && (
 				<PageTypeFilter
 					onChange={handlePageTypeSelect}
-					pageTypes={getPageTypesFromPlatformTitle(selectedPlatformTitle, platforms)}
+					pageTypes={pageTypesForPlatform}
 					selectedPageTypeUid={selectedPageTypeUid}
 				/>
 			)}
@@ -98,9 +101,6 @@ const PageFilters = ({ hidePageType }: PageFiltersProps) => {
 
 export default PageFilters;
 
-const getPageTypesFromPlatformTitle = (selectedPlatformTitle?: string, platforms?: Platform[]) =>
-	platforms?.find((p) => p.title === selectedPlatformTitle)?.pageTypes;
-
 const getPageTypeFromQuery = (query: Record<string, any>, pageTypes?: PageType[]) => {
 	const pageTypeFromQuery = query?.filters?.$and?.find(
 		(x?: Record<string, any>) => Object.keys(x || {})?.[0] === PAGE_TYPE

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webbio/strapi-plugin-page-builder",
-    "version": "0.3.2",
+    "version": "0.3.4-platform",
     "description": "This is the description of the plugin.",
     "scripts": {
         "develop": "tsc -p tsconfig.server.json -w",

package/dist/server/bootstrap/permissions.js

@@ -2,30 +2,83 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("../../shared/utils/constants");
 exports.default = async ({ strapi }) => {
-    var _a;
+    var _a, _b;
     try {
         const pageTypes = (await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findMany(constants_1.PAGE_TYPE_UID, {
             limit: -1
         })));
-        const pagePermissions = pageTypes.map((pageType) => {
-            const name = `page-type-is-${pageType.uid}`;
-            const displayName = pageType.title;
+        const platforms = (await ((_b = strapi.entityService) === null || _b === void 0 ? void 0 : _b.findMany(constants_1.PLATFORM_UID, {
+            limit: -1
+        })));
+        const platformPagePermissions = platforms.map((platform) => {
+            return pageTypes.map((pageType) => {
+                const name = `platform-is-${platform.title}-${pageType.uid}`;
+                const displayName = `${platform.title}-${pageType.title}`;
+                return {
+                    plugin: 'page-builder',
+                    name,
+                    displayName,
+                    category: `${platform.title} Page roles`,
+                    handler: async () => {
+                        return {
+                            $and: [
+                                {
+                                    'platform.id': {
+                                        $eq: platform.id
+                                    }
+                                },
+                                {
+                                    'pageType.uid': {
+                                        $eq: pageType.uid
+                                    }
+                                },
+                                {
+                                    uid: {
+                                        $eq: pageType.uid
+                                    }
+                                }
+                            ]
+                        };
+                    }
+                };
+            });
+        });
+        const pageTypePermissions = pageTypes.map((pageType) => {
+            const name = `pageType-permission-${pageType.uid}`;
+            const displayName = `pageType ${pageType.title}`;
+            return {
+                plugin: 'page-builder',
+                name,
+                displayName,
+                category: `Platform pageType roles`,
+                handler: async () => {
+                    return {
+                        uid: {
+                            $eq: pageType.uid
+                        }
+                    };
+                }
+            };
+        });
+        const platformCollectiontypePermissions = platforms.map((platform) => {
+            const name = `platform-is-${platform.title}`;
+            const displayName = platform.title;
             return {
                 plugin: 'page-builder',
                 name,
                 displayName,
-                category: 'Page type',
+                category: 'Platform CollectionType roles',
                 handler: async () => {
                     return {
                         $or: [
                             {
-                                'pageType.uid': {
-                                    $eq: pageType.uid
+                                'platform.id': {
+                                    $eq: platform.id
                                 }
                             },
                             {
-                                uid: {
-                                    $eq: pageType.uid
+                                id: {
+                                    $eq: platform.id
                                 }
                             }
                         ]
@@ -33,8 +86,13 @@ exports.default = async ({ strapi }) => {
                 }
             };
         });
+        const allPermissions = [
+            ...platformPagePermissions.flat(),
+            ...pageTypePermissions.flat(),
+            ...platformCollectiontypePermissions
+        ];
         // @ts-ignore shitty types
-        await strapi.admin.services.permission.conditionProvider.registerMany(pagePermissions);
+        await strapi.admin.services.permission.conditionProvider.registerMany(allPermissions);
     }
     catch {
         console.log('Cannot set page permissions');

package/dist/server/graphql/page-by-slug.js

@@ -10,7 +10,7 @@ const getPageBySlug = (strapi) => {
 				}
 
         type Query {
-          getPageBySlug(path: String, _locale: String, _publicationState: PublicationState): PageEntity
+          getPageBySlug(path: String, _domain: String, _locale: String, _publicationState: PublicationState): PageEntity
         }
 
       `;
@@ -22,45 +22,52 @@ const getPageBySlug = (strapi) => {
                 getPageBySlug: {
                     resolve: async (_parent, args, ctx) => {
                         var _a;
-                        const filteredArgs = {
-                            ...(0, filter_underscore_arguments_1.filterUnderscoreArguments)(args)
-                        };
-                        const { toEntityResponse } = strapi.plugin('graphql').service('format').returnTypes;
-                        const getPage = async () => {
-                            var _a, _b, _c;
-                            const transformedArgs = transformArgs(filteredArgs, {
-                                contentType: strapi.contentTypes[constants_1.PAGE_UID],
-                                usePagination: false
-                            });
-                            const results = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findMany(constants_1.PAGE_UID, {
-                                filters: transformedArgs,
-                                locale: args._locale,
-                                publicationState: args._publicationState,
-                                populate: '*'
-                            }));
-                            const entityResponse = toEntityResponse((results === null || results === void 0 ? void 0 : results[0]) || {}, {
-                                args: transformedArgs,
-                                resourceUID: constants_1.PAGE_UID
-                            });
-                            if (!(entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value) || Object.keys(entityResponse.value).length === 0) {
-                                throw new Error(ctx.koaContext.response.message);
-                            }
-                            const collectionTypeDataFilter = (_c = (_b = entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value) === null || _b === void 0 ? void 0 : _b.collectionTypeData) === null || _c === void 0 ? void 0 : _c.filter(Boolean);
-                            const collectionType = collectionTypeDataFilter.length === 1 ? collectionTypeDataFilter === null || collectionTypeDataFilter === void 0 ? void 0 : collectionTypeDataFilter[0] : null;
-                            const addedAttributes = {
-                                collectionType: collectionType
+                        try {
+                            const filteredArgs = {
+                                ...(0, filter_underscore_arguments_1.filterUnderscoreArguments)(args),
+                                platform: { domain: args._domain }
                             };
-                            const result = {
-                                ...entityResponse.value,
-                                ...addedAttributes
+                            const { toEntityResponse } = strapi.plugin('graphql').service('format').returnTypes;
+                            const getPage = async () => {
+                                var _a, _b, _c;
+                                const transformedArgs = transformArgs(filteredArgs, {
+                                    contentType: strapi.contentTypes[constants_1.PAGE_UID],
+                                    usePagination: false
+                                });
+                                const results = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findMany(constants_1.PAGE_UID, {
+                                    filters: filteredArgs,
+                                    locale: args._locale,
+                                    publicationState: args._publicationState,
+                                    populate: '*'
+                                }));
+                                const entityResponse = toEntityResponse((results === null || results === void 0 ? void 0 : results[0]) || {}, {
+                                    args: transformedArgs,
+                                    resourceUID: constants_1.PAGE_UID
+                                });
+                                if (!(entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value) || Object.keys(entityResponse.value).length === 0) {
+                                    throw new Error(ctx.koaContext.response.message);
+                                }
+                                const collectionTypeDataFilter = (_c = (_b = entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value) === null || _b === void 0 ? void 0 : _b.collectionTypeData) === null || _c === void 0 ? void 0 : _c.filter(Boolean);
+                                const collectionType = collectionTypeDataFilter.length === 1 ? collectionTypeDataFilter === null || collectionTypeDataFilter === void 0 ? void 0 : collectionTypeDataFilter[0] : null;
+                                const addedAttributes = {
+                                    collectionType: collectionType
+                                };
+                                const result = {
+                                    ...entityResponse.value,
+                                    ...addedAttributes
+                                };
+                                return result;
                             };
-                            return result;
-                        };
-                        const results = await getPage();
-                        if (((_a = Object.values(results)) === null || _a === void 0 ? void 0 : _a.filter(Boolean).length) > 0) {
-                            return results;
+                            const results = await getPage();
+                            if (((_a = Object.values(results)) === null || _a === void 0 ? void 0 : _a.filter(Boolean).length) > 0) {
+                                return results;
+                            }
+                            else {
+                                throw new Error(ctx.koaContext.response.message);
+                            }
                         }
-                        else {
+                        catch (error) {
+                            console.log('Error in getPageBySlug:', error);
                             throw new Error(ctx.koaContext.response.message);
                         }
                     }