Fix error message.

robgietema · robgietema · commit 284b736fc604 · 2025-05-08T14:21:04.000+02:00
diff --git a/frontend/packages/volto-form-block/locales/de/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/de/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr "Ja"
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr "Ihr Formular konnte nicht versendet werden. Bitte laden Sie die Seite neu und versuchen Sie es erneut. Ihre eingegebenen Daten bleiben erhalten."
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr "Das Formular konnte nicht gesendet werden. Bitte versuchen Sie es später nochmal."
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/en/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/en/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/es/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/es/LC_MESSAGES/volto.po
@@ -191,6 +191,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/eu/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/eu/LC_MESSAGES/volto.po
@@ -187,6 +187,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/fr/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/fr/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/it/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/it/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/ja/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/ja/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/nl/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/nl/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/pt/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/pt/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/pt_BR/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/pt_BR/LC_MESSAGES/volto.po
@@ -191,6 +191,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/ro/LC_MESSAGES/volto.po b/frontend/packages/volto-form-block/locales/ro/LC_MESSAGES/volto.po
@@ -185,6 +185,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/locales/volto.pot b/frontend/packages/volto-form-block/locales/volto.pot
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Plone\n"
-"POT-Creation-Date: 2025-05-08T09:34:22.308Z\n"
+"POT-Creation-Date: 2025-05-08T11:56:44.396Z\n"
 "Last-Translator: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Language-Team: Plone i18n <plone-i18n@lists.sourceforge.net>\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -187,6 +187,11 @@ msgstr ""
 msgid "Your form could not be sent. Please reload the page and try again. The data you entered will be retained."
 msgstr ""
 
+#. Default: "Your form could not be sent. Please try again later."
+#: components/ViewSchemaForm
+msgid "Your form could not be sent. Please try again later."
+msgstr ""
+
 #. Default: "Your form could not be sent. Please try again."
 #: components/ViewSchemaForm
 msgid "Your form could not be sent. Please try again."
diff --git a/frontend/packages/volto-form-block/src/components/ViewSchemaForm.jsx b/frontend/packages/volto-form-block/src/components/ViewSchemaForm.jsx
@@ -1,6 +1,6 @@
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { defineMessages, useIntl, FormattedMessage } from 'react-intl';
+import { defineMessages, useIntl } from 'react-intl';
 import { Form } from '@plone/volto/components/manage/Form';
 import { submitForm } from 'volto-form-block/actions';
 import { tryParseJSON, extractInvariantErrors } from '@plone/volto/helpers';
@@ -43,6 +43,10 @@ const messages = defineMessages({
     defaultMessage:
       'Your form could not be sent. Please reload the page and try again. The data you entered will be retained.',
   },
+  errorCaptcha: {
+    id: 'Your form could not be sent. Please try again later.',
+    defaultMessage: 'Your form could not be sent. Please try again later.',
+  },
   cancel: {
     id: 'Cancel',
     defaultMessage: 'Cancel',
@@ -90,6 +94,18 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
   const captchaError =
     localStorage.getItem('formBlockError') === 'error' ? true : false;
 
+  useEffect(() => {
+    if (captchaError) {
+      toast.error(
+        <Toast
+          error
+          title={intl.formatMessage(messages.errorCaptcha)}
+          content=""
+        />,
+      );
+    }
+  }, [captchaError]);
+
   propertyNames.map((property) => {
     if (queryParams[property] !== undefined) {
       initialData[property] = queryParams[property];
@@ -361,7 +377,7 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
           buttonComponent={
             config.blocks.blocksConfig.schemaForm.buttonComponent
           }
-          onSubmit={!submitPressed && onSubmit}
+          onSubmit={submitPressed ? () => {} : onSubmit}
           resetOnCancel={true}
           onChangeFormData={onChangeFormData}
           onCancel={data.show_cancel ? onCancel : null}
@@ -370,14 +386,6 @@ const FormBlockView = ({ data, id, path, moment: momentlib }) => {
           textButtons={true}
         />
       )}
-      {captchaError && (
-        <Message error size="small`">
-          <FormattedMessage
-            id="Your form could not be sent. Please try again."
-            defaultMessage="Your form could not be sent. Please try again."
-          />
-        </Message>
-      )}
     </div>
   );
 };
diff --git a/frontend/packages/volto-form-block/src/components/Wrappers/CheckboxGroupWrapper.jsx b/frontend/packages/volto-form-block/src/components/Wrappers/CheckboxGroupWrapper.jsx
@@ -127,7 +127,10 @@ CheckboxGroupWrapper.propTypes = {
   description: PropTypes.string,
   required: PropTypes.bool,
   error: PropTypes.arrayOf(PropTypes.string),
-  value: PropTypes.string,
+  value: PropTypes.oneOfType([
+    PropTypes.string,
+    PropTypes.arrayOf(PropTypes.string),
+  ]),
   focus: PropTypes.bool,
   onChange: PropTypes.func,
   onClick: PropTypes.func,
diff --git a/frontend/packages/volto-form-block/src/components/Wrappers/TextWrapper.jsx b/frontend/packages/volto-form-block/src/components/Wrappers/TextWrapper.jsx
@@ -67,6 +67,6 @@ TextWrapper.propTypes = {
   onClick: PropTypes.func,
   onEdit: PropTypes.func,
   onDelete: PropTypes.func,
-  minLength: PropTypes.string,
-  maxLength: PropTypes.string,
+  minLength: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  maxLength: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
 };
