Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Rework] split ParameterLine #2168

Merged
merged 7 commits into from
Jul 19, 2024
Merged

[Rework] split ParameterLine #2168

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a8e07bd
split ParameterLine component with the four children. update Equipeme…
Jul 12, 2024
8d4de12
Powsybl/diagram-viewer doesn't provide type so return component to jsx
Jul 12, 2024
c69be22
remove ParamLine from network and singleline diagram
Jul 12, 2024
2959083
fix parameter-group file name
Jul 18, 2024
53ce46b
remove TODOs in map-parameters since silgle line diagram update
Jul 19, 2024
6873801
revert type
Jul 19, 2024
42fcdde
Merge branch 'main' into rework/ParameterLine
jonenst Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions src/components/dialogs/parameters/load-flow-parameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,34 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import React, { useCallback, useEffect, useMemo, useState } from 'react';
import { FormattedMessage, useIntl } from 'react-intl';
import { Autocomplete, Chip, Grid, TextField, Box } from '@mui/material';
import {
DropDown,
LabelledButton,
SwitchWithLabel,
useParameterState,
styles,
} from './parameters';
import { LineSeparator } from '../dialogUtils';
import {
DirectoryItemSelector,
ElementType,
FlatParameters,
useSnackMessage,
} from '@gridsuite/commons-ui';
import { useLocalizedCountries } from '../../utils/localized-countries-hook';
import { replaceAllDefaultValues } from '../../utils/utils';
import { Autocomplete, Box, Chip, Grid, TextField } from '@mui/material';
import { useCallback, useEffect, useMemo, useState } from 'react';
import { FormattedMessage, useIntl } from 'react-intl';
import { fetchLoadFlowParameters } from '../../../services/loadflow';
import {
PARAM_DEVELOPER_MODE,
PARAM_LIMIT_REDUCTION,
} from '../../../utils/config-params';
import { ParameterType, ParamLine, ParameterGroup } from './widget';
import { mergeSx } from '../../utils/functions';
import { useLocalizedCountries } from '../../utils/localized-countries-hook';
import { replaceAllDefaultValues } from '../../utils/utils';
import { LineSeparator } from '../dialogUtils';
import CreateParameterDialog from './common/parameters-creation-dialog';
import { DirectoryItemSelector } from '@gridsuite/commons-ui';
import { fetchLoadFlowParameters } from '../../../services/loadflow';
import {
DropDown,
LabelledButton,
SwitchWithLabel,
styles,
useParameterState,
} from './parameters';
import { ParameterGroup } from './widget';
import ParameterLineSlider from './widget/parameter-line-slider';

const CountrySelector = ({ value, label, callback }) => {
const { translate, countryCodes } = useLocalizedCountries();
Expand All @@ -45,7 +46,7 @@ const CountrySelector = ({ value, label, callback }) => {
<Autocomplete
size="small"
value={value}
multiple={true}
multiple
onChange={(event, newValues) => callback(newValues)}
options={countryCodes}
getOptionLabel={(countryCode) => translate(countryCode)}
Expand Down Expand Up @@ -638,9 +639,8 @@ export const LoadFlowParameters = ({ parametersBackend }) => {
>
<LineSeparator />
<Grid container spacing={1} paddingTop={1}>
<ParamLine
type={ParameterType.Slider}
param_name_id={PARAM_LIMIT_REDUCTION}
<ParameterLineSlider
paramNameId={PARAM_LIMIT_REDUCTION}
label="LimitReduction"
marks={alertThresholdMarks}
minValue={MIN_VALUE_ALLOWED_FOR_LIMIT_REDUCTION}
Expand Down
55 changes: 24 additions & 31 deletions ...nts/dialogs/parameters/map-parameters.jsx → ...nts/dialogs/parameters/map-parameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,26 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { Grid } from '@mui/material';
import { LineFlowMode, LineFlowColorMode } from '@powsybl/diagram-viewer';
import { LineFlowColorMode, LineFlowMode } from '@powsybl/diagram-viewer';
import { useState } from 'react';
import {
MAP_BASEMAP_CARTO,
MAP_BASEMAP_CARTO_NOLABEL,
MAP_BASEMAP_MAPBOX,
PARAM_LINE_FLOW_ALERT_THRESHOLD,
PARAM_LINE_FLOW_COLOR_MODE,
PARAM_LINE_FLOW_MODE,
PARAM_LINE_FULL_PATH,
PARAM_LINE_PARALLEL_PATH,
PARAM_MAP_MANUAL_REFRESH,
PARAM_MAP_BASEMAP,
MAP_BASEMAP_MAPBOX,
MAP_BASEMAP_CARTO,
MAP_BASEMAP_CARTO_NOLABEL,
PARAM_MAP_MANUAL_REFRESH,
} from '../../../utils/config-params';
import { useParameterState, styles } from './parameters';
import { LineSeparator } from '../dialogUtils';
import { ParamLine, ParameterType } from './widget';
import { useState } from 'react';
import { styles, useParameterState } from './parameters';
import ParameterLineDropdown from './widget/parameter-line-dropdown';
import ParameterLineSlider from './widget/parameter-line-slider';
import ParameterLineSwitch from './widget/parameter-line-switch';

export const MapParameters = () => {
const alertThresholdMarks = [
Expand Down Expand Up @@ -55,21 +56,18 @@ export const MapParameters = () => {
marginTop={-3}
justifyContent={'space-between'}
>
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_LINE_FULL_PATH}
<ParameterLineSwitch
paramNameId={PARAM_LINE_FULL_PATH}
label="lineFullPath"
/>
<LineSeparator />
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_LINE_PARALLEL_PATH}
<ParameterLineSwitch
paramNameId={PARAM_LINE_PARALLEL_PATH}
label="lineParallelPath"
/>
<LineSeparator />
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_LINE_FLOW_MODE}
<ParameterLineDropdown
paramNameId={PARAM_LINE_FLOW_MODE}
labelTitle="LineFlowMode"
labelValue="line-flow-mode-select-label"
values={{
Expand All @@ -79,9 +77,8 @@ export const MapParameters = () => {
}}
/>
<LineSeparator />
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_LINE_FLOW_COLOR_MODE}
<ParameterLineDropdown
paramNameId={PARAM_LINE_FLOW_COLOR_MODE}
labelTitle="LineFlowColorMode"
labelValue="line-flow-color-mode-select-label"
values={{
Expand All @@ -96,24 +93,20 @@ export const MapParameters = () => {
}}
/>
<LineSeparator />
<ParamLine
type={ParameterType.Slider}
param_name_id={PARAM_LINE_FLOW_ALERT_THRESHOLD}
<ParameterLineSlider
paramNameId={PARAM_LINE_FLOW_ALERT_THRESHOLD}
label="AlertThresholdLabel"
disabled={isLineFlowNominal}
marks={alertThresholdMarks}
/>
<LineSeparator />
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_MAP_MANUAL_REFRESH}
<ParameterLineSwitch
paramNameId={PARAM_MAP_MANUAL_REFRESH}
label="MapManualRefresh"
marks={alertThresholdMarks}
/>
<LineSeparator />
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_MAP_BASEMAP}
<ParameterLineDropdown
paramNameId={PARAM_MAP_BASEMAP}
labelTitle="MapBaseMap"
labelValue="map-base-map-select-label"
values={{
Expand Down
23 changes: 11 additions & 12 deletions src/components/dialogs/parameters/network-parameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,19 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { FormattedMessage } from 'react-intl';
import { Grid } from '@mui/material';
import Alert from '@mui/material/Alert';
import { FormattedMessage } from 'react-intl';
import { fetchDefaultParametersValues } from '../../../services/utils';
import {
PARAM_DEVELOPER_MODE,
PARAM_FLUX_CONVENTION,
} from '../../../utils/config-params';
import { LabelledButton, useParameterState, styles } from './parameters';
import { LineSeparator } from '../dialogUtils';
import Alert from '@mui/material/Alert';
import { fetchDefaultParametersValues } from '../../../services/utils';
import { ParamLine, ParameterType } from './widget';
import { mergeSx } from '../../utils/functions';
import { LineSeparator } from '../dialogUtils';
import { LabelledButton, styles, useParameterState } from './parameters';
import ParameterLineDropdown from './widget/parameter-line-dropdown';
import ParameterLineSwitch from './widget/parameter-line-switch';

export const FluxConventions = {
IIDM: 'iidm',
Expand Down Expand Up @@ -54,9 +55,8 @@ export const NetworkParameters = () => {
marginTop={-3}
justifyContent={'space-between'}
>
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_FLUX_CONVENTION}
<ParameterLineDropdown
paramNameId={PARAM_FLUX_CONVENTION}
labelTitle="FluxConvention"
labelValue="flux-convention-select-label"
values={{
Expand All @@ -66,9 +66,8 @@ export const NetworkParameters = () => {
/>
<LineSeparator />
<Grid item container xs={12}>
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_DEVELOPER_MODE}
<ParameterLineSwitch
paramNameId={PARAM_DEVELOPER_MODE}
label="EnableDeveloperMode"
/>
{enableDeveloperMode && (
Expand Down
33 changes: 15 additions & 18 deletions src/components/dialogs/parameters/single-line-diagram-parameters.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import React, { useEffect, useMemo, useState } from 'react';
import { Grid } from '@mui/material';
import { SubstationLayout } from '../../diagrams/diagram-common';
import { useEffect, useMemo, useState } from 'react';
import { getAvailableComponentLibraries } from '../../../services/study';
import {
PARAM_CENTER_LABEL,
PARAM_COMPONENT_LIBRARY,
PARAM_DIAGONAL_LABEL,
PARAM_SUBSTATION_LAYOUT,
PARAM_COMPONENT_LIBRARY,
} from '../../../utils/config-params';
import { styles } from './parameters';
import { SubstationLayout } from '../../diagrams/diagram-common';
import { LineSeparator } from '../dialogUtils';
import { getAvailableComponentLibraries } from '../../../services/study';
import { ParamLine, ParameterType } from './widget';
import { styles } from './parameters';
import ParameterLineDropdown from './widget/parameter-line-dropdown';
import ParameterLineSwitch from './widget/parameter-line-switch';

export const useGetAvailableComponentLibraries = (user) => {
const [componentLibraries, setComponentLibraries] = useState([]);
Expand Down Expand Up @@ -53,21 +54,18 @@ export const SingleLineDiagramParameters = ({ componentLibraries }) => {
marginTop={-3}
justifyContent={'space-between'}
>
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_DIAGONAL_LABEL}
<ParameterLineSwitch
paramNameId={PARAM_DIAGONAL_LABEL}
label="diagonalLabel"
/>
<LineSeparator />
<ParamLine
type={ParameterType.Switch}
param_name_id={PARAM_CENTER_LABEL}
<ParameterLineSwitch
paramNameId={PARAM_CENTER_LABEL}
label="centerLabel"
/>
<LineSeparator />
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_SUBSTATION_LAYOUT}
<ParameterLineDropdown
paramNameId={PARAM_SUBSTATION_LAYOUT}
labelTitle="SubstationLayout"
labelValue="substation-layout-select-label"
defaultValueIfNull={true}
Expand All @@ -84,9 +82,8 @@ export const SingleLineDiagramParameters = ({ componentLibraries }) => {
}}
/>
<LineSeparator />
<ParamLine
type={ParameterType.DropDown}
param_name_id={PARAM_COMPONENT_LIBRARY}
<ParameterLineDropdown
paramNameId={PARAM_COMPONENT_LIBRARY}
labelTitle="ComponentLibrary"
labelValue="component-library-select-label"
values={componentLibsRenderCache}
Expand Down
31 changes: 11 additions & 20 deletions ...geinit/equipment-selection-parameters.jsx → ...geinit/equipment-selection-parameters.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,37 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

import { ElementType } from '@gridsuite/commons-ui';
import { ElementType, EquipmentType } from '@gridsuite/commons-ui';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok but it's not exactly the same enum, there is no TIE_LINE in the commons-ui enum.

import { DialogContent } from '@mui/material';
import { EQUIPMENT_TYPES } from 'components/utils/equipment-types';
import {
FIXED_GENERATORS,
VARIABLE_SHUNT_COMPENSATORS,
VARIABLE_TRANSFORMERS,
} from 'components/utils/field-constants';
import React from 'react';
import { ParameterType, ParamLine } from '../widget';

import ParameterLineDirectoryItemsInput from '../widget/parameter-line-directory-items-input';
const EquipmentSelectionParameters = () => {
return (
<DialogContent>
<ParamLine
type={ParameterType.DirectoryItems}
param_name_id={null}
<ParameterLineDirectoryItemsInput
name={FIXED_GENERATORS}
equipmentTypes={[EQUIPMENT_TYPES.GENERATOR]}
equipmentTypes={[EquipmentType.GENERATOR]}
elementType={ElementType.FILTER}
label={'FixedGenerators'}
hideErrorMessage={true}
hideErrorMessage
/>
<ParamLine
type={ParameterType.DirectoryItems}
param_name_id={null}
<ParameterLineDirectoryItemsInput
name={VARIABLE_TRANSFORMERS}
equipmentTypes={[EQUIPMENT_TYPES.TWO_WINDINGS_TRANSFORMER]}
equipmentTypes={[EquipmentType.TWO_WINDINGS_TRANSFORMER]}
elementType={ElementType.FILTER}
label={'VariableTransformers'}
hideErrorMessage={true}
hideErrorMessage
/>
<ParamLine
type={ParameterType.DirectoryItems}
param_name_id={null}
<ParameterLineDirectoryItemsInput
name={VARIABLE_SHUNT_COMPENSATORS}
equipmentTypes={[EQUIPMENT_TYPES.SHUNT_COMPENSATOR]}
equipmentTypes={[EquipmentType.SHUNT_COMPENSATOR]}
elementType={ElementType.FILTER}
label={'VariableShuntCompensators'}
hideErrorMessage={true}
hideErrorMessage
/>
</DialogContent>
);
Expand Down
Loading
Loading