Merge branch 'main' into limit-sets-ui

gridsuite · Dec 20, 2024 · 48bbe12 · 48bbe12
2 parents 873acc1 + dd28fd0
commit 48bbe12
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/components/dialogs/parameters/shortcircuit/short-circuit-parameters.tsx b/src/components/dialogs/parameters/shortcircuit/short-circuit-parameters.tsx
@@ -165,15 +165,16 @@ const ShortCircuitFields: FunctionComponent<ShortCircuitFieldsProps> = ({ resetA
                 <GridItem size={4}>{statusToShow}</GridItem>
             </Grid>
             <GridSection title="ShortCircuitCharacteristics" heading={4} />
-            <Grid container>
-                <GridItem>{loads}</GridItem>
-                <GridItem>{shuntCompensators}</GridItem>
-            </Grid>
-            <Grid container marginLeft={4}>
-                <GridItem size={4}>{vsc}</GridItem>
-                <GridItem size={8}>{neutralPosition}</GridItem>
+            <Grid container spacing={5}>
+                <Grid item>
+                    <GridItem>{loads}</GridItem>
+                    <GridItem>{shuntCompensators}</GridItem>
+                </Grid>
+                <Grid item xs={8}>
+                    <GridItem>{vsc}</GridItem>
+                    <GridItem>{neutralPosition}</GridItem>
+                </Grid>
             </Grid>
-
             <GridSection title="ShortCircuitVoltageProfileMode" heading={4} />
             <Grid container>
                 <GridItem size={12}>{initialVoltageProfileModeField}</GridItem>

diff --git a/src/services/spreadsheet.ts b/src/services/spreadsheet.ts
@@ -8,7 +8,7 @@
 import { backendFetchJson } from '@gridsuite/commons-ui';
 import { UUID } from 'crypto';
 
-const PREFIX_SPREADSHEET_CONFIG_QUERIES = import.meta.env.VITE_API_GATEWAY + '/spreadsheet-config';
+const PREFIX_SPREADSHEET_CONFIG_QUERIES = import.meta.env.VITE_API_GATEWAY + '/study-config';
 
 export function getSpreadsheetModel(spreadsheetModelUuid: UUID) {
     const fetchUrl = `${PREFIX_SPREADSHEET_CONFIG_QUERIES}/v1/spreadsheet-configs/${spreadsheetModelUuid}`;

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -1334,7 +1334,7 @@
     "ShortCircuitCharacteristics": "Features considered",
     "ShortCircuitVoltageProfileMode": "Initial voltage profile",
     "shortCircuitLoads": "Loads",
-    "shortCircuitHvdc": "HVDC(VSC)",
+    "shortCircuitHvdc": "HVDC (VSC)",
     "shortCircuitShuntCompensators": "Shunt compensators",
     "shortCircuitNeutralPosition": "Tap position of ratio tap changers",
     "shortCircuitNominalVoltage": "Nominal voltage (kV)",

diff --git a/src/translations/fr.json b/src/translations/fr.json
@@ -1332,7 +1332,7 @@
     "ShortCircuitCharacteristics": "Caractéristiques prises en compte",
     "ShortCircuitVoltageProfileMode": "Plan de tension initial",
     "shortCircuitLoads": "Charges",
-    "shortCircuitHvdc": "HVDC(VSC)",
+    "shortCircuitHvdc": "HVDC (VSC)",
     "shortCircuitShuntCompensators": "MCS",
     "shortCircuitNeutralPosition": "Prises courantes des régleurs en charge",
     "shortCircuitNominalVoltage": "Tension nominale (kV)",