fix(locale): added 'locale' information in payload.findByID

README.md

@@ -1,299 +1,7 @@
 # Payload Form Builder Plugin
 
-[![NPM](https://img.shields.io/npm/v/@payloadcms/plugin-form-builder)](https://www.npmjs.com/package/@payloadcms/plugin-form-builder)
+[![NPM](https://img.shields.io/npm/v/@finkinfridom/payload-plugin-form-builder)](https://www.npmjs.com/package/@finkinfridom/payload-plugin-form-builder)
 
-A plugin for [Payload CMS](https://github.com/payloadcms/payload) to easily allow your admin editors to build and manage forms from the admin panel.
+This is a **fork** from the official package [here](https://github.com/payloadcms/plugin-form-builder).
 
-Core features:
-
-- Creates a `forms` collection where you can:
-  - Build dynamic forms with any number of fields
-  - Add payment fields that can handle dynamic prices
-  - Build completely custom and dynamic emails
-- Creates a `formSubmissions` collection that:
-  - Validates and saves the form data submitted by your frontend
-  - Sends emails (if applicable)
-  - Handles payment processing (if applicable)
-
-## Installation
-
-```bash
-  yarn add @payloadcms/plugin-form-builder
-  # OR
-  npm i @payloadcms/plugin-form-builder
-```
-
-## Basic Usage
-
-In the `plugins` array of your [Payload config](https://payloadcms.com/docs/configuration/overview), call the plugin with [options](#options):
-
-```js
-import { buildConfig } from "payload/config";
-import formBuilder from "@payloadcms/plugin-form-builder";
-
-const config = buildConfig({
-  collections: [
-    {
-      slug: "pages",
-      fields: [],
-    },
-  ],
-  plugins: [formBuilder()],
-});
-
-export default config;
-```
-
-### Options
-
-- `fields`
-
-  An object of field types to allow your admin editors to build forms with. To override default settings pass either a boolean value or a partial [Payload Block](https://payloadcms.com/docs/fields/blocks#block-configs) keyed to the block slug. See [Fields](#fields) for more details.
-
-  ```js
-  fields: {
-    text: true,
-    textarea: true,
-    select: true,
-    email: true,
-    state: true,
-    country: true,
-    checkbox: true,
-    number: true,
-    message: true,
-    payment: false
-  }
-  ```
-
-  You can also provide your own custom field definitions by passing a new [Payload Block](https://payloadcms.com/docs/fields/blocks#block-configs) object into `fields`.
-
-- `redirectRelationships`
-
-  An array of collection slugs that, when enabled, are populated as options in form redirect fields.
-
-  ```js
-  redirectRelationships: ["pages"];
-  ```
-
-- `handlePayment`
-
-  A [beforeChange](<[beforeChange](https://payloadcms.com/docs/hooks/globals#beforechange)>) hook that is called upon form submissions. You can integrate into any third-party payment processing API here. There is a `getPaymentTotal` function that will calculate the total cost after all conditions have been applied.
-
-  ```js
-  import { getPaymentTotal } from '@payloadcms/plugin-form-builder';
-  ...
-  handlePayment: async ({ form, submissionData }) => {
-    // first calculate the price
-    const paymentField =  form.fields?.find((field) => field.blockType === 'payment');
-    const price = getPaymentTotal({
-      basePrice: paymentField.basePrice,
-      priceConditions: paymentField.priceConditions,
-      fieldValues: submissionData,
-    });
-    // then asynchronously process the payment here
-  }
-  ```
-
-- `beforeEmail`
-
-  A [beforeChange](<[beforeChange](https://payloadcms.com/docs/hooks/globals#beforechange)>) hook that is called just after emails are prepared, but before they are sent. This is a great place to inject your own HTML template to add custom styles.
-
-  ```js
-  beforeEmail: (emailsToSend) => {
-    // modify the emails in any way before they are sent
-    return emails.map((email) => ({
-      ...email,
-      html: email.html, // transform the html in any way you'd like (maybe wrap it in an html template?)
-    }));
-  };
-  ```
-
-- `formOverrides`
-
-  Override anything on the form collection by sending a [Payload Collection Config](https://payloadcms.com/docs/configuration/collections). Your overrides will be merged into the default `forms` collection.
-
-  ```ts
-  formOverrides: {
-    slug: "contact-forms",
-    fields: [
-      {
-        name: "custom-field",
-        type: "text"
-      }
-    ]
-  }
-  ```
-
-- `formSubmissionOverrides`
-
-  By default, this plugin relies on [Payload access control](https://payloadcms.com/docs/access-control/collections) to restrict the `update` and `read` operations. This is because anyone should be able to create a form submission, even from a public-facing website - but no one should be able to update a submission one it has been created, or read a submission unless they have permission.
-
-  You can override access control and anything else on the form submission collection by sending a [Payload Collection Config](https://payloadcms.com/docs/configuration/collections). Your overrides will be merged into the default `formSubmissions` collection.
-
-  ```js
-  formSubmissionOverrides: {
-    slug: "leads";
-  }
-  ```
-
-## Fields
-
-Each field represents a form input. To override default settings pass either a boolean value or a partial [Payload Block](https://payloadcms.com/docs/fields/blocks) keyed to the block's slug.
-
-- Text
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `required`: checkbox
-- Textarea
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `required`: checkbox
-- Select
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `options`: array
-  - `required`: checkbox
-- Email
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `required`: checkbox
-- State
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `required`: checkbox
-- Country
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: string
-  - `width`: string
-  - `required`: checkbox
-- Checkbox
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: checkbox
-  - `width`: string
-  - `required`: checkbox
-- Number
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: number
-  - `width`: string
-  - `required`: checkbox
-- Message
-  - `message`: richText
-- Payment
-  - `name`: string
-  - `label`: string
-  - `defaultValue`: number
-  - `width`: string
-  - `required`: checkbox
-  - `priceConditions`: array
-    - `fieldToUse`: relationship, dynamically populated based on the fields in your form
-    - `condition`: string - `equals`, `notEquals` | `hasValue`
-    - `valueForOperator`: string - only if `condition` is `equals` or `notEquals`
-    - `operator`: string - `add`, `subtract`, `multiply`, `divide`
-    - `valueType`: string - `static`, `valueOfField`
-    - `value`: string - only if `valueType` is `static`
-
-## Email
-
-This plugin relies on the [email configuration](https://payloadcms.com/docs/email/overview) defined in your `payload.init()`. It will read from your config and attempt to send your emails using the credentials provided.
-
-## TypeScript
-
-All types can be directly imported:
-
-```js
-import {
-  PluginConfig,
-  Form,
-  FormSubmission,
-  FieldsConfig,
-  BeforePayment,
-  BeforeEmail,
-  HandlePayment,
-  ...
-} from "@payloadcms/plugin-form-builder/types";
-```
-
-## Development
-
-To actively develop or debug this plugin you can either work directly within the demo directory of this repo, or link your own project.
-
-1. #### Internal Demo
-
-   This repo includes a fully working, self-seeding instance of Payload that installs the plugin directly from the source code. This is the easiest way to get started. To spin up this demo, follow these steps:
-
-   1. First clone the repo
-   1. Then, `cd YOUR_PLUGIN_REPO && yarn && cd demo && cp env.example .env && yarn && yarn dev`
-   1. Now open `http://localhost:3000/admin` in your browser
-   1. Enter username `dev@payloadcms.com` and password `test`
-
-   That's it! Changes made in `./src` will be reflected in your demo. Keep in mind that the demo database is automatically seeded on every startup, any changes you make to the data get destroyed each time you reboot the app.
-
-1. #### Linked Project
-
-   You can alternatively link your own project to the source code:
-
-   1. First clone the repo
-   1. Then, `cd YOUR_PLUGIN_REPO && yarn && yarn build && yarn link`
-   1. Now `cd` back into your own project and run, `yarn link @payloadcms/plugin-form-builder`
-   1. If this plugin using React in any way, continue to the next step. Otherwise skip to step 7.
-   1. From your own project, `cd node_modules/react && yarn link && cd ../react-dom && yarn link && cd ../../`
-   1. Then, `cd YOUR_PLUGIN_REPO && yarn link react react-dom`
-
-   All set! You can now boot up your own project as normal, and your local copy of the plugin source code will be used. Keep in mind that changes to the source code require a rebuild, `yarn build`.
-
-   You might also need to alias these modules in your Webpack config. To do this, open your project's Payload config and add the following:
-
-   ```ts
-   import { buildConfig } from "payload/config";
-
-   export default buildConfig({
-     admin: {
-       webpack: (config) => ({
-         ...config,
-         resolve: {
-           ...config.resolve,
-           alias: {
-             ...config.resolve.alias,
-             react: path.join(__dirname, "../node_modules/react"),
-             "react-dom": path.join(__dirname, "../node_modules/react-dom"),
-             payload: path.join(__dirname, "../node_modules/payload"),
-             "@payloadcms/plugin-form-builder": path.join(
-               __dirname,
-               "../../payload/plugin-form-builder/src"
-             ),
-           },
-         },
-       }),
-     },
-   });
-   ```
-
-## Troubleshooting
-
-Below are some common troubleshooting tips. To help other developers, please contribute to this section as you troubleshoot your own application.
-
-### SendGrid 403 Forbidden Error
-
-- If you are using [SendGrid Link Branding](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-link-branding) to remove the "via sendgrid.net" part of your email, you must also setup [Domain Authentication](https://docs.sendgrid.com/ui/account-and-settings/how-to-set-up-domain-authentication). This means you can only send emails from an address on this domain — so the `from` addresses in your form submission emails **_cannot_** be anything other than `something@your_domain.com`. This means that from `{{email}}` will not work, but `website@your_domain.com` will. You can still send the form's email address in the body of the email.
-
-## Screenshots
-
-![screenshot 1](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-1.jpg?raw=true)
-![screenshot 2](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-2.jpg?raw=true)
-![screenshot 3](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-3.jpg?raw=true)
-![screenshot 4](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-4.jpg?raw=true)
-![screenshot 5](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-5.jpg?raw=true)
-![screenshot 6](https://github.com/payloadcms/plugin-form-builder/blob/main/images/screenshot-6.jpg?raw=true)
+This fork is needed as the official package is missing (at the moment) the capabilities to properly work with localizations when sending emails.

demo/src/payload.config.ts

@@ -22,6 +22,10 @@ const colorField: Block = {
 
 export default buildConfig({
   serverURL: 'http://localhost:3000',
+  localization: {
+    locales: ['en', 'it'],
+    defaultLocale: 'en',
+  },
   admin: {
     user: Users.slug,
     webpack: (config) => {

package.json

@@ -1,15 +1,20 @@
 {
-  "name": "@payloadcms/plugin-form-builder",
-  "version": "1.0.13",
+  "name": "@finkinfridom/payload-plugin-form-builder",
+  "version": "1.0.15",
   "homepage:": "https://payloadcms.com",
-  "repository": "git@github.com:payloadcms/plugin-form-builder.git",
+  "repository": "git@github.com:payloadcms/finkinfridom/plugin-form-builder.git",
   "description": "Form builder plugin for Payload CMS",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
+  "private": false,
   "scripts": {
     "build": "tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
   "keywords": [
     "payload",
     "cms",
@@ -21,7 +26,7 @@
     "form builder",
     "payments"
   ],
-  "author": "dev@payloadcms.com",
+  "author": "a.maghini@gmail.com",
   "license": "MIT",
   "peerDependencies": {
     "payload": "^0.18.5 || ^1.0.0",

src/collections/FormSubmissions/hooks/sendEmail.ts

@@ -14,7 +14,8 @@ const sendEmail = async (beforeChangeData: any, formConfig: PluginConfig) => {
         id: formSubmissionID
       },
       req: {
-        payload
+        payload,
+        locale
       }
     } = beforeChangeData;
 
@@ -32,6 +33,7 @@ const sendEmail = async (beforeChangeData: any, formConfig: PluginConfig) => {
       const form = await payload.findByID({
         id: formID,
         collection: formOverrides?.slug || 'forms',
+        locale
       });
 
       if (form) {
@@ -82,9 +84,19 @@ const sendEmail = async (beforeChangeData: any, formConfig: PluginConfig) => {
               try {
                 const emailPromise = await payload.sendEmail(email);
                 return emailPromise;
-              } catch (err) {
+              } catch (err: any) {
                 console.error(`Error while sending email to address: ${to}. Email not sent.`);
-                console.error(err);
+                if (
+                  err.response &&
+                  err.response.body &&
+                  err.response.body.errors
+                ) {
+                  err.response.body.errors.forEach((error: any) =>
+                    console.log("%s: %s", error.field, error.message)
+                  );
+                } else {
+                  console.log(err);
+                }
               }
             })
           );