feat(Form): add resetFieldsValidation and setFieldError methods * 2

cube-js · Dec 27, 2024 · dc88774 · dc88774
1 parent 6e22100
commit dc88774
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/.changeset/funny-oranges-hope.md b/.changeset/funny-oranges-hope.md
@@ -2,4 +2,4 @@
 '@cube-dev/ui-kit': minor
 ---
 
-Add `clearFieldsValidation()` and `setFieldError()` methods to form to replace deprecated `setFields()`.
+Add `resetFieldsValidation()` and `setFieldError()` methods to form to replace deprecated `setFields()`.
diff --git a/src/components/form/Form/submit.test.tsx b/src/components/form/Form/submit.test.tsx
@@ -292,7 +292,7 @@ describe('<Form />', () => {
 
     // Clear all validation errors
     await act(async () => {
-      formInstance.clearFieldsValidation();
+      formInstance.resetFieldsValidation();
     });
 
     await waitFor(() => {
@@ -308,7 +308,7 @@ describe('<Form />', () => {
 
     // Clear validation error for specific field
     await act(async () => {
-      formInstance.clearFieldsValidation(['test']);
+      formInstance.resetFieldsValidation(['test']);
     });
 
     await waitFor(() => {

diff --git a/src/components/form/Form/use-form.tsx b/src/components/form/Form/use-form.tsx
@@ -423,7 +423,7 @@ export class CubeFormInstance<
     this.forceReRender();
   }
 
-  clearFieldsValidation(names?: (keyof T & string)[], skipRender?: boolean) {
+  resetFieldsValidation(names?: (keyof T & string)[], skipRender?: boolean) {
     (names || Object.keys(this.fields)).forEach((name) => {
       const field = this.getFieldInstance(name);
 
@@ -439,10 +439,14 @@ export class CubeFormInstance<
     }
   }
 
-  setFieldError(name: keyof T & string, error: string, skipRender?: boolean) {
+  setFieldError(
+    name: keyof T & string,
+    error: ReactNode,
+    skipRender?: boolean,
+  ) {
     const field = this.getFieldInstance(name);
 
-    if (!field || !error.trim()) return;
+    if (!field || !error) return;
 
     field.errors = [error];
     field.status = 'invalid';