Skip to content

Commit 436e68c

Browse files
carojeandatcarojeandat
committed
unify colors declaration
1 parent 03c24b0 commit 436e68c

File tree

7 files changed

+297
-444
lines changed

7 files changed

+297
-444
lines changed

‎src/components/grid-layout/hooks/use-diagram-model.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { useSnackMessage } from '@gridsuite/commons-ui';
3232
import { NodeType } from 'components/graph/tree-node.type';
3333
import { isThereTooManyOpenedNadDiagrams, mergePositions } from '../cards/diagrams/diagram-utils';
3434
import { DiagramMetadata } from '@powsybl/network-viewer';
35+
import { getBaseVoltagesConfigInfos } from 'utils/constants';
3536

3637
type UseDiagramModelProps = {
3738
diagramTypes: DiagramType[];
@@ -304,13 +305,22 @@ export const useDiagramModel = ({ diagramTypes, onAddDiagram, onDiagramAlreadyEx
304305
positions: diagram.positions,
305306
nadPositionsGenerationMode:
306307
networkVisuParams.networkAreaDiagramParameters.nadPositionsGenerationMode,
308+
baseVoltagesConfigInfos: getBaseVoltagesConfigInfos(),
307309
};
308310
fetchOptions = {
309311
method: 'POST',
310312
headers: { 'Content-Type': 'application/json' },
311313
body: JSON.stringify(nadRequestInfos),
312314
};
313315
}
316+
if (diagram.type === DiagramType.SUBSTATION || diagram.type === DiagramType.VOLTAGE_LEVEL) {
317+
const sldRequestInfos = { baseVoltagesConfigInfos: getBaseVoltagesConfigInfos() };
318+
fetchOptions = {
319+
method: 'POST',
320+
headers: { 'Content-Type': 'application/json' },
321+
body: JSON.stringify(sldRequestInfos),
322+
};
323+
}
314324

315325
setLoadingDiagrams((loadingDiagrams) => {
316326
if (loadingDiagrams.includes(diagram.diagramUuid)) {

‎src/components/network/nominal-voltage-filter.tsx‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,12 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
99
import { Button, Checkbox, List, ListItem, ListItemButton, ListItemText, Paper, Tooltip } from '@mui/material';
1010
import { FormattedMessage } from 'react-intl';
1111
import { type MuiStyles } from '@gridsuite/commons-ui';
12-
import { getNominalVoltageIntervalName } from 'utils/constants';
13-
import { BASE_VOLTAGES, MAX_VOLTAGE, VoltageLevelInterval } from 'utils/constants';
12+
import {
13+
BASE_VOLTAGES,
14+
MAX_VOLTAGE,
15+
VoltageLevelInterval,
16+
getNominalVoltageIntervalNameByVoltageValue,
17+
} from 'utils/constants';
1418

1519
const styles = {
1620
nominalVoltageZone: {
@@ -62,7 +66,7 @@ export default function NominalVoltageFilter({
6266
useEffect(() => {
6367
const newIntervals = BASE_VOLTAGES.map((interval) => {
6468
const vlListValues = nominalVoltages.filter(
65-
(vnom) => getNominalVoltageIntervalName(vnom) === interval.name
69+
(vnom) => getNominalVoltageIntervalNameByVoltageValue(vnom) === interval.name
6670
);
6771
return { ...interval, vlListValues, isChecked: true };
6872
});

‎src/services/study/network.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ export function getVoltageLevelSingleLineDiagram({
7979
if (componentLibrary !== null) {
8080
queryParams.append('componentLibrary', String(componentLibrary));
8181
}
82+
//baseVoltagesConfig
8283
return (
8384
getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
8485
'/network/voltage-levels/' +
@@ -236,6 +237,7 @@ export function getSubstationSingleLineDiagram({
236237
if (componentLibrary !== null) {
237238
queryParams.append('componentLibrary', String(componentLibrary));
238239
}
240+
//baseVoltagesConfig
239241
return (
240242
getStudyUrlWithNodeUuidAndRootNetworkUuid(studyUuid, currentNodeUuid, currentRootNetworkUuid) +
241243
'/network/substations/' +

‎src/styles/dark-theme-css-vars.ts‎

Lines changed: 4 additions & 210 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
66
*/
77

8+
import { DARK_THEME } from '@gridsuite/commons-ui';
9+
import { cssColors } from 'utils/colors';
10+
811
export const darkThemeCssVars = {
912
'.nad-edge-infos text': {
1013
stroke: '#292e33', // Border outside of the displayed values on lines. Same color as the background.
@@ -18,214 +21,5 @@ export const darkThemeCssVars = {
1821
'.nad-textnode-highlight': {
1922
backgroundColor: '#32373bd9', // same displayed color as #6c6c6c20 but with 0.85 opacity
2023
},
21-
'.sld-vl0to30, .nad-vl0to30': {
22-
'--vl-color': '#CCC93A',
23-
},
24-
'.sld-vl0to30.sld-bus-1, .nad-vl0to30.nad-bus-1': {
25-
'--vl-color': '#5E835C',
26-
},
27-
'.sld-vl0to30.sld-bus-2, .nad-vl0to30.nad-bus-2': {
28-
'--vl-color': '#B1B46C',
29-
},
30-
'.sld-vl0to30.sld-bus-3, .nad-vl0to30.nad-bus-3': {
31-
'--vl-color': '#A156AA',
32-
},
33-
'.sld-vl0to30.sld-bus-4, .nad-vl0to30.nad-bus-4': {
34-
'--vl-color': '#CB3DDD',
35-
},
36-
'.sld-vl0to30.sld-bus-5, .nad-vl0to30.nad-bus-5': {
37-
'--vl-color': '#AC8AC2',
38-
},
39-
'.sld-vl0to30.sld-bus-6, .nad-vl0to30.nad-bus-6': {
40-
'--vl-color': '#734097',
41-
},
42-
'.sld-vl0to30.sld-bus-7, .nad-vl0to30.nad-bus-7': {
43-
'--vl-color': '#BCADCC',
44-
},
45-
'.sld-vl0to30.sld-bus-8, .nad-vl0to30.nad-bus-8': {
46-
'--vl-color': '#A246E0',
47-
},
48-
'.sld-vl0to30.sld-bus-9, .nad-vl0to30.nad-bus-9': {
49-
'--vl-color': '#C38CEB',
50-
},
51-
'.sld-vl30to50, .nad-vl30to50': {
52-
'--vl-color': '#EA8E9B',
53-
},
54-
'.sld-vl30to50.sld-bus-1, .nad-vl30to50.nad-bus-1': {
55-
'--vl-color': '#A43857',
56-
},
57-
'.sld-vl30to50.sld-bus-2, .nad-vl30to50.nad-bus-2': {
58-
'--vl-color': '#CEAAB0',
59-
},
60-
'.sld-vl30to50.sld-bus-3, .nad-vl30to50.nad-bus-3': {
61-
'--vl-color': '#459C63',
62-
},
63-
'.sld-vl30to50.sld-bus-4, .nad-vl30to50.nad-bus-4': {
64-
'--vl-color': '#00E266',
65-
},
66-
'.sld-vl30to50.sld-bus-5, .nad-vl30to50.nad-bus-5': {
67-
'--vl-color': '#A7B368',
68-
},
69-
'.sld-vl30to50.sld-bus-6, .nad-vl30to50.nad-bus-6': {
70-
'--vl-color': '#3F7340',
71-
},
72-
'.sld-vl30to50.sld-bus-7, .nad-vl30to50.nad-bus-7': {
73-
'--vl-color': '#C2CB92',
74-
},
75-
'.sld-vl30to50.sld-bus-8, .nad-vl30to50.nad-bus-8': {
76-
'--vl-color': '#218B21',
77-
},
78-
'.sld-vl30to50.sld-bus-9, .nad-vl30to50.nad-bus-9': {
79-
'--vl-color': '#58D058',
80-
},
81-
'.sld-vl50to70, .nad-vl50to70': {
82-
'--vl-color': '#D47DFF',
83-
},
84-
'.sld-vl50to70.sld-bus-1, .nad-vl50to70.nad-bus-1': {
85-
'--vl-color': '#C230D2',
86-
},
87-
'.sld-vl50to70.sld-bus-2, .nad-vl50to70.nad-bus-2': {
88-
'--vl-color': '#AB94BF',
89-
},
90-
'.sld-vl50to70.sld-bus-3, .nad-vl50to70.nad-bus-3': {
91-
'--vl-color': '#1F7620',
92-
},
93-
'.sld-vl50to70.sld-bus-4, .nad-vl50to70.nad-bus-4': {
94-
'--vl-color': '#C5ED3B',
95-
},
96-
'.sld-vl50to70.sld-bus-5, .nad-vl50to70.nad-bus-5': {
97-
'--vl-color': '#A7B368',
98-
},
99-
'.sld-vl50to70.sld-bus-6, .nad-vl50to70.nad-bus-6': {
100-
'--vl-color': '#697046',
101-
},
102-
'.sld-vl50to70.sld-bus-7, .nad-vl50to70.nad-bus-7': {
103-
'--vl-color': '#E1E444',
104-
},
105-
'.sld-vl50to70.sld-bus-8, .nad-vl50to70.nad-bus-8': {
106-
'--vl-color': '#AAAE50',
107-
},
108-
'.sld-vl50to70.sld-bus-9, .nad-vl50to70.nad-bus-9': {
109-
'--vl-color': '#D4D486',
110-
},
111-
'.sld-vl70to120, .nad-vl70to120': {
112-
'--vl-color': '#FF6100',
113-
},
114-
'.sld-vl70to120.sld-bus-1, .nad-vl70to120.nad-bus-1': {
115-
'--vl-color': '#B27153',
116-
},
117-
'.sld-vl70to120.sld-bus-2, .nad-vl70to120.nad-bus-2': {
118-
'--vl-color': '#C6A68B',
119-
},
120-
'.sld-vl70to120.sld-bus-3, .nad-vl70to120.nad-bus-3': {
121-
'--vl-color': '#25699D',
122-
},
123-
'.sld-vl70to120.sld-bus-4, .nad-vl70to120.nad-bus-4': {
124-
'--vl-color': '#0057F9',
125-
},
126-
'.sld-vl70to120.sld-bus-5, .nad-vl70to120.nad-bus-5': {
127-
'--vl-color': '#74AFEA',
128-
},
129-
'.sld-vl70to120.sld-bus-6, .nad-vl70to120.nad-bus-6': {
130-
'--vl-color': '#44679C',
131-
},
132-
'.sld-vl70to120.sld-bus-7, .nad-vl70to120.nad-bus-7': {
133-
'--vl-color': '#458BE8',
134-
},
135-
'.sld-vl70to120.sld-bus-8, .nad-vl70to120.nad-bus-8': {
136-
'--vl-color': '#2862AE',
137-
},
138-
'.sld-vl70to120.sld-bus-9, .nad-vl70to120.nad-bus-9': {
139-
'--vl-color': '#B0D4FE',
140-
},
141-
'.sld-vl120to180, .nad-vl120to180': {
142-
'--vl-color': '#29AFB0',
143-
},
144-
'.sld-vl120to180.sld-bus-1, .nad-vl120to180.nad-bus-1': {
145-
'--vl-color': '#336B6F',
146-
},
147-
'.sld-vl120to180.sld-bus-2, .nad-vl120to180.nad-bus-2': {
148-
'--vl-color': '#84C6CC',
149-
},
150-
'.sld-vl120to180.sld-bus-3, .nad-vl120to180.nad-bus-3': {
151-
'--vl-color': '#BA133C',
152-
},
153-
'.sld-vl120to180.sld-bus-4, .nad-vl120to180.nad-bus-4': {
154-
'--vl-color': '#FF8290',
155-
},
156-
'.sld-vl120to180.sld-bus-5, .nad-vl120to180.nad-bus-5': {
157-
'--vl-color': '#DAA8AD',
158-
},
159-
'.sld-vl120to180.sld-bus-6, .nad-vl120to180.nad-bus-6': {
160-
'--vl-color': '#97353A',
161-
},
162-
'.sld-vl120to180.sld-bus-7, .nad-vl120to180.nad-bus-7': {
163-
'--vl-color': '#EABCBD',
164-
},
165-
'.sld-vl120to180.sld-bus-8, .nad-vl120to180.nad-bus-8': {
166-
'--vl-color': '#EA2E33',
167-
},
168-
'.sld-vl120to180.sld-bus-9, .nad-vl120to180.nad-bus-9': {
169-
'--vl-color': '#EA6E72',
170-
},
171-
'.sld-vl180to300, .nad-vl180to300': {
172-
'--vl-color': '#00FF50',
173-
},
174-
'.sld-vl180to300.sld-bus-1, .nad-vl180to300.nad-bus-1': {
175-
'--vl-color': '#42954B',
176-
},
177-
'.sld-vl180to300.sld-bus-2, .nad-vl180to300.nad-bus-2': {
178-
'--vl-color': '#A7B27E',
179-
},
180-
'.sld-vl180to300.sld-bus-3, .nad-vl180to300.nad-bus-3': {
181-
'--vl-color': '#F57F17',
182-
},
183-
'.sld-vl180to300.sld-bus-4, .nad-vl180to300.nad-bus-4': {
184-
'--vl-color': '#A3715C',
185-
},
186-
'.sld-vl180to300.sld-bus-5, .nad-vl180to300.nad-bus-5': {
187-
'--vl-color': '#DBAB9D',
188-
},
189-
'.sld-vl180to300.sld-bus-6, .nad-vl180to300.nad-bus-6': {
190-
'--vl-color': '#885239',
191-
},
192-
'.sld-vl180to300.sld-bus-7, .nad-vl180to300.nad-bus-7': {
193-
'--vl-color': '#B39572',
194-
},
195-
'.sld-vl180to300.sld-bus-8, .nad-vl180to300.nad-bus-8': {
196-
'--vl-color': '#C94119',
197-
},
198-
'.sld-vl180to300.sld-bus-9, .nad-vl180to300.nad-bus-9': {
199-
'--vl-color': '#EABC45',
200-
},
201-
'.sld-vl300to500, .nad-vl300to500': {
202-
'--vl-color': '#FF0007',
203-
},
204-
'.sld-vl300to500.sld-bus-1, .nad-vl300to500.nad-bus-1': {
205-
'--vl-color': '#DD6484',
206-
},
207-
'.sld-vl300to500.sld-bus-2, .nad-vl300to500.nad-bus-2': {
208-
'--vl-color': '#FFBCBE',
209-
},
210-
'.sld-vl300to500.sld-bus-3, .nad-vl300to500.nad-bus-3': {
211-
'--vl-color': '#25699D',
212-
},
213-
'.sld-vl300to500.sld-bus-4, .nad-vl300to500.nad-bus-4': {
214-
'--vl-color': '#0057F9',
215-
},
216-
'.sld-vl300to500.sld-bus-5, .nad-vl300to500.nad-bus-5': {
217-
'--vl-color': '#74AFEA',
218-
},
219-
'.sld-vl300to500.sld-bus-6, .nad-vl300to500.nad-bus-6': {
220-
'--vl-color': '#44679C',
221-
},
222-
'.sld-vl300to500.sld-bus-7, .nad-vl300to500.nad-bus-7': {
223-
'--vl-color': '#458BE8',
224-
},
225-
'.sld-vl300to500.sld-bus-8, .nad-vl300to500.nad-bus-8': {
226-
'--vl-color': '#2862AE',
227-
},
228-
'.sld-vl300to500.sld-bus-9, .nad-vl300to500.nad-bus-9': {
229-
'--vl-color': '#B0D4FE',
230-
},
24+
...cssColors(DARK_THEME),
23125
};

0 commit comments

Comments
 (0)