@webbio/strapi-plugin-page-builder 0.3.5-platform → 0.3.7-platform

package/admin/src/api/has-platform-relation.ts

@@ -0,0 +1,37 @@
+import { useQuery, UseQueryOptions } from 'react-query';
+
+import { useFetchClient } from '@strapi/helper-plugin';
+
+import getRequestUrl from '../utils/getRequestUrl';
+
+type HasPlatformRelationQueryParams = {
+	uid: string;
+	fetchClient?: any;
+};
+
+const QUERY_KEY = ['platformRelation'];
+
+const fetchHasPlatformRelation = async ({ fetchClient, uid }: HasPlatformRelationQueryParams): Promise<boolean> => {
+	const { get } = fetchClient;
+	const result = await get(`${getRequestUrl('collection-types')}/hasPlatform/${uid}`);
+
+	return Boolean(result?.data?.hasPlatformRelation);
+};
+
+export const useHasPlatformRelation = (
+	params: HasPlatformRelationQueryParams,
+	options?: UseQueryOptions<boolean, Error>
+) => {
+	const fetchClient = useFetchClient();
+
+	return useQuery<boolean, Error>(
+		[
+			QUERY_KEY,
+			{
+				...params
+			}
+		],
+		() => fetchHasPlatformRelation({ ...params, fetchClient }),
+		options
+	);
+};

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react';
 
 import { useCMEditViewDataManager } from '@strapi/helper-plugin';
-import { Flex } from '@strapi/design-system';
+import { Flex, Box } from '@strapi/design-system';
 import { Link } from '@strapi/icons';
 
 import { Wrapper } from '../wrapper';
@@ -11,7 +11,11 @@ import S from '../Details/styles';
 import { PlatformSelect } from '../Platform/platform-select';
 import { Platform, useGetPlatforms } from '../../../api/platform';
 
-export const CollectionTypeSettings = () => {
+interface CollectionTypeSettingsProps {
+	onlyPlatform?: boolean;
+}
+
+export const CollectionTypeSettings = ({ onlyPlatform }: CollectionTypeSettingsProps) => {
 	const { layout, isCreatingEntry, initialData, onChange } = useCMEditViewDataManager() as any;
 	const { data: platforms } = useGetPlatforms({});
 	const [selectedPlatform, setSelectedPlatform] = useState<Platform | undefined | null>(initialData?.platform?.[0]);
@@ -32,10 +36,6 @@ export const CollectionTypeSettings = () => {
 		}
 	}, []);
 
-	if (isCreatingEntry) {
-		return null;
-	}
-
 	useEffect(() => {
 		setSelectedPlatform(initialData?.platform?.[0]);
 	}, [initialData]);
@@ -69,28 +69,44 @@ export const CollectionTypeSettings = () => {
 
 	return (
 		<>
-			<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 />}
+			{(isCreatingEntry || onlyPlatform) && (
+				<Wrapper title="Platform">
+					<PlatformSelect
+						platforms={platforms}
+						selectedPlatform={selectedPlatform}
+						onChange={handleSelectPlatform}
+						noLabel
+					/>
+				</Wrapper>
+			)}
+			{!isCreatingEntry && !onlyPlatform && (
+				<Wrapper title="Gekoppelde pagina">
+					<Flex direction="column" gap={4} width="100%" alignItems="start">
+						<Box width="100%">
+							<PlatformSelect
+								platforms={platforms}
+								selectedPlatform={selectedPlatform}
+								onChange={handleSelectPlatform}
+							/>
+						</Box>
+						{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/Details/index.tsx

@@ -12,15 +12,26 @@ interface Props {
 	entityId?: number;
 	entityTitle?: string;
 	locale?: string;
+	platformTitle?: string;
 }
 
 const Details = (props: Props) => {
-	const { entityTitle, pageType } = props;
+	const { entityTitle, pageType, platformTitle } = props;
 
 	const url = generateLink(props);
 
 	return (
 		<Flex gap={4} width="100%" direction="column">
+			{platformTitle && (
+				<Flex direction="column" alignItems="start" width="100%" gap={1}>
+					<S.SubtleType variant="omega" fontWeight="bold" textColor="neutral800">
+						Platform
+					</S.SubtleType>
+					<S.SubtleType variant="omega" fontWeight="bold" textColor="neutral800">
+						{platformTitle}
+					</S.SubtleType>
+				</Flex>
+			)}
 			<Flex direction="column" alignItems="start" width="100%" gap={1}>
 				<S.SubtleType variant="omega" fontWeight="bold" textColor="neutral800">
 					{pageType?.title || PAGE_TYPE_PAGE}

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

@@ -140,6 +140,7 @@ export const PageSettings = () => {
 						pageType={selectedPageType}
 						entityId={modifiedData.collectionTypeId}
 						entityTitle={modifiedData.collectionTypeTitle}
+						platformTitle={selectedPlatform?.title}
 					/>
 				)}
 				{(!showEditFields || isEditting) && (

package/admin/src/components/EditView/Platform/platform-select.tsx

@@ -9,12 +9,13 @@ interface Props {
 	onChange: (platformId: string) => void;
 	selectedPlatform?: Platform | null;
 	platforms?: Platform[];
+	noLabel?: boolean;
 }
 
-export const PlatformSelect = ({ onChange, platforms, selectedPlatform }: Props) => {
+export const PlatformSelect = ({ onChange, platforms, selectedPlatform, noLabel }: Props) => {
 	return (
 		<SingleSelect
-			label="Platform"
+			label={!noLabel && 'Platform'}
 			placeholder="Choose a platform"
 			value={selectedPlatform?.id || PLATFORM}
 			onChange={onChange}

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

@@ -6,6 +6,7 @@ import { PAGE_UID } from '../../../../shared/utils/constants';
 import { PageSettings } from './PageSettings';
 import { CollectionTypeSettings } from './CollectionTypeSettings';
 import { useHasPageRelation } from '../../api/has-page-relation';
+import { useHasPlatformRelation } from '../../api/has-platform-relation';
 
 export const EditView = () => {
 	const { layout } = useCMEditViewDataManager() as any;
@@ -17,12 +18,17 @@ export const EditView = () => {
 		uid: layout.uid
 	});
 
+	const { data: hasPlatformRelation, isLoading: isLoadingPlatformRelation } = useHasPlatformRelation({
+		uid: layout.uid
+	});
+
 	if (isPageCollectionType) {
 		return <PageSettings />;
 	}
 
-	if (isCollectionType && !isLoading && hasPageRelation) {
-		return <CollectionTypeSettings />;
+	// Show collectiontype settings if it's not a page and it has a page relation OR a platform relation
+	if (isCollectionType && !isLoading && !isLoadingPlatformRelation && (hasPageRelation || hasPlatformRelation)) {
+		return <CollectionTypeSettings onlyPlatform={!hasPageRelation && hasPlatformRelation} />;
 	}
 
 	return null;

package/dist/package.json

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

package/dist/server/controllers/collection-types.js

@@ -6,6 +6,11 @@ exports.default = {
         const uid = (_a = ctx.params) === null || _a === void 0 ? void 0 : _a.uid;
         return strapi.service('plugin::page-builder.collection-types').hasPageRelation(uid);
     },
+    async hasPlatformRelation(ctx) {
+        var _a;
+        const uid = (_a = ctx.params) === null || _a === void 0 ? void 0 : _a.uid;
+        return strapi.service('plugin::page-builder.collection-types').hasPlatformRelation(uid);
+    },
     async getTranslationPageLinks(ctx) {
         const { uid, ids } = ctx.params || {};
         const idsArr = ids === null || ids === void 0 ? void 0 : ids.split(',').map(Number).filter((x) => !isNaN(x));

package/dist/server/graphql/index.js

@@ -4,10 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const page_type_1 = __importDefault(require("./page-type"));
-const page_by_slug_1 = __importDefault(require("./page-by-slug"));
+const page_by_path_1 = __importDefault(require("./page-by-path"));
 const pages_by_uid_1 = __importDefault(require("./pages-by-uid"));
 exports.default = {
     getPageInfoFromUID: pages_by_uid_1.default,
     pageType: page_type_1.default,
-    pageBySlug: page_by_slug_1.default
+    pageByPath: page_by_path_1.default
 };

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

@@ -0,0 +1,89 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const filter_underscore_arguments_1 = require("../utils/filter-underscore-arguments");
+const constants_1 = require("../../shared/utils/constants");
+const getPageByPath = (strapi) => {
+    const typeDefs = () => {
+        return `
+				extend type Page {
+					collectionType: GenericMorph
+				}
+
+        type Query {
+          getPageByPath(path: String, _domain: String, _locale: String, _publicationState: PublicationState): PageEntity
+        }
+
+      `;
+    };
+    const resolvers = (strapi) => {
+        const { transformArgs } = strapi.plugin('graphql').service('builders').utils;
+        return {
+            Query: {
+                getPageByPath: {
+                    resolve: async (_parent, args, ctx) => {
+                        var _a;
+                        try {
+                            const filteredArgs = {
+                                ...(0, filter_underscore_arguments_1.filterUnderscoreArguments)(args),
+                                platform: { domain: args._domain }
+                            };
+                            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;
+                            };
+                            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);
+                            }
+                        }
+                        catch (error) {
+                            console.log('Error in getPageByPath:', error);
+                            throw new Error(ctx.koaContext.response.message);
+                        }
+                    }
+                }
+            }
+        };
+    };
+    const resolversConfig = {
+        'Query.getPageByPath': {
+            auth: false
+        }
+    };
+    return {
+        typeDefs: typeDefs(),
+        resolvers: resolvers(strapi),
+        resolversConfig
+    };
+};
+exports.default = getPageByPath;

package/dist/server/register.js

@@ -3,14 +3,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const page_by_slug_1 = __importDefault(require("./graphql/page-by-slug"));
+const page_by_path_1 = __importDefault(require("./graphql/page-by-path"));
 const page_type_1 = __importDefault(require("./graphql/page-type"));
 const pages_by_uid_1 = __importDefault(require("./graphql/pages-by-uid"));
 exports.default = async ({ strapi }) => {
     var _a, _b;
     const extensionService = strapi.plugin('graphql').service('extension');
     extensionService.use(page_type_1.default);
-    extensionService.use((0, page_by_slug_1.default)(strapi));
+    extensionService.use((0, page_by_path_1.default)(strapi));
     extensionService.use((0, pages_by_uid_1.default)(strapi));
     await ((_b = (_a = strapi.services) === null || _a === void 0 ? void 0 : _a['plugin::page-builder.builder']) === null || _b === void 0 ? void 0 : _b.buildContentTypes());
 };

package/dist/server/routes/index.js

@@ -36,6 +36,11 @@ const routes = {
                 method: 'GET',
                 path: '/collection-types-page-links/:uid/:ids?',
                 handler: 'collection-types.getTranslationPageLinks'
+            },
+            {
+                method: 'GET',
+                path: '/collection-types/hasPlatform/:uid',
+                handler: 'collection-types.hasPlatformRelation'
             }
         ]
     },

package/dist/server/services/collection-types.js

@@ -22,6 +22,13 @@ exports.default = {
                 pageTypesWithUid.length > 0)
         };
     },
+    async hasPlatformRelation(uid) {
+        var _a, _b, _c;
+        const contentType = (_a = strapi.contentTypes) === null || _a === void 0 ? void 0 : _a[uid];
+        return {
+            hasPlatformRelation: Boolean(((_c = (_b = contentType === null || contentType === void 0 ? void 0 : contentType.attributes) === null || _b === void 0 ? void 0 : _b.platform) === null || _c === void 0 ? void 0 : _c.target) === constants_1.PLATFORM_UID)
+        };
+    },
     withPageMorph() {
         const { getTypeName, getFiltersInputTypeName } = strapi.plugin('graphql').service('utils').naming;
         const collectionTypes = Object.entries(strapi.contentTypes)