Skip to content

Fix line name modification + rework LineModification dialog #3260

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

Merged
merged 7 commits into from
Sep 17, 2025
Merged

Fix line name modification + rework LineModification dialog #3260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b48f407
more rigorous LineModificationForm typing
Mathieu-Deharbe Sep 11, 2025
b5984ec
rename types
Mathieu-Deharbe Sep 16, 2025
0cda30e
remove uuid from LineModificationDialogForm
Mathieu-Deharbe Sep 17, 2025
bf441c6
Merge branch 'main' into more-rigorous-LineModificationForm-typing
etiennehomer Sep 17, 2025
1289927
back to lineName
Mathieu-Deharbe Sep 17, 2025
f562778
Merge branch 'main' into more-rigorous-LineModificationForm-typing
Mathieu-Deharbe Sep 17, 2025
8aeb3fb
reremove lineName
Mathieu-Deharbe Sep 17, 2025
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
9 changes: 5 additions & 4 deletions src/components/dialogs/limits/limits-pane-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ import { isNodeBuilt } from '../../graph/util/model-functions';
import {
AttributeModification,
CurrentLimits,
LineModificationInfos,
OperationalLimitsGroup,
OperationType,
TemporaryLimit,
} from '../../../services/network-modification-types';
import { CurrentTreeNode } from '../../graph/tree-node.type';
import { BranchInfos } from '../../../services/study/network-map.type';
import { areOperationalLimitsGroupUnique, OperationalLimitsId } from './limits-utils';
import { LineModificationEditData } from '../network-modifications/line/modification/line-modification-type';
import { LineModificationFormInfos } from '../network-modifications/line/modification/line-modification-type';

const limitsGroupValidationSchema = (isModification: boolean) => ({
[ID]: yup.string().nonNullable().required(),
Expand Down Expand Up @@ -225,10 +226,10 @@ export const updateTemporaryLimits = (
};

/**
* extract data loaded from the map server and merge it with local data in order to fill the operaitonal liits groups modification interface
* extract data loaded from the map server and merge it with local data in order to fill the operational limits groups modification interface
*/
export const updateOpLimitsGroups = (
formBranchModification: LineModificationEditData,
formBranchModification: LineModificationFormInfos,
mapServerBranch: BranchInfos
): OperationalLimitsGroup[] => {
let updatedOpLG: OperationalLimitsGroup[] = formBranchModification.limits.operationalLimitsGroups ?? [];
Expand Down Expand Up @@ -367,7 +368,7 @@ export function addOperationTypeToSelectedOpLG(
export const addModificationTypeToOpLimitsGroups = (
limitsGroups: OperationalLimitsGroup[],
networkLine: BranchInfos | null,
editData: LineModificationEditData | null | undefined,
editData: LineModificationInfos | null | undefined,
currentNode: CurrentTreeNode
) => {
let modificationLimitsGroups: OperationalLimitsGroup[] = sanitizeLimitsGroups(limitsGroups);
Expand Down
20 changes: 11 additions & 9 deletions src/components/dialogs/network-modifications/line/modification/line-modification-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,13 @@ import { UUID } from 'crypto';
import { CurrentTreeNode } from '../../../../graph/tree-node.type';
import { BranchInfos } from '../../../../../services/study/network-map.type';
import { useIntl } from 'react-intl';
import { LineModificationEditData } from './line-modification-type';
import { LineModificationFormInfos } from './line-modification-type';
import { LineModificationInfos } from '../../../../../services/network-modification-types';
import { toModificationOperation } from '../../../../utils/utils';

export interface LineModificationDialogProps {
// contains data when we try to edit an existing hypothesis from the current node's list
editData: LineModificationEditData | null | undefined;
editData: LineModificationInfos | null | undefined;
// Used to pre-select an equipmentId when calling this dialog from the SLD or network map
defaultIdValue: string;
studyUuid: UUID;
Expand Down Expand Up @@ -183,7 +185,7 @@ const LineModificationDialog = ({
const { reset, setValue, getValues } = formMethods;

const fromEditDataToFormValues = useCallback(
(lineModification: LineModificationEditData) => {
(lineModification: LineModificationInfos) => {
if (lineModification?.equipmentId) {
setSelectedId(lineModification.equipmentId);
}
Expand Down Expand Up @@ -220,7 +222,7 @@ const LineModificationDialog = ({
}, [fromEditDataToFormValues, editData]);

const onSubmit = useCallback(
(line: LineModificationEditData) => {
(line: LineModificationFormInfos) => {
const connectivity1 = line[CONNECTIVITY]?.[CONNECTIVITY_1];
const connectivity2 = line[CONNECTIVITY]?.[CONNECTIVITY_2];
const characteristics = line[CHARACTERISTICS];
Expand All @@ -232,7 +234,7 @@ const LineModificationDialog = ({
nodeUuid: currentNodeUuid,
modificationUuid: editData?.uuid ?? '',
lineId: selectedId,
lineName: sanitizeString(line[EQUIPMENT_NAME]?.value) ?? '',
equipmentName: toModificationOperation(sanitizeString(line[EQUIPMENT_NAME]) ?? ''),
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
equipmentName: toModificationOperation(sanitizeString(line[EQUIPMENT_NAME]) ?? ''),
lineName: toModificationOperation(sanitizeString(line[EQUIPMENT_NAME]) ?? ''),

To be more homogeneous with the other modifications ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

OK done. But I had to put it back into LineModificationInfos. And I saw it only in LineCreationInfo : 1289927

r: characteristics[R],
x: characteristics[X],
g1: convertOutputValue(FieldType.G1, characteristics[G1]),
Expand All @@ -245,13 +247,13 @@ const LineModificationDialog = ({
editData,
currentNode
),
selectedLimitsGroup1: addOperationTypeToSelectedOpLG(
selectedOperationalLimitsGroup1: addOperationTypeToSelectedOpLG(
limits[SELECTED_LIMITS_GROUP_1],
intl.formatMessage({
id: 'None',
})
),
selectedLimitsGroup2: addOperationTypeToSelectedOpLG(
selectedOperationalLimitsGroup2: addOperationTypeToSelectedOpLG(
limits[SELECTED_LIMITS_GROUP_2],
intl.formatMessage({
id: 'None',
Expand Down Expand Up @@ -309,7 +311,7 @@ const LineModificationDialog = ({
if (line) {
setLineToModify(line);
reset(
(formValues: LineModificationEditData) => ({
(formValues: LineModificationFormInfos) => ({
...formValues,
...{
[LIMITS]: {
Expand Down Expand Up @@ -344,7 +346,7 @@ const LineModificationDialog = ({
}
}, [selectedId, onEquipmentIdChange]);

const onValidationError = (errors: FieldErrors<LineModificationEditData>) => {
const onValidationError = (errors: FieldErrors<LineModificationFormInfos>) => {
let tabsInError: number[] = [];
if (errors?.[LIMITS] !== undefined) {
tabsInError.push(LineModificationDialogTab.LIMITS_TAB);
Expand Down
23 changes: 11 additions & 12 deletions src/components/dialogs/network-modifications/line/modification/line-modification-type.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,27 +6,26 @@
*/

import { UUID } from 'crypto';
import { AttributeModification, OperationalLimitsGroup } from '../../../../../services/network-modification-types';
import { OperationalLimitsGroup } from '../../../../../services/network-modification-types';
import { Property } from '../../common/properties/property-utils';

export interface LineModificationEditData {
uuid?: string;
export interface LineModificationFormInfos {
equipmentId?: string;
equipmentName?: { value: string };
equipmentName?: string;
studyUuid: string;
nodeUuid: UUID;
modificationUuid: string;
lineId: string;
lineName: string | null;
r: AttributeModification<number> | null;
x: AttributeModification<number>;
g1: AttributeModification<number>;
b1: AttributeModification<number>;
g2: AttributeModification<number>;
b2: AttributeModification<number>;
r: number;
x: number;
g1: number;
b1: number;
g2: number;
b2: number;
operationalLimitsGroups: OperationalLimitsGroup[];
selectedOperationalLimitsGroup1: AttributeModification<string>;
selectedOperationalLimitsGroup2: AttributeModification<string>;
selectedOperationalLimitsGroup1: string | null;
selectedOperationalLimitsGroup2: string | null;
voltageLevelId1: string;
busOrBusbarSectionId1: string;
voltageLevelId2: string;
Expand Down
22 changes: 12 additions & 10 deletions src/services/network-modification-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,21 +538,23 @@ export interface LineCreationInfo {
properties: Property[] | null;
}

export interface LineModificationInfo {
export interface LineModificationInfos {
uuid?: string | null;
studyUuid: string;
equipmentId?: string;
equipmentName?: AttributeModification<string> | null;
nodeUuid: UUID;
modificationUuid: string;
lineId: string;
lineName: string | null;
r: number;
x: number;
g1: number;
b1: number;
g2: number;
b2: number;
r: AttributeModification<number> | null;
x: AttributeModification<number> | null;
g1: AttributeModification<number> | null;
b1: AttributeModification<number> | null;
g2: AttributeModification<number> | null;
b2: AttributeModification<number> | null;
operationalLimitsGroups: OperationalLimitsGroup[];
selectedLimitsGroup1: AttributeModification<string> | null;
selectedLimitsGroup2: AttributeModification<string> | null;
selectedOperationalLimitsGroup1: AttributeModification<string> | null;
selectedOperationalLimitsGroup2: AttributeModification<string> | null;
voltageLevelId1: string;
busOrBusbarSectionId1: string;
voltageLevelId2: string;
Expand Down
16 changes: 8 additions & 8 deletions src/services/study/network-modifications.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import {
LCCCreationInfo,
LccModificationInfos,
LineCreationInfo,
LineModificationInfo,
LineModificationInfos,
LinesAttachToSplitLinesInfo,
LoadCreationInfo,
LoadModificationInfo,
Expand Down Expand Up @@ -828,16 +828,16 @@ export function modifyLine({
nodeUuid,
modificationUuid,
lineId,
lineName,
equipmentName,
Copy link
Contributor

Choose a reason for hiding this comment

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

And revert this ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yep done.

r,
x,
g1,
b1,
g2,
b2,
operationalLimitsGroups,
selectedLimitsGroup1,
selectedLimitsGroup2,
selectedOperationalLimitsGroup1,
selectedOperationalLimitsGroup2,
voltageLevelId1,
busOrBusbarSectionId1,
voltageLevelId2,
Expand All @@ -859,7 +859,7 @@ export function modifyLine({
p2MeasurementValidity,
q2MeasurementValue,
q2MeasurementValidity,
}: LineModificationInfo) {
}: LineModificationInfos) {
let modifyLineUrl = getNetworkModificationUrl(studyUuid, nodeUuid);
const isUpdate = !!modificationUuid;
if (isUpdate) {
Expand All @@ -878,16 +878,16 @@ export function modifyLine({
body: JSON.stringify({
type: MODIFICATION_TYPES.LINE_MODIFICATION.type,
equipmentId: lineId,
equipmentName: toModificationOperation(lineName),
equipmentName: equipmentName,
r: toModificationOperation(r),
x: toModificationOperation(x),
g1: toModificationOperation(g1),
b1: toModificationOperation(b1),
g2: toModificationOperation(g2),
b2: toModificationOperation(b2),
operationalLimitsGroups: operationalLimitsGroups,
selectedOperationalLimitsGroup1: selectedLimitsGroup1,
selectedOperationalLimitsGroup2: selectedLimitsGroup2,
selectedOperationalLimitsGroup1: selectedOperationalLimitsGroup1,
selectedOperationalLimitsGroup2: selectedOperationalLimitsGroup2,
voltageLevelId1: toModificationOperation(voltageLevelId1),
busOrBusbarSectionId1: toModificationOperation(busOrBusbarSectionId1),
voltageLevelId2: toModificationOperation(voltageLevelId2),
Expand Down
Loading