Skip to content

Commit 960a797

Browse files
committed
changes for branch modification
Signed-off-by: basseche <[email protected]>
1 parent 7ce511e commit 960a797

File tree

5 files changed

+14
-8
lines changed

5 files changed

+14
-8
lines changed

src/components/dialogs/limits/limits-pane-utils.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,12 +227,13 @@ export const updateTemporaryLimits = (
227227
return updatedTemporaryLimits;
228228
};
229229

230-
export const mapServerLimitsGroupsToFormInfos = (currentLimits: CurrentLimits[]) => {
231-
return currentLimits?.map((currentLimit: CurrentLimits) => {
230+
export const mapServerLimitsGroupsToFormInfos = (currentLimits: CurrentLimitsData[]) => {
231+
return currentLimits?.map((currentLimit: CurrentLimitsData) => {
232232
return {
233233
id: currentLimit.id + currentLimit.applicability,
234234
name: currentLimit.id,
235235
applicability: currentLimit.applicability,
236+
limitsProperties: currentLimit.limitsProperties,
236237
currentLimits: {
237238
id: currentLimit.id,
238239
permanentLimit: null,
@@ -342,6 +343,7 @@ export const addModificationTypeToOpLimitsGroups = (
342343
id: limitsGroupForm.id,
343344
name: limitsGroupForm.name,
344345
applicability: limitsGroupForm.applicability,
346+
limitsProperties: limitsGroupForm.limitsProperties,
345347
currentLimits: currentLimits,
346348
modificationType: LIMIT_SETS_MODIFICATION_TYPE.MODIFY_OR_ADD,
347349
temporaryLimitsModificationType: TEMPORARY_LIMIT_MODIFICATION_TYPE.REPLACE,

src/components/dialogs/limits/limits-properties-side-stack.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@ import { useFormContext, useWatch } from 'react-hook-form';
1515

1616
export interface LimitsPropertiesSideStackProps {
1717
formName: string;
18+
disabled?: boolean;
1819
}
19-
export function LimitsPropertiesSideStack({ formName, ...props }: Readonly<LimitsPropertiesSideStackProps>) {
20+
export function LimitsPropertiesSideStack({ formName, disabled }: Readonly<LimitsPropertiesSideStackProps>) {
2021
const { setValue } = useFormContext();
2122
const limitsProperties: LimitsProperty[] = useWatch({ name: formName });
2223

@@ -63,24 +64,25 @@ export function LimitsPropertiesSideStack({ formName, ...props }: Readonly<Limit
6364
);
6465

6566
return (
66-
<Stack direction="column" spacing={2} paddingBottom={2} flexWrap="wrap">
67-
<Stack direction="row" {...props} sx={{ display: 'flex', flexWrap: 'wrap' }}>
67+
<Stack direction="column" spacing={2} paddingBottom={2} flexWrap="wrap" >
68+
<Stack direction="row" sx={{ display: 'flex', flexWrap: 'wrap' }}>
6869
{limitsProperties?.map((property: LimitsProperty, index: number) => (
6970
<LimitsTagChip
7071
key={`${property.name}`}
7172
limitsProperty={property}
7273
onDelete={() => handleDelete(index)}
74+
disabled={disabled}
7375
/>
7476
))}
7577
{!isEditing ? (
76-
<IconButton color="primary" sx={{ verticalAlign: 'center' }} onClick={() => setIsEditing(true)}>
78+
<IconButton color="primary" sx={{ verticalAlign: 'center' }} onClick={() => setIsEditing(true)} disabled={disabled}>
7779
<AddCircle />
7880
</IconButton>
7981
) : (
8082
''
8183
)}
8284
</Stack>
83-
{isEditing ? (
85+
{isEditing && !disabled ? (
8486
<Box
8587
display="flex"
8688
gap={2}

src/components/dialogs/limits/limits-side-pane.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ export function LimitsSidePane({
205205
<Box sx={{ p: 2 }}>
206206
{limitsGroupApplicabilityName && (
207207
<Box>
208-
<LimitsPropertiesSideStack formName={`${OplimitsGroupFormName}.${LIMITS_PROPERTIES}`} />
208+
<LimitsPropertiesSideStack formName={`${OplimitsGroupFormName}.${LIMITS_PROPERTIES}`} disabled={disabled}/>
209209
<Grid container justifyContent="flex-start" alignItems="center" sx={{ paddingBottom: '15px' }}>
210210
<Grid item xs={2}>
211211
<FormattedMessage id="Applicability" />

src/components/dialogs/network-modifications/line/modification/line-modification-dialog.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ const LineModificationDialog = ({
231231
const characteristics = line[CHARACTERISTICS];
232232
const stateEstimationData = line[STATE_ESTIMATION];
233233
const limits: LimitsDialogFormInfos = line[LIMITS];
234+
console.log('LimitsDialogFormInfos-----------------------', limits);
234235

235236
modifyLine({
236237
studyUuid: studyUuid,

src/services/study/network-modifications.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,7 @@ export function modifyLine({
863863
q2MeasurementValue,
864864
q2MeasurementValidity,
865865
}: LineModificationInfos) {
866+
console.log('operationalLimitsGroups : ', operationalLimitsGroups);
866867
let modifyLineUrl = getNetworkModificationUrl(studyUuid, nodeUuid);
867868
const isUpdate = !!modificationUuid;
868869
if (isUpdate) {

0 commit comments

Comments
 (0)