@webbio/strapi-plugin-page-builder 0.0.13 → 0.0.15

package/admin/src/components/EditView/CollectionTypeSettings/CreatePageButton/styles.ts

@@ -1,12 +1,6 @@
 import styled, { css } from 'styled-components';
 
-import { Typography, Button } from '@strapi/design-system';
-
-const SubtleType = styled(Typography)`
-	${({ _theme }) => css`
-		text-transform: capitalize;
-	`}
-`;
+import { Button } from '@strapi/design-system';
 
 const CreateButton = styled(Button)`
 	${({ _theme }) => css`
@@ -19,7 +13,6 @@ const CreateButton = styled(Button)`
 `;
 
 const CreatePageButtonStyles = {
-	SubtleType,
 	CreateButton
 };
 

package/admin/src/components/EditView/Details/styles.ts

@@ -35,8 +35,8 @@ const EditLink = styled(Button)`
 	${({ _theme }) => css`
 		text-decoration: none;
 
-		> div {
-			display: flex;
+		svg {
+			flex-shrink: 0;
 		}
 	`}
 `;

package/admin/src/index.tsx

@@ -1,73 +1,17 @@
 import { prefixPluginTranslations } from '@strapi/helper-plugin';
 
-import { getFetchClient } from '@strapi/helper-plugin';
-
 import pluginPkg from '../../package.json';
 import pluginId from './pluginId';
 import Initializer from './components/Initializer';
-import PluginIcon from './components/PluginIcon';
 import PageTypeFilter from './components/PageTypeFilter';
 import { EditView } from './components/EditView';
-import getRequestUrl from './utils/getRequestUrl';
-import { PAGE_UID } from '../../shared/utils/constants';
+import middlewares from './middlewares';
 
 const name = pluginPkg.strapi.name;
 
-const middleware =
-	() =>
-	({ getState }: any) =>
-	(next: any) =>
-	async (action: any) => {
-		// If data is being fetched or after a save
-		if (
-			action.type === 'ContentManager/CrudReducer/GET_DATA_SUCCEEDED' ||
-			action.type === 'ContentManager/CrudReducer/SUBMIT_SUCCEEDED'
-		) {
-			const store = getState();
-			const layoutSlice = store['content-manager_editViewLayoutManager'];
-			const uid = layoutSlice.currentLayout.contentType.uid;
-
-			if (uid !== PAGE_UID) {
-				return next(action);
-			}
-
-			const { get } = await getFetchClient();
-			const { data: pageData } = await get(`${getRequestUrl('page')}/${action.data.id}`);
-
-			action.data.collectionTypeTitle = pageData?.collectionTypeData?.title;
-			action.data.collectionTypeId = pageData?.collectionTypeData?.id;
-			action.data.initialPageType = pageData?.pageType ? pageData.pageType : undefined;
-
-			return next(action);
-		}
-		return next(action);
-	};
-
-const middlewares = [middleware];
-
 export default {
 	register(app: any) {
 		app.addMiddlewares(middlewares);
-		app.addMenuLink({
-			to: `/plugins/${pluginId}`,
-			icon: PluginIcon,
-			intlLabel: {
-				id: `${pluginId}.plugin.name`,
-				defaultMessage: name
-			},
-			Component: async () => {
-				const component = await import(/* webpackChunkName: "[request]" */ './pages/App');
-
-				return component;
-			},
-			permissions: [
-				// Uncomment to set the permissions of the plugin here
-				// {
-				//   action: '', // the action name should be plugin::plugin-name.actionType
-				//   subject: null,
-				// },
-			]
-		});
 		const plugin = {
 			id: pluginId,
 			initializer: Initializer,
@@ -80,11 +24,11 @@ export default {
 
 	bootstrap(app: any) {
 		app.injectContentManagerComponent('editView', 'right-links', {
-			name: 'collectionType-picker',
+			name: 'collection-type-picker',
 			Component: EditView
 		});
 		app.injectContentManagerComponent('listView', 'actions', {
-			name: 'collectionType-picker',
+			name: 'page-type-filter',
 			Component: PageTypeFilter
 		});
 	},

package/admin/src/middlewares/index.tsx

@@ -0,0 +1,37 @@
+import { getFetchClient } from '@strapi/helper-plugin';
+
+import { PAGE_UID } from '../../../shared/utils/constants';
+import getRequestUrl from '../utils/getRequestUrl';
+
+const middleware =
+	() =>
+	({ getState }: any) =>
+	(next: any) =>
+	async (action: any) => {
+		// If data is being fetched or after a save
+		if (
+			action.type === 'ContentManager/CrudReducer/GET_DATA_SUCCEEDED' ||
+			action.type === 'ContentManager/CrudReducer/SUBMIT_SUCCEEDED'
+		) {
+			const store = getState();
+			const layoutSlice = store['content-manager_editViewLayoutManager'];
+			const uid = layoutSlice.currentLayout.contentType.uid;
+
+			if (uid !== PAGE_UID) {
+				return next(action);
+			}
+
+			const { get } = await getFetchClient();
+			const { data: pageData } = await get(`${getRequestUrl('page')}/${action.data.id}`);
+
+			action.data.collectionTypeTitle = pageData?.collectionTypeData?.title;
+			action.data.collectionTypeId = pageData?.collectionTypeData?.id;
+			action.data.initialPageType = pageData?.pageType ? pageData.pageType : undefined;
+
+			return next(action);
+		}
+		return next(action);
+	};
+
+const middlewares = [middleware];
+export default middlewares;

package/dist/package.json

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

package/dist/server/services/builder.js

@@ -71,23 +71,32 @@ exports.default = {
     },
     getPageContentType(create) {
         const page = create ? page_start_json_1.default : page_end_json_1.default;
-        const contentType = this.addModulesToCollectionType(page);
+        const contentType = this.mergeCollectionTypeWithModules(page, constants_1.PAGE_UID);
         return { uid: constants_1.PAGE_UID, contentType };
     },
     getPageTypeContentType(create) {
         const pageType = create ? page_type_start_json_1.default : page_type_end_json_1.default;
-        const contentType = this.addModulesToCollectionType(pageType);
+        const contentType = this.mergeCollectionTypeWithModules(pageType, constants_1.PAGE_TYPE_UID);
         return { uid: constants_1.PAGE_TYPE_UID, contentType };
     },
     getTemplateContentType() {
-        const contentType = this.addModulesToCollectionType(template_json_1.default);
+        const contentType = this.mergeCollectionTypeWithModules(template_json_1.default, constants_1.TEMPLATE_UID);
         return { uid: constants_1.TEMPLATE_UID, contentType };
     },
-    addModulesToCollectionType(collectionType) {
+    mergeCollectionTypeWithModules(collectionType, uid) {
+        const { pluginOptions: oldPluginOptions, __schema__: { attributes: oldAttributes } } = strapi.contentType(uid) || {};
         const components = this.getConfigModuleComponents();
         return {
             ...collectionType,
-            attributes: { ...collectionType.attributes, modules: { ...collectionType.attributes.modules, components } }
+            pluginOptions: {
+                ...oldPluginOptions,
+                ...collectionType === null || collectionType === void 0 ? void 0 : collectionType.pluginOptions
+            },
+            attributes: {
+                ...oldAttributes,
+                ...collectionType.attributes,
+                modules: { ...collectionType.attributes.modules, components }
+            }
         };
     },
     getConfigModuleComponents() {

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

@@ -4,12 +4,22 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const uniqBy_1 = __importDefault(require("lodash/uniqBy"));
+const constants_1 = require("../../shared/utils/constants");
 exports.default = {
     async hasPageRelation(uid) {
         var _a, _b, _c, _d;
         const contentType = (_a = strapi.contentTypes) === null || _a === void 0 ? void 0 : _a[uid];
+        const pageTypesWithUid = (await strapi.entityService.findMany(constants_1.PAGE_TYPE_UID, {
+            filters: {
+                uid: {
+                    $eq: uid
+                }
+            }
+        })) || [];
         return {
-            hasPageRelation: Boolean(((_b = contentType === null || contentType === void 0 ? void 0 : contentType.attributes) === null || _b === void 0 ? void 0 : _b.page) && ((_d = (_c = contentType === null || contentType === void 0 ? void 0 : contentType.attributes) === null || _c === void 0 ? void 0 : _c.page) === null || _d === void 0 ? void 0 : _d.morphBy) === 'collectionTypeData')
+            hasPageRelation: Boolean(((_b = contentType === null || contentType === void 0 ? void 0 : contentType.attributes) === null || _b === void 0 ? void 0 : _b.page) &&
+                ((_d = (_c = contentType === null || contentType === void 0 ? void 0 : contentType.attributes) === null || _c === void 0 ? void 0 : _c.page) === null || _d === void 0 ? void 0 : _d.morphBy) === 'collectionTypeData' &&
+                pageTypesWithUid.length > 0)
         };
     },
     async getTranslationPageLinks(uid, ids) {