review

src/components/dialogs/descriptionModificationDialog/DescriptionModificationDialog.tsx

@@ -14,7 +14,7 @@ import { FieldConstants } from '../../../utils/constants/fieldConstants';
 import { useSnackMessage } from '../../../hooks/useSnackMessage';
 import { CustomMuiDialog } from '../customMuiDialog/CustomMuiDialog';
 import { ExpandingTextField } from '../../inputs/reactHookForm/text/ExpandingTextField';
-import { MAX_CHAR_DESCRIPTION } from '../../../utils/constants/UIconstants';
+import { MAX_CHAR_DESCRIPTION } from '../../../utils/constants/uiConstants';
 
 export interface DescriptionModificationDialogProps {
     elementUuid: string;

src/components/filter/FilterCreationDialog.tsx

@@ -23,7 +23,7 @@ import { FilterForm } from './FilterForm';
 import { EXPERT_FILTER_QUERY, expertFilterSchema, getExpertFilterEmptyFormData } from './expert/ExpertFilterForm';
 import { FilterType } from './constants/FilterConstants';
 import { ElementExistsType } from '../../utils/types/elementType';
-import { MAX_CHAR_DESCRIPTION } from '../../utils/constants/UIconstants';
+import { MAX_CHAR_DESCRIPTION } from '../../utils/constants/uiConstants';
 
 const emptyFormData = {
     [FieldConstants.NAME]: '',

src/components/filter/FilterForm.tsx

@@ -14,15 +14,6 @@ import { ExplicitNamingFilterForm } from './explicitNaming/ExplicitNamingFilterF
 import { ExpertFilterForm } from './expert/ExpertFilterForm';
 import { FilterType } from './constants/FilterConstants';
 import { unscrollableDialogStyles } from '../dialogs';
-import yup from '../../utils/yupConfig';
-import { MAX_CHAR_DESCRIPTION } from '../../utils/constants/UIconstants';
-
-export const FilterSchema = {
-    [FieldConstants.NAME]: yup.string().trim().required('nameEmpty'),
-    [FieldConstants.FILTER_TYPE]: yup.string().required(),
-    [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
-    [FieldConstants.DESCRIPTION]: yup.string().max(MAX_CHAR_DESCRIPTION, 'descriptionLimitError'),
-};
 
 export function FilterForm({
     sourceFilterForExplicitNamingConversion,

src/components/filter/HeaderFilterForm.tsx

@@ -13,6 +13,8 @@ import { UniqueNameInput } from '../inputs/reactHookForm/text/UniqueNameInput';
 import { ElementExistsType, ElementType } from '../../utils/types/elementType';
 import { DescriptionField } from '../inputs/reactHookForm/text/DescriptionField';
 import { RadioInput } from '../inputs/reactHookForm/booleans/RadioInput';
+import yup from '../../utils/yupConfig';
+import { MAX_CHAR_DESCRIPTION } from '../../utils/constants/uiConstants';
 
 export interface FilterFormProps {
     creation?: boolean;
@@ -25,6 +27,13 @@ export interface FilterFormProps {
     handleFilterTypeChange?: (event: React.ChangeEvent<HTMLInputElement>, value: string) => void;
 }
 
+export const HeaderFilterSchema = {
+    [FieldConstants.NAME]: yup.string().trim().required('nameEmpty'),
+    [FieldConstants.FILTER_TYPE]: yup.string().required(),
+    [FieldConstants.EQUIPMENT_TYPE]: yup.string().required(),
+    [FieldConstants.DESCRIPTION]: yup.string().max(MAX_CHAR_DESCRIPTION, 'descriptionLimitError'),
+};
+
 export function HeaderFilterForm({
     sourceFilterForExplicitNamingConversion,
     creation,
@@ -48,7 +57,7 @@ export function HeaderFilterForm({
             </Grid>
             <>
                 <Grid item xs={12}>
-                    <DescriptionField showDescription />
+                    <DescriptionField />
                 </Grid>
                 {creation && !sourceFilterForExplicitNamingConversion && (
                     <Grid item>

src/components/filter/expert/ExpertFilterEditionDialog.tsx

@@ -14,16 +14,17 @@ import { FieldConstants } from '../../../utils/constants/fieldConstants';
 import yup from '../../../utils/yupConfig';
 import { CustomMuiDialog } from '../../dialogs/customMuiDialog/CustomMuiDialog';
 import { FilterType, NO_ITEM_SELECTION_FOR_COPY } from '../constants/FilterConstants';
-import { FilterProps } from '../filter.type';
-import { FilterForm, FilterSchema } from '../FilterForm';
+import { FilterEditionProps } from '../filter.type';
+import { FilterForm } from '../FilterForm';
 import { saveExpertFilter } from '../utils/filterApi';
 import { EXPERT_FILTER_QUERY, expertFilterSchema } from './ExpertFilterForm';
 import { importExpertRules } from './expertFilterUtils';
+import { HeaderFilterSchema } from '../HeaderFilterForm';
 
 const formSchema = yup
     .object()
     .shape({
-        ...FilterSchema,
+        ...HeaderFilterSchema,
         ...expertFilterSchema,
     })
     .required();
@@ -42,7 +43,7 @@ export function ExpertFilterEditionDialog({
     elementExists,
     language,
     description,
-}: Readonly<FilterProps>) {
+}: Readonly<FilterEditionProps>) {
     const { snackError } = useSnackMessage();
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
 

src/components/filter/explicitNaming/ExplicitNamingFilterEditionDialog.tsx

@@ -18,14 +18,15 @@ import { saveExplicitNamingFilter } from '../utils/filterApi';
 import { explicitNamingFilterSchema, FILTER_EQUIPMENTS_ATTRIBUTES } from './ExplicitNamingFilterForm';
 
 import { FetchStatus } from '../../../utils/constants/fetchStatus';
-import { FilterForm, FilterSchema } from '../FilterForm';
+import { FilterForm } from '../FilterForm';
 import { FilterType, NO_ITEM_SELECTION_FOR_COPY } from '../constants/FilterConstants';
-import { FilterProps } from '../filter.type';
+import { FilterEditionProps } from '../filter.type';
+import { HeaderFilterSchema } from '../HeaderFilterForm';
 
 const formSchema = yup
     .object()
     .shape({
-        ...FilterSchema,
+        ...HeaderFilterSchema,
         ...explicitNamingFilterSchema,
     })
     .required();
@@ -46,7 +47,7 @@ export function ExplicitNamingFilterEditionDialog({
     elementExists,
     language,
     description,
-}: Readonly<FilterProps>) {
+}: Readonly<FilterEditionProps>) {
     const { snackError } = useSnackMessage();
     const [dataFetchStatus, setDataFetchStatus] = useState(FetchStatus.IDLE);
 

src/components/filter/filter.type.ts

@@ -20,7 +20,7 @@ export type ItemSelectionForCopy = {
     specificTypeItem: string | null;
 };
 
-export interface FilterProps {
+export interface FilterEditionProps {
     id: string;
     name: string;
     titleId: string;

src/components/inputs/reactHookForm/text/DescriptionField.tsx

@@ -14,16 +14,10 @@ import { useFormContext } from 'react-hook-form'; // Import useFormContext
 import { FieldConstants } from '../../../../utils/constants/fieldConstants';
 import { ExpandingTextField } from './ExpandingTextField';
 
-interface DescriptionProps {
-    showDescription?: boolean;
-    description?: string;
-}
-export function DescriptionField({ showDescription }: Readonly<DescriptionProps>) {
+export function DescriptionField() {
     const { setValue, getValues } = useFormContext();
     const description = getValues(FieldConstants.DESCRIPTION);
-    const [isDescriptionFieldVisible, setIsDescriptionFieldVisible] = useState(
-        showDescription && description && description !== ''
-    );
+    const [isDescriptionFieldVisible, setIsDescriptionFieldVisible] = useState(!!description);
 
     const handleOpenDescription = () => {
         setIsDescriptionFieldVisible(true);