@webbio/strapi-plugin-page-builder 0.12.7-platform → 0.13.0-platform

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

@@ -0,0 +1,52 @@
+import { parse, stringify } from 'qs';
+import { useMemo, useCallback } from 'react';
+import { useLocation, useHistory } from 'react-router-dom';
+
+interface IUseQueryParamsObj {
+	query: Record<string, any>;
+	rawQuery: string;
+}
+
+type ISetQuery = (nextParams: Record<string, any>, method?: string, routerMethod?: string) => void;
+
+// We created this as a copy of the useQueryParams hook from the Strapi plugin
+// This one however supports the replace and push methods from the useHistory hook
+const useQueryParams = (initialParams?: Record<string, any>): [IUseQueryParamsObj, ISetQuery] => {
+	const { search } = useLocation();
+	const { replace, push } = useHistory();
+
+	const query = useMemo(() => {
+		const searchQuery = search.substring(1);
+		if (!search) {
+			return initialParams || {};
+		}
+		return parse(searchQuery);
+	}, [search, initialParams]);
+
+	const setQuery = useCallback(
+		(nextParams: Record<string, any>, method = 'push', routerMethod = 'push') => {
+			let nextQuery = { ...query };
+			if (method === 'remove') {
+				Object.keys(nextParams).forEach((key) => {
+					if (Object.prototype.hasOwnProperty.call(nextQuery, key)) {
+						delete nextQuery[key];
+					}
+				});
+			} else {
+				nextQuery = { ...query, ...nextParams };
+			}
+			const props = { search: stringify(nextQuery, { encode: false }) };
+
+			if (routerMethod === 'replace') {
+				replace(props);
+			} else {
+				push(props);
+			}
+		},
+		[push, replace, query]
+	);
+
+	return [{ query, rawQuery: search }, setQuery];
+};
+
+export { useQueryParams };

package/dist/package.json

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

package/dist/server/bootstrap/permissions.js

@@ -20,7 +20,7 @@ exports.default = async ({ strapi }) => {
                 displayName,
                 category: 'Platform',
                 handler: async (x) => {
-                    var _a, _b, _c, _d;
+                    var _a, _b, _c;
                     if (((_a = x === null || x === void 0 ? void 0 : x.permission) === null || _a === void 0 ? void 0 : _a.subject) === 'api::platform.platform') {
                         return {
                             id: {
@@ -34,25 +34,28 @@ exports.default = async ({ strapi }) => {
                                 limit: -1,
                                 populate: '*'
                             })));
-                            // checks which role the user has
-                            const foundRole = roles.filter((role) => {
-                                return x.roles.find((userRole) => userRole.name === role.name);
-                            });
+                            // checks which roles the user has
+                            const foundRoles = roles.filter((role) => x.roles.find((userRole) => userRole.name === role.name));
+                            // Get all permissions from the roles the user has
+                            const allPermissions = [foundRoles === null || foundRoles === void 0 ? void 0 : foundRoles[0]]
+                                .map((role) => role === null || role === void 0 ? void 0 : role.permissions)
+                                .flat()
+                                .filter(Boolean);
                             // get the right platform permissions, and filters out the platform
                             // this is neccesary because of multiple platforms. if you can see Vacancy from platform 1 and collegue from platform 2
                             // it will show both at page level, so this filters out the wrong page
-                            const platformPermission = (_d = foundRole === null || foundRole === void 0 ? void 0 : foundRole[0]) === null || _d === void 0 ? void 0 : _d.permissions.map((permission) => {
-                                return {
-                                    permission: permission.subject,
-                                    condition: permission.conditions.filter((condition) => condition.includes(platform.title))
-                                };
-                            });
-                            // get the right permission for platform
-                            const permissions = platformPermission.map((permission) => {
-                                if (permission.condition.length > 0) {
-                                    return permission.permission;
+                            const platformPermission = allPermissions.map((permission) => ({
+                                subject: permission.subject,
+                                conditions: permission === null || permission === void 0 ? void 0 : permission.conditions.filter((condition) => condition.includes(platform.title))
+                            }));
+                            // Get the right permission for platform
+                            const permissions = platformPermission
+                                .map((permission) => {
+                                if (permission.conditions.length > 0) {
+                                    return permission.subject;
                                 }
-                            });
+                            })
+                                .filter(Boolean);
                             const uniquePermissions = (0, uniq_1.default)(permissions);
                             return {
                                 $and: [

package/dist/server/bootstrap.js

@@ -30,23 +30,25 @@ exports.default = async ({ strapi }) => {
         async beforeUpdate(event) {
             var _a;
             if (event.params.data.id) {
-                const userToUpdate = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, event.params.data.id, {
+                const originalUserObject = await ((_a = strapi.entityService) === null || _a === void 0 ? void 0 : _a.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, event.params.data.id, {
                     populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
                 }));
-                if (userToUpdate) {
-                    if (event.params.data.activateUser && event.params.data.confirmed && !userToUpdate.confirmMailSend) {
-                        await strapi.service(constants_1.PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
-                            // @ts-ignore strapi typings
-                            from: userToUpdate.platform.platformEmails.accountAcceptedMail.fromEmail,
-                            to: event.params.data.email,
-                            // @ts-ignore
-                            subject: userToUpdate.platform.platformEmails.accountAcceptedMail.subject,
-                            // @ts-ignore
-                            text: userToUpdate.platform.platformEmails.accountAcceptedMail.message,
-                            firstName: event.params.data.firstName,
-                            lastName: event.params.data.lastName
-                        });
-                    }
+                if (originalUserObject &&
+                    event.params.data.activateUser &&
+                    event.params.data.confirmed &&
+                    !originalUserObject.confirmMailSend) {
+                    await strapi.service(constants_1.PAGE_BUILDER_EMAIL_PLUGIN).sendMail({
+                        // @ts-ignore strapi typings
+                        from: originalUserObject.platform.platformEmails.accountAcceptedMail.fromEmail,
+                        to: event.params.data.email,
+                        // @ts-ignore
+                        subject: originalUserObject.platform.platformEmails.accountAcceptedMail.subject,
+                        // @ts-ignore
+                        text: originalUserObject.platform.platformEmails.accountAcceptedMail.message,
+                        firstName: event.params.data.firstName,
+                        lastName: event.params.data.lastName
+                    });
+                    event.params.data.confirmMailSend = true;
                 }
             }
         }

package/dist/server/content-types/user-categories/schema.json

@@ -0,0 +1,18 @@
+{
+    "kind": "collectionType",
+    "collectionName": "user-categories",
+    "info": {
+        "singularName": "user-category",
+        "pluralName": "user-categories",
+        "displayName": "User Categories"
+    },
+    "options": {
+        "draftAndPublish": false,
+        "comment": ""
+    },
+    "attributes": {
+        "title": {
+            "type": "string"
+        }
+    }
+}

package/dist/server/controllers/private-content.js

@@ -8,7 +8,7 @@ exports.default = {
             return ctx.redirect(callbackUrl);
         }
         catch (error) {
-            console.log(ctx);
+            console.log('Activate User Error', error, ctx);
             return ctx.unauthorized('User is already confirmed or token is invalid');
         }
     },

package/dist/server/services/email.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const AWS = __importStar(require("@aws-sdk/client-ses"));
 const txtMail_email_template_text_1 = require("./private-content/mail-template/txtMail.email.template.text");
 const constants_1 = require("../../shared/utils/constants");
+const utils_1 = require("@strapi/utils");
 exports.default = {
     async sendMail(options) {
         const { from, to, subject, text, variables } = options;
@@ -47,6 +48,7 @@ exports.default = {
         }
         catch (error) {
             console.error(error);
+            throw new utils_1.errors.ApplicationError('Failed to send email', error);
         }
     },
     async sendAdminMail(user) {