fixup! front: infra editor make slopes and curves optional values

Author: Wadjetz

front/src/applications/editor/components/EditorForm.tsx

@@ -84,16 +84,6 @@ function EditorForm<T extends Omit<EditorEntity, 'objType'> & { objType: string
     }
   }, [error]);
 
-  useEffect(() => {
-    if (!data.properties.curves || !data.properties.slopes) {
-      setFormData({
-        ...data.properties,
-        slopes: data.properties.slopes ?? [],
-        curves: data.properties.curves ?? [],
-      });
-    }
-  }, [data.properties.length]);
-
   return (
     <div>
       {submited && error !== null && (

front/src/applications/editor/components/LinearMetadata/FormComponent.tsx

@@ -78,6 +78,7 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
       getFieldJsonSchema(
         schema,
         registry.rootSchema,
+        requiredFilter,
         distance
           ? {
               begin: {
@@ -89,8 +90,7 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
                 maximum: distance,
               },
             }
-          : {},
-        requiredFilter
+          : {}
       ),
     [schema, registry.rootSchema, distance]
   );
@@ -345,24 +345,19 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
                 noHtml5Validate
                 tagName="div"
                 schema={
-                  (getFieldJsonSchema(
-                    schema,
-                    registry.rootSchema,
-                    {
-                      begin: {
-                        minimum: 0,
-                        maximum: fnMax([selectedData.begin, selectedData.end - SEGMENT_MIN_SIZE]),
-                      },
-                      end: {
-                        minimum: fnMin([selectedData.end, data[selected].begin + SEGMENT_MIN_SIZE]),
-                        maximum:
-                          selected !== data.length - 1
-                            ? fnMax([selectedData.end, data[selected + 1].end - SEGMENT_MIN_SIZE])
-                            : selectedData.end,
-                      },
+                  (getFieldJsonSchema(schema, registry.rootSchema, requiredFilter, {
+                    begin: {
+                      minimum: 0,
+                      maximum: fnMax([selectedData.begin, selectedData.end - SEGMENT_MIN_SIZE]),
                     },
-                    requiredFilter
-                  ).items as JSONSchema7) || {}
+                    end: {
+                      minimum: fnMin([selectedData.end, data[selected].begin + SEGMENT_MIN_SIZE]),
+                      maximum:
+                        selected !== data.length - 1
+                          ? fnMax([selectedData.end, data[selected + 1].end - SEGMENT_MIN_SIZE])
+                          : selectedData.end,
+                    },
+                  }).items as JSONSchema7) || {}
                 }
                 uiSchema={{
                   begin: {

front/src/applications/editor/tools/trackEdition/utils.ts

@@ -13,6 +13,8 @@ export function getNewLine(points: [number, number][]): TrackSectionEntity {
     properties: {
       id: NEW_ENTITY_ID,
       length: 0,
+      slopes: [],
+      curves: [],
     },
   };
 }

front/src/common/IntervalsDataViz/IntervalItem.tsx

@@ -75,7 +75,7 @@ const IntervalItem = <T extends { [key: string]: string | number }>({
         highlighted.includes(segment.index) && 'highlighted',
         {
           'with-data': hasData,
-          'no-data': hasNoData
+          'no-data': hasNoData,
         },
         !field && isNilObject(segment, ['begin', 'end', 'index']) && 'no-data'
       )}

front/src/common/IntervalsDataViz/data.ts

@@ -688,10 +688,9 @@ export function entityDoUpdate<T extends EditorEntity>(entity: T, sourceLine: Li
 export function getFieldJsonSchema(
   fieldSchema: JSONSchema7,
   rootSchema: JSONSchema7,
-  enhancement: { [key: string]: JSONSchema7Definition },
-  requiredFilter?: (required: string[]) => string[]
+  requiredFilter?: (required: string[]) => string[],
+  enhancement: { [key: string]: JSONSchema7Definition } = {}
 ): JSONSchema7 {
-  const enhancementValues = enhancement ?? {};
   let result = { ...fieldSchema };
   if (fieldSchema.items) {
     const itemsSchema = utils.retrieveSchema(fieldSchema.items as JSONSchema7, rootSchema);
@@ -707,11 +706,11 @@ export function getFieldJsonSchema(
           properties: {
             begin: {
               ...(itemsSchema.properties?.begin as JSONSchema7),
-              ...(enhancementValues.begin as JSONSchema7),
+              ...(enhancement.begin as JSONSchema7),
             },
             end: {
               ...(itemsSchema.properties?.end as JSONSchema7),
-              ...(enhancementValues.end as JSONSchema7),
+              ...(enhancement.end as JSONSchema7),
             },
             ...Object.keys(itemsSchema.properties || {})
               .filter((k) => !['begin', 'end'].includes(k))
@@ -722,7 +721,7 @@ export function getFieldJsonSchema(
               .reduce((acc, curr) => {
                 acc[curr.name] = {
                   ...(curr.schema as JSONSchema7),
-                  ...(enhancementValues[curr.name] as JSONSchema7),
+                  ...(enhancement[curr.name] as JSONSchema7),
                 };
                 return acc;
               }, {} as { [key: string]: JSONSchema7Definition }),

front/src/types/editor.ts

@@ -1,6 +1,7 @@
 import { JSONSchema7 } from 'json-schema';
 import { Feature, GeoJsonProperties, Geometry, Point, LineString, MultiLineString } from 'geojson';
 import { Direction, DirectionalTrackRange, ObjectType } from 'common/api/osrdEditoastApi';
+import { LinearMetadataItem } from 'common/IntervalsDataViz/types';
 import { NullGeometry } from './geospatial';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -22,6 +23,8 @@ export interface TrackSectionEntity
     LineString,
     {
       length: number;
+      slopes: LinearMetadataItem<{ gradient: number }>[];
+      curves: LinearMetadataItem<{ radius: number }>[];
       extensions?: {
         sncf?: {
           line_code?: number;