From f12b877faa2251c2264bbbfb8bda41f93536c3e2 Mon Sep 17 00:00:00 2001
From: vincenzoarcidiacono <vinci1it2000@gmail.com>
Date: Thu, 12 Sep 2024 15:36:22 +0200
Subject: [PATCH] fix(form): Correct error message for cascader.

---
 .../react/src/core/fields/BaseField/index.js  |  2 +-
 .../themes/antd/fields/CascaderField/core.js  | 22 ++++++++++++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/schedula/utils/form/react/src/core/fields/BaseField/index.js b/schedula/utils/form/react/src/core/fields/BaseField/index.js
index 41b3167d6..1edc8e3d3 100644
--- a/schedula/utils/form/react/src/core/fields/BaseField/index.js
+++ b/schedula/utils/form/react/src/core/fields/BaseField/index.js
@@ -160,7 +160,7 @@ function BaseFieldRender(props) {
      */
     const errorsComponent =
         hideError ||
-        ((schema.anyOf || schema.oneOf) && !schemaUtils.isSelect(schema)) ? (
+        ((schema.anyOf || schema.oneOf) && (!(schemaUtils.isSelect(schema) || schema.cascader))) ? (
             undefined
         ) : (
             <FieldErrorTemplate
diff --git a/schedula/utils/form/react/src/themes/antd/fields/CascaderField/core.js b/schedula/utils/form/react/src/themes/antd/fields/CascaderField/core.js
index 2787ebaa5..3f94c44aa 100644
--- a/schedula/utils/form/react/src/themes/antd/fields/CascaderField/core.js
+++ b/schedula/utils/form/react/src/themes/antd/fields/CascaderField/core.js
@@ -32,7 +32,16 @@ function buildOptions(schema, names) {
 }
 
 export default function CascaderField(
-    {schema, uiSchema, formData = {}, onChange, registry, ...props}
+    {
+        schema,
+        uiSchema,
+        formData = {},
+        onChange,
+        registry,
+        rawErrors,
+        errorSchema,
+        ...props
+    }
 ) {
     const {getLocale} = useLocaleStore()
     const locale = getLocale('global')
@@ -73,14 +82,17 @@ export default function CascaderField(
     );
     const {fields: {BaseField}} = registry
     return <BaseField
-        schema={schema} uiSchema={{
-        displayLabel: true,
-        "ui:classNames": ['unset-height'], ...uiSchema
-    }}
+        schema={schema}
+        errorSchema={{__errors: rawErrors, ...errorSchema}}
+        uiSchema={{
+            displayLabel: true,
+            "ui:classNames": ['unset-height'], ...uiSchema
+        }}
         formData={formData}
         registry={registry}
         {...props}>
         <Cascader
+            status={!!rawErrors ? "error" : null}
             style={{width: '100%'}}
             value={value}
             options={valueOptions}