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

Author: Wadjetz

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

@@ -24,8 +24,8 @@ import {
 import { LinearMetadataItem } from 'common/IntervalsDataViz/types';
 import { LinearMetadataDataviz } from 'common/IntervalsDataViz/dataviz';
 import { useModal } from 'common/BootstrapSNCF/ModalSNCF';
-import HelpModal from './HelpModal';
 import { tooltipPosition, notEmpty } from 'common/IntervalsDataViz/utils';
+import HelpModal from './HelpModal';
 
 import { LinearMetadataTooltip } from './tooltip';
 import { FormBeginEndWidget } from './FormBeginEndWidget';
@@ -66,6 +66,12 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
     return 0;
   }, [formContext]);
 
+  // Remove the 'valueField' required field because it is required by the backend. However,
+  // the segment with missing values is filtered in 'customOnChange' before being sent to the backend,
+  // and then re-added by 'fixLinearMetadataItems'.
+  const requiredFilter = (requireds: string[]) =>
+    requireds.filter((r) => ['end', 'begin'].includes(r));
+
   // Compute the JSON schema of the linear metadata item
   const jsonSchema = useMemo(
     () =>
@@ -83,7 +89,8 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
                 maximum: distance,
               },
             }
-          : {}
+          : {},
+        requiredFilter
       ),
     [schema, registry.rootSchema, distance]
   );
@@ -338,19 +345,24 @@ 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,
+                    {
+                      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,
+                      },
                     },
-                  }).items as JSONSchema7) || {}
+                    requiredFilter
+                  ).items as JSONSchema7) || {}
                 }
                 uiSchema={{
                   begin: {
@@ -394,7 +406,7 @@ export const FormComponent: React.FC<FieldProps> = (props) => {
                       );
                       newData = resizeEnd.result;
                     }
-                    onChange(newData);
+                    customOnChange(newData);
                   } catch (error) {
                     // TODO: Should we display the resize error ?
                   } finally {

front/src/common/IntervalsDataViz/data.ts

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

front/src/reducers/osrdconf/infra_schema.json

@@ -254,6 +254,7 @@
                 }
             },
             "required": [
+                "radius",
                 "begin",
                 "end"
             ],
@@ -1152,6 +1153,7 @@
                 }
             },
             "required": [
+                "gradient",
                 "begin",
                 "end"
             ],