@webbio/strapi-plugin-page-builder 0.14.1-platform → 0.15.0-platform

package/admin/src/api/search-filtered-entity.ts

@@ -1,10 +1,10 @@
 import { useQuery, UseQueryOptions } from 'react-query';
-import orderBy from 'lodash/orderBy';
 import objGet from 'lodash/get';
 
 import { useFetchClient } from '@strapi/helper-plugin';
 import qs from 'qs';
-import { getConditionalFilters } from '../components/PlatformFilteredSelectField/utils/get-condition-filters';
+
+import Fuse from 'fuse.js';
 
 export type SearchFilteredEntitiesResult = {
 	pagination: {
@@ -81,32 +81,44 @@ export const getSearchFilteredEntities = async ({
 		});
 
 		const { data } = await get(`/content-manager/collection-types/${uid}?${filters}`);
-		const mapResults = data.results.map(
-			(result: Record<string, any>): SearchFilteredEntitiesResult['results'][number] => {
-				const getPublicationState = () => {
-					if (result?.publishedAt !== undefined) {
-						return result?.publishedAt ? 'published' : 'draft';
-					}
-
-					return false;
-				};
-
-				const subTitle = subTitlePath ? objGet(result, subTitlePath) : undefined;
-
-				return {
-					id: result.id,
-					title: result?.[mainFieldName],
-					publicationState: getPublicationState(),
-					publishedAt: result?.publishedAt,
-					href: `/content-manager/collectionType/${uid}/${result.id}`,
-					subTitle: typeof subTitle === 'string' || typeof subTitle === 'number' ? String(subTitle) : ''
-				};
+		let results = data.results;
+
+		if (searchQuery) {
+			const fuse = new Fuse(data.results, {
+				keys: searchableFields
+			});
+
+			const fuseSearch = fuse.search(searchQuery);
+
+			if (fuseSearch && fuseSearch.length > 0) {
+				results = fuseSearch.map((r) => r.item);
 			}
-		);
+		}
+
+		const mapResults = results.map((result: Record<string, any>): SearchFilteredEntitiesResult['results'][number] => {
+			const getPublicationState = () => {
+				if (result?.publishedAt !== undefined) {
+					return result?.publishedAt ? 'published' : 'draft';
+				}
+
+				return false;
+			};
+
+			const subTitle = subTitlePath ? objGet(result, subTitlePath) : undefined;
+
+			return {
+				id: result.id,
+				title: result?.[mainFieldName],
+				publicationState: getPublicationState(),
+				publishedAt: result?.publishedAt,
+				href: `/content-manager/collectionType/${uid}/${result.id}`,
+				subTitle: typeof subTitle === 'string' || typeof subTitle === 'number' ? String(subTitle) : ''
+			};
+		});
 
 		return {
 			pagination: data.pagination,
-			results: orderBy(mapResults, ['title'], ['asc'])
+			results: mapResults
 		};
 	} catch (e) {
 		return {

package/dist/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@webbio/strapi-plugin-page-builder",
-    "version": "0.14.1-platform",
+    "version": "0.15.0-platform",
     "description": "This is the description of the plugin.",
     "scripts": {
         "develop": "tsc -p tsconfig.server.json -w",
@@ -31,6 +31,7 @@
         "@strapi/utils": "^4.15.0",
         "add": "^2.0.6",
         "aws-sdk": "^2.1528.0",
+        "fuse.js": "^7.0.0",
         "handlebars": "^4.7.8",
         "react-select": "^5.7.4",
         "sitemap": "^7.1.1"

package/dist/server/bootstrap.js

@@ -28,23 +28,21 @@ exports.default = async ({ strapi }) => {
     (_a = strapi.db) === null || _a === void 0 ? void 0 : _a.lifecycles.subscribe({
         models: [constants_1.USER_PERMISSION_USER_PLUGIN],
         async beforeUpdate(event) {
-            var _a;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
             if (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, {
+                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 (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,
+                        from: (_d = (_c = (_b = originalUserObject.platform) === null || _b === void 0 ? void 0 : _b.platformEmails) === null || _c === void 0 ? void 0 : _c.accountAcceptedMail) === null || _d === void 0 ? void 0 : _d.fromEmail,
                         to: event.params.data.email,
-                        // @ts-ignore
-                        subject: originalUserObject.platform.platformEmails.accountAcceptedMail.subject,
-                        // @ts-ignore
-                        text: originalUserObject.platform.platformEmails.accountAcceptedMail.message,
+                        nameSender: (_g = (_f = (_e = originalUserObject.platform) === null || _e === void 0 ? void 0 : _e.platformEmails) === null || _f === void 0 ? void 0 : _f.accountAcceptedMail) === null || _g === void 0 ? void 0 : _g.nameSender,
+                        subject: (_k = (_j = (_h = originalUserObject.platform) === null || _h === void 0 ? void 0 : _h.platformEmails) === null || _j === void 0 ? void 0 : _j.accountAcceptedMail) === null || _k === void 0 ? void 0 : _k.subject,
+                        text: (_o = (_m = (_l = originalUserObject.platform) === null || _l === void 0 ? void 0 : _l.platformEmails) === null || _m === void 0 ? void 0 : _m.accountAcceptedMail) === null || _o === void 0 ? void 0 : _o.message,
                         firstName: event.params.data.firstName,
                         lastName: event.params.data.lastName
                     });

package/dist/server/services/email.js

@@ -29,12 +29,13 @@ 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;
+        const { from, to, subject, text, variables, nameSender } = options;
         const emailData = (0, txtMail_email_template_text_1.txtEmail)(text, variables);
+        const Source = nameSender ? `${nameSender} <${from}>` : from;
         try {
             const client = new AWS.SES();
             await client.sendEmail({
-                Source: from,
+                Source,
                 Destination: {
                     ToAddresses: [to]
                 },
@@ -52,17 +53,16 @@ exports.default = {
         }
     },
     async sendAdminMail(user) {
-        const foundUser = await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
+        var _a, _b, _c;
+        const foundUser = (await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
             populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
-        });
+        }));
+        console.log('HI', (_c = (_b = (_a = foundUser === null || foundUser === void 0 ? void 0 : foundUser.platform) === null || _a === void 0 ? void 0 : _a.platformEmails) === null || _b === void 0 ? void 0 : _b.adminEmail) === null || _c === void 0 ? void 0 : _c.fromEmail);
         await this.sendMail({
-            // @ts-ignore we all love strapi typings
             from: foundUser.platform.platformEmails.adminEmail.fromEmail,
-            // @ts-ignore
             to: foundUser.platform.platformEmails.adminEmail.toEmail,
-            // @ts-ignore
+            nameSender: user.platform.platformEmails.adminEmail.nameSender,
             subject: foundUser.platform.platformEmails.adminEmail.subject,
-            // @ts-ignore
             text: foundUser.platform.platformEmails.adminEmail.message,
             variables: {
                 firstName: user.firstName,
@@ -71,33 +71,24 @@ exports.default = {
         });
     },
     async sendConfirmationEmail(user) {
-        const foundUser = await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
+        const foundUser = (await strapi.entityService.findOne(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
             populate: { platform: { populate: { platformEmails: { populate: '*' } } } }
-        });
+        }));
         if (foundUser && foundUser.platform) {
             const jwtService = strapi.plugin('users-permissions').service('jwt');
-            const confirmationToken = await jwtService.issue(
-            // @ts-ignore
-            { userId: user.id, platformId: foundUser.platform.id }, { expiresIn: '1d' });
+            const confirmationToken = await jwtService.issue({ userId: user.id, platformId: foundUser.platform.id }, { expiresIn: '1d' });
             await strapi.entityService.update(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
-                // @ts-ignore
                 data: { confirmationToken: confirmationToken }
             });
-            // @ts-ignore
             const confirmEmailUrl = `${strapi.config.server.url}/api/page-builder/activate/${confirmationToken}`;
             await this.sendMail({
-                // @ts-ignore
                 from: foundUser.platform.platformEmails.accountCreatedMail.fromEmail,
-                // @ts-ignore
                 to: foundUser.email,
-                // @ts-ignore
+                nameSender: user.platform.platformEmails.accountCreatedMail.nameSender,
                 subject: foundUser.platform.platformEmails.accountCreatedMail.subject,
-                // @ts-ignore
                 text: foundUser.platform.platformEmails.accountCreatedMail.message,
                 variables: {
-                    // @ts-ignore
                     firstName: foundUser.firstName,
-                    // @ts-ignore
                     lastName: foundUser.lastName,
                     confirmEmailUrl
                 }
@@ -109,18 +100,14 @@ exports.default = {
             const jwtService = strapi.plugin('users-permissions').service('jwt');
             const resetPasswordToken = await jwtService.issue({ userId: user.id, platformId: user.platform.id }, { expiresIn: '1d' });
             await strapi.entityService.update(constants_1.USER_PERMISSION_USER_PLUGIN, user.id, {
-                // @ts-ignore
                 data: { resetPasswordToken }
             });
-            // @ts-ignore
-            const resetPasswordUrl = `${user.platform.domain}/wachtwoord-resetten/${resetPasswordToken}`;
+            const resetPasswordUrl = getResetPasswordUrl(user, resetPasswordToken);
             await this.sendMail({
-                // @ts-ignore
                 from: user.platform.platformEmails.resetPasswordMail.fromEmail,
                 to: user.email,
-                // @ts-ignore
+                nameSender: user.platform.platformEmails.resetPasswordMail.nameSender,
                 subject: user.platform.platformEmails.resetPasswordMail.subject,
-                // @ts-ignore
                 text: user.platform.platformEmails.resetPasswordMail.message,
                 variables: {
                     firstName: user === null || user === void 0 ? void 0 : user.firstName,
@@ -131,3 +118,16 @@ exports.default = {
         }
     }
 };
+const getResetPasswordUrl = (user, resetPasswordToken) => {
+    if (!user || !(user === null || user === void 0 ? void 0 : user.platform)) {
+        return '';
+    }
+    if (user.platform.platformEmails.resetPasswordUrl &&
+        user.platform.platformEmails.resetPasswordUrl.includes('{{resetPasswordToken}}')) {
+        const replacedTokens = user.platform.platformEmails.resetPasswordUrl
+            .replace('{{domain}}', user.platform.domain)
+            .replace('{{resetPasswordToken}}', resetPasswordToken);
+        return replacedTokens;
+    }
+    return `${user.platform.domain}/wachtwoord-resetten/${resetPasswordToken}`;
+};

package/dist/server/services/private-content/graphql/resolvers/forgot-password.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.platformForgotPassword = void 0;
-const utils_1 = require("@strapi/utils");
 const constants_1 = require("../../constants");
 const schemas_1 = require("../../schemas");
-const { UnauthorizedError } = utils_1.errors;
 exports.platformForgotPassword = {
     async resolve(parent, args, context) {
         await (0, schemas_1.validateForgotPasswordSchema)(args.input);