Merge pull request #10364 from marmelab/ra-core-form-organization

[Chore] Reorganize ra-core/form directory

Author: djhi

packages/ra-core/src/form/Form.spec.tsx

@@ -11,7 +11,7 @@ import { CoreAdminContext } from '../core';
 import { Form } from './Form';
 import { useNotificationContext } from '../notification';
 import { useInput } from './useInput';
-import { required } from './validate';
+import { required } from './validation/validate';
 import {
     FormLevelValidation,
     InputLevelValidation,

packages/ra-core/src/form/Form.stories.tsx

@@ -13,8 +13,7 @@ import { Route, Routes, useNavigate, Link, HashRouter } from 'react-router-dom';
 import { CoreAdminContext } from '../core';
 import { Form } from './Form';
 import { useInput } from './useInput';
-import { required } from './validate';
-import ValidationError from './ValidationError';
+import { required, ValidationError } from './validation';
 import { mergeTranslations } from '../i18n';
 import { I18nProvider } from '../types';
 import { SaveContextProvider, useNotificationContext } from '..';

packages/ra-core/src/form/Form.tsx

@@ -11,7 +11,7 @@ import {
     UNSAFE_DataRouterStateContext,
 } from 'react-router';
 
-import { FormGroupsProvider } from './FormGroupsProvider';
+import { FormGroupsProvider } from './groups/FormGroupsProvider';
 import { RaRecord } from '../types';
 import {
     useRecordContext,
@@ -23,7 +23,7 @@ import {
     SourceContextValue,
     useResourceContext,
 } from '../core';
-import { ValidateForm } from './getSimpleValidationResolver';
+import { ValidateForm } from './validation/getSimpleValidationResolver';
 import { WarnWhenUnsavedChanges } from './WarnWhenUnsavedChanges';
 import { useAugmentedForm } from './useAugmentedForm';
 

packages/ra-core/src/form/FormDataConsumer.spec.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { render, waitFor, screen, fireEvent } from '@testing-library/react';
 
-import FormDataConsumer, { FormDataConsumerView } from './FormDataConsumer';
+import { FormDataConsumer, FormDataConsumerView } from './FormDataConsumer';
 import { testDataProvider } from '../dataProvider';
 import {
     AdminContext,

packages/ra-core/src/form/FormDataConsumer.tsx

@@ -42,7 +42,9 @@ import { useWrappedSource } from '../core';
  *     </Edit>
  * );
  */
-const FormDataConsumer = <TFieldValues extends FieldValues = FieldValues>(
+export const FormDataConsumer = <
+    TFieldValues extends FieldValues = FieldValues,
+>(
     props: ConnectedProps<TFieldValues>
 ) => {
     const form = useFormContext<TFieldValues>();
@@ -83,8 +85,6 @@ export const FormDataConsumerView = <
     return ret === undefined ? null : ret;
 };
 
-export default FormDataConsumer;
-
 const ArraySourceRegex = new RegExp(/.+\.\d+$/);
 
 export interface FormDataConsumerRenderParams<

packages/ra-core/src/form/choices/index.ts

@@ -1,3 +1,4 @@
 export * from './ChoicesContext';
 export * from './ChoicesContextProvider';
 export * from './useChoicesContext';
+export * from './useChoices';

…ges/ra-core/src/form/useChoices.spec.tsx …ore/src/form/choices/useChoices.spec.tsxpackages/ra-core/src/form/useChoices.spec.tsx renamed to packages/ra-core/src/form/choices/useChoices.spec.tsx packages/ra-core/src/form/useChoices.spec.tsx renamed to packages/ra-core/src/form/choices/useChoices.spec.tsx

@@ -3,8 +3,8 @@ import expect from 'expect';
 import { render, screen } from '@testing-library/react';
 
 import { useChoices } from './useChoices';
-import { TestTranslationProvider } from '../i18n';
-import { useRecordContext } from '../controller';
+import { TestTranslationProvider } from '../../i18n';
+import { useRecordContext } from '../../controller';
 
 describe('useChoices hook', () => {
     const defaultProps = {

packages/ra-core/src/form/useChoices.tsx …/ra-core/src/form/choices/useChoices.tsxpackages/ra-core/src/form/useChoices.tsx renamed to packages/ra-core/src/form/choices/useChoices.tsx packages/ra-core/src/form/useChoices.tsx renamed to packages/ra-core/src/form/choices/useChoices.tsx

@@ -2,9 +2,9 @@ import * as React from 'react';
 import { ReactElement, isValidElement, useCallback } from 'react';
 import get from 'lodash/get';
 
-import { useTranslate } from '../i18n';
-import { RaRecord } from '../types';
-import { RecordContextProvider } from '../controller';
+import { useTranslate } from '../../i18n';
+import { RaRecord } from '../../types';
+import { RecordContextProvider } from '../../controller';
 
 export type OptionTextElement = ReactElement<{
     record: RaRecord;