@webbio/strapi-plugin-page-builder 0.5.1-platform → 0.7.0-platform

package/admin/src/utils/hooks/useDefaultPlatformFromLocalStorage.ts

@@ -1,29 +1,59 @@
-import { useLocalStorage } from '@mantine/hooks';
-import { Platform, useGetPlatforms } from '../../api/platform';
 import { useEffect } from 'react';
+import remove from 'lodash/remove';
+
+import { useLocalStorage, useSessionStorage } from '@mantine/hooks';
+
+import { Platform, useGetPlatforms } from '../../api/platform';
 
 const useDefaultPlatformFromLocalStorage = () => {
 	const { data: platforms, isLoading } = useGetPlatforms({});
-	const [selectedPlatform, setSelectedPlatform] = useLocalStorage<Platform | undefined>({
+	// Set multiple platforms in local storage. When a new tab is opened, the first platform from the array will be selected.
+	const [platformsFromState, setPlatformsFromState] = useLocalStorage<Platform[] | undefined>({
+		key: 'selectedPlatforms',
+		defaultValue: undefined,
+		getInitialValueInEffect: false
+	});
+	const selectedPlatformFromState = platformsFromState?.[0];
+
+	// Session storage is used to keep the state of the current tab.
+	const [selectedPlatform, setSelectedPlatform] = useSessionStorage<Platform | undefined>({
 		key: 'selectedPlatform',
 		defaultValue: undefined,
 		getInitialValueInEffect: false
 	});
 
+	// When a new platform is selected, it is added as first element to the array of platforms in local storage.
+	// This makes sure that when a new tab is opened, the most recent platform will be selected.
 	useEffect(() => {
-		console.log('useDefaultPlatformFromLocalStorage', { selectedPlatform, platforms, isLoading });
+		const platformArray: Platform[] = platformsFromState || [];
+		remove(platformArray, (p) => p.id === selectedPlatform?.id);
+
+		if (selectedPlatform) {
+			platformArray.unshift(selectedPlatform);
+		}
+		setPlatformsFromState(platformArray);
+	}, [selectedPlatform]);
+
+	useEffect(() => {
+		// If there are no platforms in local storage, select the first platform from the list.
 		if (
 			!isLoading &&
 			platforms?.[0]?.title &&
-			(!selectedPlatform?.id || !platforms.find((platform) => platform.id === selectedPlatform.id))
+			(!selectedPlatform?.id || !platforms.find((platform) => platform.id === selectedPlatformFromState?.id))
 		) {
 			setSelectedPlatform(platforms[0]);
 		}
 
+		// If there are no platforms in local storage and no platforms are returned from the API, set the selected platform to undefined.
 		if (!isLoading && (platforms || []).length === 0) {
 			setSelectedPlatform(undefined);
 		}
-	}, [isLoading, selectedPlatform, platforms]);
+
+		// If there is no selected platform in the session storage, set it to the selected platform from local storage.
+		if (!isLoading && selectedPlatformFromState?.id && !selectedPlatform) {
+			setSelectedPlatform(selectedPlatformFromState);
+		}
+	}, [isLoading, selectedPlatformFromState, platforms]);
 
 	return { selectedPlatform, setSelectedPlatform, platforms };
 };

package/admin/src/utils/hooks/usePlatformFormData.ts

@@ -6,6 +6,7 @@ import { useGetPlatformRelation } from '../../api/platform-relation';
 const usePlatformFormData = (form?: Record<string, any>, onPlatformChange?: (platform: Platform) => void) => {
 	const { onChange, initialData, layout } = form || {};
 	const { isLoading } = useGetPlatformRelation({ id: initialData?.id, uid: layout.uid });
+
 	const { selectedPlatform: defaultPlatform, setSelectedPlatform: setDefaultPlatform } =
 		useDefaultPlatformFromLocalStorage();
 

package/dist/package.json

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

package/dist/server/controllers/page-type.js

@@ -2,11 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = {
     async findOneByUid(ctx) {
-        var _a;
+        var _a, _b;
         const uid = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.params) === null || _a === void 0 ? void 0 : _a.uid;
+        const platformId = (_b = ctx === null || ctx === void 0 ? void 0 : ctx.params) === null || _b === void 0 ? void 0 : _b.platformId;
         if (!uid) {
             return ctx.badRequest('uid is missing.');
         }
-        return await strapi.service('plugin::page-builder.page-type').findOneByUid(uid);
+        if (!platformId) {
+            return ctx.badRequest('PlatformId is missing.');
+        }
+        return await strapi.service('plugin::page-builder.page-type').findOneByUid(uid, platformId);
     }
 };

package/dist/server/routes/index.js

@@ -7,7 +7,7 @@ const routes = {
         routes: [
             {
                 method: 'GET',
-                path: '/page-types/:uid',
+                path: '/page-types/:uid/:platformId',
                 handler: 'page-type.findOneByUid'
             }
         ]

package/dist/server/schema/page-type-end.json

@@ -25,6 +25,21 @@
                 }
             }
         },
+        "template": {
+            "type": "relation",
+            "relation": "oneToOne",
+            "target": "api::template.template"
+        },
+        "platform": {
+            "type": "relation",
+            "relation": "oneToOne",
+            "target": "api::platform.platform"
+        },
+        "defaultParent": {
+            "type": "relation",
+            "relation": "oneToOne",
+            "target": "api::page.page"
+        },
         "modules": {
             "type": "dynamiczone",
             "components": [],
@@ -33,11 +48,6 @@
                     "localized": true
                 }
             }
-        },
-        "template": {
-            "type": "relation",
-            "relation": "oneToOne",
-            "target": "api::template.template"
         }
     }
 }

package/dist/server/schema/platform-start.json

@@ -16,16 +16,6 @@
         },
         "domain": {
             "type": "string"
-        },
-        "template": {
-            "type": "relation",
-            "relation": "oneToMany",
-            "target": "api::template.template"
-        },
-        "pageTypes": {
-            "type": "relation",
-            "relation": "oneToMany",
-            "target": "api::page-type.page-type"
         }
     }
 }

package/dist/server/schema/template-end.json

@@ -0,0 +1,40 @@
+{
+    "draftAndPublish": false,
+    "displayName": "Templates",
+    "singularName": "template",
+    "pluralName": "templates",
+    "description": "",
+    "plugin": "page-builder",
+    "pluginOptions": {
+        "i18n": {
+            "localized": true
+        }
+    },
+    "kind": "collectionType",
+    "collectionName": "templates",
+    "attributes": {
+        "title": {
+            "type": "string",
+            "required": true,
+            "pluginOptions": {
+                "i18n": {
+                    "localized": true
+                }
+            }
+        },
+        "platform": {
+            "type": "relation",
+            "relation": "oneToOne",
+            "target": "api::platform.platform"
+        },
+        "modules": {
+            "type": "dynamiczone",
+            "components": [],
+            "pluginOptions": {
+                "i18n": {
+                    "localized": true
+                }
+            }
+        }
+    }
+}

package/dist/server/services/builder.js

@@ -12,6 +12,7 @@ const reload_strapi_on_load_1 = require("../utils/reload-strapi-on-load");
 const page_type_start_json_1 = __importDefault(require("../schema/page-type-start.json"));
 const page_type_end_json_1 = __importDefault(require("../schema/page-type-end.json"));
 const template_start_json_1 = __importDefault(require("../schema/template-start.json"));
+const template_end_json_1 = __importDefault(require("../schema/template-end.json"));
 const platform_start_json_1 = __importDefault(require("../schema/platform-start.json"));
 const UIDS = [constants_1.TEMPLATE_UID, constants_1.PAGE_TYPE_UID, constants_1.PLATFORM_UID, constants_1.PAGE_UID];
 exports.default = {
@@ -71,7 +72,7 @@ exports.default = {
                 update: this.getPageTypeContentType()
             },
             [constants_1.TEMPLATE_UID]: {
-                create: this.getTemplateContentType(),
+                create: this.getTemplateContentType(true),
                 update: this.getTemplateContentType()
             },
             [constants_1.PLATFORM_UID]: {
@@ -91,8 +92,8 @@ exports.default = {
         const contentType = this.mergeCollectionTypeWithOld(pageType, constants_1.PAGE_TYPE_UID);
         return { uid: constants_1.PAGE_TYPE_UID, contentType };
     },
-    getTemplateContentType() {
-        const template = template_start_json_1.default;
+    getTemplateContentType(create) {
+        const template = create ? template_start_json_1.default : template_end_json_1.default;
         const contentType = this.mergeCollectionTypeWithOld(template, constants_1.TEMPLATE_UID);
         return { uid: constants_1.TEMPLATE_UID, contentType };
     },

package/dist/server/services/page-type.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const constants_1 = require("../../shared/utils/constants");
 exports.default = {
-    async findOneByUid(uid) {
+    async findOneByUid(uid, platformId) {
         var _a;
         const results = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findMany(constants_1.PAGE_TYPE_UID, {
             populate: {
@@ -10,10 +10,14 @@ exports.default = {
                     populate: {
                         modules: true
                     }
-                }
+                },
+                defaultParent: true
             },
             filters: {
-                uid
+                uid,
+                platform: {
+                    id: platformId
+                }
             }
         }));
         const result = results.length > 0 ? results === null || results === void 0 ? void 0 : results[0] : undefined;