Merge branch 'root-network-panel' of https://github.com/gridsuite/gri…

…dstudy-app into root-network-panel
gridsuite · Jan 6, 2025 · aa0f905 · aa0f905
2 parents 92ab307 + e595a74
commit aa0f905
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/src/components/dialogs/parameters/dynamicsimulation/mapping-parameters.tsx b/src/components/dialogs/parameters/dynamicsimulation/mapping-parameters.tsx
@@ -34,12 +34,7 @@ const MappingParameters: FunctionComponent<MappingParametersProps> = ({ mapping,
     const { mappings } = mapping ?? {};
 
     const mappingOptions = useMemo(() => {
-        return (
-            mappings?.map((elem) => ({
-                id: elem.name,
-                label: elem.name,
-            })) ?? []
-        );
+        return mappings?.map((elem) => elem.name) ?? [];
     }, [mappings]);
 
     const defParams: Record<string, DefParam> = {

diff --git a/src/components/dialogs/parameters/util/make-component-utils.tsx b/src/components/dialogs/parameters/util/make-component-utils.tsx
@@ -8,7 +8,7 @@
 import { Grid, InputAdornment } from '@mui/material';
 import { styles } from '../parameters';
 import { FormattedMessage } from 'react-intl';
-import { FloatInput, IntegerInput, MuiSelectInput, SwitchInput, TextInput } from '@gridsuite/commons-ui';
+import { FloatInput, IntegerInput, Option, SelectInput, SwitchInput, TextInput } from '@gridsuite/commons-ui';
 import LineSeparator from '../../commons/line-separator';
 import { ReactElement } from 'react';
 
@@ -24,15 +24,15 @@ export enum TYPES {
 export type DefParam = {
     type: TYPES;
     label: string;
-    options?: { id: string; label: string }[];
+    options?: Option[];
     render?: (defParam: DefParam, path: string, key: string) => ReactElement;
 };
 
 const defaultParamRender = (defParam: DefParam, path: string, key: string) => {
     switch (defParam.type) {
         case TYPES.ENUM:
             return (
-                <MuiSelectInput
+                <SelectInput
                     name={`${path}.${key}`}
                     label={''}
                     options={defParam?.options ?? []}