@webbio/strapi-plugin-page-builder 0.0.21 → 0.0.23

package/README.md

@@ -1,7 +1,3 @@
 # Strapi plugin page-builder
 
 A quick description of page-builder.
-
-# Notes
-
-In the `builder.ts` service, we refer to the template uid twice. This is necessary because the template json is editted by the page UID that comes second. If a change in modules has been made, this change will be removed again from the template once the page is updated. This is because the page has a reference to the template and will edit the template.json.

package/dist/package.json

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

package/dist/server/queries/index.js

@@ -0,0 +1,9 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const page_1 = __importDefault(require("./page"));
+exports.default = {
+    page: page_1.default
+};

package/dist/server/queries/page.js

@@ -0,0 +1,85 @@
+"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 getPageBySlug = (strapi) => {
+    const typeDefs = () => {
+        return `
+				extend type Page {
+					collectionTypeId: String
+					collectionType: GenericMorph
+				}
+
+        type Query {
+          getPageBySlug(path: String, _locale: String, _publicationState: PublicationState): PageEntity
+        }
+
+      `;
+    };
+    const resolvers = (strapi) => {
+        const { transformArgs } = strapi.plugin('graphql').service('builders').utils;
+        return {
+            Query: {
+                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;
+                            const id = constants_1.PAGE_UID;
+                            const transformedArgs = transformArgs(filteredArgs, {
+                                contentType: strapi.contentTypes[id],
+                                usePagination: false
+                            });
+                            const results = await strapi.entityService.findMany(id, {
+                                filters: transformedArgs,
+                                locale: args._locale,
+                                publicationState: args._publicationState,
+                                populate: '*'
+                            });
+                            const entityResponse = toEntityResponse(results[0], {
+                                args: transformedArgs,
+                                resourceUID: id
+                            });
+                            if (!(entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value)) {
+                                return undefined;
+                            }
+                            const collectionTypeDataFilter = (_b = (_a = entityResponse === null || entityResponse === void 0 ? void 0 : entityResponse.value) === null || _a === void 0 ? void 0 : _a.collectionTypeData) === null || _b === void 0 ? void 0 : _b.filter(Boolean);
+                            const collectionType = collectionTypeDataFilter.length === 1 ? collectionTypeDataFilter === null || collectionTypeDataFilter === void 0 ? void 0 : collectionTypeDataFilter[0] : null;
+                            const addedAttributes = {
+                                collectionType,
+                                collectionTypeId: (collectionType === null || collectionType === void 0 ? void 0 : collectionType.id) || null
+                            };
+                            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);
+                        }
+                    }
+                }
+            }
+        };
+    };
+    const resolversConfig = {
+        'Query.getPageBySlug': {
+            auth: false
+        }
+    };
+    return {
+        typeDefs: typeDefs(),
+        resolvers: resolvers(strapi),
+        resolversConfig
+    };
+};
+exports.default = getPageBySlug;

package/dist/server/register.js

@@ -1,6 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+const page_1 = __importDefault(require("./queries/page"));
 exports.default = async ({ strapi }) => {
     var _a, _b;
+    const extensionService = strapi.plugin('graphql').service('extension');
+    extensionService.use((0, page_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/schema/page-end.json

@@ -82,12 +82,6 @@
             },
             "component": "shared.seo"
         },
-        "template": {
-            "relation": "manyToOne",
-            "target": "api::template.template",
-            "targetAttribute": "pages",
-            "type": "relation"
-        },
         "pageType": {
             "type": "relation",
             "relation": "oneToOne",

package/dist/server/services/builder.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const partition_1 = __importDefault(require("lodash/partition"));
-const isEqual_1 = __importDefault(require("lodash/isEqual"));
 const page_start_json_1 = __importDefault(require("../schema/page-start.json"));
 const page_end_json_1 = __importDefault(require("../schema/page-end.json"));
 const pluginId_1 = __importDefault(require("../../admin/src/pluginId"));
@@ -13,8 +12,6 @@ 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"));
-// We use template twice, see Readme for more info
 const UIDS = [constants_1.TEMPLATE_UID, constants_1.PAGE_TYPE_UID, constants_1.PAGE_UID];
 exports.default = {
     async buildContentTypes() {
@@ -54,11 +51,8 @@ exports.default = {
             await ctb.createContentTypes(newTypes.map((c) => ({ contentType: c.contentType, components: [] })));
         }
         if ((updateTypes || []).length > 0) {
-            for (const updateType of updateTypes) {
+            for await (const updateType of updateTypes) {
                 await ctb.editContentType(updateType.uid, { contentType: updateType.contentType, components: [] });
-                if (updateType.uid === constants_1.PAGE_UID) {
-                    strapi.reload();
-                }
             }
         }
     },
@@ -73,7 +67,7 @@ exports.default = {
                 update: this.getPageTypeContentType()
             },
             [constants_1.TEMPLATE_UID]: {
-                create: this.getTemplateContentType(true),
+                create: this.getTemplateContentType(),
                 update: this.getTemplateContentType()
             }
         };
@@ -82,9 +76,6 @@ exports.default = {
     getPageContentType(create) {
         const page = create ? page_start_json_1.default : page_end_json_1.default;
         const contentType = this.mergeCollectionTypeWithModules(page, constants_1.PAGE_UID);
-        if (this.collectionTypesAreEqual(contentType, constants_1.TEMPLATE_UID)) {
-            return undefined;
-        }
         return { uid: constants_1.PAGE_UID, contentType };
     },
     getPageTypeContentType(create) {
@@ -92,8 +83,8 @@ exports.default = {
         const contentType = this.mergeCollectionTypeWithModules(pageType, constants_1.PAGE_TYPE_UID);
         return { uid: constants_1.PAGE_TYPE_UID, contentType };
     },
-    getTemplateContentType(create) {
-        const pageType = create ? template_start_json_1.default : template_end_json_1.default;
+    getTemplateContentType() {
+        const pageType = template_start_json_1.default;
         const contentType = this.mergeCollectionTypeWithModules(pageType, constants_1.TEMPLATE_UID);
         return { uid: constants_1.TEMPLATE_UID, contentType };
     },
@@ -113,11 +104,6 @@ exports.default = {
             }
         };
     },
-    collectionTypesAreEqual(collectionType, uid) {
-        const { pluginOptions: oldPluginOptions, __schema__: oldSchema } = strapi.contentType(uid) || {};
-        return ((0, isEqual_1.default)(oldSchema.attributes, collectionType === null || collectionType === void 0 ? void 0 : collectionType.attributes) &&
-            (0, isEqual_1.default)(oldPluginOptions, collectionType === null || collectionType === void 0 ? void 0 : collectionType.pluginOptions));
-    },
     getConfigModuleComponents() {
         var _a;
         return (((_a = strapi.config.get(`plugin.${pluginId_1.default}`)) === null || _a === void 0 ? void 0 : _a.modules) || []).filter(Boolean);

package/dist/server/utils/filter-underscore-arguments.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterUnderscoreArguments = void 0;
+const filterUnderscoreArguments = (args) => {
+    const newArgs = {};
+    const objectArray = Object.keys(args);
+    objectArray.forEach((key) => {
+        if (!key.startsWith('_')) {
+            newArgs[key] = args[key];
+        }
+    });
+    return newArgs;
+};
+exports.filterUnderscoreArguments = filterUnderscoreArguments;